diff -Nrc2 texinfo-6.1/ChangeLog texinfo-6.3/ChangeLog
*** texinfo-6.1/ChangeLog	2016-02-06 11:49:09.000000000 +0000
--- texinfo-6.3/ChangeLog	2016-09-10 20:28:35.000000000 +0100
***************
*** 1,2 ****
--- 1,1716 ----
+ 2016-09-10  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	6.3 release.
+ 	* configure.ac, NEWS, util/texi2dvi, util/texi2pdf,
+ 	doc/refcard/txirefcard.tex, texindex/texindex.awk:
+ 	Version number.
+ 	* tp/Texinfo: Update version numbers in modules.
+ 	* tp/Texinfo/Convert/XSParagraph/TestXS.pm,
+ 	* tp/Texinfo/Convert/XSParagraph/configure.ac: Version number.
+ 
+ 2016-09-10  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/tests/README: Mention that the tests must be run before the 
+ 	reference results can be updated.
+ 
+ 2016-09-10  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* README-hacking: Add note about updating the version number 
+ 	under tp/Texinfo/Convert/XSParagraph.
+ 
+ 2016-09-10  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	6.2 release.
+ 	* configure.ac, NEWS, util/texi2dvi, util/texi2pdf,
+ 	doc/refcard/txirefcard.tex, texindex/texindex.awk:
+ 	Version number.
+ 	* tp/Texinfo: Update version numbers in modules.
+ 	* po, po_document: Synch with translationproject.org and run 
+ 	"make update_po".
+ 	* build-aux/texinfo.tex: Update from doc/texinfo.tex.
+ 
+ 2016-09-07  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* pretest 6.1.92
+ 
+ 2016-09-07  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* README-hacking: Add note about checking svn checkout is 
+ 	up-to-date.
+ 
+ 2016-09-05  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* pretest 6.1.91
+ 
+ 2016-09-05  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* po, po_document: Synch with translationproject.org and run 
+ 	"make update_po".
+ 
+ 2016-09-03  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* README-hacking: Mention LINGUAS files and "svn status .".
+ 
+ 2016-09-03  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/tests/htmlxref-only_mono/test_scripts,
+ 	* tp/tests/htmlxref-only_split/test_scripts,
+ 	* tp/tests/htmlxref/test_scripts:
+ 	Remove unused directories.
+ 
+ 2016-09-03  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* info/window.c (window_make_modeline): Do not make modeline 
+ 	depend on whether preprocess_nodes_p is set.
+ 
+ 2016-09-03  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* info/info-utils.c (scan_reference_target): Remove code that 
+ 	altered the line number of an index entry if 
+ 	preprocess_nodes_p=1, because this is is independent of whether 
+ 	the first line of the node is displayed or not.
+ 
+ 2016-09-03  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* po/el.po: Commit file.
+ 	* po/LINGUAS: List el.
+ 
+ 2016-09-03  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* po_document/LINGUAS: List ca, de, el, hr, pt, pt_BR.
+ 
+ 2016-08-30  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Convert/XSParagraph: Run gnulib-tool --add-import.
+ 	* (top-level): Run gnulib-tool --add-import.
+ 
+ 2016-08-28  Emanuele Giaquinta  <emanuele.giaquinta@gmail.com>  (tiny change)
+ 
+ 	* util/texi2dvi (cleanup): Fix cleanup for "clean" build mode.  
+ 	Bug introduced on 2016-05-03.
+ 
+ 2016-08-16  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\entry): Disable output of marks for whole 
+ 	entry, instead of just for the page number.  This is intended to 
+ 	prevent an infinite loop in \ourunvbox when @uref is used in an 
+ 	index entry (reported by Karl Berry for latex refman manual).
+ 
+ 2016-08-14  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* README-hacking: Mention gnulib import in XSParagraph subdirectory.
+ 
+ 2016-08-13  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* pretest 6.1.90
+ 
+ 2016-08-13  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo-tex-test.texi (Document encoding): Test glyph 
+ 	commands in section title.
+ 
+ 2016-08-09  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\indexnofonts): Eat the {} following glyph 
+ 	commands, and add definitions for \atchar, \lbracechar and 
+ 	\rbracechar.
+ 	(\definedummies): Add dummy for @atchar.
+ 	* doc/texinfo-tex-test.texi (Document encoding): Test some glyph 
+ 	commands in section title.
+ 
+ 2016-08-09  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\balancecolumns): When making bottoms of the 
+ 	two columns flush, use \unskip to remove glue from bottom of 
+ 	columns.  Remove code which ignored glue at the bottom of 
+ 	columns when balancing columns, because this glue was there to 
+ 	help to break before an index initial.
+ 
+ 	* doc/texinfo-tex-test.texi
+ 	(Final page initial at top of both columns): New example of 
+ 	index formatting.
+ 	(Short indices): Add text saying what to look at for short 
+ 	indices.
+ 	(\commenceindex, \finishindex): Move use of \smallfonts in order 
+ 	not to cancel the change to \baselineskip done in 
+ 	\begindoublecolumns.
+ 
+ 2016-08-08  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex (\setpdfdestname): New macro for XeTeX.
+ 	(\pdfdestname): Escaped PDF destination name
+ 	is set by \setpdfdestname.
+ 	(\setpdfoutlinetext): New macro for XeTeX.
+ 	(\pdfoutlinetext): Converted and escaped outline text
+ 	is set by \setpdfoutlinetext.
+ 	(\pdfmkdest): Use \setpdfdestname.
+ 	(\dopdfoutline): Use \setpdfdestname and \setpdfoutlinetext.
+ 	(\xrefX): Use \setpdfdestname.
+ 
+ 2016-08-08  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex (\setpdfdestname): New macro for pdfTeX and LuaTeX.
+ 	(\pdfdestname): Escaped PDF destination name
+ 	is set by \setpdfdestname.
+ 	(\setpdfoutlinetext): New macro for pdfTeX and LuaTeX.
+ 	(\pdfoutlinetext): Converted and escaped outline text
+ 	is set by \setpdfoutlinetext.
+ 	(\pdfmkdest): Use \setpdfdestname.
+ 	(\dopdfoutline): Use \setpdfdestname and \setpdfoutlinetext.
+ 	(\xrefX): Use \setpdfdestname.
+ 
+ 2016-08-07  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex (\pdfescapestrutfsixteen):
+ 	Rename from \pdfescapestring for LuaTeX.
+ 	(PDFescstr): New Lua function.
+ 	(\pdfescapestring): New macro for LuaTeX.
+ 	(\txiescapepdfutfsixteen): New macro.
+ 	(\dopdfoutline): LuaTeX:
+ 	Use UTF-8 encodings instead of UTF-16 for PDF destination names.
+ 
+ 2016-08-06  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\doublecolumntopgap, \pagesofar)
+ 	(\begindoublecolumns): Remove use of \doublecolumntopgap 
+ 	dimension.
+ 	(\begindoublecolumns): Don't touch \topskip or alter \vsize 
+ 	other than doubling it.
+ 	(\balancecolumns): Use a different height for boxes when 
+ 	splitting double column material roughly in two.
+ 	* doc/texinfo-tex-test.texi (Final page of index hard to balance):
+ 	Update so that test works properly.
+ 
+ 2016-08-06  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\entry): Remove stretch added before entry 
+ 	here.
+ 	(\begindoublecolumns): Put stretch into \baselineskip, so it can
+ 	appear between the lines of a multi-line entry as well as 
+ 	between entries.  This results in more even line spacing.
+ 	(\indexwidowpenalty): Remove \unskip, because the glue it 
+ 	removed isn't there anymore.
+ 	(\balancecolumns): Use \leftskip instead of indenting lines with
+ 	\parshape (which is equivalent to using \moveright), because 
+ 	this is lost when the box is taken apart with \lastbox.
+ 	Change comment about use of \parshape.  Do not set \hangindent 
+ 	either.
+ 	(\ourunvbox): New macro to take apart a vbox with \lastbox and 
+ 	re-add the boxes to the current vertical list.
+ 	(\insertindexentrybox): Use it to add the text of the index entry
+ 	to the current vertical list.
+ 	(\entrylinedepth): Remove \dimen.
+ 
+ 2016-08-05  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex (\pdfmkdest, \dopdfoutline, \xrefX):
+ 	Change the method of destination name switching
+ 	Unicode or ASCII for pdfTeX and LuaTeX.
+ 
+ 2016-08-04  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex (\iftxiuseunicodedestname):
+ 	Add initializing for pdfTeX and LuaTeX.
+ 
+ 2016-08-04  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex (\pdfmkdest, \dopdfoutline, \xrefX):
+ 	Change the method of destination name switching
+ 	Unicode or ASCII for XeTeX.
+ 
+ 2016-08-03  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo-tex-test.texi (Test of index widow elimination):
+ 	New test.
+ 	* doc/texinfo-tex-test.WIDOWs: Add file used in test.
+ 
+ 2016-08-03  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\indexdummies): Put "{}" after use of 
+ 	\lbracechar and \rbracechar in index in order to avoid 
+ 	whitespace following a @{ or @} command in an index being lost 
+ 	when the index file is read back in.
+ 
+ 2016-08-03  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\balancecolumns) <right-hand column higher>:
+ 	Use height of right-hand column to avoid possibly overlapping
+ 	following text.
+ 	(\indexwidowpenalty): Rename from \indexwidowpenalty.
+ 	(\documentencoding): Change the spelling of a word in a message.
+ 	
+ 2016-08-03  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex (\pdfmkdest):
+ 	Fix LuaTeX PDF destination names.
+ 	LuaTeX can handle Unicode characters for destination names.
+ 	So pass through Unicode characters for LuaTeX.
+ 
+ 2016-08-03  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex (\xref):
+ 	Fix pdfTeX PDF destination names.
+ 	In order to replace Unicode characters with ASCII,
+ 	it is necessary that \edef\pdfxrefdest{#1} is
+ 	before \turnoffactive.
+ 
+ 2016-08-03  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex (\documentencoding):
+ 	Add warning for XeTeX with non-UTF-8 encodings.
+ 
+ 2016-08-03  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex (\xref):
+ 	Fix XeTeX PDF destination names when \txiuseunicodedestnamefalse.
+ 	In order to replace Unicode characters with ASCII,
+ 	it is necessary that \edef\pdfxrefdest{#1} is
+ 	before \turnoffactive.
+ 
+ 2016-08-02  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex (\urlcolor, \linkcolor, \endlink):
+ 	Fix XeTeX PDF color support
+ 	by copying from the definition for pdfTeX.
+ 
+ 2016-08-01  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (_end_line) <"misc text" commands>:
+ 	Convert @@, @} and @{ commands, so there is a way to include 
+ 	these characters in filenames.  (Previously this was done by the
+ 	Texinfo::Convert::Text module.)
+ 
+ 2016-08-01  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex
+ 	(\rgbDarkRed, \rgbBlack, \setcolor, \maincolor, \thiscolor)
+ 	(\lastcolordefs, \makefootline, \makeheadline):
+ 	Copy from the definition for pdfTeX.
+ 	(\pdfsetcolor): Add XeTeX PDF color support.
+ 
+ 2016-07-31  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\balancecolumns): Reduce height limit for 
+ 	splitting the final double-column material.  Remove glue from 
+ 	bottom of both left and right columns when comparing heights.
+ 	Compare heights of columns differently.  When not making the 
+ 	bottoms of the two columns flush, use the obtained height of the 
+ 	taller left column for the height of both columns.  (Otherwise, 
+ 	an overful column box could overlap material below.)  An example
+ 	of broken formatting due to this was reported in the AucTeX manual
+ 	by Arash Esbati.
+ 	Change some comments and edit for clarity.
+ 
+ 2016-07-31  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/Makefile.am (TXI_XLATE): Add txi-ja.tex.
+ 	(EXTRA_DIST): Add texinfo-ja.tex and short-sample-ja.tex.
+ 
+ 2016-07-31  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\printindex): Set catcode of @ to 12 instead 
+ 	of 11 so that e.g. "\@math" is not viewed all as one control 
+ 	sequence when it should begin with the control letter "\@".
+ 
+ 2016-07-30  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/refcard/txicmdcheck: Ignore @setcontentsaftertitlepage.
+ 	* doc/refcard/txivarcheck: Ignore HTMLXREF.
+ 	* doc/texinfo.texi (Customization Variables for @-Commands): Remove
+ 	@setcontentsaftertitlepage.
+ 
+ 2016-07-30  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo-tex-test.texi (Test of @synindex): Add section.
+ 
+ 2016-07-30  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	Remove --javascript-ref option, because nobody is using it.
+ 
+ 	* tp/texi2any.pl ($result_options): Remove option 
+ 	--javascript-ref.
+ 	($cmdline_options): Remove value 'JAVASCRIPT_REFS'.
+ 	* tp/Texinfo/Convert/HTML.pm
+ 	(default_javascript_lines): Remove function.
+ 	(%default_formatting_references): Remove 'javascript_lines'.
+ 	(output): Don't call default_javascript_lines.
+ 	(_file_header_informations): Don't use 'JAVASCRIPT_LINES' conf 
+ 	value.
+ 	(_default_begin_file, default_node_redirection_page): Don't 
+ 	include lines referring to a JavaScript file in the file header.
+ 	* tp/Texinfo/Common.pm (@variable_string_settables): Remove
+ 	'JAVASCRIPT_LINES'.
+ 	(@variable_other_settables): Remove 'JAVASCRIPT_REFS'.
+ 
+ 2016-07-30  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Common.pm (%block_commands, %block_item_commands)
+ 	(%item_line_commands): Remove 'ktable'.
+ 	(%command_index): Remove 'ktable'.
+ 	* tp/Texinfo/Parser.pm (module documentation part): Remove @ktable.
+ 	* tp/Texinfo/Convert/HTML.pm (%default_commands_conversion):
+ 	Remove conversion for @ktable.
+ 	(_convert_before_item_type): Add 'ktable' to a condition.
+ 	* tp/Texinfo/Convert/Plaintext.pm (%item_indent_format_length):
+ 	Remove 'ktable'.
+ 	* tp/t/22xtable.t (ktable): Remove test.
+ 
+ 	@ktable is being removed because nobody wants it anymore.
+ 
+ 2016-07-30  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* NEWS: Remove @ktable.
+ 	* doc/texinfo.texi (Command List) <@asis, @ktable>: Remove
+ 	@ktable.
+ 	(@ftable @vtable): Remove mention of @ktable.
+ 
+ 2016-07-30  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\ktable): Remove.
+ 
+ 2016-07-30  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\dosynindex): Call \requireopenindexfile so 
+ 	that we copy a working file descriptor for the index.  Remove code
+ 	that closes the file for the index getting redefined.  Fixes 
+ 	broken @synindex and @syncodeindex commands, reported by
+ 	Ralph Schleicher.
+ 
+ 2016-07-28  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex
+ 	(\pdfdest, \dopdfoutline, \pdflink, \xrefX):
+ 	Fix XeTeX PDF destination name for consistent with pdfTeX.
+ 
+ 2016-07-27  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex:
+ 	Improve some Unicode and XeTeX, LuaTeX related comments
+ 	by Werner Lemberg's suggestion.
+ 
+ 2016-07-23  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\indexdummies): Use \definedummyletter\@ 
+ 	instead of outputting "@@" as "@" in index file.
+ 	(\mylbrace, \myrbrace): Remove out-of-date comment.
+ 	(\rbracecmd, \lbracecmd, \rbraceatcmd, \lbraceatcmd):
+ 	Remove unused macros.
+ 	(\atdummies): Use \definedummyletter for \{ and \} instead of 
+ 	using \lbraceatcmd and \rbraceatcmd.
+ 	(\atdummies, \indexdummies): Use \definedummyletter for 
+ 	\(SPACE).
+ 
+ 	* doc/texinfo-tex-test.texi (Test of macros with @ in index): 
+ 	New test.
+ 
+ 2016-07-20  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex:
+ 	Add XeTeX `dvipdfmx:config' special
+ 	for avoiding PDF destination name replacement.
+ 
+ 2016-07-20  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex (\pdfdest):
+ 	Fix XeTeX PDF destination.
+ 
+ 2016-07-18  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (_parse_texi) <misc commands>: Add 
+ 	condition on call to _register_global_command.
+ 
+ 2016-07-17  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (_parse_texi) <root commands>: Initialize 
+ 	contents here, so it will always be set.
+ 	(_end_line) <root commands>: Don't set contents here.
+ 
+ 2016-07-17  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* info/indices.c (apropos_in_all_indices): Only free file buffer 
+ 	if we had to load it.  Otherwise the file buffer could still be 
+ 	referenced.  Fixes crash reported by "mtsio@cryptolab.net".
+ 	* info/nodes.c (check_loaded_file): Function split out from 
+ 	info_find_file.
+ 
+ 2016-07-16  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* dco/texinfo-tex-test.texi (Test of auxiliary files): Add test
+ 	of macro used in index entry.
+ 
+ 2016-07-16  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\macrolist, \addtomacrolist, \unmacro): Store
+ 	list of macros with "\commondummyword" instead of 
+ 	"\definedummyword", so that we remove the macro when writing an 
+ 	index sort key.  Otherwise, texindex can produce a broken sorted 
+ 	index file.  This fixes bug introduced on 2016-05-28, when the 
+ 	macros used in \commondummiesnofonts were changed.
+ 
+ 2016-07-16  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\ktable): Add to implement @ktable, following 
+ 	pattern of \ftable and \vtable.
+ 
+ 2016-07-16  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* info/dir.c (build_dir_node): Save contents of dir node.  This 
+ 	avoids a memory leak when hide-node-references=On due to 
+ 	scan_node_contents overwriting node->contents.
+ 
+ 2016-07-16  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* info/t/dir-merge.sh: New test.
+ 
+ 2016-07-14  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.texi (Command List) <@copying>: Correctly say
+ 	to end with "@end copying".  Reported by Daniel Birket.
+ 
+ 2016-07-12  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\defmacro): Remove separate code for 
+ 	recursive and non-recursive macros, because the code is 
+ 	identical now (except possibly for macros of more than 9 
+ 	arguments).
+ 
+ 2016-07-11  Brandon Invergo  <brandon@gnu.org>
+ 
+ 	* util/htmlxref.cnf (gnat_ugn_unw, gnat_ugn): Change manual name 
+ 	and location.
+ 
+ 2016-07-10  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* info/info-utils.c (forward_to_info_syntax): Avoid reading past 
+ 	end of string.  Report by Hanno Böck.
+ 
+ 2016-07-10  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* NEWS: Mention @ktable.
+ 	* doc/texinfo.texi (Command List) <@asis, @ktable>: Mention 
+ 	@ktable.
+ 	(@ftable @vtable): Change section heading to "@ftable, @vtable 
+ 	and @ktable".  Keep node name the same.  Add index entry for 
+ 	@ktable.  Mention @ktable throughout.  Delete some unnecessary 
+ 	words.
+ 
+ 2016-07-10  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Common.pm (%block_commands, %block_item_commands)
+ 	(%item_line_commands): Add 'ktable'.
+ 	(%command_index): Add 'ktable'.
+ 	* tp/Texinfo/Parser.pm (module documentation part): Mention 
+ 	@ktable and small grammar changes.
+ 	* tp/Texinfo/Convert/HTML.pm (%default_commands_conversion):
+ 	Add conversion for @ktable.
+ 	(_convert_before_item_type): Add 'ktable' to a condition.
+ 	* tp/Texinfo/Convert/Plaintext.pm (%item_indent_format_length):
+ 	Add 'ktable'.
+ 	* tp/t/22xtable.t (ktable): New test.
+ 
+ 	@ktable requested by Robert Weiner, following pattern of @vtable 
+ 	and @ftable.
+ 
+ 2016-07-09  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Convert/Texinfo.pm: Remove commented-out debugging 
+ 	statements.
+ 
+ 2016-07-09  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* NEWS, doc/texinfo.texi (Conditional Commands) <@errormsg>: 
+ 	Update to reflect fact that @-commands inside @errormsg is no 
+ 	longer supported.
+ 	* NEWS: Move a news item to the right place.
+ 
+ 2016-07-09  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (_parse_texi) <@errormsg, @U>: Don't use
+ 	Texinfo::Convert::Text::convert to get argument, because the 
+ 	dependence on Texinfo::Convert::Text is a significant 
+ 	complication.
+ 	(top level): Remove "use Texinfo::Convert::Text" directive.
+ 	(%default_valid_nestings): Don't allow anything inside @errormsg 
+ 	or @U.
+ 	(__): Remove commented-out definition of '__' sub.
+ 	(parser): Remove commented-out loop printing values.
+ 
+ 2016-07-05  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Convert/Plaintext.pm: Add "use" directive for 
+ 	Texinfo::Convert::NodeNameNormalization instead of relying on 
+ 	this module being pulled in indirectly.
+ 
+ 2016-07-05  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm: Remove comment referring to 
+ 	'raw_formats_stack'.
+ 	(_parse_texi): Add debugging statement if the condition in an 
+ 	inline command is missing.
+ 
+ 2016-06-26  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (_parse_texi, _register_global_command)
+ 	(_register_label, _enter_index_entry, _end_line)
+ 	(_parse_line_command_args, _parse_special_misc_commands): Remove 
+ 	uses of _ignore_global_commands.  Remove some commented-out 
+ 	lines of code.
+ 	(parser, simple_parser): Remove reference to 
+ 	$self->{'expanded_formats_stack'}.
+ 	(_ignore_global_commands): Removed.
+ 
+ 2016-06-26  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (_parse_texi): For raw block commands 
+ 	(like @tex) and raw inline commands (@inlinefmt), skip over the 
+ 	part of the conditional that isn't expanded, instead of parsing 
+ 	it as usual and using a stack of expanded conditionals.  Add a 
+ 	dummy argument to the parse tree for the skipped-over argument.
+ 	This will mean that there is no use for the 
+ 	_ignore_global_commands function.  This change is intended to 
+ 	make implementation of the parser module in C easier, and should 
+ 	also make the Perl module itself simpler.
+ 
+ 	(_close_current, _close_commands): Do not refer to 
+ 	$self->{'expanded_formats_stack'}.
+ 
+ 	(_ignore_global_commands): Always return 0.
+ 
+ 2016-06-25  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/t/test_utils.pl (set_converter_option_defaults): Set 
+ 	default expanded formats hash for converter even if this was 
+ 	given in the parser options.  This helps to make the parser 
+ 	options and converter options separate.
+ 
+ 	(test) If expanded formats not defined in the parser options, 
+ 	expand all of the formats except 'tex'.
+ 
+ 	* t/16raw.t,
+ 	* t/50value.t,
+ 	* t/55conditionals.t,
+ 	* t/57invalid_nestings.t,
+ 	* t/60macro.t,
+ 	* t/converters_tests.t,
+ 	* t/html_tests.t,
+ 	* t/plaintext_tests.t:
+ 	Add 'expanded_formats' configuration values where required to 
+ 	minimize changes to the results of the tests.
+ 
+ 2016-06-19  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (_end_line, _parse_texi): Remove some 
+ 	commented-out code.
+ 
+ 2016-06-19  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (_parse_texi) <@value>: Don't handle 
+ 	arrays or hashes as values any more.  These used to be used for 
+ 	string translation.
+ 
+ 2016-06-18  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo-tex-test.texi (Final page of index hard to balance):
+ 	Add section testing the problematic situation reported by Robert 
+ 	Weiner.
+ 
+ 2016-06-18  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo-tex-test.texi (Test of characters in section title):
+ 	New section testing characters in a section title.
+ 
+ 2016-06-18  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\balancecolumns): If the left column is 
+ 	longer than the page height, split the last double column 
+ 	material roughly in half.  Otherwise, a blank page could appear 
+ 	before the last page of an index.  Blank page in index reported 
+ 	by Robert Weiner.
+ 
+ 2016-06-14  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (_parse_texi) <@U>: Change the error 
+ 	message given when argument exceeds size of integer.  (This is 
+ 	for consistency with the C implementation which may have a 
+ 	different size of integer.)
+ 
+ 2016-06-14  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (_parse_texi) <closed raw block command>: 
+ 	Do not call _start_empty_line_after_command, and add an 
+ 	'empty_line_after_command' element.  This led to an inconsistent 
+ 	meaning for the 'spaces_after_command' extra value, and an 
+ 	existing extra value could be overwritten, for example for a 
+ 	@verbatim block, where the 'spaces_after_command' could be 
+ 	immediately after the '@verbatim' line, or after the entire 
+ 	block.
+ 
+ 2016-06-13  Vincent Belaïche  <vincentb1@users.sourceforge.net>
+ 
+ 	* util/texi2dvi (run_tex): Inline function listing unusual 
+ 	characters and pass through literal backslash-newline sequence 
+ 	to sed by use of single quotes.  Also, pass input file as a 
+ 	separate argument for the benefit of MSYS path conversion.
+ 
+ 2016-06-12  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (_print_tree),
+ 	* tp/Texinfo/Common.pm (print_tree): Move implementation
+ 	to Common.pm.
+ 
+ 2016-06-12  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Convert/NodeNameNormalization.pm: Remove 
+ 	commented-out code.
+ 
+ 2016-06-11  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (_end_line) <@end, @include>
+ 	<@documentencoding, @documentlanguage>: Do not call 
+ 	Texinfo::Convert::Text::convert to get the argument to the 
+ 	command.  Instead, call _trim_spaces_comment_from_content to 
+ 	find the element containing the text for the command.  Give an 
+ 	error message if there are excessive elements in the argument 
+ 	(e.g. @-commands).
+ 
+ 	This has the consequence that @@ can no longer be used to
+ 	refer to an @-sign in an @include command (similarly for "@ " 
+ 	for " ", and some other @-commands).
+ 
+ 2016-06-11  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.texi (@setfilename): Fix typo.
+ 
+ 2016-06-09  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Convert/TextContent.pm: Remove commented-out and 
+ 	disabled code.
+ 
+ 2016-06-09  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo-text-test.texi (@set and @value): Add a chapter 
+ 	for tests of @set and @value.  Add a test of a value in an index 
+ 	entry which is only defined after the index entry.
+ 
+ 2016-06-09  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* README-hacking: Remove line referring to "parsetexi" 
+ 	subdirectory.
+ 
+ 2016-06-09  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Structuring.pm (nodes_tree): Refer to
+ 	Texinfo::Common::parse_node_manual instead of
+ 	Texinfo::Parser::_parse_node_manual.
+ 	* tp/t/test_utils.pl (cmp_trimmed): Put module name "Test::Deep"
+ 	in front of function "cmp_deeply" which comes from it.
+ 
+ 2016-06-07  Gavin Smith  <gavinsmith0123@gmail.com>
+ 	
+ 	* doc/texinfo.tex (\dopdfoutline): For display string for PDF 
+ 	bookmark, check if encoding is Latin-1, and if so, call 
+ 	\passthroughcharstrue.
+ 
+ 2016-06-07  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\pdfmkdest): Call \passthroughcharsfalse in 
+ 	order to use ASCII approximations in destination names.
+ 
+ 2016-06-07  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\txiescapepdf) <\pdfescapestring not defined>:
+ 	Completely expand argument, as is done in the other case.
+ 
+ 2016-06-04  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* util/texi2dvi (run_tex): Use \ followed by newline instead of 
+ 	"\n" in replacement text of 'sed' 's' command.  Problem with 
+ 	some versions of sed reported by Vincent Belaïche.
+ 
+ 2016-06-03  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\UTFviiiLoop): Add a missing % character in 
+ 	definition of non-initial bytes in UTF-8 sequences.
+ 	(\DeclareUnicodeCharacterUTFviii): Move definition of 
+ 	\UTFviiiTwoOctets (and others) out of this macro and rename 
+ 	them.  Add more comments.
+ 
+ 2016-06-01  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* util/texi2dvi (run_tex): Only check for certain unusual 
+ 	characters in the filename, using 'sed'.  (Suggestion from 
+ 	Vincent Belaïche.)  Loop through any that occurred and change the
+ 	catcode to 12 within a TeX group.
+ 
+ 2016-05-30  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* util/texi2dvi (cd_dir): Check if argument is absolute, and if 
+ 	so, make all the path variables absolute.  Fix test of whether a 
+ 	variable is absolute or not.  Absolute path given to --build-dir 
+ 	broken reported by Daniel Gerbert.
+ 	(cd_orig): If cdd_prefix is empty, don't try to remove it.
+ 
+ 2016-05-29  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/t/test-utils.pl (@avoided_keys_tree): Don't compare 
+ 	'remaining_args' values.  This is for the XS module, which 
+ 	doesn't output them.
+ 
+ 2016-05-29  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (_parse_macro_command_line): Order of 
+ 	error messages changed.
+ 
+ 2016-05-29  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (_parse_texi) <@acronym, @abbr>: Don't
+ 	set 'explained_commands' hash or 'explanation_contents' extra 
+ 	value on elements.
+ 	* tp/Texinfo/Convert/HTML.pm (_convert_explained_command): Move 
+ 	the code for keeping track of previous acronym explanations
+ 	here.
+ 
+ 2016-05-28  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (_parse_texi) <@novalidate>,
+ 	* texi2any.pl <option processing>,
+ 	* tp/Texinfo/Structuring.pm (nodes_tree)
+ 	(associate_internal_references),
+ 	* tp/Texinfo/Common.pm (%default_parser_state_configuration): 
+ 	Use $self->{'info'}->{'novalidate'} instead of
+ 	$self->{'novalidate'}.  Delete some commented-out code.
+ 
+ 2016-05-28  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\indexnofontsvalue): New definition for a 
+ 	@value when expanded in an index entry sort key.
+ 	(\indexnofonts): Call it.
+ 	(\dummyvalue): If @value is undefined, pass through an 
+ 	unexpanded @value command to the auxiliary file.
+ 
+ 2016-05-28  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\commondummies): Move definitions of 
+ 	\definedummyword, \definedummyletter, \definedummyaccent out of 
+ 	\commondummies.  Reorder a comment to put content about control 
+ 	words next to content about \definedummyword.  Rename this macro 
+ 	\definedummies, to reduce confusion with \commondummiesnofonts.
+ 
+ 	(\commondummiesnofonts): Use different names for the parameters.
+ 	Add a comment saying what is listed here.
+ 
+ 2016-05-26  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo-tex-test.texi (Test of auxiliary files): Note 
+ 	where cross-references should definitely work.  Add section 
+ 	testing `-' and `_' in a @value.
+ 
+ 2016-05-26  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\setref): Give \value a definition to match 
+ 	those in \xrdef, \refx and \xrefX, to fix @value in 
+ 	cross-reference targets.
+ 
+ 2016-05-26  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\dummyvalue): New definition of @value for 
+ 	writing to auxiliary files.  Expand the @value at the time of 
+ 	writing, reversing change on 2016-05-07.
+ 	(\commondummies): Use \dummyvalue definition for @value.
+ 	Files using @value's in section titles broken when value was 
+ 	@set after the table of contents, reported by Paul Eggert.
+ 
+ 2016-05-24  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (_abort_empty_line): Look for a 
+ 	'spaces_after_command' empty extra value on the parent element 
+ 	as well to stop an 'empty_line_after_command' element lingering.
+ 
+ 2016-05-22  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (_parse_texi) <@definfoenclose command>: 
+ 	Don't overwrite any 'extra' values, such as 'invalid_nesting'.
+ 
+ 2016-05-22  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* NEWS: Update with news since 6.1 release.
+ 
+ 2016-05-22  Ingo Feinerer  <feinerer@logic.at>  (tiny change)
+ 
+ 	* util/texi2dvi (run_tex, make_openout_test): Use parentheses 
+ 	around "eval" command in order not to exit prematurely due to 
+ 	"set -e" with ksh under OpenBSD.
+ 
+ 2016-05-08  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (_parse_texi) <@abbr and @acronym>: Don't 
+ 	set 'normalized' values on elements.  Remove commented-out code.
+ 	(module documentation): Don't document that a list of the 
+ 	elements is kept in $self->{'explained_commands'}.  
+ 
+ 2016-05-08  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Structuring.pm (associate_internal_references): 
+ 	Avoid adding an undefined 'label' value under certain 
+ 	circumstances.
+ 
+ 2016-05-08  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (_abort_empty_line): Remove a 
+ 	'spaces_after_command' empty extra value, just as an empty
+ 	'spaces_before_argument' value is removed.  This stops an 
+ 	'empty_line_after_command' element lingering as an extra value.
+ 
+ 2016-05-07  John Collins  <jcc8@psu.edu>  (tiny change)
+ 
+ 	* doc/texinfo.tex (\typeout): New macro defined like in LaTeX for
+ 	ensuring message are identical in format as those output by
+ 	latex/pdflatex.
+ 	(\requireopenindexfile): \typeout trace Writing index file.
+ 	(\printindex) \typeout trace No file.
+ 
+ 2016-05-07  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\mylbrace, \myrbrace): Avoid use of \ecfont, 
+ 	because the user may not have it installed.  Use \lbrace and 
+ 	\rbrace from plain TeX instead.
+ 	* doc/texinfo-tex-test.texi (Test of non-alphanumeric characters):
+ 	New section.
+ 
+ 2016-05-07  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\commondummies): Define \value as a dummy.
+ 	Do not call \makevalueexpandable.
+ 	(\xrdef, \refx, \xrefX): Give \value a definition so we can get 
+ 	rid of it when making a control sequence name for a 
+ 	cross-reference target.  Comments changed.
+ 
+ 	* doc/texinfo-tex-test.texi (Test of auxiliary files): New 
+ 	section testing uses of @value in index entries and anchors.
+ 
+ 2016-05-07  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo-ja.tex (\writetocentry):
+ 	Fix XeTeX PDF link page number duplicates.
+ 	For XeTeX, change \pdfmakepagedesttrue timing to after TOC writing.
+ 
+ 2016-05-06  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo-ja.tex: New File.
+ 	Japanese texinfo.tex loader.
+ 	Some CJK packages are necessary to load before texinfo.tex.
+ 	* doc/txi-ja.tex: New File.
+ 	Japanese translations and font definitions for texinfo.tex.
+ 	* doc/short-sample-ja.tex: New File.
+ 	Short sample of Japanese Texinfo support files.
+ 
+ 2016-05-05  Vincent Belaïche  <vincentb1@users.sourceforge.net>, and
+ 	    Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* util/texi2dvi (make_tex_cmd): Remove use of 'catcode_special'
+ 	variable for filenames containing a tilde.  Do not append
+ 	"\input" to the command-line to TeX.
+ 	(run_tex): Check whether the filename contains a funny character 
+ 	like a tilde.  If so, change the TeX category codes of some 
+ 	characters within a group, and use \expandafter to input a file 
+ 	outside of the group.  Append \input to the command-line.
+ 
+ 	(option parsing): Make -~ do nothing.
+ 	(make_openout_test): Don't refer to 'catcode_special' variable.
+ 
+ 2016-05-04  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* util/texi2dvi (cd_orig, cd_dir): Use SED variable instead of 
+ 	sed directly.
+ 
+ 2016-05-03  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* util/texi2dvi (usage): Change wording of documentation of 
+ 	--mostly-clean option.
+ 	(input_file_name_decode): Remove unused 'in_dir_abs' variable.
+ 	(cd_orig): Don't use ${VAR#WORD} feature because it doesn't 
+ 	exist in some older shells.  Use sed instead.
+ 	(cd_dir): Don't use \+ feature of sed because it is said not to 
+ 	be portable.
+ 	(move_to_dest): Remove commented-out echo line.
+ 
+ 2016-05-03  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* util/texi2dvi (cd_dir): New function, to change directory
+ 	while updating variables containing paths.
+ 	(cd_orig): Reverse the changes to these variables made in cd_dir.
+ 
+ 	(run_tex_suite, make_openout_test): Use 'cd_dir' instead of 
+ 	'cd'.
+ 
+ 	(input_file_name_decode, main program loop): Don't change 
+ 	variables t2ddir, in_dir to be absolute.  This could cause 
+ 	problems passing filenames to TeX if the absolute path to the 
+ 	input file contained a space or another unusual character.  
+ 	(Problem found following report by Stephen Dawson.)
+ 
+ 	(run_tex) [--tidy]: Remove code that uses a symbolic link to the 
+ 	file being processed.  This meant that --command didn't work 
+ 	along with --tidy due to the path to the file with the inserted 
+ 	commands being overridden.  It is less necessary when absolute 
+ 	paths aren't used.  (Problem found following report by
+ 	Guo Yixuan).
+ 
+ 	(cleanup): Refer to 'clean' and 'tidy' variables instead of 
+ 	'build_mode'.  (No functional change.)
+ 	(compile): Change a comment.
+ 
+ 2016-05-01  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* util/texi2dvi (usage): Streamline help message.  Don't mention 
+ 	option '-@' (but don't touch the implementation of this option 
+ 	to avoid breaking anything).  Don't mention pdftexi2dvi or 
+ 	--dvipdf in the summary.  Don't mention --silent as a synonym 
+ 	for --quiet, and don't mention --texinfo for --command.  Move 
+ 	mention of @setfilename next to --command.  Remove mention of 
+ 	AUC-TeX.  Only mention -E for --expand, and not -e.
+ 
+ 2016-04-25  Theodore Ts'o  <tytso@mit.edu>  (tiny change)
+ 
+ 	* util/texi2dvi (make_tex_cmd): Check whether 'catcode_special' 
+ 	variable is equal to 'false' instead of 'maybe', so it doesn't 
+ 	get set to 'false' on the second round when the variable has the 
+ 	value 'true'.  Otherwise it breaks if the path to the file 
+ 	contains a tilde.
+ 	
+ 2016-04-25  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* util/texi2dvi (make_openout_test): Place double quotes around 
+ 	expansion of shell variable to be more resilient in case path to 
+ 	file contains spaces.  Problem reported by Stephen H. Dawson.
+ 
+ 2016-04-24  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (_expand_macro_body, _parse_texi):
+ 	Place 'args_index' hash as a value in the elements of
+ 	$self->{'macro'}, instead of being stored as an 'extra' value.
+ 	This change is because the 'arg_index' hash is not used outside 
+ 	of Parser.pm.
+ 
+ 2016-04-24  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (_expand_macro_arguments)
+ 	(_expand_macro_body, _end_line <insertcopying>, parse_texi):
+ 	Make $self->{'macros'} hash contain hashes which refer to the 
+ 	elements that define the macro with the 'element' key, instead 
+ 	of containing the elements themselves.  Define 'macrobody' on 
+ 	the elements of $self->{'macros'}, instead of defining it as an 
+ 	'extra' value.  This change is because the 'macrobody' is not 
+ 	used outside of Parser.pm.
+ 
+ 2016-04-14  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (_end_line),
+ 	* tp/Texinfo/Structuring.pm (number_floats): Set
+ 	$float->{'extra'}->{'float_section'} instead of
+ 	$float->{'float_section'}, where $float is a @float element.
+ 
+ 2016-04-14  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (_next_bracketed_or_word): Don't set 
+ 	parent field on created bracketed_def_content element.
+ 
+ 2016-04-14  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\scanmacro): Set catcode of @ to 0 so that 
+ 	@-commands in macro expansions aren't printed literally in an 
+ 	index, where \ is the escape character.
+ 	(\tex, \printindex): Don't set \escapechar.
+ 	Broken formatting reported by Christophe Rhodes and Norbert Preining.
+ 
+ 2016-04-09  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (_parse_node_manual): Move implementation 
+ 	of function to tp/Texinfo/Common.pm.
+ 
+ 2016-04-09  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	Reduce references to Texinfo::Parser module.
+ 
+ 	* tp/Texinfo/Parser.pm (_parse_def): Remove commented-out code.
+ 	* tp/Texinfo/Convert/HTML.pm: Refer to 
+ 	Texinfo::Common::_print_current instead of 
+ 	Texinfo::Parser::_print_current.
+ 	(command_filename, _convert_key_command) 
+ 	(_convert_indicateurl_command, _convert_ctrl_command)
+ 	(_convert_titlefont_command, _convert_style_command)
+ 	(_convert_float_command): Remove commented-out code.
+ 	* tp/Texinfo/Parser.pm (_parse_node_manual): Add a comment.
+ 
+ 	* tp/Texinfo/Convert/Converter.pm (_bug_message),
+ 	* tp/Texinfo/Convert/DocBook.pm (_convert),
+ 	* tp/Texinfo/Convert/TexinfoXML.pm (_convert):
+ 	Refer to Texinfo::Common::_print_current instead of 
+ 	Texinfo::Parser::_print_current.
+ 
+ 2016-04-09  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Common.pm (%index_names): Don't set a 'prefix' 
+ 	array on each member.
+ 	(%command_index_prefix): Replace with a new variable called 
+ 	%command_index.
+ 	(definition_category, %index_type_def): Update.
+ 
+ 	* tp/Texinfo/Parser.pm (%command_index_prefix, %command_index): Update.
+ 	(_enter_index_entry, _register_index_commands): Don't use 
+ 	$self->{'prefix_to_index_name'}.  Don't set 'index_prefix' on 
+ 	index entry record.
+ 	(_end_line) <def commands>,
+ 	(_end_line) <@item, @itemx>,
+ 	(_parse_texi) <@ifcommanddefined>,
+ 	(parser, simple_parser): Use %command_index instead of 
+ 	%command_index_prefix.
+ 	(_register_index_commmands): Don't use 'prefix' array on index 
+ 	record.  Inline into calling sites.
+ 
+ 2016-04-09  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (parse_texi_file, _parse_texi): Set 
+ 	'parent' field on created elements in the main tree.
+ 
+ 2016-04-09  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (_parse_texi) <brace commands>: Define 
+ 	'contents' for all brace commands again (changed on 2016-03-28).  
+ 	(_end_line) <@itemize, @table>: Add 'contents' for @asis and 
+ 	@bullet elements.
+ 
+ 2016-04-03  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (_parse_line_command_args) <@exampleindent>:
+ 	Don't permit trailing text after a numeric argument.
+ 
+ 2016-04-03  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm: Use "closing brace" instead of "close 
+ 	brace" in messages, and use "the beginning of a line" instead of 
+ 	"a line beginning".
+ 
+ 2016-04-03  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (_end_line) <@multitable prototypes>: Don't
+ 	set parent field for created 'bracketed_multitable_prototype' 
+ 	element.
+ 
+ 2016-04-03  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (_end_line) <@multitable prototypes>: Don't
+ 	save a 'prototypes_line' extra value for the multitable element.
+ 	* tp/Texinfo/Convert/TexinfoXML.pm (_convert) <@multitable>: 
+ 	Reconstruct the information that was in 'prototypes_line'.
+ 
+ 2016-03-29  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex (\skipspaces, \getfilename):
+ 	Copy from the definition for pdfTeX.
+ 	(\xrefX): Add XeTeX @xref PDF link support.
+ 
+ 2016-03-29  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex (\pdfmkdest, \dopdfoutline):
+ 	Add \txiescapepdf for XeTeX.
+ 
+ 2016-03-28  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (_node_extra_to_texi): Move to 
+ 	tp/Texinfo/Convert/Texinfo.pm and rename 'node_extra_to_texi'.
+ 
+ 2016-03-28  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (_abort_empty_line): Check if 
+ 	'spaces_before_argument' extra value needs to be removed from 
+ 	parent as well as from current element.
+ 
+ 2016-03-28  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (parse_texi): Always set parent on 
+ 	element of type 'empty_spaces_before_argument'.
+ 
+ 2016-03-28  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (%keep_line_nr_brace_commands): Keep line 
+ 	number for all brace commands.
+ 	(_parse_texi) <open brace separator>: Don't save line number 
+ 	here.
+ 
+ 2016-03-28  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (_parse_texi) <commands with commands as 
+ 	arguments>: Don't remove 'contents'.
+ 
+ 2016-03-28  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Parser.pm (%keep_line_nr_brace_commands): Add 
+ 	accent commands, so that the line number always recorded for 
+ 	accent commands (previously only done if the accent command took 
+ 	an argument in braces).
+ 	(_parse_texi) <brace commands>: Never define 'contents' for an 
+ 	accent command.
+ 
+ 2016-03-27  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Convert/HTML.pm: Add line
+ 	"use Texinfo::Convert::NodeNameNormalization" instead of relying 
+ 	on module being pulled in indirectly.
+ 
+ 2016-03-27  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* parsetexi, tp/parsetexi: Move subdirectory in preparation for 
+ 	integration into texi2any as an XS module.
+ 
+ 2016-03-26  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Report.pm (_subsititue, _substitute_element_array): 
+ 	New functions.
+ 	(gdt): Only pass @value's to parser if they are simple strings.
+ 	before running parser.  This will be necessary when we use the
+ 	XS parser, which we can't pass complex Perl data structures to.
+ 	Call _substitute afterwards on the resulting tree to fill in 
+ 	@value's.
+ 	* tp/Texinfo/Parser.pm (_parse_texi) <undefined @value>: Call 
+ 	_abort_empty_line as is done for the other cases.  Add a comment 
+ 	explaining when we'll get an undefined @value.
+ 	* tp/t: Update reference test results.  No empty elements ("{}") 
+ 	after value subsititutions any more.  Empty line elements before 
+ 	unknown values removed.
+ 
+ 2016-03-26  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Convert/XSParagraph/configure.ac (lookup_perl_flags):
+ 	Remove AC_DEFUN and use lookup_perl_conf instead.  Processing of
+ 	flags broken if one of them took an argument, e.g. '-arch'.  
+ 	Broken build for Darwin reported by Jack Howart.
+ 
+ 2016-03-23  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex (\internalpagesizes):
+ 	Add XeTeX PDF paper size support.
+ 
+ 2016-03-23  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex (\urefbreakfinish):
+ 	Add XeTeX \urefurlonlylinktrue support.
+ 
+ 2016-03-23  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex (\email, \doemail):
+ 	Copy from the definition for pdfTeX.
+ 	Add XeTeX @email support.
+ 
+ 2016-03-23  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex (\pdfgettoks, \pdfaddtokens, \adn, \poptoks) 
+ 	(\maketoks, \makelink, \pdflink, \done):
+ 	Copy from the definition for pdfTeX and modify for XeTeX.
+ 	Add XeTeX PDF table of contents page number link support.
+ 
+ 2016-03-22  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex (\pdfurl, \endlink):
+ 	Copy from the definition for pdfTeX and modify for XeTeX.
+ 	Add XeTeX PDF URL link support.
+ 
+ 2016-03-22  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex (\iftxiuseunicodedestname): New switch.
+ 	(\pdfmkdest, \dopdfoutline, \pdfmakeoutlines):
+ 	Add XeTeX Unicode PDF destination name support.
+ 
+ 2016-03-21  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\scanexp): Simply call \scanmacro instead of 
+ 	expanding argument with \edef.
+ 	(\Efloat) <xref label for @float>: Don't call \scanexp.  Remove 
+ 	a comment.  Change some tabs to spaces.
+ 	* doc/test-texinfo-tex-texi.tex (Copying and captions): New 
+ 	section testing @float and @copying.
+ 
+ 	Broken Unicode character in @copying reported by Masamichi 
+ 	Hosoda.
+ 
+ 2016-03-21  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex: Combine sections with XeTeX support.
+ 
+ 2016-03-21  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex (\ifxeteximgpdf): Remove.
+ 	(\doxeteximage): Improve XeTeX @image support.
+ 
+ 2016-03-21  Thomas Klausner  <tk@giga.or.at> (tiny change)
+ 
+ 	*  tp/Texinfo/Convert/XSParagraph/xspara.c (xspara_add_text):
+ 	Do not call text_append_n with (size_t)-1.  Fix typos.
+ 
+ 2016-03-20  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex (\ifpassthroughchars):
+ 	Remove duplicated definition.
+ 
+ 2016-03-07  Karl Berry  <karl@freefriends.org>
+ 
+ 	* util/texi2dvi (version): add +dev, since the release has happened.
+ 
+ 2016-03-06  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	Control expansion of non-ASCII bytes with a conditional.
+ 
+ 	* doc/texinfo.tex (\gdefchar): New macro.  If 
+ 	\ifpassthroughchars, output a token with catcode "other" for 
+ 	each byte instead of expanding into the TeX code to display the 
+ 	character.
+ 	(\latonechardefs, \lattwochardefs): Use \gdefchar instead of 
+ 	\gdef.
+ 	(definitions for bytes in UTF-8 sequences): Check value of 
+ 	\ifpassthroughchars, and if true, output a token with catcode 
+ 	"other".  Give definitions for bytes that could appear after the 
+ 	first in a UTF-8 sequence.  Use \gdef instead of \xdef when 
+ 	using \UTFviiLoop.  Add some comments.
+ 
+ 	(\passthroughcharacters): Remove macro, and replace uses of it 
+ 	with "\passthroughcharstrue".
+ 	(\nonasciistringdefs): Remove.
+ 
+ 	(\setcharscatcodeothernonglobal): Remove.
+ 	(\nativeunicodecharscatcodeothernonglobal): Remove.
+ 	(\scanctxt): Replace use of \setcharscatcodeothernonglobal with 
+ 	\passthroughcharstrue.
+ 	(\setupdatafile): Don't call \setcharscatcodeothernonglobal.  
+ 	(The existing call appeared not to do anything because it took 
+ 	place within a group.)
+ 
+ 2016-03-05  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo-tex-test.texi: Add example with a closing brace 
+ 	following an empty macro argument.  Update remark about what is 
+ 	expected for space trimming from macro arguments.
+ 
+ 2016-03-05  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\defmacro): Don't attempt to strip spaces at 
+ 	the start of the argument to a macro taking only one argument.  
+ 	This could lead to an error ("Argument of @gobblespaces has an 
+ 	extra }") for an empty argmuent.  Reported by Norbert Preining 
+ 	for ESS manual.
+ 	(\gobblespaces): Removed.
+ 	(\parsemargdef, \scanmacro, \defmacro): Put "\xeatspaces" in 
+ 	body of macro, instead of "\processmacroarg".  For 
+ 	single-argument macros, make it disappear instead of letting it 
+ 	equal to \eatspaces.
+ 
+ 2016-03-04  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* info/infokey.c (compile): Check if key sequence was defined as 
+ 	"invalid" in infokey file, and if so, record it by saving a 
+ 	pointer to a null InfoCommand structure.  Broken handling of 
+ 	"invalid" reported by Ken Brown.
+ 
+ 2016-03-04  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* util/dir-example,
+ 	* install-info/install-info.c (ensure_dirfile_exists): Update 
+ 	message in dir node.
+ 
+ 2015-03-04  Ken Brown  <kbrown@cornell.edu>
+ 
+ 	* info/dir.c (build_dir_node): Update message in dir node to 
+ 	account for change in binding for '?' key, and use 'H' instead.
+ 
+ 2016-02-27  Vincent Belaïche  <vincentb1@users.sourceforge.net>
+ 
+ 	* util/texi2dvi (make_openout_test): make compilation of openout
+ 	test in batch mode with using batch variable, rather than taking
+ 	input from /dev/null, so that there is no clash with --batch
+ 	command line option.
+ 
+ 2016-02-27  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/tests/long-tests.sh,
+ 	* tp/tests/tex_html_tests.sh,
+ 	* tp/tests/parser_base_tests: Remove unused scripts for running 
+ 	tests.
+ 
+ 2016-02-27  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* po/Makevars, po_document/Makevars (DIST_DEPENDS_ON_UPDATE_PO): Set
+ 	to "no" to prevent "make distcheck" or "make dist" dirtying the
+ 	output of "svn diff".
+ 
+ 2016-02-27  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/tests/htmlxref/Makefile.am,
+ 	* tp/tests/htmlxref-only_mono/Makefile.am,
+ 	* tp/tests/htmlxref-only_split/Makefile.am: Remove unused rules.  
+ 	Don't use Makefile.onetst (no longer created) to say what to 
+ 	distribute.
+ 
+ 2016-02-27  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Common.pm (@variable_string_settables): New 
+ 	customization variable HTMLXREF.
+ 	* tp/texi2any.pl: If HTMLXREF given on the command line, use it 
+ 	as the location of the htmlxref.cnf file.
+ 	* tp/Texinfo/Common.pm (parse_htmlxref_files): Move function to 
+ 	tp/Texinfo/Convert/HTML.pm.
+ 
+ 	* tp/tests/htmlxref/tests-parser.txt,
+ 	* tp/tests/htmlxref-only_mono/tests-parser.txt,
+ 	* tp/tests/htmlxref-only_split/tests-parser.txt:
+ 	Set HTMLXREF customization variable.
+ 
+ 	* tp/tests/htmlxref/Makefile.am:
+ 	tp/tests/Makefile.am: Don't build in htmlxref, htmlxref-only_mono,
+ 	htmlxref-only_split directories using a recursive make.  Run the 
+ 	tests in those directories the same way that all of the others 
+ 	are, except many_input_files.
+ 
+ 	* tp/tests/README: Remove section on subdirectories.
+ 
+ 2016-02-27  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* info/info-utils.c (info_get_menu_entry_by_label): Always check 
+ 	case-insensitively, so that manpages are not preferred to a 
+ 	case-insensitive dir match when invoking.  Problem reported by 
+ 	Vincent Lefevre.
+ 
+ 2016-02-24  Vincent Belaïche  <vincentb1@users.sourceforge.net>
+ 
+ 	* util/texi2dvi (filter_files): Ensure that this function does not
+ 	make any non zero return status when the list of new xref files is
+ 	empty. Otherwise that causes a prematurate exit of calling
+ 	function, notably run_index. Remember texi2dvi is running under
+ 	set -e regime.
+ 
+ 2016-02-22  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex: Fix PDF outline cmap for XeTeX.
+ 
+ 2016-02-21  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/tests/contents/tests-parser.txt: Remove tests
+ 	'double_contents_setcontentsaftertitlepage',
+ 	'double_contents_setcontentsaftertitlepage_inline',
+ 	'double_contents_setcontentsaftertitlepage_book',
+ 	'double_contents_setcontentsaftertitlepage_book_chapter', and
+ 	'double_contents_setcontentsaftertitlepage_book_info'.
+ 
+ 2016-02-21  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/t/test_utils.pl (test): When using an out_ directory (like 
+ 	out_info or out_html), delete its contents to prevent test 
+ 	failures from left-over files.
+ 
+ 2016-02-21  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Common.pm (%misc_commands): Move 
+ 	'setcontentsaftertitlepage' and 'setshortcontentsaftertitlepage'
+ 	to obsolete section.
+ 	(%deprecated_commands): Add these two commands.
+ 
+ 	* tp/Texinfo/Common.pm (%document_settable_unique_at_commands): 
+ 	Remove these two commands.
+ 	* tp/Texinfo/Convert/Converter.pm (converter): Remove handling 
+ 	of these two commands.
+ 
+ 	* tp/Texinfo/Convert/HTML.pm (@informative_global_commands): 
+ 	Remove these two commands.
+ 	* tp/Texinfo/Convert/Plaintext.pm (@informative_global_commands):
+ 	Remove these two commands.
+ 	(_convert) <sectioning commands, @contents, @shortcontents>:
+ 	Remove handling of these two commands.
+ 	(_prepare_special_element, _prepare_contents_elements)
+ 	(_convert_informative_command): Remove handling of these two 
+ 	commands.
+ 	(_contents_short_contents_in_title): Removed.
+ 
+ 	* tp/t/30sectioning.t (setcontentsaftertitlepage)
+ 	(setshortcontentsaftertitlepage): Remove tests.
+ 	(section_in_unnumbered_plaintext, section_in_unnumbered_info): Remove
+ 	use of @setcontentsaftertitlepage in tests.
+ 
+ 2016-02-20  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\setchapterstyle): Remove implementation.  
+ 	(Obsolete since at least 3.8 release, September 1996).
+ 
+ 2016-02-20  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\setcontentsaftertitlepage)
+ 	(\setshortcontentsaftertitlepage): Replace definitions with a 
+ 	message saying that these aren't Texinfo commands any more.
+ 	(\Etitlepage): Remove handling of @setcontentsaftertitlepage.
+ 	and @setshortcontentsaftertitlepage.
+ 	(Karl Berry, bug-texinfo 2016-02-03).
+ 
+ 	* doc/texinfo.texi (@-Command Details, Obsolete @-Commands): New 
+ 	section node of appendix.
+ 	(Obsolete @-Commands): Add @setcontentsaftertitlepage and
+ 	@setshortcontentsaftertitlepage.
+ 	(Command List): Remove the same.
+ 	(Contents): Move information about @setcontentsaftertitlepage 
+ 	and @setshortcontentsaftertitlepage to appendix.
+ 
+ 	NB not done in texi2any yet.
+ 
+ 2016-02-20  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* info/info.c (get_initial_file): Handle --file option here 
+ 	instead of in 'main', as well as handling invocation as "info 
+ 	'(FILE)NODE'", and the full path to FILE as the "initial file".  Use 
+ 	"dir" as the last resort for the initial file.  Don't add a node to the 
+ 	list of nodes to load.
+ 	(add_initial_nodes): Add "Top" node to list of nodes to load if no 
+ 	others are given.  Remove error message for initial_file undefined.
+ 	(main): Handle --where option separately for --all given and not given.
+ 	* info/session.c (info_follow_menus): Free initial node if following 
+ 	menus strictly and a menu entry is dangling.
+ 	* info/t/node-no-file.sh: Change expected error message.
+ 
+ 	This is so that "info --output -" outputs the dir node, as used to 
+ 	happen.  Vincent Lefevre reported that it doesn't happen for
+ 	Texinfo 6.1.
+ 
+ 2016-02-15  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\setchapterstyle, \headings, \setchapternewpage)
+ 	(\everyheadingmarks, \everyfootingmarks): Define with 
+ 	\parseargdef to read argument on the line instead of delimiting 
+ 	the argument with a space.  This is necessary in case newlines 
+ 	are active, which is the case at the very start of the file due 
+ 	to the definitions in \enablebackslashhack.  Broken 
+ 	@setchapternewpage reported by Norbert Preining.
+ 	(\enablebackslashhack): Turn off special meanings after two 
+ 	active newlines instead of after three, and add comments to 
+ 	explain what is going on.
+ 
+ 2016-02-15  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex: Add LuaTeX PDF outline Unicode strings 
+ 	support.
+ 	(UTF16oct): New Lua function.
+ 	(\pdfescapestring): New macro.
+ 	(\dopdfoutline): Add Unicode support for LuaTeX.
+ 
+ 2016-02-15  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex: Add LuaTeX >= 0.85 support.
+ 	(\txipagewidth): Rename from \pagewidth.
+ 	(\txipageheight): Rename from \pageheight.
+ 	(\pdfdest, \pdfoutput, \pdfliteral, \pdfcatalog, \pdftexversion)
+ 	(\pdfximage, \pdfrefximage, \pdflastximage, \pdfendlink, \pdfoutline)
+ 	(\pdfstartlink, \pdffontattr, \pdfobj, \pdflastobj)
+ 	(\pdfpagewidth, \pdfpageheight, \pdfhorigin, \pdfvorigin): 
+ 	Definitions for LuaTeX.
+ 
+ 2016-02-15  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex: Fix PDF outline cmap for XeTeX.
+ 
+ 2016-02-14  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Convert/TexinfoXML.pm (output): Add a comment.
+ 
+ 2016-02-14  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.texi (Tips): Add missing word "to".
+ 
+ 2016-02-14  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/Structuring.pm (split_by_node): Add a comment.
+ 	* tp/Texinfo/Convert/HTML.pm (_prepare_elements, output)
+ 	(_convert_contents, _protect_space, _convert)
+ 	(_convert_element_type): Add some comments and blank lines in 
+ 	source.  Remove some commented-out lines of code.  Add some 
+ 	capital letters in comments.
+ 	(%ignored_types): Remove commented-out variable.
+ 	(%default_types_conversion): Add a comment.
+ 
+ 2016-02-13  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* info/session.c (dump_nodes_to_file): Argument changed from 
+ 	flags argument to a simple Boolean to say whether to dump 
+ 	subnodes.
+ 	* info/session.h (DUMP_SUBNODES): Remove definition.
+ 
+ 2016-02-13  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* info/nodes.h, info/echo-area.h, info/filesys.h, info/window.h,
+ 	info/indices.h, info/info-utils.h, info/search.h, info/session.h,
+ 	info/variables.h: Remove unnecessary "extern" modifier for 
+ 	function declarations.
+ 	
+ 	* info/window.h: Remove declaration of removed function 
+ 	'process_node_text'.
+ 
+ 2016-02-13  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* info/window.c (calculate_line_starts): Only look in first line 
+ 	of node for Info keywords.
+ 
+ 2016-02-13  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* info/info-utils.c (nodeline_print): Move to info/window.c.
+ 	(parse_top_node_line): Remove code altering start of node 
+ 	depending on value of nodeline_print.
+ 	* info/window.c (calculate_line_starts): Use nodeline variable 
+ 	to decide where to start displaying the node.
+ 	(window_line_of_point): Comments changed.
+ 
+ 2016-02-13  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* info/nodes.c (info_node_of_tag_ext): Don't save a pointer into 
+ 	the file buffer in the tag table, because it could continue 
+ 	after the file buffer was garbage collected.  Change the logic 
+ 	around so that the NODE field of the TAG structure is 
+ 	initialized from the NODE object we return, instead of vice versa.
+ 	* info/nodes.h (FILE_BUFFER, TAG): Comments changed.
+ 	* info/t/search-split-after-index.sh: New test.
+ 
+ 2016-02-13  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.texi (Customization Variables and Options): Move 
+ 	@vindex commands after @item, so that the index entries refer to 
+ 	the right row of the @multitable.
+ 
+ 2016-02-13  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	Implement --javascript-ref option, suggested by Per Bothner.
+ 
+ 	* tp/texi2any.pl ($result_options): New option --javascript-ref.
+ 	($cmdline_options): New value 'JAVASCRIPT_REFS'.
+ 	* tp/Texinfo/Convert/HTML.pm
+ 	(default_javascript_lines): New function.
+ 	(%default_formatting_references): Add 'javascript_lines', and 
+ 	comment changed.
+ 	(output): Call default_javascript_lines (indirectly).
+ 	(_file_header_informations): Look at and return 
+ 	'JAVASCRIPT_LINES' conf value.  Callers updated.
+ 	(_default_begin_file, default_node_redirection_page): Include 
+ 	lines referring to a JavaScript file in the file header.
+ 	* tp/Texinfo/Common.pm (@variable_string_settables): Add 
+ 	'JAVASCRIPT_LINES'.
+ 	(@variable_other_settables): Add 'JAVASCRIPT_REFS'.
+ 
+ 2016-02-09  Karl Berry  <karl@freefriends.org>
+ 
+ 	* doc/texinfo.texi (Output Formats) <XML>: explicitly mention that
+ 	web browsers cannot display our XML output, but just give an error.
+ 
+ 2016-02-09  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+         * doc/texinfo.tex: Fix XeTeX PDF outline support.
+         (\dopdfoutline): Add braces.
+ 
+ 2016-02-08  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex:
+ 	Native Unicode replace switching instead of re-definition.
+ 
+ 	(\ifpassthroughchars): New switch.
+ 	(\DeclareUnicodeCharacterNative):
+ 	Integrate \DeclareUnicodeCharacterNativeThru.
+ 	Add capable to switch replace / pass-through characters.
+ 	(\DeclareUnicodeCharacterNativeThru): Remove.
+ 	(\nativeunicodechardefsthru): Remove.
+ 	(\passthroughcharacters):
+ 	Use switch instead of \nativeunicodechardefsthru.
+ 
+ 2016-02-08  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex:
+ 	Improve XeTeX PDF outline support.
+ 	(\pdfmkdest): Add \indexnofonts and \makevalueexpandable.
+ 	(\dopdfoutline): Add \turnoffactive.
+ 	(\pdfmakeoutlines): Add some comments. Use \let instead of \def.
+ 
+ 2016-02-07  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+ 	* doc/texinfo.tex (\unicodechardefs): Comment out end of lines 
+ 	to prevent extra space at the start of the page when native 
+ 	Unicode support is used.
+ 
+ 2016-02-07  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+         * doc/texinfo.tex:
+ 	Add PDF outline support for XeTeX.
+ 	(\pdfdest): set destination.
+ 	(\pdfmkdest): set destination.
+ 	(\dopdfoutline): make outline element.
+ 	(\pdfmakeoutlines): make PDF outline.
+ 
+ 2016-02-07  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* doc/texinfo.tex (\throughcharactersdefs): Rename to 
+ 	\passthroughcharacters, and change comment.
+ 	(\nonasciistringdefs): Change comment.
+ 	(\documentencoding) <UTF-8>: Change comment.
+ 	(\DeclareUnicodeCharacterUTFviii): Change comment.
+ 	(\nativeunicodechardefsthru, \DeclareUnicodeCharacterNativeThru):
+ 	Change comment, and move definition.
+ 	(\DeclareUnicodeCharacterNativeAtU): Change comment, and move 
+ 	definition.
+ 	(\setcharscatcodeothernonglobal): Comment changed.
+ 	(\DeclareUnicodeCharacterNative): Move definition.
+ 
+ 2016-02-07  Masamichi Hosoda  <trueroad@trueroad.jp>
+ 
+         * doc/texinfo.tex:
+ 	Add native Unicode support for XeTeX and LuaTex.
+ 
+ 	(\iftxinativeunicodecapable): New switch.
+ 	(\iftxiusebytewiseio): New switch.
+ 
+         (\setbytewiseio): Set I/O by bytes instead of UTF-8 sequence
+ 	for XeTeX and LuaTex non-UTF-8 (byte-wise) encodings.
+ 
+ 	(\documentencoding): Remove input by bytes settings for XeTeX.
+ 	Add I/O by bytes settings for single-byte encodings.
+ 	Add native Unicode settings for UTF-8 encoding.
+ 
+ 	(\U): Any Unicode characters can be used by native Unicode.
+ 
+ 	(\DeclareUnicodeCharacterUTFviii): Rename from
+ 	\DeclareUnicodeCharacter.
+ 	(\DeclareUnicodeCharacterNative): For native Unicode,
+ 	Definition macro to replace the Unicode character.
+ 	(\DeclareUnicodeCharacterNativeThru): For native Unicode,
+ 	Definition macro not to replace (through) the Unicode character.
+ 	(\DeclareUnicodeCharacterNativeAtU): For native Unicode,
+ 	Definition macro that is used by @U command.
+ 	(\DeclareUnicodeCharacterNativeOther): For native Unicode,
+ 	Definition macro that is set catcode other non global.
+ 
+ 	(\unicodechardefs): Rename from \utfeightchardefs.
+ 	(\utfeightchardefs): UTF-8 byte sequence definitions (replacing and
+ 	@U command). It makes the setting that replace UTF-8 byte sequence.
+ 	(\nativeunicodechardefs): Native Unicode character replacing
+ 	definitions. It makes the setting that replace the Unicode characters.
+ 	(\nativeunicodechardefsthru): Native Unicode character ``through''
+ 	definitions. It makes the setting that does not replace
+ 	the Unicode characters.
+ 	(\nativeunicodechardefsatu): Native Unicode @U command definitions.
+ 	(\nativeunicodecharscatcodeothernonglobal):
+ 	Native Unicode catcode other non global definitions.
+ 	(\setcharscatcodeothernonglobal):
+ 	Catcode (non-ascii or native Unicode) are set to other non global.
+ 
+ 	(\throughcharactersdefs): Character ``through'' definitions.
+ 	It makes the setting that does not replace the characters.
+ 
+ 2016-02-06  Gavin Smith  <gavinsmith0123@gmail.com>
+ 
+ 	* configure.ac: Update version to 6.1dev.
+ 
+ 2016-02-06  Eli Zaretskii  <eliz@gnu.org>
+ 
+ 	* tp/Texinfo/Convert/XSParagraph/xspara.c (popen, pclose)
+ 	[_WIN32]: Redefine to their non-Posix counterparts _popen and
+ 	_pclose, to countermand Perl redirections in XSUB.h.
+ 
  2016-02-06  Gavin Smith  <gavinsmith0123@gmail.com>
  
diff -Nrc2 texinfo-6.1/Makefile.in texinfo-6.3/Makefile.in
*** texinfo-6.1/Makefile.in	2016-02-06 12:24:03.000000000 +0000
--- texinfo-6.3/Makefile.in	2016-09-10 20:29:55.000000000 +0100
***************
*** 135,138 ****
--- 135,139 ----
  	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
  	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+ 	$(top_srcdir)/gnulib/m4/hard-locale.m4 \
  	$(top_srcdir)/gnulib/m4/iconv.m4 \
  	$(top_srcdir)/gnulib/m4/include_next.m4 \
***************
*** 294,299 ****
  	build-aux/compile build-aux/config.guess \
  	build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
! 	build-aux/install-sh build-aux/ltmain.sh build-aux/mdate-sh \
! 	build-aux/missing build-aux/texinfo.tex
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  distdir = $(PACKAGE)-$(VERSION)
--- 295,300 ----
  	build-aux/compile build-aux/config.guess \
  	build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
! 	build-aux/install-sh build-aux/mdate-sh build-aux/missing \
! 	build-aux/texinfo.tex
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  distdir = $(PACKAGE)-$(VERSION)
diff -Nrc2 texinfo-6.1/NEWS texinfo-6.3/NEWS
*** texinfo-6.1/NEWS	2016-02-06 12:21:52.000000000 +0000
--- texinfo-6.3/NEWS	2016-09-10 20:24:56.000000000 +0100
***************
*** 1,3 ****
! $Id: NEWS 6991 2016-02-06 12:16:13Z gavin $
  This NEWS file records noteworthy changes, very tersely.
  See the manual for detailed information.
--- 1,3 ----
! $Id: NEWS 7353 2016-09-10 13:03:54Z gavin $
  This NEWS file records noteworthy changes, very tersely.
  See the manual for detailed information.
***************
*** 12,15 ****
--- 12,55 ----
  
  -------------------------------------------------------------------------------
+ 6.3 (10 September 2016)
+ 
+ * Language:
+   . The commands `@setcontentsaftertitlepage' and
+     `@setshortcontentsaftertitlepage' have been removed.
+   . @-commands are no longer supported within `@errormsg'.
+ 
+ * texinfo.tex:
+   . For a couple of characters (opening and closing braces), use glyphs
+     from the standard TeX math fonts instead of using EC fonts which are 
+     less likely to be installed.
+   . Use of user-defined macros in the text of an index entry is more
+     reliable when the text contains Texinfo @-commands.
+   . @synindex and @syncodeindex have been fixed (broken in the last
+     release).
+   . Support added for native UTF-8 support with XeTeX and LuaTeX.
+   . Support of PDF output with XeTeX improved.
+   . You can use a new file doc/texinfo-ja.tex for Texinfo documents in
+     Japanese.  doc/short-sample-ja.tex is a sample document.  New 
+     support file doc/txi-ja.tex for Japanese.
+ 
+ * texi2any:
+   . Fix handling of compiler options when building Perl extension modules.
+ 
+ * texi2dvi:
+   . Can now process files whose absolute paths contain space characters,
+     as long a relative path to the file is given.  Better support of 
+     files with unusual characters in their names.
+   . No longer exits prematurely in some circumstances (due to the script
+     running under "set -e").
+   . Bug fixed which made the `--command' and `--tidy' options
+     incompatible.
+ 
+ * info:
+   . Handling of "invalid" value in infokey file fixed.
+ 
+ 6.2 (withdrawn)
+ 
+ 
+ 
  6.1 (06 February 2016)
  
diff -Nrc2 texinfo-6.1/Pod-Simple-Texinfo/Makefile.in texinfo-6.3/Pod-Simple-Texinfo/Makefile.in
*** texinfo-6.1/Pod-Simple-Texinfo/Makefile.in	2016-02-06 12:24:04.000000000 +0000
--- texinfo-6.3/Pod-Simple-Texinfo/Makefile.in	2016-09-10 20:29:55.000000000 +0100
***************
*** 123,126 ****
--- 123,127 ----
  	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
  	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+ 	$(top_srcdir)/gnulib/m4/hard-locale.m4 \
  	$(top_srcdir)/gnulib/m4/iconv.m4 \
  	$(top_srcdir)/gnulib/m4/include_next.m4 \
diff -Nrc2 texinfo-6.1/README-hacking texinfo-6.3/README-hacking
*** texinfo-6.1/README-hacking	2016-02-06 10:58:49.000000000 +0000
--- texinfo-6.3/README-hacking	2016-09-10 15:54:31.000000000 +0100
***************
*** 1,3 ****
! $Id: README-hacking 6990 2016-02-06 10:53:11Z gavin $
  This file describes the development environment for Texinfo.
  
--- 1,3 ----
! $Id: README-hacking 7355 2016-09-10 14:46:01Z gavin $
  This file describes the development environment for Texinfo.
  
***************
*** 87,91 ****
  makeinfo/  - Implementation of makeinfo in C, distributed before version 5.0
  texi2html/ - Perl program to generate HTML from Texinfo, superseded by texi2any
- parsetexi/ - Incomplete reimplementation of Texinfo::Parser in C
  
  
--- 87,90 ----
***************
*** 152,155 ****
--- 151,157 ----
  Ensure texinfo.tex, texi2dvi, and htmlxref.cnf are updated on ftp.gnu.org.
  Ensure TXI_XLATE in doc/Makefile.am matches actual file list.
+ Check that LINGUAS under po and po_document match actual file list.
+ Have a look at the output of "svn status ." to check for files that
+   should be tracked in SVN or ignored.
  Check that TEXINFO_DTD_VERSION has been updated to the next version in
    configure.ac if the DTD has been modified since the last release.
***************
*** 158,170 ****
  Check "dist-xz" is in the option list in configure.ac (often removed
  for speed when testing).
  make po-check             # update po/POTFILES.in as needed
! gnulib-tool --add-import  # for pretest
  util/srclist-txi          # for pretest, to sync files with other sources
  
  - Official releases only:
- version number in texi2dvi, texi2pdf, txirefcard.tex.
  version and date in NEWS.
  (cd tp && ./maintain/change_perl_modules_version.sh auto)
    -- this updates all the version numbers in the Perl modules
  sync texi2html/test/ results with tp/.
  
--- 160,183 ----
  Check "dist-xz" is in the option list in configure.ac (often removed
  for speed when testing).
+ Update copyright years in many files for release; best to grep -r for
+   the previous year.  See also ChangeLog entries for "copyright years".
+   No need (though it's ok) to change every source file at once, just the
+   ones relevant to --version calls, etc., such as texindex.awk and info.c.
  make po-check             # update po/POTFILES.in as needed
! 
! # Under the top level, and also under tp/Texinfo/Convert/XSParagraph, which
! # uses a separate gnulib import.
! gnulib-tool --add-import
! 
  util/srclist-txi          # for pretest, to sync files with other sources
  
  - Official releases only:
  version and date in NEWS.
+ version number in texi2dvi, texi2pdf, txirefcard.tex.
  (cd tp && ./maintain/change_perl_modules_version.sh auto)
    -- this updates all the version numbers in the Perl modules
+ version number in
+   tp/Texinfo/Convert/XSParagraph/configure.ac, and
+   tp/Texinfo/Convert/XSParagraph/TestXS.pm
  sync texi2html/test/ results with tp/.
  
***************
*** 182,185 ****
--- 195,200 ----
      followed by copying updated translation files to po/ and po_document/.
  pod2man Pod-Simple-Texinfo/pod2texi.pl >man/pod2texi.1 # until we fix deps
+ 
+ check that the svn checkout is up-to-date (run "svnversion" and "svn update")
  make
  make update-po            # both po and po_document needed, build a dist first
***************
*** 252,257 ****
  #  Official releases only: ... update texinfo at tug.org
  #  (contact root@tug.org):
! prev=5.2
! ver=6.0
  cd ~ftp/tex
  rm -rf texinfo-$prev*
--- 267,272 ----
  #  Official releases only: ... update texinfo at tug.org
  #  (contact root@tug.org):
! prev=6.0
! ver=6.1
  cd ~ftp/tex
  rm -rf texinfo-$prev*
diff -Nrc2 texinfo-6.1/aclocal.m4 texinfo-6.3/aclocal.m4
*** texinfo-6.1/aclocal.m4	2016-02-06 12:24:01.000000000 +0000
--- texinfo-6.3/aclocal.m4	2016-09-10 20:29:52.000000000 +0100
***************
*** 1231,1234 ****
--- 1231,1235 ----
  m4_include([gnulib/m4/gnulib-common.m4])
  m4_include([gnulib/m4/gnulib-comp.m4])
+ m4_include([gnulib/m4/hard-locale.m4])
  m4_include([gnulib/m4/iconv.m4])
  m4_include([gnulib/m4/include_next.m4])
diff -Nrc2 texinfo-6.1/build-aux/config.rpath texinfo-6.3/build-aux/config.rpath
*** texinfo-6.1/build-aux/config.rpath	2015-12-15 19:15:24.000000000 +0000
--- texinfo-6.3/build-aux/config.rpath	2016-07-30 20:33:16.000000000 +0100
***************
*** 3,7 ****
  # run time search path of shared libraries in an executable.
  #
! #   Copyright 1996-2015 Free Software Foundation, Inc.
  #   Taken from GNU libtool, 2001
  #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
--- 3,7 ----
  # run time search path of shared libraries in an executable.
  #
! #   Copyright 1996-2016 Free Software Foundation, Inc.
  #   Taken from GNU libtool, 2001
  #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
diff -Nrc2 texinfo-6.1/build-aux/ltmain.sh texinfo-6.3/build-aux/ltmain.sh
*** texinfo-6.1/build-aux/ltmain.sh	2013-10-21 04:21:12.000000000 +0100
--- texinfo-6.3/build-aux/ltmain.sh	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,9655 ****
- 
- # libtool (GNU libtool) 2.4.2
- # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
- 
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
- # 2007, 2008, 2009, 2010, 2011 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.
- 
- # GNU Libtool 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 2 of the License, or
- # (at your option) any later version.
- #
- # As a special exception to the GNU General Public License,
- # if you distribute this file as part of a program or library that
- # is built using GNU Libtool, you may include this file under the
- # same distribution terms that you use for the rest of that program.
- #
- # GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
- # can be downloaded from http://www.gnu.org/licenses/gpl.html,
- # or obtained by writing to the Free Software Foundation, Inc.,
- # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- 
- # Usage: $progname [OPTION]... [MODE-ARG]...
- #
- # Provide generalized library-building support services.
- #
- #       --config             show all configuration variables
- #       --debug              enable verbose shell tracing
- #   -n, --dry-run            display commands without modifying any files
- #       --features           display basic configuration information and exit
- #       --mode=MODE          use operation mode MODE
- #       --preserve-dup-deps  don't remove duplicate dependency libraries
- #       --quiet, --silent    don't print informational messages
- #       --no-quiet, --no-silent
- #                            print informational messages (default)
- #       --no-warn            don't display warning messages
- #       --tag=TAG            use configuration variables from tag TAG
- #   -v, --verbose            print more informational messages than default
- #       --no-verbose         don't print the extra informational messages
- #       --version            print version information
- #   -h, --help, --help-all   print short, long, or detailed help message
- #
- # MODE must be one of the following:
- #
- #         clean              remove files from the build directory
- #         compile            compile a source file into a libtool object
- #         execute            automatically set library path, then run a program
- #         finish             complete the installation of libtool libraries
- #         install            install libraries or executables
- #         link               create a library or an executable
- #         uninstall          remove libraries from an installed directory
- #
- # MODE-ARGS vary depending on the MODE.  When passed as first option,
- # `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
- # Try `$progname --help --mode=MODE' for a more detailed description of MODE.
- #
- # When reporting a bug, please describe a test case to reproduce it and
- # include the following information:
- #
- #         host-triplet:	$host
- #         shell:		$SHELL
- #         compiler:		$LTCC
- #         compiler flags:		$LTCFLAGS
- #         linker:		$LD (gnu? $with_gnu_ld)
- #         $progname:	(GNU libtool) 2.4.2
- #         automake:	$automake_version
- #         autoconf:	$autoconf_version
- #
- # Report bugs to <bug-libtool@gnu.org>.
- # GNU libtool home page: <http://www.gnu.org/software/libtool/>.
- # General help using GNU software: <http://www.gnu.org/gethelp/>.
- 
- PROGRAM=libtool
- PACKAGE=libtool
- VERSION=2.4.2
- TIMESTAMP=""
- package_revision=1.3337
- 
- # Be Bourne compatible
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-   NULLCMD=:
-   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-   # is contrary to our usage.  Disable this feature.
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
- else
-   case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
- fi
- BIN_SH=xpg4; export BIN_SH # for Tru64
- DUALCASE=1; export DUALCASE # for MKS sh
- 
- # A function that is used when there is no print builtin or printf.
- func_fallback_echo ()
- {
-   eval 'cat <<_LTECHO_EOF
- $1
- _LTECHO_EOF'
- }
- 
- # NLS nuisances: We save the old values to restore during execute mode.
- lt_user_locale=
- lt_safe_locale=
- for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
- do
-   eval "if test \"\${$lt_var+set}\" = set; then
-           save_$lt_var=\$$lt_var
-           $lt_var=C
- 	  export $lt_var
- 	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
- 	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
- 	fi"
- done
- LC_ALL=C
- LANGUAGE=C
- export LANGUAGE LC_ALL
- 
- $lt_unset CDPATH
- 
- 
- # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
- # is ksh but when the shell is invoked as "sh" and the current value of
- # the _XPG environment variable is not equal to 1 (one), the special
- # positional parameter $0, within a function call, is the name of the
- # function.
- progpath="$0"
- 
- 
- 
- : ${CP="cp -f"}
- test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
- : ${MAKE="make"}
- : ${MKDIR="mkdir"}
- : ${MV="mv -f"}
- : ${RM="rm -f"}
- : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
- : ${Xsed="$SED -e 1s/^X//"}
- 
- # Global variables:
- EXIT_SUCCESS=0
- EXIT_FAILURE=1
- EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
- EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
- 
- exit_status=$EXIT_SUCCESS
- 
- # Make sure IFS has a sensible default
- lt_nl='
- '
- IFS=" 	$lt_nl"
- 
- dirname="s,/[^/]*$,,"
- basename="s,^.*/,,"
- 
- # func_dirname file append nondir_replacement
- # Compute the dirname of FILE.  If nonempty, add APPEND to the result,
- # otherwise set result to NONDIR_REPLACEMENT.
- func_dirname ()
- {
-     func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
-     if test "X$func_dirname_result" = "X${1}"; then
-       func_dirname_result="${3}"
-     else
-       func_dirname_result="$func_dirname_result${2}"
-     fi
- } # func_dirname may be replaced by extended shell implementation
- 
- 
- # func_basename file
- func_basename ()
- {
-     func_basename_result=`$ECHO "${1}" | $SED "$basename"`
- } # func_basename may be replaced by extended shell implementation
- 
- 
- # func_dirname_and_basename file append nondir_replacement
- # perform func_basename and func_dirname in a single function
- # call:
- #   dirname:  Compute the dirname of FILE.  If nonempty,
- #             add APPEND to the result, otherwise set result
- #             to NONDIR_REPLACEMENT.
- #             value returned in "$func_dirname_result"
- #   basename: Compute filename of FILE.
- #             value retuned in "$func_basename_result"
- # Implementation must be kept synchronized with func_dirname
- # and func_basename. For efficiency, we do not delegate to
- # those functions but instead duplicate the functionality here.
- func_dirname_and_basename ()
- {
-     # Extract subdirectory from the argument.
-     func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
-     if test "X$func_dirname_result" = "X${1}"; then
-       func_dirname_result="${3}"
-     else
-       func_dirname_result="$func_dirname_result${2}"
-     fi
-     func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
- } # func_dirname_and_basename may be replaced by extended shell implementation
- 
- 
- # func_stripname prefix suffix name
- # strip PREFIX and SUFFIX off of NAME.
- # PREFIX and SUFFIX must not contain globbing or regex special
- # characters, hashes, percent signs, but SUFFIX may contain a leading
- # dot (in which case that matches only a dot).
- # func_strip_suffix prefix name
- func_stripname ()
- {
-     case ${2} in
-       .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-       *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-     esac
- } # func_stripname may be replaced by extended shell implementation
- 
- 
- # These SED scripts presuppose an absolute path with a trailing slash.
- pathcar='s,^/\([^/]*\).*$,\1,'
- pathcdr='s,^/[^/]*,,'
- removedotparts=':dotsl
- 		s@/\./@/@g
- 		t dotsl
- 		s,/\.$,/,'
- collapseslashes='s@/\{1,\}@/@g'
- finalslash='s,/*$,/,'
- 
- # func_normal_abspath PATH
- # Remove doubled-up and trailing slashes, "." path components,
- # and cancel out any ".." path components in PATH after making
- # it an absolute path.
- #             value returned in "$func_normal_abspath_result"
- func_normal_abspath ()
- {
-   # Start from root dir and reassemble the path.
-   func_normal_abspath_result=
-   func_normal_abspath_tpath=$1
-   func_normal_abspath_altnamespace=
-   case $func_normal_abspath_tpath in
-     "")
-       # Empty path, that just means $cwd.
-       func_stripname '' '/' "`pwd`"
-       func_normal_abspath_result=$func_stripname_result
-       return
-     ;;
-     # The next three entries are used to spot a run of precisely
-     # two leading slashes without using negated character classes;
-     # we take advantage of case's first-match behaviour.
-     ///*)
-       # Unusual form of absolute path, do nothing.
-     ;;
-     //*)
-       # Not necessarily an ordinary path; POSIX reserves leading '//'
-       # and for example Cygwin uses it to access remote file shares
-       # over CIFS/SMB, so we conserve a leading double slash if found.
-       func_normal_abspath_altnamespace=/
-     ;;
-     /*)
-       # Absolute path, do nothing.
-     ;;
-     *)
-       # Relative path, prepend $cwd.
-       func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
-     ;;
-   esac
-   # Cancel out all the simple stuff to save iterations.  We also want
-   # the path to end with a slash for ease of parsing, so make sure
-   # there is one (and only one) here.
-   func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-         -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
-   while :; do
-     # Processed it all yet?
-     if test "$func_normal_abspath_tpath" = / ; then
-       # If we ascended to the root using ".." the result may be empty now.
-       if test -z "$func_normal_abspath_result" ; then
-         func_normal_abspath_result=/
-       fi
-       break
-     fi
-     func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
-         -e "$pathcar"`
-     func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-         -e "$pathcdr"`
-     # Figure out what to do with it
-     case $func_normal_abspath_tcomponent in
-       "")
-         # Trailing empty path component, ignore it.
-       ;;
-       ..)
-         # Parent dir; strip last assembled component from result.
-         func_dirname "$func_normal_abspath_result"
-         func_normal_abspath_result=$func_dirname_result
-       ;;
-       *)
-         # Actual path component, append it.
-         func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
-       ;;
-     esac
-   done
-   # Restore leading double-slash if one was found on entry.
-   func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
- }
- 
- # func_relative_path SRCDIR DSTDIR
- # generates a relative path from SRCDIR to DSTDIR, with a trailing
- # slash if non-empty, suitable for immediately appending a filename
- # without needing to append a separator.
- #             value returned in "$func_relative_path_result"
- func_relative_path ()
- {
-   func_relative_path_result=
-   func_normal_abspath "$1"
-   func_relative_path_tlibdir=$func_normal_abspath_result
-   func_normal_abspath "$2"
-   func_relative_path_tbindir=$func_normal_abspath_result
- 
-   # Ascend the tree starting from libdir
-   while :; do
-     # check if we have found a prefix of bindir
-     case $func_relative_path_tbindir in
-       $func_relative_path_tlibdir)
-         # found an exact match
-         func_relative_path_tcancelled=
-         break
-         ;;
-       $func_relative_path_tlibdir*)
-         # found a matching prefix
-         func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
-         func_relative_path_tcancelled=$func_stripname_result
-         if test -z "$func_relative_path_result"; then
-           func_relative_path_result=.
-         fi
-         break
-         ;;
-       *)
-         func_dirname $func_relative_path_tlibdir
-         func_relative_path_tlibdir=${func_dirname_result}
-         if test "x$func_relative_path_tlibdir" = x ; then
-           # Have to descend all the way to the root!
-           func_relative_path_result=../$func_relative_path_result
-           func_relative_path_tcancelled=$func_relative_path_tbindir
-           break
-         fi
-         func_relative_path_result=../$func_relative_path_result
-         ;;
-     esac
-   done
- 
-   # Now calculate path; take care to avoid doubling-up slashes.
-   func_stripname '' '/' "$func_relative_path_result"
-   func_relative_path_result=$func_stripname_result
-   func_stripname '/' '/' "$func_relative_path_tcancelled"
-   if test "x$func_stripname_result" != x ; then
-     func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
-   fi
- 
-   # Normalisation. If bindir is libdir, return empty string,
-   # else relative path ending with a slash; either way, target
-   # file name can be directly appended.
-   if test ! -z "$func_relative_path_result"; then
-     func_stripname './' '' "$func_relative_path_result/"
-     func_relative_path_result=$func_stripname_result
-   fi
- }
- 
- # The name of this program:
- func_dirname_and_basename "$progpath"
- progname=$func_basename_result
- 
- # Make sure we have an absolute path for reexecution:
- case $progpath in
-   [\\/]*|[A-Za-z]:\\*) ;;
-   *[\\/]*)
-      progdir=$func_dirname_result
-      progdir=`cd "$progdir" && pwd`
-      progpath="$progdir/$progname"
-      ;;
-   *)
-      save_IFS="$IFS"
-      IFS=${PATH_SEPARATOR-:}
-      for progdir in $PATH; do
-        IFS="$save_IFS"
-        test -x "$progdir/$progname" && break
-      done
-      IFS="$save_IFS"
-      test -n "$progdir" || progdir=`pwd`
-      progpath="$progdir/$progname"
-      ;;
- esac
- 
- # Sed substitution that helps us do robust quoting.  It backslashifies
- # metacharacters that are still active within double-quoted strings.
- Xsed="${SED}"' -e 1s/^X//'
- sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
- 
- # Same as above, but do not quote variable references.
- double_quote_subst='s/\(["`\\]\)/\\\1/g'
- 
- # Sed substitution that turns a string into a regex matching for the
- # string literally.
- sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
- 
- # Sed substitution that converts a w32 file name or path
- # which contains forward slashes, into one that contains
- # (escaped) backslashes.  A very naive implementation.
- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
- 
- # Re-`\' parameter expansions in output of double_quote_subst that were
- # `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
- # in input to double_quote_subst, that '$' was protected from expansion.
- # Since each input `\' is now two `\'s, look for any number of runs of
- # four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
- bs='\\'
- bs2='\\\\'
- bs4='\\\\\\\\'
- dollar='\$'
- sed_double_backslash="\
-   s/$bs4/&\\
- /g
-   s/^$bs2$dollar/$bs&/
-   s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
-   s/\n//g"
- 
- # Standard options:
- opt_dry_run=false
- opt_help=false
- opt_quiet=false
- opt_verbose=false
- opt_warning=:
- 
- # func_echo arg...
- # Echo program name prefixed message, along with the current mode
- # name if it has been set yet.
- func_echo ()
- {
-     $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
- }
- 
- # func_verbose arg...
- # Echo program name prefixed message in verbose mode only.
- func_verbose ()
- {
-     $opt_verbose && func_echo ${1+"$@"}
- 
-     # A bug in bash halts the script if the last line of a function
-     # fails when set -e is in force, so we need another command to
-     # work around that:
-     :
- }
- 
- # func_echo_all arg...
- # Invoke $ECHO with all args, space-separated.
- func_echo_all ()
- {
-     $ECHO "$*"
- }
- 
- # func_error arg...
- # Echo program name prefixed message to standard error.
- func_error ()
- {
-     $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
- }
- 
- # func_warning arg...
- # Echo program name prefixed warning message to standard error.
- func_warning ()
- {
-     $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
- 
-     # bash bug again:
-     :
- }
- 
- # func_fatal_error arg...
- # Echo program name prefixed message to standard error, and exit.
- func_fatal_error ()
- {
-     func_error ${1+"$@"}
-     exit $EXIT_FAILURE
- }
- 
- # func_fatal_help arg...
- # Echo program name prefixed message to standard error, followed by
- # a help hint, and exit.
- func_fatal_help ()
- {
-     func_error ${1+"$@"}
-     func_fatal_error "$help"
- }
- help="Try \`$progname --help' for more information."  ## default
- 
- 
- # func_grep expression filename
- # Check whether EXPRESSION matches any line of FILENAME, without output.
- func_grep ()
- {
-     $GREP "$1" "$2" >/dev/null 2>&1
- }
- 
- 
- # func_mkdir_p directory-path
- # Make sure the entire path to DIRECTORY-PATH is available.
- func_mkdir_p ()
- {
-     my_directory_path="$1"
-     my_dir_list=
- 
-     if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
- 
-       # Protect directory names starting with `-'
-       case $my_directory_path in
-         -*) my_directory_path="./$my_directory_path" ;;
-       esac
- 
-       # While some portion of DIR does not yet exist...
-       while test ! -d "$my_directory_path"; do
-         # ...make a list in topmost first order.  Use a colon delimited
- 	# list incase some portion of path contains whitespace.
-         my_dir_list="$my_directory_path:$my_dir_list"
- 
-         # If the last portion added has no slash in it, the list is done
-         case $my_directory_path in */*) ;; *) break ;; esac
- 
-         # ...otherwise throw away the child directory and loop
-         my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
-       done
-       my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
- 
-       save_mkdir_p_IFS="$IFS"; IFS=':'
-       for my_dir in $my_dir_list; do
- 	IFS="$save_mkdir_p_IFS"
-         # mkdir can fail with a `File exist' error if two processes
-         # try to create one of the directories concurrently.  Don't
-         # stop in that case!
-         $MKDIR "$my_dir" 2>/dev/null || :
-       done
-       IFS="$save_mkdir_p_IFS"
- 
-       # Bail out if we (or some other process) failed to create a directory.
-       test -d "$my_directory_path" || \
-         func_fatal_error "Failed to create \`$1'"
-     fi
- }
- 
- 
- # func_mktempdir [string]
- # Make a temporary directory that won't clash with other running
- # libtool processes, and avoids race conditions if possible.  If
- # given, STRING is the basename for that directory.
- func_mktempdir ()
- {
-     my_template="${TMPDIR-/tmp}/${1-$progname}"
- 
-     if test "$opt_dry_run" = ":"; then
-       # Return a directory name, but don't create it in dry-run mode
-       my_tmpdir="${my_template}-$$"
-     else
- 
-       # If mktemp works, use that first and foremost
-       my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
- 
-       if test ! -d "$my_tmpdir"; then
-         # Failing that, at least try and use $RANDOM to avoid a race
-         my_tmpdir="${my_template}-${RANDOM-0}$$"
- 
-         save_mktempdir_umask=`umask`
-         umask 0077
-         $MKDIR "$my_tmpdir"
-         umask $save_mktempdir_umask
-       fi
- 
-       # If we're not in dry-run mode, bomb out on failure
-       test -d "$my_tmpdir" || \
-         func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
-     fi
- 
-     $ECHO "$my_tmpdir"
- }
- 
- 
- # func_quote_for_eval arg
- # Aesthetically quote ARG to be evaled later.
- # This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
- # is double-quoted, suitable for a subsequent eval, whereas
- # FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
- # which are still active within double quotes backslashified.
- func_quote_for_eval ()
- {
-     case $1 in
-       *[\\\`\"\$]*)
- 	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
-       *)
-         func_quote_for_eval_unquoted_result="$1" ;;
-     esac
- 
-     case $func_quote_for_eval_unquoted_result in
-       # Double-quote args containing shell metacharacters to delay
-       # word splitting, command substitution and and variable
-       # expansion for a subsequent eval.
-       # Many Bourne shells cannot handle close brackets correctly
-       # in scan sets, so we specify it separately.
-       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-         func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
-         ;;
-       *)
-         func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
-     esac
- }
- 
- 
- # func_quote_for_expand arg
- # Aesthetically quote ARG to be evaled later; same as above,
- # but do not quote variable references.
- func_quote_for_expand ()
- {
-     case $1 in
-       *[\\\`\"]*)
- 	my_arg=`$ECHO "$1" | $SED \
- 	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
-       *)
-         my_arg="$1" ;;
-     esac
- 
-     case $my_arg in
-       # Double-quote args containing shell metacharacters to delay
-       # word splitting and command substitution for a subsequent eval.
-       # Many Bourne shells cannot handle close brackets correctly
-       # in scan sets, so we specify it separately.
-       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-         my_arg="\"$my_arg\""
-         ;;
-     esac
- 
-     func_quote_for_expand_result="$my_arg"
- }
- 
- 
- # func_show_eval cmd [fail_exp]
- # Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
- # not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
- # is given, then evaluate it.
- func_show_eval ()
- {
-     my_cmd="$1"
-     my_fail_exp="${2-:}"
- 
-     ${opt_silent-false} || {
-       func_quote_for_expand "$my_cmd"
-       eval "func_echo $func_quote_for_expand_result"
-     }
- 
-     if ${opt_dry_run-false}; then :; else
-       eval "$my_cmd"
-       my_status=$?
-       if test "$my_status" -eq 0; then :; else
- 	eval "(exit $my_status); $my_fail_exp"
-       fi
-     fi
- }
- 
- 
- # func_show_eval_locale cmd [fail_exp]
- # Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
- # not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
- # is given, then evaluate it.  Use the saved locale for evaluation.
- func_show_eval_locale ()
- {
-     my_cmd="$1"
-     my_fail_exp="${2-:}"
- 
-     ${opt_silent-false} || {
-       func_quote_for_expand "$my_cmd"
-       eval "func_echo $func_quote_for_expand_result"
-     }
- 
-     if ${opt_dry_run-false}; then :; else
-       eval "$lt_user_locale
- 	    $my_cmd"
-       my_status=$?
-       eval "$lt_safe_locale"
-       if test "$my_status" -eq 0; then :; else
- 	eval "(exit $my_status); $my_fail_exp"
-       fi
-     fi
- }
- 
- # func_tr_sh
- # Turn $1 into a string suitable for a shell variable name.
- # Result is stored in $func_tr_sh_result.  All characters
- # not in the set a-zA-Z0-9_ are replaced with '_'. Further,
- # if $1 begins with a digit, a '_' is prepended as well.
- func_tr_sh ()
- {
-   case $1 in
-   [0-9]* | *[!a-zA-Z0-9_]*)
-     func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
-     ;;
-   * )
-     func_tr_sh_result=$1
-     ;;
-   esac
- }
- 
- 
- # func_version
- # Echo version message to standard output and exit.
- func_version ()
- {
-     $opt_debug
- 
-     $SED -n '/(C)/!b go
- 	:more
- 	/\./!{
- 	  N
- 	  s/\n# / /
- 	  b more
- 	}
- 	:go
- 	/^# '$PROGRAM' (GNU /,/# warranty; / {
-         s/^# //
- 	s/^# *$//
-         s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
-         p
-      }' < "$progpath"
-      exit $?
- }
- 
- # func_usage
- # Echo short help message to standard output and exit.
- func_usage ()
- {
-     $opt_debug
- 
-     $SED -n '/^# Usage:/,/^#  *.*--help/ {
-         s/^# //
- 	s/^# *$//
- 	s/\$progname/'$progname'/
- 	p
-     }' < "$progpath"
-     echo
-     $ECHO "run \`$progname --help | more' for full usage"
-     exit $?
- }
- 
- # func_help [NOEXIT]
- # Echo long help message to standard output and exit,
- # unless 'noexit' is passed as argument.
- func_help ()
- {
-     $opt_debug
- 
-     $SED -n '/^# Usage:/,/# Report bugs to/ {
- 	:print
-         s/^# //
- 	s/^# *$//
- 	s*\$progname*'$progname'*
- 	s*\$host*'"$host"'*
- 	s*\$SHELL*'"$SHELL"'*
- 	s*\$LTCC*'"$LTCC"'*
- 	s*\$LTCFLAGS*'"$LTCFLAGS"'*
- 	s*\$LD*'"$LD"'*
- 	s/\$with_gnu_ld/'"$with_gnu_ld"'/
- 	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
- 	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
- 	p
- 	d
-      }
-      /^# .* home page:/b print
-      /^# General help using/b print
-      ' < "$progpath"
-     ret=$?
-     if test -z "$1"; then
-       exit $ret
-     fi
- }
- 
- # func_missing_arg argname
- # Echo program name prefixed message to standard error and set global
- # exit_cmd.
- func_missing_arg ()
- {
-     $opt_debug
- 
-     func_error "missing argument for $1."
-     exit_cmd=exit
- }
- 
- 
- # func_split_short_opt shortopt
- # Set func_split_short_opt_name and func_split_short_opt_arg shell
- # variables after splitting SHORTOPT after the 2nd character.
- func_split_short_opt ()
- {
-     my_sed_short_opt='1s/^\(..\).*$/\1/;q'
-     my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
- 
-     func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
-     func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
- } # func_split_short_opt may be replaced by extended shell implementation
- 
- 
- # func_split_long_opt longopt
- # Set func_split_long_opt_name and func_split_long_opt_arg shell
- # variables after splitting LONGOPT at the `=' sign.
- func_split_long_opt ()
- {
-     my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
-     my_sed_long_arg='1s/^--[^=]*=//'
- 
-     func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
-     func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
- } # func_split_long_opt may be replaced by extended shell implementation
- 
- exit_cmd=:
- 
- 
- 
- 
- 
- magic="%%%MAGIC variable%%%"
- magic_exe="%%%MAGIC EXE variable%%%"
- 
- # Global variables.
- nonopt=
- preserve_args=
- lo2o="s/\\.lo\$/.${objext}/"
- o2lo="s/\\.${objext}\$/.lo/"
- extracted_archives=
- extracted_serial=0
- 
- # If this variable is set in any of the actions, the command in it
- # will be execed at the end.  This prevents here-documents from being
- # left over by shells.
- exec_cmd=
- 
- # func_append var value
- # Append VALUE to the end of shell variable VAR.
- func_append ()
- {
-     eval "${1}=\$${1}\${2}"
- } # func_append may be replaced by extended shell implementation
- 
- # func_append_quoted var value
- # Quote VALUE and append to the end of shell variable VAR, separated
- # by a space.
- func_append_quoted ()
- {
-     func_quote_for_eval "${2}"
-     eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
- } # func_append_quoted may be replaced by extended shell implementation
- 
- 
- # func_arith arithmetic-term...
- func_arith ()
- {
-     func_arith_result=`expr "${@}"`
- } # func_arith may be replaced by extended shell implementation
- 
- 
- # func_len string
- # STRING may not start with a hyphen.
- func_len ()
- {
-     func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
- } # func_len may be replaced by extended shell implementation
- 
- 
- # func_lo2o object
- func_lo2o ()
- {
-     func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
- } # func_lo2o may be replaced by extended shell implementation
- 
- 
- # func_xform libobj-or-source
- func_xform ()
- {
-     func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
- } # func_xform may be replaced by extended shell implementation
- 
- 
- # func_fatal_configuration arg...
- # Echo program name prefixed message to standard error, followed by
- # a configuration failure hint, and exit.
- func_fatal_configuration ()
- {
-     func_error ${1+"$@"}
-     func_error "See the $PACKAGE documentation for more information."
-     func_fatal_error "Fatal configuration error."
- }
- 
- 
- # func_config
- # Display the configuration for all the tags in this script.
- func_config ()
- {
-     re_begincf='^# ### BEGIN LIBTOOL'
-     re_endcf='^# ### END LIBTOOL'
- 
-     # Default configuration.
-     $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
- 
-     # Now print the configurations for the tags.
-     for tagname in $taglist; do
-       $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
-     done
- 
-     exit $?
- }
- 
- # func_features
- # Display the features supported by this script.
- func_features ()
- {
-     echo "host: $host"
-     if test "$build_libtool_libs" = yes; then
-       echo "enable shared libraries"
-     else
-       echo "disable shared libraries"
-     fi
-     if test "$build_old_libs" = yes; then
-       echo "enable static libraries"
-     else
-       echo "disable static libraries"
-     fi
- 
-     exit $?
- }
- 
- # func_enable_tag tagname
- # Verify that TAGNAME is valid, and either flag an error and exit, or
- # enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
- # variable here.
- func_enable_tag ()
- {
-   # Global variable:
-   tagname="$1"
- 
-   re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
-   re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
-   sed_extractcf="/$re_begincf/,/$re_endcf/p"
- 
-   # Validate tagname.
-   case $tagname in
-     *[!-_A-Za-z0-9,/]*)
-       func_fatal_error "invalid tag name: $tagname"
-       ;;
-   esac
- 
-   # Don't test for the "default" C tag, as we know it's
-   # there but not specially marked.
-   case $tagname in
-     CC) ;;
-     *)
-       if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
- 	taglist="$taglist $tagname"
- 
- 	# Evaluate the configuration.  Be careful to quote the path
- 	# and the sed script, to avoid splitting on whitespace, but
- 	# also don't use non-portable quotes within backquotes within
- 	# quotes we have to do it in 2 steps:
- 	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
- 	eval "$extractedcf"
-       else
- 	func_error "ignoring unknown tag $tagname"
-       fi
-       ;;
-   esac
- }
- 
- # func_check_version_match
- # Ensure that we are using m4 macros, and libtool script from the same
- # release of libtool.
- func_check_version_match ()
- {
-   if test "$package_revision" != "$macro_revision"; then
-     if test "$VERSION" != "$macro_version"; then
-       if test -z "$macro_version"; then
-         cat >&2 <<_LT_EOF
- $progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
- $progname: definition of this LT_INIT comes from an older release.
- $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
- $progname: and run autoconf again.
- _LT_EOF
-       else
-         cat >&2 <<_LT_EOF
- $progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
- $progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
- $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
- $progname: and run autoconf again.
- _LT_EOF
-       fi
-     else
-       cat >&2 <<_LT_EOF
- $progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
- $progname: but the definition of this LT_INIT comes from revision $macro_revision.
- $progname: You should recreate aclocal.m4 with macros from revision $package_revision
- $progname: of $PACKAGE $VERSION and run autoconf again.
- _LT_EOF
-     fi
- 
-     exit $EXIT_MISMATCH
-   fi
- }
- 
- 
- # Shorthand for --mode=foo, only valid as the first argument
- case $1 in
- clean|clea|cle|cl)
-   shift; set dummy --mode clean ${1+"$@"}; shift
-   ;;
- compile|compil|compi|comp|com|co|c)
-   shift; set dummy --mode compile ${1+"$@"}; shift
-   ;;
- execute|execut|execu|exec|exe|ex|e)
-   shift; set dummy --mode execute ${1+"$@"}; shift
-   ;;
- finish|finis|fini|fin|fi|f)
-   shift; set dummy --mode finish ${1+"$@"}; shift
-   ;;
- install|instal|insta|inst|ins|in|i)
-   shift; set dummy --mode install ${1+"$@"}; shift
-   ;;
- link|lin|li|l)
-   shift; set dummy --mode link ${1+"$@"}; shift
-   ;;
- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-   shift; set dummy --mode uninstall ${1+"$@"}; shift
-   ;;
- esac
- 
- 
- 
- # Option defaults:
- opt_debug=:
- opt_dry_run=false
- opt_config=false
- opt_preserve_dup_deps=false
- opt_features=false
- opt_finish=false
- opt_help=false
- opt_help_all=false
- opt_silent=:
- opt_warning=:
- opt_verbose=:
- opt_silent=false
- opt_verbose=false
- 
- 
- # Parse options once, thoroughly.  This comes as soon as possible in the
- # script to make things like `--version' happen as quickly as we can.
- {
-   # this just eases exit handling
-   while test $# -gt 0; do
-     opt="$1"
-     shift
-     case $opt in
-       --debug|-x)	opt_debug='set -x'
- 			func_echo "enabling shell trace mode"
- 			$opt_debug
- 			;;
-       --dry-run|--dryrun|-n)
- 			opt_dry_run=:
- 			;;
-       --config)
- 			opt_config=:
- func_config
- 			;;
-       --dlopen|-dlopen)
- 			optarg="$1"
- 			opt_dlopen="${opt_dlopen+$opt_dlopen
- }$optarg"
- 			shift
- 			;;
-       --preserve-dup-deps)
- 			opt_preserve_dup_deps=:
- 			;;
-       --features)
- 			opt_features=:
- func_features
- 			;;
-       --finish)
- 			opt_finish=:
- set dummy --mode finish ${1+"$@"}; shift
- 			;;
-       --help)
- 			opt_help=:
- 			;;
-       --help-all)
- 			opt_help_all=:
- opt_help=': help-all'
- 			;;
-       --mode)
- 			test $# = 0 && func_missing_arg $opt && break
- 			optarg="$1"
- 			opt_mode="$optarg"
- case $optarg in
-   # Valid mode arguments:
-   clean|compile|execute|finish|install|link|relink|uninstall) ;;
- 
-   # Catch anything else as an error
-   *) func_error "invalid argument for $opt"
-      exit_cmd=exit
-      break
-      ;;
- esac
- 			shift
- 			;;
-       --no-silent|--no-quiet)
- 			opt_silent=false
- func_append preserve_args " $opt"
- 			;;
-       --no-warning|--no-warn)
- 			opt_warning=false
- func_append preserve_args " $opt"
- 			;;
-       --no-verbose)
- 			opt_verbose=false
- func_append preserve_args " $opt"
- 			;;
-       --silent|--quiet)
- 			opt_silent=:
- func_append preserve_args " $opt"
-         opt_verbose=false
- 			;;
-       --verbose|-v)
- 			opt_verbose=:
- func_append preserve_args " $opt"
- opt_silent=false
- 			;;
-       --tag)
- 			test $# = 0 && func_missing_arg $opt && break
- 			optarg="$1"
- 			opt_tag="$optarg"
- func_append preserve_args " $opt $optarg"
- func_enable_tag "$optarg"
- 			shift
- 			;;
- 
-       -\?|-h)		func_usage				;;
-       --help)		func_help				;;
-       --version)	func_version				;;
- 
-       # Separate optargs to long options:
-       --*=*)
- 			func_split_long_opt "$opt"
- 			set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
- 			shift
- 			;;
- 
-       # Separate non-argument short options:
-       -\?*|-h*|-n*|-v*)
- 			func_split_short_opt "$opt"
- 			set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
- 			shift
- 			;;
- 
-       --)		break					;;
-       -*)		func_fatal_help "unrecognized option \`$opt'" ;;
-       *)		set dummy "$opt" ${1+"$@"};	shift; break  ;;
-     esac
-   done
- 
-   # Validate options:
- 
-   # save first non-option argument
-   if test "$#" -gt 0; then
-     nonopt="$opt"
-     shift
-   fi
- 
-   # preserve --debug
-   test "$opt_debug" = : || func_append preserve_args " --debug"
- 
-   case $host in
-     *cygwin* | *mingw* | *pw32* | *cegcc*)
-       # don't eliminate duplications in $postdeps and $predeps
-       opt_duplicate_compiler_generated_deps=:
-       ;;
-     *)
-       opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
-       ;;
-   esac
- 
-   $opt_help || {
-     # Sanity checks first:
-     func_check_version_match
- 
-     if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-       func_fatal_configuration "not configured to build any kind of library"
-     fi
- 
-     # Darwin sucks
-     eval std_shrext=\"$shrext_cmds\"
- 
-     # Only execute mode is allowed to have -dlopen flags.
-     if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
-       func_error "unrecognized option \`-dlopen'"
-       $ECHO "$help" 1>&2
-       exit $EXIT_FAILURE
-     fi
- 
-     # Change the help message to a mode-specific one.
-     generic_help="$help"
-     help="Try \`$progname --help --mode=$opt_mode' for more information."
-   }
- 
- 
-   # Bail if the options were screwed
-   $exit_cmd $EXIT_FAILURE
- }
- 
- 
- 
- 
- ## ----------- ##
- ##    Main.    ##
- ## ----------- ##
- 
- # func_lalib_p file
- # True iff FILE is a libtool `.la' library or `.lo' object file.
- # This function is only a basic sanity check; it will hardly flush out
- # determined imposters.
- func_lalib_p ()
- {
-     test -f "$1" &&
-       $SED -e 4q "$1" 2>/dev/null \
-         | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
- }
- 
- # func_lalib_unsafe_p file
- # True iff FILE is a libtool `.la' library or `.lo' object file.
- # This function implements the same check as func_lalib_p without
- # resorting to external programs.  To this end, it redirects stdin and
- # closes it afterwards, without saving the original file descriptor.
- # As a safety measure, use it only where a negative result would be
- # fatal anyway.  Works if `file' does not exist.
- func_lalib_unsafe_p ()
- {
-     lalib_p=no
-     if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
- 	for lalib_p_l in 1 2 3 4
- 	do
- 	    read lalib_p_line
- 	    case "$lalib_p_line" in
- 		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
- 	    esac
- 	done
- 	exec 0<&5 5<&-
-     fi
-     test "$lalib_p" = yes
- }
- 
- # func_ltwrapper_script_p file
- # True iff FILE is a libtool wrapper script
- # This function is only a basic sanity check; it will hardly flush out
- # determined imposters.
- func_ltwrapper_script_p ()
- {
-     func_lalib_p "$1"
- }
- 
- # func_ltwrapper_executable_p file
- # True iff FILE is a libtool wrapper executable
- # This function is only a basic sanity check; it will hardly flush out
- # determined imposters.
- func_ltwrapper_executable_p ()
- {
-     func_ltwrapper_exec_suffix=
-     case $1 in
-     *.exe) ;;
-     *) func_ltwrapper_exec_suffix=.exe ;;
-     esac
-     $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
- }
- 
- # func_ltwrapper_scriptname file
- # Assumes file is an ltwrapper_executable
- # uses $file to determine the appropriate filename for a
- # temporary ltwrapper_script.
- func_ltwrapper_scriptname ()
- {
-     func_dirname_and_basename "$1" "" "."
-     func_stripname '' '.exe' "$func_basename_result"
-     func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
- }
- 
- # func_ltwrapper_p file
- # True iff FILE is a libtool wrapper script or wrapper executable
- # This function is only a basic sanity check; it will hardly flush out
- # determined imposters.
- func_ltwrapper_p ()
- {
-     func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
- }
- 
- 
- # func_execute_cmds commands fail_cmd
- # Execute tilde-delimited COMMANDS.
- # If FAIL_CMD is given, eval that upon failure.
- # FAIL_CMD may read-access the current command in variable CMD!
- func_execute_cmds ()
- {
-     $opt_debug
-     save_ifs=$IFS; IFS='~'
-     for cmd in $1; do
-       IFS=$save_ifs
-       eval cmd=\"$cmd\"
-       func_show_eval "$cmd" "${2-:}"
-     done
-     IFS=$save_ifs
- }
- 
- 
- # func_source file
- # Source FILE, adding directory component if necessary.
- # Note that it is not necessary on cygwin/mingw to append a dot to
- # FILE even if both FILE and FILE.exe exist: automatic-append-.exe
- # behavior happens only for exec(3), not for open(2)!  Also, sourcing
- # `FILE.' does not work on cygwin managed mounts.
- func_source ()
- {
-     $opt_debug
-     case $1 in
-     */* | *\\*)	. "$1" ;;
-     *)		. "./$1" ;;
-     esac
- }
- 
- 
- # func_resolve_sysroot PATH
- # Replace a leading = in PATH with a sysroot.  Store the result into
- # func_resolve_sysroot_result
- func_resolve_sysroot ()
- {
-   func_resolve_sysroot_result=$1
-   case $func_resolve_sysroot_result in
-   =*)
-     func_stripname '=' '' "$func_resolve_sysroot_result"
-     func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
-     ;;
-   esac
- }
- 
- # func_replace_sysroot PATH
- # If PATH begins with the sysroot, replace it with = and
- # store the result into func_replace_sysroot_result.
- func_replace_sysroot ()
- {
-   case "$lt_sysroot:$1" in
-   ?*:"$lt_sysroot"*)
-     func_stripname "$lt_sysroot" '' "$1"
-     func_replace_sysroot_result="=$func_stripname_result"
-     ;;
-   *)
-     # Including no sysroot.
-     func_replace_sysroot_result=$1
-     ;;
-   esac
- }
- 
- # func_infer_tag arg
- # Infer tagged configuration to use if any are available and
- # if one wasn't chosen via the "--tag" command line option.
- # Only attempt this if the compiler in the base compile
- # command doesn't match the default compiler.
- # arg is usually of the form 'gcc ...'
- func_infer_tag ()
- {
-     $opt_debug
-     if test -n "$available_tags" && test -z "$tagname"; then
-       CC_quoted=
-       for arg in $CC; do
- 	func_append_quoted CC_quoted "$arg"
-       done
-       CC_expanded=`func_echo_all $CC`
-       CC_quoted_expanded=`func_echo_all $CC_quoted`
-       case $@ in
-       # Blanks in the command may have been stripped by the calling shell,
-       # but not from the CC environment variable when configure was run.
-       " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
-       " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
-       # Blanks at the start of $base_compile will cause this to fail
-       # if we don't check for them as well.
-       *)
- 	for z in $available_tags; do
- 	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
- 	    # Evaluate the configuration.
- 	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
- 	    CC_quoted=
- 	    for arg in $CC; do
- 	      # Double-quote args containing other shell metacharacters.
- 	      func_append_quoted CC_quoted "$arg"
- 	    done
- 	    CC_expanded=`func_echo_all $CC`
- 	    CC_quoted_expanded=`func_echo_all $CC_quoted`
- 	    case "$@ " in
- 	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
- 	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
- 	      # The compiler in the base compile command matches
- 	      # the one in the tagged configuration.
- 	      # Assume this is the tagged configuration we want.
- 	      tagname=$z
- 	      break
- 	      ;;
- 	    esac
- 	  fi
- 	done
- 	# If $tagname still isn't set, then no tagged configuration
- 	# was found and let the user know that the "--tag" command
- 	# line option must be used.
- 	if test -z "$tagname"; then
- 	  func_echo "unable to infer tagged configuration"
- 	  func_fatal_error "specify a tag with \`--tag'"
- #	else
- #	  func_verbose "using $tagname tagged configuration"
- 	fi
- 	;;
-       esac
-     fi
- }
- 
- 
- 
- # func_write_libtool_object output_name pic_name nonpic_name
- # Create a libtool object file (analogous to a ".la" file),
- # but don't create it if we're doing a dry run.
- func_write_libtool_object ()
- {
-     write_libobj=${1}
-     if test "$build_libtool_libs" = yes; then
-       write_lobj=\'${2}\'
-     else
-       write_lobj=none
-     fi
- 
-     if test "$build_old_libs" = yes; then
-       write_oldobj=\'${3}\'
-     else
-       write_oldobj=none
-     fi
- 
-     $opt_dry_run || {
-       cat >${write_libobj}T <<EOF
- # $write_libobj - a libtool object file
- # Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
- #
- # Please DO NOT delete this file!
- # It is necessary for linking the library.
- 
- # Name of the PIC object.
- pic_object=$write_lobj
- 
- # Name of the non-PIC object
- non_pic_object=$write_oldobj
- 
- EOF
-       $MV "${write_libobj}T" "${write_libobj}"
-     }
- }
- 
- 
- ##################################################
- # FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
- ##################################################
- 
- # func_convert_core_file_wine_to_w32 ARG
- # Helper function used by file name conversion functions when $build is *nix,
- # and $host is mingw, cygwin, or some other w32 environment. Relies on a
- # correctly configured wine environment available, with the winepath program
- # in $build's $PATH.
- #
- # ARG is the $build file name to be converted to w32 format.
- # Result is available in $func_convert_core_file_wine_to_w32_result, and will
- # be empty on error (or when ARG is empty)
- func_convert_core_file_wine_to_w32 ()
- {
-   $opt_debug
-   func_convert_core_file_wine_to_w32_result="$1"
-   if test -n "$1"; then
-     # Unfortunately, winepath does not exit with a non-zero error code, so we
-     # are forced to check the contents of stdout. On the other hand, if the
-     # command is not found, the shell will set an exit code of 127 and print
-     # *an error message* to stdout. So we must check for both error code of
-     # zero AND non-empty stdout, which explains the odd construction:
-     func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
-     if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
-       func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
-         $SED -e "$lt_sed_naive_backslashify"`
-     else
-       func_convert_core_file_wine_to_w32_result=
-     fi
-   fi
- }
- # end: func_convert_core_file_wine_to_w32
- 
- 
- # func_convert_core_path_wine_to_w32 ARG
- # Helper function used by path conversion functions when $build is *nix, and
- # $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
- # configured wine environment available, with the winepath program in $build's
- # $PATH. Assumes ARG has no leading or trailing path separator characters.
- #
- # ARG is path to be converted from $build format to win32.
- # Result is available in $func_convert_core_path_wine_to_w32_result.
- # Unconvertible file (directory) names in ARG are skipped; if no directory names
- # are convertible, then the result may be empty.
- func_convert_core_path_wine_to_w32 ()
- {
-   $opt_debug
-   # unfortunately, winepath doesn't convert paths, only file names
-   func_convert_core_path_wine_to_w32_result=""
-   if test -n "$1"; then
-     oldIFS=$IFS
-     IFS=:
-     for func_convert_core_path_wine_to_w32_f in $1; do
-       IFS=$oldIFS
-       func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
-       if test -n "$func_convert_core_file_wine_to_w32_result" ; then
-         if test -z "$func_convert_core_path_wine_to_w32_result"; then
-           func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
-         else
-           func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
-         fi
-       fi
-     done
-     IFS=$oldIFS
-   fi
- }
- # end: func_convert_core_path_wine_to_w32
- 
- 
- # func_cygpath ARGS...
- # Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
- # when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
- # $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
- # (2), returns the Cygwin file name or path in func_cygpath_result (input
- # file name or path is assumed to be in w32 format, as previously converted
- # from $build's *nix or MSYS format). In case (3), returns the w32 file name
- # or path in func_cygpath_result (input file name or path is assumed to be in
- # Cygwin format). Returns an empty string on error.
- #
- # ARGS are passed to cygpath, with the last one being the file name or path to
- # be converted.
- #
- # Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
- # environment variable; do not put it in $PATH.
- func_cygpath ()
- {
-   $opt_debug
-   if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
-     func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
-     if test "$?" -ne 0; then
-       # on failure, ensure result is empty
-       func_cygpath_result=
-     fi
-   else
-     func_cygpath_result=
-     func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
-   fi
- }
- #end: func_cygpath
- 
- 
- # func_convert_core_msys_to_w32 ARG
- # Convert file name or path ARG from MSYS format to w32 format.  Return
- # result in func_convert_core_msys_to_w32_result.
- func_convert_core_msys_to_w32 ()
- {
-   $opt_debug
-   # awkward: cmd appends spaces to result
-   func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
-     $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
- }
- #end: func_convert_core_msys_to_w32
- 
- 
- # func_convert_file_check ARG1 ARG2
- # Verify that ARG1 (a file name in $build format) was converted to $host
- # format in ARG2. Otherwise, emit an error message, but continue (resetting
- # func_to_host_file_result to ARG1).
- func_convert_file_check ()
- {
-   $opt_debug
-   if test -z "$2" && test -n "$1" ; then
-     func_error "Could not determine host file name corresponding to"
-     func_error "  \`$1'"
-     func_error "Continuing, but uninstalled executables may not work."
-     # Fallback:
-     func_to_host_file_result="$1"
-   fi
- }
- # end func_convert_file_check
- 
- 
- # func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
- # Verify that FROM_PATH (a path in $build format) was converted to $host
- # format in TO_PATH. Otherwise, emit an error message, but continue, resetting
- # func_to_host_file_result to a simplistic fallback value (see below).
- func_convert_path_check ()
- {
-   $opt_debug
-   if test -z "$4" && test -n "$3"; then
-     func_error "Could not determine the host path corresponding to"
-     func_error "  \`$3'"
-     func_error "Continuing, but uninstalled executables may not work."
-     # Fallback.  This is a deliberately simplistic "conversion" and
-     # should not be "improved".  See libtool.info.
-     if test "x$1" != "x$2"; then
-       lt_replace_pathsep_chars="s|$1|$2|g"
-       func_to_host_path_result=`echo "$3" |
-         $SED -e "$lt_replace_pathsep_chars"`
-     else
-       func_to_host_path_result="$3"
-     fi
-   fi
- }
- # end func_convert_path_check
- 
- 
- # func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
- # Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
- # and appending REPL if ORIG matches BACKPAT.
- func_convert_path_front_back_pathsep ()
- {
-   $opt_debug
-   case $4 in
-   $1 ) func_to_host_path_result="$3$func_to_host_path_result"
-     ;;
-   esac
-   case $4 in
-   $2 ) func_append func_to_host_path_result "$3"
-     ;;
-   esac
- }
- # end func_convert_path_front_back_pathsep
- 
- 
- ##################################################
- # $build to $host FILE NAME CONVERSION FUNCTIONS #
- ##################################################
- # invoked via `$to_host_file_cmd ARG'
- #
- # In each case, ARG is the path to be converted from $build to $host format.
- # Result will be available in $func_to_host_file_result.
- 
- 
- # func_to_host_file ARG
- # Converts the file name ARG from $build format to $host format. Return result
- # in func_to_host_file_result.
- func_to_host_file ()
- {
-   $opt_debug
-   $to_host_file_cmd "$1"
- }
- # end func_to_host_file
- 
- 
- # func_to_tool_file ARG LAZY
- # converts the file name ARG from $build format to toolchain format. Return
- # result in func_to_tool_file_result.  If the conversion in use is listed
- # in (the comma separated) LAZY, no conversion takes place.
- func_to_tool_file ()
- {
-   $opt_debug
-   case ,$2, in
-     *,"$to_tool_file_cmd",*)
-       func_to_tool_file_result=$1
-       ;;
-     *)
-       $to_tool_file_cmd "$1"
-       func_to_tool_file_result=$func_to_host_file_result
-       ;;
-   esac
- }
- # end func_to_tool_file
- 
- 
- # func_convert_file_noop ARG
- # Copy ARG to func_to_host_file_result.
- func_convert_file_noop ()
- {
-   func_to_host_file_result="$1"
- }
- # end func_convert_file_noop
- 
- 
- # func_convert_file_msys_to_w32 ARG
- # Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
- # conversion to w32 is not available inside the cwrapper.  Returns result in
- # func_to_host_file_result.
- func_convert_file_msys_to_w32 ()
- {
-   $opt_debug
-   func_to_host_file_result="$1"
-   if test -n "$1"; then
-     func_convert_core_msys_to_w32 "$1"
-     func_to_host_file_result="$func_convert_core_msys_to_w32_result"
-   fi
-   func_convert_file_check "$1" "$func_to_host_file_result"
- }
- # end func_convert_file_msys_to_w32
- 
- 
- # func_convert_file_cygwin_to_w32 ARG
- # Convert file name ARG from Cygwin to w32 format.  Returns result in
- # func_to_host_file_result.
- func_convert_file_cygwin_to_w32 ()
- {
-   $opt_debug
-   func_to_host_file_result="$1"
-   if test -n "$1"; then
-     # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
-     # LT_CYGPATH in this case.
-     func_to_host_file_result=`cygpath -m "$1"`
-   fi
-   func_convert_file_check "$1" "$func_to_host_file_result"
- }
- # end func_convert_file_cygwin_to_w32
- 
- 
- # func_convert_file_nix_to_w32 ARG
- # Convert file name ARG from *nix to w32 format.  Requires a wine environment
- # and a working winepath. Returns result in func_to_host_file_result.
- func_convert_file_nix_to_w32 ()
- {
-   $opt_debug
-   func_to_host_file_result="$1"
-   if test -n "$1"; then
-     func_convert_core_file_wine_to_w32 "$1"
-     func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
-   fi
-   func_convert_file_check "$1" "$func_to_host_file_result"
- }
- # end func_convert_file_nix_to_w32
- 
- 
- # func_convert_file_msys_to_cygwin ARG
- # Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
- # Returns result in func_to_host_file_result.
- func_convert_file_msys_to_cygwin ()
- {
-   $opt_debug
-   func_to_host_file_result="$1"
-   if test -n "$1"; then
-     func_convert_core_msys_to_w32 "$1"
-     func_cygpath -u "$func_convert_core_msys_to_w32_result"
-     func_to_host_file_result="$func_cygpath_result"
-   fi
-   func_convert_file_check "$1" "$func_to_host_file_result"
- }
- # end func_convert_file_msys_to_cygwin
- 
- 
- # func_convert_file_nix_to_cygwin ARG
- # Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
- # in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
- # in func_to_host_file_result.
- func_convert_file_nix_to_cygwin ()
- {
-   $opt_debug
-   func_to_host_file_result="$1"
-   if test -n "$1"; then
-     # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
-     func_convert_core_file_wine_to_w32 "$1"
-     func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
-     func_to_host_file_result="$func_cygpath_result"
-   fi
-   func_convert_file_check "$1" "$func_to_host_file_result"
- }
- # end func_convert_file_nix_to_cygwin
- 
- 
- #############################################
- # $build to $host PATH CONVERSION FUNCTIONS #
- #############################################
- # invoked via `$to_host_path_cmd ARG'
- #
- # In each case, ARG is the path to be converted from $build to $host format.
- # The result will be available in $func_to_host_path_result.
- #
- # Path separators are also converted from $build format to $host format.  If
- # ARG begins or ends with a path separator character, it is preserved (but
- # converted to $host format) on output.
- #
- # All path conversion functions are named using the following convention:
- #   file name conversion function    : func_convert_file_X_to_Y ()
- #   path conversion function         : func_convert_path_X_to_Y ()
- # where, for any given $build/$host combination the 'X_to_Y' value is the
- # same.  If conversion functions are added for new $build/$host combinations,
- # the two new functions must follow this pattern, or func_init_to_host_path_cmd
- # will break.
- 
- 
- # func_init_to_host_path_cmd
- # Ensures that function "pointer" variable $to_host_path_cmd is set to the
- # appropriate value, based on the value of $to_host_file_cmd.
- to_host_path_cmd=
- func_init_to_host_path_cmd ()
- {
-   $opt_debug
-   if test -z "$to_host_path_cmd"; then
-     func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
-     to_host_path_cmd="func_convert_path_${func_stripname_result}"
-   fi
- }
- 
- 
- # func_to_host_path ARG
- # Converts the path ARG from $build format to $host format. Return result
- # in func_to_host_path_result.
- func_to_host_path ()
- {
-   $opt_debug
-   func_init_to_host_path_cmd
-   $to_host_path_cmd "$1"
- }
- # end func_to_host_path
- 
- 
- # func_convert_path_noop ARG
- # Copy ARG to func_to_host_path_result.
- func_convert_path_noop ()
- {
-   func_to_host_path_result="$1"
- }
- # end func_convert_path_noop
- 
- 
- # func_convert_path_msys_to_w32 ARG
- # Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
- # conversion to w32 is not available inside the cwrapper.  Returns result in
- # func_to_host_path_result.
- func_convert_path_msys_to_w32 ()
- {
-   $opt_debug
-   func_to_host_path_result="$1"
-   if test -n "$1"; then
-     # Remove leading and trailing path separator characters from ARG.  MSYS
-     # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
-     # and winepath ignores them completely.
-     func_stripname : : "$1"
-     func_to_host_path_tmp1=$func_stripname_result
-     func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-     func_to_host_path_result="$func_convert_core_msys_to_w32_result"
-     func_convert_path_check : ";" \
-       "$func_to_host_path_tmp1" "$func_to_host_path_result"
-     func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-   fi
- }
- # end func_convert_path_msys_to_w32
- 
- 
- # func_convert_path_cygwin_to_w32 ARG
- # Convert path ARG from Cygwin to w32 format.  Returns result in
- # func_to_host_file_result.
- func_convert_path_cygwin_to_w32 ()
- {
-   $opt_debug
-   func_to_host_path_result="$1"
-   if test -n "$1"; then
-     # See func_convert_path_msys_to_w32:
-     func_stripname : : "$1"
-     func_to_host_path_tmp1=$func_stripname_result
-     func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
-     func_convert_path_check : ";" \
-       "$func_to_host_path_tmp1" "$func_to_host_path_result"
-     func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-   fi
- }
- # end func_convert_path_cygwin_to_w32
- 
- 
- # func_convert_path_nix_to_w32 ARG
- # Convert path ARG from *nix to w32 format.  Requires a wine environment and
- # a working winepath.  Returns result in func_to_host_file_result.
- func_convert_path_nix_to_w32 ()
- {
-   $opt_debug
-   func_to_host_path_result="$1"
-   if test -n "$1"; then
-     # See func_convert_path_msys_to_w32:
-     func_stripname : : "$1"
-     func_to_host_path_tmp1=$func_stripname_result
-     func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-     func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
-     func_convert_path_check : ";" \
-       "$func_to_host_path_tmp1" "$func_to_host_path_result"
-     func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-   fi
- }
- # end func_convert_path_nix_to_w32
- 
- 
- # func_convert_path_msys_to_cygwin ARG
- # Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
- # Returns result in func_to_host_file_result.
- func_convert_path_msys_to_cygwin ()
- {
-   $opt_debug
-   func_to_host_path_result="$1"
-   if test -n "$1"; then
-     # See func_convert_path_msys_to_w32:
-     func_stripname : : "$1"
-     func_to_host_path_tmp1=$func_stripname_result
-     func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-     func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
-     func_to_host_path_result="$func_cygpath_result"
-     func_convert_path_check : : \
-       "$func_to_host_path_tmp1" "$func_to_host_path_result"
-     func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-   fi
- }
- # end func_convert_path_msys_to_cygwin
- 
- 
- # func_convert_path_nix_to_cygwin ARG
- # Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
- # a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
- # func_to_host_file_result.
- func_convert_path_nix_to_cygwin ()
- {
-   $opt_debug
-   func_to_host_path_result="$1"
-   if test -n "$1"; then
-     # Remove leading and trailing path separator characters from
-     # ARG. msys behavior is inconsistent here, cygpath turns them
-     # into '.;' and ';.', and winepath ignores them completely.
-     func_stripname : : "$1"
-     func_to_host_path_tmp1=$func_stripname_result
-     func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-     func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
-     func_to_host_path_result="$func_cygpath_result"
-     func_convert_path_check : : \
-       "$func_to_host_path_tmp1" "$func_to_host_path_result"
-     func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-   fi
- }
- # end func_convert_path_nix_to_cygwin
- 
- 
- # func_mode_compile arg...
- func_mode_compile ()
- {
-     $opt_debug
-     # Get the compilation command and the source file.
-     base_compile=
-     srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-     suppress_opt=yes
-     suppress_output=
-     arg_mode=normal
-     libobj=
-     later=
-     pie_flag=
- 
-     for arg
-     do
-       case $arg_mode in
-       arg  )
- 	# do not "continue".  Instead, add this to base_compile
- 	lastarg="$arg"
- 	arg_mode=normal
- 	;;
- 
-       target )
- 	libobj="$arg"
- 	arg_mode=normal
- 	continue
- 	;;
- 
-       normal )
- 	# Accept any command-line options.
- 	case $arg in
- 	-o)
- 	  test -n "$libobj" && \
- 	    func_fatal_error "you cannot specify \`-o' more than once"
- 	  arg_mode=target
- 	  continue
- 	  ;;
- 
- 	-pie | -fpie | -fPIE)
-           func_append pie_flag " $arg"
- 	  continue
- 	  ;;
- 
- 	-shared | -static | -prefer-pic | -prefer-non-pic)
- 	  func_append later " $arg"
- 	  continue
- 	  ;;
- 
- 	-no-suppress)
- 	  suppress_opt=no
- 	  continue
- 	  ;;
- 
- 	-Xcompiler)
- 	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
- 	  continue      #  The current "srcfile" will either be retained or
- 	  ;;            #  replaced later.  I would guess that would be a bug.
- 
- 	-Wc,*)
- 	  func_stripname '-Wc,' '' "$arg"
- 	  args=$func_stripname_result
- 	  lastarg=
- 	  save_ifs="$IFS"; IFS=','
- 	  for arg in $args; do
- 	    IFS="$save_ifs"
- 	    func_append_quoted lastarg "$arg"
- 	  done
- 	  IFS="$save_ifs"
- 	  func_stripname ' ' '' "$lastarg"
- 	  lastarg=$func_stripname_result
- 
- 	  # Add the arguments to base_compile.
- 	  func_append base_compile " $lastarg"
- 	  continue
- 	  ;;
- 
- 	*)
- 	  # Accept the current argument as the source file.
- 	  # The previous "srcfile" becomes the current argument.
- 	  #
- 	  lastarg="$srcfile"
- 	  srcfile="$arg"
- 	  ;;
- 	esac  #  case $arg
- 	;;
-       esac    #  case $arg_mode
- 
-       # Aesthetically quote the previous argument.
-       func_append_quoted base_compile "$lastarg"
-     done # for arg
- 
-     case $arg_mode in
-     arg)
-       func_fatal_error "you must specify an argument for -Xcompile"
-       ;;
-     target)
-       func_fatal_error "you must specify a target with \`-o'"
-       ;;
-     *)
-       # Get the name of the library object.
-       test -z "$libobj" && {
- 	func_basename "$srcfile"
- 	libobj="$func_basename_result"
-       }
-       ;;
-     esac
- 
-     # Recognize several different file suffixes.
-     # If the user specifies -o file.o, it is replaced with file.lo
-     case $libobj in
-     *.[cCFSifmso] | \
-     *.ada | *.adb | *.ads | *.asm | \
-     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-     *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
-       func_xform "$libobj"
-       libobj=$func_xform_result
-       ;;
-     esac
- 
-     case $libobj in
-     *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
-     *)
-       func_fatal_error "cannot determine name of library object from \`$libobj'"
-       ;;
-     esac
- 
-     func_infer_tag $base_compile
- 
-     for arg in $later; do
-       case $arg in
-       -shared)
- 	test "$build_libtool_libs" != yes && \
- 	  func_fatal_configuration "can not build a shared library"
- 	build_old_libs=no
- 	continue
- 	;;
- 
-       -static)
- 	build_libtool_libs=no
- 	build_old_libs=yes
- 	continue
- 	;;
- 
-       -prefer-pic)
- 	pic_mode=yes
- 	continue
- 	;;
- 
-       -prefer-non-pic)
- 	pic_mode=no
- 	continue
- 	;;
-       esac
-     done
- 
-     func_quote_for_eval "$libobj"
-     test "X$libobj" != "X$func_quote_for_eval_result" \
-       && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
-       && func_warning "libobj name \`$libobj' may not contain shell special characters."
-     func_dirname_and_basename "$obj" "/" ""
-     objname="$func_basename_result"
-     xdir="$func_dirname_result"
-     lobj=${xdir}$objdir/$objname
- 
-     test -z "$base_compile" && \
-       func_fatal_help "you must specify a compilation command"
- 
-     # Delete any leftover library objects.
-     if test "$build_old_libs" = yes; then
-       removelist="$obj $lobj $libobj ${libobj}T"
-     else
-       removelist="$lobj $libobj ${libobj}T"
-     fi
- 
-     # On Cygwin there's no "real" PIC flag so we must build both object types
-     case $host_os in
-     cygwin* | mingw* | pw32* | os2* | cegcc*)
-       pic_mode=default
-       ;;
-     esac
-     if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-       # non-PIC code in shared libraries is not supported
-       pic_mode=default
-     fi
- 
-     # Calculate the filename of the output object if compiler does
-     # not support -o with -c
-     if test "$compiler_c_o" = no; then
-       output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
-       lockfile="$output_obj.lock"
-     else
-       output_obj=
-       need_locks=no
-       lockfile=
-     fi
- 
-     # Lock this critical section if it is needed
-     # We use this script file to make the link, it avoids creating a new file
-     if test "$need_locks" = yes; then
-       until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
- 	func_echo "Waiting for $lockfile to be removed"
- 	sleep 2
-       done
-     elif test "$need_locks" = warn; then
-       if test -f "$lockfile"; then
- 	$ECHO "\
- *** ERROR, $lockfile exists and contains:
- `cat $lockfile 2>/dev/null`
- 
- This indicates that another process is trying to use the same
- temporary object file, and libtool could not work around it because
- your compiler does not support \`-c' and \`-o' together.  If you
- repeat this compilation, it may succeed, by chance, but you had better
- avoid parallel builds (make -j) in this platform, or get a better
- compiler."
- 
- 	$opt_dry_run || $RM $removelist
- 	exit $EXIT_FAILURE
-       fi
-       func_append removelist " $output_obj"
-       $ECHO "$srcfile" > "$lockfile"
-     fi
- 
-     $opt_dry_run || $RM $removelist
-     func_append removelist " $lockfile"
-     trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
- 
-     func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
-     srcfile=$func_to_tool_file_result
-     func_quote_for_eval "$srcfile"
-     qsrcfile=$func_quote_for_eval_result
- 
-     # Only build a PIC object if we are building libtool libraries.
-     if test "$build_libtool_libs" = yes; then
-       # Without this assignment, base_compile gets emptied.
-       fbsd_hideous_sh_bug=$base_compile
- 
-       if test "$pic_mode" != no; then
- 	command="$base_compile $qsrcfile $pic_flag"
-       else
- 	# Don't build PIC code
- 	command="$base_compile $qsrcfile"
-       fi
- 
-       func_mkdir_p "$xdir$objdir"
- 
-       if test -z "$output_obj"; then
- 	# Place PIC objects in $objdir
- 	func_append command " -o $lobj"
-       fi
- 
-       func_show_eval_locale "$command"	\
-           'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
- 
-       if test "$need_locks" = warn &&
- 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
- 	$ECHO "\
- *** ERROR, $lockfile contains:
- `cat $lockfile 2>/dev/null`
- 
- but it should contain:
- $srcfile
- 
- This indicates that another process is trying to use the same
- temporary object file, and libtool could not work around it because
- your compiler does not support \`-c' and \`-o' together.  If you
- repeat this compilation, it may succeed, by chance, but you had better
- avoid parallel builds (make -j) in this platform, or get a better
- compiler."
- 
- 	$opt_dry_run || $RM $removelist
- 	exit $EXIT_FAILURE
-       fi
- 
-       # Just move the object if needed, then go on to compile the next one
-       if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
- 	func_show_eval '$MV "$output_obj" "$lobj"' \
- 	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-       fi
- 
-       # Allow error messages only from the first compilation.
-       if test "$suppress_opt" = yes; then
- 	suppress_output=' >/dev/null 2>&1'
-       fi
-     fi
- 
-     # Only build a position-dependent object if we build old libraries.
-     if test "$build_old_libs" = yes; then
-       if test "$pic_mode" != yes; then
- 	# Don't build PIC code
- 	command="$base_compile $qsrcfile$pie_flag"
-       else
- 	command="$base_compile $qsrcfile $pic_flag"
-       fi
-       if test "$compiler_c_o" = yes; then
- 	func_append command " -o $obj"
-       fi
- 
-       # Suppress compiler output if we already did a PIC compilation.
-       func_append command "$suppress_output"
-       func_show_eval_locale "$command" \
-         '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
- 
-       if test "$need_locks" = warn &&
- 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
- 	$ECHO "\
- *** ERROR, $lockfile contains:
- `cat $lockfile 2>/dev/null`
- 
- but it should contain:
- $srcfile
- 
- This indicates that another process is trying to use the same
- temporary object file, and libtool could not work around it because
- your compiler does not support \`-c' and \`-o' together.  If you
- repeat this compilation, it may succeed, by chance, but you had better
- avoid parallel builds (make -j) in this platform, or get a better
- compiler."
- 
- 	$opt_dry_run || $RM $removelist
- 	exit $EXIT_FAILURE
-       fi
- 
-       # Just move the object if needed
-       if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
- 	func_show_eval '$MV "$output_obj" "$obj"' \
- 	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-       fi
-     fi
- 
-     $opt_dry_run || {
-       func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
- 
-       # Unlock the critical section if it was locked
-       if test "$need_locks" != no; then
- 	removelist=$lockfile
-         $RM "$lockfile"
-       fi
-     }
- 
-     exit $EXIT_SUCCESS
- }
- 
- $opt_help || {
-   test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
- }
- 
- func_mode_help ()
- {
-     # We need to display help for each of the modes.
-     case $opt_mode in
-       "")
-         # Generic help is extracted from the usage comments
-         # at the start of this file.
-         func_help
-         ;;
- 
-       clean)
-         $ECHO \
- "Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
- 
- Remove files from the build directory.
- 
- RM is the name of the program to use to delete files associated with each FILE
- (typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
- to RM.
- 
- If FILE is a libtool library, object or program, all the files associated
- with it are deleted. Otherwise, only FILE itself is deleted using RM."
-         ;;
- 
-       compile)
-       $ECHO \
- "Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
- 
- Compile a source file into a libtool library object.
- 
- This mode accepts the following additional options:
- 
-   -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-   -no-suppress      do not suppress compiler output for multiple passes
-   -prefer-pic       try to build PIC objects only
-   -prefer-non-pic   try to build non-PIC objects only
-   -shared           do not build a \`.o' file suitable for static linking
-   -static           only build a \`.o' file suitable for static linking
-   -Wc,FLAG          pass FLAG directly to the compiler
- 
- COMPILE-COMMAND is a command to be used in creating a \`standard' object file
- from the given SOURCEFILE.
- 
- The output file name is determined by removing the directory component from
- SOURCEFILE, then substituting the C source code suffix \`.c' with the
- library object suffix, \`.lo'."
-         ;;
- 
-       execute)
-         $ECHO \
- "Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
- 
- Automatically set library path, then run a program.
- 
- This mode accepts the following additional options:
- 
-   -dlopen FILE      add the directory containing FILE to the library path
- 
- This mode sets the library path environment variable according to \`-dlopen'
- flags.
- 
- If any of the ARGS are libtool executable wrappers, then they are translated
- into their corresponding uninstalled binary, and any of their required library
- directories are added to the library path.
- 
- Then, COMMAND is executed, with ARGS as arguments."
-         ;;
- 
-       finish)
-         $ECHO \
- "Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
- 
- Complete the installation of libtool libraries.
- 
- Each LIBDIR is a directory that contains libtool libraries.
- 
- The commands that this mode executes may require superuser privileges.  Use
- the \`--dry-run' option if you just want to see what would be executed."
-         ;;
- 
-       install)
-         $ECHO \
- "Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
- 
- Install executables or libraries.
- 
- INSTALL-COMMAND is the installation command.  The first component should be
- either the \`install' or \`cp' program.
- 
- The following components of INSTALL-COMMAND are treated specially:
- 
-   -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
- 
- The rest of the components are interpreted as arguments to that command (only
- BSD-compatible install options are recognized)."
-         ;;
- 
-       link)
-         $ECHO \
- "Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
- 
- Link object files or libraries together to form another library, or to
- create an executable program.
- 
- LINK-COMMAND is a command using the C compiler that you would use to create
- a program from several object files.
- 
- The following components of LINK-COMMAND are treated specially:
- 
-   -all-static       do not do any dynamic linking at all
-   -avoid-version    do not add a version suffix if possible
-   -bindir BINDIR    specify path to binaries directory (for systems where
-                     libraries must be found in the PATH setting at runtime)
-   -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-   -export-symbols SYMFILE
-                     try to export only the symbols listed in SYMFILE
-   -export-symbols-regex REGEX
-                     try to export only the symbols matching REGEX
-   -LLIBDIR          search LIBDIR for required installed libraries
-   -lNAME            OUTPUT-FILE requires the installed library libNAME
-   -module           build a library that can dlopened
-   -no-fast-install  disable the fast-install mode
-   -no-install       link a not-installable executable
-   -no-undefined     declare that a library does not refer to external symbols
-   -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-   -objectlist FILE  Use a list of object files found in FILE to specify objects
-   -precious-files-regex REGEX
-                     don't remove output files matching REGEX
-   -release RELEASE  specify package release information
-   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-   -shared           only do dynamic linking of libtool libraries
-   -shrext SUFFIX    override the standard shared library file extension
-   -static           do not do any dynamic linking of uninstalled libtool libraries
-   -static-libtool-libs
-                     do not do any dynamic linking of libtool libraries
-   -version-info CURRENT[:REVISION[:AGE]]
-                     specify library version info [each variable defaults to 0]
-   -weak LIBNAME     declare that the target provides the LIBNAME interface
-   -Wc,FLAG
-   -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
-   -Wl,FLAG
-   -Xlinker FLAG     pass linker-specific FLAG directly to the linker
-   -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
- 
- All other options (arguments beginning with \`-') are ignored.
- 
- Every other argument is treated as a filename.  Files ending in \`.la' are
- treated as uninstalled libtool libraries, other files are standard or library
- object files.
- 
- If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
- only library objects (\`.lo' files) may be specified, and \`-rpath' is
- required, except when creating a convenience library.
- 
- If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
- using \`ar' and \`ranlib', or on Windows using \`lib'.
- 
- If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
- is created, otherwise an executable program is created."
-         ;;
- 
-       uninstall)
-         $ECHO \
- "Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
- 
- Remove libraries from an installation directory.
- 
- RM is the name of the program to use to delete files associated with each FILE
- (typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
- to RM.
- 
- If FILE is a libtool library, all the files associated with it are deleted.
- Otherwise, only FILE itself is deleted using RM."
-         ;;
- 
-       *)
-         func_fatal_help "invalid operation mode \`$opt_mode'"
-         ;;
-     esac
- 
-     echo
-     $ECHO "Try \`$progname --help' for more information about other modes."
- }
- 
- # Now that we've collected a possible --mode arg, show help if necessary
- if $opt_help; then
-   if test "$opt_help" = :; then
-     func_mode_help
-   else
-     {
-       func_help noexit
-       for opt_mode in compile link execute install finish uninstall clean; do
- 	func_mode_help
-       done
-     } | sed -n '1p; 2,$s/^Usage:/  or: /p'
-     {
-       func_help noexit
-       for opt_mode in compile link execute install finish uninstall clean; do
- 	echo
- 	func_mode_help
-       done
-     } |
-     sed '1d
-       /^When reporting/,/^Report/{
- 	H
- 	d
-       }
-       $x
-       /information about other modes/d
-       /more detailed .*MODE/d
-       s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
-   fi
-   exit $?
- fi
- 
- 
- # func_mode_execute arg...
- func_mode_execute ()
- {
-     $opt_debug
-     # The first argument is the command name.
-     cmd="$nonopt"
-     test -z "$cmd" && \
-       func_fatal_help "you must specify a COMMAND"
- 
-     # Handle -dlopen flags immediately.
-     for file in $opt_dlopen; do
-       test -f "$file" \
- 	|| func_fatal_help "\`$file' is not a file"
- 
-       dir=
-       case $file in
-       *.la)
- 	func_resolve_sysroot "$file"
- 	file=$func_resolve_sysroot_result
- 
- 	# Check to see that this really is a libtool archive.
- 	func_lalib_unsafe_p "$file" \
- 	  || func_fatal_help "\`$lib' is not a valid libtool archive"
- 
- 	# Read the libtool library.
- 	dlname=
- 	library_names=
- 	func_source "$file"
- 
- 	# Skip this library if it cannot be dlopened.
- 	if test -z "$dlname"; then
- 	  # Warn if it was a shared library.
- 	  test -n "$library_names" && \
- 	    func_warning "\`$file' was not linked with \`-export-dynamic'"
- 	  continue
- 	fi
- 
- 	func_dirname "$file" "" "."
- 	dir="$func_dirname_result"
- 
- 	if test -f "$dir/$objdir/$dlname"; then
- 	  func_append dir "/$objdir"
- 	else
- 	  if test ! -f "$dir/$dlname"; then
- 	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
- 	  fi
- 	fi
- 	;;
- 
-       *.lo)
- 	# Just add the directory containing the .lo file.
- 	func_dirname "$file" "" "."
- 	dir="$func_dirname_result"
- 	;;
- 
-       *)
- 	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
- 	continue
- 	;;
-       esac
- 
-       # Get the absolute pathname.
-       absdir=`cd "$dir" && pwd`
-       test -n "$absdir" && dir="$absdir"
- 
-       # Now add the directory to shlibpath_var.
-       if eval "test -z \"\$$shlibpath_var\""; then
- 	eval "$shlibpath_var=\"\$dir\""
-       else
- 	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-       fi
-     done
- 
-     # This variable tells wrapper scripts just to set shlibpath_var
-     # rather than running their programs.
-     libtool_execute_magic="$magic"
- 
-     # Check if any of the arguments is a wrapper script.
-     args=
-     for file
-     do
-       case $file in
-       -* | *.la | *.lo ) ;;
-       *)
- 	# Do a test to see if this is really a libtool program.
- 	if func_ltwrapper_script_p "$file"; then
- 	  func_source "$file"
- 	  # Transform arg to wrapped name.
- 	  file="$progdir/$program"
- 	elif func_ltwrapper_executable_p "$file"; then
- 	  func_ltwrapper_scriptname "$file"
- 	  func_source "$func_ltwrapper_scriptname_result"
- 	  # Transform arg to wrapped name.
- 	  file="$progdir/$program"
- 	fi
- 	;;
-       esac
-       # Quote arguments (to preserve shell metacharacters).
-       func_append_quoted args "$file"
-     done
- 
-     if test "X$opt_dry_run" = Xfalse; then
-       if test -n "$shlibpath_var"; then
- 	# Export the shlibpath_var.
- 	eval "export $shlibpath_var"
-       fi
- 
-       # Restore saved environment variables
-       for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-       do
- 	eval "if test \"\${save_$lt_var+set}\" = set; then
-                 $lt_var=\$save_$lt_var; export $lt_var
- 	      else
- 		$lt_unset $lt_var
- 	      fi"
-       done
- 
-       # Now prepare to actually exec the command.
-       exec_cmd="\$cmd$args"
-     else
-       # Display what would be done.
-       if test -n "$shlibpath_var"; then
- 	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
- 	echo "export $shlibpath_var"
-       fi
-       $ECHO "$cmd$args"
-       exit $EXIT_SUCCESS
-     fi
- }
- 
- test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
- 
- 
- # func_mode_finish arg...
- func_mode_finish ()
- {
-     $opt_debug
-     libs=
-     libdirs=
-     admincmds=
- 
-     for opt in "$nonopt" ${1+"$@"}
-     do
-       if test -d "$opt"; then
- 	func_append libdirs " $opt"
- 
-       elif test -f "$opt"; then
- 	if func_lalib_unsafe_p "$opt"; then
- 	  func_append libs " $opt"
- 	else
- 	  func_warning "\`$opt' is not a valid libtool archive"
- 	fi
- 
-       else
- 	func_fatal_error "invalid argument \`$opt'"
-       fi
-     done
- 
-     if test -n "$libs"; then
-       if test -n "$lt_sysroot"; then
-         sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
-         sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
-       else
-         sysroot_cmd=
-       fi
- 
-       # Remove sysroot references
-       if $opt_dry_run; then
-         for lib in $libs; do
-           echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
-         done
-       else
-         tmpdir=`func_mktempdir`
-         for lib in $libs; do
- 	  sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
- 	    > $tmpdir/tmp-la
- 	  mv -f $tmpdir/tmp-la $lib
- 	done
-         ${RM}r "$tmpdir"
-       fi
-     fi
- 
-     if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-       for libdir in $libdirs; do
- 	if test -n "$finish_cmds"; then
- 	  # Do each command in the finish commands.
- 	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
- '"$cmd"'"'
- 	fi
- 	if test -n "$finish_eval"; then
- 	  # Do the single finish_eval.
- 	  eval cmds=\"$finish_eval\"
- 	  $opt_dry_run || eval "$cmds" || func_append admincmds "
-        $cmds"
- 	fi
-       done
-     fi
- 
-     # Exit here if they wanted silent mode.
-     $opt_silent && exit $EXIT_SUCCESS
- 
-     if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-       echo "----------------------------------------------------------------------"
-       echo "Libraries have been installed in:"
-       for libdir in $libdirs; do
- 	$ECHO "   $libdir"
-       done
-       echo
-       echo "If you ever happen to want to link against installed libraries"
-       echo "in a given directory, LIBDIR, you must either use libtool, and"
-       echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-       echo "flag during linking and do at least one of the following:"
-       if test -n "$shlibpath_var"; then
- 	echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
- 	echo "     during execution"
-       fi
-       if test -n "$runpath_var"; then
- 	echo "   - add LIBDIR to the \`$runpath_var' environment variable"
- 	echo "     during linking"
-       fi
-       if test -n "$hardcode_libdir_flag_spec"; then
- 	libdir=LIBDIR
- 	eval flag=\"$hardcode_libdir_flag_spec\"
- 
- 	$ECHO "   - use the \`$flag' linker flag"
-       fi
-       if test -n "$admincmds"; then
- 	$ECHO "   - have your system administrator run these commands:$admincmds"
-       fi
-       if test -f /etc/ld.so.conf; then
- 	echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-       fi
-       echo
- 
-       echo "See any operating system documentation about shared libraries for"
-       case $host in
- 	solaris2.[6789]|solaris2.1[0-9])
- 	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
- 	  echo "pages."
- 	  ;;
- 	*)
- 	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
- 	  ;;
-       esac
-       echo "----------------------------------------------------------------------"
-     fi
-     exit $EXIT_SUCCESS
- }
- 
- test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
- 
- 
- # func_mode_install arg...
- func_mode_install ()
- {
-     $opt_debug
-     # There may be an optional sh(1) argument at the beginning of
-     # install_prog (especially on Windows NT).
-     if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-        # Allow the use of GNU shtool's install command.
-        case $nonopt in *shtool*) :;; *) false;; esac; then
-       # Aesthetically quote it.
-       func_quote_for_eval "$nonopt"
-       install_prog="$func_quote_for_eval_result "
-       arg=$1
-       shift
-     else
-       install_prog=
-       arg=$nonopt
-     fi
- 
-     # The real first argument should be the name of the installation program.
-     # Aesthetically quote it.
-     func_quote_for_eval "$arg"
-     func_append install_prog "$func_quote_for_eval_result"
-     install_shared_prog=$install_prog
-     case " $install_prog " in
-       *[\\\ /]cp\ *) install_cp=: ;;
-       *) install_cp=false ;;
-     esac
- 
-     # We need to accept at least all the BSD install flags.
-     dest=
-     files=
-     opts=
-     prev=
-     install_type=
-     isdir=no
-     stripme=
-     no_mode=:
-     for arg
-     do
-       arg2=
-       if test -n "$dest"; then
- 	func_append files " $dest"
- 	dest=$arg
- 	continue
-       fi
- 
-       case $arg in
-       -d) isdir=yes ;;
-       -f)
- 	if $install_cp; then :; else
- 	  prev=$arg
- 	fi
- 	;;
-       -g | -m | -o)
- 	prev=$arg
- 	;;
-       -s)
- 	stripme=" -s"
- 	continue
- 	;;
-       -*)
- 	;;
-       *)
- 	# If the previous option needed an argument, then skip it.
- 	if test -n "$prev"; then
- 	  if test "x$prev" = x-m && test -n "$install_override_mode"; then
- 	    arg2=$install_override_mode
- 	    no_mode=false
- 	  fi
- 	  prev=
- 	else
- 	  dest=$arg
- 	  continue
- 	fi
- 	;;
-       esac
- 
-       # Aesthetically quote the argument.
-       func_quote_for_eval "$arg"
-       func_append install_prog " $func_quote_for_eval_result"
-       if test -n "$arg2"; then
- 	func_quote_for_eval "$arg2"
-       fi
-       func_append install_shared_prog " $func_quote_for_eval_result"
-     done
- 
-     test -z "$install_prog" && \
-       func_fatal_help "you must specify an install program"
- 
-     test -n "$prev" && \
-       func_fatal_help "the \`$prev' option requires an argument"
- 
-     if test -n "$install_override_mode" && $no_mode; then
-       if $install_cp; then :; else
- 	func_quote_for_eval "$install_override_mode"
- 	func_append install_shared_prog " -m $func_quote_for_eval_result"
-       fi
-     fi
- 
-     if test -z "$files"; then
-       if test -z "$dest"; then
- 	func_fatal_help "no file or destination specified"
-       else
- 	func_fatal_help "you must specify a destination"
-       fi
-     fi
- 
-     # Strip any trailing slash from the destination.
-     func_stripname '' '/' "$dest"
-     dest=$func_stripname_result
- 
-     # Check to see that the destination is a directory.
-     test -d "$dest" && isdir=yes
-     if test "$isdir" = yes; then
-       destdir="$dest"
-       destname=
-     else
-       func_dirname_and_basename "$dest" "" "."
-       destdir="$func_dirname_result"
-       destname="$func_basename_result"
- 
-       # Not a directory, so check to see that there is only one file specified.
-       set dummy $files; shift
-       test "$#" -gt 1 && \
- 	func_fatal_help "\`$dest' is not a directory"
-     fi
-     case $destdir in
-     [\\/]* | [A-Za-z]:[\\/]*) ;;
-     *)
-       for file in $files; do
- 	case $file in
- 	*.lo) ;;
- 	*)
- 	  func_fatal_help "\`$destdir' must be an absolute directory name"
- 	  ;;
- 	esac
-       done
-       ;;
-     esac
- 
-     # This variable tells wrapper scripts just to set variables rather
-     # than running their programs.
-     libtool_install_magic="$magic"
- 
-     staticlibs=
-     future_libdirs=
-     current_libdirs=
-     for file in $files; do
- 
-       # Do each installation.
-       case $file in
-       *.$libext)
- 	# Do the static libraries later.
- 	func_append staticlibs " $file"
- 	;;
- 
-       *.la)
- 	func_resolve_sysroot "$file"
- 	file=$func_resolve_sysroot_result
- 
- 	# Check to see that this really is a libtool archive.
- 	func_lalib_unsafe_p "$file" \
- 	  || func_fatal_help "\`$file' is not a valid libtool archive"
- 
- 	library_names=
- 	old_library=
- 	relink_command=
- 	func_source "$file"
- 
- 	# Add the libdir to current_libdirs if it is the destination.
- 	if test "X$destdir" = "X$libdir"; then
- 	  case "$current_libdirs " in
- 	  *" $libdir "*) ;;
- 	  *) func_append current_libdirs " $libdir" ;;
- 	  esac
- 	else
- 	  # Note the libdir as a future libdir.
- 	  case "$future_libdirs " in
- 	  *" $libdir "*) ;;
- 	  *) func_append future_libdirs " $libdir" ;;
- 	  esac
- 	fi
- 
- 	func_dirname "$file" "/" ""
- 	dir="$func_dirname_result"
- 	func_append dir "$objdir"
- 
- 	if test -n "$relink_command"; then
- 	  # Determine the prefix the user has applied to our future dir.
- 	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
- 
- 	  # Don't allow the user to place us outside of our expected
- 	  # location b/c this prevents finding dependent libraries that
- 	  # are installed to the same prefix.
- 	  # At present, this check doesn't affect windows .dll's that
- 	  # are installed into $libdir/../bin (currently, that works fine)
- 	  # but it's something to keep an eye on.
- 	  test "$inst_prefix_dir" = "$destdir" && \
- 	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
- 
- 	  if test -n "$inst_prefix_dir"; then
- 	    # Stick the inst_prefix_dir data into the link command.
- 	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
- 	  else
- 	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
- 	  fi
- 
- 	  func_warning "relinking \`$file'"
- 	  func_show_eval "$relink_command" \
- 	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
- 	fi
- 
- 	# See the names of the shared library.
- 	set dummy $library_names; shift
- 	if test -n "$1"; then
- 	  realname="$1"
- 	  shift
- 
- 	  srcname="$realname"
- 	  test -n "$relink_command" && srcname="$realname"T
- 
- 	  # Install the shared library and build the symlinks.
- 	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
- 	      'exit $?'
- 	  tstripme="$stripme"
- 	  case $host_os in
- 	  cygwin* | mingw* | pw32* | cegcc*)
- 	    case $realname in
- 	    *.dll.a)
- 	      tstripme=""
- 	      ;;
- 	    esac
- 	    ;;
- 	  esac
- 	  if test -n "$tstripme" && test -n "$striplib"; then
- 	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
- 	  fi
- 
- 	  if test "$#" -gt 0; then
- 	    # Delete the old symlinks, and create new ones.
- 	    # Try `ln -sf' first, because the `ln' binary might depend on
- 	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
- 	    # so we also need to try rm && ln -s.
- 	    for linkname
- 	    do
- 	      test "$linkname" != "$realname" \
- 		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
- 	    done
- 	  fi
- 
- 	  # Do each command in the postinstall commands.
- 	  lib="$destdir/$realname"
- 	  func_execute_cmds "$postinstall_cmds" 'exit $?'
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
- 	func_basename "$file"
- 	name="$func_basename_result"
- 	instname="$dir/$name"i
- 	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
- 	;;
- 
-       *.lo)
- 	# Install (i.e. copy) a libtool object.
- 
- 	# Figure out destination file name, if it wasn't already specified.
- 	if test -n "$destname"; then
- 	  destfile="$destdir/$destname"
- 	else
- 	  func_basename "$file"
- 	  destfile="$func_basename_result"
- 	  destfile="$destdir/$destfile"
- 	fi
- 
- 	# Deduce the name of the destination old-style object file.
- 	case $destfile in
- 	*.lo)
- 	  func_lo2o "$destfile"
- 	  staticdest=$func_lo2o_result
- 	  ;;
- 	*.$objext)
- 	  staticdest="$destfile"
- 	  destfile=
- 	  ;;
- 	*)
- 	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
- 	  ;;
- 	esac
- 
- 	# Install the libtool object if requested.
- 	test -n "$destfile" && \
- 	  func_show_eval "$install_prog $file $destfile" 'exit $?'
- 
- 	# Install the old object if enabled.
- 	if test "$build_old_libs" = yes; then
- 	  # Deduce the name of the old-style object file.
- 	  func_lo2o "$file"
- 	  staticobj=$func_lo2o_result
- 	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
- 	fi
- 	exit $EXIT_SUCCESS
- 	;;
- 
-       *)
- 	# Figure out destination file name, if it wasn't already specified.
- 	if test -n "$destname"; then
- 	  destfile="$destdir/$destname"
- 	else
- 	  func_basename "$file"
- 	  destfile="$func_basename_result"
- 	  destfile="$destdir/$destfile"
- 	fi
- 
- 	# If the file is missing, and there is a .exe on the end, strip it
- 	# because it is most likely a libtool script we actually want to
- 	# install
- 	stripped_ext=""
- 	case $file in
- 	  *.exe)
- 	    if test ! -f "$file"; then
- 	      func_stripname '' '.exe' "$file"
- 	      file=$func_stripname_result
- 	      stripped_ext=".exe"
- 	    fi
- 	    ;;
- 	esac
- 
- 	# Do a test to see if this is really a libtool program.
- 	case $host in
- 	*cygwin* | *mingw*)
- 	    if func_ltwrapper_executable_p "$file"; then
- 	      func_ltwrapper_scriptname "$file"
- 	      wrapper=$func_ltwrapper_scriptname_result
- 	    else
- 	      func_stripname '' '.exe' "$file"
- 	      wrapper=$func_stripname_result
- 	    fi
- 	    ;;
- 	*)
- 	    wrapper=$file
- 	    ;;
- 	esac
- 	if func_ltwrapper_script_p "$wrapper"; then
- 	  notinst_deplibs=
- 	  relink_command=
- 
- 	  func_source "$wrapper"
- 
- 	  # Check the variables that should have been set.
- 	  test -z "$generated_by_libtool_version" && \
- 	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
- 
- 	  finalize=yes
- 	  for lib in $notinst_deplibs; do
- 	    # Check to see that each library is installed.
- 	    libdir=
- 	    if test -f "$lib"; then
- 	      func_source "$lib"
- 	    fi
- 	    libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
- 	    if test -n "$libdir" && test ! -f "$libfile"; then
- 	      func_warning "\`$lib' has not been installed in \`$libdir'"
- 	      finalize=no
- 	    fi
- 	  done
- 
- 	  relink_command=
- 	  func_source "$wrapper"
- 
- 	  outputname=
- 	  if test "$fast_install" = no && test -n "$relink_command"; then
- 	    $opt_dry_run || {
- 	      if test "$finalize" = yes; then
- 	        tmpdir=`func_mktempdir`
- 		func_basename "$file$stripped_ext"
- 		file="$func_basename_result"
- 	        outputname="$tmpdir/$file"
- 	        # Replace the output file specification.
- 	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
- 
- 	        $opt_silent || {
- 	          func_quote_for_expand "$relink_command"
- 		  eval "func_echo $func_quote_for_expand_result"
- 	        }
- 	        if eval "$relink_command"; then :
- 	          else
- 		  func_error "error: relink \`$file' with the above command before installing it"
- 		  $opt_dry_run || ${RM}r "$tmpdir"
- 		  continue
- 	        fi
- 	        file="$outputname"
- 	      else
- 	        func_warning "cannot relink \`$file'"
- 	      fi
- 	    }
- 	  else
- 	    # Install the binary that we compiled earlier.
- 	    file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
- 	  fi
- 	fi
- 
- 	# remove .exe since cygwin /usr/bin/install will append another
- 	# one anyway
- 	case $install_prog,$host in
- 	*/usr/bin/install*,*cygwin*)
- 	  case $file:$destfile in
- 	  *.exe:*.exe)
- 	    # this is ok
- 	    ;;
- 	  *.exe:*)
- 	    destfile=$destfile.exe
- 	    ;;
- 	  *:*.exe)
- 	    func_stripname '' '.exe' "$destfile"
- 	    destfile=$func_stripname_result
- 	    ;;
- 	  esac
- 	  ;;
- 	esac
- 	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
- 	$opt_dry_run || if test -n "$outputname"; then
- 	  ${RM}r "$tmpdir"
- 	fi
- 	;;
-       esac
-     done
- 
-     for file in $staticlibs; do
-       func_basename "$file"
-       name="$func_basename_result"
- 
-       # Set up the ranlib parameters.
-       oldlib="$destdir/$name"
-       func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
-       tool_oldlib=$func_to_tool_file_result
- 
-       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
- 
-       if test -n "$stripme" && test -n "$old_striplib"; then
- 	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
-       fi
- 
-       # Do each command in the postinstall commands.
-       func_execute_cmds "$old_postinstall_cmds" 'exit $?'
-     done
- 
-     test -n "$future_libdirs" && \
-       func_warning "remember to run \`$progname --finish$future_libdirs'"
- 
-     if test -n "$current_libdirs"; then
-       # Maybe just do a dry run.
-       $opt_dry_run && current_libdirs=" -n$current_libdirs"
-       exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-     else
-       exit $EXIT_SUCCESS
-     fi
- }
- 
- test "$opt_mode" = install && func_mode_install ${1+"$@"}
- 
- 
- # func_generate_dlsyms outputname originator pic_p
- # Extract symbols from dlprefiles and create ${outputname}S.o with
- # a dlpreopen symbol table.
- func_generate_dlsyms ()
- {
-     $opt_debug
-     my_outputname="$1"
-     my_originator="$2"
-     my_pic_p="${3-no}"
-     my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
-     my_dlsyms=
- 
-     if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-       if test -n "$NM" && test -n "$global_symbol_pipe"; then
- 	my_dlsyms="${my_outputname}S.c"
-       else
- 	func_error "not configured to extract global symbols from dlpreopened files"
-       fi
-     fi
- 
-     if test -n "$my_dlsyms"; then
-       case $my_dlsyms in
-       "") ;;
-       *.c)
- 	# Discover the nlist of each of the dlfiles.
- 	nlist="$output_objdir/${my_outputname}.nm"
- 
- 	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
- 
- 	# Parse the name list into a source file.
- 	func_verbose "creating $output_objdir/$my_dlsyms"
- 
- 	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
- /* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
- /* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
- 
- #ifdef __cplusplus
- extern \"C\" {
- #endif
- 
- #if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
- #pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
- #endif
- 
- /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
- #if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
- /* DATA imports from DLLs on WIN32 con't be const, because runtime
-    relocations are performed -- see ld's documentation on pseudo-relocs.  */
- # define LT_DLSYM_CONST
- #elif defined(__osf__)
- /* This system does not cope well with relocations in const data.  */
- # define LT_DLSYM_CONST
- #else
- # define LT_DLSYM_CONST const
- #endif
- 
- /* External symbol declarations for the compiler. */\
- "
- 
- 	if test "$dlself" = yes; then
- 	  func_verbose "generating symbol list for \`$output'"
- 
- 	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
- 
- 	  # Add our own program objects to the symbol list.
- 	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
- 	  for progfile in $progfiles; do
- 	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
- 	    func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
- 	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
- 	  done
- 
- 	  if test -n "$exclude_expsyms"; then
- 	    $opt_dry_run || {
- 	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
- 	      eval '$MV "$nlist"T "$nlist"'
- 	    }
- 	  fi
- 
- 	  if test -n "$export_symbols_regex"; then
- 	    $opt_dry_run || {
- 	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
- 	      eval '$MV "$nlist"T "$nlist"'
- 	    }
- 	  fi
- 
- 	  # Prepare the list of exported symbols
- 	  if test -z "$export_symbols"; then
- 	    export_symbols="$output_objdir/$outputname.exp"
- 	    $opt_dry_run || {
- 	      $RM $export_symbols
- 	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
- 	      case $host in
- 	      *cygwin* | *mingw* | *cegcc* )
-                 eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-                 eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
- 	        ;;
- 	      esac
- 	    }
- 	  else
- 	    $opt_dry_run || {
- 	      eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
- 	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
- 	      eval '$MV "$nlist"T "$nlist"'
- 	      case $host in
- 	        *cygwin* | *mingw* | *cegcc* )
- 	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
- 	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
- 	          ;;
- 	      esac
- 	    }
- 	  fi
- 	fi
- 
- 	for dlprefile in $dlprefiles; do
- 	  func_verbose "extracting global C symbols from \`$dlprefile'"
- 	  func_basename "$dlprefile"
- 	  name="$func_basename_result"
-           case $host in
- 	    *cygwin* | *mingw* | *cegcc* )
- 	      # if an import library, we need to obtain dlname
- 	      if func_win32_import_lib_p "$dlprefile"; then
- 	        func_tr_sh "$dlprefile"
- 	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
- 	        dlprefile_dlbasename=""
- 	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
- 	          # Use subshell, to avoid clobbering current variable values
- 	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
- 	          if test -n "$dlprefile_dlname" ; then
- 	            func_basename "$dlprefile_dlname"
- 	            dlprefile_dlbasename="$func_basename_result"
- 	          else
- 	            # no lafile. user explicitly requested -dlpreopen <import library>.
- 	            $sharedlib_from_linklib_cmd "$dlprefile"
- 	            dlprefile_dlbasename=$sharedlib_from_linklib_result
- 	          fi
- 	        fi
- 	        $opt_dry_run || {
- 	          if test -n "$dlprefile_dlbasename" ; then
- 	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
- 	          else
- 	            func_warning "Could not compute DLL name from $name"
- 	            eval '$ECHO ": $name " >> "$nlist"'
- 	          fi
- 	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
- 	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
- 	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
- 	        }
- 	      else # not an import lib
- 	        $opt_dry_run || {
- 	          eval '$ECHO ": $name " >> "$nlist"'
- 	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
- 	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
- 	        }
- 	      fi
- 	    ;;
- 	    *)
- 	      $opt_dry_run || {
- 	        eval '$ECHO ": $name " >> "$nlist"'
- 	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
- 	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
- 	      }
- 	    ;;
-           esac
- 	done
- 
- 	$opt_dry_run || {
- 	  # Make sure we have at least an empty file.
- 	  test -f "$nlist" || : > "$nlist"
- 
- 	  if test -n "$exclude_expsyms"; then
- 	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
- 	    $MV "$nlist"T "$nlist"
- 	  fi
- 
- 	  # Try sorting and uniquifying the output.
- 	  if $GREP -v "^: " < "$nlist" |
- 	      if sort -k 3 </dev/null >/dev/null 2>&1; then
- 		sort -k 3
- 	      else
- 		sort +2
- 	      fi |
- 	      uniq > "$nlist"S; then
- 	    :
- 	  else
- 	    $GREP -v "^: " < "$nlist" > "$nlist"S
- 	  fi
- 
- 	  if test -f "$nlist"S; then
- 	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
- 	  else
- 	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
- 	  fi
- 
- 	  echo >> "$output_objdir/$my_dlsyms" "\
- 
- /* The mapping between symbol names and symbols.  */
- typedef struct {
-   const char *name;
-   void *address;
- } lt_dlsymlist;
- extern LT_DLSYM_CONST lt_dlsymlist
- lt_${my_prefix}_LTX_preloaded_symbols[];
- LT_DLSYM_CONST lt_dlsymlist
- lt_${my_prefix}_LTX_preloaded_symbols[] =
- {\
-   { \"$my_originator\", (void *) 0 },"
- 
- 	  case $need_lib_prefix in
- 	  no)
- 	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
- 	    ;;
- 	  *)
- 	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
- 	    ;;
- 	  esac
- 	  echo >> "$output_objdir/$my_dlsyms" "\
-   {0, (void *) 0}
- };
- 
- /* This works around a problem in FreeBSD linker */
- #ifdef FREEBSD_WORKAROUND
- static const void *lt_preloaded_setup() {
-   return lt_${my_prefix}_LTX_preloaded_symbols;
- }
- #endif
- 
- #ifdef __cplusplus
- }
- #endif\
- "
- 	} # !$opt_dry_run
- 
- 	pic_flag_for_symtable=
- 	case "$compile_command " in
- 	*" -static "*) ;;
- 	*)
- 	  case $host in
- 	  # compiling the symbol table file with pic_flag works around
- 	  # a FreeBSD bug that causes programs to crash when -lm is
- 	  # linked before any other PIC object.  But we must not use
- 	  # pic_flag when linking with -static.  The problem exists in
- 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
- 	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
- 	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
- 	  *-*-hpux*)
- 	    pic_flag_for_symtable=" $pic_flag"  ;;
- 	  *)
- 	    if test "X$my_pic_p" != Xno; then
- 	      pic_flag_for_symtable=" $pic_flag"
- 	    fi
- 	    ;;
- 	  esac
- 	  ;;
- 	esac
- 	symtab_cflags=
- 	for arg in $LTCFLAGS; do
- 	  case $arg in
- 	  -pie | -fpie | -fPIE) ;;
- 	  *) func_append symtab_cflags " $arg" ;;
- 	  esac
- 	done
- 
- 	# Now compile the dynamic symbol file.
- 	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
- 
- 	# Clean up the generated files.
- 	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
- 
- 	# Transform the symbol file into the correct name.
- 	symfileobj="$output_objdir/${my_outputname}S.$objext"
- 	case $host in
- 	*cygwin* | *mingw* | *cegcc* )
- 	  if test -f "$output_objdir/$my_outputname.def"; then
- 	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
- 	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
- 	  else
- 	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
- 	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
- 	  fi
- 	  ;;
- 	*)
- 	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
- 	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
- 	  ;;
- 	esac
- 	;;
-       *)
- 	func_fatal_error "unknown suffix for \`$my_dlsyms'"
- 	;;
-       esac
-     else
-       # We keep going just in case the user didn't refer to
-       # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-       # really was required.
- 
-       # Nullify the symbol file.
-       compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
-       finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
-     fi
- }
- 
- # func_win32_libid arg
- # return the library type of file 'arg'
- #
- # Need a lot of goo to handle *both* DLLs and import libs
- # Has to be a shell function in order to 'eat' the argument
- # that is supplied when $file_magic_command is called.
- # Despite the name, also deal with 64 bit binaries.
- func_win32_libid ()
- {
-   $opt_debug
-   win32_libid_type="unknown"
-   win32_fileres=`file -L $1 2>/dev/null`
-   case $win32_fileres in
-   *ar\ archive\ import\ library*) # definitely import
-     win32_libid_type="x86 archive import"
-     ;;
-   *ar\ archive*) # could be an import, or static
-     # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
-     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
-        $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
-       func_to_tool_file "$1" func_convert_file_msys_to_w32
-       win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
- 	$SED -n -e '
- 	    1,100{
- 		/ I /{
- 		    s,.*,import,
- 		    p
- 		    q
- 		}
- 	    }'`
-       case $win32_nmres in
-       import*)  win32_libid_type="x86 archive import";;
-       *)        win32_libid_type="x86 archive static";;
-       esac
-     fi
-     ;;
-   *DLL*)
-     win32_libid_type="x86 DLL"
-     ;;
-   *executable*) # but shell scripts are "executable" too...
-     case $win32_fileres in
-     *MS\ Windows\ PE\ Intel*)
-       win32_libid_type="x86 DLL"
-       ;;
-     esac
-     ;;
-   esac
-   $ECHO "$win32_libid_type"
- }
- 
- # func_cygming_dll_for_implib ARG
- #
- # Platform-specific function to extract the
- # name of the DLL associated with the specified
- # import library ARG.
- # Invoked by eval'ing the libtool variable
- #    $sharedlib_from_linklib_cmd
- # Result is available in the variable
- #    $sharedlib_from_linklib_result
- func_cygming_dll_for_implib ()
- {
-   $opt_debug
-   sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
- }
- 
- # func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
- #
- # The is the core of a fallback implementation of a
- # platform-specific function to extract the name of the
- # DLL associated with the specified import library LIBNAME.
- #
- # SECTION_NAME is either .idata$6 or .idata$7, depending
- # on the platform and compiler that created the implib.
- #
- # Echos the name of the DLL associated with the
- # specified import library.
- func_cygming_dll_for_implib_fallback_core ()
- {
-   $opt_debug
-   match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
-   $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
-     $SED '/^Contents of section '"$match_literal"':/{
-       # Place marker at beginning of archive member dllname section
-       s/.*/====MARK====/
-       p
-       d
-     }
-     # These lines can sometimes be longer than 43 characters, but
-     # are always uninteresting
-     /:[	 ]*file format pe[i]\{,1\}-/d
-     /^In archive [^:]*:/d
-     # Ensure marker is printed
-     /^====MARK====/p
-     # Remove all lines with less than 43 characters
-     /^.\{43\}/!d
-     # From remaining lines, remove first 43 characters
-     s/^.\{43\}//' |
-     $SED -n '
-       # Join marker and all lines until next marker into a single line
-       /^====MARK====/ b para
-       H
-       $ b para
-       b
-       :para
-       x
-       s/\n//g
-       # Remove the marker
-       s/^====MARK====//
-       # Remove trailing dots and whitespace
-       s/[\. \t]*$//
-       # Print
-       /./p' |
-     # we now have a list, one entry per line, of the stringified
-     # contents of the appropriate section of all members of the
-     # archive which possess that section. Heuristic: eliminate
-     # all those which have a first or second character that is
-     # a '.' (that is, objdump's representation of an unprintable
-     # character.) This should work for all archives with less than
-     # 0x302f exports -- but will fail for DLLs whose name actually
-     # begins with a literal '.' or a single character followed by
-     # a '.'.
-     #
-     # Of those that remain, print the first one.
-     $SED -e '/^\./d;/^.\./d;q'
- }
- 
- # func_cygming_gnu_implib_p ARG
- # This predicate returns with zero status (TRUE) if
- # ARG is a GNU/binutils-style import library. Returns
- # with nonzero status (FALSE) otherwise.
- func_cygming_gnu_implib_p ()
- {
-   $opt_debug
-   func_to_tool_file "$1" func_convert_file_msys_to_w32
-   func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
-   test -n "$func_cygming_gnu_implib_tmp"
- }
- 
- # func_cygming_ms_implib_p ARG
- # This predicate returns with zero status (TRUE) if
- # ARG is an MS-style import library. Returns
- # with nonzero status (FALSE) otherwise.
- func_cygming_ms_implib_p ()
- {
-   $opt_debug
-   func_to_tool_file "$1" func_convert_file_msys_to_w32
-   func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
-   test -n "$func_cygming_ms_implib_tmp"
- }
- 
- # func_cygming_dll_for_implib_fallback ARG
- # Platform-specific function to extract the
- # name of the DLL associated with the specified
- # import library ARG.
- #
- # This fallback implementation is for use when $DLLTOOL
- # does not support the --identify-strict option.
- # Invoked by eval'ing the libtool variable
- #    $sharedlib_from_linklib_cmd
- # Result is available in the variable
- #    $sharedlib_from_linklib_result
- func_cygming_dll_for_implib_fallback ()
- {
-   $opt_debug
-   if func_cygming_gnu_implib_p "$1" ; then
-     # binutils import library
-     sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
-   elif func_cygming_ms_implib_p "$1" ; then
-     # ms-generated import library
-     sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
-   else
-     # unknown
-     sharedlib_from_linklib_result=""
-   fi
- }
- 
- 
- # func_extract_an_archive dir oldlib
- func_extract_an_archive ()
- {
-     $opt_debug
-     f_ex_an_ar_dir="$1"; shift
-     f_ex_an_ar_oldlib="$1"
-     if test "$lock_old_archive_extraction" = yes; then
-       lockfile=$f_ex_an_ar_oldlib.lock
-       until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
- 	func_echo "Waiting for $lockfile to be removed"
- 	sleep 2
-       done
-     fi
-     func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
- 		   'stat=$?; rm -f "$lockfile"; exit $stat'
-     if test "$lock_old_archive_extraction" = yes; then
-       $opt_dry_run || rm -f "$lockfile"
-     fi
-     if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-      :
-     else
-       func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
-     fi
- }
- 
- 
- # func_extract_archives gentop oldlib ...
- func_extract_archives ()
- {
-     $opt_debug
-     my_gentop="$1"; shift
-     my_oldlibs=${1+"$@"}
-     my_oldobjs=""
-     my_xlib=""
-     my_xabs=""
-     my_xdir=""
- 
-     for my_xlib in $my_oldlibs; do
-       # Extract the objects.
-       case $my_xlib in
- 	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
- 	*) my_xabs=`pwd`"/$my_xlib" ;;
-       esac
-       func_basename "$my_xlib"
-       my_xlib="$func_basename_result"
-       my_xlib_u=$my_xlib
-       while :; do
-         case " $extracted_archives " in
- 	*" $my_xlib_u "*)
- 	  func_arith $extracted_serial + 1
- 	  extracted_serial=$func_arith_result
- 	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
- 	*) break ;;
- 	esac
-       done
-       extracted_archives="$extracted_archives $my_xlib_u"
-       my_xdir="$my_gentop/$my_xlib_u"
- 
-       func_mkdir_p "$my_xdir"
- 
-       case $host in
-       *-darwin*)
- 	func_verbose "Extracting $my_xabs"
- 	# Do not bother doing anything if just a dry run
- 	$opt_dry_run || {
- 	  darwin_orig_dir=`pwd`
- 	  cd $my_xdir || exit $?
- 	  darwin_archive=$my_xabs
- 	  darwin_curdir=`pwd`
- 	  darwin_base_archive=`basename "$darwin_archive"`
- 	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
- 	  if test -n "$darwin_arches"; then
- 	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
- 	    darwin_arch=
- 	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
- 	    for darwin_arch in  $darwin_arches ; do
- 	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
- 	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
- 	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
- 	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
- 	      cd "$darwin_curdir"
- 	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
- 	    done # $darwin_arches
-             ## Okay now we've a bunch of thin objects, gotta fatten them up :)
- 	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
- 	    darwin_file=
- 	    darwin_files=
- 	    for darwin_file in $darwin_filelist; do
- 	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
- 	      $LIPO -create -output "$darwin_file" $darwin_files
- 	    done # $darwin_filelist
- 	    $RM -rf unfat-$$
- 	    cd "$darwin_orig_dir"
- 	  else
- 	    cd $darwin_orig_dir
- 	    func_extract_an_archive "$my_xdir" "$my_xabs"
- 	  fi # $darwin_arches
- 	} # !$opt_dry_run
- 	;;
-       *)
-         func_extract_an_archive "$my_xdir" "$my_xabs"
- 	;;
-       esac
-       my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
-     done
- 
-     func_extract_archives_result="$my_oldobjs"
- }
- 
- 
- # func_emit_wrapper [arg=no]
- #
- # Emit a libtool wrapper script on stdout.
- # Don't directly open a file because we may want to
- # incorporate the script contents within a cygwin/mingw
- # wrapper executable.  Must ONLY be called from within
- # func_mode_link because it depends on a number of variables
- # set therein.
- #
- # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
- # variable will take.  If 'yes', then the emitted script
- # will assume that the directory in which it is stored is
- # the $objdir directory.  This is a cygwin/mingw-specific
- # behavior.
- func_emit_wrapper ()
- {
- 	func_emit_wrapper_arg1=${1-no}
- 
- 	$ECHO "\
- #! $SHELL
- 
- # $output - temporary wrapper script for $objdir/$outputname
- # Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
- #
- # The $output program cannot be directly executed until all the libtool
- # libraries that it depends on are installed.
- #
- # This wrapper script should never be moved out of the build directory.
- # If it is, it will not operate correctly.
- 
- # Sed substitution that helps us do robust quoting.  It backslashifies
- # metacharacters that are still active within double-quoted strings.
- sed_quote_subst='$sed_quote_subst'
- 
- # Be Bourne compatible
- if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-   NULLCMD=:
-   # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
-   # is contrary to our usage.  Disable this feature.
-   alias -g '\${1+\"\$@\"}'='\"\$@\"'
-   setopt NO_GLOB_SUBST
- else
-   case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
- fi
- BIN_SH=xpg4; export BIN_SH # for Tru64
- DUALCASE=1; export DUALCASE # for MKS sh
- 
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
- (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- relink_command=\"$relink_command\"
- 
- # This environment variable determines our operation mode.
- if test \"\$libtool_install_magic\" = \"$magic\"; then
-   # install mode needs the following variables:
-   generated_by_libtool_version='$macro_version'
-   notinst_deplibs='$notinst_deplibs'
- else
-   # When we are sourced in execute mode, \$file and \$ECHO are already set.
-   if test \"\$libtool_execute_magic\" != \"$magic\"; then
-     file=\"\$0\""
- 
-     qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
-     $ECHO "\
- 
- # A function that is used when there is no print builtin or printf.
- func_fallback_echo ()
- {
-   eval 'cat <<_LTECHO_EOF
- \$1
- _LTECHO_EOF'
- }
-     ECHO=\"$qECHO\"
-   fi
- 
- # Very basic option parsing. These options are (a) specific to
- # the libtool wrapper, (b) are identical between the wrapper
- # /script/ and the wrapper /executable/ which is used only on
- # windows platforms, and (c) all begin with the string "--lt-"
- # (application programs are unlikely to have options which match
- # this pattern).
- #
- # There are only two supported options: --lt-debug and
- # --lt-dump-script. There is, deliberately, no --lt-help.
- #
- # The first argument to this parsing function should be the
- # script's $0 value, followed by "$@".
- lt_option_debug=
- func_parse_lt_options ()
- {
-   lt_script_arg0=\$0
-   shift
-   for lt_opt
-   do
-     case \"\$lt_opt\" in
-     --lt-debug) lt_option_debug=1 ;;
-     --lt-dump-script)
-         lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
-         test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
-         lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
-         cat \"\$lt_dump_D/\$lt_dump_F\"
-         exit 0
-       ;;
-     --lt-*)
-         \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
-         exit 1
-       ;;
-     esac
-   done
- 
-   # Print the debug banner immediately:
-   if test -n \"\$lt_option_debug\"; then
-     echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
-   fi
- }
- 
- # Used when --lt-debug. Prints its arguments to stdout
- # (redirection is the responsibility of the caller)
- func_lt_dump_args ()
- {
-   lt_dump_args_N=1;
-   for lt_arg
-   do
-     \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
-     lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
-   done
- }
- 
- # Core function for launching the target application
- func_exec_program_core ()
- {
- "
-   case $host in
-   # Backslashes separate directories on plain windows
-   *-*-mingw | *-*-os2* | *-cegcc*)
-     $ECHO "\
-       if test -n \"\$lt_option_debug\"; then
-         \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
-         func_lt_dump_args \${1+\"\$@\"} 1>&2
-       fi
-       exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
- "
-     ;;
- 
-   *)
-     $ECHO "\
-       if test -n \"\$lt_option_debug\"; then
-         \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
-         func_lt_dump_args \${1+\"\$@\"} 1>&2
-       fi
-       exec \"\$progdir/\$program\" \${1+\"\$@\"}
- "
-     ;;
-   esac
-   $ECHO "\
-       \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
-       exit 1
- }
- 
- # A function to encapsulate launching the target application
- # Strips options in the --lt-* namespace from \$@ and
- # launches target application with the remaining arguments.
- func_exec_program ()
- {
-   case \" \$* \" in
-   *\\ --lt-*)
-     for lt_wr_arg
-     do
-       case \$lt_wr_arg in
-       --lt-*) ;;
-       *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-       esac
-       shift
-     done ;;
-   esac
-   func_exec_program_core \${1+\"\$@\"}
- }
- 
-   # Parse options
-   func_parse_lt_options \"\$0\" \${1+\"\$@\"}
- 
-   # Find the directory that this script lives in.
-   thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
-   test \"x\$thisdir\" = \"x\$file\" && thisdir=.
- 
-   # Follow symbolic links until we get to the real thisdir.
-   file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
-   while test -n \"\$file\"; do
-     destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
- 
-     # If there was a directory component, then change thisdir.
-     if test \"x\$destdir\" != \"x\$file\"; then
-       case \"\$destdir\" in
-       [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-       *) thisdir=\"\$thisdir/\$destdir\" ;;
-       esac
-     fi
- 
-     file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
-     file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
-   done
- 
-   # Usually 'no', except on cygwin/mingw when embedded into
-   # the cwrapper.
-   WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
-   if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
-     # special case for '.'
-     if test \"\$thisdir\" = \".\"; then
-       thisdir=\`pwd\`
-     fi
-     # remove .libs from thisdir
-     case \"\$thisdir\" in
-     *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
-     $objdir )   thisdir=. ;;
-     esac
-   fi
- 
-   # Try to get the absolute directory name.
-   absdir=\`cd \"\$thisdir\" && pwd\`
-   test -n \"\$absdir\" && thisdir=\"\$absdir\"
- "
- 
- 	if test "$fast_install" = yes; then
- 	  $ECHO "\
-   program=lt-'$outputname'$exeext
-   progdir=\"\$thisdir/$objdir\"
- 
-   if test ! -f \"\$progdir/\$program\" ||
-      { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-        test \"X\$file\" != \"X\$progdir/\$program\"; }; then
- 
-     file=\"\$\$-\$program\"
- 
-     if test ! -d \"\$progdir\"; then
-       $MKDIR \"\$progdir\"
-     else
-       $RM \"\$progdir/\$file\"
-     fi"
- 
- 	  $ECHO "\
- 
-     # relink executable if necessary
-     if test -n \"\$relink_command\"; then
-       if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-       else
- 	$ECHO \"\$relink_command_output\" >&2
- 	$RM \"\$progdir/\$file\"
- 	exit 1
-       fi
-     fi
- 
-     $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-     { $RM \"\$progdir/\$program\";
-       $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-     $RM \"\$progdir/\$file\"
-   fi"
- 	else
- 	  $ECHO "\
-   program='$outputname'
-   progdir=\"\$thisdir/$objdir\"
- "
- 	fi
- 
- 	$ECHO "\
- 
-   if test -f \"\$progdir/\$program\"; then"
- 
- 	# fixup the dll searchpath if we need to.
- 	#
- 	# Fix the DLL searchpath if we need to.  Do this before prepending
- 	# to shlibpath, because on Windows, both are PATH and uninstalled
- 	# libraries must come first.
- 	if test -n "$dllsearchpath"; then
- 	  $ECHO "\
-     # Add the dll search path components to the executable PATH
-     PATH=$dllsearchpath:\$PATH
- "
- 	fi
- 
- 	# Export our shlibpath_var if we have one.
- 	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
- 	  $ECHO "\
-     # Add our own library path to $shlibpath_var
-     $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
- 
-     # Some systems cannot cope with colon-terminated $shlibpath_var
-     # The second colon is a workaround for a bug in BeOS R4 sed
-     $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
- 
-     export $shlibpath_var
- "
- 	fi
- 
- 	$ECHO "\
-     if test \"\$libtool_execute_magic\" != \"$magic\"; then
-       # Run the actual program with our arguments.
-       func_exec_program \${1+\"\$@\"}
-     fi
-   else
-     # The program doesn't exist.
-     \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-     \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
-     \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
-     exit 1
-   fi
- fi\
- "
- }
- 
- 
- # func_emit_cwrapperexe_src
- # emit the source code for a wrapper executable on stdout
- # Must ONLY be called from within func_mode_link because
- # it depends on a number of variable set therein.
- func_emit_cwrapperexe_src ()
- {
- 	cat <<EOF
- 
- /* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-    Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
- 
-    The $output program cannot be directly executed until all the libtool
-    libraries that it depends on are installed.
- 
-    This wrapper executable should never be moved out of the build directory.
-    If it is, it will not operate correctly.
- */
- EOF
- 	    cat <<"EOF"
- #ifdef _MSC_VER
- # define _CRT_SECURE_NO_DEPRECATE 1
- #endif
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef _MSC_VER
- # include <direct.h>
- # include <process.h>
- # include <io.h>
- #else
- # include <unistd.h>
- # include <stdint.h>
- # ifdef __CYGWIN__
- #  include <io.h>
- # endif
- #endif
- #include <malloc.h>
- #include <stdarg.h>
- #include <assert.h>
- #include <string.h>
- #include <ctype.h>
- #include <errno.h>
- #include <fcntl.h>
- #include <sys/stat.h>
- 
- /* declarations of non-ANSI functions */
- #if defined(__MINGW32__)
- # ifdef __STRICT_ANSI__
- int _putenv (const char *);
- # endif
- #elif defined(__CYGWIN__)
- # ifdef __STRICT_ANSI__
- char *realpath (const char *, char *);
- int putenv (char *);
- int setenv (const char *, const char *, int);
- # endif
- /* #elif defined (other platforms) ... */
- #endif
- 
- /* portability defines, excluding path handling macros */
- #if defined(_MSC_VER)
- # define setmode _setmode
- # define stat    _stat
- # define chmod   _chmod
- # define getcwd  _getcwd
- # define putenv  _putenv
- # define S_IXUSR _S_IEXEC
- # ifndef _INTPTR_T_DEFINED
- #  define _INTPTR_T_DEFINED
- #  define intptr_t int
- # endif
- #elif defined(__MINGW32__)
- # define setmode _setmode
- # define stat    _stat
- # define chmod   _chmod
- # define getcwd  _getcwd
- # define putenv  _putenv
- #elif defined(__CYGWIN__)
- # define HAVE_SETENV
- # define FOPEN_WB "wb"
- /* #elif defined (other platforms) ... */
- #endif
- 
- #if defined(PATH_MAX)
- # define LT_PATHMAX PATH_MAX
- #elif defined(MAXPATHLEN)
- # define LT_PATHMAX MAXPATHLEN
- #else
- # define LT_PATHMAX 1024
- #endif
- 
- #ifndef S_IXOTH
- # define S_IXOTH 0
- #endif
- #ifndef S_IXGRP
- # define S_IXGRP 0
- #endif
- 
- /* path handling portability macros */
- #ifndef DIR_SEPARATOR
- # define DIR_SEPARATOR '/'
- # define PATH_SEPARATOR ':'
- #endif
- 
- #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-   defined (__OS2__)
- # define HAVE_DOS_BASED_FILE_SYSTEM
- # define FOPEN_WB "wb"
- # ifndef DIR_SEPARATOR_2
- #  define DIR_SEPARATOR_2 '\\'
- # endif
- # ifndef PATH_SEPARATOR_2
- #  define PATH_SEPARATOR_2 ';'
- # endif
- #endif
- 
- #ifndef DIR_SEPARATOR_2
- # define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
- #else /* DIR_SEPARATOR_2 */
- # define IS_DIR_SEPARATOR(ch) \
- 	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
- #endif /* DIR_SEPARATOR_2 */
- 
- #ifndef PATH_SEPARATOR_2
- # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
- #else /* PATH_SEPARATOR_2 */
- # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
- #endif /* PATH_SEPARATOR_2 */
- 
- #ifndef FOPEN_WB
- # define FOPEN_WB "w"
- #endif
- #ifndef _O_BINARY
- # define _O_BINARY 0
- #endif
- 
- #define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
- #define XFREE(stale) do { \
-   if (stale) { free ((void *) stale); stale = 0; } \
- } while (0)
- 
- #if defined(LT_DEBUGWRAPPER)
- static int lt_debug = 1;
- #else
- static int lt_debug = 0;
- #endif
- 
- const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
- 
- void *xmalloc (size_t num);
- char *xstrdup (const char *string);
- const char *base_name (const char *name);
- char *find_executable (const char *wrapper);
- char *chase_symlinks (const char *pathspec);
- int make_executable (const char *path);
- int check_executable (const char *path);
- char *strendzap (char *str, const char *pat);
- void lt_debugprintf (const char *file, int line, const char *fmt, ...);
- void lt_fatal (const char *file, int line, const char *message, ...);
- static const char *nonnull (const char *s);
- static const char *nonempty (const char *s);
- void lt_setenv (const char *name, const char *value);
- char *lt_extend_str (const char *orig_value, const char *add, int to_end);
- void lt_update_exe_path (const char *name, const char *value);
- void lt_update_lib_path (const char *name, const char *value);
- char **prepare_spawn (char **argv);
- void lt_dump_script (FILE *f);
- EOF
- 
- 	    cat <<EOF
- volatile const char * MAGIC_EXE = "$magic_exe";
- const char * LIB_PATH_VARNAME = "$shlibpath_var";
- EOF
- 
- 	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-               func_to_host_path "$temp_rpath"
- 	      cat <<EOF
- const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
- EOF
- 	    else
- 	      cat <<"EOF"
- const char * LIB_PATH_VALUE   = "";
- EOF
- 	    fi
- 
- 	    if test -n "$dllsearchpath"; then
-               func_to_host_path "$dllsearchpath:"
- 	      cat <<EOF
- const char * EXE_PATH_VARNAME = "PATH";
- const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
- EOF
- 	    else
- 	      cat <<"EOF"
- const char * EXE_PATH_VARNAME = "";
- const char * EXE_PATH_VALUE   = "";
- EOF
- 	    fi
- 
- 	    if test "$fast_install" = yes; then
- 	      cat <<EOF
- const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
- EOF
- 	    else
- 	      cat <<EOF
- const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
- EOF
- 	    fi
- 
- 
- 	    cat <<"EOF"
- 
- #define LTWRAPPER_OPTION_PREFIX         "--lt-"
- 
- static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
- static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
- static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
- 
- int
- main (int argc, char *argv[])
- {
-   char **newargz;
-   int  newargc;
-   char *tmp_pathspec;
-   char *actual_cwrapper_path;
-   char *actual_cwrapper_name;
-   char *target_name;
-   char *lt_argv_zero;
-   intptr_t rval = 127;
- 
-   int i;
- 
-   program_name = (char *) xstrdup (base_name (argv[0]));
-   newargz = XMALLOC (char *, argc + 1);
- 
-   /* very simple arg parsing; don't want to rely on getopt
-    * also, copy all non cwrapper options to newargz, except
-    * argz[0], which is handled differently
-    */
-   newargc=0;
-   for (i = 1; i < argc; i++)
-     {
-       if (strcmp (argv[i], dumpscript_opt) == 0)
- 	{
- EOF
- 	    case "$host" in
- 	      *mingw* | *cygwin* )
- 		# make stdout use "unix" line endings
- 		echo "          setmode(1,_O_BINARY);"
- 		;;
- 	      esac
- 
- 	    cat <<"EOF"
- 	  lt_dump_script (stdout);
- 	  return 0;
- 	}
-       if (strcmp (argv[i], debug_opt) == 0)
- 	{
-           lt_debug = 1;
-           continue;
- 	}
-       if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
-         {
-           /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
-              namespace, but it is not one of the ones we know about and
-              have already dealt with, above (inluding dump-script), then
-              report an error. Otherwise, targets might begin to believe
-              they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
-              namespace. The first time any user complains about this, we'll
-              need to make LTWRAPPER_OPTION_PREFIX a configure-time option
-              or a configure.ac-settable value.
-            */
-           lt_fatal (__FILE__, __LINE__,
- 		    "unrecognized %s option: '%s'",
-                     ltwrapper_option_prefix, argv[i]);
-         }
-       /* otherwise ... */
-       newargz[++newargc] = xstrdup (argv[i]);
-     }
-   newargz[++newargc] = NULL;
- 
- EOF
- 	    cat <<EOF
-   /* The GNU banner must be the first non-error debug message */
-   lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
- EOF
- 	    cat <<"EOF"
-   lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
-   lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
- 
-   tmp_pathspec = find_executable (argv[0]);
-   if (tmp_pathspec == NULL)
-     lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
-   lt_debugprintf (__FILE__, __LINE__,
-                   "(main) found exe (before symlink chase) at: %s\n",
- 		  tmp_pathspec);
- 
-   actual_cwrapper_path = chase_symlinks (tmp_pathspec);
-   lt_debugprintf (__FILE__, __LINE__,
-                   "(main) found exe (after symlink chase) at: %s\n",
- 		  actual_cwrapper_path);
-   XFREE (tmp_pathspec);
- 
-   actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
-   strendzap (actual_cwrapper_path, actual_cwrapper_name);
- 
-   /* wrapper name transforms */
-   strendzap (actual_cwrapper_name, ".exe");
-   tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
-   XFREE (actual_cwrapper_name);
-   actual_cwrapper_name = tmp_pathspec;
-   tmp_pathspec = 0;
- 
-   /* target_name transforms -- use actual target program name; might have lt- prefix */
-   target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
-   strendzap (target_name, ".exe");
-   tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
-   XFREE (target_name);
-   target_name = tmp_pathspec;
-   tmp_pathspec = 0;
- 
-   lt_debugprintf (__FILE__, __LINE__,
- 		  "(main) libtool target name: %s\n",
- 		  target_name);
- EOF
- 
- 	    cat <<EOF
-   newargz[0] =
-     XMALLOC (char, (strlen (actual_cwrapper_path) +
- 		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
-   strcpy (newargz[0], actual_cwrapper_path);
-   strcat (newargz[0], "$objdir");
-   strcat (newargz[0], "/");
- EOF
- 
- 	    cat <<"EOF"
-   /* stop here, and copy so we don't have to do this twice */
-   tmp_pathspec = xstrdup (newargz[0]);
- 
-   /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
-   strcat (newargz[0], actual_cwrapper_name);
- 
-   /* DO want the lt- prefix here if it exists, so use target_name */
-   lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
-   XFREE (tmp_pathspec);
-   tmp_pathspec = NULL;
- EOF
- 
- 	    case $host_os in
- 	      mingw*)
- 	    cat <<"EOF"
-   {
-     char* p;
-     while ((p = strchr (newargz[0], '\\')) != NULL)
-       {
- 	*p = '/';
-       }
-     while ((p = strchr (lt_argv_zero, '\\')) != NULL)
-       {
- 	*p = '/';
-       }
-   }
- EOF
- 	    ;;
- 	    esac
- 
- 	    cat <<"EOF"
-   XFREE (target_name);
-   XFREE (actual_cwrapper_path);
-   XFREE (actual_cwrapper_name);
- 
-   lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
-   lt_setenv ("DUALCASE", "1");  /* for MSK sh */
-   /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
-      be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
-      because on Windows, both *_VARNAMEs are PATH but uninstalled
-      libraries must come first. */
-   lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
-   lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
- 
-   lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
- 		  nonnull (lt_argv_zero));
-   for (i = 0; i < newargc; i++)
-     {
-       lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
- 		      i, nonnull (newargz[i]));
-     }
- 
- EOF
- 
- 	    case $host_os in
- 	      mingw*)
- 		cat <<"EOF"
-   /* execv doesn't actually work on mingw as expected on unix */
-   newargz = prepare_spawn (newargz);
-   rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
-   if (rval == -1)
-     {
-       /* failed to start process */
-       lt_debugprintf (__FILE__, __LINE__,
- 		      "(main) failed to launch target \"%s\": %s\n",
- 		      lt_argv_zero, nonnull (strerror (errno)));
-       return 127;
-     }
-   return rval;
- EOF
- 		;;
- 	      *)
- 		cat <<"EOF"
-   execv (lt_argv_zero, newargz);
-   return rval; /* =127, but avoids unused variable warning */
- EOF
- 		;;
- 	    esac
- 
- 	    cat <<"EOF"
- }
- 
- void *
- xmalloc (size_t num)
- {
-   void *p = (void *) malloc (num);
-   if (!p)
-     lt_fatal (__FILE__, __LINE__, "memory exhausted");
- 
-   return p;
- }
- 
- char *
- xstrdup (const char *string)
- {
-   return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
- 			  string) : NULL;
- }
- 
- const char *
- base_name (const char *name)
- {
-   const char *base;
- 
- #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-   /* Skip over the disk name in MSDOS pathnames. */
-   if (isalpha ((unsigned char) name[0]) && name[1] == ':')
-     name += 2;
- #endif
- 
-   for (base = name; *name; name++)
-     if (IS_DIR_SEPARATOR (*name))
-       base = name + 1;
-   return base;
- }
- 
- int
- check_executable (const char *path)
- {
-   struct stat st;
- 
-   lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
-                   nonempty (path));
-   if ((!path) || (!*path))
-     return 0;
- 
-   if ((stat (path, &st) >= 0)
-       && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
-     return 1;
-   else
-     return 0;
- }
- 
- int
- make_executable (const char *path)
- {
-   int rval = 0;
-   struct stat st;
- 
-   lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
-                   nonempty (path));
-   if ((!path) || (!*path))
-     return 0;
- 
-   if (stat (path, &st) >= 0)
-     {
-       rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
-     }
-   return rval;
- }
- 
- /* Searches for the full path of the wrapper.  Returns
-    newly allocated full path name if found, NULL otherwise
-    Does not chase symlinks, even on platforms that support them.
- */
- char *
- find_executable (const char *wrapper)
- {
-   int has_slash = 0;
-   const char *p;
-   const char *p_next;
-   /* static buffer for getcwd */
-   char tmp[LT_PATHMAX + 1];
-   int tmp_len;
-   char *concat_name;
- 
-   lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
-                   nonempty (wrapper));
- 
-   if ((wrapper == NULL) || (*wrapper == '\0'))
-     return NULL;
- 
-   /* Absolute path? */
- #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-   if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
-     {
-       concat_name = xstrdup (wrapper);
-       if (check_executable (concat_name))
- 	return concat_name;
-       XFREE (concat_name);
-     }
-   else
-     {
- #endif
-       if (IS_DIR_SEPARATOR (wrapper[0]))
- 	{
- 	  concat_name = xstrdup (wrapper);
- 	  if (check_executable (concat_name))
- 	    return concat_name;
- 	  XFREE (concat_name);
- 	}
- #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-     }
- #endif
- 
-   for (p = wrapper; *p; p++)
-     if (*p == '/')
-       {
- 	has_slash = 1;
- 	break;
-       }
-   if (!has_slash)
-     {
-       /* no slashes; search PATH */
-       const char *path = getenv ("PATH");
-       if (path != NULL)
- 	{
- 	  for (p = path; *p; p = p_next)
- 	    {
- 	      const char *q;
- 	      size_t p_len;
- 	      for (q = p; *q; q++)
- 		if (IS_PATH_SEPARATOR (*q))
- 		  break;
- 	      p_len = q - p;
- 	      p_next = (*q == '\0' ? q : q + 1);
- 	      if (p_len == 0)
- 		{
- 		  /* empty path: current directory */
- 		  if (getcwd (tmp, LT_PATHMAX) == NULL)
- 		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-                               nonnull (strerror (errno)));
- 		  tmp_len = strlen (tmp);
- 		  concat_name =
- 		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
- 		  memcpy (concat_name, tmp, tmp_len);
- 		  concat_name[tmp_len] = '/';
- 		  strcpy (concat_name + tmp_len + 1, wrapper);
- 		}
- 	      else
- 		{
- 		  concat_name =
- 		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
- 		  memcpy (concat_name, p, p_len);
- 		  concat_name[p_len] = '/';
- 		  strcpy (concat_name + p_len + 1, wrapper);
- 		}
- 	      if (check_executable (concat_name))
- 		return concat_name;
- 	      XFREE (concat_name);
- 	    }
- 	}
-       /* not found in PATH; assume curdir */
-     }
-   /* Relative path | not found in path: prepend cwd */
-   if (getcwd (tmp, LT_PATHMAX) == NULL)
-     lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-               nonnull (strerror (errno)));
-   tmp_len = strlen (tmp);
-   concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-   memcpy (concat_name, tmp, tmp_len);
-   concat_name[tmp_len] = '/';
-   strcpy (concat_name + tmp_len + 1, wrapper);
- 
-   if (check_executable (concat_name))
-     return concat_name;
-   XFREE (concat_name);
-   return NULL;
- }
- 
- char *
- chase_symlinks (const char *pathspec)
- {
- #ifndef S_ISLNK
-   return xstrdup (pathspec);
- #else
-   char buf[LT_PATHMAX];
-   struct stat s;
-   char *tmp_pathspec = xstrdup (pathspec);
-   char *p;
-   int has_symlinks = 0;
-   while (strlen (tmp_pathspec) && !has_symlinks)
-     {
-       lt_debugprintf (__FILE__, __LINE__,
- 		      "checking path component for symlinks: %s\n",
- 		      tmp_pathspec);
-       if (lstat (tmp_pathspec, &s) == 0)
- 	{
- 	  if (S_ISLNK (s.st_mode) != 0)
- 	    {
- 	      has_symlinks = 1;
- 	      break;
- 	    }
- 
- 	  /* search backwards for last DIR_SEPARATOR */
- 	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
- 	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
- 	    p--;
- 	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
- 	    {
- 	      /* no more DIR_SEPARATORS left */
- 	      break;
- 	    }
- 	  *p = '\0';
- 	}
-       else
- 	{
- 	  lt_fatal (__FILE__, __LINE__,
- 		    "error accessing file \"%s\": %s",
- 		    tmp_pathspec, nonnull (strerror (errno)));
- 	}
-     }
-   XFREE (tmp_pathspec);
- 
-   if (!has_symlinks)
-     {
-       return xstrdup (pathspec);
-     }
- 
-   tmp_pathspec = realpath (pathspec, buf);
-   if (tmp_pathspec == 0)
-     {
-       lt_fatal (__FILE__, __LINE__,
- 		"could not follow symlinks for %s", pathspec);
-     }
-   return xstrdup (tmp_pathspec);
- #endif
- }
- 
- char *
- strendzap (char *str, const char *pat)
- {
-   size_t len, patlen;
- 
-   assert (str != NULL);
-   assert (pat != NULL);
- 
-   len = strlen (str);
-   patlen = strlen (pat);
- 
-   if (patlen <= len)
-     {
-       str += len - patlen;
-       if (strcmp (str, pat) == 0)
- 	*str = '\0';
-     }
-   return str;
- }
- 
- void
- lt_debugprintf (const char *file, int line, const char *fmt, ...)
- {
-   va_list args;
-   if (lt_debug)
-     {
-       (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
-       va_start (args, fmt);
-       (void) vfprintf (stderr, fmt, args);
-       va_end (args);
-     }
- }
- 
- static void
- lt_error_core (int exit_status, const char *file,
- 	       int line, const char *mode,
- 	       const char *message, va_list ap)
- {
-   fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
-   vfprintf (stderr, message, ap);
-   fprintf (stderr, ".\n");
- 
-   if (exit_status >= 0)
-     exit (exit_status);
- }
- 
- void
- lt_fatal (const char *file, int line, const char *message, ...)
- {
-   va_list ap;
-   va_start (ap, message);
-   lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
-   va_end (ap);
- }
- 
- static const char *
- nonnull (const char *s)
- {
-   return s ? s : "(null)";
- }
- 
- static const char *
- nonempty (const char *s)
- {
-   return (s && !*s) ? "(empty)" : nonnull (s);
- }
- 
- void
- lt_setenv (const char *name, const char *value)
- {
-   lt_debugprintf (__FILE__, __LINE__,
- 		  "(lt_setenv) setting '%s' to '%s'\n",
-                   nonnull (name), nonnull (value));
-   {
- #ifdef HAVE_SETENV
-     /* always make a copy, for consistency with !HAVE_SETENV */
-     char *str = xstrdup (value);
-     setenv (name, str, 1);
- #else
-     int len = strlen (name) + 1 + strlen (value) + 1;
-     char *str = XMALLOC (char, len);
-     sprintf (str, "%s=%s", name, value);
-     if (putenv (str) != EXIT_SUCCESS)
-       {
-         XFREE (str);
-       }
- #endif
-   }
- }
- 
- char *
- lt_extend_str (const char *orig_value, const char *add, int to_end)
- {
-   char *new_value;
-   if (orig_value && *orig_value)
-     {
-       int orig_value_len = strlen (orig_value);
-       int add_len = strlen (add);
-       new_value = XMALLOC (char, add_len + orig_value_len + 1);
-       if (to_end)
-         {
-           strcpy (new_value, orig_value);
-           strcpy (new_value + orig_value_len, add);
-         }
-       else
-         {
-           strcpy (new_value, add);
-           strcpy (new_value + add_len, orig_value);
-         }
-     }
-   else
-     {
-       new_value = xstrdup (add);
-     }
-   return new_value;
- }
- 
- void
- lt_update_exe_path (const char *name, const char *value)
- {
-   lt_debugprintf (__FILE__, __LINE__,
- 		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
-                   nonnull (name), nonnull (value));
- 
-   if (name && *name && value && *value)
-     {
-       char *new_value = lt_extend_str (getenv (name), value, 0);
-       /* some systems can't cope with a ':'-terminated path #' */
-       int len = strlen (new_value);
-       while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
-         {
-           new_value[len-1] = '\0';
-         }
-       lt_setenv (name, new_value);
-       XFREE (new_value);
-     }
- }
- 
- void
- lt_update_lib_path (const char *name, const char *value)
- {
-   lt_debugprintf (__FILE__, __LINE__,
- 		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
-                   nonnull (name), nonnull (value));
- 
-   if (name && *name && value && *value)
-     {
-       char *new_value = lt_extend_str (getenv (name), value, 0);
-       lt_setenv (name, new_value);
-       XFREE (new_value);
-     }
- }
- 
- EOF
- 	    case $host_os in
- 	      mingw*)
- 		cat <<"EOF"
- 
- /* Prepares an argument vector before calling spawn().
-    Note that spawn() does not by itself call the command interpreter
-      (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
-       ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-          GetVersionEx(&v);
-          v.dwPlatformId == VER_PLATFORM_WIN32_NT;
-       }) ? "cmd.exe" : "command.com").
-    Instead it simply concatenates the arguments, separated by ' ', and calls
-    CreateProcess().  We must quote the arguments since Win32 CreateProcess()
-    interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
-    special way:
-    - Space and tab are interpreted as delimiters. They are not treated as
-      delimiters if they are surrounded by double quotes: "...".
-    - Unescaped double quotes are removed from the input. Their only effect is
-      that within double quotes, space and tab are treated like normal
-      characters.
-    - Backslashes not followed by double quotes are not special.
-    - But 2*n+1 backslashes followed by a double quote become
-      n backslashes followed by a double quote (n >= 0):
-        \" -> "
-        \\\" -> \"
-        \\\\\" -> \\"
-  */
- #define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
- #define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
- char **
- prepare_spawn (char **argv)
- {
-   size_t argc;
-   char **new_argv;
-   size_t i;
- 
-   /* Count number of arguments.  */
-   for (argc = 0; argv[argc] != NULL; argc++)
-     ;
- 
-   /* Allocate new argument vector.  */
-   new_argv = XMALLOC (char *, argc + 1);
- 
-   /* Put quoted arguments into the new argument vector.  */
-   for (i = 0; i < argc; i++)
-     {
-       const char *string = argv[i];
- 
-       if (string[0] == '\0')
- 	new_argv[i] = xstrdup ("\"\"");
-       else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
- 	{
- 	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
- 	  size_t length;
- 	  unsigned int backslashes;
- 	  const char *s;
- 	  char *quoted_string;
- 	  char *p;
- 
- 	  length = 0;
- 	  backslashes = 0;
- 	  if (quote_around)
- 	    length++;
- 	  for (s = string; *s != '\0'; s++)
- 	    {
- 	      char c = *s;
- 	      if (c == '"')
- 		length += backslashes + 1;
- 	      length++;
- 	      if (c == '\\')
- 		backslashes++;
- 	      else
- 		backslashes = 0;
- 	    }
- 	  if (quote_around)
- 	    length += backslashes + 1;
- 
- 	  quoted_string = XMALLOC (char, length + 1);
- 
- 	  p = quoted_string;
- 	  backslashes = 0;
- 	  if (quote_around)
- 	    *p++ = '"';
- 	  for (s = string; *s != '\0'; s++)
- 	    {
- 	      char c = *s;
- 	      if (c == '"')
- 		{
- 		  unsigned int j;
- 		  for (j = backslashes + 1; j > 0; j--)
- 		    *p++ = '\\';
- 		}
- 	      *p++ = c;
- 	      if (c == '\\')
- 		backslashes++;
- 	      else
- 		backslashes = 0;
- 	    }
- 	  if (quote_around)
- 	    {
- 	      unsigned int j;
- 	      for (j = backslashes; j > 0; j--)
- 		*p++ = '\\';
- 	      *p++ = '"';
- 	    }
- 	  *p = '\0';
- 
- 	  new_argv[i] = quoted_string;
- 	}
-       else
- 	new_argv[i] = (char *) string;
-     }
-   new_argv[argc] = NULL;
- 
-   return new_argv;
- }
- EOF
- 		;;
- 	    esac
- 
-             cat <<"EOF"
- void lt_dump_script (FILE* f)
- {
- EOF
- 	    func_emit_wrapper yes |
- 	      $SED -n -e '
- s/^\(.\{79\}\)\(..*\)/\1\
- \2/
- h
- s/\([\\"]\)/\\\1/g
- s/$/\\n/
- s/\([^\n]*\).*/  fputs ("\1", f);/p
- g
- D'
-             cat <<"EOF"
- }
- EOF
- }
- # end: func_emit_cwrapperexe_src
- 
- # func_win32_import_lib_p ARG
- # True if ARG is an import lib, as indicated by $file_magic_cmd
- func_win32_import_lib_p ()
- {
-     $opt_debug
-     case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
-     *import*) : ;;
-     *) false ;;
-     esac
- }
- 
- # func_mode_link arg...
- func_mode_link ()
- {
-     $opt_debug
-     case $host in
-     *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-       # It is impossible to link a dll without this setting, and
-       # we shouldn't force the makefile maintainer to figure out
-       # which system we are compiling for in order to pass an extra
-       # flag for every libtool invocation.
-       # allow_undefined=no
- 
-       # FIXME: Unfortunately, there are problems with the above when trying
-       # to make a dll which has undefined symbols, in which case not
-       # even a static library is built.  For now, we need to specify
-       # -no-undefined on the libtool link line when we can be certain
-       # that all symbols are satisfied, otherwise we get a static library.
-       allow_undefined=yes
-       ;;
-     *)
-       allow_undefined=yes
-       ;;
-     esac
-     libtool_args=$nonopt
-     base_compile="$nonopt $@"
-     compile_command=$nonopt
-     finalize_command=$nonopt
- 
-     compile_rpath=
-     finalize_rpath=
-     compile_shlibpath=
-     finalize_shlibpath=
-     convenience=
-     old_convenience=
-     deplibs=
-     old_deplibs=
-     compiler_flags=
-     linker_flags=
-     dllsearchpath=
-     lib_search_path=`pwd`
-     inst_prefix_dir=
-     new_inherited_linker_flags=
- 
-     avoid_version=no
-     bindir=
-     dlfiles=
-     dlprefiles=
-     dlself=no
-     export_dynamic=no
-     export_symbols=
-     export_symbols_regex=
-     generated=
-     libobjs=
-     ltlibs=
-     module=no
-     no_install=no
-     objs=
-     non_pic_objects=
-     precious_files_regex=
-     prefer_static_libs=no
-     preload=no
-     prev=
-     prevarg=
-     release=
-     rpath=
-     xrpath=
-     perm_rpath=
-     temp_rpath=
-     thread_safe=no
-     vinfo=
-     vinfo_number=no
-     weak_libs=
-     single_module="${wl}-single_module"
-     func_infer_tag $base_compile
- 
-     # We need to know -static, to get the right output filenames.
-     for arg
-     do
-       case $arg in
-       -shared)
- 	test "$build_libtool_libs" != yes && \
- 	  func_fatal_configuration "can not build a shared library"
- 	build_old_libs=no
- 	break
- 	;;
-       -all-static | -static | -static-libtool-libs)
- 	case $arg in
- 	-all-static)
- 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
- 	    func_warning "complete static linking is impossible in this configuration"
- 	  fi
- 	  if test -n "$link_static_flag"; then
- 	    dlopen_self=$dlopen_self_static
- 	  fi
- 	  prefer_static_libs=yes
- 	  ;;
- 	-static)
- 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
- 	    dlopen_self=$dlopen_self_static
- 	  fi
- 	  prefer_static_libs=built
- 	  ;;
- 	-static-libtool-libs)
- 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
- 	    dlopen_self=$dlopen_self_static
- 	  fi
- 	  prefer_static_libs=yes
- 	  ;;
- 	esac
- 	build_libtool_libs=no
- 	build_old_libs=yes
- 	break
- 	;;
-       esac
-     done
- 
-     # See if our shared archives depend on static archives.
-     test -n "$old_archive_from_new_cmds" && build_old_libs=yes
- 
-     # Go through the arguments, transforming them on the way.
-     while test "$#" -gt 0; do
-       arg="$1"
-       shift
-       func_quote_for_eval "$arg"
-       qarg=$func_quote_for_eval_unquoted_result
-       func_append libtool_args " $func_quote_for_eval_result"
- 
-       # If the previous option needs an argument, assign it.
-       if test -n "$prev"; then
- 	case $prev in
- 	output)
- 	  func_append compile_command " @OUTPUT@"
- 	  func_append finalize_command " @OUTPUT@"
- 	  ;;
- 	esac
- 
- 	case $prev in
- 	bindir)
- 	  bindir="$arg"
- 	  prev=
- 	  continue
- 	  ;;
- 	dlfiles|dlprefiles)
- 	  if test "$preload" = no; then
- 	    # Add the symbol object into the linking commands.
- 	    func_append compile_command " @SYMFILE@"
- 	    func_append finalize_command " @SYMFILE@"
- 	    preload=yes
- 	  fi
- 	  case $arg in
- 	  *.la | *.lo) ;;  # We handle these cases below.
- 	  force)
- 	    if test "$dlself" = no; then
- 	      dlself=needless
- 	      export_dynamic=yes
- 	    fi
- 	    prev=
- 	    continue
- 	    ;;
- 	  self)
- 	    if test "$prev" = dlprefiles; then
- 	      dlself=yes
- 	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
- 	      dlself=yes
- 	    else
- 	      dlself=needless
- 	      export_dynamic=yes
- 	    fi
- 	    prev=
- 	    continue
- 	    ;;
- 	  *)
- 	    if test "$prev" = dlfiles; then
- 	      func_append dlfiles " $arg"
- 	    else
- 	      func_append dlprefiles " $arg"
- 	    fi
- 	    prev=
- 	    continue
- 	    ;;
- 	  esac
- 	  ;;
- 	expsyms)
- 	  export_symbols="$arg"
- 	  test -f "$arg" \
- 	    || func_fatal_error "symbol file \`$arg' does not exist"
- 	  prev=
- 	  continue
- 	  ;;
- 	expsyms_regex)
- 	  export_symbols_regex="$arg"
- 	  prev=
- 	  continue
- 	  ;;
- 	framework)
- 	  case $host in
- 	    *-*-darwin*)
- 	      case "$deplibs " in
- 		*" $qarg.ltframework "*) ;;
- 		*) func_append deplibs " $qarg.ltframework" # this is fixed later
- 		   ;;
- 	      esac
- 	      ;;
- 	  esac
- 	  prev=
- 	  continue
- 	  ;;
- 	inst_prefix)
- 	  inst_prefix_dir="$arg"
- 	  prev=
- 	  continue
- 	  ;;
- 	objectlist)
- 	  if test -f "$arg"; then
- 	    save_arg=$arg
- 	    moreargs=
- 	    for fil in `cat "$save_arg"`
- 	    do
- #	      func_append moreargs " $fil"
- 	      arg=$fil
- 	      # A libtool-controlled object.
- 
- 	      # Check to see that this really is a libtool object.
- 	      if func_lalib_unsafe_p "$arg"; then
- 		pic_object=
- 		non_pic_object=
- 
- 		# Read the .lo file
- 		func_source "$arg"
- 
- 		if test -z "$pic_object" ||
- 		   test -z "$non_pic_object" ||
- 		   test "$pic_object" = none &&
- 		   test "$non_pic_object" = none; then
- 		  func_fatal_error "cannot find name of object for \`$arg'"
- 		fi
- 
- 		# Extract subdirectory from the argument.
- 		func_dirname "$arg" "/" ""
- 		xdir="$func_dirname_result"
- 
- 		if test "$pic_object" != none; then
- 		  # Prepend the subdirectory the object is found in.
- 		  pic_object="$xdir$pic_object"
- 
- 		  if test "$prev" = dlfiles; then
- 		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
- 		      func_append dlfiles " $pic_object"
- 		      prev=
- 		      continue
- 		    else
- 		      # If libtool objects are unsupported, then we need to preload.
- 		      prev=dlprefiles
- 		    fi
- 		  fi
- 
- 		  # CHECK ME:  I think I busted this.  -Ossama
- 		  if test "$prev" = dlprefiles; then
- 		    # Preload the old-style object.
- 		    func_append dlprefiles " $pic_object"
- 		    prev=
- 		  fi
- 
- 		  # A PIC object.
- 		  func_append libobjs " $pic_object"
- 		  arg="$pic_object"
- 		fi
- 
- 		# Non-PIC object.
- 		if test "$non_pic_object" != none; then
- 		  # Prepend the subdirectory the object is found in.
- 		  non_pic_object="$xdir$non_pic_object"
- 
- 		  # A standard non-PIC object
- 		  func_append non_pic_objects " $non_pic_object"
- 		  if test -z "$pic_object" || test "$pic_object" = none ; then
- 		    arg="$non_pic_object"
- 		  fi
- 		else
- 		  # If the PIC object exists, use it instead.
- 		  # $xdir was prepended to $pic_object above.
- 		  non_pic_object="$pic_object"
- 		  func_append non_pic_objects " $non_pic_object"
- 		fi
- 	      else
- 		# Only an error if not doing a dry-run.
- 		if $opt_dry_run; then
- 		  # Extract subdirectory from the argument.
- 		  func_dirname "$arg" "/" ""
- 		  xdir="$func_dirname_result"
- 
- 		  func_lo2o "$arg"
- 		  pic_object=$xdir$objdir/$func_lo2o_result
- 		  non_pic_object=$xdir$func_lo2o_result
- 		  func_append libobjs " $pic_object"
- 		  func_append non_pic_objects " $non_pic_object"
- 	        else
- 		  func_fatal_error "\`$arg' is not a valid libtool object"
- 		fi
- 	      fi
- 	    done
- 	  else
- 	    func_fatal_error "link input file \`$arg' does not exist"
- 	  fi
- 	  arg=$save_arg
- 	  prev=
- 	  continue
- 	  ;;
- 	precious_regex)
- 	  precious_files_regex="$arg"
- 	  prev=
- 	  continue
- 	  ;;
- 	release)
- 	  release="-$arg"
- 	  prev=
- 	  continue
- 	  ;;
- 	rpath | xrpath)
- 	  # We need an absolute path.
- 	  case $arg in
- 	  [\\/]* | [A-Za-z]:[\\/]*) ;;
- 	  *)
- 	    func_fatal_error "only absolute run-paths are allowed"
- 	    ;;
- 	  esac
- 	  if test "$prev" = rpath; then
- 	    case "$rpath " in
- 	    *" $arg "*) ;;
- 	    *) func_append rpath " $arg" ;;
- 	    esac
- 	  else
- 	    case "$xrpath " in
- 	    *" $arg "*) ;;
- 	    *) func_append xrpath " $arg" ;;
- 	    esac
- 	  fi
- 	  prev=
- 	  continue
- 	  ;;
- 	shrext)
- 	  shrext_cmds="$arg"
- 	  prev=
- 	  continue
- 	  ;;
- 	weak)
- 	  func_append weak_libs " $arg"
- 	  prev=
- 	  continue
- 	  ;;
- 	xcclinker)
- 	  func_append linker_flags " $qarg"
- 	  func_append compiler_flags " $qarg"
- 	  prev=
- 	  func_append compile_command " $qarg"
- 	  func_append finalize_command " $qarg"
- 	  continue
- 	  ;;
- 	xcompiler)
- 	  func_append compiler_flags " $qarg"
- 	  prev=
- 	  func_append compile_command " $qarg"
- 	  func_append finalize_command " $qarg"
- 	  continue
- 	  ;;
- 	xlinker)
- 	  func_append linker_flags " $qarg"
- 	  func_append compiler_flags " $wl$qarg"
- 	  prev=
- 	  func_append compile_command " $wl$qarg"
- 	  func_append finalize_command " $wl$qarg"
- 	  continue
- 	  ;;
- 	*)
- 	  eval "$prev=\"\$arg\""
- 	  prev=
- 	  continue
- 	  ;;
- 	esac
-       fi # test -n "$prev"
- 
-       prevarg="$arg"
- 
-       case $arg in
-       -all-static)
- 	if test -n "$link_static_flag"; then
- 	  # See comment for -static flag below, for more details.
- 	  func_append compile_command " $link_static_flag"
- 	  func_append finalize_command " $link_static_flag"
- 	fi
- 	continue
- 	;;
- 
-       -allow-undefined)
- 	# FIXME: remove this flag sometime in the future.
- 	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
- 	;;
- 
-       -avoid-version)
- 	avoid_version=yes
- 	continue
- 	;;
- 
-       -bindir)
- 	prev=bindir
- 	continue
- 	;;
- 
-       -dlopen)
- 	prev=dlfiles
- 	continue
- 	;;
- 
-       -dlpreopen)
- 	prev=dlprefiles
- 	continue
- 	;;
- 
-       -export-dynamic)
- 	export_dynamic=yes
- 	continue
- 	;;
- 
-       -export-symbols | -export-symbols-regex)
- 	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
- 	  func_fatal_error "more than one -exported-symbols argument is not allowed"
- 	fi
- 	if test "X$arg" = "X-export-symbols"; then
- 	  prev=expsyms
- 	else
- 	  prev=expsyms_regex
- 	fi
- 	continue
- 	;;
- 
-       -framework)
- 	prev=framework
- 	continue
- 	;;
- 
-       -inst-prefix-dir)
- 	prev=inst_prefix
- 	continue
- 	;;
- 
-       # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-       # so, if we see these flags be careful not to treat them like -L
-       -L[A-Z][A-Z]*:*)
- 	case $with_gcc/$host in
- 	no/*-*-irix* | /*-*-irix*)
- 	  func_append compile_command " $arg"
- 	  func_append finalize_command " $arg"
- 	  ;;
- 	esac
- 	continue
- 	;;
- 
-       -L*)
- 	func_stripname "-L" '' "$arg"
- 	if test -z "$func_stripname_result"; then
- 	  if test "$#" -gt 0; then
- 	    func_fatal_error "require no space between \`-L' and \`$1'"
- 	  else
- 	    func_fatal_error "need path for \`-L' option"
- 	  fi
- 	fi
- 	func_resolve_sysroot "$func_stripname_result"
- 	dir=$func_resolve_sysroot_result
- 	# We need an absolute path.
- 	case $dir in
- 	[\\/]* | [A-Za-z]:[\\/]*) ;;
- 	*)
- 	  absdir=`cd "$dir" && pwd`
- 	  test -z "$absdir" && \
- 	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
- 	  dir="$absdir"
- 	  ;;
- 	esac
- 	case "$deplibs " in
- 	*" -L$dir "* | *" $arg "*)
- 	  # Will only happen for absolute or sysroot arguments
- 	  ;;
- 	*)
- 	  # Preserve sysroot, but never include relative directories
- 	  case $dir in
- 	    [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
- 	    *) func_append deplibs " -L$dir" ;;
- 	  esac
- 	  func_append lib_search_path " $dir"
- 	  ;;
- 	esac
- 	case $host in
- 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
- 	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
- 	  case :$dllsearchpath: in
- 	  *":$dir:"*) ;;
- 	  ::) dllsearchpath=$dir;;
- 	  *) func_append dllsearchpath ":$dir";;
- 	  esac
- 	  case :$dllsearchpath: in
- 	  *":$testbindir:"*) ;;
- 	  ::) dllsearchpath=$testbindir;;
- 	  *) func_append dllsearchpath ":$testbindir";;
- 	  esac
- 	  ;;
- 	esac
- 	continue
- 	;;
- 
-       -l*)
- 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
- 	  case $host in
- 	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
- 	    # These systems don't actually have a C or math library (as such)
- 	    continue
- 	    ;;
- 	  *-*-os2*)
- 	    # These systems don't actually have a C library (as such)
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
- 	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
- 	  *-*-rhapsody* | *-*-darwin1.[012])
- 	    # Rhapsody C and math libraries are in the System framework
- 	    func_append deplibs " System.ltframework"
- 	    continue
- 	    ;;
- 	  *-*-sco3.2v5* | *-*-sco5v6*)
- 	    # Causes problems with __ctype
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
- 	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
- 	    # Compiler inserts libc in the correct place for threads to work
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
- 	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
- 	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
- 	 esac
- 	fi
- 	func_append deplibs " $arg"
- 	continue
- 	;;
- 
-       -module)
- 	module=yes
- 	continue
- 	;;
- 
-       # Tru64 UNIX uses -model [arg] to determine the layout of C++
-       # classes, name mangling, and exception handling.
-       # Darwin uses the -arch flag to determine output architecture.
-       -model|-arch|-isysroot|--sysroot)
- 	func_append compiler_flags " $arg"
- 	func_append compile_command " $arg"
- 	func_append finalize_command " $arg"
- 	prev=xcompiler
- 	continue
- 	;;
- 
-       -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
-       |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
- 	func_append compiler_flags " $arg"
- 	func_append compile_command " $arg"
- 	func_append finalize_command " $arg"
- 	case "$new_inherited_linker_flags " in
- 	    *" $arg "*) ;;
- 	    * ) func_append new_inherited_linker_flags " $arg" ;;
- 	esac
- 	continue
- 	;;
- 
-       -multi_module)
- 	single_module="${wl}-multi_module"
- 	continue
- 	;;
- 
-       -no-fast-install)
- 	fast_install=no
- 	continue
- 	;;
- 
-       -no-install)
- 	case $host in
- 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
- 	  # The PATH hackery in wrapper scripts is required on Windows
- 	  # and Darwin in order for the loader to find any dlls it needs.
- 	  func_warning "\`-no-install' is ignored for $host"
- 	  func_warning "assuming \`-no-fast-install' instead"
- 	  fast_install=no
- 	  ;;
- 	*) no_install=yes ;;
- 	esac
- 	continue
- 	;;
- 
-       -no-undefined)
- 	allow_undefined=no
- 	continue
- 	;;
- 
-       -objectlist)
- 	prev=objectlist
- 	continue
- 	;;
- 
-       -o) prev=output ;;
- 
-       -precious-files-regex)
- 	prev=precious_regex
- 	continue
- 	;;
- 
-       -release)
- 	prev=release
- 	continue
- 	;;
- 
-       -rpath)
- 	prev=rpath
- 	continue
- 	;;
- 
-       -R)
- 	prev=xrpath
- 	continue
- 	;;
- 
-       -R*)
- 	func_stripname '-R' '' "$arg"
- 	dir=$func_stripname_result
- 	# We need an absolute path.
- 	case $dir in
- 	[\\/]* | [A-Za-z]:[\\/]*) ;;
- 	=*)
- 	  func_stripname '=' '' "$dir"
- 	  dir=$lt_sysroot$func_stripname_result
- 	  ;;
- 	*)
- 	  func_fatal_error "only absolute run-paths are allowed"
- 	  ;;
- 	esac
- 	case "$xrpath " in
- 	*" $dir "*) ;;
- 	*) func_append xrpath " $dir" ;;
- 	esac
- 	continue
- 	;;
- 
-       -shared)
- 	# The effects of -shared are defined in a previous loop.
- 	continue
- 	;;
- 
-       -shrext)
- 	prev=shrext
- 	continue
- 	;;
- 
-       -static | -static-libtool-libs)
- 	# The effects of -static are defined in a previous loop.
- 	# We used to do the same as -all-static on platforms that
- 	# didn't have a PIC flag, but the assumption that the effects
- 	# would be equivalent was wrong.  It would break on at least
- 	# Digital Unix and AIX.
- 	continue
- 	;;
- 
-       -thread-safe)
- 	thread_safe=yes
- 	continue
- 	;;
- 
-       -version-info)
- 	prev=vinfo
- 	continue
- 	;;
- 
-       -version-number)
- 	prev=vinfo
- 	vinfo_number=yes
- 	continue
- 	;;
- 
-       -weak)
-         prev=weak
- 	continue
- 	;;
- 
-       -Wc,*)
- 	func_stripname '-Wc,' '' "$arg"
- 	args=$func_stripname_result
- 	arg=
- 	save_ifs="$IFS"; IFS=','
- 	for flag in $args; do
- 	  IFS="$save_ifs"
-           func_quote_for_eval "$flag"
- 	  func_append arg " $func_quote_for_eval_result"
- 	  func_append compiler_flags " $func_quote_for_eval_result"
- 	done
- 	IFS="$save_ifs"
- 	func_stripname ' ' '' "$arg"
- 	arg=$func_stripname_result
- 	;;
- 
-       -Wl,*)
- 	func_stripname '-Wl,' '' "$arg"
- 	args=$func_stripname_result
- 	arg=
- 	save_ifs="$IFS"; IFS=','
- 	for flag in $args; do
- 	  IFS="$save_ifs"
-           func_quote_for_eval "$flag"
- 	  func_append arg " $wl$func_quote_for_eval_result"
- 	  func_append compiler_flags " $wl$func_quote_for_eval_result"
- 	  func_append linker_flags " $func_quote_for_eval_result"
- 	done
- 	IFS="$save_ifs"
- 	func_stripname ' ' '' "$arg"
- 	arg=$func_stripname_result
- 	;;
- 
-       -Xcompiler)
- 	prev=xcompiler
- 	continue
- 	;;
- 
-       -Xlinker)
- 	prev=xlinker
- 	continue
- 	;;
- 
-       -XCClinker)
- 	prev=xcclinker
- 	continue
- 	;;
- 
-       # -msg_* for osf cc
-       -msg_*)
- 	func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
- 	;;
- 
-       # Flags to be passed through unchanged, with rationale:
-       # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
-       # -r[0-9][0-9]*        specify processor for the SGI compiler
-       # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
-       # +DA*, +DD*           enable 64-bit mode for the HP compiler
-       # -q*                  compiler args for the IBM compiler
-       # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
-       # -F/path              path to uninstalled frameworks, gcc on darwin
-       # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
-       # @file                GCC response files
-       # -tp=*                Portland pgcc target processor selection
-       # --sysroot=*          for sysroot support
-       # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-       -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*|-flto*|-fwhopr*|-fuse-linker-plugin)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
-         func_append finalize_command " $arg"
-         func_append compiler_flags " $arg"
-         continue
-         ;;
- 
-       # Some other compiler flag.
-       -* | +*)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
- 	;;
- 
-       *.$objext)
- 	# A standard object.
- 	func_append objs " $arg"
- 	;;
- 
-       *.lo)
- 	# A libtool-controlled object.
- 
- 	# Check to see that this really is a libtool object.
- 	if func_lalib_unsafe_p "$arg"; then
- 	  pic_object=
- 	  non_pic_object=
- 
- 	  # Read the .lo file
- 	  func_source "$arg"
- 
- 	  if test -z "$pic_object" ||
- 	     test -z "$non_pic_object" ||
- 	     test "$pic_object" = none &&
- 	     test "$non_pic_object" = none; then
- 	    func_fatal_error "cannot find name of object for \`$arg'"
- 	  fi
- 
- 	  # Extract subdirectory from the argument.
- 	  func_dirname "$arg" "/" ""
- 	  xdir="$func_dirname_result"
- 
- 	  if test "$pic_object" != none; then
- 	    # Prepend the subdirectory the object is found in.
- 	    pic_object="$xdir$pic_object"
- 
- 	    if test "$prev" = dlfiles; then
- 	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
- 		func_append dlfiles " $pic_object"
- 		prev=
- 		continue
- 	      else
- 		# If libtool objects are unsupported, then we need to preload.
- 		prev=dlprefiles
- 	      fi
- 	    fi
- 
- 	    # CHECK ME:  I think I busted this.  -Ossama
- 	    if test "$prev" = dlprefiles; then
- 	      # Preload the old-style object.
- 	      func_append dlprefiles " $pic_object"
- 	      prev=
- 	    fi
- 
- 	    # A PIC object.
- 	    func_append libobjs " $pic_object"
- 	    arg="$pic_object"
- 	  fi
- 
- 	  # Non-PIC object.
- 	  if test "$non_pic_object" != none; then
- 	    # Prepend the subdirectory the object is found in.
- 	    non_pic_object="$xdir$non_pic_object"
- 
- 	    # A standard non-PIC object
- 	    func_append non_pic_objects " $non_pic_object"
- 	    if test -z "$pic_object" || test "$pic_object" = none ; then
- 	      arg="$non_pic_object"
- 	    fi
- 	  else
- 	    # If the PIC object exists, use it instead.
- 	    # $xdir was prepended to $pic_object above.
- 	    non_pic_object="$pic_object"
- 	    func_append non_pic_objects " $non_pic_object"
- 	  fi
- 	else
- 	  # Only an error if not doing a dry-run.
- 	  if $opt_dry_run; then
- 	    # Extract subdirectory from the argument.
- 	    func_dirname "$arg" "/" ""
- 	    xdir="$func_dirname_result"
- 
- 	    func_lo2o "$arg"
- 	    pic_object=$xdir$objdir/$func_lo2o_result
- 	    non_pic_object=$xdir$func_lo2o_result
- 	    func_append libobjs " $pic_object"
- 	    func_append non_pic_objects " $non_pic_object"
- 	  else
- 	    func_fatal_error "\`$arg' is not a valid libtool object"
- 	  fi
- 	fi
- 	;;
- 
-       *.$libext)
- 	# An archive.
- 	func_append deplibs " $arg"
- 	func_append old_deplibs " $arg"
- 	continue
- 	;;
- 
-       *.la)
- 	# A libtool-controlled library.
- 
- 	func_resolve_sysroot "$arg"
- 	if test "$prev" = dlfiles; then
- 	  # This library was specified with -dlopen.
- 	  func_append dlfiles " $func_resolve_sysroot_result"
- 	  prev=
- 	elif test "$prev" = dlprefiles; then
- 	  # The library was specified with -dlpreopen.
- 	  func_append dlprefiles " $func_resolve_sysroot_result"
- 	  prev=
- 	else
- 	  func_append deplibs " $func_resolve_sysroot_result"
- 	fi
- 	continue
- 	;;
- 
-       # Some other compiler argument.
-       *)
- 	# Unknown arguments in both finalize_command and compile_command need
- 	# to be aesthetically quoted because they are evaled later.
- 	func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
- 	;;
-       esac # arg
- 
-       # Now actually substitute the argument into the commands.
-       if test -n "$arg"; then
- 	func_append compile_command " $arg"
- 	func_append finalize_command " $arg"
-       fi
-     done # argument parsing loop
- 
-     test -n "$prev" && \
-       func_fatal_help "the \`$prevarg' option requires an argument"
- 
-     if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-       eval arg=\"$export_dynamic_flag_spec\"
-       func_append compile_command " $arg"
-       func_append finalize_command " $arg"
-     fi
- 
-     oldlibs=
-     # calculate the name of the file, without its directory
-     func_basename "$output"
-     outputname="$func_basename_result"
-     libobjs_save="$libobjs"
- 
-     if test -n "$shlibpath_var"; then
-       # get the directories listed in $shlibpath_var
-       eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
-     else
-       shlib_search_path=
-     fi
-     eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-     eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
- 
-     func_dirname "$output" "/" ""
-     output_objdir="$func_dirname_result$objdir"
-     func_to_tool_file "$output_objdir/"
-     tool_output_objdir=$func_to_tool_file_result
-     # Create the object directory.
-     func_mkdir_p "$output_objdir"
- 
-     # Determine the type of output
-     case $output in
-     "")
-       func_fatal_help "you must specify an output file"
-       ;;
-     *.$libext) linkmode=oldlib ;;
-     *.lo | *.$objext) linkmode=obj ;;
-     *.la) linkmode=lib ;;
-     *) linkmode=prog ;; # Anything else should be a program.
-     esac
- 
-     specialdeplibs=
- 
-     libs=
-     # Find all interdependent deplibs by searching for libraries
-     # that are linked more than once (e.g. -la -lb -la)
-     for deplib in $deplibs; do
-       if $opt_preserve_dup_deps ; then
- 	case "$libs " in
- 	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
- 	esac
-       fi
-       func_append libs " $deplib"
-     done
- 
-     if test "$linkmode" = lib; then
-       libs="$predeps $libs $compiler_lib_search_path $postdeps"
- 
-       # Compute libraries that are listed more than once in $predeps
-       # $postdeps and mark them as special (i.e., whose duplicates are
-       # not to be eliminated).
-       pre_post_deps=
-       if $opt_duplicate_compiler_generated_deps; then
- 	for pre_post_dep in $predeps $postdeps; do
- 	  case "$pre_post_deps " in
- 	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
- 	  esac
- 	  func_append pre_post_deps " $pre_post_dep"
- 	done
-       fi
-       pre_post_deps=
-     fi
- 
-     deplibs=
-     newdependency_libs=
-     newlib_search_path=
-     need_relink=no # whether we're linking any uninstalled libtool libraries
-     notinst_deplibs= # not-installed libtool libraries
-     notinst_path= # paths that contain not-installed libtool libraries
- 
-     case $linkmode in
-     lib)
- 	passes="conv dlpreopen link"
- 	for file in $dlfiles $dlprefiles; do
- 	  case $file in
- 	  *.la) ;;
- 	  *)
- 	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
- 	    ;;
- 	  esac
- 	done
- 	;;
-     prog)
- 	compile_deplibs=
- 	finalize_deplibs=
- 	alldeplibs=no
- 	newdlfiles=
- 	newdlprefiles=
- 	passes="conv scan dlopen dlpreopen link"
- 	;;
-     *)  passes="conv"
- 	;;
-     esac
- 
-     for pass in $passes; do
-       # The preopen pass in lib mode reverses $deplibs; put it back here
-       # so that -L comes before libs that need it for instance...
-       if test "$linkmode,$pass" = "lib,link"; then
- 	## FIXME: Find the place where the list is rebuilt in the wrong
- 	##        order, and fix it there properly
-         tmp_deplibs=
- 	for deplib in $deplibs; do
- 	  tmp_deplibs="$deplib $tmp_deplibs"
- 	done
- 	deplibs="$tmp_deplibs"
-       fi
- 
-       if test "$linkmode,$pass" = "lib,link" ||
- 	 test "$linkmode,$pass" = "prog,scan"; then
- 	libs="$deplibs"
- 	deplibs=
-       fi
-       if test "$linkmode" = prog; then
- 	case $pass in
- 	dlopen) libs="$dlfiles" ;;
- 	dlpreopen) libs="$dlprefiles" ;;
- 	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
- 	esac
-       fi
-       if test "$linkmode,$pass" = "lib,dlpreopen"; then
- 	# Collect and forward deplibs of preopened libtool libs
- 	for lib in $dlprefiles; do
- 	  # Ignore non-libtool-libs
- 	  dependency_libs=
- 	  func_resolve_sysroot "$lib"
- 	  case $lib in
- 	  *.la)	func_source "$func_resolve_sysroot_result" ;;
- 	  esac
- 
- 	  # Collect preopened libtool deplibs, except any this library
- 	  # has declared as weak libs
- 	  for deplib in $dependency_libs; do
- 	    func_basename "$deplib"
-             deplib_base=$func_basename_result
- 	    case " $weak_libs " in
- 	    *" $deplib_base "*) ;;
- 	    *) func_append deplibs " $deplib" ;;
- 	    esac
- 	  done
- 	done
- 	libs="$dlprefiles"
-       fi
-       if test "$pass" = dlopen; then
- 	# Collect dlpreopened libraries
- 	save_deplibs="$deplibs"
- 	deplibs=
-       fi
- 
-       for deplib in $libs; do
- 	lib=
- 	found=no
- 	case $deplib in
- 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
-         |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
- 	  if test "$linkmode,$pass" = "prog,link"; then
- 	    compile_deplibs="$deplib $compile_deplibs"
- 	    finalize_deplibs="$deplib $finalize_deplibs"
- 	  else
- 	    func_append compiler_flags " $deplib"
- 	    if test "$linkmode" = lib ; then
- 		case "$new_inherited_linker_flags " in
- 		    *" $deplib "*) ;;
- 		    * ) func_append new_inherited_linker_flags " $deplib" ;;
- 		esac
- 	    fi
- 	  fi
- 	  continue
- 	  ;;
- 	-l*)
- 	  if test "$linkmode" != lib && test "$linkmode" != prog; then
- 	    func_warning "\`-l' is ignored for archives/objects"
- 	    continue
- 	  fi
- 	  func_stripname '-l' '' "$deplib"
- 	  name=$func_stripname_result
- 	  if test "$linkmode" = lib; then
- 	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
- 	  else
- 	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
- 	  fi
- 	  for searchdir in $searchdirs; do
- 	    for search_ext in .la $std_shrext .so .a; do
- 	      # Search the libtool library
- 	      lib="$searchdir/lib${name}${search_ext}"
- 	      if test -f "$lib"; then
- 		if test "$search_ext" = ".la"; then
- 		  found=yes
- 		else
- 		  found=no
- 		fi
- 		break 2
- 	      fi
- 	    done
- 	  done
- 	  if test "$found" != yes; then
- 	    # deplib doesn't seem to be a libtool library
- 	    if test "$linkmode,$pass" = "prog,link"; then
- 	      compile_deplibs="$deplib $compile_deplibs"
- 	      finalize_deplibs="$deplib $finalize_deplibs"
- 	    else
- 	      deplibs="$deplib $deplibs"
- 	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
- 	    fi
- 	    continue
- 	  else # deplib is a libtool library
- 	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
- 	    # We need to do some special things here, and not later.
- 	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- 	      case " $predeps $postdeps " in
- 	      *" $deplib "*)
- 		if func_lalib_p "$lib"; then
- 		  library_names=
- 		  old_library=
- 		  func_source "$lib"
- 		  for l in $old_library $library_names; do
- 		    ll="$l"
- 		  done
- 		  if test "X$ll" = "X$old_library" ; then # only static version available
- 		    found=no
- 		    func_dirname "$lib" "" "."
- 		    ladir="$func_dirname_result"
- 		    lib=$ladir/$old_library
- 		    if test "$linkmode,$pass" = "prog,link"; then
- 		      compile_deplibs="$deplib $compile_deplibs"
- 		      finalize_deplibs="$deplib $finalize_deplibs"
- 		    else
- 		      deplibs="$deplib $deplibs"
- 		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
- 		    fi
- 		    continue
- 		  fi
- 		fi
- 		;;
- 	      *) ;;
- 	      esac
- 	    fi
- 	  fi
- 	  ;; # -l
- 	*.ltframework)
- 	  if test "$linkmode,$pass" = "prog,link"; then
- 	    compile_deplibs="$deplib $compile_deplibs"
- 	    finalize_deplibs="$deplib $finalize_deplibs"
- 	  else
- 	    deplibs="$deplib $deplibs"
- 	    if test "$linkmode" = lib ; then
- 		case "$new_inherited_linker_flags " in
- 		    *" $deplib "*) ;;
- 		    * ) func_append new_inherited_linker_flags " $deplib" ;;
- 		esac
- 	    fi
- 	  fi
- 	  continue
- 	  ;;
- 	-L*)
- 	  case $linkmode in
- 	  lib)
- 	    deplibs="$deplib $deplibs"
- 	    test "$pass" = conv && continue
- 	    newdependency_libs="$deplib $newdependency_libs"
- 	    func_stripname '-L' '' "$deplib"
- 	    func_resolve_sysroot "$func_stripname_result"
- 	    func_append newlib_search_path " $func_resolve_sysroot_result"
- 	    ;;
- 	  prog)
- 	    if test "$pass" = conv; then
- 	      deplibs="$deplib $deplibs"
- 	      continue
- 	    fi
- 	    if test "$pass" = scan; then
- 	      deplibs="$deplib $deplibs"
- 	    else
- 	      compile_deplibs="$deplib $compile_deplibs"
- 	      finalize_deplibs="$deplib $finalize_deplibs"
- 	    fi
- 	    func_stripname '-L' '' "$deplib"
- 	    func_resolve_sysroot "$func_stripname_result"
- 	    func_append newlib_search_path " $func_resolve_sysroot_result"
- 	    ;;
- 	  *)
- 	    func_warning "\`-L' is ignored for archives/objects"
- 	    ;;
- 	  esac # linkmode
- 	  continue
- 	  ;; # -L
- 	-R*)
- 	  if test "$pass" = link; then
- 	    func_stripname '-R' '' "$deplib"
- 	    func_resolve_sysroot "$func_stripname_result"
- 	    dir=$func_resolve_sysroot_result
- 	    # Make sure the xrpath contains only unique directories.
- 	    case "$xrpath " in
- 	    *" $dir "*) ;;
- 	    *) func_append xrpath " $dir" ;;
- 	    esac
- 	  fi
- 	  deplibs="$deplib $deplibs"
- 	  continue
- 	  ;;
- 	*.la)
- 	  func_resolve_sysroot "$deplib"
- 	  lib=$func_resolve_sysroot_result
- 	  ;;
- 	*.$libext)
- 	  if test "$pass" = conv; then
- 	    deplibs="$deplib $deplibs"
- 	    continue
- 	  fi
- 	  case $linkmode in
- 	  lib)
- 	    # Linking convenience modules into shared libraries is allowed,
- 	    # but linking other static libraries is non-portable.
- 	    case " $dlpreconveniencelibs " in
- 	    *" $deplib "*) ;;
- 	    *)
- 	      valid_a_lib=no
- 	      case $deplibs_check_method in
- 		match_pattern*)
- 		  set dummy $deplibs_check_method; shift
- 		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
- 		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
- 		    | $EGREP "$match_pattern_regex" > /dev/null; then
- 		    valid_a_lib=yes
- 		  fi
- 		;;
- 		pass_all)
- 		  valid_a_lib=yes
- 		;;
- 	      esac
- 	      if test "$valid_a_lib" != yes; then
- 		echo
- 		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
- 		echo "*** I have the capability to make that library automatically link in when"
- 		echo "*** you link to this library.  But I can only do this if you have a"
- 		echo "*** shared version of the library, which you do not appear to have"
- 		echo "*** because the file extensions .$libext of this argument makes me believe"
- 		echo "*** that it is just a static archive that I should not use here."
- 	      else
- 		echo
- 		$ECHO "*** Warning: Linking the shared library $output against the"
- 		$ECHO "*** static library $deplib is not portable!"
- 		deplibs="$deplib $deplibs"
- 	      fi
- 	      ;;
- 	    esac
- 	    continue
- 	    ;;
- 	  prog)
- 	    if test "$pass" != link; then
- 	      deplibs="$deplib $deplibs"
- 	    else
- 	      compile_deplibs="$deplib $compile_deplibs"
- 	      finalize_deplibs="$deplib $finalize_deplibs"
- 	    fi
- 	    continue
- 	    ;;
- 	  esac # linkmode
- 	  ;; # *.$libext
- 	*.lo | *.$objext)
- 	  if test "$pass" = conv; then
- 	    deplibs="$deplib $deplibs"
- 	  elif test "$linkmode" = prog; then
- 	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
- 	      # If there is no dlopen support or we're linking statically,
- 	      # we need to preload.
- 	      func_append newdlprefiles " $deplib"
- 	      compile_deplibs="$deplib $compile_deplibs"
- 	      finalize_deplibs="$deplib $finalize_deplibs"
- 	    else
- 	      func_append newdlfiles " $deplib"
- 	    fi
- 	  fi
- 	  continue
- 	  ;;
- 	%DEPLIBS%)
- 	  alldeplibs=yes
- 	  continue
- 	  ;;
- 	esac # case $deplib
- 
- 	if test "$found" = yes || test -f "$lib"; then :
- 	else
- 	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
- 	fi
- 
- 	# Check to see that this really is a libtool archive.
- 	func_lalib_unsafe_p "$lib" \
- 	  || func_fatal_error "\`$lib' is not a valid libtool archive"
- 
- 	func_dirname "$lib" "" "."
- 	ladir="$func_dirname_result"
- 
- 	dlname=
- 	dlopen=
- 	dlpreopen=
- 	libdir=
- 	library_names=
- 	old_library=
- 	inherited_linker_flags=
- 	# If the library was installed with an old release of libtool,
- 	# it will not redefine variables installed, or shouldnotlink
- 	installed=yes
- 	shouldnotlink=no
- 	avoidtemprpath=
- 
- 
- 	# Read the .la file
- 	func_source "$lib"
- 
- 	# Convert "-framework foo" to "foo.ltframework"
- 	if test -n "$inherited_linker_flags"; then
- 	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
- 	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
- 	    case " $new_inherited_linker_flags " in
- 	      *" $tmp_inherited_linker_flag "*) ;;
- 	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
- 	    esac
- 	  done
- 	fi
- 	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
- 	if test "$linkmode,$pass" = "lib,link" ||
- 	   test "$linkmode,$pass" = "prog,scan" ||
- 	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
- 	  test -n "$dlopen" && func_append dlfiles " $dlopen"
- 	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
- 	fi
- 
- 	if test "$pass" = conv; then
- 	  # Only check for convenience libraries
- 	  deplibs="$lib $deplibs"
- 	  if test -z "$libdir"; then
- 	    if test -z "$old_library"; then
- 	      func_fatal_error "cannot find name of link library for \`$lib'"
- 	    fi
- 	    # 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"
- 	  elif test "$linkmode" != prog && test "$linkmode" != lib; 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
- 
- 
- 	# Get the name of the library we link against.
- 	linklib=
- 	if test -n "$old_library" &&
- 	   { test "$prefer_static_libs" = yes ||
- 	     test "$prefer_static_libs,$installed" = "built,no"; }; then
- 	  linklib=$old_library
- 	else
- 	  for l in $old_library $library_names; do
- 	    linklib="$l"
- 	  done
- 	fi
- 	if test -z "$linklib"; then
- 	  func_fatal_error "cannot find name of link library for \`$lib'"
- 	fi
- 
- 	# This library was specified with -dlopen.
- 	if test "$pass" = dlopen; then
- 	  if test -z "$libdir"; then
- 	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
- 	  fi
- 	  if test -z "$dlname" ||
- 	     test "$dlopen_support" != yes ||
- 	     test "$build_libtool_libs" = no; then
- 	    # If there is no dlname, no dlopen support or we're linking
- 	    # statically, we need to preload.  We also need to preload any
- 	    # dependent libraries so libltdl's deplib preloader doesn't
- 	    # bomb out in the load deplibs phase.
- 	    func_append dlprefiles " $lib $dependency_libs"
- 	  else
- 	    func_append newdlfiles " $lib"
- 	  fi
- 	  continue
- 	fi # $pass = dlopen
- 
- 	# We need an absolute path.
- 	case $ladir in
- 	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
- 	*)
- 	  abs_ladir=`cd "$ladir" && pwd`
- 	  if test -z "$abs_ladir"; then
- 	    func_warning "cannot determine absolute directory name of \`$ladir'"
- 	    func_warning "passing it literally to the linker, although it might fail"
- 	    abs_ladir="$ladir"
- 	  fi
- 	  ;;
- 	esac
- 	func_basename "$lib"
- 	laname="$func_basename_result"
- 
- 	# Find the relevant object directory and library name.
- 	if test "X$installed" = Xyes; then
- 	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
- 	    #func_warning "library \`$lib' was moved."
- 	    dir="$ladir"
- 	    absdir="$abs_ladir"
- 	    libdir="$abs_ladir"
- 	  else
- 	    dir="$lt_sysroot$libdir"
- 	    absdir="$lt_sysroot$libdir"
- 	  fi
- 	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
- 	else
- 	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
- 	    dir="$ladir"
- 	    absdir="$abs_ladir"
- 	    # Remove this search path later
- 	    func_append notinst_path " $abs_ladir"
- 	  else
- 	    dir="$ladir/$objdir"
- 	    absdir="$abs_ladir/$objdir"
- 	    # Remove this search path later
- 	    func_append notinst_path " $abs_ladir"
- 	  fi
- 	fi # $installed = yes
- 	func_stripname 'lib' '.la' "$laname"
- 	name=$func_stripname_result
- 
- 	# This library was specified with -dlpreopen.
- 	if test "$pass" = dlpreopen; then
- 	  if test -z "$libdir" && test "$linkmode" = prog; then
- 	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
- 	  fi
- 	  case "$host" in
- 	    # special handling for platforms with PE-DLLs.
- 	    *cygwin* | *mingw* | *cegcc* )
- 	      # Linker will automatically link against shared library if both
- 	      # static and shared are present.  Therefore, ensure we extract
- 	      # symbols from the import library if a shared library is present
- 	      # (otherwise, the dlopen module name will be incorrect).  We do
- 	      # this by putting the import library name into $newdlprefiles.
- 	      # We recover the dlopen module name by 'saving' the la file
- 	      # name in a special purpose variable, and (later) extracting the
- 	      # dlname from the la file.
- 	      if test -n "$dlname"; then
- 	        func_tr_sh "$dir/$linklib"
- 	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
- 	        func_append newdlprefiles " $dir/$linklib"
- 	      else
- 	        func_append newdlprefiles " $dir/$old_library"
- 	        # Keep a list of preopened convenience libraries to check
- 	        # that they are being used correctly in the link pass.
- 	        test -z "$libdir" && \
- 	          func_append dlpreconveniencelibs " $dir/$old_library"
- 	      fi
- 	    ;;
- 	    * )
- 	      # Prefer using a static library (so that no silly _DYNAMIC symbols
- 	      # are required to link).
- 	      if test -n "$old_library"; then
- 	        func_append newdlprefiles " $dir/$old_library"
- 	        # Keep a list of preopened convenience libraries to check
- 	        # that they are being used correctly in the link pass.
- 	        test -z "$libdir" && \
- 	          func_append dlpreconveniencelibs " $dir/$old_library"
- 	      # Otherwise, use the dlname, so that lt_dlopen finds it.
- 	      elif test -n "$dlname"; then
- 	        func_append newdlprefiles " $dir/$dlname"
- 	      else
- 	        func_append newdlprefiles " $dir/$linklib"
- 	      fi
- 	    ;;
- 	  esac
- 	fi # $pass = dlpreopen
- 
- 	if test -z "$libdir"; then
- 	  # Link the convenience library
- 	  if test "$linkmode" = lib; then
- 	    deplibs="$dir/$old_library $deplibs"
- 	  elif test "$linkmode,$pass" = "prog,link"; then
- 	    compile_deplibs="$dir/$old_library $compile_deplibs"
- 	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
- 	  else
- 	    deplibs="$lib $deplibs" # used for prog,scan pass
- 	  fi
- 	  continue
- 	fi
- 
- 
- 	if test "$linkmode" = prog && test "$pass" != link; then
- 	  func_append newlib_search_path " $ladir"
- 	  deplibs="$lib $deplibs"
- 
- 	  linkalldeplibs=no
- 	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
- 	     test "$build_libtool_libs" = no; then
- 	    linkalldeplibs=yes
- 	  fi
- 
- 	  tmp_libs=
- 	  for deplib in $dependency_libs; do
- 	    case $deplib in
- 	    -L*) func_stripname '-L' '' "$deplib"
- 	         func_resolve_sysroot "$func_stripname_result"
- 	         func_append newlib_search_path " $func_resolve_sysroot_result"
- 		 ;;
- 	    esac
- 	    # Need to link against all dependency_libs?
- 	    if test "$linkalldeplibs" = yes; then
- 	      deplibs="$deplib $deplibs"
- 	    else
- 	      # Need to hardcode shared library paths
- 	      # or/and link against static libraries
- 	      newdependency_libs="$deplib $newdependency_libs"
- 	    fi
- 	    if $opt_preserve_dup_deps ; then
- 	      case "$tmp_libs " in
- 	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
- 	      esac
- 	    fi
- 	    func_append tmp_libs " $deplib"
- 	  done # for deplib
- 	  continue
- 	fi # $linkmode = prog...
- 
- 	if test "$linkmode,$pass" = "prog,link"; then
- 	  if test -n "$library_names" &&
- 	     { { test "$prefer_static_libs" = no ||
- 	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
- 	       test -z "$old_library"; }; then
- 	    # We need to hardcode the library path
- 	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
- 	      # Make sure the rpath contains only unique directories.
- 	      case "$temp_rpath:" in
- 	      *"$absdir:"*) ;;
- 	      *) func_append temp_rpath "$absdir:" ;;
- 	      esac
- 	    fi
- 
- 	    # Hardcode the library path.
- 	    # Skip directories that are in the system default run-time
- 	    # search path.
- 	    case " $sys_lib_dlsearch_path " in
- 	    *" $absdir "*) ;;
- 	    *)
- 	      case "$compile_rpath " in
- 	      *" $absdir "*) ;;
- 	      *) func_append compile_rpath " $absdir" ;;
- 	      esac
- 	      ;;
- 	    esac
- 	    case " $sys_lib_dlsearch_path " in
- 	    *" $libdir "*) ;;
- 	    *)
- 	      case "$finalize_rpath " in
- 	      *" $libdir "*) ;;
- 	      *) func_append finalize_rpath " $libdir" ;;
- 	      esac
- 	      ;;
- 	    esac
- 	  fi # $linkmode,$pass = prog,link...
- 
- 	  if test "$alldeplibs" = yes &&
- 	     { test "$deplibs_check_method" = pass_all ||
- 	       { test "$build_libtool_libs" = yes &&
- 		 test -n "$library_names"; }; }; then
- 	    # We only need to search for static libraries
- 	    continue
- 	  fi
- 	fi
- 
- 	link_static=no # Whether the deplib will be linked statically
- 	use_static_libs=$prefer_static_libs
- 	if test "$use_static_libs" = built && test "$installed" = yes; then
- 	  use_static_libs=no
- 	fi
- 	if test -n "$library_names" &&
- 	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
- 	  case $host in
- 	  *cygwin* | *mingw* | *cegcc*)
- 	      # No point in relinking DLLs because paths are not encoded
- 	      func_append notinst_deplibs " $lib"
- 	      need_relink=no
- 	    ;;
- 	  *)
- 	    if test "$installed" = no; then
- 	      func_append notinst_deplibs " $lib"
- 	      need_relink=yes
- 	    fi
- 	    ;;
- 	  esac
- 	  # This is a shared library
- 
- 	  # Warn about portability, can't link against -module's on some
- 	  # systems (darwin).  Don't bleat about dlopened modules though!
- 	  dlopenmodule=""
- 	  for dlpremoduletest in $dlprefiles; do
- 	    if test "X$dlpremoduletest" = "X$lib"; then
- 	      dlopenmodule="$dlpremoduletest"
- 	      break
- 	    fi
- 	  done
- 	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
- 	    echo
- 	    if test "$linkmode" = prog; then
- 	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
- 	    else
- 	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
- 	    fi
- 	    $ECHO "*** $linklib is not portable!"
- 	  fi
- 	  if test "$linkmode" = lib &&
- 	     test "$hardcode_into_libs" = yes; then
- 	    # Hardcode the library path.
- 	    # Skip directories that are in the system default run-time
- 	    # search path.
- 	    case " $sys_lib_dlsearch_path " in
- 	    *" $absdir "*) ;;
- 	    *)
- 	      case "$compile_rpath " in
- 	      *" $absdir "*) ;;
- 	      *) func_append compile_rpath " $absdir" ;;
- 	      esac
- 	      ;;
- 	    esac
- 	    case " $sys_lib_dlsearch_path " in
- 	    *" $libdir "*) ;;
- 	    *)
- 	      case "$finalize_rpath " in
- 	      *" $libdir "*) ;;
- 	      *) func_append finalize_rpath " $libdir" ;;
- 	      esac
- 	      ;;
- 	    esac
- 	  fi
- 
- 	  if test -n "$old_archive_from_expsyms_cmds"; then
- 	    # figure out the soname
- 	    set dummy $library_names
- 	    shift
- 	    realname="$1"
- 	    shift
- 	    libname=`eval "\\$ECHO \"$libname_spec\""`
- 	    # use dlname if we got it. it's perfectly good, no?
- 	    if test -n "$dlname"; then
- 	      soname="$dlname"
- 	    elif test -n "$soname_spec"; then
- 	      # bleh windows
- 	      case $host in
- 	      *cygwin* | mingw* | *cegcc*)
- 	        func_arith $current - $age
- 		major=$func_arith_result
- 		versuffix="-$major"
- 		;;
- 	      esac
- 	      eval soname=\"$soname_spec\"
- 	    else
- 	      soname="$realname"
- 	    fi
- 
- 	    # Make a new name for the extract_expsyms_cmds to use
- 	    soroot="$soname"
- 	    func_basename "$soroot"
- 	    soname="$func_basename_result"
- 	    func_stripname 'lib' '.dll' "$soname"
- 	    newlib=libimp-$func_stripname_result.a
- 
- 	    # If the library has no export list, then create one now
- 	    if test -f "$output_objdir/$soname-def"; then :
- 	    else
- 	      func_verbose "extracting exported symbol list from \`$soname'"
- 	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
- 	    fi
- 
- 	    # Create $newlib
- 	    if test -f "$output_objdir/$newlib"; then :; else
- 	      func_verbose "generating import library for \`$soname'"
- 	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
- 	    fi
- 	    # make sure the library variables are pointing to the new library
- 	    dir=$output_objdir
- 	    linklib=$newlib
- 	  fi # test -n "$old_archive_from_expsyms_cmds"
- 
- 	  if test "$linkmode" = prog || test "$opt_mode" != relink; then
- 	    add_shlibpath=
- 	    add_dir=
- 	    add=
- 	    lib_linked=yes
- 	    case $hardcode_action in
- 	    immediate | unsupported)
- 	      if test "$hardcode_direct" = no; then
- 		add="$dir/$linklib"
- 		case $host in
- 		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
- 		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
- 		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
- 		    *-*-unixware7*) add_dir="-L$dir" ;;
- 		  *-*-darwin* )
- 		    # if the lib is a (non-dlopened) module then we can not
- 		    # link against it, someone is ignoring the earlier warnings
- 		    if /usr/bin/file -L $add 2> /dev/null |
- 			 $GREP ": [^:]* bundle" >/dev/null ; then
- 		      if test "X$dlopenmodule" != "X$lib"; then
- 			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
- 			if test -z "$old_library" ; then
- 			  echo
- 			  echo "*** And there doesn't seem to be a static archive available"
- 			  echo "*** The link will probably fail, sorry"
- 			else
- 			  add="$dir/$old_library"
- 			fi
- 		      elif test -n "$old_library"; then
- 			add="$dir/$old_library"
- 		      fi
- 		    fi
- 		esac
- 	      elif test "$hardcode_minus_L" = no; then
- 		case $host in
- 		*-*-sunos*) add_shlibpath="$dir" ;;
- 		esac
- 		add_dir="-L$dir"
- 		add="-l$name"
- 	      elif test "$hardcode_shlibpath_var" = no; then
- 		add_shlibpath="$dir"
- 		add="-l$name"
- 	      else
- 		lib_linked=no
- 	      fi
- 	      ;;
- 	    relink)
- 	      if test "$hardcode_direct" = yes &&
- 	         test "$hardcode_direct_absolute" = no; then
- 		add="$dir/$linklib"
- 	      elif test "$hardcode_minus_L" = yes; then
- 		add_dir="-L$absdir"
- 		# Try looking first in the location we're being installed to.
- 		if test -n "$inst_prefix_dir"; then
- 		  case $libdir in
- 		    [\\/]*)
- 		      func_append add_dir " -L$inst_prefix_dir$libdir"
- 		      ;;
- 		  esac
- 		fi
- 		add="-l$name"
- 	      elif test "$hardcode_shlibpath_var" = yes; then
- 		add_shlibpath="$dir"
- 		add="-l$name"
- 	      else
- 		lib_linked=no
- 	      fi
- 	      ;;
- 	    *) lib_linked=no ;;
- 	    esac
- 
- 	    if test "$lib_linked" != yes; then
- 	      func_fatal_configuration "unsupported hardcode properties"
- 	    fi
- 
- 	    if test -n "$add_shlibpath"; then
- 	      case :$compile_shlibpath: in
- 	      *":$add_shlibpath:"*) ;;
- 	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
- 	      esac
- 	    fi
- 	    if test "$linkmode" = prog; then
- 	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
- 	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
- 	    else
- 	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
- 	      test -n "$add" && deplibs="$add $deplibs"
- 	      if test "$hardcode_direct" != yes &&
- 		 test "$hardcode_minus_L" != yes &&
- 		 test "$hardcode_shlibpath_var" = yes; then
- 		case :$finalize_shlibpath: in
- 		*":$libdir:"*) ;;
- 		*) func_append finalize_shlibpath "$libdir:" ;;
- 		esac
- 	      fi
- 	    fi
- 	  fi
- 
- 	  if test "$linkmode" = prog || test "$opt_mode" = relink; then
- 	    add_shlibpath=
- 	    add_dir=
- 	    add=
- 	    # Finalize command for both is simple: just hardcode it.
- 	    if test "$hardcode_direct" = yes &&
- 	       test "$hardcode_direct_absolute" = no; then
- 	      add="$libdir/$linklib"
- 	    elif test "$hardcode_minus_L" = yes; then
- 	      add_dir="-L$libdir"
- 	      add="-l$name"
- 	    elif test "$hardcode_shlibpath_var" = yes; then
- 	      case :$finalize_shlibpath: in
- 	      *":$libdir:"*) ;;
- 	      *) func_append finalize_shlibpath "$libdir:" ;;
- 	      esac
- 	      add="-l$name"
- 	    elif test "$hardcode_automatic" = yes; then
- 	      if test -n "$inst_prefix_dir" &&
- 		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
- 		add="$inst_prefix_dir$libdir/$linklib"
- 	      else
- 		add="$libdir/$linklib"
- 	      fi
- 	    else
- 	      # We cannot seem to hardcode it, guess we'll fake it.
- 	      add_dir="-L$libdir"
- 	      # Try looking first in the location we're being installed to.
- 	      if test -n "$inst_prefix_dir"; then
- 		case $libdir in
- 		  [\\/]*)
- 		    func_append add_dir " -L$inst_prefix_dir$libdir"
- 		    ;;
- 		esac
- 	      fi
- 	      add="-l$name"
- 	    fi
- 
- 	    if test "$linkmode" = prog; then
- 	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
- 	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
- 	    else
- 	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
- 	      test -n "$add" && deplibs="$add $deplibs"
- 	    fi
- 	  fi
- 	elif test "$linkmode" = prog; then
- 	  # Here we assume that one of hardcode_direct or hardcode_minus_L
- 	  # is not unsupported.  This is valid on all known static and
- 	  # shared platforms.
- 	  if test "$hardcode_direct" != unsupported; then
- 	    test -n "$old_library" && linklib="$old_library"
- 	    compile_deplibs="$dir/$linklib $compile_deplibs"
- 	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
- 	  else
- 	    compile_deplibs="-l$name -L$dir $compile_deplibs"
- 	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
- 	  fi
- 	elif test "$build_libtool_libs" = yes; then
- 	  # Not a shared library
- 	  if test "$deplibs_check_method" != pass_all; then
- 	    # We're trying link a shared library against a static one
- 	    # but the system doesn't support it.
- 
- 	    # Just print a warning and add the library to dependency_libs so
- 	    # that the program can be linked against the static library.
- 	    echo
- 	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
- 	    echo "*** I have the capability to make that library automatically link in when"
- 	    echo "*** you link to this library.  But I can only do this if you have a"
- 	    echo "*** shared version of the library, which you do not appear to have."
- 	    if test "$module" = yes; then
- 	      echo "*** But as you try to build a module library, libtool will still create "
- 	      echo "*** a static module, that should work as long as the dlopening application"
- 	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
- 	      if test -z "$global_symbol_pipe"; then
- 		echo
- 		echo "*** However, this would only work if libtool was able to extract symbol"
- 		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
- 		echo "*** not find such a program.  So, this module is probably useless."
- 		echo "*** \`nm' from GNU binutils and a full rebuild may help."
- 	      fi
- 	      if test "$build_old_libs" = no; then
- 		build_libtool_libs=module
- 		build_old_libs=yes
- 	      else
- 		build_libtool_libs=no
- 	      fi
- 	    fi
- 	  else
- 	    deplibs="$dir/$old_library $deplibs"
- 	    link_static=yes
- 	  fi
- 	fi # link shared/static library?
- 
- 	if test "$linkmode" = lib; then
- 	  if test -n "$dependency_libs" &&
- 	     { test "$hardcode_into_libs" != yes ||
- 	       test "$build_old_libs" = yes ||
- 	       test "$link_static" = yes; }; then
- 	    # Extract -R from dependency_libs
- 	    temp_deplibs=
- 	    for libdir in $dependency_libs; do
- 	      case $libdir in
- 	      -R*) func_stripname '-R' '' "$libdir"
- 	           temp_xrpath=$func_stripname_result
- 		   case " $xrpath " in
- 		   *" $temp_xrpath "*) ;;
- 		   *) func_append xrpath " $temp_xrpath";;
- 		   esac;;
- 	      *) func_append temp_deplibs " $libdir";;
- 	      esac
- 	    done
- 	    dependency_libs="$temp_deplibs"
- 	  fi
- 
- 	  func_append newlib_search_path " $absdir"
- 	  # Link against this library
- 	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
- 	  # ... and its dependency_libs
- 	  tmp_libs=
- 	  for deplib in $dependency_libs; do
- 	    newdependency_libs="$deplib $newdependency_libs"
- 	    case $deplib in
-               -L*) func_stripname '-L' '' "$deplib"
-                    func_resolve_sysroot "$func_stripname_result";;
-               *) func_resolve_sysroot "$deplib" ;;
-             esac
- 	    if $opt_preserve_dup_deps ; then
- 	      case "$tmp_libs " in
- 	      *" $func_resolve_sysroot_result "*)
-                 func_append specialdeplibs " $func_resolve_sysroot_result" ;;
- 	      esac
- 	    fi
- 	    func_append tmp_libs " $func_resolve_sysroot_result"
- 	  done
- 
- 	  if test "$link_all_deplibs" != no; then
- 	    # Add the search paths of all dependency libraries
- 	    for deplib in $dependency_libs; do
- 	      path=
- 	      case $deplib in
- 	      -L*) path="$deplib" ;;
- 	      *.la)
- 	        func_resolve_sysroot "$deplib"
- 	        deplib=$func_resolve_sysroot_result
- 	        func_dirname "$deplib" "" "."
- 		dir=$func_dirname_result
- 		# We need an absolute path.
- 		case $dir in
- 		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
- 		*)
- 		  absdir=`cd "$dir" && pwd`
- 		  if test -z "$absdir"; then
- 		    func_warning "cannot determine absolute directory name of \`$dir'"
- 		    absdir="$dir"
- 		  fi
- 		  ;;
- 		esac
- 		if $GREP "^installed=no" $deplib > /dev/null; then
- 		case $host in
- 		*-*-darwin*)
- 		  depdepl=
- 		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
- 		  if test -n "$deplibrary_names" ; then
- 		    for tmp in $deplibrary_names ; do
- 		      depdepl=$tmp
- 		    done
- 		    if test -f "$absdir/$objdir/$depdepl" ; then
- 		      depdepl="$absdir/$objdir/$depdepl"
- 		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
-                       if test -z "$darwin_install_name"; then
-                           darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
-                       fi
- 		      func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
- 		      func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
- 		      path=
- 		    fi
- 		  fi
- 		  ;;
- 		*)
- 		  path="-L$absdir/$objdir"
- 		  ;;
- 		esac
- 		else
- 		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- 		  test -z "$libdir" && \
- 		    func_fatal_error "\`$deplib' is not a valid libtool archive"
- 		  #test "$absdir" != "$libdir" && \
- 		  #  func_warning "\`$deplib' seems to be moved"
- 
- 		  path="-L$absdir"
- 		fi
- 		;;
- 	      esac
- 	      case " $deplibs " in
- 	      *" $path "*) ;;
- 	      *) deplibs="$path $deplibs" ;;
- 	      esac
- 	    done
- 	  fi # link_all_deplibs != no
- 	fi # linkmode = lib
-       done # for deplib in $libs
-       if test "$pass" = link; then
- 	if test "$linkmode" = "prog"; then
- 	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
- 	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
- 	else
- 	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
- 	fi
-       fi
-       dependency_libs="$newdependency_libs"
-       if test "$pass" = dlpreopen; then
- 	# Link the dlpreopened libraries before other libraries
- 	for deplib in $save_deplibs; do
- 	  deplibs="$deplib $deplibs"
- 	done
-       fi
-       if test "$pass" != dlopen; then
- 	if test "$pass" != conv; then
- 	  # Make sure lib_search_path contains only unique directories.
- 	  lib_search_path=
- 	  for dir in $newlib_search_path; do
- 	    case "$lib_search_path " in
- 	    *" $dir "*) ;;
- 	    *) func_append lib_search_path " $dir" ;;
- 	    esac
- 	  done
- 	  newlib_search_path=
- 	fi
- 
- 	if test "$linkmode,$pass" != "prog,link"; then
- 	  vars="deplibs"
- 	else
- 	  vars="compile_deplibs finalize_deplibs"
- 	fi
- 	for var in $vars dependency_libs; do
- 	  # Add libraries to $var in reverse order
- 	  eval tmp_libs=\"\$$var\"
- 	  new_libs=
- 	  for deplib in $tmp_libs; do
- 	    # FIXME: Pedantically, this is the right thing to do, so
- 	    #        that some nasty dependency loop isn't accidentally
- 	    #        broken:
- 	    #new_libs="$deplib $new_libs"
- 	    # Pragmatically, this seems to cause very few problems in
- 	    # practice:
- 	    case $deplib in
- 	    -L*) new_libs="$deplib $new_libs" ;;
- 	    -R*) ;;
- 	    *)
- 	      # And here is the reason: when a library appears more
- 	      # than once as an explicit dependence of a library, or
- 	      # is implicitly linked in more than once by the
- 	      # compiler, it is considered special, and multiple
- 	      # occurrences thereof are not removed.  Compare this
- 	      # with having the same library being listed as a
- 	      # dependency of multiple other libraries: in this case,
- 	      # we know (pedantically, we assume) the library does not
- 	      # need to be listed more than once, so we keep only the
- 	      # last copy.  This is not always right, but it is rare
- 	      # enough that we require users that really mean to play
- 	      # such unportable linking tricks to link the library
- 	      # using -Wl,-lname, so that libtool does not consider it
- 	      # for duplicate removal.
- 	      case " $specialdeplibs " in
- 	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
- 	      *)
- 		case " $new_libs " in
- 		*" $deplib "*) ;;
- 		*) new_libs="$deplib $new_libs" ;;
- 		esac
- 		;;
- 	      esac
- 	      ;;
- 	    esac
- 	  done
- 	  tmp_libs=
- 	  for deplib in $new_libs; do
- 	    case $deplib in
- 	    -L*)
- 	      case " $tmp_libs " in
- 	      *" $deplib "*) ;;
- 	      *) func_append tmp_libs " $deplib" ;;
- 	      esac
- 	      ;;
- 	    *) func_append tmp_libs " $deplib" ;;
- 	    esac
- 	  done
- 	  eval $var=\"$tmp_libs\"
- 	done # for var
-       fi
-       # Last step: remove runtime libs from dependency_libs
-       # (they stay in deplibs)
-       tmp_libs=
-       for i in $dependency_libs ; do
- 	case " $predeps $postdeps $compiler_lib_search_path " in
- 	*" $i "*)
- 	  i=""
- 	  ;;
- 	esac
- 	if test -n "$i" ; then
- 	  func_append tmp_libs " $i"
- 	fi
-       done
-       dependency_libs=$tmp_libs
-     done # for pass
-     if test "$linkmode" = prog; then
-       dlfiles="$newdlfiles"
-     fi
-     if test "$linkmode" = prog || test "$linkmode" = lib; then
-       dlprefiles="$newdlprefiles"
-     fi
- 
-     case $linkmode in
-     oldlib)
-       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- 	func_warning "\`-dlopen' is ignored for archives"
-       fi
- 
-       case " $deplibs" in
-       *\ -l* | *\ -L*)
- 	func_warning "\`-l' and \`-L' are ignored for archives" ;;
-       esac
- 
-       test -n "$rpath" && \
- 	func_warning "\`-rpath' is ignored for archives"
- 
-       test -n "$xrpath" && \
- 	func_warning "\`-R' is ignored for archives"
- 
-       test -n "$vinfo" && \
- 	func_warning "\`-version-info/-version-number' is ignored for archives"
- 
-       test -n "$release" && \
- 	func_warning "\`-release' is ignored for archives"
- 
-       test -n "$export_symbols$export_symbols_regex" && \
- 	func_warning "\`-export-symbols' is ignored for archives"
- 
-       # Now set the variables for building old libraries.
-       build_libtool_libs=no
-       oldlibs="$output"
-       func_append objs "$old_deplibs"
-       ;;
- 
-     lib)
-       # Make sure we only generate libraries of the form `libNAME.la'.
-       case $outputname in
-       lib*)
- 	func_stripname 'lib' '.la' "$outputname"
- 	name=$func_stripname_result
- 	eval shared_ext=\"$shrext_cmds\"
- 	eval libname=\"$libname_spec\"
- 	;;
-       *)
- 	test "$module" = no && \
- 	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
- 
- 	if test "$need_lib_prefix" != no; then
- 	  # Add the "lib" prefix for modules if required
- 	  func_stripname '' '.la' "$outputname"
- 	  name=$func_stripname_result
- 	  eval shared_ext=\"$shrext_cmds\"
- 	  eval libname=\"$libname_spec\"
- 	else
- 	  func_stripname '' '.la' "$outputname"
- 	  libname=$func_stripname_result
- 	fi
- 	;;
-       esac
- 
-       if test -n "$objs"; then
- 	if test "$deplibs_check_method" != pass_all; then
- 	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
- 	else
- 	  echo
- 	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
- 	  $ECHO "*** objects $objs is not portable!"
- 	  func_append libobjs " $objs"
- 	fi
-       fi
- 
-       test "$dlself" != no && \
- 	func_warning "\`-dlopen self' is ignored for libtool libraries"
- 
-       set dummy $rpath
-       shift
-       test "$#" -gt 1 && \
- 	func_warning "ignoring multiple \`-rpath's for a libtool library"
- 
-       install_libdir="$1"
- 
-       oldlibs=
-       if test -z "$rpath"; then
- 	if test "$build_libtool_libs" = yes; then
- 	  # Building a libtool convenience library.
- 	  # Some compilers have problems with a `.al' extension so
- 	  # convenience libraries should have the same extension an
- 	  # archive normally would.
- 	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
- 	  build_libtool_libs=convenience
- 	  build_old_libs=yes
- 	fi
- 
- 	test -n "$vinfo" && \
- 	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
- 
- 	test -n "$release" && \
- 	  func_warning "\`-release' is ignored for convenience libraries"
-       else
- 
- 	# Parse the version information argument.
- 	save_ifs="$IFS"; IFS=':'
- 	set dummy $vinfo 0 0 0
- 	shift
- 	IFS="$save_ifs"
- 
- 	test -n "$7" && \
- 	  func_fatal_help "too many parameters to \`-version-info'"
- 
- 	# convert absolute version numbers to libtool ages
- 	# this retains compatibility with .la files and attempts
- 	# to make the code below a bit more comprehensible
- 
- 	case $vinfo_number in
- 	yes)
- 	  number_major="$1"
- 	  number_minor="$2"
- 	  number_revision="$3"
- 	  #
- 	  # There are really only two kinds -- those that
- 	  # use the current revision as the major version
- 	  # and those that subtract age and use age as
- 	  # a minor version.  But, then there is irix
- 	  # which has an extra 1 added just for fun
- 	  #
- 	  case $version_type in
- 	  # correct linux to gnu/linux during the next big refactor
- 	  darwin|linux|osf|windows|none)
- 	    func_arith $number_major + $number_minor
- 	    current=$func_arith_result
- 	    age="$number_minor"
- 	    revision="$number_revision"
- 	    ;;
- 	  freebsd-aout|freebsd-elf|qnx|sunos)
- 	    current="$number_major"
- 	    revision="$number_minor"
- 	    age="0"
- 	    ;;
- 	  irix|nonstopux)
- 	    func_arith $number_major + $number_minor
- 	    current=$func_arith_result
- 	    age="$number_minor"
- 	    revision="$number_minor"
- 	    lt_irix_increment=no
- 	    ;;
- 	  esac
- 	  ;;
- 	no)
- 	  current="$1"
- 	  revision="$2"
- 	  age="$3"
- 	  ;;
- 	esac
- 
- 	# Check that each of the things are valid numbers.
- 	case $current in
- 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
- 	*)
- 	  func_error "CURRENT \`$current' must be a nonnegative integer"
- 	  func_fatal_error "\`$vinfo' is not valid version information"
- 	  ;;
- 	esac
- 
- 	case $revision in
- 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
- 	*)
- 	  func_error "REVISION \`$revision' must be a nonnegative integer"
- 	  func_fatal_error "\`$vinfo' is not valid version information"
- 	  ;;
- 	esac
- 
- 	case $age in
- 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
- 	*)
- 	  func_error "AGE \`$age' must be a nonnegative integer"
- 	  func_fatal_error "\`$vinfo' is not valid version information"
- 	  ;;
- 	esac
- 
- 	if test "$age" -gt "$current"; then
- 	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
- 	  func_fatal_error "\`$vinfo' is not valid version information"
- 	fi
- 
- 	# Calculate the version variables.
- 	major=
- 	versuffix=
- 	verstring=
- 	case $version_type in
- 	none) ;;
- 
- 	darwin)
- 	  # Like Linux, but with the current version available in
- 	  # verstring for coding it into the library header
- 	  func_arith $current - $age
- 	  major=.$func_arith_result
- 	  versuffix="$major.$age.$revision"
- 	  # Darwin ld doesn't like 0 for these options...
- 	  func_arith $current + 1
- 	  minor_current=$func_arith_result
- 	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
- 	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
- 	  ;;
- 
- 	freebsd-aout)
- 	  major=".$current"
- 	  versuffix=".$current.$revision";
- 	  ;;
- 
- 	freebsd-elf)
- 	  major=".$current"
- 	  versuffix=".$current"
- 	  ;;
- 
- 	irix | nonstopux)
- 	  if test "X$lt_irix_increment" = "Xno"; then
- 	    func_arith $current - $age
- 	  else
- 	    func_arith $current - $age + 1
- 	  fi
- 	  major=$func_arith_result
- 
- 	  case $version_type in
- 	    nonstopux) verstring_prefix=nonstopux ;;
- 	    *)         verstring_prefix=sgi ;;
- 	  esac
- 	  verstring="$verstring_prefix$major.$revision"
- 
- 	  # Add in all the interfaces that we are compatible with.
- 	  loop=$revision
- 	  while test "$loop" -ne 0; do
- 	    func_arith $revision - $loop
- 	    iface=$func_arith_result
- 	    func_arith $loop - 1
- 	    loop=$func_arith_result
- 	    verstring="$verstring_prefix$major.$iface:$verstring"
- 	  done
- 
- 	  # Before this point, $major must not contain `.'.
- 	  major=.$major
- 	  versuffix="$major.$revision"
- 	  ;;
- 
- 	linux) # correct to gnu/linux during the next big refactor
- 	  func_arith $current - $age
- 	  major=.$func_arith_result
- 	  versuffix="$major.$age.$revision"
- 	  ;;
- 
- 	osf)
- 	  func_arith $current - $age
- 	  major=.$func_arith_result
- 	  versuffix=".$current.$age.$revision"
- 	  verstring="$current.$age.$revision"
- 
- 	  # Add in all the interfaces that we are compatible with.
- 	  loop=$age
- 	  while test "$loop" -ne 0; do
- 	    func_arith $current - $loop
- 	    iface=$func_arith_result
- 	    func_arith $loop - 1
- 	    loop=$func_arith_result
- 	    verstring="$verstring:${iface}.0"
- 	  done
- 
- 	  # Make executables depend on our current version.
- 	  func_append verstring ":${current}.0"
- 	  ;;
- 
- 	qnx)
- 	  major=".$current"
- 	  versuffix=".$current"
- 	  ;;
- 
- 	sunos)
- 	  major=".$current"
- 	  versuffix=".$current.$revision"
- 	  ;;
- 
- 	windows)
- 	  # Use '-' rather than '.', since we only want one
- 	  # extension on DOS 8.3 filesystems.
- 	  func_arith $current - $age
- 	  major=$func_arith_result
- 	  versuffix="-$major"
- 	  ;;
- 
- 	*)
- 	  func_fatal_configuration "unknown library version type \`$version_type'"
- 	  ;;
- 	esac
- 
- 	# Clear the version info if we defaulted, and they specified a release.
- 	if test -z "$vinfo" && test -n "$release"; then
- 	  major=
- 	  case $version_type in
- 	  darwin)
- 	    # we can't check for "0.0" in archive_cmds due to quoting
- 	    # problems, so we reset it completely
- 	    verstring=
- 	    ;;
- 	  *)
- 	    verstring="0.0"
- 	    ;;
- 	  esac
- 	  if test "$need_version" = no; then
- 	    versuffix=
- 	  else
- 	    versuffix=".0.0"
- 	  fi
- 	fi
- 
- 	# Remove version info from name if versioning should be avoided
- 	if test "$avoid_version" = yes && test "$need_version" = no; then
- 	  major=
- 	  versuffix=
- 	  verstring=""
- 	fi
- 
- 	# Check to see if the archive will have undefined symbols.
- 	if test "$allow_undefined" = yes; then
- 	  if test "$allow_undefined_flag" = unsupported; then
- 	    func_warning "undefined symbols not allowed in $host shared libraries"
- 	    build_libtool_libs=no
- 	    build_old_libs=yes
- 	  fi
- 	else
- 	  # Don't allow undefined symbols.
- 	  allow_undefined_flag="$no_undefined_flag"
- 	fi
- 
-       fi
- 
-       func_generate_dlsyms "$libname" "$libname" "yes"
-       func_append libobjs " $symfileobj"
-       test "X$libobjs" = "X " && libobjs=
- 
-       if test "$opt_mode" != relink; then
- 	# Remove our outputs, but don't remove object files since they
- 	# may have been created when compiling PIC objects.
- 	removelist=
- 	tempremovelist=`$ECHO "$output_objdir/*"`
- 	for p in $tempremovelist; do
- 	  case $p in
- 	    *.$objext | *.gcno)
- 	       ;;
- 	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
- 	       if test "X$precious_files_regex" != "X"; then
- 		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
- 		 then
- 		   continue
- 		 fi
- 	       fi
- 	       func_append removelist " $p"
- 	       ;;
- 	    *) ;;
- 	  esac
- 	done
- 	test -n "$removelist" && \
- 	  func_show_eval "${RM}r \$removelist"
-       fi
- 
-       # Now set the variables for building old libraries.
-       if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
- 	func_append oldlibs " $output_objdir/$libname.$libext"
- 
- 	# Transform .lo files to .o files.
- 	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
-       fi
- 
-       # Eliminate all temporary directories.
-       #for path in $notinst_path; do
-       #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
-       #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
-       #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
-       #done
- 
-       if test -n "$xrpath"; then
- 	# If the user specified any rpath flags, then add them.
- 	temp_xrpath=
- 	for libdir in $xrpath; do
- 	  func_replace_sysroot "$libdir"
- 	  func_append temp_xrpath " -R$func_replace_sysroot_result"
- 	  case "$finalize_rpath " in
- 	  *" $libdir "*) ;;
- 	  *) func_append finalize_rpath " $libdir" ;;
- 	  esac
- 	done
- 	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
- 	  dependency_libs="$temp_xrpath $dependency_libs"
- 	fi
-       fi
- 
-       # Make sure dlfiles contains only unique files that won't be dlpreopened
-       old_dlfiles="$dlfiles"
-       dlfiles=
-       for lib in $old_dlfiles; do
- 	case " $dlprefiles $dlfiles " in
- 	*" $lib "*) ;;
- 	*) func_append dlfiles " $lib" ;;
- 	esac
-       done
- 
-       # Make sure dlprefiles contains only unique files
-       old_dlprefiles="$dlprefiles"
-       dlprefiles=
-       for lib in $old_dlprefiles; do
- 	case "$dlprefiles " in
- 	*" $lib "*) ;;
- 	*) func_append dlprefiles " $lib" ;;
- 	esac
-       done
- 
-       if test "$build_libtool_libs" = yes; then
- 	if test -n "$rpath"; then
- 	  case $host in
- 	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
- 	    # these systems don't actually have a c library (as such)!
- 	    ;;
- 	  *-*-rhapsody* | *-*-darwin1.[012])
- 	    # Rhapsody C library is in the System framework
- 	    func_append deplibs " System.ltframework"
- 	    ;;
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
- 	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    ;;
- 	  *-*-sco3.2v5* | *-*-sco5v6*)
- 	    # Causes problems with __ctype
- 	    ;;
- 	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
- 	    # Compiler inserts libc in the correct place for threads to work
- 	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
- 	      func_append deplibs " -lc"
- 	    fi
- 	    ;;
- 	  esac
- 	fi
- 
- 	# Transform deplibs into only deplibs that can be linked in shared.
- 	name_save=$name
- 	libname_save=$libname
- 	release_save=$release
- 	versuffix_save=$versuffix
- 	major_save=$major
- 	# I'm not sure if I'm treating the release correctly.  I think
- 	# release should show up in the -l (ie -lgmp5) so we don't want to
- 	# add it in twice.  Is that correct?
- 	release=""
- 	versuffix=""
- 	major=""
- 	newdeplibs=
- 	droppeddeps=no
- 	case $deplibs_check_method in
- 	pass_all)
- 	  # Don't check for shared/static.  Everything works.
- 	  # This might be a little naive.  We might want to check
- 	  # whether the library exists or not.  But this is on
- 	  # osf3 & osf4 and I'm not really sure... Just
- 	  # implementing what was already the behavior.
- 	  newdeplibs=$deplibs
- 	  ;;
- 	test_compile)
- 	  # This code stresses the "libraries are programs" paradigm to its
- 	  # limits. Maybe even breaks it.  We compile a program, linking it
- 	  # against the deplibs as a proxy for the library.  Then we can check
- 	  # whether they linked in statically or dynamically with ldd.
- 	  $opt_dry_run || $RM conftest.c
- 	  cat > conftest.c <<EOF
- 	  int main() { return 0; }
- EOF
- 	  $opt_dry_run || $RM conftest
- 	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
- 	    ldd_output=`ldd conftest`
- 	    for i in $deplibs; do
- 	      case $i in
- 	      -l*)
- 		func_stripname -l '' "$i"
- 		name=$func_stripname_result
- 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- 		  case " $predeps $postdeps " in
- 		  *" $i "*)
- 		    func_append newdeplibs " $i"
- 		    i=""
- 		    ;;
- 		  esac
- 		fi
- 		if test -n "$i" ; then
- 		  libname=`eval "\\$ECHO \"$libname_spec\""`
- 		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
- 		  set dummy $deplib_matches; shift
- 		  deplib_match=$1
- 		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
- 		    func_append newdeplibs " $i"
- 		  else
- 		    droppeddeps=yes
- 		    echo
- 		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
- 		    echo "*** I have the capability to make that library automatically link in when"
- 		    echo "*** you link to this library.  But I can only do this if you have a"
- 		    echo "*** shared version of the library, which I believe you do not have"
- 		    echo "*** because a test_compile did reveal that the linker did not use it for"
- 		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
- 		  fi
- 		fi
- 		;;
- 	      *)
- 		func_append newdeplibs " $i"
- 		;;
- 	      esac
- 	    done
- 	  else
- 	    # Error occurred in the first compile.  Let's try to salvage
- 	    # the situation: Compile a separate program for each library.
- 	    for i in $deplibs; do
- 	      case $i in
- 	      -l*)
- 		func_stripname -l '' "$i"
- 		name=$func_stripname_result
- 		$opt_dry_run || $RM conftest
- 		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
- 		  ldd_output=`ldd conftest`
- 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- 		    case " $predeps $postdeps " in
- 		    *" $i "*)
- 		      func_append newdeplibs " $i"
- 		      i=""
- 		      ;;
- 		    esac
- 		  fi
- 		  if test -n "$i" ; then
- 		    libname=`eval "\\$ECHO \"$libname_spec\""`
- 		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
- 		    set dummy $deplib_matches; shift
- 		    deplib_match=$1
- 		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
- 		      func_append newdeplibs " $i"
- 		    else
- 		      droppeddeps=yes
- 		      echo
- 		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
- 		      echo "*** I have the capability to make that library automatically link in when"
- 		      echo "*** you link to this library.  But I can only do this if you have a"
- 		      echo "*** shared version of the library, which you do not appear to have"
- 		      echo "*** because a test_compile did reveal that the linker did not use this one"
- 		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
- 		    fi
- 		  fi
- 		else
- 		  droppeddeps=yes
- 		  echo
- 		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
- 		  echo "*** make it link in!  You will probably need to install it or some"
- 		  echo "*** library that it depends on before this library will be fully"
- 		  echo "*** functional.  Installing it before continuing would be even better."
- 		fi
- 		;;
- 	      *)
- 		func_append newdeplibs " $i"
- 		;;
- 	      esac
- 	    done
- 	  fi
- 	  ;;
- 	file_magic*)
- 	  set dummy $deplibs_check_method; shift
- 	  file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
- 	  for a_deplib in $deplibs; do
- 	    case $a_deplib in
- 	    -l*)
- 	      func_stripname -l '' "$a_deplib"
- 	      name=$func_stripname_result
- 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- 		case " $predeps $postdeps " in
- 		*" $a_deplib "*)
- 		  func_append newdeplibs " $a_deplib"
- 		  a_deplib=""
- 		  ;;
- 		esac
- 	      fi
- 	      if test -n "$a_deplib" ; then
- 		libname=`eval "\\$ECHO \"$libname_spec\""`
- 		if test -n "$file_magic_glob"; then
- 		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
- 		else
- 		  libnameglob=$libname
- 		fi
- 		test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
- 		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
- 		  if test "$want_nocaseglob" = yes; then
- 		    shopt -s nocaseglob
- 		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
- 		    $nocaseglob
- 		  else
- 		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
- 		  fi
- 		  for potent_lib in $potential_libs; do
- 		      # Follow soft links.
- 		      if ls -lLd "$potent_lib" 2>/dev/null |
- 			 $GREP " -> " >/dev/null; then
- 			continue
- 		      fi
- 		      # The statement above tries to avoid entering an
- 		      # endless loop below, in case of cyclic links.
- 		      # We might still enter an endless loop, since a link
- 		      # loop can be closed while we follow links,
- 		      # but so what?
- 		      potlib="$potent_lib"
- 		      while test -h "$potlib" 2>/dev/null; do
- 			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
- 			case $potliblink in
- 			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
- 			*) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
- 			esac
- 		      done
- 		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
- 			 $SED -e 10q |
- 			 $EGREP "$file_magic_regex" > /dev/null; then
- 			func_append newdeplibs " $a_deplib"
- 			a_deplib=""
- 			break 2
- 		      fi
- 		  done
- 		done
- 	      fi
- 	      if test -n "$a_deplib" ; then
- 		droppeddeps=yes
- 		echo
- 		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
- 		echo "*** I have the capability to make that library automatically link in when"
- 		echo "*** you link to this library.  But I can only do this if you have a"
- 		echo "*** shared version of the library, which you do not appear to have"
- 		echo "*** because I did check the linker path looking for a file starting"
- 		if test -z "$potlib" ; then
- 		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
- 		else
- 		  $ECHO "*** with $libname and none of the candidates passed a file format test"
- 		  $ECHO "*** using a file magic. Last file checked: $potlib"
- 		fi
- 	      fi
- 	      ;;
- 	    *)
- 	      # Add a -L argument.
- 	      func_append newdeplibs " $a_deplib"
- 	      ;;
- 	    esac
- 	  done # Gone through all deplibs.
- 	  ;;
- 	match_pattern*)
- 	  set dummy $deplibs_check_method; shift
- 	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
- 	  for a_deplib in $deplibs; do
- 	    case $a_deplib in
- 	    -l*)
- 	      func_stripname -l '' "$a_deplib"
- 	      name=$func_stripname_result
- 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- 		case " $predeps $postdeps " in
- 		*" $a_deplib "*)
- 		  func_append newdeplibs " $a_deplib"
- 		  a_deplib=""
- 		  ;;
- 		esac
- 	      fi
- 	      if test -n "$a_deplib" ; then
- 		libname=`eval "\\$ECHO \"$libname_spec\""`
- 		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
- 		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
- 		  for potent_lib in $potential_libs; do
- 		    potlib="$potent_lib" # see symlink-check above in file_magic test
- 		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
- 		       $EGREP "$match_pattern_regex" > /dev/null; then
- 		      func_append newdeplibs " $a_deplib"
- 		      a_deplib=""
- 		      break 2
- 		    fi
- 		  done
- 		done
- 	      fi
- 	      if test -n "$a_deplib" ; then
- 		droppeddeps=yes
- 		echo
- 		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
- 		echo "*** I have the capability to make that library automatically link in when"
- 		echo "*** you link to this library.  But I can only do this if you have a"
- 		echo "*** shared version of the library, which you do not appear to have"
- 		echo "*** because I did check the linker path looking for a file starting"
- 		if test -z "$potlib" ; then
- 		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
- 		else
- 		  $ECHO "*** with $libname and none of the candidates passed a file format test"
- 		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
- 		fi
- 	      fi
- 	      ;;
- 	    *)
- 	      # Add a -L argument.
- 	      func_append newdeplibs " $a_deplib"
- 	      ;;
- 	    esac
- 	  done # Gone through all deplibs.
- 	  ;;
- 	none | unknown | *)
- 	  newdeplibs=""
- 	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
- 	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- 	    for i in $predeps $postdeps ; do
- 	      # can't use Xsed below, because $i might contain '/'
- 	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
- 	    done
- 	  fi
- 	  case $tmp_deplibs in
- 	  *[!\	\ ]*)
- 	    echo
- 	    if test "X$deplibs_check_method" = "Xnone"; then
- 	      echo "*** Warning: inter-library dependencies are not supported in this platform."
- 	    else
- 	      echo "*** Warning: inter-library dependencies are not known to be supported."
- 	    fi
- 	    echo "*** All declared inter-library dependencies are being dropped."
- 	    droppeddeps=yes
- 	    ;;
- 	  esac
- 	  ;;
- 	esac
- 	versuffix=$versuffix_save
- 	major=$major_save
- 	release=$release_save
- 	libname=$libname_save
- 	name=$name_save
- 
- 	case $host in
- 	*-*-rhapsody* | *-*-darwin1.[012])
- 	  # On Rhapsody replace the C library with the System framework
- 	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
- 	  ;;
- 	esac
- 
- 	if test "$droppeddeps" = yes; then
- 	  if test "$module" = yes; then
- 	    echo
- 	    echo "*** Warning: libtool could not satisfy all declared inter-library"
- 	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
- 	    echo "*** a static module, that should work as long as the dlopening"
- 	    echo "*** application is linked with the -dlopen flag."
- 	    if test -z "$global_symbol_pipe"; then
- 	      echo
- 	      echo "*** However, this would only work if libtool was able to extract symbol"
- 	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
- 	      echo "*** not find such a program.  So, this module is probably useless."
- 	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
- 	    fi
- 	    if test "$build_old_libs" = no; then
- 	      oldlibs="$output_objdir/$libname.$libext"
- 	      build_libtool_libs=module
- 	      build_old_libs=yes
- 	    else
- 	      build_libtool_libs=no
- 	    fi
- 	  else
- 	    echo "*** The inter-library dependencies that have been dropped here will be"
- 	    echo "*** automatically added whenever a program is linked with this library"
- 	    echo "*** or is declared to -dlopen it."
- 
- 	    if test "$allow_undefined" = no; then
- 	      echo
- 	      echo "*** Since this library must not contain undefined symbols,"
- 	      echo "*** because either the platform does not support them or"
- 	      echo "*** it was explicitly requested with -no-undefined,"
- 	      echo "*** libtool will only create a static version of it."
- 	      if test "$build_old_libs" = no; then
- 		oldlibs="$output_objdir/$libname.$libext"
- 		build_libtool_libs=module
- 		build_old_libs=yes
- 	      else
- 		build_libtool_libs=no
- 	      fi
- 	    fi
- 	  fi
- 	fi
- 	# Done checking deplibs!
- 	deplibs=$newdeplibs
-       fi
-       # Time to change all our "foo.ltframework" stuff back to "-framework foo"
-       case $host in
- 	*-*-darwin*)
- 	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
- 	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
- 	  deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
- 	  ;;
-       esac
- 
-       # move library search paths that coincide with paths to not yet
-       # installed libraries to the beginning of the library search list
-       new_libs=
-       for path in $notinst_path; do
- 	case " $new_libs " in
- 	*" -L$path/$objdir "*) ;;
- 	*)
- 	  case " $deplibs " in
- 	  *" -L$path/$objdir "*)
- 	    func_append new_libs " -L$path/$objdir" ;;
- 	  esac
- 	  ;;
- 	esac
-       done
-       for deplib in $deplibs; do
- 	case $deplib in
- 	-L*)
- 	  case " $new_libs " in
- 	  *" $deplib "*) ;;
- 	  *) func_append new_libs " $deplib" ;;
- 	  esac
- 	  ;;
- 	*) func_append new_libs " $deplib" ;;
- 	esac
-       done
-       deplibs="$new_libs"
- 
-       # All the library-specific variables (install_libdir is set above).
-       library_names=
-       old_library=
-       dlname=
- 
-       # Test again, we may have decided not to build it any more
-       if test "$build_libtool_libs" = yes; then
- 	# Remove ${wl} instances when linking with ld.
- 	# FIXME: should test the right _cmds variable.
- 	case $archive_cmds in
- 	  *\$LD\ *) wl= ;;
-         esac
- 	if test "$hardcode_into_libs" = yes; then
- 	  # Hardcode the library paths
- 	  hardcode_libdirs=
- 	  dep_rpath=
- 	  rpath="$finalize_rpath"
- 	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
- 	  for libdir in $rpath; do
- 	    if test -n "$hardcode_libdir_flag_spec"; then
- 	      if test -n "$hardcode_libdir_separator"; then
- 		func_replace_sysroot "$libdir"
- 		libdir=$func_replace_sysroot_result
- 		if test -z "$hardcode_libdirs"; then
- 		  hardcode_libdirs="$libdir"
- 		else
- 		  # Just accumulate the unique libdirs.
- 		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
- 		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
- 		    ;;
- 		  *)
- 		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
- 		    ;;
- 		  esac
- 		fi
- 	      else
- 		eval flag=\"$hardcode_libdir_flag_spec\"
- 		func_append dep_rpath " $flag"
- 	      fi
- 	    elif test -n "$runpath_var"; then
- 	      case "$perm_rpath " in
- 	      *" $libdir "*) ;;
- 	      *) func_append perm_rpath " $libdir" ;;
- 	      esac
- 	    fi
- 	  done
- 	  # Substitute the hardcoded libdirs into the rpath.
- 	  if test -n "$hardcode_libdir_separator" &&
- 	     test -n "$hardcode_libdirs"; then
- 	    libdir="$hardcode_libdirs"
- 	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
- 	  fi
- 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
- 	    # We should set the runpath_var.
- 	    rpath=
- 	    for dir in $perm_rpath; do
- 	      func_append rpath "$dir:"
- 	    done
- 	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
- 	  fi
- 	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
- 	fi
- 
- 	shlibpath="$finalize_shlibpath"
- 	test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
- 	if test -n "$shlibpath"; then
- 	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
- 	fi
- 
- 	# Get the real and link names of the library.
- 	eval shared_ext=\"$shrext_cmds\"
- 	eval library_names=\"$library_names_spec\"
- 	set dummy $library_names
- 	shift
- 	realname="$1"
- 	shift
- 
- 	if test -n "$soname_spec"; then
- 	  eval soname=\"$soname_spec\"
- 	else
- 	  soname="$realname"
- 	fi
- 	if test -z "$dlname"; then
- 	  dlname=$soname
- 	fi
- 
- 	lib="$output_objdir/$realname"
- 	linknames=
- 	for link
- 	do
- 	  func_append linknames " $link"
- 	done
- 
- 	# Use standard objects if they are pic
- 	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
- 	test "X$libobjs" = "X " && libobjs=
- 
- 	delfiles=
- 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
- 	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
- 	  export_symbols="$output_objdir/$libname.uexp"
- 	  func_append delfiles " $export_symbols"
- 	fi
- 
- 	orig_export_symbols=
- 	case $host_os in
- 	cygwin* | mingw* | cegcc*)
- 	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
- 	    # exporting using user supplied symfile
- 	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
- 	      # and it's NOT already a .def file. Must figure out
- 	      # which of the given symbols are data symbols and tag
- 	      # them as such. So, trigger use of export_symbols_cmds.
- 	      # export_symbols gets reassigned inside the "prepare
- 	      # the list of exported symbols" if statement, so the
- 	      # include_expsyms logic still works.
- 	      orig_export_symbols="$export_symbols"
- 	      export_symbols=
- 	      always_export_symbols=yes
- 	    fi
- 	  fi
- 	  ;;
- 	esac
- 
- 	# Prepare the list of exported symbols
- 	if test -z "$export_symbols"; then
- 	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
- 	    func_verbose "generating symbol list for \`$libname.la'"
- 	    export_symbols="$output_objdir/$libname.exp"
- 	    $opt_dry_run || $RM $export_symbols
- 	    cmds=$export_symbols_cmds
- 	    save_ifs="$IFS"; IFS='~'
- 	    for cmd1 in $cmds; do
- 	      IFS="$save_ifs"
- 	      # Take the normal branch if the nm_file_list_spec branch
- 	      # doesn't work or if tool conversion is not needed.
- 	      case $nm_file_list_spec~$to_tool_file_cmd in
- 		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
- 		  try_normal_branch=yes
- 		  eval cmd=\"$cmd1\"
- 		  func_len " $cmd"
- 		  len=$func_len_result
- 		  ;;
- 		*)
- 		  try_normal_branch=no
- 		  ;;
- 	      esac
- 	      if test "$try_normal_branch" = yes \
- 		 && { test "$len" -lt "$max_cmd_len" \
- 		      || test "$max_cmd_len" -le -1; }
- 	      then
- 		func_show_eval "$cmd" 'exit $?'
- 		skipped_export=false
- 	      elif test -n "$nm_file_list_spec"; then
- 		func_basename "$output"
- 		output_la=$func_basename_result
- 		save_libobjs=$libobjs
- 		save_output=$output
- 		output=${output_objdir}/${output_la}.nm
- 		func_to_tool_file "$output"
- 		libobjs=$nm_file_list_spec$func_to_tool_file_result
- 		func_append delfiles " $output"
- 		func_verbose "creating $NM input file list: $output"
- 		for obj in $save_libobjs; do
- 		  func_to_tool_file "$obj"
- 		  $ECHO "$func_to_tool_file_result"
- 		done > "$output"
- 		eval cmd=\"$cmd1\"
- 		func_show_eval "$cmd" 'exit $?'
- 		output=$save_output
- 		libobjs=$save_libobjs
- 		skipped_export=false
- 	      else
- 		# The command line is too long to execute in one step.
- 		func_verbose "using reloadable object file for export list..."
- 		skipped_export=:
- 		# Break out early, otherwise skipped_export may be
- 		# set to false by a later but shorter cmd.
- 		break
- 	      fi
- 	    done
- 	    IFS="$save_ifs"
- 	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
- 	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
- 	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
- 	    fi
- 	  fi
- 	fi
- 
- 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
- 	  tmp_export_symbols="$export_symbols"
- 	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
- 	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
- 	fi
- 
- 	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
- 	  # The given exports_symbols file has to be filtered, so filter it.
- 	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
- 	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
- 	  # 's' commands which not all seds can handle. GNU sed should be fine
- 	  # though. Also, the filter scales superlinearly with the number of
- 	  # global variables. join(1) would be nice here, but unfortunately
- 	  # isn't a blessed tool.
- 	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
- 	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
- 	  export_symbols=$output_objdir/$libname.def
- 	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
- 	fi
- 
- 	tmp_deplibs=
- 	for test_deplib in $deplibs; do
- 	  case " $convenience " in
- 	  *" $test_deplib "*) ;;
- 	  *)
- 	    func_append tmp_deplibs " $test_deplib"
- 	    ;;
- 	  esac
- 	done
- 	deplibs="$tmp_deplibs"
- 
- 	if test -n "$convenience"; then
- 	  if test -n "$whole_archive_flag_spec" &&
- 	    test "$compiler_needs_object" = yes &&
- 	    test -z "$libobjs"; then
- 	    # extract the archives, so we have objects to list.
- 	    # TODO: could optimize this to just extract one archive.
- 	    whole_archive_flag_spec=
- 	  fi
- 	  if test -n "$whole_archive_flag_spec"; then
- 	    save_libobjs=$libobjs
- 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
- 	    test "X$libobjs" = "X " && libobjs=
- 	  else
- 	    gentop="$output_objdir/${outputname}x"
- 	    func_append generated " $gentop"
- 
- 	    func_extract_archives $gentop $convenience
- 	    func_append libobjs " $func_extract_archives_result"
- 	    test "X$libobjs" = "X " && libobjs=
- 	  fi
- 	fi
- 
- 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
- 	  eval flag=\"$thread_safe_flag_spec\"
- 	  func_append linker_flags " $flag"
- 	fi
- 
- 	# Make a backup of the uninstalled library when relinking
- 	if test "$opt_mode" = relink; then
- 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
- 	fi
- 
- 	# Do each of the archive commands.
- 	if test "$module" = yes && test -n "$module_cmds" ; then
- 	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
- 	    eval test_cmds=\"$module_expsym_cmds\"
- 	    cmds=$module_expsym_cmds
- 	  else
- 	    eval test_cmds=\"$module_cmds\"
- 	    cmds=$module_cmds
- 	  fi
- 	else
- 	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
- 	    eval test_cmds=\"$archive_expsym_cmds\"
- 	    cmds=$archive_expsym_cmds
- 	  else
- 	    eval test_cmds=\"$archive_cmds\"
- 	    cmds=$archive_cmds
- 	  fi
- 	fi
- 
- 	if test "X$skipped_export" != "X:" &&
- 	   func_len " $test_cmds" &&
- 	   len=$func_len_result &&
- 	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
- 	  :
- 	else
- 	  # The command line is too long to link in one step, link piecewise
- 	  # or, if using GNU ld and skipped_export is not :, use a linker
- 	  # script.
- 
- 	  # Save the value of $output and $libobjs because we want to
- 	  # use them later.  If we have whole_archive_flag_spec, we
- 	  # want to use save_libobjs as it was before
- 	  # whole_archive_flag_spec was expanded, because we can't
- 	  # assume the linker understands whole_archive_flag_spec.
- 	  # This may have to be revisited, in case too many
- 	  # convenience libraries get linked in and end up exceeding
- 	  # the spec.
- 	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
- 	    save_libobjs=$libobjs
- 	  fi
- 	  save_output=$output
- 	  func_basename "$output"
- 	  output_la=$func_basename_result
- 
- 	  # Clear the reloadable object creation command queue and
- 	  # initialize k to one.
- 	  test_cmds=
- 	  concat_cmds=
- 	  objlist=
- 	  last_robj=
- 	  k=1
- 
- 	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
- 	    output=${output_objdir}/${output_la}.lnkscript
- 	    func_verbose "creating GNU ld script: $output"
- 	    echo 'INPUT (' > $output
- 	    for obj in $save_libobjs
- 	    do
- 	      func_to_tool_file "$obj"
- 	      $ECHO "$func_to_tool_file_result" >> $output
- 	    done
- 	    echo ')' >> $output
- 	    func_append delfiles " $output"
- 	    func_to_tool_file "$output"
- 	    output=$func_to_tool_file_result
- 	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
- 	    output=${output_objdir}/${output_la}.lnk
- 	    func_verbose "creating linker input file list: $output"
- 	    : > $output
- 	    set x $save_libobjs
- 	    shift
- 	    firstobj=
- 	    if test "$compiler_needs_object" = yes; then
- 	      firstobj="$1 "
- 	      shift
- 	    fi
- 	    for obj
- 	    do
- 	      func_to_tool_file "$obj"
- 	      $ECHO "$func_to_tool_file_result" >> $output
- 	    done
- 	    func_append delfiles " $output"
- 	    func_to_tool_file "$output"
- 	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
- 	  else
- 	    if test -n "$save_libobjs"; then
- 	      func_verbose "creating reloadable object files..."
- 	      output=$output_objdir/$output_la-${k}.$objext
- 	      eval test_cmds=\"$reload_cmds\"
- 	      func_len " $test_cmds"
- 	      len0=$func_len_result
- 	      len=$len0
- 
- 	      # Loop over the list of objects to be linked.
- 	      for obj in $save_libobjs
- 	      do
- 		func_len " $obj"
- 		func_arith $len + $func_len_result
- 		len=$func_arith_result
- 		if test "X$objlist" = X ||
- 		   test "$len" -lt "$max_cmd_len"; then
- 		  func_append objlist " $obj"
- 		else
- 		  # The command $test_cmds is almost too long, add a
- 		  # command to the queue.
- 		  if test "$k" -eq 1 ; then
- 		    # The first file doesn't have a previous command to add.
- 		    reload_objs=$objlist
- 		    eval concat_cmds=\"$reload_cmds\"
- 		  else
- 		    # All subsequent reloadable object files will link in
- 		    # the last one created.
- 		    reload_objs="$objlist $last_robj"
- 		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
- 		  fi
- 		  last_robj=$output_objdir/$output_la-${k}.$objext
- 		  func_arith $k + 1
- 		  k=$func_arith_result
- 		  output=$output_objdir/$output_la-${k}.$objext
- 		  objlist=" $obj"
- 		  func_len " $last_robj"
- 		  func_arith $len0 + $func_len_result
- 		  len=$func_arith_result
- 		fi
- 	      done
- 	      # Handle the remaining objects by creating one last
- 	      # reloadable object file.  All subsequent reloadable object
- 	      # files will link in the last one created.
- 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
- 	      reload_objs="$objlist $last_robj"
- 	      eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
- 	      if test -n "$last_robj"; then
- 	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
- 	      fi
- 	      func_append delfiles " $output"
- 
- 	    else
- 	      output=
- 	    fi
- 
- 	    if ${skipped_export-false}; then
- 	      func_verbose "generating symbol list for \`$libname.la'"
- 	      export_symbols="$output_objdir/$libname.exp"
- 	      $opt_dry_run || $RM $export_symbols
- 	      libobjs=$output
- 	      # Append the command to create the export file.
- 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
- 	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
- 	      if test -n "$last_robj"; then
- 		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
- 	      fi
- 	    fi
- 
- 	    test -n "$save_libobjs" &&
- 	      func_verbose "creating a temporary reloadable object file: $output"
- 
- 	    # Loop through the commands generated above and execute them.
- 	    save_ifs="$IFS"; IFS='~'
- 	    for cmd in $concat_cmds; do
- 	      IFS="$save_ifs"
- 	      $opt_silent || {
- 		  func_quote_for_expand "$cmd"
- 		  eval "func_echo $func_quote_for_expand_result"
- 	      }
- 	      $opt_dry_run || eval "$cmd" || {
- 		lt_exit=$?
- 
- 		# Restore the uninstalled library and exit
- 		if test "$opt_mode" = relink; then
- 		  ( cd "$output_objdir" && \
- 		    $RM "${realname}T" && \
- 		    $MV "${realname}U" "$realname" )
- 		fi
- 
- 		exit $lt_exit
- 	      }
- 	    done
- 	    IFS="$save_ifs"
- 
- 	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
- 	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
- 	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
- 	    fi
- 	  fi
- 
-           if ${skipped_export-false}; then
- 	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
- 	      tmp_export_symbols="$export_symbols"
- 	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
- 	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
- 	    fi
- 
- 	    if test -n "$orig_export_symbols"; then
- 	      # The given exports_symbols file has to be filtered, so filter it.
- 	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
- 	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
- 	      # 's' commands which not all seds can handle. GNU sed should be fine
- 	      # though. Also, the filter scales superlinearly with the number of
- 	      # global variables. join(1) would be nice here, but unfortunately
- 	      # isn't a blessed tool.
- 	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
- 	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
- 	      export_symbols=$output_objdir/$libname.def
- 	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
- 	    fi
- 	  fi
- 
- 	  libobjs=$output
- 	  # Restore the value of output.
- 	  output=$save_output
- 
- 	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
- 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
- 	    test "X$libobjs" = "X " && libobjs=
- 	  fi
- 	  # Expand the library linking commands again to reset the
- 	  # value of $libobjs for piecewise linking.
- 
- 	  # Do each of the archive commands.
- 	  if test "$module" = yes && test -n "$module_cmds" ; then
- 	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
- 	      cmds=$module_expsym_cmds
- 	    else
- 	      cmds=$module_cmds
- 	    fi
- 	  else
- 	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
- 	      cmds=$archive_expsym_cmds
- 	    else
- 	      cmds=$archive_cmds
- 	    fi
- 	  fi
- 	fi
- 
- 	if test -n "$delfiles"; then
- 	  # Append the command to remove temporary files to $cmds.
- 	  eval cmds=\"\$cmds~\$RM $delfiles\"
- 	fi
- 
- 	# Add any objects from preloaded convenience libraries
- 	if test -n "$dlprefiles"; then
- 	  gentop="$output_objdir/${outputname}x"
- 	  func_append generated " $gentop"
- 
- 	  func_extract_archives $gentop $dlprefiles
- 	  func_append libobjs " $func_extract_archives_result"
- 	  test "X$libobjs" = "X " && libobjs=
- 	fi
- 
- 	save_ifs="$IFS"; IFS='~'
- 	for cmd in $cmds; do
- 	  IFS="$save_ifs"
- 	  eval cmd=\"$cmd\"
- 	  $opt_silent || {
- 	    func_quote_for_expand "$cmd"
- 	    eval "func_echo $func_quote_for_expand_result"
- 	  }
- 	  $opt_dry_run || eval "$cmd" || {
- 	    lt_exit=$?
- 
- 	    # Restore the uninstalled library and exit
- 	    if test "$opt_mode" = relink; then
- 	      ( cd "$output_objdir" && \
- 	        $RM "${realname}T" && \
- 		$MV "${realname}U" "$realname" )
- 	    fi
- 
- 	    exit $lt_exit
- 	  }
- 	done
- 	IFS="$save_ifs"
- 
- 	# Restore the uninstalled library and exit
- 	if test "$opt_mode" = relink; then
- 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
- 
- 	  if test -n "$convenience"; then
- 	    if test -z "$whole_archive_flag_spec"; then
- 	      func_show_eval '${RM}r "$gentop"'
- 	    fi
- 	  fi
- 
- 	  exit $EXIT_SUCCESS
- 	fi
- 
- 	# Create links to the real library.
- 	for linkname in $linknames; do
- 	  if test "$realname" != "$linkname"; then
- 	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
- 	  fi
- 	done
- 
- 	# If -module or -export-dynamic was specified, set the dlname.
- 	if test "$module" = yes || test "$export_dynamic" = yes; then
- 	  # On all known operating systems, these are identical.
- 	  dlname="$soname"
- 	fi
-       fi
-       ;;
- 
-     obj)
-       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- 	func_warning "\`-dlopen' is ignored for objects"
-       fi
- 
-       case " $deplibs" in
-       *\ -l* | *\ -L*)
- 	func_warning "\`-l' and \`-L' are ignored for objects" ;;
-       esac
- 
-       test -n "$rpath" && \
- 	func_warning "\`-rpath' is ignored for objects"
- 
-       test -n "$xrpath" && \
- 	func_warning "\`-R' is ignored for objects"
- 
-       test -n "$vinfo" && \
- 	func_warning "\`-version-info' is ignored for objects"
- 
-       test -n "$release" && \
- 	func_warning "\`-release' is ignored for objects"
- 
-       case $output in
-       *.lo)
- 	test -n "$objs$old_deplibs" && \
- 	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"
- 
- 	libobj=$output
- 	func_lo2o "$libobj"
- 	obj=$func_lo2o_result
- 	;;
-       *)
- 	libobj=
- 	obj="$output"
- 	;;
-       esac
- 
-       # Delete the old objects.
-       $opt_dry_run || $RM $obj $libobj
- 
-       # Objects from convenience libraries.  This assumes
-       # single-version convenience libraries.  Whenever we create
-       # different ones for PIC/non-PIC, this we'll have to duplicate
-       # the extraction.
-       reload_conv_objs=
-       gentop=
-       # reload_cmds runs $LD directly, so let us get rid of
-       # -Wl from whole_archive_flag_spec and hope we can get by with
-       # turning comma into space..
-       wl=
- 
-       if test -n "$convenience"; then
- 	if test -n "$whole_archive_flag_spec"; then
- 	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
- 	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
- 	else
- 	  gentop="$output_objdir/${obj}x"
- 	  func_append generated " $gentop"
- 
- 	  func_extract_archives $gentop $convenience
- 	  reload_conv_objs="$reload_objs $func_extract_archives_result"
- 	fi
-       fi
- 
-       # If we're not building shared, we need to use non_pic_objs
-       test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
- 
-       # Create the old-style object.
-       reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
- 
-       output="$obj"
-       func_execute_cmds "$reload_cmds" 'exit $?'
- 
-       # Exit if we aren't doing a library object file.
-       if test -z "$libobj"; then
- 	if test -n "$gentop"; then
- 	  func_show_eval '${RM}r "$gentop"'
- 	fi
- 
- 	exit $EXIT_SUCCESS
-       fi
- 
-       if test "$build_libtool_libs" != yes; then
- 	if test -n "$gentop"; then
- 	  func_show_eval '${RM}r "$gentop"'
- 	fi
- 
- 	# Create an invalid libtool object if no PIC, so that we don't
- 	# accidentally link it into a program.
- 	# $show "echo timestamp > $libobj"
- 	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
- 	exit $EXIT_SUCCESS
-       fi
- 
-       if test -n "$pic_flag" || test "$pic_mode" != default; then
- 	# Only do commands if we really have different PIC objects.
- 	reload_objs="$libobjs $reload_conv_objs"
- 	output="$libobj"
- 	func_execute_cmds "$reload_cmds" 'exit $?'
-       fi
- 
-       if test -n "$gentop"; then
- 	func_show_eval '${RM}r "$gentop"'
-       fi
- 
-       exit $EXIT_SUCCESS
-       ;;
- 
-     prog)
-       case $host in
- 	*cygwin*) func_stripname '' '.exe' "$output"
- 	          output=$func_stripname_result.exe;;
-       esac
-       test -n "$vinfo" && \
- 	func_warning "\`-version-info' is ignored for programs"
- 
-       test -n "$release" && \
- 	func_warning "\`-release' is ignored for programs"
- 
-       test "$preload" = yes \
-         && test "$dlopen_support" = unknown \
- 	&& test "$dlopen_self" = unknown \
- 	&& test "$dlopen_self_static" = unknown && \
- 	  func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
- 
-       case $host in
-       *-*-rhapsody* | *-*-darwin1.[012])
- 	# On Rhapsody replace the C library is the System framework
- 	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
- 	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
- 	;;
-       esac
- 
-       case $host in
-       *-*-darwin*)
- 	# Don't allow lazy linking, it breaks C++ global constructors
- 	# But is supposedly fixed on 10.4 or later (yay!).
- 	if test "$tagname" = CXX ; then
- 	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
- 	    10.[0123])
- 	      func_append compile_command " ${wl}-bind_at_load"
- 	      func_append finalize_command " ${wl}-bind_at_load"
- 	    ;;
- 	  esac
- 	fi
- 	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
- 	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
- 	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
- 	;;
-       esac
- 
- 
-       # move library search paths that coincide with paths to not yet
-       # installed libraries to the beginning of the library search list
-       new_libs=
-       for path in $notinst_path; do
- 	case " $new_libs " in
- 	*" -L$path/$objdir "*) ;;
- 	*)
- 	  case " $compile_deplibs " in
- 	  *" -L$path/$objdir "*)
- 	    func_append new_libs " -L$path/$objdir" ;;
- 	  esac
- 	  ;;
- 	esac
-       done
-       for deplib in $compile_deplibs; do
- 	case $deplib in
- 	-L*)
- 	  case " $new_libs " in
- 	  *" $deplib "*) ;;
- 	  *) func_append new_libs " $deplib" ;;
- 	  esac
- 	  ;;
- 	*) func_append new_libs " $deplib" ;;
- 	esac
-       done
-       compile_deplibs="$new_libs"
- 
- 
-       func_append compile_command " $compile_deplibs"
-       func_append finalize_command " $finalize_deplibs"
- 
-       if test -n "$rpath$xrpath"; then
- 	# If the user specified any rpath flags, then add them.
- 	for libdir in $rpath $xrpath; do
- 	  # This is the magic to use -rpath.
- 	  case "$finalize_rpath " in
- 	  *" $libdir "*) ;;
- 	  *) func_append finalize_rpath " $libdir" ;;
- 	  esac
- 	done
-       fi
- 
-       # Now hardcode the library paths
-       rpath=
-       hardcode_libdirs=
-       for libdir in $compile_rpath $finalize_rpath; do
- 	if test -n "$hardcode_libdir_flag_spec"; then
- 	  if test -n "$hardcode_libdir_separator"; then
- 	    if test -z "$hardcode_libdirs"; then
- 	      hardcode_libdirs="$libdir"
- 	    else
- 	      # Just accumulate the unique libdirs.
- 	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
- 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
- 		;;
- 	      *)
- 		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
- 		;;
- 	      esac
- 	    fi
- 	  else
- 	    eval flag=\"$hardcode_libdir_flag_spec\"
- 	    func_append rpath " $flag"
- 	  fi
- 	elif test -n "$runpath_var"; then
- 	  case "$perm_rpath " in
- 	  *" $libdir "*) ;;
- 	  *) func_append perm_rpath " $libdir" ;;
- 	  esac
- 	fi
- 	case $host in
- 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
- 	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
- 	  case :$dllsearchpath: in
- 	  *":$libdir:"*) ;;
- 	  ::) dllsearchpath=$libdir;;
- 	  *) func_append dllsearchpath ":$libdir";;
- 	  esac
- 	  case :$dllsearchpath: in
- 	  *":$testbindir:"*) ;;
- 	  ::) dllsearchpath=$testbindir;;
- 	  *) func_append dllsearchpath ":$testbindir";;
- 	  esac
- 	  ;;
- 	esac
-       done
-       # Substitute the hardcoded libdirs into the rpath.
-       if test -n "$hardcode_libdir_separator" &&
- 	 test -n "$hardcode_libdirs"; then
- 	libdir="$hardcode_libdirs"
- 	eval rpath=\" $hardcode_libdir_flag_spec\"
-       fi
-       compile_rpath="$rpath"
- 
-       rpath=
-       hardcode_libdirs=
-       for libdir in $finalize_rpath; do
- 	if test -n "$hardcode_libdir_flag_spec"; then
- 	  if test -n "$hardcode_libdir_separator"; then
- 	    if test -z "$hardcode_libdirs"; then
- 	      hardcode_libdirs="$libdir"
- 	    else
- 	      # Just accumulate the unique libdirs.
- 	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
- 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
- 		;;
- 	      *)
- 		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
- 		;;
- 	      esac
- 	    fi
- 	  else
- 	    eval flag=\"$hardcode_libdir_flag_spec\"
- 	    func_append rpath " $flag"
- 	  fi
- 	elif test -n "$runpath_var"; then
- 	  case "$finalize_perm_rpath " in
- 	  *" $libdir "*) ;;
- 	  *) func_append finalize_perm_rpath " $libdir" ;;
- 	  esac
- 	fi
-       done
-       # Substitute the hardcoded libdirs into the rpath.
-       if test -n "$hardcode_libdir_separator" &&
- 	 test -n "$hardcode_libdirs"; then
- 	libdir="$hardcode_libdirs"
- 	eval rpath=\" $hardcode_libdir_flag_spec\"
-       fi
-       finalize_rpath="$rpath"
- 
-       if test -n "$libobjs" && test "$build_old_libs" = yes; then
- 	# Transform all the library objects into standard objects.
- 	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
- 	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
-       fi
- 
-       func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
- 
-       # template prelinking step
-       if test -n "$prelink_cmds"; then
- 	func_execute_cmds "$prelink_cmds" 'exit $?'
-       fi
- 
-       wrappers_required=yes
-       case $host in
-       *cegcc* | *mingw32ce*)
-         # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
-         wrappers_required=no
-         ;;
-       *cygwin* | *mingw* )
-         if test "$build_libtool_libs" != yes; then
-           wrappers_required=no
-         fi
-         ;;
-       *)
-         if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-           wrappers_required=no
-         fi
-         ;;
-       esac
-       if test "$wrappers_required" = no; then
- 	# Replace the output file specification.
- 	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
- 	link_command="$compile_command$compile_rpath"
- 
- 	# We have no uninstalled library dependencies, so finalize right now.
- 	exit_status=0
- 	func_show_eval "$link_command" 'exit_status=$?'
- 
- 	if test -n "$postlink_cmds"; then
- 	  func_to_tool_file "$output"
- 	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
- 	  func_execute_cmds "$postlink_cmds" 'exit $?'
- 	fi
- 
- 	# Delete the generated files.
- 	if test -f "$output_objdir/${outputname}S.${objext}"; then
- 	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
- 	fi
- 
- 	exit $exit_status
-       fi
- 
-       if test -n "$compile_shlibpath$finalize_shlibpath"; then
- 	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-       fi
-       if test -n "$finalize_shlibpath"; then
- 	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-       fi
- 
-       compile_var=
-       finalize_var=
-       if test -n "$runpath_var"; then
- 	if test -n "$perm_rpath"; then
- 	  # We should set the runpath_var.
- 	  rpath=
- 	  for dir in $perm_rpath; do
- 	    func_append rpath "$dir:"
- 	  done
- 	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
- 	fi
- 	if test -n "$finalize_perm_rpath"; then
- 	  # We should set the runpath_var.
- 	  rpath=
- 	  for dir in $finalize_perm_rpath; do
- 	    func_append rpath "$dir:"
- 	  done
- 	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
- 	fi
-       fi
- 
-       if test "$no_install" = yes; then
- 	# We don't need to create a wrapper script.
- 	link_command="$compile_var$compile_command$compile_rpath"
- 	# Replace the output file specification.
- 	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
- 	# Delete the old output file.
- 	$opt_dry_run || $RM $output
- 	# Link the executable and exit
- 	func_show_eval "$link_command" 'exit $?'
- 
- 	if test -n "$postlink_cmds"; then
- 	  func_to_tool_file "$output"
- 	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
- 	  func_execute_cmds "$postlink_cmds" 'exit $?'
- 	fi
- 
- 	exit $EXIT_SUCCESS
-       fi
- 
-       if test "$hardcode_action" = relink; then
- 	# Fast installation is not supported
- 	link_command="$compile_var$compile_command$compile_rpath"
- 	relink_command="$finalize_var$finalize_command$finalize_rpath"
- 
- 	func_warning "this platform does not like uninstalled shared libraries"
- 	func_warning "\`$output' will be relinked during installation"
-       else
- 	if test "$fast_install" != no; then
- 	  link_command="$finalize_var$compile_command$finalize_rpath"
- 	  if test "$fast_install" = yes; then
- 	    relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
- 	  else
- 	    # fast_install is set to needless
- 	    relink_command=
- 	  fi
- 	else
- 	  link_command="$compile_var$compile_command$compile_rpath"
- 	  relink_command="$finalize_var$finalize_command$finalize_rpath"
- 	fi
-       fi
- 
-       # Replace the output file specification.
-       link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
- 
-       # Delete the old output files.
-       $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
- 
-       func_show_eval "$link_command" 'exit $?'
- 
-       if test -n "$postlink_cmds"; then
- 	func_to_tool_file "$output_objdir/$outputname"
- 	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
- 	func_execute_cmds "$postlink_cmds" 'exit $?'
-       fi
- 
-       # Now create the wrapper script.
-       func_verbose "creating $output"
- 
-       # Quote the relink command for shipping.
-       if test -n "$relink_command"; then
- 	# Preserve any variables that may affect compiler behavior
- 	for var in $variables_saved_for_relink; do
- 	  if eval test -z \"\${$var+set}\"; then
- 	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
- 	  elif eval var_value=\$$var; test -z "$var_value"; then
- 	    relink_command="$var=; export $var; $relink_command"
- 	  else
- 	    func_quote_for_eval "$var_value"
- 	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
- 	  fi
- 	done
- 	relink_command="(cd `pwd`; $relink_command)"
- 	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-       fi
- 
-       # Only actually do things if not in dry run mode.
-       $opt_dry_run || {
- 	# win32 will think the script is a binary if it has
- 	# a .exe suffix, so we strip it off here.
- 	case $output in
- 	  *.exe) func_stripname '' '.exe' "$output"
- 	         output=$func_stripname_result ;;
- 	esac
- 	# test for cygwin because mv fails w/o .exe extensions
- 	case $host in
- 	  *cygwin*)
- 	    exeext=.exe
- 	    func_stripname '' '.exe' "$outputname"
- 	    outputname=$func_stripname_result ;;
- 	  *) exeext= ;;
- 	esac
- 	case $host in
- 	  *cygwin* | *mingw* )
- 	    func_dirname_and_basename "$output" "" "."
- 	    output_name=$func_basename_result
- 	    output_path=$func_dirname_result
- 	    cwrappersource="$output_path/$objdir/lt-$output_name.c"
- 	    cwrapper="$output_path/$output_name.exe"
- 	    $RM $cwrappersource $cwrapper
- 	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
- 
- 	    func_emit_cwrapperexe_src > $cwrappersource
- 
- 	    # The wrapper executable is built using the $host compiler,
- 	    # because it contains $host paths and files. If cross-
- 	    # compiling, it, like the target executable, must be
- 	    # executed on the $host or under an emulation environment.
- 	    $opt_dry_run || {
- 	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
- 	      $STRIP $cwrapper
- 	    }
- 
- 	    # Now, create the wrapper script for func_source use:
- 	    func_ltwrapper_scriptname $cwrapper
- 	    $RM $func_ltwrapper_scriptname_result
- 	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
- 	    $opt_dry_run || {
- 	      # note: this script will not be executed, so do not chmod.
- 	      if test "x$build" = "x$host" ; then
- 		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
- 	      else
- 		func_emit_wrapper no > $func_ltwrapper_scriptname_result
- 	      fi
- 	    }
- 	  ;;
- 	  * )
- 	    $RM $output
- 	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
- 
- 	    func_emit_wrapper no > $output
- 	    chmod +x $output
- 	  ;;
- 	esac
-       }
-       exit $EXIT_SUCCESS
-       ;;
-     esac
- 
-     # See if we need to build an old-fashioned archive.
-     for oldlib in $oldlibs; do
- 
-       if test "$build_libtool_libs" = convenience; then
- 	oldobjs="$libobjs_save $symfileobj"
- 	addlibs="$convenience"
- 	build_libtool_libs=no
-       else
- 	if test "$build_libtool_libs" = module; then
- 	  oldobjs="$libobjs_save"
- 	  build_libtool_libs=no
- 	else
- 	  oldobjs="$old_deplibs $non_pic_objects"
- 	  if test "$preload" = yes && test -f "$symfileobj"; then
- 	    func_append oldobjs " $symfileobj"
- 	  fi
- 	fi
- 	addlibs="$old_convenience"
-       fi
- 
-       if test -n "$addlibs"; then
- 	gentop="$output_objdir/${outputname}x"
- 	func_append generated " $gentop"
- 
- 	func_extract_archives $gentop $addlibs
- 	func_append oldobjs " $func_extract_archives_result"
-       fi
- 
-       # Do each command in the archive commands.
-       if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
- 	cmds=$old_archive_from_new_cmds
-       else
- 
- 	# Add any objects from preloaded convenience libraries
- 	if test -n "$dlprefiles"; then
- 	  gentop="$output_objdir/${outputname}x"
- 	  func_append generated " $gentop"
- 
- 	  func_extract_archives $gentop $dlprefiles
- 	  func_append oldobjs " $func_extract_archives_result"
- 	fi
- 
- 	# POSIX demands no paths to be encoded in archives.  We have
- 	# to avoid creating archives with duplicate basenames if we
- 	# might have to extract them afterwards, e.g., when creating a
- 	# static archive out of a convenience library, or when linking
- 	# the entirety of a libtool archive into another (currently
- 	# not supported by libtool).
- 	if (for obj in $oldobjs
- 	    do
- 	      func_basename "$obj"
- 	      $ECHO "$func_basename_result"
- 	    done | sort | sort -uc >/dev/null 2>&1); then
- 	  :
- 	else
- 	  echo "copying selected object files to avoid basename conflicts..."
- 	  gentop="$output_objdir/${outputname}x"
- 	  func_append generated " $gentop"
- 	  func_mkdir_p "$gentop"
- 	  save_oldobjs=$oldobjs
- 	  oldobjs=
- 	  counter=1
- 	  for obj in $save_oldobjs
- 	  do
- 	    func_basename "$obj"
- 	    objbase="$func_basename_result"
- 	    case " $oldobjs " in
- 	    " ") oldobjs=$obj ;;
- 	    *[\ /]"$objbase "*)
- 	      while :; do
- 		# Make sure we don't pick an alternate name that also
- 		# overlaps.
- 		newobj=lt$counter-$objbase
- 		func_arith $counter + 1
- 		counter=$func_arith_result
- 		case " $oldobjs " in
- 		*[\ /]"$newobj "*) ;;
- 		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
- 		esac
- 	      done
- 	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
- 	      func_append oldobjs " $gentop/$newobj"
- 	      ;;
- 	    *) func_append oldobjs " $obj" ;;
- 	    esac
- 	  done
- 	fi
- 	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
- 	tool_oldlib=$func_to_tool_file_result
- 	eval cmds=\"$old_archive_cmds\"
- 
- 	func_len " $cmds"
- 	len=$func_len_result
- 	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
- 	  cmds=$old_archive_cmds
- 	elif test -n "$archiver_list_spec"; then
- 	  func_verbose "using command file archive linking..."
- 	  for obj in $oldobjs
- 	  do
- 	    func_to_tool_file "$obj"
- 	    $ECHO "$func_to_tool_file_result"
- 	  done > $output_objdir/$libname.libcmd
- 	  func_to_tool_file "$output_objdir/$libname.libcmd"
- 	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
- 	  cmds=$old_archive_cmds
- 	else
- 	  # the command line is too long to link in one step, link in parts
- 	  func_verbose "using piecewise archive linking..."
- 	  save_RANLIB=$RANLIB
- 	  RANLIB=:
- 	  objlist=
- 	  concat_cmds=
- 	  save_oldobjs=$oldobjs
- 	  oldobjs=
- 	  # Is there a better way of finding the last object in the list?
- 	  for obj in $save_oldobjs
- 	  do
- 	    last_oldobj=$obj
- 	  done
- 	  eval test_cmds=\"$old_archive_cmds\"
- 	  func_len " $test_cmds"
- 	  len0=$func_len_result
- 	  len=$len0
- 	  for obj in $save_oldobjs
- 	  do
- 	    func_len " $obj"
- 	    func_arith $len + $func_len_result
- 	    len=$func_arith_result
- 	    func_append objlist " $obj"
- 	    if test "$len" -lt "$max_cmd_len"; then
- 	      :
- 	    else
- 	      # the above command should be used before it gets too long
- 	      oldobjs=$objlist
- 	      if test "$obj" = "$last_oldobj" ; then
- 		RANLIB=$save_RANLIB
- 	      fi
- 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
- 	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
- 	      objlist=
- 	      len=$len0
- 	    fi
- 	  done
- 	  RANLIB=$save_RANLIB
- 	  oldobjs=$objlist
- 	  if test "X$oldobjs" = "X" ; then
- 	    eval cmds=\"\$concat_cmds\"
- 	  else
- 	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
- 	  fi
- 	fi
-       fi
-       func_execute_cmds "$cmds" 'exit $?'
-     done
- 
-     test -n "$generated" && \
-       func_show_eval "${RM}r$generated"
- 
-     # Now create the libtool archive.
-     case $output in
-     *.la)
-       old_library=
-       test "$build_old_libs" = yes && old_library="$libname.$libext"
-       func_verbose "creating $output"
- 
-       # Preserve any variables that may affect compiler behavior
-       for var in $variables_saved_for_relink; do
- 	if eval test -z \"\${$var+set}\"; then
- 	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
- 	elif eval var_value=\$$var; test -z "$var_value"; then
- 	  relink_command="$var=; export $var; $relink_command"
- 	else
- 	  func_quote_for_eval "$var_value"
- 	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
- 	fi
-       done
-       # Quote the link command for shipping.
-       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-       relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-       if test "$hardcode_automatic" = yes ; then
- 	relink_command=
-       fi
- 
-       # Only create the output if not a dry run.
-       $opt_dry_run || {
- 	for installed in no yes; do
- 	  if test "$installed" = yes; then
- 	    if test -z "$install_libdir"; then
- 	      break
- 	    fi
- 	    output="$output_objdir/$outputname"i
- 	    # Replace all uninstalled libtool libraries with the installed ones
- 	    newdependency_libs=
- 	    for deplib in $dependency_libs; do
- 	      case $deplib in
- 	      *.la)
- 		func_basename "$deplib"
- 		name="$func_basename_result"
- 		func_resolve_sysroot "$deplib"
- 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
- 		test -z "$libdir" && \
- 		  func_fatal_error "\`$deplib' is not a valid libtool archive"
- 		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
- 		;;
- 	      -L*)
- 		func_stripname -L '' "$deplib"
- 		func_replace_sysroot "$func_stripname_result"
- 		func_append newdependency_libs " -L$func_replace_sysroot_result"
- 		;;
- 	      -R*)
- 		func_stripname -R '' "$deplib"
- 		func_replace_sysroot "$func_stripname_result"
- 		func_append newdependency_libs " -R$func_replace_sysroot_result"
- 		;;
- 	      *) func_append newdependency_libs " $deplib" ;;
- 	      esac
- 	    done
- 	    dependency_libs="$newdependency_libs"
- 	    newdlfiles=
- 
- 	    for lib in $dlfiles; do
- 	      case $lib in
- 	      *.la)
- 	        func_basename "$lib"
- 		name="$func_basename_result"
- 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
- 		test -z "$libdir" && \
- 		  func_fatal_error "\`$lib' is not a valid libtool archive"
- 		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
- 		;;
- 	      *) func_append newdlfiles " $lib" ;;
- 	      esac
- 	    done
- 	    dlfiles="$newdlfiles"
- 	    newdlprefiles=
- 	    for lib in $dlprefiles; do
- 	      case $lib in
- 	      *.la)
- 		# Only pass preopened files to the pseudo-archive (for
- 		# eventual linking with the app. that links it) if we
- 		# didn't already link the preopened objects directly into
- 		# the library:
- 		func_basename "$lib"
- 		name="$func_basename_result"
- 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
- 		test -z "$libdir" && \
- 		  func_fatal_error "\`$lib' is not a valid libtool archive"
- 		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
- 		;;
- 	      esac
- 	    done
- 	    dlprefiles="$newdlprefiles"
- 	  else
- 	    newdlfiles=
- 	    for lib in $dlfiles; do
- 	      case $lib in
- 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
- 		*) abs=`pwd`"/$lib" ;;
- 	      esac
- 	      func_append newdlfiles " $abs"
- 	    done
- 	    dlfiles="$newdlfiles"
- 	    newdlprefiles=
- 	    for lib in $dlprefiles; do
- 	      case $lib in
- 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
- 		*) abs=`pwd`"/$lib" ;;
- 	      esac
- 	      func_append newdlprefiles " $abs"
- 	    done
- 	    dlprefiles="$newdlprefiles"
- 	  fi
- 	  $RM $output
- 	  # place dlname in correct position for cygwin
- 	  # In fact, it would be nice if we could use this code for all target
- 	  # systems that can't hard-code library paths into their executables
- 	  # and that have no shared library path variable independent of PATH,
- 	  # but it turns out we can't easily determine that from inspecting
- 	  # libtool variables, so we have to hard-code the OSs to which it
- 	  # applies here; at the moment, that means platforms that use the PE
- 	  # object format with DLL files.  See the long comment at the top of
- 	  # tests/bindir.at for full details.
- 	  tdlname=$dlname
- 	  case $host,$output,$installed,$module,$dlname in
- 	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
- 	      # If a -bindir argument was supplied, place the dll there.
- 	      if test "x$bindir" != x ;
- 	      then
- 		func_relative_path "$install_libdir" "$bindir"
- 		tdlname=$func_relative_path_result$dlname
- 	      else
- 		# Otherwise fall back on heuristic.
- 		tdlname=../bin/$dlname
- 	      fi
- 	      ;;
- 	  esac
- 	  $ECHO > $output "\
- # $outputname - a libtool library file
- # Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
- #
- # Please DO NOT delete this file!
- # It is necessary for linking the library.
- 
- # The name that we can dlopen(3).
- dlname='$tdlname'
- 
- # Names of this library.
- library_names='$library_names'
- 
- # The name of the static archive.
- old_library='$old_library'
- 
- # Linker flags that can not go in dependency_libs.
- inherited_linker_flags='$new_inherited_linker_flags'
- 
- # Libraries that this one depends upon.
- dependency_libs='$dependency_libs'
- 
- # Names of additional weak libraries provided by this library
- weak_library_names='$weak_libs'
- 
- # Version information for $libname.
- current=$current
- age=$age
- revision=$revision
- 
- # Is this an already installed library?
- installed=$installed
- 
- # Should we warn about portability when linking against -modules?
- shouldnotlink=$module
- 
- # Files to dlopen/dlpreopen
- dlopen='$dlfiles'
- dlpreopen='$dlprefiles'
- 
- # Directory that this library needs to be installed in:
- libdir='$install_libdir'"
- 	  if test "$installed" = no && test "$need_relink" = yes; then
- 	    $ECHO >> $output "\
- relink_command=\"$relink_command\""
- 	  fi
- 	done
-       }
- 
-       # Do a symbolic link so that the libtool archive can be found in
-       # LD_LIBRARY_PATH before the program is installed.
-       func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
-       ;;
-     esac
-     exit $EXIT_SUCCESS
- }
- 
- { test "$opt_mode" = link || test "$opt_mode" = relink; } &&
-     func_mode_link ${1+"$@"}
- 
- 
- # func_mode_uninstall arg...
- func_mode_uninstall ()
- {
-     $opt_debug
-     RM="$nonopt"
-     files=
-     rmforce=
-     exit_status=0
- 
-     # This variable tells wrapper scripts just to set variables rather
-     # than running their programs.
-     libtool_install_magic="$magic"
- 
-     for arg
-     do
-       case $arg in
-       -f) func_append RM " $arg"; rmforce=yes ;;
-       -*) func_append RM " $arg" ;;
-       *) func_append files " $arg" ;;
-       esac
-     done
- 
-     test -z "$RM" && \
-       func_fatal_help "you must specify an RM program"
- 
-     rmdirs=
- 
-     for file in $files; do
-       func_dirname "$file" "" "."
-       dir="$func_dirname_result"
-       if test "X$dir" = X.; then
- 	odir="$objdir"
-       else
- 	odir="$dir/$objdir"
-       fi
-       func_basename "$file"
-       name="$func_basename_result"
-       test "$opt_mode" = uninstall && odir="$dir"
- 
-       # Remember odir for removal later, being careful to avoid duplicates
-       if test "$opt_mode" = clean; then
- 	case " $rmdirs " in
- 	  *" $odir "*) ;;
- 	  *) func_append rmdirs " $odir" ;;
- 	esac
-       fi
- 
-       # Don't error if the file doesn't exist and rm -f was used.
-       if { test -L "$file"; } >/dev/null 2>&1 ||
- 	 { test -h "$file"; } >/dev/null 2>&1 ||
- 	 test -f "$file"; then
- 	:
-       elif test -d "$file"; then
- 	exit_status=1
- 	continue
-       elif test "$rmforce" = yes; then
- 	continue
-       fi
- 
-       rmfiles="$file"
- 
-       case $name in
-       *.la)
- 	# Possibly a libtool archive, so verify it.
- 	if func_lalib_p "$file"; then
- 	  func_source $dir/$name
- 
- 	  # Delete the libtool libraries and symlinks.
- 	  for n in $library_names; do
- 	    func_append rmfiles " $odir/$n"
- 	  done
- 	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
- 
- 	  case "$opt_mode" in
- 	  clean)
- 	    case " $library_names " in
- 	    *" $dlname "*) ;;
- 	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
- 	    esac
- 	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
- 	    ;;
- 	  uninstall)
- 	    if test -n "$library_names"; then
- 	      # Do each command in the postuninstall commands.
- 	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
- 	    fi
- 
- 	    if test -n "$old_library"; then
- 	      # Do each command in the old_postuninstall commands.
- 	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
- 	    fi
- 	    # FIXME: should reinstall the best remaining shared library.
- 	    ;;
- 	  esac
- 	fi
- 	;;
- 
-       *.lo)
- 	# Possibly a libtool object, so verify it.
- 	if func_lalib_p "$file"; then
- 
- 	  # Read the .lo file
- 	  func_source $dir/$name
- 
- 	  # Add PIC object to the list of files to remove.
- 	  if test -n "$pic_object" &&
- 	     test "$pic_object" != none; then
- 	    func_append rmfiles " $dir/$pic_object"
- 	  fi
- 
- 	  # Add non-PIC object to the list of files to remove.
- 	  if test -n "$non_pic_object" &&
- 	     test "$non_pic_object" != none; then
- 	    func_append rmfiles " $dir/$non_pic_object"
- 	  fi
- 	fi
- 	;;
- 
-       *)
- 	if test "$opt_mode" = clean ; then
- 	  noexename=$name
- 	  case $file in
- 	  *.exe)
- 	    func_stripname '' '.exe' "$file"
- 	    file=$func_stripname_result
- 	    func_stripname '' '.exe' "$name"
- 	    noexename=$func_stripname_result
- 	    # $file with .exe has already been added to rmfiles,
- 	    # add $file without .exe
- 	    func_append rmfiles " $file"
- 	    ;;
- 	  esac
- 	  # Do a test to see if this is a libtool program.
- 	  if func_ltwrapper_p "$file"; then
- 	    if func_ltwrapper_executable_p "$file"; then
- 	      func_ltwrapper_scriptname "$file"
- 	      relink_command=
- 	      func_source $func_ltwrapper_scriptname_result
- 	      func_append rmfiles " $func_ltwrapper_scriptname_result"
- 	    else
- 	      relink_command=
- 	      func_source $dir/$noexename
- 	    fi
- 
- 	    # note $name still contains .exe if it was in $file originally
- 	    # as does the version of $file that was added into $rmfiles
- 	    func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
- 	    if test "$fast_install" = yes && test -n "$relink_command"; then
- 	      func_append rmfiles " $odir/lt-$name"
- 	    fi
- 	    if test "X$noexename" != "X$name" ; then
- 	      func_append rmfiles " $odir/lt-${noexename}.c"
- 	    fi
- 	  fi
- 	fi
- 	;;
-       esac
-       func_show_eval "$RM $rmfiles" 'exit_status=1'
-     done
- 
-     # Try to remove the ${objdir}s in the directories where we deleted files
-     for dir in $rmdirs; do
-       if test -d "$dir"; then
- 	func_show_eval "rmdir $dir >/dev/null 2>&1"
-       fi
-     done
- 
-     exit $exit_status
- }
- 
- { test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
-     func_mode_uninstall ${1+"$@"}
- 
- test -z "$opt_mode" && {
-   help="$generic_help"
-   func_fatal_help "you must specify a MODE"
- }
- 
- test -z "$exec_cmd" && \
-   func_fatal_help "invalid operation mode \`$opt_mode'"
- 
- if test -n "$exec_cmd"; then
-   eval exec "$exec_cmd"
-   exit $EXIT_FAILURE
- fi
- 
- exit $exit_status
- 
- 
- # The TAGs below are defined such that we never get into a situation
- # in which we disable both kinds of libraries.  Given conflicting
- # choices, we go for a static library, that is the most portable,
- # since we can't tell whether shared libraries were disabled because
- # the user asked for that or because the platform doesn't support
- # them.  This is particularly important on AIX, because we don't
- # support having both static and shared libraries enabled at the same
- # time on that platform, so we default to a shared-only configuration.
- # If a disable-shared tag is given, we'll fallback to a static-only
- # configuration.  But we'll never go from static-only to shared-only.
- 
- # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
- build_libtool_libs=no
- build_old_libs=yes
- # ### END LIBTOOL TAG CONFIG: disable-shared
- 
- # ### BEGIN LIBTOOL TAG CONFIG: disable-static
- build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
- # ### END LIBTOOL TAG CONFIG: disable-static
- 
- # Local Variables:
- # mode:shell-script
- # sh-indentation:2
- # End:
- # vi:sw=2
- 
--- 0 ----
diff -Nrc2 texinfo-6.1/build-aux/snippet/arg-nonnull.h texinfo-6.3/build-aux/snippet/arg-nonnull.h
*** texinfo-6.1/build-aux/snippet/arg-nonnull.h	2015-02-25 20:17:37.000000000 +0000
--- texinfo-6.3/build-aux/snippet/arg-nonnull.h	2016-07-30 20:33:16.000000000 +0100
***************
*** 1,4 ****
  /* A C macro for declaring that specific arguments must not be NULL.
!    Copyright (C) 2009-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify it
--- 1,4 ----
  /* A C macro for declaring that specific arguments must not be NULL.
!    Copyright (C) 2009-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify it
diff -Nrc2 texinfo-6.1/build-aux/snippet/c++defs.h texinfo-6.3/build-aux/snippet/c++defs.h
*** texinfo-6.1/build-aux/snippet/c++defs.h	2015-02-25 20:17:37.000000000 +0000
--- texinfo-6.3/build-aux/snippet/c++defs.h	2016-07-30 20:33:16.000000000 +0100
***************
*** 1,4 ****
  /* C++ compatible function declaration macros.
!    Copyright (C) 2010-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify it
--- 1,4 ----
  /* C++ compatible function declaration macros.
!    Copyright (C) 2010-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify it
diff -Nrc2 texinfo-6.1/build-aux/snippet/warn-on-use.h texinfo-6.3/build-aux/snippet/warn-on-use.h
*** texinfo-6.1/build-aux/snippet/warn-on-use.h	2015-02-25 20:17:37.000000000 +0000
--- texinfo-6.3/build-aux/snippet/warn-on-use.h	2016-07-30 20:33:16.000000000 +0100
***************
*** 1,4 ****
  /* A C macro for emitting warnings if a function is used.
!    Copyright (C) 2010-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify it
--- 1,4 ----
  /* A C macro for emitting warnings if a function is used.
!    Copyright (C) 2010-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify it
diff -Nrc2 texinfo-6.1/build-aux/texinfo.tex texinfo-6.3/build-aux/texinfo.tex
*** texinfo-6.1/build-aux/texinfo.tex	2016-02-06 11:48:48.000000000 +0000
--- texinfo-6.3/build-aux/texinfo.tex	2016-09-10 13:08:23.000000000 +0100
***************
*** 4,8 ****
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2016-02-05.07}
  %
  % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
--- 4,8 ----
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2016-08-16.20}
  %
  % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
***************
*** 68,71 ****
--- 68,75 ----
    \catcode`+=\active \catcode`\_=\active}
  
+ % LaTeX's \typeout.  This ensures that the messages it is used for
+ % are identical in format to the corresponding ones from latex/pdflatex.
+ \def\typeout{\immediate\write17}%
+ 
  \chardef\other=12
  
***************
*** 311,315 ****
  \newdimen\bindingoffset
  \newdimen\normaloffset
! \newdimen\pagewidth \newdimen\pageheight
  
  % Main output routine.
--- 315,319 ----
  \newdimen\bindingoffset
  \newdimen\normaloffset
! \newdimen\txipagewidth \newdimen\txipageheight
  
  % Main output routine.
***************
*** 335,339 ****
    % 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=\pagewidth \texinfochars}
    %
    % Retrieve the information for the headings from the marks in the page,
--- 339,343 ----
    % 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,
***************
*** 434,438 ****
  
  % Main part of page, including any footnotes
! \def\pagebody#1{\vbox to\pageheight{\boxmaxdepth=\maxdepth #1}}
  {\catcode`\@ =11
  \gdef\pagecontents#1{\ifvoid\topins\else\unvbox\topins\fi
--- 438,442 ----
  
  % Main part of page, including any footnotes
! \def\pagebody#1{\vbox to\txipageheight{\boxmaxdepth=\maxdepth #1}}
  {\catcode`\@ =11
  \gdef\pagecontents#1{\ifvoid\topins\else\unvbox\topins\fi
***************
*** 725,733 ****
    \dimen0 = \ht\groupbox  \advance\dimen0 by \dp\groupbox
    % \dimen2 is how much space is left on the page (more or less).
!   \dimen2 = \pageheight   \advance\dimen2 by -\pagetotal
    % if the group doesn't fit on the current page, and it's a big big
    % group, force a page break.
    \ifdim \dimen0 > \dimen2
!     \ifdim \pagetotal < \vfilllimit\pageheight
        \page
      \fi
--- 729,737 ----
    \dimen0 = \ht\groupbox  \advance\dimen0 by \dp\groupbox
    % \dimen2 is how much space is left on the page (more or less).
!   \dimen2 = \txipageheight   \advance\dimen2 by -\pagetotal
    % if the group doesn't fit on the current page, and it's a big big
    % group, force a page break.
    \ifdim \dimen0 > \dimen2
!     \ifdim \pagetotal < \vfilllimit\txipageheight
        \page
      \fi
***************
*** 1101,1104 ****
--- 1105,1188 ----
  \newif\ifpdfmakepagedest
  
+ %
+ % For LuaTeX
+ %
+ 
+ \newif\iftxiuseunicodedestname
+ \txiuseunicodedestnamefalse % For pdfTeX etc.
+ 
+ \ifx\luatexversion\thisisundefined
+ \else
+   % Use Unicode destination names
+   \txiuseunicodedestnametrue
+   % Escape PDF strings with converting UTF-16 from UTF-8
+   \begingroup
+     \catcode`\%=12
+     \directlua{
+       function UTF16oct(str)
+         tex.sprint(string.char(0x5c) .. '376' .. string.char(0x5c) .. '377')
+         for c in string.utfvalues(str) do
+           if c < 0x10000 then
+             tex.sprint(
+               string.format(string.char(0x5c) .. string.char(0x25) .. '03o' ..
+                             string.char(0x5c) .. string.char(0x25) .. '03o',
+                             (c / 256), (c % 256)))
+           else
+             c = c - 0x10000
+             local c_hi = c / 1024 + 0xd800
+             local c_lo = c % 1024 + 0xdc00
+             tex.sprint(
+               string.format(string.char(0x5c) .. string.char(0x25) .. '03o' ..
+                             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)))
+           end
+         end
+       end
+     }
+   \endgroup
+   \def\pdfescapestrutfsixteen#1{\directlua{UTF16oct('\luaescapestring{#1}')}}
+   % Escape PDF strings without converting
+   \begingroup
+     \directlua{
+       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(
+               string.format(string.char(0x5c) .. string.char(0x25) .. '03o',
+                             c))
+           else
+             tex.sprint(string.char(c))
+           end
+         end
+       end
+     }
+   \endgroup
+   \def\pdfescapestring#1{\directlua{PDFescstr('\luaescapestring{#1}')}}
+   \ifnum\luatexversion>84
+     % For LuaTeX >= 0.85
+     \def\pdfdest{\pdfextension dest}
+     \let\pdfoutput\outputmode
+     \def\pdfliteral{\pdfextension literal}
+     \def\pdfcatalog{\pdfextension catalog}
+     \def\pdftexversion{\numexpr\pdffeedback version\relax}
+     \let\pdfximage\saveimageresource
+     \let\pdfrefximage\useimageresource
+     \let\pdflastximage\lastsavedimageresourceindex
+     \def\pdfendlink{\pdfextension endlink\relax}
+     \def\pdfoutline{\pdfextension outline}
+     \def\pdfstartlink{\pdfextension startlink}
+     \def\pdffontattr{\pdfextension fontattr}
+     \def\pdfobj{\pdfextension obj}
+     \def\pdflastobj{\numexpr\pdffeedback lastobj\relax}
+     \let\pdfpagewidth\pagewidth
+     \let\pdfpageheight\pageheight
+     \edef\pdfhorigin{\pdfvariable horigin}
+     \edef\pdfvorigin{\pdfvariable vorigin}
+   \fi
+ \fi
+ 
  % when pdftex is run in dvi mode, \pdfoutput is defined (so \pdfoutput=1
  % can be set).  So we test for \relax and 0 as well as being undefined.
***************
*** 1131,1134 ****
--- 1215,1219 ----
      % No primitive available; should we give a warning or log?
      % Many times it won't matter.
+     \xdef#1{#1}%
    \else
      % The expandable \pdfescapestring primitive escapes parentheses,
***************
*** 1137,1140 ****
--- 1222,1233 ----
    \fi
  }
+ \def\txiescapepdfutfsixteen#1{%
+   \ifx\pdfescapestrutfsixteen\thisisundefined
+     % No UTF-16 converting macro available.
+     \txiescapepdf{#1}%
+   \else
+     \xdef#1{\pdfescapestrutfsixteen{#1}}%
+   \fi
+ }
  
  \newhelp\nopdfimagehelp{Texinfo supports .png, .jpg, .jpeg, and .pdf images
***************
*** 1246,1260 ****
      \fi}
    %
!   \def\pdfmkdest#1{{%
      % We have to set dummies so commands such as @code, and characters
      % such as \, aren't expanded when present in a section title.
      \indexnofonts
-     \turnoffactive
      \makevalueexpandable
      \def\pdfdestname{#1}%
      \txiescapepdf\pdfdestname
-     \safewhatsit{\pdfdest name{\pdfdestname} xyz}%
    }}
    %
    % used to mark target names; must be expandable.
    \def\pdfmkpgn#1{#1}
--- 1339,1413 ----
      \fi}
    %
!   \def\setpdfdestname#1{{%
      % We have to set dummies so commands such as @code, and characters
      % such as \, aren't expanded when present in a section title.
      \indexnofonts
      \makevalueexpandable
+     \turnoffactive
+     \iftxiuseunicodedestname
+       \ifx \declaredencoding \latone
+         % Pass through Latin-1 characters.
+         % LuaTeX with byte wise I/O converts Latin-1 characters to Unicode.
+       \else
+         \ifx \declaredencoding \utfeight
+           % Pass through Unicode characters.
+         \else
+           % Use ASCII approximations in destination names.
+           \passthroughcharsfalse
+         \fi
+       \fi
+     \else
+       % Use ASCII approximations in destination names.
+       \passthroughcharsfalse
+     \fi
      \def\pdfdestname{#1}%
      \txiescapepdf\pdfdestname
    }}
    %
+   \def\setpdfoutlinetext#1{{%
+     \indexnofonts
+     \makevalueexpandable
+     \turnoffactive
+     \ifx \declaredencoding \latone
+       % The PDF format can use an extended form of Latin-1 in bookmark
+       % strings.  See Appendix D of the PDF Reference, Sixth Edition, for
+       % the "PDFDocEncoding".
+       \passthroughcharstrue
+       % Pass through Latin-1 characters.
+       %   LuaTeX: Convert to Unicode
+       %   pdfTeX: Use Latin-1 as PDFDocEncoding
+       \def\pdfoutlinetext{#1}%
+     \else
+       \ifx \declaredencoding \utfeight
+         \ifx\luatexversion\thisisundefined
+           % For pdfTeX  with UTF-8.
+           % TODO: the PDF format can use UTF-16 in bookmark strings,
+           % but the code for this isn't done yet.
+           % Use ASCII approximations.
+           \passthroughcharsfalse
+           \def\pdfoutlinetext{#1}%
+         \else
+           % For LuaTeX with UTF-8.
+           % Pass through Unicode characters for title texts.
+           \passthroughcharstrue
+           \def\pdfoutlinetext{#1}%
+         \fi
+       \else
+         % For non-Latin-1 or non-UTF-8 encodings.
+         % Use ASCII approximations.
+         \passthroughcharsfalse
+         \def\pdfoutlinetext{#1}%
+       \fi
+     \fi
+     % LuaTeX: Convert to UTF-16
+     % pdfTeX: Use Latin-1 as PDFDocEncoding
+     \txiescapepdfutfsixteen\pdfoutlinetext
+   }}
+   %
+   \def\pdfmkdest#1{%
+     \setpdfdestname{#1}%
+     \safewhatsit{\pdfdest name{\pdfdestname} xyz}%
+   }
+   %
    % used to mark target names; must be expandable.
    \def\pdfmkpgn#1{#1}
***************
*** 1284,1299 ****
      % text in the case where a section has no node, but it doesn't
      % seem worth the trouble, since most documents are normally structured.
!     \edef\pdfoutlinedest{#3}%
!     \ifx\pdfoutlinedest\empty
!       \def\pdfoutlinedest{#4}%
!     \else
!       \txiescapepdf\pdfoutlinedest
      \fi
      %
!     % Also escape PDF chars in the display string.
!     \edef\pdfoutlinetext{#1}%
!     \txiescapepdf\pdfoutlinetext
!     %
!     \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}%
    }
    %
--- 1437,1447 ----
      % text in the case where a section has no node, but it doesn't
      % seem worth the trouble, since most documents are normally structured.
!     \setpdfoutlinetext{#1}
!     \setpdfdestname{#3}
!     \ifx\pdfdestname\empty
!       \def\pdfdestname{#4}%
      \fi
      %
!     \pdfoutline goto name{\pdfmkpgn{\pdfdestname}}#2{\pdfoutlinetext}%
    }
    %
***************
*** 1451,1460 ****
  
  %
! % @image support for XeTeX
  %
- \newif\ifxeteximgpdf
  \ifx\XeTeXrevision\thisisundefined
  \else
    %
    % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
    \def\doxeteximage#1#2#3{%
--- 1599,1840 ----
  
  %
! % For XeTeX
  %
  \ifx\XeTeXrevision\thisisundefined
  \else
    %
+   % XeTeX version check
+   %
+   \ifnum\strcmp{\the\XeTeXversion\XeTeXrevision}{0.99996}>-1
+     % TeX Live 2016 contains XeTeX 0.99996 and xdvipdfmx 20160307.
+     % It can use the `dvipdfmx:config' special (from TeX Live SVN r40941).
+     % For avoiding PDF destination name replacement, we use this special
+     % instead of xdvipdfmx's command line option `-C 0x0010'.
+     \special{dvipdfmx:config C 0x0010}
+     % XeTeX 0.99995+ comes with xdvipdfmx 20160307+.
+     % It can handle Unicode destination names for PDF.
+     \txiuseunicodedestnametrue
+   \else
+     % XeTeX < 0.99996 (TeX Live < 2016) cannot use the
+     % `dvipdfmx:config' special.
+     % So for avoiding PDF destination name replacement,
+     % xdvipdfmx's command line option `-C 0x0010' is necessary.
+     %
+     % XeTeX < 0.99995 can not handle Unicode destination names for PDF
+     % because xdvipdfmx 20150315 has a UTF-16 conversion issue.
+     % It is fixed by xdvipdfmx 20160106 (TeX Live SVN r39753).
+     \txiuseunicodedestnamefalse
+   \fi
+   %
+   % Color support
+   %
+   \def\rgbDarkRed{0.50 0.09 0.12}
+   \def\rgbBlack{0 0 0}
+   %
+   \def\pdfsetcolor#1{\special{pdf:scolor [#1]}}
+   %
+   % 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}}%
+     \domark
+     \pdfsetcolor{#1}%
+   }
+   %
+   \def\maincolor{\rgbBlack}
+   \pdfsetcolor{\maincolor}
+   \edef\thiscolor{\maincolor}
+   \def\lastcolordefs{}
+   %
+   \def\makefootline{%
+     \baselineskip24pt
+     \line{\pdfsetcolor{\maincolor}\the\footline}%
+   }
+   %
+   \def\makeheadline{%
+     \vbox to 0pt{%
+       \vskip-22.5pt
+       \line{%
+         \vbox to8.5pt{}%
+         % Extract \thiscolor definition from the marks.
+         \getcolormarks
+         % Typeset the headline with \maincolor, then restore the color.
+         \pdfsetcolor{\maincolor}\the\headline\pdfsetcolor{\thiscolor}%
+       }%
+       \vss
+     }%
+     \nointerlineskip
+   }
+   %
+   % PDF outline support
+   %
+   % Emulate pdfTeX primitive
+   \def\pdfdest name#1 xyz{%
+     \special{pdf:dest (#1) [@thispage /XYZ @xpos @ypos null]}%
+   }
+   %
+   \def\setpdfdestname#1{{%
+     % We have to set dummies so commands such as @code, and characters
+     % such as \, aren't expanded when present in a section title.
+     \indexnofonts
+     \makevalueexpandable
+     \turnoffactive
+     \iftxiuseunicodedestname
+       % Pass through Unicode characters.
+     \else
+       % Use ASCII approximations in destination names.
+       \passthroughcharsfalse
+     \fi
+     \def\pdfdestname{#1}%
+     \txiescapepdf\pdfdestname
+   }}
+   %
+   \def\setpdfoutlinetext#1{{%
+     \turnoffactive
+     % Always use Unicode characters in title texts.
+     \def\pdfoutlinetext{#1}%
+     % For XeTeX, xdvipdfmx converts to UTF-16.
+     % So we do not convert.
+     \txiescapepdf\pdfoutlinetext
+   }}
+   %
+   \def\pdfmkdest#1{%
+     \setpdfdestname{#1}%
+     \safewhatsit{\pdfdest name{\pdfdestname} xyz}%
+   }
+   %
+   % by default, use black for everything.
+   \def\urlcolor{\rgbBlack}
+   \def\linkcolor{\rgbBlack}
+   \def\endlink{\setcolor{\maincolor}\pdfendlink}
+   %
+   \def\dopdfoutline#1#2#3#4{%
+     \setpdfoutlinetext{#1}
+     \setpdfdestname{#3}
+     \ifx\pdfdestname\empty
+       \def\pdfdestname{#4}%
+     \fi
+     %
+     \special{pdf:out [-] #2 << /Title (\pdfoutlinetext) /A
+       << /S /GoTo /D (\pdfdestname) >> >> }%
+   }
+   %
+   \def\pdfmakeoutlines{%
+     \begingroup
+       %
+       % For XeTeX, counts of subentries are not necessary.
+       % Therefore, we read toc only once.
+       %
+       % We use node names as destinations.
+       \def\partentry##1##2##3##4{}% ignore parts in the outlines
+       \def\numchapentry##1##2##3##4{%
+         \dopdfoutline{##1}{1}{##3}{##4}}%
+       \def\numsecentry##1##2##3##4{%
+         \dopdfoutline{##1}{2}{##3}{##4}}%
+       \def\numsubsecentry##1##2##3##4{%
+         \dopdfoutline{##1}{3}{##3}{##4}}%
+       \def\numsubsubsecentry##1##2##3##4{%
+         \dopdfoutline{##1}{4}{##3}{##4}}%
+       %
+       \let\appentry\numchapentry%
+       \let\appsecentry\numsecentry%
+       \let\appsubsecentry\numsubsecentry%
+       \let\appsubsubsecentry\numsubsubsecentry%
+       \let\unnchapentry\numchapentry%
+       \let\unnsecentry\numsecentry%
+       \let\unnsubsecentry\numsubsecentry%
+       \let\unnsubsubsecentry\numsubsubsecentry%
+       %
+       % For XeTeX, xdvipdfmx converts strings to UTF-16.
+       % Therefore, the encoding and the language may not be considered.
+       %
+       \indexnofonts
+       \setupdatafile
+       % We can have normal brace characters in the PDF outlines, unlike
+       % Texinfo index files.  So set that up.
+       \def\{{\lbracecharliteral}%
+       \def\}{\rbracecharliteral}%
+       \catcode`\\=\active \otherbackslash
+       \input \tocreadfilename
+     \endgroup
+   }
+   {\catcode`[=1 \catcode`]=2
+    \catcode`{=\other \catcode`}=\other
+    \gdef\lbracecharliteral[{]%
+    \gdef\rbracecharliteral[}]%
+   ]
+ 
+   \special{pdf:docview << /PageMode /UseOutlines >> }
+   % ``\special{pdf:tounicode ...}'' is not necessary
+   % because xdvipdfmx converts strings from UTF-8 to UTF-16 without it.
+   % However, due to a UTF-16 conversion issue of xdvipdfmx 20150315,
+   % ``\special{pdf:dest ...}'' cannot handle non-ASCII strings.
+   % It is fixed by xdvipdfmx 20160106 (TeX Live SVN r39753).
+ %
+   \def\skipspaces#1{\def\PP{#1}\def\D{|}%
+     \ifx\PP\D\let\nextsp\relax
+     \else\let\nextsp\skipspaces
+       \addtokens{\filename}{\PP}%
+       \advance\filenamelength by 1
+     \fi
+     \nextsp}
+   \def\getfilename#1{%
+     \filenamelength=0
+     % If we don't expand the argument now, \skipspaces will get
+     % snagged on things like "@value{foo}".
+     \edef\temp{#1}%
+     \expandafter\skipspaces\temp|\relax
+   }
+   % make a live url in pdf output.
+   \def\pdfurl#1{%
+     \begingroup
+       % it seems we really need yet another set of dummies; have not
+       % tried to figure out what each command should do in the context
+       % of @url.  for now, just make @/ a no-op, that's the only one
+       % people have actually reported a problem with.
+       %
+       \normalturnoffactive
+       \def\@{@}%
+       \let\/=\empty
+       \makevalueexpandable
+       % do we want to go so far as to use \indexnofonts instead of just
+       % special-casing \var here?
+       \def\var##1{##1}%
+       %
+       \leavevmode\setcolor{\urlcolor}%
+       \special{pdf:bann << /Border [0 0 0]
+         /Subtype /Link /A << /S /URI /URI (#1) >> >>}%
+     \endgroup}
+   \def\endlink{\setcolor{\maincolor}\special{pdf:eann}}
+   \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}
+   \def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}\toksA={#2}}
+   \def\maketoks{%
+     \expandafter\poptoks\the\toksA|ENDTOKS|\relax
+     \ifx\first0\adn0
+     \else\ifx\first1\adn1 \else\ifx\first2\adn2 \else\ifx\first3\adn3
+     \else\ifx\first4\adn4 \else\ifx\first5\adn5 \else\ifx\first6\adn6
+     \else\ifx\first7\adn7 \else\ifx\first8\adn8 \else\ifx\first9\adn9
+     \else
+       \ifnum0=\countA\else\makelink\fi
+       \ifx\first.\let\next=\done\else
+         \let\next=\maketoks
+         \addtokens{\toksB}{\the\toksD}
+         \ifx\first,\addtokens{\toksB}{\space}\fi
+       \fi
+     \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
+     \next}
+   \def\makelink{\addtokens{\toksB}%
+     {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0}
+   \def\pdflink#1{%
+     \special{pdf:bann << /Border [0 0 0]
+       /Type /Annot /Subtype /Link /A << /S /GoTo /D (#1) >> >>}%
+     \setcolor{\linkcolor}#1\endlink}
+   \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
+ %
+   %
+   % @image support
+   %
    % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
    \def\doxeteximage#1#2#3{%
***************
*** 1462,1471 ****
      \def\xeteximageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
      %
!     % XeTeX (and the PDF format) support .pdf, .png, .jpg (among
      % others).  Let's try in that order, PDF first since if
      % someone has a scalable image, presumably better to use that than a
      % bitmap.
      \let\xeteximgext=\empty
-     \xeteximgpdffalse
      \begingroup
        \openin 1 #1.pdf \ifeof 1
--- 1842,1850 ----
      \def\xeteximageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
      %
!     % XeTeX (and the PDF format) supports .pdf, .png, .jpg (among
      % others).  Let's try in that order, PDF first since if
      % someone has a scalable image, presumably better to use that than a
      % bitmap.
      \let\xeteximgext=\empty
      \begingroup
        \openin 1 #1.pdf \ifeof 1
***************
*** 1484,1498 ****
            \else \gdef\xeteximgext{png}%
            \fi
!         \else \gdef\xeteximgext{PDF} \global\xeteximgpdftrue%
          \fi
!       \else \gdef\xeteximgext{pdf} \global\xeteximgpdftrue%
        \fi
        \closein 1
      \endgroup
      %
!     \ifxeteximgpdf
        \XeTeXpdffile "#1".\xeteximgext ""
      \else
!       \XeTeXpicfile "#1".\xeteximgext ""
      \fi
      \ifdim \wd0 >0pt width \xeteximagewidth \fi
--- 1863,1883 ----
            \else \gdef\xeteximgext{png}%
            \fi
!         \else \gdef\xeteximgext{PDF}%
          \fi
!       \else \gdef\xeteximgext{pdf}%
        \fi
        \closein 1
      \endgroup
      %
!     \def\xetexpdfext{pdf}%
!     \ifx\xeteximgext\xetexpdfext
        \XeTeXpdffile "#1".\xeteximgext ""
      \else
!       \def\xetexpdfext{PDF}%
!       \ifx\xeteximgext\xetexpdfext
!         \XeTeXpdffile "#1".\xeteximgext ""
!       \else
!         \XeTeXpicfile "#1".\xeteximgext ""
!       \fi
      \fi
      \ifdim \wd0 >0pt width \xeteximagewidth \fi
***************
*** 2660,2663 ****
--- 3045,3049 ----
      \ifdim\wd0 > 0pt
        \ifpdf
+         % For pdfTeX and LuaTeX
          \ifurefurlonlylink
            % PDF plus option to not display url, show just arg
***************
*** 2669,2673 ****
          \fi
        \else
!         \unhbox0\ (\urefcode{#1})% DVI, always show arg and url
        \fi
      \else
--- 3055,3071 ----
          \fi
        \else
!         \ifx\XeTeXrevision\thisisundefined
!           \unhbox0\ (\urefcode{#1})% DVI, always show arg and url
!         \else
!           % For XeTeX
!           \ifurefurlonlylink
!             % PDF plus option to not display url, show just arg
!             \unhbox0             
!           \else
!             % PDF, normally display both arg and url for consistency,
!             % visibility, if the pdf is eventually used to print, etc.
!             \unhbox0\ (\urefcode{#1})%
!           \fi
!         \fi
        \fi
      \else
***************
*** 2770,2774 ****
    \endgroup}
  \else
!   \let\email=\uref
  \fi
  
--- 3168,3183 ----
    \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
  \fi
  
***************
*** 3005,3025 ****
  
  % @{ @} @lbracechar{} @rbracechar{} all generate brace characters.
! % Unless we're in typewriter, use \ecfont because the CM text fonts do
! % not have braces, and we don't want to switch into math.
! \def\mylbrace{{\ifmonospace\else\ecfont\fi \char123}}
! \def\myrbrace{{\ifmonospace\else\ecfont\fi \char125}}
! \let\{=\mylbrace \let\lbracechar=\{
! \let\}=\myrbrace \let\rbracechar=\}
! \begingroup
!   % Definitions to produce \{ and \} commands for indices,
!   % and @{ and @} for the aux/toc files.
!   \catcode`\{ = \other \catcode`\} = \other
!   \catcode`\[ = 1 \catcode`\] = 2
!   \catcode`\! = 0 \catcode`\\ = \other
!   !gdef!lbracecmd[\{]%
!   !gdef!rbracecmd[\}]%
!   !gdef!lbraceatcmd[@{]%
!   !gdef!rbraceatcmd[@}]%
! !endgroup
  
  % @comma{} to avoid , parsing problems.
--- 3414,3421 ----
  
  % @{ @} @lbracechar{} @rbracechar{} all generate brace characters.
! \def\lbracechar{{\ifmonospace\char123\else\ensuremath\lbrace\fi}}
! \def\rbracechar{{\ifmonospace\char125\else\ensuremath\rbrace\fi}}
! \let\{=\lbracechar
! \let\}=\rbracechar
  
  % @comma{} to avoid , parsing problems.
***************
*** 3324,3334 ****
  \newif\iffinishedtitlepage
  
! % Do an implicit @contents or @shortcontents after @end titlepage if the
! % user says @setcontentsaftertitlepage or @setshortcontentsaftertitlepage.
! %
! \newif\ifsetcontentsaftertitlepage
!  \let\setcontentsaftertitlepage = \setcontentsaftertitlepagetrue
! \newif\ifsetshortcontentsaftertitlepage
!  \let\setshortcontentsaftertitlepage = \setshortcontentsaftertitlepagetrue
  
  \parseargdef\shorttitlepage{%
--- 3720,3733 ----
  \newif\iffinishedtitlepage
  
! % @setcontentsaftertitlepage used to do an implicit @contents or
! % @shortcontents after @end titlepage, but it is now obsolete.
! \def\setcontentsaftertitlepage{%
!   \errmessage{@setcontentsaftertitlepage has been removed as a Texinfo
!               command; move your @contents command if you want the contents
!               after the title page.}}%
! \def\setshortcontentsaftertitlepage{%
!   \errmessage{@setshortcontentsaftertitlepage has been removed as a Texinfo
!               command; move your @shortcontents and @contents commands if you 
!               want the contents after the title page.}}%
  
  \parseargdef\shorttitlepage{%
***************
*** 3372,3389 ****
    % in effect the toc pages will come out with page numbers.
    \HEADINGSon
-   %
-   % If they want short, they certainly want long too.
-   \ifsetshortcontentsaftertitlepage
-     \shortcontents
-     \contents
-     \global\let\shortcontents = \relax
-     \global\let\contents = \relax
-   \fi
-   %
-   \ifsetcontentsaftertitlepage
-     \contents
-     \global\let\contents = \relax
-     \global\let\shortcontents = \relax
-   \fi
  }
  
--- 3771,3774 ----
***************
*** 3489,3493 ****
    % Leave some space for the footline.  Hopefully ok to assume
    % @evenfooting will not be used by itself.
!   \global\advance\pageheight by -12pt
    \global\advance\vsize by -12pt
  }
--- 3874,3878 ----
    % Leave some space for the footline.  Hopefully ok to assume
    % @evenfooting will not be used by itself.
!   \global\advance\txipageheight by -12pt
    \global\advance\vsize by -12pt
  }
***************
*** 3514,3520 ****
  \def\evenfootingmarks{\headingmarks{even}{footing}}
  \def\oddfootingmarks{\headingmarks{odd}{footing}}
! \def\everyheadingmarks#1 {\headingmarks{even}{heading}{#1}
                            \headingmarks{odd}{heading}{#1} }
! \def\everyfootingmarks#1 {\headingmarks{even}{footing}{#1}
                            \headingmarks{odd}{footing}{#1} }
  % #1 = even/odd, #2 = heading/footing, #3 = top/bottom.
--- 3899,3905 ----
  \def\evenfootingmarks{\headingmarks{even}{footing}}
  \def\oddfootingmarks{\headingmarks{odd}{footing}}
! \parseargdef\everyheadingmarks{\headingmarks{even}{heading}{#1}
                            \headingmarks{odd}{heading}{#1} }
! \parseargdef\everyfootingmarks{\headingmarks{even}{footing}{#1}
                            \headingmarks{odd}{footing}{#1} }
  % #1 = even/odd, #2 = heading/footing, #3 = top/bottom.
***************
*** 3537,3541 ****
  % and turned `on' after @end titlepage.
  
! \def\headings #1 {\csname HEADINGS#1\endcsname}
  
  \def\headingsoff{% non-global headings elimination
--- 3922,3926 ----
  % and turned `on' after @end titlepage.
  
! \parseargdef\headings{\csname HEADINGS#1\endcsname}
  
  \def\headingsoff{% non-global headings elimination
***************
*** 4351,4354 ****
--- 4736,4764 ----
  }
  
+ % Like \expandablevalue, but completely expandable (the \message in the
+ % definition above operates at the execution level of TeX).  Used when
+ % writing to auxiliary files, due to the expansion that \write does.
+ % If flag is undefined, pass through an unexpanded @value command: maybe it 
+ % will be set by the time it is read back in.
+ %
+ % NB flag names containing - or _ may not work here.
+ \def\dummyvalue#1{%
+   \expandafter\ifx\csname SET#1\endcsname\relax
+     \noexpand\value{#1}%
+   \else
+     \csname SET#1\endcsname
+   \fi
+ }
+ 
+ % Used for @value's in index entries to form the sort key: expand the @value
+ % if possible, otherwise sort late.
+ \def\indexnofontsvalue#1{%
+   \expandafter\ifx\csname SET#1\endcsname\relax
+     ZZZZZZZ
+   \else
+     \csname SET#1\endcsname
+   \fi
+ }
+ 
  % @ifset VAR ... @end ifset reads the `...' iff VAR has been defined
  % with @set.
***************
*** 4475,4486 ****
  % #3 the target index (bar).
  \def\dosynindex#1#2#3{%
!   % Only do \closeout if we haven't already done it, else we'll end up
!   % closing the target index.
!   \expandafter \ifx\csname donesynindex#2\endcsname \relax
!     % The \closeout helps reduce unnecessary open files; the limit on the
!     % Acorn RISC OS is a mere 16 files.
!     \expandafter\closeout\csname#2indfile\endcsname
!     \expandafter\let\csname donesynindex#2\endcsname = 1
!   \fi
    % redefine \fooindfile:
    \expandafter\let\expandafter\temp\expandafter=\csname#3indfile\endcsname
--- 4885,4889 ----
  % #3 the target index (bar).
  \def\dosynindex#1#2#3{%
!   \requireopenindexfile{#3}%
    % redefine \fooindfile:
    \expandafter\let\expandafter\temp\expandafter=\csname#3indfile\endcsname
***************
*** 4492,4496 ****
  % Define \doindex, the driver for all index macros.
  % Argument #1 is generated by the calling \fooindex macro,
! % and it the two-letter name of the index.
  
  \def\doindex#1{\edef\indexname{#1}\parsearg\doindexxxx}
--- 4895,4899 ----
  % Define \doindex, the driver for all index macros.
  % Argument #1 is generated by the calling \fooindex macro,
! % and it is the two-letter name of the index.
  
  \def\doindex#1{\edef\indexname{#1}\parsearg\doindexxxx}
***************
*** 4501,4561 ****
  \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.
!   \def\@{@}% change to @@ when we switch to @ as escape char in index files.
!   \def\ {\realbackslash\space }%
    %
!   % Need these unexpandable (because we define \tt as a dummy)
!   % definitions when @{ or @} appear in index entry text.  Also, more
!   % complicated, when \tex is in effect and \{ is a \delimiter again.
!   % We can't use \lbracecmd and \rbracecmd because texindex assumes
!   % braces and backslashes are used only as delimiters.  Perhaps we
!   % should use @lbracechar and @rbracechar?
!   \def\{{{\tt\char123}}%
!   \def\}{{\tt\char125}}%
    %
    % Do the redefinitions.
!   \commondummies
  }
  
! % For the aux and toc files, @ is the escape character.  So we want to
! % redefine everything using @ as the escape character (instead of
! % \realbackslash, still used for index files).  When everything uses @,
! % this will be simpler.
  %
  \def\atdummies{%
!   \def\@{@@}%
!   \def\ {@ }%
!   \let\{ = \lbraceatcmd
!   \let\} = \rbraceatcmd
    %
    % Do the redefinitions.
!   \commondummies
    \otherbackslash
  }
  
! % Called from \indexdummies and \atdummies.
! %
! \def\commondummies{%
!   % \definedummyword defines \#1 as \string\#1\space, thus effectively
!   % preventing its expansion.  This is used only for control words,
!   % not control letters, because the \space would be incorrect for
!   % control characters, but is needed to separate the control word
!   % from whatever follows.
!   %
!   % For control letters, we have \definedummyletter, which omits the
!   % space.
!   %
!   % These can be used both for control words that take an argument and
!   % those that do not.  If it is followed by {arg} in the input, then
!   % that will dutifully get written to the index (or wherever).
!   %
!   \def\definedummyword  ##1{\def##1{\string##1\space}}%
!   \def\definedummyletter##1{\def##1{\string##1}}%
!   \let\definedummyaccent\definedummyletter
!   %
    \commondummiesnofonts
    %
--- 4904,4962 ----
  \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.
  %
  \def\atdummies{%
!   \definedummyletter\@%
!   \definedummyletter\ %
!   \definedummyletter\{%
!   \definedummyletter\}%
    %
    % Do the redefinitions.
!   \definedummies
    \otherbackslash
  }
  
! % \definedummyword defines \#1 as \string\#1\space, thus effectively
! % preventing its expansion.  This is used only for control words,
! % not control letters, because the \space would be incorrect for
! % control characters, but is needed to separate the control word
! % from whatever follows.
! %
! % These can be used both for control words that take an argument and
! % those that do not.  If it is followed by {arg} in the input, then
! % that will dutifully get written to the index (or wherever).
! %
! % For control letters, we have \definedummyletter, which omits the
! % space.
! %
! \def\definedummyword  #1{\def#1{\string#1\space}}%
! \def\definedummyletter#1{\def#1{\string#1}}%
! \let\definedummyaccent\definedummyletter
! 
! % Called from \indexdummies and \atdummies, to effectively prevent
! % the expansion of commands.
! %
! \def\definedummies{%
!   %
!   \let\commondummyword\definedummyword
!   \let\commondummyletter\definedummyletter
!   \let\commondummyaccent\definedummyaccent
    \commondummiesnofonts
    %
***************
*** 4598,4601 ****
--- 4999,5003 ----
    %
    % Assorted special characters.
+   \definedummyword\atchar
    \definedummyword\arrow
    \definedummyword\bullet
***************
*** 4637,4719 ****
    % We want to disable all macros so that they are not expanded by \write.
    \macrolist
    %
    \normalturnoffactive
-   %
-   % Handle some cases of @value -- where it does not contain any
-   % (non-fully-expandable) commands.
-   \makevalueexpandable
  }
  
! % \commondummiesnofonts: common to \commondummies and \indexnofonts.
! % Define \definedumyletter, \definedummyaccent and \definedummyword before
! % using.
  %
  \def\commondummiesnofonts{%
    % Control letters and accents.
!   \definedummyletter\!%
!   \definedummyaccent\"%
!   \definedummyaccent\'%
!   \definedummyletter\*%
!   \definedummyaccent\,%
!   \definedummyletter\.%
!   \definedummyletter\/%
!   \definedummyletter\:%
!   \definedummyaccent\=%
!   \definedummyletter\?%
!   \definedummyaccent\^%
!   \definedummyaccent\`%
!   \definedummyaccent\~%
!   \definedummyword\u
!   \definedummyword\v
!   \definedummyword\H
!   \definedummyword\dotaccent
!   \definedummyword\ogonek
!   \definedummyword\ringaccent
!   \definedummyword\tieaccent
!   \definedummyword\ubaraccent
!   \definedummyword\udotaccent
!   \definedummyword\dotless
    %
    % Texinfo font commands.
!   \definedummyword\b
!   \definedummyword\i
!   \definedummyword\r
!   \definedummyword\sansserif
!   \definedummyword\sc
!   \definedummyword\slanted
!   \definedummyword\t
    %
    % Commands that take arguments.
!   \definedummyword\abbr
!   \definedummyword\acronym
!   \definedummyword\anchor
!   \definedummyword\cite
!   \definedummyword\code
!   \definedummyword\command
!   \definedummyword\dfn
!   \definedummyword\dmn
!   \definedummyword\email
!   \definedummyword\emph
!   \definedummyword\env
!   \definedummyword\file
!   \definedummyword\image
!   \definedummyword\indicateurl
!   \definedummyword\inforef
!   \definedummyword\kbd
!   \definedummyword\key
!   \definedummyword\math
!   \definedummyword\option
!   \definedummyword\pxref
!   \definedummyword\ref
!   \definedummyword\samp
!   \definedummyword\strong
!   \definedummyword\tie
!   \definedummyword\U
!   \definedummyword\uref
!   \definedummyword\url
!   \definedummyword\var
!   \definedummyword\verb
!   \definedummyword\w
!   \definedummyword\xref
  }
  
--- 5039,5118 ----
    % We want to disable all macros so that they are not expanded by \write.
    \macrolist
+   \let\value\dummyvalue
    %
    \normalturnoffactive
  }
  
! % \commondummiesnofonts: common to \definedummies and \indexnofonts.
! % Define \commondummyletter, \commondummyaccent and \commondummyword before
! % using.  Used for accents, font commands, and various control letters.
  %
  \def\commondummiesnofonts{%
    % Control letters and accents.
!   \commondummyletter\!%
!   \commondummyaccent\"%
!   \commondummyaccent\'%
!   \commondummyletter\*%
!   \commondummyaccent\,%
!   \commondummyletter\.%
!   \commondummyletter\/%
!   \commondummyletter\:%
!   \commondummyaccent\=%
!   \commondummyletter\?%
!   \commondummyaccent\^%
!   \commondummyaccent\`%
!   \commondummyaccent\~%
!   \commondummyword\u
!   \commondummyword\v
!   \commondummyword\H
!   \commondummyword\dotaccent
!   \commondummyword\ogonek
!   \commondummyword\ringaccent
!   \commondummyword\tieaccent
!   \commondummyword\ubaraccent
!   \commondummyword\udotaccent
!   \commondummyword\dotless
    %
    % Texinfo font commands.
!   \commondummyword\b
!   \commondummyword\i
!   \commondummyword\r
!   \commondummyword\sansserif
!   \commondummyword\sc
!   \commondummyword\slanted
!   \commondummyword\t
    %
    % Commands that take arguments.
!   \commondummyword\abbr
!   \commondummyword\acronym
!   \commondummyword\anchor
!   \commondummyword\cite
!   \commondummyword\code
!   \commondummyword\command
!   \commondummyword\dfn
!   \commondummyword\dmn
!   \commondummyword\email
!   \commondummyword\emph
!   \commondummyword\env
!   \commondummyword\file
!   \commondummyword\image
!   \commondummyword\indicateurl
!   \commondummyword\inforef
!   \commondummyword\kbd
!   \commondummyword\key
!   \commondummyword\math
!   \commondummyword\option
!   \commondummyword\pxref
!   \commondummyword\ref
!   \commondummyword\samp
!   \commondummyword\strong
!   \commondummyword\tie
!   \commondummyword\U
!   \commondummyword\uref
!   \commondummyword\url
!   \commondummyword\var
!   \commondummyword\verb
!   \commondummyword\w
!   \commondummyword\xref
  }
  
***************
*** 4771,4779 ****
  \def\indexnofonts{%
    % Accent commands should become @asis.
!   \def\definedummyaccent##1{\let##1\asis}%
    % We can just ignore other control letters.
!   \def\definedummyletter##1{\let##1\empty}%
    % All control words become @asis by default; overrides below.
!   \let\definedummyword\definedummyaccent
    \commondummiesnofonts
    %
--- 5170,5178 ----
  \def\indexnofonts{%
    % Accent commands should become @asis.
!   \def\commondummyaccent##1{\let##1\asis}%
    % We can just ignore other control letters.
!   \def\commondummyletter##1{\let##1\empty}%
    % All control words become @asis by default; overrides below.
!   \let\commondummyword\commondummyaccent
    \commondummiesnofonts
    %
***************
*** 4817,4851 ****
    \def\TeX{TeX}%
    %
!   % Assorted special characters.
!   % (The following {} will end up in the sort string, but that's ok.)
!   \def\arrow{->}%
!   \def\bullet{bullet}%
!   \def\comma{,}%
!   \def\copyright{copyright}%
!   \def\dots{...}%
!   \def\enddots{...}%
!   \def\equiv{==}%
!   \def\error{error}%
!   \def\euro{euro}%
!   \def\expansion{==>}%
!   \def\geq{>=}%
!   \def\guillemetleft{<<}%
!   \def\guillemetright{>>}%
!   \def\guilsinglleft{<}%
!   \def\guilsinglright{>}%
!   \def\leq{<=}%
!   \def\minus{-}%
!   \def\point{.}%
!   \def\pounds{pounds}%
!   \def\print{-|}%
!   \def\quotedblbase{"}%
!   \def\quotedblleft{"}%
!   \def\quotedblright{"}%
!   \def\quoteleft{`}%
!   \def\quoteright{'}%
!   \def\quotesinglbase{,}%
!   \def\registeredsymbol{R}%
!   \def\result{=>}%
!   \def\textdegree{o}%
    %
    % We need to get rid of all macros, leaving only the arguments (if present).
--- 5216,5253 ----
    \def\TeX{TeX}%
    %
!   % Assorted special characters.  \defglyph gives the control sequence a
!   % definition that removes the {} that follows its use.
!   \defglyph\atchar{@}%
!   \defglyph\arrow{->}%
!   \defglyph\bullet{bullet}%
!   \defglyph\comma{,}%
!   \defglyph\copyright{copyright}%
!   \defglyph\dots{...}%
!   \defglyph\enddots{...}%
!   \defglyph\equiv{==}%
!   \defglyph\error{error}%
!   \defglyph\euro{euro}%
!   \defglyph\expansion{==>}%
!   \defglyph\geq{>=}%
!   \defglyph\guillemetleft{<<}%
!   \defglyph\guillemetright{>>}%
!   \defglyph\guilsinglleft{<}%
!   \defglyph\guilsinglright{>}%
!   \defglyph\leq{<=}%
!   \defglyph\lbracechar{\{}%
!   \defglyph\minus{-}%
!   \defglyph\point{.}%
!   \defglyph\pounds{pounds}%
!   \defglyph\print{-|}%
!   \defglyph\quotedblbase{"}%
!   \defglyph\quotedblleft{"}%
!   \defglyph\quotedblright{"}%
!   \defglyph\quoteleft{`}%
!   \defglyph\quoteright{'}%
!   \defglyph\quotesinglbase{,}%
!   \defglyph\rbracechar{\}}%
!   \defglyph\registeredsymbol{R}%
!   \defglyph\result{=>}%
!   \defglyph\textdegree{o}%
    %
    % We need to get rid of all macros, leaving only the arguments (if present).
***************
*** 4860,4864 ****
--- 5262,5270 ----
    %
    \macrolist
+   \let\value\indexnofontsvalue
  }
+ \def\defglyph#1#2{\def#1##1{#2}} % see above
+ 
+ 
  
  
***************
*** 4907,4913 ****
    % Open the file
    \immediate\openout\csname#1indfile\endcsname \jobname.\suffix
!   % Using \immediate here prevents an object entering into the current box,
!   % which could confound checks such as those in \safewhatsit for preceding
!   % skips.
  \fi}
  \def\indexisfl{fl}
--- 5313,5320 ----
    % Open the file
    \immediate\openout\csname#1indfile\endcsname \jobname.\suffix
!   % Using \immediate above here prevents an object entering into the current 
!   % box, which could confound checks such as those in \safewhatsit for
!   % preceding skips.
!   \typeout{Writing index file \jobname.\suffix}%
  \fi}
  \def\indexisfl{fl}
***************
*** 5107,5111 ****
    % as its first line, TeX doesn't complain about mismatched braces
    % (because it thinks @} is a control sequence).
!   \catcode`\@ = 11
    % See comment in \requireopenindexfile.
    \def\indexname{#1}\ifx\indexname\indexisfl\def\indexname{f1}\fi
--- 5514,5518 ----
    % 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
***************
*** 5117,5123 ****
      % there is some text.
      \putwordIndexNonexistent
    \else
      \catcode`\\ = 0
-     \escapechar = `\\
      %
      % If the index file exists but is empty, then \openin leaves \ifeof
--- 5524,5530 ----
      % there is some text.
      \putwordIndexNonexistent
+     \typeout{No file \jobname.\indexname s.}%
    \else
      \catcode`\\ = 0
      %
      % If the index file exists but is empty, then \openin leaves \ifeof
***************
*** 5135,5139 ****
        \let\indexrbrace\}   % used in the sort key.
        \begindoublecolumns
!       \let\entryorphanpenalty=\indexorphanpenalty
        %
        % Read input from the index file line by line.
--- 5542,5546 ----
        \let\indexrbrace\}   % used in the sort key.
        \begindoublecolumns
!       \let\entrywidowpenalty=\indexwidowpenalty
        %
        % Read input from the index file line by line.
***************
*** 5236,5239 ****
--- 5643,5652 ----
    \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.
***************
*** 5249,5256 ****
      \def\entrybreak{\hfil\break}% An undocumented command
      %
-     % A bit of stretch before each entry for the benefit of balancing
-     % columns.
-     \vskip 0pt plus0.5pt
-     %
      % Swallow the left brace of the text (first parameter):
      \afterassignment\doentry
--- 5662,5665 ----
***************
*** 5286,5297 ****
        \ifpdf
          \pdfgettoks#1.%
!         \bgroup\let\domark\relax
!           \hskip\skip\thinshrinkable\the\toksA
!         \egroup
!         % The redefinion 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.
        \else
!         \hskip\skip\thinshrinkable #1%
        \fi
      \fi
--- 5695,5706 ----
        \ifpdf
          \pdfgettoks#1.%
!         \hskip\skip\thinshrinkable\the\toksA
        \else
!         \ifx\XeTeXrevision\thisisundefined
!           \hskip\skip\thinshrinkable #1%
!         \else
!           \pdfgettoks#1.%
!           \hskip\skip\thinshrinkable\the\toksA
!         \fi
        \fi
      \fi
***************
*** 5301,5309 ****
      \else
      \global\setbox\entryindexbox=\vbox\bgroup
-       \prevdepth=\entrylinedepth
-       \noindent
        % We want the text of the entries to be aligned to the left, and the
        % page numbers to be aligned to the right.
        %
        \advance\leftskip by 0pt plus 1fil
        \advance\leftskip by 0pt plus -1fill
--- 5710,5717 ----
      \else
      \global\setbox\entryindexbox=\vbox\bgroup
        % We want the text of the entries to be aligned to the left, and the
        % page numbers to be aligned to the right.
        %
+       \parindent = 0pt
        \advance\leftskip by 0pt plus 1fil
        \advance\leftskip by 0pt plus -1fill
***************
*** 5314,5319 ****
        \parfillskip=0pt plus -1fill
        %
-       \hangindent=1em
-       %
        \advance\rightskip by \entryrightmargin
        % Determine how far we can stretch into the margin.
--- 5722,5725 ----
***************
*** 5335,5339 ****
          \dimen@ = 0.7\dimen@ % Try to split the text roughly evenly
          \dimen@ii = \hsize
-         \advance \dimen@ii by -1em
          \ifnum\dimen@>\dimen@ii
            % If the entry is too long, use the whole line
--- 5741,5744 ----
***************
*** 5342,5349 ****
          \advance\leftskip by 0pt plus 1fill % ragged right
          \advance \dimen@ by 1\rightskip
!         \parshape = 2 0pt \dimen@ 1em \dimen@ii
!         % Ideally we'd add a finite glue at the end of the first line only, but
!         % TeX doesn't seem to provide a way to do such a thing.
        \fi\fi
        \unhbox\boxA
        %
--- 5747,5759 ----
          \advance\leftskip by 0pt plus 1fill % ragged right
          \advance \dimen@ by 1\rightskip
!         \parshape = 2 0pt \dimen@ 0em \dimen@ii
!         % Ideally we'd add a finite glue at the end of the first line only,
!         % 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
        \fi\fi
+       \indent % start paragraph
        \unhbox\boxA
        %
***************
*** 5363,5367 ****
    % delay text of entry until after penalty
    \bgroup\aftergroup\insertindexentrybox
!   \entryorphanpenalty
  }}
  
--- 5773,5777 ----
    % delay text of entry until after penalty
    \bgroup\aftergroup\insertindexentrybox
!   \entrywidowpenalty
  }}
  
***************
*** 5371,5408 ****
  \newbox\entryindexbox
  \def\insertindexentrybox{%
!   \copy\entryindexbox
!   % The following gets the depth of the last box.  This is for even
!   % line spacing when entries span several lines.
!   \setbox\dummybox\vbox{%
!     \unvbox\entryindexbox
!     \nointerlineskip
!     \lastbox
!     \global\entrylinedepth=\prevdepth
    }%
!   % Note that we couldn't simply \unvbox\entryindexbox followed by 
!   % \nointerlineskip\lastbox to remove the last box and then reinstate it, 
!   % because this resets how far the box has been \moveleft'ed to 0.  \unvbox
!   % doesn't affect \prevdepth either.
  }
! \newdimen\entrylinedepth
  
  % Default is no penalty
! \let\entryorphanpenalty\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
! % orphaned index entries.
! \long\def\indexorphanpenalty{%
    \def\isentry{\entry}%
    \ifx\firsttoken\isentry
    \else
!     \unskip\penalty 9000
!     % The \unskip here stops breaking before the glue.  It relies on the
!     % \vskip above being there, otherwise there is an error
!     % "You can't use `\unskip' in vertical mode".  There has to be glue
!     % in the current vertical list that hasn't been added to the
!     % "current page".  See Chapter 24 of the TeXbook.  This contradicts
!     % Section 8.3.7 in "TeX by Topic," though.
    \fi
    \egroup % now comes the box added with \aftergroup
--- 5781,5821 ----
  \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
***************
*** 5428,5432 ****
      \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph.
    \else
!     #2
    \fi
    \par
--- 5841,5849 ----
      \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
***************
*** 5440,5445 ****
  \newbox\partialpage
  \newdimen\doublecolumnhsize
- \newdimen\doublecolumntopgap
- \doublecolumntopgap = 0pt
  
  % Use inside an output routine to save \topmark and \firstmark
--- 5857,5860 ----
***************
*** 5524,5533 ****
    % Double the \vsize as well.  (We don't need a separate register here,
    % since nobody clobbers \vsize.)
-   \global\doublecolumntopgap = \topskip
-   \global\advance\doublecolumntopgap by -1\baselineskip
-   \advance\vsize by -1\doublecolumntopgap
    \vsize = 2\vsize
!   \topskip=0pt
!   \global\entrylinedepth=0pt\relax
  }
  
--- 5939,5946 ----
    % Double the \vsize as well.  (We don't need a separate register here,
    % since nobody clobbers \vsize.)
    \vsize = 2\vsize
!   %
!   % For the benefit of balancing columns
!   \advance\baselineskip by 0pt plus 0.5pt
  }
  
***************
*** 5559,5565 ****
    \hsize = \doublecolumnhsize
    \wd0=\hsize \wd2=\hsize
!   \vbox{%
!     \vskip\doublecolumntopgap
!     \hbox to\pagewidth{\box0\hfil\box2}}%
  }
  
--- 5972,5976 ----
    \hsize = \doublecolumnhsize
    \wd0=\hsize \wd2=\hsize
!   \hbox to\txipagewidth{\box0\hfil\box2}%
  }
  
***************
*** 5588,5592 ****
    % section, it invokes the new output routine that we've set after
    % \balancecolumns below; \onepageout will try to fit the two columns
!   % and the final section into the vbox of \pageheight (see
    % \pagebody), causing an overfull box.
    %
--- 5999,6003 ----
    % section, it invokes the new output routine that we've set after
    % \balancecolumns below; \onepageout will try to fit the two columns
!   % and the final section into the vbox of \txipageheight (see
    % \pagebody), causing an overfull box.
    %
***************
*** 5628,5632 ****
    \advance\dimen@ by \topskip
    \advance\dimen@ by-\baselineskip
!   \ifdim\dimen@<14\baselineskip
      % Don't split a short final column in two.
      \setbox2=\vbox{}%
--- 6039,6043 ----
    \advance\dimen@ by \topskip
    \advance\dimen@ by-\baselineskip
!   \ifdim\dimen@<5\baselineskip
      % Don't split a short final column in two.
      \setbox2=\vbox{}%
***************
*** 5635,5639 ****
      \dimen@ii = \dimen@
      \splittopskip = \topskip
!     % Loop until the second column is no higher than the first
      {%
        \vbadness = 10000
--- 6046,6050 ----
      \dimen@ii = \dimen@
      \splittopskip = \topskip
!     % Loop until left column is at least as high as the right column.
      {%
        \vbadness = 10000
***************
*** 5641,5663 ****
          \global\setbox3 = \copy0
          \global\setbox1 = \vsplit3 to \dimen@
!         % Remove glue from bottom of first column to
!         % make sure it is higher than the second.
!         \global\setbox1 = \vbox{\unvbox1\unpenalty\unskip}%
!       \ifdim\ht3>\ht1
          \global\advance\dimen@ by 1pt
        \repeat
      }%
!     \multiply\dimen@ii by 4
!     \divide\dimen@ii by 5
!     \ifdim\ht3<\dimen@ii
!       % Column heights are too different, so don't make their bottoms
!       % flush with each other.  The glue at the end of the second column
!       % allows a second column to stretch, reducing the difference in
!       % height between the two.
!       \setbox0=\vbox to\dimen@{\unvbox1\vfill}%
!       \setbox2=\vbox to\dimen@{\unvbox3\vskip 0pt plus 0.3\ht0}%
      \else
!       \setbox0=\vbox to\dimen@{\unvbox1}%
!       \setbox2=\vbox to\dimen@{\unvbox3}%
      \fi
    \fi
--- 6052,6081 ----
          \global\setbox3 = \copy0
          \global\setbox1 = \vsplit3 to \dimen@
!       \ifdim\ht1<\ht3
          \global\advance\dimen@ by 1pt
        \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}%
      \else
!       % Compare the heights of the two columns.
!       \ifdim4\ht1>5\ht3
!         % Column heights are too different, so don't make their bottoms
!         % flush with each other.
!         \setbox2=\vbox to \ht1 {\unvbox3\vfill}%
!         \setbox0=\vbox to \ht1 {\unvbox1\vfill}%
!       \else
!         % Make column bottoms flush with each other.
!         \setbox2=\vbox to\ht1{\unvbox3\unskip}%
!         \setbox0=\vbox to\ht1{\unvbox1\unskip}%
!       \fi
      \fi
    \fi
***************
*** 6072,6076 ****
  }
  
! \def\setchapternewpage #1 {\csname CHAPPAG#1\endcsname}
  
  \def\CHAPPAGoff{%
--- 6490,6494 ----
  }
  
! \parseargdef\setchapternewpage{\csname CHAPPAG#1\endcsname}
  
  \def\CHAPPAGoff{%
***************
*** 6218,6245 ****
  
  
- % I don't think this chapter style is supported any more, so I'm not
- % updating it with the new noderef stuff.  We'll see.  --karl, 11aug03.
- %
- \def\setchapterstyle #1 {\csname CHAPF#1\endcsname}
- %
- \def\unnchfopen #1{%
-   \chapoddpage
-   \vbox{\chapfonts \raggedtitlesettings #1\par}%
-   \nobreak\bigskip\nobreak
- }
- \def\chfopen #1#2{\chapoddpage {\chapfonts
- \vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}%
- \par\penalty 5000 %
- }
- \def\centerchfopen #1{%
-   \chapoddpage
-   \vbox{\chapfonts \raggedtitlesettings \hfill #1\hfill}%
-   \nobreak\bigskip \nobreak
- }
- \def\CHAPFopen{%
-   \global\let\chapmacro=\chfopen
-   \global\let\centerchapmacro=\centerchfopen}
- 
- 
  % Section titles.  These macros combine the section number parts and
  % call the generic \sectionheading to do the printing.
--- 6636,6639 ----
***************
*** 6444,6448 ****
    % two pages of the document.  Thus, we'd have two destinations named
    % `1', and two named `2'.
!   \ifpdf \global\pdfmakepagedesttrue \fi
  }
  
--- 6838,6849 ----
    % two pages of the document.  Thus, we'd have two destinations named
    % `1', and two named `2'.
!   \ifpdf
!     \global\pdfmakepagedesttrue
!   \else
!     \ifx\XeTeXrevision\thisisundefined
!     \else
!       \global\pdfmakepagedesttrue
!     \fi
!   \fi
  }
  
***************
*** 6704,6708 ****
    \catcode `\`=\other
    \catcode `\'=\other
-   \escapechar=`\\
    %
    % ' is active in math mode (mathcode"8000).  So reset it, and all our
--- 7105,7108 ----
***************
*** 7682,7695 ****
  \let\texinfoc=\c
  
  % Used at the time of macro expansion.
  % Argument is macro body with arguments substituted
  \def\scanmacro#1{%
    \newlinechar`\^^M
!   \def\xprocessmacroarg{\eatspaces}%
    %
    % Process the macro body under the current catcode regime.
!   \scantokens{#1\texinfoc}\aftermacro%
    %
!   % The \c 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
--- 8082,8109 ----
  \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%
!   %
!   \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
***************
*** 7704,7716 ****
  % Used for copying and captions
  \def\scanexp#1{%
!   \bgroup
!   % Undo catcode changes of \startcontents and \printindex
!   % When called from @insertcopying or (short)caption, we need active
!   % backslash to get it printed correctly.
!   % FIXME: This may not be needed.
!   %\catcode`\@=0 \catcode`\\=\active \escapechar=`\@
!   \edef\temp{\noexpand\scanmacro{#1}}%
!   \temp
!   \egroup
  }
  
--- 8118,8122 ----
  % Used for copying and captions
  \def\scanexp#1{%
!   \expandafter\scanmacro\expandafter{#1}%
  }
  
***************
*** 7720,7724 ****
  
  % List of all defined macros in the form
! %    \definedummyword\macro1\definedummyword\macro2...
  % Currently is also contains all @aliases; the list can be split
  % if there is a need.
--- 8126,8130 ----
  
  % List of all defined macros in the form
! %    \commondummyword\macro1\commondummyword\macro2...
  % Currently is also contains all @aliases; the list can be split
  % if there is a need.
***************
*** 7728,7732 ****
  \def\addtomacrolist#1{\expandafter \addtomacrolistxxx \csname#1\endcsname}
  \def\addtomacrolistxxx#1{%
!      \toks0 = \expandafter{\macrolist\definedummyword#1}%
       \xdef\macrolist{\the\toks0}%
  }
--- 8134,8138 ----
  \def\addtomacrolist#1{\expandafter \addtomacrolistxxx \csname#1\endcsname}
  \def\addtomacrolistxxx#1{%
!      \toks0 = \expandafter{\macrolist\commondummyword#1}%
       \xdef\macrolist{\the\toks0}%
  }
***************
*** 7782,7786 ****
    \catcode`\|=\other
    \catcode`\~=\other
!   \ifx\declaredencoding\ascii \else \setnonasciicharscatcodenonglobal\other \fi
  }
  
--- 8188,8192 ----
    \catcode`\|=\other
    \catcode`\~=\other
!   \passthroughcharstrue
  }
  
***************
*** 7869,7873 ****
      \begingroup
        \expandafter\let\csname#1\endcsname \relax
!       \let\definedummyword\unmacrodo
        \xdef\macrolist{\macrolist}%
      \endgroup
--- 8275,8279 ----
      \begingroup
        \expandafter\let\csname#1\endcsname \relax
!       \let\commondummyword\unmacrodo
        \xdef\macrolist{\macrolist}%
      \endgroup
***************
*** 7884,7888 ****
      % remove this
    \else
!     \noexpand\definedummyword \noexpand#1%
    \fi
  }
--- 8290,8294 ----
      % remove this
    \else
!     \noexpand\commondummyword \noexpand#1%
    \fi
  }
***************
*** 7916,7920 ****
    \let\hash\relax
    % \hash is redefined to `#' later to get it into definitions
!   \let\processmacroarg\relax
    \parsemargdefxxx#1,;,%
    \ifnum\paramno<10\relax\else
--- 8322,8326 ----
    \let\hash\relax
    % \hash is redefined to `#' later to get it into definitions
!   \let\xeatspaces\relax
    \parsemargdefxxx#1,;,%
    \ifnum\paramno<10\relax\else
***************
*** 7928,7932 ****
      \advance\paramno by 1
      \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname
!         {\processmacroarg{\hash\the\paramno}}%
      \edef\paramlist{\paramlist\hash\the\paramno,}%
    \fi\next}
--- 8334,8338 ----
      \advance\paramno by 1
      \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname
!         {\xeatspaces{\hash\the\paramno}}%
      \edef\paramlist{\paramlist\hash\the\paramno,}%
    \fi\next}
***************
*** 8154,8171 ****
  
  
- 
- % Remove following spaces at the expansion stage.
- % This works because spaces are discarded before each argument when TeX is 
- % getting the arguments for a macro.
- % This must not be immediately followed by a }.
- \long\def\gobblespaces#1{#1}
- 
  % This defines a Texinfo @macro or @rmacro, called by \parsemacbody.
  %    \macrobody has the body of the macro in it, with placeholders for
! % its parameters, looking like "\processmacroarg{\hash 1}".
  %    \paramno is the number of parameters
  %    \paramlist is a TeX parameter text, e.g. "#1,#2,#3,"
! % There are eight cases: recursive and nonrecursive macros of zero, one,
! % up to nine, and many arguments.
  % \xdef is used so that macro definitions will survive the file
  % they're defined in: @include reads the file inside a group.
--- 8560,8569 ----
  
  
  % This defines a Texinfo @macro or @rmacro, called by \parsemacbody.
  %    \macrobody has the body of the macro in it, with placeholders for
! % its parameters, looking like "\xeatspaces{\hash 1}".
  %    \paramno is the number of parameters
  %    \paramlist is a TeX parameter text, e.g. "#1,#2,#3,"
! % There are four cases: macros of zero, one, up to nine, and many arguments.
  % \xdef is used so that macro definitions will survive the file
  % they're defined in: @include reads the file inside a group.
***************
*** 8174,8178 ****
    \let\hash=##% convert placeholders to macro parameter chars
    \ifnum\paramno=1
!     \def\processmacroarg{\gobblespaces}%
      % This removes the pair of braces around the argument.  We don't
      % use \eatspaces, because this can cause ends of lines to be lost
--- 8572,8576 ----
    \let\hash=##% convert placeholders to macro parameter chars
    \ifnum\paramno=1
!     \def\xeatspaces##1{##1}%
      % This removes the pair of braces around the argument.  We don't
      % use \eatspaces, because this can cause ends of lines to be lost
***************
*** 8180,8279 ****
      % commands like "@itemize" not being read correctly.
    \else
!     \def\processmacroarg{\xprocessmacroarg}%
!     \let\xprocessmacroarg\relax
    \fi
!   \ifrecursive   %%%%%%%%%%%%%% Recursive %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
!     \ifcase\paramno
!     % 0
!       \expandafter\xdef\csname\the\macname\endcsname{%
!         \noexpand\scanmacro{\macrobody}}%
!     \or % 1
        \expandafter\xdef\csname\the\macname\endcsname{%
!          \bgroup
!          \noexpand\braceorline
!          \expandafter\noexpand\csname\the\macname @@@\endcsname}%
        \expandafter\xdef\csname\the\macname @@@\endcsname##1{%
!          \expandafter\noexpand\csname\the\macname @@@@\endcsname{%
!            \noexpand\gobblespaces##1\empty}%
!            % The \empty is for \gobblespaces in case #1 is empty
!          }%
!       \expandafter\xdef\csname\the\macname @@@@\endcsname##1{%
!          \egroup\noexpand\scanmacro{\macrobody}}%
!     \else
!       \ifnum\paramno<10\relax % at most 9
!         % See non-recursive section below for comments
!         \expandafter\xdef\csname\the\macname\endcsname{%
!           \bgroup
!           \noexpand\expandafter
!           \noexpand\macroargctxt
!           \noexpand\expandafter
!           \expandafter\noexpand\csname\the\macname @@\endcsname}%
!         \expandafter\xdef\csname\the\macname @@\endcsname##1{%
!             \noexpand\passargtomacro
!             \expandafter\noexpand\csname\the\macname @@@\endcsname{##1,}}%
!         \expandafter\xdef\csname\the\macname @@@\endcsname##1{%
!             \expandafter\noexpand\csname\the\macname @@@@\endcsname ##1}%
!         \expandafter\expandafter
!         \expandafter\xdef
!         \expandafter\expandafter
!           \csname\the\macname @@@@\endcsname\paramlist{%
!             \egroup\noexpand\scanmacro{\macrobody}}%
!       \else % 10 or more
!         \expandafter\xdef\csname\the\macname\endcsname{%
!           \noexpand\getargvals@{\the\macname}{\argl}%
!         }%    
!         \global\expandafter\let\csname mac.\the\macname .body\endcsname\macrobody
!         \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\gobble
!       \fi
!     \fi
!   \else  %%%%%%%%%%%%%%%%%%%%%% Non-recursive %%%%%%%%%%%%%%%%%%%%%%%%%%
!     \ifcase\paramno
!     % 0
!       \expandafter\xdef\csname\the\macname\endcsname{%
!         \noexpand\scanmacro{\macrobody}}%
!     \or % 1
        \expandafter\xdef\csname\the\macname\endcsname{%
!          \bgroup
!          \noexpand\braceorline
!          \expandafter\noexpand\csname\the\macname @@@\endcsname}%
!       \expandafter\xdef\csname\the\macname @@@\endcsname##1{%
!          \expandafter\noexpand\csname\the\macname @@@@\endcsname{%
!            \noexpand\gobblespaces##1\empty}%
!            % The \empty is for \gobblespaces in case #1 is empty
!          }%
!       \expandafter\xdef\csname\the\macname @@@@\endcsname##1{%
!         \egroup
!         \noexpand\scanmacro{\macrobody}%
!         }%
!     \else % at most 9
!       \ifnum\paramno<10\relax
!         % @MACNAME sets the context for reading the macro argument
!         % @MACNAME@@ gets the argument, processes backslashes and appends a 
!         % comma.
!         % @MACNAME@@@ removes braces surrounding the argument list.
!         % @MACNAME@@@@ scans the macro body with arguments substituted.
!         \expandafter\xdef\csname\the\macname\endcsname{%
!           \bgroup
!           \noexpand\expandafter  % This \expandafter skip any spaces after the
!           \noexpand\macroargctxt % macro before we change the catcode of space.
!           \noexpand\expandafter
!           \expandafter\noexpand\csname\the\macname @@\endcsname}%
!         \expandafter\xdef\csname\the\macname @@\endcsname##1{%
!             \noexpand\passargtomacro
!             \expandafter\noexpand\csname\the\macname @@@\endcsname{##1,}}%
!         \expandafter\xdef\csname\the\macname @@@\endcsname##1{%
!             \expandafter\noexpand\csname\the\macname @@@@\endcsname ##1}%
!         \expandafter\expandafter
!         \expandafter\xdef
!         \expandafter\expandafter
!           \csname\the\macname @@@@\endcsname\paramlist{%
!             \egroup\noexpand\scanmacro{\macrobody}}%
!       \else % 10 or more:
!         \expandafter\xdef\csname\the\macname\endcsname{%
!           \noexpand\getargvals@{\the\macname}{\argl}%
!         }%
!         \global\expandafter\let\csname mac.\the\macname .body\endcsname\macrobody
!         \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\norecurse
!       \fi
      \fi
    \fi}
--- 8578,8625 ----
      % commands like "@itemize" not being read correctly.
    \else
!     \let\xeatspaces\relax % suppress expansion
    \fi
!   \ifcase\paramno
!   % 0
!     \expandafter\xdef\csname\the\macname\endcsname{%
!       \noexpand\scanmacro{\macrobody}}%
!   \or % 1
!     \expandafter\xdef\csname\the\macname\endcsname{%
!        \bgroup
!        \noexpand\braceorline
!        \expandafter\noexpand\csname\the\macname @@@\endcsname}%
!     \expandafter\xdef\csname\the\macname @@@\endcsname##1{%
!       \egroup
!       \noexpand\scanmacro{\macrobody}%
!       }%
!   \else % at most 9
!     \ifnum\paramno<10\relax
!       % @MACNAME sets the context for reading the macro argument
!       % @MACNAME@@ gets the argument, processes backslashes and appends a 
!       % comma.
!       % @MACNAME@@@ removes braces surrounding the argument list.
!       % @MACNAME@@@@ scans the macro body with arguments substituted.
        \expandafter\xdef\csname\the\macname\endcsname{%
!         \bgroup
!         \noexpand\expandafter  % This \expandafter skip any spaces after the
!         \noexpand\macroargctxt % macro before we change the catcode of space.
!         \noexpand\expandafter
!         \expandafter\noexpand\csname\the\macname @@\endcsname}%
!       \expandafter\xdef\csname\the\macname @@\endcsname##1{%
!           \noexpand\passargtomacro
!           \expandafter\noexpand\csname\the\macname @@@\endcsname{##1,}}%
        \expandafter\xdef\csname\the\macname @@@\endcsname##1{%
!           \expandafter\noexpand\csname\the\macname @@@@\endcsname ##1}%
!       \expandafter\expandafter
!       \expandafter\xdef
!       \expandafter\expandafter
!         \csname\the\macname @@@@\endcsname\paramlist{%
!           \egroup\noexpand\scanmacro{\macrobody}}%
!     \else % 10 or more:
        \expandafter\xdef\csname\the\macname\endcsname{%
!         \noexpand\getargvals@{\the\macname}{\argl}%
!       }%
!       \global\expandafter\let\csname mac.\the\macname .body\endcsname\macrobody
!       \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\gobble
      \fi
    \fi}
***************
*** 8471,8474 ****
--- 8817,8822 ----
        \requireauxfile
        \atdummies  % preserve commands, but don't expand them
+       % match definition in \xrdef, \refx, \xrefX.
+       \def\value##1{##1}%
        \edef\writexrdef##1##2{%
  	\write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef
***************
*** 8561,8567 ****
    % Make link in pdf output.
    \ifpdf
      {\indexnofonts
-      \turnoffactive
       \makevalueexpandable
       % This expands tokens, so do it after making catcode changes, so _
       % etc. don't get their TeX definitions.  This ignores all spaces in
--- 8909,8916 ----
    % Make link in pdf output.
    \ifpdf
+     % For pdfTeX and LuaTeX
      {\indexnofonts
       \makevalueexpandable
+      \turnoffactive
       % This expands tokens, so do it after making catcode changes, so _
       % etc. don't get their TeX definitions.  This ignores all spaces in
***************
*** 8571,8579 ****
       % This (wrongly) does not take account of leading or trailing
       % spaces in #1, which should be ignored.
!      \edef\pdfxrefdest{#1}%
!      \ifx\pdfxrefdest\empty
!        \def\pdfxrefdest{Top}% no empty targets
!      \else
!        \txiescapepdf\pdfxrefdest  % escape PDF special chars
       \fi
       %
--- 8920,8927 ----
       % This (wrongly) does not take account of leading or trailing
       % spaces in #1, which should be ignored.
!      \setpdfdestname{#1}%
!      %
!      \ifx\pdfdestname\empty
!        \def\pdfdestname{Top}% no empty targets
       \fi
       %
***************
*** 8581,8590 ****
       \startlink attr{/Border [0 0 0]}%
       \ifnum\filenamelength>0
!        goto file{\the\filename.pdf} name{\pdfxrefdest}%
       \else
!        goto name{\pdfmkpgn{\pdfxrefdest}}%
       \fi
      }%
      \setcolor{\linkcolor}%
    \fi
    {%
--- 8929,8977 ----
       \startlink attr{/Border [0 0 0]}%
       \ifnum\filenamelength>0
!        goto file{\the\filename.pdf} name{\pdfdestname}%
       \else
!        goto name{\pdfmkpgn{\pdfdestname}}%
       \fi
      }%
      \setcolor{\linkcolor}%
+   \else
+     \ifx\XeTeXrevision\thisisundefined
+     \else
+       % For XeTeX
+       {\indexnofonts
+        \makevalueexpandable
+        \turnoffactive
+        % This expands tokens, so do it after making catcode changes, so _
+        % etc. don't get their TeX definitions.  This ignores all spaces in
+        % #4, including (wrongly) those in the middle of the filename.
+        \getfilename{#4}%
+        %
+        % This (wrongly) does not take account of leading or trailing
+        % spaces in #1, which should be ignored.
+        \setpdfdestname{#1}%
+        %
+        \ifx\pdfdestname\empty
+          \def\pdfdestname{Top}% no empty targets
+        \fi
+        %
+        \leavevmode
+        \ifnum\filenamelength>0
+          % With default settings,
+          % XeTeX (xdvipdfmx) replaces link destination names with integers.
+          % In this case, the replaced destination names of
+          % remote PDFs are no longer known.  In order to avoid a replacement,
+          % you can use xdvipdfmx's command line option `-C 0x0010'.
+          % If you use XeTeX 0.99996+ (TeX Live 2016+),
+          % this command line option is no longer necessary
+          % because we can use the `dvipdfmx:config' special.
+          \special{pdf:bann << /Border [0 0 0] /Type /Annot /Subtype /Link /A
+            << /S /GoToR /F (\the\filename.pdf) /D (\pdfdestname) >> >>}%
+        \else
+          \special{pdf:bann << /Border [0 0 0] /Type /Annot /Subtype /Link /A
+            << /S /GoTo /D (\pdfdestname) >> >>}%
+        \fi
+       }%
+       \setcolor{\linkcolor}%
+     \fi
    \fi
    {%
***************
*** 8593,8596 ****
--- 8980,8984 ----
      \indexnofonts
      \turnoffactive
+     \def\value##1{##1}%
      \expandafter\global\expandafter\let\expandafter\Xthisreftitle
        \csname XR#1-title\endcsname
***************
*** 8733,8739 ****
  }
  
! % Define \refx{NAME}{SUFFIX} to reference a cross-reference string named NAME.
! % If its value is nonempty, SUFFIX is output afterward.
! %
  \def\refx#1#2{%
    \requireauxfile
--- 9121,9126 ----
  }
  
! % \refx{NAME}{SUFFIX} - reference a cross-reference string named NAME.  SUFFIX 
! % is output afterwards if non-empty.
  \def\refx#1#2{%
    \requireauxfile
***************
*** 8741,8744 ****
--- 9128,9132 ----
      \indexnofonts
      \otherbackslash
+     \def\value##1{##1}%
      \expandafter\global\expandafter\let\expandafter\thisrefX
        \csname XR#1\endcsname
***************
*** 8765,8778 ****
  }
  
! % This is the macro invoked by entries in the aux file.  Usually it's
! % just a \def (we prepend XR to the control sequence name to avoid
! % collisions).  But if this is a float type, we have more work to do.
  %
  \def\xrdef#1#2{%
!   {% The node name might contain 8-bit characters, which in our current
!    % implementation are changed to commands like @'e.  Don't let these
!    % mess up the control sequence name.
      \indexnofonts
      \turnoffactive
      \xdef\safexrefname{#1}%
    }%
--- 9153,9168 ----
  }
  
! % This is the macro invoked by entries in the aux file.  Define a control 
! % sequence for a cross-reference target (we prepend XR to the control sequence 
! % name to avoid collisions).  The value is the page number.  If this is a float 
! % type, we have more work to do.
  %
  \def\xrdef#1#2{%
!   {% Expand the node or anchor name to remove control sequences.
!    % \turnoffactive stops 8-bit characters being changed to commands
!    % like @'e.  \refx does the same to retrieve the value in the definition.
      \indexnofonts
      \turnoffactive
+     \def\value##1{##1}%
      \xdef\safexrefname{#1}%
    }%
***************
*** 8896,8902 ****
    \catcode`\\=\other
    %
-   % Make the characters 128-255 be printing characters.
-   {\setnonasciicharscatcodenonglobal\other}%
-   %
    % @ is our escape character in .aux files, and we need braces.
    \catcode`\{=1
--- 9286,9289 ----
***************
*** 8962,8966 ****
    % footnote reference occurs in (for example) a display environment.
    % So reset some parameters.
!   \hsize=\pagewidth
    \interlinepenalty\interfootnotelinepenalty
    \splittopskip\ht\strutbox % top baseline for broken footnotes
--- 9349,9353 ----
    % footnote reference occurs in (for example) a display environment.
    % So reset some parameters.
!   \hsize=\txipagewidth
    \interlinepenalty\interfootnotelinepenalty
    \splittopskip\ht\strutbox % top baseline for broken footnotes
***************
*** 9277,9281 ****
      \ifx\thiscaption\empty \else
        \ifx\floatident\empty \else
! 	\appendtomacro\captionline{: }% had ident, so need a colon between
        \fi
        %
--- 9664,9668 ----
      \ifx\thiscaption\empty \else
        \ifx\floatident\empty \else
!         \appendtomacro\captionline{: }% had ident, so need a colon between
        \fi
        %
***************
*** 9304,9331 ****
          \atdummies
          %
!         % since we read the caption text in the macro world, where ^^M
!         % is turned into a normal character, we have to scan it back, so
!         % we don't write the literal three characters "^^M" into the aux file.
! 	\scanexp{%
! 	  \xdef\noexpand\gtemp{%
! 	    \ifx\thisshortcaption\empty
! 	      \thiscaption
! 	    \else
! 	      \thisshortcaption
! 	    \fi
! 	  }%
! 	}%
          \immediate\write\auxfile{@xrdef{\floatlabel-lof}{\floatident
! 	  \ifx\gtemp\empty \else : \gtemp \fi}}%
        }%
      \fi
    \egroup  % end of \vtop
    %
-   % place the captured inserts
-   %
-   % BEWARE: when the floats start floating, we have to issue warning
-   % whenever an insert appears inside a float which could possibly
-   % float. --kasal, 26may04
-   %
    \checkinserts
  }
--- 9691,9705 ----
          \atdummies
          %
!         \ifx\thisshortcaption\empty
!           \def\gtemp{\thiscaption}%
!         \else
!           \def\gtemp{\thisshortcaption}%
!         \fi
          \immediate\write\auxfile{@xrdef{\floatlabel-lof}{\floatident
!           \ifx\gtemp\empty \else : \gtemp \fi}}%
        }%
      \fi
    \egroup  % end of \vtop
    %
    \checkinserts
  }
***************
*** 9502,9542 ****
  }
  
! % Get input by bytes instead of by UTF-8 codepoints for XeTeX and LuaTeX, 
! % otherwise the encoding support is completely broken.
  \ifx\XeTeXrevision\thisisundefined
  \else
! \XeTeXdefaultencoding "bytes"  % For subsequent files to be read
! \XeTeXinputencoding "bytes"  % Effective in texinfo.tex only
! % Unfortunately, there seems to be no corresponding XeTeX command for
! % output encoding.  This is a problem for auxiliary index and TOC files.
! % The only solution would be perhaps to write out @U{...} sequences in
! % place of UTF-8 characters.
  \fi
  
! \ifx\luatexversion\thisisundefined
! \else
! \directlua{
! local utf8_char, byte, gsub = unicode.utf8.char, string.byte, string.gsub
! local function convert_char (char)
!   return utf8_char(byte(char))
! end
  
! local function convert_line (line)
!   return gsub(line, ".", convert_char)
! end
  
! callback.register("process_input_buffer", convert_line)
  
! local function convert_line_out (line)
!   local line_out = ""
!   for c in string.utfvalues(line) do
!      line_out = line_out .. string.char(c)
!   end
!   return line_out
! end
  
! callback.register("process_output_buffer", convert_line_out)
  }
- \fi
  
  
--- 9876,9941 ----
  }
  
! % XeTeX and LuaTeX can handle Unicode natively.
! % Their default I/O uses UTF-8 sequences instead of a byte-wise operation.
! % Other TeX engines' I/O (pdfTeX, etc.) is byte-wise.
! %
! \newif\iftxinativeunicodecapable
! \newif\iftxiusebytewiseio
! 
  \ifx\XeTeXrevision\thisisundefined
+   \ifx\luatexversion\thisisundefined
+     \txinativeunicodecapablefalse
+     \txiusebytewiseiotrue
+   \else
+     \txinativeunicodecapabletrue
+     \txiusebytewiseiofalse
+   \fi
  \else
!   \txinativeunicodecapabletrue
!   \txiusebytewiseiofalse
  \fi
  
! % Set I/O by bytes instead of UTF-8 sequence for XeTeX and LuaTex
! % for non-UTF-8 (byte-wise) encodings.
! %
! \def\setbytewiseio{%
!   \ifx\XeTeXrevision\thisisundefined
!   \else
!     \XeTeXdefaultencoding "bytes"  % For subsequent files to be read
!     \XeTeXinputencoding "bytes"  % For document root file
!     % Unfortunately, there seems to be no corresponding XeTeX command for
!     % output encoding.  This is a problem for auxiliary index and TOC files.
!     % The only solution would be perhaps to write out @U{...} sequences in
!     % place of non-ASCII characters.
!   \fi
  
!   \ifx\luatexversion\thisisundefined
!   \else
!     \directlua{
!     local utf8_char, byte, gsub = unicode.utf8.char, string.byte, string.gsub
!     local function convert_char (char)
!       return utf8_char(byte(char))
!     end
  
!     local function convert_line (line)
!       return gsub(line, ".", convert_char)
!     end
  
!     callback.register("process_input_buffer", convert_line)
! 
!     local function convert_line_out (line)
!       local line_out = ""
!       for c in string.utfvalues(line) do
!          line_out = line_out .. string.char(c)
!       end
!       return line_out
!     end
! 
!     callback.register("process_output_buffer", convert_line_out)
!     }
!   \fi
  
!   \txiusebytewiseiotrue
  }
  
  
***************
*** 9565,9575 ****
  \def\documentencoding{\parseargusing\filenamecatcodes\documentencodingzzz}
  \def\documentencodingzzz#1{%
-   % Get input by bytes instead of by UTF-8 codepoints for XeTeX,
-   % otherwise the encoding support is completely broken.
-   % This settings is for the document root file.
-   \ifx\XeTeXrevision\thisisundefined
-   \else
-     \XeTeXinputencoding "bytes"
-   \fi
    %
    % Encoding being declared for the document.
--- 9964,9967 ----
***************
*** 9588,9607 ****
    %
    \else \ifx \declaredencoding \lattwo
       \setnonasciicharscatcode\active
       \lattwochardefs
    %
    \else \ifx \declaredencoding \latone
       \setnonasciicharscatcode\active
       \latonechardefs
    %
    \else \ifx \declaredencoding \latnine
       \setnonasciicharscatcode\active
       \latninechardefs
    %
    \else \ifx \declaredencoding \utfeight
!      \setnonasciicharscatcode\active
!      % since we already invoked \utfeightchardefs at the top level
!      % (below), do not re-invoke it, then our check for duplicated
!      % definitions triggers.  Making non-ascii chars active is enough.
    %
    \else
--- 9980,10015 ----
    %
    \else \ifx \declaredencoding \lattwo
+      \iftxinativeunicodecapable
+        \setbytewiseio
+      \fi
       \setnonasciicharscatcode\active
       \lattwochardefs
    %
    \else \ifx \declaredencoding \latone
+      \iftxinativeunicodecapable
+        \setbytewiseio
+      \fi
       \setnonasciicharscatcode\active
       \latonechardefs
    %
    \else \ifx \declaredencoding \latnine
+      \iftxinativeunicodecapable
+        \setbytewiseio
+      \fi
       \setnonasciicharscatcode\active
       \latninechardefs
    %
    \else \ifx \declaredencoding \utfeight
!      \iftxinativeunicodecapable
!        % For native Unicode handling (XeTeX and LuaTeX)
!        \nativeunicodechardefs
!      \else
!        % For treating UTF-8 as byte sequences (TeX, eTeX and pdfTeX)
!        \setnonasciicharscatcode\active
!        % since we already invoked \utfeightchardefs at the top level
!        % (below), do not re-invoke it, otherwise our check for duplicated
!        % definitions gets triggered.  Making non-ascii chars active is
!        % sufficient.
!      \fi
    %
    \else
***************
*** 9613,9616 ****
--- 10021,10036 ----
    \fi % lattwo
    \fi % ascii
+   %
+   \ifx\XeTeXrevision\thisisundefined
+   \else
+     \ifx \declaredencoding \utfeight
+     \else
+       \ifx \declaredencoding \ascii
+       \else
+         \message{Warning: XeTeX with non-UTF-8 encodings cannot handle %
+         non-ASCII characters in auxiliary files.}%
+       \fi
+     \fi
+   \fi
  }
  
***************
*** 9629,9735 ****
  \setnonasciicharscatcode\active
  %
  % Latin1 (ISO-8859-1) character definitions.
  \def\latonechardefs{%
!   \gdef^^a0{\tie}
!   \gdef^^a1{\exclamdown}
!   \gdef^^a2{{\tcfont \char162}} % cent
!   \gdef^^a3{\pounds}
!   \gdef^^a4{{\tcfont \char164}} % currency
!   \gdef^^a5{{\tcfont \char165}} % yen
!   \gdef^^a6{{\tcfont \char166}} % broken bar
!   \gdef^^a7{\S}
!   \gdef^^a8{\"{}}
!   \gdef^^a9{\copyright}
!   \gdef^^aa{\ordf}
!   \gdef^^ab{\guillemetleft}
!   \gdef^^ac{\ensuremath\lnot}
!   \gdef^^ad{\-}
!   \gdef^^ae{\registeredsymbol}
!   \gdef^^af{\={}}
!   %
!   \gdef^^b0{\textdegree}
!   \gdef^^b1{$\pm$}
!   \gdef^^b2{$^2$}
!   \gdef^^b3{$^3$}
!   \gdef^^b4{\'{}}
!   \gdef^^b5{$\mu$}
!   \gdef^^b6{\P}
!   \gdef^^b7{\ensuremath\cdot}
!   \gdef^^b8{\cedilla\ }
!   \gdef^^b9{$^1$}
!   \gdef^^ba{\ordm}
!   \gdef^^bb{\guillemetright}
!   \gdef^^bc{$1\over4$}
!   \gdef^^bd{$1\over2$}
!   \gdef^^be{$3\over4$}
!   \gdef^^bf{\questiondown}
!   %
!   \gdef^^c0{\`A}
!   \gdef^^c1{\'A}
!   \gdef^^c2{\^A}
!   \gdef^^c3{\~A}
!   \gdef^^c4{\"A}
!   \gdef^^c5{\ringaccent A}
!   \gdef^^c6{\AE}
!   \gdef^^c7{\cedilla C}
!   \gdef^^c8{\`E}
!   \gdef^^c9{\'E}
!   \gdef^^ca{\^E}
!   \gdef^^cb{\"E}
!   \gdef^^cc{\`I}
!   \gdef^^cd{\'I}
!   \gdef^^ce{\^I}
!   \gdef^^cf{\"I}
!   %
!   \gdef^^d0{\DH}
!   \gdef^^d1{\~N}
!   \gdef^^d2{\`O}
!   \gdef^^d3{\'O}
!   \gdef^^d4{\^O}
!   \gdef^^d5{\~O}
!   \gdef^^d6{\"O}
!   \gdef^^d7{$\times$}
!   \gdef^^d8{\O}
!   \gdef^^d9{\`U}
!   \gdef^^da{\'U}
!   \gdef^^db{\^U}
!   \gdef^^dc{\"U}
!   \gdef^^dd{\'Y}
!   \gdef^^de{\TH}
!   \gdef^^df{\ss}
!   %
!   \gdef^^e0{\`a}
!   \gdef^^e1{\'a}
!   \gdef^^e2{\^a}
!   \gdef^^e3{\~a}
!   \gdef^^e4{\"a}
!   \gdef^^e5{\ringaccent a}
!   \gdef^^e6{\ae}
!   \gdef^^e7{\cedilla c}
!   \gdef^^e8{\`e}
!   \gdef^^e9{\'e}
!   \gdef^^ea{\^e}
!   \gdef^^eb{\"e}
!   \gdef^^ec{\`{\dotless i}}
!   \gdef^^ed{\'{\dotless i}}
!   \gdef^^ee{\^{\dotless i}}
!   \gdef^^ef{\"{\dotless i}}
!   %
!   \gdef^^f0{\dh}
!   \gdef^^f1{\~n}
!   \gdef^^f2{\`o}
!   \gdef^^f3{\'o}
!   \gdef^^f4{\^o}
!   \gdef^^f5{\~o}
!   \gdef^^f6{\"o}
!   \gdef^^f7{$\div$}
!   \gdef^^f8{\o}
!   \gdef^^f9{\`u}
!   \gdef^^fa{\'u}
!   \gdef^^fb{\^u}
!   \gdef^^fc{\"u}
!   \gdef^^fd{\'y}
!   \gdef^^fe{\th}
!   \gdef^^ff{\"y}
  }
  
--- 10049,10165 ----
  \setnonasciicharscatcode\active
  %
+ 
+ \def\gdefchar#1#2{%
+ \gdef#1{%
+    \ifpassthroughchars
+      \string#1%
+    \else
+      #2%
+    \fi
+ }}
+ 
  % Latin1 (ISO-8859-1) character definitions.
  \def\latonechardefs{%
!   \gdefchar^^a0{\tie}
!   \gdefchar^^a1{\exclamdown}
!   \gdefchar^^a2{{\tcfont \char162}} % cent
!   \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^^aa{\ordf}
!   \gdefchar^^ab{\guillemetleft}
!   \gdefchar^^ac{\ensuremath\lnot}
!   \gdefchar^^ad{\-}
!   \gdefchar^^ae{\registeredsymbol}
!   \gdefchar^^af{\={}}
!   %
!   \gdefchar^^b0{\textdegree}
!   \gdefchar^^b1{$\pm$}
!   \gdefchar^^b2{$^2$}
!   \gdefchar^^b3{$^3$}
!   \gdefchar^^b4{\'{}}
!   \gdefchar^^b5{$\mu$}
!   \gdefchar^^b6{\P}
!   \gdefchar^^b7{\ensuremath\cdot}
!   \gdefchar^^b8{\cedilla\ }
!   \gdefchar^^b9{$^1$}
!   \gdefchar^^ba{\ordm}
!   \gdefchar^^bb{\guillemetright}
!   \gdefchar^^bc{$1\over4$}
!   \gdefchar^^bd{$1\over2$}
!   \gdefchar^^be{$3\over4$}
!   \gdefchar^^bf{\questiondown}
!   %
!   \gdefchar^^c0{\`A}
!   \gdefchar^^c1{\'A}
!   \gdefchar^^c2{\^A}
!   \gdefchar^^c3{\~A}
!   \gdefchar^^c4{\"A}
!   \gdefchar^^c5{\ringaccent A}
!   \gdefchar^^c6{\AE}
!   \gdefchar^^c7{\cedilla C}
!   \gdefchar^^c8{\`E}
!   \gdefchar^^c9{\'E}
!   \gdefchar^^ca{\^E}
!   \gdefchar^^cb{\"E}
!   \gdefchar^^cc{\`I}
!   \gdefchar^^cd{\'I}
!   \gdefchar^^ce{\^I}
!   \gdefchar^^cf{\"I}
!   %
!   \gdefchar^^d0{\DH}
!   \gdefchar^^d1{\~N}
!   \gdefchar^^d2{\`O}
!   \gdefchar^^d3{\'O}
!   \gdefchar^^d4{\^O}
!   \gdefchar^^d5{\~O}
!   \gdefchar^^d6{\"O}
!   \gdefchar^^d7{$\times$}
!   \gdefchar^^d8{\O}
!   \gdefchar^^d9{\`U}
!   \gdefchar^^da{\'U}
!   \gdefchar^^db{\^U}
!   \gdefchar^^dc{\"U}
!   \gdefchar^^dd{\'Y}
!   \gdefchar^^de{\TH}
!   \gdefchar^^df{\ss}
!   %
!   \gdefchar^^e0{\`a}
!   \gdefchar^^e1{\'a}
!   \gdefchar^^e2{\^a}
!   \gdefchar^^e3{\~a}
!   \gdefchar^^e4{\"a}
!   \gdefchar^^e5{\ringaccent a}
!   \gdefchar^^e6{\ae}
!   \gdefchar^^e7{\cedilla c}
!   \gdefchar^^e8{\`e}
!   \gdefchar^^e9{\'e}
!   \gdefchar^^ea{\^e}
!   \gdefchar^^eb{\"e}
!   \gdefchar^^ec{\`{\dotless i}}
!   \gdefchar^^ed{\'{\dotless i}}
!   \gdefchar^^ee{\^{\dotless i}}
!   \gdefchar^^ef{\"{\dotless i}}
!   %
!   \gdefchar^^f0{\dh}
!   \gdefchar^^f1{\~n}
!   \gdefchar^^f2{\`o}
!   \gdefchar^^f3{\'o}
!   \gdefchar^^f4{\^o}
!   \gdefchar^^f5{\~o}
!   \gdefchar^^f6{\"o}
!   \gdefchar^^f7{$\div$}
!   \gdefchar^^f8{\o}
!   \gdefchar^^f9{\`u}
!   \gdefchar^^fa{\'u}
!   \gdefchar^^fb{\^u}
!   \gdefchar^^fc{\"u}
!   \gdefchar^^fd{\'y}
!   \gdefchar^^fe{\th}
!   \gdefchar^^ff{\"y}
  }
  
***************
*** 9739,9855 ****
    \latonechardefs
    %
!   \gdef^^a4{\euro}
!   \gdef^^a6{\v S}
!   \gdef^^a8{\v s}
!   \gdef^^b4{\v Z}
!   \gdef^^b8{\v z}
!   \gdef^^bc{\OE}
!   \gdef^^bd{\oe}
!   \gdef^^be{\"Y}
  }
  
  % Latin2 (ISO-8859-2) character definitions.
  \def\lattwochardefs{%
!   \gdef^^a0{\tie}
!   \gdef^^a1{\ogonek{A}}
!   \gdef^^a2{\u{}}
!   \gdef^^a3{\L}
!   \gdef^^a4{\missingcharmsg{CURRENCY SIGN}}
!   \gdef^^a5{\v L}
!   \gdef^^a6{\'S}
!   \gdef^^a7{\S}
!   \gdef^^a8{\"{}}
!   \gdef^^a9{\v S}
!   \gdef^^aa{\cedilla S}
!   \gdef^^ab{\v T}
!   \gdef^^ac{\'Z}
!   \gdef^^ad{\-}
!   \gdef^^ae{\v Z}
!   \gdef^^af{\dotaccent Z}
!   %
!   \gdef^^b0{\textdegree}
!   \gdef^^b1{\ogonek{a}}
!   \gdef^^b2{\ogonek{ }}
!   \gdef^^b3{\l}
!   \gdef^^b4{\'{}}
!   \gdef^^b5{\v l}
!   \gdef^^b6{\'s}
!   \gdef^^b7{\v{}}
!   \gdef^^b8{\cedilla\ }
!   \gdef^^b9{\v s}
!   \gdef^^ba{\cedilla s}
!   \gdef^^bb{\v t}
!   \gdef^^bc{\'z}
!   \gdef^^bd{\H{}}
!   \gdef^^be{\v z}
!   \gdef^^bf{\dotaccent z}
!   %
!   \gdef^^c0{\'R}
!   \gdef^^c1{\'A}
!   \gdef^^c2{\^A}
!   \gdef^^c3{\u A}
!   \gdef^^c4{\"A}
!   \gdef^^c5{\'L}
!   \gdef^^c6{\'C}
!   \gdef^^c7{\cedilla C}
!   \gdef^^c8{\v C}
!   \gdef^^c9{\'E}
!   \gdef^^ca{\ogonek{E}}
!   \gdef^^cb{\"E}
!   \gdef^^cc{\v E}
!   \gdef^^cd{\'I}
!   \gdef^^ce{\^I}
!   \gdef^^cf{\v D}
!   %
!   \gdef^^d0{\DH}
!   \gdef^^d1{\'N}
!   \gdef^^d2{\v N}
!   \gdef^^d3{\'O}
!   \gdef^^d4{\^O}
!   \gdef^^d5{\H O}
!   \gdef^^d6{\"O}
!   \gdef^^d7{$\times$}
!   \gdef^^d8{\v R}
!   \gdef^^d9{\ringaccent U}
!   \gdef^^da{\'U}
!   \gdef^^db{\H U}
!   \gdef^^dc{\"U}
!   \gdef^^dd{\'Y}
!   \gdef^^de{\cedilla T}
!   \gdef^^df{\ss}
!   %
!   \gdef^^e0{\'r}
!   \gdef^^e1{\'a}
!   \gdef^^e2{\^a}
!   \gdef^^e3{\u a}
!   \gdef^^e4{\"a}
!   \gdef^^e5{\'l}
!   \gdef^^e6{\'c}
!   \gdef^^e7{\cedilla c}
!   \gdef^^e8{\v c}
!   \gdef^^e9{\'e}
!   \gdef^^ea{\ogonek{e}}
!   \gdef^^eb{\"e}
!   \gdef^^ec{\v e}
!   \gdef^^ed{\'{\dotless{i}}}
!   \gdef^^ee{\^{\dotless{i}}}
!   \gdef^^ef{\v d}
!   %
!   \gdef^^f0{\dh}
!   \gdef^^f1{\'n}
!   \gdef^^f2{\v n}
!   \gdef^^f3{\'o}
!   \gdef^^f4{\^o}
!   \gdef^^f5{\H o}
!   \gdef^^f6{\"o}
!   \gdef^^f7{$\div$}
!   \gdef^^f8{\v r}
!   \gdef^^f9{\ringaccent u}
!   \gdef^^fa{\'u}
!   \gdef^^fb{\H u}
!   \gdef^^fc{\"u}
!   \gdef^^fd{\'y}
!   \gdef^^fe{\cedilla t}
!   \gdef^^ff{\dotaccent{}}
  }
  
--- 10169,10285 ----
    \latonechardefs
    %
!   \gdefchar^^a4{\euro}
!   \gdefchar^^a6{\v S}
!   \gdefchar^^a8{\v s}
!   \gdefchar^^b4{\v Z}
!   \gdefchar^^b8{\v z}
!   \gdefchar^^bc{\OE}
!   \gdefchar^^bd{\oe}
!   \gdefchar^^be{\"Y}
  }
  
  % Latin2 (ISO-8859-2) character definitions.
  \def\lattwochardefs{%
!   \gdefchar^^a0{\tie}
!   \gdefchar^^a1{\ogonek{A}}
!   \gdefchar^^a2{\u{}}
!   \gdefchar^^a3{\L}
!   \gdefchar^^a4{\missingcharmsg{CURRENCY SIGN}}
!   \gdefchar^^a5{\v L}
!   \gdefchar^^a6{\'S}
!   \gdefchar^^a7{\S}
!   \gdefchar^^a8{\"{}}
!   \gdefchar^^a9{\v S}
!   \gdefchar^^aa{\cedilla S}
!   \gdefchar^^ab{\v T}
!   \gdefchar^^ac{\'Z}
!   \gdefchar^^ad{\-}
!   \gdefchar^^ae{\v Z}
!   \gdefchar^^af{\dotaccent Z}
!   %
!   \gdefchar^^b0{\textdegree}
!   \gdefchar^^b1{\ogonek{a}}
!   \gdefchar^^b2{\ogonek{ }}
!   \gdefchar^^b3{\l}
!   \gdefchar^^b4{\'{}}
!   \gdefchar^^b5{\v l}
!   \gdefchar^^b6{\'s}
!   \gdefchar^^b7{\v{}}
!   \gdefchar^^b8{\cedilla\ }
!   \gdefchar^^b9{\v s}
!   \gdefchar^^ba{\cedilla s}
!   \gdefchar^^bb{\v t}
!   \gdefchar^^bc{\'z}
!   \gdefchar^^bd{\H{}}
!   \gdefchar^^be{\v z}
!   \gdefchar^^bf{\dotaccent z}
!   %
!   \gdefchar^^c0{\'R}
!   \gdefchar^^c1{\'A}
!   \gdefchar^^c2{\^A}
!   \gdefchar^^c3{\u A}
!   \gdefchar^^c4{\"A}
!   \gdefchar^^c5{\'L}
!   \gdefchar^^c6{\'C}
!   \gdefchar^^c7{\cedilla C}
!   \gdefchar^^c8{\v C}
!   \gdefchar^^c9{\'E}
!   \gdefchar^^ca{\ogonek{E}}
!   \gdefchar^^cb{\"E}
!   \gdefchar^^cc{\v E}
!   \gdefchar^^cd{\'I}
!   \gdefchar^^ce{\^I}
!   \gdefchar^^cf{\v D}
!   %
!   \gdefchar^^d0{\DH}
!   \gdefchar^^d1{\'N}
!   \gdefchar^^d2{\v N}
!   \gdefchar^^d3{\'O}
!   \gdefchar^^d4{\^O}
!   \gdefchar^^d5{\H O}
!   \gdefchar^^d6{\"O}
!   \gdefchar^^d7{$\times$}
!   \gdefchar^^d8{\v R}
!   \gdefchar^^d9{\ringaccent U}
!   \gdefchar^^da{\'U}
!   \gdefchar^^db{\H U}
!   \gdefchar^^dc{\"U}
!   \gdefchar^^dd{\'Y}
!   \gdefchar^^de{\cedilla T}
!   \gdefchar^^df{\ss}
!   %
!   \gdefchar^^e0{\'r}
!   \gdefchar^^e1{\'a}
!   \gdefchar^^e2{\^a}
!   \gdefchar^^e3{\u a}
!   \gdefchar^^e4{\"a}
!   \gdefchar^^e5{\'l}
!   \gdefchar^^e6{\'c}
!   \gdefchar^^e7{\cedilla c}
!   \gdefchar^^e8{\v c}
!   \gdefchar^^e9{\'e}
!   \gdefchar^^ea{\ogonek{e}}
!   \gdefchar^^eb{\"e}
!   \gdefchar^^ec{\v e}
!   \gdefchar^^ed{\'{\dotless{i}}}
!   \gdefchar^^ee{\^{\dotless{i}}}
!   \gdefchar^^ef{\v d}
!   %
!   \gdefchar^^f0{\dh}
!   \gdefchar^^f1{\'n}
!   \gdefchar^^f2{\v n}
!   \gdefchar^^f3{\'o}
!   \gdefchar^^f4{\^o}
!   \gdefchar^^f5{\H o}
!   \gdefchar^^f6{\"o}
!   \gdefchar^^f7{$\div$}
!   \gdefchar^^f8{\v r}
!   \gdefchar^^f9{\ringaccent u}
!   \gdefchar^^fa{\'u}
!   \gdefchar^^fb{\H u}
!   \gdefchar^^fc{\"u}
!   \gdefchar^^fd{\'y}
!   \gdefchar^^fe{\cedilla t}
!   \gdefchar^^ff{\dotaccent{}}
  }
  
***************
*** 9881,9891 ****
--- 10311,10326 ----
  }
  
+ % Give non-ASCII bytes the active definitions for processing UTF-8 sequences
  \begingroup
    \catcode`\~13
+   \catcode`\$12
    \catcode`\"12
  
+   % Loop from \countUTFx to \countUTFy, performing \UTFviiiTmp
+   % substituting ~ and $ with a character token of that value.
    \def\UTFviiiLoop{%
      \global\catcode\countUTFx\active
      \uccode`\~\countUTFx
+     \uccode`\$\countUTFx
      \uppercase\expandafter{\UTFviiiTmp}%
      \advance\countUTFx by 1
***************
*** 9894,9901 ****
      \fi}
  
    \countUTFx = "C2
    \countUTFy = "E0
    \def\UTFviiiTmp{%
!     \xdef~{\noexpand\UTFviiiTwoOctets\string~}}
    \UTFviiiLoop
  
--- 10329,10347 ----
      \fi}
  
+   % For bytes other than the first in a UTF-8 sequence.  Not expected to
+   % be expanded except when writing to auxiliary files.
+   \countUTFx = "80
+   \countUTFy = "C2
+   \def\UTFviiiTmp{%
+     \gdef~{%
+         \ifpassthroughchars $\fi}}%
+   \UTFviiiLoop
+ 
    \countUTFx = "C2
    \countUTFy = "E0
    \def\UTFviiiTmp{%
!     \gdef~{%
!         \ifpassthroughchars $%
!         \else\expandafter\UTFviiiTwoOctets\expandafter$\fi}}%
    \UTFviiiLoop
  
***************
*** 9903,9907 ****
    \countUTFy = "F0
    \def\UTFviiiTmp{%
!     \xdef~{\noexpand\UTFviiiThreeOctets\string~}}
    \UTFviiiLoop
  
--- 10349,10355 ----
    \countUTFy = "F0
    \def\UTFviiiTmp{%
!     \gdef~{%
!         \ifpassthroughchars $%
!         \else\expandafter\UTFviiiThreeOctets\expandafter$\fi}}%
    \UTFviiiLoop
  
***************
*** 9909,9913 ****
    \countUTFy = "F4
    \def\UTFviiiTmp{%
!     \xdef~{\noexpand\UTFviiiFourOctets\string~}}
    \UTFviiiLoop
  \endgroup
--- 10357,10364 ----
    \countUTFy = "F4
    \def\UTFviiiTmp{%
!     \gdef~{%
!         \ifpassthroughchars $%
!         \else\expandafter\UTFviiiFourOctets\expandafter$\fi
!         }}%
    \UTFviiiLoop
  \endgroup
***************
*** 9918,9923 ****
  \def\U#1{%
    \expandafter\ifx\csname uni:#1\endcsname \relax
!     \errhelp = \EMsimple	
!     \errmessage{Unicode character U+#1 not supported, sorry}%
    \else
      \csname uni:#1\endcsname
--- 10369,10384 ----
  \def\U#1{%
    \expandafter\ifx\csname uni:#1\endcsname \relax
!     \iftxinativeunicodecapable
!       % All Unicode characters can be used if native Unicode handling is
!       % active.  However, if the font does not have the glyph,
!       % letters are missing.
!       \begingroup
!         \uccode`\.="#1\relax
!         \uppercase{.}
!       \endgroup
!     \else
!       \errhelp = \EMsimple	
!       \errmessage{Unicode character U+#1 not supported, sorry}%
!     \fi
    \else
      \csname uni:#1\endcsname
***************
*** 9925,9928 ****
--- 10386,10402 ----
  }
  
+ % These macros are used here to construct the name of a control
+ % sequence to be defined.
+ \def\UTFviiiTwoOctetsName#1#2{%
+   \csname u8:#1\string #2\endcsname}%
+ \def\UTFviiiThreeOctetsName#1#2#3{%
+   \csname u8:#1\string #2\string #3\endcsname}%
+ \def\UTFviiiFourOctetsName#1#2#3#4{%
+   \csname u8:#1\string #2\string #3\string #4\endcsname}%
+ 
+ % For UTF-8 byte sequences (TeX, e-TeX and pdfTeX),
+ % provide a definition macro to replace a Unicode character;
+ % this gets used by the @U command
+ %
  \begingroup
    \catcode`\"=12
***************
*** 9933,9950 ****
    \catcode`\!=12
    \catcode`\~=13
!   \gdef\DeclareUnicodeCharacter#1#2{%
      \countUTFz = "#1\relax
-     %\wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}%
      \begingroup
        \parseXMLCharref
!       \def\UTFviiiTwoOctets##1##2{%
!         \csname u8:##1\string ##2\endcsname}%
!       \def\UTFviiiThreeOctets##1##2##3{%
!         \csname u8:##1\string ##2\string ##3\endcsname}%
!       \def\UTFviiiFourOctets##1##2##3##4{%
!         \csname u8:##1\string ##2\string ##3\string ##4\endcsname}%
!       \expandafter\expandafter\expandafter\expandafter
!        \expandafter\expandafter\expandafter
!        \gdef\UTFviiiTmp{#2}%
        % 
        \expandafter\ifx\csname uni:#1\endcsname \relax \else
--- 10407,10426 ----
    \catcode`\!=12
    \catcode`\~=13
!   \gdef\DeclareUnicodeCharacterUTFviii#1#2{%
      \countUTFz = "#1\relax
      \begingroup
        \parseXMLCharref
!     
!       % Give \u8:... its definition.  The sequence of seven \expandafter's
!       % expands after the \gdef three times, e.g.
!       %
!       % 1.  \UTFviiTwoOctetsName B1 B2
!       % 2.  \csname u8:B1 \string B2 \endcsname
!       % 3.  \u8: B1 B2  (a single control sequence token)
!       %
!       \expandafter\expandafter
!       \expandafter\expandafter
!       \expandafter\expandafter
!       \expandafter\gdef       \UTFviiiTmp{#2}%
        % 
        \expandafter\ifx\csname uni:#1\endcsname \relax \else
***************
*** 9955,9959 ****
        \expandafter\globallet\csname uni:#1\endcsname \UTFviiiTmp
      \endgroup}
! 
    \gdef\parseXMLCharref{%
      \ifnum\countUTFz < "A0\relax
--- 10431,10437 ----
        \expandafter\globallet\csname uni:#1\endcsname \UTFviiiTmp
      \endgroup}
!   %
!   % Given the value in \countUTFz as a Unicode code point, set \UTFviiiTmp
!   % to the corresponding UTF-8 sequence.
    \gdef\parseXMLCharref{%
      \ifnum\countUTFz < "A0\relax
***************
*** 9962,9988 ****
      \else\ifnum\countUTFz < "800\relax
        \parseUTFviiiA,%
!       \parseUTFviiiB C\UTFviiiTwoOctets.,%
      \else\ifnum\countUTFz < "10000\relax
        \parseUTFviiiA;%
        \parseUTFviiiA,%
!       \parseUTFviiiB E\UTFviiiThreeOctets.{,;}%
      \else
        \parseUTFviiiA;%
        \parseUTFviiiA,%
        \parseUTFviiiA!%
!       \parseUTFviiiB F\UTFviiiFourOctets.{!,;}%
      \fi\fi\fi
    }
  
    \gdef\parseUTFviiiA#1{%
      \countUTFx = \countUTFz
      \divide\countUTFz by 64
!     \countUTFy = \countUTFz
      \multiply\countUTFz by 64
      \advance\countUTFx by -\countUTFz
      \advance\countUTFx by 128
      \uccode `#1\countUTFx
      \countUTFz = \countUTFy}
  
    \gdef\parseUTFviiiB#1#2#3#4{%
      \advance\countUTFz by "#10\relax
--- 10440,10482 ----
      \else\ifnum\countUTFz < "800\relax
        \parseUTFviiiA,%
!       \parseUTFviiiB C\UTFviiiTwoOctetsName.,%
      \else\ifnum\countUTFz < "10000\relax
        \parseUTFviiiA;%
        \parseUTFviiiA,%
!       \parseUTFviiiB E\UTFviiiThreeOctetsName.{,;}%
      \else
        \parseUTFviiiA;%
        \parseUTFviiiA,%
        \parseUTFviiiA!%
!       \parseUTFviiiB F\UTFviiiFourOctetsName.{!,;}%
      \fi\fi\fi
    }
  
+   % Extract a byte from the end of the UTF-8 representation of \countUTFx.
+   % It must be a non-initial byte in the sequence.
+   % Change \uccode of #1 for it to be used in \parseUTFviiiB as one
+   % of the bytes.
    \gdef\parseUTFviiiA#1{%
      \countUTFx = \countUTFz
      \divide\countUTFz by 64
!     \countUTFy = \countUTFz  % Save to be the future value of \countUTFz.
      \multiply\countUTFz by 64
+     
+     % \countUTFz is now \countUTFx with the last 5 bits cleared.  Subtract
+     % in order to get the last five bits.
      \advance\countUTFx by -\countUTFz
+ 
+     % Convert this to the byte in the UTF-8 sequence.
      \advance\countUTFx by 128
      \uccode `#1\countUTFx
      \countUTFz = \countUTFy}
  
+   % Used to put a UTF-8 byte sequence into \UTFviiiTmp
+   % #1 is the increment for \countUTFz to yield a the first byte of the UTF-8
+   %    sequence.
+   % #2 is one of the \UTFviii*OctetsName macros.
+   % #3 is always a full stop (.)
+   % #4 is a template for the other bytes in the sequence.  The values for these
+   %    bytes is substituted in here with \uppercase using the \uccode's.
    \gdef\parseUTFviiiB#1#2#3#4{%
      \advance\countUTFz by "#10\relax
***************
*** 9991,9994 ****
--- 10485,10495 ----
  \endgroup
  
+ % For native Unicode handling (XeTeX and LuaTeX),
+ % provide a definition macro that sets a catcode to `other' non-globally
+ %
+ \def\DeclareUnicodeCharacterNativeOther#1#2{%
+   \catcode"#1=\other
+ }
+ 
  % https://en.wikipedia.org/wiki/Plane_(Unicode)#Basic_M
  % U+0000..U+007F = https://en.wikipedia.org/wiki/Basic_Latin_(Unicode_block)
***************
*** 10005,10734 ****
  % least make most of the characters not bomb out.
  %
! \def\utfeightchardefs{%
!   \DeclareUnicodeCharacter{00A0}{\tie}
!   \DeclareUnicodeCharacter{00A1}{\exclamdown}
    \DeclareUnicodeCharacter{00A2}{{\tcfont \char162}}% 0242=cent
!   \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{00AA}{\ordf}
!   \DeclareUnicodeCharacter{00AB}{\guillemetleft}
!   \DeclareUnicodeCharacter{00AC}{\ensuremath\lnot}
!   \DeclareUnicodeCharacter{00AD}{\-}
!   \DeclareUnicodeCharacter{00AE}{\registeredsymbol}
!   \DeclareUnicodeCharacter{00AF}{\={ }}
!   %
!   \DeclareUnicodeCharacter{00B0}{\ringaccent{ }}
!   \DeclareUnicodeCharacter{00B1}{\ensuremath\pm}
!   \DeclareUnicodeCharacter{00B2}{$^2$}
!   \DeclareUnicodeCharacter{00B3}{$^3$}
!   \DeclareUnicodeCharacter{00B4}{\'{ }}
!   \DeclareUnicodeCharacter{00B5}{$\mu$}
!   \DeclareUnicodeCharacter{00B6}{\P}
!   \DeclareUnicodeCharacter{00B7}{\ensuremath\cdot}
!   \DeclareUnicodeCharacter{00B8}{\cedilla{ }}
!   \DeclareUnicodeCharacter{00B9}{$^1$}
!   \DeclareUnicodeCharacter{00BA}{\ordm}
!   \DeclareUnicodeCharacter{00BB}{\guillemetright}
!   \DeclareUnicodeCharacter{00BC}{$1\over4$}
!   \DeclareUnicodeCharacter{00BD}{$1\over2$}
!   \DeclareUnicodeCharacter{00BE}{$3\over4$}
!   \DeclareUnicodeCharacter{00BF}{\questiondown}
!   %
!   \DeclareUnicodeCharacter{00C0}{\`A}
!   \DeclareUnicodeCharacter{00C1}{\'A}
!   \DeclareUnicodeCharacter{00C2}{\^A}
!   \DeclareUnicodeCharacter{00C3}{\~A}
!   \DeclareUnicodeCharacter{00C4}{\"A}
!   \DeclareUnicodeCharacter{00C5}{\AA}
!   \DeclareUnicodeCharacter{00C6}{\AE}
!   \DeclareUnicodeCharacter{00C7}{\cedilla{C}}
!   \DeclareUnicodeCharacter{00C8}{\`E}
!   \DeclareUnicodeCharacter{00C9}{\'E}
!   \DeclareUnicodeCharacter{00CA}{\^E}
!   \DeclareUnicodeCharacter{00CB}{\"E}
!   \DeclareUnicodeCharacter{00CC}{\`I}
!   \DeclareUnicodeCharacter{00CD}{\'I}
!   \DeclareUnicodeCharacter{00CE}{\^I}
!   \DeclareUnicodeCharacter{00CF}{\"I}
!   %
!   \DeclareUnicodeCharacter{00D0}{\DH}
!   \DeclareUnicodeCharacter{00D1}{\~N}
!   \DeclareUnicodeCharacter{00D2}{\`O}
!   \DeclareUnicodeCharacter{00D3}{\'O}
!   \DeclareUnicodeCharacter{00D4}{\^O}
!   \DeclareUnicodeCharacter{00D5}{\~O}
!   \DeclareUnicodeCharacter{00D6}{\"O}
!   \DeclareUnicodeCharacter{00D7}{\ensuremath\times}
!   \DeclareUnicodeCharacter{00D8}{\O}
!   \DeclareUnicodeCharacter{00D9}{\`U}
!   \DeclareUnicodeCharacter{00DA}{\'U}
!   \DeclareUnicodeCharacter{00DB}{\^U}
!   \DeclareUnicodeCharacter{00DC}{\"U}
!   \DeclareUnicodeCharacter{00DD}{\'Y}
!   \DeclareUnicodeCharacter{00DE}{\TH}
!   \DeclareUnicodeCharacter{00DF}{\ss}
!   %
!   \DeclareUnicodeCharacter{00E0}{\`a}
!   \DeclareUnicodeCharacter{00E1}{\'a}
!   \DeclareUnicodeCharacter{00E2}{\^a}
!   \DeclareUnicodeCharacter{00E3}{\~a}
!   \DeclareUnicodeCharacter{00E4}{\"a}
!   \DeclareUnicodeCharacter{00E5}{\aa}
!   \DeclareUnicodeCharacter{00E6}{\ae}
!   \DeclareUnicodeCharacter{00E7}{\cedilla{c}}
!   \DeclareUnicodeCharacter{00E8}{\`e}
!   \DeclareUnicodeCharacter{00E9}{\'e}
!   \DeclareUnicodeCharacter{00EA}{\^e}
!   \DeclareUnicodeCharacter{00EB}{\"e}
!   \DeclareUnicodeCharacter{00EC}{\`{\dotless{i}}}
!   \DeclareUnicodeCharacter{00ED}{\'{\dotless{i}}}
!   \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}}
!   \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}}
!   %
!   \DeclareUnicodeCharacter{00F0}{\dh}
!   \DeclareUnicodeCharacter{00F1}{\~n}
!   \DeclareUnicodeCharacter{00F2}{\`o}
!   \DeclareUnicodeCharacter{00F3}{\'o}
!   \DeclareUnicodeCharacter{00F4}{\^o}
!   \DeclareUnicodeCharacter{00F5}{\~o}
!   \DeclareUnicodeCharacter{00F6}{\"o}
!   \DeclareUnicodeCharacter{00F7}{\ensuremath\div}
!   \DeclareUnicodeCharacter{00F8}{\o}
!   \DeclareUnicodeCharacter{00F9}{\`u}
!   \DeclareUnicodeCharacter{00FA}{\'u}
!   \DeclareUnicodeCharacter{00FB}{\^u}
!   \DeclareUnicodeCharacter{00FC}{\"u}
!   \DeclareUnicodeCharacter{00FD}{\'y}
!   \DeclareUnicodeCharacter{00FE}{\th}
!   \DeclareUnicodeCharacter{00FF}{\"y}
!   %
!   \DeclareUnicodeCharacter{0100}{\=A}
!   \DeclareUnicodeCharacter{0101}{\=a}
!   \DeclareUnicodeCharacter{0102}{\u{A}}
!   \DeclareUnicodeCharacter{0103}{\u{a}}
!   \DeclareUnicodeCharacter{0104}{\ogonek{A}}
!   \DeclareUnicodeCharacter{0105}{\ogonek{a}}
!   \DeclareUnicodeCharacter{0106}{\'C}
!   \DeclareUnicodeCharacter{0107}{\'c}
!   \DeclareUnicodeCharacter{0108}{\^C}
!   \DeclareUnicodeCharacter{0109}{\^c}
!   \DeclareUnicodeCharacter{010A}{\dotaccent{C}}
!   \DeclareUnicodeCharacter{010B}{\dotaccent{c}}
!   \DeclareUnicodeCharacter{010C}{\v{C}}
!   \DeclareUnicodeCharacter{010D}{\v{c}}
!   \DeclareUnicodeCharacter{010E}{\v{D}}
!   \DeclareUnicodeCharacter{010F}{d'}
!   %
!   \DeclareUnicodeCharacter{0110}{\DH}
!   \DeclareUnicodeCharacter{0111}{\dh}
!   \DeclareUnicodeCharacter{0112}{\=E}
!   \DeclareUnicodeCharacter{0113}{\=e}
!   \DeclareUnicodeCharacter{0114}{\u{E}}
!   \DeclareUnicodeCharacter{0115}{\u{e}}
!   \DeclareUnicodeCharacter{0116}{\dotaccent{E}}
!   \DeclareUnicodeCharacter{0117}{\dotaccent{e}}
!   \DeclareUnicodeCharacter{0118}{\ogonek{E}}
!   \DeclareUnicodeCharacter{0119}{\ogonek{e}}
!   \DeclareUnicodeCharacter{011A}{\v{E}}
!   \DeclareUnicodeCharacter{011B}{\v{e}}
!   \DeclareUnicodeCharacter{011C}{\^G}
!   \DeclareUnicodeCharacter{011D}{\^g}
!   \DeclareUnicodeCharacter{011E}{\u{G}}
!   \DeclareUnicodeCharacter{011F}{\u{g}}
!   %
!   \DeclareUnicodeCharacter{0120}{\dotaccent{G}}
!   \DeclareUnicodeCharacter{0121}{\dotaccent{g}}
!   \DeclareUnicodeCharacter{0122}{\cedilla{G}}
!   \DeclareUnicodeCharacter{0123}{\cedilla{g}}
!   \DeclareUnicodeCharacter{0124}{\^H}
!   \DeclareUnicodeCharacter{0125}{\^h}
!   \DeclareUnicodeCharacter{0126}{\missingcharmsg{H WITH STROKE}}
!   \DeclareUnicodeCharacter{0127}{\missingcharmsg{h WITH STROKE}}
!   \DeclareUnicodeCharacter{0128}{\~I}
!   \DeclareUnicodeCharacter{0129}{\~{\dotless{i}}}
!   \DeclareUnicodeCharacter{012A}{\=I}
!   \DeclareUnicodeCharacter{012B}{\={\dotless{i}}}
!   \DeclareUnicodeCharacter{012C}{\u{I}}
!   \DeclareUnicodeCharacter{012D}{\u{\dotless{i}}}
!   \DeclareUnicodeCharacter{012E}{\ogonek{I}}
!   \DeclareUnicodeCharacter{012F}{\ogonek{i}}
!   %
!   \DeclareUnicodeCharacter{0130}{\dotaccent{I}}
!   \DeclareUnicodeCharacter{0131}{\dotless{i}}
!   \DeclareUnicodeCharacter{0132}{IJ}
!   \DeclareUnicodeCharacter{0133}{ij}
!   \DeclareUnicodeCharacter{0134}{\^J}
!   \DeclareUnicodeCharacter{0135}{\^{\dotless{j}}}
!   \DeclareUnicodeCharacter{0136}{\cedilla{K}}
!   \DeclareUnicodeCharacter{0137}{\cedilla{k}}
!   \DeclareUnicodeCharacter{0138}{\ensuremath\kappa}  
!   \DeclareUnicodeCharacter{0139}{\'L}
!   \DeclareUnicodeCharacter{013A}{\'l}
!   \DeclareUnicodeCharacter{013B}{\cedilla{L}}
!   \DeclareUnicodeCharacter{013C}{\cedilla{l}}
    \DeclareUnicodeCharacter{013D}{L'}% should kern
    \DeclareUnicodeCharacter{013E}{l'}% should kern
!   \DeclareUnicodeCharacter{013F}{L\U{00B7}}
    %
!   \DeclareUnicodeCharacter{0140}{l\U{00B7}}
!   \DeclareUnicodeCharacter{0141}{\L}
!   \DeclareUnicodeCharacter{0142}{\l}
!   \DeclareUnicodeCharacter{0143}{\'N}
!   \DeclareUnicodeCharacter{0144}{\'n}
!   \DeclareUnicodeCharacter{0145}{\cedilla{N}}
!   \DeclareUnicodeCharacter{0146}{\cedilla{n}}
!   \DeclareUnicodeCharacter{0147}{\v{N}}
!   \DeclareUnicodeCharacter{0148}{\v{n}}
!   \DeclareUnicodeCharacter{0149}{'n}
!   \DeclareUnicodeCharacter{014A}{\missingcharmsg{ENG}}
!   \DeclareUnicodeCharacter{014B}{\missingcharmsg{eng}}
!   \DeclareUnicodeCharacter{014C}{\=O}
!   \DeclareUnicodeCharacter{014D}{\=o}
!   \DeclareUnicodeCharacter{014E}{\u{O}}
!   \DeclareUnicodeCharacter{014F}{\u{o}}
!   %
!   \DeclareUnicodeCharacter{0150}{\H{O}}
!   \DeclareUnicodeCharacter{0151}{\H{o}}
!   \DeclareUnicodeCharacter{0152}{\OE}
!   \DeclareUnicodeCharacter{0153}{\oe}
!   \DeclareUnicodeCharacter{0154}{\'R}
!   \DeclareUnicodeCharacter{0155}{\'r}
!   \DeclareUnicodeCharacter{0156}{\cedilla{R}}
!   \DeclareUnicodeCharacter{0157}{\cedilla{r}}
!   \DeclareUnicodeCharacter{0158}{\v{R}}
!   \DeclareUnicodeCharacter{0159}{\v{r}}
!   \DeclareUnicodeCharacter{015A}{\'S}
!   \DeclareUnicodeCharacter{015B}{\'s}
!   \DeclareUnicodeCharacter{015C}{\^S}
!   \DeclareUnicodeCharacter{015D}{\^s}
!   \DeclareUnicodeCharacter{015E}{\cedilla{S}}
!   \DeclareUnicodeCharacter{015F}{\cedilla{s}}
!   %
!   \DeclareUnicodeCharacter{0160}{\v{S}}
!   \DeclareUnicodeCharacter{0161}{\v{s}}
!   \DeclareUnicodeCharacter{0162}{\cedilla{T}}
!   \DeclareUnicodeCharacter{0163}{\cedilla{t}}
!   \DeclareUnicodeCharacter{0164}{\v{T}}
!   \DeclareUnicodeCharacter{0165}{\v{t}}
!   \DeclareUnicodeCharacter{0166}{\missingcharmsg{H WITH STROKE}}
!   \DeclareUnicodeCharacter{0167}{\missingcharmsg{h WITH STROKE}}
!   \DeclareUnicodeCharacter{0168}{\~U}
!   \DeclareUnicodeCharacter{0169}{\~u}
!   \DeclareUnicodeCharacter{016A}{\=U}
!   \DeclareUnicodeCharacter{016B}{\=u}
!   \DeclareUnicodeCharacter{016C}{\u{U}}
!   \DeclareUnicodeCharacter{016D}{\u{u}}
!   \DeclareUnicodeCharacter{016E}{\ringaccent{U}}
!   \DeclareUnicodeCharacter{016F}{\ringaccent{u}}
!   %
!   \DeclareUnicodeCharacter{0170}{\H{U}}
!   \DeclareUnicodeCharacter{0171}{\H{u}}
!   \DeclareUnicodeCharacter{0172}{\ogonek{U}}
!   \DeclareUnicodeCharacter{0173}{\ogonek{u}}
!   \DeclareUnicodeCharacter{0174}{\^W}
!   \DeclareUnicodeCharacter{0175}{\^w}
!   \DeclareUnicodeCharacter{0176}{\^Y}
!   \DeclareUnicodeCharacter{0177}{\^y}
!   \DeclareUnicodeCharacter{0178}{\"Y}
!   \DeclareUnicodeCharacter{0179}{\'Z}
!   \DeclareUnicodeCharacter{017A}{\'z}
!   \DeclareUnicodeCharacter{017B}{\dotaccent{Z}}
!   \DeclareUnicodeCharacter{017C}{\dotaccent{z}}
!   \DeclareUnicodeCharacter{017D}{\v{Z}}
!   \DeclareUnicodeCharacter{017E}{\v{z}}
!   \DeclareUnicodeCharacter{017F}{\missingcharmsg{LONG S}}
!   %
!   \DeclareUnicodeCharacter{01C4}{D\v{Z}}
!   \DeclareUnicodeCharacter{01C5}{D\v{z}}
!   \DeclareUnicodeCharacter{01C6}{d\v{z}}
!   \DeclareUnicodeCharacter{01C7}{LJ}
!   \DeclareUnicodeCharacter{01C8}{Lj}
!   \DeclareUnicodeCharacter{01C9}{lj}
!   \DeclareUnicodeCharacter{01CA}{NJ}
!   \DeclareUnicodeCharacter{01CB}{Nj}
!   \DeclareUnicodeCharacter{01CC}{nj}
!   \DeclareUnicodeCharacter{01CD}{\v{A}}
!   \DeclareUnicodeCharacter{01CE}{\v{a}}
!   \DeclareUnicodeCharacter{01CF}{\v{I}}
!   %
!   \DeclareUnicodeCharacter{01D0}{\v{\dotless{i}}}
!   \DeclareUnicodeCharacter{01D1}{\v{O}}
!   \DeclareUnicodeCharacter{01D2}{\v{o}}
!   \DeclareUnicodeCharacter{01D3}{\v{U}}
!   \DeclareUnicodeCharacter{01D4}{\v{u}}
!   %
!   \DeclareUnicodeCharacter{01E2}{\={\AE}}
!   \DeclareUnicodeCharacter{01E3}{\={\ae}}
!   \DeclareUnicodeCharacter{01E6}{\v{G}}
!   \DeclareUnicodeCharacter{01E7}{\v{g}}
!   \DeclareUnicodeCharacter{01E8}{\v{K}}
!   \DeclareUnicodeCharacter{01E9}{\v{k}}
!   %
!   \DeclareUnicodeCharacter{01F0}{\v{\dotless{j}}}
!   \DeclareUnicodeCharacter{01F1}{DZ}
!   \DeclareUnicodeCharacter{01F2}{Dz}
!   \DeclareUnicodeCharacter{01F3}{dz}
!   \DeclareUnicodeCharacter{01F4}{\'G}
!   \DeclareUnicodeCharacter{01F5}{\'g}
!   \DeclareUnicodeCharacter{01F8}{\`N}
!   \DeclareUnicodeCharacter{01F9}{\`n}
!   \DeclareUnicodeCharacter{01FC}{\'{\AE}}
!   \DeclareUnicodeCharacter{01FD}{\'{\ae}}
!   \DeclareUnicodeCharacter{01FE}{\'{\O}}
!   \DeclareUnicodeCharacter{01FF}{\'{\o}}
!   %
!   \DeclareUnicodeCharacter{021E}{\v{H}}
!   \DeclareUnicodeCharacter{021F}{\v{h}}
!   %
!   \DeclareUnicodeCharacter{0226}{\dotaccent{A}}
!   \DeclareUnicodeCharacter{0227}{\dotaccent{a}}
!   \DeclareUnicodeCharacter{0228}{\cedilla{E}}
!   \DeclareUnicodeCharacter{0229}{\cedilla{e}}
!   \DeclareUnicodeCharacter{022E}{\dotaccent{O}}
!   \DeclareUnicodeCharacter{022F}{\dotaccent{o}}
!   %
!   \DeclareUnicodeCharacter{0232}{\=Y}
!   \DeclareUnicodeCharacter{0233}{\=y}
!   \DeclareUnicodeCharacter{0237}{\dotless{j}}
    %
!   \DeclareUnicodeCharacter{02DB}{\ogonek{ }}
    %
    % Greek letters upper case
!   \DeclareUnicodeCharacter{0391}{{\it A}}
!   \DeclareUnicodeCharacter{0392}{{\it B}}
!   \DeclareUnicodeCharacter{0393}{\ensuremath{\mit\Gamma}}
!   \DeclareUnicodeCharacter{0394}{\ensuremath{\mit\Delta}}
!   \DeclareUnicodeCharacter{0395}{{\it E}}
!   \DeclareUnicodeCharacter{0396}{{\it Z}}
!   \DeclareUnicodeCharacter{0397}{{\it H}}
!   \DeclareUnicodeCharacter{0398}{\ensuremath{\mit\Theta}}
!   \DeclareUnicodeCharacter{0399}{{\it I}}
!   \DeclareUnicodeCharacter{039A}{{\it K}}
!   \DeclareUnicodeCharacter{039B}{\ensuremath{\mit\Lambda}}
!   \DeclareUnicodeCharacter{039C}{{\it M}}
!   \DeclareUnicodeCharacter{039D}{{\it N}}
!   \DeclareUnicodeCharacter{039E}{\ensuremath{\mit\Xi}}
!   \DeclareUnicodeCharacter{039F}{{\it O}}
!   \DeclareUnicodeCharacter{03A0}{\ensuremath{\mit\Pi}}
!   \DeclareUnicodeCharacter{03A1}{{\it P}}
    %\DeclareUnicodeCharacter{03A2}{} % none - corresponds to final sigma
!   \DeclareUnicodeCharacter{03A3}{\ensuremath{\mit\Sigma}}
!   \DeclareUnicodeCharacter{03A4}{{\it T}}
!   \DeclareUnicodeCharacter{03A5}{\ensuremath{\mit\Upsilon}}
!   \DeclareUnicodeCharacter{03A6}{\ensuremath{\mit\Phi}}
!   \DeclareUnicodeCharacter{03A7}{{\it X}}
!   \DeclareUnicodeCharacter{03A8}{\ensuremath{\mit\Psi}}
!   \DeclareUnicodeCharacter{03A9}{\ensuremath{\mit\Omega}}
    %
    % Vowels with accents
!   \DeclareUnicodeCharacter{0390}{\ensuremath{\ddot{\acute\iota}}}
!   \DeclareUnicodeCharacter{03AC}{\ensuremath{\acute\alpha}}
!   \DeclareUnicodeCharacter{03AD}{\ensuremath{\acute\epsilon}}
!   \DeclareUnicodeCharacter{03AE}{\ensuremath{\acute\eta}}
!   \DeclareUnicodeCharacter{03AF}{\ensuremath{\acute\iota}}
!   \DeclareUnicodeCharacter{03B0}{\ensuremath{\acute{\ddot\upsilon}}}
    %
    % Standalone accent
!   \DeclareUnicodeCharacter{0384}{\ensuremath{\acute{\ }}}
    %
    % Greek letters lower case
!   \DeclareUnicodeCharacter{03B1}{\ensuremath\alpha}
!   \DeclareUnicodeCharacter{03B2}{\ensuremath\beta}
!   \DeclareUnicodeCharacter{03B3}{\ensuremath\gamma}
!   \DeclareUnicodeCharacter{03B4}{\ensuremath\delta}
!   \DeclareUnicodeCharacter{03B5}{\ensuremath\epsilon}
!   \DeclareUnicodeCharacter{03B6}{\ensuremath\zeta}
!   \DeclareUnicodeCharacter{03B7}{\ensuremath\eta}
!   \DeclareUnicodeCharacter{03B8}{\ensuremath\theta}
!   \DeclareUnicodeCharacter{03B9}{\ensuremath\iota}
!   \DeclareUnicodeCharacter{03BA}{\ensuremath\kappa}
!   \DeclareUnicodeCharacter{03BB}{\ensuremath\lambda}
!   \DeclareUnicodeCharacter{03BC}{\ensuremath\mu}
!   \DeclareUnicodeCharacter{03BD}{\ensuremath\nu}
!   \DeclareUnicodeCharacter{03BE}{\ensuremath\xi}
!   \DeclareUnicodeCharacter{03BF}{{\it o}} % omicron
!   \DeclareUnicodeCharacter{03C0}{\ensuremath\pi}
!   \DeclareUnicodeCharacter{03C1}{\ensuremath\rho}
!   \DeclareUnicodeCharacter{03C2}{\ensuremath\varsigma}
!   \DeclareUnicodeCharacter{03C3}{\ensuremath\sigma}
!   \DeclareUnicodeCharacter{03C4}{\ensuremath\tau}
!   \DeclareUnicodeCharacter{03C5}{\ensuremath\upsilon}
!   \DeclareUnicodeCharacter{03C6}{\ensuremath\phi}
!   \DeclareUnicodeCharacter{03C7}{\ensuremath\chi}
!   \DeclareUnicodeCharacter{03C8}{\ensuremath\psi}
!   \DeclareUnicodeCharacter{03C9}{\ensuremath\omega}
    %
    % More Greek vowels with accents
!   \DeclareUnicodeCharacter{03CA}{\ensuremath{\ddot\iota}}
!   \DeclareUnicodeCharacter{03CB}{\ensuremath{\ddot\upsilon}}
!   \DeclareUnicodeCharacter{03CC}{\ensuremath{\acute o}}
!   \DeclareUnicodeCharacter{03CD}{\ensuremath{\acute\upsilon}}
!   \DeclareUnicodeCharacter{03CE}{\ensuremath{\acute\omega}}
    %
    % Variant Greek letters
!   \DeclareUnicodeCharacter{03D1}{\ensuremath\vartheta}
!   \DeclareUnicodeCharacter{03D6}{\ensuremath\varpi}
!   \DeclareUnicodeCharacter{03F1}{\ensuremath\varrho}
!   %
!   \DeclareUnicodeCharacter{1E02}{\dotaccent{B}}
!   \DeclareUnicodeCharacter{1E03}{\dotaccent{b}}
!   \DeclareUnicodeCharacter{1E04}{\udotaccent{B}}
!   \DeclareUnicodeCharacter{1E05}{\udotaccent{b}}
!   \DeclareUnicodeCharacter{1E06}{\ubaraccent{B}}
!   \DeclareUnicodeCharacter{1E07}{\ubaraccent{b}}
!   \DeclareUnicodeCharacter{1E0A}{\dotaccent{D}}
!   \DeclareUnicodeCharacter{1E0B}{\dotaccent{d}}
!   \DeclareUnicodeCharacter{1E0C}{\udotaccent{D}}
!   \DeclareUnicodeCharacter{1E0D}{\udotaccent{d}}
!   \DeclareUnicodeCharacter{1E0E}{\ubaraccent{D}}
!   \DeclareUnicodeCharacter{1E0F}{\ubaraccent{d}}
!   %
!   \DeclareUnicodeCharacter{1E1E}{\dotaccent{F}}
!   \DeclareUnicodeCharacter{1E1F}{\dotaccent{f}}
!   %
!   \DeclareUnicodeCharacter{1E20}{\=G}
!   \DeclareUnicodeCharacter{1E21}{\=g}
!   \DeclareUnicodeCharacter{1E22}{\dotaccent{H}}
!   \DeclareUnicodeCharacter{1E23}{\dotaccent{h}}
!   \DeclareUnicodeCharacter{1E24}{\udotaccent{H}}
!   \DeclareUnicodeCharacter{1E25}{\udotaccent{h}}
!   \DeclareUnicodeCharacter{1E26}{\"H}
!   \DeclareUnicodeCharacter{1E27}{\"h}
!   %
!   \DeclareUnicodeCharacter{1E30}{\'K}
!   \DeclareUnicodeCharacter{1E31}{\'k}
!   \DeclareUnicodeCharacter{1E32}{\udotaccent{K}}
!   \DeclareUnicodeCharacter{1E33}{\udotaccent{k}}
!   \DeclareUnicodeCharacter{1E34}{\ubaraccent{K}}
!   \DeclareUnicodeCharacter{1E35}{\ubaraccent{k}}
!   \DeclareUnicodeCharacter{1E36}{\udotaccent{L}}
!   \DeclareUnicodeCharacter{1E37}{\udotaccent{l}}
!   \DeclareUnicodeCharacter{1E3A}{\ubaraccent{L}}
!   \DeclareUnicodeCharacter{1E3B}{\ubaraccent{l}}
!   \DeclareUnicodeCharacter{1E3E}{\'M}
!   \DeclareUnicodeCharacter{1E3F}{\'m}
!   %
!   \DeclareUnicodeCharacter{1E40}{\dotaccent{M}}
!   \DeclareUnicodeCharacter{1E41}{\dotaccent{m}}
!   \DeclareUnicodeCharacter{1E42}{\udotaccent{M}}
!   \DeclareUnicodeCharacter{1E43}{\udotaccent{m}}
!   \DeclareUnicodeCharacter{1E44}{\dotaccent{N}}
!   \DeclareUnicodeCharacter{1E45}{\dotaccent{n}}
!   \DeclareUnicodeCharacter{1E46}{\udotaccent{N}}
!   \DeclareUnicodeCharacter{1E47}{\udotaccent{n}}
!   \DeclareUnicodeCharacter{1E48}{\ubaraccent{N}}
!   \DeclareUnicodeCharacter{1E49}{\ubaraccent{n}}
!   %
!   \DeclareUnicodeCharacter{1E54}{\'P}
!   \DeclareUnicodeCharacter{1E55}{\'p}
!   \DeclareUnicodeCharacter{1E56}{\dotaccent{P}}
!   \DeclareUnicodeCharacter{1E57}{\dotaccent{p}}
!   \DeclareUnicodeCharacter{1E58}{\dotaccent{R}}
!   \DeclareUnicodeCharacter{1E59}{\dotaccent{r}}
!   \DeclareUnicodeCharacter{1E5A}{\udotaccent{R}}
!   \DeclareUnicodeCharacter{1E5B}{\udotaccent{r}}
!   \DeclareUnicodeCharacter{1E5E}{\ubaraccent{R}}
!   \DeclareUnicodeCharacter{1E5F}{\ubaraccent{r}}
!   %
!   \DeclareUnicodeCharacter{1E60}{\dotaccent{S}}
!   \DeclareUnicodeCharacter{1E61}{\dotaccent{s}}
!   \DeclareUnicodeCharacter{1E62}{\udotaccent{S}}
!   \DeclareUnicodeCharacter{1E63}{\udotaccent{s}}
!   \DeclareUnicodeCharacter{1E6A}{\dotaccent{T}}
!   \DeclareUnicodeCharacter{1E6B}{\dotaccent{t}}
!   \DeclareUnicodeCharacter{1E6C}{\udotaccent{T}}
!   \DeclareUnicodeCharacter{1E6D}{\udotaccent{t}}
!   \DeclareUnicodeCharacter{1E6E}{\ubaraccent{T}}
!   \DeclareUnicodeCharacter{1E6F}{\ubaraccent{t}}
!   %
!   \DeclareUnicodeCharacter{1E7C}{\~V}
!   \DeclareUnicodeCharacter{1E7D}{\~v}
!   \DeclareUnicodeCharacter{1E7E}{\udotaccent{V}}
!   \DeclareUnicodeCharacter{1E7F}{\udotaccent{v}}
!   %
!   \DeclareUnicodeCharacter{1E80}{\`W}
!   \DeclareUnicodeCharacter{1E81}{\`w}
!   \DeclareUnicodeCharacter{1E82}{\'W}
!   \DeclareUnicodeCharacter{1E83}{\'w}
!   \DeclareUnicodeCharacter{1E84}{\"W}
!   \DeclareUnicodeCharacter{1E85}{\"w}
!   \DeclareUnicodeCharacter{1E86}{\dotaccent{W}}
!   \DeclareUnicodeCharacter{1E87}{\dotaccent{w}}
!   \DeclareUnicodeCharacter{1E88}{\udotaccent{W}}
!   \DeclareUnicodeCharacter{1E89}{\udotaccent{w}}
!   \DeclareUnicodeCharacter{1E8A}{\dotaccent{X}}
!   \DeclareUnicodeCharacter{1E8B}{\dotaccent{x}}
!   \DeclareUnicodeCharacter{1E8C}{\"X}
!   \DeclareUnicodeCharacter{1E8D}{\"x}
!   \DeclareUnicodeCharacter{1E8E}{\dotaccent{Y}}
!   \DeclareUnicodeCharacter{1E8F}{\dotaccent{y}}
!   %
!   \DeclareUnicodeCharacter{1E90}{\^Z}
!   \DeclareUnicodeCharacter{1E91}{\^z}
!   \DeclareUnicodeCharacter{1E92}{\udotaccent{Z}}
!   \DeclareUnicodeCharacter{1E93}{\udotaccent{z}}
!   \DeclareUnicodeCharacter{1E94}{\ubaraccent{Z}}
!   \DeclareUnicodeCharacter{1E95}{\ubaraccent{z}}
!   \DeclareUnicodeCharacter{1E96}{\ubaraccent{h}}
!   \DeclareUnicodeCharacter{1E97}{\"t}
!   \DeclareUnicodeCharacter{1E98}{\ringaccent{w}}
!   \DeclareUnicodeCharacter{1E99}{\ringaccent{y}}
!   %
!   \DeclareUnicodeCharacter{1EA0}{\udotaccent{A}}
!   \DeclareUnicodeCharacter{1EA1}{\udotaccent{a}}
!   %
!   \DeclareUnicodeCharacter{1EB8}{\udotaccent{E}}
!   \DeclareUnicodeCharacter{1EB9}{\udotaccent{e}}
!   \DeclareUnicodeCharacter{1EBC}{\~E}
!   \DeclareUnicodeCharacter{1EBD}{\~e}
!   %
!   \DeclareUnicodeCharacter{1ECA}{\udotaccent{I}}
!   \DeclareUnicodeCharacter{1ECB}{\udotaccent{i}}
!   \DeclareUnicodeCharacter{1ECC}{\udotaccent{O}}
!   \DeclareUnicodeCharacter{1ECD}{\udotaccent{o}}
!   %
!   \DeclareUnicodeCharacter{1EE4}{\udotaccent{U}}
!   \DeclareUnicodeCharacter{1EE5}{\udotaccent{u}}
!   %
!   \DeclareUnicodeCharacter{1EF2}{\`Y}
!   \DeclareUnicodeCharacter{1EF3}{\`y}
!   \DeclareUnicodeCharacter{1EF4}{\udotaccent{Y}}
    %
!   \DeclareUnicodeCharacter{1EF8}{\~Y}
!   \DeclareUnicodeCharacter{1EF9}{\~y}
    %
    % Punctuation
!   \DeclareUnicodeCharacter{2013}{--}
!   \DeclareUnicodeCharacter{2014}{---}
!   \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{202F}{\thinspace}
!   \DeclareUnicodeCharacter{2026}{\dots}
!   \DeclareUnicodeCharacter{2039}{\guilsinglleft}
!   \DeclareUnicodeCharacter{203A}{\guilsinglright}
    %
!   \DeclareUnicodeCharacter{20AC}{\euro}
    %
!   \DeclareUnicodeCharacter{2192}{\expansion}
!   \DeclareUnicodeCharacter{21D2}{\result}
    %
    % Mathematical symbols
!   \DeclareUnicodeCharacter{2200}{\ensuremath\forall}
!   \DeclareUnicodeCharacter{2203}{\ensuremath\exists}
!   \DeclareUnicodeCharacter{2208}{\ensuremath\in}
!   \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{2264}{\ensuremath\leq}
!   \DeclareUnicodeCharacter{2265}{\ensuremath\geq}
!   \DeclareUnicodeCharacter{2282}{\ensuremath\subset}
!   \DeclareUnicodeCharacter{2287}{\ensuremath\supseteq}
!   %
!   \DeclareUnicodeCharacter{2016}{\ensuremath\Vert}
!   \DeclareUnicodeCharacter{2032}{\ensuremath\prime}
!   \DeclareUnicodeCharacter{210F}{\ensuremath\hbar}
!   \DeclareUnicodeCharacter{2111}{\ensuremath\Im}
!   \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}
!   \DeclareUnicodeCharacter{2193}{\ensuremath\downarrow}
!   \DeclareUnicodeCharacter{2194}{\ensuremath\leftrightarrow}
!   \DeclareUnicodeCharacter{2195}{\ensuremath\updownarrow}
!   \DeclareUnicodeCharacter{2196}{\ensuremath\nwarrow}
!   \DeclareUnicodeCharacter{2197}{\ensuremath\nearrow}
!   \DeclareUnicodeCharacter{2198}{\ensuremath\searrow}
!   \DeclareUnicodeCharacter{2199}{\ensuremath\swarrow}
!   \DeclareUnicodeCharacter{21A6}{\ensuremath\mapsto}
!   \DeclareUnicodeCharacter{21A9}{\ensuremath\hookleftarrow}
!   \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}
!   \DeclareUnicodeCharacter{21D0}{\ensuremath\Leftarrow}
!   \DeclareUnicodeCharacter{21D1}{\ensuremath\Uparrow}
!   \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}
!   \DeclareUnicodeCharacter{2209}{\ensuremath\notin}
!   \DeclareUnicodeCharacter{220B}{\ensuremath\owns}
!   \DeclareUnicodeCharacter{220F}{\ensuremath\prod}
!   \DeclareUnicodeCharacter{2210}{\ensuremath\coprod}
!   \DeclareUnicodeCharacter{2211}{\ensuremath\sum}
!   \DeclareUnicodeCharacter{2213}{\ensuremath\mp}
!   \DeclareUnicodeCharacter{2218}{\ensuremath\circ}
!   \DeclareUnicodeCharacter{221A}{\ensuremath\surd}
!   \DeclareUnicodeCharacter{221D}{\ensuremath\propto}
!   \DeclareUnicodeCharacter{2220}{\ensuremath\angle}
!   \DeclareUnicodeCharacter{2223}{\ensuremath\mid}
!   \DeclareUnicodeCharacter{2228}{\ensuremath\vee}
!   \DeclareUnicodeCharacter{222A}{\ensuremath\cup}
!   \DeclareUnicodeCharacter{222B}{\ensuremath\smallint}
!   \DeclareUnicodeCharacter{222E}{\ensuremath\oint}
!   \DeclareUnicodeCharacter{223C}{\ensuremath\sim}
!   \DeclareUnicodeCharacter{2240}{\ensuremath\wr}
!   \DeclareUnicodeCharacter{2243}{\ensuremath\simeq}
!   \DeclareUnicodeCharacter{2245}{\ensuremath\cong}
!   \DeclareUnicodeCharacter{2248}{\ensuremath\approx}
!   \DeclareUnicodeCharacter{224D}{\ensuremath\asymp}
!   \DeclareUnicodeCharacter{2250}{\ensuremath\doteq}
!   \DeclareUnicodeCharacter{2260}{\ensuremath\neq}
!   \DeclareUnicodeCharacter{226A}{\ensuremath\ll}
!   \DeclareUnicodeCharacter{226B}{\ensuremath\gg}
!   \DeclareUnicodeCharacter{227A}{\ensuremath\prec}
!   \DeclareUnicodeCharacter{227B}{\ensuremath\succ}
!   \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}
!   \DeclareUnicodeCharacter{2294}{\ensuremath\sqcup}
!   \DeclareUnicodeCharacter{2295}{\ensuremath\oplus}
!   \DeclareUnicodeCharacter{2296}{\ensuremath\ominus}
!   \DeclareUnicodeCharacter{2297}{\ensuremath\otimes}
!   \DeclareUnicodeCharacter{2298}{\ensuremath\oslash}
!   \DeclareUnicodeCharacter{2299}{\ensuremath\odot}
!   \DeclareUnicodeCharacter{22A2}{\ensuremath\vdash}
!   \DeclareUnicodeCharacter{22A3}{\ensuremath\dashv}
!   \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}
!   \DeclareUnicodeCharacter{22C3}{\ensuremath\bigcup}
!   \DeclareUnicodeCharacter{22C4}{\ensuremath\diamond}
!   \DeclareUnicodeCharacter{22C5}{\ensuremath\cdot}
!   \DeclareUnicodeCharacter{22C6}{\ensuremath\star}
!   \DeclareUnicodeCharacter{22C8}{\ensuremath\bowtie}
!   \DeclareUnicodeCharacter{2308}{\ensuremath\lceil}
!   \DeclareUnicodeCharacter{2309}{\ensuremath\rceil}
!   \DeclareUnicodeCharacter{230A}{\ensuremath\lfloor}
!   \DeclareUnicodeCharacter{230B}{\ensuremath\rfloor}
!   \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{2660}{\ensuremath\spadesuit}
!   \DeclareUnicodeCharacter{2661}{\ensuremath\heartsuit}
!   \DeclareUnicodeCharacter{2662}{\ensuremath\diamondsuit}
!   \DeclareUnicodeCharacter{2663}{\ensuremath\clubsuit}
!   \DeclareUnicodeCharacter{266D}{\ensuremath\flat}
!   \DeclareUnicodeCharacter{266E}{\ensuremath\natural}
!   \DeclareUnicodeCharacter{266F}{\ensuremath\sharp}
!   \DeclareUnicodeCharacter{26AA}{\ensuremath\bigcirc}
!   \DeclareUnicodeCharacter{27B9}{\ensuremath\rangle}
!   \DeclareUnicodeCharacter{27C2}{\ensuremath\perp}
!   \DeclareUnicodeCharacter{27E8}{\ensuremath\langle}
!   \DeclareUnicodeCharacter{27F5}{\ensuremath\longleftarrow}
!   \DeclareUnicodeCharacter{27F6}{\ensuremath\longrightarrow}
!   \DeclareUnicodeCharacter{27F7}{\ensuremath\longleftrightarrow}
!   \DeclareUnicodeCharacter{27FC}{\ensuremath\longmapsto}
!   \DeclareUnicodeCharacter{29F5}{\ensuremath\setminus}
!   \DeclareUnicodeCharacter{2A00}{\ensuremath\bigodot}
!   \DeclareUnicodeCharacter{2A01}{\ensuremath\bigoplus}
!   \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}
!   %
!   \global\mathchardef\checkmark="1370 % actually the square root sign
!   \DeclareUnicodeCharacter{2713}{\ensuremath\checkmark}
! }% end of \utfeightchardefs
  
! % US-ASCII character definitions.
! \def\asciichardefs{% nothing need be done
!    \relax
  }
  
! % Latin1 (ISO-8859-1) character definitions.
! \def\nonasciistringdefs{%
!   \setnonasciicharscatcode\active
!   \def\defstringchar##1{\def##1{\string##1}}%
!   %
!   \defstringchar^^80\defstringchar^^81\defstringchar^^82\defstringchar^^83%
!   \defstringchar^^84\defstringchar^^85\defstringchar^^86\defstringchar^^87%
!   \defstringchar^^88\defstringchar^^89\defstringchar^^8a\defstringchar^^8b%
!   \defstringchar^^8c\defstringchar^^8d\defstringchar^^8e\defstringchar^^8f%
!   %
!   \defstringchar^^90\defstringchar^^91\defstringchar^^92\defstringchar^^93%
!   \defstringchar^^94\defstringchar^^95\defstringchar^^96\defstringchar^^97%
!   \defstringchar^^98\defstringchar^^99\defstringchar^^9a\defstringchar^^9b%
!   \defstringchar^^9c\defstringchar^^9d\defstringchar^^9e\defstringchar^^9f%
!   %
!   \defstringchar^^a0\defstringchar^^a1\defstringchar^^a2\defstringchar^^a3%
!   \defstringchar^^a4\defstringchar^^a5\defstringchar^^a6\defstringchar^^a7%
!   \defstringchar^^a8\defstringchar^^a9\defstringchar^^aa\defstringchar^^ab%
!   \defstringchar^^ac\defstringchar^^ad\defstringchar^^ae\defstringchar^^af%
!   %
!   \defstringchar^^b0\defstringchar^^b1\defstringchar^^b2\defstringchar^^b3%
!   \defstringchar^^b4\defstringchar^^b5\defstringchar^^b6\defstringchar^^b7%
!   \defstringchar^^b8\defstringchar^^b9\defstringchar^^ba\defstringchar^^bb%
!   \defstringchar^^bc\defstringchar^^bd\defstringchar^^be\defstringchar^^bf%
!   %
!   \defstringchar^^c0\defstringchar^^c1\defstringchar^^c2\defstringchar^^c3%
!   \defstringchar^^c4\defstringchar^^c5\defstringchar^^c6\defstringchar^^c7%
!   \defstringchar^^c8\defstringchar^^c9\defstringchar^^ca\defstringchar^^cb%
!   \defstringchar^^cc\defstringchar^^cd\defstringchar^^ce\defstringchar^^cf%
!   %
!   \defstringchar^^d0\defstringchar^^d1\defstringchar^^d2\defstringchar^^d3%
!   \defstringchar^^d4\defstringchar^^d5\defstringchar^^d6\defstringchar^^d7%
!   \defstringchar^^d8\defstringchar^^d9\defstringchar^^da\defstringchar^^db%
!   \defstringchar^^dc\defstringchar^^dd\defstringchar^^de\defstringchar^^df%
!   %
!   \defstringchar^^e0\defstringchar^^e1\defstringchar^^e2\defstringchar^^e3%
!   \defstringchar^^e4\defstringchar^^e5\defstringchar^^e6\defstringchar^^e7%
!   \defstringchar^^e8\defstringchar^^e9\defstringchar^^ea\defstringchar^^eb%
!   \defstringchar^^ec\defstringchar^^ed\defstringchar^^ee\defstringchar^^ef%
!   %
!   \defstringchar^^f0\defstringchar^^f1\defstringchar^^f2\defstringchar^^f3%
!   \defstringchar^^f4\defstringchar^^f5\defstringchar^^f6\defstringchar^^f7%
!   \defstringchar^^f8\defstringchar^^f9\defstringchar^^fa\defstringchar^^fb%
!   \defstringchar^^fc\defstringchar^^fd\defstringchar^^fe\defstringchar^^ff%
  }
  
  
! % define all the unicode characters we know about, for the sake of @U.
! \utfeightchardefs
  
  
--- 10506,11251 ----
  % least make most of the characters not bomb out.
  %
! \def\unicodechardefs{%
!   \DeclareUnicodeCharacter{00A0}{\tie}%
!   \DeclareUnicodeCharacter{00A1}{\exclamdown}%
    \DeclareUnicodeCharacter{00A2}{{\tcfont \char162}}% 0242=cent
!   \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{00AA}{\ordf}%
!   \DeclareUnicodeCharacter{00AB}{\guillemetleft}%
!   \DeclareUnicodeCharacter{00AC}{\ensuremath\lnot}%
!   \DeclareUnicodeCharacter{00AD}{\-}%
!   \DeclareUnicodeCharacter{00AE}{\registeredsymbol}%
!   \DeclareUnicodeCharacter{00AF}{\={ }}%
!   %
!   \DeclareUnicodeCharacter{00B0}{\ringaccent{ }}%
!   \DeclareUnicodeCharacter{00B1}{\ensuremath\pm}%
!   \DeclareUnicodeCharacter{00B2}{$^2$}%
!   \DeclareUnicodeCharacter{00B3}{$^3$}%
!   \DeclareUnicodeCharacter{00B4}{\'{ }}%
!   \DeclareUnicodeCharacter{00B5}{$\mu$}%
!   \DeclareUnicodeCharacter{00B6}{\P}%
!   \DeclareUnicodeCharacter{00B7}{\ensuremath\cdot}%
!   \DeclareUnicodeCharacter{00B8}{\cedilla{ }}%
!   \DeclareUnicodeCharacter{00B9}{$^1$}%
!   \DeclareUnicodeCharacter{00BA}{\ordm}%
!   \DeclareUnicodeCharacter{00BB}{\guillemetright}%
!   \DeclareUnicodeCharacter{00BC}{$1\over4$}%
!   \DeclareUnicodeCharacter{00BD}{$1\over2$}%
!   \DeclareUnicodeCharacter{00BE}{$3\over4$}%
!   \DeclareUnicodeCharacter{00BF}{\questiondown}%
!   %
!   \DeclareUnicodeCharacter{00C0}{\`A}%
!   \DeclareUnicodeCharacter{00C1}{\'A}%
!   \DeclareUnicodeCharacter{00C2}{\^A}%
!   \DeclareUnicodeCharacter{00C3}{\~A}%
!   \DeclareUnicodeCharacter{00C4}{\"A}%
!   \DeclareUnicodeCharacter{00C5}{\AA}%
!   \DeclareUnicodeCharacter{00C6}{\AE}%
!   \DeclareUnicodeCharacter{00C7}{\cedilla{C}}%
!   \DeclareUnicodeCharacter{00C8}{\`E}%
!   \DeclareUnicodeCharacter{00C9}{\'E}%
!   \DeclareUnicodeCharacter{00CA}{\^E}%
!   \DeclareUnicodeCharacter{00CB}{\"E}%
!   \DeclareUnicodeCharacter{00CC}{\`I}%
!   \DeclareUnicodeCharacter{00CD}{\'I}%
!   \DeclareUnicodeCharacter{00CE}{\^I}%
!   \DeclareUnicodeCharacter{00CF}{\"I}%
!   %
!   \DeclareUnicodeCharacter{00D0}{\DH}%
!   \DeclareUnicodeCharacter{00D1}{\~N}%
!   \DeclareUnicodeCharacter{00D2}{\`O}%
!   \DeclareUnicodeCharacter{00D3}{\'O}%
!   \DeclareUnicodeCharacter{00D4}{\^O}%
!   \DeclareUnicodeCharacter{00D5}{\~O}%
!   \DeclareUnicodeCharacter{00D6}{\"O}%
!   \DeclareUnicodeCharacter{00D7}{\ensuremath\times}%
!   \DeclareUnicodeCharacter{00D8}{\O}%
!   \DeclareUnicodeCharacter{00D9}{\`U}%
!   \DeclareUnicodeCharacter{00DA}{\'U}%
!   \DeclareUnicodeCharacter{00DB}{\^U}%
!   \DeclareUnicodeCharacter{00DC}{\"U}%
!   \DeclareUnicodeCharacter{00DD}{\'Y}%
!   \DeclareUnicodeCharacter{00DE}{\TH}%
!   \DeclareUnicodeCharacter{00DF}{\ss}%
!   %
!   \DeclareUnicodeCharacter{00E0}{\`a}%
!   \DeclareUnicodeCharacter{00E1}{\'a}%
!   \DeclareUnicodeCharacter{00E2}{\^a}%
!   \DeclareUnicodeCharacter{00E3}{\~a}%
!   \DeclareUnicodeCharacter{00E4}{\"a}%
!   \DeclareUnicodeCharacter{00E5}{\aa}%
!   \DeclareUnicodeCharacter{00E6}{\ae}%
!   \DeclareUnicodeCharacter{00E7}{\cedilla{c}}%
!   \DeclareUnicodeCharacter{00E8}{\`e}%
!   \DeclareUnicodeCharacter{00E9}{\'e}%
!   \DeclareUnicodeCharacter{00EA}{\^e}%
!   \DeclareUnicodeCharacter{00EB}{\"e}%
!   \DeclareUnicodeCharacter{00EC}{\`{\dotless{i}}}%
!   \DeclareUnicodeCharacter{00ED}{\'{\dotless{i}}}%
!   \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}}%
!   \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}}%
!   %
!   \DeclareUnicodeCharacter{00F0}{\dh}%
!   \DeclareUnicodeCharacter{00F1}{\~n}%
!   \DeclareUnicodeCharacter{00F2}{\`o}%
!   \DeclareUnicodeCharacter{00F3}{\'o}%
!   \DeclareUnicodeCharacter{00F4}{\^o}%
!   \DeclareUnicodeCharacter{00F5}{\~o}%
!   \DeclareUnicodeCharacter{00F6}{\"o}%
!   \DeclareUnicodeCharacter{00F7}{\ensuremath\div}%
!   \DeclareUnicodeCharacter{00F8}{\o}%
!   \DeclareUnicodeCharacter{00F9}{\`u}%
!   \DeclareUnicodeCharacter{00FA}{\'u}%
!   \DeclareUnicodeCharacter{00FB}{\^u}%
!   \DeclareUnicodeCharacter{00FC}{\"u}%
!   \DeclareUnicodeCharacter{00FD}{\'y}%
!   \DeclareUnicodeCharacter{00FE}{\th}%
!   \DeclareUnicodeCharacter{00FF}{\"y}%
!   %
!   \DeclareUnicodeCharacter{0100}{\=A}%
!   \DeclareUnicodeCharacter{0101}{\=a}%
!   \DeclareUnicodeCharacter{0102}{\u{A}}%
!   \DeclareUnicodeCharacter{0103}{\u{a}}%
!   \DeclareUnicodeCharacter{0104}{\ogonek{A}}%
!   \DeclareUnicodeCharacter{0105}{\ogonek{a}}%
!   \DeclareUnicodeCharacter{0106}{\'C}%
!   \DeclareUnicodeCharacter{0107}{\'c}%
!   \DeclareUnicodeCharacter{0108}{\^C}%
!   \DeclareUnicodeCharacter{0109}{\^c}%
!   \DeclareUnicodeCharacter{010A}{\dotaccent{C}}%
!   \DeclareUnicodeCharacter{010B}{\dotaccent{c}}%
!   \DeclareUnicodeCharacter{010C}{\v{C}}%
!   \DeclareUnicodeCharacter{010D}{\v{c}}%
!   \DeclareUnicodeCharacter{010E}{\v{D}}%
!   \DeclareUnicodeCharacter{010F}{d'}%
!   %
!   \DeclareUnicodeCharacter{0110}{\DH}%
!   \DeclareUnicodeCharacter{0111}{\dh}%
!   \DeclareUnicodeCharacter{0112}{\=E}%
!   \DeclareUnicodeCharacter{0113}{\=e}%
!   \DeclareUnicodeCharacter{0114}{\u{E}}%
!   \DeclareUnicodeCharacter{0115}{\u{e}}%
!   \DeclareUnicodeCharacter{0116}{\dotaccent{E}}%
!   \DeclareUnicodeCharacter{0117}{\dotaccent{e}}%
!   \DeclareUnicodeCharacter{0118}{\ogonek{E}}%
!   \DeclareUnicodeCharacter{0119}{\ogonek{e}}%
!   \DeclareUnicodeCharacter{011A}{\v{E}}%
!   \DeclareUnicodeCharacter{011B}{\v{e}}%
!   \DeclareUnicodeCharacter{011C}{\^G}%
!   \DeclareUnicodeCharacter{011D}{\^g}%
!   \DeclareUnicodeCharacter{011E}{\u{G}}%
!   \DeclareUnicodeCharacter{011F}{\u{g}}%
!   %
!   \DeclareUnicodeCharacter{0120}{\dotaccent{G}}%
!   \DeclareUnicodeCharacter{0121}{\dotaccent{g}}%
!   \DeclareUnicodeCharacter{0122}{\cedilla{G}}%
!   \DeclareUnicodeCharacter{0123}{\cedilla{g}}%
!   \DeclareUnicodeCharacter{0124}{\^H}%
!   \DeclareUnicodeCharacter{0125}{\^h}%
!   \DeclareUnicodeCharacter{0126}{\missingcharmsg{H WITH STROKE}}%
!   \DeclareUnicodeCharacter{0127}{\missingcharmsg{h WITH STROKE}}%
!   \DeclareUnicodeCharacter{0128}{\~I}%
!   \DeclareUnicodeCharacter{0129}{\~{\dotless{i}}}%
!   \DeclareUnicodeCharacter{012A}{\=I}%
!   \DeclareUnicodeCharacter{012B}{\={\dotless{i}}}%
!   \DeclareUnicodeCharacter{012C}{\u{I}}%
!   \DeclareUnicodeCharacter{012D}{\u{\dotless{i}}}%
!   \DeclareUnicodeCharacter{012E}{\ogonek{I}}%
!   \DeclareUnicodeCharacter{012F}{\ogonek{i}}%
!   %
!   \DeclareUnicodeCharacter{0130}{\dotaccent{I}}%
!   \DeclareUnicodeCharacter{0131}{\dotless{i}}%
!   \DeclareUnicodeCharacter{0132}{IJ}%
!   \DeclareUnicodeCharacter{0133}{ij}%
!   \DeclareUnicodeCharacter{0134}{\^J}%
!   \DeclareUnicodeCharacter{0135}{\^{\dotless{j}}}%
!   \DeclareUnicodeCharacter{0136}{\cedilla{K}}%
!   \DeclareUnicodeCharacter{0137}{\cedilla{k}}%
!   \DeclareUnicodeCharacter{0138}{\ensuremath\kappa}%
!   \DeclareUnicodeCharacter{0139}{\'L}%
!   \DeclareUnicodeCharacter{013A}{\'l}%
!   \DeclareUnicodeCharacter{013B}{\cedilla{L}}%
!   \DeclareUnicodeCharacter{013C}{\cedilla{l}}%
    \DeclareUnicodeCharacter{013D}{L'}% should kern
    \DeclareUnicodeCharacter{013E}{l'}% should kern
!   \DeclareUnicodeCharacter{013F}{L\U{00B7}}%
    %
!   \DeclareUnicodeCharacter{0140}{l\U{00B7}}%
!   \DeclareUnicodeCharacter{0141}{\L}%
!   \DeclareUnicodeCharacter{0142}{\l}%
!   \DeclareUnicodeCharacter{0143}{\'N}%
!   \DeclareUnicodeCharacter{0144}{\'n}%
!   \DeclareUnicodeCharacter{0145}{\cedilla{N}}%
!   \DeclareUnicodeCharacter{0146}{\cedilla{n}}%
!   \DeclareUnicodeCharacter{0147}{\v{N}}%
!   \DeclareUnicodeCharacter{0148}{\v{n}}%
!   \DeclareUnicodeCharacter{0149}{'n}%
!   \DeclareUnicodeCharacter{014A}{\missingcharmsg{ENG}}%
!   \DeclareUnicodeCharacter{014B}{\missingcharmsg{eng}}%
!   \DeclareUnicodeCharacter{014C}{\=O}%
!   \DeclareUnicodeCharacter{014D}{\=o}%
!   \DeclareUnicodeCharacter{014E}{\u{O}}%
!   \DeclareUnicodeCharacter{014F}{\u{o}}%
!   %
!   \DeclareUnicodeCharacter{0150}{\H{O}}%
!   \DeclareUnicodeCharacter{0151}{\H{o}}%
!   \DeclareUnicodeCharacter{0152}{\OE}%
!   \DeclareUnicodeCharacter{0153}{\oe}%
!   \DeclareUnicodeCharacter{0154}{\'R}%
!   \DeclareUnicodeCharacter{0155}{\'r}%
!   \DeclareUnicodeCharacter{0156}{\cedilla{R}}%
!   \DeclareUnicodeCharacter{0157}{\cedilla{r}}%
!   \DeclareUnicodeCharacter{0158}{\v{R}}%
!   \DeclareUnicodeCharacter{0159}{\v{r}}%
!   \DeclareUnicodeCharacter{015A}{\'S}%
!   \DeclareUnicodeCharacter{015B}{\'s}%
!   \DeclareUnicodeCharacter{015C}{\^S}%
!   \DeclareUnicodeCharacter{015D}{\^s}%
!   \DeclareUnicodeCharacter{015E}{\cedilla{S}}%
!   \DeclareUnicodeCharacter{015F}{\cedilla{s}}%
!   %
!   \DeclareUnicodeCharacter{0160}{\v{S}}%
!   \DeclareUnicodeCharacter{0161}{\v{s}}%
!   \DeclareUnicodeCharacter{0162}{\cedilla{T}}%
!   \DeclareUnicodeCharacter{0163}{\cedilla{t}}%
!   \DeclareUnicodeCharacter{0164}{\v{T}}%
!   \DeclareUnicodeCharacter{0165}{\v{t}}%
!   \DeclareUnicodeCharacter{0166}{\missingcharmsg{H WITH STROKE}}%
!   \DeclareUnicodeCharacter{0167}{\missingcharmsg{h WITH STROKE}}%
!   \DeclareUnicodeCharacter{0168}{\~U}%
!   \DeclareUnicodeCharacter{0169}{\~u}%
!   \DeclareUnicodeCharacter{016A}{\=U}%
!   \DeclareUnicodeCharacter{016B}{\=u}%
!   \DeclareUnicodeCharacter{016C}{\u{U}}%
!   \DeclareUnicodeCharacter{016D}{\u{u}}%
!   \DeclareUnicodeCharacter{016E}{\ringaccent{U}}%
!   \DeclareUnicodeCharacter{016F}{\ringaccent{u}}%
!   %
!   \DeclareUnicodeCharacter{0170}{\H{U}}%
!   \DeclareUnicodeCharacter{0171}{\H{u}}%
!   \DeclareUnicodeCharacter{0172}{\ogonek{U}}%
!   \DeclareUnicodeCharacter{0173}{\ogonek{u}}%
!   \DeclareUnicodeCharacter{0174}{\^W}%
!   \DeclareUnicodeCharacter{0175}{\^w}%
!   \DeclareUnicodeCharacter{0176}{\^Y}%
!   \DeclareUnicodeCharacter{0177}{\^y}%
!   \DeclareUnicodeCharacter{0178}{\"Y}%
!   \DeclareUnicodeCharacter{0179}{\'Z}%
!   \DeclareUnicodeCharacter{017A}{\'z}%
!   \DeclareUnicodeCharacter{017B}{\dotaccent{Z}}%
!   \DeclareUnicodeCharacter{017C}{\dotaccent{z}}%
!   \DeclareUnicodeCharacter{017D}{\v{Z}}%
!   \DeclareUnicodeCharacter{017E}{\v{z}}%
!   \DeclareUnicodeCharacter{017F}{\missingcharmsg{LONG S}}%
!   %
!   \DeclareUnicodeCharacter{01C4}{D\v{Z}}%
!   \DeclareUnicodeCharacter{01C5}{D\v{z}}%
!   \DeclareUnicodeCharacter{01C6}{d\v{z}}%
!   \DeclareUnicodeCharacter{01C7}{LJ}%
!   \DeclareUnicodeCharacter{01C8}{Lj}%
!   \DeclareUnicodeCharacter{01C9}{lj}%
!   \DeclareUnicodeCharacter{01CA}{NJ}%
!   \DeclareUnicodeCharacter{01CB}{Nj}%
!   \DeclareUnicodeCharacter{01CC}{nj}%
!   \DeclareUnicodeCharacter{01CD}{\v{A}}%
!   \DeclareUnicodeCharacter{01CE}{\v{a}}%
!   \DeclareUnicodeCharacter{01CF}{\v{I}}%
!   %
!   \DeclareUnicodeCharacter{01D0}{\v{\dotless{i}}}%
!   \DeclareUnicodeCharacter{01D1}{\v{O}}%
!   \DeclareUnicodeCharacter{01D2}{\v{o}}%
!   \DeclareUnicodeCharacter{01D3}{\v{U}}%
!   \DeclareUnicodeCharacter{01D4}{\v{u}}%
!   %
!   \DeclareUnicodeCharacter{01E2}{\={\AE}}%
!   \DeclareUnicodeCharacter{01E3}{\={\ae}}%
!   \DeclareUnicodeCharacter{01E6}{\v{G}}%
!   \DeclareUnicodeCharacter{01E7}{\v{g}}%
!   \DeclareUnicodeCharacter{01E8}{\v{K}}%
!   \DeclareUnicodeCharacter{01E9}{\v{k}}%
!   %
!   \DeclareUnicodeCharacter{01F0}{\v{\dotless{j}}}%
!   \DeclareUnicodeCharacter{01F1}{DZ}%
!   \DeclareUnicodeCharacter{01F2}{Dz}%
!   \DeclareUnicodeCharacter{01F3}{dz}%
!   \DeclareUnicodeCharacter{01F4}{\'G}%
!   \DeclareUnicodeCharacter{01F5}{\'g}%
!   \DeclareUnicodeCharacter{01F8}{\`N}%
!   \DeclareUnicodeCharacter{01F9}{\`n}%
!   \DeclareUnicodeCharacter{01FC}{\'{\AE}}%
!   \DeclareUnicodeCharacter{01FD}{\'{\ae}}%
!   \DeclareUnicodeCharacter{01FE}{\'{\O}}%
!   \DeclareUnicodeCharacter{01FF}{\'{\o}}%
!   %
!   \DeclareUnicodeCharacter{021E}{\v{H}}%
!   \DeclareUnicodeCharacter{021F}{\v{h}}%
!   %
!   \DeclareUnicodeCharacter{0226}{\dotaccent{A}}%
!   \DeclareUnicodeCharacter{0227}{\dotaccent{a}}%
!   \DeclareUnicodeCharacter{0228}{\cedilla{E}}%
!   \DeclareUnicodeCharacter{0229}{\cedilla{e}}%
!   \DeclareUnicodeCharacter{022E}{\dotaccent{O}}%
!   \DeclareUnicodeCharacter{022F}{\dotaccent{o}}%
!   %
!   \DeclareUnicodeCharacter{0232}{\=Y}%
!   \DeclareUnicodeCharacter{0233}{\=y}%
!   \DeclareUnicodeCharacter{0237}{\dotless{j}}%
    %
!   \DeclareUnicodeCharacter{02DB}{\ogonek{ }}%
    %
    % Greek letters upper case
!   \DeclareUnicodeCharacter{0391}{{\it A}}%
!   \DeclareUnicodeCharacter{0392}{{\it B}}%
!   \DeclareUnicodeCharacter{0393}{\ensuremath{\mit\Gamma}}%
!   \DeclareUnicodeCharacter{0394}{\ensuremath{\mit\Delta}}%
!   \DeclareUnicodeCharacter{0395}{{\it E}}%
!   \DeclareUnicodeCharacter{0396}{{\it Z}}%
!   \DeclareUnicodeCharacter{0397}{{\it H}}%
!   \DeclareUnicodeCharacter{0398}{\ensuremath{\mit\Theta}}%
!   \DeclareUnicodeCharacter{0399}{{\it I}}%
!   \DeclareUnicodeCharacter{039A}{{\it K}}%
!   \DeclareUnicodeCharacter{039B}{\ensuremath{\mit\Lambda}}%
!   \DeclareUnicodeCharacter{039C}{{\it M}}%
!   \DeclareUnicodeCharacter{039D}{{\it N}}%
!   \DeclareUnicodeCharacter{039E}{\ensuremath{\mit\Xi}}%
!   \DeclareUnicodeCharacter{039F}{{\it O}}%
!   \DeclareUnicodeCharacter{03A0}{\ensuremath{\mit\Pi}}%
!   \DeclareUnicodeCharacter{03A1}{{\it P}}%
    %\DeclareUnicodeCharacter{03A2}{} % none - corresponds to final sigma
!   \DeclareUnicodeCharacter{03A3}{\ensuremath{\mit\Sigma}}%
!   \DeclareUnicodeCharacter{03A4}{{\it T}}%
!   \DeclareUnicodeCharacter{03A5}{\ensuremath{\mit\Upsilon}}%
!   \DeclareUnicodeCharacter{03A6}{\ensuremath{\mit\Phi}}%
!   \DeclareUnicodeCharacter{03A7}{{\it X}}%
!   \DeclareUnicodeCharacter{03A8}{\ensuremath{\mit\Psi}}%
!   \DeclareUnicodeCharacter{03A9}{\ensuremath{\mit\Omega}}%
    %
    % Vowels with accents
!   \DeclareUnicodeCharacter{0390}{\ensuremath{\ddot{\acute\iota}}}%
!   \DeclareUnicodeCharacter{03AC}{\ensuremath{\acute\alpha}}%
!   \DeclareUnicodeCharacter{03AD}{\ensuremath{\acute\epsilon}}%
!   \DeclareUnicodeCharacter{03AE}{\ensuremath{\acute\eta}}%
!   \DeclareUnicodeCharacter{03AF}{\ensuremath{\acute\iota}}%
!   \DeclareUnicodeCharacter{03B0}{\ensuremath{\acute{\ddot\upsilon}}}%
    %
    % Standalone accent
!   \DeclareUnicodeCharacter{0384}{\ensuremath{\acute{\ }}}%
    %
    % Greek letters lower case
!   \DeclareUnicodeCharacter{03B1}{\ensuremath\alpha}%
!   \DeclareUnicodeCharacter{03B2}{\ensuremath\beta}%
!   \DeclareUnicodeCharacter{03B3}{\ensuremath\gamma}%
!   \DeclareUnicodeCharacter{03B4}{\ensuremath\delta}%
!   \DeclareUnicodeCharacter{03B5}{\ensuremath\epsilon}%
!   \DeclareUnicodeCharacter{03B6}{\ensuremath\zeta}%
!   \DeclareUnicodeCharacter{03B7}{\ensuremath\eta}%
!   \DeclareUnicodeCharacter{03B8}{\ensuremath\theta}%
!   \DeclareUnicodeCharacter{03B9}{\ensuremath\iota}%
!   \DeclareUnicodeCharacter{03BA}{\ensuremath\kappa}%
!   \DeclareUnicodeCharacter{03BB}{\ensuremath\lambda}%
!   \DeclareUnicodeCharacter{03BC}{\ensuremath\mu}%
!   \DeclareUnicodeCharacter{03BD}{\ensuremath\nu}%
!   \DeclareUnicodeCharacter{03BE}{\ensuremath\xi}%
!   \DeclareUnicodeCharacter{03BF}{{\it o}}% omicron
!   \DeclareUnicodeCharacter{03C0}{\ensuremath\pi}%
!   \DeclareUnicodeCharacter{03C1}{\ensuremath\rho}%
!   \DeclareUnicodeCharacter{03C2}{\ensuremath\varsigma}%
!   \DeclareUnicodeCharacter{03C3}{\ensuremath\sigma}%
!   \DeclareUnicodeCharacter{03C4}{\ensuremath\tau}%
!   \DeclareUnicodeCharacter{03C5}{\ensuremath\upsilon}%
!   \DeclareUnicodeCharacter{03C6}{\ensuremath\phi}%
!   \DeclareUnicodeCharacter{03C7}{\ensuremath\chi}%
!   \DeclareUnicodeCharacter{03C8}{\ensuremath\psi}%
!   \DeclareUnicodeCharacter{03C9}{\ensuremath\omega}%
    %
    % More Greek vowels with accents
!   \DeclareUnicodeCharacter{03CA}{\ensuremath{\ddot\iota}}%
!   \DeclareUnicodeCharacter{03CB}{\ensuremath{\ddot\upsilon}}%
!   \DeclareUnicodeCharacter{03CC}{\ensuremath{\acute o}}%
!   \DeclareUnicodeCharacter{03CD}{\ensuremath{\acute\upsilon}}%
!   \DeclareUnicodeCharacter{03CE}{\ensuremath{\acute\omega}}%
    %
    % Variant Greek letters
!   \DeclareUnicodeCharacter{03D1}{\ensuremath\vartheta}%
!   \DeclareUnicodeCharacter{03D6}{\ensuremath\varpi}%
!   \DeclareUnicodeCharacter{03F1}{\ensuremath\varrho}%
!   %
!   \DeclareUnicodeCharacter{1E02}{\dotaccent{B}}%
!   \DeclareUnicodeCharacter{1E03}{\dotaccent{b}}%
!   \DeclareUnicodeCharacter{1E04}{\udotaccent{B}}%
!   \DeclareUnicodeCharacter{1E05}{\udotaccent{b}}%
!   \DeclareUnicodeCharacter{1E06}{\ubaraccent{B}}%
!   \DeclareUnicodeCharacter{1E07}{\ubaraccent{b}}%
!   \DeclareUnicodeCharacter{1E0A}{\dotaccent{D}}%
!   \DeclareUnicodeCharacter{1E0B}{\dotaccent{d}}%
!   \DeclareUnicodeCharacter{1E0C}{\udotaccent{D}}%
!   \DeclareUnicodeCharacter{1E0D}{\udotaccent{d}}%
!   \DeclareUnicodeCharacter{1E0E}{\ubaraccent{D}}%
!   \DeclareUnicodeCharacter{1E0F}{\ubaraccent{d}}%
!   %
!   \DeclareUnicodeCharacter{1E1E}{\dotaccent{F}}%
!   \DeclareUnicodeCharacter{1E1F}{\dotaccent{f}}%
!   %
!   \DeclareUnicodeCharacter{1E20}{\=G}%
!   \DeclareUnicodeCharacter{1E21}{\=g}%
!   \DeclareUnicodeCharacter{1E22}{\dotaccent{H}}%
!   \DeclareUnicodeCharacter{1E23}{\dotaccent{h}}%
!   \DeclareUnicodeCharacter{1E24}{\udotaccent{H}}%
!   \DeclareUnicodeCharacter{1E25}{\udotaccent{h}}%
!   \DeclareUnicodeCharacter{1E26}{\"H}%
!   \DeclareUnicodeCharacter{1E27}{\"h}%
!   %
!   \DeclareUnicodeCharacter{1E30}{\'K}%
!   \DeclareUnicodeCharacter{1E31}{\'k}%
!   \DeclareUnicodeCharacter{1E32}{\udotaccent{K}}%
!   \DeclareUnicodeCharacter{1E33}{\udotaccent{k}}%
!   \DeclareUnicodeCharacter{1E34}{\ubaraccent{K}}%
!   \DeclareUnicodeCharacter{1E35}{\ubaraccent{k}}%
!   \DeclareUnicodeCharacter{1E36}{\udotaccent{L}}%
!   \DeclareUnicodeCharacter{1E37}{\udotaccent{l}}%
!   \DeclareUnicodeCharacter{1E3A}{\ubaraccent{L}}%
!   \DeclareUnicodeCharacter{1E3B}{\ubaraccent{l}}%
!   \DeclareUnicodeCharacter{1E3E}{\'M}%
!   \DeclareUnicodeCharacter{1E3F}{\'m}%
!   %
!   \DeclareUnicodeCharacter{1E40}{\dotaccent{M}}%
!   \DeclareUnicodeCharacter{1E41}{\dotaccent{m}}%
!   \DeclareUnicodeCharacter{1E42}{\udotaccent{M}}%
!   \DeclareUnicodeCharacter{1E43}{\udotaccent{m}}%
!   \DeclareUnicodeCharacter{1E44}{\dotaccent{N}}%
!   \DeclareUnicodeCharacter{1E45}{\dotaccent{n}}%
!   \DeclareUnicodeCharacter{1E46}{\udotaccent{N}}%
!   \DeclareUnicodeCharacter{1E47}{\udotaccent{n}}%
!   \DeclareUnicodeCharacter{1E48}{\ubaraccent{N}}%
!   \DeclareUnicodeCharacter{1E49}{\ubaraccent{n}}%
!   %
!   \DeclareUnicodeCharacter{1E54}{\'P}%
!   \DeclareUnicodeCharacter{1E55}{\'p}%
!   \DeclareUnicodeCharacter{1E56}{\dotaccent{P}}%
!   \DeclareUnicodeCharacter{1E57}{\dotaccent{p}}%
!   \DeclareUnicodeCharacter{1E58}{\dotaccent{R}}%
!   \DeclareUnicodeCharacter{1E59}{\dotaccent{r}}%
!   \DeclareUnicodeCharacter{1E5A}{\udotaccent{R}}%
!   \DeclareUnicodeCharacter{1E5B}{\udotaccent{r}}%
!   \DeclareUnicodeCharacter{1E5E}{\ubaraccent{R}}%
!   \DeclareUnicodeCharacter{1E5F}{\ubaraccent{r}}%
!   %
!   \DeclareUnicodeCharacter{1E60}{\dotaccent{S}}%
!   \DeclareUnicodeCharacter{1E61}{\dotaccent{s}}%
!   \DeclareUnicodeCharacter{1E62}{\udotaccent{S}}%
!   \DeclareUnicodeCharacter{1E63}{\udotaccent{s}}%
!   \DeclareUnicodeCharacter{1E6A}{\dotaccent{T}}%
!   \DeclareUnicodeCharacter{1E6B}{\dotaccent{t}}%
!   \DeclareUnicodeCharacter{1E6C}{\udotaccent{T}}%
!   \DeclareUnicodeCharacter{1E6D}{\udotaccent{t}}%
!   \DeclareUnicodeCharacter{1E6E}{\ubaraccent{T}}%
!   \DeclareUnicodeCharacter{1E6F}{\ubaraccent{t}}%
!   %
!   \DeclareUnicodeCharacter{1E7C}{\~V}%
!   \DeclareUnicodeCharacter{1E7D}{\~v}%
!   \DeclareUnicodeCharacter{1E7E}{\udotaccent{V}}%
!   \DeclareUnicodeCharacter{1E7F}{\udotaccent{v}}%
!   %
!   \DeclareUnicodeCharacter{1E80}{\`W}%
!   \DeclareUnicodeCharacter{1E81}{\`w}%
!   \DeclareUnicodeCharacter{1E82}{\'W}%
!   \DeclareUnicodeCharacter{1E83}{\'w}%
!   \DeclareUnicodeCharacter{1E84}{\"W}%
!   \DeclareUnicodeCharacter{1E85}{\"w}%
!   \DeclareUnicodeCharacter{1E86}{\dotaccent{W}}%
!   \DeclareUnicodeCharacter{1E87}{\dotaccent{w}}%
!   \DeclareUnicodeCharacter{1E88}{\udotaccent{W}}%
!   \DeclareUnicodeCharacter{1E89}{\udotaccent{w}}%
!   \DeclareUnicodeCharacter{1E8A}{\dotaccent{X}}%
!   \DeclareUnicodeCharacter{1E8B}{\dotaccent{x}}%
!   \DeclareUnicodeCharacter{1E8C}{\"X}%
!   \DeclareUnicodeCharacter{1E8D}{\"x}%
!   \DeclareUnicodeCharacter{1E8E}{\dotaccent{Y}}%
!   \DeclareUnicodeCharacter{1E8F}{\dotaccent{y}}%
!   %
!   \DeclareUnicodeCharacter{1E90}{\^Z}%
!   \DeclareUnicodeCharacter{1E91}{\^z}%
!   \DeclareUnicodeCharacter{1E92}{\udotaccent{Z}}%
!   \DeclareUnicodeCharacter{1E93}{\udotaccent{z}}%
!   \DeclareUnicodeCharacter{1E94}{\ubaraccent{Z}}%
!   \DeclareUnicodeCharacter{1E95}{\ubaraccent{z}}%
!   \DeclareUnicodeCharacter{1E96}{\ubaraccent{h}}%
!   \DeclareUnicodeCharacter{1E97}{\"t}%
!   \DeclareUnicodeCharacter{1E98}{\ringaccent{w}}%
!   \DeclareUnicodeCharacter{1E99}{\ringaccent{y}}%
!   %
!   \DeclareUnicodeCharacter{1EA0}{\udotaccent{A}}%
!   \DeclareUnicodeCharacter{1EA1}{\udotaccent{a}}%
!   %
!   \DeclareUnicodeCharacter{1EB8}{\udotaccent{E}}%
!   \DeclareUnicodeCharacter{1EB9}{\udotaccent{e}}%
!   \DeclareUnicodeCharacter{1EBC}{\~E}%
!   \DeclareUnicodeCharacter{1EBD}{\~e}%
!   %
!   \DeclareUnicodeCharacter{1ECA}{\udotaccent{I}}%
!   \DeclareUnicodeCharacter{1ECB}{\udotaccent{i}}%
!   \DeclareUnicodeCharacter{1ECC}{\udotaccent{O}}%
!   \DeclareUnicodeCharacter{1ECD}{\udotaccent{o}}%
!   %
!   \DeclareUnicodeCharacter{1EE4}{\udotaccent{U}}%
!   \DeclareUnicodeCharacter{1EE5}{\udotaccent{u}}%
!   %
!   \DeclareUnicodeCharacter{1EF2}{\`Y}%
!   \DeclareUnicodeCharacter{1EF3}{\`y}%
!   \DeclareUnicodeCharacter{1EF4}{\udotaccent{Y}}%
    %
!   \DeclareUnicodeCharacter{1EF8}{\~Y}%
!   \DeclareUnicodeCharacter{1EF9}{\~y}%
    %
    % Punctuation
!   \DeclareUnicodeCharacter{2013}{--}%
!   \DeclareUnicodeCharacter{2014}{---}%
!   \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{202F}{\thinspace}%
!   \DeclareUnicodeCharacter{2026}{\dots}%
!   \DeclareUnicodeCharacter{2039}{\guilsinglleft}%
!   \DeclareUnicodeCharacter{203A}{\guilsinglright}%
    %
!   \DeclareUnicodeCharacter{20AC}{\euro}%
    %
!   \DeclareUnicodeCharacter{2192}{\expansion}%
!   \DeclareUnicodeCharacter{21D2}{\result}%
    %
    % Mathematical symbols
!   \DeclareUnicodeCharacter{2200}{\ensuremath\forall}%
!   \DeclareUnicodeCharacter{2203}{\ensuremath\exists}%
!   \DeclareUnicodeCharacter{2208}{\ensuremath\in}%
!   \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{2264}{\ensuremath\leq}%
!   \DeclareUnicodeCharacter{2265}{\ensuremath\geq}%
!   \DeclareUnicodeCharacter{2282}{\ensuremath\subset}%
!   \DeclareUnicodeCharacter{2287}{\ensuremath\supseteq}%
!   %
!   \DeclareUnicodeCharacter{2016}{\ensuremath\Vert}%
!   \DeclareUnicodeCharacter{2032}{\ensuremath\prime}%
!   \DeclareUnicodeCharacter{210F}{\ensuremath\hbar}%
!   \DeclareUnicodeCharacter{2111}{\ensuremath\Im}%
!   \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}%
!   \DeclareUnicodeCharacter{2193}{\ensuremath\downarrow}%
!   \DeclareUnicodeCharacter{2194}{\ensuremath\leftrightarrow}%
!   \DeclareUnicodeCharacter{2195}{\ensuremath\updownarrow}%
!   \DeclareUnicodeCharacter{2196}{\ensuremath\nwarrow}%
!   \DeclareUnicodeCharacter{2197}{\ensuremath\nearrow}%
!   \DeclareUnicodeCharacter{2198}{\ensuremath\searrow}%
!   \DeclareUnicodeCharacter{2199}{\ensuremath\swarrow}%
!   \DeclareUnicodeCharacter{21A6}{\ensuremath\mapsto}%
!   \DeclareUnicodeCharacter{21A9}{\ensuremath\hookleftarrow}%
!   \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}%
!   \DeclareUnicodeCharacter{21D0}{\ensuremath\Leftarrow}%
!   \DeclareUnicodeCharacter{21D1}{\ensuremath\Uparrow}%
!   \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}%
!   \DeclareUnicodeCharacter{2209}{\ensuremath\notin}%
!   \DeclareUnicodeCharacter{220B}{\ensuremath\owns}%
!   \DeclareUnicodeCharacter{220F}{\ensuremath\prod}%
!   \DeclareUnicodeCharacter{2210}{\ensuremath\coprod}%
!   \DeclareUnicodeCharacter{2211}{\ensuremath\sum}%
!   \DeclareUnicodeCharacter{2213}{\ensuremath\mp}%
!   \DeclareUnicodeCharacter{2218}{\ensuremath\circ}%
!   \DeclareUnicodeCharacter{221A}{\ensuremath\surd}%
!   \DeclareUnicodeCharacter{221D}{\ensuremath\propto}%
!   \DeclareUnicodeCharacter{2220}{\ensuremath\angle}%
!   \DeclareUnicodeCharacter{2223}{\ensuremath\mid}%
!   \DeclareUnicodeCharacter{2228}{\ensuremath\vee}%
!   \DeclareUnicodeCharacter{222A}{\ensuremath\cup}%
!   \DeclareUnicodeCharacter{222B}{\ensuremath\smallint}%
!   \DeclareUnicodeCharacter{222E}{\ensuremath\oint}%
!   \DeclareUnicodeCharacter{223C}{\ensuremath\sim}%
!   \DeclareUnicodeCharacter{2240}{\ensuremath\wr}%
!   \DeclareUnicodeCharacter{2243}{\ensuremath\simeq}%
!   \DeclareUnicodeCharacter{2245}{\ensuremath\cong}%
!   \DeclareUnicodeCharacter{2248}{\ensuremath\approx}%
!   \DeclareUnicodeCharacter{224D}{\ensuremath\asymp}%
!   \DeclareUnicodeCharacter{2250}{\ensuremath\doteq}%
!   \DeclareUnicodeCharacter{2260}{\ensuremath\neq}%
!   \DeclareUnicodeCharacter{226A}{\ensuremath\ll}%
!   \DeclareUnicodeCharacter{226B}{\ensuremath\gg}%
!   \DeclareUnicodeCharacter{227A}{\ensuremath\prec}%
!   \DeclareUnicodeCharacter{227B}{\ensuremath\succ}%
!   \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}%
!   \DeclareUnicodeCharacter{2294}{\ensuremath\sqcup}%
!   \DeclareUnicodeCharacter{2295}{\ensuremath\oplus}%
!   \DeclareUnicodeCharacter{2296}{\ensuremath\ominus}%
!   \DeclareUnicodeCharacter{2297}{\ensuremath\otimes}%
!   \DeclareUnicodeCharacter{2298}{\ensuremath\oslash}%
!   \DeclareUnicodeCharacter{2299}{\ensuremath\odot}%
!   \DeclareUnicodeCharacter{22A2}{\ensuremath\vdash}%
!   \DeclareUnicodeCharacter{22A3}{\ensuremath\dashv}%
!   \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}%
!   \DeclareUnicodeCharacter{22C3}{\ensuremath\bigcup}%
!   \DeclareUnicodeCharacter{22C4}{\ensuremath\diamond}%
!   \DeclareUnicodeCharacter{22C5}{\ensuremath\cdot}%
!   \DeclareUnicodeCharacter{22C6}{\ensuremath\star}%
!   \DeclareUnicodeCharacter{22C8}{\ensuremath\bowtie}%
!   \DeclareUnicodeCharacter{2308}{\ensuremath\lceil}%
!   \DeclareUnicodeCharacter{2309}{\ensuremath\rceil}%
!   \DeclareUnicodeCharacter{230A}{\ensuremath\lfloor}%
!   \DeclareUnicodeCharacter{230B}{\ensuremath\rfloor}%
!   \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{2660}{\ensuremath\spadesuit}%
!   \DeclareUnicodeCharacter{2661}{\ensuremath\heartsuit}%
!   \DeclareUnicodeCharacter{2662}{\ensuremath\diamondsuit}%
!   \DeclareUnicodeCharacter{2663}{\ensuremath\clubsuit}%
!   \DeclareUnicodeCharacter{266D}{\ensuremath\flat}%
!   \DeclareUnicodeCharacter{266E}{\ensuremath\natural}%
!   \DeclareUnicodeCharacter{266F}{\ensuremath\sharp}%
!   \DeclareUnicodeCharacter{26AA}{\ensuremath\bigcirc}%
!   \DeclareUnicodeCharacter{27B9}{\ensuremath\rangle}%
!   \DeclareUnicodeCharacter{27C2}{\ensuremath\perp}%
!   \DeclareUnicodeCharacter{27E8}{\ensuremath\langle}%
!   \DeclareUnicodeCharacter{27F5}{\ensuremath\longleftarrow}%
!   \DeclareUnicodeCharacter{27F6}{\ensuremath\longrightarrow}%
!   \DeclareUnicodeCharacter{27F7}{\ensuremath\longleftrightarrow}%
!   \DeclareUnicodeCharacter{27FC}{\ensuremath\longmapsto}%
!   \DeclareUnicodeCharacter{29F5}{\ensuremath\setminus}%
!   \DeclareUnicodeCharacter{2A00}{\ensuremath\bigodot}%
!   \DeclareUnicodeCharacter{2A01}{\ensuremath\bigoplus}%
!   \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}%
!   %
!   \global\mathchardef\checkmark="1370% actually the square root sign
!   \DeclareUnicodeCharacter{2713}{\ensuremath\checkmark}%
! }% end of \unicodechardefs
  
! % UTF-8 byte sequence (pdfTeX) definitions (replacing and @U command)
! % It makes the setting that replace UTF-8 byte sequence.
! \def\utfeightchardefs{%
!   \let\DeclareUnicodeCharacter\DeclareUnicodeCharacterUTFviii
!   \unicodechardefs
  }
  
! % Whether the active definitions of non-ASCII characters expand to
! % non-active tokens with the same character code.  This is used to
! % write characters literally, instead of using active definitions for
! % printing the correct glyphs.
! \newif\ifpassthroughchars
! \passthroughcharsfalse
! 
! % For native Unicode handling (XeTeX and LuaTeX),
! % provide a definition macro to replace/pass-through a Unicode character
! %
! \def\DeclareUnicodeCharacterNative#1#2{%
!   \catcode"#1=\active
!   \def\dodeclareunicodecharacternative##1##2##3{%
!     \begingroup
!       \uccode`\~="##2\relax
!       \uppercase{\gdef~}{%
!         \ifpassthroughchars
!           ##1%
!         \else
!           ##3%
!         \fi
!       }
!     \endgroup
!   }
!   \begingroup
!     \uccode`\.="#1\relax
!     \uppercase{\def\UTFNativeTmp{.}}%
!     \expandafter\dodeclareunicodecharacternative\UTFNativeTmp{#1}{#2}%
!   \endgroup
  }
  
+ % Native Unicode handling (XeTeX and LuaTeX) character replacing definition.
+ % It activates the setting that replaces Unicode characters.
+ \def\nativeunicodechardefs{%
+   \let\DeclareUnicodeCharacter\DeclareUnicodeCharacterNative
+   \unicodechardefs
+ }
+ 
+ % For native Unicode handling (XeTeX and LuaTeX),
+ % make the character token expand
+ % to the sequences given in \unicodechardefs for printing.
+ \def\DeclareUnicodeCharacterNativeAtU#1#2{%
+   \def\UTFAtUTmp{#2}
+   \expandafter\globallet\csname uni:#1\endcsname \UTFAtUTmp
+ }
+ 
+ % @U command definitions for native Unicode handling (XeTeX and LuaTeX).
+ \def\nativeunicodechardefsatu{%
+   \let\DeclareUnicodeCharacter\DeclareUnicodeCharacterNativeAtU
+   \unicodechardefs
+ }
+ 
+ % US-ASCII character definitions.
+ \def\asciichardefs{% nothing need be done
+    \relax
+ }
  
! % define all Unicode characters we know about, for the sake of @U.
! \iftxinativeunicodecapable
!   \nativeunicodechardefsatu
! \else
!   \utfeightchardefs
! \fi
  
  
***************
*** 10788,10797 ****
    \outervsize = \vsize
    \advance\outervsize by 2\topandbottommargin
!   \pageheight = \vsize
    %
    \hsize = #2\relax
    \outerhsize = \hsize
    \advance\outerhsize by 0.5in
!   \pagewidth = \hsize
    %
    \normaloffset = #4\relax
--- 11305,11314 ----
    \outervsize = \vsize
    \advance\outervsize by 2\topandbottommargin
!   \txipageheight = \vsize
    %
    \hsize = #2\relax
    \outerhsize = \hsize
    \advance\outerhsize by 0.5in
!   \txipagewidth = \hsize
    %
    \normaloffset = #4\relax
***************
*** 10805,10808 ****
--- 11322,11332 ----
      \pdfhorigin = 1 true in
      \pdfvorigin = 1 true in
+   \else
+     \ifx\XeTeXrevision\thisisundefined
+     \else
+       \pdfpageheight #7\relax
+       \pdfpagewidth #8\relax
+       % XeTeX does not have \pdfhorigin and \pdfvorigin.
+     \fi
    \fi
    %
***************
*** 11079,11083 ****
  {@catcode`- = @active
   @gdef@normalturnoffactive{%
!    @nonasciistringdefs
     @let-=@normaldash
     @let"=@normaldoublequote
--- 11603,11607 ----
  {@catcode`- = @active
   @gdef@normalturnoffactive{%
!    @passthroughcharstrue
     @let-=@normaldash
     @let"=@normaldoublequote
***************
*** 11117,11123 ****
    @catcode`@^^M=13%
    @def@c{@fixbackslash@c}%
    @def ^^M{@let^^M@secondlinenl}%
!   @gdef @secondlinenl{@let^^M@thirdlinenl}%
!   @gdef @thirdlinenl{@fixbackslash}%
  }}
  
--- 11641,11648 ----
    @catcode`@^^M=13%
    @def@c{@fixbackslash@c}%
+   % Definition for the newline at the end of this file.
    @def ^^M{@let^^M@secondlinenl}%
!   % Definition for a newline in the main Texinfo file.
!   @gdef @secondlinenl{@fixbackslash}%
  }}
  
diff -Nrc2 texinfo-6.1/config.in texinfo-6.3/config.in
*** texinfo-6.1/config.in	2016-02-06 12:24:22.000000000 +0000
--- texinfo-6.3/config.in	2016-09-10 20:36:30.000000000 +0100
***************
*** 27,30 ****
--- 27,33 ----
  #undef C_ALLOCA
  
+ /* Define to 1 if the C locale may have encoding errors. */
+ #undef C_LOCALE_MAYBE_EILSEQ
+ 
  /* Define as the bit index in the word where to find bit 0 of the exponent of
     'double'. */
***************
*** 1302,1305 ****
--- 1305,1314 ----
  #undef __GETOPT_PREFIX
  
+ /* Define to 1 if the system <stdint.h> predates C++11. */
+ #undef __STDC_CONSTANT_MACROS
+ 
+ /* Define to 1 if the system <stdint.h> predates C++11. */
+ #undef __STDC_LIMIT_MACROS
+ 
  /* Define so that glibc/gnulib argp.h does not typedef error_t. */
  #undef __error_t_defined
***************
*** 1357,1360 ****
--- 1366,1370 ----
        : (199901L <= __STDC_VERSION__ \
           && !defined __HP_cc \
+          && !defined __PGI \
           && !(defined __SUNPRO_C && __STDC__))) \
       && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
diff -Nrc2 texinfo-6.1/configure texinfo-6.3/configure
*** texinfo-6.1/configure	2016-02-06 12:24:10.000000000 +0000
--- texinfo-6.3/configure	2016-09-10 20:30:01.000000000 +0100
***************
*** 1,5 ****
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.69 for GNU Texinfo 6.1.
  #
  # Report bugs to <bug-texinfo@gnu.org>.
--- 1,5 ----
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.69 for GNU Texinfo 6.3.
  #
  # Report bugs to <bug-texinfo@gnu.org>.
***************
*** 581,586 ****
  PACKAGE_NAME='GNU Texinfo'
  PACKAGE_TARNAME='texinfo'
! PACKAGE_VERSION='6.1'
! PACKAGE_STRING='GNU Texinfo 6.1'
  PACKAGE_BUGREPORT='bug-texinfo@gnu.org'
  PACKAGE_URL='http://www.gnu.org/software/texinfo/'
--- 581,586 ----
  PACKAGE_NAME='GNU Texinfo'
  PACKAGE_TARNAME='texinfo'
! PACKAGE_VERSION='6.3'
! PACKAGE_STRING='GNU Texinfo 6.3'
  PACKAGE_BUGREPORT='bug-texinfo@gnu.org'
  PACKAGE_URL='http://www.gnu.org/software/texinfo/'
***************
*** 729,732 ****
--- 729,734 ----
  gl_GNULIB_ENABLED_intprops_FALSE
  gl_GNULIB_ENABLED_intprops_TRUE
+ gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76_FALSE
+ gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76_TRUE
  gl_GNULIB_ENABLED_configmake_FALSE
  gl_GNULIB_ENABLED_configmake_TRUE
***************
*** 2044,2048 ****
    # This message is too long to be a string in the A/UX 3.1 sh.
    cat <<_ACEOF
! \`configure' configures GNU Texinfo 6.1 to adapt to many kinds of systems.
  
  Usage: $0 [OPTION]... [VAR=VALUE]...
--- 2046,2050 ----
    # This message is too long to be a string in the A/UX 3.1 sh.
    cat <<_ACEOF
! \`configure' configures GNU Texinfo 6.3 to adapt to many kinds of systems.
  
  Usage: $0 [OPTION]... [VAR=VALUE]...
***************
*** 2114,2118 ****
  if test -n "$ac_init_help"; then
    case $ac_init_help in
!      short | recursive ) echo "Configuration of GNU Texinfo 6.1:";;
     esac
    cat <<\_ACEOF
--- 2116,2120 ----
  if test -n "$ac_init_help"; then
    case $ac_init_help in
!      short | recursive ) echo "Configuration of GNU Texinfo 6.3:";;
     esac
    cat <<\_ACEOF
***************
*** 2251,2255 ****
  if $ac_init_version; then
    cat <<\_ACEOF
! GNU Texinfo configure 6.1
  generated by GNU Autoconf 2.69
  
--- 2253,2257 ----
  if $ac_init_version; then
    cat <<\_ACEOF
! GNU Texinfo configure 6.3
  generated by GNU Autoconf 2.69
  
***************
*** 2960,2964 ****
  running configure, to aid debugging if configure makes a mistake.
  
! It was created by GNU Texinfo $as_me 6.1, which was
  generated by GNU Autoconf 2.69.  Invocation command line was
  
--- 2962,2966 ----
  running configure, to aid debugging if configure makes a mistake.
  
! It was created by GNU Texinfo $as_me 6.3, which was
  generated by GNU Autoconf 2.69.  Invocation command line was
  
***************
*** 3857,3861 ****
  # Define the identity of the package.
   PACKAGE='texinfo'
!  VERSION='6.1'
  
  
--- 3859,3863 ----
  # Define the identity of the package.
   PACKAGE='texinfo'
!  VERSION='6.3'
  
  
***************
*** 6619,6622 ****
--- 6621,6625 ----
    # Code from module gettext:
    # Code from module gettext-h:
+   # Code from module hard-locale:
    # Code from module havelib:
    # Code from module iconv:
***************
*** 8120,8128 ****
  /* Avoid a crash on POSIX systems.  */
  #include <signal.h>
  /* A POSIX signal handler.  */
  static void
  exception_handler (int sig)
  {
!   exit (1);
  }
  static void
--- 8123,8132 ----
  /* Avoid a crash on POSIX systems.  */
  #include <signal.h>
+ #include <unistd.h>
  /* A POSIX signal handler.  */
  static void
  exception_handler (int sig)
  {
!   _exit (1);
  }
  static void
***************
*** 9842,9846 ****
  main ()
  {
! return ! malloc (0);
    ;
    return 0;
--- 9846,9853 ----
  main ()
  {
! char *p = malloc (0);
!             int result = !p;
!             free (p);
!             return result;
    ;
    return 0;
***************
*** 11012,11035 ****
  
               #include <stdbool.h>
!              #ifndef bool
!               "error: bool is not defined"
!              #endif
!              #ifndef false
!               "error: false is not defined"
!              #endif
!              #if false
!               "error: false is not 0"
!              #endif
!              #ifndef true
!               "error: true is not defined"
!              #endif
!              #if true != 1
!               "error: true is not 1"
               #endif
               #ifndef __bool_true_false_are_defined
                "error: __bool_true_false_are_defined is not defined"
               #endif
  
!              struct s { _Bool s: 1; _Bool t; } s;
  
               char a[true == 1 ? 1 : -1];
--- 11019,11049 ----
  
               #include <stdbool.h>
! 
!              #ifdef __cplusplus
!               typedef bool Bool;
!              #else
!               typedef _Bool Bool;
!               #ifndef bool
!                "error: bool is not defined"
!               #endif
!               #ifndef false
!                "error: false is not defined"
!               #endif
!               #if false
!                "error: false is not 0"
!               #endif
!               #ifndef true
!                "error: true is not defined"
!               #endif
!               #if true != 1
!                "error: true is not 1"
!               #endif
               #endif
+ 
               #ifndef __bool_true_false_are_defined
                "error: __bool_true_false_are_defined is not defined"
               #endif
  
!              struct s { Bool s: 1; Bool t; bool u: 1; bool v; } s;
  
               char a[true == 1 ? 1 : -1];
***************
*** 11038,11057 ****
               char d[(bool) 0.5 == true ? 1 : -1];
               /* See body of main program for 'e'.  */
!              char f[(_Bool) 0.0 == false ? 1 : -1];
               char g[true];
!              char h[sizeof (_Bool)];
               char i[sizeof s.t];
               enum { j = false, k = true, l = false * true, m = true * 256 };
               /* The following fails for
                  HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
!              _Bool n[m];
               char o[sizeof n == m * sizeof n[0] ? 1 : -1];
!              char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
               /* Catch a bug in an HP-UX C compiler.  See
                  http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
                  http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
                */
!              _Bool q = true;
!              _Bool *pq = &q;
  
  int
--- 11052,11072 ----
               char d[(bool) 0.5 == true ? 1 : -1];
               /* See body of main program for 'e'.  */
!              char f[(Bool) 0.0 == false ? 1 : -1];
               char g[true];
!              char h[sizeof (Bool)];
               char i[sizeof s.t];
               enum { j = false, k = true, l = false * true, m = true * 256 };
               /* The following fails for
                  HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
!              Bool n[m];
               char o[sizeof n == m * sizeof n[0] ? 1 : -1];
!              char p[-1 - (Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
               /* Catch a bug in an HP-UX C compiler.  See
                  http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
                  http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
                */
!              Bool q = true;
!              Bool *pq = &q;
!              bool *qq = &q;
  
  int
***************
*** 11060,11068 ****
  
               bool e = &s;
!              *pq |= q;
!              *pq |= ! q;
               /* Refer to every declared value, to avoid compiler optimizations.  */
               return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
!                      + !m + !n + !o + !p + !q + !pq);
  
    ;
--- 11075,11083 ----
  
               bool e = &s;
!              *pq |= q; *pq |= ! q;
!              *qq |= q; *qq |= ! q;
               /* Refer to every declared value, to avoid compiler optimizations.  */
               return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
!                      + !m + !n + !o + !p + !q + !pq + !qq);
  
    ;
***************
*** 11281,11284 ****
--- 11296,11301 ----
  
  #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+ #define __STDC_CONSTANT_MACROS 1
+ #define __STDC_LIMIT_MACROS 1
  #include <stdint.h>
  /* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
***************
*** 11449,11452 ****
--- 11466,11471 ----
  
  #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+ #define __STDC_CONSTANT_MACROS 1
+ #define __STDC_LIMIT_MACROS 1
  #include <stdint.h>
  
***************
*** 11535,11538 ****
--- 11554,11609 ----
    fi
    if test "$gl_cv_header_working_stdint_h" = yes; then
+             { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h predates C++11" >&5
+ $as_echo_n "checking whether stdint.h predates C++11... " >&6; }
+ if ${gl_cv_header_stdint_predates_cxx11_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   gl_cv_header_stdint_predates_cxx11_h=yes
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ 
+ #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+ #include <stdint.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 <signal.h>
+   #if HAVE_WCHAR_H
+   # include <stdio.h>
+   # include <time.h>
+   # include <wchar.h>
+   #endif
+ 
+ 
+ intmax_t im = INTMAX_MAX;
+ int32_t i32 = INT32_C (0x7fffffff);
+ 
+ int
+ main ()
+ {
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_compile "$LINENO"; then :
+   gl_cv_header_stdint_predates_cxx11_h=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_predates_cxx11_h" >&5
+ $as_echo "$gl_cv_header_stdint_predates_cxx11_h" >&6; }
+ 
+     if test "$gl_cv_header_stdint_predates_cxx11_h" = yes; then
+ 
+ $as_echo "#define __STDC_CONSTANT_MACROS 1" >>confdefs.h
+ 
+ 
+ $as_echo "#define __STDC_LIMIT_MACROS 1" >>confdefs.h
+ 
+     fi
      STDINT_H=
    else
***************
*** 12710,12713 ****
--- 12781,12786 ----
  
  _ACEOF
+                               save_ac_compile="$ac_compile"
+      ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest1/`
       if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
    (eval $ac_compile) 2>&5
***************
*** 12715,12719 ****
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    test $ac_status = 0; }; then
-        mv conftest.$ac_objext conftest1.$ac_objext
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
--- 12788,12791 ----
***************
*** 12731,12734 ****
--- 12803,12807 ----
  
  _ACEOF
+               ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest2/`
         if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
    (eval $ac_compile) 2>&5
***************
*** 12736,12740 ****
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    test $ac_status = 0; }; then
-          mv conftest.$ac_objext conftest2.$ac_objext
           if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&5 2>&1; then
             :
--- 12809,12812 ----
***************
*** 12744,12747 ****
--- 12816,12820 ----
         fi
       fi
+      ac_compile="$save_ac_compile"
       rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext
  
***************
*** 14055,14058 ****
--- 14128,14152 ----
  
  
+   :
+ 
+ 
+ 
+ 
+ 
+   if test $ac_cv_func__set_invalid_parameter_handler = yes; then
+     HAVE_MSVC_INVALID_PARAMETER_HANDLER=1
+ 
+ $as_echo "#define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h
+ 
+   else
+     HAVE_MSVC_INVALID_PARAMETER_HANDLER=0
+   fi
+ 
+ 
+ 
+ 
+ 
+ 
+ 
  
  
***************
*** 16009,16013 ****
             main (void)
             {
!              return ! mbrtowc (&wc, "", 0, &mbs) == (size_t) -2;
             }
  _ACEOF
--- 16103,16107 ----
             main (void)
             {
!              return mbrtowc (&wc, "", 0, &mbs) != (size_t) -2;
             }
  _ACEOF
***************
*** 16026,16029 ****
--- 16120,16177 ----
  $as_echo "$gl_cv_func_mbrtowc_empty_input" >&6; }
  
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C locale is free of encoding errors" >&5
+ $as_echo_n "checking whether the C locale is free of encoding errors... " >&6; }
+ if ${gl_cv_C_locale_sans_EILSEQ+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+                gl_cv_C_locale_sans_EILSEQ="guessing no"
+ 
+      if test "$cross_compiling" = yes; then :
+   :
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <limits.h>
+             #include <locale.h>
+             #include <wchar.h>
+ 
+ int
+ main ()
+ {
+ 
+             int i;
+             char *locale = setlocale (LC_ALL, "C");
+             if (! locale)
+               return 1;
+             for (i = CHAR_MIN; i <= CHAR_MAX; i++)
+               {
+                 char c = i;
+                 wchar_t wc;
+                 mbstate_t mbs = { 0, };
+                 size_t ss = mbrtowc (&wc, &c, 1, &mbs);
+                 if (1 < ss)
+                   return 1;
+               }
+             return 0;
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_run "$LINENO"; then :
+   gl_cv_C_locale_sans_EILSEQ=yes
+ else
+   gl_cv_C_locale_sans_EILSEQ=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_C_locale_sans_EILSEQ" >&5
+ $as_echo "$gl_cv_C_locale_sans_EILSEQ" >&6; }
+ 
        case "$gl_cv_func_mbrtowc_null_arg1" in
          *yes) ;;
***************
*** 16066,16069 ****
--- 16214,16225 ----
             ;;
        esac
+       case $gl_cv_C_locale_sans_EILSEQ in
+         *yes) ;;
+         *)
+ $as_echo "#define C_LOCALE_MAYBE_EILSEQ 1" >>confdefs.h
+ 
+            REPLACE_MBRTOWC=1
+            ;;
+       esac
      fi
    fi
***************
*** 16748,16751 ****
--- 16904,16908 ----
                             != -1)
                      result |= 1;
+                   regfree (&regex);
                  }
  
***************
*** 16779,16782 ****
--- 16936,16940 ----
                          result |= 1;
                      }
+                   regfree (&regex);
                  }
  
***************
*** 17829,17833 ****
  #include <stdlib.h> /* for malloc */
  #include <unistd.h> /* for alarm */
! static void quit (int sig) { exit (sig + 128); }
  
  int
--- 17987,17991 ----
  #include <stdlib.h> /* for malloc */
  #include <unistd.h> /* for alarm */
! static void quit (int sig) { _exit (sig + 128); }
  
  int
***************
*** 19165,19169 ****
    if test $ac_cv_func_wcwidth = yes; then
      HAVE_WCWIDTH=1
!                     { $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 :
--- 19323,19327 ----
    if test $ac_cv_func_wcwidth = yes; then
      HAVE_WCWIDTH=1
!                         { $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 :
***************
*** 19212,19215 ****
--- 19370,19375 ----
        if (wcwidth (0x200B) > 0)
          result |= 4;
+       if (wcwidth (0xFF1A) == 0)
+         result |= 8;
      }
    return result;
***************
*** 19267,19270 ****
--- 19427,19431 ----
    gl_gnulib_enabled_btowc=false
    gl_gnulib_enabled_configmake=false
+   gl_gnulib_enabled_30838f5439487421042f2225bed3af76=false
    gl_gnulib_enabled_intprops=false
    gl_gnulib_enabled_langinfo=false
***************
*** 19507,19510 ****
--- 19668,19680 ----
      fi
    }
+   func_gl_gnulib_m4code_30838f5439487421042f2225bed3af76 ()
+   {
+     if ! $gl_gnulib_enabled_30838f5439487421042f2225bed3af76; then
+ 
+   :
+ 
+       gl_gnulib_enabled_30838f5439487421042f2225bed3af76=true
+     fi
+   }
    func_gl_gnulib_m4code_intprops ()
    {
***************
*** 20328,20348 ****
      if ! $gl_gnulib_enabled_f691f076f650964c9f5598c3ee487616; then
  
- 
-   :
- 
- 
- 
- 
- 
-   if test $ac_cv_func__set_invalid_parameter_handler = yes; then
-     HAVE_MSVC_INVALID_PARAMETER_HANDLER=1
- 
- $as_echo "#define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h
- 
-   else
-     HAVE_MSVC_INVALID_PARAMETER_HANDLER=0
-   fi
- 
- 
        if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
  
--- 20498,20501 ----
***************
*** 20364,20369 ****
      if ! $gl_gnulib_enabled_676220fa4366efa9bdbfccf11a857c07; then
  
- 
- 
        if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
  
--- 20517,20520 ----
***************
*** 20762,20770 ****
    char *strndup (const char *, size_t);
  #endif
    char *s;
    s = strndup ("some longer string", 15);
    free (s);
    s = strndup ("shorter string", 13);
!   return s[13] != '\0';
    ;
    return 0;
--- 20913,20924 ----
    char *strndup (const char *, size_t);
  #endif
+   int result;
    char *s;
    s = strndup ("some longer string", 15);
    free (s);
    s = strndup ("shorter string", 13);
!   result = s[13] != '\0';
!   free (s);
!   return result;
    ;
    return 0;
***************
*** 20864,20872 ****
  /* end confdefs.h.  */
  
  #include <signal.h> /* for signal */
  #include <string.h> /* for strstr */
  #include <stdlib.h> /* for malloc */
  #include <unistd.h> /* for alarm */
! static void quit (int sig) { exit (sig + 128); }
  
  int
--- 21018,21032 ----
  /* end confdefs.h.  */
  
+ #ifdef __MVS__
+ /* z/OS does not deliver signals while strstr() is running (thanks to
+    restrictions on its LE runtime), which prevents us from limiting the
+    running time of this test.  */
+ # error "This test does not work properly on z/OS"
+ #endif
  #include <signal.h> /* for signal */
  #include <string.h> /* for strstr */
  #include <stdlib.h> /* for malloc */
  #include <unistd.h> /* for alarm */
! static void quit (int sig) { _exit (sig + 128); }
  
  int
***************
*** 21516,21519 ****
--- 21676,21682 ----
    fi
    if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
+     func_gl_gnulib_m4code_30838f5439487421042f2225bed3af76
+   fi
+   if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
      func_gl_gnulib_m4code_localcharset
    fi
***************
*** 21562,21565 ****
--- 21725,21736 ----
  fi
  
+    if $gl_gnulib_enabled_30838f5439487421042f2225bed3af76; then
+   gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76_TRUE=
+   gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76_FALSE='#'
+ else
+   gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76_TRUE='#'
+   gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76_FALSE=
+ fi
+ 
     if $gl_gnulib_enabled_intprops; then
    gl_GNULIB_ENABLED_intprops_TRUE=
***************
*** 23254,23260 ****
  
  #include <libintl.h>
! $gt_revision_test_code
  extern int _nl_msg_cat_cntr;
  extern int *_nl_domain_bindings;
  
  int
--- 23425,23436 ----
  
  #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
***************
*** 23263,23267 ****
  
  bindtextdomain ("", "");
! return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
  
    ;
--- 23439,23443 ----
  
  bindtextdomain ("", "");
! return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
  
    ;
***************
*** 24016,24020 ****
  
  #include <libintl.h>
! $gt_revision_test_code
  extern int _nl_msg_cat_cntr;
  extern
--- 24192,24196 ----
  
  #include <libintl.h>
! #ifndef __GNU_GETTEXT_SUPPORTED_REVISION
  extern int _nl_msg_cat_cntr;
  extern
***************
*** 24023,24026 ****
--- 24199,24207 ----
  #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
***************
*** 24029,24033 ****
  
  bindtextdomain ("", "");
! return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
  
    ;
--- 24210,24214 ----
  
  bindtextdomain ("", "");
! return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
  
    ;
***************
*** 24048,24052 ****
  
  #include <libintl.h>
! $gt_revision_test_code
  extern int _nl_msg_cat_cntr;
  extern
--- 24229,24233 ----
  
  #include <libintl.h>
! #ifndef __GNU_GETTEXT_SUPPORTED_REVISION
  extern int _nl_msg_cat_cntr;
  extern
***************
*** 24055,24058 ****
--- 24236,24244 ----
  #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
***************
*** 24061,24065 ****
  
  bindtextdomain ("", "");
! return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
  
    ;
--- 24247,24251 ----
  
  bindtextdomain ("", "");
! return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
  
    ;
***************
*** 24766,24769 ****
--- 24952,24959 ----
  Usually this means the macro was only invoked conditionally." "$LINENO" 5
  fi
+ if test -z "${gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76_TRUE}" && test -z "${gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76_FALSE}"; then
+   as_fn_error $? "conditional \"gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
  if test -z "${gl_GNULIB_ENABLED_intprops_TRUE}" && test -z "${gl_GNULIB_ENABLED_intprops_FALSE}"; then
    as_fn_error $? "conditional \"gl_GNULIB_ENABLED_intprops\" was never defined.
***************
*** 25319,25323 ****
  # values after options handling.
  ac_log="
! This file was extended by GNU Texinfo $as_me 6.1, which was
  generated by GNU Autoconf 2.69.  Invocation command line was
  
--- 25509,25513 ----
  # values after options handling.
  ac_log="
! This file was extended by GNU Texinfo $as_me 6.3, which was
  generated by GNU Autoconf 2.69.  Invocation command line was
  
***************
*** 25387,25391 ****
  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  ac_cs_version="\\
! GNU Texinfo config.status 6.1
  configured by $0, generated by GNU Autoconf 2.69,
    with options \\"\$ac_cs_config\\"
--- 25577,25581 ----
  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  ac_cs_version="\\
! GNU Texinfo config.status 6.3
  configured by $0, generated by GNU Autoconf 2.69,
    with options \\"\$ac_cs_config\\"
diff -Nrc2 texinfo-6.1/configure.ac texinfo-6.3/configure.ac
*** texinfo-6.1/configure.ac	2016-02-06 12:21:52.000000000 +0000
--- texinfo-6.3/configure.ac	2016-09-10 20:24:30.000000000 +0100
***************
*** 1,4 ****
  # Process this file with autoconf to produce a configure script.
! # $Id: configure.ac 6991 2016-02-06 12:16:13Z gavin $
  #
  # Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
--- 1,4 ----
  # Process this file with autoconf to produce a configure script.
! # $Id: configure.ac 7353 2016-09-10 13:03:54Z gavin $
  #
  # Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
***************
*** 13,17 ****
  # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  #
! AC_INIT([GNU Texinfo], [6.1], [bug-texinfo@gnu.org])
  
  dnl Must come before AM_INIT_AUTOMAKE.
--- 13,17 ----
  # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  #
! AC_INIT([GNU Texinfo], [6.3], [bug-texinfo@gnu.org])
  
  dnl Must come before AM_INIT_AUTOMAKE.
diff -Nrc2 texinfo-6.1/doc/Makefile.am texinfo-6.3/doc/Makefile.am
*** texinfo-6.1/doc/Makefile.am	2016-02-06 10:43:56.000000000 +0000
--- texinfo-6.3/doc/Makefile.am	2016-07-31 09:48:28.000000000 +0100
***************
*** 1,3 ****
! # $Id: Makefile.am 6989 2016-02-06 10:38:22Z gavin $
  # Makefile.am for texinfo/doc.
  #
--- 1,3 ----
! # $Id: Makefile.am 7290 2016-07-31 08:40:28Z gavin $
  # Makefile.am for texinfo/doc.
  #
***************
*** 28,34 ****
  
  TXI_XLATE = txi-ca.tex txi-cs.tex txi-de.tex txi-en.tex txi-es.tex \
!             txi-fr.tex txi-hu.tex txi-is.tex txi-it.tex txi-nb.tex \
! 	    txi-nl.tex txi-nn.tex txi-pl.tex txi-pt.tex txi-ru.tex \
! 	    txi-sr.tex txi-tr.tex txi-uk.tex
  
  refcard_files = refcard/Makefile refcard/txicmdcheck \
--- 28,34 ----
  
  TXI_XLATE = txi-ca.tex txi-cs.tex txi-de.tex txi-en.tex txi-es.tex \
!             txi-fr.tex txi-hu.tex txi-is.tex txi-it.tex txi-ja.tex \
!             txi-nb.tex txi-nl.tex txi-nn.tex txi-pl.tex txi-pt.tex \
!             txi-ru.tex txi-sr.tex txi-tr.tex txi-uk.tex
  
  refcard_files = refcard/Makefile refcard/txicmdcheck \
***************
*** 40,44 ****
               fdl.texi \
  	     $(man_MANS) $(TXI_XLATE) \
! 	     $(refcard_files) texinfo-tex-test.texi
  
  if INSTALL_WARNINGS
--- 40,45 ----
               fdl.texi \
  	     $(man_MANS) $(TXI_XLATE) \
!              $(refcard_files) texinfo-tex-test.texi \
!              texinfo-ja.tex short-sample-ja.texi
  
  if INSTALL_WARNINGS
diff -Nrc2 texinfo-6.1/doc/Makefile.in texinfo-6.3/doc/Makefile.in
*** texinfo-6.1/doc/Makefile.in	2016-02-06 12:24:04.000000000 +0000
--- texinfo-6.3/doc/Makefile.in	2016-09-10 20:29:55.000000000 +0100
***************
*** 15,19 ****
  @SET_MAKE@
  
! # $Id: Makefile.am 6989 2016-02-06 10:38:22Z gavin $
  # Makefile.am for texinfo/doc.
  #
--- 15,19 ----
  @SET_MAKE@
  
! # $Id: Makefile.am 7290 2016-07-31 08:40:28Z gavin $
  # Makefile.am for texinfo/doc.
  #
***************
*** 123,126 ****
--- 123,127 ----
  	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
  	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+ 	$(top_srcdir)/gnulib/m4/hard-locale.m4 \
  	$(top_srcdir)/gnulib/m4/iconv.m4 \
  	$(top_srcdir)/gnulib/m4/include_next.m4 \
***************
*** 1125,1131 ****
  # INSTALL_INFO = $(top_builddir)/$(native_tools)/util/ginstall-info
  TXI_XLATE = txi-ca.tex txi-cs.tex txi-de.tex txi-en.tex txi-es.tex \
!             txi-fr.tex txi-hu.tex txi-is.tex txi-it.tex txi-nb.tex \
! 	    txi-nl.tex txi-nn.tex txi-pl.tex txi-pt.tex txi-ru.tex \
! 	    txi-sr.tex txi-tr.tex txi-uk.tex
  
  refcard_files = refcard/Makefile refcard/txicmdcheck \
--- 1126,1132 ----
  # INSTALL_INFO = $(top_builddir)/$(native_tools)/util/ginstall-info
  TXI_XLATE = txi-ca.tex txi-cs.tex txi-de.tex txi-en.tex txi-es.tex \
!             txi-fr.tex txi-hu.tex txi-is.tex txi-it.tex txi-ja.tex \
!             txi-nb.tex txi-nl.tex txi-nn.tex txi-pl.tex txi-pt.tex \
!             txi-ru.tex txi-sr.tex txi-tr.tex txi-uk.tex
  
  refcard_files = refcard/Makefile refcard/txicmdcheck \
***************
*** 1138,1142 ****
               fdl.texi \
  	     $(man_MANS) $(TXI_XLATE) \
! 	     $(refcard_files) texinfo-tex-test.texi
  
  texmf_texinfo = $(TEXMF)/tex/texinfo
--- 1139,1144 ----
               fdl.texi \
  	     $(man_MANS) $(TXI_XLATE) \
!              $(refcard_files) texinfo-tex-test.texi \
!              texinfo-ja.tex short-sample-ja.texi
  
  texmf_texinfo = $(TEXMF)/tex/texinfo
diff -Nrc2 texinfo-6.1/doc/refcard/txicmdcheck texinfo-6.3/doc/refcard/txicmdcheck
*** texinfo-6.1/doc/refcard/txicmdcheck	2015-09-15 22:48:47.000000000 +0100
--- texinfo-6.3/doc/refcard/txicmdcheck	2016-07-30 21:36:02.000000000 +0100
***************
*** 1,4 ****
  #!/usr/bin/env perl
! # $Id: txicmdcheck 6623 2015-09-15 21:45:13Z gavin $
  # Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015
  # Free Software Foundation, Inc.
--- 1,4 ----
  #!/usr/bin/env perl
! # $Id: txicmdcheck 7286 2016-07-30 20:28:05Z gavin $
  # Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015
  # Free Software Foundation, Inc.
***************
*** 224,227 ****
--- 224,228 ----
                     |quote-arg
                     |rmacro
+                    |set(short)?contentsaftertitlepage
                     |shorttitle$
                     |\|
diff -Nrc2 texinfo-6.1/doc/refcard/txirefcard.tex texinfo-6.3/doc/refcard/txirefcard.tex
*** texinfo-6.1/doc/refcard/txirefcard.tex	2016-02-06 12:21:52.000000000 +0000
--- texinfo-6.3/doc/refcard/txirefcard.tex	2016-09-10 20:25:35.000000000 +0100
***************
*** 1,4 ****
  % Texinfo reference card.
! % $Id: txirefcard.tex 6991 2016-02-06 12:16:13Z gavin $
  %
  %**start of header
--- 1,4 ----
  % Texinfo reference card.
! % $Id: txirefcard.tex 7353 2016-09-10 13:03:54Z gavin $
  %
  %**start of header
***************
*** 51,55 ****
  
  \def\versionyear{2016}          % year manual was updated
! \def\versionTexinfo{6.1}        % version of Texinfo this manual is for
  
  \def\copyrightnotice{%
--- 51,55 ----
  
  \def\versionyear{2016}          % year manual was updated
! \def\versionTexinfo{6.3}        % version of Texinfo this manual is for
  
  \def\copyrightnotice{%
***************
*** 453,458 ****
  \txicmd{@summarycontents}{}{Synonym for \code{@shortcontents}.}
  \txicmd{@contents}{}{Print a complete table of contents. Has no effect in Info, which uses menus instead.}
- \txicmd{@setcontentsaftertitlepage}{}{Put the table of contents after the `\code{@end titlepage}' even if the \code{@contents} is at the end.}
- \txicmd{@setshortcontentsaftertitlepage}{}{Place the short table of contents after the `\code{@end titlepage}' command even if the \code{@shortcontents} command is at the end.}
  
  
--- 453,456 ----
diff -Nrc2 texinfo-6.1/doc/short-sample-ja.texi texinfo-6.3/doc/short-sample-ja.texi
*** texinfo-6.1/doc/short-sample-ja.texi	1970-01-01 01:00:00.000000000 +0100
--- texinfo-6.3/doc/short-sample-ja.texi	2016-05-06 16:36:32.000000000 +0100
***************
*** 0 ****
--- 1,64 ----
+ \input texinfo-ja
+ 
+ @documentencoding UTF-8
+ @documentlanguage ja
+ 
+ @settitle ã‚µãƒ³ãƒ—ãƒ« ãƒžãƒ‹ãƒ¥ã‚¢ãƒ« 1.0 æ—¥æœ¬èªžç‰ˆ
+ 
+ @copying
+ ã�“ã‚Œã�¯å®Œå…¨ã�ª Texinfo ãƒ•ã‚¡ã‚¤ãƒ«ã�®çŸ­ã�„ä¾‹ã�§ã�™ã€‚
+ 
+ Copyright @copyright{} 2016 Free Software Foundation, Inc.
+ @end copying
+ 
+ @titlepage
+ @title ã‚µãƒ³ãƒ—ãƒ« ã‚¿ã‚¤ãƒˆãƒ«
+ @page
+ @vskip 0pt plus 1filll
+ @insertcopying
+ @end titlepage
+ 
+ @c æœ€åˆ�ã�«ç›®æ¬¡ã‚’å‡ºåŠ›ã�—ã�¾ã�™ã€‚
+ @contents
+ 
+ @ifnottex
+ @node Top
+ @top GNU ã‚µãƒ³ãƒ—ãƒ«
+ 
+ ã�“ã�®ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ã�¯ GNU ã‚µãƒ³ãƒ—ãƒ«
+ (version @value{VERSION}, @value{UPDATED})
+ ç”¨ã�§ã�™ã€‚
+ @end ifnottex
+ 
+ @menu
+ * ç¬¬ä¸€ç« ::           ç¬¬ä¸€ç« ã�¯
+                       ã�“ã�®ã‚µãƒ³ãƒ—ãƒ«ã�®å”¯ä¸€ã�®ç« ã�§ã�™
+ * ç´¢å¼•::             å®Œå…¨ã�ªç´¢å¼•
+ @end menu
+ 
+ 
+ @node ç¬¬ä¸€ç« 
+ @chapter ç¬¬ä¸€ç« 
+ 
+ @cindex ç« , ç¬¬ä¸€
+ 
+ ã�“ã‚Œã�¯ç¬¬ä¸€ç« ã�§ã�™ã€‚
+ @cindex ç´¢å¼•é …ç›®, ä»–
+ 
+ ã�“ã�“ã�¯ç•ªå�·ä»˜ã��ä¸€è¦§ã�§ã�™ã€‚
+ 
+ @enumerate
+ @item
+ ã�“ã‚Œã�¯æœ€åˆ�ã�®é …ç›®ã�§ã�™ã€‚
+ 
+ @item
+ ã�“ã‚Œã�¯äºŒç•ªç›®ã�®é …ç›®ã�§ã�™ã€‚
+ @end enumerate
+ 
+ 
+ @node ç´¢å¼•
+ @unnumbered ç´¢å¼•
+ 
+ @printindex cp
+ 
+ @bye
diff -Nrc2 texinfo-6.1/doc/stamp-1 texinfo-6.3/doc/stamp-1
*** texinfo-6.1/doc/stamp-1	2016-02-06 12:24:35.000000000 +0000
--- texinfo-6.3/doc/stamp-1	2016-09-10 20:36:55.000000000 +0100
***************
*** 1,4 ****
  @set UPDATED 6 February 2016
  @set UPDATED-MONTH February 2016
! @set EDITION 6.1
! @set VERSION 6.1
--- 1,4 ----
  @set UPDATED 6 February 2016
  @set UPDATED-MONTH February 2016
! @set EDITION 6.3
! @set VERSION 6.3
diff -Nrc2 texinfo-6.1/doc/stamp-vti texinfo-6.3/doc/stamp-vti
*** texinfo-6.1/doc/stamp-vti	2016-02-06 12:24:35.000000000 +0000
--- texinfo-6.3/doc/stamp-vti	2016-09-10 20:36:55.000000000 +0100
***************
*** 1,4 ****
! @set UPDATED 6 February 2016
! @set UPDATED-MONTH February 2016
! @set EDITION 6.1
! @set VERSION 6.1
--- 1,4 ----
! @set UPDATED 30 July 2016
! @set UPDATED-MONTH July 2016
! @set EDITION 6.3
! @set VERSION 6.3
diff -Nrc2 texinfo-6.1/doc/texinfo-ja.tex texinfo-6.3/doc/texinfo-ja.tex
*** texinfo-6.1/doc/texinfo-ja.tex	1970-01-01 01:00:00.000000000 +0100
--- texinfo-6.3/doc/texinfo-ja.tex	2016-05-06 16:36:32.000000000 +0100
***************
*** 0 ****
--- 1,84 ----
+ % texinfo-ja.tex -- Japanese texinfo.tex loader
+ % Some CJK packages are necessary to load before texinfo.tex.
+ %
+ % Copyright 2016 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 <http://www.gnu.org/licenses/>.
+ %
+ % Written by Masamichi Hosoda, 6 May 2016, <trueroad@trueroad.jp>
+ 
+ %
+ % For LuaTeX
+ %
+ \ifx\luatexversion\thisisundefined
+ \else
+   % LuaTeX 0.95+ is required.
+   \ifnum\luatexversion<95
+     \errmessage{LuaTeX 0.95+ is required}
+   \fi
+   % LuaTeX-ja: Typeset Japanese with Lua(La)TeX
+   % http://www.ctan.org/tex-archive/macros/luatex/generic/luatexja
+   \openin 1 luatexja.sty \ifeof 1
+     \errmessage{LuaTeX-ja is not found.
+     It is required for Japanese Texinfo files with LuaTeX.
+     http://www.ctan.org/tex-archive/macros/luatex/generic/luatexja
+     It might be contained in texlive-lang-japanese package}
+   \else
+     \input luatexja.sty
+     \def\txijapackage{LaTeX-ja}
+   \fi
+ \fi
+ 
+ %
+ % For XeTeX
+ %
+ \ifx\XeTeXrevision\thisisundefined
+ \else
+   % XeTeX 0.9998+ is required.
+   \ifnum\strcmp{\the\XeTeXversion\XeTeXrevision}{0.9998}<0
+     \errmessage{XeTeX 0.9998+ is required}
+   \fi
+   % zhspacing: Spacing for mixed CJK-English documents in XeTeX
+   % http://www.ctan.org/tex-archive/macros/xetex/generic/zhspacing
+   %
+   % This package is originally for Chinese,
+   % but can also used in Japanese.
+   %
+   \openin 1 zhspacing.sty \ifeof 1
+     \errmessage{zhspacing is not found.
+     It is required for Japanese Texinfo files with LuaTeX.
+     http://www.ctan.org/tex-archive/macros/xetex/generic/zhspacing
+     It might be contained in texlive-lang-chinese.
+     (This package is for Chinese, but can also used in Japanese)}
+   \else
+     \def\zhfont{dummy} % Cancel the request of SimSun font
+     \def\zhpunctfont{dummy} % Cancel the request of SimSun font
+     \input zhspacing.sty
+     \zhspacing
+     \def\txijapackage{zhspacing}
+   \fi
+ \fi
+ 
+ %
+ % For others
+ %
+ \ifx\luatexversion\thisisundefined
+   \ifx\XeTeXrevision\thisisundefined
+     \errmessage{The TeX engine is not LuaTeX / XeTeX.
+     LuaTeX / XeTeX is required for Japanese Texinfo files}
+   \fi
+ \fi
+ 
+ % Original texinfo.tex
+ \input texinfo.tex
diff -Nrc2 texinfo-6.1/doc/texinfo-tex-test.texi texinfo-6.3/doc/texinfo-tex-test.texi
*** texinfo-6.1/doc/texinfo-tex-test.texi	2016-02-06 10:36:56.000000000 +0000
--- texinfo-6.3/doc/texinfo-tex-test.texi	2016-08-09 22:56:43.000000000 +0100
***************
*** 25,28 ****
--- 25,30 ----
  @showboxbreadth=1000
  
+ @documentencoding UTF-8
+ 
  @contents
  
***************
*** 162,165 ****
--- 164,177 ----
  xx e xx
  
+ @section Closing brace following empty macro argument
+ 
+ @macro Mac{x}
+ A@acronym{\x\}A
+ @end macro
+ 
+ @Mac{}
+ 
+ AA
+ 
  @section Trailing newlines in macro bodies
  
***************
*** 252,256 ****
  @end macro
  
! No space should appear right after an `X':
  
  @noindent @Mac{b} @Mac{ b} @Mac{b  } @Mac{ b }
--- 264,268 ----
  @end macro
  
! No trimming for single-arg macros.
  
  @noindent @Mac{b} @Mac{ b} @Mac{b  } @Mac{ b }
***************
*** 287,293 ****
  @tex
  \gdef \commenceindex{%
  \page
- \begindoublecolumns
  \smallfonts \rm
  \tolerance = 9500
  \plainfrenchspacing
--- 299,306 ----
  @tex
  \gdef \commenceindex{%
+ \begingroup
  \page
  \smallfonts \rm
+ \begindoublecolumns
  \tolerance = 9500
  \plainfrenchspacing
***************
*** 299,302 ****
--- 312,317 ----
  \catcode`\@=0 \catcode`\\=13
  \enddoublecolumns
+ \endgroup
+ \hrule
  }
  @end tex
***************
*** 304,307 ****
--- 319,326 ----
  @chapter Index display
  
+ 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 Long index entries
  
***************
*** 363,367 ****
  \entry {\code {pdftex}}{176}
  \entry {\code {pdftex\r {, and images}}}{97}
! \entry {\code {pdftexi2dvi}}{166}
  \entry {Period in node name}{37}
  \entry {Periods, inserting}{111}
--- 382,386 ----
  \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}
***************
*** 418,421 ****
--- 437,447 ----
  \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}
***************
*** 428,438 ****
  \entry {Quoting, automatic for some macros}{156}
  \initial {R}
- \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}
--- 454,457 ----
***************
*** 489,493 ****
  \entry {\code {pdftex}}{176}
  \entry {\code {pdftex\r {, and images}}}{97}
! \entry {\code {pdftexi2dvi}}{166}
  \entry {Period in node name}{37}
  \entry {Periods, inserting}{111}
--- 508,512 ----
  \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}
***************
*** 594,597 ****
--- 613,619 ----
  \finishindex
  
+ If the above is in two columns, check that the space below the initials
+ `A' and `B' is even.
+ 
  @commenceindex
  \initial{A}
***************
*** 635,638 ****
--- 657,977 ----
  \finishindex
  
+ @section Final page of index hard to balance
+ 
+ The left column of the final page of the index should be shorter than the
+ right column here, and 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
+ 
+ @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
+ 
+ 
+ @section Test of index widow elimination
+ 
+ First time shows without widow elimination.  Second time shows it with
+ (uses @file{texinfo-tex-test.WIDOWs} file).  For test to work properly,
+ @code{ordm} should be a widow in the first case, and not in the second 
+ case.
+ 
+ @commenceindex
+ \input texinfo-tex-test.WIDOWs
+ \finishindex
+ 
+ 
+ @page
+ 
+ @printindex WIDOW
+ 
+ 
  @section Non-alphanumeric Index Initials
  
***************
*** 657,660 ****
--- 996,1093 ----
  
  
+ @chapter Test of non-alphanumeric characters
+ 
+ Not in code: @{@}@@#\
+ 
+ In code @t{@{@}@@#\}
+ 
+ 
+ @chapter Test of auxiliary files
+ 
+ Need to test with @command{texi2dvi}.
+ 
+ Undefined value in anchor: @anchor{@value{ho} ho}
+ 
+ Xref to said anchor: @xref{@value{ho} ho}.
+ 
+ @set auxvalue this is the value
+ Defined value in anchor: @anchor{@value{auxvalue} ho}
+ 
+ Xref to said anchor: @xref{@value{auxvalue} ho}.  (Should definitely 
+ work.)
+ 
+ @defindex ax
+ 
+ value in index entry
+ @axindex @value{ho} in index entry
+ 
+ defined value in index entry (this should definitely work)
+ @axindex @value{auxvalue} in index entry
+ 
+ value in index entry, but only defined afterwards
+ @axindex @value{definedafter} index entry
+ 
+ @axindex @b{another}
+ 
+ some more text.
+ 
+ test of macro in index entry:
+ @macro MyMac {arg}
+ ffff\arg\ggggg
+ @end macro
+ 
+ @axindex @MyMac{bah}
+ 
+ @page
+ 
+ @set definedafter Defining this now
+ @set definedafter Defining this again
+ 
+ @printindex ax
+ 
+ @section Test of macros with @samp{@@} in index
+ 
+ @defindex BB
+ 
+ @macro Mac {arg}
+ \arg\@}
+ @end macro
+ 
+ @macro MacTwo {arg}
+ @{@}
+ @end macro
+ 
+ @BBindex @Mac{CCCC @@}
+ 
+ @BBindex @MacTwo{DDDD @@}
+ @printindex BB
+ 
+ 
+ @section Test of @code{@@synindex}
+ 
+ @defindex foo
+ @defindex bar
+ 
+ @synindex foo bar
+ 
+ @fooindex One
+ @barindex Two
+ 
+ Should be two entries, not one below.
+ 
+ @printindex bar
+ 
+ 
+ @chapter @code{@@set} and @code{@@value}
+ 
+ @section Another test of @t{@@value}
+ 
+ Underscores and hyphens in value
+ 
+ @set foo-bar_ neenaw
+ 
+ The value is @value{foo-bar_}.
+ 
+ 
  @chapter Cross-references
  
***************
*** 685,688 ****
--- 1118,1167 ----
  @section Target
  
+ @chapter Copying and captions
+ 
+ @section Copying
+ 
+ @documentencoding UTF-8
+ 
+ @copying
+ This manual is for blah-de-blah.@*
+ Backslash \@*
+ 
+ Copyrite @copyright{} 201X@*
+ Ã¾ Ã¾ Ã¾ Ã¾ Ã¾ Ã¾ Ã¾ Ã¾
+ @end copying
+ 
+ Now for the @@insertcopying:
+ 
+ @insertcopying
+ 
+ 
+ @section Captions
+ 
+ 
+ There's a float in this section.
+ 
+ @float Figure,fig:ex1
+ This is a float.
+ 
+ @caption{This is a caption.
+ Multiple paragraphs are allowed here.  Here are some ``special'' 
+ characters: \ Ã .
+ 
+ Paragraph breaks allowed.
+ }
+ 
+ @shortcaption{short caption text.}
+ 
+ This float should have a caption somewhere.
+ @end float
+ 
+ List of floats now:
+ 
+ @listoffloats Figure
+ 
+ 
+ 
+ 
  @chapter Document encoding
  
***************
*** 712,715 ****
--- 1191,1211 ----
  
  
+ @section Test of characters in section title
+ 
+ Check table of contents.
+ 
+ For PDF output, check the bookmarks pane in the reader.
+ (Currently plain ASCII approximations are used for the UTF-8 encoding.)
+ 
+ @section --- Ã¼bersicht
+ 
+ @section --- @"Ubersicht
+ 
+ @section @{ @} @@ @{@ @} @arrow{} @atchar{} @lbracechar{}
+ 
+ This section should be called ``@{ @} @@ @{ @} @arrow{} @@ @{''.
+ 
+ 
+ 
  @chapter PDF link colours
  
diff -Nrc2 texinfo-6.1/doc/texinfo.tex texinfo-6.3/doc/texinfo.tex
*** texinfo-6.1/doc/texinfo.tex	2016-02-05 08:09:54.000000000 +0000
--- texinfo-6.3/doc/texinfo.tex	2016-08-16 20:53:17.000000000 +0100
***************
*** 4,8 ****
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2016-02-05.07}
  %
  % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
--- 4,8 ----
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2016-08-16.20}
  %
  % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
***************
*** 68,71 ****
--- 68,75 ----
    \catcode`+=\active \catcode`\_=\active}
  
+ % LaTeX's \typeout.  This ensures that the messages it is used for
+ % are identical in format to the corresponding ones from latex/pdflatex.
+ \def\typeout{\immediate\write17}%
+ 
  \chardef\other=12
  
***************
*** 311,315 ****
  \newdimen\bindingoffset
  \newdimen\normaloffset
! \newdimen\pagewidth \newdimen\pageheight
  
  % Main output routine.
--- 315,319 ----
  \newdimen\bindingoffset
  \newdimen\normaloffset
! \newdimen\txipagewidth \newdimen\txipageheight
  
  % Main output routine.
***************
*** 335,339 ****
    % 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=\pagewidth \texinfochars}
    %
    % Retrieve the information for the headings from the marks in the page,
--- 339,343 ----
    % 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,
***************
*** 434,438 ****
  
  % Main part of page, including any footnotes
! \def\pagebody#1{\vbox to\pageheight{\boxmaxdepth=\maxdepth #1}}
  {\catcode`\@ =11
  \gdef\pagecontents#1{\ifvoid\topins\else\unvbox\topins\fi
--- 438,442 ----
  
  % Main part of page, including any footnotes
! \def\pagebody#1{\vbox to\txipageheight{\boxmaxdepth=\maxdepth #1}}
  {\catcode`\@ =11
  \gdef\pagecontents#1{\ifvoid\topins\else\unvbox\topins\fi
***************
*** 725,733 ****
    \dimen0 = \ht\groupbox  \advance\dimen0 by \dp\groupbox
    % \dimen2 is how much space is left on the page (more or less).
!   \dimen2 = \pageheight   \advance\dimen2 by -\pagetotal
    % if the group doesn't fit on the current page, and it's a big big
    % group, force a page break.
    \ifdim \dimen0 > \dimen2
!     \ifdim \pagetotal < \vfilllimit\pageheight
        \page
      \fi
--- 729,737 ----
    \dimen0 = \ht\groupbox  \advance\dimen0 by \dp\groupbox
    % \dimen2 is how much space is left on the page (more or less).
!   \dimen2 = \txipageheight   \advance\dimen2 by -\pagetotal
    % if the group doesn't fit on the current page, and it's a big big
    % group, force a page break.
    \ifdim \dimen0 > \dimen2
!     \ifdim \pagetotal < \vfilllimit\txipageheight
        \page
      \fi
***************
*** 1101,1104 ****
--- 1105,1188 ----
  \newif\ifpdfmakepagedest
  
+ %
+ % For LuaTeX
+ %
+ 
+ \newif\iftxiuseunicodedestname
+ \txiuseunicodedestnamefalse % For pdfTeX etc.
+ 
+ \ifx\luatexversion\thisisundefined
+ \else
+   % Use Unicode destination names
+   \txiuseunicodedestnametrue
+   % Escape PDF strings with converting UTF-16 from UTF-8
+   \begingroup
+     \catcode`\%=12
+     \directlua{
+       function UTF16oct(str)
+         tex.sprint(string.char(0x5c) .. '376' .. string.char(0x5c) .. '377')
+         for c in string.utfvalues(str) do
+           if c < 0x10000 then
+             tex.sprint(
+               string.format(string.char(0x5c) .. string.char(0x25) .. '03o' ..
+                             string.char(0x5c) .. string.char(0x25) .. '03o',
+                             (c / 256), (c % 256)))
+           else
+             c = c - 0x10000
+             local c_hi = c / 1024 + 0xd800
+             local c_lo = c % 1024 + 0xdc00
+             tex.sprint(
+               string.format(string.char(0x5c) .. string.char(0x25) .. '03o' ..
+                             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)))
+           end
+         end
+       end
+     }
+   \endgroup
+   \def\pdfescapestrutfsixteen#1{\directlua{UTF16oct('\luaescapestring{#1}')}}
+   % Escape PDF strings without converting
+   \begingroup
+     \directlua{
+       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(
+               string.format(string.char(0x5c) .. string.char(0x25) .. '03o',
+                             c))
+           else
+             tex.sprint(string.char(c))
+           end
+         end
+       end
+     }
+   \endgroup
+   \def\pdfescapestring#1{\directlua{PDFescstr('\luaescapestring{#1}')}}
+   \ifnum\luatexversion>84
+     % For LuaTeX >= 0.85
+     \def\pdfdest{\pdfextension dest}
+     \let\pdfoutput\outputmode
+     \def\pdfliteral{\pdfextension literal}
+     \def\pdfcatalog{\pdfextension catalog}
+     \def\pdftexversion{\numexpr\pdffeedback version\relax}
+     \let\pdfximage\saveimageresource
+     \let\pdfrefximage\useimageresource
+     \let\pdflastximage\lastsavedimageresourceindex
+     \def\pdfendlink{\pdfextension endlink\relax}
+     \def\pdfoutline{\pdfextension outline}
+     \def\pdfstartlink{\pdfextension startlink}
+     \def\pdffontattr{\pdfextension fontattr}
+     \def\pdfobj{\pdfextension obj}
+     \def\pdflastobj{\numexpr\pdffeedback lastobj\relax}
+     \let\pdfpagewidth\pagewidth
+     \let\pdfpageheight\pageheight
+     \edef\pdfhorigin{\pdfvariable horigin}
+     \edef\pdfvorigin{\pdfvariable vorigin}
+   \fi
+ \fi
+ 
  % when pdftex is run in dvi mode, \pdfoutput is defined (so \pdfoutput=1
  % can be set).  So we test for \relax and 0 as well as being undefined.
***************
*** 1131,1134 ****
--- 1215,1219 ----
      % No primitive available; should we give a warning or log?
      % Many times it won't matter.
+     \xdef#1{#1}%
    \else
      % The expandable \pdfescapestring primitive escapes parentheses,
***************
*** 1137,1140 ****
--- 1222,1233 ----
    \fi
  }
+ \def\txiescapepdfutfsixteen#1{%
+   \ifx\pdfescapestrutfsixteen\thisisundefined
+     % No UTF-16 converting macro available.
+     \txiescapepdf{#1}%
+   \else
+     \xdef#1{\pdfescapestrutfsixteen{#1}}%
+   \fi
+ }
  
  \newhelp\nopdfimagehelp{Texinfo supports .png, .jpg, .jpeg, and .pdf images
***************
*** 1246,1260 ****
      \fi}
    %
!   \def\pdfmkdest#1{{%
      % We have to set dummies so commands such as @code, and characters
      % such as \, aren't expanded when present in a section title.
      \indexnofonts
-     \turnoffactive
      \makevalueexpandable
      \def\pdfdestname{#1}%
      \txiescapepdf\pdfdestname
-     \safewhatsit{\pdfdest name{\pdfdestname} xyz}%
    }}
    %
    % used to mark target names; must be expandable.
    \def\pdfmkpgn#1{#1}
--- 1339,1413 ----
      \fi}
    %
!   \def\setpdfdestname#1{{%
      % We have to set dummies so commands such as @code, and characters
      % such as \, aren't expanded when present in a section title.
      \indexnofonts
      \makevalueexpandable
+     \turnoffactive
+     \iftxiuseunicodedestname
+       \ifx \declaredencoding \latone
+         % Pass through Latin-1 characters.
+         % LuaTeX with byte wise I/O converts Latin-1 characters to Unicode.
+       \else
+         \ifx \declaredencoding \utfeight
+           % Pass through Unicode characters.
+         \else
+           % Use ASCII approximations in destination names.
+           \passthroughcharsfalse
+         \fi
+       \fi
+     \else
+       % Use ASCII approximations in destination names.
+       \passthroughcharsfalse
+     \fi
      \def\pdfdestname{#1}%
      \txiescapepdf\pdfdestname
    }}
    %
+   \def\setpdfoutlinetext#1{{%
+     \indexnofonts
+     \makevalueexpandable
+     \turnoffactive
+     \ifx \declaredencoding \latone
+       % The PDF format can use an extended form of Latin-1 in bookmark
+       % strings.  See Appendix D of the PDF Reference, Sixth Edition, for
+       % the "PDFDocEncoding".
+       \passthroughcharstrue
+       % Pass through Latin-1 characters.
+       %   LuaTeX: Convert to Unicode
+       %   pdfTeX: Use Latin-1 as PDFDocEncoding
+       \def\pdfoutlinetext{#1}%
+     \else
+       \ifx \declaredencoding \utfeight
+         \ifx\luatexversion\thisisundefined
+           % For pdfTeX  with UTF-8.
+           % TODO: the PDF format can use UTF-16 in bookmark strings,
+           % but the code for this isn't done yet.
+           % Use ASCII approximations.
+           \passthroughcharsfalse
+           \def\pdfoutlinetext{#1}%
+         \else
+           % For LuaTeX with UTF-8.
+           % Pass through Unicode characters for title texts.
+           \passthroughcharstrue
+           \def\pdfoutlinetext{#1}%
+         \fi
+       \else
+         % For non-Latin-1 or non-UTF-8 encodings.
+         % Use ASCII approximations.
+         \passthroughcharsfalse
+         \def\pdfoutlinetext{#1}%
+       \fi
+     \fi
+     % LuaTeX: Convert to UTF-16
+     % pdfTeX: Use Latin-1 as PDFDocEncoding
+     \txiescapepdfutfsixteen\pdfoutlinetext
+   }}
+   %
+   \def\pdfmkdest#1{%
+     \setpdfdestname{#1}%
+     \safewhatsit{\pdfdest name{\pdfdestname} xyz}%
+   }
+   %
    % used to mark target names; must be expandable.
    \def\pdfmkpgn#1{#1}
***************
*** 1284,1299 ****
      % text in the case where a section has no node, but it doesn't
      % seem worth the trouble, since most documents are normally structured.
!     \edef\pdfoutlinedest{#3}%
!     \ifx\pdfoutlinedest\empty
!       \def\pdfoutlinedest{#4}%
!     \else
!       \txiescapepdf\pdfoutlinedest
      \fi
      %
!     % Also escape PDF chars in the display string.
!     \edef\pdfoutlinetext{#1}%
!     \txiescapepdf\pdfoutlinetext
!     %
!     \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}%
    }
    %
--- 1437,1447 ----
      % text in the case where a section has no node, but it doesn't
      % seem worth the trouble, since most documents are normally structured.
!     \setpdfoutlinetext{#1}
!     \setpdfdestname{#3}
!     \ifx\pdfdestname\empty
!       \def\pdfdestname{#4}%
      \fi
      %
!     \pdfoutline goto name{\pdfmkpgn{\pdfdestname}}#2{\pdfoutlinetext}%
    }
    %
***************
*** 1451,1460 ****
  
  %
! % @image support for XeTeX
  %
- \newif\ifxeteximgpdf
  \ifx\XeTeXrevision\thisisundefined
  \else
    %
    % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
    \def\doxeteximage#1#2#3{%
--- 1599,1840 ----
  
  %
! % For XeTeX
  %
  \ifx\XeTeXrevision\thisisundefined
  \else
    %
+   % XeTeX version check
+   %
+   \ifnum\strcmp{\the\XeTeXversion\XeTeXrevision}{0.99996}>-1
+     % TeX Live 2016 contains XeTeX 0.99996 and xdvipdfmx 20160307.
+     % It can use the `dvipdfmx:config' special (from TeX Live SVN r40941).
+     % For avoiding PDF destination name replacement, we use this special
+     % instead of xdvipdfmx's command line option `-C 0x0010'.
+     \special{dvipdfmx:config C 0x0010}
+     % XeTeX 0.99995+ comes with xdvipdfmx 20160307+.
+     % It can handle Unicode destination names for PDF.
+     \txiuseunicodedestnametrue
+   \else
+     % XeTeX < 0.99996 (TeX Live < 2016) cannot use the
+     % `dvipdfmx:config' special.
+     % So for avoiding PDF destination name replacement,
+     % xdvipdfmx's command line option `-C 0x0010' is necessary.
+     %
+     % XeTeX < 0.99995 can not handle Unicode destination names for PDF
+     % because xdvipdfmx 20150315 has a UTF-16 conversion issue.
+     % It is fixed by xdvipdfmx 20160106 (TeX Live SVN r39753).
+     \txiuseunicodedestnamefalse
+   \fi
+   %
+   % Color support
+   %
+   \def\rgbDarkRed{0.50 0.09 0.12}
+   \def\rgbBlack{0 0 0}
+   %
+   \def\pdfsetcolor#1{\special{pdf:scolor [#1]}}
+   %
+   % 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}}%
+     \domark
+     \pdfsetcolor{#1}%
+   }
+   %
+   \def\maincolor{\rgbBlack}
+   \pdfsetcolor{\maincolor}
+   \edef\thiscolor{\maincolor}
+   \def\lastcolordefs{}
+   %
+   \def\makefootline{%
+     \baselineskip24pt
+     \line{\pdfsetcolor{\maincolor}\the\footline}%
+   }
+   %
+   \def\makeheadline{%
+     \vbox to 0pt{%
+       \vskip-22.5pt
+       \line{%
+         \vbox to8.5pt{}%
+         % Extract \thiscolor definition from the marks.
+         \getcolormarks
+         % Typeset the headline with \maincolor, then restore the color.
+         \pdfsetcolor{\maincolor}\the\headline\pdfsetcolor{\thiscolor}%
+       }%
+       \vss
+     }%
+     \nointerlineskip
+   }
+   %
+   % PDF outline support
+   %
+   % Emulate pdfTeX primitive
+   \def\pdfdest name#1 xyz{%
+     \special{pdf:dest (#1) [@thispage /XYZ @xpos @ypos null]}%
+   }
+   %
+   \def\setpdfdestname#1{{%
+     % We have to set dummies so commands such as @code, and characters
+     % such as \, aren't expanded when present in a section title.
+     \indexnofonts
+     \makevalueexpandable
+     \turnoffactive
+     \iftxiuseunicodedestname
+       % Pass through Unicode characters.
+     \else
+       % Use ASCII approximations in destination names.
+       \passthroughcharsfalse
+     \fi
+     \def\pdfdestname{#1}%
+     \txiescapepdf\pdfdestname
+   }}
+   %
+   \def\setpdfoutlinetext#1{{%
+     \turnoffactive
+     % Always use Unicode characters in title texts.
+     \def\pdfoutlinetext{#1}%
+     % For XeTeX, xdvipdfmx converts to UTF-16.
+     % So we do not convert.
+     \txiescapepdf\pdfoutlinetext
+   }}
+   %
+   \def\pdfmkdest#1{%
+     \setpdfdestname{#1}%
+     \safewhatsit{\pdfdest name{\pdfdestname} xyz}%
+   }
+   %
+   % by default, use black for everything.
+   \def\urlcolor{\rgbBlack}
+   \def\linkcolor{\rgbBlack}
+   \def\endlink{\setcolor{\maincolor}\pdfendlink}
+   %
+   \def\dopdfoutline#1#2#3#4{%
+     \setpdfoutlinetext{#1}
+     \setpdfdestname{#3}
+     \ifx\pdfdestname\empty
+       \def\pdfdestname{#4}%
+     \fi
+     %
+     \special{pdf:out [-] #2 << /Title (\pdfoutlinetext) /A
+       << /S /GoTo /D (\pdfdestname) >> >> }%
+   }
+   %
+   \def\pdfmakeoutlines{%
+     \begingroup
+       %
+       % For XeTeX, counts of subentries are not necessary.
+       % Therefore, we read toc only once.
+       %
+       % We use node names as destinations.
+       \def\partentry##1##2##3##4{}% ignore parts in the outlines
+       \def\numchapentry##1##2##3##4{%
+         \dopdfoutline{##1}{1}{##3}{##4}}%
+       \def\numsecentry##1##2##3##4{%
+         \dopdfoutline{##1}{2}{##3}{##4}}%
+       \def\numsubsecentry##1##2##3##4{%
+         \dopdfoutline{##1}{3}{##3}{##4}}%
+       \def\numsubsubsecentry##1##2##3##4{%
+         \dopdfoutline{##1}{4}{##3}{##4}}%
+       %
+       \let\appentry\numchapentry%
+       \let\appsecentry\numsecentry%
+       \let\appsubsecentry\numsubsecentry%
+       \let\appsubsubsecentry\numsubsubsecentry%
+       \let\unnchapentry\numchapentry%
+       \let\unnsecentry\numsecentry%
+       \let\unnsubsecentry\numsubsecentry%
+       \let\unnsubsubsecentry\numsubsubsecentry%
+       %
+       % For XeTeX, xdvipdfmx converts strings to UTF-16.
+       % Therefore, the encoding and the language may not be considered.
+       %
+       \indexnofonts
+       \setupdatafile
+       % We can have normal brace characters in the PDF outlines, unlike
+       % Texinfo index files.  So set that up.
+       \def\{{\lbracecharliteral}%
+       \def\}{\rbracecharliteral}%
+       \catcode`\\=\active \otherbackslash
+       \input \tocreadfilename
+     \endgroup
+   }
+   {\catcode`[=1 \catcode`]=2
+    \catcode`{=\other \catcode`}=\other
+    \gdef\lbracecharliteral[{]%
+    \gdef\rbracecharliteral[}]%
+   ]
+ 
+   \special{pdf:docview << /PageMode /UseOutlines >> }
+   % ``\special{pdf:tounicode ...}'' is not necessary
+   % because xdvipdfmx converts strings from UTF-8 to UTF-16 without it.
+   % However, due to a UTF-16 conversion issue of xdvipdfmx 20150315,
+   % ``\special{pdf:dest ...}'' cannot handle non-ASCII strings.
+   % It is fixed by xdvipdfmx 20160106 (TeX Live SVN r39753).
+ %
+   \def\skipspaces#1{\def\PP{#1}\def\D{|}%
+     \ifx\PP\D\let\nextsp\relax
+     \else\let\nextsp\skipspaces
+       \addtokens{\filename}{\PP}%
+       \advance\filenamelength by 1
+     \fi
+     \nextsp}
+   \def\getfilename#1{%
+     \filenamelength=0
+     % If we don't expand the argument now, \skipspaces will get
+     % snagged on things like "@value{foo}".
+     \edef\temp{#1}%
+     \expandafter\skipspaces\temp|\relax
+   }
+   % make a live url in pdf output.
+   \def\pdfurl#1{%
+     \begingroup
+       % it seems we really need yet another set of dummies; have not
+       % tried to figure out what each command should do in the context
+       % of @url.  for now, just make @/ a no-op, that's the only one
+       % people have actually reported a problem with.
+       %
+       \normalturnoffactive
+       \def\@{@}%
+       \let\/=\empty
+       \makevalueexpandable
+       % do we want to go so far as to use \indexnofonts instead of just
+       % special-casing \var here?
+       \def\var##1{##1}%
+       %
+       \leavevmode\setcolor{\urlcolor}%
+       \special{pdf:bann << /Border [0 0 0]
+         /Subtype /Link /A << /S /URI /URI (#1) >> >>}%
+     \endgroup}
+   \def\endlink{\setcolor{\maincolor}\special{pdf:eann}}
+   \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}
+   \def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}\toksA={#2}}
+   \def\maketoks{%
+     \expandafter\poptoks\the\toksA|ENDTOKS|\relax
+     \ifx\first0\adn0
+     \else\ifx\first1\adn1 \else\ifx\first2\adn2 \else\ifx\first3\adn3
+     \else\ifx\first4\adn4 \else\ifx\first5\adn5 \else\ifx\first6\adn6
+     \else\ifx\first7\adn7 \else\ifx\first8\adn8 \else\ifx\first9\adn9
+     \else
+       \ifnum0=\countA\else\makelink\fi
+       \ifx\first.\let\next=\done\else
+         \let\next=\maketoks
+         \addtokens{\toksB}{\the\toksD}
+         \ifx\first,\addtokens{\toksB}{\space}\fi
+       \fi
+     \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
+     \next}
+   \def\makelink{\addtokens{\toksB}%
+     {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0}
+   \def\pdflink#1{%
+     \special{pdf:bann << /Border [0 0 0]
+       /Type /Annot /Subtype /Link /A << /S /GoTo /D (#1) >> >>}%
+     \setcolor{\linkcolor}#1\endlink}
+   \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
+ %
+   %
+   % @image support
+   %
    % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
    \def\doxeteximage#1#2#3{%
***************
*** 1462,1471 ****
      \def\xeteximageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
      %
!     % XeTeX (and the PDF format) support .pdf, .png, .jpg (among
      % others).  Let's try in that order, PDF first since if
      % someone has a scalable image, presumably better to use that than a
      % bitmap.
      \let\xeteximgext=\empty
-     \xeteximgpdffalse
      \begingroup
        \openin 1 #1.pdf \ifeof 1
--- 1842,1850 ----
      \def\xeteximageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
      %
!     % XeTeX (and the PDF format) supports .pdf, .png, .jpg (among
      % others).  Let's try in that order, PDF first since if
      % someone has a scalable image, presumably better to use that than a
      % bitmap.
      \let\xeteximgext=\empty
      \begingroup
        \openin 1 #1.pdf \ifeof 1
***************
*** 1484,1498 ****
            \else \gdef\xeteximgext{png}%
            \fi
!         \else \gdef\xeteximgext{PDF} \global\xeteximgpdftrue%
          \fi
!       \else \gdef\xeteximgext{pdf} \global\xeteximgpdftrue%
        \fi
        \closein 1
      \endgroup
      %
!     \ifxeteximgpdf
        \XeTeXpdffile "#1".\xeteximgext ""
      \else
!       \XeTeXpicfile "#1".\xeteximgext ""
      \fi
      \ifdim \wd0 >0pt width \xeteximagewidth \fi
--- 1863,1883 ----
            \else \gdef\xeteximgext{png}%
            \fi
!         \else \gdef\xeteximgext{PDF}%
          \fi
!       \else \gdef\xeteximgext{pdf}%
        \fi
        \closein 1
      \endgroup
      %
!     \def\xetexpdfext{pdf}%
!     \ifx\xeteximgext\xetexpdfext
        \XeTeXpdffile "#1".\xeteximgext ""
      \else
!       \def\xetexpdfext{PDF}%
!       \ifx\xeteximgext\xetexpdfext
!         \XeTeXpdffile "#1".\xeteximgext ""
!       \else
!         \XeTeXpicfile "#1".\xeteximgext ""
!       \fi
      \fi
      \ifdim \wd0 >0pt width \xeteximagewidth \fi
***************
*** 2660,2663 ****
--- 3045,3049 ----
      \ifdim\wd0 > 0pt
        \ifpdf
+         % For pdfTeX and LuaTeX
          \ifurefurlonlylink
            % PDF plus option to not display url, show just arg
***************
*** 2669,2673 ****
          \fi
        \else
!         \unhbox0\ (\urefcode{#1})% DVI, always show arg and url
        \fi
      \else
--- 3055,3071 ----
          \fi
        \else
!         \ifx\XeTeXrevision\thisisundefined
!           \unhbox0\ (\urefcode{#1})% DVI, always show arg and url
!         \else
!           % For XeTeX
!           \ifurefurlonlylink
!             % PDF plus option to not display url, show just arg
!             \unhbox0             
!           \else
!             % PDF, normally display both arg and url for consistency,
!             % visibility, if the pdf is eventually used to print, etc.
!             \unhbox0\ (\urefcode{#1})%
!           \fi
!         \fi
        \fi
      \else
***************
*** 2770,2774 ****
    \endgroup}
  \else
!   \let\email=\uref
  \fi
  
--- 3168,3183 ----
    \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
  \fi
  
***************
*** 3005,3025 ****
  
  % @{ @} @lbracechar{} @rbracechar{} all generate brace characters.
! % Unless we're in typewriter, use \ecfont because the CM text fonts do
! % not have braces, and we don't want to switch into math.
! \def\mylbrace{{\ifmonospace\else\ecfont\fi \char123}}
! \def\myrbrace{{\ifmonospace\else\ecfont\fi \char125}}
! \let\{=\mylbrace \let\lbracechar=\{
! \let\}=\myrbrace \let\rbracechar=\}
! \begingroup
!   % Definitions to produce \{ and \} commands for indices,
!   % and @{ and @} for the aux/toc files.
!   \catcode`\{ = \other \catcode`\} = \other
!   \catcode`\[ = 1 \catcode`\] = 2
!   \catcode`\! = 0 \catcode`\\ = \other
!   !gdef!lbracecmd[\{]%
!   !gdef!rbracecmd[\}]%
!   !gdef!lbraceatcmd[@{]%
!   !gdef!rbraceatcmd[@}]%
! !endgroup
  
  % @comma{} to avoid , parsing problems.
--- 3414,3421 ----
  
  % @{ @} @lbracechar{} @rbracechar{} all generate brace characters.
! \def\lbracechar{{\ifmonospace\char123\else\ensuremath\lbrace\fi}}
! \def\rbracechar{{\ifmonospace\char125\else\ensuremath\rbrace\fi}}
! \let\{=\lbracechar
! \let\}=\rbracechar
  
  % @comma{} to avoid , parsing problems.
***************
*** 3324,3334 ****
  \newif\iffinishedtitlepage
  
! % Do an implicit @contents or @shortcontents after @end titlepage if the
! % user says @setcontentsaftertitlepage or @setshortcontentsaftertitlepage.
! %
! \newif\ifsetcontentsaftertitlepage
!  \let\setcontentsaftertitlepage = \setcontentsaftertitlepagetrue
! \newif\ifsetshortcontentsaftertitlepage
!  \let\setshortcontentsaftertitlepage = \setshortcontentsaftertitlepagetrue
  
  \parseargdef\shorttitlepage{%
--- 3720,3733 ----
  \newif\iffinishedtitlepage
  
! % @setcontentsaftertitlepage used to do an implicit @contents or
! % @shortcontents after @end titlepage, but it is now obsolete.
! \def\setcontentsaftertitlepage{%
!   \errmessage{@setcontentsaftertitlepage has been removed as a Texinfo
!               command; move your @contents command if you want the contents
!               after the title page.}}%
! \def\setshortcontentsaftertitlepage{%
!   \errmessage{@setshortcontentsaftertitlepage has been removed as a Texinfo
!               command; move your @shortcontents and @contents commands if you 
!               want the contents after the title page.}}%
  
  \parseargdef\shorttitlepage{%
***************
*** 3372,3389 ****
    % in effect the toc pages will come out with page numbers.
    \HEADINGSon
-   %
-   % If they want short, they certainly want long too.
-   \ifsetshortcontentsaftertitlepage
-     \shortcontents
-     \contents
-     \global\let\shortcontents = \relax
-     \global\let\contents = \relax
-   \fi
-   %
-   \ifsetcontentsaftertitlepage
-     \contents
-     \global\let\contents = \relax
-     \global\let\shortcontents = \relax
-   \fi
  }
  
--- 3771,3774 ----
***************
*** 3489,3493 ****
    % Leave some space for the footline.  Hopefully ok to assume
    % @evenfooting will not be used by itself.
!   \global\advance\pageheight by -12pt
    \global\advance\vsize by -12pt
  }
--- 3874,3878 ----
    % Leave some space for the footline.  Hopefully ok to assume
    % @evenfooting will not be used by itself.
!   \global\advance\txipageheight by -12pt
    \global\advance\vsize by -12pt
  }
***************
*** 3514,3520 ****
  \def\evenfootingmarks{\headingmarks{even}{footing}}
  \def\oddfootingmarks{\headingmarks{odd}{footing}}
! \def\everyheadingmarks#1 {\headingmarks{even}{heading}{#1}
                            \headingmarks{odd}{heading}{#1} }
! \def\everyfootingmarks#1 {\headingmarks{even}{footing}{#1}
                            \headingmarks{odd}{footing}{#1} }
  % #1 = even/odd, #2 = heading/footing, #3 = top/bottom.
--- 3899,3905 ----
  \def\evenfootingmarks{\headingmarks{even}{footing}}
  \def\oddfootingmarks{\headingmarks{odd}{footing}}
! \parseargdef\everyheadingmarks{\headingmarks{even}{heading}{#1}
                            \headingmarks{odd}{heading}{#1} }
! \parseargdef\everyfootingmarks{\headingmarks{even}{footing}{#1}
                            \headingmarks{odd}{footing}{#1} }
  % #1 = even/odd, #2 = heading/footing, #3 = top/bottom.
***************
*** 3537,3541 ****
  % and turned `on' after @end titlepage.
  
! \def\headings #1 {\csname HEADINGS#1\endcsname}
  
  \def\headingsoff{% non-global headings elimination
--- 3922,3926 ----
  % and turned `on' after @end titlepage.
  
! \parseargdef\headings{\csname HEADINGS#1\endcsname}
  
  \def\headingsoff{% non-global headings elimination
***************
*** 4351,4354 ****
--- 4736,4764 ----
  }
  
+ % Like \expandablevalue, but completely expandable (the \message in the
+ % definition above operates at the execution level of TeX).  Used when
+ % writing to auxiliary files, due to the expansion that \write does.
+ % If flag is undefined, pass through an unexpanded @value command: maybe it 
+ % will be set by the time it is read back in.
+ %
+ % NB flag names containing - or _ may not work here.
+ \def\dummyvalue#1{%
+   \expandafter\ifx\csname SET#1\endcsname\relax
+     \noexpand\value{#1}%
+   \else
+     \csname SET#1\endcsname
+   \fi
+ }
+ 
+ % Used for @value's in index entries to form the sort key: expand the @value
+ % if possible, otherwise sort late.
+ \def\indexnofontsvalue#1{%
+   \expandafter\ifx\csname SET#1\endcsname\relax
+     ZZZZZZZ
+   \else
+     \csname SET#1\endcsname
+   \fi
+ }
+ 
  % @ifset VAR ... @end ifset reads the `...' iff VAR has been defined
  % with @set.
***************
*** 4475,4486 ****
  % #3 the target index (bar).
  \def\dosynindex#1#2#3{%
!   % Only do \closeout if we haven't already done it, else we'll end up
!   % closing the target index.
!   \expandafter \ifx\csname donesynindex#2\endcsname \relax
!     % The \closeout helps reduce unnecessary open files; the limit on the
!     % Acorn RISC OS is a mere 16 files.
!     \expandafter\closeout\csname#2indfile\endcsname
!     \expandafter\let\csname donesynindex#2\endcsname = 1
!   \fi
    % redefine \fooindfile:
    \expandafter\let\expandafter\temp\expandafter=\csname#3indfile\endcsname
--- 4885,4889 ----
  % #3 the target index (bar).
  \def\dosynindex#1#2#3{%
!   \requireopenindexfile{#3}%
    % redefine \fooindfile:
    \expandafter\let\expandafter\temp\expandafter=\csname#3indfile\endcsname
***************
*** 4492,4496 ****
  % Define \doindex, the driver for all index macros.
  % Argument #1 is generated by the calling \fooindex macro,
! % and it the two-letter name of the index.
  
  \def\doindex#1{\edef\indexname{#1}\parsearg\doindexxxx}
--- 4895,4899 ----
  % Define \doindex, the driver for all index macros.
  % Argument #1 is generated by the calling \fooindex macro,
! % and it is the two-letter name of the index.
  
  \def\doindex#1{\edef\indexname{#1}\parsearg\doindexxxx}
***************
*** 4501,4561 ****
  \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.
!   \def\@{@}% change to @@ when we switch to @ as escape char in index files.
!   \def\ {\realbackslash\space }%
    %
!   % Need these unexpandable (because we define \tt as a dummy)
!   % definitions when @{ or @} appear in index entry text.  Also, more
!   % complicated, when \tex is in effect and \{ is a \delimiter again.
!   % We can't use \lbracecmd and \rbracecmd because texindex assumes
!   % braces and backslashes are used only as delimiters.  Perhaps we
!   % should use @lbracechar and @rbracechar?
!   \def\{{{\tt\char123}}%
!   \def\}{{\tt\char125}}%
    %
    % Do the redefinitions.
!   \commondummies
  }
  
! % For the aux and toc files, @ is the escape character.  So we want to
! % redefine everything using @ as the escape character (instead of
! % \realbackslash, still used for index files).  When everything uses @,
! % this will be simpler.
  %
  \def\atdummies{%
!   \def\@{@@}%
!   \def\ {@ }%
!   \let\{ = \lbraceatcmd
!   \let\} = \rbraceatcmd
    %
    % Do the redefinitions.
!   \commondummies
    \otherbackslash
  }
  
! % Called from \indexdummies and \atdummies.
! %
! \def\commondummies{%
!   % \definedummyword defines \#1 as \string\#1\space, thus effectively
!   % preventing its expansion.  This is used only for control words,
!   % not control letters, because the \space would be incorrect for
!   % control characters, but is needed to separate the control word
!   % from whatever follows.
!   %
!   % For control letters, we have \definedummyletter, which omits the
!   % space.
!   %
!   % These can be used both for control words that take an argument and
!   % those that do not.  If it is followed by {arg} in the input, then
!   % that will dutifully get written to the index (or wherever).
!   %
!   \def\definedummyword  ##1{\def##1{\string##1\space}}%
!   \def\definedummyletter##1{\def##1{\string##1}}%
!   \let\definedummyaccent\definedummyletter
!   %
    \commondummiesnofonts
    %
--- 4904,4962 ----
  \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.
  %
  \def\atdummies{%
!   \definedummyletter\@%
!   \definedummyletter\ %
!   \definedummyletter\{%
!   \definedummyletter\}%
    %
    % Do the redefinitions.
!   \definedummies
    \otherbackslash
  }
  
! % \definedummyword defines \#1 as \string\#1\space, thus effectively
! % preventing its expansion.  This is used only for control words,
! % not control letters, because the \space would be incorrect for
! % control characters, but is needed to separate the control word
! % from whatever follows.
! %
! % These can be used both for control words that take an argument and
! % those that do not.  If it is followed by {arg} in the input, then
! % that will dutifully get written to the index (or wherever).
! %
! % For control letters, we have \definedummyletter, which omits the
! % space.
! %
! \def\definedummyword  #1{\def#1{\string#1\space}}%
! \def\definedummyletter#1{\def#1{\string#1}}%
! \let\definedummyaccent\definedummyletter
! 
! % Called from \indexdummies and \atdummies, to effectively prevent
! % the expansion of commands.
! %
! \def\definedummies{%
!   %
!   \let\commondummyword\definedummyword
!   \let\commondummyletter\definedummyletter
!   \let\commondummyaccent\definedummyaccent
    \commondummiesnofonts
    %
***************
*** 4598,4601 ****
--- 4999,5003 ----
    %
    % Assorted special characters.
+   \definedummyword\atchar
    \definedummyword\arrow
    \definedummyword\bullet
***************
*** 4637,4719 ****
    % We want to disable all macros so that they are not expanded by \write.
    \macrolist
    %
    \normalturnoffactive
-   %
-   % Handle some cases of @value -- where it does not contain any
-   % (non-fully-expandable) commands.
-   \makevalueexpandable
  }
  
! % \commondummiesnofonts: common to \commondummies and \indexnofonts.
! % Define \definedumyletter, \definedummyaccent and \definedummyword before
! % using.
  %
  \def\commondummiesnofonts{%
    % Control letters and accents.
!   \definedummyletter\!%
!   \definedummyaccent\"%
!   \definedummyaccent\'%
!   \definedummyletter\*%
!   \definedummyaccent\,%
!   \definedummyletter\.%
!   \definedummyletter\/%
!   \definedummyletter\:%
!   \definedummyaccent\=%
!   \definedummyletter\?%
!   \definedummyaccent\^%
!   \definedummyaccent\`%
!   \definedummyaccent\~%
!   \definedummyword\u
!   \definedummyword\v
!   \definedummyword\H
!   \definedummyword\dotaccent
!   \definedummyword\ogonek
!   \definedummyword\ringaccent
!   \definedummyword\tieaccent
!   \definedummyword\ubaraccent
!   \definedummyword\udotaccent
!   \definedummyword\dotless
    %
    % Texinfo font commands.
!   \definedummyword\b
!   \definedummyword\i
!   \definedummyword\r
!   \definedummyword\sansserif
!   \definedummyword\sc
!   \definedummyword\slanted
!   \definedummyword\t
    %
    % Commands that take arguments.
!   \definedummyword\abbr
!   \definedummyword\acronym
!   \definedummyword\anchor
!   \definedummyword\cite
!   \definedummyword\code
!   \definedummyword\command
!   \definedummyword\dfn
!   \definedummyword\dmn
!   \definedummyword\email
!   \definedummyword\emph
!   \definedummyword\env
!   \definedummyword\file
!   \definedummyword\image
!   \definedummyword\indicateurl
!   \definedummyword\inforef
!   \definedummyword\kbd
!   \definedummyword\key
!   \definedummyword\math
!   \definedummyword\option
!   \definedummyword\pxref
!   \definedummyword\ref
!   \definedummyword\samp
!   \definedummyword\strong
!   \definedummyword\tie
!   \definedummyword\U
!   \definedummyword\uref
!   \definedummyword\url
!   \definedummyword\var
!   \definedummyword\verb
!   \definedummyword\w
!   \definedummyword\xref
  }
  
--- 5039,5118 ----
    % We want to disable all macros so that they are not expanded by \write.
    \macrolist
+   \let\value\dummyvalue
    %
    \normalturnoffactive
  }
  
! % \commondummiesnofonts: common to \definedummies and \indexnofonts.
! % Define \commondummyletter, \commondummyaccent and \commondummyword before
! % using.  Used for accents, font commands, and various control letters.
  %
  \def\commondummiesnofonts{%
    % Control letters and accents.
!   \commondummyletter\!%
!   \commondummyaccent\"%
!   \commondummyaccent\'%
!   \commondummyletter\*%
!   \commondummyaccent\,%
!   \commondummyletter\.%
!   \commondummyletter\/%
!   \commondummyletter\:%
!   \commondummyaccent\=%
!   \commondummyletter\?%
!   \commondummyaccent\^%
!   \commondummyaccent\`%
!   \commondummyaccent\~%
!   \commondummyword\u
!   \commondummyword\v
!   \commondummyword\H
!   \commondummyword\dotaccent
!   \commondummyword\ogonek
!   \commondummyword\ringaccent
!   \commondummyword\tieaccent
!   \commondummyword\ubaraccent
!   \commondummyword\udotaccent
!   \commondummyword\dotless
    %
    % Texinfo font commands.
!   \commondummyword\b
!   \commondummyword\i
!   \commondummyword\r
!   \commondummyword\sansserif
!   \commondummyword\sc
!   \commondummyword\slanted
!   \commondummyword\t
    %
    % Commands that take arguments.
!   \commondummyword\abbr
!   \commondummyword\acronym
!   \commondummyword\anchor
!   \commondummyword\cite
!   \commondummyword\code
!   \commondummyword\command
!   \commondummyword\dfn
!   \commondummyword\dmn
!   \commondummyword\email
!   \commondummyword\emph
!   \commondummyword\env
!   \commondummyword\file
!   \commondummyword\image
!   \commondummyword\indicateurl
!   \commondummyword\inforef
!   \commondummyword\kbd
!   \commondummyword\key
!   \commondummyword\math
!   \commondummyword\option
!   \commondummyword\pxref
!   \commondummyword\ref
!   \commondummyword\samp
!   \commondummyword\strong
!   \commondummyword\tie
!   \commondummyword\U
!   \commondummyword\uref
!   \commondummyword\url
!   \commondummyword\var
!   \commondummyword\verb
!   \commondummyword\w
!   \commondummyword\xref
  }
  
***************
*** 4771,4779 ****
  \def\indexnofonts{%
    % Accent commands should become @asis.
!   \def\definedummyaccent##1{\let##1\asis}%
    % We can just ignore other control letters.
!   \def\definedummyletter##1{\let##1\empty}%
    % All control words become @asis by default; overrides below.
!   \let\definedummyword\definedummyaccent
    \commondummiesnofonts
    %
--- 5170,5178 ----
  \def\indexnofonts{%
    % Accent commands should become @asis.
!   \def\commondummyaccent##1{\let##1\asis}%
    % We can just ignore other control letters.
!   \def\commondummyletter##1{\let##1\empty}%
    % All control words become @asis by default; overrides below.
!   \let\commondummyword\commondummyaccent
    \commondummiesnofonts
    %
***************
*** 4817,4851 ****
    \def\TeX{TeX}%
    %
!   % Assorted special characters.
!   % (The following {} will end up in the sort string, but that's ok.)
!   \def\arrow{->}%
!   \def\bullet{bullet}%
!   \def\comma{,}%
!   \def\copyright{copyright}%
!   \def\dots{...}%
!   \def\enddots{...}%
!   \def\equiv{==}%
!   \def\error{error}%
!   \def\euro{euro}%
!   \def\expansion{==>}%
!   \def\geq{>=}%
!   \def\guillemetleft{<<}%
!   \def\guillemetright{>>}%
!   \def\guilsinglleft{<}%
!   \def\guilsinglright{>}%
!   \def\leq{<=}%
!   \def\minus{-}%
!   \def\point{.}%
!   \def\pounds{pounds}%
!   \def\print{-|}%
!   \def\quotedblbase{"}%
!   \def\quotedblleft{"}%
!   \def\quotedblright{"}%
!   \def\quoteleft{`}%
!   \def\quoteright{'}%
!   \def\quotesinglbase{,}%
!   \def\registeredsymbol{R}%
!   \def\result{=>}%
!   \def\textdegree{o}%
    %
    % We need to get rid of all macros, leaving only the arguments (if present).
--- 5216,5253 ----
    \def\TeX{TeX}%
    %
!   % Assorted special characters.  \defglyph gives the control sequence a
!   % definition that removes the {} that follows its use.
!   \defglyph\atchar{@}%
!   \defglyph\arrow{->}%
!   \defglyph\bullet{bullet}%
!   \defglyph\comma{,}%
!   \defglyph\copyright{copyright}%
!   \defglyph\dots{...}%
!   \defglyph\enddots{...}%
!   \defglyph\equiv{==}%
!   \defglyph\error{error}%
!   \defglyph\euro{euro}%
!   \defglyph\expansion{==>}%
!   \defglyph\geq{>=}%
!   \defglyph\guillemetleft{<<}%
!   \defglyph\guillemetright{>>}%
!   \defglyph\guilsinglleft{<}%
!   \defglyph\guilsinglright{>}%
!   \defglyph\leq{<=}%
!   \defglyph\lbracechar{\{}%
!   \defglyph\minus{-}%
!   \defglyph\point{.}%
!   \defglyph\pounds{pounds}%
!   \defglyph\print{-|}%
!   \defglyph\quotedblbase{"}%
!   \defglyph\quotedblleft{"}%
!   \defglyph\quotedblright{"}%
!   \defglyph\quoteleft{`}%
!   \defglyph\quoteright{'}%
!   \defglyph\quotesinglbase{,}%
!   \defglyph\rbracechar{\}}%
!   \defglyph\registeredsymbol{R}%
!   \defglyph\result{=>}%
!   \defglyph\textdegree{o}%
    %
    % We need to get rid of all macros, leaving only the arguments (if present).
***************
*** 4860,4864 ****
--- 5262,5270 ----
    %
    \macrolist
+   \let\value\indexnofontsvalue
  }
+ \def\defglyph#1#2{\def#1##1{#2}} % see above
+ 
+ 
  
  
***************
*** 4907,4913 ****
    % Open the file
    \immediate\openout\csname#1indfile\endcsname \jobname.\suffix
!   % Using \immediate here prevents an object entering into the current box,
!   % which could confound checks such as those in \safewhatsit for preceding
!   % skips.
  \fi}
  \def\indexisfl{fl}
--- 5313,5320 ----
    % Open the file
    \immediate\openout\csname#1indfile\endcsname \jobname.\suffix
!   % Using \immediate above here prevents an object entering into the current 
!   % box, which could confound checks such as those in \safewhatsit for
!   % preceding skips.
!   \typeout{Writing index file \jobname.\suffix}%
  \fi}
  \def\indexisfl{fl}
***************
*** 5107,5111 ****
    % as its first line, TeX doesn't complain about mismatched braces
    % (because it thinks @} is a control sequence).
!   \catcode`\@ = 11
    % See comment in \requireopenindexfile.
    \def\indexname{#1}\ifx\indexname\indexisfl\def\indexname{f1}\fi
--- 5514,5518 ----
    % 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
***************
*** 5117,5123 ****
      % there is some text.
      \putwordIndexNonexistent
    \else
      \catcode`\\ = 0
-     \escapechar = `\\
      %
      % If the index file exists but is empty, then \openin leaves \ifeof
--- 5524,5530 ----
      % there is some text.
      \putwordIndexNonexistent
+     \typeout{No file \jobname.\indexname s.}%
    \else
      \catcode`\\ = 0
      %
      % If the index file exists but is empty, then \openin leaves \ifeof
***************
*** 5135,5139 ****
        \let\indexrbrace\}   % used in the sort key.
        \begindoublecolumns
!       \let\entryorphanpenalty=\indexorphanpenalty
        %
        % Read input from the index file line by line.
--- 5542,5546 ----
        \let\indexrbrace\}   % used in the sort key.
        \begindoublecolumns
!       \let\entrywidowpenalty=\indexwidowpenalty
        %
        % Read input from the index file line by line.
***************
*** 5236,5239 ****
--- 5643,5652 ----
    \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.
***************
*** 5249,5256 ****
      \def\entrybreak{\hfil\break}% An undocumented command
      %
-     % A bit of stretch before each entry for the benefit of balancing
-     % columns.
-     \vskip 0pt plus0.5pt
-     %
      % Swallow the left brace of the text (first parameter):
      \afterassignment\doentry
--- 5662,5665 ----
***************
*** 5286,5297 ****
        \ifpdf
          \pdfgettoks#1.%
!         \bgroup\let\domark\relax
!           \hskip\skip\thinshrinkable\the\toksA
!         \egroup
!         % The redefinion 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.
        \else
!         \hskip\skip\thinshrinkable #1%
        \fi
      \fi
--- 5695,5706 ----
        \ifpdf
          \pdfgettoks#1.%
!         \hskip\skip\thinshrinkable\the\toksA
        \else
!         \ifx\XeTeXrevision\thisisundefined
!           \hskip\skip\thinshrinkable #1%
!         \else
!           \pdfgettoks#1.%
!           \hskip\skip\thinshrinkable\the\toksA
!         \fi
        \fi
      \fi
***************
*** 5301,5309 ****
      \else
      \global\setbox\entryindexbox=\vbox\bgroup
-       \prevdepth=\entrylinedepth
-       \noindent
        % We want the text of the entries to be aligned to the left, and the
        % page numbers to be aligned to the right.
        %
        \advance\leftskip by 0pt plus 1fil
        \advance\leftskip by 0pt plus -1fill
--- 5710,5717 ----
      \else
      \global\setbox\entryindexbox=\vbox\bgroup
        % We want the text of the entries to be aligned to the left, and the
        % page numbers to be aligned to the right.
        %
+       \parindent = 0pt
        \advance\leftskip by 0pt plus 1fil
        \advance\leftskip by 0pt plus -1fill
***************
*** 5314,5319 ****
        \parfillskip=0pt plus -1fill
        %
-       \hangindent=1em
-       %
        \advance\rightskip by \entryrightmargin
        % Determine how far we can stretch into the margin.
--- 5722,5725 ----
***************
*** 5335,5339 ****
          \dimen@ = 0.7\dimen@ % Try to split the text roughly evenly
          \dimen@ii = \hsize
-         \advance \dimen@ii by -1em
          \ifnum\dimen@>\dimen@ii
            % If the entry is too long, use the whole line
--- 5741,5744 ----
***************
*** 5342,5349 ****
          \advance\leftskip by 0pt plus 1fill % ragged right
          \advance \dimen@ by 1\rightskip
!         \parshape = 2 0pt \dimen@ 1em \dimen@ii
!         % Ideally we'd add a finite glue at the end of the first line only, but
!         % TeX doesn't seem to provide a way to do such a thing.
        \fi\fi
        \unhbox\boxA
        %
--- 5747,5759 ----
          \advance\leftskip by 0pt plus 1fill % ragged right
          \advance \dimen@ by 1\rightskip
!         \parshape = 2 0pt \dimen@ 0em \dimen@ii
!         % Ideally we'd add a finite glue at the end of the first line only,
!         % 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
        \fi\fi
+       \indent % start paragraph
        \unhbox\boxA
        %
***************
*** 5363,5367 ****
    % delay text of entry until after penalty
    \bgroup\aftergroup\insertindexentrybox
!   \entryorphanpenalty
  }}
  
--- 5773,5777 ----
    % delay text of entry until after penalty
    \bgroup\aftergroup\insertindexentrybox
!   \entrywidowpenalty
  }}
  
***************
*** 5371,5408 ****
  \newbox\entryindexbox
  \def\insertindexentrybox{%
!   \copy\entryindexbox
!   % The following gets the depth of the last box.  This is for even
!   % line spacing when entries span several lines.
!   \setbox\dummybox\vbox{%
!     \unvbox\entryindexbox
!     \nointerlineskip
!     \lastbox
!     \global\entrylinedepth=\prevdepth
    }%
!   % Note that we couldn't simply \unvbox\entryindexbox followed by 
!   % \nointerlineskip\lastbox to remove the last box and then reinstate it, 
!   % because this resets how far the box has been \moveleft'ed to 0.  \unvbox
!   % doesn't affect \prevdepth either.
  }
! \newdimen\entrylinedepth
  
  % Default is no penalty
! \let\entryorphanpenalty\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
! % orphaned index entries.
! \long\def\indexorphanpenalty{%
    \def\isentry{\entry}%
    \ifx\firsttoken\isentry
    \else
!     \unskip\penalty 9000
!     % The \unskip here stops breaking before the glue.  It relies on the
!     % \vskip above being there, otherwise there is an error
!     % "You can't use `\unskip' in vertical mode".  There has to be glue
!     % in the current vertical list that hasn't been added to the
!     % "current page".  See Chapter 24 of the TeXbook.  This contradicts
!     % Section 8.3.7 in "TeX by Topic," though.
    \fi
    \egroup % now comes the box added with \aftergroup
--- 5781,5821 ----
  \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
***************
*** 5428,5432 ****
      \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph.
    \else
!     #2
    \fi
    \par
--- 5841,5849 ----
      \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
***************
*** 5440,5445 ****
  \newbox\partialpage
  \newdimen\doublecolumnhsize
- \newdimen\doublecolumntopgap
- \doublecolumntopgap = 0pt
  
  % Use inside an output routine to save \topmark and \firstmark
--- 5857,5860 ----
***************
*** 5524,5533 ****
    % Double the \vsize as well.  (We don't need a separate register here,
    % since nobody clobbers \vsize.)
-   \global\doublecolumntopgap = \topskip
-   \global\advance\doublecolumntopgap by -1\baselineskip
-   \advance\vsize by -1\doublecolumntopgap
    \vsize = 2\vsize
!   \topskip=0pt
!   \global\entrylinedepth=0pt\relax
  }
  
--- 5939,5946 ----
    % Double the \vsize as well.  (We don't need a separate register here,
    % since nobody clobbers \vsize.)
    \vsize = 2\vsize
!   %
!   % For the benefit of balancing columns
!   \advance\baselineskip by 0pt plus 0.5pt
  }
  
***************
*** 5559,5565 ****
    \hsize = \doublecolumnhsize
    \wd0=\hsize \wd2=\hsize
!   \vbox{%
!     \vskip\doublecolumntopgap
!     \hbox to\pagewidth{\box0\hfil\box2}}%
  }
  
--- 5972,5976 ----
    \hsize = \doublecolumnhsize
    \wd0=\hsize \wd2=\hsize
!   \hbox to\txipagewidth{\box0\hfil\box2}%
  }
  
***************
*** 5588,5592 ****
    % section, it invokes the new output routine that we've set after
    % \balancecolumns below; \onepageout will try to fit the two columns
!   % and the final section into the vbox of \pageheight (see
    % \pagebody), causing an overfull box.
    %
--- 5999,6003 ----
    % section, it invokes the new output routine that we've set after
    % \balancecolumns below; \onepageout will try to fit the two columns
!   % and the final section into the vbox of \txipageheight (see
    % \pagebody), causing an overfull box.
    %
***************
*** 5628,5632 ****
    \advance\dimen@ by \topskip
    \advance\dimen@ by-\baselineskip
!   \ifdim\dimen@<14\baselineskip
      % Don't split a short final column in two.
      \setbox2=\vbox{}%
--- 6039,6043 ----
    \advance\dimen@ by \topskip
    \advance\dimen@ by-\baselineskip
!   \ifdim\dimen@<5\baselineskip
      % Don't split a short final column in two.
      \setbox2=\vbox{}%
***************
*** 5635,5639 ****
      \dimen@ii = \dimen@
      \splittopskip = \topskip
!     % Loop until the second column is no higher than the first
      {%
        \vbadness = 10000
--- 6046,6050 ----
      \dimen@ii = \dimen@
      \splittopskip = \topskip
!     % Loop until left column is at least as high as the right column.
      {%
        \vbadness = 10000
***************
*** 5641,5663 ****
          \global\setbox3 = \copy0
          \global\setbox1 = \vsplit3 to \dimen@
!         % Remove glue from bottom of first column to
!         % make sure it is higher than the second.
!         \global\setbox1 = \vbox{\unvbox1\unpenalty\unskip}%
!       \ifdim\ht3>\ht1
          \global\advance\dimen@ by 1pt
        \repeat
      }%
!     \multiply\dimen@ii by 4
!     \divide\dimen@ii by 5
!     \ifdim\ht3<\dimen@ii
!       % Column heights are too different, so don't make their bottoms
!       % flush with each other.  The glue at the end of the second column
!       % allows a second column to stretch, reducing the difference in
!       % height between the two.
!       \setbox0=\vbox to\dimen@{\unvbox1\vfill}%
!       \setbox2=\vbox to\dimen@{\unvbox3\vskip 0pt plus 0.3\ht0}%
      \else
!       \setbox0=\vbox to\dimen@{\unvbox1}%
!       \setbox2=\vbox to\dimen@{\unvbox3}%
      \fi
    \fi
--- 6052,6081 ----
          \global\setbox3 = \copy0
          \global\setbox1 = \vsplit3 to \dimen@
!       \ifdim\ht1<\ht3
          \global\advance\dimen@ by 1pt
        \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}%
      \else
!       % Compare the heights of the two columns.
!       \ifdim4\ht1>5\ht3
!         % Column heights are too different, so don't make their bottoms
!         % flush with each other.
!         \setbox2=\vbox to \ht1 {\unvbox3\vfill}%
!         \setbox0=\vbox to \ht1 {\unvbox1\vfill}%
!       \else
!         % Make column bottoms flush with each other.
!         \setbox2=\vbox to\ht1{\unvbox3\unskip}%
!         \setbox0=\vbox to\ht1{\unvbox1\unskip}%
!       \fi
      \fi
    \fi
***************
*** 6072,6076 ****
  }
  
! \def\setchapternewpage #1 {\csname CHAPPAG#1\endcsname}
  
  \def\CHAPPAGoff{%
--- 6490,6494 ----
  }
  
! \parseargdef\setchapternewpage{\csname CHAPPAG#1\endcsname}
  
  \def\CHAPPAGoff{%
***************
*** 6218,6245 ****
  
  
- % I don't think this chapter style is supported any more, so I'm not
- % updating it with the new noderef stuff.  We'll see.  --karl, 11aug03.
- %
- \def\setchapterstyle #1 {\csname CHAPF#1\endcsname}
- %
- \def\unnchfopen #1{%
-   \chapoddpage
-   \vbox{\chapfonts \raggedtitlesettings #1\par}%
-   \nobreak\bigskip\nobreak
- }
- \def\chfopen #1#2{\chapoddpage {\chapfonts
- \vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}%
- \par\penalty 5000 %
- }
- \def\centerchfopen #1{%
-   \chapoddpage
-   \vbox{\chapfonts \raggedtitlesettings \hfill #1\hfill}%
-   \nobreak\bigskip \nobreak
- }
- \def\CHAPFopen{%
-   \global\let\chapmacro=\chfopen
-   \global\let\centerchapmacro=\centerchfopen}
- 
- 
  % Section titles.  These macros combine the section number parts and
  % call the generic \sectionheading to do the printing.
--- 6636,6639 ----
***************
*** 6444,6448 ****
    % two pages of the document.  Thus, we'd have two destinations named
    % `1', and two named `2'.
!   \ifpdf \global\pdfmakepagedesttrue \fi
  }
  
--- 6838,6849 ----
    % two pages of the document.  Thus, we'd have two destinations named
    % `1', and two named `2'.
!   \ifpdf
!     \global\pdfmakepagedesttrue
!   \else
!     \ifx\XeTeXrevision\thisisundefined
!     \else
!       \global\pdfmakepagedesttrue
!     \fi
!   \fi
  }
  
***************
*** 6704,6708 ****
    \catcode `\`=\other
    \catcode `\'=\other
-   \escapechar=`\\
    %
    % ' is active in math mode (mathcode"8000).  So reset it, and all our
--- 7105,7108 ----
***************
*** 7682,7695 ****
  \let\texinfoc=\c
  
  % Used at the time of macro expansion.
  % Argument is macro body with arguments substituted
  \def\scanmacro#1{%
    \newlinechar`\^^M
!   \def\xprocessmacroarg{\eatspaces}%
    %
    % Process the macro body under the current catcode regime.
!   \scantokens{#1\texinfoc}\aftermacro%
    %
!   % The \c 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
--- 8082,8109 ----
  \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%
!   %
!   \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
***************
*** 7704,7716 ****
  % Used for copying and captions
  \def\scanexp#1{%
!   \bgroup
!   % Undo catcode changes of \startcontents and \printindex
!   % When called from @insertcopying or (short)caption, we need active
!   % backslash to get it printed correctly.
!   % FIXME: This may not be needed.
!   %\catcode`\@=0 \catcode`\\=\active \escapechar=`\@
!   \edef\temp{\noexpand\scanmacro{#1}}%
!   \temp
!   \egroup
  }
  
--- 8118,8122 ----
  % Used for copying and captions
  \def\scanexp#1{%
!   \expandafter\scanmacro\expandafter{#1}%
  }
  
***************
*** 7720,7724 ****
  
  % List of all defined macros in the form
! %    \definedummyword\macro1\definedummyword\macro2...
  % Currently is also contains all @aliases; the list can be split
  % if there is a need.
--- 8126,8130 ----
  
  % List of all defined macros in the form
! %    \commondummyword\macro1\commondummyword\macro2...
  % Currently is also contains all @aliases; the list can be split
  % if there is a need.
***************
*** 7728,7732 ****
  \def\addtomacrolist#1{\expandafter \addtomacrolistxxx \csname#1\endcsname}
  \def\addtomacrolistxxx#1{%
!      \toks0 = \expandafter{\macrolist\definedummyword#1}%
       \xdef\macrolist{\the\toks0}%
  }
--- 8134,8138 ----
  \def\addtomacrolist#1{\expandafter \addtomacrolistxxx \csname#1\endcsname}
  \def\addtomacrolistxxx#1{%
!      \toks0 = \expandafter{\macrolist\commondummyword#1}%
       \xdef\macrolist{\the\toks0}%
  }
***************
*** 7782,7786 ****
    \catcode`\|=\other
    \catcode`\~=\other
!   \ifx\declaredencoding\ascii \else \setnonasciicharscatcodenonglobal\other \fi
  }
  
--- 8188,8192 ----
    \catcode`\|=\other
    \catcode`\~=\other
!   \passthroughcharstrue
  }
  
***************
*** 7869,7873 ****
      \begingroup
        \expandafter\let\csname#1\endcsname \relax
!       \let\definedummyword\unmacrodo
        \xdef\macrolist{\macrolist}%
      \endgroup
--- 8275,8279 ----
      \begingroup
        \expandafter\let\csname#1\endcsname \relax
!       \let\commondummyword\unmacrodo
        \xdef\macrolist{\macrolist}%
      \endgroup
***************
*** 7884,7888 ****
      % remove this
    \else
!     \noexpand\definedummyword \noexpand#1%
    \fi
  }
--- 8290,8294 ----
      % remove this
    \else
!     \noexpand\commondummyword \noexpand#1%
    \fi
  }
***************
*** 7916,7920 ****
    \let\hash\relax
    % \hash is redefined to `#' later to get it into definitions
!   \let\processmacroarg\relax
    \parsemargdefxxx#1,;,%
    \ifnum\paramno<10\relax\else
--- 8322,8326 ----
    \let\hash\relax
    % \hash is redefined to `#' later to get it into definitions
!   \let\xeatspaces\relax
    \parsemargdefxxx#1,;,%
    \ifnum\paramno<10\relax\else
***************
*** 7928,7932 ****
      \advance\paramno by 1
      \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname
!         {\processmacroarg{\hash\the\paramno}}%
      \edef\paramlist{\paramlist\hash\the\paramno,}%
    \fi\next}
--- 8334,8338 ----
      \advance\paramno by 1
      \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname
!         {\xeatspaces{\hash\the\paramno}}%
      \edef\paramlist{\paramlist\hash\the\paramno,}%
    \fi\next}
***************
*** 8154,8171 ****
  
  
- 
- % Remove following spaces at the expansion stage.
- % This works because spaces are discarded before each argument when TeX is 
- % getting the arguments for a macro.
- % This must not be immediately followed by a }.
- \long\def\gobblespaces#1{#1}
- 
  % This defines a Texinfo @macro or @rmacro, called by \parsemacbody.
  %    \macrobody has the body of the macro in it, with placeholders for
! % its parameters, looking like "\processmacroarg{\hash 1}".
  %    \paramno is the number of parameters
  %    \paramlist is a TeX parameter text, e.g. "#1,#2,#3,"
! % There are eight cases: recursive and nonrecursive macros of zero, one,
! % up to nine, and many arguments.
  % \xdef is used so that macro definitions will survive the file
  % they're defined in: @include reads the file inside a group.
--- 8560,8569 ----
  
  
  % This defines a Texinfo @macro or @rmacro, called by \parsemacbody.
  %    \macrobody has the body of the macro in it, with placeholders for
! % its parameters, looking like "\xeatspaces{\hash 1}".
  %    \paramno is the number of parameters
  %    \paramlist is a TeX parameter text, e.g. "#1,#2,#3,"
! % There are four cases: macros of zero, one, up to nine, and many arguments.
  % \xdef is used so that macro definitions will survive the file
  % they're defined in: @include reads the file inside a group.
***************
*** 8174,8178 ****
    \let\hash=##% convert placeholders to macro parameter chars
    \ifnum\paramno=1
!     \def\processmacroarg{\gobblespaces}%
      % This removes the pair of braces around the argument.  We don't
      % use \eatspaces, because this can cause ends of lines to be lost
--- 8572,8576 ----
    \let\hash=##% convert placeholders to macro parameter chars
    \ifnum\paramno=1
!     \def\xeatspaces##1{##1}%
      % This removes the pair of braces around the argument.  We don't
      % use \eatspaces, because this can cause ends of lines to be lost
***************
*** 8180,8279 ****
      % commands like "@itemize" not being read correctly.
    \else
!     \def\processmacroarg{\xprocessmacroarg}%
!     \let\xprocessmacroarg\relax
    \fi
!   \ifrecursive   %%%%%%%%%%%%%% Recursive %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
!     \ifcase\paramno
!     % 0
!       \expandafter\xdef\csname\the\macname\endcsname{%
!         \noexpand\scanmacro{\macrobody}}%
!     \or % 1
        \expandafter\xdef\csname\the\macname\endcsname{%
!          \bgroup
!          \noexpand\braceorline
!          \expandafter\noexpand\csname\the\macname @@@\endcsname}%
        \expandafter\xdef\csname\the\macname @@@\endcsname##1{%
!          \expandafter\noexpand\csname\the\macname @@@@\endcsname{%
!            \noexpand\gobblespaces##1\empty}%
!            % The \empty is for \gobblespaces in case #1 is empty
!          }%
!       \expandafter\xdef\csname\the\macname @@@@\endcsname##1{%
!          \egroup\noexpand\scanmacro{\macrobody}}%
!     \else
!       \ifnum\paramno<10\relax % at most 9
!         % See non-recursive section below for comments
!         \expandafter\xdef\csname\the\macname\endcsname{%
!           \bgroup
!           \noexpand\expandafter
!           \noexpand\macroargctxt
!           \noexpand\expandafter
!           \expandafter\noexpand\csname\the\macname @@\endcsname}%
!         \expandafter\xdef\csname\the\macname @@\endcsname##1{%
!             \noexpand\passargtomacro
!             \expandafter\noexpand\csname\the\macname @@@\endcsname{##1,}}%
!         \expandafter\xdef\csname\the\macname @@@\endcsname##1{%
!             \expandafter\noexpand\csname\the\macname @@@@\endcsname ##1}%
!         \expandafter\expandafter
!         \expandafter\xdef
!         \expandafter\expandafter
!           \csname\the\macname @@@@\endcsname\paramlist{%
!             \egroup\noexpand\scanmacro{\macrobody}}%
!       \else % 10 or more
!         \expandafter\xdef\csname\the\macname\endcsname{%
!           \noexpand\getargvals@{\the\macname}{\argl}%
!         }%    
!         \global\expandafter\let\csname mac.\the\macname .body\endcsname\macrobody
!         \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\gobble
!       \fi
!     \fi
!   \else  %%%%%%%%%%%%%%%%%%%%%% Non-recursive %%%%%%%%%%%%%%%%%%%%%%%%%%
!     \ifcase\paramno
!     % 0
!       \expandafter\xdef\csname\the\macname\endcsname{%
!         \noexpand\scanmacro{\macrobody}}%
!     \or % 1
        \expandafter\xdef\csname\the\macname\endcsname{%
!          \bgroup
!          \noexpand\braceorline
!          \expandafter\noexpand\csname\the\macname @@@\endcsname}%
!       \expandafter\xdef\csname\the\macname @@@\endcsname##1{%
!          \expandafter\noexpand\csname\the\macname @@@@\endcsname{%
!            \noexpand\gobblespaces##1\empty}%
!            % The \empty is for \gobblespaces in case #1 is empty
!          }%
!       \expandafter\xdef\csname\the\macname @@@@\endcsname##1{%
!         \egroup
!         \noexpand\scanmacro{\macrobody}%
!         }%
!     \else % at most 9
!       \ifnum\paramno<10\relax
!         % @MACNAME sets the context for reading the macro argument
!         % @MACNAME@@ gets the argument, processes backslashes and appends a 
!         % comma.
!         % @MACNAME@@@ removes braces surrounding the argument list.
!         % @MACNAME@@@@ scans the macro body with arguments substituted.
!         \expandafter\xdef\csname\the\macname\endcsname{%
!           \bgroup
!           \noexpand\expandafter  % This \expandafter skip any spaces after the
!           \noexpand\macroargctxt % macro before we change the catcode of space.
!           \noexpand\expandafter
!           \expandafter\noexpand\csname\the\macname @@\endcsname}%
!         \expandafter\xdef\csname\the\macname @@\endcsname##1{%
!             \noexpand\passargtomacro
!             \expandafter\noexpand\csname\the\macname @@@\endcsname{##1,}}%
!         \expandafter\xdef\csname\the\macname @@@\endcsname##1{%
!             \expandafter\noexpand\csname\the\macname @@@@\endcsname ##1}%
!         \expandafter\expandafter
!         \expandafter\xdef
!         \expandafter\expandafter
!           \csname\the\macname @@@@\endcsname\paramlist{%
!             \egroup\noexpand\scanmacro{\macrobody}}%
!       \else % 10 or more:
!         \expandafter\xdef\csname\the\macname\endcsname{%
!           \noexpand\getargvals@{\the\macname}{\argl}%
!         }%
!         \global\expandafter\let\csname mac.\the\macname .body\endcsname\macrobody
!         \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\norecurse
!       \fi
      \fi
    \fi}
--- 8578,8625 ----
      % commands like "@itemize" not being read correctly.
    \else
!     \let\xeatspaces\relax % suppress expansion
    \fi
!   \ifcase\paramno
!   % 0
!     \expandafter\xdef\csname\the\macname\endcsname{%
!       \noexpand\scanmacro{\macrobody}}%
!   \or % 1
!     \expandafter\xdef\csname\the\macname\endcsname{%
!        \bgroup
!        \noexpand\braceorline
!        \expandafter\noexpand\csname\the\macname @@@\endcsname}%
!     \expandafter\xdef\csname\the\macname @@@\endcsname##1{%
!       \egroup
!       \noexpand\scanmacro{\macrobody}%
!       }%
!   \else % at most 9
!     \ifnum\paramno<10\relax
!       % @MACNAME sets the context for reading the macro argument
!       % @MACNAME@@ gets the argument, processes backslashes and appends a 
!       % comma.
!       % @MACNAME@@@ removes braces surrounding the argument list.
!       % @MACNAME@@@@ scans the macro body with arguments substituted.
        \expandafter\xdef\csname\the\macname\endcsname{%
!         \bgroup
!         \noexpand\expandafter  % This \expandafter skip any spaces after the
!         \noexpand\macroargctxt % macro before we change the catcode of space.
!         \noexpand\expandafter
!         \expandafter\noexpand\csname\the\macname @@\endcsname}%
!       \expandafter\xdef\csname\the\macname @@\endcsname##1{%
!           \noexpand\passargtomacro
!           \expandafter\noexpand\csname\the\macname @@@\endcsname{##1,}}%
        \expandafter\xdef\csname\the\macname @@@\endcsname##1{%
!           \expandafter\noexpand\csname\the\macname @@@@\endcsname ##1}%
!       \expandafter\expandafter
!       \expandafter\xdef
!       \expandafter\expandafter
!         \csname\the\macname @@@@\endcsname\paramlist{%
!           \egroup\noexpand\scanmacro{\macrobody}}%
!     \else % 10 or more:
        \expandafter\xdef\csname\the\macname\endcsname{%
!         \noexpand\getargvals@{\the\macname}{\argl}%
!       }%
!       \global\expandafter\let\csname mac.\the\macname .body\endcsname\macrobody
!       \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\gobble
      \fi
    \fi}
***************
*** 8471,8474 ****
--- 8817,8822 ----
        \requireauxfile
        \atdummies  % preserve commands, but don't expand them
+       % match definition in \xrdef, \refx, \xrefX.
+       \def\value##1{##1}%
        \edef\writexrdef##1##2{%
  	\write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef
***************
*** 8561,8567 ****
    % Make link in pdf output.
    \ifpdf
      {\indexnofonts
-      \turnoffactive
       \makevalueexpandable
       % This expands tokens, so do it after making catcode changes, so _
       % etc. don't get their TeX definitions.  This ignores all spaces in
--- 8909,8916 ----
    % Make link in pdf output.
    \ifpdf
+     % For pdfTeX and LuaTeX
      {\indexnofonts
       \makevalueexpandable
+      \turnoffactive
       % This expands tokens, so do it after making catcode changes, so _
       % etc. don't get their TeX definitions.  This ignores all spaces in
***************
*** 8571,8579 ****
       % This (wrongly) does not take account of leading or trailing
       % spaces in #1, which should be ignored.
!      \edef\pdfxrefdest{#1}%
!      \ifx\pdfxrefdest\empty
!        \def\pdfxrefdest{Top}% no empty targets
!      \else
!        \txiescapepdf\pdfxrefdest  % escape PDF special chars
       \fi
       %
--- 8920,8927 ----
       % This (wrongly) does not take account of leading or trailing
       % spaces in #1, which should be ignored.
!      \setpdfdestname{#1}%
!      %
!      \ifx\pdfdestname\empty
!        \def\pdfdestname{Top}% no empty targets
       \fi
       %
***************
*** 8581,8590 ****
       \startlink attr{/Border [0 0 0]}%
       \ifnum\filenamelength>0
!        goto file{\the\filename.pdf} name{\pdfxrefdest}%
       \else
!        goto name{\pdfmkpgn{\pdfxrefdest}}%
       \fi
      }%
      \setcolor{\linkcolor}%
    \fi
    {%
--- 8929,8977 ----
       \startlink attr{/Border [0 0 0]}%
       \ifnum\filenamelength>0
!        goto file{\the\filename.pdf} name{\pdfdestname}%
       \else
!        goto name{\pdfmkpgn{\pdfdestname}}%
       \fi
      }%
      \setcolor{\linkcolor}%
+   \else
+     \ifx\XeTeXrevision\thisisundefined
+     \else
+       % For XeTeX
+       {\indexnofonts
+        \makevalueexpandable
+        \turnoffactive
+        % This expands tokens, so do it after making catcode changes, so _
+        % etc. don't get their TeX definitions.  This ignores all spaces in
+        % #4, including (wrongly) those in the middle of the filename.
+        \getfilename{#4}%
+        %
+        % This (wrongly) does not take account of leading or trailing
+        % spaces in #1, which should be ignored.
+        \setpdfdestname{#1}%
+        %
+        \ifx\pdfdestname\empty
+          \def\pdfdestname{Top}% no empty targets
+        \fi
+        %
+        \leavevmode
+        \ifnum\filenamelength>0
+          % With default settings,
+          % XeTeX (xdvipdfmx) replaces link destination names with integers.
+          % In this case, the replaced destination names of
+          % remote PDFs are no longer known.  In order to avoid a replacement,
+          % you can use xdvipdfmx's command line option `-C 0x0010'.
+          % If you use XeTeX 0.99996+ (TeX Live 2016+),
+          % this command line option is no longer necessary
+          % because we can use the `dvipdfmx:config' special.
+          \special{pdf:bann << /Border [0 0 0] /Type /Annot /Subtype /Link /A
+            << /S /GoToR /F (\the\filename.pdf) /D (\pdfdestname) >> >>}%
+        \else
+          \special{pdf:bann << /Border [0 0 0] /Type /Annot /Subtype /Link /A
+            << /S /GoTo /D (\pdfdestname) >> >>}%
+        \fi
+       }%
+       \setcolor{\linkcolor}%
+     \fi
    \fi
    {%
***************
*** 8593,8596 ****
--- 8980,8984 ----
      \indexnofonts
      \turnoffactive
+     \def\value##1{##1}%
      \expandafter\global\expandafter\let\expandafter\Xthisreftitle
        \csname XR#1-title\endcsname
***************
*** 8733,8739 ****
  }
  
! % Define \refx{NAME}{SUFFIX} to reference a cross-reference string named NAME.
! % If its value is nonempty, SUFFIX is output afterward.
! %
  \def\refx#1#2{%
    \requireauxfile
--- 9121,9126 ----
  }
  
! % \refx{NAME}{SUFFIX} - reference a cross-reference string named NAME.  SUFFIX 
! % is output afterwards if non-empty.
  \def\refx#1#2{%
    \requireauxfile
***************
*** 8741,8744 ****
--- 9128,9132 ----
      \indexnofonts
      \otherbackslash
+     \def\value##1{##1}%
      \expandafter\global\expandafter\let\expandafter\thisrefX
        \csname XR#1\endcsname
***************
*** 8765,8778 ****
  }
  
! % This is the macro invoked by entries in the aux file.  Usually it's
! % just a \def (we prepend XR to the control sequence name to avoid
! % collisions).  But if this is a float type, we have more work to do.
  %
  \def\xrdef#1#2{%
!   {% The node name might contain 8-bit characters, which in our current
!    % implementation are changed to commands like @'e.  Don't let these
!    % mess up the control sequence name.
      \indexnofonts
      \turnoffactive
      \xdef\safexrefname{#1}%
    }%
--- 9153,9168 ----
  }
  
! % This is the macro invoked by entries in the aux file.  Define a control 
! % sequence for a cross-reference target (we prepend XR to the control sequence 
! % name to avoid collisions).  The value is the page number.  If this is a float 
! % type, we have more work to do.
  %
  \def\xrdef#1#2{%
!   {% Expand the node or anchor name to remove control sequences.
!    % \turnoffactive stops 8-bit characters being changed to commands
!    % like @'e.  \refx does the same to retrieve the value in the definition.
      \indexnofonts
      \turnoffactive
+     \def\value##1{##1}%
      \xdef\safexrefname{#1}%
    }%
***************
*** 8896,8902 ****
    \catcode`\\=\other
    %
-   % Make the characters 128-255 be printing characters.
-   {\setnonasciicharscatcodenonglobal\other}%
-   %
    % @ is our escape character in .aux files, and we need braces.
    \catcode`\{=1
--- 9286,9289 ----
***************
*** 8962,8966 ****
    % footnote reference occurs in (for example) a display environment.
    % So reset some parameters.
!   \hsize=\pagewidth
    \interlinepenalty\interfootnotelinepenalty
    \splittopskip\ht\strutbox % top baseline for broken footnotes
--- 9349,9353 ----
    % footnote reference occurs in (for example) a display environment.
    % So reset some parameters.
!   \hsize=\txipagewidth
    \interlinepenalty\interfootnotelinepenalty
    \splittopskip\ht\strutbox % top baseline for broken footnotes
***************
*** 9277,9281 ****
      \ifx\thiscaption\empty \else
        \ifx\floatident\empty \else
! 	\appendtomacro\captionline{: }% had ident, so need a colon between
        \fi
        %
--- 9664,9668 ----
      \ifx\thiscaption\empty \else
        \ifx\floatident\empty \else
!         \appendtomacro\captionline{: }% had ident, so need a colon between
        \fi
        %
***************
*** 9304,9331 ****
          \atdummies
          %
!         % since we read the caption text in the macro world, where ^^M
!         % is turned into a normal character, we have to scan it back, so
!         % we don't write the literal three characters "^^M" into the aux file.
! 	\scanexp{%
! 	  \xdef\noexpand\gtemp{%
! 	    \ifx\thisshortcaption\empty
! 	      \thiscaption
! 	    \else
! 	      \thisshortcaption
! 	    \fi
! 	  }%
! 	}%
          \immediate\write\auxfile{@xrdef{\floatlabel-lof}{\floatident
! 	  \ifx\gtemp\empty \else : \gtemp \fi}}%
        }%
      \fi
    \egroup  % end of \vtop
    %
-   % place the captured inserts
-   %
-   % BEWARE: when the floats start floating, we have to issue warning
-   % whenever an insert appears inside a float which could possibly
-   % float. --kasal, 26may04
-   %
    \checkinserts
  }
--- 9691,9705 ----
          \atdummies
          %
!         \ifx\thisshortcaption\empty
!           \def\gtemp{\thiscaption}%
!         \else
!           \def\gtemp{\thisshortcaption}%
!         \fi
          \immediate\write\auxfile{@xrdef{\floatlabel-lof}{\floatident
!           \ifx\gtemp\empty \else : \gtemp \fi}}%
        }%
      \fi
    \egroup  % end of \vtop
    %
    \checkinserts
  }
***************
*** 9502,9542 ****
  }
  
! % Get input by bytes instead of by UTF-8 codepoints for XeTeX and LuaTeX, 
! % otherwise the encoding support is completely broken.
  \ifx\XeTeXrevision\thisisundefined
  \else
! \XeTeXdefaultencoding "bytes"  % For subsequent files to be read
! \XeTeXinputencoding "bytes"  % Effective in texinfo.tex only
! % Unfortunately, there seems to be no corresponding XeTeX command for
! % output encoding.  This is a problem for auxiliary index and TOC files.
! % The only solution would be perhaps to write out @U{...} sequences in
! % place of UTF-8 characters.
  \fi
  
! \ifx\luatexversion\thisisundefined
! \else
! \directlua{
! local utf8_char, byte, gsub = unicode.utf8.char, string.byte, string.gsub
! local function convert_char (char)
!   return utf8_char(byte(char))
! end
  
! local function convert_line (line)
!   return gsub(line, ".", convert_char)
! end
  
! callback.register("process_input_buffer", convert_line)
  
! local function convert_line_out (line)
!   local line_out = ""
!   for c in string.utfvalues(line) do
!      line_out = line_out .. string.char(c)
!   end
!   return line_out
! end
  
! callback.register("process_output_buffer", convert_line_out)
  }
- \fi
  
  
--- 9876,9941 ----
  }
  
! % XeTeX and LuaTeX can handle Unicode natively.
! % Their default I/O uses UTF-8 sequences instead of a byte-wise operation.
! % Other TeX engines' I/O (pdfTeX, etc.) is byte-wise.
! %
! \newif\iftxinativeunicodecapable
! \newif\iftxiusebytewiseio
! 
  \ifx\XeTeXrevision\thisisundefined
+   \ifx\luatexversion\thisisundefined
+     \txinativeunicodecapablefalse
+     \txiusebytewiseiotrue
+   \else
+     \txinativeunicodecapabletrue
+     \txiusebytewiseiofalse
+   \fi
  \else
!   \txinativeunicodecapabletrue
!   \txiusebytewiseiofalse
  \fi
  
! % Set I/O by bytes instead of UTF-8 sequence for XeTeX and LuaTex
! % for non-UTF-8 (byte-wise) encodings.
! %
! \def\setbytewiseio{%
!   \ifx\XeTeXrevision\thisisundefined
!   \else
!     \XeTeXdefaultencoding "bytes"  % For subsequent files to be read
!     \XeTeXinputencoding "bytes"  % For document root file
!     % Unfortunately, there seems to be no corresponding XeTeX command for
!     % output encoding.  This is a problem for auxiliary index and TOC files.
!     % The only solution would be perhaps to write out @U{...} sequences in
!     % place of non-ASCII characters.
!   \fi
  
!   \ifx\luatexversion\thisisundefined
!   \else
!     \directlua{
!     local utf8_char, byte, gsub = unicode.utf8.char, string.byte, string.gsub
!     local function convert_char (char)
!       return utf8_char(byte(char))
!     end
  
!     local function convert_line (line)
!       return gsub(line, ".", convert_char)
!     end
  
!     callback.register("process_input_buffer", convert_line)
! 
!     local function convert_line_out (line)
!       local line_out = ""
!       for c in string.utfvalues(line) do
!          line_out = line_out .. string.char(c)
!       end
!       return line_out
!     end
! 
!     callback.register("process_output_buffer", convert_line_out)
!     }
!   \fi
  
!   \txiusebytewiseiotrue
  }
  
  
***************
*** 9565,9575 ****
  \def\documentencoding{\parseargusing\filenamecatcodes\documentencodingzzz}
  \def\documentencodingzzz#1{%
-   % Get input by bytes instead of by UTF-8 codepoints for XeTeX,
-   % otherwise the encoding support is completely broken.
-   % This settings is for the document root file.
-   \ifx\XeTeXrevision\thisisundefined
-   \else
-     \XeTeXinputencoding "bytes"
-   \fi
    %
    % Encoding being declared for the document.
--- 9964,9967 ----
***************
*** 9588,9607 ****
    %
    \else \ifx \declaredencoding \lattwo
       \setnonasciicharscatcode\active
       \lattwochardefs
    %
    \else \ifx \declaredencoding \latone
       \setnonasciicharscatcode\active
       \latonechardefs
    %
    \else \ifx \declaredencoding \latnine
       \setnonasciicharscatcode\active
       \latninechardefs
    %
    \else \ifx \declaredencoding \utfeight
!      \setnonasciicharscatcode\active
!      % since we already invoked \utfeightchardefs at the top level
!      % (below), do not re-invoke it, then our check for duplicated
!      % definitions triggers.  Making non-ascii chars active is enough.
    %
    \else
--- 9980,10015 ----
    %
    \else \ifx \declaredencoding \lattwo
+      \iftxinativeunicodecapable
+        \setbytewiseio
+      \fi
       \setnonasciicharscatcode\active
       \lattwochardefs
    %
    \else \ifx \declaredencoding \latone
+      \iftxinativeunicodecapable
+        \setbytewiseio
+      \fi
       \setnonasciicharscatcode\active
       \latonechardefs
    %
    \else \ifx \declaredencoding \latnine
+      \iftxinativeunicodecapable
+        \setbytewiseio
+      \fi
       \setnonasciicharscatcode\active
       \latninechardefs
    %
    \else \ifx \declaredencoding \utfeight
!      \iftxinativeunicodecapable
!        % For native Unicode handling (XeTeX and LuaTeX)
!        \nativeunicodechardefs
!      \else
!        % For treating UTF-8 as byte sequences (TeX, eTeX and pdfTeX)
!        \setnonasciicharscatcode\active
!        % since we already invoked \utfeightchardefs at the top level
!        % (below), do not re-invoke it, otherwise our check for duplicated
!        % definitions gets triggered.  Making non-ascii chars active is
!        % sufficient.
!      \fi
    %
    \else
***************
*** 9613,9616 ****
--- 10021,10036 ----
    \fi % lattwo
    \fi % ascii
+   %
+   \ifx\XeTeXrevision\thisisundefined
+   \else
+     \ifx \declaredencoding \utfeight
+     \else
+       \ifx \declaredencoding \ascii
+       \else
+         \message{Warning: XeTeX with non-UTF-8 encodings cannot handle %
+         non-ASCII characters in auxiliary files.}%
+       \fi
+     \fi
+   \fi
  }
  
***************
*** 9629,9735 ****
  \setnonasciicharscatcode\active
  %
  % Latin1 (ISO-8859-1) character definitions.
  \def\latonechardefs{%
!   \gdef^^a0{\tie}
!   \gdef^^a1{\exclamdown}
!   \gdef^^a2{{\tcfont \char162}} % cent
!   \gdef^^a3{\pounds}
!   \gdef^^a4{{\tcfont \char164}} % currency
!   \gdef^^a5{{\tcfont \char165}} % yen
!   \gdef^^a6{{\tcfont \char166}} % broken bar
!   \gdef^^a7{\S}
!   \gdef^^a8{\"{}}
!   \gdef^^a9{\copyright}
!   \gdef^^aa{\ordf}
!   \gdef^^ab{\guillemetleft}
!   \gdef^^ac{\ensuremath\lnot}
!   \gdef^^ad{\-}
!   \gdef^^ae{\registeredsymbol}
!   \gdef^^af{\={}}
!   %
!   \gdef^^b0{\textdegree}
!   \gdef^^b1{$\pm$}
!   \gdef^^b2{$^2$}
!   \gdef^^b3{$^3$}
!   \gdef^^b4{\'{}}
!   \gdef^^b5{$\mu$}
!   \gdef^^b6{\P}
!   \gdef^^b7{\ensuremath\cdot}
!   \gdef^^b8{\cedilla\ }
!   \gdef^^b9{$^1$}
!   \gdef^^ba{\ordm}
!   \gdef^^bb{\guillemetright}
!   \gdef^^bc{$1\over4$}
!   \gdef^^bd{$1\over2$}
!   \gdef^^be{$3\over4$}
!   \gdef^^bf{\questiondown}
!   %
!   \gdef^^c0{\`A}
!   \gdef^^c1{\'A}
!   \gdef^^c2{\^A}
!   \gdef^^c3{\~A}
!   \gdef^^c4{\"A}
!   \gdef^^c5{\ringaccent A}
!   \gdef^^c6{\AE}
!   \gdef^^c7{\cedilla C}
!   \gdef^^c8{\`E}
!   \gdef^^c9{\'E}
!   \gdef^^ca{\^E}
!   \gdef^^cb{\"E}
!   \gdef^^cc{\`I}
!   \gdef^^cd{\'I}
!   \gdef^^ce{\^I}
!   \gdef^^cf{\"I}
!   %
!   \gdef^^d0{\DH}
!   \gdef^^d1{\~N}
!   \gdef^^d2{\`O}
!   \gdef^^d3{\'O}
!   \gdef^^d4{\^O}
!   \gdef^^d5{\~O}
!   \gdef^^d6{\"O}
!   \gdef^^d7{$\times$}
!   \gdef^^d8{\O}
!   \gdef^^d9{\`U}
!   \gdef^^da{\'U}
!   \gdef^^db{\^U}
!   \gdef^^dc{\"U}
!   \gdef^^dd{\'Y}
!   \gdef^^de{\TH}
!   \gdef^^df{\ss}
!   %
!   \gdef^^e0{\`a}
!   \gdef^^e1{\'a}
!   \gdef^^e2{\^a}
!   \gdef^^e3{\~a}
!   \gdef^^e4{\"a}
!   \gdef^^e5{\ringaccent a}
!   \gdef^^e6{\ae}
!   \gdef^^e7{\cedilla c}
!   \gdef^^e8{\`e}
!   \gdef^^e9{\'e}
!   \gdef^^ea{\^e}
!   \gdef^^eb{\"e}
!   \gdef^^ec{\`{\dotless i}}
!   \gdef^^ed{\'{\dotless i}}
!   \gdef^^ee{\^{\dotless i}}
!   \gdef^^ef{\"{\dotless i}}
!   %
!   \gdef^^f0{\dh}
!   \gdef^^f1{\~n}
!   \gdef^^f2{\`o}
!   \gdef^^f3{\'o}
!   \gdef^^f4{\^o}
!   \gdef^^f5{\~o}
!   \gdef^^f6{\"o}
!   \gdef^^f7{$\div$}
!   \gdef^^f8{\o}
!   \gdef^^f9{\`u}
!   \gdef^^fa{\'u}
!   \gdef^^fb{\^u}
!   \gdef^^fc{\"u}
!   \gdef^^fd{\'y}
!   \gdef^^fe{\th}
!   \gdef^^ff{\"y}
  }
  
--- 10049,10165 ----
  \setnonasciicharscatcode\active
  %
+ 
+ \def\gdefchar#1#2{%
+ \gdef#1{%
+    \ifpassthroughchars
+      \string#1%
+    \else
+      #2%
+    \fi
+ }}
+ 
  % Latin1 (ISO-8859-1) character definitions.
  \def\latonechardefs{%
!   \gdefchar^^a0{\tie}
!   \gdefchar^^a1{\exclamdown}
!   \gdefchar^^a2{{\tcfont \char162}} % cent
!   \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^^aa{\ordf}
!   \gdefchar^^ab{\guillemetleft}
!   \gdefchar^^ac{\ensuremath\lnot}
!   \gdefchar^^ad{\-}
!   \gdefchar^^ae{\registeredsymbol}
!   \gdefchar^^af{\={}}
!   %
!   \gdefchar^^b0{\textdegree}
!   \gdefchar^^b1{$\pm$}
!   \gdefchar^^b2{$^2$}
!   \gdefchar^^b3{$^3$}
!   \gdefchar^^b4{\'{}}
!   \gdefchar^^b5{$\mu$}
!   \gdefchar^^b6{\P}
!   \gdefchar^^b7{\ensuremath\cdot}
!   \gdefchar^^b8{\cedilla\ }
!   \gdefchar^^b9{$^1$}
!   \gdefchar^^ba{\ordm}
!   \gdefchar^^bb{\guillemetright}
!   \gdefchar^^bc{$1\over4$}
!   \gdefchar^^bd{$1\over2$}
!   \gdefchar^^be{$3\over4$}
!   \gdefchar^^bf{\questiondown}
!   %
!   \gdefchar^^c0{\`A}
!   \gdefchar^^c1{\'A}
!   \gdefchar^^c2{\^A}
!   \gdefchar^^c3{\~A}
!   \gdefchar^^c4{\"A}
!   \gdefchar^^c5{\ringaccent A}
!   \gdefchar^^c6{\AE}
!   \gdefchar^^c7{\cedilla C}
!   \gdefchar^^c8{\`E}
!   \gdefchar^^c9{\'E}
!   \gdefchar^^ca{\^E}
!   \gdefchar^^cb{\"E}
!   \gdefchar^^cc{\`I}
!   \gdefchar^^cd{\'I}
!   \gdefchar^^ce{\^I}
!   \gdefchar^^cf{\"I}
!   %
!   \gdefchar^^d0{\DH}
!   \gdefchar^^d1{\~N}
!   \gdefchar^^d2{\`O}
!   \gdefchar^^d3{\'O}
!   \gdefchar^^d4{\^O}
!   \gdefchar^^d5{\~O}
!   \gdefchar^^d6{\"O}
!   \gdefchar^^d7{$\times$}
!   \gdefchar^^d8{\O}
!   \gdefchar^^d9{\`U}
!   \gdefchar^^da{\'U}
!   \gdefchar^^db{\^U}
!   \gdefchar^^dc{\"U}
!   \gdefchar^^dd{\'Y}
!   \gdefchar^^de{\TH}
!   \gdefchar^^df{\ss}
!   %
!   \gdefchar^^e0{\`a}
!   \gdefchar^^e1{\'a}
!   \gdefchar^^e2{\^a}
!   \gdefchar^^e3{\~a}
!   \gdefchar^^e4{\"a}
!   \gdefchar^^e5{\ringaccent a}
!   \gdefchar^^e6{\ae}
!   \gdefchar^^e7{\cedilla c}
!   \gdefchar^^e8{\`e}
!   \gdefchar^^e9{\'e}
!   \gdefchar^^ea{\^e}
!   \gdefchar^^eb{\"e}
!   \gdefchar^^ec{\`{\dotless i}}
!   \gdefchar^^ed{\'{\dotless i}}
!   \gdefchar^^ee{\^{\dotless i}}
!   \gdefchar^^ef{\"{\dotless i}}
!   %
!   \gdefchar^^f0{\dh}
!   \gdefchar^^f1{\~n}
!   \gdefchar^^f2{\`o}
!   \gdefchar^^f3{\'o}
!   \gdefchar^^f4{\^o}
!   \gdefchar^^f5{\~o}
!   \gdefchar^^f6{\"o}
!   \gdefchar^^f7{$\div$}
!   \gdefchar^^f8{\o}
!   \gdefchar^^f9{\`u}
!   \gdefchar^^fa{\'u}
!   \gdefchar^^fb{\^u}
!   \gdefchar^^fc{\"u}
!   \gdefchar^^fd{\'y}
!   \gdefchar^^fe{\th}
!   \gdefchar^^ff{\"y}
  }
  
***************
*** 9739,9855 ****
    \latonechardefs
    %
!   \gdef^^a4{\euro}
!   \gdef^^a6{\v S}
!   \gdef^^a8{\v s}
!   \gdef^^b4{\v Z}
!   \gdef^^b8{\v z}
!   \gdef^^bc{\OE}
!   \gdef^^bd{\oe}
!   \gdef^^be{\"Y}
  }
  
  % Latin2 (ISO-8859-2) character definitions.
  \def\lattwochardefs{%
!   \gdef^^a0{\tie}
!   \gdef^^a1{\ogonek{A}}
!   \gdef^^a2{\u{}}
!   \gdef^^a3{\L}
!   \gdef^^a4{\missingcharmsg{CURRENCY SIGN}}
!   \gdef^^a5{\v L}
!   \gdef^^a6{\'S}
!   \gdef^^a7{\S}
!   \gdef^^a8{\"{}}
!   \gdef^^a9{\v S}
!   \gdef^^aa{\cedilla S}
!   \gdef^^ab{\v T}
!   \gdef^^ac{\'Z}
!   \gdef^^ad{\-}
!   \gdef^^ae{\v Z}
!   \gdef^^af{\dotaccent Z}
!   %
!   \gdef^^b0{\textdegree}
!   \gdef^^b1{\ogonek{a}}
!   \gdef^^b2{\ogonek{ }}
!   \gdef^^b3{\l}
!   \gdef^^b4{\'{}}
!   \gdef^^b5{\v l}
!   \gdef^^b6{\'s}
!   \gdef^^b7{\v{}}
!   \gdef^^b8{\cedilla\ }
!   \gdef^^b9{\v s}
!   \gdef^^ba{\cedilla s}
!   \gdef^^bb{\v t}
!   \gdef^^bc{\'z}
!   \gdef^^bd{\H{}}
!   \gdef^^be{\v z}
!   \gdef^^bf{\dotaccent z}
!   %
!   \gdef^^c0{\'R}
!   \gdef^^c1{\'A}
!   \gdef^^c2{\^A}
!   \gdef^^c3{\u A}
!   \gdef^^c4{\"A}
!   \gdef^^c5{\'L}
!   \gdef^^c6{\'C}
!   \gdef^^c7{\cedilla C}
!   \gdef^^c8{\v C}
!   \gdef^^c9{\'E}
!   \gdef^^ca{\ogonek{E}}
!   \gdef^^cb{\"E}
!   \gdef^^cc{\v E}
!   \gdef^^cd{\'I}
!   \gdef^^ce{\^I}
!   \gdef^^cf{\v D}
!   %
!   \gdef^^d0{\DH}
!   \gdef^^d1{\'N}
!   \gdef^^d2{\v N}
!   \gdef^^d3{\'O}
!   \gdef^^d4{\^O}
!   \gdef^^d5{\H O}
!   \gdef^^d6{\"O}
!   \gdef^^d7{$\times$}
!   \gdef^^d8{\v R}
!   \gdef^^d9{\ringaccent U}
!   \gdef^^da{\'U}
!   \gdef^^db{\H U}
!   \gdef^^dc{\"U}
!   \gdef^^dd{\'Y}
!   \gdef^^de{\cedilla T}
!   \gdef^^df{\ss}
!   %
!   \gdef^^e0{\'r}
!   \gdef^^e1{\'a}
!   \gdef^^e2{\^a}
!   \gdef^^e3{\u a}
!   \gdef^^e4{\"a}
!   \gdef^^e5{\'l}
!   \gdef^^e6{\'c}
!   \gdef^^e7{\cedilla c}
!   \gdef^^e8{\v c}
!   \gdef^^e9{\'e}
!   \gdef^^ea{\ogonek{e}}
!   \gdef^^eb{\"e}
!   \gdef^^ec{\v e}
!   \gdef^^ed{\'{\dotless{i}}}
!   \gdef^^ee{\^{\dotless{i}}}
!   \gdef^^ef{\v d}
!   %
!   \gdef^^f0{\dh}
!   \gdef^^f1{\'n}
!   \gdef^^f2{\v n}
!   \gdef^^f3{\'o}
!   \gdef^^f4{\^o}
!   \gdef^^f5{\H o}
!   \gdef^^f6{\"o}
!   \gdef^^f7{$\div$}
!   \gdef^^f8{\v r}
!   \gdef^^f9{\ringaccent u}
!   \gdef^^fa{\'u}
!   \gdef^^fb{\H u}
!   \gdef^^fc{\"u}
!   \gdef^^fd{\'y}
!   \gdef^^fe{\cedilla t}
!   \gdef^^ff{\dotaccent{}}
  }
  
--- 10169,10285 ----
    \latonechardefs
    %
!   \gdefchar^^a4{\euro}
!   \gdefchar^^a6{\v S}
!   \gdefchar^^a8{\v s}
!   \gdefchar^^b4{\v Z}
!   \gdefchar^^b8{\v z}
!   \gdefchar^^bc{\OE}
!   \gdefchar^^bd{\oe}
!   \gdefchar^^be{\"Y}
  }
  
  % Latin2 (ISO-8859-2) character definitions.
  \def\lattwochardefs{%
!   \gdefchar^^a0{\tie}
!   \gdefchar^^a1{\ogonek{A}}
!   \gdefchar^^a2{\u{}}
!   \gdefchar^^a3{\L}
!   \gdefchar^^a4{\missingcharmsg{CURRENCY SIGN}}
!   \gdefchar^^a5{\v L}
!   \gdefchar^^a6{\'S}
!   \gdefchar^^a7{\S}
!   \gdefchar^^a8{\"{}}
!   \gdefchar^^a9{\v S}
!   \gdefchar^^aa{\cedilla S}
!   \gdefchar^^ab{\v T}
!   \gdefchar^^ac{\'Z}
!   \gdefchar^^ad{\-}
!   \gdefchar^^ae{\v Z}
!   \gdefchar^^af{\dotaccent Z}
!   %
!   \gdefchar^^b0{\textdegree}
!   \gdefchar^^b1{\ogonek{a}}
!   \gdefchar^^b2{\ogonek{ }}
!   \gdefchar^^b3{\l}
!   \gdefchar^^b4{\'{}}
!   \gdefchar^^b5{\v l}
!   \gdefchar^^b6{\'s}
!   \gdefchar^^b7{\v{}}
!   \gdefchar^^b8{\cedilla\ }
!   \gdefchar^^b9{\v s}
!   \gdefchar^^ba{\cedilla s}
!   \gdefchar^^bb{\v t}
!   \gdefchar^^bc{\'z}
!   \gdefchar^^bd{\H{}}
!   \gdefchar^^be{\v z}
!   \gdefchar^^bf{\dotaccent z}
!   %
!   \gdefchar^^c0{\'R}
!   \gdefchar^^c1{\'A}
!   \gdefchar^^c2{\^A}
!   \gdefchar^^c3{\u A}
!   \gdefchar^^c4{\"A}
!   \gdefchar^^c5{\'L}
!   \gdefchar^^c6{\'C}
!   \gdefchar^^c7{\cedilla C}
!   \gdefchar^^c8{\v C}
!   \gdefchar^^c9{\'E}
!   \gdefchar^^ca{\ogonek{E}}
!   \gdefchar^^cb{\"E}
!   \gdefchar^^cc{\v E}
!   \gdefchar^^cd{\'I}
!   \gdefchar^^ce{\^I}
!   \gdefchar^^cf{\v D}
!   %
!   \gdefchar^^d0{\DH}
!   \gdefchar^^d1{\'N}
!   \gdefchar^^d2{\v N}
!   \gdefchar^^d3{\'O}
!   \gdefchar^^d4{\^O}
!   \gdefchar^^d5{\H O}
!   \gdefchar^^d6{\"O}
!   \gdefchar^^d7{$\times$}
!   \gdefchar^^d8{\v R}
!   \gdefchar^^d9{\ringaccent U}
!   \gdefchar^^da{\'U}
!   \gdefchar^^db{\H U}
!   \gdefchar^^dc{\"U}
!   \gdefchar^^dd{\'Y}
!   \gdefchar^^de{\cedilla T}
!   \gdefchar^^df{\ss}
!   %
!   \gdefchar^^e0{\'r}
!   \gdefchar^^e1{\'a}
!   \gdefchar^^e2{\^a}
!   \gdefchar^^e3{\u a}
!   \gdefchar^^e4{\"a}
!   \gdefchar^^e5{\'l}
!   \gdefchar^^e6{\'c}
!   \gdefchar^^e7{\cedilla c}
!   \gdefchar^^e8{\v c}
!   \gdefchar^^e9{\'e}
!   \gdefchar^^ea{\ogonek{e}}
!   \gdefchar^^eb{\"e}
!   \gdefchar^^ec{\v e}
!   \gdefchar^^ed{\'{\dotless{i}}}
!   \gdefchar^^ee{\^{\dotless{i}}}
!   \gdefchar^^ef{\v d}
!   %
!   \gdefchar^^f0{\dh}
!   \gdefchar^^f1{\'n}
!   \gdefchar^^f2{\v n}
!   \gdefchar^^f3{\'o}
!   \gdefchar^^f4{\^o}
!   \gdefchar^^f5{\H o}
!   \gdefchar^^f6{\"o}
!   \gdefchar^^f7{$\div$}
!   \gdefchar^^f8{\v r}
!   \gdefchar^^f9{\ringaccent u}
!   \gdefchar^^fa{\'u}
!   \gdefchar^^fb{\H u}
!   \gdefchar^^fc{\"u}
!   \gdefchar^^fd{\'y}
!   \gdefchar^^fe{\cedilla t}
!   \gdefchar^^ff{\dotaccent{}}
  }
  
***************
*** 9881,9891 ****
--- 10311,10326 ----
  }
  
+ % Give non-ASCII bytes the active definitions for processing UTF-8 sequences
  \begingroup
    \catcode`\~13
+   \catcode`\$12
    \catcode`\"12
  
+   % Loop from \countUTFx to \countUTFy, performing \UTFviiiTmp
+   % substituting ~ and $ with a character token of that value.
    \def\UTFviiiLoop{%
      \global\catcode\countUTFx\active
      \uccode`\~\countUTFx
+     \uccode`\$\countUTFx
      \uppercase\expandafter{\UTFviiiTmp}%
      \advance\countUTFx by 1
***************
*** 9894,9901 ****
      \fi}
  
    \countUTFx = "C2
    \countUTFy = "E0
    \def\UTFviiiTmp{%
!     \xdef~{\noexpand\UTFviiiTwoOctets\string~}}
    \UTFviiiLoop
  
--- 10329,10347 ----
      \fi}
  
+   % For bytes other than the first in a UTF-8 sequence.  Not expected to
+   % be expanded except when writing to auxiliary files.
+   \countUTFx = "80
+   \countUTFy = "C2
+   \def\UTFviiiTmp{%
+     \gdef~{%
+         \ifpassthroughchars $\fi}}%
+   \UTFviiiLoop
+ 
    \countUTFx = "C2
    \countUTFy = "E0
    \def\UTFviiiTmp{%
!     \gdef~{%
!         \ifpassthroughchars $%
!         \else\expandafter\UTFviiiTwoOctets\expandafter$\fi}}%
    \UTFviiiLoop
  
***************
*** 9903,9907 ****
    \countUTFy = "F0
    \def\UTFviiiTmp{%
!     \xdef~{\noexpand\UTFviiiThreeOctets\string~}}
    \UTFviiiLoop
  
--- 10349,10355 ----
    \countUTFy = "F0
    \def\UTFviiiTmp{%
!     \gdef~{%
!         \ifpassthroughchars $%
!         \else\expandafter\UTFviiiThreeOctets\expandafter$\fi}}%
    \UTFviiiLoop
  
***************
*** 9909,9913 ****
    \countUTFy = "F4
    \def\UTFviiiTmp{%
!     \xdef~{\noexpand\UTFviiiFourOctets\string~}}
    \UTFviiiLoop
  \endgroup
--- 10357,10364 ----
    \countUTFy = "F4
    \def\UTFviiiTmp{%
!     \gdef~{%
!         \ifpassthroughchars $%
!         \else\expandafter\UTFviiiFourOctets\expandafter$\fi
!         }}%
    \UTFviiiLoop
  \endgroup
***************
*** 9918,9923 ****
  \def\U#1{%
    \expandafter\ifx\csname uni:#1\endcsname \relax
!     \errhelp = \EMsimple	
!     \errmessage{Unicode character U+#1 not supported, sorry}%
    \else
      \csname uni:#1\endcsname
--- 10369,10384 ----
  \def\U#1{%
    \expandafter\ifx\csname uni:#1\endcsname \relax
!     \iftxinativeunicodecapable
!       % All Unicode characters can be used if native Unicode handling is
!       % active.  However, if the font does not have the glyph,
!       % letters are missing.
!       \begingroup
!         \uccode`\.="#1\relax
!         \uppercase{.}
!       \endgroup
!     \else
!       \errhelp = \EMsimple	
!       \errmessage{Unicode character U+#1 not supported, sorry}%
!     \fi
    \else
      \csname uni:#1\endcsname
***************
*** 9925,9928 ****
--- 10386,10402 ----
  }
  
+ % These macros are used here to construct the name of a control
+ % sequence to be defined.
+ \def\UTFviiiTwoOctetsName#1#2{%
+   \csname u8:#1\string #2\endcsname}%
+ \def\UTFviiiThreeOctetsName#1#2#3{%
+   \csname u8:#1\string #2\string #3\endcsname}%
+ \def\UTFviiiFourOctetsName#1#2#3#4{%
+   \csname u8:#1\string #2\string #3\string #4\endcsname}%
+ 
+ % For UTF-8 byte sequences (TeX, e-TeX and pdfTeX),
+ % provide a definition macro to replace a Unicode character;
+ % this gets used by the @U command
+ %
  \begingroup
    \catcode`\"=12
***************
*** 9933,9950 ****
    \catcode`\!=12
    \catcode`\~=13
!   \gdef\DeclareUnicodeCharacter#1#2{%
      \countUTFz = "#1\relax
-     %\wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}%
      \begingroup
        \parseXMLCharref
!       \def\UTFviiiTwoOctets##1##2{%
!         \csname u8:##1\string ##2\endcsname}%
!       \def\UTFviiiThreeOctets##1##2##3{%
!         \csname u8:##1\string ##2\string ##3\endcsname}%
!       \def\UTFviiiFourOctets##1##2##3##4{%
!         \csname u8:##1\string ##2\string ##3\string ##4\endcsname}%
!       \expandafter\expandafter\expandafter\expandafter
!        \expandafter\expandafter\expandafter
!        \gdef\UTFviiiTmp{#2}%
        % 
        \expandafter\ifx\csname uni:#1\endcsname \relax \else
--- 10407,10426 ----
    \catcode`\!=12
    \catcode`\~=13
!   \gdef\DeclareUnicodeCharacterUTFviii#1#2{%
      \countUTFz = "#1\relax
      \begingroup
        \parseXMLCharref
!     
!       % Give \u8:... its definition.  The sequence of seven \expandafter's
!       % expands after the \gdef three times, e.g.
!       %
!       % 1.  \UTFviiTwoOctetsName B1 B2
!       % 2.  \csname u8:B1 \string B2 \endcsname
!       % 3.  \u8: B1 B2  (a single control sequence token)
!       %
!       \expandafter\expandafter
!       \expandafter\expandafter
!       \expandafter\expandafter
!       \expandafter\gdef       \UTFviiiTmp{#2}%
        % 
        \expandafter\ifx\csname uni:#1\endcsname \relax \else
***************
*** 9955,9959 ****
        \expandafter\globallet\csname uni:#1\endcsname \UTFviiiTmp
      \endgroup}
! 
    \gdef\parseXMLCharref{%
      \ifnum\countUTFz < "A0\relax
--- 10431,10437 ----
        \expandafter\globallet\csname uni:#1\endcsname \UTFviiiTmp
      \endgroup}
!   %
!   % Given the value in \countUTFz as a Unicode code point, set \UTFviiiTmp
!   % to the corresponding UTF-8 sequence.
    \gdef\parseXMLCharref{%
      \ifnum\countUTFz < "A0\relax
***************
*** 9962,9988 ****
      \else\ifnum\countUTFz < "800\relax
        \parseUTFviiiA,%
!       \parseUTFviiiB C\UTFviiiTwoOctets.,%
      \else\ifnum\countUTFz < "10000\relax
        \parseUTFviiiA;%
        \parseUTFviiiA,%
!       \parseUTFviiiB E\UTFviiiThreeOctets.{,;}%
      \else
        \parseUTFviiiA;%
        \parseUTFviiiA,%
        \parseUTFviiiA!%
!       \parseUTFviiiB F\UTFviiiFourOctets.{!,;}%
      \fi\fi\fi
    }
  
    \gdef\parseUTFviiiA#1{%
      \countUTFx = \countUTFz
      \divide\countUTFz by 64
!     \countUTFy = \countUTFz
      \multiply\countUTFz by 64
      \advance\countUTFx by -\countUTFz
      \advance\countUTFx by 128
      \uccode `#1\countUTFx
      \countUTFz = \countUTFy}
  
    \gdef\parseUTFviiiB#1#2#3#4{%
      \advance\countUTFz by "#10\relax
--- 10440,10482 ----
      \else\ifnum\countUTFz < "800\relax
        \parseUTFviiiA,%
!       \parseUTFviiiB C\UTFviiiTwoOctetsName.,%
      \else\ifnum\countUTFz < "10000\relax
        \parseUTFviiiA;%
        \parseUTFviiiA,%
!       \parseUTFviiiB E\UTFviiiThreeOctetsName.{,;}%
      \else
        \parseUTFviiiA;%
        \parseUTFviiiA,%
        \parseUTFviiiA!%
!       \parseUTFviiiB F\UTFviiiFourOctetsName.{!,;}%
      \fi\fi\fi
    }
  
+   % Extract a byte from the end of the UTF-8 representation of \countUTFx.
+   % It must be a non-initial byte in the sequence.
+   % Change \uccode of #1 for it to be used in \parseUTFviiiB as one
+   % of the bytes.
    \gdef\parseUTFviiiA#1{%
      \countUTFx = \countUTFz
      \divide\countUTFz by 64
!     \countUTFy = \countUTFz  % Save to be the future value of \countUTFz.
      \multiply\countUTFz by 64
+     
+     % \countUTFz is now \countUTFx with the last 5 bits cleared.  Subtract
+     % in order to get the last five bits.
      \advance\countUTFx by -\countUTFz
+ 
+     % Convert this to the byte in the UTF-8 sequence.
      \advance\countUTFx by 128
      \uccode `#1\countUTFx
      \countUTFz = \countUTFy}
  
+   % Used to put a UTF-8 byte sequence into \UTFviiiTmp
+   % #1 is the increment for \countUTFz to yield a the first byte of the UTF-8
+   %    sequence.
+   % #2 is one of the \UTFviii*OctetsName macros.
+   % #3 is always a full stop (.)
+   % #4 is a template for the other bytes in the sequence.  The values for these
+   %    bytes is substituted in here with \uppercase using the \uccode's.
    \gdef\parseUTFviiiB#1#2#3#4{%
      \advance\countUTFz by "#10\relax
***************
*** 9991,9994 ****
--- 10485,10495 ----
  \endgroup
  
+ % For native Unicode handling (XeTeX and LuaTeX),
+ % provide a definition macro that sets a catcode to `other' non-globally
+ %
+ \def\DeclareUnicodeCharacterNativeOther#1#2{%
+   \catcode"#1=\other
+ }
+ 
  % https://en.wikipedia.org/wiki/Plane_(Unicode)#Basic_M
  % U+0000..U+007F = https://en.wikipedia.org/wiki/Basic_Latin_(Unicode_block)
***************
*** 10005,10734 ****
  % least make most of the characters not bomb out.
  %
! \def\utfeightchardefs{%
!   \DeclareUnicodeCharacter{00A0}{\tie}
!   \DeclareUnicodeCharacter{00A1}{\exclamdown}
    \DeclareUnicodeCharacter{00A2}{{\tcfont \char162}}% 0242=cent
!   \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{00AA}{\ordf}
!   \DeclareUnicodeCharacter{00AB}{\guillemetleft}
!   \DeclareUnicodeCharacter{00AC}{\ensuremath\lnot}
!   \DeclareUnicodeCharacter{00AD}{\-}
!   \DeclareUnicodeCharacter{00AE}{\registeredsymbol}
!   \DeclareUnicodeCharacter{00AF}{\={ }}
!   %
!   \DeclareUnicodeCharacter{00B0}{\ringaccent{ }}
!   \DeclareUnicodeCharacter{00B1}{\ensuremath\pm}
!   \DeclareUnicodeCharacter{00B2}{$^2$}
!   \DeclareUnicodeCharacter{00B3}{$^3$}
!   \DeclareUnicodeCharacter{00B4}{\'{ }}
!   \DeclareUnicodeCharacter{00B5}{$\mu$}
!   \DeclareUnicodeCharacter{00B6}{\P}
!   \DeclareUnicodeCharacter{00B7}{\ensuremath\cdot}
!   \DeclareUnicodeCharacter{00B8}{\cedilla{ }}
!   \DeclareUnicodeCharacter{00B9}{$^1$}
!   \DeclareUnicodeCharacter{00BA}{\ordm}
!   \DeclareUnicodeCharacter{00BB}{\guillemetright}
!   \DeclareUnicodeCharacter{00BC}{$1\over4$}
!   \DeclareUnicodeCharacter{00BD}{$1\over2$}
!   \DeclareUnicodeCharacter{00BE}{$3\over4$}
!   \DeclareUnicodeCharacter{00BF}{\questiondown}
!   %
!   \DeclareUnicodeCharacter{00C0}{\`A}
!   \DeclareUnicodeCharacter{00C1}{\'A}
!   \DeclareUnicodeCharacter{00C2}{\^A}
!   \DeclareUnicodeCharacter{00C3}{\~A}
!   \DeclareUnicodeCharacter{00C4}{\"A}
!   \DeclareUnicodeCharacter{00C5}{\AA}
!   \DeclareUnicodeCharacter{00C6}{\AE}
!   \DeclareUnicodeCharacter{00C7}{\cedilla{C}}
!   \DeclareUnicodeCharacter{00C8}{\`E}
!   \DeclareUnicodeCharacter{00C9}{\'E}
!   \DeclareUnicodeCharacter{00CA}{\^E}
!   \DeclareUnicodeCharacter{00CB}{\"E}
!   \DeclareUnicodeCharacter{00CC}{\`I}
!   \DeclareUnicodeCharacter{00CD}{\'I}
!   \DeclareUnicodeCharacter{00CE}{\^I}
!   \DeclareUnicodeCharacter{00CF}{\"I}
!   %
!   \DeclareUnicodeCharacter{00D0}{\DH}
!   \DeclareUnicodeCharacter{00D1}{\~N}
!   \DeclareUnicodeCharacter{00D2}{\`O}
!   \DeclareUnicodeCharacter{00D3}{\'O}
!   \DeclareUnicodeCharacter{00D4}{\^O}
!   \DeclareUnicodeCharacter{00D5}{\~O}
!   \DeclareUnicodeCharacter{00D6}{\"O}
!   \DeclareUnicodeCharacter{00D7}{\ensuremath\times}
!   \DeclareUnicodeCharacter{00D8}{\O}
!   \DeclareUnicodeCharacter{00D9}{\`U}
!   \DeclareUnicodeCharacter{00DA}{\'U}
!   \DeclareUnicodeCharacter{00DB}{\^U}
!   \DeclareUnicodeCharacter{00DC}{\"U}
!   \DeclareUnicodeCharacter{00DD}{\'Y}
!   \DeclareUnicodeCharacter{00DE}{\TH}
!   \DeclareUnicodeCharacter{00DF}{\ss}
!   %
!   \DeclareUnicodeCharacter{00E0}{\`a}
!   \DeclareUnicodeCharacter{00E1}{\'a}
!   \DeclareUnicodeCharacter{00E2}{\^a}
!   \DeclareUnicodeCharacter{00E3}{\~a}
!   \DeclareUnicodeCharacter{00E4}{\"a}
!   \DeclareUnicodeCharacter{00E5}{\aa}
!   \DeclareUnicodeCharacter{00E6}{\ae}
!   \DeclareUnicodeCharacter{00E7}{\cedilla{c}}
!   \DeclareUnicodeCharacter{00E8}{\`e}
!   \DeclareUnicodeCharacter{00E9}{\'e}
!   \DeclareUnicodeCharacter{00EA}{\^e}
!   \DeclareUnicodeCharacter{00EB}{\"e}
!   \DeclareUnicodeCharacter{00EC}{\`{\dotless{i}}}
!   \DeclareUnicodeCharacter{00ED}{\'{\dotless{i}}}
!   \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}}
!   \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}}
!   %
!   \DeclareUnicodeCharacter{00F0}{\dh}
!   \DeclareUnicodeCharacter{00F1}{\~n}
!   \DeclareUnicodeCharacter{00F2}{\`o}
!   \DeclareUnicodeCharacter{00F3}{\'o}
!   \DeclareUnicodeCharacter{00F4}{\^o}
!   \DeclareUnicodeCharacter{00F5}{\~o}
!   \DeclareUnicodeCharacter{00F6}{\"o}
!   \DeclareUnicodeCharacter{00F7}{\ensuremath\div}
!   \DeclareUnicodeCharacter{00F8}{\o}
!   \DeclareUnicodeCharacter{00F9}{\`u}
!   \DeclareUnicodeCharacter{00FA}{\'u}
!   \DeclareUnicodeCharacter{00FB}{\^u}
!   \DeclareUnicodeCharacter{00FC}{\"u}
!   \DeclareUnicodeCharacter{00FD}{\'y}
!   \DeclareUnicodeCharacter{00FE}{\th}
!   \DeclareUnicodeCharacter{00FF}{\"y}
!   %
!   \DeclareUnicodeCharacter{0100}{\=A}
!   \DeclareUnicodeCharacter{0101}{\=a}
!   \DeclareUnicodeCharacter{0102}{\u{A}}
!   \DeclareUnicodeCharacter{0103}{\u{a}}
!   \DeclareUnicodeCharacter{0104}{\ogonek{A}}
!   \DeclareUnicodeCharacter{0105}{\ogonek{a}}
!   \DeclareUnicodeCharacter{0106}{\'C}
!   \DeclareUnicodeCharacter{0107}{\'c}
!   \DeclareUnicodeCharacter{0108}{\^C}
!   \DeclareUnicodeCharacter{0109}{\^c}
!   \DeclareUnicodeCharacter{010A}{\dotaccent{C}}
!   \DeclareUnicodeCharacter{010B}{\dotaccent{c}}
!   \DeclareUnicodeCharacter{010C}{\v{C}}
!   \DeclareUnicodeCharacter{010D}{\v{c}}
!   \DeclareUnicodeCharacter{010E}{\v{D}}
!   \DeclareUnicodeCharacter{010F}{d'}
!   %
!   \DeclareUnicodeCharacter{0110}{\DH}
!   \DeclareUnicodeCharacter{0111}{\dh}
!   \DeclareUnicodeCharacter{0112}{\=E}
!   \DeclareUnicodeCharacter{0113}{\=e}
!   \DeclareUnicodeCharacter{0114}{\u{E}}
!   \DeclareUnicodeCharacter{0115}{\u{e}}
!   \DeclareUnicodeCharacter{0116}{\dotaccent{E}}
!   \DeclareUnicodeCharacter{0117}{\dotaccent{e}}
!   \DeclareUnicodeCharacter{0118}{\ogonek{E}}
!   \DeclareUnicodeCharacter{0119}{\ogonek{e}}
!   \DeclareUnicodeCharacter{011A}{\v{E}}
!   \DeclareUnicodeCharacter{011B}{\v{e}}
!   \DeclareUnicodeCharacter{011C}{\^G}
!   \DeclareUnicodeCharacter{011D}{\^g}
!   \DeclareUnicodeCharacter{011E}{\u{G}}
!   \DeclareUnicodeCharacter{011F}{\u{g}}
!   %
!   \DeclareUnicodeCharacter{0120}{\dotaccent{G}}
!   \DeclareUnicodeCharacter{0121}{\dotaccent{g}}
!   \DeclareUnicodeCharacter{0122}{\cedilla{G}}
!   \DeclareUnicodeCharacter{0123}{\cedilla{g}}
!   \DeclareUnicodeCharacter{0124}{\^H}
!   \DeclareUnicodeCharacter{0125}{\^h}
!   \DeclareUnicodeCharacter{0126}{\missingcharmsg{H WITH STROKE}}
!   \DeclareUnicodeCharacter{0127}{\missingcharmsg{h WITH STROKE}}
!   \DeclareUnicodeCharacter{0128}{\~I}
!   \DeclareUnicodeCharacter{0129}{\~{\dotless{i}}}
!   \DeclareUnicodeCharacter{012A}{\=I}
!   \DeclareUnicodeCharacter{012B}{\={\dotless{i}}}
!   \DeclareUnicodeCharacter{012C}{\u{I}}
!   \DeclareUnicodeCharacter{012D}{\u{\dotless{i}}}
!   \DeclareUnicodeCharacter{012E}{\ogonek{I}}
!   \DeclareUnicodeCharacter{012F}{\ogonek{i}}
!   %
!   \DeclareUnicodeCharacter{0130}{\dotaccent{I}}
!   \DeclareUnicodeCharacter{0131}{\dotless{i}}
!   \DeclareUnicodeCharacter{0132}{IJ}
!   \DeclareUnicodeCharacter{0133}{ij}
!   \DeclareUnicodeCharacter{0134}{\^J}
!   \DeclareUnicodeCharacter{0135}{\^{\dotless{j}}}
!   \DeclareUnicodeCharacter{0136}{\cedilla{K}}
!   \DeclareUnicodeCharacter{0137}{\cedilla{k}}
!   \DeclareUnicodeCharacter{0138}{\ensuremath\kappa}  
!   \DeclareUnicodeCharacter{0139}{\'L}
!   \DeclareUnicodeCharacter{013A}{\'l}
!   \DeclareUnicodeCharacter{013B}{\cedilla{L}}
!   \DeclareUnicodeCharacter{013C}{\cedilla{l}}
    \DeclareUnicodeCharacter{013D}{L'}% should kern
    \DeclareUnicodeCharacter{013E}{l'}% should kern
!   \DeclareUnicodeCharacter{013F}{L\U{00B7}}
    %
!   \DeclareUnicodeCharacter{0140}{l\U{00B7}}
!   \DeclareUnicodeCharacter{0141}{\L}
!   \DeclareUnicodeCharacter{0142}{\l}
!   \DeclareUnicodeCharacter{0143}{\'N}
!   \DeclareUnicodeCharacter{0144}{\'n}
!   \DeclareUnicodeCharacter{0145}{\cedilla{N}}
!   \DeclareUnicodeCharacter{0146}{\cedilla{n}}
!   \DeclareUnicodeCharacter{0147}{\v{N}}
!   \DeclareUnicodeCharacter{0148}{\v{n}}
!   \DeclareUnicodeCharacter{0149}{'n}
!   \DeclareUnicodeCharacter{014A}{\missingcharmsg{ENG}}
!   \DeclareUnicodeCharacter{014B}{\missingcharmsg{eng}}
!   \DeclareUnicodeCharacter{014C}{\=O}
!   \DeclareUnicodeCharacter{014D}{\=o}
!   \DeclareUnicodeCharacter{014E}{\u{O}}
!   \DeclareUnicodeCharacter{014F}{\u{o}}
!   %
!   \DeclareUnicodeCharacter{0150}{\H{O}}
!   \DeclareUnicodeCharacter{0151}{\H{o}}
!   \DeclareUnicodeCharacter{0152}{\OE}
!   \DeclareUnicodeCharacter{0153}{\oe}
!   \DeclareUnicodeCharacter{0154}{\'R}
!   \DeclareUnicodeCharacter{0155}{\'r}
!   \DeclareUnicodeCharacter{0156}{\cedilla{R}}
!   \DeclareUnicodeCharacter{0157}{\cedilla{r}}
!   \DeclareUnicodeCharacter{0158}{\v{R}}
!   \DeclareUnicodeCharacter{0159}{\v{r}}
!   \DeclareUnicodeCharacter{015A}{\'S}
!   \DeclareUnicodeCharacter{015B}{\'s}
!   \DeclareUnicodeCharacter{015C}{\^S}
!   \DeclareUnicodeCharacter{015D}{\^s}
!   \DeclareUnicodeCharacter{015E}{\cedilla{S}}
!   \DeclareUnicodeCharacter{015F}{\cedilla{s}}
!   %
!   \DeclareUnicodeCharacter{0160}{\v{S}}
!   \DeclareUnicodeCharacter{0161}{\v{s}}
!   \DeclareUnicodeCharacter{0162}{\cedilla{T}}
!   \DeclareUnicodeCharacter{0163}{\cedilla{t}}
!   \DeclareUnicodeCharacter{0164}{\v{T}}
!   \DeclareUnicodeCharacter{0165}{\v{t}}
!   \DeclareUnicodeCharacter{0166}{\missingcharmsg{H WITH STROKE}}
!   \DeclareUnicodeCharacter{0167}{\missingcharmsg{h WITH STROKE}}
!   \DeclareUnicodeCharacter{0168}{\~U}
!   \DeclareUnicodeCharacter{0169}{\~u}
!   \DeclareUnicodeCharacter{016A}{\=U}
!   \DeclareUnicodeCharacter{016B}{\=u}
!   \DeclareUnicodeCharacter{016C}{\u{U}}
!   \DeclareUnicodeCharacter{016D}{\u{u}}
!   \DeclareUnicodeCharacter{016E}{\ringaccent{U}}
!   \DeclareUnicodeCharacter{016F}{\ringaccent{u}}
!   %
!   \DeclareUnicodeCharacter{0170}{\H{U}}
!   \DeclareUnicodeCharacter{0171}{\H{u}}
!   \DeclareUnicodeCharacter{0172}{\ogonek{U}}
!   \DeclareUnicodeCharacter{0173}{\ogonek{u}}
!   \DeclareUnicodeCharacter{0174}{\^W}
!   \DeclareUnicodeCharacter{0175}{\^w}
!   \DeclareUnicodeCharacter{0176}{\^Y}
!   \DeclareUnicodeCharacter{0177}{\^y}
!   \DeclareUnicodeCharacter{0178}{\"Y}
!   \DeclareUnicodeCharacter{0179}{\'Z}
!   \DeclareUnicodeCharacter{017A}{\'z}
!   \DeclareUnicodeCharacter{017B}{\dotaccent{Z}}
!   \DeclareUnicodeCharacter{017C}{\dotaccent{z}}
!   \DeclareUnicodeCharacter{017D}{\v{Z}}
!   \DeclareUnicodeCharacter{017E}{\v{z}}
!   \DeclareUnicodeCharacter{017F}{\missingcharmsg{LONG S}}
!   %
!   \DeclareUnicodeCharacter{01C4}{D\v{Z}}
!   \DeclareUnicodeCharacter{01C5}{D\v{z}}
!   \DeclareUnicodeCharacter{01C6}{d\v{z}}
!   \DeclareUnicodeCharacter{01C7}{LJ}
!   \DeclareUnicodeCharacter{01C8}{Lj}
!   \DeclareUnicodeCharacter{01C9}{lj}
!   \DeclareUnicodeCharacter{01CA}{NJ}
!   \DeclareUnicodeCharacter{01CB}{Nj}
!   \DeclareUnicodeCharacter{01CC}{nj}
!   \DeclareUnicodeCharacter{01CD}{\v{A}}
!   \DeclareUnicodeCharacter{01CE}{\v{a}}
!   \DeclareUnicodeCharacter{01CF}{\v{I}}
!   %
!   \DeclareUnicodeCharacter{01D0}{\v{\dotless{i}}}
!   \DeclareUnicodeCharacter{01D1}{\v{O}}
!   \DeclareUnicodeCharacter{01D2}{\v{o}}
!   \DeclareUnicodeCharacter{01D3}{\v{U}}
!   \DeclareUnicodeCharacter{01D4}{\v{u}}
!   %
!   \DeclareUnicodeCharacter{01E2}{\={\AE}}
!   \DeclareUnicodeCharacter{01E3}{\={\ae}}
!   \DeclareUnicodeCharacter{01E6}{\v{G}}
!   \DeclareUnicodeCharacter{01E7}{\v{g}}
!   \DeclareUnicodeCharacter{01E8}{\v{K}}
!   \DeclareUnicodeCharacter{01E9}{\v{k}}
!   %
!   \DeclareUnicodeCharacter{01F0}{\v{\dotless{j}}}
!   \DeclareUnicodeCharacter{01F1}{DZ}
!   \DeclareUnicodeCharacter{01F2}{Dz}
!   \DeclareUnicodeCharacter{01F3}{dz}
!   \DeclareUnicodeCharacter{01F4}{\'G}
!   \DeclareUnicodeCharacter{01F5}{\'g}
!   \DeclareUnicodeCharacter{01F8}{\`N}
!   \DeclareUnicodeCharacter{01F9}{\`n}
!   \DeclareUnicodeCharacter{01FC}{\'{\AE}}
!   \DeclareUnicodeCharacter{01FD}{\'{\ae}}
!   \DeclareUnicodeCharacter{01FE}{\'{\O}}
!   \DeclareUnicodeCharacter{01FF}{\'{\o}}
!   %
!   \DeclareUnicodeCharacter{021E}{\v{H}}
!   \DeclareUnicodeCharacter{021F}{\v{h}}
!   %
!   \DeclareUnicodeCharacter{0226}{\dotaccent{A}}
!   \DeclareUnicodeCharacter{0227}{\dotaccent{a}}
!   \DeclareUnicodeCharacter{0228}{\cedilla{E}}
!   \DeclareUnicodeCharacter{0229}{\cedilla{e}}
!   \DeclareUnicodeCharacter{022E}{\dotaccent{O}}
!   \DeclareUnicodeCharacter{022F}{\dotaccent{o}}
!   %
!   \DeclareUnicodeCharacter{0232}{\=Y}
!   \DeclareUnicodeCharacter{0233}{\=y}
!   \DeclareUnicodeCharacter{0237}{\dotless{j}}
    %
!   \DeclareUnicodeCharacter{02DB}{\ogonek{ }}
    %
    % Greek letters upper case
!   \DeclareUnicodeCharacter{0391}{{\it A}}
!   \DeclareUnicodeCharacter{0392}{{\it B}}
!   \DeclareUnicodeCharacter{0393}{\ensuremath{\mit\Gamma}}
!   \DeclareUnicodeCharacter{0394}{\ensuremath{\mit\Delta}}
!   \DeclareUnicodeCharacter{0395}{{\it E}}
!   \DeclareUnicodeCharacter{0396}{{\it Z}}
!   \DeclareUnicodeCharacter{0397}{{\it H}}
!   \DeclareUnicodeCharacter{0398}{\ensuremath{\mit\Theta}}
!   \DeclareUnicodeCharacter{0399}{{\it I}}
!   \DeclareUnicodeCharacter{039A}{{\it K}}
!   \DeclareUnicodeCharacter{039B}{\ensuremath{\mit\Lambda}}
!   \DeclareUnicodeCharacter{039C}{{\it M}}
!   \DeclareUnicodeCharacter{039D}{{\it N}}
!   \DeclareUnicodeCharacter{039E}{\ensuremath{\mit\Xi}}
!   \DeclareUnicodeCharacter{039F}{{\it O}}
!   \DeclareUnicodeCharacter{03A0}{\ensuremath{\mit\Pi}}
!   \DeclareUnicodeCharacter{03A1}{{\it P}}
    %\DeclareUnicodeCharacter{03A2}{} % none - corresponds to final sigma
!   \DeclareUnicodeCharacter{03A3}{\ensuremath{\mit\Sigma}}
!   \DeclareUnicodeCharacter{03A4}{{\it T}}
!   \DeclareUnicodeCharacter{03A5}{\ensuremath{\mit\Upsilon}}
!   \DeclareUnicodeCharacter{03A6}{\ensuremath{\mit\Phi}}
!   \DeclareUnicodeCharacter{03A7}{{\it X}}
!   \DeclareUnicodeCharacter{03A8}{\ensuremath{\mit\Psi}}
!   \DeclareUnicodeCharacter{03A9}{\ensuremath{\mit\Omega}}
    %
    % Vowels with accents
!   \DeclareUnicodeCharacter{0390}{\ensuremath{\ddot{\acute\iota}}}
!   \DeclareUnicodeCharacter{03AC}{\ensuremath{\acute\alpha}}
!   \DeclareUnicodeCharacter{03AD}{\ensuremath{\acute\epsilon}}
!   \DeclareUnicodeCharacter{03AE}{\ensuremath{\acute\eta}}
!   \DeclareUnicodeCharacter{03AF}{\ensuremath{\acute\iota}}
!   \DeclareUnicodeCharacter{03B0}{\ensuremath{\acute{\ddot\upsilon}}}
    %
    % Standalone accent
!   \DeclareUnicodeCharacter{0384}{\ensuremath{\acute{\ }}}
    %
    % Greek letters lower case
!   \DeclareUnicodeCharacter{03B1}{\ensuremath\alpha}
!   \DeclareUnicodeCharacter{03B2}{\ensuremath\beta}
!   \DeclareUnicodeCharacter{03B3}{\ensuremath\gamma}
!   \DeclareUnicodeCharacter{03B4}{\ensuremath\delta}
!   \DeclareUnicodeCharacter{03B5}{\ensuremath\epsilon}
!   \DeclareUnicodeCharacter{03B6}{\ensuremath\zeta}
!   \DeclareUnicodeCharacter{03B7}{\ensuremath\eta}
!   \DeclareUnicodeCharacter{03B8}{\ensuremath\theta}
!   \DeclareUnicodeCharacter{03B9}{\ensuremath\iota}
!   \DeclareUnicodeCharacter{03BA}{\ensuremath\kappa}
!   \DeclareUnicodeCharacter{03BB}{\ensuremath\lambda}
!   \DeclareUnicodeCharacter{03BC}{\ensuremath\mu}
!   \DeclareUnicodeCharacter{03BD}{\ensuremath\nu}
!   \DeclareUnicodeCharacter{03BE}{\ensuremath\xi}
!   \DeclareUnicodeCharacter{03BF}{{\it o}} % omicron
!   \DeclareUnicodeCharacter{03C0}{\ensuremath\pi}
!   \DeclareUnicodeCharacter{03C1}{\ensuremath\rho}
!   \DeclareUnicodeCharacter{03C2}{\ensuremath\varsigma}
!   \DeclareUnicodeCharacter{03C3}{\ensuremath\sigma}
!   \DeclareUnicodeCharacter{03C4}{\ensuremath\tau}
!   \DeclareUnicodeCharacter{03C5}{\ensuremath\upsilon}
!   \DeclareUnicodeCharacter{03C6}{\ensuremath\phi}
!   \DeclareUnicodeCharacter{03C7}{\ensuremath\chi}
!   \DeclareUnicodeCharacter{03C8}{\ensuremath\psi}
!   \DeclareUnicodeCharacter{03C9}{\ensuremath\omega}
    %
    % More Greek vowels with accents
!   \DeclareUnicodeCharacter{03CA}{\ensuremath{\ddot\iota}}
!   \DeclareUnicodeCharacter{03CB}{\ensuremath{\ddot\upsilon}}
!   \DeclareUnicodeCharacter{03CC}{\ensuremath{\acute o}}
!   \DeclareUnicodeCharacter{03CD}{\ensuremath{\acute\upsilon}}
!   \DeclareUnicodeCharacter{03CE}{\ensuremath{\acute\omega}}
    %
    % Variant Greek letters
!   \DeclareUnicodeCharacter{03D1}{\ensuremath\vartheta}
!   \DeclareUnicodeCharacter{03D6}{\ensuremath\varpi}
!   \DeclareUnicodeCharacter{03F1}{\ensuremath\varrho}
!   %
!   \DeclareUnicodeCharacter{1E02}{\dotaccent{B}}
!   \DeclareUnicodeCharacter{1E03}{\dotaccent{b}}
!   \DeclareUnicodeCharacter{1E04}{\udotaccent{B}}
!   \DeclareUnicodeCharacter{1E05}{\udotaccent{b}}
!   \DeclareUnicodeCharacter{1E06}{\ubaraccent{B}}
!   \DeclareUnicodeCharacter{1E07}{\ubaraccent{b}}
!   \DeclareUnicodeCharacter{1E0A}{\dotaccent{D}}
!   \DeclareUnicodeCharacter{1E0B}{\dotaccent{d}}
!   \DeclareUnicodeCharacter{1E0C}{\udotaccent{D}}
!   \DeclareUnicodeCharacter{1E0D}{\udotaccent{d}}
!   \DeclareUnicodeCharacter{1E0E}{\ubaraccent{D}}
!   \DeclareUnicodeCharacter{1E0F}{\ubaraccent{d}}
!   %
!   \DeclareUnicodeCharacter{1E1E}{\dotaccent{F}}
!   \DeclareUnicodeCharacter{1E1F}{\dotaccent{f}}
!   %
!   \DeclareUnicodeCharacter{1E20}{\=G}
!   \DeclareUnicodeCharacter{1E21}{\=g}
!   \DeclareUnicodeCharacter{1E22}{\dotaccent{H}}
!   \DeclareUnicodeCharacter{1E23}{\dotaccent{h}}
!   \DeclareUnicodeCharacter{1E24}{\udotaccent{H}}
!   \DeclareUnicodeCharacter{1E25}{\udotaccent{h}}
!   \DeclareUnicodeCharacter{1E26}{\"H}
!   \DeclareUnicodeCharacter{1E27}{\"h}
!   %
!   \DeclareUnicodeCharacter{1E30}{\'K}
!   \DeclareUnicodeCharacter{1E31}{\'k}
!   \DeclareUnicodeCharacter{1E32}{\udotaccent{K}}
!   \DeclareUnicodeCharacter{1E33}{\udotaccent{k}}
!   \DeclareUnicodeCharacter{1E34}{\ubaraccent{K}}
!   \DeclareUnicodeCharacter{1E35}{\ubaraccent{k}}
!   \DeclareUnicodeCharacter{1E36}{\udotaccent{L}}
!   \DeclareUnicodeCharacter{1E37}{\udotaccent{l}}
!   \DeclareUnicodeCharacter{1E3A}{\ubaraccent{L}}
!   \DeclareUnicodeCharacter{1E3B}{\ubaraccent{l}}
!   \DeclareUnicodeCharacter{1E3E}{\'M}
!   \DeclareUnicodeCharacter{1E3F}{\'m}
!   %
!   \DeclareUnicodeCharacter{1E40}{\dotaccent{M}}
!   \DeclareUnicodeCharacter{1E41}{\dotaccent{m}}
!   \DeclareUnicodeCharacter{1E42}{\udotaccent{M}}
!   \DeclareUnicodeCharacter{1E43}{\udotaccent{m}}
!   \DeclareUnicodeCharacter{1E44}{\dotaccent{N}}
!   \DeclareUnicodeCharacter{1E45}{\dotaccent{n}}
!   \DeclareUnicodeCharacter{1E46}{\udotaccent{N}}
!   \DeclareUnicodeCharacter{1E47}{\udotaccent{n}}
!   \DeclareUnicodeCharacter{1E48}{\ubaraccent{N}}
!   \DeclareUnicodeCharacter{1E49}{\ubaraccent{n}}
!   %
!   \DeclareUnicodeCharacter{1E54}{\'P}
!   \DeclareUnicodeCharacter{1E55}{\'p}
!   \DeclareUnicodeCharacter{1E56}{\dotaccent{P}}
!   \DeclareUnicodeCharacter{1E57}{\dotaccent{p}}
!   \DeclareUnicodeCharacter{1E58}{\dotaccent{R}}
!   \DeclareUnicodeCharacter{1E59}{\dotaccent{r}}
!   \DeclareUnicodeCharacter{1E5A}{\udotaccent{R}}
!   \DeclareUnicodeCharacter{1E5B}{\udotaccent{r}}
!   \DeclareUnicodeCharacter{1E5E}{\ubaraccent{R}}
!   \DeclareUnicodeCharacter{1E5F}{\ubaraccent{r}}
!   %
!   \DeclareUnicodeCharacter{1E60}{\dotaccent{S}}
!   \DeclareUnicodeCharacter{1E61}{\dotaccent{s}}
!   \DeclareUnicodeCharacter{1E62}{\udotaccent{S}}
!   \DeclareUnicodeCharacter{1E63}{\udotaccent{s}}
!   \DeclareUnicodeCharacter{1E6A}{\dotaccent{T}}
!   \DeclareUnicodeCharacter{1E6B}{\dotaccent{t}}
!   \DeclareUnicodeCharacter{1E6C}{\udotaccent{T}}
!   \DeclareUnicodeCharacter{1E6D}{\udotaccent{t}}
!   \DeclareUnicodeCharacter{1E6E}{\ubaraccent{T}}
!   \DeclareUnicodeCharacter{1E6F}{\ubaraccent{t}}
!   %
!   \DeclareUnicodeCharacter{1E7C}{\~V}
!   \DeclareUnicodeCharacter{1E7D}{\~v}
!   \DeclareUnicodeCharacter{1E7E}{\udotaccent{V}}
!   \DeclareUnicodeCharacter{1E7F}{\udotaccent{v}}
!   %
!   \DeclareUnicodeCharacter{1E80}{\`W}
!   \DeclareUnicodeCharacter{1E81}{\`w}
!   \DeclareUnicodeCharacter{1E82}{\'W}
!   \DeclareUnicodeCharacter{1E83}{\'w}
!   \DeclareUnicodeCharacter{1E84}{\"W}
!   \DeclareUnicodeCharacter{1E85}{\"w}
!   \DeclareUnicodeCharacter{1E86}{\dotaccent{W}}
!   \DeclareUnicodeCharacter{1E87}{\dotaccent{w}}
!   \DeclareUnicodeCharacter{1E88}{\udotaccent{W}}
!   \DeclareUnicodeCharacter{1E89}{\udotaccent{w}}
!   \DeclareUnicodeCharacter{1E8A}{\dotaccent{X}}
!   \DeclareUnicodeCharacter{1E8B}{\dotaccent{x}}
!   \DeclareUnicodeCharacter{1E8C}{\"X}
!   \DeclareUnicodeCharacter{1E8D}{\"x}
!   \DeclareUnicodeCharacter{1E8E}{\dotaccent{Y}}
!   \DeclareUnicodeCharacter{1E8F}{\dotaccent{y}}
!   %
!   \DeclareUnicodeCharacter{1E90}{\^Z}
!   \DeclareUnicodeCharacter{1E91}{\^z}
!   \DeclareUnicodeCharacter{1E92}{\udotaccent{Z}}
!   \DeclareUnicodeCharacter{1E93}{\udotaccent{z}}
!   \DeclareUnicodeCharacter{1E94}{\ubaraccent{Z}}
!   \DeclareUnicodeCharacter{1E95}{\ubaraccent{z}}
!   \DeclareUnicodeCharacter{1E96}{\ubaraccent{h}}
!   \DeclareUnicodeCharacter{1E97}{\"t}
!   \DeclareUnicodeCharacter{1E98}{\ringaccent{w}}
!   \DeclareUnicodeCharacter{1E99}{\ringaccent{y}}
!   %
!   \DeclareUnicodeCharacter{1EA0}{\udotaccent{A}}
!   \DeclareUnicodeCharacter{1EA1}{\udotaccent{a}}
!   %
!   \DeclareUnicodeCharacter{1EB8}{\udotaccent{E}}
!   \DeclareUnicodeCharacter{1EB9}{\udotaccent{e}}
!   \DeclareUnicodeCharacter{1EBC}{\~E}
!   \DeclareUnicodeCharacter{1EBD}{\~e}
!   %
!   \DeclareUnicodeCharacter{1ECA}{\udotaccent{I}}
!   \DeclareUnicodeCharacter{1ECB}{\udotaccent{i}}
!   \DeclareUnicodeCharacter{1ECC}{\udotaccent{O}}
!   \DeclareUnicodeCharacter{1ECD}{\udotaccent{o}}
!   %
!   \DeclareUnicodeCharacter{1EE4}{\udotaccent{U}}
!   \DeclareUnicodeCharacter{1EE5}{\udotaccent{u}}
!   %
!   \DeclareUnicodeCharacter{1EF2}{\`Y}
!   \DeclareUnicodeCharacter{1EF3}{\`y}
!   \DeclareUnicodeCharacter{1EF4}{\udotaccent{Y}}
    %
!   \DeclareUnicodeCharacter{1EF8}{\~Y}
!   \DeclareUnicodeCharacter{1EF9}{\~y}
    %
    % Punctuation
!   \DeclareUnicodeCharacter{2013}{--}
!   \DeclareUnicodeCharacter{2014}{---}
!   \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{202F}{\thinspace}
!   \DeclareUnicodeCharacter{2026}{\dots}
!   \DeclareUnicodeCharacter{2039}{\guilsinglleft}
!   \DeclareUnicodeCharacter{203A}{\guilsinglright}
    %
!   \DeclareUnicodeCharacter{20AC}{\euro}
    %
!   \DeclareUnicodeCharacter{2192}{\expansion}
!   \DeclareUnicodeCharacter{21D2}{\result}
    %
    % Mathematical symbols
!   \DeclareUnicodeCharacter{2200}{\ensuremath\forall}
!   \DeclareUnicodeCharacter{2203}{\ensuremath\exists}
!   \DeclareUnicodeCharacter{2208}{\ensuremath\in}
!   \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{2264}{\ensuremath\leq}
!   \DeclareUnicodeCharacter{2265}{\ensuremath\geq}
!   \DeclareUnicodeCharacter{2282}{\ensuremath\subset}
!   \DeclareUnicodeCharacter{2287}{\ensuremath\supseteq}
!   %
!   \DeclareUnicodeCharacter{2016}{\ensuremath\Vert}
!   \DeclareUnicodeCharacter{2032}{\ensuremath\prime}
!   \DeclareUnicodeCharacter{210F}{\ensuremath\hbar}
!   \DeclareUnicodeCharacter{2111}{\ensuremath\Im}
!   \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}
!   \DeclareUnicodeCharacter{2193}{\ensuremath\downarrow}
!   \DeclareUnicodeCharacter{2194}{\ensuremath\leftrightarrow}
!   \DeclareUnicodeCharacter{2195}{\ensuremath\updownarrow}
!   \DeclareUnicodeCharacter{2196}{\ensuremath\nwarrow}
!   \DeclareUnicodeCharacter{2197}{\ensuremath\nearrow}
!   \DeclareUnicodeCharacter{2198}{\ensuremath\searrow}
!   \DeclareUnicodeCharacter{2199}{\ensuremath\swarrow}
!   \DeclareUnicodeCharacter{21A6}{\ensuremath\mapsto}
!   \DeclareUnicodeCharacter{21A9}{\ensuremath\hookleftarrow}
!   \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}
!   \DeclareUnicodeCharacter{21D0}{\ensuremath\Leftarrow}
!   \DeclareUnicodeCharacter{21D1}{\ensuremath\Uparrow}
!   \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}
!   \DeclareUnicodeCharacter{2209}{\ensuremath\notin}
!   \DeclareUnicodeCharacter{220B}{\ensuremath\owns}
!   \DeclareUnicodeCharacter{220F}{\ensuremath\prod}
!   \DeclareUnicodeCharacter{2210}{\ensuremath\coprod}
!   \DeclareUnicodeCharacter{2211}{\ensuremath\sum}
!   \DeclareUnicodeCharacter{2213}{\ensuremath\mp}
!   \DeclareUnicodeCharacter{2218}{\ensuremath\circ}
!   \DeclareUnicodeCharacter{221A}{\ensuremath\surd}
!   \DeclareUnicodeCharacter{221D}{\ensuremath\propto}
!   \DeclareUnicodeCharacter{2220}{\ensuremath\angle}
!   \DeclareUnicodeCharacter{2223}{\ensuremath\mid}
!   \DeclareUnicodeCharacter{2228}{\ensuremath\vee}
!   \DeclareUnicodeCharacter{222A}{\ensuremath\cup}
!   \DeclareUnicodeCharacter{222B}{\ensuremath\smallint}
!   \DeclareUnicodeCharacter{222E}{\ensuremath\oint}
!   \DeclareUnicodeCharacter{223C}{\ensuremath\sim}
!   \DeclareUnicodeCharacter{2240}{\ensuremath\wr}
!   \DeclareUnicodeCharacter{2243}{\ensuremath\simeq}
!   \DeclareUnicodeCharacter{2245}{\ensuremath\cong}
!   \DeclareUnicodeCharacter{2248}{\ensuremath\approx}
!   \DeclareUnicodeCharacter{224D}{\ensuremath\asymp}
!   \DeclareUnicodeCharacter{2250}{\ensuremath\doteq}
!   \DeclareUnicodeCharacter{2260}{\ensuremath\neq}
!   \DeclareUnicodeCharacter{226A}{\ensuremath\ll}
!   \DeclareUnicodeCharacter{226B}{\ensuremath\gg}
!   \DeclareUnicodeCharacter{227A}{\ensuremath\prec}
!   \DeclareUnicodeCharacter{227B}{\ensuremath\succ}
!   \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}
!   \DeclareUnicodeCharacter{2294}{\ensuremath\sqcup}
!   \DeclareUnicodeCharacter{2295}{\ensuremath\oplus}
!   \DeclareUnicodeCharacter{2296}{\ensuremath\ominus}
!   \DeclareUnicodeCharacter{2297}{\ensuremath\otimes}
!   \DeclareUnicodeCharacter{2298}{\ensuremath\oslash}
!   \DeclareUnicodeCharacter{2299}{\ensuremath\odot}
!   \DeclareUnicodeCharacter{22A2}{\ensuremath\vdash}
!   \DeclareUnicodeCharacter{22A3}{\ensuremath\dashv}
!   \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}
!   \DeclareUnicodeCharacter{22C3}{\ensuremath\bigcup}
!   \DeclareUnicodeCharacter{22C4}{\ensuremath\diamond}
!   \DeclareUnicodeCharacter{22C5}{\ensuremath\cdot}
!   \DeclareUnicodeCharacter{22C6}{\ensuremath\star}
!   \DeclareUnicodeCharacter{22C8}{\ensuremath\bowtie}
!   \DeclareUnicodeCharacter{2308}{\ensuremath\lceil}
!   \DeclareUnicodeCharacter{2309}{\ensuremath\rceil}
!   \DeclareUnicodeCharacter{230A}{\ensuremath\lfloor}
!   \DeclareUnicodeCharacter{230B}{\ensuremath\rfloor}
!   \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{2660}{\ensuremath\spadesuit}
!   \DeclareUnicodeCharacter{2661}{\ensuremath\heartsuit}
!   \DeclareUnicodeCharacter{2662}{\ensuremath\diamondsuit}
!   \DeclareUnicodeCharacter{2663}{\ensuremath\clubsuit}
!   \DeclareUnicodeCharacter{266D}{\ensuremath\flat}
!   \DeclareUnicodeCharacter{266E}{\ensuremath\natural}
!   \DeclareUnicodeCharacter{266F}{\ensuremath\sharp}
!   \DeclareUnicodeCharacter{26AA}{\ensuremath\bigcirc}
!   \DeclareUnicodeCharacter{27B9}{\ensuremath\rangle}
!   \DeclareUnicodeCharacter{27C2}{\ensuremath\perp}
!   \DeclareUnicodeCharacter{27E8}{\ensuremath\langle}
!   \DeclareUnicodeCharacter{27F5}{\ensuremath\longleftarrow}
!   \DeclareUnicodeCharacter{27F6}{\ensuremath\longrightarrow}
!   \DeclareUnicodeCharacter{27F7}{\ensuremath\longleftrightarrow}
!   \DeclareUnicodeCharacter{27FC}{\ensuremath\longmapsto}
!   \DeclareUnicodeCharacter{29F5}{\ensuremath\setminus}
!   \DeclareUnicodeCharacter{2A00}{\ensuremath\bigodot}
!   \DeclareUnicodeCharacter{2A01}{\ensuremath\bigoplus}
!   \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}
!   %
!   \global\mathchardef\checkmark="1370 % actually the square root sign
!   \DeclareUnicodeCharacter{2713}{\ensuremath\checkmark}
! }% end of \utfeightchardefs
  
! % US-ASCII character definitions.
! \def\asciichardefs{% nothing need be done
!    \relax
  }
  
! % Latin1 (ISO-8859-1) character definitions.
! \def\nonasciistringdefs{%
!   \setnonasciicharscatcode\active
!   \def\defstringchar##1{\def##1{\string##1}}%
!   %
!   \defstringchar^^80\defstringchar^^81\defstringchar^^82\defstringchar^^83%
!   \defstringchar^^84\defstringchar^^85\defstringchar^^86\defstringchar^^87%
!   \defstringchar^^88\defstringchar^^89\defstringchar^^8a\defstringchar^^8b%
!   \defstringchar^^8c\defstringchar^^8d\defstringchar^^8e\defstringchar^^8f%
!   %
!   \defstringchar^^90\defstringchar^^91\defstringchar^^92\defstringchar^^93%
!   \defstringchar^^94\defstringchar^^95\defstringchar^^96\defstringchar^^97%
!   \defstringchar^^98\defstringchar^^99\defstringchar^^9a\defstringchar^^9b%
!   \defstringchar^^9c\defstringchar^^9d\defstringchar^^9e\defstringchar^^9f%
!   %
!   \defstringchar^^a0\defstringchar^^a1\defstringchar^^a2\defstringchar^^a3%
!   \defstringchar^^a4\defstringchar^^a5\defstringchar^^a6\defstringchar^^a7%
!   \defstringchar^^a8\defstringchar^^a9\defstringchar^^aa\defstringchar^^ab%
!   \defstringchar^^ac\defstringchar^^ad\defstringchar^^ae\defstringchar^^af%
!   %
!   \defstringchar^^b0\defstringchar^^b1\defstringchar^^b2\defstringchar^^b3%
!   \defstringchar^^b4\defstringchar^^b5\defstringchar^^b6\defstringchar^^b7%
!   \defstringchar^^b8\defstringchar^^b9\defstringchar^^ba\defstringchar^^bb%
!   \defstringchar^^bc\defstringchar^^bd\defstringchar^^be\defstringchar^^bf%
!   %
!   \defstringchar^^c0\defstringchar^^c1\defstringchar^^c2\defstringchar^^c3%
!   \defstringchar^^c4\defstringchar^^c5\defstringchar^^c6\defstringchar^^c7%
!   \defstringchar^^c8\defstringchar^^c9\defstringchar^^ca\defstringchar^^cb%
!   \defstringchar^^cc\defstringchar^^cd\defstringchar^^ce\defstringchar^^cf%
!   %
!   \defstringchar^^d0\defstringchar^^d1\defstringchar^^d2\defstringchar^^d3%
!   \defstringchar^^d4\defstringchar^^d5\defstringchar^^d6\defstringchar^^d7%
!   \defstringchar^^d8\defstringchar^^d9\defstringchar^^da\defstringchar^^db%
!   \defstringchar^^dc\defstringchar^^dd\defstringchar^^de\defstringchar^^df%
!   %
!   \defstringchar^^e0\defstringchar^^e1\defstringchar^^e2\defstringchar^^e3%
!   \defstringchar^^e4\defstringchar^^e5\defstringchar^^e6\defstringchar^^e7%
!   \defstringchar^^e8\defstringchar^^e9\defstringchar^^ea\defstringchar^^eb%
!   \defstringchar^^ec\defstringchar^^ed\defstringchar^^ee\defstringchar^^ef%
!   %
!   \defstringchar^^f0\defstringchar^^f1\defstringchar^^f2\defstringchar^^f3%
!   \defstringchar^^f4\defstringchar^^f5\defstringchar^^f6\defstringchar^^f7%
!   \defstringchar^^f8\defstringchar^^f9\defstringchar^^fa\defstringchar^^fb%
!   \defstringchar^^fc\defstringchar^^fd\defstringchar^^fe\defstringchar^^ff%
  }
  
  
! % define all the unicode characters we know about, for the sake of @U.
! \utfeightchardefs
  
  
--- 10506,11251 ----
  % least make most of the characters not bomb out.
  %
! \def\unicodechardefs{%
!   \DeclareUnicodeCharacter{00A0}{\tie}%
!   \DeclareUnicodeCharacter{00A1}{\exclamdown}%
    \DeclareUnicodeCharacter{00A2}{{\tcfont \char162}}% 0242=cent
!   \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{00AA}{\ordf}%
!   \DeclareUnicodeCharacter{00AB}{\guillemetleft}%
!   \DeclareUnicodeCharacter{00AC}{\ensuremath\lnot}%
!   \DeclareUnicodeCharacter{00AD}{\-}%
!   \DeclareUnicodeCharacter{00AE}{\registeredsymbol}%
!   \DeclareUnicodeCharacter{00AF}{\={ }}%
!   %
!   \DeclareUnicodeCharacter{00B0}{\ringaccent{ }}%
!   \DeclareUnicodeCharacter{00B1}{\ensuremath\pm}%
!   \DeclareUnicodeCharacter{00B2}{$^2$}%
!   \DeclareUnicodeCharacter{00B3}{$^3$}%
!   \DeclareUnicodeCharacter{00B4}{\'{ }}%
!   \DeclareUnicodeCharacter{00B5}{$\mu$}%
!   \DeclareUnicodeCharacter{00B6}{\P}%
!   \DeclareUnicodeCharacter{00B7}{\ensuremath\cdot}%
!   \DeclareUnicodeCharacter{00B8}{\cedilla{ }}%
!   \DeclareUnicodeCharacter{00B9}{$^1$}%
!   \DeclareUnicodeCharacter{00BA}{\ordm}%
!   \DeclareUnicodeCharacter{00BB}{\guillemetright}%
!   \DeclareUnicodeCharacter{00BC}{$1\over4$}%
!   \DeclareUnicodeCharacter{00BD}{$1\over2$}%
!   \DeclareUnicodeCharacter{00BE}{$3\over4$}%
!   \DeclareUnicodeCharacter{00BF}{\questiondown}%
!   %
!   \DeclareUnicodeCharacter{00C0}{\`A}%
!   \DeclareUnicodeCharacter{00C1}{\'A}%
!   \DeclareUnicodeCharacter{00C2}{\^A}%
!   \DeclareUnicodeCharacter{00C3}{\~A}%
!   \DeclareUnicodeCharacter{00C4}{\"A}%
!   \DeclareUnicodeCharacter{00C5}{\AA}%
!   \DeclareUnicodeCharacter{00C6}{\AE}%
!   \DeclareUnicodeCharacter{00C7}{\cedilla{C}}%
!   \DeclareUnicodeCharacter{00C8}{\`E}%
!   \DeclareUnicodeCharacter{00C9}{\'E}%
!   \DeclareUnicodeCharacter{00CA}{\^E}%
!   \DeclareUnicodeCharacter{00CB}{\"E}%
!   \DeclareUnicodeCharacter{00CC}{\`I}%
!   \DeclareUnicodeCharacter{00CD}{\'I}%
!   \DeclareUnicodeCharacter{00CE}{\^I}%
!   \DeclareUnicodeCharacter{00CF}{\"I}%
!   %
!   \DeclareUnicodeCharacter{00D0}{\DH}%
!   \DeclareUnicodeCharacter{00D1}{\~N}%
!   \DeclareUnicodeCharacter{00D2}{\`O}%
!   \DeclareUnicodeCharacter{00D3}{\'O}%
!   \DeclareUnicodeCharacter{00D4}{\^O}%
!   \DeclareUnicodeCharacter{00D5}{\~O}%
!   \DeclareUnicodeCharacter{00D6}{\"O}%
!   \DeclareUnicodeCharacter{00D7}{\ensuremath\times}%
!   \DeclareUnicodeCharacter{00D8}{\O}%
!   \DeclareUnicodeCharacter{00D9}{\`U}%
!   \DeclareUnicodeCharacter{00DA}{\'U}%
!   \DeclareUnicodeCharacter{00DB}{\^U}%
!   \DeclareUnicodeCharacter{00DC}{\"U}%
!   \DeclareUnicodeCharacter{00DD}{\'Y}%
!   \DeclareUnicodeCharacter{00DE}{\TH}%
!   \DeclareUnicodeCharacter{00DF}{\ss}%
!   %
!   \DeclareUnicodeCharacter{00E0}{\`a}%
!   \DeclareUnicodeCharacter{00E1}{\'a}%
!   \DeclareUnicodeCharacter{00E2}{\^a}%
!   \DeclareUnicodeCharacter{00E3}{\~a}%
!   \DeclareUnicodeCharacter{00E4}{\"a}%
!   \DeclareUnicodeCharacter{00E5}{\aa}%
!   \DeclareUnicodeCharacter{00E6}{\ae}%
!   \DeclareUnicodeCharacter{00E7}{\cedilla{c}}%
!   \DeclareUnicodeCharacter{00E8}{\`e}%
!   \DeclareUnicodeCharacter{00E9}{\'e}%
!   \DeclareUnicodeCharacter{00EA}{\^e}%
!   \DeclareUnicodeCharacter{00EB}{\"e}%
!   \DeclareUnicodeCharacter{00EC}{\`{\dotless{i}}}%
!   \DeclareUnicodeCharacter{00ED}{\'{\dotless{i}}}%
!   \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}}%
!   \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}}%
!   %
!   \DeclareUnicodeCharacter{00F0}{\dh}%
!   \DeclareUnicodeCharacter{00F1}{\~n}%
!   \DeclareUnicodeCharacter{00F2}{\`o}%
!   \DeclareUnicodeCharacter{00F3}{\'o}%
!   \DeclareUnicodeCharacter{00F4}{\^o}%
!   \DeclareUnicodeCharacter{00F5}{\~o}%
!   \DeclareUnicodeCharacter{00F6}{\"o}%
!   \DeclareUnicodeCharacter{00F7}{\ensuremath\div}%
!   \DeclareUnicodeCharacter{00F8}{\o}%
!   \DeclareUnicodeCharacter{00F9}{\`u}%
!   \DeclareUnicodeCharacter{00FA}{\'u}%
!   \DeclareUnicodeCharacter{00FB}{\^u}%
!   \DeclareUnicodeCharacter{00FC}{\"u}%
!   \DeclareUnicodeCharacter{00FD}{\'y}%
!   \DeclareUnicodeCharacter{00FE}{\th}%
!   \DeclareUnicodeCharacter{00FF}{\"y}%
!   %
!   \DeclareUnicodeCharacter{0100}{\=A}%
!   \DeclareUnicodeCharacter{0101}{\=a}%
!   \DeclareUnicodeCharacter{0102}{\u{A}}%
!   \DeclareUnicodeCharacter{0103}{\u{a}}%
!   \DeclareUnicodeCharacter{0104}{\ogonek{A}}%
!   \DeclareUnicodeCharacter{0105}{\ogonek{a}}%
!   \DeclareUnicodeCharacter{0106}{\'C}%
!   \DeclareUnicodeCharacter{0107}{\'c}%
!   \DeclareUnicodeCharacter{0108}{\^C}%
!   \DeclareUnicodeCharacter{0109}{\^c}%
!   \DeclareUnicodeCharacter{010A}{\dotaccent{C}}%
!   \DeclareUnicodeCharacter{010B}{\dotaccent{c}}%
!   \DeclareUnicodeCharacter{010C}{\v{C}}%
!   \DeclareUnicodeCharacter{010D}{\v{c}}%
!   \DeclareUnicodeCharacter{010E}{\v{D}}%
!   \DeclareUnicodeCharacter{010F}{d'}%
!   %
!   \DeclareUnicodeCharacter{0110}{\DH}%
!   \DeclareUnicodeCharacter{0111}{\dh}%
!   \DeclareUnicodeCharacter{0112}{\=E}%
!   \DeclareUnicodeCharacter{0113}{\=e}%
!   \DeclareUnicodeCharacter{0114}{\u{E}}%
!   \DeclareUnicodeCharacter{0115}{\u{e}}%
!   \DeclareUnicodeCharacter{0116}{\dotaccent{E}}%
!   \DeclareUnicodeCharacter{0117}{\dotaccent{e}}%
!   \DeclareUnicodeCharacter{0118}{\ogonek{E}}%
!   \DeclareUnicodeCharacter{0119}{\ogonek{e}}%
!   \DeclareUnicodeCharacter{011A}{\v{E}}%
!   \DeclareUnicodeCharacter{011B}{\v{e}}%
!   \DeclareUnicodeCharacter{011C}{\^G}%
!   \DeclareUnicodeCharacter{011D}{\^g}%
!   \DeclareUnicodeCharacter{011E}{\u{G}}%
!   \DeclareUnicodeCharacter{011F}{\u{g}}%
!   %
!   \DeclareUnicodeCharacter{0120}{\dotaccent{G}}%
!   \DeclareUnicodeCharacter{0121}{\dotaccent{g}}%
!   \DeclareUnicodeCharacter{0122}{\cedilla{G}}%
!   \DeclareUnicodeCharacter{0123}{\cedilla{g}}%
!   \DeclareUnicodeCharacter{0124}{\^H}%
!   \DeclareUnicodeCharacter{0125}{\^h}%
!   \DeclareUnicodeCharacter{0126}{\missingcharmsg{H WITH STROKE}}%
!   \DeclareUnicodeCharacter{0127}{\missingcharmsg{h WITH STROKE}}%
!   \DeclareUnicodeCharacter{0128}{\~I}%
!   \DeclareUnicodeCharacter{0129}{\~{\dotless{i}}}%
!   \DeclareUnicodeCharacter{012A}{\=I}%
!   \DeclareUnicodeCharacter{012B}{\={\dotless{i}}}%
!   \DeclareUnicodeCharacter{012C}{\u{I}}%
!   \DeclareUnicodeCharacter{012D}{\u{\dotless{i}}}%
!   \DeclareUnicodeCharacter{012E}{\ogonek{I}}%
!   \DeclareUnicodeCharacter{012F}{\ogonek{i}}%
!   %
!   \DeclareUnicodeCharacter{0130}{\dotaccent{I}}%
!   \DeclareUnicodeCharacter{0131}{\dotless{i}}%
!   \DeclareUnicodeCharacter{0132}{IJ}%
!   \DeclareUnicodeCharacter{0133}{ij}%
!   \DeclareUnicodeCharacter{0134}{\^J}%
!   \DeclareUnicodeCharacter{0135}{\^{\dotless{j}}}%
!   \DeclareUnicodeCharacter{0136}{\cedilla{K}}%
!   \DeclareUnicodeCharacter{0137}{\cedilla{k}}%
!   \DeclareUnicodeCharacter{0138}{\ensuremath\kappa}%
!   \DeclareUnicodeCharacter{0139}{\'L}%
!   \DeclareUnicodeCharacter{013A}{\'l}%
!   \DeclareUnicodeCharacter{013B}{\cedilla{L}}%
!   \DeclareUnicodeCharacter{013C}{\cedilla{l}}%
    \DeclareUnicodeCharacter{013D}{L'}% should kern
    \DeclareUnicodeCharacter{013E}{l'}% should kern
!   \DeclareUnicodeCharacter{013F}{L\U{00B7}}%
    %
!   \DeclareUnicodeCharacter{0140}{l\U{00B7}}%
!   \DeclareUnicodeCharacter{0141}{\L}%
!   \DeclareUnicodeCharacter{0142}{\l}%
!   \DeclareUnicodeCharacter{0143}{\'N}%
!   \DeclareUnicodeCharacter{0144}{\'n}%
!   \DeclareUnicodeCharacter{0145}{\cedilla{N}}%
!   \DeclareUnicodeCharacter{0146}{\cedilla{n}}%
!   \DeclareUnicodeCharacter{0147}{\v{N}}%
!   \DeclareUnicodeCharacter{0148}{\v{n}}%
!   \DeclareUnicodeCharacter{0149}{'n}%
!   \DeclareUnicodeCharacter{014A}{\missingcharmsg{ENG}}%
!   \DeclareUnicodeCharacter{014B}{\missingcharmsg{eng}}%
!   \DeclareUnicodeCharacter{014C}{\=O}%
!   \DeclareUnicodeCharacter{014D}{\=o}%
!   \DeclareUnicodeCharacter{014E}{\u{O}}%
!   \DeclareUnicodeCharacter{014F}{\u{o}}%
!   %
!   \DeclareUnicodeCharacter{0150}{\H{O}}%
!   \DeclareUnicodeCharacter{0151}{\H{o}}%
!   \DeclareUnicodeCharacter{0152}{\OE}%
!   \DeclareUnicodeCharacter{0153}{\oe}%
!   \DeclareUnicodeCharacter{0154}{\'R}%
!   \DeclareUnicodeCharacter{0155}{\'r}%
!   \DeclareUnicodeCharacter{0156}{\cedilla{R}}%
!   \DeclareUnicodeCharacter{0157}{\cedilla{r}}%
!   \DeclareUnicodeCharacter{0158}{\v{R}}%
!   \DeclareUnicodeCharacter{0159}{\v{r}}%
!   \DeclareUnicodeCharacter{015A}{\'S}%
!   \DeclareUnicodeCharacter{015B}{\'s}%
!   \DeclareUnicodeCharacter{015C}{\^S}%
!   \DeclareUnicodeCharacter{015D}{\^s}%
!   \DeclareUnicodeCharacter{015E}{\cedilla{S}}%
!   \DeclareUnicodeCharacter{015F}{\cedilla{s}}%
!   %
!   \DeclareUnicodeCharacter{0160}{\v{S}}%
!   \DeclareUnicodeCharacter{0161}{\v{s}}%
!   \DeclareUnicodeCharacter{0162}{\cedilla{T}}%
!   \DeclareUnicodeCharacter{0163}{\cedilla{t}}%
!   \DeclareUnicodeCharacter{0164}{\v{T}}%
!   \DeclareUnicodeCharacter{0165}{\v{t}}%
!   \DeclareUnicodeCharacter{0166}{\missingcharmsg{H WITH STROKE}}%
!   \DeclareUnicodeCharacter{0167}{\missingcharmsg{h WITH STROKE}}%
!   \DeclareUnicodeCharacter{0168}{\~U}%
!   \DeclareUnicodeCharacter{0169}{\~u}%
!   \DeclareUnicodeCharacter{016A}{\=U}%
!   \DeclareUnicodeCharacter{016B}{\=u}%
!   \DeclareUnicodeCharacter{016C}{\u{U}}%
!   \DeclareUnicodeCharacter{016D}{\u{u}}%
!   \DeclareUnicodeCharacter{016E}{\ringaccent{U}}%
!   \DeclareUnicodeCharacter{016F}{\ringaccent{u}}%
!   %
!   \DeclareUnicodeCharacter{0170}{\H{U}}%
!   \DeclareUnicodeCharacter{0171}{\H{u}}%
!   \DeclareUnicodeCharacter{0172}{\ogonek{U}}%
!   \DeclareUnicodeCharacter{0173}{\ogonek{u}}%
!   \DeclareUnicodeCharacter{0174}{\^W}%
!   \DeclareUnicodeCharacter{0175}{\^w}%
!   \DeclareUnicodeCharacter{0176}{\^Y}%
!   \DeclareUnicodeCharacter{0177}{\^y}%
!   \DeclareUnicodeCharacter{0178}{\"Y}%
!   \DeclareUnicodeCharacter{0179}{\'Z}%
!   \DeclareUnicodeCharacter{017A}{\'z}%
!   \DeclareUnicodeCharacter{017B}{\dotaccent{Z}}%
!   \DeclareUnicodeCharacter{017C}{\dotaccent{z}}%
!   \DeclareUnicodeCharacter{017D}{\v{Z}}%
!   \DeclareUnicodeCharacter{017E}{\v{z}}%
!   \DeclareUnicodeCharacter{017F}{\missingcharmsg{LONG S}}%
!   %
!   \DeclareUnicodeCharacter{01C4}{D\v{Z}}%
!   \DeclareUnicodeCharacter{01C5}{D\v{z}}%
!   \DeclareUnicodeCharacter{01C6}{d\v{z}}%
!   \DeclareUnicodeCharacter{01C7}{LJ}%
!   \DeclareUnicodeCharacter{01C8}{Lj}%
!   \DeclareUnicodeCharacter{01C9}{lj}%
!   \DeclareUnicodeCharacter{01CA}{NJ}%
!   \DeclareUnicodeCharacter{01CB}{Nj}%
!   \DeclareUnicodeCharacter{01CC}{nj}%
!   \DeclareUnicodeCharacter{01CD}{\v{A}}%
!   \DeclareUnicodeCharacter{01CE}{\v{a}}%
!   \DeclareUnicodeCharacter{01CF}{\v{I}}%
!   %
!   \DeclareUnicodeCharacter{01D0}{\v{\dotless{i}}}%
!   \DeclareUnicodeCharacter{01D1}{\v{O}}%
!   \DeclareUnicodeCharacter{01D2}{\v{o}}%
!   \DeclareUnicodeCharacter{01D3}{\v{U}}%
!   \DeclareUnicodeCharacter{01D4}{\v{u}}%
!   %
!   \DeclareUnicodeCharacter{01E2}{\={\AE}}%
!   \DeclareUnicodeCharacter{01E3}{\={\ae}}%
!   \DeclareUnicodeCharacter{01E6}{\v{G}}%
!   \DeclareUnicodeCharacter{01E7}{\v{g}}%
!   \DeclareUnicodeCharacter{01E8}{\v{K}}%
!   \DeclareUnicodeCharacter{01E9}{\v{k}}%
!   %
!   \DeclareUnicodeCharacter{01F0}{\v{\dotless{j}}}%
!   \DeclareUnicodeCharacter{01F1}{DZ}%
!   \DeclareUnicodeCharacter{01F2}{Dz}%
!   \DeclareUnicodeCharacter{01F3}{dz}%
!   \DeclareUnicodeCharacter{01F4}{\'G}%
!   \DeclareUnicodeCharacter{01F5}{\'g}%
!   \DeclareUnicodeCharacter{01F8}{\`N}%
!   \DeclareUnicodeCharacter{01F9}{\`n}%
!   \DeclareUnicodeCharacter{01FC}{\'{\AE}}%
!   \DeclareUnicodeCharacter{01FD}{\'{\ae}}%
!   \DeclareUnicodeCharacter{01FE}{\'{\O}}%
!   \DeclareUnicodeCharacter{01FF}{\'{\o}}%
!   %
!   \DeclareUnicodeCharacter{021E}{\v{H}}%
!   \DeclareUnicodeCharacter{021F}{\v{h}}%
!   %
!   \DeclareUnicodeCharacter{0226}{\dotaccent{A}}%
!   \DeclareUnicodeCharacter{0227}{\dotaccent{a}}%
!   \DeclareUnicodeCharacter{0228}{\cedilla{E}}%
!   \DeclareUnicodeCharacter{0229}{\cedilla{e}}%
!   \DeclareUnicodeCharacter{022E}{\dotaccent{O}}%
!   \DeclareUnicodeCharacter{022F}{\dotaccent{o}}%
!   %
!   \DeclareUnicodeCharacter{0232}{\=Y}%
!   \DeclareUnicodeCharacter{0233}{\=y}%
!   \DeclareUnicodeCharacter{0237}{\dotless{j}}%
    %
!   \DeclareUnicodeCharacter{02DB}{\ogonek{ }}%
    %
    % Greek letters upper case
!   \DeclareUnicodeCharacter{0391}{{\it A}}%
!   \DeclareUnicodeCharacter{0392}{{\it B}}%
!   \DeclareUnicodeCharacter{0393}{\ensuremath{\mit\Gamma}}%
!   \DeclareUnicodeCharacter{0394}{\ensuremath{\mit\Delta}}%
!   \DeclareUnicodeCharacter{0395}{{\it E}}%
!   \DeclareUnicodeCharacter{0396}{{\it Z}}%
!   \DeclareUnicodeCharacter{0397}{{\it H}}%
!   \DeclareUnicodeCharacter{0398}{\ensuremath{\mit\Theta}}%
!   \DeclareUnicodeCharacter{0399}{{\it I}}%
!   \DeclareUnicodeCharacter{039A}{{\it K}}%
!   \DeclareUnicodeCharacter{039B}{\ensuremath{\mit\Lambda}}%
!   \DeclareUnicodeCharacter{039C}{{\it M}}%
!   \DeclareUnicodeCharacter{039D}{{\it N}}%
!   \DeclareUnicodeCharacter{039E}{\ensuremath{\mit\Xi}}%
!   \DeclareUnicodeCharacter{039F}{{\it O}}%
!   \DeclareUnicodeCharacter{03A0}{\ensuremath{\mit\Pi}}%
!   \DeclareUnicodeCharacter{03A1}{{\it P}}%
    %\DeclareUnicodeCharacter{03A2}{} % none - corresponds to final sigma
!   \DeclareUnicodeCharacter{03A3}{\ensuremath{\mit\Sigma}}%
!   \DeclareUnicodeCharacter{03A4}{{\it T}}%
!   \DeclareUnicodeCharacter{03A5}{\ensuremath{\mit\Upsilon}}%
!   \DeclareUnicodeCharacter{03A6}{\ensuremath{\mit\Phi}}%
!   \DeclareUnicodeCharacter{03A7}{{\it X}}%
!   \DeclareUnicodeCharacter{03A8}{\ensuremath{\mit\Psi}}%
!   \DeclareUnicodeCharacter{03A9}{\ensuremath{\mit\Omega}}%
    %
    % Vowels with accents
!   \DeclareUnicodeCharacter{0390}{\ensuremath{\ddot{\acute\iota}}}%
!   \DeclareUnicodeCharacter{03AC}{\ensuremath{\acute\alpha}}%
!   \DeclareUnicodeCharacter{03AD}{\ensuremath{\acute\epsilon}}%
!   \DeclareUnicodeCharacter{03AE}{\ensuremath{\acute\eta}}%
!   \DeclareUnicodeCharacter{03AF}{\ensuremath{\acute\iota}}%
!   \DeclareUnicodeCharacter{03B0}{\ensuremath{\acute{\ddot\upsilon}}}%
    %
    % Standalone accent
!   \DeclareUnicodeCharacter{0384}{\ensuremath{\acute{\ }}}%
    %
    % Greek letters lower case
!   \DeclareUnicodeCharacter{03B1}{\ensuremath\alpha}%
!   \DeclareUnicodeCharacter{03B2}{\ensuremath\beta}%
!   \DeclareUnicodeCharacter{03B3}{\ensuremath\gamma}%
!   \DeclareUnicodeCharacter{03B4}{\ensuremath\delta}%
!   \DeclareUnicodeCharacter{03B5}{\ensuremath\epsilon}%
!   \DeclareUnicodeCharacter{03B6}{\ensuremath\zeta}%
!   \DeclareUnicodeCharacter{03B7}{\ensuremath\eta}%
!   \DeclareUnicodeCharacter{03B8}{\ensuremath\theta}%
!   \DeclareUnicodeCharacter{03B9}{\ensuremath\iota}%
!   \DeclareUnicodeCharacter{03BA}{\ensuremath\kappa}%
!   \DeclareUnicodeCharacter{03BB}{\ensuremath\lambda}%
!   \DeclareUnicodeCharacter{03BC}{\ensuremath\mu}%
!   \DeclareUnicodeCharacter{03BD}{\ensuremath\nu}%
!   \DeclareUnicodeCharacter{03BE}{\ensuremath\xi}%
!   \DeclareUnicodeCharacter{03BF}{{\it o}}% omicron
!   \DeclareUnicodeCharacter{03C0}{\ensuremath\pi}%
!   \DeclareUnicodeCharacter{03C1}{\ensuremath\rho}%
!   \DeclareUnicodeCharacter{03C2}{\ensuremath\varsigma}%
!   \DeclareUnicodeCharacter{03C3}{\ensuremath\sigma}%
!   \DeclareUnicodeCharacter{03C4}{\ensuremath\tau}%
!   \DeclareUnicodeCharacter{03C5}{\ensuremath\upsilon}%
!   \DeclareUnicodeCharacter{03C6}{\ensuremath\phi}%
!   \DeclareUnicodeCharacter{03C7}{\ensuremath\chi}%
!   \DeclareUnicodeCharacter{03C8}{\ensuremath\psi}%
!   \DeclareUnicodeCharacter{03C9}{\ensuremath\omega}%
    %
    % More Greek vowels with accents
!   \DeclareUnicodeCharacter{03CA}{\ensuremath{\ddot\iota}}%
!   \DeclareUnicodeCharacter{03CB}{\ensuremath{\ddot\upsilon}}%
!   \DeclareUnicodeCharacter{03CC}{\ensuremath{\acute o}}%
!   \DeclareUnicodeCharacter{03CD}{\ensuremath{\acute\upsilon}}%
!   \DeclareUnicodeCharacter{03CE}{\ensuremath{\acute\omega}}%
    %
    % Variant Greek letters
!   \DeclareUnicodeCharacter{03D1}{\ensuremath\vartheta}%
!   \DeclareUnicodeCharacter{03D6}{\ensuremath\varpi}%
!   \DeclareUnicodeCharacter{03F1}{\ensuremath\varrho}%
!   %
!   \DeclareUnicodeCharacter{1E02}{\dotaccent{B}}%
!   \DeclareUnicodeCharacter{1E03}{\dotaccent{b}}%
!   \DeclareUnicodeCharacter{1E04}{\udotaccent{B}}%
!   \DeclareUnicodeCharacter{1E05}{\udotaccent{b}}%
!   \DeclareUnicodeCharacter{1E06}{\ubaraccent{B}}%
!   \DeclareUnicodeCharacter{1E07}{\ubaraccent{b}}%
!   \DeclareUnicodeCharacter{1E0A}{\dotaccent{D}}%
!   \DeclareUnicodeCharacter{1E0B}{\dotaccent{d}}%
!   \DeclareUnicodeCharacter{1E0C}{\udotaccent{D}}%
!   \DeclareUnicodeCharacter{1E0D}{\udotaccent{d}}%
!   \DeclareUnicodeCharacter{1E0E}{\ubaraccent{D}}%
!   \DeclareUnicodeCharacter{1E0F}{\ubaraccent{d}}%
!   %
!   \DeclareUnicodeCharacter{1E1E}{\dotaccent{F}}%
!   \DeclareUnicodeCharacter{1E1F}{\dotaccent{f}}%
!   %
!   \DeclareUnicodeCharacter{1E20}{\=G}%
!   \DeclareUnicodeCharacter{1E21}{\=g}%
!   \DeclareUnicodeCharacter{1E22}{\dotaccent{H}}%
!   \DeclareUnicodeCharacter{1E23}{\dotaccent{h}}%
!   \DeclareUnicodeCharacter{1E24}{\udotaccent{H}}%
!   \DeclareUnicodeCharacter{1E25}{\udotaccent{h}}%
!   \DeclareUnicodeCharacter{1E26}{\"H}%
!   \DeclareUnicodeCharacter{1E27}{\"h}%
!   %
!   \DeclareUnicodeCharacter{1E30}{\'K}%
!   \DeclareUnicodeCharacter{1E31}{\'k}%
!   \DeclareUnicodeCharacter{1E32}{\udotaccent{K}}%
!   \DeclareUnicodeCharacter{1E33}{\udotaccent{k}}%
!   \DeclareUnicodeCharacter{1E34}{\ubaraccent{K}}%
!   \DeclareUnicodeCharacter{1E35}{\ubaraccent{k}}%
!   \DeclareUnicodeCharacter{1E36}{\udotaccent{L}}%
!   \DeclareUnicodeCharacter{1E37}{\udotaccent{l}}%
!   \DeclareUnicodeCharacter{1E3A}{\ubaraccent{L}}%
!   \DeclareUnicodeCharacter{1E3B}{\ubaraccent{l}}%
!   \DeclareUnicodeCharacter{1E3E}{\'M}%
!   \DeclareUnicodeCharacter{1E3F}{\'m}%
!   %
!   \DeclareUnicodeCharacter{1E40}{\dotaccent{M}}%
!   \DeclareUnicodeCharacter{1E41}{\dotaccent{m}}%
!   \DeclareUnicodeCharacter{1E42}{\udotaccent{M}}%
!   \DeclareUnicodeCharacter{1E43}{\udotaccent{m}}%
!   \DeclareUnicodeCharacter{1E44}{\dotaccent{N}}%
!   \DeclareUnicodeCharacter{1E45}{\dotaccent{n}}%
!   \DeclareUnicodeCharacter{1E46}{\udotaccent{N}}%
!   \DeclareUnicodeCharacter{1E47}{\udotaccent{n}}%
!   \DeclareUnicodeCharacter{1E48}{\ubaraccent{N}}%
!   \DeclareUnicodeCharacter{1E49}{\ubaraccent{n}}%
!   %
!   \DeclareUnicodeCharacter{1E54}{\'P}%
!   \DeclareUnicodeCharacter{1E55}{\'p}%
!   \DeclareUnicodeCharacter{1E56}{\dotaccent{P}}%
!   \DeclareUnicodeCharacter{1E57}{\dotaccent{p}}%
!   \DeclareUnicodeCharacter{1E58}{\dotaccent{R}}%
!   \DeclareUnicodeCharacter{1E59}{\dotaccent{r}}%
!   \DeclareUnicodeCharacter{1E5A}{\udotaccent{R}}%
!   \DeclareUnicodeCharacter{1E5B}{\udotaccent{r}}%
!   \DeclareUnicodeCharacter{1E5E}{\ubaraccent{R}}%
!   \DeclareUnicodeCharacter{1E5F}{\ubaraccent{r}}%
!   %
!   \DeclareUnicodeCharacter{1E60}{\dotaccent{S}}%
!   \DeclareUnicodeCharacter{1E61}{\dotaccent{s}}%
!   \DeclareUnicodeCharacter{1E62}{\udotaccent{S}}%
!   \DeclareUnicodeCharacter{1E63}{\udotaccent{s}}%
!   \DeclareUnicodeCharacter{1E6A}{\dotaccent{T}}%
!   \DeclareUnicodeCharacter{1E6B}{\dotaccent{t}}%
!   \DeclareUnicodeCharacter{1E6C}{\udotaccent{T}}%
!   \DeclareUnicodeCharacter{1E6D}{\udotaccent{t}}%
!   \DeclareUnicodeCharacter{1E6E}{\ubaraccent{T}}%
!   \DeclareUnicodeCharacter{1E6F}{\ubaraccent{t}}%
!   %
!   \DeclareUnicodeCharacter{1E7C}{\~V}%
!   \DeclareUnicodeCharacter{1E7D}{\~v}%
!   \DeclareUnicodeCharacter{1E7E}{\udotaccent{V}}%
!   \DeclareUnicodeCharacter{1E7F}{\udotaccent{v}}%
!   %
!   \DeclareUnicodeCharacter{1E80}{\`W}%
!   \DeclareUnicodeCharacter{1E81}{\`w}%
!   \DeclareUnicodeCharacter{1E82}{\'W}%
!   \DeclareUnicodeCharacter{1E83}{\'w}%
!   \DeclareUnicodeCharacter{1E84}{\"W}%
!   \DeclareUnicodeCharacter{1E85}{\"w}%
!   \DeclareUnicodeCharacter{1E86}{\dotaccent{W}}%
!   \DeclareUnicodeCharacter{1E87}{\dotaccent{w}}%
!   \DeclareUnicodeCharacter{1E88}{\udotaccent{W}}%
!   \DeclareUnicodeCharacter{1E89}{\udotaccent{w}}%
!   \DeclareUnicodeCharacter{1E8A}{\dotaccent{X}}%
!   \DeclareUnicodeCharacter{1E8B}{\dotaccent{x}}%
!   \DeclareUnicodeCharacter{1E8C}{\"X}%
!   \DeclareUnicodeCharacter{1E8D}{\"x}%
!   \DeclareUnicodeCharacter{1E8E}{\dotaccent{Y}}%
!   \DeclareUnicodeCharacter{1E8F}{\dotaccent{y}}%
!   %
!   \DeclareUnicodeCharacter{1E90}{\^Z}%
!   \DeclareUnicodeCharacter{1E91}{\^z}%
!   \DeclareUnicodeCharacter{1E92}{\udotaccent{Z}}%
!   \DeclareUnicodeCharacter{1E93}{\udotaccent{z}}%
!   \DeclareUnicodeCharacter{1E94}{\ubaraccent{Z}}%
!   \DeclareUnicodeCharacter{1E95}{\ubaraccent{z}}%
!   \DeclareUnicodeCharacter{1E96}{\ubaraccent{h}}%
!   \DeclareUnicodeCharacter{1E97}{\"t}%
!   \DeclareUnicodeCharacter{1E98}{\ringaccent{w}}%
!   \DeclareUnicodeCharacter{1E99}{\ringaccent{y}}%
!   %
!   \DeclareUnicodeCharacter{1EA0}{\udotaccent{A}}%
!   \DeclareUnicodeCharacter{1EA1}{\udotaccent{a}}%
!   %
!   \DeclareUnicodeCharacter{1EB8}{\udotaccent{E}}%
!   \DeclareUnicodeCharacter{1EB9}{\udotaccent{e}}%
!   \DeclareUnicodeCharacter{1EBC}{\~E}%
!   \DeclareUnicodeCharacter{1EBD}{\~e}%
!   %
!   \DeclareUnicodeCharacter{1ECA}{\udotaccent{I}}%
!   \DeclareUnicodeCharacter{1ECB}{\udotaccent{i}}%
!   \DeclareUnicodeCharacter{1ECC}{\udotaccent{O}}%
!   \DeclareUnicodeCharacter{1ECD}{\udotaccent{o}}%
!   %
!   \DeclareUnicodeCharacter{1EE4}{\udotaccent{U}}%
!   \DeclareUnicodeCharacter{1EE5}{\udotaccent{u}}%
!   %
!   \DeclareUnicodeCharacter{1EF2}{\`Y}%
!   \DeclareUnicodeCharacter{1EF3}{\`y}%
!   \DeclareUnicodeCharacter{1EF4}{\udotaccent{Y}}%
    %
!   \DeclareUnicodeCharacter{1EF8}{\~Y}%
!   \DeclareUnicodeCharacter{1EF9}{\~y}%
    %
    % Punctuation
!   \DeclareUnicodeCharacter{2013}{--}%
!   \DeclareUnicodeCharacter{2014}{---}%
!   \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{202F}{\thinspace}%
!   \DeclareUnicodeCharacter{2026}{\dots}%
!   \DeclareUnicodeCharacter{2039}{\guilsinglleft}%
!   \DeclareUnicodeCharacter{203A}{\guilsinglright}%
    %
!   \DeclareUnicodeCharacter{20AC}{\euro}%
    %
!   \DeclareUnicodeCharacter{2192}{\expansion}%
!   \DeclareUnicodeCharacter{21D2}{\result}%
    %
    % Mathematical symbols
!   \DeclareUnicodeCharacter{2200}{\ensuremath\forall}%
!   \DeclareUnicodeCharacter{2203}{\ensuremath\exists}%
!   \DeclareUnicodeCharacter{2208}{\ensuremath\in}%
!   \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{2264}{\ensuremath\leq}%
!   \DeclareUnicodeCharacter{2265}{\ensuremath\geq}%
!   \DeclareUnicodeCharacter{2282}{\ensuremath\subset}%
!   \DeclareUnicodeCharacter{2287}{\ensuremath\supseteq}%
!   %
!   \DeclareUnicodeCharacter{2016}{\ensuremath\Vert}%
!   \DeclareUnicodeCharacter{2032}{\ensuremath\prime}%
!   \DeclareUnicodeCharacter{210F}{\ensuremath\hbar}%
!   \DeclareUnicodeCharacter{2111}{\ensuremath\Im}%
!   \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}%
!   \DeclareUnicodeCharacter{2193}{\ensuremath\downarrow}%
!   \DeclareUnicodeCharacter{2194}{\ensuremath\leftrightarrow}%
!   \DeclareUnicodeCharacter{2195}{\ensuremath\updownarrow}%
!   \DeclareUnicodeCharacter{2196}{\ensuremath\nwarrow}%
!   \DeclareUnicodeCharacter{2197}{\ensuremath\nearrow}%
!   \DeclareUnicodeCharacter{2198}{\ensuremath\searrow}%
!   \DeclareUnicodeCharacter{2199}{\ensuremath\swarrow}%
!   \DeclareUnicodeCharacter{21A6}{\ensuremath\mapsto}%
!   \DeclareUnicodeCharacter{21A9}{\ensuremath\hookleftarrow}%
!   \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}%
!   \DeclareUnicodeCharacter{21D0}{\ensuremath\Leftarrow}%
!   \DeclareUnicodeCharacter{21D1}{\ensuremath\Uparrow}%
!   \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}%
!   \DeclareUnicodeCharacter{2209}{\ensuremath\notin}%
!   \DeclareUnicodeCharacter{220B}{\ensuremath\owns}%
!   \DeclareUnicodeCharacter{220F}{\ensuremath\prod}%
!   \DeclareUnicodeCharacter{2210}{\ensuremath\coprod}%
!   \DeclareUnicodeCharacter{2211}{\ensuremath\sum}%
!   \DeclareUnicodeCharacter{2213}{\ensuremath\mp}%
!   \DeclareUnicodeCharacter{2218}{\ensuremath\circ}%
!   \DeclareUnicodeCharacter{221A}{\ensuremath\surd}%
!   \DeclareUnicodeCharacter{221D}{\ensuremath\propto}%
!   \DeclareUnicodeCharacter{2220}{\ensuremath\angle}%
!   \DeclareUnicodeCharacter{2223}{\ensuremath\mid}%
!   \DeclareUnicodeCharacter{2228}{\ensuremath\vee}%
!   \DeclareUnicodeCharacter{222A}{\ensuremath\cup}%
!   \DeclareUnicodeCharacter{222B}{\ensuremath\smallint}%
!   \DeclareUnicodeCharacter{222E}{\ensuremath\oint}%
!   \DeclareUnicodeCharacter{223C}{\ensuremath\sim}%
!   \DeclareUnicodeCharacter{2240}{\ensuremath\wr}%
!   \DeclareUnicodeCharacter{2243}{\ensuremath\simeq}%
!   \DeclareUnicodeCharacter{2245}{\ensuremath\cong}%
!   \DeclareUnicodeCharacter{2248}{\ensuremath\approx}%
!   \DeclareUnicodeCharacter{224D}{\ensuremath\asymp}%
!   \DeclareUnicodeCharacter{2250}{\ensuremath\doteq}%
!   \DeclareUnicodeCharacter{2260}{\ensuremath\neq}%
!   \DeclareUnicodeCharacter{226A}{\ensuremath\ll}%
!   \DeclareUnicodeCharacter{226B}{\ensuremath\gg}%
!   \DeclareUnicodeCharacter{227A}{\ensuremath\prec}%
!   \DeclareUnicodeCharacter{227B}{\ensuremath\succ}%
!   \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}%
!   \DeclareUnicodeCharacter{2294}{\ensuremath\sqcup}%
!   \DeclareUnicodeCharacter{2295}{\ensuremath\oplus}%
!   \DeclareUnicodeCharacter{2296}{\ensuremath\ominus}%
!   \DeclareUnicodeCharacter{2297}{\ensuremath\otimes}%
!   \DeclareUnicodeCharacter{2298}{\ensuremath\oslash}%
!   \DeclareUnicodeCharacter{2299}{\ensuremath\odot}%
!   \DeclareUnicodeCharacter{22A2}{\ensuremath\vdash}%
!   \DeclareUnicodeCharacter{22A3}{\ensuremath\dashv}%
!   \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}%
!   \DeclareUnicodeCharacter{22C3}{\ensuremath\bigcup}%
!   \DeclareUnicodeCharacter{22C4}{\ensuremath\diamond}%
!   \DeclareUnicodeCharacter{22C5}{\ensuremath\cdot}%
!   \DeclareUnicodeCharacter{22C6}{\ensuremath\star}%
!   \DeclareUnicodeCharacter{22C8}{\ensuremath\bowtie}%
!   \DeclareUnicodeCharacter{2308}{\ensuremath\lceil}%
!   \DeclareUnicodeCharacter{2309}{\ensuremath\rceil}%
!   \DeclareUnicodeCharacter{230A}{\ensuremath\lfloor}%
!   \DeclareUnicodeCharacter{230B}{\ensuremath\rfloor}%
!   \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{2660}{\ensuremath\spadesuit}%
!   \DeclareUnicodeCharacter{2661}{\ensuremath\heartsuit}%
!   \DeclareUnicodeCharacter{2662}{\ensuremath\diamondsuit}%
!   \DeclareUnicodeCharacter{2663}{\ensuremath\clubsuit}%
!   \DeclareUnicodeCharacter{266D}{\ensuremath\flat}%
!   \DeclareUnicodeCharacter{266E}{\ensuremath\natural}%
!   \DeclareUnicodeCharacter{266F}{\ensuremath\sharp}%
!   \DeclareUnicodeCharacter{26AA}{\ensuremath\bigcirc}%
!   \DeclareUnicodeCharacter{27B9}{\ensuremath\rangle}%
!   \DeclareUnicodeCharacter{27C2}{\ensuremath\perp}%
!   \DeclareUnicodeCharacter{27E8}{\ensuremath\langle}%
!   \DeclareUnicodeCharacter{27F5}{\ensuremath\longleftarrow}%
!   \DeclareUnicodeCharacter{27F6}{\ensuremath\longrightarrow}%
!   \DeclareUnicodeCharacter{27F7}{\ensuremath\longleftrightarrow}%
!   \DeclareUnicodeCharacter{27FC}{\ensuremath\longmapsto}%
!   \DeclareUnicodeCharacter{29F5}{\ensuremath\setminus}%
!   \DeclareUnicodeCharacter{2A00}{\ensuremath\bigodot}%
!   \DeclareUnicodeCharacter{2A01}{\ensuremath\bigoplus}%
!   \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}%
!   %
!   \global\mathchardef\checkmark="1370% actually the square root sign
!   \DeclareUnicodeCharacter{2713}{\ensuremath\checkmark}%
! }% end of \unicodechardefs
  
! % UTF-8 byte sequence (pdfTeX) definitions (replacing and @U command)
! % It makes the setting that replace UTF-8 byte sequence.
! \def\utfeightchardefs{%
!   \let\DeclareUnicodeCharacter\DeclareUnicodeCharacterUTFviii
!   \unicodechardefs
  }
  
! % Whether the active definitions of non-ASCII characters expand to
! % non-active tokens with the same character code.  This is used to
! % write characters literally, instead of using active definitions for
! % printing the correct glyphs.
! \newif\ifpassthroughchars
! \passthroughcharsfalse
! 
! % For native Unicode handling (XeTeX and LuaTeX),
! % provide a definition macro to replace/pass-through a Unicode character
! %
! \def\DeclareUnicodeCharacterNative#1#2{%
!   \catcode"#1=\active
!   \def\dodeclareunicodecharacternative##1##2##3{%
!     \begingroup
!       \uccode`\~="##2\relax
!       \uppercase{\gdef~}{%
!         \ifpassthroughchars
!           ##1%
!         \else
!           ##3%
!         \fi
!       }
!     \endgroup
!   }
!   \begingroup
!     \uccode`\.="#1\relax
!     \uppercase{\def\UTFNativeTmp{.}}%
!     \expandafter\dodeclareunicodecharacternative\UTFNativeTmp{#1}{#2}%
!   \endgroup
  }
  
+ % Native Unicode handling (XeTeX and LuaTeX) character replacing definition.
+ % It activates the setting that replaces Unicode characters.
+ \def\nativeunicodechardefs{%
+   \let\DeclareUnicodeCharacter\DeclareUnicodeCharacterNative
+   \unicodechardefs
+ }
+ 
+ % For native Unicode handling (XeTeX and LuaTeX),
+ % make the character token expand
+ % to the sequences given in \unicodechardefs for printing.
+ \def\DeclareUnicodeCharacterNativeAtU#1#2{%
+   \def\UTFAtUTmp{#2}
+   \expandafter\globallet\csname uni:#1\endcsname \UTFAtUTmp
+ }
+ 
+ % @U command definitions for native Unicode handling (XeTeX and LuaTeX).
+ \def\nativeunicodechardefsatu{%
+   \let\DeclareUnicodeCharacter\DeclareUnicodeCharacterNativeAtU
+   \unicodechardefs
+ }
+ 
+ % US-ASCII character definitions.
+ \def\asciichardefs{% nothing need be done
+    \relax
+ }
  
! % define all Unicode characters we know about, for the sake of @U.
! \iftxinativeunicodecapable
!   \nativeunicodechardefsatu
! \else
!   \utfeightchardefs
! \fi
  
  
***************
*** 10788,10797 ****
    \outervsize = \vsize
    \advance\outervsize by 2\topandbottommargin
!   \pageheight = \vsize
    %
    \hsize = #2\relax
    \outerhsize = \hsize
    \advance\outerhsize by 0.5in
!   \pagewidth = \hsize
    %
    \normaloffset = #4\relax
--- 11305,11314 ----
    \outervsize = \vsize
    \advance\outervsize by 2\topandbottommargin
!   \txipageheight = \vsize
    %
    \hsize = #2\relax
    \outerhsize = \hsize
    \advance\outerhsize by 0.5in
!   \txipagewidth = \hsize
    %
    \normaloffset = #4\relax
***************
*** 10805,10808 ****
--- 11322,11332 ----
      \pdfhorigin = 1 true in
      \pdfvorigin = 1 true in
+   \else
+     \ifx\XeTeXrevision\thisisundefined
+     \else
+       \pdfpageheight #7\relax
+       \pdfpagewidth #8\relax
+       % XeTeX does not have \pdfhorigin and \pdfvorigin.
+     \fi
    \fi
    %
***************
*** 11079,11083 ****
  {@catcode`- = @active
   @gdef@normalturnoffactive{%
!    @nonasciistringdefs
     @let-=@normaldash
     @let"=@normaldoublequote
--- 11603,11607 ----
  {@catcode`- = @active
   @gdef@normalturnoffactive{%
!    @passthroughcharstrue
     @let-=@normaldash
     @let"=@normaldoublequote
***************
*** 11117,11123 ****
    @catcode`@^^M=13%
    @def@c{@fixbackslash@c}%
    @def ^^M{@let^^M@secondlinenl}%
!   @gdef @secondlinenl{@let^^M@thirdlinenl}%
!   @gdef @thirdlinenl{@fixbackslash}%
  }}
  
--- 11641,11648 ----
    @catcode`@^^M=13%
    @def@c{@fixbackslash@c}%
+   % Definition for the newline at the end of this file.
    @def ^^M{@let^^M@secondlinenl}%
!   % Definition for a newline in the main Texinfo file.
!   @gdef @secondlinenl{@fixbackslash}%
  }}
  
diff -Nrc2 texinfo-6.1/doc/texinfo.texi texinfo-6.3/doc/texinfo.texi
*** texinfo-6.1/doc/texinfo.texi	2016-02-06 09:04:55.000000000 +0000
--- texinfo-6.3/doc/texinfo.texi	2016-07-30 21:45:12.000000000 +0100
***************
*** 1,4 ****
  \input texinfo.tex    @c -*-texinfo-*-
! @c $Id: texinfo.texi 6987 2016-02-06 08:59:21Z gavin $
  
  @c Everything between the start/end of header lines will be passed by
--- 1,4 ----
  \input texinfo.tex    @c -*-texinfo-*-
! @c $Id: texinfo.texi 7287 2016-07-30 20:37:16Z gavin $
  
  @c Everything between the start/end of header lines will be passed by
***************
*** 979,989 ****
  Texinfo source rather than processed output.  That is, it translates
  the Texinfo markup commands into XML syntax, for further processing by
! XML tools.  The details of the output are defined in an XML DTD as
! usual, which is contained in a file @file{texinfo.dtd} included in the
  Texinfo source distribution and available via the Texinfo web pages.
! The XML contains enough information to recreate the original content,
! except for syntactic constructs such as Texinfo macros and
! conditionals.  The Texinfo source distribution includes a utility script
! @file{txixml2texi} to do that backward transformation.
  @end table
  
--- 979,993 ----
  Texinfo source rather than processed output.  That is, it translates
  the Texinfo markup commands into XML syntax, for further processing by
! XML tools.  The XML contains enough information to recreate the
! original content, except for syntactic constructs such as Texinfo
! macros and conditionals.  The Texinfo source distribution includes a
! utility script @file{txixml2texi} to do that backward transformation.
! 
! The details of the output syntax are defined in an XML DTD as usual,
! which is contained in a file @file{texinfo.dtd} included in the
  Texinfo source distribution and available via the Texinfo web pages.
! Texinfo XML files, and XML files in general, cannot be viewed in
! typical web browsers; they won't follow the DTD reference and as a
! result will simply report a (misleading) syntax error.
  @end table
  
***************
*** 1905,1909 ****
  The @code{@@setfilename} line specifies the name of the output file to
  be generated.
! When present, it should be the first Texinfo command (that is, afte
  @samp{\input texinfo}).
  Write the @code{@@setfilename} command at the beginning of a line and
--- 1909,1913 ----
  The @code{@@setfilename} line specifies the name of the output file to
  be generated.
! When present, it should be the first Texinfo command (that is, after
  @samp{\input texinfo}).
  Write the @code{@@setfilename} command at the beginning of a line and
***************
*** 2575,2613 ****
  main text of the document.
  
- In the past, the contents commands were sometimes placed at the end of
- the file, after any indices and just before the @code{@@bye}, but we
- no longer recommend this.
- 
- @findex setcontentsaftertitlepage
- @findex setshortcontentsaftertitlepage
- @cindex Contents, after title page
- @cindex Table of contents, after title page
- However, since many existing Texinfo documents still do have the
- @code{@@contents} at the end of the manual, if you are a user printing
- a manual, you may wish to force the contents to be printed after the
- title page.  You can do this by specifying
- @code{@@setcontentsaftertitlepage} and/or
- @code{@@setshortcontentsaftertitlepage}.  The first prints only the
- main contents after the @code{@@end titlepage}; the second prints both
- the short contents and the main contents.  In either case, any
- subsequent @code{@@contents} or @code{@@shortcontents} is ignored.
- 
- You need to include the @code{@@set@dots{}contentsaftertitlepage}
- commands early in the document (just after @code{@@setfilename}, for
- example).  We recommend using @command{texi2dvi} (@pxref{Format with
- @command{texi2dvi}}) to specify this without altering the source file at
- all.  For example:
- 
- @example
- texi2dvi --texinfo=@@setcontentsaftertitlepage foo.texi
- @end example
- 
- An alternative invocation, using @command{texi2any}:
- 
- @example
- texi2any --dvi --Xopt --texinfo=@@setcontentsaftertitlepage foo.texi
- @end example
- 
- 
  
  @node The Top Node
--- 2579,2582 ----
***************
*** 12989,12994 ****
  in some conditionals that should not ever be processed.  The
  @code{@@errormsg@{@var{text}@}} command will do this; it takes one
! argument, the text of the error message, which is expanded more or
! less as if it were Info text.
  
  We mention @code{@@errormsg@{@}} here even though it is not strictly
--- 12958,12962 ----
  in some conditionals that should not ever be processed.  The
  @code{@@errormsg@{@var{text}@}} command will do this; it takes one
! argument, the text of the error message.
  
  We mention @code{@@errormsg@{@}} here even though it is not strictly
***************
*** 16722,16728 ****
  @@oddheading    @@oddheadingmarks
  @@pagesizes     @@paragraphindent
! @@setchapternewpage @@setcontentsaftertitlepage
! @@setfilename   @@setshortcontentsaftertitlepage @@shortcontents
! @@urefbreakstyle @@validatemenus @@xrefautomaticsectiontitle
  @end smallexample
  
--- 16690,16696 ----
  @@oddheading    @@oddheadingmarks
  @@pagesizes     @@paragraphindent
! @@setchapternewpage  @@setfilename
! @@shortcontents  @@urefbreakstyle
! @@validatemenus  @@xrefautomaticsectiontitle
  @end smallexample
  
***************
*** 16747,16796 ****
  @multitable @columnfractions 0.5 0.5
  @headitem Option @tab Variable
  @vindex ENABLE_ENCODING
! @item @option{--enable-encoding}   @tab @code{ENABLE_ENCODING}
  @vindex documentlanguage
! @item @option{--document-language} @tab @code{documentlanguage}
  @vindex ERROR_LIMIT
! @item @option{--error-limit}       @tab @code{ERROR_LIMIT}
  @vindex FILLCOLUMN
! @item @option{--fill-column}       @tab @code{FILLCOLUMN}
  @vindex footnotestyle
! @item @option{--footnote-style}    @tab @code{footnotestyle}
  @vindex FORCE
! @item @option{--force}             @tab @code{FORCE}
  @vindex INTERNAL_LINKS
! @item @option{--internal-links}    @tab @code{INTERNAL_LINKS}
  @vindex MACRO_EXPAND
! @item @option{--macro-expand}      @tab @code{MACRO_EXPAND}
  @vindex HEADERS
  @vindex SHOW_MENU
! @item @option{--headers}           @tab @code{HEADERS}, @code{SHOW_MENU}
  @vindex NO_WARN
! @item @option{--no-warn}           @tab @code{NO_WARN}
  @vindex novalidate
! @item @option{--no-validate}       @tab @code{novalidate}
  @vindex NUMBER_FOOTNOTES
! @item @option{--number-footnotes}  @tab @code{NUMBER_FOOTNOTES}
  @vindex NUMBER_SECTIONS
! @item @option{--number-sections}   @tab @code{NUMBER_SECTIONS}
  @vindex NODE_FILES
! @item @option{--node-files}        @tab @code{NODE_FILES}
  @vindex OUT
  @vindex OUTFILE
  @vindex SUBDIR
! @item @option{--output}            @tab @code{OUT}, @code{OUTFILE},
                                          @code{SUBDIR}
  @vindex paragraphindent
! @item @option{--paragraph-indent}  @tab @code{paragraphindent}
  @vindex SILENT
! @item @option{--silent}            @tab @code{SILENT}
  @vindex SPLIT
! @item @option{--split}             @tab @code{SPLIT}
  @vindex SPLIT_SIZE
! @item @option{--split-size}        @tab @code{SPLIT_SIZE}
  @vindex TRANSLITERATE_FILE_NAMES
! @item @option{--transliterate-file-names} @tab @code{TRANSLITERATE_FILE_NAMES}
  @vindex VERBOSE
! @item @option{--verbose}           @tab @code{VERBOSE}
  @end multitable
  
--- 16715,16785 ----
  @multitable @columnfractions 0.5 0.5
  @headitem Option @tab Variable
+ @item
  @vindex ENABLE_ENCODING
! @option{--enable-encoding}   @tab @code{ENABLE_ENCODING}
  @vindex documentlanguage
! @item
! @option{--document-language} @tab @code{documentlanguage}
! @item
  @vindex ERROR_LIMIT
! @option{--error-limit}       @tab @code{ERROR_LIMIT}
! @item
  @vindex FILLCOLUMN
! @option{--fill-column}       @tab @code{FILLCOLUMN}
  @vindex footnotestyle
! @item
! @option{--footnote-style}    @tab @code{footnotestyle}
! @item
  @vindex FORCE
! @option{--force}             @tab @code{FORCE}
  @vindex INTERNAL_LINKS
! @item
! @option{--internal-links}    @tab @code{INTERNAL_LINKS}
! @item
  @vindex MACRO_EXPAND
! @option{--macro-expand}      @tab @code{MACRO_EXPAND}
! @item
  @vindex HEADERS
  @vindex SHOW_MENU
! @option{--headers}           @tab @code{HEADERS}, @code{SHOW_MENU}
! @item
  @vindex NO_WARN
! @option{--no-warn}           @tab @code{NO_WARN}
! @item
  @vindex novalidate
! @option{--no-validate}       @tab @code{novalidate}
! @item
  @vindex NUMBER_FOOTNOTES
! @option{--number-footnotes}  @tab @code{NUMBER_FOOTNOTES}
! @item
  @vindex NUMBER_SECTIONS
! @option{--number-sections}   @tab @code{NUMBER_SECTIONS}
! @item
  @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}
+ @item
  @vindex paragraphindent
! @option{--paragraph-indent}  @tab @code{paragraphindent}
! @item
  @vindex SILENT
! @option{--silent}            @tab @code{SILENT}
! @item
  @vindex SPLIT
! @option{--split}             @tab @code{SPLIT}
! @item
  @vindex SPLIT_SIZE
! @option{--split-size}        @tab @code{SPLIT_SIZE}
! @item
  @vindex TRANSLITERATE_FILE_NAMES
! @option{--transliterate-file-names} @tab @code{TRANSLITERATE_FILE_NAMES}
! @item
  @vindex VERBOSE
! @option{--verbose}           @tab @code{VERBOSE}
  @end multitable
  
***************
*** 19823,19828 ****
  
  @item @@copying
! Specify copyright holders and copying conditions for the document Pair
! with @code{@@end cartouche}.  @xref{@code{@@copying}}.
  
  @item @@copyright@{@}
--- 19812,19817 ----
  
  @item @@copying
! Specify copyright holders and copying conditions for the document.  Pair
! with @code{@@end copying}.  @xref{@code{@@copying}}.
  
  @item @@copyright@{@}
***************
*** 20559,20575 ****
  odd-numbered (right-hand) new pages.  @xref{@code{@@setchapternewpage}}.
  
- @item @@setcontentsaftertitlepage
- Put the table of contents after the @samp{@@end titlepage} even if the
- @code{@@contents} command is at the end.  @xref{Contents}.
- 
  @item @@setfilename @var{info-file-name}
  Provide a name to be used for the output files.  This command is ignored
  for @TeX{} formatting.  @xref{@code{@@setfilename}}.
  
- @item @@setshortcontentsaftertitlepage
- Place the short table of contents after the @samp{@@end titlepage}
- command even if the @code{@@shortcontents} command is at the end.
- @xref{Contents}.
- 
  @item @@settitle @var{title}
  Specify the title for page headers in a printed manual, and the
--- 20548,20555 ----
***************
*** 20930,20933 ****
--- 20910,20939 ----
  
  
+ @node Obsolete @@-Commands
+ @section Obsolete @@-Commands
+ 
+ Here are Texinfo @@-commands which are obsolete or have been removed 
+ completely.  This section is for historical purposes.
+ 
+ @ftable @code
+ @item @@setcontentsaftertitlepage
+ @cindex Contents, after title page
+ @cindex Table of contents, after title page
+ In the past, the contents commands were sometimes placed at the end of
+ the file, after any indices and just before the @code{@@bye}, but we
+ no longer recommend this.
+ This command could be used by a user printing a manual, to force the 
+ contents to be printed after the title page
+ (after the @samp{@@end titlepage} line)
+ even if the @code{@@contents} command was at the end of the manual.  It 
+ now does nothing.
+ 
+ @item @@setshortcontentsaftertitlepage
+ This placed the short table of contents after the @samp{@@end titlepage}
+ command even if the @code{@@shortcontents} command was at the end.  It 
+ now does nothing.
+ @end ftable
+ 
+ 
  @node Tips
  @appendix Tips and Hints
***************
*** 21292,21296 ****
  
  Keep nodes (sections) to a reasonable length, whatever reasonable
! might be in the given context.  Don't hesitate break up long nodes
  into subnodes and have an extensive tree structure; that's what it's
  there for.  Many times, readers will probably try to find a single
--- 21298,21302 ----
  
  Keep nodes (sections) to a reasonable length, whatever reasonable
! might be in the given context.  Don't hesitate to break up long nodes
  into subnodes and have an extensive tree structure; that's what it's
  there for.  Many times, readers will probably try to find a single
***************
*** 21477,21481 ****
  
  @example
! $Id: texinfo.texi 6987 2016-02-06 08:59:21Z gavin $
  @end example
  
--- 21483,21487 ----
  
  @example
! $Id: texinfo.texi 7287 2016-07-30 20:37:16Z gavin $
  @end example
  
diff -Nrc2 texinfo-6.1/doc/tp_api/Makefile.in texinfo-6.3/doc/tp_api/Makefile.in
*** texinfo-6.1/doc/tp_api/Makefile.in	2016-02-06 12:24:04.000000000 +0000
--- texinfo-6.3/doc/tp_api/Makefile.in	2016-09-10 20:29:55.000000000 +0100
***************
*** 123,126 ****
--- 123,127 ----
  	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
  	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+ 	$(top_srcdir)/gnulib/m4/hard-locale.m4 \
  	$(top_srcdir)/gnulib/m4/iconv.m4 \
  	$(top_srcdir)/gnulib/m4/include_next.m4 \
diff -Nrc2 texinfo-6.1/doc/tp_api/api_includes/Texinfo-Convert-Converter.texi texinfo-6.3/doc/tp_api/api_includes/Texinfo-Convert-Converter.texi
*** texinfo-6.1/doc/tp_api/api_includes/Texinfo-Convert-Converter.texi	2016-02-06 12:24:40.000000000 +0000
--- texinfo-6.3/doc/tp_api/api_includes/Texinfo-Convert-Converter.texi	2016-09-10 20:37:00.000000000 +0100
***************
*** 257,262 ****
  
  @table @asis
! @item Around line 1803:
! @anchor{Texinfo::Convert::Converter Around line 1803:}
  
  '=item' outside of any '=over'
--- 257,262 ----
  
  @table @asis
! @item Around line 1795:
! @anchor{Texinfo::Convert::Converter Around line 1795:}
  
  '=item' outside of any '=over'
diff -Nrc2 texinfo-6.1/doc/tp_api/api_includes/Texinfo-Parser.texi texinfo-6.3/doc/tp_api/api_includes/Texinfo-Parser.texi
*** texinfo-6.1/doc/tp_api/api_includes/Texinfo-Parser.texi	2016-02-06 12:24:39.000000000 +0000
--- texinfo-6.3/doc/tp_api/api_includes/Texinfo-Parser.texi	2016-09-10 20:36:58.000000000 +0100
***************
*** 92,98 ****
  conditional blocks should be expanded.  Default is empty.
  
- The raw block formats (within @code{@@html} blocks, for example) are 
- always kept.
- 
  @item gettext
  @anchor{Texinfo::Parser gettext}
--- 92,95 ----
***************
*** 266,269 ****
--- 263,271 ----
  An array of menus that are not associated with a node.
  
+ @item novalidate
+ @anchor{Texinfo::Parser novalidate}
+ 
+ If set, it is as if @code{@@novalidate} was set in the document.
+ 
  @end table
  
***************
*** 386,394 ****
  The index name.
  
- @item index_prefix
- @anchor{Texinfo::Parser index_prefix}
- 
- The associated index prefix.
- 
  @item index_at_command
  @anchor{Texinfo::Parser index_at_command}
--- 388,391 ----
***************
*** 439,443 ****
  @end table
  
! The following shows the references corresponding with the default indexes
  @emph{cp} and @emph{fn}, the @emph{fn} index having its entries formatted as code and 
  the indices corresponding to the following texinfo
--- 436,440 ----
  @end table
  
! The following shows the references corresponding to the default indexes
  @emph{cp} and @emph{fn}, the @emph{fn} index having its entries formatted as code and 
  the indices corresponding to the following texinfo
***************
*** 447,460 ****
    @defcodeindex code
  
!   $index_names = {'cp' => {'name' => 'cp', 'in_code' => 0, 
!                                            'prefix' => ['c', 'cp']},
!                   'fn' => {'name' => 'fn', 'in_code' => 1, 
!                                            'prefix' => ['f', 'fn']},
                    'some' => {'in_code' => 0},
                    'code' => {'in_code' => 1}};
  @end verbatim
  
! If @code{name} is not set, it is set to the index name.  If @code{prefix} is 
! not set, it is set to an array containing the index name.
  
  @emph{$merged_indices_hash} is a hash reference, the key is an index
--- 444,454 ----
    @defcodeindex code
  
!   $index_names = {'cp' => {'name' => 'cp', 'in_code' => 0, },
!                   'fn' => {'name' => 'fn', 'in_code' => 1, },
                    'some' => {'in_code' => 0},
                    'code' => {'in_code' => 1}};
  @end verbatim
  
! If @code{name} is not set, it is set to the index name.
  
  @emph{$merged_indices_hash} is a hash reference, the key is an index
***************
*** 486,510 ****
  A string corresponding to a document language set by @code{@@documentlanguage}.
  
- @item explained_commands
- @anchor{Texinfo::Parser explained_commands}
- 
- A hash reference of explained commands (currently abbr or acronym).
- The value is also a hash reference.  The key of this hash is a normalized
- first argument of these commands, the value is a content array
- corresponding to the explanation associated with this first argument.
- 
- For example giving as an option:
- 
- @verbatim
-   'explained_commands' 
-     => {'acronym' => {'EU' => [{'text' => 'European Union'}]} 
- @end verbatim
- 
- is the same as having the following texinfo code in the document:
- 
- @verbatim
-   @acronym{EU, European Union}
- @end verbatim
- 
  @item INPUT_ENCODING_NAME
  @anchor{Texinfo::Parser INPUT_ENCODING_NAME}
--- 480,483 ----
***************
*** 566,571 ****
                {'text' => 'arg', 'type' => 'macro_arg}],
     'contents' => [{'text' => "coucou \arg\ after arg\n", 'type' => 'raw'}],
!    'extra' => {'arg_line' => " mymacro{arg}\n",
!                'macrobody' => "coucou \arg\ after arg\n"}}
  @end verbatim
  
--- 539,543 ----
                {'text' => 'arg', 'type' => 'macro_arg}],
     'contents' => [{'text' => "coucou \arg\ after arg\n", 'type' => 'raw'}],
!    'extra' => {'arg_line' => " mymacro{arg}\n", }}
  @end verbatim
  
***************
*** 575,583 ****
  is merged in the value.  Same as setting @code{@@synindex} or @code{syncodeindex}.
  
- @item novalidate
- @anchor{Texinfo::Parser novalidate}
- 
- If set, it is as if @code{@@novalidate} was set in the document.
- 
  @item sections_level
  @anchor{Texinfo::Parser sections_level}
--- 547,550 ----
***************
*** 1273,1280 ****
  
  @emph{invalid_syntax} is set if there was an error on the @code{@@macro}
! line.  The key @emph{args_index} associates format arguments with
! their index on the @@macro line formal arguments definition.
! The @emph{macrobody} holds the @@macro body.  @emph{arg_line} holds the
! line after @code{@@macro}.
  
  @item @code{@@node}
--- 1240,1244 ----
  
  @emph{invalid_syntax} is set if there was an error on the @code{@@macro}
! line.  @emph{arg_line} holds the line after @code{@@macro}.
  
  @item @code{@@node}
***************
*** 1354,1361 ****
  @anchor{Texinfo::Parser @code{@@acronym}}
  
! The first argument normalized is in @emph{normalized}.  If there is no
! second argument, but a second argument appeared previously for the
! same first argument, the second argument content of the previous
! command is stored in @emph{explanation_contents}.
  
  @item definition command
--- 1318,1322 ----
  @anchor{Texinfo::Parser @code{@@acronym}}
  
! The first argument normalized is in @emph{normalized}.
  
  @item definition command
***************
*** 1389,1395 ****
  The key @emph{max_columns} holds the maximal number of columns.  If there
  are prototypes on the line they are in the array associated with 
! @emph{prototypes}.  In that case, @emph{prototypes_line} also holds this 
! information, and, in addition, keeps spaces with type @code{prototype_space}.  
! If there is a @code{@@columnfractions} as argument, then the 
  @emph{columnfractions} key is associated with the array of columnfractions
  arguments, holding all the column fractions.
--- 1350,1354 ----
  The key @emph{max_columns} holds the maximal number of columns.  If there
  are prototypes on the line they are in the array associated with 
! @emph{prototypes}.  If there is a @code{@@columnfractions} as argument, then the 
  @emph{columnfractions} key is associated with the array of columnfractions
  arguments, holding all the column fractions.
diff -Nrc2 texinfo-6.1/doc/txi-ja.tex texinfo-6.3/doc/txi-ja.tex
*** texinfo-6.1/doc/txi-ja.tex	1970-01-01 01:00:00.000000000 +0100
--- texinfo-6.3/doc/txi-ja.tex	2016-05-06 16:36:32.000000000 +0100
***************
*** 0 ****
--- 1,488 ----
+ % $Id$
+ % txi-ja.tex -- Japanese translations and font definitions for texinfo.tex.
+ %
+ % Copyright 1999, 2007, 2008, 2016 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 <http://www.gnu.org/licenses/>.
+ %
+ % Written by Masamichi Hosoda, 5 May 2016, <trueroad@trueroad.jp>
+ 
+ \txisetlanguage{USenglish}{2}{3}
+ 
+ \plainnonfrenchspacing
+ 
+ \gdef\putwordAppendix{ä»˜éŒ²}
+ \gdef\putwordChapter{Chapter}
+ \gdef\putworderror{ã‚¨ãƒ©ãƒ¼}
+ \gdef\putwordfile{ãƒ•ã‚¡ã‚¤ãƒ«}
+ \gdef\putwordin{in}
+ \gdef\putwordIndexIsEmpty{ï¼ˆã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã�Œç©ºã�§ã�™ï¼‰}
+ \gdef\putwordIndexNonexistent{ï¼ˆã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã�Œã�‚ã‚Šã�¾ã�›ã‚“ï¼‰}
+ \gdef\putwordInfo{Info}
+ \gdef\putwordInstanceVariableof{Instance Variable of}
+ \gdef\putwordMethodon{Method on}
+ \gdef\putwordNoTitle{ç„¡é¡Œ}
+ \gdef\putwordof{of}
+ \gdef\putwordon{on}
+ \gdef\putwordpage{p.}
+ \gdef\putwordsection{section}
+ \gdef\putwordSection{Section}
+ \gdef\putwordsee{see}
+ \gdef\putwordSee{See}
+ \gdef\putwordShortTOC{ç°¡å�˜ã�ªç›®æ¬¡}
+ \gdef\putwordTOC{ç›®æ¬¡}
+ %
+ \gdef\putwordMJan{1æœˆ}
+ \gdef\putwordMFeb{2æœˆ}
+ \gdef\putwordMMar{3æœˆ}
+ \gdef\putwordMApr{4æœˆ}
+ \gdef\putwordMMay{5æœˆ}
+ \gdef\putwordMJun{6æœˆ}
+ \gdef\putwordMJul{7æœˆ}
+ \gdef\putwordMAug{8æœˆ}
+ \gdef\putwordMSep{9æœˆ}
+ \gdef\putwordMOct{10æœˆ}
+ \gdef\putwordMNov{11æœˆ}
+ \gdef\putwordMDec{12æœˆ}
+ %
+ \gdef\putwordDefmac{ãƒžã‚¯ãƒ­}
+ \gdef\putwordDefspec{ç‰¹æ®Šãƒ•ã‚©ãƒ¼ãƒ }
+ \gdef\putwordDefvar{å¤‰æ•°}
+ \gdef\putwordDefopt{ãƒ¦ãƒ¼ã‚¶ã‚ªãƒ—ã‚·ãƒ§ãƒ³}
+ \gdef\putwordDeffunc{é–¢æ•°}
+ 
+ % Produces Year Month Day style of output.
+ \def\today{%
+   \number\year å¹´\space
+   \ifcase\month
+   \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr
+   \or\putwordMMay\or\putwordMJun\or\putwordMJul\or\putwordMAug
+   \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec
+   \fi
+   \space\number\day æ—¥}
+ 
+ 
+ %
+ % Japanese font definitions
+ %
+ 
+ \ifx\txijapackage\thisisundefined
+   \errmessage{Required CJK package is not found.
+   Use `texinfo-ja.tex' instead of `texinfo.tex'}
+ \else
+ 
+   %
+   % For LuaTeX
+   %
+   \ifx\luatexversion\thisisundefined
+   \else
+     % Definitions for a main text size of 11pt.  (The default in Texinfo.)
+     % Japanese font size is muliplied by 0.962216.
+     \let\definealphabetictextfontsizexi\definetextfontsizexi
+     \gdef\definetextfontsizexi{%
+       % Text fonts (11.2pt, magstep1).
+       \jfont\textmc{file:ipaexm.ttf:jfm=ujis} at 10.78pt
+       \jfont\textgt{file:ipaexg.ttf:jfm=ujis} at 10.78pt
+ 
+       % Fonts for indices, footnotes, small examples (9pt).
+       \jfont\smallmc{file:ipaexm.ttf:jfm=ujis} at 8.66pt
+       \jfont\smallgt{file:ipaexg.ttf:jfm=ujis} at 8.66pt
+ 
+       % Fonts for small examples (8pt).
+       \jfont\smallermc{file:ipaexm.ttf:jfm=ujis} at 7.70pt
+       \jfont\smallergt{file:ipaexg.ttf:jfm=ujis} at 7.70pt
+ 
+       % Fonts for title page (20.4pt):
+       \jfont\titlemc{file:ipaexm.ttf:jfm=ujis} at 19.63pt
+       \jfont\titlegt{file:ipaexg.ttf:jfm=ujis} at 19.63pt
+ 
+       % Chapter (and unnumbered) fonts (17.28pt).
+       \jfont\chapmc{file:ipaexm.ttf:jfm=ujis} at 16.63pt
+       \jfont\chapgt{file:ipaexg.ttf:jfm=ujis} at 16.63pt
+ 
+       % Section fonts (14.4pt).
+       \jfont\secmc{file:ipaexm.ttf:jfm=ujis} at 13.86pt
+       \jfont\secgt{file:ipaexg.ttf:jfm=ujis} at 13.86pt
+ 
+       % Subsection fonts (13.15pt).
+       \jfont\ssecmc{file:ipaexm.ttf:jfm=ujis} at 12.65pt
+       \jfont\ssecgt{file:ipaexg.ttf:jfm=ujis} at 12.65pt
+ 
+       % Reduced fonts for @acro in text (10pt).
+       \jfont\reducedmc{file:ipaexm.ttf:jfm=ujis} at 9.62pt
+       \jfont\reducedgt{file:ipaexg.ttf:jfm=ujis} at 9.62pt
+ 
+       % Fonts for short table of contents.
+       \jfont\shortcontmc{file:ipaexm.ttf:jfm=ujis} at 11.55pt
+       \jfont\shortcontgt{file:ipaexg.ttf:jfm=ujis} at 11.55pt
+ 
+       \definealphabetictextfontsizexi
+     }
+ 
+     % Definitions for a main text size of 10pt.
+     % Japanese font size is muliplied by 0.962216.
+     \let\definealphabetictextfontsizex\definetextfontsizex
+     \gdef\definetextfontsizex{%
+       % Text fonts (10pt).
+       \jfont\textmc{file:ipaexm.ttf:jfm=ujis} at 9.62pt
+       \jfont\textgt{file:ipaexg.ttf:jfm=ujis} at 9.62pt
+ 
+       % Fonts for indices, footnotes, small examples (9pt).
+       \jfont\smallmc{file:ipaexm.ttf:jfm=ujis} at 8.66pt
+       \jfont\smallgt{file:ipaexg.ttf:jfm=ujis} at 8.66pt
+ 
+       % Fonts for small examples (8pt).
+       \jfont\smallermc{file:ipaexm.ttf:jfm=ujis} at 7.70pt
+       \jfont\smallergt{file:ipaexg.ttf:jfm=ujis} at 7.70pt
+ 
+       % Fonts for title page (20.4pt):
+       \jfont\titlemc{file:ipaexm.ttf:jfm=ujis} at 19.63pt
+       \jfont\titlegt{file:ipaexg.ttf:jfm=ujis} at 19.63pt
+ 
+       % Chapter fonts (14.4pt).
+       \jfont\chapmc{file:ipaexm.ttf:jfm=ujis} at 13.86pt
+       \jfont\chapgt{file:ipaexg.ttf:jfm=ujis} at 13.86pt
+ 
+       % Section fonts (12pt).
+       \jfont\secmc{file:ipaexm.ttf:jfm=ujis} at 11.55pt
+       \jfont\secgt{file:ipaexg.ttf:jfm=ujis} at 11.55pt
+ 
+       % Subsection fonts (10pt).
+       \jfont\ssecmc{file:ipaexm.ttf:jfm=ujis} at 9.62pt
+       \jfont\ssecgt{file:ipaexg.ttf:jfm=ujis} at 9.62pt
+ 
+       % Reduced fonts for @acro in text (9pt).
+       \jfont\reducedmc{file:ipaexm.ttf:jfm=ujis} at 8.66pt
+       \jfont\reducedgt{file:ipaexg.ttf:jfm=ujis} at 8.66pt
+ 
+       % Fonts for short table of contents.
+       \jfont\shortcontmc{file:ipaexm.ttf:jfm=ujis} at 11.55pt
+       \jfont\shortcontgt{file:ipaexg.ttf:jfm=ujis} at 11.55pt
+ 
+       \definealphabetictextfontsizex
+     }
+ 
+     % Ignore LuaTeX-ja added line end comment
+     % https://osdn.jp/ticket/browse.php?group_id=5593&tid=36096
+     %
+     % Re-define texinfo.tex's \parseargusing
+     \def\parseargusing#1#2{%
+       \def\argtorun{#2}%
+       \begingroup
+         \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
+         \obeylines
+         \spaceisspace
+         #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
+         % 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%
+     \cxxx}
+     % Re-let \c related macro
+     \let\texinfoc=\c
+   \fi % LuaTeX
+ 
+   %
+   % For XeTeX
+   %
+   \ifx\XeTeXrevision\thisisundefined
+   \else
+     % Fix some Japanese character class
+     % (unicode-letters.tex is wrong.)
+     \def\do#1{\XeTeXcharclass"#1=1 }
+     \do{3041}\do{3043}\do{3045}\do{3047}\do{3049}\do{3063}
+     \do{3083}\do{3085}\do{3087}\do{308E}\do{3095}\do{3096}
+     \do{30A1}\do{30A3}\do{30A5}\do{30A7}\do{30A9}\do{30C3}
+     \do{30E3}\do{30E5}\do{30E7}\do{30EE}\do{30F5}\do{30F6}
+     \do{30FC}\do{31F0}\do{31F1}\do{31F2}\do{31F3}\do{31F4}
+     \do{31F5}\do{31F6}\do{31F7}\do{31F8}\do{31F9}\do{31FA}
+     \do{31FB}\do{31FC}\do{31FD}\do{31FE}\do{31FF}
+ 
+     % Add some character class
+     \do{2015}\do{2016}\do{2025}\do{2030}\do{2032}\do{2033}
+     \do{203B}\do{2103}\do{212B}
+ 
+     \do{2500}\do{2501}\do{2502}\do{2503}\do{250C}\do{250F}
+     \do{2510}\do{2513}\do{2514}\do{2517}\do{2518}\do{251B}
+     \do{251C}\do{251D}\do{2520}\do{2523}\do{2524}\do{2525}
+     \do{2528}\do{252B}\do{252C}\do{252F}\do{2530}\do{2533}
+     \do{2534}\do{2537}\do{2538}\do{253B}\do{253C}\do{253F}
+     \do{2542}\do{254B}
+ 
+     \do{25A0}\do{25A1}\do{25B2}\do{25B3}\do{25BC}\do{25BD}
+     \do{25C6}\do{25C7}\do{25CB}\do{25CE}\do{25CF}\do{25EF}
+     \do{2605}\do{2606}\do{2640}\do{2642}
+ 
+     \do{3000}
+ 
+     % Setting Japanese font instead of Chinese font
+     \def\setjafont#1{%
+       \let\zhfont#1\let\zhpunctfont#1%
+       \let\zhextafont#1\let\zhextbfont#1%
+     }
+ 
+     % Definitions for a main text size of 11pt.  (The default in Texinfo.)
+     % Japanese font size is muliplied by 0.962216.
+     \let\definealphabetictextfontsizexi\definetextfontsizexi
+     \gdef\definetextfontsizexi{%
+       % Text fonts (11.2pt, magstep1).
+       \font\textmczzz"[ipaexm.ttf]:mapping=tex-text" at 10.78pt
+       \font\textgtzzz"[ipaexg.ttf]:mapping=tex-text" at 10.78pt
+       \def\textmc{\setjafont\textmczzz}
+       \def\textgt{\setjafont\textgtzzz}
+ 
+       % Fonts for indices, footnotes, small examples (9pt).
+       \font\smallmczzz"[ipaexm.ttf]:mapping=tex-text" at 8.66pt
+       \font\smallgtzzz"[ipaexg.ttf]:mapping=tex-text" at 8.66pt
+       \def\smallmc{\setjafont\smallmczzz}
+       \def\smallgt{\setjafont\smallgtzzz}
+ 
+       % Fonts for small examples (8pt).
+       \font\smallermczzz"[ipaexm.ttf]:mapping=tex-text" at 7.70pt
+       \font\smallergtzzz"[ipaexg.ttf]:mapping=tex-text" at 7.70pt
+       \def\smallermc{\setjafont\smallermczzz}
+       \def\smallergt{\setjafont\smallergtzzz}
+ 
+       % Fonts for title page (20.4pt):
+       \font\titlemczzz"[ipaexm.ttf]:mapping=tex-text" at 19.63pt
+       \font\titlegtzzz"[ipaexg.ttf]:mapping=tex-text" at 19.63pt
+       \def\titlemc{\setjafont\titlemczzz}
+       \def\titlegt{\setjafont\titlegtzzz}
+ 
+       % Chapter (and unnumbered) fonts (17.28pt).
+       \font\chapmczzz"[ipaexm.ttf]:mapping=tex-text" at 16.63pt
+       \font\chapgtzzz"[ipaexg.ttf]:mapping=tex-text" at 16.63pt
+       \def\chapmc{\setjafont\chapmczzz}
+       \def\chapgt{\setjafont\chapgtzzz}
+ 
+       % Section fonts (14.4pt).
+       \font\secmczzz"[ipaexm.ttf]:mapping=tex-text" at 13.86pt
+       \font\secgtzzz"[ipaexg.ttf]:mapping=tex-text" at 13.86pt
+       \def\secmc{\setjafont\secmczzz}
+       \def\secgt{\setjafont\secgtzzz}
+ 
+       % Subsection fonts (13.15pt).
+       \font\ssecmczzz"[ipaexm.ttf]:mapping=tex-text" at 12.65pt
+       \font\ssecgtzzz"[ipaexg.ttf]:mapping=tex-text" at 12.65pt
+       \def\ssecmc{\setjafont\ssecmczzz}
+       \def\ssecgt{\setjafont\ssecgtzzz}
+ 
+       % Reduced fonts for @acro in text (10pt).
+       \font\reducedmczzz"[ipaexm.ttf]:mapping=tex-text" at 9.62pt
+       \font\reducedgtzzz"[ipaexg.ttf]:mapping=tex-text" at 9.62pt
+       \def\reducedmc{\setjafont\reducedmczzz}
+       \def\reducedgt{\setjafont\reducedgtzzz}
+ 
+       % Fonts for short table of contents.
+       \font\shortcontmczzz"[ipaexm.ttf]:mapping=tex-text" at 11.55pt
+       \font\shortcontgtzzz"[ipaexg.ttf]:mapping=tex-text" at 11.55pt
+       \def\shortcontmc{\setjafont\shortcontmczzz}
+       \def\shortcontgt{\setjafont\shortcontgtzzz}
+ 
+       \definealphabetictextfontsizexi
+     }
+ 
+     % Definitions for a main text size of 10pt.
+     % Japanese font size is muliplied by 0.962216.
+     \let\definealphabetictextfontsizex\definetextfontsizex
+     \gdef\definetextfontsizex{%
+       % Text fonts (10pt).
+       \font\textmczzz"[ipaexm.ttf]:mapping=tex-text" at 9.62pt
+       \font\textgtzzz"[ipaexg.ttf]:mapping=tex-text" at 9.62pt
+       \def\textmc{\setjafont\textmczzz}
+       \def\textgt{\setjafont\textgtzzz}
+ 
+       % Fonts for indices, footnotes, small examples (9pt).
+       \font\smallmczzz"[ipaexm.ttf]:mapping=tex-text" at 8.66pt
+       \font\smallgtzzz"[ipaexg.ttf]:mapping=tex-text" at 8.66pt
+       \def\smallmc{\setjafont\smallmczzz}
+       \def\smallgt{\setjafont\smallgtzzz}
+ 
+       % Fonts for small examples (8pt).
+       \font\smallermczzz"[ipaexm.ttf]:mapping=tex-text" at 7.70pt
+       \font\smallergtzzz"[ipaexg.ttf]:mapping=tex-text" at 7.70pt
+       \def\smallermc{\setjafont\smallermczzz}
+       \def\smallergt{\setjafont\smallergtzzz}
+ 
+       % Fonts for title page (20.4pt):
+       \font\titlemczzz"[ipaexm.ttf]:mapping=tex-text" at 19.63pt
+       \font\titlegtzzz"[ipaexg.ttf]:mapping=tex-text" at 19.63pt
+       \def\titlemc{\setjafont\titlemczzz}
+       \def\titlegt{\setjafont\titlegtzzz}
+ 
+       % Chapter fonts (14.4pt).
+       \font\chapmczzz"[ipaexm.ttf]:mapping=tex-text" at 13.86pt
+       \font\chapgtzzz"[ipaexg.ttf]:mapping=tex-text" at 13.86pt
+       \def\chapmc{\setjafont\chapmczzz}
+       \def\chapgt{\setjafont\chapgtzzz}
+ 
+       % Section fonts (12pt).
+       \font\secmczzz"[ipaexm.ttf]:mapping=tex-text" at 11.55pt
+       \font\secgtzzz"[ipaexg.ttf]:mapping=tex-text" at 11.55pt
+       \def\secmc{\setjafont\secmczzz}
+       \def\secgt{\setjafont\secgtzzz}
+ 
+       % Subsection fonts (10pt).
+       \font\ssecmczzz"[ipaexm.ttf]:mapping=tex-text" at 9.62pt
+       \font\ssecgtzzz"[ipaexg.ttf]:mapping=tex-text" at 9.62pt
+       \def\ssecmc{\setjafont\ssecmczzz}
+       \def\ssecgt{\setjafont\ssecgtzzz}
+ 
+       % Reduced fonts for @acro in text (9pt).
+       \font\reducedmczzz"[ipaexm.ttf]:mapping=tex-text" at 8.66pt
+       \font\reducedgtzzz"[ipaexg.ttf]:mapping=tex-text" at 8.66pt
+       \def\reducedmc{\setjafont\reducedmczzz}
+       \def\reducedgt{\setjafont\reducedgtzzz}
+ 
+       % Fonts for short table of contents.
+       \font\shortcontmczzz"[ipaexm.ttf]:mapping=tex-text" at 11.55pt
+       \font\shortcontgtzzz"[ipaexg.ttf]:mapping=tex-text" at 11.55pt
+       \def\shortcontmc{\setjafont\shortcontmczzz}
+       \def\shortcontgt{\setjafont\shortcontgtzzz}
+ 
+       \definealphabetictextfontsizex
+     }
+ 
+     % Japanese line break settings
+     \XeTeXlinebreaklocale "ja_JP"
+     \XeTeXlinebreakskip=0em plus 0.1em minus 0.01em
+     \XeTeXlinebreakpenalty=0
+ 
+     % For copy & paste Unicode characters (XeTeX 0.99995+)
+     \ifx\XeTeXgenerateactualtext\thisisundefined
+     \else
+       \XeTeXgenerateactualtext=1
+     \fi
+ 
+   \fi % XeTeX
+ 
+   \iftxinativeunicodecapable
+ 
+     % Sync fonts
+ 
+     \let\alphabeticrm\rm
+     \gdef\rm{\alphabeticrm\tenmc}
+ 
+     \let\alphabeticit\it
+     \gdef\it{\alphabeticit\tenmc}
+ 
+     \let\alphabeticsl\sl
+     \gdef\sl{\alphabeticsl\tengt}
+ 
+     \let\alphabeticbf\bf
+     \gdef\bf{\alphabeticbf\tengt}
+ 
+     \let\alphabetictt\tt
+     \gdef\tt{\alphabetictt\tengt}
+ 
+     % Add fonts
+ 
+     \let\alphabetictextfonts\textfonts
+     \gdef\textfonts{%
+       \alphabetictextfonts
+       \let\tenmc\textmc
+       \let\tengt\textgt
+     }
+ 
+     \let\alphabetictitlefonts\titlefonts
+     \gdef\titlefonts{%
+       \alphabetictitlefonts
+       \let\tenmc\titlemc
+       \let\tengt\titlegt
+     }
+ 
+     \let\alphabeticchapfonts\chapfonts
+     \gdef\chapfonts{%
+       \alphabeticchapfonts
+       \let\tenmc\chapmc
+       \let\tengt\chapgt
+     }
+ 
+     \let\alphabeticsecfonts\secfonts
+     \gdef\secfonts{%
+       \alphabeticsecfonts
+       \let\tenmc\secmc
+       \let\tengt\secgt
+     }
+ 
+     \let\alphabeticsubsecfonts\subsecfonts
+     \gdef\subsecfonts{%
+       \alphabeticsubsecfonts
+       \let\tenmc\ssecmc
+       \let\tengt\ssecgt
+     }
+ 
+     \global\let\subsubsecfonts\subsecfonts
+ 
+     \let\alphabeticreducedfonts\reducedfonts
+     \gdef\reducedfonts{%
+       \alphabeticreducedfonts
+       \let\tenmc\reducedmc
+       \let\tengt\reducedgt
+     }
+ 
+     \let\alphabeticsmallfonts\smallfonts
+     \gdef\smallfonts{%
+       \alphabeticsmallfonts
+       \let\tenmc\smallmc
+       \let\tengt\smallgt
+     }
+ 
+     \let\alphabeticsmallerfonts\smallerfonts
+     \gdef\smallerfonts{%
+       \alphabeticsmallerfonts
+       \let\tenmc\smallermc
+       \let\tengt\smallergt
+     }
+ 
+     \let\smallexamplefonts\smallfonts
+ 
+     % Reset fonts
+ 
+     \globaldefs = 1
+     \definetextfontsizexi
+     \globaldefs = 0
+ 
+   \fi % \iftxinativeunicodecapable
+ 
+ \fi % \ifx\txijapackage\thisisundefined
diff -Nrc2 texinfo-6.1/doc/version-stnd.texi texinfo-6.3/doc/version-stnd.texi
*** texinfo-6.1/doc/version-stnd.texi	2016-02-06 11:34:16.000000000 +0000
--- texinfo-6.3/doc/version-stnd.texi	2016-09-10 20:36:55.000000000 +0100
***************
*** 1,4 ****
  @set UPDATED 6 February 2016
  @set UPDATED-MONTH February 2016
! @set EDITION 6.1
! @set VERSION 6.1
--- 1,4 ----
  @set UPDATED 6 February 2016
  @set UPDATED-MONTH February 2016
! @set EDITION 6.3
! @set VERSION 6.3
diff -Nrc2 texinfo-6.1/doc/version.texi texinfo-6.3/doc/version.texi
*** texinfo-6.1/doc/version.texi	2016-02-06 11:34:06.000000000 +0000
--- texinfo-6.3/doc/version.texi	2016-09-10 20:36:55.000000000 +0100
***************
*** 1,4 ****
! @set UPDATED 6 February 2016
! @set UPDATED-MONTH February 2016
! @set EDITION 6.1
! @set VERSION 6.1
--- 1,4 ----
! @set UPDATED 30 July 2016
! @set UPDATED-MONTH July 2016
! @set EDITION 6.3
! @set VERSION 6.3
diff -Nrc2 texinfo-6.1/gnulib/lib/Makefile.am texinfo-6.3/gnulib/lib/Makefile.am
*** texinfo-6.1/gnulib/lib/Makefile.am	2016-01-09 15:29:43.000000000 +0000
--- texinfo-6.3/gnulib/lib/Makefile.am	2016-07-30 20:33:24.000000000 +0100
***************
*** 1,5 ****
  ## DO NOT EDIT! GENERATED AUTOMATICALLY!
  ## Process this file with automake to produce Makefile.in.
! # Copyright (C) 2002-2015 Free Software Foundation, Inc.
  #
  # This file is free software; you can redistribute it and/or modify
--- 1,5 ----
  ## DO NOT EDIT! GENERATED AUTOMATICALLY!
  ## Process this file with automake to produce Makefile.in.
! # Copyright (C) 2002-2016 Free Software Foundation, Inc.
  #
  # This file is free software; you can redistribute it and/or modify
***************
*** 296,299 ****
--- 296,309 ----
  ## end   gnulib module gettext-h
  
+ ## begin gnulib module hard-locale
+ 
+ if gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76
+ libgnu_a_SOURCES += hard-locale.c
+ 
+ endif
+ EXTRA_DIST += hard-locale.h
+ 
+ ## end   gnulib module hard-locale
+ 
  ## begin gnulib module havelib
  
diff -Nrc2 texinfo-6.1/gnulib/lib/Makefile.in texinfo-6.3/gnulib/lib/Makefile.in
*** texinfo-6.1/gnulib/lib/Makefile.in	2016-02-06 12:24:04.000000000 +0000
--- texinfo-6.3/gnulib/lib/Makefile.in	2016-09-10 20:29:56.000000000 +0100
***************
*** 15,19 ****
  @SET_MAKE@
  
! # Copyright (C) 2002-2015 Free Software Foundation, Inc.
  #
  # This file is free software; you can redistribute it and/or modify
--- 15,19 ----
  @SET_MAKE@
  
! # Copyright (C) 2002-2016 Free Software Foundation, Inc.
  #
  # This file is free software; you can redistribute it and/or modify
***************
*** 115,130 ****
  @gl_GNULIB_ENABLED_configmake_TRUE@am__append_1 = configmake.h
  @gl_GNULIB_ENABLED_configmake_TRUE@am__append_2 = configmake.h configmake.h-t
! @gl_GNULIB_ENABLED_langinfo_TRUE@am__append_3 = langinfo.h
! @gl_GNULIB_ENABLED_langinfo_TRUE@am__append_4 = langinfo.h langinfo.h-t
! @gl_GNULIB_ENABLED_localcharset_TRUE@am__append_5 = localcharset.h localcharset.c
! @gl_GNULIB_ENABLED_localcharset_TRUE@am__append_6 = .sed .sin
! @gl_GNULIB_ENABLED_localcharset_TRUE@am__append_7 = charset.alias ref-add.sed ref-del.sed
! @gl_GNULIB_ENABLED_locale_TRUE@am__append_8 = locale.h
! @gl_GNULIB_ENABLED_locale_TRUE@am__append_9 = locale.h locale.h-t
! @gl_GNULIB_ENABLED_lock_TRUE@am__append_10 = glthread/lock.h glthread/lock.c
! @gl_GNULIB_ENABLED_size_max_TRUE@am__append_11 = size_max.h
! @gl_GNULIB_ENABLED_threadlib_TRUE@am__append_12 = glthread/threadlib.c
! @LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__append_13 = uniwidth/width.c
! @gl_GNULIB_ENABLED_xsize_TRUE@am__append_14 = xsize.h xsize.c
  subdir = gnulib/lib
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--- 115,131 ----
  @gl_GNULIB_ENABLED_configmake_TRUE@am__append_1 = configmake.h
  @gl_GNULIB_ENABLED_configmake_TRUE@am__append_2 = configmake.h configmake.h-t
! @gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76_TRUE@am__append_3 = hard-locale.c
! @gl_GNULIB_ENABLED_langinfo_TRUE@am__append_4 = langinfo.h
! @gl_GNULIB_ENABLED_langinfo_TRUE@am__append_5 = langinfo.h langinfo.h-t
! @gl_GNULIB_ENABLED_localcharset_TRUE@am__append_6 = localcharset.h localcharset.c
! @gl_GNULIB_ENABLED_localcharset_TRUE@am__append_7 = .sed .sin
! @gl_GNULIB_ENABLED_localcharset_TRUE@am__append_8 = charset.alias ref-add.sed ref-del.sed
! @gl_GNULIB_ENABLED_locale_TRUE@am__append_9 = locale.h
! @gl_GNULIB_ENABLED_locale_TRUE@am__append_10 = locale.h locale.h-t
! @gl_GNULIB_ENABLED_lock_TRUE@am__append_11 = glthread/lock.h glthread/lock.c
! @gl_GNULIB_ENABLED_size_max_TRUE@am__append_12 = size_max.h
! @gl_GNULIB_ENABLED_threadlib_TRUE@am__append_13 = glthread/threadlib.c
! @LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__append_14 = uniwidth/width.c
! @gl_GNULIB_ENABLED_xsize_TRUE@am__append_15 = xsize.h xsize.c
  subdir = gnulib/lib
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
***************
*** 149,152 ****
--- 150,154 ----
  	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
  	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+ 	$(top_srcdir)/gnulib/m4/hard-locale.m4 \
  	$(top_srcdir)/gnulib/m4/iconv.m4 \
  	$(top_srcdir)/gnulib/m4/include_next.m4 \
***************
*** 243,269 ****
  libgnu_a_AR = $(AR) $(ARFLAGS)
  am__DEPENDENCIES_1 =
! am__libgnu_a_SOURCES_DIST = exitfail.c gettext.h localcharset.h \
! 	localcharset.c glthread/lock.h glthread/lock.c malloca.c \
! 	mbchar.c mbiter.h mbiter.c mbscasecmp.c mbschr.c mbslen.c \
! 	mbsncasecmp.c mbsstr.c mbswidth.h mbswidth.c mbuiter.h \
! 	mbuiter.c size_max.h strnlen1.h strnlen1.c \
  	glthread/threadlib.c unistd.c uniwidth/width.c wctype-h.c \
  	xmalloc.c xalloc-die.c xsize.h xsize.c
! @gl_GNULIB_ENABLED_localcharset_TRUE@am__objects_1 =  \
  @gl_GNULIB_ENABLED_localcharset_TRUE@	localcharset.$(OBJEXT)
  am__dirstamp = $(am__leading_dot)dirstamp
! @gl_GNULIB_ENABLED_lock_TRUE@am__objects_2 = glthread/lock.$(OBJEXT)
! am__objects_3 =
! @gl_GNULIB_ENABLED_threadlib_TRUE@am__objects_4 = glthread/threadlib.$(OBJEXT)
! @LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__objects_5 = uniwidth/width.$(OBJEXT)
! @gl_GNULIB_ENABLED_xsize_TRUE@am__objects_6 = xsize.$(OBJEXT)
  am_libgnu_a_OBJECTS = exitfail.$(OBJEXT) $(am__objects_1) \
! 	$(am__objects_2) malloca.$(OBJEXT) mbchar.$(OBJEXT) \
! 	mbiter.$(OBJEXT) mbscasecmp.$(OBJEXT) mbschr.$(OBJEXT) \
! 	mbslen.$(OBJEXT) mbsncasecmp.$(OBJEXT) mbsstr.$(OBJEXT) \
! 	mbswidth.$(OBJEXT) mbuiter.$(OBJEXT) $(am__objects_3) \
! 	strnlen1.$(OBJEXT) $(am__objects_4) unistd.$(OBJEXT) \
! 	$(am__objects_5) wctype-h.$(OBJEXT) xmalloc.$(OBJEXT) \
! 	xalloc-die.$(OBJEXT) $(am__objects_6)
  libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS)
  LTLIBRARIES = $(noinst_LTLIBRARIES)
--- 245,272 ----
  libgnu_a_AR = $(AR) $(ARFLAGS)
  am__DEPENDENCIES_1 =
! am__libgnu_a_SOURCES_DIST = exitfail.c gettext.h hard-locale.c \
! 	localcharset.h localcharset.c glthread/lock.h glthread/lock.c \
! 	malloca.c mbchar.c mbiter.h mbiter.c mbscasecmp.c mbschr.c \
! 	mbslen.c mbsncasecmp.c mbsstr.c mbswidth.h mbswidth.c \
! 	mbuiter.h mbuiter.c size_max.h strnlen1.h strnlen1.c \
  	glthread/threadlib.c unistd.c uniwidth/width.c wctype-h.c \
  	xmalloc.c xalloc-die.c xsize.h xsize.c
! @gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76_TRUE@am__objects_1 = hard-locale.$(OBJEXT)
! @gl_GNULIB_ENABLED_localcharset_TRUE@am__objects_2 =  \
  @gl_GNULIB_ENABLED_localcharset_TRUE@	localcharset.$(OBJEXT)
  am__dirstamp = $(am__leading_dot)dirstamp
! @gl_GNULIB_ENABLED_lock_TRUE@am__objects_3 = glthread/lock.$(OBJEXT)
! am__objects_4 =
! @gl_GNULIB_ENABLED_threadlib_TRUE@am__objects_5 = glthread/threadlib.$(OBJEXT)
! @LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__objects_6 = uniwidth/width.$(OBJEXT)
! @gl_GNULIB_ENABLED_xsize_TRUE@am__objects_7 = xsize.$(OBJEXT)
  am_libgnu_a_OBJECTS = exitfail.$(OBJEXT) $(am__objects_1) \
! 	$(am__objects_2) $(am__objects_3) malloca.$(OBJEXT) \
! 	mbchar.$(OBJEXT) mbiter.$(OBJEXT) mbscasecmp.$(OBJEXT) \
! 	mbschr.$(OBJEXT) mbslen.$(OBJEXT) mbsncasecmp.$(OBJEXT) \
! 	mbsstr.$(OBJEXT) mbswidth.$(OBJEXT) mbuiter.$(OBJEXT) \
! 	$(am__objects_4) strnlen1.$(OBJEXT) $(am__objects_5) \
! 	unistd.$(OBJEXT) $(am__objects_6) wctype-h.$(OBJEXT) \
! 	xmalloc.$(OBJEXT) xalloc-die.$(OBJEXT) $(am__objects_7)
  libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS)
  LTLIBRARIES = $(noinst_LTLIBRARIES)
***************
*** 1136,1140 ****
  	error.h exitfail.h float.c float.in.h itold.c getopt.c \
  	getopt.in.h getopt1.c getopt_int.h \
! 	$(top_srcdir)/build-aux/config.rpath \
  	$(top_srcdir)/build-aux/config.rpath intprops.h iswblank.c \
  	langinfo.in.h config.charset ref-add.sin ref-del.sin \
--- 1139,1143 ----
  	error.h exitfail.h float.c float.in.h itold.c getopt.c \
  	getopt.in.h getopt1.c getopt_int.h \
! 	$(top_srcdir)/build-aux/config.rpath hard-locale.h \
  	$(top_srcdir)/build-aux/config.rpath intprops.h iswblank.c \
  	langinfo.in.h config.charset ref-add.sin ref-del.sin \
***************
*** 1170,1182 ****
  # 'all' defined above.
  BUILT_SOURCES = $(ALLOCA_H) $(ARGZ_H) $(am__append_1) $(ERRNO_H) \
! 	$(FLOAT_H) $(GETOPT_H) $(am__append_3) $(am__append_8) \
  	arg-nonnull.h c++defs.h warn-on-use.h $(STDARG_H) $(STDBOOL_H) \
  	$(STDDEF_H) $(STDINT_H) stdio.h stdlib.h string.h strings.h \
  	sys/types.h unistd.h $(LIBUNISTRING_UNITYPES_H) \
  	$(LIBUNISTRING_UNIWIDTH_H) wchar.h wctype.h
! SUFFIXES = $(am__append_6)
  MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t argz.h \
  	argz.h-t errno.h errno.h-t float.h float.h-t getopt.h \
! 	getopt.h-t $(am__append_4) $(am__append_9) arg-nonnull.h \
  	arg-nonnull.h-t c++defs.h c++defs.h-t warn-on-use.h \
  	warn-on-use.h-t stdarg.h stdarg.h-t stdbool.h stdbool.h-t \
--- 1173,1185 ----
  # 'all' defined above.
  BUILT_SOURCES = $(ALLOCA_H) $(ARGZ_H) $(am__append_1) $(ERRNO_H) \
! 	$(FLOAT_H) $(GETOPT_H) $(am__append_4) $(am__append_9) \
  	arg-nonnull.h c++defs.h warn-on-use.h $(STDARG_H) $(STDBOOL_H) \
  	$(STDDEF_H) $(STDINT_H) stdio.h stdlib.h string.h strings.h \
  	sys/types.h unistd.h $(LIBUNISTRING_UNITYPES_H) \
  	$(LIBUNISTRING_UNIWIDTH_H) wchar.h wctype.h
! SUFFIXES = $(am__append_7)
  MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t argz.h \
  	argz.h-t errno.h errno.h-t float.h float.h-t getopt.h \
! 	getopt.h-t $(am__append_5) $(am__append_10) arg-nonnull.h \
  	arg-nonnull.h-t c++defs.h c++defs.h-t warn-on-use.h \
  	warn-on-use.h-t stdarg.h stdarg.h-t stdbool.h stdbool.h-t \
***************
*** 1187,1202 ****
  	wctype.h wctype.h-t
  MOSTLYCLEANDIRS = 
! CLEANFILES = $(am__append_2) $(am__append_7)
  DISTCLEANFILES = 
  MAINTAINERCLEANFILES = 
  AM_CPPFLAGS = 
  AM_CFLAGS = 
! libgnu_a_SOURCES = exitfail.c gettext.h $(am__append_5) \
! 	$(am__append_10) malloca.c mbchar.c mbiter.h mbiter.c \
! 	mbscasecmp.c mbschr.c mbslen.c mbsncasecmp.c mbsstr.c \
! 	mbswidth.h mbswidth.c mbuiter.h mbuiter.c $(am__append_11) \
! 	strnlen1.h strnlen1.c $(am__append_12) unistd.c \
! 	$(am__append_13) wctype-h.c xmalloc.c xalloc-die.c \
! 	$(am__append_14)
  libgnu_a_LIBADD = $(gl_LIBOBJS)
  libgnu_a_DEPENDENCIES = $(gl_LIBOBJS)
--- 1190,1205 ----
  	wctype.h wctype.h-t
  MOSTLYCLEANDIRS = 
! CLEANFILES = $(am__append_2) $(am__append_8)
  DISTCLEANFILES = 
  MAINTAINERCLEANFILES = 
  AM_CPPFLAGS = 
  AM_CFLAGS = 
! libgnu_a_SOURCES = exitfail.c gettext.h $(am__append_3) \
! 	$(am__append_6) $(am__append_11) malloca.c mbchar.c mbiter.h \
! 	mbiter.c mbscasecmp.c mbschr.c mbslen.c mbsncasecmp.c mbsstr.c \
! 	mbswidth.h mbswidth.c mbuiter.h mbuiter.c $(am__append_12) \
! 	strnlen1.h strnlen1.c $(am__append_13) unistd.c \
! 	$(am__append_14) wctype-h.c xmalloc.c xalloc-die.c \
! 	$(am__append_15)
  libgnu_a_LIBADD = $(gl_LIBOBJS)
  libgnu_a_DEPENDENCIES = $(gl_LIBOBJS)
***************
*** 1313,1316 ****
--- 1316,1320 ----
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hard-locale.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iswblank.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/itold.Po@am__quote@
***************
*** 1584,1589 ****
  	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
  	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
- @gl_GNULIB_ENABLED_localcharset_FALSE@install-exec-local:
  @gl_GNULIB_ENABLED_localcharset_FALSE@uninstall-local:
  clean: clean-recursive
  
--- 1588,1593 ----
  	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
  	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
  @gl_GNULIB_ENABLED_localcharset_FALSE@uninstall-local:
+ @gl_GNULIB_ENABLED_localcharset_FALSE@install-exec-local:
  clean: clean-recursive
  
diff -Nrc2 texinfo-6.1/gnulib/lib/alloca.in.h texinfo-6.3/gnulib/lib/alloca.in.h
*** texinfo-6.1/gnulib/lib/alloca.in.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/alloca.in.h	2016-08-30 18:31:31.000000000 +0100
***************
*** 1,5 ****
  /* Memory allocation on the stack.
  
!    Copyright (C) 1995, 1999, 2001-2004, 2006-2015 Free Software Foundation,
     Inc.
  
--- 1,5 ----
  /* Memory allocation on the stack.
  
!    Copyright (C) 1995, 1999, 2001-2004, 2006-2016 Free Software Foundation,
     Inc.
  
***************
*** 52,55 ****
--- 52,57 ----
  #  pragma intrinsic (_alloca)
  #  define alloca _alloca
+ # elif defined __MVS__
+ #  include <stdlib.h>
  # else
  #  include <stddef.h>
diff -Nrc2 texinfo-6.1/gnulib/lib/argz.c texinfo-6.3/gnulib/lib/argz.c
*** texinfo-6.1/gnulib/lib/argz.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/argz.c	2016-07-30 20:33:16.000000000 +0100
***************
*** 1,4 ****
  /* Functions for dealing with '\0' separated arg vectors.
!    Copyright (C) 1995-1998, 2000-2002, 2006, 2008-2015 Free Software
     Foundation, Inc.
     This file is part of the GNU C Library.
--- 1,4 ----
  /* Functions for dealing with '\0' separated arg vectors.
!    Copyright (C) 1995-1998, 2000-2002, 2006, 2008-2016 Free Software
     Foundation, Inc.
     This file is part of the GNU C Library.
diff -Nrc2 texinfo-6.1/gnulib/lib/argz.in.h texinfo-6.3/gnulib/lib/argz.in.h
*** texinfo-6.1/gnulib/lib/argz.in.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/argz.in.h	2016-07-30 20:33:16.000000000 +0100
***************
*** 1,4 ****
  /* Routines for dealing with '\0' separated arg vectors.
!    Copyright (C) 1995-2000, 2004, 2007, 2009-2015 Free Software Foundation,
     Inc.
     This file is part of the GNU C Library.
--- 1,4 ----
  /* Routines for dealing with '\0' separated arg vectors.
!    Copyright (C) 1995-2000, 2004, 2007, 2009-2016 Free Software Foundation,
     Inc.
     This file is part of the GNU C Library.
diff -Nrc2 texinfo-6.1/gnulib/lib/asnprintf.c texinfo-6.3/gnulib/lib/asnprintf.c
*** texinfo-6.1/gnulib/lib/asnprintf.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/asnprintf.c	2016-07-30 20:33:16.000000000 +0100
***************
*** 1,4 ****
  /* Formatted output to strings.
!    Copyright (C) 1999, 2002, 2006, 2009-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,4 ----
  /* Formatted output to strings.
!    Copyright (C) 1999, 2002, 2006, 2009-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/asprintf.c texinfo-6.3/gnulib/lib/asprintf.c
*** texinfo-6.1/gnulib/lib/asprintf.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/asprintf.c	2016-07-30 20:33:16.000000000 +0100
***************
*** 1,4 ****
  /* Formatted output to strings.
!    Copyright (C) 1999, 2002, 2006-2007, 2009-2015 Free Software Foundation,
     Inc.
  
--- 1,4 ----
  /* Formatted output to strings.
!    Copyright (C) 1999, 2002, 2006-2007, 2009-2016 Free Software Foundation,
     Inc.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/btowc.c texinfo-6.3/gnulib/lib/btowc.c
*** texinfo-6.1/gnulib/lib/btowc.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/btowc.c	2016-07-30 20:33:16.000000000 +0100
***************
*** 1,4 ****
  /* Convert unibyte character to wide character.
!    Copyright (C) 2008, 2010-2015 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2008.
  
--- 1,4 ----
  /* Convert unibyte character to wide character.
!    Copyright (C) 2008, 2010-2016 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2008.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/config.charset texinfo-6.3/gnulib/lib/config.charset
*** texinfo-6.1/gnulib/lib/config.charset	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/config.charset	2016-07-30 20:33:16.000000000 +0100
***************
*** 2,6 ****
  # Output a system dependent table of character encoding aliases.
  #
! #   Copyright (C) 2000-2004, 2006-2015 Free Software Foundation, Inc.
  #
  #   This program is free software; you can redistribute it and/or modify
--- 2,6 ----
  # Output a system dependent table of character encoding aliases.
  #
! #   Copyright (C) 2000-2004, 2006-2016 Free Software Foundation, Inc.
  #
  #   This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/errno.in.h texinfo-6.3/gnulib/lib/errno.in.h
*** texinfo-6.1/gnulib/lib/errno.in.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/errno.in.h	2016-07-30 20:33:16.000000000 +0100
***************
*** 1,5 ****
  /* A POSIX-like <errno.h>.
  
!    Copyright (C) 2008-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  /* A POSIX-like <errno.h>.
  
!    Copyright (C) 2008-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/error.c texinfo-6.3/gnulib/lib/error.c
*** texinfo-6.1/gnulib/lib/error.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/error.c	2016-07-30 20:33:16.000000000 +0100
***************
*** 1,4 ****
  /* Error handler for noninteractive utilities
!    Copyright (C) 1990-1998, 2000-2007, 2009-2015 Free Software Foundation, Inc.
     This file is part of the GNU C Library.
  
--- 1,4 ----
  /* Error handler for noninteractive utilities
!    Copyright (C) 1990-1998, 2000-2007, 2009-2016 Free Software Foundation, Inc.
     This file is part of the GNU C Library.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/error.h texinfo-6.3/gnulib/lib/error.h
*** texinfo-6.1/gnulib/lib/error.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/error.h	2016-07-30 20:33:16.000000000 +0100
***************
*** 1,4 ****
  /* Declaration for error-reporting function
!    Copyright (C) 1995-1997, 2003, 2006, 2008-2015 Free Software Foundation,
     Inc.
     This file is part of the GNU C Library.
--- 1,4 ----
  /* Declaration for error-reporting function
!    Copyright (C) 1995-1997, 2003, 2006, 2008-2016 Free Software Foundation,
     Inc.
     This file is part of the GNU C Library.
diff -Nrc2 texinfo-6.1/gnulib/lib/exitfail.c texinfo-6.3/gnulib/lib/exitfail.c
*** texinfo-6.1/gnulib/lib/exitfail.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/exitfail.c	2016-07-30 20:33:16.000000000 +0100
***************
*** 1,5 ****
  /* Failure exit status
  
!    Copyright (C) 2002-2003, 2005-2007, 2009-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
--- 1,5 ----
  /* Failure exit status
  
!    Copyright (C) 2002-2003, 2005-2007, 2009-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/exitfail.h texinfo-6.3/gnulib/lib/exitfail.h
*** texinfo-6.1/gnulib/lib/exitfail.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/exitfail.h	2016-07-30 20:33:16.000000000 +0100
***************
*** 1,5 ****
  /* Failure exit status
  
!    Copyright (C) 2002, 2009-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
--- 1,5 ----
  /* Failure exit status
  
!    Copyright (C) 2002, 2009-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/float+.h texinfo-6.3/gnulib/lib/float+.h
*** texinfo-6.1/gnulib/lib/float+.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/float+.h	2016-07-30 20:33:16.000000000 +0100
***************
*** 1,4 ****
  /* Supplemental information about the floating-point formats.
!    Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2007.
  
--- 1,4 ----
  /* Supplemental information about the floating-point formats.
!    Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2007.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/float.c texinfo-6.3/gnulib/lib/float.c
*** texinfo-6.1/gnulib/lib/float.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/float.c	2016-07-30 20:33:16.000000000 +0100
***************
*** 1,4 ****
  /* Auxiliary definitions for <float.h>.
!    Copyright (C) 2011-2015 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2011.
  
--- 1,4 ----
  /* Auxiliary definitions for <float.h>.
!    Copyright (C) 2011-2016 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2011.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/float.in.h texinfo-6.3/gnulib/lib/float.in.h
*** texinfo-6.1/gnulib/lib/float.in.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/float.in.h	2016-07-30 20:33:16.000000000 +0100
***************
*** 1,5 ****
  /* A correct <float.h>.
  
!    Copyright (C) 2007-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
--- 1,5 ----
  /* A correct <float.h>.
  
!    Copyright (C) 2007-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/getopt.c texinfo-6.3/gnulib/lib/getopt.c
*** texinfo-6.1/gnulib/lib/getopt.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/getopt.c	2016-07-30 20:33:16.000000000 +0100
***************
*** 3,7 ****
     "Keep this file name-space clean" means, talk to drepper@gnu.org
     before changing it!
!    Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2015 Free Software
     Foundation, Inc.
     This file is part of the GNU C Library.
--- 3,7 ----
     "Keep this file name-space clean" means, talk to drepper@gnu.org
     before changing it!
!    Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2016 Free Software
     Foundation, Inc.
     This file is part of the GNU C Library.
diff -Nrc2 texinfo-6.1/gnulib/lib/getopt.in.h texinfo-6.3/gnulib/lib/getopt.in.h
*** texinfo-6.1/gnulib/lib/getopt.in.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/getopt.in.h	2016-07-30 20:33:16.000000000 +0100
***************
*** 1,4 ****
  /* Declarations for getopt.
!    Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2015 Free Software
     Foundation, Inc.
     This file is part of the GNU C Library.
--- 1,4 ----
  /* Declarations for getopt.
!    Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2016 Free Software
     Foundation, Inc.
     This file is part of the GNU C Library.
diff -Nrc2 texinfo-6.1/gnulib/lib/getopt1.c texinfo-6.3/gnulib/lib/getopt1.c
*** texinfo-6.1/gnulib/lib/getopt1.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/getopt1.c	2016-07-30 20:33:16.000000000 +0100
***************
*** 1,4 ****
  /* getopt_long and getopt_long_only entry points for GNU getopt.
!    Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2015 Free Software
     Foundation, Inc.
     This file is part of the GNU C Library.
--- 1,4 ----
  /* getopt_long and getopt_long_only entry points for GNU getopt.
!    Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2016 Free Software
     Foundation, Inc.
     This file is part of the GNU C Library.
diff -Nrc2 texinfo-6.1/gnulib/lib/getopt_int.h texinfo-6.3/gnulib/lib/getopt_int.h
*** texinfo-6.1/gnulib/lib/getopt_int.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/getopt_int.h	2016-07-30 20:33:16.000000000 +0100
***************
*** 1,4 ****
  /* Internal declarations for getopt.
!    Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2015 Free Software
     Foundation, Inc.
     This file is part of the GNU C Library.
--- 1,4 ----
  /* Internal declarations for getopt.
!    Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2016 Free Software
     Foundation, Inc.
     This file is part of the GNU C Library.
diff -Nrc2 texinfo-6.1/gnulib/lib/gettext.h texinfo-6.3/gnulib/lib/gettext.h
*** texinfo-6.1/gnulib/lib/gettext.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/gettext.h	2016-07-30 20:33:16.000000000 +0100
***************
*** 1,4 ****
  /* Convenience header for conditional use of GNU <libintl.h>.
!    Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2015 Free Software
     Foundation, Inc.
  
--- 1,4 ----
  /* Convenience header for conditional use of GNU <libintl.h>.
!    Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2016 Free Software
     Foundation, Inc.
  
***************
*** 226,238 ****
  #endif
      {
        memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
        msg_ctxt_id[msgctxt_len - 1] = '\004';
        memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
        translation = dcgettext (domain, msg_ctxt_id, category);
  #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
        if (msg_ctxt_id != buf)
          free (msg_ctxt_id);
  #endif
!       if (translation != msg_ctxt_id)
          return translation;
      }
--- 226,240 ----
  #endif
      {
+       int found_translation;
        memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
        msg_ctxt_id[msgctxt_len - 1] = '\004';
        memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
        translation = dcgettext (domain, msg_ctxt_id, category);
+       found_translation = (translation != msg_ctxt_id);
  #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
        if (msg_ctxt_id != buf)
          free (msg_ctxt_id);
  #endif
!       if (found_translation)
          return translation;
      }
***************
*** 272,284 ****
  #endif
      {
        memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
        msg_ctxt_id[msgctxt_len - 1] = '\004';
        memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
        translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
  #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
        if (msg_ctxt_id != buf)
          free (msg_ctxt_id);
  #endif
!       if (!(translation == msg_ctxt_id || translation == msgid_plural))
          return translation;
      }
--- 274,288 ----
  #endif
      {
+       int found_translation;
        memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
        msg_ctxt_id[msgctxt_len - 1] = '\004';
        memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
        translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
+       found_translation = !(translation == msg_ctxt_id || translation == msgid_plural);
  #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
        if (msg_ctxt_id != buf)
          free (msg_ctxt_id);
  #endif
!       if (found_translation)
          return translation;
      }
diff -Nrc2 texinfo-6.1/gnulib/lib/glthread/lock.c texinfo-6.3/gnulib/lib/glthread/lock.c
*** texinfo-6.1/gnulib/lib/glthread/lock.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/glthread/lock.c	2016-07-30 20:33:16.000000000 +0100
***************
*** 1,4 ****
  /* Locking in multithreaded situations.
!    Copyright (C) 2005-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,4 ----
  /* Locking in multithreaded situations.
!    Copyright (C) 2005-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/glthread/lock.h texinfo-6.3/gnulib/lib/glthread/lock.h
*** texinfo-6.1/gnulib/lib/glthread/lock.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/glthread/lock.h	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Locking in multithreaded situations.
!    Copyright (C) 2005-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,4 ----
  /* Locking in multithreaded situations.
!    Copyright (C) 2005-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/glthread/threadlib.c texinfo-6.3/gnulib/lib/glthread/threadlib.c
*** texinfo-6.1/gnulib/lib/glthread/threadlib.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/glthread/threadlib.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Multithreading primitives.
!    Copyright (C) 2005-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,4 ----
  /* Multithreading primitives.
!    Copyright (C) 2005-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/hard-locale.c texinfo-6.3/gnulib/lib/hard-locale.c
*** texinfo-6.1/gnulib/lib/hard-locale.c	1970-01-01 01:00:00.000000000 +0100
--- texinfo-6.3/gnulib/lib/hard-locale.c	2016-07-30 20:33:16.000000000 +0100
***************
*** 0 ****
--- 1,72 ----
+ /* hard-locale.c -- Determine whether a locale is hard.
+ 
+    Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2016 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 <http://www.gnu.org/licenses/>.  */
+ 
+ #include <config.h>
+ 
+ #include "hard-locale.h"
+ 
+ #include <locale.h>
+ #include <stdlib.h>
+ #include <string.h>
+ 
+ #ifdef __GLIBC__
+ # define GLIBC_VERSION __GLIBC__
+ #elif defined __UCLIBC__
+ # define GLIBC_VERSION 2
+ #else
+ # define GLIBC_VERSION 0
+ #endif
+ 
+ /* Return true if the current CATEGORY locale is hard, i.e. if you
+    can't get away with assuming traditional C or POSIX behavior.  */
+ bool
+ hard_locale (int category)
+ {
+   bool hard = true;
+   char const *p = setlocale (category, NULL);
+ 
+   if (p)
+     {
+       if (2 <= GLIBC_VERSION)
+         {
+           if (strcmp (p, "C") == 0 || strcmp (p, "POSIX") == 0)
+             hard = false;
+         }
+       else
+         {
+           char *locale = strdup (p);
+           if (locale)
+             {
+               /* Temporarily set the locale to the "C" and "POSIX" locales
+                  to find their names, so that we can determine whether one
+                  or the other is the caller's locale.  */
+               if (((p = setlocale (category, "C"))
+                    && strcmp (p, locale) == 0)
+                   || ((p = setlocale (category, "POSIX"))
+                       && strcmp (p, locale) == 0))
+                 hard = false;
+ 
+               /* Restore the caller's locale.  */
+               setlocale (category, locale);
+               free (locale);
+             }
+         }
+     }
+ 
+   return hard;
+ }
diff -Nrc2 texinfo-6.1/gnulib/lib/hard-locale.h texinfo-6.3/gnulib/lib/hard-locale.h
*** texinfo-6.1/gnulib/lib/hard-locale.h	1970-01-01 01:00:00.000000000 +0100
--- texinfo-6.3/gnulib/lib/hard-locale.h	2016-07-30 20:33:16.000000000 +0100
***************
*** 0 ****
--- 1,25 ----
+ /* Determine whether a locale is hard.
+ 
+    Copyright (C) 1999, 2003-2004, 2009-2016 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 <http://www.gnu.org/licenses/>.  */
+ 
+ #ifndef HARD_LOCALE_H_
+ # define HARD_LOCALE_H_ 1
+ 
+ # include <stdbool.h>
+ 
+ bool hard_locale (int);
+ 
+ #endif /* HARD_LOCALE_H_ */
diff -Nrc2 texinfo-6.1/gnulib/lib/intprops.h texinfo-6.3/gnulib/lib/intprops.h
*** texinfo-6.1/gnulib/lib/intprops.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/intprops.h	2016-08-30 18:31:32.000000000 +0100
***************
*** 1,9 ****
  /* intprops.h -- properties of integer types
  
!    Copyright (C) 2001-2005, 2009-2015 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.
  
--- 1,9 ----
  /* intprops.h -- properties of integer types
  
!    Copyright (C) 2001-2016 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.
  
***************
*** 22,25 ****
--- 22,30 ----
  
  #include <limits.h>
+ #include <verify.h>
+ 
+ #ifndef __has_builtin
+ # define __has_builtin(x) 0
+ #endif
  
  /* Return a value with the common real type of E and V and the value of V.  */
***************
*** 37,51 ****
  #define TYPE_IS_INTEGER(t) ((t) 1.5 == 1)
  
- /* True if negative values of the signed integer type T use two's
-    complement, ones' complement, or signed magnitude representation,
-    respectively.  Much GNU code assumes two's complement, but some
-    people like to be portable to all possible C hosts.  */
- #define TYPE_TWOS_COMPLEMENT(t) ((t) ~ (t) 0 == (t) -1)
- #define TYPE_ONES_COMPLEMENT(t) ((t) ~ (t) 0 == 0)
- #define TYPE_SIGNED_MAGNITUDE(t) ((t) ~ (t) 0 < (t) -1)
- 
- /* True if the signed integer expression E uses two's complement.  */
- #define _GL_INT_TWOS_COMPLEMENT(e) (~ _GL_INT_CONVERT (e, 0) == -1)
- 
  /* True if the real type T is signed.  */
  #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
--- 42,45 ----
***************
*** 56,71 ****
  
  
! /* Minimum and maximum values for integer types and expressions.  These
!    macros have undefined behavior if T is signed and has padding bits.
!    If this is a problem for you, please let us know how to fix it for
!    your host.  */
  
  /* The maximum and minimum values for the integer type T.  */
! #define TYPE_MINIMUM(t)                                                 \
!   ((t) (! TYPE_SIGNED (t)                                               \
!         ? (t) 0                                                         \
!         : TYPE_SIGNED_MAGNITUDE (t)                                     \
!         ? ~ (t) 0                                                       \
!         : ~ TYPE_MAXIMUM (t)))
  #define TYPE_MAXIMUM(t)                                                 \
    ((t) (! TYPE_SIGNED (t)                                               \
--- 50,57 ----
  
  
! /* Minimum and maximum values for integer types and expressions.  */
  
  /* The maximum and minimum values for the integer type T.  */
! #define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t))
  #define TYPE_MAXIMUM(t)                                                 \
    ((t) (! TYPE_SIGNED (t)                                               \
***************
*** 77,81 ****
  #define _GL_INT_MINIMUM(e)                                              \
    (EXPR_SIGNED (e)                                                      \
!    ? - _GL_INT_TWOS_COMPLEMENT (e) - _GL_SIGNED_INT_MAXIMUM (e)         \
     : _GL_INT_CONVERT (e, 0))
  #define _GL_INT_MAXIMUM(e)                                              \
--- 63,67 ----
  #define _GL_INT_MINIMUM(e)                                              \
    (EXPR_SIGNED (e)                                                      \
!    ? ~ _GL_SIGNED_INT_MAXIMUM (e)                                       \
     : _GL_INT_CONVERT (e, 0))
  #define _GL_INT_MAXIMUM(e)                                              \
***************
*** 86,91 ****
    (((_GL_INT_CONVERT (e, 1) << (sizeof ((e) + 0) * CHAR_BIT - 2)) - 1) * 2 + 1)
  
  
! /* Return 1 if the __typeof__ keyword works.  This could be done by
     'configure', but for now it's easier to do it by hand.  */
  #if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \
--- 72,100 ----
    (((_GL_INT_CONVERT (e, 1) << (sizeof ((e) + 0) * CHAR_BIT - 2)) - 1) * 2 + 1)
  
+ /* Work around OpenVMS incompatibility with C99.  */
+ #if !defined LLONG_MAX && defined __INT64_MAX
+ # define LLONG_MAX __INT64_MAX
+ # define LLONG_MIN __INT64_MIN
+ #endif
+ 
+ /* This include file assumes that signed types are two's complement without
+    padding bits; the above macros have undefined behavior otherwise.
+    If this is a problem for you, please let us know how to fix it for your host.
+    As a sanity check, test the assumption for some signed types that
+    <limits.h> bounds.  */
+ verify (TYPE_MINIMUM (signed char) == SCHAR_MIN);
+ verify (TYPE_MAXIMUM (signed char) == SCHAR_MAX);
+ verify (TYPE_MINIMUM (short int) == SHRT_MIN);
+ verify (TYPE_MAXIMUM (short int) == SHRT_MAX);
+ verify (TYPE_MINIMUM (int) == INT_MIN);
+ verify (TYPE_MAXIMUM (int) == INT_MAX);
+ verify (TYPE_MINIMUM (long int) == LONG_MIN);
+ verify (TYPE_MAXIMUM (long int) == LONG_MAX);
+ #ifdef LLONG_MAX
+ verify (TYPE_MINIMUM (long long int) == LLONG_MIN);
+ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
+ #endif
  
! /* Does the __typeof__ keyword work?  This could be done by
     'configure', but for now it's easier to do it by hand.  */
  #if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \
***************
*** 224,227 ****
--- 233,243 ----
     : (max) >> (b) < (a))
  
+ /* True if __builtin_add_overflow (A, B, P) works when P is non-null.  */
+ #define _GL_HAS_BUILTIN_OVERFLOW \
+   (5 <= __GNUC__ || __has_builtin (__builtin_add_overflow))
+ 
+ /* True if __builtin_add_overflow_p (A, B, C) works.  */
+ #define _GL_HAS_BUILTIN_OVERFLOW_P \
+   (7 <= __GNUC__ || __has_builtin (__builtin_add_overflow_p))
  
  /* The _GL*_OVERFLOW macros have the same restrictions as the
***************
*** 229,245 ****
     (e.g., A and B) have the same type as MIN and MAX.  Instead, they assume
     that the result (e.g., A + B) has that type.  */
! #define _GL_ADD_OVERFLOW(a, b, min, max)                                \
!   ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max)                  \
!    : (a) < 0 ? (b) <= (a) + (b)                                         \
!    : (b) < 0 ? (a) <= (a) + (b)                                         \
!    : (a) + (b) < (b))
! #define _GL_SUBTRACT_OVERFLOW(a, b, min, max)                           \
!   ((min) < 0 ? INT_SUBTRACT_RANGE_OVERFLOW (a, b, min, max)             \
!    : (a) < 0 ? 1                                                        \
!    : (b) < 0 ? (a) - (b) <= (a)                                         \
!    : (a) < (b))
! #define _GL_MULTIPLY_OVERFLOW(a, b, min, max)                           \
!   (((min) == 0 && (((a) < 0 && 0 < (b)) || ((b) < 0 && 0 < (a))))       \
!    || INT_MULTIPLY_RANGE_OVERFLOW (a, b, min, max))
  #define _GL_DIVIDE_OVERFLOW(a, b, min, max)                             \
    ((min) < 0 ? (b) == _GL_INT_NEGATE_CONVERT (min, 1) && (a) < - (max)  \
--- 245,270 ----
     (e.g., A and B) have the same type as MIN and MAX.  Instead, they assume
     that the result (e.g., A + B) has that type.  */
! #if _GL_HAS_BUILTIN_OVERFLOW_P
! # define _GL_ADD_OVERFLOW(a, b, min, max)                               \
!    __builtin_add_overflow_p (a, b, (__typeof__ ((a) + (b))) 0)
! # define _GL_SUBTRACT_OVERFLOW(a, b, min, max)                          \
!    __builtin_sub_overflow_p (a, b, (__typeof__ ((a) - (b))) 0)
! # define _GL_MULTIPLY_OVERFLOW(a, b, min, max)                          \
!    __builtin_mul_overflow_p (a, b, (__typeof__ ((a) * (b))) 0)
! #else
! # define _GL_ADD_OVERFLOW(a, b, min, max)                                \
!    ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max)                  \
!     : (a) < 0 ? (b) <= (a) + (b)                                         \
!     : (b) < 0 ? (a) <= (a) + (b)                                         \
!     : (a) + (b) < (b))
! # define _GL_SUBTRACT_OVERFLOW(a, b, min, max)                           \
!    ((min) < 0 ? INT_SUBTRACT_RANGE_OVERFLOW (a, b, min, max)             \
!     : (a) < 0 ? 1                                                        \
!     : (b) < 0 ? (a) - (b) <= (a)                                         \
!     : (a) < (b))
! # define _GL_MULTIPLY_OVERFLOW(a, b, min, max)                           \
!    (((min) == 0 && (((a) < 0 && 0 < (b)) || ((b) < 0 && 0 < (a))))       \
!     || INT_MULTIPLY_RANGE_OVERFLOW (a, b, min, max))
! #endif
  #define _GL_DIVIDE_OVERFLOW(a, b, min, max)                             \
    ((min) < 0 ? (b) == _GL_INT_NEGATE_CONVERT (min, 1) && (a) < - (max)  \
***************
*** 306,311 ****
  #define INT_SUBTRACT_OVERFLOW(a, b) \
    _GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW)
! #define INT_NEGATE_OVERFLOW(a) \
!   INT_NEGATE_RANGE_OVERFLOW (a, _GL_INT_MINIMUM (a), _GL_INT_MAXIMUM (a))
  #define INT_MULTIPLY_OVERFLOW(a, b) \
    _GL_BINARY_OP_OVERFLOW (a, b, _GL_MULTIPLY_OVERFLOW)
--- 331,340 ----
  #define INT_SUBTRACT_OVERFLOW(a, b) \
    _GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW)
! #if _GL_HAS_BUILTIN_OVERFLOW || _GL_HAS_BUILTIN_OVERFLOW_P
! # define INT_NEGATE_OVERFLOW(a) INT_SUBTRACT_OVERFLOW (0, a)
! #else
! # define INT_NEGATE_OVERFLOW(a) \
!    INT_NEGATE_RANGE_OVERFLOW (a, _GL_INT_MINIMUM (a), _GL_INT_MAXIMUM (a))
! #endif
  #define INT_MULTIPLY_OVERFLOW(a, b) \
    _GL_BINARY_OP_OVERFLOW (a, b, _GL_MULTIPLY_OVERFLOW)
***************
*** 327,331 ****
                        _GL_INT_MAXIMUM (0 * (b) + (a)))
  
! /* Compute A + B, A - B, A * B, respectively, storing the result into *R.
     Return 1 if the result overflows.  See above for restrictions.  */
  #define INT_ADD_WRAPV(a, b, r) \
--- 356,360 ----
                        _GL_INT_MAXIMUM (0 * (b) + (a)))
  
! /* 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) \
***************
*** 336,343 ****
    _GL_INT_OP_WRAPV (a, b, r, *, __builtin_mul_overflow, INT_MULTIPLY_OVERFLOW)
  
- #ifndef __has_builtin
- # define __has_builtin(x) 0
- #endif
- 
  /* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390.  See:
     https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193
--- 365,368 ----
***************
*** 352,359 ****
  #endif
  
! /* Store A <op> B into *R, where OP specifies the operation.
!    BUILTIN is the builtin operation, and OVERFLOW the overflow predicate.
!    See above for restrictions.  */
! #if 5 <= __GNUC__ || __has_builtin (__builtin_add_overflow)
  # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) builtin (a, b, r)
  #elif 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS
--- 377,385 ----
  #endif
  
! /* Store the low-order bits of A <op> B into *R, where OP specifies
!    the operation.  BUILTIN is the builtin operation, and OVERFLOW the
!    overflow predicate.  Return 1 if the result overflows.  See above
!    for restrictions.  */
! #if _GL_HAS_BUILTIN_OVERFLOW
  # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) builtin (a, b, r)
  #elif 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS
***************
*** 398,402 ****
  #  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))
  # endif
  #endif
--- 424,428 ----
  #  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)
  # endif
  #endif
***************
*** 405,409 ****
     is given by OP.  Use the unsigned type UT for calculation to avoid
     overflow problems.  *R's type is T, with extremal values TMIN and
!    TMAX.  T must be a signed integer type.  */
  #define _GL_INT_OP_CALC(a, b, r, op, overflow, ut, t, tmin, tmax) \
    (sizeof ((a) op (b)) < sizeof (t) \
--- 431,436 ----
     is given by OP.  Use the unsigned type UT for calculation to avoid
     overflow problems.  *R's type is T, with extremal values 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) \
diff -Nrc2 texinfo-6.1/gnulib/lib/iswblank.c texinfo-6.3/gnulib/lib/iswblank.c
*** texinfo-6.1/gnulib/lib/iswblank.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/iswblank.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Test wide character for being blank.
!    Copyright (C) 2008-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,4 ----
  /* Test wide character for being blank.
!    Copyright (C) 2008-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/itold.c texinfo-6.3/gnulib/lib/itold.c
*** texinfo-6.1/gnulib/lib/itold.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/itold.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Replacement for 'int' to 'long double' conversion routine.
!    Copyright (C) 2011-2015 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2011.
  
--- 1,4 ----
  /* Replacement for 'int' to 'long double' conversion routine.
!    Copyright (C) 2011-2016 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2011.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/langinfo.in.h texinfo-6.3/gnulib/lib/langinfo.in.h
*** texinfo-6.1/gnulib/lib/langinfo.in.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/langinfo.in.h	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Substitute for and wrapper around <langinfo.h>.
!    Copyright (C) 2009-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,4 ----
  /* Substitute for and wrapper around <langinfo.h>.
!    Copyright (C) 2009-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/localcharset.c texinfo-6.3/gnulib/lib/localcharset.c
*** texinfo-6.1/gnulib/lib/localcharset.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/localcharset.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,5 ****
  /* Determine a canonical name for the current locale's character encoding.
  
!    Copyright (C) 2000-2006, 2008-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  /* Determine a canonical name for the current locale's character encoding.
  
!    Copyright (C) 2000-2006, 2008-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/localcharset.h texinfo-6.3/gnulib/lib/localcharset.h
*** texinfo-6.1/gnulib/lib/localcharset.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/localcharset.h	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Determine a canonical name for the current locale's character encoding.
!    Copyright (C) 2000-2003, 2009-2015 Free Software Foundation, Inc.
     This file is part of the GNU CHARSET Library.
  
--- 1,4 ----
  /* Determine a canonical name for the current locale's character encoding.
!    Copyright (C) 2000-2003, 2009-2016 Free Software Foundation, Inc.
     This file is part of the GNU CHARSET Library.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/locale.in.h texinfo-6.3/gnulib/lib/locale.in.h
*** texinfo-6.1/gnulib/lib/locale.in.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/locale.in.h	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* A POSIX <locale.h>.
!    Copyright (C) 2007-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
--- 1,4 ----
  /* A POSIX <locale.h>.
!    Copyright (C) 2007-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/localeconv.c texinfo-6.3/gnulib/lib/localeconv.c
*** texinfo-6.1/gnulib/lib/localeconv.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/localeconv.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Query locale dependent information for formatting numbers.
!    Copyright (C) 2012-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
--- 1,4 ----
  /* Query locale dependent information for formatting numbers.
!    Copyright (C) 2012-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/malloc.c texinfo-6.3/gnulib/lib/malloc.c
*** texinfo-6.1/gnulib/lib/malloc.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/malloc.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,5 ****
  /* malloc() function that is glibc compatible.
  
!    Copyright (C) 1997-1998, 2006-2007, 2009-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  /* malloc() function that is glibc compatible.
  
!    Copyright (C) 1997-1998, 2006-2007, 2009-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/malloca.c texinfo-6.3/gnulib/lib/malloca.c
*** texinfo-6.1/gnulib/lib/malloca.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/malloca.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Safe automatic memory allocation.
!    Copyright (C) 2003, 2006-2007, 2009-2015 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2003.
  
--- 1,4 ----
  /* Safe automatic memory allocation.
!    Copyright (C) 2003, 2006-2007, 2009-2016 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2003.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/malloca.h texinfo-6.3/gnulib/lib/malloca.h
*** texinfo-6.1/gnulib/lib/malloca.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/malloca.h	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Safe automatic memory allocation.
!    Copyright (C) 2003-2007, 2009-2015 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2003.
  
--- 1,4 ----
  /* Safe automatic memory allocation.
!    Copyright (C) 2003-2007, 2009-2016 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2003.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/mbchar.c texinfo-6.3/gnulib/lib/mbchar.c
*** texinfo-6.1/gnulib/lib/mbchar.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/mbchar.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,3 ****
! /* Copyright (C) 2001, 2006, 2009-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
--- 1,3 ----
! /* Copyright (C) 2001, 2006, 2009-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/mbchar.h texinfo-6.3/gnulib/lib/mbchar.h
*** texinfo-6.1/gnulib/lib/mbchar.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/mbchar.h	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Multibyte character data type.
!    Copyright (C) 2001, 2005-2007, 2009-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
--- 1,4 ----
  /* Multibyte character data type.
!    Copyright (C) 2001, 2005-2007, 2009-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/mbiter.h texinfo-6.3/gnulib/lib/mbiter.h
*** texinfo-6.1/gnulib/lib/mbiter.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/mbiter.h	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Iterating through multibyte strings: macros for multi-byte encodings.
!    Copyright (C) 2001, 2005, 2007, 2009-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
--- 1,4 ----
  /* Iterating through multibyte strings: macros for multi-byte encodings.
!    Copyright (C) 2001, 2005, 2007, 2009-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/mbrtowc.c texinfo-6.3/gnulib/lib/mbrtowc.c
*** texinfo-6.1/gnulib/lib/mbrtowc.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/mbrtowc.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Convert multibyte character to wide character.
!    Copyright (C) 1999-2002, 2005-2015 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2008.
  
--- 1,4 ----
  /* Convert multibyte character to wide character.
!    Copyright (C) 1999-2002, 2005-2016 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2008.
  
***************
*** 21,24 ****
--- 21,29 ----
  #include <wchar.h>
  
+ #if C_LOCALE_MAYBE_EILSEQ
+ # include "hard-locale.h"
+ # include <locale.h>
+ #endif
+ 
  #if GNULIB_defined_mbstate_t
  /* Implement mbrtowc() on top of mbtowc().  */
***************
*** 329,332 ****
--- 334,340 ----
  rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
  {
+   size_t ret;
+   wchar_t wc;
+ 
  # if MBRTOWC_NULL_ARG2_BUG || MBRTOWC_RETVAL_BUG || MBRTOWC_EMPTY_INPUT_BUG
    if (s == NULL)
***************
*** 343,346 ****
--- 351,357 ----
  # endif
  
+   if (! pwc)
+     pwc = &wc;
+ 
  # if MBRTOWC_RETVAL_BUG
    {
***************
*** 358,363 ****
          for (; n > 0; s++, n--)
            {
!             wchar_t wc;
!             size_t ret = mbrtowc (&wc, s, 1, ps);
  
              if (ret == (size_t)(-1))
--- 369,373 ----
          for (; n > 0; s++, n--)
            {
!             ret = mbrtowc (&wc, s, 1, ps);
  
              if (ret == (size_t)(-1))
***************
*** 367,372 ****
                {
                  /* The multibyte character has been completed.  */
!                 if (pwc != NULL)
!                   *pwc = wc;
                  return (wc == 0 ? 0 : count);
                }
--- 377,381 ----
                {
                  /* The multibyte character has been completed.  */
!                 *pwc = wc;
                  return (wc == 0 ? 0 : count);
                }
***************
*** 377,406 ****
  # endif
  
! # if MBRTOWC_NUL_RETVAL_BUG
!   {
!     wchar_t wc;
!     size_t ret = mbrtowc (&wc, s, n, ps);
! 
!     if (ret != (size_t)(-1) && ret != (size_t)(-2))
!       {
!         if (pwc != NULL)
!           *pwc = wc;
!         if (wc == 0)
!           ret = 0;
!       }
!     return ret;
!   }
! # else
!   {
! #   if MBRTOWC_NULL_ARG1_BUG
!     wchar_t dummy;
  
!     if (pwc == NULL)
!       pwc = &dummy;
! #   endif
  
!     return mbrtowc (pwc, s, n, ps);
!   }
  # endif
  }
  
--- 386,406 ----
  # endif
  
!   ret = mbrtowc (pwc, s, n, ps);
  
! # if MBRTOWC_NUL_RETVAL_BUG
!   if (ret < (size_t) -2 && !*pwc)
!     return 0;
! # endif
  
! # if C_LOCALE_MAYBE_EILSEQ
!   if ((size_t) -2 <= ret && n != 0 && ! hard_locale (LC_CTYPE))
!     {
!       unsigned char uc = *s;
!       *pwc = uc;
!       return 1;
!     }
  # endif
+ 
+   return ret;
  }
  
diff -Nrc2 texinfo-6.1/gnulib/lib/mbscasecmp.c texinfo-6.3/gnulib/lib/mbscasecmp.c
*** texinfo-6.1/gnulib/lib/mbscasecmp.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/mbscasecmp.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Case-insensitive string comparison function.
!    Copyright (C) 1998-1999, 2005-2015 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2005,
     based on earlier glibc code.
--- 1,4 ----
  /* Case-insensitive string comparison function.
!    Copyright (C) 1998-1999, 2005-2016 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2005,
     based on earlier glibc code.
diff -Nrc2 texinfo-6.1/gnulib/lib/mbschr.c texinfo-6.3/gnulib/lib/mbschr.c
*** texinfo-6.1/gnulib/lib/mbschr.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/mbschr.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Searching a string for a character.
!    Copyright (C) 2007-2015 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2007.
  
--- 1,4 ----
  /* Searching a string for a character.
!    Copyright (C) 2007-2016 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2007.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/mbsinit.c texinfo-6.3/gnulib/lib/mbsinit.c
*** texinfo-6.1/gnulib/lib/mbsinit.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/mbsinit.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Test for initial conversion state.
!    Copyright (C) 2008-2015 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2008.
  
--- 1,4 ----
  /* Test for initial conversion state.
!    Copyright (C) 2008-2016 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2008.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/mbslen.c texinfo-6.3/gnulib/lib/mbslen.c
*** texinfo-6.1/gnulib/lib/mbslen.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/mbslen.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Counting the multibyte characters in a string.
!    Copyright (C) 2007-2015 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2007.
  
--- 1,4 ----
  /* Counting the multibyte characters in a string.
!    Copyright (C) 2007-2016 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2007.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/mbsncasecmp.c texinfo-6.3/gnulib/lib/mbsncasecmp.c
*** texinfo-6.1/gnulib/lib/mbsncasecmp.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/mbsncasecmp.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Case-insensitive string comparison function.
!    Copyright (C) 1998-1999, 2005-2015 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2005,
     based on earlier glibc code.
--- 1,4 ----
  /* Case-insensitive string comparison function.
!    Copyright (C) 1998-1999, 2005-2016 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2005,
     based on earlier glibc code.
diff -Nrc2 texinfo-6.1/gnulib/lib/mbsstr.c texinfo-6.3/gnulib/lib/mbsstr.c
*** texinfo-6.1/gnulib/lib/mbsstr.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/mbsstr.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Searching in a string.  -*- coding: utf-8 -*-
!    Copyright (C) 2005-2015 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2005.
  
--- 1,4 ----
  /* Searching in a string.  -*- coding: utf-8 -*-
!    Copyright (C) 2005-2016 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2005.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/mbswidth.c texinfo-6.3/gnulib/lib/mbswidth.c
*** texinfo-6.1/gnulib/lib/mbswidth.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/mbswidth.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Determine the number of screen columns needed for a string.
!    Copyright (C) 2000-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
--- 1,4 ----
  /* Determine the number of screen columns needed for a string.
!    Copyright (C) 2000-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/mbswidth.h texinfo-6.3/gnulib/lib/mbswidth.h
*** texinfo-6.1/gnulib/lib/mbswidth.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/mbswidth.h	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Determine the number of screen columns needed for a string.
!    Copyright (C) 2000-2004, 2007, 2009-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
--- 1,4 ----
  /* Determine the number of screen columns needed for a string.
!    Copyright (C) 2000-2004, 2007, 2009-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/mbtowc-impl.h texinfo-6.3/gnulib/lib/mbtowc-impl.h
*** texinfo-6.1/gnulib/lib/mbtowc-impl.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/mbtowc-impl.h	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Convert multibyte character to wide character.
!    Copyright (C) 2011-2015 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2011.
  
--- 1,4 ----
  /* Convert multibyte character to wide character.
!    Copyright (C) 2011-2016 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2011.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/mbtowc.c texinfo-6.3/gnulib/lib/mbtowc.c
*** texinfo-6.1/gnulib/lib/mbtowc.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/mbtowc.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Convert multibyte character to wide character.
!    Copyright (C) 2011-2015 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2011.
  
--- 1,4 ----
  /* Convert multibyte character to wide character.
!    Copyright (C) 2011-2016 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2011.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/mbuiter.h texinfo-6.3/gnulib/lib/mbuiter.h
*** texinfo-6.1/gnulib/lib/mbuiter.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/mbuiter.h	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Iterating through multibyte strings: macros for multi-byte encodings.
!    Copyright (C) 2001, 2005, 2007, 2009-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
--- 1,4 ----
  /* Iterating through multibyte strings: macros for multi-byte encodings.
!    Copyright (C) 2001, 2005, 2007, 2009-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/memchr.c texinfo-6.3/gnulib/lib/memchr.c
*** texinfo-6.1/gnulib/lib/memchr.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/memchr.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,3 ****
! /* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2015
     Free Software Foundation, Inc.
  
--- 1,3 ----
! /* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2016
     Free Software Foundation, Inc.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/mempcpy.c texinfo-6.3/gnulib/lib/mempcpy.c
*** texinfo-6.1/gnulib/lib/mempcpy.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/mempcpy.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Copy memory area and return pointer after last written byte.
!    Copyright (C) 2003, 2007, 2009-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,4 ----
  /* Copy memory area and return pointer after last written byte.
!    Copyright (C) 2003, 2007, 2009-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/memrchr.c texinfo-6.3/gnulib/lib/memrchr.c
*** texinfo-6.1/gnulib/lib/memrchr.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/memrchr.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,5 ****
  /* memrchr -- find the last occurrence of a byte in a memory block
  
!    Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2015 Free Software
     Foundation, Inc.
  
--- 1,5 ----
  /* memrchr -- find the last occurrence of a byte in a memory block
  
!    Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2016 Free Software
     Foundation, Inc.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/msvc-inval.c texinfo-6.3/gnulib/lib/msvc-inval.c
*** texinfo-6.1/gnulib/lib/msvc-inval.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/msvc-inval.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Invalid parameter handler for MSVC runtime libraries.
!    Copyright (C) 2011-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,4 ----
  /* Invalid parameter handler for MSVC runtime libraries.
!    Copyright (C) 2011-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/msvc-inval.h texinfo-6.3/gnulib/lib/msvc-inval.h
*** texinfo-6.1/gnulib/lib/msvc-inval.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/msvc-inval.h	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Invalid parameter handler for MSVC runtime libraries.
!    Copyright (C) 2011-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,4 ----
  /* Invalid parameter handler for MSVC runtime libraries.
!    Copyright (C) 2011-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/msvc-nothrow.c texinfo-6.3/gnulib/lib/msvc-nothrow.c
*** texinfo-6.1/gnulib/lib/msvc-nothrow.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/msvc-nothrow.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,5 ****
  /* Wrappers that don't throw invalid parameter notifications
     with MSVC runtime libraries.
!    Copyright (C) 2011-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  /* Wrappers that don't throw invalid parameter notifications
     with MSVC runtime libraries.
!    Copyright (C) 2011-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/msvc-nothrow.h texinfo-6.3/gnulib/lib/msvc-nothrow.h
*** texinfo-6.1/gnulib/lib/msvc-nothrow.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/msvc-nothrow.h	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,5 ****
  /* Wrappers that don't throw invalid parameter notifications
     with MSVC runtime libraries.
!    Copyright (C) 2011-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  /* Wrappers that don't throw invalid parameter notifications
     with MSVC runtime libraries.
!    Copyright (C) 2011-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/nl_langinfo.c texinfo-6.3/gnulib/lib/nl_langinfo.c
*** texinfo-6.1/gnulib/lib/nl_langinfo.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/nl_langinfo.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,5 ****
  /* nl_langinfo() replacement: query locale dependent information.
  
!    Copyright (C) 2007-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
--- 1,5 ----
  /* nl_langinfo() replacement: query locale dependent information.
  
!    Copyright (C) 2007-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/printf-args.c texinfo-6.3/gnulib/lib/printf-args.c
*** texinfo-6.1/gnulib/lib/printf-args.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/printf-args.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Decomposed printf argument list.
!    Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2015 Free Software
     Foundation, Inc.
  
--- 1,4 ----
  /* Decomposed printf argument list.
!    Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2016 Free Software
     Foundation, Inc.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/printf-args.h texinfo-6.3/gnulib/lib/printf-args.h
*** texinfo-6.1/gnulib/lib/printf-args.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/printf-args.h	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Decomposed printf argument list.
!    Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2015 Free Software
     Foundation, Inc.
  
--- 1,4 ----
  /* Decomposed printf argument list.
!    Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2016 Free Software
     Foundation, Inc.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/printf-parse.c texinfo-6.3/gnulib/lib/printf-parse.c
*** texinfo-6.1/gnulib/lib/printf-parse.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/printf-parse.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Formatted output to strings.
!    Copyright (C) 1999-2000, 2002-2003, 2006-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,4 ----
  /* Formatted output to strings.
!    Copyright (C) 1999-2000, 2002-2003, 2006-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/printf-parse.h texinfo-6.3/gnulib/lib/printf-parse.h
*** texinfo-6.1/gnulib/lib/printf-parse.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/printf-parse.h	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Parse printf format string.
!    Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2015 Free Software
     Foundation, Inc.
  
--- 1,4 ----
  /* Parse printf format string.
!    Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2016 Free Software
     Foundation, Inc.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/ref-add.sin texinfo-6.3/gnulib/lib/ref-add.sin
*** texinfo-6.1/gnulib/lib/ref-add.sin	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/ref-add.sin	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,5 ****
  # Add this package to a list of references stored in a text file.
  #
! #   Copyright (C) 2000, 2009-2015 Free Software Foundation, Inc.
  #
  #   This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  # Add this package to a list of references stored in a text file.
  #
! #   Copyright (C) 2000, 2009-2016 Free Software Foundation, Inc.
  #
  #   This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/ref-del.sin texinfo-6.3/gnulib/lib/ref-del.sin
*** texinfo-6.1/gnulib/lib/ref-del.sin	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/ref-del.sin	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,5 ****
  # Remove this package from a list of references stored in a text file.
  #
! #   Copyright (C) 2000, 2009-2015 Free Software Foundation, Inc.
  #
  #   This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  # Remove this package from a list of references stored in a text file.
  #
! #   Copyright (C) 2000, 2009-2016 Free Software Foundation, Inc.
  #
  #   This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/regcomp.c texinfo-6.3/gnulib/lib/regcomp.c
*** texinfo-6.1/gnulib/lib/regcomp.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/regcomp.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Extended regular expression matching and search library.
!    Copyright (C) 2002-2015 Free Software Foundation, Inc.
     This file is part of the GNU C Library.
     Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
--- 1,4 ----
  /* Extended regular expression matching and search library.
!    Copyright (C) 2002-2016 Free Software Foundation, Inc.
     This file is part of the GNU C Library.
     Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
***************
*** 154,160 ****
      "\0"
  #define REG_EBRACK_IDX	(REG_ESUBREG_IDX + sizeof "Invalid back reference")
!     gettext_noop ("Unmatched [ or [^")	/* REG_EBRACK */
      "\0"
! #define REG_EPAREN_IDX	(REG_EBRACK_IDX + sizeof "Unmatched [ or [^")
      gettext_noop ("Unmatched ( or \\(") /* REG_EPAREN */
      "\0"
--- 154,160 ----
      "\0"
  #define REG_EBRACK_IDX	(REG_ESUBREG_IDX + sizeof "Invalid back reference")
!     gettext_noop ("Unmatched [, [^, [:, [., or [=")	/* REG_EBRACK */
      "\0"
! #define REG_EPAREN_IDX	(REG_EBRACK_IDX + sizeof "Unmatched [, [^, [:, [., or [=")
      gettext_noop ("Unmatched ( or \\(") /* REG_EPAREN */
      "\0"
***************
*** 214,228 ****
     are set in BUFP on entry.  */
  
- #ifdef _LIBC
- const char *
- re_compile_pattern (pattern, length, bufp)
-     const char *pattern;
-     size_t length;
-     struct re_pattern_buffer *bufp;
- #else /* size_t might promote */
  const char *
  re_compile_pattern (const char *pattern, size_t length,
  		    struct re_pattern_buffer *bufp)
- #endif
  {
    reg_errcode_t ret;
--- 214,220 ----
***************
*** 262,267 ****
  
  reg_syntax_t
! re_set_syntax (syntax)
!     reg_syntax_t syntax;
  {
    reg_syntax_t ret = re_syntax_options;
--- 254,258 ----
  
  reg_syntax_t
! re_set_syntax (reg_syntax_t syntax)
  {
    reg_syntax_t ret = re_syntax_options;
***************
*** 275,280 ****
  
  int
! re_compile_fastmap (bufp)
!     struct re_pattern_buffer *bufp;
  {
    re_dfa_t *dfa = bufp->buffer;
--- 266,270 ----
  
  int
! re_compile_fastmap (struct re_pattern_buffer *bufp)
  {
    re_dfa_t *dfa = bufp->buffer;
***************
*** 475,482 ****
  
  int
! regcomp (preg, pattern, cflags)
!     regex_t *_Restrict_ preg;
!     const char *_Restrict_ pattern;
!     int cflags;
  {
    reg_errcode_t ret;
--- 465,469 ----
  
  int
! regcomp (regex_t *_Restrict_ preg, const char *_Restrict_ pattern, int cflags)
  {
    reg_errcode_t ret;
***************
*** 536,551 ****
     from either regcomp or regexec.   We don't use PREG here.  */
  
- #ifdef _LIBC
- size_t
- regerror (errcode, preg, errbuf, errbuf_size)
-     int errcode;
-     const regex_t *_Restrict_ preg;
-     char *_Restrict_ errbuf;
-     size_t errbuf_size;
- #else /* size_t might promote */
  size_t
! regerror (int errcode, const regex_t *_Restrict_ preg,
! 	  char *_Restrict_ errbuf, size_t errbuf_size)
! #endif
  {
    const char *msg;
--- 523,529 ----
     from either regcomp or regexec.   We don't use PREG here.  */
  
  size_t
! regerror (int errcode, const regex_t *_Restrict_ preg, char *_Restrict_ errbuf,
! 	  size_t errbuf_size)
  {
    const char *msg;
***************
*** 663,668 ****
  
  void
! regfree (preg)
!     regex_t *preg;
  {
    re_dfa_t *dfa = preg->buffer;
--- 641,645 ----
  
  void
! regfree (regex_t *preg)
  {
    re_dfa_t *dfa = preg->buffer;
***************
*** 700,705 ****
  weak_function
  # endif
! re_comp (s)
!      const char *s;
  {
    reg_errcode_t ret;
--- 677,681 ----
  weak_function
  # endif
! re_comp (const char *s)
  {
    reg_errcode_t ret;
***************
*** 1422,1426 ****
        node->first = node;
        node->node_idx = re_dfa_add_node (dfa, node->token);
!       if (BE (node->node_idx == REG_MISSING, 0))
  	return REG_ESPACE;
        if (node->token.type == ANCHOR)
--- 1398,1402 ----
        node->first = node;
        node->node_idx = re_dfa_add_node (dfa, node->token);
!       if (BE (node->node_idx == -1, 0))
  	return REG_ESPACE;
        if (node->token.type == ANCHOR)
***************
*** 1483,1488 ****
  	else
  	  right = node->next->node_idx;
! 	assert (REG_VALID_INDEX (left));
! 	assert (REG_VALID_INDEX (right));
  	err = re_node_set_init_2 (dfa->edests + idx, left, right);
        }
--- 1459,1464 ----
  	else
  	  right = node->next->node_idx;
! 	assert (left > -1);
! 	assert (right > -1);
  	err = re_node_set_init_2 (dfa->edests + idx, left, right);
        }
***************
*** 1534,1538 ****
  	  re_node_set_empty (dfa->edests + clone_node);
  	  clone_dest = duplicate_node (dfa, org_dest, constraint);
! 	  if (BE (clone_dest == REG_MISSING, 0))
  	    return REG_ESPACE;
  	  dfa->nexts[clone_node] = dfa->nexts[org_node];
--- 1510,1514 ----
  	  re_node_set_empty (dfa->edests + clone_node);
  	  clone_dest = duplicate_node (dfa, org_dest, constraint);
! 	  if (BE (clone_dest == -1, 0))
  	    return REG_ESPACE;
  	  dfa->nexts[clone_node] = dfa->nexts[org_node];
***************
*** 1567,1571 ****
  	  constraint |= dfa->nodes[org_node].constraint;
  	  clone_dest = duplicate_node (dfa, org_dest, constraint);
! 	  if (BE (clone_dest == REG_MISSING, 0))
  	    return REG_ESPACE;
  	  ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
--- 1543,1547 ----
  	  constraint |= dfa->nodes[org_node].constraint;
  	  clone_dest = duplicate_node (dfa, org_dest, constraint);
! 	  if (BE (clone_dest == -1, 0))
  	    return REG_ESPACE;
  	  ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
***************
*** 1581,1590 ****
  	  /* Search for a duplicated node which satisfies the constraint.  */
  	  clone_dest = search_duplicated_node (dfa, org_dest, constraint);
! 	  if (clone_dest == REG_MISSING)
  	    {
  	      /* There is no such duplicated node, create a new one.  */
  	      reg_errcode_t err;
  	      clone_dest = duplicate_node (dfa, org_dest, constraint);
! 	      if (BE (clone_dest == REG_MISSING, 0))
  		return REG_ESPACE;
  	      ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
--- 1557,1566 ----
  	  /* Search for a duplicated node which satisfies the constraint.  */
  	  clone_dest = search_duplicated_node (dfa, org_dest, constraint);
! 	  if (clone_dest == -1)
  	    {
  	      /* There is no such duplicated node, create a new one.  */
  	      reg_errcode_t err;
  	      clone_dest = duplicate_node (dfa, org_dest, constraint);
! 	      if (BE (clone_dest == -1, 0))
  		return REG_ESPACE;
  	      ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
***************
*** 1607,1611 ****
  	  org_dest = dfa->edests[org_node].elems[1];
  	  clone_dest = duplicate_node (dfa, org_dest, constraint);
! 	  if (BE (clone_dest == REG_MISSING, 0))
  	    return REG_ESPACE;
  	  ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
--- 1583,1587 ----
  	  org_dest = dfa->edests[org_node].elems[1];
  	  clone_dest = duplicate_node (dfa, org_dest, constraint);
! 	  if (BE (clone_dest == -1, 0))
  	    return REG_ESPACE;
  	  ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
***************
*** 1633,1641 ****
  	return idx; /* Found.  */
      }
!   return REG_MISSING; /* Not found.  */
  }
  
  /* Duplicate the node whose index is ORG_IDX and set the constraint CONSTRAINT.
!    Return the index of the new node, or REG_MISSING if insufficient storage is
     available.  */
  
--- 1609,1617 ----
  	return idx; /* Found.  */
      }
!   return -1; /* Not found.  */
  }
  
  /* Duplicate the node whose index is ORG_IDX and set the constraint CONSTRAINT.
!    Return the index of the new node, or -1 if insufficient storage is
     available.  */
  
***************
*** 1644,1648 ****
  {
    Idx dup_idx = re_dfa_add_node (dfa, dfa->nodes[org_idx]);
!   if (BE (dup_idx != REG_MISSING, 1))
      {
        dfa->nodes[dup_idx].constraint = constraint;
--- 1620,1624 ----
  {
    Idx dup_idx = re_dfa_add_node (dfa, dfa->nodes[org_idx]);
!   if (BE (dup_idx != -1, 1))
      {
        dfa->nodes[dup_idx].constraint = constraint;
***************
*** 1703,1707 ****
  
  #ifdef DEBUG
!       assert (dfa->eclosures[node_idx].nelem != REG_MISSING);
  #endif
  
--- 1679,1683 ----
  
  #ifdef DEBUG
!       assert (dfa->eclosures[node_idx].nelem != -1);
  #endif
  
***************
*** 1739,1743 ****
    /* This indicates that we are calculating this node now.
       We reference this value to avoid infinite loop.  */
!   dfa->eclosures[node].nelem = REG_MISSING;
  
    /* If the current node has constraints, duplicate all nodes
--- 1715,1719 ----
    /* This indicates that we are calculating this node now.
       We reference this value to avoid infinite loop.  */
!   dfa->eclosures[node].nelem = -1;
  
    /* If the current node has constraints, duplicate all nodes
***************
*** 1761,1765 ****
  	/* If calculating the epsilon closure of 'edest' is in progress,
  	   return intermediate result.  */
! 	if (dfa->eclosures[edest].nelem == REG_MISSING)
  	  {
  	    incomplete = true;
--- 1737,1741 ----
  	/* If calculating the epsilon closure of 'edest' is in progress,
  	   return intermediate result.  */
! 	if (dfa->eclosures[edest].nelem == -1)
  	  {
  	    incomplete = true;
***************
*** 2558,2562 ****
        end = 0;
        start = fetch_number (regexp, token, syntax);
!       if (start == REG_MISSING)
  	{
  	  if (token->type == CHARACTER && token->opr.c == ',')
--- 2534,2538 ----
        end = 0;
        start = fetch_number (regexp, token, syntax);
!       if (start == -1)
  	{
  	  if (token->type == CHARACTER && token->opr.c == ',')
***************
*** 2568,2579 ****
  	    }
  	}
!       if (BE (start != REG_ERROR, 1))
  	{
  	  /* We treat "{n}" as "{n,n}".  */
  	  end = ((token->type == OP_CLOSE_DUP_NUM) ? start
  		 : ((token->type == CHARACTER && token->opr.c == ',')
! 		    ? fetch_number (regexp, token, syntax) : REG_ERROR));
  	}
!       if (BE (start == REG_ERROR || end == REG_ERROR, 0))
  	{
  	  /* Invalid sequence.  */
--- 2544,2555 ----
  	    }
  	}
!       if (BE (start != -2, 1))
  	{
  	  /* We treat "{n}" as "{n,n}".  */
  	  end = ((token->type == OP_CLOSE_DUP_NUM) ? start
  		 : ((token->type == CHARACTER && token->opr.c == ',')
! 		    ? fetch_number (regexp, token, syntax) : -2));
  	}
!       if (BE (start == -2 || end == -2, 0))
  	{
  	  /* Invalid sequence.  */
***************
*** 2597,2601 ****
  	}
  
!       if (BE ((end != REG_MISSING && start > end)
  	      || token->type != OP_CLOSE_DUP_NUM, 0))
  	{
--- 2573,2577 ----
  	}
  
!       if (BE ((end != -1 && start > end)
  	      || token->type != OP_CLOSE_DUP_NUM, 0))
  	{
***************
*** 2605,2609 ****
  	}
  
!       if (BE (RE_DUP_MAX < (end == REG_MISSING ? start : end), 0))
  	{
  	  *err = REG_ESIZE;
--- 2581,2585 ----
  	}
  
!       if (BE (RE_DUP_MAX < (end == -1 ? start : end), 0))
  	{
  	  *err = REG_ESIZE;
***************
*** 2614,2618 ****
      {
        start = (token->type == OP_DUP_PLUS) ? 1 : 0;
!       end = (token->type == OP_DUP_QUESTION) ? 1 : REG_MISSING;
      }
  
--- 2590,2594 ----
      {
        start = (token->type == OP_DUP_PLUS) ? 1 : 0;
!       end = (token->type == OP_DUP_QUESTION) ? 1 : -1;
      }
  
***************
*** 2658,2662 ****
  
    tree = create_tree (dfa, elem, NULL,
! 		      (end == REG_MISSING ? OP_DUP_ASTERISK : OP_ALT));
    if (BE (tree == NULL, 0))
      goto parse_dup_op_espace;
--- 2634,2638 ----
  
    tree = create_tree (dfa, elem, NULL,
! 		      (end == -1 ? OP_DUP_ASTERISK : OP_ALT));
    if (BE (tree == NULL, 0))
      goto parse_dup_op_espace;
***************
*** 2666,2673 ****
  #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
  
!   /* This loop is actually executed only when end != REG_MISSING,
       to rewrite <re>{0,n} as (<re>(<re>...<re>?)?)?...  We have
       already created the start+1-th copy.  */
!   if (TYPE_SIGNED (Idx) || end != REG_MISSING)
      for (i = start + 2; i <= end; ++i)
        {
--- 2642,2649 ----
  #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
  
!   /* This loop is actually executed only when end != -1,
       to rewrite <re>{0,n} as (<re>(<re>...<re>?)?)?...  We have
       already created the start+1-th copy.  */
!   if (TYPE_SIGNED (Idx) || end != -1)
      for (i = start + 2; i <= end; ++i)
        {
***************
*** 2697,2700 ****
--- 2673,2689 ----
  
  #ifndef _LIBC
+ 
+ # ifdef RE_ENABLE_I18N
+ /* Convert the byte B to the corresponding wide character.  In a
+    unibyte locale, treat B as itself if it is an encoding error.
+    In a multibyte locale, return WEOF if B is an encoding error.  */
+ static wint_t
+ parse_byte (unsigned char b, re_charset_t *mbcset)
+ {
+   wint_t wc = __btowc (b);
+   return wc == WEOF && !mbcset ? b : wc;
+ }
+ #endif
+ 
    /* Local function for parse_bracket_exp only used in case of NOT _LIBC.
       Build the range expression which starts from START_ELEM, and ends
***************
*** 2748,2754 ****
  		 : 0));
      start_wc = ((start_elem->type == SB_CHAR || start_elem->type == COLL_SYM)
! 		? __btowc (start_ch) : start_elem->opr.wch);
      end_wc = ((end_elem->type == SB_CHAR || end_elem->type == COLL_SYM)
! 	      ? __btowc (end_ch) : end_elem->opr.wch);
      if (start_wc == WEOF || end_wc == WEOF)
        return REG_ECOLLATE;
--- 2737,2743 ----
  		 : 0));
      start_wc = ((start_elem->type == SB_CHAR || start_elem->type == COLL_SYM)
! 		? parse_byte (start_ch, mbcset) : start_elem->opr.wch);
      end_wc = ((end_elem->type == SB_CHAR || end_elem->type == COLL_SYM)
! 	      ? parse_byte (end_ch, mbcset) : end_elem->opr.wch);
      if (start_wc == WEOF || end_wc == WEOF)
        return REG_ECOLLATE;
***************
*** 2780,2784 ****
  
  	    if (BE (new_array_start == NULL || new_array_end == NULL, 0))
! 	      return REG_ESPACE;
  
  	    mbcset->range_starts = new_array_start;
--- 2769,2777 ----
  
  	    if (BE (new_array_start == NULL || new_array_end == NULL, 0))
! 	      {
! 		re_free (new_array_start);
! 		re_free (new_array_end);
! 		return REG_ESPACE;
! 	      }
  
  	    mbcset->range_starts = new_array_start;
***************
*** 3677,3700 ****
  
    sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1);
- #ifdef RE_ENABLE_I18N
-   mbcset = (re_charset_t *) calloc (sizeof (re_charset_t), 1);
- #endif /* RE_ENABLE_I18N */
- 
- #ifdef RE_ENABLE_I18N
-   if (BE (sbcset == NULL || mbcset == NULL, 0))
- #else /* not RE_ENABLE_I18N */
    if (BE (sbcset == NULL, 0))
- #endif /* not RE_ENABLE_I18N */
      {
        *err = REG_ESPACE;
        return NULL;
      }
- 
-   if (non_match)
-     {
  #ifdef RE_ENABLE_I18N
!       mbcset->non_match = 1;
! #endif /* not RE_ENABLE_I18N */
      }
  
    /* We don't care the syntax in this case.  */
--- 3670,3688 ----
  
    sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1);
    if (BE (sbcset == NULL, 0))
      {
        *err = REG_ESPACE;
        return NULL;
      }
  #ifdef RE_ENABLE_I18N
!   mbcset = (re_charset_t *) calloc (sizeof (re_charset_t), 1);
!   if (BE (mbcset == NULL, 0))
!     {
!       re_free (sbcset);
!       *err = REG_ESPACE;
!       return NULL;
      }
+   mbcset->non_match = non_match;
+ #endif /* RE_ENABLE_I18N */
  
    /* We don't care the syntax in this case.  */
***************
*** 3729,3732 ****
--- 3717,3723 ----
  
    /* Build a tree for simple bracket.  */
+ #if defined GCC_LINT || defined lint
+   memset (&br_token, 0, sizeof br_token);
+ #endif
    br_token.type = SIMPLE_BRACKET;
    br_token.opr.sbcset = sbcset;
***************
*** 3771,3782 ****
  /* This is intended for the expressions like "a{1,3}".
     Fetch a number from 'input', and return the number.
!    Return REG_MISSING if the number field is empty like "{,1}".
     Return RE_DUP_MAX + 1 if the number field is too large.
!    Return REG_ERROR if an error occurred.  */
  
  static Idx
  fetch_number (re_string_t *input, re_token_t *token, reg_syntax_t syntax)
  {
!   Idx num = REG_MISSING;
    unsigned char c;
    while (1)
--- 3762,3773 ----
  /* This is intended for the expressions like "a{1,3}".
     Fetch a number from 'input', and return the number.
!    Return -1 if the number field is empty like "{,1}".
     Return RE_DUP_MAX + 1 if the number field is too large.
!    Return -2 if an error occurred.  */
  
  static Idx
  fetch_number (re_string_t *input, re_token_t *token, reg_syntax_t syntax)
  {
!   Idx num = -1;
    unsigned char c;
    while (1)
***************
*** 3785,3795 ****
        c = token->opr.c;
        if (BE (token->type == END_OF_RE, 0))
! 	return REG_ERROR;
        if (token->type == OP_CLOSE_DUP_NUM || c == ',')
  	break;
!       num = ((token->type != CHARACTER || c < '0' || '9' < c
! 	      || num == REG_ERROR)
! 	     ? REG_ERROR
! 	     : num == REG_MISSING
  	     ? c - '0'
  	     : MIN (RE_DUP_MAX + 1, num * 10 + c - '0'));
--- 3776,3785 ----
        c = token->opr.c;
        if (BE (token->type == END_OF_RE, 0))
! 	return -2;
        if (token->type == OP_CLOSE_DUP_NUM || c == ',')
  	break;
!       num = ((token->type != CHARACTER || c < '0' || '9' < c || num == -2)
! 	     ? -2
! 	     : num == -1
  	     ? c - '0'
  	     : MIN (RE_DUP_MAX + 1, num * 10 + c - '0'));
***************
*** 3823,3826 ****
--- 3813,3819 ----
  {
    re_token_t t;
+ #if defined GCC_LINT || defined lint
+   memset (&t, 0, sizeof t);
+ #endif
    t.type = type;
    return create_token_tree (dfa, left, right, &t);
***************
*** 3852,3856 ****
    tree->first = NULL;
    tree->next = NULL;
!   tree->node_idx = REG_MISSING;
  
    if (left != NULL)
--- 3845,3849 ----
    tree->first = NULL;
    tree->next = NULL;
!   tree->node_idx = -1;
  
    if (left != NULL)
diff -Nrc2 texinfo-6.1/gnulib/lib/regex.c texinfo-6.3/gnulib/lib/regex.c
*** texinfo-6.1/gnulib/lib/regex.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/regex.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Extended regular expression matching and search library.
!    Copyright (C) 2002-2015 Free Software Foundation, Inc.
     This file is part of the GNU C Library.
     Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
--- 1,4 ----
  /* Extended regular expression matching and search library.
!    Copyright (C) 2002-2016 Free Software Foundation, Inc.
     This file is part of the GNU C Library.
     Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
diff -Nrc2 texinfo-6.1/gnulib/lib/regex.h texinfo-6.3/gnulib/lib/regex.h
*** texinfo-6.1/gnulib/lib/regex.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/regex.h	2016-08-30 18:31:33.000000000 +0100
***************
*** 1,5 ****
  /* Definitions for data structures and routines for the regular
     expression library.
!    Copyright (C) 1985, 1989-1993, 1995-1998, 2000-2003, 2005-2015 Free Software
     Foundation, Inc.
     This file is part of the GNU C Library.
--- 1,5 ----
  /* Definitions for data structures and routines for the regular
     expression library.
!    Copyright (C) 1985, 1989-1993, 1995-1998, 2000-2003, 2005-2016 Free Software
     Foundation, Inc.
     This file is part of the GNU C Library.
***************
*** 43,51 ****
     _REGEX_LARGE_OFFSETS.  */
  
- /* The type of nonnegative object indexes.  Traditionally, GNU regex
-    uses 'int' for these.  Code that uses __re_idx_t should work
-    regardless of whether the type is signed.  */
- typedef size_t __re_idx_t;
- 
  /* The type of object sizes.  */
  typedef size_t __re_size_t;
--- 43,46 ----
***************
*** 59,63 ****
  /* The traditional GNU regex implementation mishandles strings longer
     than INT_MAX.  */
- typedef int __re_idx_t;
  typedef unsigned int __re_size_t;
  typedef unsigned long int __re_long_size_t;
--- 54,57 ----
***************
*** 489,493 ****
  /* POSIX 1003.1-2008 requires that regoff_t be at least as wide as
     ptrdiff_t and ssize_t.  We don't know of any hosts where ptrdiff_t
!    is wider than ssize_t, so ssize_t is safe.  */
  typedef ssize_t regoff_t;
  #else
--- 483,488 ----
  /* POSIX 1003.1-2008 requires that regoff_t be at least as wide as
     ptrdiff_t and ssize_t.  We don't know of any hosts where ptrdiff_t
!    is wider than ssize_t, so ssize_t is safe.  ptrdiff_t is not
!    visible here, so use ssize_t.  */
  typedef ssize_t regoff_t;
  #else
***************
*** 539,543 ****
  
     To free the allocated storage, you must call 'regfree' on BUFFER.
!    Note that the translate table must either have been initialised by
     'regcomp', with a malloc'ed value, or set to NULL before calling
     'regfree'.  */
--- 534,538 ----
  
     To free the allocated storage, you must call 'regfree' on BUFFER.
!    Note that the translate table must either have been initialized by
     'regcomp', with a malloc'ed value, or set to NULL before calling
     'regfree'.  */
***************
*** 558,563 ****
     information in REGS (if REGS and BUFFER->no_sub are nonzero).  */
  extern regoff_t re_search (struct re_pattern_buffer *__buffer,
! 			   const char *__string, __re_idx_t __length,
! 			   __re_idx_t __start, regoff_t __range,
  			   struct re_registers *__regs);
  
--- 553,558 ----
     information in REGS (if REGS and BUFFER->no_sub are nonzero).  */
  extern regoff_t re_search (struct re_pattern_buffer *__buffer,
! 			   const char *__String, regoff_t __length,
! 			   regoff_t __start, regoff_t __range,
  			   struct re_registers *__regs);
  
***************
*** 566,574 ****
     STRING2.  Also, stop searching at index START + STOP.  */
  extern regoff_t re_search_2 (struct re_pattern_buffer *__buffer,
! 			     const char *__string1, __re_idx_t __length1,
! 			     const char *__string2, __re_idx_t __length2,
! 			     __re_idx_t __start, regoff_t __range,
  			     struct re_registers *__regs,
! 			     __re_idx_t __stop);
  
  
--- 561,569 ----
     STRING2.  Also, stop searching at index START + STOP.  */
  extern regoff_t re_search_2 (struct re_pattern_buffer *__buffer,
! 			     const char *__string1, regoff_t __length1,
! 			     const char *__string2, regoff_t __length2,
! 			     regoff_t __start, regoff_t __range,
  			     struct re_registers *__regs,
! 			     regoff_t __stop);
  
  
***************
*** 576,589 ****
     in BUFFER matched, starting at position START.  */
  extern regoff_t re_match (struct re_pattern_buffer *__buffer,
! 			  const char *__string, __re_idx_t __length,
! 			  __re_idx_t __start, struct re_registers *__regs);
  
  
  /* Relates to 're_match' as 're_search_2' relates to 're_search'.  */
  extern regoff_t re_match_2 (struct re_pattern_buffer *__buffer,
! 			    const char *__string1, __re_idx_t __length1,
! 			    const char *__string2, __re_idx_t __length2,
! 			    __re_idx_t __start, struct re_registers *__regs,
! 			    __re_idx_t __stop);
  
  
--- 571,584 ----
     in BUFFER matched, starting at position START.  */
  extern regoff_t re_match (struct re_pattern_buffer *__buffer,
! 			  const char *__String, regoff_t __length,
! 			  regoff_t __start, struct re_registers *__regs);
  
  
  /* Relates to 're_match' as 're_search_2' relates to 're_search'.  */
  extern regoff_t re_match_2 (struct re_pattern_buffer *__buffer,
! 			    const char *__string1, regoff_t __length1,
! 			    const char *__string2, regoff_t __length2,
! 			    regoff_t __start, struct re_registers *__regs,
! 			    regoff_t __stop);
  
  
***************
*** 648,652 ****
  
  extern int regexec (const regex_t *_Restrict_ __preg,
! 		    const char *_Restrict_ __string, size_t __nmatch,
  		    regmatch_t __pmatch[_Restrict_arr_],
  		    int __eflags);
--- 643,647 ----
  
  extern int regexec (const regex_t *_Restrict_ __preg,
! 		    const char *_Restrict_ __String, size_t __nmatch,
  		    regmatch_t __pmatch[_Restrict_arr_],
  		    int __eflags);
diff -Nrc2 texinfo-6.1/gnulib/lib/regex_internal.c texinfo-6.3/gnulib/lib/regex_internal.c
*** texinfo-6.1/gnulib/lib/regex_internal.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/regex_internal.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Extended regular expression matching and search library.
!    Copyright (C) 2002-2015 Free Software Foundation, Inc.
     This file is part of the GNU C Library.
     Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
--- 1,4 ----
  /* Extended regular expression matching and search library.
!    Copyright (C) 2002-2016 Free Software Foundation, Inc.
     This file is part of the GNU C Library.
     Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
***************
*** 923,927 ****
  {
    int c;
!   if (BE (! REG_VALID_INDEX (idx), 0))
      /* In this case, we use the value stored in input->tip_context,
         since we can't know the character in input->mbs[-1] here.  */
--- 923,927 ----
  {
    int c;
!   if (BE (idx < 0, 0))
      /* In this case, we use the value stored in input->tip_context,
         since we can't know the character in input->mbs[-1] here.  */
***************
*** 939,946 ****
  #if defined DEBUG && DEBUG
  	  /* It must not happen.  */
! 	  assert (REG_VALID_INDEX (wc_idx));
  #endif
  	  --wc_idx;
! 	  if (! REG_VALID_INDEX (wc_idx))
  	    return input->tip_context;
  	}
--- 939,946 ----
  #if defined DEBUG && DEBUG
  	  /* It must not happen.  */
! 	  assert (wc_idx >= 0);
  #endif
  	  --wc_idx;
! 	  if (wc_idx < 0)
  	    return input->tip_context;
  	}
***************
*** 1078,1088 ****
  	{
  	  /* Try to find the item in DEST.  Maybe we could binary search?  */
! 	  while (REG_VALID_INDEX (id) && dest->elems[id] > src1->elems[i1])
  	    --id;
  
!           if (! REG_VALID_INDEX (id) || dest->elems[id] != src1->elems[i1])
              dest->elems[--sbase] = src1->elems[i1];
  
! 	  if (! REG_VALID_INDEX (--i1) || ! REG_VALID_INDEX (--i2))
  	    break;
  	}
--- 1078,1088 ----
  	{
  	  /* Try to find the item in DEST.  Maybe we could binary search?  */
! 	  while (id >= 0 && dest->elems[id] > src1->elems[i1])
  	    --id;
  
! 	  if (id < 0 || dest->elems[id] != src1->elems[i1])
              dest->elems[--sbase] = src1->elems[i1];
  
! 	  if (--i1 < 0 || --i2 < 0)
  	    break;
  	}
***************
*** 1091,1100 ****
        else if (src1->elems[i1] < src2->elems[i2])
  	{
! 	  if (! REG_VALID_INDEX (--i2))
  	    break;
  	}
        else
  	{
! 	  if (! REG_VALID_INDEX (--i1))
  	    break;
  	}
--- 1091,1100 ----
        else if (src1->elems[i1] < src2->elems[i2])
  	{
! 	  if (--i2 < 0)
  	    break;
  	}
        else
  	{
! 	  if (--i1 < 0)
  	    break;
  	}
***************
*** 1109,1113 ****
       less the same loop that is in re_node_set_merge.  */
    dest->nelem += delta;
!   if (delta > 0 && REG_VALID_INDEX (id))
      for (;;)
        {
--- 1109,1113 ----
       less the same loop that is in re_node_set_merge.  */
    dest->nelem += delta;
!   if (delta > 0 && id >= 0)
      for (;;)
        {
***************
*** 1123,1127 ****
  	    /* Slide from the bottom.  */
  	    dest->elems[id + delta] = dest->elems[id];
! 	    if (! REG_VALID_INDEX (--id))
  	      break;
  	  }
--- 1123,1127 ----
  	    /* Slide from the bottom.  */
  	    dest->elems[id + delta] = dest->elems[id];
! 	    if (--id < 0)
  	      break;
  	  }
***************
*** 1217,1222 ****
       found in DEST.  Maybe we could binary search in DEST?  */
    for (sbase = dest->nelem + 2 * src->nelem,
!        is = src->nelem - 1, id = dest->nelem - 1;
!        REG_VALID_INDEX (is) && REG_VALID_INDEX (id); )
      {
        if (dest->elems[id] == src->elems[is])
--- 1217,1221 ----
       found in DEST.  Maybe we could binary search in DEST?  */
    for (sbase = dest->nelem + 2 * src->nelem,
!        is = src->nelem - 1, id = dest->nelem - 1; is >= 0 && id >= 0; )
      {
        if (dest->elems[id] == src->elems[is])
***************
*** 1228,1232 ****
      }
  
!   if (REG_VALID_INDEX (is))
      {
        /* If DEST is exhausted, the remaining items of SRC must be unique.  */
--- 1227,1231 ----
      }
  
!   if (is >= 0)
      {
        /* If DEST is exhausted, the remaining items of SRC must be unique.  */
***************
*** 1257,1261 ****
  	  /* Slide from the bottom.  */
  	  dest->elems[id + delta] = dest->elems[id];
! 	  if (! REG_VALID_INDEX (--id))
  	    {
  	      /* Copy remaining SRC elements.  */
--- 1256,1260 ----
  	  /* Slide from the bottom.  */
  	  dest->elems[id + delta] = dest->elems[id];
! 	  if (--id < 0)
  	    {
  	      /* Copy remaining SRC elements.  */
***************
*** 1356,1360 ****
    if (set1 == NULL || set2 == NULL || set1->nelem != set2->nelem)
      return false;
!   for (i = set1->nelem ; REG_VALID_INDEX (--i) ; )
      if (set1->elems[i] != set2->elems[i])
        return false;
--- 1355,1359 ----
    if (set1 == NULL || set2 == NULL || set1->nelem != set2->nelem)
      return false;
!   for (i = set1->nelem ; --i >= 0 ; )
      if (set1->elems[i] != set2->elems[i])
        return false;
***************
*** 1369,1373 ****
  {
    __re_size_t idx, right, mid;
!   if (! REG_VALID_NONZERO_INDEX (set->nelem))
      return 0;
  
--- 1368,1372 ----
  {
    __re_size_t idx, right, mid;
!   if (set->nelem <= 0)
      return 0;
  
***************
*** 1399,1403 ****
  
  /* Add the token TOKEN to dfa->nodes, and return the index of the token.
!    Or return REG_MISSING if an error occurred.  */
  
  static Idx
--- 1398,1402 ----
  
  /* Add the token TOKEN to dfa->nodes, and return the index of the token.
!    Or return -1 if an error occurred.  */
  
  static Idx
***************
*** 1417,1425 ****
  					       sizeof (Idx)));
        if (BE (MIN (IDX_MAX, SIZE_MAX / max_object_size) < new_nodes_alloc, 0))
! 	return REG_MISSING;
  
        new_nodes = re_realloc (dfa->nodes, re_token_t, new_nodes_alloc);
        if (BE (new_nodes == NULL, 0))
! 	return REG_MISSING;
        dfa->nodes = new_nodes;
        new_nexts = re_realloc (dfa->nexts, Idx, new_nodes_alloc);
--- 1416,1424 ----
  					       sizeof (Idx)));
        if (BE (MIN (IDX_MAX, SIZE_MAX / max_object_size) < new_nodes_alloc, 0))
! 	return -1;
  
        new_nodes = re_realloc (dfa->nodes, re_token_t, new_nodes_alloc);
        if (BE (new_nodes == NULL, 0))
! 	return -1;
        dfa->nodes = new_nodes;
        new_nexts = re_realloc (dfa->nexts, Idx, new_nodes_alloc);
***************
*** 1429,1433 ****
        if (BE (new_nexts == NULL || new_indices == NULL
  	      || new_edests == NULL || new_eclosures == NULL, 0))
! 	return REG_MISSING;
        dfa->nexts = new_nexts;
        dfa->org_indices = new_indices;
--- 1428,1438 ----
        if (BE (new_nexts == NULL || new_indices == NULL
  	      || new_edests == NULL || new_eclosures == NULL, 0))
! 	{
! 	   re_free (new_nexts);
! 	   re_free (new_indices);
! 	   re_free (new_edests);
! 	   re_free (new_eclosures);
! 	   return -1;
! 	}
        dfa->nexts = new_nexts;
        dfa->org_indices = new_indices;
***************
*** 1443,1447 ****
       || token.type == COMPLEX_BRACKET);
  #endif
!   dfa->nexts[dfa->nodes_len] = REG_MISSING;
    re_node_set_init_empty (dfa->edests + dfa->nodes_len);
    re_node_set_init_empty (dfa->eclosures + dfa->nodes_len);
--- 1448,1452 ----
       || token.type == COMPLEX_BRACKET);
  #endif
!   dfa->nexts[dfa->nodes_len] = -1;
    re_node_set_init_empty (dfa->edests + dfa->nodes_len);
    re_node_set_init_empty (dfa->eclosures + dfa->nodes_len);
***************
*** 1478,1482 ****
    struct re_state_table_entry *spot;
    Idx i;
! #ifdef lint
    /* Suppress bogus uninitialized-variable warnings.  */
    *err = REG_NOERROR;
--- 1483,1487 ----
    struct re_state_table_entry *spot;
    Idx i;
! #if defined GCC_LINT || defined lint
    /* Suppress bogus uninitialized-variable warnings.  */
    *err = REG_NOERROR;
***************
*** 1526,1530 ****
    struct re_state_table_entry *spot;
    Idx i;
! #ifdef lint
    /* Suppress bogus uninitialized-variable warnings.  */
    *err = REG_NOERROR;
--- 1531,1535 ----
    struct re_state_table_entry *spot;
    Idx i;
! #if defined GCC_LINT || defined lint
    /* Suppress bogus uninitialized-variable warnings.  */
    *err = REG_NOERROR;
diff -Nrc2 texinfo-6.1/gnulib/lib/regex_internal.h texinfo-6.3/gnulib/lib/regex_internal.h
*** texinfo-6.1/gnulib/lib/regex_internal.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/regex_internal.h	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Extended regular expression matching and search library.
!    Copyright (C) 2002-2015 Free Software Foundation, Inc.
     This file is part of the GNU C Library.
     Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
--- 1,4 ----
  /* Extended regular expression matching and search library.
!    Copyright (C) 2002-2016 Free Software Foundation, Inc.
     This file is part of the GNU C Library.
     Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
***************
*** 152,180 ****
  #endif
  
! typedef __re_idx_t Idx;
! #ifdef _REGEX_LARGE_OFFSETS
! # define IDX_MAX (SIZE_MAX - 2)
! #else
! # define IDX_MAX INT_MAX
! #endif
! 
! /* Special return value for failure to match.  */
! #define REG_MISSING ((Idx) -1)
! 
! /* Special return value for internal error.  */
! #define REG_ERROR ((Idx) -2)
! 
! /* Test whether N is a valid index, and is not one of the above.  */
! #ifdef _REGEX_LARGE_OFFSETS
! # define REG_VALID_INDEX(n) ((Idx) (n) < REG_ERROR)
! #else
! # define REG_VALID_INDEX(n) (0 <= (n))
  #endif
  
! /* Test whether N is a valid nonzero index.  */
  #ifdef _REGEX_LARGE_OFFSETS
! # define REG_VALID_NONZERO_INDEX(n) ((Idx) ((n) - 1) < (Idx) (REG_ERROR - 1))
  #else
! # define REG_VALID_NONZERO_INDEX(n) (0 < (n))
  #endif
  
--- 152,171 ----
  #endif
  
! #ifndef SSIZE_MAX
! # define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
  #endif
  
! /* The type of indexes into strings.  This is signed, not size_t,
!    since the API requires indexes to fit in regoff_t anyway, and using
!    signed integers makes the code a bit smaller and presumably faster.
!    The traditional GNU regex implementation uses int for indexes.
!    The POSIX-compatible implementation uses a possibly-wider type.
!    The name 'Idx' is three letters to minimize the hassle of
!    reindenting a lot of regex code that formerly used 'int'.  */
! typedef regoff_t Idx;
  #ifdef _REGEX_LARGE_OFFSETS
! # define IDX_MAX SSIZE_MAX
  #else
! # define IDX_MAX INT_MAX
  #endif
  
diff -Nrc2 texinfo-6.1/gnulib/lib/regexec.c texinfo-6.3/gnulib/lib/regexec.c
*** texinfo-6.1/gnulib/lib/regexec.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/regexec.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Extended regular expression matching and search library.
!    Copyright (C) 2002-2015 Free Software Foundation, Inc.
     This file is part of the GNU C Library.
     Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
--- 1,4 ----
  /* Extended regular expression matching and search library.
!    Copyright (C) 2002-2016 Free Software Foundation, Inc.
     This file is part of the GNU C Library.
     Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
***************
*** 220,229 ****
  
  int
! regexec (preg, string, nmatch, pmatch, eflags)
!     const regex_t *_Restrict_ preg;
!     const char *_Restrict_ string;
!     size_t nmatch;
!     regmatch_t pmatch[_Restrict_arr_];
!     int eflags;
  {
    reg_errcode_t err;
--- 220,225 ----
  
  int
! regexec (const regex_t *_Restrict_ preg, const char *_Restrict_ string,
! 	 size_t nmatch, regmatch_t pmatch[], int eflags)
  {
    reg_errcode_t err;
***************
*** 306,314 ****
  
  regoff_t
! re_match (bufp, string, length, start, regs)
!     struct re_pattern_buffer *bufp;
!     const char *string;
!     Idx length, start;
!     struct re_registers *regs;
  {
    return re_search_stub (bufp, string, length, start, 0, length, regs, true);
--- 302,307 ----
  
  regoff_t
! re_match (struct re_pattern_buffer *bufp, const char *string, Idx length,
! 	  Idx start, struct re_registers *regs)
  {
    return re_search_stub (bufp, string, length, start, 0, length, regs, true);
***************
*** 319,328 ****
  
  regoff_t
! re_search (bufp, string, length, start, range, regs)
!     struct re_pattern_buffer *bufp;
!     const char *string;
!     Idx length, start;
!     regoff_t range;
!     struct re_registers *regs;
  {
    return re_search_stub (bufp, string, length, start, range, length, regs,
--- 312,317 ----
  
  regoff_t
! re_search (struct re_pattern_buffer *bufp, const char *string, Idx length,
! 	   Idx start, regoff_t range, struct re_registers *regs)
  {
    return re_search_stub (bufp, string, length, start, range, length, regs,
***************
*** 334,342 ****
  
  regoff_t
! re_match_2 (bufp, string1, length1, string2, length2, start, regs, stop)
!     struct re_pattern_buffer *bufp;
!     const char *string1, *string2;
!     Idx length1, length2, start, stop;
!     struct re_registers *regs;
  {
    return re_search_2_stub (bufp, string1, length1, string2, length2,
--- 323,329 ----
  
  regoff_t
! re_match_2 (struct re_pattern_buffer *bufp, const char *string1, Idx length1,
! 	    const char *string2, Idx length2, Idx start,
! 	    struct re_registers *regs, Idx stop)
  {
    return re_search_2_stub (bufp, string1, length1, string2, length2,
***************
*** 348,357 ****
  
  regoff_t
! re_search_2 (bufp, string1, length1, string2, length2, start, range, regs, stop)
!     struct re_pattern_buffer *bufp;
!     const char *string1, *string2;
!     Idx length1, length2, start, stop;
!     regoff_t range;
!     struct re_registers *regs;
  {
    return re_search_2_stub (bufp, string1, length1, string2, length2,
--- 335,341 ----
  
  regoff_t
! re_search_2 (struct re_pattern_buffer *bufp, const char *string1, Idx length1,
! 	     const char *string2, Idx length2, Idx start, regoff_t range,
! 	     struct re_registers *regs, Idx stop)
  {
    return re_search_2_stub (bufp, string1, length1, string2, length2,
***************
*** 363,370 ****
  
  static regoff_t
! re_search_2_stub (struct re_pattern_buffer *bufp,
! 		  const char *string1, Idx length1,
! 		  const char *string2, Idx length2,
! 		  Idx start, regoff_t range, struct re_registers *regs,
  		  Idx stop, bool ret_len)
  {
--- 347,354 ----
  
  static regoff_t
! internal_function
! re_search_2_stub (struct re_pattern_buffer *bufp, const char *string1,
! 		  Idx length1, const char *string2, Idx length2, Idx start,
! 		  regoff_t range, struct re_registers *regs,
  		  Idx stop, bool ret_len)
  {
***************
*** 410,415 ****
  
  static regoff_t
! re_search_stub (struct re_pattern_buffer *bufp,
! 		const char *string, Idx length,
  		Idx start, regoff_t range, Idx stop, struct re_registers *regs,
  		bool ret_len)
--- 394,399 ----
  
  static regoff_t
! internal_function
! re_search_stub (struct re_pattern_buffer *bufp, const char *string, Idx length,
  		Idx start, regoff_t range, Idx stop, struct re_registers *regs,
  		bool ret_len)
***************
*** 500,503 ****
--- 484,488 ----
  
  static unsigned
+ internal_function
  re_copy_regs (struct re_registers *regs, regmatch_t *pmatch, Idx nregs,
  	      int regs_allocated)
***************
*** 578,586 ****
  
  void
! re_set_registers (bufp, regs, num_regs, starts, ends)
!     struct re_pattern_buffer *bufp;
!     struct re_registers *regs;
!     __re_size_t num_regs;
!     regoff_t *starts, *ends;
  {
    if (num_regs)
--- 563,568 ----
  
  void
! re_set_registers (struct re_pattern_buffer *bufp, struct re_registers *regs,
! 		  __re_size_t num_regs, regoff_t *starts, regoff_t *ends)
  {
    if (num_regs)
***************
*** 610,615 ****
  weak_function
  # endif
! re_exec (s)
!      const char *s;
  {
    return 0 == regexec (&re_comp_buf, s, 0, NULL, 0);
--- 592,596 ----
  weak_function
  # endif
! re_exec (const char *s)
  {
    return 0 == regexec (&re_comp_buf, s, 0, NULL, 0);
***************
*** 629,638 ****
  
  static reg_errcode_t
! __attribute_warn_unused_result__
! re_search_internal (const regex_t *preg,
! 		    const char *string, Idx length,
! 		    Idx start, Idx last_start, Idx stop,
! 		    size_t nmatch, regmatch_t pmatch[],
! 		    int eflags)
  {
    reg_errcode_t err;
--- 610,617 ----
  
  static reg_errcode_t
! __attribute_warn_unused_result__ internal_function
! re_search_internal (const regex_t *preg, const char *string, Idx length,
! 		    Idx start, Idx last_start, Idx stop, size_t nmatch,
! 		    regmatch_t pmatch[], int eflags)
  {
    reg_errcode_t err;
***************
*** 643,647 ****
    int match_kind;
    Idx match_first;
!   Idx match_last = REG_MISSING;
    Idx extra_nmatch;
    bool sb;
--- 622,626 ----
    int match_kind;
    Idx match_first;
!   Idx match_last = -1;
    Idx extra_nmatch;
    bool sb;
***************
*** 852,858 ****
        match_last = check_matching (&mctx, fl_longest_match,
  				   start <= last_start ? &match_first : NULL);
!       if (match_last != REG_MISSING)
  	{
! 	  if (BE (match_last == REG_ERROR, 0))
  	    {
  	      err = REG_ESPACE;
--- 831,837 ----
        match_last = check_matching (&mctx, fl_longest_match,
  				   start <= last_start ? &match_first : NULL);
!       if (match_last != -1)
  	{
! 	  if (BE (match_last == -2, 0))
  	    {
  	      err = REG_ESPACE;
***************
*** 876,880 ****
  		  if (BE (err != REG_NOMATCH, 0))
  		    goto free_return;
! 		  match_last = REG_MISSING;
  		}
  	      else
--- 855,859 ----
  		  if (BE (err != REG_NOMATCH, 0))
  		    goto free_return;
! 		  match_last = -1;
  		}
  	      else
***************
*** 887,891 ****
  
  #ifdef DEBUG
!   assert (match_last != REG_MISSING);
    assert (err == REG_NOERROR);
  #endif
--- 866,870 ----
  
  #ifdef DEBUG
!   assert (match_last != -1);
    assert (err == REG_NOERROR);
  #endif
***************
*** 965,969 ****
  
  static reg_errcode_t
! __attribute_warn_unused_result__
  prune_impossible_nodes (re_match_context_t *mctx)
  {
--- 944,948 ----
  
  static reg_errcode_t
! internal_function __attribute_warn_unused_result__
  prune_impossible_nodes (re_match_context_t *mctx)
  {
***************
*** 1013,1017 ****
  	    {
  	      --match_last;
! 	      if (! REG_VALID_INDEX (match_last))
  		{
  		  ret = REG_NOMATCH;
--- 992,996 ----
  	    {
  	      --match_last;
! 	      if (match_last < 0)
  		{
  		  ret = REG_NOMATCH;
***************
*** 1094,1099 ****
  
  /* Check whether the regular expression match input string INPUT or not,
!    and return the index where the matching end.  Return REG_MISSING if
!    there is no match, and return REG_ERROR in case of an error.
     FL_LONGEST_MATCH means we want the POSIX longest matching.
     If P_MATCH_FIRST is not NULL, and the match fails, it is set to the
--- 1073,1078 ----
  
  /* Check whether the regular expression match input string INPUT or not,
!    and return the index where the matching end.  Return -1 if
!    there is no match, and return -2 in case of an error.
     FL_LONGEST_MATCH means we want the POSIX longest matching.
     If P_MATCH_FIRST is not NULL, and the match fails, it is set to the
***************
*** 1110,1114 ****
    reg_errcode_t err;
    Idx match = 0;
!   Idx match_last = REG_MISSING;
    Idx cur_str_idx = re_string_cur_idx (&mctx->input);
    re_dfastate_t *cur_state;
--- 1089,1093 ----
    reg_errcode_t err;
    Idx match = 0;
!   Idx match_last = -1;
    Idx cur_str_idx = re_string_cur_idx (&mctx->input);
    re_dfastate_t *cur_state;
***************
*** 1122,1126 ****
      {
        assert (err == REG_ESPACE);
!       return REG_ERROR;
      }
  
--- 1101,1105 ----
      {
        assert (err == REG_ESPACE);
!       return -2;
      }
  
***************
*** 1177,1181 ****
  	    {
  	      assert (err == REG_ESPACE);
! 	      return REG_ERROR;
  	    }
  	}
--- 1156,1160 ----
  	    {
  	      assert (err == REG_ESPACE);
! 	      return -2;
  	    }
  	}
***************
*** 1191,1195 ****
  	     already found a valid (even if not the longest) match.  */
  	  if (BE (err != REG_NOERROR, 0))
! 	    return REG_ERROR;
  
  	  if (mctx->state_log == NULL
--- 1170,1174 ----
  	     already found a valid (even if not the longest) match.  */
  	  if (BE (err != REG_NOERROR, 0))
! 	    return -2;
  
  	  if (mctx->state_log == NULL
***************
*** 1274,1278 ****
     corresponding to the DFA).
     Return the destination node, and update EPS_VIA_NODES;
!    return REG_MISSING in case of errors.  */
  
  static Idx
--- 1253,1257 ----
     corresponding to the DFA).
     Return the destination node, and update EPS_VIA_NODES;
!    return -1 in case of errors.  */
  
  static Idx
***************
*** 1292,1304 ****
        ok = re_node_set_insert (eps_via_nodes, node);
        if (BE (! ok, 0))
! 	return REG_ERROR;
!       /* Pick up a valid destination, or return REG_MISSING if none
  	 is found.  */
!       for (dest_node = REG_MISSING, i = 0; i < edests->nelem; ++i)
  	{
  	  Idx candidate = edests->elems[i];
  	  if (!re_node_set_contains (cur_nodes, candidate))
  	    continue;
!           if (dest_node == REG_MISSING)
  	    dest_node = candidate;
  
--- 1271,1283 ----
        ok = re_node_set_insert (eps_via_nodes, node);
        if (BE (! ok, 0))
! 	return -2;
!       /* Pick up a valid destination, or return -1 if none
  	 is found.  */
!       for (dest_node = -1, i = 0; i < edests->nelem; ++i)
  	{
  	  Idx candidate = edests->elems[i];
  	  if (!re_node_set_contains (cur_nodes, candidate))
  	    continue;
!           if (dest_node == -1)
  	    dest_node = candidate;
  
***************
*** 1314,1318 ****
  		       && push_fail_stack (fs, *pidx, candidate, nregs, regs,
  					   eps_via_nodes))
! 		return REG_ERROR;
  
  	      /* We know we are going to exit.  */
--- 1293,1297 ----
  		       && push_fail_stack (fs, *pidx, candidate, nregs, regs,
  					   eps_via_nodes))
! 		return -2;
  
  	      /* We know we are going to exit.  */
***************
*** 1339,1343 ****
  	    {
  	      if (regs[subexp_idx].rm_so == -1 || regs[subexp_idx].rm_eo == -1)
! 		return REG_MISSING;
  	      else if (naccepted)
  		{
--- 1318,1322 ----
  	    {
  	      if (regs[subexp_idx].rm_so == -1 || regs[subexp_idx].rm_eo == -1)
! 		return -1;
  	      else if (naccepted)
  		{
***************
*** 1345,1349 ****
  		  if (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx,
  			      naccepted) != 0)
! 		    return REG_MISSING;
  		}
  	    }
--- 1324,1328 ----
  		  if (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx,
  			      naccepted) != 0)
! 		    return -1;
  		}
  	    }
***************
*** 1354,1358 ****
  	      ok = re_node_set_insert (eps_via_nodes, node);
  	      if (BE (! ok, 0))
! 		return REG_ERROR;
  	      dest_node = dfa->edests[node].elems[0];
  	      if (re_node_set_contains (&mctx->state_log[*pidx]->nodes,
--- 1333,1337 ----
  	      ok = re_node_set_insert (eps_via_nodes, node);
  	      if (BE (! ok, 0))
! 		return -2;
  	      dest_node = dfa->edests[node].elems[0];
  	      if (re_node_set_contains (&mctx->state_log[*pidx]->nodes,
***************
*** 1370,1379 ****
  		     || !re_node_set_contains (&mctx->state_log[*pidx]->nodes,
  					       dest_node)))
! 	    return REG_MISSING;
  	  re_node_set_empty (eps_via_nodes);
  	  return dest_node;
  	}
      }
!   return REG_MISSING;
  }
  
--- 1349,1358 ----
  		     || !re_node_set_contains (&mctx->state_log[*pidx]->nodes,
  					       dest_node)))
! 	    return -1;
  	  re_node_set_empty (eps_via_nodes);
  	  return dest_node;
  	}
      }
!   return -1;
  }
  
***************
*** 1411,1415 ****
  {
    Idx num = --fs->num;
!   assert (REG_VALID_INDEX (num));
    *pidx = fs->stack[num].idx;
    memcpy (regs, fs->stack[num].regs, sizeof (regmatch_t) * nregs);
--- 1390,1394 ----
  {
    Idx num = --fs->num;
!   assert (num >= 0);
    *pidx = fs->stack[num].idx;
    memcpy (regs, fs->stack[num].regs, sizeof (regmatch_t) * nregs);
***************
*** 1504,1510 ****
  				    &eps_via_nodes, fs);
  
!       if (BE (! REG_VALID_INDEX (cur_node), 0))
  	{
! 	  if (BE (cur_node == REG_ERROR, 0))
  	    {
  	      re_node_set_free (&eps_via_nodes);
--- 1483,1489 ----
  				    &eps_via_nodes, fs);
  
!       if (BE (cur_node < 0, 0))
  	{
! 	  if (BE (cur_node == -2, 0))
  	    {
  	      re_node_set_free (&eps_via_nodes);
***************
*** 1890,1897 ****
  	    Idx edst1 = dfa->edests[cur_node].elems[0];
  	    Idx edst2 = ((dfa->edests[cur_node].nelem > 1)
! 			 ? dfa->edests[cur_node].elems[1] : REG_MISSING);
  	    if ((!re_node_set_contains (inv_eclosure, edst1)
  		 && re_node_set_contains (dest_nodes, edst1))
! 		|| (REG_VALID_NONZERO_INDEX (edst2)
  		    && !re_node_set_contains (inv_eclosure, edst2)
  		    && re_node_set_contains (dest_nodes, edst2)))
--- 1869,1876 ----
  	    Idx edst1 = dfa->edests[cur_node].elems[0];
  	    Idx edst2 = ((dfa->edests[cur_node].nelem > 1)
! 			 ? dfa->edests[cur_node].elems[1] : -1);
  	    if ((!re_node_set_contains (inv_eclosure, edst1)
  		 && re_node_set_contains (dest_nodes, edst1))
! 		|| (edst2 > 0
  		    && !re_node_set_contains (inv_eclosure, edst2)
  		    && re_node_set_contains (dest_nodes, edst2)))
***************
*** 1973,1977 ****
  	{
  	case OP_BACK_REF:
! 	  if (bkref_idx != REG_MISSING)
  	    {
  	      struct re_backref_cache_entry *ent = mctx->bkref_ents + bkref_idx;
--- 1952,1956 ----
  	{
  	case OP_BACK_REF:
! 	  if (bkref_idx != -1)
  	    {
  	      struct re_backref_cache_entry *ent = mctx->bkref_ents + bkref_idx;
***************
*** 2089,2094 ****
        if (ent->subexp_to == str_idx)
  	{
! 	  Idx ops_node = REG_MISSING;
! 	  Idx cls_node = REG_MISSING;
  	  for (node_idx = 0; node_idx < dest_nodes->nelem; ++node_idx)
  	    {
--- 2068,2073 ----
        if (ent->subexp_to == str_idx)
  	{
! 	  Idx ops_node = -1;
! 	  Idx cls_node = -1;
  	  for (node_idx = 0; node_idx < dest_nodes->nelem; ++node_idx)
  	    {
***************
*** 2105,2109 ****
  	  /* Check the limitation of the open subexpression.  */
  	  /* Note that (ent->subexp_to = str_idx != ent->subexp_from).  */
! 	  if (REG_VALID_INDEX (ops_node))
  	    {
  	      err = sub_epsilon_src_nodes (dfa, ops_node, dest_nodes,
--- 2084,2088 ----
  	  /* Check the limitation of the open subexpression.  */
  	  /* Note that (ent->subexp_to = str_idx != ent->subexp_from).  */
! 	  if (ops_node >= 0)
  	    {
  	      err = sub_epsilon_src_nodes (dfa, ops_node, dest_nodes,
***************
*** 2114,2118 ****
  
  	  /* Check the limitation of the close subexpression.  */
! 	  if (REG_VALID_INDEX (cls_node))
  	    for (node_idx = 0; node_idx < dest_nodes->nelem; ++node_idx)
  	      {
--- 2093,2097 ----
  
  	  /* Check the limitation of the close subexpression.  */
! 	  if (cls_node >= 0)
  	    for (node_idx = 0; node_idx < dest_nodes->nelem; ++node_idx)
  	      {
***************
*** 2167,2171 ****
    Idx first_idx = search_cur_bkref_entry (mctx, str_idx);
  
!   if (first_idx == REG_MISSING)
      return REG_NOERROR;
  
--- 2146,2150 ----
    Idx first_idx = search_cur_bkref_entry (mctx, str_idx);
  
!   if (first_idx == -1)
      return REG_NOERROR;
  
***************
*** 2571,2575 ****
  	return err;
  #ifdef DEBUG
!       assert (dfa->nexts[cur_node_idx] != REG_MISSING);
  #endif
        new_nodes = dfa->eclosures + dfa->nexts[cur_node_idx];
--- 2550,2554 ----
  	return err;
  #ifdef DEBUG
!       assert (dfa->nexts[cur_node_idx] != -1);
  #endif
        new_nodes = dfa->eclosures + dfa->nexts[cur_node_idx];
***************
*** 2637,2641 ****
  	 the backreference to appropriate state_log.  */
  #ifdef DEBUG
!       assert (dfa->nexts[node_idx] != REG_MISSING);
  #endif
        for (; bkc_idx < mctx->nbkref_ents; ++bkc_idx)
--- 2616,2620 ----
  	 the backreference to appropriate state_log.  */
  #ifdef DEBUG
!       assert (dfa->nexts[node_idx] != -1);
  #endif
        for (; bkc_idx < mctx->nbkref_ents; ++bkc_idx)
***************
*** 2721,2725 ****
    /* Return if we have already checked BKREF_NODE at BKREF_STR_IDX.  */
    Idx cache_idx = search_cur_bkref_entry (mctx, bkref_str_idx);
!   if (cache_idx != REG_MISSING)
      {
        const struct re_backref_cache_entry *entry
--- 2700,2704 ----
    /* Return if we have already checked BKREF_NODE at BKREF_STR_IDX.  */
    Idx cache_idx = search_cur_bkref_entry (mctx, bkref_str_idx);
!   if (cache_idx != -1)
      {
        const struct re_backref_cache_entry *entry
***************
*** 2826,2830 ****
  	  cls_node = find_subexp_node (dfa, nodes, subexp_num,
  				       OP_CLOSE_SUBEXP);
! 	  if (cls_node == REG_MISSING)
  	    continue; /* No.  */
  	  if (sub_top->path == NULL)
--- 2805,2809 ----
  	  cls_node = find_subexp_node (dfa, nodes, subexp_num,
  				       OP_CLOSE_SUBEXP);
! 	  if (cls_node == -1)
  	    continue; /* No.  */
  	  if (sub_top->path == NULL)
***************
*** 2905,2909 ****
  	return cls_node;
      }
!   return REG_MISSING;
  }
  
--- 2884,2888 ----
  	return cls_node;
      }
!   return -1;
  }
  
***************
*** 3181,3185 ****
        const re_node_set *eclosure = dfa->eclosures + cur_node;
        outside_node = find_subexp_node (dfa, eclosure, ex_subexp, type);
!       if (outside_node == REG_MISSING)
  	{
  	  /* There are no problematic nodes, just merge them.  */
--- 3160,3164 ----
        const re_node_set *eclosure = dfa->eclosures + cur_node;
        outside_node = find_subexp_node (dfa, eclosure, ex_subexp, type);
!       if (outside_node == -1)
  	{
  	  /* There are no problematic nodes, just merge them.  */
***************
*** 3267,3271 ****
    struct re_backref_cache_entry *ent;
  
!   if (cache_idx_start == REG_MISSING)
      return REG_NOERROR;
  
--- 3246,3250 ----
    struct re_backref_cache_entry *ent;
  
!   if (cache_idx_start == -1)
      return REG_NOERROR;
  
***************
*** 3392,3396 ****
       destinations.  */
    ndests = group_nodes_into_DFAstates (dfa, state, dests_node, dests_ch);
!   if (BE (! REG_VALID_NONZERO_INDEX (ndests), 0))
      {
        if (dests_node_malloced)
--- 3371,3375 ----
       destinations.  */
    ndests = group_nodes_into_DFAstates (dfa, state, dests_node, dests_ch);
!   if (BE (ndests <= 0, 0))
      {
        if (dests_node_malloced)
***************
*** 3454,3458 ****
  	{
  	  next_node = dfa->nexts[dests_node[i].elems[j]];
! 	  if (next_node != REG_MISSING)
  	    {
  	      err = re_node_set_merge (&follows, dfa->eclosures + next_node);
--- 3433,3437 ----
  	{
  	  next_node = dfa->nexts[dests_node[i].elems[j]];
! 	  if (next_node != -1)
  	    {
  	      err = re_node_set_merge (&follows, dfa->eclosures + next_node);
***************
*** 3765,3769 ****
    for (j = 0; j < ndests; ++j)
      re_node_set_free (dests_node + j);
!   return REG_MISSING;
  }
  
--- 3744,3748 ----
    for (j = 0; j < ndests; ++j)
      re_node_set_free (dests_node + j);
!   return -1;
  }
  
***************
*** 4196,4200 ****
  {
    mctx->eflags = eflags;
!   mctx->match_last = REG_MISSING;
    if (n > 0)
      {
--- 4175,4179 ----
  {
    mctx->eflags = eflags;
!   mctx->match_last = -1;
    if (n > 0)
      {
***************
*** 4317,4321 ****
  }
  
! /* Return the first entry with the same str_idx, or REG_MISSING if none is
     found.  Note that MCTX->BKREF_ENTS is already sorted by MCTX->STR_IDX.  */
  
--- 4296,4300 ----
  }
  
! /* Return the first entry with the same str_idx, or -1 if none is
     found.  Note that MCTX->BKREF_ENTS is already sorted by MCTX->STR_IDX.  */
  
***************
*** 4337,4341 ****
      return left;
    else
!     return REG_MISSING;
  }
  
--- 4316,4320 ----
      return left;
    else
!     return -1;
  }
  
diff -Nrc2 texinfo-6.1/gnulib/lib/size_max.h texinfo-6.3/gnulib/lib/size_max.h
*** texinfo-6.1/gnulib/lib/size_max.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/size_max.h	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* size_max.h -- declare SIZE_MAX through system headers
!    Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc.
     Written by Simon Josefsson.
  
--- 1,4 ----
  /* size_max.h -- declare SIZE_MAX through system headers
!    Copyright (C) 2005-2006, 2009-2016 Free Software Foundation, Inc.
     Written by Simon Josefsson.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/stdarg.in.h texinfo-6.3/gnulib/lib/stdarg.in.h
*** texinfo-6.1/gnulib/lib/stdarg.in.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/stdarg.in.h	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Substitute for and wrapper around <stdarg.h>.
!    Copyright (C) 2008-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,4 ----
  /* Substitute for and wrapper around <stdarg.h>.
!    Copyright (C) 2008-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/stdbool.in.h texinfo-6.3/gnulib/lib/stdbool.in.h
*** texinfo-6.1/gnulib/lib/stdbool.in.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/stdbool.in.h	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,3 ****
! /* Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc.
     Written by Bruno Haible <haible@clisp.cons.org>, 2001.
  
--- 1,3 ----
! /* Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc.
     Written by Bruno Haible <haible@clisp.cons.org>, 2001.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/stddef.in.h texinfo-6.3/gnulib/lib/stddef.in.h
*** texinfo-6.1/gnulib/lib/stddef.in.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/stddef.in.h	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,5 ****
  /* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues.
  
!    Copyright (C) 2009-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  /* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues.
  
!    Copyright (C) 2009-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
***************
*** 82,87 ****
  #endif
  
! /* Some platforms lack max_align_t.  */
! #if !@HAVE_MAX_ALIGN_T@
  /* On the x86, the maximum storage alignment of double, long, etc. is 4,
     but GCC's C11 ABI for x86 says that max_align_t has an alignment of 8,
--- 82,89 ----
  #endif
  
! /* Some platforms lack max_align_t.  The check for _GCC_MAX_ALIGN_T is
!    a hack in case the configure-time test was done with g++ even though
!    we are currently compiling with gcc.  */
! #if ! (@HAVE_MAX_ALIGN_T@ || defined _GCC_MAX_ALIGN_T)
  /* On the x86, the maximum storage alignment of double, long, etc. is 4,
     but GCC's C11 ABI for x86 says that max_align_t has an alignment of 8,
diff -Nrc2 texinfo-6.1/gnulib/lib/stdint.in.h texinfo-6.3/gnulib/lib/stdint.in.h
*** texinfo-6.1/gnulib/lib/stdint.in.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/stdint.in.h	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,3 ****
! /* Copyright (C) 2001-2002, 2004-2015 Free Software Foundation, Inc.
     Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
     This file is part of gnulib.
--- 1,3 ----
! /* Copyright (C) 2001-2002, 2004-2016 Free Software Foundation, Inc.
     Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
     This file is part of gnulib.
***************
*** 119,131 ****
  
  #define _STDINT_MIN(signed, bits, zero) \
!   ((signed) ? (- ((zero) + 1) << ((bits) ? (bits) - 1 : 0)) : (zero))
  
  #define _STDINT_MAX(signed, bits, zero) \
!   ((signed) \
!    ? ~ _STDINT_MIN (signed, bits, zero) \
!    : /* The expression for the unsigned case.  The subtraction of (signed) \
!         is a nop in the unsigned case and avoids "signed integer overflow" \
!         warnings in the signed case.  */ \
!      ((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1)
  
  #if !GNULIB_defined_stdint_types
--- 119,126 ----
  
  #define _STDINT_MIN(signed, bits, zero) \
!   ((signed) ? ~ _STDINT_MAX (signed, bits, zero) : (zero))
  
  #define _STDINT_MAX(signed, bits, zero) \
!   (((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1)
  
  #if !GNULIB_defined_stdint_types
***************
*** 289,292 ****
--- 284,291 ----
  /* 7.18.1.4. Integer types capable of holding object pointers */
  
+ /* kLIBC's stdint.h defines _INTPTR_T_DECLARED and needs its own
+    definitions of intptr_t and uintptr_t (which use int and unsigned)
+    to avoid clashes with declarations of system functions like sbrk.  */
+ #ifndef _INTPTR_T_DECLARED
  #undef intptr_t
  #undef uintptr_t
***************
*** 295,298 ****
--- 294,298 ----
  #define intptr_t gl_intptr_t
  #define uintptr_t gl_uintptr_t
+ #endif
  
  /* 7.18.1.5. Greatest-width integer types */
diff -Nrc2 texinfo-6.1/gnulib/lib/stdio.in.h texinfo-6.3/gnulib/lib/stdio.in.h
*** texinfo-6.1/gnulib/lib/stdio.in.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/stdio.in.h	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,5 ****
  /* A GNU-like <stdio.h>.
  
!    Copyright (C) 2004, 2007-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  /* A GNU-like <stdio.h>.
  
!    Copyright (C) 2004, 2007-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/stdlib.in.h texinfo-6.3/gnulib/lib/stdlib.in.h
*** texinfo-6.1/gnulib/lib/stdlib.in.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/stdlib.in.h	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,5 ****
  /* A GNU-like <stdlib.h>.
  
!    Copyright (C) 1995, 2001-2004, 2006-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
--- 1,5 ----
  /* A GNU-like <stdlib.h>.
  
!    Copyright (C) 1995, 2001-2004, 2006-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/stpcpy.c texinfo-6.3/gnulib/lib/stpcpy.c
*** texinfo-6.1/gnulib/lib/stpcpy.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/stpcpy.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* stpcpy.c -- copy a string and return pointer to end of new string
!    Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2015 Free Software
     Foundation, Inc.
  
--- 1,4 ----
  /* stpcpy.c -- copy a string and return pointer to end of new string
!    Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2016 Free Software
     Foundation, Inc.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/str-kmp.h texinfo-6.3/gnulib/lib/str-kmp.h
*** texinfo-6.1/gnulib/lib/str-kmp.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/str-kmp.h	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,5 ****
  /* Substring search in a NUL terminated string of UNIT elements,
     using the Knuth-Morris-Pratt algorithm.
!    Copyright (C) 2005-2015 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2005.
  
--- 1,5 ----
  /* Substring search in a NUL terminated string of UNIT elements,
     using the Knuth-Morris-Pratt algorithm.
!    Copyright (C) 2005-2016 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2005.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/str-two-way.h texinfo-6.3/gnulib/lib/str-two-way.h
*** texinfo-6.1/gnulib/lib/str-two-way.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/str-two-way.h	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Byte-wise substring search, using the Two-Way algorithm.
!    Copyright (C) 2008-2015 Free Software Foundation, Inc.
     This file is part of the GNU C Library.
     Written by Eric Blake <ebb9@byu.net>, 2008.
--- 1,4 ----
  /* Byte-wise substring search, using the Two-Way algorithm.
!    Copyright (C) 2008-2016 Free Software Foundation, Inc.
     This file is part of the GNU C Library.
     Written by Eric Blake <ebb9@byu.net>, 2008.
diff -Nrc2 texinfo-6.1/gnulib/lib/strcasecmp.c texinfo-6.3/gnulib/lib/strcasecmp.c
*** texinfo-6.1/gnulib/lib/strcasecmp.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/strcasecmp.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Case-insensitive string comparison function.
!    Copyright (C) 1998-1999, 2005-2007, 2009-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,4 ----
  /* Case-insensitive string comparison function.
!    Copyright (C) 1998-1999, 2005-2007, 2009-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/strcasestr.c texinfo-6.3/gnulib/lib/strcasestr.c
*** texinfo-6.1/gnulib/lib/strcasestr.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/strcasestr.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Case-insensitive searching in a string.
!    Copyright (C) 2005-2015 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2005.
  
--- 1,4 ----
  /* Case-insensitive searching in a string.
!    Copyright (C) 2005-2016 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2005.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/strdup.c texinfo-6.3/gnulib/lib/strdup.c
*** texinfo-6.1/gnulib/lib/strdup.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/strdup.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,3 ****
! /* Copyright (C) 1991, 1996-1998, 2002-2004, 2006-2007, 2009-2015 Free Software
     Foundation, Inc.
  
--- 1,3 ----
! /* Copyright (C) 1991, 1996-1998, 2002-2004, 2006-2007, 2009-2016 Free Software
     Foundation, Inc.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/streq.h texinfo-6.3/gnulib/lib/streq.h
*** texinfo-6.1/gnulib/lib/streq.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/streq.h	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Optimized string comparison.
!    Copyright (C) 2001-2002, 2007, 2009-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify it
--- 1,4 ----
  /* Optimized string comparison.
!    Copyright (C) 2001-2002, 2007, 2009-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify it
diff -Nrc2 texinfo-6.1/gnulib/lib/strerror-override.c texinfo-6.3/gnulib/lib/strerror-override.c
*** texinfo-6.1/gnulib/lib/strerror-override.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/strerror-override.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,5 ****
  /* strerror-override.c --- POSIX compatible system error routine
  
!    Copyright (C) 2010-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
--- 1,5 ----
  /* strerror-override.c --- POSIX compatible system error routine
  
!    Copyright (C) 2010-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/strerror-override.h texinfo-6.3/gnulib/lib/strerror-override.h
*** texinfo-6.1/gnulib/lib/strerror-override.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/strerror-override.h	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,5 ****
  /* strerror-override.h --- POSIX compatible system error routine
  
!    Copyright (C) 2010-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
--- 1,5 ----
  /* strerror-override.h --- POSIX compatible system error routine
  
!    Copyright (C) 2010-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/strerror.c texinfo-6.3/gnulib/lib/strerror.c
*** texinfo-6.1/gnulib/lib/strerror.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/strerror.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,5 ****
  /* strerror.c --- POSIX compatible system error routine
  
!    Copyright (C) 2007-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
--- 1,5 ----
  /* strerror.c --- POSIX compatible system error routine
  
!    Copyright (C) 2007-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/string.in.h texinfo-6.3/gnulib/lib/string.in.h
*** texinfo-6.1/gnulib/lib/string.in.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/string.in.h	2016-08-30 18:31:33.000000000 +0100
***************
*** 1,5 ****
  /* A GNU-like <string.h>.
  
!    Copyright (C) 1995-1996, 2001-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  /* A GNU-like <string.h>.
  
!    Copyright (C) 1995-1996, 2001-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
***************
*** 417,429 ****
  #   define strndup rpl_strndup
  #  endif
! _GL_FUNCDECL_RPL (strndup, char *, (char const *__string, size_t __n)
                                     _GL_ARG_NONNULL ((1)));
! _GL_CXXALIAS_RPL (strndup, char *, (char const *__string, size_t __n));
  # else
  #  if ! @HAVE_DECL_STRNDUP@
! _GL_FUNCDECL_SYS (strndup, char *, (char const *__string, size_t __n)
                                     _GL_ARG_NONNULL ((1)));
  #  endif
! _GL_CXXALIAS_SYS (strndup, char *, (char const *__string, size_t __n));
  # endif
  _GL_CXXALIASWARN (strndup);
--- 417,429 ----
  #   define strndup rpl_strndup
  #  endif
! _GL_FUNCDECL_RPL (strndup, char *, (char const *__s, size_t __n)
                                     _GL_ARG_NONNULL ((1)));
! _GL_CXXALIAS_RPL (strndup, char *, (char const *__s, size_t __n));
  # else
  #  if ! @HAVE_DECL_STRNDUP@
! _GL_FUNCDECL_SYS (strndup, char *, (char const *__s, size_t __n)
                                     _GL_ARG_NONNULL ((1)));
  #  endif
! _GL_CXXALIAS_SYS (strndup, char *, (char const *__s, size_t __n));
  # endif
  _GL_CXXALIASWARN (strndup);
***************
*** 445,459 ****
  #   define strnlen rpl_strnlen
  #  endif
! _GL_FUNCDECL_RPL (strnlen, size_t, (char const *__string, size_t __maxlen)
                                     _GL_ATTRIBUTE_PURE
                                     _GL_ARG_NONNULL ((1)));
! _GL_CXXALIAS_RPL (strnlen, size_t, (char const *__string, size_t __maxlen));
  # else
  #  if ! @HAVE_DECL_STRNLEN@
! _GL_FUNCDECL_SYS (strnlen, size_t, (char const *__string, size_t __maxlen)
                                     _GL_ATTRIBUTE_PURE
                                     _GL_ARG_NONNULL ((1)));
  #  endif
! _GL_CXXALIAS_SYS (strnlen, size_t, (char const *__string, size_t __maxlen));
  # endif
  _GL_CXXALIASWARN (strnlen);
--- 445,459 ----
  #   define strnlen rpl_strnlen
  #  endif
! _GL_FUNCDECL_RPL (strnlen, size_t, (char const *__s, size_t __maxlen)
                                     _GL_ATTRIBUTE_PURE
                                     _GL_ARG_NONNULL ((1)));
! _GL_CXXALIAS_RPL (strnlen, size_t, (char const *__s, size_t __maxlen));
  # else
  #  if ! @HAVE_DECL_STRNLEN@
! _GL_FUNCDECL_SYS (strnlen, size_t, (char const *__s, size_t __maxlen)
                                     _GL_ATTRIBUTE_PURE
                                     _GL_ARG_NONNULL ((1)));
  #  endif
! _GL_CXXALIAS_SYS (strnlen, size_t, (char const *__s, size_t __maxlen));
  # endif
  _GL_CXXALIASWARN (strnlen);
diff -Nrc2 texinfo-6.1/gnulib/lib/strings.in.h texinfo-6.3/gnulib/lib/strings.in.h
*** texinfo-6.1/gnulib/lib/strings.in.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/strings.in.h	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,5 ****
  /* A substitute <strings.h>.
  
!    Copyright (C) 2007-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  /* A substitute <strings.h>.
  
!    Copyright (C) 2007-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/strncasecmp.c texinfo-6.3/gnulib/lib/strncasecmp.c
*** texinfo-6.1/gnulib/lib/strncasecmp.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/strncasecmp.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* strncasecmp.c -- case insensitive string comparator
!    Copyright (C) 1998-1999, 2005-2007, 2009-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,4 ----
  /* strncasecmp.c -- case insensitive string comparator
!    Copyright (C) 1998-1999, 2005-2007, 2009-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/strndup.c texinfo-6.3/gnulib/lib/strndup.c
*** texinfo-6.1/gnulib/lib/strndup.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/strndup.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,5 ****
  /* A replacement function, for systems that lack strndup.
  
!    Copyright (C) 1996-1998, 2001-2003, 2005-2007, 2009-2015 Free Software
     Foundation, Inc.
  
--- 1,5 ----
  /* A replacement function, for systems that lack strndup.
  
!    Copyright (C) 1996-1998, 2001-2003, 2005-2007, 2009-2016 Free Software
     Foundation, Inc.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/strnlen.c texinfo-6.3/gnulib/lib/strnlen.c
*** texinfo-6.1/gnulib/lib/strnlen.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/strnlen.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Find the length of STRING, but scan at most MAXLEN characters.
!    Copyright (C) 2005-2007, 2009-2015 Free Software Foundation, Inc.
     Written by Simon Josefsson.
  
--- 1,4 ----
  /* Find the length of STRING, but scan at most MAXLEN characters.
!    Copyright (C) 2005-2007, 2009-2016 Free Software Foundation, Inc.
     Written by Simon Josefsson.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/strnlen1.c texinfo-6.3/gnulib/lib/strnlen1.c
*** texinfo-6.1/gnulib/lib/strnlen1.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/strnlen1.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Find the length of STRING + 1, but scan at most MAXLEN bytes.
!    Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
--- 1,4 ----
  /* Find the length of STRING + 1, but scan at most MAXLEN bytes.
!    Copyright (C) 2005-2006, 2009-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/strnlen1.h texinfo-6.3/gnulib/lib/strnlen1.h
*** texinfo-6.1/gnulib/lib/strnlen1.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/strnlen1.h	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,4 ****
  /* Find the length of STRING + 1, but scan at most MAXLEN bytes.
!    Copyright (C) 2005, 2009-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
--- 1,4 ----
  /* Find the length of STRING + 1, but scan at most MAXLEN bytes.
!    Copyright (C) 2005, 2009-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/strstr.c texinfo-6.3/gnulib/lib/strstr.c
*** texinfo-6.1/gnulib/lib/strstr.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/strstr.c	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,3 ****
! /* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2015 Free Software
     Foundation, Inc.
     This file is part of the GNU C Library.
--- 1,3 ----
! /* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2016 Free Software
     Foundation, Inc.
     This file is part of the GNU C Library.
diff -Nrc2 texinfo-6.1/gnulib/lib/sys_types.in.h texinfo-6.3/gnulib/lib/sys_types.in.h
*** texinfo-6.1/gnulib/lib/sys_types.in.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/sys_types.in.h	2016-07-30 20:33:17.000000000 +0100
***************
*** 1,5 ****
  /* Provide a more complete sys/types.h.
  
!    Copyright (C) 2011-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  /* Provide a more complete sys/types.h.
  
!    Copyright (C) 2011-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/unistd.in.h texinfo-6.3/gnulib/lib/unistd.in.h
*** texinfo-6.1/gnulib/lib/unistd.in.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/unistd.in.h	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  /* Substitute for and wrapper around <unistd.h>.
!    Copyright (C) 2003-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,4 ----
  /* Substitute for and wrapper around <unistd.h>.
!    Copyright (C) 2003-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/unitypes.in.h texinfo-6.3/gnulib/lib/unitypes.in.h
*** texinfo-6.1/gnulib/lib/unitypes.in.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/unitypes.in.h	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  /* Elementary types and macros for the GNU UniString library.
!    Copyright (C) 2002, 2005-2006, 2009-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify it
--- 1,4 ----
  /* Elementary types and macros for the GNU UniString library.
!    Copyright (C) 2002, 2005-2006, 2009-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify it
diff -Nrc2 texinfo-6.1/gnulib/lib/uniwidth/cjk.h texinfo-6.3/gnulib/lib/uniwidth/cjk.h
*** texinfo-6.1/gnulib/lib/uniwidth/cjk.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/uniwidth/cjk.h	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  /* Test for CJK encoding.
!    Copyright (C) 2001-2002, 2005-2007, 2009-2015 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2002.
  
--- 1,4 ----
  /* Test for CJK encoding.
!    Copyright (C) 2001-2002, 2005-2007, 2009-2016 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2002.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/uniwidth/width.c texinfo-6.3/gnulib/lib/uniwidth/width.c
*** texinfo-6.1/gnulib/lib/uniwidth/width.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/uniwidth/width.c	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  /* Determine display width of Unicode character.
!    Copyright (C) 2001-2002, 2006-2015 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2002.
  
--- 1,4 ----
  /* Determine display width of Unicode character.
!    Copyright (C) 2001-2002, 2006-2016 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2002.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/uniwidth.in.h texinfo-6.3/gnulib/lib/uniwidth.in.h
*** texinfo-6.1/gnulib/lib/uniwidth.in.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/uniwidth.in.h	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  /* Display width functions.
!    Copyright (C) 2001-2002, 2005, 2007, 2009-2015 Free Software Foundation,
     Inc.
  
--- 1,4 ----
  /* Display width functions.
!    Copyright (C) 2001-2002, 2005, 2007, 2009-2016 Free Software Foundation,
     Inc.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/vasnprintf.c texinfo-6.3/gnulib/lib/vasnprintf.c
*** texinfo-6.1/gnulib/lib/vasnprintf.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/vasnprintf.c	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  /* vsprintf with automatic memory allocation.
!    Copyright (C) 1999, 2002-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,4 ----
  /* vsprintf with automatic memory allocation.
!    Copyright (C) 1999, 2002-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
***************
*** 196,200 ****
  /* GCC >= 4.0 with -Wall emits unjustified "... may be used uninitialized"
     warnings in this file.  Use -Dlint to suppress them.  */
! #ifdef lint
  # define IF_LINT(Code) Code
  #else
--- 196,200 ----
  /* GCC >= 4.0 with -Wall emits unjustified "... may be used uninitialized"
     warnings in this file.  Use -Dlint to suppress them.  */
! #if defined GCC_LINT || defined lint
  # define IF_LINT(Code) Code
  #else
diff -Nrc2 texinfo-6.1/gnulib/lib/vasnprintf.h texinfo-6.3/gnulib/lib/vasnprintf.h
*** texinfo-6.1/gnulib/lib/vasnprintf.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/vasnprintf.h	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  /* vsprintf with automatic memory allocation.
!    Copyright (C) 2002-2004, 2007-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,4 ----
  /* vsprintf with automatic memory allocation.
!    Copyright (C) 2002-2004, 2007-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/vasprintf.c texinfo-6.3/gnulib/lib/vasprintf.c
*** texinfo-6.1/gnulib/lib/vasprintf.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/vasprintf.c	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  /* Formatted output to strings.
!    Copyright (C) 1999, 2002, 2006-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,4 ----
  /* Formatted output to strings.
!    Copyright (C) 1999, 2002, 2006-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/verify.h texinfo-6.3/gnulib/lib/verify.h
*** texinfo-6.1/gnulib/lib/verify.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/verify.h	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,5 ****
  /* Compile-time assert-like macros.
  
!    Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
--- 1,5 ----
  /* Compile-time assert-like macros.
  
!    Copyright (C) 2005-2006, 2009-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
***************
*** 264,268 ****
  #elif 1200 <= _MSC_VER
  # define assume(R) __assume (R)
! #elif (defined lint \
         && (__has_builtin (__builtin_trap) \
             || 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__))))
--- 264,268 ----
  #elif 1200 <= _MSC_VER
  # define assume(R) __assume (R)
! #elif ((defined GCC_LINT || defined lint) \
         && (__has_builtin (__builtin_trap) \
             || 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__))))
diff -Nrc2 texinfo-6.1/gnulib/lib/wchar.in.h texinfo-6.3/gnulib/lib/wchar.in.h
*** texinfo-6.1/gnulib/lib/wchar.in.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/wchar.in.h	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,5 ****
  /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
  
!    Copyright (C) 2007-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
  
!    Copyright (C) 2007-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
***************
*** 32,36 ****
  
  #if (((defined __need_mbstate_t || defined __need_wint_t)               \
!       && !defined __MINGW32__)                                          \
       || (defined __hpux                                                 \
           && ((defined _INTTYPES_INCLUDED && !defined strtoimax)         \
--- 32,36 ----
  
  #if (((defined __need_mbstate_t || defined __need_wint_t)               \
!       && !defined __MINGW32__ && !defined __KLIBC__)                    \
       || (defined __hpux                                                 \
           && ((defined _INTTYPES_INCLUDED && !defined strtoimax)         \
***************
*** 446,449 ****
--- 446,454 ----
  /* wcwidth exists but is not declared.  */
  _GL_FUNCDECL_SYS (wcwidth, int, (wchar_t) _GL_ATTRIBUTE_PURE);
+ #  elif defined __KLIBC__
+ /* On OS/2 kLIBC, wcwidth is a macro that expands to the name of a
+    static inline function.  The implementation of wcwidth in wcwidth.c
+    causes a "conflicting types" error. */
+ #   undef wcwidth
  #  endif
  _GL_CXXALIAS_SYS (wcwidth, int, (wchar_t));
diff -Nrc2 texinfo-6.1/gnulib/lib/wcrtomb.c texinfo-6.3/gnulib/lib/wcrtomb.c
*** texinfo-6.1/gnulib/lib/wcrtomb.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/wcrtomb.c	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  /* Convert wide character to multibyte character.
!    Copyright (C) 2008-2015 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2008.
  
--- 1,4 ----
  /* Convert wide character to multibyte character.
!    Copyright (C) 2008-2016 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2008.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/wctype.in.h texinfo-6.3/gnulib/lib/wctype.in.h
*** texinfo-6.1/gnulib/lib/wctype.in.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/wctype.in.h	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,5 ****
  /* A substitute for ISO C99 <wctype.h>, for platforms that lack it.
  
!    Copyright (C) 2006-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  /* A substitute for ISO C99 <wctype.h>, for platforms that lack it.
  
!    Copyright (C) 2006-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/wcwidth.c texinfo-6.3/gnulib/lib/wcwidth.c
*** texinfo-6.1/gnulib/lib/wcwidth.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/wcwidth.c	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  /* Determine the number of screen columns needed for a character.
!    Copyright (C) 2006-2007, 2010-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
--- 1,4 ----
  /* Determine the number of screen columns needed for a character.
!    Copyright (C) 2006-2007, 2010-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/xalloc-die.c texinfo-6.3/gnulib/lib/xalloc-die.c
*** texinfo-6.1/gnulib/lib/xalloc-die.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/xalloc-die.c	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,5 ****
  /* Report a memory allocation failure and exit.
  
!    Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2015 Free Software
     Foundation, Inc.
  
--- 1,5 ----
  /* Report a memory allocation failure and exit.
  
!    Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2016 Free Software
     Foundation, Inc.
  
diff -Nrc2 texinfo-6.1/gnulib/lib/xalloc-oversized.h texinfo-6.3/gnulib/lib/xalloc-oversized.h
*** texinfo-6.1/gnulib/lib/xalloc-oversized.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/xalloc-oversized.h	2016-08-30 18:31:34.000000000 +0100
***************
*** 1,5 ****
  /* xalloc-oversized.h -- memory allocation size checking
  
!    Copyright (C) 1990-2000, 2003-2004, 2006-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
--- 1,5 ----
  /* xalloc-oversized.h -- memory allocation size checking
  
!    Copyright (C) 1990-2000, 2003-2004, 2006-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
***************
*** 21,33 ****
  #include <stddef.h>
  
  #ifndef __has_builtin
  # define __has_builtin(x) 0
  #endif
  
! /* Return 1 if an array of N objects, each of size S, cannot exist due
!    to size arithmetic overflow.  S must be positive and N must be
!    nonnegative.  This is a macro, not a function, so that it
!    works correctly even when SIZE_MAX < N.
! 
     By gnulib convention, SIZE_MAX represents overflow in size
     calculations, so the conservative dividend to use here is
--- 21,31 ----
  #include <stddef.h>
  
+ /* Default for (non-Clang) compilers that lack __has_builtin.  */
  #ifndef __has_builtin
  # define __has_builtin(x) 0
  #endif
  
! /* True if N * S would overflow in a size calculation.
!    This expands to a constant expression if N and S are both constants.
     By gnulib convention, SIZE_MAX represents overflow in size
     calculations, so the conservative dividend to use here is
***************
*** 37,46 ****
     exactly-SIZE_MAX allocations on such hosts; this avoids a test and
     branch when S is known to be 1.  */
! #if 5 <= __GNUC__ || __has_builtin (__builtin_mul_overflow)
  # define xalloc_oversized(n, s) \
!     ({ size_t __xalloc_size; __builtin_mul_overflow (n, s, &__xalloc_size); })
  #else
! # define xalloc_oversized(n, s) \
!     ((size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) < (n))
  #endif
  
--- 35,62 ----
     exactly-SIZE_MAX allocations on such hosts; this avoids a test and
     branch when S is known to be 1.  */
! #define __xalloc_oversized(n, s) \
!     ((size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) < (n))
! 
! 
! /* Return 1 if an array of N objects, each of size S, cannot exist due
!    to size arithmetic overflow.  S must be positive and N must be
!    nonnegative.  This is a macro, not a function, so that it
!    works correctly even when SIZE_MAX < N.  */
! 
! #if 7 <= __GNUC__ || __has_builtin (__builtin_add_overflow_p)
! # define xalloc_oversized(n, s) __builtin_mul_overflow_p (n, s, (size_t) 1)
! #elif ((5 <= __GNUC__ \
!         || (__has_builtin (__builtin_mul_overflow) \
!             && __has_builtin (__builtin_constant_p))) \
!        && !__STRICT_ANSI__)
  # define xalloc_oversized(n, s) \
!    (__builtin_constant_p (n) && __builtin_constant_p (s) \
!     ? __xalloc_oversized (n, s) \
!     : ({ size_t __xalloc_size; __builtin_mul_overflow (n, s, &__xalloc_size); }))
! 
! /* Other compilers use integer division; this may be slower but is
!    more portable.  */
  #else
! # define xalloc_oversized(n, s) __xalloc_oversized (n, s)
  #endif
  
diff -Nrc2 texinfo-6.1/gnulib/lib/xalloc.h texinfo-6.3/gnulib/lib/xalloc.h
*** texinfo-6.1/gnulib/lib/xalloc.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/xalloc.h	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,5 ****
  /* xalloc.h -- malloc with out-of-memory checking
  
!    Copyright (C) 1990-2000, 2003-2004, 2006-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
--- 1,5 ----
  /* xalloc.h -- malloc with out-of-memory checking
  
!    Copyright (C) 1990-2000, 2003-2004, 2006-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/xmalloc.c texinfo-6.3/gnulib/lib/xmalloc.c
*** texinfo-6.1/gnulib/lib/xmalloc.c	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/xmalloc.c	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,5 ****
  /* xmalloc.c -- malloc with out of memory checking
  
!    Copyright (C) 1990-2000, 2002-2006, 2008-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
--- 1,5 ----
  /* xmalloc.c -- malloc with out of memory checking
  
!    Copyright (C) 1990-2000, 2002-2006, 2008-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/lib/xsize.h texinfo-6.3/gnulib/lib/xsize.h
*** texinfo-6.1/gnulib/lib/xsize.h	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/lib/xsize.h	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,5 ****
  /* xsize.h -- Checked size_t computations.
  
!    Copyright (C) 2003, 2008-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  /* xsize.h -- Checked size_t computations.
  
!    Copyright (C) 2003, 2008-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/m4/00gnulib.m4 texinfo-6.3/gnulib/m4/00gnulib.m4
*** texinfo-6.1/gnulib/m4/00gnulib.m4	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/m4/00gnulib.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # 00gnulib.m4 serial 3
! dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # 00gnulib.m4 serial 3
! dnl Copyright (C) 2009-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/absolute-header.m4 texinfo-6.3/gnulib/m4/absolute-header.m4
*** texinfo-6.1/gnulib/m4/absolute-header.m4	2016-01-09 15:29:37.000000000 +0000
--- texinfo-6.3/gnulib/m4/absolute-header.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # absolute-header.m4 serial 16
! dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # absolute-header.m4 serial 16
! dnl Copyright (C) 2006-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/alloca.m4 texinfo-6.3/gnulib/m4/alloca.m4
*** texinfo-6.1/gnulib/m4/alloca.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/alloca.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # alloca.m4 serial 14
! dnl Copyright (C) 2002-2004, 2006-2007, 2009-2015 Free Software Foundation,
  dnl Inc.
  dnl This file is free software; the Free Software Foundation
--- 1,4 ----
  # alloca.m4 serial 14
! dnl Copyright (C) 2002-2004, 2006-2007, 2009-2016 Free Software Foundation,
  dnl Inc.
  dnl This file is free software; the Free Software Foundation
diff -Nrc2 texinfo-6.1/gnulib/m4/argz.m4 texinfo-6.3/gnulib/m4/argz.m4
*** texinfo-6.1/gnulib/m4/argz.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/argz.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,5 ****
  # Portability macros for glibc argz.                    -*- Autoconf -*-
  #
! #   Copyright (C) 2004-2015 Free Software Foundation, Inc.
  #   Written by Gary V. Vaughan <gary@gnu.org>
  #
--- 1,5 ----
  # Portability macros for glibc argz.                    -*- Autoconf -*-
  #
! #   Copyright (C) 2004-2016 Free Software Foundation, Inc.
  #   Written by Gary V. Vaughan <gary@gnu.org>
  #
diff -Nrc2 texinfo-6.1/gnulib/m4/btowc.m4 texinfo-6.3/gnulib/m4/btowc.m4
*** texinfo-6.1/gnulib/m4/btowc.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/btowc.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # btowc.m4 serial 10
! dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # btowc.m4 serial 10
! dnl Copyright (C) 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,
diff -Nrc2 texinfo-6.1/gnulib/m4/codeset.m4 texinfo-6.3/gnulib/m4/codeset.m4
*** texinfo-6.1/gnulib/m4/codeset.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/codeset.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # codeset.m4 serial 5 (gettext-0.18.2)
! dnl Copyright (C) 2000-2002, 2006, 2008-2014 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,5 ----
  # codeset.m4 serial 5 (gettext-0.18.2)
! dnl Copyright (C) 2000-2002, 2006, 2008-2014, 2016 Free Software Foundation,
! dnl Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
diff -Nrc2 texinfo-6.1/gnulib/m4/configmake.m4 texinfo-6.3/gnulib/m4/configmake.m4
*** texinfo-6.1/gnulib/m4/configmake.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/configmake.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # configmake.m4 serial 2
! dnl Copyright (C) 2010-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # configmake.m4 serial 2
! dnl Copyright (C) 2010-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/eealloc.m4 texinfo-6.3/gnulib/m4/eealloc.m4
*** texinfo-6.1/gnulib/m4/eealloc.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/eealloc.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # eealloc.m4 serial 3
! dnl Copyright (C) 2003, 2009-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # eealloc.m4 serial 3
! dnl Copyright (C) 2003, 2009-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/errno_h.m4 texinfo-6.3/gnulib/m4/errno_h.m4
*** texinfo-6.1/gnulib/m4/errno_h.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/errno_h.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # errno_h.m4 serial 12
! dnl Copyright (C) 2004, 2006, 2008-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # errno_h.m4 serial 12
! dnl Copyright (C) 2004, 2006, 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,
diff -Nrc2 texinfo-6.1/gnulib/m4/error.m4 texinfo-6.3/gnulib/m4/error.m4
*** texinfo-6.1/gnulib/m4/error.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/error.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,5 ****
  #serial 14
  
! # Copyright (C) 1996-1998, 2001-2004, 2009-2015 Free Software Foundation, Inc.
  #
  # This file is free software; the Free Software Foundation
--- 1,5 ----
  #serial 14
  
! # Copyright (C) 1996-1998, 2001-2004, 2009-2016 Free Software Foundation, Inc.
  #
  # This file is free software; the Free Software Foundation
diff -Nrc2 texinfo-6.1/gnulib/m4/exponentd.m4 texinfo-6.3/gnulib/m4/exponentd.m4
*** texinfo-6.1/gnulib/m4/exponentd.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/exponentd.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # exponentd.m4 serial 3
! dnl Copyright (C) 2007-2008, 2010-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # exponentd.m4 serial 3
! dnl Copyright (C) 2007-2008, 2010-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/extensions.m4 texinfo-6.3/gnulib/m4/extensions.m4
*** texinfo-6.1/gnulib/m4/extensions.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/extensions.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 2,6 ****
  # Enable extensions on systems that normally disable them.
  
! # Copyright (C) 2003, 2006-2015 Free Software Foundation, Inc.
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
--- 2,6 ----
  # Enable extensions on systems that normally disable them.
  
! # Copyright (C) 2003, 2006-2016 Free Software Foundation, Inc.
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
diff -Nrc2 texinfo-6.1/gnulib/m4/extern-inline.m4 texinfo-6.3/gnulib/m4/extern-inline.m4
*** texinfo-6.1/gnulib/m4/extern-inline.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/extern-inline.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,5 ****
  dnl 'extern inline' a la ISO C99.
  
! dnl Copyright 2012-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,5 ----
  dnl 'extern inline' a la ISO C99.
  
! dnl Copyright 2012-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,
***************
*** 55,58 ****
--- 55,59 ----
        : (199901L <= __STDC_VERSION__ \
           && !defined __HP_cc \
+          && !defined __PGI \
           && !(defined __SUNPRO_C && __STDC__))) \
       && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
diff -Nrc2 texinfo-6.1/gnulib/m4/fcntl-o.m4 texinfo-6.3/gnulib/m4/fcntl-o.m4
*** texinfo-6.1/gnulib/m4/fcntl-o.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/fcntl-o.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # fcntl-o.m4 serial 4
! dnl Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # fcntl-o.m4 serial 4
! dnl Copyright (C) 2006, 2009-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/float_h.m4 texinfo-6.3/gnulib/m4/float_h.m4
*** texinfo-6.1/gnulib/m4/float_h.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/float_h.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # float_h.m4 serial 9
! dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # float_h.m4 serial 9
! dnl Copyright (C) 2007, 2009-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/getopt.m4 texinfo-6.3/gnulib/m4/getopt.m4
*** texinfo-6.1/gnulib/m4/getopt.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/getopt.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # getopt.m4 serial 44
! dnl Copyright (C) 2002-2006, 2008-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # getopt.m4 serial 44
! dnl Copyright (C) 2002-2006, 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,
diff -Nrc2 texinfo-6.1/gnulib/m4/gettext.m4 texinfo-6.3/gnulib/m4/gettext.m4
*** texinfo-6.1/gnulib/m4/gettext.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/gettext.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,9 ****
! # gettext.m4 serial 67 (gettext-0.19.6)
! dnl Copyright (C) 1995-2014 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 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
--- 1,9 ----
! # 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
***************
*** 11,15 ****
  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 package is covered by the GNU General Public License.
  dnl They are *not* in the public domain.
  
--- 11,15 ----
  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.
  
***************
*** 162,172 ****
                 [[
  #include <libintl.h>
! $gt_revision_test_code
  extern int _nl_msg_cat_cntr;
  extern int *_nl_domain_bindings;
                 ]],
                 [[
  bindtextdomain ("", "");
! return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
                 ]])],
              [eval "$gt_func_gnugettext_libc=yes"],
--- 162,177 ----
                 [[
  #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"],
***************
*** 194,198 ****
                   [[
  #include <libintl.h>
! $gt_revision_test_code
  extern int _nl_msg_cat_cntr;
  extern
--- 199,203 ----
                   [[
  #include <libintl.h>
! #ifndef __GNU_GETTEXT_SUPPORTED_REVISION
  extern int _nl_msg_cat_cntr;
  extern
***************
*** 201,208 ****
  #endif
  const char *_nl_expand_alias (const char *);
                   ]],
                   [[
  bindtextdomain ("", "");
! return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
                   ]])],
                [eval "$gt_func_gnugettext_libintl=yes"],
--- 206,218 ----
  #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"],
***************
*** 215,219 ****
                     [[
  #include <libintl.h>
! $gt_revision_test_code
  extern int _nl_msg_cat_cntr;
  extern
--- 225,229 ----
                     [[
  #include <libintl.h>
! #ifndef __GNU_GETTEXT_SUPPORTED_REVISION
  extern int _nl_msg_cat_cntr;
  extern
***************
*** 222,229 ****
  #endif
  const char *_nl_expand_alias (const char *);
                     ]],
                     [[
  bindtextdomain ("", "");
! return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
                     ]])],
                  [LIBINTL="$LIBINTL $LIBICONV"
--- 232,244 ----
  #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"
diff -Nrc2 texinfo-6.1/gnulib/m4/glibc21.m4 texinfo-6.3/gnulib/m4/glibc21.m4
*** texinfo-6.1/gnulib/m4/glibc21.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/glibc21.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # glibc21.m4 serial 5
! dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2015 Free Software Foundation,
  dnl Inc.
  dnl This file is free software; the Free Software Foundation
--- 1,4 ----
  # glibc21.m4 serial 5
! dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2016 Free Software Foundation,
  dnl Inc.
  dnl This file is free software; the Free Software Foundation
diff -Nrc2 texinfo-6.1/gnulib/m4/gnulib-cache.m4 texinfo-6.3/gnulib/m4/gnulib-cache.m4
*** texinfo-6.1/gnulib/m4/gnulib-cache.m4	2016-01-09 15:29:43.000000000 +0000
--- texinfo-6.3/gnulib/m4/gnulib-cache.m4	2016-07-30 20:33:24.000000000 +0100
***************
*** 1,3 ****
! # Copyright (C) 2002-2015 Free Software Foundation, Inc.
  #
  # This file is free software; you can redistribute it and/or modify
--- 1,3 ----
! # Copyright (C) 2002-2016 Free Software Foundation, Inc.
  #
  # This file is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/gnulib/m4/gnulib-common.m4 texinfo-6.3/gnulib/m4/gnulib-common.m4
*** texinfo-6.1/gnulib/m4/gnulib-common.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/gnulib-common.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # gnulib-common.m4 serial 36
! dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # gnulib-common.m4 serial 36
! dnl Copyright (C) 2007-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/gnulib-comp.m4 texinfo-6.3/gnulib/m4/gnulib-comp.m4
*** texinfo-6.1/gnulib/m4/gnulib-comp.m4	2016-01-09 15:29:47.000000000 +0000
--- texinfo-6.3/gnulib/m4/gnulib-comp.m4	2016-07-30 20:33:28.000000000 +0100
***************
*** 1,4 ****
  # DO NOT EDIT! GENERATED AUTOMATICALLY!
! # Copyright (C) 2002-2015 Free Software Foundation, Inc.
  #
  # This file is free software; you can redistribute it and/or modify
--- 1,4 ----
  # DO NOT EDIT! GENERATED AUTOMATICALLY!
! # Copyright (C) 2002-2016 Free Software Foundation, Inc.
  #
  # This file is free software; you can redistribute it and/or modify
***************
*** 59,62 ****
--- 59,63 ----
    # Code from module gettext:
    # Code from module gettext-h:
+   # Code from module hard-locale:
    # Code from module havelib:
    # Code from module iconv:
***************
*** 326,329 ****
--- 327,331 ----
    gl_gnulib_enabled_btowc=false
    gl_gnulib_enabled_configmake=false
+   gl_gnulib_enabled_30838f5439487421042f2225bed3af76=false
    gl_gnulib_enabled_intprops=false
    gl_gnulib_enabled_langinfo=false
***************
*** 370,373 ****
--- 372,382 ----
      fi
    }
+   func_gl_gnulib_m4code_30838f5439487421042f2225bed3af76 ()
+   {
+     if ! $gl_gnulib_enabled_30838f5439487421042f2225bed3af76; then
+       gl_HARD_LOCALE
+       gl_gnulib_enabled_30838f5439487421042f2225bed3af76=true
+     fi
+   }
    func_gl_gnulib_m4code_intprops ()
    {
***************
*** 460,464 ****
    {
      if ! $gl_gnulib_enabled_f691f076f650964c9f5598c3ee487616; then
!       gl_MSVC_INVAL
        if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
          AC_LIBOBJ([msvc-inval])
--- 469,473 ----
    {
      if ! $gl_gnulib_enabled_f691f076f650964c9f5598c3ee487616; then
!       AC_REQUIRE([gl_MSVC_INVAL])
        if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
          AC_LIBOBJ([msvc-inval])
***************
*** 470,474 ****
    {
      if ! $gl_gnulib_enabled_676220fa4366efa9bdbfccf11a857c07; then
!       gl_MSVC_NOTHROW
        if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
          AC_LIBOBJ([msvc-nothrow])
--- 479,483 ----
    {
      if ! $gl_gnulib_enabled_676220fa4366efa9bdbfccf11a857c07; then
!       AC_REQUIRE([gl_MSVC_NOTHROW])
        if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
          AC_LIBOBJ([msvc-nothrow])
***************
*** 608,611 ****
--- 617,623 ----
    fi
    if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
+     func_gl_gnulib_m4code_30838f5439487421042f2225bed3af76
+   fi
+   if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
      func_gl_gnulib_m4code_localcharset
    fi
***************
*** 640,643 ****
--- 652,656 ----
    AM_CONDITIONAL([gl_GNULIB_ENABLED_btowc], [$gl_gnulib_enabled_btowc])
    AM_CONDITIONAL([gl_GNULIB_ENABLED_configmake], [$gl_gnulib_enabled_configmake])
+   AM_CONDITIONAL([gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76], [$gl_gnulib_enabled_30838f5439487421042f2225bed3af76])
    AM_CONDITIONAL([gl_GNULIB_ENABLED_intprops], [$gl_gnulib_enabled_intprops])
    AM_CONDITIONAL([gl_GNULIB_ENABLED_langinfo], [$gl_gnulib_enabled_langinfo])
***************
*** 831,834 ****
--- 844,849 ----
    lib/glthread/lock.h
    lib/glthread/threadlib.c
+   lib/hard-locale.c
+   lib/hard-locale.h
    lib/intprops.h
    lib/iswblank.c
***************
*** 948,951 ****
--- 963,967 ----
    m4/glibc21.m4
    m4/gnulib-common.m4
+   m4/hard-locale.m4
    m4/iconv.m4
    m4/include_next.m4
diff -Nrc2 texinfo-6.1/gnulib/m4/hard-locale.m4 texinfo-6.3/gnulib/m4/hard-locale.m4
*** texinfo-6.1/gnulib/m4/hard-locale.m4	1970-01-01 01:00:00.000000000 +0100
--- texinfo-6.3/gnulib/m4/hard-locale.m4	2016-07-30 20:33:16.000000000 +0100
***************
*** 0 ****
--- 1,11 ----
+ # hard-locale.m4 serial 8
+ dnl Copyright (C) 2002-2006, 2009-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 No prerequisites of lib/hard-locale.c.
+ AC_DEFUN([gl_HARD_LOCALE],
+ [
+   :
+ ])
diff -Nrc2 texinfo-6.1/gnulib/m4/iconv.m4 texinfo-6.3/gnulib/m4/iconv.m4
*** texinfo-6.1/gnulib/m4/iconv.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/iconv.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # iconv.m4 serial 19 (gettext-0.18.2)
! dnl Copyright (C) 2000-2002, 2007-2014 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # iconv.m4 serial 19 (gettext-0.18.2)
! dnl Copyright (C) 2000-2002, 2007-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/include_next.m4 texinfo-6.3/gnulib/m4/include_next.m4
*** texinfo-6.1/gnulib/m4/include_next.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/include_next.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # include_next.m4 serial 23
! dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # include_next.m4 serial 23
! dnl Copyright (C) 2006-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/intlmacosx.m4 texinfo-6.3/gnulib/m4/intlmacosx.m4
*** texinfo-6.1/gnulib/m4/intlmacosx.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/intlmacosx.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,9 ****
  # intlmacosx.m4 serial 5 (gettext-0.18.2)
! dnl Copyright (C) 2004-2014 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 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
--- 1,9 ----
  # intlmacosx.m4 serial 5 (gettext-0.18.2)
! dnl Copyright (C) 2004-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
***************
*** 11,15 ****
  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 package is covered by the GNU General Public License.
  dnl They are *not* in the public domain.
  
--- 11,15 ----
  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.
  
diff -Nrc2 texinfo-6.1/gnulib/m4/intmax_t.m4 texinfo-6.3/gnulib/m4/intmax_t.m4
*** texinfo-6.1/gnulib/m4/intmax_t.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/intmax_t.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # intmax_t.m4 serial 8
! dnl Copyright (C) 1997-2004, 2006-2007, 2009-2015 Free Software Foundation,
  dnl Inc.
  dnl This file is free software; the Free Software Foundation
--- 1,4 ----
  # intmax_t.m4 serial 8
! dnl Copyright (C) 1997-2004, 2006-2007, 2009-2016 Free Software Foundation,
  dnl Inc.
  dnl This file is free software; the Free Software Foundation
diff -Nrc2 texinfo-6.1/gnulib/m4/inttypes_h.m4 texinfo-6.3/gnulib/m4/inttypes_h.m4
*** texinfo-6.1/gnulib/m4/inttypes_h.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/inttypes_h.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # inttypes_h.m4 serial 10
! dnl Copyright (C) 1997-2004, 2006, 2008-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # inttypes_h.m4 serial 10
! dnl Copyright (C) 1997-2004, 2006, 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,
diff -Nrc2 texinfo-6.1/gnulib/m4/iswblank.m4 texinfo-6.3/gnulib/m4/iswblank.m4
*** texinfo-6.1/gnulib/m4/iswblank.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/iswblank.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # iswblank.m4 serial 4
! dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # iswblank.m4 serial 4
! dnl Copyright (C) 2011-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/langinfo_h.m4 texinfo-6.3/gnulib/m4/langinfo_h.m4
*** texinfo-6.1/gnulib/m4/langinfo_h.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/langinfo_h.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # langinfo_h.m4 serial 7
! dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # langinfo_h.m4 serial 7
! dnl Copyright (C) 2009-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/lib-ld.m4 texinfo-6.3/gnulib/m4/lib-ld.m4
*** texinfo-6.1/gnulib/m4/lib-ld.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/lib-ld.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # lib-ld.m4 serial 6
! dnl Copyright (C) 1996-2003, 2009-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # lib-ld.m4 serial 6
! dnl Copyright (C) 1996-2003, 2009-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/lib-link.m4 texinfo-6.3/gnulib/m4/lib-link.m4
*** texinfo-6.1/gnulib/m4/lib-link.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/lib-link.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # lib-link.m4 serial 26 (gettext-0.18.2)
! dnl Copyright (C) 2001-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # lib-link.m4 serial 26 (gettext-0.18.2)
! dnl Copyright (C) 2001-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/lib-prefix.m4 texinfo-6.3/gnulib/m4/lib-prefix.m4
*** texinfo-6.1/gnulib/m4/lib-prefix.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/lib-prefix.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # lib-prefix.m4 serial 7 (gettext-0.18)
! dnl Copyright (C) 2001-2005, 2008-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # lib-prefix.m4 serial 7 (gettext-0.18)
! dnl Copyright (C) 2001-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/libunistring-base.m4 texinfo-6.3/gnulib/m4/libunistring-base.m4
*** texinfo-6.1/gnulib/m4/libunistring-base.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/libunistring-base.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # libunistring-base.m4 serial 5
! dnl Copyright (C) 2010-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # libunistring-base.m4 serial 5
! dnl Copyright (C) 2010-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/localcharset.m4 texinfo-6.3/gnulib/m4/localcharset.m4
*** texinfo-6.1/gnulib/m4/localcharset.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/localcharset.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # localcharset.m4 serial 7
! dnl Copyright (C) 2002, 2004, 2006, 2009-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # localcharset.m4 serial 7
! dnl Copyright (C) 2002, 2004, 2006, 2009-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/locale-fr.m4 texinfo-6.3/gnulib/m4/locale-fr.m4
*** texinfo-6.1/gnulib/m4/locale-fr.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/locale-fr.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # locale-fr.m4 serial 17
! dnl Copyright (C) 2003, 2005-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # locale-fr.m4 serial 17
! dnl Copyright (C) 2003, 2005-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/locale-ja.m4 texinfo-6.3/gnulib/m4/locale-ja.m4
*** texinfo-6.1/gnulib/m4/locale-ja.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/locale-ja.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # locale-ja.m4 serial 12
! dnl Copyright (C) 2003, 2005-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # locale-ja.m4 serial 12
! dnl Copyright (C) 2003, 2005-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/locale-zh.m4 texinfo-6.3/gnulib/m4/locale-zh.m4
*** texinfo-6.1/gnulib/m4/locale-zh.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/locale-zh.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # locale-zh.m4 serial 12
! dnl Copyright (C) 2003, 2005-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # locale-zh.m4 serial 12
! dnl Copyright (C) 2003, 2005-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/locale_h.m4 texinfo-6.3/gnulib/m4/locale_h.m4
*** texinfo-6.1/gnulib/m4/locale_h.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/locale_h.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # locale_h.m4 serial 19
! dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # locale_h.m4 serial 19
! dnl Copyright (C) 2007, 2009-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/localeconv.m4 texinfo-6.3/gnulib/m4/localeconv.m4
*** texinfo-6.1/gnulib/m4/localeconv.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/localeconv.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # localeconv.m4 serial 1
! dnl Copyright (C) 2012-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # localeconv.m4 serial 1
! dnl Copyright (C) 2012-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/lock.m4 texinfo-6.3/gnulib/m4/lock.m4
*** texinfo-6.1/gnulib/m4/lock.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/lock.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # lock.m4 serial 13 (gettext-0.18.2)
! dnl Copyright (C) 2005-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # lock.m4 serial 13 (gettext-0.18.2)
! dnl Copyright (C) 2005-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/longlong.m4 texinfo-6.3/gnulib/m4/longlong.m4
*** texinfo-6.1/gnulib/m4/longlong.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/longlong.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # longlong.m4 serial 17
! dnl Copyright (C) 1999-2007, 2009-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # longlong.m4 serial 17
! dnl Copyright (C) 1999-2007, 2009-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/malloc.m4 texinfo-6.3/gnulib/m4/malloc.m4
*** texinfo-6.1/gnulib/m4/malloc.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/malloc.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
! # malloc.m4 serial 14
! dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
! # malloc.m4 serial 15
! dnl Copyright (C) 2007, 2009-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,
***************
*** 7,12 ****
  m4_version_prereq([2.70], [] ,[
  
! # This is taken from the following Autoconf patch:
! # http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=7fbb553727ed7e0e689a17594b58559ecf3ea6e9
  AC_DEFUN([_AC_FUNC_MALLOC_IF],
  [
--- 7,12 ----
  m4_version_prereq([2.70], [] ,[
  
! # This is adapted with modifications from upstream Autoconf here:
! # http://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=04be2b7a29d65d9a08e64e8e56e594c91749598c
  AC_DEFUN([_AC_FUNC_MALLOC_IF],
  [
***************
*** 24,28 ****
              #endif
            ]],
!           [[return ! malloc (0);]])
         ],
         [ac_cv_func_malloc_0_nonnull=yes],
--- 24,31 ----
              #endif
            ]],
!           [[char *p = malloc (0);
!             int result = !p;
!             free (p);
!             return result;]])
         ],
         [ac_cv_func_malloc_0_nonnull=yes],
diff -Nrc2 texinfo-6.1/gnulib/m4/malloca.m4 texinfo-6.3/gnulib/m4/malloca.m4
*** texinfo-6.1/gnulib/m4/malloca.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/malloca.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # malloca.m4 serial 1
! dnl Copyright (C) 2003-2004, 2006-2007, 2009-2015 Free Software Foundation,
  dnl Inc.
  dnl This file is free software; the Free Software Foundation
--- 1,4 ----
  # malloca.m4 serial 1
! dnl Copyright (C) 2003-2004, 2006-2007, 2009-2016 Free Software Foundation,
  dnl Inc.
  dnl This file is free software; the Free Software Foundation
diff -Nrc2 texinfo-6.1/gnulib/m4/mbchar.m4 texinfo-6.3/gnulib/m4/mbchar.m4
*** texinfo-6.1/gnulib/m4/mbchar.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/mbchar.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # mbchar.m4 serial 9
! dnl Copyright (C) 2005-2007, 2009-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # mbchar.m4 serial 9
! dnl Copyright (C) 2005-2007, 2009-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/mbiter.m4 texinfo-6.3/gnulib/m4/mbiter.m4
*** texinfo-6.1/gnulib/m4/mbiter.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/mbiter.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # mbiter.m4 serial 7
! dnl Copyright (C) 2005, 2008-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # mbiter.m4 serial 7
! dnl Copyright (C) 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,
diff -Nrc2 texinfo-6.1/gnulib/m4/mbrtowc.m4 texinfo-6.3/gnulib/m4/mbrtowc.m4
*** texinfo-6.1/gnulib/m4/mbrtowc.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/mbrtowc.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
! # mbrtowc.m4 serial 26  -*- coding: utf-8 -*-
! dnl Copyright (C) 2001-2002, 2004-2005, 2008-2015 Free Software Foundation,
  dnl Inc.
  dnl This file is free software; the Free Software Foundation
--- 1,4 ----
! # mbrtowc.m4 serial 27  -*- coding: utf-8 -*-
! dnl Copyright (C) 2001-2002, 2004-2005, 2008-2016 Free Software Foundation,
  dnl Inc.
  dnl This file is free software; the Free Software Foundation
***************
*** 41,44 ****
--- 41,45 ----
        gl_MBRTOWC_NUL_RETVAL
        gl_MBRTOWC_EMPTY_INPUT
+       gl_MBRTOWC_C_LOCALE
        case "$gl_cv_func_mbrtowc_null_arg1" in
          *yes) ;;
***************
*** 77,80 ****
--- 78,88 ----
             ;;
        esac
+       case $gl_cv_C_locale_sans_EILSEQ in
+         *yes) ;;
+         *) AC_DEFINE([C_LOCALE_MAYBE_EILSEQ], [1],
+              [Define to 1 if the C locale may have encoding errors.])
+            REPLACE_MBRTOWC=1
+            ;;
+       esac
      fi
    fi
***************
*** 570,574 ****
             main (void)
             {
!              return ! mbrtowc (&wc, "", 0, &mbs) == (size_t) -2;
             }]])],
          [gl_cv_func_mbrtowc_empty_input=yes],
--- 578,582 ----
             main (void)
             {
!              return mbrtowc (&wc, "", 0, &mbs) != (size_t) -2;
             }]])],
          [gl_cv_func_mbrtowc_empty_input=yes],
***************
*** 578,581 ****
--- 586,629 ----
  ])
  
+ dnl Test whether mbrtowc reports encoding errors in the C locale.
+ dnl Although POSIX was never intended to allow this, the GNU C Library
+ dnl and other implementations do it.  See:
+ dnl https://sourceware.org/bugzilla/show_bug.cgi?id=19932
+ 
+ AC_DEFUN([gl_MBRTOWC_C_LOCALE],
+ [
+   AC_CACHE_CHECK([whether the C locale is free of encoding errors],
+     [gl_cv_C_locale_sans_EILSEQ],
+     [
+      dnl Initial guess, used when cross-compiling or when no suitable locale
+      dnl is present.
+      gl_cv_C_locale_sans_EILSEQ="guessing no"
+ 
+      AC_RUN_IFELSE(
+        [AC_LANG_PROGRAM(
+           [[#include <limits.h>
+             #include <locale.h>
+             #include <wchar.h>
+           ]], [[
+             int i;
+             char *locale = setlocale (LC_ALL, "C");
+             if (! locale)
+               return 1;
+             for (i = CHAR_MIN; i <= CHAR_MAX; i++)
+               {
+                 char c = i;
+                 wchar_t wc;
+                 mbstate_t mbs = { 0, };
+                 size_t ss = mbrtowc (&wc, &c, 1, &mbs);
+                 if (1 < ss)
+                   return 1;
+               }
+             return 0;
+           ]])],
+       [gl_cv_C_locale_sans_EILSEQ=yes],
+       [gl_cv_C_locale_sans_EILSEQ=no],
+       [:])])
+ ])
+ 
  # Prerequisites of lib/mbrtowc.c.
  AC_DEFUN([gl_PREREQ_MBRTOWC], [
diff -Nrc2 texinfo-6.1/gnulib/m4/mbsinit.m4 texinfo-6.3/gnulib/m4/mbsinit.m4
*** texinfo-6.1/gnulib/m4/mbsinit.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/mbsinit.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # mbsinit.m4 serial 8
! dnl Copyright (C) 2008, 2010-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # mbsinit.m4 serial 8
! dnl Copyright (C) 2008, 2010-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/mbslen.m4 texinfo-6.3/gnulib/m4/mbslen.m4
*** texinfo-6.1/gnulib/m4/mbslen.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/mbslen.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # mbslen.m4 serial 2
! dnl Copyright (C) 2010-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # mbslen.m4 serial 2
! dnl Copyright (C) 2010-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/mbstate_t.m4 texinfo-6.3/gnulib/m4/mbstate_t.m4
*** texinfo-6.1/gnulib/m4/mbstate_t.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/mbstate_t.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # mbstate_t.m4 serial 13
! dnl Copyright (C) 2000-2002, 2008-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # mbstate_t.m4 serial 13
! dnl Copyright (C) 2000-2002, 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,
diff -Nrc2 texinfo-6.1/gnulib/m4/mbswidth.m4 texinfo-6.3/gnulib/m4/mbswidth.m4
*** texinfo-6.1/gnulib/m4/mbswidth.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/mbswidth.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # mbswidth.m4 serial 18
! dnl Copyright (C) 2000-2002, 2004, 2006-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # mbswidth.m4 serial 18
! dnl Copyright (C) 2000-2002, 2004, 2006-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/mbtowc.m4 texinfo-6.3/gnulib/m4/mbtowc.m4
*** texinfo-6.1/gnulib/m4/mbtowc.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/mbtowc.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # mbtowc.m4 serial 2
! dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # mbtowc.m4 serial 2
! dnl Copyright (C) 2011-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/memchr.m4 texinfo-6.3/gnulib/m4/memchr.m4
*** texinfo-6.1/gnulib/m4/memchr.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/memchr.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # memchr.m4 serial 12
! dnl Copyright (C) 2002-2004, 2009-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # memchr.m4 serial 12
! dnl Copyright (C) 2002-2004, 2009-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/mempcpy.m4 texinfo-6.3/gnulib/m4/mempcpy.m4
*** texinfo-6.1/gnulib/m4/mempcpy.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/mempcpy.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # mempcpy.m4 serial 11
! dnl Copyright (C) 2003-2004, 2006-2007, 2009-2015 Free Software Foundation,
  dnl Inc.
  dnl This file is free software; the Free Software Foundation
--- 1,4 ----
  # mempcpy.m4 serial 11
! dnl Copyright (C) 2003-2004, 2006-2007, 2009-2016 Free Software Foundation,
  dnl Inc.
  dnl This file is free software; the Free Software Foundation
diff -Nrc2 texinfo-6.1/gnulib/m4/memrchr.m4 texinfo-6.3/gnulib/m4/memrchr.m4
*** texinfo-6.1/gnulib/m4/memrchr.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/memrchr.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # memrchr.m4 serial 10
! dnl Copyright (C) 2002-2003, 2005-2007, 2009-2015 Free Software Foundation,
  dnl Inc.
  dnl This file is free software; the Free Software Foundation
--- 1,4 ----
  # memrchr.m4 serial 10
! dnl Copyright (C) 2002-2003, 2005-2007, 2009-2016 Free Software Foundation,
  dnl Inc.
  dnl This file is free software; the Free Software Foundation
diff -Nrc2 texinfo-6.1/gnulib/m4/mmap-anon.m4 texinfo-6.3/gnulib/m4/mmap-anon.m4
*** texinfo-6.1/gnulib/m4/mmap-anon.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/mmap-anon.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # mmap-anon.m4 serial 10
! dnl Copyright (C) 2005, 2007, 2009-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # mmap-anon.m4 serial 10
! dnl Copyright (C) 2005, 2007, 2009-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/msvc-inval.m4 texinfo-6.3/gnulib/m4/msvc-inval.m4
*** texinfo-6.1/gnulib/m4/msvc-inval.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/msvc-inval.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # msvc-inval.m4 serial 1
! dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # msvc-inval.m4 serial 1
! dnl Copyright (C) 2011-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/msvc-nothrow.m4 texinfo-6.3/gnulib/m4/msvc-nothrow.m4
*** texinfo-6.1/gnulib/m4/msvc-nothrow.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/msvc-nothrow.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # msvc-nothrow.m4 serial 1
! dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # msvc-nothrow.m4 serial 1
! dnl Copyright (C) 2011-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/multiarch.m4 texinfo-6.3/gnulib/m4/multiarch.m4
*** texinfo-6.1/gnulib/m4/multiarch.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/multiarch.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # multiarch.m4 serial 7
! dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # multiarch.m4 serial 7
! dnl Copyright (C) 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,
diff -Nrc2 texinfo-6.1/gnulib/m4/nl_langinfo.m4 texinfo-6.3/gnulib/m4/nl_langinfo.m4
*** texinfo-6.1/gnulib/m4/nl_langinfo.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/nl_langinfo.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # nl_langinfo.m4 serial 5
! dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # nl_langinfo.m4 serial 5
! dnl Copyright (C) 2009-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/nls.m4 texinfo-6.3/gnulib/m4/nls.m4
*** texinfo-6.1/gnulib/m4/nls.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/nls.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,10 ****
  # nls.m4 serial 5 (gettext-0.18)
! dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
! dnl 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 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
--- 1,10 ----
  # 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
***************
*** 12,16 ****
  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 package is covered by the GNU General Public License.
  dnl They are *not* in the public domain.
  
--- 12,16 ----
  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.
  
diff -Nrc2 texinfo-6.1/gnulib/m4/nocrash.m4 texinfo-6.3/gnulib/m4/nocrash.m4
*** texinfo-6.1/gnulib/m4/nocrash.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/nocrash.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # nocrash.m4 serial 4
! dnl Copyright (C) 2005, 2009-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # nocrash.m4 serial 4
! dnl Copyright (C) 2005, 2009-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,
***************
*** 111,119 ****
  /* Avoid a crash on POSIX systems.  */
  #include <signal.h>
  /* A POSIX signal handler.  */
  static void
  exception_handler (int sig)
  {
!   exit (1);
  }
  static void
--- 111,120 ----
  /* Avoid a crash on POSIX systems.  */
  #include <signal.h>
+ #include <unistd.h>
  /* A POSIX signal handler.  */
  static void
  exception_handler (int sig)
  {
!   _exit (1);
  }
  static void
diff -Nrc2 texinfo-6.1/gnulib/m4/off_t.m4 texinfo-6.3/gnulib/m4/off_t.m4
*** texinfo-6.1/gnulib/m4/off_t.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/off_t.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # off_t.m4 serial 1
! dnl Copyright (C) 2012-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # off_t.m4 serial 1
! dnl Copyright (C) 2012-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/onceonly.m4 texinfo-6.3/gnulib/m4/onceonly.m4
*** texinfo-6.1/gnulib/m4/onceonly.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/onceonly.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # onceonly.m4 serial 9
! dnl Copyright (C) 2002-2003, 2005-2006, 2008-2015 Free Software Foundation,
  dnl Inc.
  dnl
--- 1,4 ----
  # onceonly.m4 serial 9
! dnl Copyright (C) 2002-2003, 2005-2006, 2008-2016 Free Software Foundation,
  dnl Inc.
  dnl
diff -Nrc2 texinfo-6.1/gnulib/m4/po.m4 texinfo-6.3/gnulib/m4/po.m4
*** texinfo-6.1/gnulib/m4/po.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/po.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,9 ****
  # po.m4 serial 24 (gettext-0.19)
! dnl Copyright (C) 1995-2014 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 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
--- 1,9 ----
  # 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
***************
*** 11,15 ****
  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 package is covered by the GNU General Public License.
  dnl They are *not* in the public domain.
  
--- 11,15 ----
  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.
  
diff -Nrc2 texinfo-6.1/gnulib/m4/printf.m4 texinfo-6.3/gnulib/m4/printf.m4
*** texinfo-6.1/gnulib/m4/printf.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/printf.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # printf.m4 serial 52
! dnl Copyright (C) 2003, 2007-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # printf.m4 serial 52
! dnl Copyright (C) 2003, 2007-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/progtest.m4 texinfo-6.3/gnulib/m4/progtest.m4
*** texinfo-6.1/gnulib/m4/progtest.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/progtest.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # progtest.m4 serial 7 (gettext-0.18.2)
! dnl Copyright (C) 1996-2003, 2005, 2008-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # 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,
diff -Nrc2 texinfo-6.1/gnulib/m4/regex.m4 texinfo-6.3/gnulib/m4/regex.m4
*** texinfo-6.1/gnulib/m4/regex.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/regex.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,5 ****
! # serial 65
  
! # Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
  #
  # This file is free software; the Free Software Foundation
--- 1,5 ----
! # serial 66
  
! # Copyright (C) 1996-2001, 2003-2016 Free Software Foundation, Inc.
  #
  # This file is free software; the Free Software Foundation
***************
*** 94,97 ****
--- 94,98 ----
                             != -1)
                      result |= 1;
+                   regfree (&regex);
                  }
  
***************
*** 125,128 ****
--- 126,130 ----
                          result |= 1;
                      }
+                   regfree (&regex);
                  }
  
diff -Nrc2 texinfo-6.1/gnulib/m4/size_max.m4 texinfo-6.3/gnulib/m4/size_max.m4
*** texinfo-6.1/gnulib/m4/size_max.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/size_max.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # size_max.m4 serial 10
! dnl Copyright (C) 2003, 2005-2006, 2008-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # size_max.m4 serial 10
! dnl Copyright (C) 2003, 2005-2006, 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,
diff -Nrc2 texinfo-6.1/gnulib/m4/ssize_t.m4 texinfo-6.3/gnulib/m4/ssize_t.m4
*** texinfo-6.1/gnulib/m4/ssize_t.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/ssize_t.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # ssize_t.m4 serial 5 (gettext-0.18.2)
! dnl Copyright (C) 2001-2003, 2006, 2010-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # ssize_t.m4 serial 5 (gettext-0.18.2)
! dnl Copyright (C) 2001-2003, 2006, 2010-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/stdarg.m4 texinfo-6.3/gnulib/m4/stdarg.m4
*** texinfo-6.1/gnulib/m4/stdarg.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/stdarg.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # stdarg.m4 serial 6
! dnl Copyright (C) 2006, 2008-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # stdarg.m4 serial 6
! dnl Copyright (C) 2006, 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,
diff -Nrc2 texinfo-6.1/gnulib/m4/stdbool.m4 texinfo-6.3/gnulib/m4/stdbool.m4
*** texinfo-6.1/gnulib/m4/stdbool.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/stdbool.m4	2016-08-30 18:31:36.000000000 +0100
***************
*** 1,10 ****
  # Check for stdbool.h that conforms to C99.
  
! dnl Copyright (C) 2002-2006, 2009-2015 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.
  
! #serial 5
  
  # Prepare for substituting <stdbool.h> if it is not supported.
--- 1,10 ----
  # Check for stdbool.h that conforms to C99.
  
! dnl Copyright (C) 2002-2006, 2009-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.
  
! #serial 7
  
  # Prepare for substituting <stdbool.h> if it is not supported.
***************
*** 44,67 ****
             [[
               #include <stdbool.h>
!              #ifndef bool
!               "error: bool is not defined"
!              #endif
!              #ifndef false
!               "error: false is not defined"
!              #endif
!              #if false
!               "error: false is not 0"
!              #endif
!              #ifndef true
!               "error: true is not defined"
!              #endif
!              #if true != 1
!               "error: true is not 1"
               #endif
               #ifndef __bool_true_false_are_defined
                "error: __bool_true_false_are_defined is not defined"
               #endif
  
!              struct s { _Bool s: 1; _Bool t; } s;
  
               char a[true == 1 ? 1 : -1];
--- 44,74 ----
             [[
               #include <stdbool.h>
! 
!              #ifdef __cplusplus
!               typedef bool Bool;
!              #else
!               typedef _Bool Bool;
!               #ifndef bool
!                "error: bool is not defined"
!               #endif
!               #ifndef false
!                "error: false is not defined"
!               #endif
!               #if false
!                "error: false is not 0"
!               #endif
!               #ifndef true
!                "error: true is not defined"
!               #endif
!               #if true != 1
!                "error: true is not 1"
!               #endif
               #endif
+ 
               #ifndef __bool_true_false_are_defined
                "error: __bool_true_false_are_defined is not defined"
               #endif
  
!              struct s { Bool s: 1; Bool t; bool u: 1; bool v; } s;
  
               char a[true == 1 ? 1 : -1];
***************
*** 70,97 ****
               char d[(bool) 0.5 == true ? 1 : -1];
               /* See body of main program for 'e'.  */
!              char f[(_Bool) 0.0 == false ? 1 : -1];
               char g[true];
!              char h[sizeof (_Bool)];
               char i[sizeof s.t];
               enum { j = false, k = true, l = false * true, m = true * 256 };
               /* The following fails for
                  HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
!              _Bool n[m];
               char o[sizeof n == m * sizeof n[0] ? 1 : -1];
!              char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
               /* Catch a bug in an HP-UX C compiler.  See
                  http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
                  http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
                */
!              _Bool q = true;
!              _Bool *pq = &q;
             ]],
             [[
               bool e = &s;
!              *pq |= q;
!              *pq |= ! q;
               /* Refer to every declared value, to avoid compiler optimizations.  */
               return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
!                      + !m + !n + !o + !p + !q + !pq);
             ]])],
          [ac_cv_header_stdbool_h=yes],
--- 77,105 ----
               char d[(bool) 0.5 == true ? 1 : -1];
               /* See body of main program for 'e'.  */
!              char f[(Bool) 0.0 == false ? 1 : -1];
               char g[true];
!              char h[sizeof (Bool)];
               char i[sizeof s.t];
               enum { j = false, k = true, l = false * true, m = true * 256 };
               /* The following fails for
                  HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
!              Bool n[m];
               char o[sizeof n == m * sizeof n[0] ? 1 : -1];
!              char p[-1 - (Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
               /* Catch a bug in an HP-UX C compiler.  See
                  http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
                  http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
                */
!              Bool q = true;
!              Bool *pq = &q;
!              bool *qq = &q;
             ]],
             [[
               bool e = &s;
!              *pq |= q; *pq |= ! q;
!              *qq |= q; *qq |= ! q;
               /* Refer to every declared value, to avoid compiler optimizations.  */
               return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
!                      + !m + !n + !o + !p + !q + !pq + !qq);
             ]])],
          [ac_cv_header_stdbool_h=yes],
diff -Nrc2 texinfo-6.1/gnulib/m4/stddef_h.m4 texinfo-6.3/gnulib/m4/stddef_h.m4
*** texinfo-6.1/gnulib/m4/stddef_h.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/stddef_h.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,5 ****
  dnl A placeholder for <stddef.h>, for platforms that have issues.
  # stddef_h.m4 serial 5
! dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,5 ----
  dnl A placeholder for <stddef.h>, for platforms that have issues.
  # stddef_h.m4 serial 5
! dnl Copyright (C) 2009-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/stdint.m4 texinfo-6.3/gnulib/m4/stdint.m4
*** texinfo-6.1/gnulib/m4/stdint.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/stdint.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
! # stdint.m4 serial 43
! dnl Copyright (C) 2001-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
! # stdint.m4 serial 44
! dnl Copyright (C) 2001-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,
***************
*** 71,74 ****
--- 71,76 ----
           AC_LANG_PROGRAM([[
  #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+ #define __STDC_CONSTANT_MACROS 1
+ #define __STDC_LIMIT_MACROS 1
  #include <stdint.h>
  /* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
***************
*** 219,222 ****
--- 221,226 ----
              AC_LANG_PROGRAM([[
  #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+ #define __STDC_CONSTANT_MACROS 1
+ #define __STDC_LIMIT_MACROS 1
  #include <stdint.h>
  ]
***************
*** 280,283 ****
--- 284,310 ----
    fi
    if test "$gl_cv_header_working_stdint_h" = yes; then
+     dnl Now see whether the system <stdint.h> works without
+     dnl __STDC_CONSTANT_MACROS/__STDC_LIMIT_MACROS defined.
+     AC_CACHE_CHECK([whether stdint.h predates C++11],
+       [gl_cv_header_stdint_predates_cxx11_h],
+       [gl_cv_header_stdint_predates_cxx11_h=yes
+        AC_COMPILE_IFELSE([
+ 	 AC_LANG_PROGRAM([[
+ #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+ #include <stdint.h>
+ ]
+ gl_STDINT_INCLUDES
+ [
+ intmax_t im = INTMAX_MAX;
+ int32_t i32 = INT32_C (0x7fffffff);
+          ]])],
+          [gl_cv_header_stdint_predates_cxx11_h=no])])
+ 
+     if test "$gl_cv_header_stdint_predates_cxx11_h" = yes; then
+       AC_DEFINE([__STDC_CONSTANT_MACROS], [1],
+                 [Define to 1 if the system <stdint.h> predates C++11.])
+       AC_DEFINE([__STDC_LIMIT_MACROS], [1],
+                 [Define to 1 if the system <stdint.h> predates C++11.])
+     fi
      STDINT_H=
    else
diff -Nrc2 texinfo-6.1/gnulib/m4/stdint_h.m4 texinfo-6.3/gnulib/m4/stdint_h.m4
*** texinfo-6.1/gnulib/m4/stdint_h.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/stdint_h.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # stdint_h.m4 serial 9
! dnl Copyright (C) 1997-2004, 2006, 2008-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # stdint_h.m4 serial 9
! dnl Copyright (C) 1997-2004, 2006, 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,
diff -Nrc2 texinfo-6.1/gnulib/m4/stdio_h.m4 texinfo-6.3/gnulib/m4/stdio_h.m4
*** texinfo-6.1/gnulib/m4/stdio_h.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/stdio_h.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # stdio_h.m4 serial 46
! dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # stdio_h.m4 serial 46
! dnl Copyright (C) 2007-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/stdlib_h.m4 texinfo-6.3/gnulib/m4/stdlib_h.m4
*** texinfo-6.1/gnulib/m4/stdlib_h.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/stdlib_h.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # stdlib_h.m4 serial 42
! dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # stdlib_h.m4 serial 42
! dnl Copyright (C) 2007-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/stpcpy.m4 texinfo-6.3/gnulib/m4/stpcpy.m4
*** texinfo-6.1/gnulib/m4/stpcpy.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/stpcpy.m4	2016-07-30 20:33:18.000000000 +0100
***************
*** 1,4 ****
  # stpcpy.m4 serial 8
! dnl Copyright (C) 2002, 2007, 2009-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # stpcpy.m4 serial 8
! dnl Copyright (C) 2002, 2007, 2009-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/strcase.m4 texinfo-6.3/gnulib/m4/strcase.m4
*** texinfo-6.1/gnulib/m4/strcase.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/strcase.m4	2016-07-30 20:33:19.000000000 +0100
***************
*** 1,4 ****
  # strcase.m4 serial 11
! dnl Copyright (C) 2002, 2005-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # strcase.m4 serial 11
! dnl Copyright (C) 2002, 2005-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/strcasestr.m4 texinfo-6.3/gnulib/m4/strcasestr.m4
*** texinfo-6.1/gnulib/m4/strcasestr.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/strcasestr.m4	2016-07-30 20:33:19.000000000 +0100
***************
*** 1,4 ****
  # strcasestr.m4 serial 21
! dnl Copyright (C) 2005, 2007-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # strcasestr.m4 serial 21
! dnl Copyright (C) 2005, 2007-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,
***************
*** 81,85 ****
  #include <stdlib.h> /* for malloc */
  #include <unistd.h> /* for alarm */
! static void quit (int sig) { exit (sig + 128); }
  ]], [[
      int result = 0;
--- 81,85 ----
  #include <stdlib.h> /* for malloc */
  #include <unistd.h> /* for alarm */
! static void quit (int sig) { _exit (sig + 128); }
  ]], [[
      int result = 0;
diff -Nrc2 texinfo-6.1/gnulib/m4/strdup.m4 texinfo-6.3/gnulib/m4/strdup.m4
*** texinfo-6.1/gnulib/m4/strdup.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/strdup.m4	2016-07-30 20:33:19.000000000 +0100
***************
*** 1,5 ****
  # strdup.m4 serial 13
  
! dnl Copyright (C) 2002-2015 Free Software Foundation, Inc.
  
  dnl This file is free software; the Free Software Foundation
--- 1,5 ----
  # strdup.m4 serial 13
  
! dnl Copyright (C) 2002-2016 Free Software Foundation, Inc.
  
  dnl This file is free software; the Free Software Foundation
diff -Nrc2 texinfo-6.1/gnulib/m4/strerror.m4 texinfo-6.3/gnulib/m4/strerror.m4
*** texinfo-6.1/gnulib/m4/strerror.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/strerror.m4	2016-07-30 20:33:19.000000000 +0100
***************
*** 1,4 ****
  # strerror.m4 serial 17
! dnl Copyright (C) 2002, 2007-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # strerror.m4 serial 17
! dnl Copyright (C) 2002, 2007-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/string_h.m4 texinfo-6.3/gnulib/m4/string_h.m4
*** texinfo-6.1/gnulib/m4/string_h.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/string_h.m4	2016-07-30 20:33:19.000000000 +0100
***************
*** 1,5 ****
  # Configure a GNU-like replacement for <string.h>.
  
! # Copyright (C) 2007-2015 Free Software Foundation, Inc.
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
--- 1,5 ----
  # Configure a GNU-like replacement for <string.h>.
  
! # Copyright (C) 2007-2016 Free Software Foundation, Inc.
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
diff -Nrc2 texinfo-6.1/gnulib/m4/strings_h.m4 texinfo-6.3/gnulib/m4/strings_h.m4
*** texinfo-6.1/gnulib/m4/strings_h.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/strings_h.m4	2016-07-30 20:33:19.000000000 +0100
***************
*** 2,6 ****
  # serial 6
  
! # Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
--- 2,6 ----
  # serial 6
  
! # Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc.
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
diff -Nrc2 texinfo-6.1/gnulib/m4/strndup.m4 texinfo-6.3/gnulib/m4/strndup.m4
*** texinfo-6.1/gnulib/m4/strndup.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/strndup.m4	2016-07-30 20:33:19.000000000 +0100
***************
*** 1,4 ****
! # strndup.m4 serial 21
! dnl Copyright (C) 2002-2003, 2005-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
! # strndup.m4 serial 22
! dnl Copyright (C) 2002-2003, 2005-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,
***************
*** 32,40 ****
    char *strndup (const char *, size_t);
  #endif
    char *s;
    s = strndup ("some longer string", 15);
    free (s);
    s = strndup ("shorter string", 13);
!   return s[13] != '\0';]])],
           [gl_cv_func_strndup_works=yes],
           [gl_cv_func_strndup_works=no],
--- 32,43 ----
    char *strndup (const char *, size_t);
  #endif
+   int result;
    char *s;
    s = strndup ("some longer string", 15);
    free (s);
    s = strndup ("shorter string", 13);
!   result = s[13] != '\0';
!   free (s);
!   return result;]])],
           [gl_cv_func_strndup_works=yes],
           [gl_cv_func_strndup_works=no],
diff -Nrc2 texinfo-6.1/gnulib/m4/strnlen.m4 texinfo-6.3/gnulib/m4/strnlen.m4
*** texinfo-6.1/gnulib/m4/strnlen.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/strnlen.m4	2016-07-30 20:33:19.000000000 +0100
***************
*** 1,4 ****
  # strnlen.m4 serial 13
! dnl Copyright (C) 2002-2003, 2005-2007, 2009-2015 Free Software Foundation,
  dnl Inc.
  dnl This file is free software; the Free Software Foundation
--- 1,4 ----
  # strnlen.m4 serial 13
! dnl Copyright (C) 2002-2003, 2005-2007, 2009-2016 Free Software Foundation,
  dnl Inc.
  dnl This file is free software; the Free Software Foundation
diff -Nrc2 texinfo-6.1/gnulib/m4/strstr.m4 texinfo-6.3/gnulib/m4/strstr.m4
*** texinfo-6.1/gnulib/m4/strstr.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/strstr.m4	2016-08-30 18:31:36.000000000 +0100
***************
*** 1,4 ****
! # strstr.m4 serial 16
! dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
! # strstr.m4 serial 17
! dnl Copyright (C) 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,
***************
*** 68,76 ****
        [gl_cv_func_strstr_linear],
        [AC_RUN_IFELSE([AC_LANG_PROGRAM([[
  #include <signal.h> /* for signal */
  #include <string.h> /* for strstr */
  #include <stdlib.h> /* for malloc */
  #include <unistd.h> /* for alarm */
! static void quit (int sig) { exit (sig + 128); }
  ]], [[
      int result = 0;
--- 68,82 ----
        [gl_cv_func_strstr_linear],
        [AC_RUN_IFELSE([AC_LANG_PROGRAM([[
+ #ifdef __MVS__
+ /* z/OS does not deliver signals while strstr() is running (thanks to
+    restrictions on its LE runtime), which prevents us from limiting the
+    running time of this test.  */
+ # error "This test does not work properly on z/OS"
+ #endif
  #include <signal.h> /* for signal */
  #include <string.h> /* for strstr */
  #include <stdlib.h> /* for malloc */
  #include <unistd.h> /* for alarm */
! static void quit (int sig) { _exit (sig + 128); }
  ]], [[
      int result = 0;
diff -Nrc2 texinfo-6.1/gnulib/m4/sys_socket_h.m4 texinfo-6.3/gnulib/m4/sys_socket_h.m4
*** texinfo-6.1/gnulib/m4/sys_socket_h.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/sys_socket_h.m4	2016-07-30 20:33:19.000000000 +0100
***************
*** 1,4 ****
  # sys_socket_h.m4 serial 23
! dnl Copyright (C) 2005-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # sys_socket_h.m4 serial 23
! dnl Copyright (C) 2005-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/sys_types_h.m4 texinfo-6.3/gnulib/m4/sys_types_h.m4
*** texinfo-6.1/gnulib/m4/sys_types_h.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/sys_types_h.m4	2016-07-30 20:33:19.000000000 +0100
***************
*** 1,4 ****
  # sys_types_h.m4 serial 5
! dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # sys_types_h.m4 serial 5
! dnl Copyright (C) 2011-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/threadlib.m4 texinfo-6.3/gnulib/m4/threadlib.m4
*** texinfo-6.1/gnulib/m4/threadlib.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/threadlib.m4	2016-07-30 20:33:19.000000000 +0100
***************
*** 1,4 ****
  # threadlib.m4 serial 11 (gettext-0.18.2)
! dnl Copyright (C) 2005-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # threadlib.m4 serial 11 (gettext-0.18.2)
! dnl Copyright (C) 2005-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/unistd_h.m4 texinfo-6.3/gnulib/m4/unistd_h.m4
*** texinfo-6.1/gnulib/m4/unistd_h.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/unistd_h.m4	2016-07-30 20:33:19.000000000 +0100
***************
*** 1,4 ****
  # unistd_h.m4 serial 68
! dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # unistd_h.m4 serial 68
! dnl Copyright (C) 2006-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/vasnprintf.m4 texinfo-6.3/gnulib/m4/vasnprintf.m4
*** texinfo-6.1/gnulib/m4/vasnprintf.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/vasnprintf.m4	2016-07-30 20:33:19.000000000 +0100
***************
*** 1,4 ****
  # vasnprintf.m4 serial 36
! dnl Copyright (C) 2002-2004, 2006-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # vasnprintf.m4 serial 36
! dnl Copyright (C) 2002-2004, 2006-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/vasprintf.m4 texinfo-6.3/gnulib/m4/vasprintf.m4
*** texinfo-6.1/gnulib/m4/vasprintf.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/vasprintf.m4	2016-07-30 20:33:19.000000000 +0100
***************
*** 1,4 ****
  # vasprintf.m4 serial 6
! dnl Copyright (C) 2002-2003, 2006-2007, 2009-2015 Free Software Foundation,
  dnl Inc.
  dnl This file is free software; the Free Software Foundation
--- 1,4 ----
  # vasprintf.m4 serial 6
! dnl Copyright (C) 2002-2003, 2006-2007, 2009-2016 Free Software Foundation,
  dnl Inc.
  dnl This file is free software; the Free Software Foundation
diff -Nrc2 texinfo-6.1/gnulib/m4/warn-on-use.m4 texinfo-6.3/gnulib/m4/warn-on-use.m4
*** texinfo-6.1/gnulib/m4/warn-on-use.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/warn-on-use.m4	2016-07-30 20:33:19.000000000 +0100
***************
*** 1,4 ****
  # warn-on-use.m4 serial 5
! dnl Copyright (C) 2010-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # warn-on-use.m4 serial 5
! dnl Copyright (C) 2010-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/wchar_h.m4 texinfo-6.3/gnulib/m4/wchar_h.m4
*** texinfo-6.1/gnulib/m4/wchar_h.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/wchar_h.m4	2016-08-30 18:31:36.000000000 +0100
***************
*** 1,5 ****
  dnl A placeholder for ISO C99 <wchar.h>, for platforms that have issues.
  
! dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,5 ----
  dnl A placeholder for ISO C99 <wchar.h>, for platforms that have issues.
  
! dnl Copyright (C) 2007-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,
***************
*** 8,12 ****
  dnl Written by Eric Blake.
  
! # wchar_h.m4 serial 39
  
  AC_DEFUN([gl_WCHAR_H],
--- 8,12 ----
  dnl Written by Eric Blake.
  
! # wchar_h.m4 serial 40
  
  AC_DEFUN([gl_WCHAR_H],
***************
*** 82,87 ****
  int main () { return zero(); }
  ]])])
       if AC_TRY_EVAL([ac_compile]); then
-        mv conftest.$ac_objext conftest1.$ac_objext
         AC_LANG_CONFTEST([
           AC_LANG_SOURCE([[#define wcstod renamed_wcstod
--- 82,93 ----
  int main () { return zero(); }
  ]])])
+      dnl Do not rename the object file from conftest.$ac_objext to
+      dnl conftest1.$ac_objext, as this will cause the link to fail on
+      dnl z/OS when using the XPLINK object format (due to duplicate
+      dnl CSECT names). Instead, temporarily redefine $ac_compile so
+      dnl that the object file has the latter name from the start.
+      save_ac_compile="$ac_compile"
+      ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest1/`
       if AC_TRY_EVAL([ac_compile]); then
         AC_LANG_CONFTEST([
           AC_LANG_SOURCE([[#define wcstod renamed_wcstod
***************
*** 96,101 ****
  int zero (void) { return 0; }
  ]])])
         if AC_TRY_EVAL([ac_compile]); then
-          mv conftest.$ac_objext conftest2.$ac_objext
           if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&AS_MESSAGE_LOG_FD 2>&1; then
             :
--- 102,108 ----
  int zero (void) { return 0; }
  ]])])
+        dnl See note above about renaming object files.
+        ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest2/`
         if AC_TRY_EVAL([ac_compile]); then
           if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&AS_MESSAGE_LOG_FD 2>&1; then
             :
***************
*** 105,108 ****
--- 112,116 ----
         fi
       fi
+      ac_compile="$save_ac_compile"
       rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext
      ])
diff -Nrc2 texinfo-6.1/gnulib/m4/wchar_t.m4 texinfo-6.3/gnulib/m4/wchar_t.m4
*** texinfo-6.1/gnulib/m4/wchar_t.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/wchar_t.m4	2016-07-30 20:33:19.000000000 +0100
***************
*** 1,4 ****
  # wchar_t.m4 serial 4 (gettext-0.18.2)
! dnl Copyright (C) 2002-2003, 2008-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # wchar_t.m4 serial 4 (gettext-0.18.2)
! dnl Copyright (C) 2002-2003, 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,
diff -Nrc2 texinfo-6.1/gnulib/m4/wcrtomb.m4 texinfo-6.3/gnulib/m4/wcrtomb.m4
*** texinfo-6.1/gnulib/m4/wcrtomb.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/wcrtomb.m4	2016-07-30 20:33:19.000000000 +0100
***************
*** 1,4 ****
  # wcrtomb.m4 serial 11
! dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # wcrtomb.m4 serial 11
! dnl Copyright (C) 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,
diff -Nrc2 texinfo-6.1/gnulib/m4/wctype_h.m4 texinfo-6.3/gnulib/m4/wctype_h.m4
*** texinfo-6.1/gnulib/m4/wctype_h.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/wctype_h.m4	2016-07-30 20:33:19.000000000 +0100
***************
*** 3,7 ****
  dnl A placeholder for ISO C99 <wctype.h>, for platforms that lack it.
  
! dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 3,7 ----
  dnl A placeholder for ISO C99 <wctype.h>, for platforms that lack it.
  
! dnl Copyright (C) 2006-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/wcwidth.m4 texinfo-6.3/gnulib/m4/wcwidth.m4
*** texinfo-6.1/gnulib/m4/wcwidth.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/wcwidth.m4	2016-07-30 20:33:19.000000000 +0100
***************
*** 1,4 ****
  # wcwidth.m4 serial 23
! dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # wcwidth.m4 serial 23
! dnl Copyright (C) 2006-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,
***************
*** 40,43 ****
--- 40,44 ----
      dnl On OpenBSD 5.0, wcwidth(0x05B0) (HEBREW POINT SHEVA) returns 1.
      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).
      AC_CACHE_CHECK([whether wcwidth works reasonably in UTF-8 locales],
***************
*** 75,78 ****
--- 76,81 ----
        if (wcwidth (0x200B) > 0)
          result |= 4;
+       if (wcwidth (0xFF1A) == 0)
+         result |= 8;
      }
    return result;
diff -Nrc2 texinfo-6.1/gnulib/m4/wint_t.m4 texinfo-6.3/gnulib/m4/wint_t.m4
*** texinfo-6.1/gnulib/m4/wint_t.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/wint_t.m4	2016-07-30 20:33:19.000000000 +0100
***************
*** 1,4 ****
  # wint_t.m4 serial 5 (gettext-0.18.2)
! dnl Copyright (C) 2003, 2007-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # wint_t.m4 serial 5 (gettext-0.18.2)
! dnl Copyright (C) 2003, 2007-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/xalloc.m4 texinfo-6.3/gnulib/m4/xalloc.m4
*** texinfo-6.1/gnulib/m4/xalloc.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/xalloc.m4	2016-07-30 20:33:19.000000000 +0100
***************
*** 1,4 ****
  # xalloc.m4 serial 18
! dnl Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # xalloc.m4 serial 18
! dnl Copyright (C) 2002-2006, 2009-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,
diff -Nrc2 texinfo-6.1/gnulib/m4/xsize.m4 texinfo-6.3/gnulib/m4/xsize.m4
*** texinfo-6.1/gnulib/m4/xsize.m4	2016-01-09 15:29:38.000000000 +0000
--- texinfo-6.3/gnulib/m4/xsize.m4	2016-07-30 20:33:19.000000000 +0100
***************
*** 1,4 ****
  # xsize.m4 serial 5
! dnl Copyright (C) 2003-2004, 2008-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # xsize.m4 serial 5
! dnl Copyright (C) 2003-2004, 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,
diff -Nrc2 texinfo-6.1/info/Makefile.am texinfo-6.3/info/Makefile.am
*** texinfo-6.1/info/Makefile.am	2016-02-06 10:43:56.000000000 +0000
--- texinfo-6.3/info/Makefile.am	2016-09-07 01:43:16.000000000 +0100
***************
*** 1,3 ****
! # $Id: Makefile.am 6989 2016-02-06 10:38:22Z gavin $
  # Makefile.am for texinfo/info.
  #
--- 1,3 ----
! # $Id: Makefile.am 7259 2016-07-16 10:56:08Z gavin $
  # Makefile.am for texinfo/info.
  #
***************
*** 98,101 ****
--- 98,102 ----
  	t/dir-file.sh \
  	t/dir-file-sloppily.sh \
+ 	t/dir-merge.sh \
  	t/dir-nondir.sh \
  	t/dir-no-file.sh \
***************
*** 134,137 ****
--- 135,139 ----
  	t/search-after-tag.sh \
  	t/split-file-menu.sh \
+ 	t/search-split-after-index.sh \
  	t/index.sh \
  	t/no-index.sh \
diff -Nrc2 texinfo-6.1/info/Makefile.in texinfo-6.3/info/Makefile.in
*** texinfo-6.1/info/Makefile.in	2016-02-06 12:24:05.000000000 +0000
--- texinfo-6.3/info/Makefile.in	2016-09-10 20:29:56.000000000 +0100
***************
*** 15,19 ****
  @SET_MAKE@
  
! # $Id: Makefile.am 6989 2016-02-06 10:38:22Z gavin $
  # Makefile.am for texinfo/info.
  #
--- 15,19 ----
  @SET_MAKE@
  
! # $Id: Makefile.am 7259 2016-07-16 10:56:08Z gavin $
  # Makefile.am for texinfo/info.
  #
***************
*** 126,129 ****
--- 126,130 ----
  	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
  	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+ 	$(top_srcdir)/gnulib/m4/hard-locale.m4 \
  	$(top_srcdir)/gnulib/m4/iconv.m4 \
  	$(top_srcdir)/gnulib/m4/include_next.m4 \
***************
*** 1316,1319 ****
--- 1317,1321 ----
  	t/dir-file.sh \
  	t/dir-file-sloppily.sh \
+ 	t/dir-merge.sh \
  	t/dir-nondir.sh \
  	t/dir-no-file.sh \
***************
*** 1352,1355 ****
--- 1354,1358 ----
  	t/search-after-tag.sh \
  	t/split-file-menu.sh \
+ 	t/search-split-after-index.sh \
  	t/index.sh \
  	t/no-index.sh \
***************
*** 1816,1819 ****
--- 1819,1829 ----
  	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
  	"$$tst" $(AM_TESTS_FD_REDIRECT)
+ t/dir-merge.sh.log: t/dir-merge.sh
+ 	@p='t/dir-merge.sh'; \
+ 	b='t/dir-merge.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/dir-nondir.sh.log: t/dir-nondir.sh
  	@p='t/dir-nondir.sh'; \
***************
*** 2066,2069 ****
--- 2076,2086 ----
  	$(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/search-split-after-index.sh.log: t/search-split-after-index.sh
+ 	@p='t/search-split-after-index.sh'; \
+ 	b='t/search-split-after-index.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)
diff -Nrc2 texinfo-6.1/info/dir.c texinfo-6.3/info/dir.c
*** texinfo-6.1/info/dir.c	2016-02-06 12:20:23.000000000 +0000
--- texinfo-6.3/info/dir.c	2016-09-07 01:43:16.000000000 +0100
***************
*** 1,4 ****
  /* dir.c -- how to build a special "dir" node from "localdir" files.
!    $Id: dir.c 6906 2016-01-01 18:33:45Z karl $
  
     Copyright 1993, 1997, 1998, 2004, 2007, 2008, 2009, 2012,
--- 1,4 ----
  /* dir.c -- how to build a special "dir" node from "localdir" files.
!    $Id: dir.c 7260 2016-07-16 11:07:44Z gavin $
  
     Copyright 1993, 1997, 1998, 2004, 2007, 2008, 2009, 2012,
***************
*** 57,60 ****
--- 57,62 ----
  }
  
+ static char *dir_contents;
+ 
  static NODE *
  build_dir_node (void)
***************
*** 75,79 ****
  "\n"
  "  'q' quits;\n"
! "  '?' lists all Info commands;\n"
  "  'h' starts the Info tutorial;\n"
  "  'mTexinfo RET' visits the Texinfo manual, etc.\n"
--- 77,81 ----
  "\n"
  "  'q' quits;\n"
! "  'H' lists all Info commands;\n"
  "  'h' starts the Info tutorial;\n"
  "  'mTexinfo RET' visits the Texinfo manual, etc.\n"
***************
*** 140,143 ****
--- 142,146 ----
  
    node->flags |= N_IsDir;
+   dir_contents = node->contents;
    scan_node_contents (node, 0, 0);
    return node;
diff -Nrc2 texinfo-6.1/info/echo-area.h texinfo-6.3/info/echo-area.h
*** texinfo-6.1/info/echo-area.h	2016-02-06 12:20:23.000000000 +0000
--- texinfo-6.3/info/echo-area.h	2016-09-07 01:43:16.000000000 +0100
***************
*** 1,4 ****
  /* echo-area.h -- Functions used in reading information from the echo area.
!    $Id: echo-area.h 6906 2016-01-01 18:33:45Z karl $
  
     Copyright 1993, 1997, 2004, 2007, 2008, 2011, 2013, 2014, 2015, 2016
--- 1,4 ----
  /* echo-area.h -- Functions used in reading information from the echo area.
!    $Id: echo-area.h 7013 2016-02-13 21:19:19Z gavin $
  
     Copyright 1993, 1997, 2004, 2007, 2008, 2011, 2013, 2014, 2015, 2016
***************
*** 33,43 ****
  extern REFERENCE **echo_area_completion_items;
  
! extern void inform_in_echo_area (const char *message);
! extern void echo_area_inform_of_deleted_window (WINDOW *window);
! extern void echo_area_prep_read (void);
  
  typedef int (*reference_bool_fn) (REFERENCE *);
  
! extern char *info_read_completing_internal (const char *prompt,
      REFERENCE **completions, int force, reference_bool_fn exclude);
  
--- 33,43 ----
  extern REFERENCE **echo_area_completion_items;
  
! void inform_in_echo_area (const char *message);
! void echo_area_inform_of_deleted_window (WINDOW *window);
! void echo_area_prep_read (void);
  
  typedef int (*reference_bool_fn) (REFERENCE *);
  
! char *info_read_completing_internal (const char *prompt,
      REFERENCE **completions, int force, reference_bool_fn exclude);
  
***************
*** 45,49 ****
     or NULL if the user aborted out of this read.  PROMPT, if
     non-null, is a prompt to print before reading the line. */
! extern char *info_read_in_echo_area (const char *prompt);
  
  /* Read a line in the echo area with completion over COMPLETIONS. */
--- 45,49 ----
     or NULL if the user aborted out of this read.  PROMPT, if
     non-null, is a prompt to print before reading the line. */
! char *info_read_in_echo_area (const char *prompt);
  
  /* Read a line in the echo area with completion over COMPLETIONS. */
***************
*** 53,58 ****
  /* Read a line in the echo area allowing completion over COMPLETIONS, but
     not requiring it. */
! extern char *info_read_maybe_completing (const char *prompt,
!                                          REFERENCE **completions);
  
  /* Read a line in the echo area with completion over COMPLETIONS, using
--- 53,57 ----
  /* Read a line in the echo area allowing completion over COMPLETIONS, but
     not requiring it. */
! char *info_read_maybe_completing (const char *prompt, REFERENCE **completions);
  
  /* Read a line in the echo area with completion over COMPLETIONS, using
***************
*** 62,88 ****
      REFERENCE **completions, reference_bool_fn exclude);
  
! extern void ea_insert (WINDOW *window, int count, int key);
! extern void ea_quoted_insert (WINDOW *window, int count);
! extern void ea_beg_of_line (WINDOW *window, int count);
! extern void ea_backward (WINDOW *window, int count);
! extern void ea_delete (WINDOW *window, int count);
! extern void ea_end_of_line (WINDOW *window, int count);
! extern void ea_forward (WINDOW *window, int count);
! extern void ea_abort (WINDOW *window, int count);
! extern void ea_rubout (WINDOW *window, int count);
! extern void ea_complete (WINDOW *window, int count);
! extern void ea_newline (WINDOW *window, int count);
! extern void ea_kill_line (WINDOW *window, int count);
! extern void ea_backward_kill_line (WINDOW *window, int count);
! extern void ea_transpose_chars (WINDOW *window, int count);
! extern void ea_yank (WINDOW *window, int count);
! extern void ea_tab_insert (WINDOW *window, int count);
! extern void ea_possible_completions (WINDOW *window, int count);
! extern void ea_backward_word (WINDOW *window, int count);
! extern void ea_kill_word (WINDOW *window, int count);
! extern void ea_forward_word (WINDOW *window, int count);
! extern void ea_yank_pop (WINDOW *window, int count);
! extern void ea_backward_kill_word (WINDOW *window, int count);
! extern void ea_scroll_completions_window (WINDOW *window, int count);
  
  #endif /* not INFO_ECHO_AREA_H */
--- 61,87 ----
      REFERENCE **completions, reference_bool_fn exclude);
  
! void ea_insert (WINDOW *window, int count, int key);
! void ea_quoted_insert (WINDOW *window, int count);
! void ea_beg_of_line (WINDOW *window, int count);
! void ea_backward (WINDOW *window, int count);
! void ea_delete (WINDOW *window, int count);
! void ea_end_of_line (WINDOW *window, int count);
! void ea_forward (WINDOW *window, int count);
! void ea_abort (WINDOW *window, int count);
! void ea_rubout (WINDOW *window, int count);
! void ea_complete (WINDOW *window, int count);
! void ea_newline (WINDOW *window, int count);
! void ea_kill_line (WINDOW *window, int count);
! void ea_backward_kill_line (WINDOW *window, int count);
! void ea_transpose_chars (WINDOW *window, int count);
! void ea_yank (WINDOW *window, int count);
! void ea_tab_insert (WINDOW *window, int count);
! void ea_possible_completions (WINDOW *window, int count);
! void ea_backward_word (WINDOW *window, int count);
! void ea_kill_word (WINDOW *window, int count);
! void ea_forward_word (WINDOW *window, int count);
! void ea_yank_pop (WINDOW *window, int count);
! void ea_backward_kill_word (WINDOW *window, int count);
! void ea_scroll_completions_window (WINDOW *window, int count);
  
  #endif /* not INFO_ECHO_AREA_H */
diff -Nrc2 texinfo-6.1/info/filesys.h texinfo-6.3/info/filesys.h
*** texinfo-6.1/info/filesys.h	2014-12-29 11:29:54.000000000 +0000
--- texinfo-6.3/info/filesys.h	2016-09-07 01:43:16.000000000 +0100
***************
*** 1,7 ****
  /* filesys.h -- external declarations for filesys.c.
!    $Id: filesys.h 5609 2014-05-27 12:49:23Z gavin $
  
     Copyright 1993, 1997, 1998, 2002, 2004, 2005, 2007, 2009, 2012, 2013,
!    2014 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
--- 1,7 ----
  /* filesys.h -- external declarations for filesys.c.
!    $Id: filesys.h 7013 2016-02-13 21:19:19Z gavin $
  
     Copyright 1993, 1997, 1998, 2002, 2004, 2005, 2007, 2009, 2012, 2013,
!    2014, 2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
***************
*** 30,34 ****
  
  /* Add PATH to the list of paths found in INFOPATH. */
! extern void infopath_add (char *path);
  
  /* Iterate over INFOPATH */
--- 30,34 ----
  
  /* Add PATH to the list of paths found in INFOPATH. */
! void infopath_add (char *path);
  
  /* Iterate over INFOPATH */
***************
*** 39,52 ****
     system.  This looks in INFO_PATHS in order to find the correct file.
     If it can't find the file, it returns NULL. */
! extern char *info_find_fullpath (char *partial, struct stat *finfo);
  
  /* Scan the list of directories in PATH looking for FILENAME.  If we find
     one that is a regular file, return it as a new string.  Otherwise, return
     a NULL pointer. */
! extern char *info_file_find_next_in_path (char *filename,
! 					  int *diridx, struct stat *finfo);
  
! extern char *info_add_extension (char *dirname, char *filename,
!                                  struct stat *finfo);
  
  /* Read the contents of PATHNAME, returning a buffer with the contents of
--- 39,51 ----
     system.  This looks in INFO_PATHS in order to find the correct file.
     If it can't find the file, it returns NULL. */
! char *info_find_fullpath (char *partial, struct stat *finfo);
  
  /* Scan the list of directories in PATH looking for FILENAME.  If we find
     one that is a regular file, return it as a new string.  Otherwise, return
     a NULL pointer. */
! char *info_file_find_next_in_path (char *filename, int *diridx,
!                                    struct stat *finfo);
  
! char *info_add_extension (char *dirname, char *filename, struct stat *finfo);
  
  /* Read the contents of PATHNAME, returning a buffer with the contents of
***************
*** 54,63 ****
     FINFO is a stat struct which has already been filled in by the caller.
     If the file cannot be read, return a NULL pointer. */
! extern char *filesys_read_info_file (char *pathname, size_t *filesize,
      struct stat *finfo, int *is_compressed);
  
  /* A function which returns a pointer to a static buffer containing
     an error message for FILENAME and ERROR_NUM. */
! extern char *filesys_error_string (char *filename, int error_num);
  
  /* The number of the most recent file system error. */
--- 53,62 ----
     FINFO is a stat struct which has already been filled in by the caller.
     If the file cannot be read, return a NULL pointer. */
! char *filesys_read_info_file (char *pathname, size_t *filesize,
      struct stat *finfo, int *is_compressed);
  
  /* A function which returns a pointer to a static buffer containing
     an error message for FILENAME and ERROR_NUM. */
! char *filesys_error_string (char *filename, int error_num);
  
  /* The number of the most recent file system error. */
***************
*** 65,69 ****
  
  /* Return true if FILENAME is `dir', with a possible compression suffix.  */
! extern int is_dir_name (char *filename);
  
  /* The default value of INFOPATH. */
--- 64,68 ----
  
  /* Return true if FILENAME is `dir', with a possible compression suffix.  */
! int is_dir_name (char *filename);
  
  /* The default value of INFOPATH. */
diff -Nrc2 texinfo-6.1/info/indices.c texinfo-6.3/info/indices.c
*** texinfo-6.1/info/indices.c	2016-02-06 12:20:23.000000000 +0000
--- texinfo-6.3/info/indices.c	2016-09-07 01:43:16.000000000 +0100
***************
*** 1,4 ****
  /* indices.c -- deal with an Info file index.
!    $Id: indices.c 6906 2016-01-01 18:33:45Z karl $
  
     Copyright 1993, 1997, 1998, 1999, 2002, 2003, 2004, 2007, 2008, 2011,
--- 1,4 ----
  /* indices.c -- deal with an Info file index.
!    $Id: indices.c 7264 2016-07-17 16:44:53Z gavin $
  
     Copyright 1993, 1997, 1998, 1999, 2002, 2003, 2004, 2007, 2008, 2011,
***************
*** 559,563 ****
      {
        REFERENCE **this_index, *this_item;
!       FILE_BUFFER *this_fb;
  
        this_item = dir_menu[dir_index];
--- 559,563 ----
      {
        REFERENCE **this_index, *this_item;
!       FILE_BUFFER *this_fb, *loaded_file = 0;
  
        this_item = dir_menu[dir_index];
***************
*** 575,582 ****
          continue;
  
!       this_fb = info_find_file (this_item->filename);
  
        if (!this_fb)
!         continue;
  
        if (this_fb && inform)
--- 575,585 ----
          continue;
  
!       this_fb = check_loaded_file (this_item->filename);
  
        if (!this_fb)
!         this_fb = loaded_file = info_find_file (this_item->filename);
! 
!       if (!this_fb)
!         continue; /* Couldn't load file. */
  
        if (this_fb && inform)
***************
*** 603,609 ****
            }
          }
!       /* Try to avoid running out of memory */
!       free (this_fb->contents);
!       this_fb->contents = NULL;
      }
  
--- 606,619 ----
            }
          }
! 
!       /* Try to avoid running out of memory by not loading all of the
!          Info files on the system into memory.  This is risky because we
!          may have a pointer into the file buffer, so only free the contents
!          if we have just loaded the file. */
!       if (loaded_file)
!         {
!           free (loaded_file->contents);
!           loaded_file->contents = NULL;
!         }
      }
  
diff -Nrc2 texinfo-6.1/info/indices.h texinfo-6.3/info/indices.h
*** texinfo-6.1/info/indices.h	2016-02-06 12:20:23.000000000 +0000
--- texinfo-6.3/info/indices.h	2016-09-07 01:43:16.000000000 +0100
***************
*** 1,4 ****
  /* indices.h -- Functions defined in indices.c.
!    $Id: indices.h 6906 2016-01-01 18:33:45Z karl $
  
     Copyright 1993, 1997, 2004, 2007, 2013, 2014, 2015, 2016
--- 1,4 ----
  /* indices.h -- Functions defined in indices.c.
!    $Id: indices.h 7013 2016-02-13 21:19:19Z gavin $
  
     Copyright 1993, 1997, 2004, 2007, 2013, 2014, 2015, 2016
***************
*** 30,35 ****
  
  /* User visible functions declared in indices.c. */
! extern void info_index_search (WINDOW *window, int count);
! extern void info_index_apropos (WINDOW *window, int count);
  void next_index_match (FILE_BUFFER *fb, char *string, int offset, int dir,
                    REFERENCE **result, int *found_offset, int *match_offset);
--- 30,35 ----
  
  /* User visible functions declared in indices.c. */
! void info_index_search (WINDOW *window, int count);
! void info_index_apropos (WINDOW *window, int count);
  void next_index_match (FILE_BUFFER *fb, char *string, int offset, int dir,
                    REFERENCE **result, int *found_offset, int *match_offset);
diff -Nrc2 texinfo-6.1/info/info-utils.c texinfo-6.3/info/info-utils.c
*** texinfo-6.1/info/info-utils.c	2016-01-30 12:02:41.000000000 +0000
--- texinfo-6.3/info/info-utils.c	2016-09-07 01:43:16.000000000 +0100
***************
*** 1,4 ****
  /* info-utils.c -- miscellanous.
!    $Id: info-utils.c 6915 2016-01-02 17:45:27Z gavin $
  
     Copyright 1993, 1998, 2003, 2004, 2007, 2008, 2009, 2011, 2012,
--- 1,4 ----
  /* info-utils.c -- miscellanous.
!    $Id: info-utils.c 7332 2016-09-03 16:20:45Z gavin $
  
     Copyright 1993, 1998, 2003, 2004, 2007, 2008, 2009, 2011, 2012,
***************
*** 216,224 ****
  /* Get the entry associated with LABEL in the menu of NODE.  Return a
     pointer to the ENTRY if found, or null.  Return value should not
!    be freed by caller. */
  REFERENCE *
  info_get_menu_entry_by_label (NODE *node, char *label, int sloppy) 
  {
    register int i;
    REFERENCE *entry;
    REFERENCE **references = node->references;
--- 216,226 ----
  /* Get the entry associated with LABEL in the menu of NODE.  Return a
     pointer to the ENTRY if found, or null.  Return value should not
!    be freed by caller.  If SLOPPY, allow initial matches, like
!    "Buffers" for a LABEL "buffer". */
  REFERENCE *
  info_get_menu_entry_by_label (NODE *node, char *label, int sloppy) 
  {
    register int i;
+   int best_guess = -1;
    REFERENCE *entry;
    REFERENCE **references = node->references;
***************
*** 227,258 ****
      return 0;
  
-   /* First look for an exact match. */
    for (i = 0; (entry = references[i]); i++)
      {
!       if (REFERENCE_MENU_ITEM != entry->type) continue;
!       if (strcmp (label, entry->label) == 0)
!         return entry;
      }
  
!   /* If the item wasn't found, search the list sloppily.  Perhaps this
!      user typed "buffer" when they really meant "Buffers". */
!   if (sloppy)
!     {
!       int i;
!       int best_guess = -1;
! 
!       for (i = 0; (entry = references[i]); i++)
!         {
!           if (REFERENCE_MENU_ITEM != entry->type) continue;
!           if (mbscasecmp (label, entry->label) == 0)
!             return entry; /* Exact, case-insensitive match. */
!           else if (best_guess == -1
!                 && (mbsncasecmp (entry->label, label, strlen (label)) == 0))
!               best_guess = i;
!         }
! 
!       if (!entry && best_guess != -1)
!         return references[best_guess];
!     }
  
    return 0;
--- 229,245 ----
      return 0;
  
    for (i = 0; (entry = references[i]); i++)
      {
!       if (entry->type != REFERENCE_MENU_ITEM)
!         continue;
!       if (mbscasecmp (label, entry->label) == 0)
!         return entry; /* Exact, case-insensitive match. */
!       else if (sloppy && best_guess == -1
!                && (mbsncasecmp (entry->label, label, strlen (label)) == 0))
!         best_guess = i;
      }
  
!   if (sloppy && best_guess != -1)
!     return references[best_guess];
  
    return 0;
***************
*** 1104,1112 ****
  }
  
- #define NO_NODELINE 0
- #define PRINT_NODELINE 1
- #define NODELINE_POINTERS_ONLY 2
- int nodeline_print = 2;
- 
  /* Read first line of node and set next, prev and up. */
  static void
--- 1091,1094 ----
***************
*** 1115,1120 ****
    char **store_in = 0;
    char *nodename;
!   char *ptr, *ptr2;
!   char *display_start = 0;
    int value_length;
  
--- 1097,1101 ----
    char **store_in = 0;
    char *nodename;
!   char *ptr;
    int value_length;
  
***************
*** 1136,1148 ****
        if (!strncasecmp (ptr, INFO_FILE_LABEL, strlen(INFO_FILE_LABEL)))
          {
!           ptr2 = ptr + strlen (INFO_FILE_LABEL);
          }
        else if (!strncasecmp (ptr, INFO_NODE_LABEL, strlen(INFO_NODE_LABEL)))
          {
!           ptr2 = ptr + strlen (INFO_NODE_LABEL);
          }
        else if (!strncasecmp (ptr, INFO_PREV_LABEL, strlen(INFO_PREV_LABEL)))
          {
!           ptr2 = ptr + strlen (INFO_PREV_LABEL);
            store_in = &node->prev;
          }
--- 1117,1129 ----
        if (!strncasecmp (ptr, INFO_FILE_LABEL, strlen(INFO_FILE_LABEL)))
          {
!           ptr += strlen (INFO_FILE_LABEL);
          }
        else if (!strncasecmp (ptr, INFO_NODE_LABEL, strlen(INFO_NODE_LABEL)))
          {
!           ptr += strlen (INFO_NODE_LABEL);
          }
        else if (!strncasecmp (ptr, INFO_PREV_LABEL, strlen(INFO_PREV_LABEL)))
          {
!           ptr += strlen (INFO_PREV_LABEL);
            store_in = &node->prev;
          }
***************
*** 1150,1177 ****
                               strlen(INFO_ALTPREV_LABEL)))
          {
!           ptr2 = ptr + strlen (INFO_ALTPREV_LABEL);
            store_in = &node->prev;
          }
        else if (!strncasecmp (ptr, INFO_NEXT_LABEL, strlen(INFO_NEXT_LABEL)))
          {
!           ptr2 = ptr + strlen (INFO_NEXT_LABEL);
            store_in = &node->next;
          }
        else if (!strncasecmp (ptr, INFO_UP_LABEL, strlen(INFO_UP_LABEL)))
          {
!           ptr2 = ptr + strlen (INFO_UP_LABEL);
            store_in = &node->up;
          }
        else 
          {
-           ptr2 = ptr;
            store_in = 0;
            /* Not recognized - code below will skip to next comma */
          }
-         
-       if (nodeline_print==NODELINE_POINTERS_ONLY && !display_start && store_in)
-         display_start = ptr;
-       ptr = ptr2;
- 
        ptr += skip_whitespace (ptr);
  
--- 1131,1152 ----
                               strlen(INFO_ALTPREV_LABEL)))
          {
!           ptr += strlen (INFO_ALTPREV_LABEL);
            store_in = &node->prev;
          }
        else if (!strncasecmp (ptr, INFO_NEXT_LABEL, strlen(INFO_NEXT_LABEL)))
          {
!           ptr += strlen (INFO_NEXT_LABEL);
            store_in = &node->next;
          }
        else if (!strncasecmp (ptr, INFO_UP_LABEL, strlen(INFO_UP_LABEL)))
          {
!           ptr += strlen (INFO_UP_LABEL);
            store_in = &node->up;
          }
        else 
          {
            store_in = 0;
            /* Not recognized - code below will skip to next comma */
          }
        ptr += skip_whitespace (ptr);
  
***************
*** 1203,1220 ****
        ptr += 1; /* Point after field terminator */
      }
-   if (display_start)
-     {
-       output_bytes_difference = display_start - node->contents;
-       node_offset += output_bytes_difference;
-       node->nodelen -= display_start - node->contents;
-       node->contents = display_start;
-     }
-   else if (nodeline_print == NO_NODELINE)
-     {
-       output_bytes_difference = ptr - node->contents;
-       node_offset += output_bytes_difference;
-       node->nodelen -= ptr - node->contents;
-       node->contents = ptr;
-     }
  }
  
--- 1178,1181 ----
***************
*** 1535,1546 ****
            entry->line_number = 0;
        }
- 
-       if (preprocess_nodes_p && entry->line_number > 1)
-         /* Adjust line offset in file to one in displayed text.  This
-            does not work perfectly because we can't know exactly what
-            text will be inserted/removed: for example, due to expansion
-            of an image tag.  This subtracts 1 for a removed node information
-            line. */
-         entry->line_number--;
      }
  
--- 1496,1499 ----
***************
*** 1616,1620 ****
  forward_to_info_syntax (char *contents)
  {
!   while (contents < input_start + input_length)
      {
        /* Menu entry comes first to optimize for the case of looking through a 
--- 1569,1576 ----
  forward_to_info_syntax (char *contents)
  {
!   /* Loop until just before the end of the input.  The '- 3' prevents us
!      accessing memory after the end of the input, and none of the strings we 
!      are looking for are shorter than 3 bytes. */
!   while (contents < input_start + input_length - 3)
      {
        /* Menu entry comes first to optimize for the case of looking through a 
diff -Nrc2 texinfo-6.1/info/info-utils.h texinfo-6.3/info/info-utils.h
*** texinfo-6.1/info/info-utils.h	2016-02-06 12:20:23.000000000 +0000
--- texinfo-6.3/info/info-utils.h	2016-09-07 01:43:16.000000000 +0100
***************
*** 1,4 ****
  /* info-utils.h -- Exported functions and variables from info-utils.c.
!    $Id: info-utils.h 6906 2016-01-01 18:33:45Z karl $   
  
     Copyright 1993, 1996, 1998, 2002, 2003, 2004, 2007, 2011, 2012, 2013,
--- 1,4 ----
  /* info-utils.h -- Exported functions and variables from info-utils.c.
!    $Id: info-utils.h 7013 2016-02-13 21:19:19Z gavin $   
  
     Copyright 1993, 1996, 1998, 2002, 2003, 2004, 2007, 2011, 2012, 2013,
***************
*** 50,54 ****
     pointer to the reference if found, or NULL.  If SLOPPY, accept
     initial substrings and check insensitively to case. */
! extern REFERENCE *info_get_menu_entry_by_label (NODE *node, char *label,
                                                  int sloppy);
  
--- 50,54 ----
     pointer to the reference if found, or NULL.  If SLOPPY, accept
     initial substrings and check insensitively to case. */
! REFERENCE *info_get_menu_entry_by_label (NODE *node, char *label,
                                                  int sloppy);
  
***************
*** 59,66 ****
  
  /* Copy an existing reference into new memory.  */
! extern REFERENCE *info_copy_reference (REFERENCE *src);
  
  /* Copy a list of existing references into new memory.  */
! extern REFERENCE **info_copy_references (REFERENCE **ref1);
  
  /* Free the data associated with a single REF */
--- 59,66 ----
  
  /* Copy an existing reference into new memory.  */
! REFERENCE *info_copy_reference (REFERENCE *src);
  
  /* Copy a list of existing references into new memory.  */
! REFERENCE **info_copy_references (REFERENCE **ref1);
  
  /* Free the data associated with a single REF */
***************
*** 68,75 ****
  
  /* Free the data associated with REFERENCES. */
! extern void info_free_references (REFERENCE **references);
  
  /* Create new REFERENCE structure. */
! extern REFERENCE *info_new_reference (char *filename, char *nodename);
  
  /* Search for sequences of whitespace or newlines in STRING, replacing
--- 68,75 ----
  
  /* Free the data associated with REFERENCES. */
! void info_free_references (REFERENCE **references);
  
  /* Create new REFERENCE structure. */
! REFERENCE *info_new_reference (char *filename, char *nodename);
  
  /* Search for sequences of whitespace or newlines in STRING, replacing
***************
*** 82,90 ****
  #define ITER_LIMIT(iter) ((iter).limit - (iter).cur.ptr)
  
! extern int ansi_escape (mbi_iterator_t iter, size_t *plen);
  
  /* Return a pointer to a string which is the printed representation
     of CHARACTER if it were printed at HPOS. */
! extern char *printed_representation (mbi_iterator_t *iter,
                                       int *delim, size_t pl_chars,
                                       size_t *pchars, size_t *pbytes);
--- 82,90 ----
  #define ITER_LIMIT(iter) ((iter).limit - (iter).cur.ptr)
  
! int ansi_escape (mbi_iterator_t iter, size_t *plen);
  
  /* Return a pointer to a string which is the printed representation
     of CHARACTER if it were printed at HPOS. */
! char *printed_representation (mbi_iterator_t *iter,
                                       int *delim, size_t pl_chars,
                                       size_t *pchars, size_t *pbytes);
***************
*** 95,109 ****
  
  /* Return a pointer to the part of PATHNAME that simply defines the file. */
! extern char *filename_non_directory (char *pathname);
  
  /* Return non-zero if NODE is one especially created by Info. */
! extern int internal_info_node_p (NODE *node);
  
  /* Make NODE appear to be one especially created by Info, and give it NAME. */
! extern void name_internal_node (NODE *node, char *name);
  
  /* Return the window displaying NAME, the name of an internally created
     Info window. */
! extern WINDOW *get_internal_info_window (char *name);
  
  struct text_buffer
--- 95,109 ----
  
  /* Return a pointer to the part of PATHNAME that simply defines the file. */
! char *filename_non_directory (char *pathname);
  
  /* Return non-zero if NODE is one especially created by Info. */
! int internal_info_node_p (NODE *node);
  
  /* Make NODE appear to be one especially created by Info, and give it NAME. */
! void name_internal_node (NODE *node, char *name);
  
  /* Return the window displaying NAME, the name of an internally created
     Info window. */
! WINDOW *get_internal_info_window (char *name);
  
  struct text_buffer
diff -Nrc2 texinfo-6.1/info/info.c texinfo-6.3/info/info.c
*** texinfo-6.1/info/info.c	2016-02-06 12:20:23.000000000 +0000
--- texinfo-6.3/info/info.c	2016-09-07 01:43:16.000000000 +0100
***************
*** 1,4 ****
  /* info.c -- Display nodes of Info files in multiple windows.
!    $Id: info.c 6906 2016-01-01 18:33:45Z karl $
  
     Copyright 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
--- 1,4 ----
  /* info.c -- Display nodes of Info files in multiple windows.
!    $Id: info.c 7027 2016-02-21 14:24:56Z gavin $
  
     Copyright 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
***************
*** 166,170 ****
  
  
! /* Interpret the first non-option argument, either by looking it up as a dir 
     entry, looking for a file by that name, or finding a man page by that name.  
     Set INITIAL_FILE to the name of the initial Info file. */
--- 166,172 ----
  
  
! /* Find the first file to load (and possibly the first node as well).
!    If the --file option is given, use that as the file, otherwise try to
!    interpret the first non-option argument, either by looking it up as a dir 
     entry, looking for a file by that name, or finding a man page by that name.  
     Set INITIAL_FILE to the name of the initial Info file. */
***************
*** 174,185 ****
    REFERENCE *entry;
  
    if (!(*argv)[0])
!     return;
  
    /* If there are any more arguments, the initial file is the
       dir entry given by the first one. */
      {
!       /* If they say info info, show them info-stnd.texi.  (Get
!          info.texi with info -f info.) */
        if ((*argv)[0] && mbscasecmp ((*argv)[0], "info") == 0)
          (*argv)[0] = "info-stnd";
--- 176,242 ----
    REFERENCE *entry;
  
+   /* User used "--file". */
+   if (user_filename)
+     {
+       if (!IS_ABSOLUTE(user_filename) && HAS_SLASH(user_filename)
+           && !(user_filename[0] == '.' && IS_SLASH(user_filename[1])))
+         {
+           /* Prefix "./" to the filename to prevent a lookup
+              in INFOPATH.  */
+           char *s;
+           asprintf (&s, "%s%s", "./", user_filename);
+           free (user_filename);
+           user_filename = s;
+         }
+       if (IS_ABSOLUTE(user_filename) || HAS_SLASH(user_filename))
+         initial_file = info_add_extension (0, user_filename, 0);
+       else
+         initial_file = info_find_fullpath (user_filename, 0);
+ 
+       if (!initial_file)
+         {
+           if (!filesys_error_number)
+             filesys_error_number = ENOENT;
+           *error = filesys_error_string (user_filename, filesys_error_number);
+         }
+ 
+       return;
+     }
+ 
    if (!(*argv)[0])
!     {
!       /* No more non-option arguments. */
!       initial_file = xstrdup("dir");
!       return;
!     }
! 
!   /* If first argument begins with '(', add it as if it were given with 
!      '--node'.  This is to support invoking like
!      "info '(emacs)Buffers'".  If it is a well-formed node spec then
!      the rest of the arguments are menu entries to follow, or an
!      index entry.  */
!   if ((*argv)[0][0] == '(')
!     {
!       info_parse_node ((*argv)[0]);
!       if (info_parsed_filename)
!         {
!           initial_file = info_find_fullpath (info_parsed_filename, 0);
!           if (initial_file)
!             {
!               add_pointer_to_array (info_new_reference (initial_file,
!                                                         info_parsed_nodename),
!                                     ref_index, ref_list, ref_slots, 2);
!               /* Remove this argument from the argument list. */
!               memmove (*argv, *argv + 1, *argc-- * sizeof (char *));
!               return;
!             }
!         }
!     }
  
    /* If there are any more arguments, the initial file is the
       dir entry given by the first one. */
      {
!       /* If they say info info (or info -O info, etc.), show them 
!          info-stnd.texi.  (Get info.texi with info -f info.) */
        if ((*argv)[0] && mbscasecmp ((*argv)[0], "info") == 0)
          (*argv)[0] = "info-stnd";
***************
*** 268,273 ****
      }
  
!   /* Otherwise, we want the dir node.  The only node to be displayed
!      or output will be "Top". */
    return;
  }
--- 325,330 ----
      }
  
!   /* Otherwise, use the dir node. */
!   initial_file = xstrdup("dir");
    return;
  }
***************
*** 311,320 ****
  
                if (!initial_file)
!                 {
!                   free (*error);
!                   asprintf (error, _("No file given for node '%s'."),
!                             user_nodenames[i]);
!                   continue;
!                 }
  
                /* Check for a node by this name, and if there isn't one
--- 368,372 ----
  
                if (!initial_file)
!                 continue; /* Shouldn't happen. */
  
                /* Check for a node by this name, and if there isn't one
***************
*** 414,420 ****
      }
  
    /* If there are arguments remaining, they are the names of menu items
       in sequential info files starting from the first one loaded. */
!   else if (*argv && ref_index > 0)
      {
        NODE *initial_node; /* Node to start following menus from. */
--- 466,479 ----
      }
  
+   /* Default is the "Top" node if there were no other nodes. */
+   if (ref_index == 0 && initial_file)
+     {
+        add_pointer_to_array (info_new_reference (initial_file, "Top"), 
+                              ref_index, ref_list, ref_slots, 2);
+     }
+ 
    /* If there are arguments remaining, they are the names of menu items
       in sequential info files starting from the first one loaded. */
!   if (*argv && ref_index > 0)
      {
        NODE *initial_node; /* Node to start following menus from. */
***************
*** 794,800 ****
      }
  
-   if (dump_subnodes)
-     dump_subnodes = DUMP_SUBNODES;
-   
    /* If the user specified --version, then show the version and exit. */
    if (print_version_p)
--- 853,856 ----
***************
*** 884,887 ****
--- 940,955 ----
        if (ref_index == 1)
          all_matches_p = 0;
+ 
+       /* --where */
+       if (print_where_p)
+         {
+           int i;
+           if (!ref_list)
+             exit (1);
+ 
+           for (i = 0; ref_list[i]; i++)
+             printf ("%s\n", ref_list[i]->filename);
+           exit (0);
+         }
      }
    else
***************
*** 901,955 ****
          }
  
-       /* User used "--file". */
-       if (user_filename)
-         {
-           if (!IS_ABSOLUTE(user_filename) && HAS_SLASH(user_filename)
-               && !(user_filename[0] == '.' && IS_SLASH(user_filename[1])))
-             {
-               /* Prefix "./" to the filename to prevent a lookup
-                  in INFOPATH.  */
-               char *s;
-               asprintf (&s, "%s%s", "./", user_filename);
-               free (user_filename);
-               user_filename = s;
-             }
-           if (IS_ABSOLUTE(user_filename) || HAS_SLASH(user_filename))
-             initial_file = info_add_extension (0, user_filename, 0);
-           else
-             initial_file = info_find_fullpath (user_filename, 0);
- 
-           if (!initial_file)
-             {
-               if (!filesys_error_number)
-                 filesys_error_number = ENOENT;
-               error = filesys_error_string (user_filename, 
-                                             filesys_error_number);
-             }
-           else
-             add_pointer_to_array (info_new_reference (initial_file, "Top"),
-                                   ref_index, ref_list, ref_slots, 2);
-           goto skip_get_initial_file;
-         }
- 
-       /* If first argument begins with '(', add it as if it were given with 
-          '--node'.  This is to support invoking like
-          "info '(emacs)Buffers'".  If it is a well-formed node spec then
-          the rest of the arguments are menu entries to follow, or an
-          index entry.  */
-       if (argv[0] && argv[0][0] == '(')
-         {
-           info_parse_node (argv[0]);
-           if (info_parsed_filename)
-             {
-               add_pointer_to_array (info_new_reference (info_parsed_filename,
-                                                         info_parsed_nodename),
-                                     ref_index, ref_list, ref_slots, 2);
-               memmove (argv, argv + 1, argc-- * sizeof (char *));
-               goto skip_get_initial_file;
-             }
-         }
- 
        get_initial_file (&argc, &argv, &error);
- skip_get_initial_file:
  
        /* If the user specified `--index-search=STRING', 
--- 969,973 ----
***************
*** 991,1006 ****
            add_initial_nodes (argc, argv, &error);
          }
-     }
  
!   /* --where */
!   if (print_where_p)
!     {
!       int i;
!       if (!ref_list)
!         exit (1);
  
-       for (i = 0; ref_list[i]; i++)
-         printf ("%s\n", ref_list[i]->filename);
-       exit (0);
      }
  
--- 1009,1021 ----
            add_initial_nodes (argc, argv, &error);
          }
  
!       /* --where */
!       if (print_where_p)
!         {
!           if (initial_file)
!             printf ("%s\n", initial_file);
!           exit (0);
!         }
  
      }
  
diff -Nrc2 texinfo-6.1/info/infokey.c texinfo-6.3/info/infokey.c
*** texinfo-6.1/info/infokey.c	2014-11-14 13:41:50.000000000 +0000
--- texinfo-6.3/info/infokey.c	2016-09-07 01:43:16.000000000 +0100
***************
*** 1,4 ****
  /* infokey.c -- compile ~/.infokey to ~/.info.
!    $Id: infokey.c 5927 2014-11-14 13:32:00Z gavin $
  
     Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009,
--- 1,4 ----
  /* infokey.c -- compile ~/.infokey to ~/.info.
!    $Id: infokey.c 7040 2016-03-04 19:33:07Z gavin $
  
     Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009,
***************
*** 464,470 ****
  
                        KEYMAP_ENTRY ke;
                        
                        ke.type = ISFUNC;
!                       ke.value.function = &function_doc_array[a];
                        To_seq (0);
  
--- 464,473 ----
  
                        KEYMAP_ENTRY ke;
+                       static InfoCommand invalid_function = { 0 };
                        
                        ke.type = ISFUNC;
!                       ke.value.function = a != A_INVALID
!                                             ? &function_doc_array[a]
!                                             : &invalid_function;
                        To_seq (0);
  
diff -Nrc2 texinfo-6.1/info/nodes.c texinfo-6.3/info/nodes.c
*** texinfo-6.1/info/nodes.c	2016-01-30 14:44:04.000000000 +0000
--- texinfo-6.3/info/nodes.c	2016-09-07 01:43:16.000000000 +0100
***************
*** 1,4 ****
  /* nodes.c -- how to get an Info file and node.
!    $Id: nodes.c 6965 2016-01-30 14:38:35Z gavin $
  
     Copyright 1993, 1998, 1999, 2000, 2002, 2003, 2004, 2006, 2007,
--- 1,4 ----
  /* nodes.c -- how to get an Info file and node.
!    $Id: nodes.c 7264 2016-07-17 16:44:53Z gavin $
  
     Copyright 1993, 1998, 1999, 2000, 2002, 2003, 2004, 2006, 2007,
***************
*** 545,560 ****
  static void info_reload_file_buffer_contents (FILE_BUFFER *fb);
  
! /* Locate the file named by FILENAME, and return the information structure
!    describing this file.  The file may appear in our list of loaded files
!    already, or it may not.  If it does not already appear, find the file,
!    and add it to the list of loaded files.  If the file cannot be found,
!    return a NULL FILE_BUFFER *. */
  FILE_BUFFER *
! info_find_file (char *filename)
  {
!   int i;
    FILE_BUFFER *file_buffer;
-   char *fullpath;
-   int is_fullpath;
    
    /* If full path to the file has been given, we must find it exactly. */
--- 545,554 ----
  static void info_reload_file_buffer_contents (FILE_BUFFER *fb);
  
! /* Try to find a file in our list of already loaded files. */
  FILE_BUFFER *
! check_loaded_file (char *filename)
  {
!   int is_fullpath, i;
    FILE_BUFFER *file_buffer;
    
    /* If full path to the file has been given, we must find it exactly. */
***************
*** 562,566 ****
                  || filename[0] == '.' && IS_SLASH(filename[1]);
  
-   /* First try to find the file in our list of already loaded files. */
    if (info_loaded_files)
      {
--- 556,559 ----
***************
*** 602,605 ****
--- 595,616 ----
            }
      }
+   return 0;
+ }
+ 
+ /* Locate the file named by FILENAME, and return the information structure
+    describing this file.  The file may appear in our list of loaded files
+    already, or it may not.  If it does not already appear, find the file,
+    and add it to the list of loaded files.  If the file cannot be found,
+    return a NULL FILE_BUFFER *. */
+ FILE_BUFFER *
+ info_find_file (char *filename)
+ {
+   FILE_BUFFER *file_buffer;
+   char *fullpath;
+   int is_fullpath;
+   
+   file_buffer = check_loaded_file (filename);
+   if (file_buffer)
+     return file_buffer;
  
    /* The file wasn't loaded.  Try to load it now. */
***************
*** 607,610 ****
--- 618,623 ----
    /* Get the full pathname of this file, as known by the info system.
       That is to say, search along INFOPATH and expand tildes, etc. */
+   is_fullpath = IS_ABSOLUTE (filename)
+                 || filename[0] == '.' && IS_SLASH(filename[1]);
    if (!is_fullpath)
      fullpath = info_find_fullpath (filename, 0);
***************
*** 1385,1390 ****
      }
  
-   /* Get the node. */
- 
    /* We haven't checked the entry pointer yet.  Look for the node
       around about it and adjust it if necessary. */
--- 1398,1401 ----
***************
*** 1397,1435 ****
      }
  
!   if (!tag->cache.contents || (tag->cache.flags & N_Simple))
      {
        /* Data for node has not been generated yet. */
!       NODE *cache = &tag->cache;
!       cache->contents = subfile->contents + tag->nodestart_adjusted;
!       cache->contents += skip_node_separator (cache->contents);
!       cache->nodename = tag->nodename;
!       cache->flags = tag->flags;
  
!       cache->fullpath = parent->fullpath;
        if (parent != subfile)
!         cache->subfile = tag->filename;
  
!       if (!fast && !tag->cache.references)
          {
            /* Read locations of references in node and similar.  Strip Info file
               syntax from node if preprocess_nodes=On.  Adjust the offsets of
               anchors that occur within the node. */
!           scan_node_contents (cache, parent, tag_ptr);
!           cache->flags &= ~N_Simple;
!         }
!       else
!         cache->flags |= N_Simple;
! 
!       if (!preprocess_nodes_p)
!         node_set_body_start (cache);
!     }
  
!   /* Initialize the node from the tag. */
!   node = xmalloc (sizeof (NODE));
!   memcpy (node, &tag->cache, sizeof (NODE));
!   if (!node->contents)
!     {
!       node->contents = subfile->contents + tag->nodestart_adjusted;
!       node->contents += skip_node_separator (node->contents);
      }
  
--- 1408,1452 ----
      }
  
!   node = xmalloc (sizeof (NODE));
!   memset (node, 0, sizeof (NODE));
!   if (tag->cache.references)
!     {
!       /* Initialize the node from the cache. */
!       *node = tag->cache;
!       if (!node->contents)
!         {
!           node->contents = subfile->contents + tag->nodestart_adjusted;
!           node->contents += skip_node_separator (node->contents);
!         }
!     }
!   else
      {
        /* Data for node has not been generated yet. */
!       node->contents = subfile->contents + tag->nodestart_adjusted;
!       node->contents += skip_node_separator (node->contents);
!       node->nodelen = tag->cache.nodelen;
!       node->nodename = tag->nodename;
!       node->flags = tag->flags;
  
!       node->fullpath = parent->fullpath;
        if (parent != subfile)
!         node->subfile = tag->filename;
  
!       if (fast)
!         node->flags |= N_Simple;
!       else
          {
            /* Read locations of references in node and similar.  Strip Info file
               syntax from node if preprocess_nodes=On.  Adjust the offsets of
               anchors that occur within the node. */
!           scan_node_contents (node, parent, tag_ptr);
  
!           if (!preprocess_nodes_p)
!             node_set_body_start (node);
!           tag->cache = *node;
!           if (!(node->flags & N_WasRewritten))
!             tag->cache.contents = 0; /* Pointer into file buffer
!                                         is not saved.  */
!         }
      }
  
diff -Nrc2 texinfo-6.1/info/nodes.h texinfo-6.3/info/nodes.h
*** texinfo-6.1/info/nodes.h	2015-10-19 19:21:25.000000000 +0100
--- texinfo-6.3/info/nodes.h	2016-09-07 01:43:16.000000000 +0100
***************
*** 1,4 ****
  /* nodes.h -- How we represent nodes internally.
!    $Id: nodes.h 6711 2015-10-19 18:17:21Z gavin $
  
     Copyright 1993, 1997, 1998, 2002, 2004, 2007, 2011, 2012, 2013,
--- 1,4 ----
  /* nodes.h -- How we represent nodes internally.
!    $Id: nodes.h 7264 2016-07-17 16:44:53Z gavin $
  
     Copyright 1993, 1997, 1998, 2002, 2004, 2007, 2011, 2012, 2013,
***************
*** 107,111 ****
    char *nodename;               /* The node pointed to by this tag. */
    long nodestart;               /* The value read from the tag table. */
!   long nodestart_adjusted;
    int flags;                    /* Same as NODE.flags. */
    NODE cache;                   /* Saved information about pointed-to node. */
--- 107,111 ----
    char *nodename;               /* The node pointed to by this tag. */
    long nodestart;               /* The value read from the tag table. */
!   long nodestart_adjusted;      /* Where the node or anchor actually is. */
    int flags;                    /* Same as NODE.flags. */
    NODE cache;                   /* Saved information about pointed-to node. */
***************
*** 116,122 ****
     is present so that we can reload the file if it has been modified since
     last being loaded.  All of the arrays appearing within this structure
!    are NULL terminated, and each array which can change size has a
!    corresponding SLOTS member which says how many slots have been allocated
!    (with malloc ()) for this array. */
  typedef struct {
    char *filename;               /* The filename used to find this file. */
--- 116,120 ----
     is present so that we can reload the file if it has been modified since
     last being loaded.  All of the arrays appearing within this structure
!    are NULL terminated. */
  typedef struct {
    char *filename;               /* The filename used to find this file. */
***************
*** 142,146 ****
     and add it to the list of loaded files.  If the file cannot be found,
     return a NULL FILE_BUFFER *. */
! extern FILE_BUFFER *info_find_file (char *filename);
  
  FILE_BUFFER *info_find_subfile (char *filename);
--- 140,146 ----
     and add it to the list of loaded files.  If the file cannot be found,
     return a NULL FILE_BUFFER *. */
! FILE_BUFFER *info_find_file (char *filename);
! 
! FILE_BUFFER *check_loaded_file (char *filename);
  
  FILE_BUFFER *info_find_subfile (char *filename);
***************
*** 149,153 ****
  
  /* Return a pointer to a new NODE structure. */
! extern NODE *info_create_node (void);
  
  /* Return a pointer to a NODE structure for the Info node (FILENAME)NODENAME.
--- 149,153 ----
  
  /* Return a pointer to a new NODE structure. */
! NODE *info_create_node (void);
  
  /* Return a pointer to a NODE structure for the Info node (FILENAME)NODENAME.
***************
*** 156,166 ****
     
     If the node cannot be found, return a NULL pointer. */
! extern NODE *info_get_node (char *filename, char *nodename);
  
! extern NODE *info_get_node_with_defaults (char *filename, char *nodename,
                                            NODE *defaults);
  
! extern NODE *info_node_of_tag (FILE_BUFFER *fb, TAG **tag_ptr);
! extern NODE *info_node_of_tag_fast (FILE_BUFFER *fb, TAG **tag_ptr);
  
  /* Return a pointer to a NODE structure for the Info node NODENAME in
--- 156,166 ----
     
     If the node cannot be found, return a NULL pointer. */
! NODE *info_get_node (char *filename, char *nodename);
  
! NODE *info_get_node_with_defaults (char *filename, char *nodename,
                                            NODE *defaults);
  
! NODE *info_node_of_tag (FILE_BUFFER *fb, TAG **tag_ptr);
! NODE *info_node_of_tag_fast (FILE_BUFFER *fb, TAG **tag_ptr);
  
  /* Return a pointer to a NODE structure for the Info node NODENAME in
***************
*** 168,177 ****
     nodename of "Top" is used.  If the node cannot be found, return a
     NULL pointer. */
! extern NODE *info_get_node_of_file_buffer (FILE_BUFFER *file_buffer,
                                             char *nodename);
  
  /* Grovel FILE_BUFFER->contents finding tags and nodes, and filling in the
     various slots.  This can also be used to rebuild a tag or node table. */
! extern void build_tags_and_nodes (FILE_BUFFER *file_buffer);
  
  void free_history_node (NODE *n);
--- 168,177 ----
     nodename of "Top" is used.  If the node cannot be found, return a
     NULL pointer. */
! NODE *info_get_node_of_file_buffer (FILE_BUFFER *file_buffer,
                                             char *nodename);
  
  /* Grovel FILE_BUFFER->contents finding tags and nodes, and filling in the
     various slots.  This can also be used to rebuild a tag or node table. */
! void build_tags_and_nodes (FILE_BUFFER *file_buffer);
  
  void free_history_node (NODE *n);
***************
*** 181,185 ****
  
  /* Create a new, empty file buffer. */
! extern FILE_BUFFER *make_file_buffer (void);
  
  /* Non-zero means don't try to be smart when searching for nodes.  */
--- 181,185 ----
  
  /* Create a new, empty file buffer. */
! FILE_BUFFER *make_file_buffer (void);
  
  /* Non-zero means don't try to be smart when searching for nodes.  */
***************
*** 188,194 ****
  
  /* Found in dir.c */
! extern NODE *get_dir_node (void);
! extern REFERENCE *lookup_dir_entry (char *label, int sloppy);
! extern REFERENCE *dir_entry_of_infodir (char *label, char *searchdir);
  
  #endif /* not NODES_H */
--- 188,194 ----
  
  /* Found in dir.c */
! NODE *get_dir_node (void);
! REFERENCE *lookup_dir_entry (char *label, int sloppy);
! REFERENCE *dir_entry_of_infodir (char *label, char *searchdir);
  
  #endif /* not NODES_H */
diff -Nrc2 texinfo-6.1/info/search.h texinfo-6.3/info/search.h
*** texinfo-6.1/info/search.h	2016-02-06 12:20:23.000000000 +0000
--- texinfo-6.3/info/search.h	2016-09-07 01:43:16.000000000 +0100
***************
*** 1,4 ****
  /* search.h -- Structure used to search large bodies of text, with bounds.
!    $Id: search.h 6906 2016-01-01 18:33:45Z karl $
  
     Copyright 1993, 1997, 1998, 2002, 2004, 2007, 2009, 2011, 2013, 2014, 2016
--- 1,4 ----
  /* search.h -- Structure used to search large bodies of text, with bounds.
!    $Id: search.h 7013 2016-02-13 21:19:19Z gavin $
  
     Copyright 1993, 1997, 1998, 2002, 2004, 2007, 2009, 2011, 2013, 2014, 2016
***************
*** 53,73 ****
  
  SEARCH_BINDING *copy_binding (SEARCH_BINDING *binding);
! extern enum search_result search_forward (char *string,
! 					  SEARCH_BINDING *binding, long *poff);
! extern enum search_result search_backward (char *input_string,
! 					   SEARCH_BINDING *binding,
! 					   long *poff);
! extern enum search_result search (char *string, SEARCH_BINDING *binding,
! 				  long *poff);
  enum search_result regexp_search (char *regexp,
                 int is_literal, int is_insensitive,
                 char *buffer, size_t buflen,
                 regmatch_t **matches_out, size_t *match_count_out);
! extern int looking_at (char *string, SEARCH_BINDING *binding);
  int looking_at_line (char *string, char *pointer);
  
  /* Note that STRING_IN_LINE () always returns the offset of the 1st character
     after the string. */
! extern int string_in_line (char *string, char *line);
  
  /* Function names that start with "skip" are passed a string, and return
--- 53,73 ----
  
  SEARCH_BINDING *copy_binding (SEARCH_BINDING *binding);
! enum search_result search_forward (char *string,
!                                  SEARCH_BINDING *binding, long *poff);
! enum search_result search_backward (char *input_string,
!                                     SEARCH_BINDING *binding,
!                                     long *poff);
! enum search_result search (char *string, SEARCH_BINDING *binding,
!                            long *poff);
  enum search_result regexp_search (char *regexp,
                 int is_literal, int is_insensitive,
                 char *buffer, size_t buflen,
                 regmatch_t **matches_out, size_t *match_count_out);
! int looking_at (char *string, SEARCH_BINDING *binding);
  int looking_at_line (char *string, char *pointer);
  
  /* Note that STRING_IN_LINE () always returns the offset of the 1st character
     after the string. */
! int string_in_line (char *string, char *line);
  
  /* Function names that start with "skip" are passed a string, and return
***************
*** 76,88 ****
     marker of the item being searched for.  "Find" functions return a value
     of -1 if the item being looked for couldn't be found. */
! extern int skip_whitespace (char *string);
! extern int skip_non_whitespace (char *string);
! extern int skip_whitespace_and_newlines (char *string);
! extern int skip_line (char *string);
! extern int skip_node_separator (char *body);
  
! extern long find_node_separator (SEARCH_BINDING *binding);
  long find_file_section (SEARCH_BINDING *binding, char *label);
! extern long find_node_in_binding (char *nodename, SEARCH_BINDING *binding);
  
  #endif /* not INFO_SEARCH_H */
--- 76,88 ----
     marker of the item being searched for.  "Find" functions return a value
     of -1 if the item being looked for couldn't be found. */
! int skip_whitespace (char *string);
! int skip_non_whitespace (char *string);
! int skip_whitespace_and_newlines (char *string);
! int skip_line (char *string);
! int skip_node_separator (char *body);
  
! long find_node_separator (SEARCH_BINDING *binding);
  long find_file_section (SEARCH_BINDING *binding, char *label);
! long find_node_in_binding (char *nodename, SEARCH_BINDING *binding);
  
  #endif /* not INFO_SEARCH_H */
diff -Nrc2 texinfo-6.1/info/session.c texinfo-6.3/info/session.c
*** texinfo-6.1/info/session.c	2016-01-30 14:44:04.000000000 +0000
--- texinfo-6.3/info/session.c	2016-09-07 01:43:16.000000000 +0100
***************
*** 1,4 ****
  /* session.c -- user windowing interface to Info.
!    $Id: session.c 6965 2016-01-30 14:38:35Z gavin $
  
     Copyright 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
--- 1,4 ----
  /* session.c -- user windowing interface to Info.
!    $Id: session.c 7022 2016-02-20 20:29:27Z gavin $
  
     Copyright 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
***************
*** 2816,2820 ****
                          node_printed_rep (initial_node));
              }
!           return strict ? 0 : initial_node;
          }
  
--- 2816,2826 ----
                          node_printed_rep (initial_node));
              }
!           if (strict)
!             {
!               free_history_node (initial_node);
!               return 0;
!             }
!           else
!             return initial_node;
          }
  
***************
*** 3694,3698 ****
  void
  dump_nodes_to_file (REFERENCE **references,
! 		    char *output_filename, int flags)
  {
    int i;
--- 3700,3704 ----
  void
  dump_nodes_to_file (REFERENCE **references,
!                     char *output_filename, int dump_subnodes)
  {
    int i;
***************
*** 3723,3727 ****
                                 references[i]->nodename,
                                 output_stream,
! 			       flags & DUMP_SUBNODES) == DUMP_SYS_ERROR)
  	{
  	  info_error (_("error writing to %s: %s"), output_filename,
--- 3729,3733 ----
                                 references[i]->nodename,
                                 output_stream,
!                                dump_subnodes) == DUMP_SYS_ERROR)
  	{
  	  info_error (_("error writing to %s: %s"), output_filename,
diff -Nrc2 texinfo-6.1/info/session.h texinfo-6.3/info/session.h
*** texinfo-6.1/info/session.h	2016-02-06 12:20:23.000000000 +0000
--- texinfo-6.3/info/session.h	2016-09-07 01:43:16.000000000 +0100
***************
*** 1,4 ****
  /* session.h -- Functions found in session.c.
!    $Id: session.h 6906 2016-01-01 18:33:45Z karl $
  
     Copyright 1993, 1998, 1999, 2001, 2002, 2004, 2007, 2011, 2013, 2014,
--- 1,4 ----
  /* session.h -- Functions found in session.c.
!    $Id: session.h 7014 2016-02-13 21:26:11Z gavin $
  
     Copyright 1993, 1998, 1999, 2001, 2002, 2004, 2007, 2011, 2013, 2014,
***************
*** 64,86 ****
  VFunction *read_key_sequence (Keymap map, int menu, int mouse,
                                int insert, int *count);
! extern unsigned char info_input_pending_p (void);
! extern void info_set_node_of_window (WINDOW *window, NODE *node);
! extern void info_set_node_of_window_fast (WINDOW *window, NODE *node);
! extern void initialize_keyseq (void);
! extern void add_char_to_keyseq (int character);
! extern FILE_BUFFER *file_buffer_of_window (WINDOW *window);
! extern int info_select_reference (WINDOW *window, REFERENCE *entry);
! extern int info_any_buffered_input_p (void);
  
! #define DUMP_SUBNODES 0x02
! 
! extern void dump_nodes_to_file (REFERENCE **references,
  				char *output_filename, int flags);
  
! extern char *program_name_from_file_name (char *file_name);
  
  /* Do the physical deletion of WINDOW, and forget this window and
     associated nodes. */
! extern void info_delete_window_internal (WINDOW *window);
  
  void forget_window_and_nodes (WINDOW *window);
--- 64,84 ----
  VFunction *read_key_sequence (Keymap map, int menu, int mouse,
                                int insert, int *count);
! unsigned char info_input_pending_p (void);
! void info_set_node_of_window (WINDOW *window, NODE *node);
! void info_set_node_of_window_fast (WINDOW *window, NODE *node);
! void initialize_keyseq (void);
! void add_char_to_keyseq (int character);
! FILE_BUFFER *file_buffer_of_window (WINDOW *window);
! int info_select_reference (WINDOW *window, REFERENCE *entry);
! int info_any_buffered_input_p (void);
  
! void dump_nodes_to_file (REFERENCE **references,
  				char *output_filename, int flags);
  
! char *program_name_from_file_name (char *file_name);
  
  /* Do the physical deletion of WINDOW, and forget this window and
     associated nodes. */
! void info_delete_window_internal (WINDOW *window);
  
  void forget_window_and_nodes (WINDOW *window);
***************
*** 89,93 ****
  
  /* Tell Info that input is coming from the file FILENAME. */
! extern void info_set_input_from_file (char *filename);
  
  /* Error and debugging messages */
--- 87,91 ----
  
  /* Tell Info that input is coming from the file FILENAME. */
! void info_set_input_from_file (char *filename);
  
  /* Error and debugging messages */
***************
*** 102,111 ****
    while (0)
  
! extern void info_debug (const char *format, ...) TEXINFO_PRINTFLIKE(1,2);
    
  /* Print args as per FORMAT.  If the window system was initialized,
     then the message is printed in the echo area.  Otherwise, a message is
     output to stderr. */
! extern void info_error (const char *format, ...) TEXINFO_PRINTFLIKE(1,2);
  
  void initialize_info_session (void);
--- 100,109 ----
    while (0)
  
! void info_debug (const char *format, ...) TEXINFO_PRINTFLIKE(1,2);
    
  /* Print args as per FORMAT.  If the window system was initialized,
     then the message is printed in the echo area.  Otherwise, a message is
     output to stderr. */
! void info_error (const char *format, ...) TEXINFO_PRINTFLIKE(1,2);
  
  void initialize_info_session (void);
***************
*** 113,118 ****
  void close_info_session (void);
  void info_session (REFERENCE **ref_list, char *user_filename, char *error);
! extern void initialize_terminal_and_keymaps (char *init_file);
! extern REFERENCE *info_intuit_options_node (NODE *initial_node, char *program);
  
  void info_scroll_forward (WINDOW *window, int count);
--- 111,116 ----
  void close_info_session (void);
  void info_session (REFERENCE **ref_list, char *user_filename, char *error);
! void initialize_terminal_and_keymaps (char *init_file);
! REFERENCE *info_intuit_options_node (NODE *initial_node, char *program);
  
  void info_scroll_forward (WINDOW *window, int count);
***************
*** 125,134 ****
  extern int info_explicit_arg;
  extern int ea_explicit_arg;
! extern void info_initialize_numeric_arg (void);
  
  /* Found in m-x.c.  */
! extern char *read_function_name (char *prompt, WINDOW *window);
  
! extern void show_error_node (char *error_msg);
  
  #endif /* not SESSION_H */
--- 123,132 ----
  extern int info_explicit_arg;
  extern int ea_explicit_arg;
! void info_initialize_numeric_arg (void);
  
  /* Found in m-x.c.  */
! char *read_function_name (char *prompt, WINDOW *window);
  
! void show_error_node (char *error_msg);
  
  #endif /* not SESSION_H */
diff -Nrc2 texinfo-6.1/info/t/dir-merge.sh texinfo-6.3/info/t/dir-merge.sh
*** texinfo-6.1/info/t/dir-merge.sh	1970-01-01 01:00:00.000000000 +0100
--- texinfo-6.3/info/t/dir-merge.sh	2016-09-07 01:43:16.000000000 +0100
***************
*** 0 ****
--- 1,29 ----
+ #!/bin/sh
+ # Copyright (C) 2014, 2015, 2016 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 <http://www.gnu.org/licenses/>.
+ 
+ srcdir=${srcdir:-.}
+ . $srcdir/t/Init-test.inc
+ . $t/Init-inter.inc
+ 
+ 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
+ . $t/Timeout-test.inc
+ 
+ cleanup
diff -Nrc2 texinfo-6.1/info/t/infodir/subdir/dir texinfo-6.3/info/t/infodir/subdir/dir
*** texinfo-6.1/info/t/infodir/subdir/dir	1970-01-01 01:00:00.000000000 +0100
--- texinfo-6.3/info/t/infodir/subdir/dir	2016-09-07 01:43:16.000000000 +0100
***************
*** 0 ****
--- 1,16 ----
+ This is the file .../info/dir, which contains the
+ topmost node of the Info hierarchy, called (dir)Top.
+ The first time you invoke Info you start off looking at this node.
+ 
+ File: dir,	Node: Top	This is the top of the INFO tree
+ 
+   Test Directory node.
+ 
+   This (the Directory node) gives a menu of major topics.
+   Typing "q" exits, "?" lists all Info commands, "d" returns here,
+   "h" gives a primer for first-timers,
+ 
+ * Menu:
+ 
+ Test Info files
+ * file: (file-in-subdir).
diff -Nrc2 texinfo-6.1/info/t/node-no-file.sh texinfo-6.3/info/t/node-no-file.sh
*** texinfo-6.1/info/t/node-no-file.sh	2015-01-14 20:24:14.000000000 +0000
--- texinfo-6.3/info/t/node-no-file.sh	2016-09-07 01:43:16.000000000 +0100
***************
*** 1,4 ****
  #!/bin/sh
! # Copyright (C) 2014 Free Software Foundation, Inc.
  #
  # This program is free software; you can redistribute it and/or modify
--- 1,4 ----
  #!/bin/sh
! # Copyright (C) 2014, 2016 Free Software Foundation, Inc.
  #
  # This program is free software; you can redistribute it and/or modify
***************
*** 20,22 ****
  # Ask for a node without saying which file it's in
  $GINFO --output - --node nodename \
!   2>&1 | grep 'No file given'
--- 20,22 ----
  # Ask for a node without saying which file it's in
  $GINFO --output - --node nodename \
!   2>&1 | grep 'Cannot find node'
diff -Nrc2 texinfo-6.1/info/t/search-split-after-index.sh texinfo-6.3/info/t/search-split-after-index.sh
*** texinfo-6.1/info/t/search-split-after-index.sh	1970-01-01 01:00:00.000000000 +0100
--- texinfo-6.3/info/t/search-split-after-index.sh	2016-09-07 01:43:16.000000000 +0100
***************
*** 0 ****
--- 1,29 ----
+ #!/bin/sh
+ # Copyright (C) 2016 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 <http://www.gnu.org/licenses/>.
+ 
+ srcdir=${srcdir:-.}
+ . $srcdir/t/Init-test.inc
+ . $t/Init-inter.inc
+ 
+ # 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
+ 
+ . $t/Timeout-test.inc
+ 
+ cleanup
+ 
diff -Nrc2 texinfo-6.1/info/variables.h texinfo-6.3/info/variables.h
*** texinfo-6.1/info/variables.h	2015-10-31 22:21:48.000000000 +0000
--- texinfo-6.3/info/variables.h	2016-09-07 01:43:16.000000000 +0100
***************
*** 1,7 ****
  /* variables.h -- Description of user visible variables in Info.
!    $Id: variables.h 6742 2015-10-31 22:17:34Z gavin $
  
!    Copyright 1993, 1997, 2004, 2007, 2011, 2013, 2014, 2015
!    Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
--- 1,7 ----
  /* variables.h -- Description of user visible variables in Info.
!    $Id: variables.h 7013 2016-02-13 21:19:19Z gavin $
  
!    Copyright 1993, 1997, 2004, 2007, 2011, 2013, 2014, 2015,
!    2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
***************
*** 50,66 ****
     address of a VARIABLE_ALIST member.  A return value of NULL indicates
     that no variable could be read. */
! extern VARIABLE_ALIST *read_variable_name (char *prompt, WINDOW *window);
  
! extern VARIABLE_ALIST *variable_by_name (char *name);
  
  /* Make an array of REFERENCE which actually contains the names of the
     variables available in Info. */
! extern REFERENCE **make_variable_completions_array (void);
  
  /* Set the value of an info variable. */
! extern void set_variable (WINDOW *window, int count);
! extern int set_variable_to_value (VARIABLE_ALIST *var, char *value, int where);
  
! extern void describe_variable (WINDOW *window, int count);
  
  /* The list of user-visible variables. */
--- 50,66 ----
     address of a VARIABLE_ALIST member.  A return value of NULL indicates
     that no variable could be read. */
! VARIABLE_ALIST *read_variable_name (char *prompt, WINDOW *window);
  
! VARIABLE_ALIST *variable_by_name (char *name);
  
  /* Make an array of REFERENCE which actually contains the names of the
     variables available in Info. */
! REFERENCE **make_variable_completions_array (void);
  
  /* Set the value of an info variable. */
! void set_variable (WINDOW *window, int count);
! int set_variable_to_value (VARIABLE_ALIST *var, char *value, int where);
  
! void describe_variable (WINDOW *window, int count);
  
  /* The list of user-visible variables. */
diff -Nrc2 texinfo-6.1/info/window.c texinfo-6.3/info/window.c
*** texinfo-6.1/info/window.c	2015-10-18 15:21:25.000000000 +0100
--- texinfo-6.3/info/window.c	2016-09-07 01:43:16.000000000 +0100
***************
*** 1,4 ****
  /* window.c -- windows in Info.
!    $Id: window.c 6608 2015-09-10 12:56:42Z gavin $
  
     Copyright 1993, 1997, 1998, 2001, 2002, 2003, 2004, 2007, 2008,
--- 1,4 ----
  /* window.c -- windows in Info.
!    $Id: window.c 7334 2016-09-03 16:47:27Z gavin $
  
     Copyright 1993, 1997, 1998, 2001, 2002, 2003, 2004, 2007, 2008,
***************
*** 826,831 ****
      calculate_line_starts (window);
  
!   /* Try to optimize.  Check to see if point is past the pagetop for
!      this window, and if so, start searching forward from there. */
    if (window->pagetop > -1 && window->pagetop < window->line_count
        && window->line_starts[window->pagetop] <= window->point)
--- 826,831 ----
      calculate_line_starts (window);
  
!   /* Check if point is past the pagetop for this window, and if so, start 
!      searching forward from there. */
    if (window->pagetop > -1 && window->pagetop < window->line_count
        && window->line_starts[window->pagetop] <= window->point)
***************
*** 838,848 ****
      }
  
-   /* Something is wrong with the above logic as it allows a negative
-      index to be returned for small windows.  Until someone figures it
-      out, at least don&#39;t core dump. */
    if (i > 0)
      return i - 1;
    else
!     return 0;
  }
  
--- 838,845 ----
      }
  
    if (i > 0)
      return i - 1;
    else
!     return 0; /* Shouldn't happen */
  }
  
***************
*** 898,976 ****
    {
      int modeline_len = 0;
-     char *parent = NULL, *filename = "*no file*";
      char *nodename = "*no node*";
      NODE *node = window->node;
  
!     if (node)
!       {
!         if (node->nodename)
!           nodename = node->nodename;
  
!         if (node->subfile)
!           {
!             parent = filename_non_directory (node->fullpath);
!             filename = filename_non_directory (node->subfile);
!           }
!         else
!           {
!             parent = 0;
!             filename = filename_non_directory (node->fullpath);
!           }
!       }
  
!     if (preprocess_nodes_p)
!       {
!         char *name;
!         int dot;
  
!         name = filename_non_directory (node->fullpath);
  
!         modeline_len += strlen ("--Info:() --");
!         modeline_len += 3; /* strlen (location_indicator) */
!         modeline_len += strlen (name);
!         if (nodename) modeline_len += strlen (nodename);
!         if (modeline_len < window->width)
!           modeline_len = window->width;
! 
!         modeline = xcalloc (1, 1 + modeline_len);
! 
!         sprintf (modeline + strlen (modeline), "%s", location_indicator);
!         sprintf (modeline + strlen (modeline), "--Info: ");
! 
!         /* Omit any extension like ".info.gz" from file name. */
!         dot = strcspn (name, ".");
! 
!         if (name && strcmp ("", name))
!           {
!             sprintf (modeline + strlen (modeline), "(");
!             strncpy (modeline + strlen (modeline), name, dot);
!             sprintf (modeline + strlen (modeline), ")");
!           }
!         sprintf (modeline + strlen (modeline), "%s--", nodename);
!       }
!     else
        {
!         modeline_len += strlen (filename);
!         modeline_len += strlen (nodename);
!         modeline_len += 4;          /* strlen (location_indicator). */
! 
!         /* 10 for the decimal representation of the number of lines in this
!            node, and the remainder of the text that can appear in the line. */
!         modeline_len += 10 + strlen (_("-----Info: (), lines ----, "));
!         modeline_len += window->width;
! 
!         modeline = xmalloc (1 + modeline_len);
! 
!         /* Special internal windows have no filename. */
!         if (!filename || !*filename)
!           sprintf (modeline, _("-%s---Info: %s, %ld lines --%s--"),
!                    (window->flags & W_NoWrap) ? "$" : "-",
!                    nodename, window->line_count, location_indicator);
!         else
!           sprintf (modeline, _("-%s---Info: (%s)%s, %ld lines --%s--"),
!                    (window->flags & W_NoWrap) ? "$" : "-",
!                    parent ? parent : filename,
!                    nodename, window->line_count, location_indicator);
        }
  
      i = strlen (modeline);
--- 895,934 ----
    {
      int modeline_len = 0;
      char *nodename = "*no node*";
      NODE *node = window->node;
+     char *name;
+     int dot;
  
!     if (node && node->nodename)
!       nodename = node->nodename;
  
!     name = filename_non_directory (node->fullpath);
  
!     /* 10 for the decimal representation of the number of lines in this
!        node, and the remainder of the text that can appear in the line. */
!     modeline_len += 10 + strlen (_("-----Info: (), lines ----, "));
!     modeline_len += 3; /* strlen (location_indicator) */
!     modeline_len += strlen (name);
!     if (nodename)
!       modeline_len += strlen (nodename);
!     if (modeline_len < window->width)
!       modeline_len = window->width;
  
!     modeline = xcalloc (1, 1 + modeline_len);
  
!     sprintf (modeline + strlen (modeline), "-----Info: ");
! 
!     /* Omit any extension like ".info.gz" from file name. */
!     dot = strcspn (name, ".");
! 
!     if (name && strcmp ("", name))
        {
!         sprintf (modeline + strlen (modeline), "(");
!         strncpy (modeline + strlen (modeline), name, dot);
!         sprintf (modeline + strlen (modeline), ")");
        }
+     sprintf (modeline + strlen (modeline),
+              "%s, %ld lines --%s",
+              nodename, window->line_count, location_indicator);
  
      i = strlen (modeline);
***************
*** 1154,1157 ****
--- 1112,1120 ----
  }
  
+ #define NO_NODELINE 0
+ #define PRINT_NODELINE 1
+ #define NODELINE_POINTERS_ONLY 2
+ int nodeline_print = 2;
+ 
  /* Calculate a list of line starts for the node belonging to WINDOW.  The
     line starts are offsets within WINDOW->node->contents.
***************
*** 1163,1167 ****
  {
    long pl_chars = 0;     /* Number of characters in line so far. */
!   long pl_start = 0;     /* Offset of start of current physical line. */
    long ll_num = 0;       /* Number of logical lines */
    mbi_iterator_t iter;
--- 1126,1130 ----
  {
    long pl_chars = 0;     /* Number of characters in line so far. */
!   long pl_start;         /* Offset of start of current physical line. */
    long ll_num = 0;       /* Number of logical lines */
    mbi_iterator_t iter;
***************
*** 1178,1182 ****
      return;
  
!   for (mbi_init (iter, win->node->contents, win->node->nodelen);
         mbi_avail (iter);
         mbi_advance (iter))
--- 1141,1172 ----
      return;
  
!   pl_start = 0;
!   if (nodeline_print != PRINT_NODELINE
!       && !memcmp (win->node->contents, "File:", strlen ("File:")))
!     {
!       char *s = strchr (win->node->contents, '\n');
!       if (s && nodeline_print == NO_NODELINE)
!         {
!           pl_start = s - win->node->contents + 1;
!         }
!       else if (s && nodeline_print == NODELINE_POINTERS_ONLY)
!         {
!           char *s2;
!           char saved = *s;
!           *s = '\0';
!           s2 = strstr (win->node->contents, "Next: ");
!           if (!s2)
!             s2 = strstr (win->node->contents, "Prev: ");
!           if (!s2)
!             s2 = strstr (win->node->contents, "Up: ");
!           if (s2)
!             pl_start = s2 - win->node->contents;
!           *s = saved;
!         }
!     }
! 
!   for (mbi_init (iter,
!                  win->node->contents + pl_start,
!                  win->node->nodelen - pl_start);
         mbi_avail (iter);
         mbi_advance (iter))
diff -Nrc2 texinfo-6.1/info/window.h texinfo-6.3/info/window.h
*** texinfo-6.1/info/window.h	2016-02-06 12:20:23.000000000 +0000
--- texinfo-6.3/info/window.h	2016-09-07 01:43:16.000000000 +0100
***************
*** 1,4 ****
  /* window.h -- Structure and flags used in manipulating Info windows.
!    $Id: window.h 6906 2016-01-01 18:33:45Z karl $
  
     Copyright 1993, 1997, 2004, 2007, 2011 2013, 2014, 2015, 2016
--- 1,4 ----
  /* window.h -- Structure and flags used in manipulating Info windows.
!    $Id: window.h 7013 2016-02-13 21:19:19Z gavin $
  
     Copyright 1993, 1997, 2004, 2007, 2011 2013, 2014, 2015, 2016
***************
*** 124,145 ****
  
   /* Make the modeline member for WINDOW. */
! extern void window_make_modeline (WINDOW *window);
  
  /* Initalize the window system by creating THE_SCREEN and THE_ECHO_AREA.
     Create the first window ever, and make it permanent.
     You pass WIDTH and HEIGHT; the dimensions of the total screen size. */
! extern void window_initialize_windows (int width, int height);
  
  /* Make a new window by splitting an existing one. If the window could
     not be made return a null pointer.  The active window is not changed .*/
! extern WINDOW *window_make_window (void);
  
  /* Delete WINDOW from the list of known windows.  If this window was the
     active window, make the next window in the chain be the active window,
     or the previous window in the chain if there is no next window. */
! extern void window_delete_window (WINDOW *window);
  
  /* Set WINDOW to display NODE. */
! extern void window_set_node_of_window (WINDOW *window, NODE *node);
  
  /* Tell the window system that the size of the screen has changed.  This
--- 124,145 ----
  
   /* Make the modeline member for WINDOW. */
! void window_make_modeline (WINDOW *window);
  
  /* Initalize the window system by creating THE_SCREEN and THE_ECHO_AREA.
     Create the first window ever, and make it permanent.
     You pass WIDTH and HEIGHT; the dimensions of the total screen size. */
! void window_initialize_windows (int width, int height);
  
  /* Make a new window by splitting an existing one. If the window could
     not be made return a null pointer.  The active window is not changed .*/
! WINDOW *window_make_window (void);
  
  /* Delete WINDOW from the list of known windows.  If this window was the
     active window, make the next window in the chain be the active window,
     or the previous window in the chain if there is no next window. */
! void window_delete_window (WINDOW *window);
  
  /* Set WINDOW to display NODE. */
! void window_set_node_of_window (WINDOW *window, NODE *node);
  
  /* Tell the window system that the size of the screen has changed.  This
***************
*** 147,161 ****
     are resized, as well as every visible window.  You pass WIDTH and HEIGHT;
     the dimensions of the total screen size. */
! extern void window_new_screen_size (int width, int height);
  
  /* Change the height of WINDOW by AMOUNT.  This also automagically adjusts
     the previous and next windows in the chain.  If there is only one user
     window, then no change takes place. */
! extern void window_change_window_height (WINDOW *window, int amount);
  
! extern void set_window_pagetop (WINDOW *window, int desired_top);
  
  /* Adjust the pagetop of WINDOW such that the cursor point will be visible. */
! extern void window_adjust_pagetop (WINDOW *window);
  
  /* Tile all of the windows currently displayed in the global variable
--- 147,161 ----
     are resized, as well as every visible window.  You pass WIDTH and HEIGHT;
     the dimensions of the total screen size. */
! void window_new_screen_size (int width, int height);
  
  /* Change the height of WINDOW by AMOUNT.  This also automagically adjusts
     the previous and next windows in the chain.  If there is only one user
     window, then no change takes place. */
! void window_change_window_height (WINDOW *window, int amount);
  
! void set_window_pagetop (WINDOW *window, int desired_top);
  
  /* Adjust the pagetop of WINDOW such that the cursor point will be visible. */
! void window_adjust_pagetop (WINDOW *window);
  
  /* Tile all of the windows currently displayed in the global variable
***************
*** 164,191 ****
  #define DONT_TILE_INTERNALS 0
  #define TILE_INTERNALS      1
! extern void window_tile_windows (int style);
  
  /* Toggle the state of line wrapping in WINDOW.  This can do a bit of fancy
     redisplay. */
! extern void window_toggle_wrap (WINDOW *window);
  
  /* For every window in CHAIN, set the flags member to have FLAG set. */
! extern void window_mark_chain (WINDOW *chain, int flag);
  
  /* For every window in CHAIN, clear the flags member of FLAG. */
! extern void window_unmark_chain (WINDOW *chain, int flag);
  
  /* Make WINDOW start displaying at PERCENT percentage of its node. */
! extern void window_goto_percentage (WINDOW *window, int percent);
  
  /* Build a new node which has AP printed according to FORMAT as the
     contents. */
! extern NODE *build_message_node (const char *format, va_list ap);
  
! extern NODE *format_message_node (const char *format, ...)
    TEXINFO_PRINTFLIKE(1,2);
  
  struct text_buffer;
! extern NODE *text_buffer_to_node (struct text_buffer *tb);
  
  /* Make a message appear in the echo area, built from arguments formatted
--- 164,191 ----
  #define DONT_TILE_INTERNALS 0
  #define TILE_INTERNALS      1
! void window_tile_windows (int style);
  
  /* Toggle the state of line wrapping in WINDOW.  This can do a bit of fancy
     redisplay. */
! void window_toggle_wrap (WINDOW *window);
  
  /* For every window in CHAIN, set the flags member to have FLAG set. */
! void window_mark_chain (WINDOW *chain, int flag);
  
  /* For every window in CHAIN, clear the flags member of FLAG. */
! void window_unmark_chain (WINDOW *chain, int flag);
  
  /* Make WINDOW start displaying at PERCENT percentage of its node. */
! void window_goto_percentage (WINDOW *window, int percent);
  
  /* Build a new node which has AP printed according to FORMAT as the
     contents. */
! NODE *build_message_node (const char *format, va_list ap);
  
! NODE *format_message_node (const char *format, ...)
    TEXINFO_PRINTFLIKE(1,2);
  
  struct text_buffer;
! NODE *text_buffer_to_node (struct text_buffer *tb);
  
  /* Make a message appear in the echo area, built from arguments formatted
***************
*** 194,203 ****
     The message appears immediately.  If there was
     already a message appearing in the echo area, it is removed. */
! extern void window_message_in_echo_area (const char *format, ...)
    TEXINFO_PRINTFLIKE(1,2);
  
! extern void vwindow_message_in_echo_area (const char *format, va_list ap);
  
! extern void free_echo_area (void);
  
  /* Place a temporary message in the echo area built from arguments
--- 194,203 ----
     The message appears immediately.  If there was
     already a message appearing in the echo area, it is removed. */
! void window_message_in_echo_area (const char *format, ...)
    TEXINFO_PRINTFLIKE(1,2);
  
! void vwindow_message_in_echo_area (const char *format, va_list ap);
  
! void free_echo_area (void);
  
  /* Place a temporary message in the echo area built from arguments
***************
*** 207,237 ****
     any existing message.  A future call to unmessage_in_echo_area ()
     restores the old contents. */
! extern void message_in_echo_area (const char *format, ...)
    TEXINFO_PRINTFLIKE(1,2);
  
! extern void unmessage_in_echo_area (void);
  
  /* Clear the echo area, removing any message that is already present.
     The echo area is cleared immediately. */
! extern void window_clear_echo_area (void);
  
  /* Return the index of the line containing point. */
! extern int window_line_of_point (WINDOW *window);
  
  /* Get and return the printed column offset of the cursor in this window. */
! extern int window_get_cursor_column (WINDOW *window);
  
! extern size_t process_node_text
!         (WINDOW *win, char *start,
!          int (*fun) (WINDOW *, size_t, size_t, size_t, char *,
! 		     size_t, size_t));
  
! extern void window_compute_line_map (WINDOW *win);
  
! extern int window_point_to_column (WINDOW *win, long point, long *np);
  
! extern void window_line_map_init (WINDOW *win);
! 
! extern long window_log_to_phys_line (WINDOW *window, long ln);
  
  void calculate_line_starts (WINDOW *window);
--- 207,232 ----
     any existing message.  A future call to unmessage_in_echo_area ()
     restores the old contents. */
! void message_in_echo_area (const char *format, ...)
    TEXINFO_PRINTFLIKE(1,2);
  
! void unmessage_in_echo_area (void);
  
  /* Clear the echo area, removing any message that is already present.
     The echo area is cleared immediately. */
! void window_clear_echo_area (void);
  
  /* Return the index of the line containing point. */
! int window_line_of_point (WINDOW *window);
  
  /* Get and return the printed column offset of the cursor in this window. */
! int window_get_cursor_column (WINDOW *window);
  
! void window_compute_line_map (WINDOW *win);
  
! int window_point_to_column (WINDOW *win, long point, long *np);
  
! void window_line_map_init (WINDOW *win);
  
! long window_log_to_phys_line (WINDOW *window, long ln);
  
  void calculate_line_starts (WINDOW *window);
diff -Nrc2 texinfo-6.1/install-info/Makefile.in texinfo-6.3/install-info/Makefile.in
*** texinfo-6.1/install-info/Makefile.in	2016-02-06 12:24:05.000000000 +0000
--- texinfo-6.3/install-info/Makefile.in	2016-09-10 20:29:56.000000000 +0100
***************
*** 125,128 ****
--- 125,129 ----
  	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
  	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+ 	$(top_srcdir)/gnulib/m4/hard-locale.m4 \
  	$(top_srcdir)/gnulib/m4/iconv.m4 \
  	$(top_srcdir)/gnulib/m4/include_next.m4 \
diff -Nrc2 texinfo-6.1/install-info/install-info.c texinfo-6.3/install-info/install-info.c
*** texinfo-6.1/install-info/install-info.c	2016-02-06 12:20:24.000000000 +0000
--- texinfo-6.3/install-info/install-info.c	2016-03-04 17:52:26.000000000 +0000
***************
*** 1,7 ****
  /* install-info -- merge Info directory entries from an Info file.
!    $Id: install-info.c 6906 2016-01-01 18:33:45Z karl $
  
     Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
!    2005, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015
     Free Software Foundation, Inc.
  
--- 1,7 ----
  /* install-info -- merge Info directory entries from an Info file.
!    $Id: install-info.c 7038 2016-03-04 17:46:30Z gavin $
  
     Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
!    2005, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016
     Free Software Foundation, Inc.
  
***************
*** 647,651 ****
  \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\
--- 647,651 ----
  \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\
diff -Nrc2 texinfo-6.1/install-info/tests/Makefile.in texinfo-6.3/install-info/tests/Makefile.in
*** texinfo-6.1/install-info/tests/Makefile.in	2016-02-06 12:24:05.000000000 +0000
--- texinfo-6.3/install-info/tests/Makefile.in	2016-09-10 20:29:56.000000000 +0100
***************
*** 123,126 ****
--- 123,127 ----
  	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
  	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+ 	$(top_srcdir)/gnulib/m4/hard-locale.m4 \
  	$(top_srcdir)/gnulib/m4/iconv.m4 \
  	$(top_srcdir)/gnulib/m4/include_next.m4 \
diff -Nrc2 texinfo-6.1/install-info/tests/ii-0018-expected-dir-file texinfo-6.3/install-info/tests/ii-0018-expected-dir-file
*** texinfo-6.1/install-info/tests/ii-0018-expected-dir-file	2015-12-16 10:45:49.000000000 +0000
--- texinfo-6.3/install-info/tests/ii-0018-expected-dir-file	2016-03-04 18:37:53.000000000 +0000
***************
*** 6,10 ****
  
    This (the Directory node) gives a menu of major topics.
!   Typing "q" exits, "?" lists all Info commands, "d" returns here,
    "h" gives a primer for first-timers,
    "mEmacs<Return>" visits the Emacs manual, etc.
--- 6,10 ----
  
    This (the Directory node) gives a menu of major topics.
!   Typing "q" exits, "H" lists all Info commands, "d" returns here,
    "h" gives a primer for first-timers,
    "mEmacs<Return>" visits the Emacs manual, etc.
diff -Nrc2 texinfo-6.1/install-info/tests/ii-0019-expected-dir-file texinfo-6.3/install-info/tests/ii-0019-expected-dir-file
*** texinfo-6.1/install-info/tests/ii-0019-expected-dir-file	2015-12-16 11:01:06.000000000 +0000
--- texinfo-6.3/install-info/tests/ii-0019-expected-dir-file	2016-03-04 18:38:03.000000000 +0000
***************
*** 6,10 ****
  
    This (the Directory node) gives a menu of major topics.
!   Typing "q" exits, "?" lists all Info commands, "d" returns here,
    "h" gives a primer for first-timers,
    "mEmacs<Return>" visits the Emacs manual, etc.
--- 6,10 ----
  
    This (the Directory node) gives a menu of major topics.
!   Typing "q" exits, "H" lists all Info commands, "d" returns here,
    "h" gives a primer for first-timers,
    "mEmacs<Return>" visits the Emacs manual, etc.
diff -Nrc2 texinfo-6.1/man/Makefile.in texinfo-6.3/man/Makefile.in
*** texinfo-6.1/man/Makefile.in	2016-02-06 12:24:05.000000000 +0000
--- texinfo-6.3/man/Makefile.in	2016-09-10 20:29:56.000000000 +0100
***************
*** 127,130 ****
--- 127,131 ----
  	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
  	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+ 	$(top_srcdir)/gnulib/m4/hard-locale.m4 \
  	$(top_srcdir)/gnulib/m4/iconv.m4 \
  	$(top_srcdir)/gnulib/m4/include_next.m4 \
diff -Nrc2 texinfo-6.1/man/info.1 texinfo-6.3/man/info.1
*** texinfo-6.1/man/info.1	2016-02-06 12:24:51.000000000 +0000
--- texinfo-6.3/man/info.1	2016-09-10 20:37:10.000000000 +0100
***************
*** 1,4 ****
  .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.4.
! .TH INFO "1" "February 2016" "info 6.1" "User Commands"
  .SH NAME
  info \- read Info documents
--- 1,4 ----
  .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.4.
! .TH INFO "1" "September 2016" "info 6.3" "User Commands"
  .SH NAME
  info \- read Info documents
diff -Nrc2 texinfo-6.1/man/install-info.1 texinfo-6.3/man/install-info.1
*** texinfo-6.1/man/install-info.1	2016-02-06 12:24:43.000000000 +0000
--- texinfo-6.3/man/install-info.1	2016-09-10 20:37:05.000000000 +0100
***************
*** 1,4 ****
  .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.4.
! .TH INSTALL-INFO "1" "February 2016" "install-info 6.1" "User Commands"
  .SH NAME
  install-info \- update info/dir entries
--- 1,4 ----
  .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.4.
! .TH INSTALL-INFO "1" "September 2016" "install-info 6.3" "User Commands"
  .SH NAME
  install-info \- update info/dir entries
diff -Nrc2 texinfo-6.1/man/makeinfo.1 texinfo-6.3/man/makeinfo.1
*** texinfo-6.1/man/makeinfo.1	2016-02-06 12:24:44.000000000 +0000
--- texinfo-6.3/man/makeinfo.1	2016-09-10 20:37:05.000000000 +0100
***************
*** 1,4 ****
  .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.4.
! .TH TEXI2ANY "1" "February 2016" "texi2any 6.1" "User Commands"
  .SH NAME
  texi2any \- translate Texinfo documents
--- 1,4 ----
  .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.4.
! .TH TEXI2ANY "1" "September 2016" "texi2any 6.3" "User Commands"
  .SH NAME
  texi2any \- translate Texinfo documents
diff -Nrc2 texinfo-6.1/man/pod2texi.1 texinfo-6.3/man/pod2texi.1
*** texinfo-6.1/man/pod2texi.1	2016-02-06 11:33:18.000000000 +0000
--- texinfo-6.3/man/pod2texi.1	2016-09-10 12:44:48.000000000 +0100
***************
*** 134,138 ****
  .\"
  .IX Title "POD2TEXI 1"
! .TH POD2TEXI 1 "2015-02-25" "perl v5.18.1" "User Contributed Perl Documentation"
  .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
  .\" way too many mistakes in technical documents.
--- 134,138 ----
  .\"
  .IX Title "POD2TEXI 1"
! .TH POD2TEXI 1 "2016-02-06" "perl v5.18.1" "User Contributed Perl Documentation"
  .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
  .\" way too many mistakes in technical documents.
***************
*** 223,227 ****
  .SH "COPYRIGHT"
  .IX Header "COPYRIGHT"
! Copyright 2015 Free Software Foundation, Inc.
  .PP
  This program is free software; you can redistribute it and/or modify
--- 223,227 ----
  .SH "COPYRIGHT"
  .IX Header "COPYRIGHT"
! Copyright 2016 Free Software Foundation, Inc.
  .PP
  This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/man/texi2dvi.1 texinfo-6.3/man/texi2dvi.1
*** texinfo-6.1/man/texi2dvi.1	2016-02-06 12:24:44.000000000 +0000
--- texinfo-6.3/man/texi2dvi.1	2016-09-10 20:37:06.000000000 +0100
***************
*** 1,4 ****
  .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.4.
! .TH TEXI2DVI "1" "February 2016" "texi2dvi 6991" "User Commands"
  .SH NAME
  texi2dvi \- convert Texinfo documents to DVI or PDF
--- 1,4 ----
  .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.4.
! .TH TEXI2DVI "1" "September 2016" "texi2dvi 7353" "User Commands"
  .SH NAME
  texi2dvi \- convert Texinfo documents to DVI or PDF
***************
*** 19,33 ****
  (e)plain TeX files, set the environment variable LATEX=tex.
  .PP
! In order to make texi2dvi a drop\-in replacement of TeX/LaTeX in AUC\-TeX,
! the FILE may also be composed of the following simple TeX commands.
! .TP
! `\einput{FILE}'
! the actual file to compile
! .TP
! `\enonstopmode'
! same as \fB\-\-batch\fR
! .PP
! When invoked as `texi2pdf' or `pdftexi2dvi', or given the option \fB\-\-pdf\fR
! or \fB\-\-dvipdf\fR, generate PDF output.  Otherwise, generate DVI.
  .SS "General options:"
  .TP
--- 19,24 ----
  (e)plain TeX files, set the environment variable LATEX=tex.
  .PP
! When invoked as `texi2pdf' or given the option \fB\-\-pdf\fR generate PDF output.
! Otherwise, generate DVI.
  .SS "General options:"
  .TP
***************
*** 47,53 ****
  no output unless errors (implies \fB\-\-batch\fR)
  .TP
- \fB\-s\fR, \fB\-\-silent\fR
- same as \fB\-\-quiet\fR
- .TP
  \fB\-v\fR, \fB\-\-version\fR
  display version information and exit successfully
--- 38,41 ----
***************
*** 60,65 ****
  .TP
  \fB\-\-mostly\-clean\fR
! remove the auxiliary files and directories,
! but not the output
  .SS "Output format:"
  .TP
--- 48,53 ----
  .TP
  \fB\-\-mostly\-clean\fR
! remove auxiliary files or directories from
! previous runs (but not the output)
  .SS "Output format:"
  .TP
***************
*** 86,94 ****
  .SS "TeX tuning:"
  .TP
! \-@
! use @input instead of \einput for preloaded Texinfo
! .TP
! \fB\-e\fR, \fB\-E\fR, \fB\-\-expand\fR
! force macro expansion using makeinfo
  .TP
  \fB\-I\fR DIR
--- 74,79 ----
  .SS "TeX tuning:"
  .TP
! \fB\-E\fR, \fB\-\-expand\fR
! macro expansion using makeinfo
  .TP
  \fB\-I\fR DIR
***************
*** 107,118 ****
  pass \fB\-\-src\-specials\fR to TeX
  .TP
- \fB\-t\fR, \fB\-\-command\fR=\fI\,CMD\/\fR
- insert CMD in copy of input file
- .TP
- or \fB\-\-texinfo\fR=\fI\,CMD\/\fR
- multiple values accumulate
- .TP
  \fB\-\-translate\-file\fR=\fI\,FILE\/\fR
  use given charset translation file for TeX
  .SS "Build modes:"
  .TP
--- 92,103 ----
  pass \fB\-\-src\-specials\fR to TeX
  .TP
  \fB\-\-translate\-file\fR=\fI\,FILE\/\fR
  use given charset translation file for TeX
+ .TP
+ \fB\-t\fR, \fB\-\-command\fR=\fI\,CMD\/\fR
+ insert CMD in copy of input file
+ .PP
+ Any CMD strings are added after @setfilename for Texinfo input, or in
+ the first line for LaTeX input.  Multiple values accumulate.
  .SS "Build modes:"
  .TP
***************
*** 158,164 ****
  dvipdf dvi2pdf dvitopdf.
  .PP
- Any CMD strings are added after @setfilename for Texinfo input, or in
- the first line for LaTeX input.
- .PP
  If Texinfo is installed on your site, then the command
  .IP
--- 143,146 ----
diff -Nrc2 texinfo-6.1/man/texindex.1 texinfo-6.3/man/texindex.1
*** texinfo-6.1/man/texindex.1	2016-02-06 12:24:44.000000000 +0000
--- texinfo-6.3/man/texindex.1	2016-09-10 20:37:06.000000000 +0100
***************
*** 1,4 ****
  .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.4.
! .TH TEXINDEX "1" "February 2016" "texindex 6.1" "User Commands"
  .SH NAME
  texindex \- sort Texinfo index files
--- 1,4 ----
  .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.4.
! .TH TEXINDEX "1" "September 2016" "texindex 6.3" "User Commands"
  .SH NAME
  texindex \- sort Texinfo index files
diff -Nrc2 texinfo-6.1/po/LINGUAS texinfo-6.3/po/LINGUAS
*** texinfo-6.1/po/LINGUAS	2015-02-25 11:49:42.000000000 +0000
--- texinfo-6.3/po/LINGUAS	2016-09-03 14:45:01.000000000 +0100
***************
*** 4,7 ****
--- 4,8 ----
  de
  de_AT
+ el
  eo
  es
diff -Nrc2 texinfo-6.1/po/Makevars texinfo-6.3/po/Makevars
*** texinfo-6.1/po/Makevars	2015-06-03 19:51:23.000000000 +0100
--- texinfo-6.3/po/Makevars	2016-02-27 16:02:47.000000000 +0000
***************
*** 103,105 ****
  # "no".  Set this to no if the POT file and PO files are maintained
  # externally.
! DIST_DEPENDS_ON_UPDATE_PO = yes
--- 103,105 ----
  # "no".  Set this to no if the POT file and PO files are maintained
  # externally.
! DIST_DEPENDS_ON_UPDATE_PO = no
Binary files texinfo-6.1/po/ca.gmo and texinfo-6.3/po/ca.gmo differ
diff -Nrc2 texinfo-6.1/po/ca.po texinfo-6.3/po/ca.po
*** texinfo-6.1/po/ca.po	2016-02-06 11:35:49.000000000 +0000
--- texinfo-6.3/po/ca.po	2016-09-10 12:45:50.000000000 +0100
***************
*** 8,12 ****
  "Project-Id-Version: texinfo 5.9.93\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
  "PO-Revision-Date: 2015-06-08 17:07+0200\n"
  "Last-Translator: Walter Garcia-Fontes <walter.garcia@upf.edu>\n"
--- 8,12 ----
  "Project-Id-Version: texinfo 5.9.93\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:45+0100\n"
  "PO-Revision-Date: 2015-06-08 17:07+0200\n"
  "Last-Translator: Walter Garcia-Fontes <walter.garcia@upf.edu>\n"
***************
*** 16,19 ****
--- 16,20 ----
  "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"
  
***************
*** 112,116 ****
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [ or [^"
  msgstr "[ o [^ sense concordÃ ncia"
  
--- 113,118 ----
  
  #: gnulib/lib/regcomp.c:156
! #, fuzzy
! msgid "Unmatched [, [^, [:, [., or [="
  msgstr "[ o [^ sense concordÃ ncia"
  
***************
*** 151,155 ****
  msgstr ") o \\) sense concordÃ ncia"
  
! #: gnulib/lib/regcomp.c:711
  msgid "No previous regular expression"
  msgstr "No hi ha una expressiÃ³ regular prÃ¨via"
--- 153,157 ----
  msgstr ") o \\) sense concordÃ ncia"
  
! #: gnulib/lib/regcomp.c:687
  msgid "No previous regular expression"
  msgstr "No hi ha una expressiÃ³ regular prÃ¨via"
***************
*** 305,309 ****
  msgstr "---------- Notes a peu de pÃ gina ----------"
  
! #: info/indices.c:123 info/indices.c:812
  #, c-format
  msgid "Finding index entries..."
--- 307,311 ----
  msgstr "---------- Notes a peu de pÃ gina ----------"
  
! #: info/indices.c:123 info/indices.c:822
  #, c-format
  msgid "Finding index entries..."
***************
*** 314,318 ****
  msgstr "Busca una cadena de carÃ cters a l'index per a aquest fitxer"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:818
  #, c-format
  msgid "No indices found."
--- 316,320 ----
  msgstr "Busca una cadena de carÃ cters a l'index per a aquest fitxer"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:828
  #, c-format
  msgid "No indices found."
***************
*** 346,360 ****
  msgstr "No hi ha mÃ©s entrades d'Ã­ndex que continguin `%s'."
  
! #: info/indices.c:476 info/indices.c:880
  #, c-format
  msgid "No index entries containing '%s'."
  msgstr "No hi ha entrades d'Ã­ndex que continguin `%s'."
  
! #: info/indices.c:583
  #, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "S'estan explorant els Ã­ndexs de `%s'..."
  
! #: info/indices.c:636
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
--- 348,362 ----
  msgstr "No hi ha mÃ©s entrades d'Ã­ndex que continguin `%s'."
  
! #: info/indices.c:476 info/indices.c:890
  #, c-format
  msgid "No index entries containing '%s'."
  msgstr "No hi ha entrades d'Ã­ndex que continguin `%s'."
  
! #: info/indices.c:586
  #, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "S'estan explorant els Ã­ndexs de `%s'..."
  
! #: info/indices.c:646
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
***************
*** 362,380 ****
  "carÃ cters i construeix un menÃº"
  
! #: info/indices.c:644 info/indices.c:646
  msgid "Index apropos"
  msgstr "Sobre Ã�ndex"
  
! #: info/indices.c:688
  #, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Entrades d'Ã­ndex que contenen `%s':\n"
  
! #: info/indices.c:797
  msgid "List all matches of a string in the index"
  msgstr ""
  "Fes una  llista de totes les concordances d'una cadena de carÃ cters a l'Ã­ndex"
  
! #: info/indices.c:824 info/indices.c:826
  msgid "Index topic"
  msgstr "Tema d'Ã­ndex"
--- 364,382 ----
  "carÃ cters i construeix un menÃº"
  
! #: info/indices.c:654 info/indices.c:656
  msgid "Index apropos"
  msgstr "Sobre Ã�ndex"
  
! #: info/indices.c:698
  #, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Entrades d'Ã­ndex que contenen `%s':\n"
  
! #: info/indices.c:807
  msgid "List all matches of a string in the index"
  msgstr ""
  "Fes una  llista de totes les concordances d'una cadena de carÃ cters a l'Ã­ndex"
  
! #: info/indices.c:834 info/indices.c:836
  msgid "Index topic"
  msgstr "Tema d'Ã­ndex"
***************
*** 385,389 ****
  msgstr "Cap dels fitxers info disponibles tenen `%s' als seus Ã­ndexs."
  
! #: info/info-utils.c:892
  #, c-format
  msgid "Error converting file character encoding."
--- 387,391 ----
  msgstr "Cap dels fitxers info disponibles tenen `%s' als seus Ã­ndexs."
  
! #: info/info-utils.c:879
  #, c-format
  msgid "Error converting file character encoding."
***************
*** 391,440 ****
  "S'ha produÃ¯t un error en la conversiÃ³ la codificaciÃ³ de carÃ cters del fitxer."
  
! #: info/info.c:222 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "No hi ha un element de menÃº `%s' al node `%s'."
  
! #: info/info.c:315
! #, c-format
! msgid "No file given for node '%s'."
! msgstr "No s'ha donat un fitxer per al node `%s'."
! 
! #: info/info.c:364 info/info.c:1133
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr "No es pot trobar el node `%s'."
  
! #: info/info.c:386
  #, c-format
  msgid "No program name given."
  msgstr "No s'ha donat un nom de programa."
  
! #: info/info.c:577
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "nÃºmero no vÃ lid: %s\n"
  
! #: info/info.c:757
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "AssignaciÃ³ mal format de variable: %s"
  
! #: info/info.c:764 info/infokey.c:537
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: la variable no existeix"
  
! #: info/info.c:770 info/infokey.c:539
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "el valor %s no Ã©s vÃ lid per a la variable %s"
  
! #: info/info.c:782
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "Proveu --help per a mÃ©s informaciÃ³.\n"
  
! #: info/info.c:804 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
--- 393,437 ----
  "S'ha produÃ¯t un error en la conversiÃ³ la codificaciÃ³ de carÃ cters del fitxer."
  
! #: info/info.c:279 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "No hi ha un element de menÃº `%s' al node `%s'."
  
! #: info/info.c:416 info/info.c:1148
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr "No es pot trobar el node `%s'."
  
! #: info/info.c:438
  #, c-format
  msgid "No program name given."
  msgstr "No s'ha donat un nom de programa."
  
! #: info/info.c:636
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "nÃºmero no vÃ lid: %s\n"
  
! #: info/info.c:816
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "AssignaciÃ³ mal format de variable: %s"
  
! #: info/info.c:823 info/infokey.c:540
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: la variable no existeix"
  
! #: info/info.c:829 info/infokey.c:542
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "el valor %s no Ã©s vÃ lid per a la variable %s"
  
! #: info/info.c:841
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "Proveu --help per a mÃ©s informaciÃ³.\n"
  
! #: info/info.c:860 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
***************
*** 452,461 ****
  "No hi ha CAP GARANTIA, en la mesura que ho permet la llei.\n"
  
! #: info/info.c:981
  #, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "no s'han trobat entrades d'Ã­ndex per a `%s'\n"
  
! #: info/info.c:1034
  #, c-format
  msgid ""
--- 449,458 ----
  "No hi ha CAP GARANTIA, en la mesura que ho permet la llei.\n"
  
! #: info/info.c:999
  #, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "no s'han trobat entrades d'Ã­ndex per a `%s'\n"
  
! #: info/info.c:1049
  #, c-format
  msgid ""
***************
*** 468,472 ****
  "Llegiu la informaciÃ³ en format Info.\n"
  
! #: info/info.c:1040
  msgid ""
  "Options:\n"
--- 465,469 ----
  "Llegiu la informaciÃ³ en format Info.\n"
  
! #: info/info.c:1055
  msgid ""
  "Options:\n"
***************
*** 487,491 ****
  "  -f, --file=MANUAL            especifiqueu al manual INFO a visitar."
  
! #: info/info.c:1048
  msgid ""
  "  -h, --help                   display this help and exit.\n"
--- 484,488 ----
  "  -f, --file=MANUAL            especifiqueu al manual INFO a visitar."
  
! #: info/info.c:1063
  msgid ""
  "  -h, --help                   display this help and exit.\n"
***************
*** 501,505 ****
  "  -o, --output=FITXER          bolca els nodes escollits a FITXER."
  
! #: info/info.c:1054
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
--- 498,502 ----
  "  -o, --output=FITXER          bolca els nodes escollits a FITXER."
  
! #: info/info.c:1069
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
***************
*** 516,525 ****
  "  -O, --show-options, --usage  ves al node d'opcions de lÃ­nia d'ordres."
  
! #: info/info.c:1061
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr ""
  "  -b, --speech-friendly        sigues amigable amb els sintetitzadors de veu."
  
! #: info/info.c:1065
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
--- 513,522 ----
  "  -O, --show-options, --usage  ves al node d'opcions de lÃ­nia d'ordres."
  
! #: info/info.c:1076
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr ""
  "  -b, --speech-friendly        sigues amigable amb els sintetitzadors de veu."
  
! #: info/info.c:1080
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
***************
*** 544,548 ****
  "tot).\n"
  
! #: info/info.c:1074
  msgid ""
  "\n"
--- 541,545 ----
  "tot).\n"
  
! #: info/info.c:1089
  msgid ""
  "\n"
***************
*** 562,566 ****
  "de menÃº relatius al node inicial que s'ha visitat."
  
! #: info/info.c:1081
  msgid ""
  "\n"
--- 559,563 ----
  "de menÃº relatius al node inicial que s'ha visitat."
  
! #: info/info.c:1096
  msgid ""
  "\n"
***************
*** 570,574 ****
  "Per a un resum de les assignacions de tecles, entreu H dins d'Info."
  
! #: info/info.c:1084
  msgid ""
  "\n"
--- 567,571 ----
  "Per a un resum de les assignacions de tecles, entreu H dins d'Info."
  
! #: info/info.c:1099
  msgid ""
  "\n"
***************
*** 604,608 ****
  "  info -f ./bla.info         mostra el fitxer ./bla.info, sense buscar a dir"
  
! #: info/info.c:1099 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
--- 601,605 ----
  "  info -f ./bla.info         mostra el fitxer ./bla.info, sense buscar a dir"
  
! #: info/info.c:1114 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
***************
*** 614,678 ****
  "PÃ gina d'inici de texinfo: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1134
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "No es pot trobar el node '(%s)%s'."
  
! #: info/info.c:1135
  msgid "Cannot find a window!"
  msgstr "No es pot trobar una finestra!"
  
! #: info/info.c:1136
  msgid "Point doesn't appear within this window's node!"
  msgstr "El punt no apareix dins del node d'aquesta finestra!"
  
! #: info/info.c:1137
  msgid "Cannot delete the last window."
  msgstr "No es pot eliminar l'Ãºltima finestra."
  
! #: info/info.c:1138
  msgid "No menu in this node."
  msgstr "No hi ha un menÃº a aquest node."
  
! #: info/info.c:1139
  msgid "No footnotes in this node."
  msgstr "No hi ha notes a peu de pÃ gina a aquest node."
  
! #: info/info.c:1140
  msgid "No cross references in this node."
  msgstr "No hi ha referÃ¨ncies creuades a aquest node."
  
! #: info/info.c:1141
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr "No hi ha un punter '%s' per a aquest node."
  
! #: info/info.c:1142
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "Ordre `%c' d'Info desconeguda; proveu `?' per a ajuda."
  
! #: info/info.c:1143
  #, c-format
  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:1144
  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:1145
  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:1146
  msgid "Only one window."
  msgstr "Sols una finestra."
  
! #: info/info.c:1147
  msgid "Resulting window would be too small."
  msgstr "La finestra resultant seria massa petita."
  
! #: info/info.c:1148
  msgid "Not enough room for a help window, please delete a window."
  msgstr ""
--- 611,675 ----
  "PÃ gina d'inici de texinfo: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1149
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "No es pot trobar el node '(%s)%s'."
  
! #: info/info.c:1150
  msgid "Cannot find a window!"
  msgstr "No es pot trobar una finestra!"
  
! #: info/info.c:1151
  msgid "Point doesn't appear within this window's node!"
  msgstr "El punt no apareix dins del node d'aquesta finestra!"
  
! #: info/info.c:1152
  msgid "Cannot delete the last window."
  msgstr "No es pot eliminar l'Ãºltima finestra."
  
! #: info/info.c:1153
  msgid "No menu in this node."
  msgstr "No hi ha un menÃº a aquest node."
  
! #: info/info.c:1154
  msgid "No footnotes in this node."
  msgstr "No hi ha notes a peu de pÃ gina a aquest node."
  
! #: info/info.c:1155
  msgid "No cross references in this node."
  msgstr "No hi ha referÃ¨ncies creuades a aquest node."
  
! #: info/info.c:1156
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr "No hi ha un punter '%s' per a aquest node."
  
! #: info/info.c:1157
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "Ordre `%c' d'Info desconeguda; proveu `?' per a ajuda."
  
! #: info/info.c:1158
  #, c-format
  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:1159
  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:1160
  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:1161
  msgid "Only one window."
  msgstr "Sols una finestra."
  
! #: info/info.c:1162
  msgid "Resulting window would be too small."
  msgstr "La finestra resultant seria massa petita."
  
! #: info/info.c:1163
  msgid "Not enough room for a help window, please delete a window."
  msgstr ""
***************
*** 953,987 ****
  msgstr "acciÃ³ desconeguda `%s'"
  
! #: info/infokey.c:482
  #, c-format
  msgid "action name too long"
  msgstr "nom d'acciÃ³ massa llarg"
  
! #: info/infokey.c:495
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "hi ha carÃ cters extra a continuaciÃ³ de l'acciÃ³ `%s'"
  
! #: info/infokey.c:506
  #, c-format
  msgid "missing variable name"
  msgstr "nom absent de variable"
  
! #: info/infokey.c:515
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "`=' absent immediatament desprÃ©s del nom de la variable"
  
! #: info/infokey.c:522
  #, c-format
  msgid "variable name too long"
  msgstr "nom de la variable massa llarg"
  
! #: info/infokey.c:546
  #, c-format
  msgid "value too long"
  msgstr "valor massa llarg"
  
! #: info/infokey.c:592
  #, c-format
  msgid "\"%s\", line %u: "
--- 950,984 ----
  msgstr "acciÃ³ desconeguda `%s'"
  
! #: info/infokey.c:485
  #, c-format
  msgid "action name too long"
  msgstr "nom d'acciÃ³ massa llarg"
  
! #: info/infokey.c:498
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "hi ha carÃ cters extra a continuaciÃ³ de l'acciÃ³ `%s'"
  
! #: info/infokey.c:509
  #, c-format
  msgid "missing variable name"
  msgstr "nom absent de variable"
  
! #: info/infokey.c:518
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "`=' absent immediatament desprÃ©s del nom de la variable"
  
! #: info/infokey.c:525
  #, c-format
  msgid "variable name too long"
  msgstr "nom de la variable massa llarg"
  
! #: info/infokey.c:549
  #, c-format
  msgid "value too long"
  msgstr "valor massa llarg"
  
! #: info/infokey.c:595
  #, c-format
  msgid "\"%s\", line %u: "
***************
*** 1322,1662 ****
  msgstr "No s'ha pogut trobar el node referenciat per '%s' a '%s'."
  
! #: info/session.c:2864
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "Llegeix una llista de menÃºs comenÃ§ant des del directori i segueix-los"
  
! #: info/session.c:2866
  msgid "Follow menus: "
  msgstr "Segueix els menÃºs: "
  
! #: info/session.c:2971
  msgid "Select the Next node"
  msgstr "Selecciona el node SegÃ¼ent"
  
! #: info/session.c:2978
  msgid "Select the Prev node"
  msgstr "Selecciona el node Previ"
  
! #: info/session.c:2985
  msgid "Select the Up node"
  msgstr "Selecciona el node Amunt"
  
! #: info/session.c:2991
  msgid "Select the last node in this file"
  msgstr "Selecciona l'Ãºltim node a aquest fitxer"
  
! #: info/session.c:3018 info/session.c:3051
  msgid "This window has no additional nodes"
  msgstr "Aquesta finestra no tÃ© nodes addicionals"
  
! #: info/session.c:3024
  msgid "Select the first node in this file"
  msgstr "Selecciona el primer node a aquest fitxer"
  
! #: info/session.c:3158
  msgid "No more nodes within this document."
  msgstr "No hi ha mÃ©s nodes dins d'aquest document."
  
! #: info/session.c:3203 info/session.c:3243
  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."
  
! #: info/session.c:3256
  msgid "Move forwards or down through node structure"
  msgstr "Ves amunt o avall a travÃ©s de l'estructura de nodes"
  
! #: info/session.c:3273
  msgid "Move backwards or up through node structure"
  msgstr "Ves cap endarrere o amunt a travÃ©s de l'estructura de nodes"
  
! #: info/session.c:3296
  msgid "Read a node name and select it"
  msgstr "Llegeix un nom de node i selecciona'l"
  
! #: info/session.c:3350 info/session.c:3354
  msgid "Goto node: "
  msgstr "Ves al node: "
  
! #: info/session.c:3533
  msgid "Find the node describing program invocation"
  msgstr "Troba el node que descriu la invocaciÃ³ del programa"
  
! #: info/session.c:3535
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Troba el node InvocaciÃ³ de [%s]: "
  
! #: info/session.c:3580
  msgid "Read a manpage reference and select it"
  msgstr "Llegeix una referÃ¨ncia manpage i selecciona-la"
  
! #: info/session.c:3584
  msgid "Get Manpage: "
  msgstr "ObtÃ© la Manpage: "
  
! #: info/session.c:3605
  msgid "Select the node 'Top' in this file"
  msgstr "Selecciona el node `Top' a aquest fitxer"
  
! #: info/session.c:3611
  msgid "Select the node '(dir)'"
  msgstr "Selecciona el node '(dir)'"
  
! #: info/session.c:3617
  msgid "Show full file name of node being displayed"
  msgstr "Mostra el nom complet de fitxer del node que s'estÃ  mostrant"
  
! #: info/session.c:3634
  msgid "Select the most recently selected node"
  msgstr "Selecciona el node seleccionat mÃ©s recentment"
  
! #: info/session.c:3639
  #, c-format
  msgid "No earlier node in history"
  msgstr "No hi ha un node anterior a la histÃ²ria"
  
! #: info/session.c:3643
  msgid "Read the name of a file and select it"
  msgstr "Llegeix el nom d'un fitxer i selecciona'l"
  
! #: info/session.c:3647
  msgid "Find file: "
  msgstr "Troba el fitxer: "
  
! #: info/session.c:3664
  #, c-format
  msgid "Cannot find '%s'."
  msgstr "No es pot trobar '%s'."
  
! #: info/session.c:3713
  #, c-format
  msgid "Could not create output file '%s'."
  msgstr "No s'ha pogut crear el fitxer de sortida '%s'."
  
! #: info/session.c:3727
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "error quan s'estava escrivint a %s: %s"
  
! #: info/session.c:3736
  #, c-format
  msgid "closing %s"
  msgstr "s'estÃ  tancant %s"
  
! #: info/session.c:3785
  #, c-format
  msgid "writing node %s..."
  msgstr "s'estÃ  escrivint el node %s..."
  
! #: info/session.c:3831
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "Passa els continguts d'aquest node a travÃ©s d'INFO_PRINT_COMMAND"
  
! #: info/session.c:3859
  #, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "No es pot obrir el conducte a '%s'."
  
! #: info/session.c:3864
  #, c-format
  msgid "printing node %s..."
  msgstr "s'estÃ  imprimint el node %s..."
  
! #: info/session.c:3872
  #, c-format
  msgid "finished printing node %s"
  msgstr "s'ha acabat d'imprimir el node %s"
  
! #: info/session.c:3904
  msgid "Toggle the usage of regular expressions in searches"
  msgstr "Commuta l'Ãºs d'expressions regulars a les cerques"
  
! #: info/session.c:3908
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr "S'estan usant les expressions regular per a les cerques."
  
! #: info/session.c:3909
  #, c-format
  msgid "Using literal strings for searches."
  msgstr "S'estan usant cadenes literals de carÃ cters per a les cerques."
  
! #: info/session.c:4169
  msgid "Search continued from the end of the document."
  msgstr "Es continuarÃ  la cerca des del final del document."
  
! #: info/session.c:4174
  msgid "Search continued from the beginning of the document."
  msgstr "Es continuarÃ  la cerca des del principi del document."
  
! #: info/session.c:4194
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "S'estÃ  buscant el subfitxer %s..."
  
! #: info/session.c:4231
  msgid "Search failed."
  msgstr "La cerca ha fallat."
  
! #: info/session.c:4248
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Regexp search"
  msgstr "Cerca d'expressiÃ³ regular"
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Search"
  msgstr "Cerca"
  
! #: info/session.c:4250 info/session.c:4256
  msgid " case-sensitively"
  msgstr "respectant majÃºscules i minÃºscules"
  
! #: info/session.c:4251 info/session.c:4257
  msgid " backward"
  msgstr " cap endarrere"
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s: "
  
! #: info/session.c:4274
  msgid "Search string too short"
  msgstr "La cadena de carÃ cters de cerca Ã©s massa curta"
  
! #: info/session.c:4467
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4491 info/session.c:4601
  #, fuzzy, c-format
  msgid "No more matches."
  msgstr "No hi ha concordanÃ§a"
  
! #: info/session.c:4628
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4649
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4653 info/session.c:4665
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4661
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4674
  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:4679
  msgid "Read a string and search for it"
  msgstr "Llegeix una cadena de carÃ cters i busca-la"
  
! #: info/session.c:4685
  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:4693
  msgid "Repeat last search in the same direction"
  msgstr "Repeteix l'Ãºltima cerca en la mateixa direcciÃ³"
  
! #: info/session.c:4701 info/session.c:4746
  msgid "No previous search string"
  msgstr "No hi ha una cadena de carÃ cters de cerca prÃ¨via"
  
! #: info/session.c:4738
  msgid "Repeat last search in the reverse direction"
  msgstr "Repeteix l'Ãºltima cerca en la direcciÃ³ inversa"
  
! #: info/session.c:4785
  msgid "Clear displayed search matches"
  msgstr "Neteja les concordances mostrades de cerca"
  
! #: info/session.c:4802 info/session.c:4808
  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:4928
  msgid "Regexp I-search backward: "
  msgstr "I-cerca l'expressiÃ³ regular cap endarrere: "
  
! #: info/session.c:4929
  msgid "I-search backward: "
  msgstr "I-cerca cap endarrere: "
  
! #: info/session.c:4931
  msgid "Regexp I-search: "
  msgstr "I-cerca l'expressiÃ³ regular: "
  
! #: info/session.c:4932
  msgid "I-search: "
  msgstr "I-cerca: "
  
! #: info/session.c:4957 info/session.c:4960
  msgid "Failing "
  msgstr "EstÃ  fallant "
  
! #: info/session.c:5326
  msgid "Cancel current operation"
  msgstr "CancelÂ·la l'operaciÃ³ actual"
  
! #: info/session.c:5333
  msgid "Quit"
  msgstr "Surt"
  
! #: info/session.c:5338
  msgid "Display version of Info being run"
  msgstr "Mostra la informaciÃ³ de versiÃ³ de l'Info que s'estÃ  executant"
  
! #: info/session.c:5340
  #, c-format
  msgid "GNU Info version %s"
  msgstr "GNU Info versiÃ³ %s"
  
! #: info/session.c:5345
  msgid "Redraw the display"
  msgstr "Torna a dibuixar la pantalla"
  
! #: info/session.c:5382
  msgid "Quit using Info"
  msgstr "Surt d'Info"
  
! #: info/session.c:5398
  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:5409
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Ordre desconeguda (%s)."
  
! #: info/session.c:5412
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\" no Ã©s vÃ lid"
  
! #: info/session.c:5413
  #, c-format
  msgid "'%s' is invalid"
  msgstr "'%s' no Ã©s vÃ lid"
  
! #: info/session.c:5731
  msgid "Add this digit to the current numeric argument"
  msgstr "Afegeix aquest dÃ­git a l'argument numÃ¨ric actual"
  
! #: info/session.c:5738
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "Inicia (o multiplica per 4) l'argument numÃ¨ric actual"
--- 1319,1659 ----
  msgstr "No s'ha pogut trobar el node referenciat per '%s' a '%s'."
  
! #: info/session.c:2870
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "Llegeix una llista de menÃºs comenÃ§ant des del directori i segueix-los"
  
! #: info/session.c:2872
  msgid "Follow menus: "
  msgstr "Segueix els menÃºs: "
  
! #: info/session.c:2977
  msgid "Select the Next node"
  msgstr "Selecciona el node SegÃ¼ent"
  
! #: info/session.c:2984
  msgid "Select the Prev node"
  msgstr "Selecciona el node Previ"
  
! #: info/session.c:2991
  msgid "Select the Up node"
  msgstr "Selecciona el node Amunt"
  
! #: info/session.c:2997
  msgid "Select the last node in this file"
  msgstr "Selecciona l'Ãºltim node a aquest fitxer"
  
! #: info/session.c:3024 info/session.c:3057
  msgid "This window has no additional nodes"
  msgstr "Aquesta finestra no tÃ© nodes addicionals"
  
! #: info/session.c:3030
  msgid "Select the first node in this file"
  msgstr "Selecciona el primer node a aquest fitxer"
  
! #: info/session.c:3164
  msgid "No more nodes within this document."
  msgstr "No hi ha mÃ©s nodes dins d'aquest document."
  
! #: info/session.c:3209 info/session.c:3249
  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."
  
! #: info/session.c:3262
  msgid "Move forwards or down through node structure"
  msgstr "Ves amunt o avall a travÃ©s de l'estructura de nodes"
  
! #: info/session.c:3279
  msgid "Move backwards or up through node structure"
  msgstr "Ves cap endarrere o amunt a travÃ©s de l'estructura de nodes"
  
! #: info/session.c:3302
  msgid "Read a node name and select it"
  msgstr "Llegeix un nom de node i selecciona'l"
  
! #: info/session.c:3356 info/session.c:3360
  msgid "Goto node: "
  msgstr "Ves al node: "
  
! #: info/session.c:3539
  msgid "Find the node describing program invocation"
  msgstr "Troba el node que descriu la invocaciÃ³ del programa"
  
! #: info/session.c:3541
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Troba el node InvocaciÃ³ de [%s]: "
  
! #: info/session.c:3586
  msgid "Read a manpage reference and select it"
  msgstr "Llegeix una referÃ¨ncia manpage i selecciona-la"
  
! #: info/session.c:3590
  msgid "Get Manpage: "
  msgstr "ObtÃ© la Manpage: "
  
! #: info/session.c:3611
  msgid "Select the node 'Top' in this file"
  msgstr "Selecciona el node `Top' a aquest fitxer"
  
! #: info/session.c:3617
  msgid "Select the node '(dir)'"
  msgstr "Selecciona el node '(dir)'"
  
! #: info/session.c:3623
  msgid "Show full file name of node being displayed"
  msgstr "Mostra el nom complet de fitxer del node que s'estÃ  mostrant"
  
! #: info/session.c:3640
  msgid "Select the most recently selected node"
  msgstr "Selecciona el node seleccionat mÃ©s recentment"
  
! #: info/session.c:3645
  #, c-format
  msgid "No earlier node in history"
  msgstr "No hi ha un node anterior a la histÃ²ria"
  
! #: info/session.c:3649
  msgid "Read the name of a file and select it"
  msgstr "Llegeix el nom d'un fitxer i selecciona'l"
  
! #: info/session.c:3653
  msgid "Find file: "
  msgstr "Troba el fitxer: "
  
! #: info/session.c:3670
  #, c-format
  msgid "Cannot find '%s'."
  msgstr "No es pot trobar '%s'."
  
! #: info/session.c:3719
  #, c-format
  msgid "Could not create output file '%s'."
  msgstr "No s'ha pogut crear el fitxer de sortida '%s'."
  
! #: info/session.c:3733
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "error quan s'estava escrivint a %s: %s"
  
! #: info/session.c:3742
  #, c-format
  msgid "closing %s"
  msgstr "s'estÃ  tancant %s"
  
! #: info/session.c:3791
  #, c-format
  msgid "writing node %s..."
  msgstr "s'estÃ  escrivint el node %s..."
  
! #: info/session.c:3837
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "Passa els continguts d'aquest node a travÃ©s d'INFO_PRINT_COMMAND"
  
! #: info/session.c:3865
  #, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "No es pot obrir el conducte a '%s'."
  
! #: info/session.c:3870
  #, c-format
  msgid "printing node %s..."
  msgstr "s'estÃ  imprimint el node %s..."
  
! #: info/session.c:3878
  #, c-format
  msgid "finished printing node %s"
  msgstr "s'ha acabat d'imprimir el node %s"
  
! #: info/session.c:3910
  msgid "Toggle the usage of regular expressions in searches"
  msgstr "Commuta l'Ãºs d'expressions regulars a les cerques"
  
! #: info/session.c:3914
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr "S'estan usant les expressions regular per a les cerques."
  
! #: info/session.c:3915
  #, c-format
  msgid "Using literal strings for searches."
  msgstr "S'estan usant cadenes literals de carÃ cters per a les cerques."
  
! #: info/session.c:4175
  msgid "Search continued from the end of the document."
  msgstr "Es continuarÃ  la cerca des del final del document."
  
! #: info/session.c:4180
  msgid "Search continued from the beginning of the document."
  msgstr "Es continuarÃ  la cerca des del principi del document."
  
! #: info/session.c:4200
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "S'estÃ  buscant el subfitxer %s..."
  
! #: info/session.c:4237
  msgid "Search failed."
  msgstr "La cerca ha fallat."
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Regexp search"
  msgstr "Cerca d'expressiÃ³ regular"
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Search"
  msgstr "Cerca"
  
! #: info/session.c:4256 info/session.c:4262
  msgid " case-sensitively"
  msgstr "respectant majÃºscules i minÃºscules"
  
! #: info/session.c:4257 info/session.c:4263
  msgid " backward"
  msgstr " cap endarrere"
  
! #: info/session.c:4260
  #, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s: "
  
! #: info/session.c:4280
  msgid "Search string too short"
  msgstr "La cadena de carÃ cters de cerca Ã©s massa curta"
  
! #: info/session.c:4473
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4497 info/session.c:4607
  #, fuzzy, c-format
  msgid "No more matches."
  msgstr "No hi ha concordanÃ§a"
  
! #: info/session.c:4634
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4655
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4659 info/session.c:4671
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4667
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4680
  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:4685
  msgid "Read a string and search for it"
  msgstr "Llegeix una cadena de carÃ cters i busca-la"
  
! #: info/session.c:4691
  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:4699
  msgid "Repeat last search in the same direction"
  msgstr "Repeteix l'Ãºltima cerca en la mateixa direcciÃ³"
  
! #: info/session.c:4707 info/session.c:4752
  msgid "No previous search string"
  msgstr "No hi ha una cadena de carÃ cters de cerca prÃ¨via"
  
! #: info/session.c:4744
  msgid "Repeat last search in the reverse direction"
  msgstr "Repeteix l'Ãºltima cerca en la direcciÃ³ inversa"
  
! #: info/session.c:4791
  msgid "Clear displayed search matches"
  msgstr "Neteja les concordances mostrades de cerca"
  
! #: info/session.c:4808 info/session.c:4814
  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:4934
  msgid "Regexp I-search backward: "
  msgstr "I-cerca l'expressiÃ³ regular cap endarrere: "
  
! #: info/session.c:4935
  msgid "I-search backward: "
  msgstr "I-cerca cap endarrere: "
  
! #: info/session.c:4937
  msgid "Regexp I-search: "
  msgstr "I-cerca l'expressiÃ³ regular: "
  
! #: info/session.c:4938
  msgid "I-search: "
  msgstr "I-cerca: "
  
! #: info/session.c:4963 info/session.c:4966
  msgid "Failing "
  msgstr "EstÃ  fallant "
  
! #: info/session.c:5332
  msgid "Cancel current operation"
  msgstr "CancelÂ·la l'operaciÃ³ actual"
  
! #: info/session.c:5339
  msgid "Quit"
  msgstr "Surt"
  
! #: info/session.c:5344
  msgid "Display version of Info being run"
  msgstr "Mostra la informaciÃ³ de versiÃ³ de l'Info que s'estÃ  executant"
  
! #: info/session.c:5346
  #, c-format
  msgid "GNU Info version %s"
  msgstr "GNU Info versiÃ³ %s"
  
! #: info/session.c:5351
  msgid "Redraw the display"
  msgstr "Torna a dibuixar la pantalla"
  
! #: info/session.c:5388
  msgid "Quit using Info"
  msgstr "Surt d'Info"
  
! #: info/session.c:5404
  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:5415
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Ordre desconeguda (%s)."
  
! #: info/session.c:5418
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\" no Ã©s vÃ lid"
  
! #: info/session.c:5419
  #, c-format
  msgid "'%s' is invalid"
  msgstr "'%s' no Ã©s vÃ lid"
  
! #: info/session.c:5737
  msgid "Add this digit to the current numeric argument"
  msgstr "Afegeix aquest dÃ­git a l'argument numÃ¨ric actual"
  
! #: info/session.c:5744
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "Inicia (o multiplica per 4) l'argument numÃ¨ric actual"
***************
*** 1813,1830 ****
  msgstr "Estableix %s al valor (%s): "
  
! #: info/window.c:959
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), lÃ­nies ----, "
  
- #: info/window.c:966
- #, c-format
- msgid "-%s---Info: %s, %ld lines --%s--"
- msgstr "-%s---Info: %s, %ld lÃ­nies --%s--"
- 
- #: info/window.c:970
- #, fuzzy, c-format
- msgid "-%s---Info: (%s)%s, %ld lines --%s--"
- msgstr "-%s%s-Info: (%s)%s, %ld lÃ­nies --%s--"
- 
  #: install-info/install-info.c:292
  #, c-format
--- 1810,1817 ----
  msgstr "Estableix %s al valor (%s): "
  
! #: info/window.c:909
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), lÃ­nies ----, "
  
  #: install-info/install-info.c:292
  #, c-format
***************
*** 2005,2009 ****
  
  #: install-info/install-info.c:642
! #, c-format
  msgid ""
  "This is the file .../info/dir, which contains the\n"
--- 1992,1996 ----
  
  #: install-info/install-info.c:642
! #, fuzzy, c-format
  msgid ""
  "This is the file .../info/dir, which contains the\n"
***************
*** 2014,2018 ****
  "\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"
--- 2001,2005 ----
  "\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"
***************
*** 2105,2222 ****
  msgstr "no s'han trobat entrades per a `%s'; no s'ha esborrat res"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:855
! #: tp/Texinfo/Convert/Converter.pm:893 tp/Texinfo/Convert/Converter.pm:1204
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6504
! #: tp/Texinfo/Convert/HTML.pm:6528 tp/Texinfo/Convert/HTML.pm:6905
! #: tp/Texinfo/Convert/HTML.pm:6963 tp/Texinfo/Convert/HTML.pm:7041
! #: tp/Texinfo/Convert/HTML.pm:7118 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:546
! #: tp/Texinfo/Convert/TexinfoXML.pm:457
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "no s'ha pogut obrir %s per escriure: %s"
  
! #: tp/Texinfo/Common.pm:881
  msgid "recursion is always allowed"
  msgstr "sempre es permet la recursivitat"
  
! #: tp/Texinfo/Common.pm:882
  msgid "arguments are quoted by default"
  msgstr "els arguments estan entre cometes de forma predeterminada"
  
! #: tp/Texinfo/Common.pm:1105
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s no Ã©s un codi vÃ lid"
  
! #: tp/Texinfo/Common.pm:1110
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s no es un codi vÃ lid de regiÃ³"
  
! #: tp/Texinfo/Common.pm:1128
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%s no Ã©s una possibilitat vÃ lida de divisiÃ³"
  
! #: tp/Texinfo/Common.pm:1151
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "no s'ha pogut llegir %s: %s"
  
! #: tp/Texinfo/Common.pm:1170
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "error en tancar fitxer @verbatiminclude %s: %s"
  
! #: tp/Texinfo/Common.pm:1176 tp/Texinfo/Parser.pm:3353
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%s: no s'ha pogut trobar %s"
  
! #: tp/Texinfo/Common.pm:1520
! #, 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/Common.pm:1548
! msgid "missing type"
! msgstr "tipus que falta"
! 
! #: tp/Texinfo/Common.pm:1551
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "tipus no reconegut: %s"
! 
! #: tp/Texinfo/Common.pm:1568
! #, 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/Common.pm:1603
  msgid "no node to be renamed"
  msgstr "no hi ha un node a reanomenar"
  
! #: tp/Texinfo/Common.pm:1614
  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:1624 tp/Texinfo/Parser.pm:926
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "no s'ha pogut obrir %s: %s"
  
! #: tp/Texinfo/Common.pm:2144
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr "no s'ha pogut protegir el carÃ cter coixinet a @%s"
  
! #: tp/Texinfo/Convert/Converter.pm:395 tp/Texinfo/Convert/Converter.pm:414
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Variable obsoleta %s\n"
  
! #: tp/Texinfo/Convert/Converter.pm:794
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr "%s: la sortida Ã©s incompatible amb la divisiÃ³"
  
! #: tp/Texinfo/Convert/Converter.pm:876 tp/Texinfo/Convert/Converter.pm:909
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:6931
! #: tp/Texinfo/Convert/HTML.pm:6989 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:476 tp/Texinfo/Parser.pm:2035
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "error en tancar %s: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, 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:995
  #, perl-format
  msgid "could not create directory `%s': %s"
--- 2092,2200 ----
  msgstr "no s'han trobat entrades per a `%s'; no s'ha esborrat res"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:847
! #: tp/Texinfo/Convert/Converter.pm:885 tp/Texinfo/Convert/Converter.pm:1196
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6573
! #: tp/Texinfo/Convert/HTML.pm:6597 tp/Texinfo/Convert/HTML.pm:6978
! #: tp/Texinfo/Convert/HTML.pm:7037 tp/Texinfo/Convert/HTML.pm:7115
! #: tp/Texinfo/Convert/HTML.pm:7192 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:547
! #: tp/Texinfo/Convert/TexinfoXML.pm:458
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "no s'ha pogut obrir %s per escriure: %s"
  
! #: tp/Texinfo/Common.pm:862
  msgid "recursion is always allowed"
  msgstr "sempre es permet la recursivitat"
  
! #: tp/Texinfo/Common.pm:863
  msgid "arguments are quoted by default"
  msgstr "els arguments estan entre cometes de forma predeterminada"
  
! #: tp/Texinfo/Common.pm:866
! msgid ""
! "move your @contents command if you want the contents after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:869
! msgid ""
! "move your @shortcontents and @contents commands if you want the contents "
! "after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:1093
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s no Ã©s un codi vÃ lid"
  
! #: tp/Texinfo/Common.pm:1098
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s no es un codi vÃ lid de regiÃ³"
  
! #: tp/Texinfo/Common.pm:1116
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%s no Ã©s una possibilitat vÃ lida de divisiÃ³"
  
! #: tp/Texinfo/Common.pm:1139
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "no s'ha pogut llegir %s: %s"
  
! #: tp/Texinfo/Common.pm:1158
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "error en tancar fitxer @verbatiminclude %s: %s"
  
! #: tp/Texinfo/Common.pm:1164 tp/Texinfo/Parser.pm:3193
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%s: no s'ha pogut trobar %s"
  
! #: tp/Texinfo/Common.pm:1637
  msgid "no node to be renamed"
  msgstr "no hi ha un node a reanomenar"
  
! #: tp/Texinfo/Common.pm:1648
  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:1658 tp/Texinfo/Parser.pm:899
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "no s'ha pogut obrir %s: %s"
  
! #: tp/Texinfo/Common.pm:2178
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr "no s'ha pogut protegir el carÃ cter coixinet a @%s"
  
! #: tp/Texinfo/Convert/Converter.pm:387 tp/Texinfo/Convert/Converter.pm:406
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Variable obsoleta %s\n"
  
! #: tp/Texinfo/Convert/Converter.pm:786
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr "%s: la sortida Ã©s incompatible amb la divisiÃ³"
  
! #: tp/Texinfo/Convert/Converter.pm:868 tp/Texinfo/Convert/Converter.pm:901
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:7004
! #: tp/Texinfo/Convert/HTML.pm:7063 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:477 tp/Texinfo/Parser.pm:1996
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "error en tancar %s: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:979
  #, 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:987
  #, perl-format
  msgid "could not create directory `%s': %s"
***************
*** 2228,2326 ****
  msgstr "no s'ha trobar el fitxer @image  `%s', s'usarÃ  `%s'"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5388
  msgid "no argument specified for @U"
  msgstr "no s'ha especificat un argument per a @U"
  
! #: tp/Texinfo/Convert/HTML.pm:1683
  #, 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:2371
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "el format en cru %s no es convertirÃ "
  
! #: tp/Texinfo/Convert/HTML.pm:4888
  msgid "string not closed in css file"
  msgstr "la cadena de carÃ cters no estÃ  tancada al fitxer css"
  
! #: tp/Texinfo/Convert/HTML.pm:4890
  msgid "--css-include ended in comment"
  msgstr "--css-include ha finalitzat en un comentari"
  
! #: tp/Texinfo/Convert/HTML.pm:4892
  msgid "@import not finished in css file"
  msgstr "@import no ha acabat a un fitxer css"
  
! #: tp/Texinfo/Convert/HTML.pm:4918
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "No s'ha trobat el fitxer CSS %s"
  
! #: tp/Texinfo/Convert/HTML.pm:4924
  #, 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:4934
  #, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "error en tancar el fitxer CSS %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5801 tp/Texinfo/Convert/HTML.pm:5805
  #, 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:6499
  #, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "error en tancar el fitxer marc %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6523
  #, 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:6638
  #, 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:6839
  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:7048
  #, 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:7073
  #, 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:7079
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "el fitxer estÃ  buit per al node reanomenat `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:7093
  #, 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:7125
  #, 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:7163
  msgid "empty node name"
  msgstr "nom buit de node"
  
! #: tp/Texinfo/Convert/HTML.pm:7165 tp/Texinfo/Parser.pm:3697
  #, perl-format
  msgid "syntax for an external node used for `%s'"
--- 2206,2324 ----
  msgstr "no s'ha trobar el fitxer @image  `%s', s'usarÃ  `%s'"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5225
  msgid "no argument specified for @U"
  msgstr "no s'ha especificat un argument per a @U"
  
! #: tp/Texinfo/Convert/HTML.pm:1715
  #, 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:2399
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "el format en cru %s no es convertirÃ "
  
! #: tp/Texinfo/Convert/HTML.pm:4629
! #, 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:4657
! msgid "missing type"
! msgstr "tipus que falta"
! 
! #: tp/Texinfo/Convert/HTML.pm:4660
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "tipus no reconegut: %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4677
! #, 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:4962
  msgid "string not closed in css file"
  msgstr "la cadena de carÃ cters no estÃ  tancada al fitxer css"
  
! #: tp/Texinfo/Convert/HTML.pm:4964
  msgid "--css-include ended in comment"
  msgstr "--css-include ha finalitzat en un comentari"
  
! #: tp/Texinfo/Convert/HTML.pm:4966
  msgid "@import not finished in css file"
  msgstr "@import no ha acabat a un fitxer css"
  
! #: tp/Texinfo/Convert/HTML.pm:4992
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "No s'ha trobat el fitxer CSS %s"
  
! #: tp/Texinfo/Convert/HTML.pm:4998
  #, 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:5008
  #, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "error en tancar el fitxer CSS %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5870 tp/Texinfo/Convert/HTML.pm:5874
  #, 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:6568
  #, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "error en tancar el fitxer marc %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6592
  #, 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:6707
  #, 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:6912
  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:7122
  #, 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:7147
  #, 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:7153
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "el fitxer estÃ  buit per al node reanomenat `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:7167
  #, 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:7199
  #, 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:7237
  msgid "empty node name"
  msgstr "nom buit de node"
  
! #: tp/Texinfo/Convert/HTML.pm:7239 tp/Texinfo/Parser.pm:3542
  #, perl-format
  msgid "syntax for an external node used for `%s'"
***************
*** 2355,2379 ****
  msgstr "el nom de @node no ha de contenir `,': %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1334
  #, 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:1381 tp/Texinfo/Parser.pm:2722
  #, 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:1495
  #, 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:1500
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "fitxer @image `%s' no llegible: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1523
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
--- 2353,2377 ----
  msgstr "el nom de @node no ha de contenir `,': %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1335
  #, 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:1382 tp/Texinfo/Parser.pm:2568
  #, 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:1496
  #, 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:1501
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "fitxer @image `%s' no llegible: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1524
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
***************
*** 2381,2385 ****
  "no s'ha pogut trobar el fitxer @image `%s.txt' i tampoc un text alternatiu"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1931
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
--- 2379,2383 ----
  "no s'ha pogut trobar el fitxer @image `%s.txt' i tampoc un text alternatiu"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1932
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
***************
*** 2389,2539 ****
  "ho per evitar aixÃ²"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2161
  #, 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:2193
  #, 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:2226
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr "el nom de node @%s no hauria de contenir `:'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2272
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "`.' o `,' ha de seguir a @xref, no %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2275
  msgid "`.' or `,' must follow @xref"
  msgstr "`.' or `,' ha de seguir a @xref"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3118
  #, 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:3129
  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:3145
  msgid "menu entry name should not contain `:'"
  msgstr "el nom d'entrada de menÃº no hauria de contenir `:'"
  
! #: tp/Texinfo/Parser.pm:910
  #, 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"
  
! #: tp/Texinfo/Parser.pm:1160 tp/Texinfo/Structuring.pm:594
  #, perl-format
  msgid "multiple @%s"
  msgstr "@%s mÃºltiple"
  
! #: tp/Texinfo/Parser.pm:1194
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "sintaxi incorrecta per a argument @%s: %s "
! 
! #: tp/Texinfo/Parser.pm:1210
  #, perl-format
  msgid "bad or empty @%s formal argument: %s"
  msgstr "argument formal @%s incorrecte o buit: %s"
  
! #: tp/Texinfo/Parser.pm:1219 tp/Texinfo/Parser.pm:4856
! #: tp/Texinfo/Parser.pm:4882 tp/Texinfo/Parser.pm:5671
! #: tp/Texinfo/Parser.pm:5687 tp/Texinfo/Parser.pm:5702
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s requereix un nom"
  
! #: tp/Texinfo/Parser.pm:1223 tp/Texinfo/Parser.pm:4859
! #: tp/Texinfo/Parser.pm:4885 tp/Texinfo/Parser.pm:5674
! #: tp/Texinfo/Parser.pm:5690 tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad name for @%s"
  msgstr "nom incorrecte per a @%s"
  
! #: tp/Texinfo/Parser.pm:1341
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr "@end %s vist abans @%s claudÃ tor de tancada"
  
! #: tp/Texinfo/Parser.pm:1345
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "@%s vist abans @%s claudÃ tor de tancada"
  
! #: tp/Texinfo/Parser.pm:1350
! #, perl-format
! msgid "%c%s missing close brace"
  msgstr "%c%s claudÃ tor de tancada que falta"
  
! #: tp/Texinfo/Parser.pm:1354
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "@%s seqÃ¼Ã¨ncia de delimitaciÃ³ de tancada que falta: %s}"
  
! #: tp/Texinfo/Parser.pm:1476
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "@itemx no hauria de comenÃ§ar @%s"
  
! #: tp/Texinfo/Parser.pm:1544
  msgid "@itemx must follow @item"
  msgstr "@itemx ha de seguir @item"
  
! #: tp/Texinfo/Parser.pm:1712
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr "@%s tÃ© text perÃ² no @item"
  
! #: tp/Texinfo/Parser.pm:1743
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "`@end' esperava `%s', perÃ² ha vist `%s'"
  
! #: tp/Texinfo/Parser.pm:1746
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "s'ha vist @%s abans de @end %s"
  
! #: tp/Texinfo/Parser.pm:1750
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "no hi ha `%cend %s' concordant"
  
! #: tp/Texinfo/Parser.pm:1776 tp/Texinfo/Parser.pm:5204
! #: tp/Texinfo/Parser.pm:5470
  #, perl-format
  msgid "misplaced %c"
  msgstr "%c fora de lloc"
  
! #: tp/Texinfo/Parser.pm:1874 tp/Texinfo/Parser.pm:3312
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "`%c%s' no concordat"
  
! #: tp/Texinfo/Parser.pm:2110
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "el macro `%s' s'ha cridat amb massa arguments"
  
! #: tp/Texinfo/Parser.pm:2132
! #, perl-format
! msgid "@%s missing close brace"
  msgstr "@%s claudÃ tor de tancada que falta"
  
! #: tp/Texinfo/Parser.pm:2140
  #, 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/Parser.pm:2175
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
--- 2387,2537 ----
  "ho per evitar aixÃ²"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2162
  #, 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:2194
  #, 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:2227
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr "el nom de node @%s no hauria de contenir `:'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2273
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "`.' o `,' ha de seguir a @xref, no %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2276
  msgid "`.' or `,' must follow @xref"
  msgstr "`.' or `,' ha de seguir a @xref"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3086
  #, 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:3097
  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:3113
  msgid "menu entry name should not contain `:'"
  msgstr "el nom d'entrada de menÃº no hauria de contenir `:'"
  
! #: tp/Texinfo/Parser.pm:883
  #, 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"
  
! #: tp/Texinfo/Parser.pm:1125 tp/Texinfo/Structuring.pm:595
  #, perl-format
  msgid "multiple @%s"
  msgstr "@%s mÃºltiple"
  
! #: tp/Texinfo/Parser.pm:1166
  #, perl-format
  msgid "bad or empty @%s formal argument: %s"
  msgstr "argument formal @%s incorrecte o buit: %s"
  
! #: tp/Texinfo/Parser.pm:1176
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "sintaxi incorrecta per a argument @%s: %s "
! 
! #: tp/Texinfo/Parser.pm:1183 tp/Texinfo/Parser.pm:4707
! #: tp/Texinfo/Parser.pm:4733 tp/Texinfo/Parser.pm:5565
! #: tp/Texinfo/Parser.pm:5578 tp/Texinfo/Parser.pm:5592
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s requereix un nom"
  
! #: tp/Texinfo/Parser.pm:1187 tp/Texinfo/Parser.pm:4710
! #: tp/Texinfo/Parser.pm:4736 tp/Texinfo/Parser.pm:5568
! #: tp/Texinfo/Parser.pm:5581 tp/Texinfo/Parser.pm:5595
  #, perl-format
  msgid "bad name for @%s"
  msgstr "nom incorrecte per a @%s"
  
! #: tp/Texinfo/Parser.pm:1305
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr "@end %s vist abans @%s claudÃ tor de tancada"
  
! #: tp/Texinfo/Parser.pm:1309
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "@%s vist abans @%s claudÃ tor de tancada"
  
! #: tp/Texinfo/Parser.pm:1314
! #, fuzzy, perl-format
! msgid "%c%s missing closing brace"
  msgstr "%c%s claudÃ tor de tancada que falta"
  
! #: tp/Texinfo/Parser.pm:1318
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "@%s seqÃ¼Ã¨ncia de delimitaciÃ³ de tancada que falta: %s}"
  
! #: tp/Texinfo/Parser.pm:1440
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "@itemx no hauria de comenÃ§ar @%s"
  
! #: tp/Texinfo/Parser.pm:1508
  msgid "@itemx must follow @item"
  msgstr "@itemx ha de seguir @item"
  
! #: tp/Texinfo/Parser.pm:1676
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr "@%s tÃ© text perÃ² no @item"
  
! #: tp/Texinfo/Parser.pm:1707
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "`@end' esperava `%s', perÃ² ha vist `%s'"
  
! #: tp/Texinfo/Parser.pm:1710
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "s'ha vist @%s abans de @end %s"
  
! #: tp/Texinfo/Parser.pm:1714
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "no hi ha `%cend %s' concordant"
  
! #: tp/Texinfo/Parser.pm:1738 tp/Texinfo/Parser.pm:5070
! #: tp/Texinfo/Parser.pm:5308
  #, perl-format
  msgid "misplaced %c"
  msgstr "%c fora de lloc"
  
! #: tp/Texinfo/Parser.pm:1835 tp/Texinfo/Parser.pm:3148
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "`%c%s' no concordat"
  
! #: tp/Texinfo/Parser.pm:2072
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "el macro `%s' s'ha cridat amb massa arguments"
  
! #: tp/Texinfo/Parser.pm:2094
! #, fuzzy, perl-format
! msgid "@%s missing closing brace"
  msgstr "@%s claudÃ tor de tancada que falta"
  
! #: tp/Texinfo/Parser.pm:2102
  #, 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/Parser.pm:2138
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
***************
*** 2541,2590 ****
  "\\ a expansiÃ³  @%s seguida de `%s' en comptes del nom de parÃ metre o \\"
  
! #: tp/Texinfo/Parser.pm:2650
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s `%s' definit prÃ¨viament"
  
! #: tp/Texinfo/Parser.pm:2655
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "aquÃ­ estÃ  la definiciÃ³ prÃ¨via de @%s"
  
! #: tp/Texinfo/Parser.pm:3016
  #, perl-format
  msgid "missing name for @%s"
  msgstr "nom que falta per a @%s"
  
! #: tp/Texinfo/Parser.pm:3021
  #, perl-format
  msgid "missing category for @%s"
  msgstr "categoria que falta per a @%s"
  
! #: tp/Texinfo/Parser.pm:3073
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "argument inesperat sobre @%s a la lÃ­nia: %s"
  
! #: tp/Texinfo/Parser.pm:3089
  msgid "empty multitable"
  msgstr "multitaula buida"
  
! #: tp/Texinfo/Parser.pm:3145 tp/Texinfo/Parser.pm:5784
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "argument superflu a @%s"
  
! #: tp/Texinfo/Parser.pm:3151 tp/Texinfo/Parser.pm:5806
! #: tp/Texinfo/Parser.pm:5818
  #, perl-format
  msgid "bad argument to @%s"
  msgstr "argument incorrecte a @%s"
  
! #: tp/Texinfo/Parser.pm:3162
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s requereix un argument: el formatejador per a %citem"
  
! #: tp/Texinfo/Parser.pm:3167
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
--- 2539,2588 ----
  "\\ a expansiÃ³  @%s seguida de `%s' en comptes del nom de parÃ metre o \\"
  
! #: tp/Texinfo/Parser.pm:2501
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s `%s' definit prÃ¨viament"
  
! #: tp/Texinfo/Parser.pm:2506
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "aquÃ­ estÃ  la definiciÃ³ prÃ¨via de @%s"
  
! #: tp/Texinfo/Parser.pm:2850
  #, perl-format
  msgid "missing name for @%s"
  msgstr "nom que falta per a @%s"
  
! #: tp/Texinfo/Parser.pm:2855
  #, perl-format
  msgid "missing category for @%s"
  msgstr "categoria que falta per a @%s"
  
! #: tp/Texinfo/Parser.pm:2890
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "argument inesperat sobre @%s a la lÃ­nia: %s"
  
! #: tp/Texinfo/Parser.pm:2905
  msgid "empty multitable"
  msgstr "multitaula buida"
  
! #: tp/Texinfo/Parser.pm:2959 tp/Texinfo/Parser.pm:5673
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "argument superflu a @%s"
  
! #: tp/Texinfo/Parser.pm:2965 tp/Texinfo/Parser.pm:5694
! #: tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad argument to @%s"
  msgstr "argument incorrecte a @%s"
  
! #: tp/Texinfo/Parser.pm:2976
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s requereix un argument: el formatejador per a %citem"
  
! #: tp/Texinfo/Parser.pm:2981
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
***************
*** 2593,2655 ****
  "estar a la lÃ­nia @%s"
  
! #: tp/Texinfo/Parser.pm:3202
  #, 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/Parser.pm:3290 tp/Texinfo/Parser.pm:3429
! #: tp/Texinfo/Parser.pm:5777
  #, perl-format
  msgid "@%s missing argument"
  msgstr "@%s argument que falta"
  
! #: tp/Texinfo/Parser.pm:3302
  #, perl-format
  msgid "unknown @end %s"
  msgstr "@end desconegut %s"
  
! #: tp/Texinfo/Parser.pm:3324 tp/Texinfo/Parser.pm:3943
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "argument superflu a @%s %s: %s"
  
! #: tp/Texinfo/Parser.pm:3329 tp/Texinfo/Parser.pm:5861
! #: tp/Texinfo/Parser.pm:5906 tp/Texinfo/Parser.pm:5935
! #: tp/Texinfo/Parser.pm:5976 tp/Texinfo/Parser.pm:6055
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "argument incorrecte a @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3348
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%s: no s'ha pogut obrir %s: %s"
  
! #: tp/Texinfo/Parser.pm:3360
  #, 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/Parser.pm:3369
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "nom `%s' de codificaciÃ³ no reconegut"
  
! #: tp/Texinfo/Parser.pm:3516
  #, perl-format
  msgid "@%s after the first element"
  msgstr "@%s desprÃ©s del primer element"
  
! #: tp/Texinfo/Parser.pm:3523
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s sols tÃ© sentit a una lÃ­nia @multitable"
  
! #: tp/Texinfo/Parser.pm:3563
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "@%s no hauria d'estar associat amb @top"
  
! #: tp/Texinfo/Parser.pm:3575
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
--- 2591,2654 ----
  "estar a la lÃ­nia @%s"
  
! #: tp/Texinfo/Parser.pm:3016
  #, 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/Parser.pm:3124 tp/Texinfo/Parser.pm:3277
! #: tp/Texinfo/Parser.pm:5666
  #, perl-format
  msgid "@%s missing argument"
  msgstr "@%s argument que falta"
  
! #: tp/Texinfo/Parser.pm:3138
  #, perl-format
  msgid "unknown @end %s"
  msgstr "@end desconegut %s"
  
! #: tp/Texinfo/Parser.pm:3161 tp/Texinfo/Parser.pm:3788
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "argument superflu a @%s %s: %s"
  
! #: tp/Texinfo/Parser.pm:3167 tp/Texinfo/Parser.pm:3245
! #: tp/Texinfo/Parser.pm:5755 tp/Texinfo/Parser.pm:5798
! #: tp/Texinfo/Parser.pm:5827 tp/Texinfo/Parser.pm:5868
! #: tp/Texinfo/Parser.pm:5946
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "argument incorrecte a @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3188
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%s: no s'ha pogut obrir %s: %s"
  
! #: tp/Texinfo/Parser.pm:3200
  #, 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/Parser.pm:3208
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "nom `%s' de codificaciÃ³ no reconegut"
  
! #: tp/Texinfo/Parser.pm:3364
  #, perl-format
  msgid "@%s after the first element"
  msgstr "@%s desprÃ©s del primer element"
  
! #: tp/Texinfo/Parser.pm:3371
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s sols tÃ© sentit a una lÃ­nia @multitable"
  
! #: tp/Texinfo/Parser.pm:3408
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "@%s no hauria d'estar associat amb @top"
  
! #: tp/Texinfo/Parser.pm:3420
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
***************
*** 2657,2710 ****
  "@node precedeix @%s, perÃ² les parts no haurien d'estar associades amb nodes"
  
! #: tp/Texinfo/Parser.pm:3677
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "argument buit a @%s"
  
! #: tp/Texinfo/Parser.pm:3681
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "nom de node buit desprÃ©s d'expansiÃ³ `%s'"
  
! #: tp/Texinfo/Parser.pm:3724
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "nom buit d'entrada de menÃº a `%s'"
  
! #: tp/Texinfo/Parser.pm:3732
  msgid "empty node name in menu entry"
  msgstr "nom buit de node a entrada de menÃº"
  
! #: tp/Texinfo/Parser.pm:3805
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "@%s no hauria d'aparÃ¨ixer a @%s"
  
! #: tp/Texinfo/Parser.pm:3937
! #, perl-format
! msgid "@end %s should only appear at a line beginning"
  msgstr "@end %s hauria d'aparÃ¨ixer Ãºnicament a un principi de lÃ­nia"
  
! #: tp/Texinfo/Parser.pm:3960
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "el macro `%s' ha estat definit prÃ¨viament"
  
! #: tp/Texinfo/Parser.pm:3963
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "aquÃ­ estÃ  la definiciÃ³ prÃ¨via de `%s'"
  
! #: tp/Texinfo/Parser.pm:3968
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "s'estÃ  redefinint l'ordre de llenguatge Texinfo: @%s"
  
! #: tp/Texinfo/Parser.pm:4017
  #, perl-format
  msgid "@%s without associated character"
  msgstr "@%s sense un carÃ cter associat"
  
! #: tp/Texinfo/Parser.pm:4087
  #, perl-format
  msgid ""
--- 2656,2709 ----
  "@node precedeix @%s, perÃ² les parts no haurien d'estar associades amb nodes"
  
! #: tp/Texinfo/Parser.pm:3522
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "argument buit a @%s"
  
! #: tp/Texinfo/Parser.pm:3526
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "nom de node buit desprÃ©s d'expansiÃ³ `%s'"
  
! #: tp/Texinfo/Parser.pm:3569
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "nom buit d'entrada de menÃº a `%s'"
  
! #: tp/Texinfo/Parser.pm:3577
  msgid "empty node name in menu entry"
  msgstr "nom buit de node a entrada de menÃº"
  
! #: tp/Texinfo/Parser.pm:3650
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "@%s no hauria d'aparÃ¨ixer a @%s"
  
! #: tp/Texinfo/Parser.pm:3782
! #, fuzzy, 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/Parser.pm:3804
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "el macro `%s' ha estat definit prÃ¨viament"
  
! #: tp/Texinfo/Parser.pm:3807
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "aquÃ­ estÃ  la definiciÃ³ prÃ¨via de `%s'"
  
! #: tp/Texinfo/Parser.pm:3812
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "s'estÃ  redefinint l'ordre de llenguatge Texinfo: @%s"
  
! #: tp/Texinfo/Parser.pm:3879
  #, perl-format
  msgid "@%s without associated character"
  msgstr "@%s sense un carÃ cter associat"
  
! #: tp/Texinfo/Parser.pm:3949
  #, perl-format
  msgid ""
***************
*** 2712,2716 ****
  msgstr "@%s definit amb zero o mÃ©s d'un argument hauria de ser invocat amb {}"
  
! #: tp/Texinfo/Parser.pm:4111
  #, perl-format
  msgid ""
--- 2711,2715 ----
  msgstr "@%s definit amb zero o mÃ©s d'un argument hauria de ser invocat amb {}"
  
! #: tp/Texinfo/Parser.pm:3974
  #, perl-format
  msgid ""
***************
*** 2721,2725 ****
  "per anulÂ·lar-ho: el valor actual Ã©s %d)"
  
! #: tp/Texinfo/Parser.pm:4120
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
--- 2720,2724 ----
  "per anulÂ·lar-ho: el valor actual Ã©s %d)"
  
! #: tp/Texinfo/Parser.pm:3983
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
***************
*** 2727,2847 ****
  "no estÃ  permÃ¨s la crida recursiva del macro %s; useu @rmacro si es necessita"
  
! #: tp/Texinfo/Parser.pm:4176
  #, 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/Parser.pm:4182
  #, 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/Parser.pm:4195 tp/Texinfo/Parser.pm:5325
  #, 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/Parser.pm:4207
  #, 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/Parser.pm:4218
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s esperava claudÃ tors"
  
! #: tp/Texinfo/Parser.pm:4383
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "etiqueta no definida: %s"
  
! #: tp/Texinfo/Parser.pm:4386
  msgid "bad syntax for @value"
  msgstr "sintaxi incorrecta per a @value"
  
! #: tp/Texinfo/Parser.pm:4393
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s Ã©s obsolet."
  
! #: tp/Texinfo/Parser.pm:4396
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s Ã©s obsolet; %s"
  
! #: tp/Texinfo/Parser.pm:4405
! #, perl-format
! msgid "@%s should only appear at a line beginning"
  msgstr "@%s hauria d'aparÃ¨ixer Ãºnicament a un comenÃ§ament de lÃ­nia"
  
! #: tp/Texinfo/Parser.pm:4496
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s no estÃ  permÃ¨s dins d'un bloc `@%s'"
  
! #: tp/Texinfo/Parser.pm:4505
  #, 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/Parser.pm:4631 tp/Texinfo/Parser.pm:4648
! #: tp/Texinfo/Parser.pm:4698
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s no tÃ© sentit dins d'un bloc `@%s'"
  
! #: tp/Texinfo/Parser.pm:4658
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "@%s a una multitaula buida"
  
! #: tp/Texinfo/Parser.pm:4664
  msgid "@tab before @item"
  msgstr "@tab abans de @item"
  
! #: tp/Texinfo/Parser.pm:4667
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "massa columnes a element multitaula (max %d)"
  
! #: tp/Texinfo/Parser.pm:4704
  msgid "ignoring @tab outside of multitable"
  msgstr "s'ignorarÃ  @tab fora d'una multitaula"
  
! #: tp/Texinfo/Parser.pm:4708
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "@%s fora d'una taula o una llista"
  
! #: tp/Texinfo/Parser.pm:4745
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "ha d'estar a darrera de `@%s' per usar `@%s'"
  
! #: tp/Texinfo/Parser.pm:4787
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "@%s no tÃ© sentit fora d'entorns `@titlepage' i `@quotation'"
  
! #: tp/Texinfo/Parser.pm:4791
  msgid "@dircategory after first node"
  msgstr "@dircategory desprÃ©s del primer node"
  
! #: tp/Texinfo/Parser.pm:4979
  #, 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/Parser.pm:4997
  msgid "@direntry after first node"
  msgstr "@direntry desprÃ©s del primer node"
  
! #: tp/Texinfo/Parser.pm:5005
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "s'ha vist @%s abans del primer @node"
  
! #: tp/Texinfo/Parser.pm:5008
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
--- 2726,2846 ----
  "no estÃ  permÃ¨s la crida recursiva del macro %s; useu @rmacro si es necessita"
  
! #: tp/Texinfo/Parser.pm:4038
  #, 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/Parser.pm:4044
  #, 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/Parser.pm:4057 tp/Texinfo/Parser.pm:5189
  #, 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/Parser.pm:4068
  #, 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/Parser.pm:4079
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s esperava claudÃ tors"
  
! #: tp/Texinfo/Parser.pm:4233
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "etiqueta no definida: %s"
  
! #: tp/Texinfo/Parser.pm:4236
  msgid "bad syntax for @value"
  msgstr "sintaxi incorrecta per a @value"
  
! #: tp/Texinfo/Parser.pm:4243
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s Ã©s obsolet."
  
! #: tp/Texinfo/Parser.pm:4246
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s Ã©s obsolet; %s"
  
! #: tp/Texinfo/Parser.pm:4255
! #, fuzzy, 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/Parser.pm:4346
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s no estÃ  permÃ¨s dins d'un bloc `@%s'"
  
! #: tp/Texinfo/Parser.pm:4355
  #, 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/Parser.pm:4479 tp/Texinfo/Parser.pm:4496
! #: tp/Texinfo/Parser.pm:4546
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s no tÃ© sentit dins d'un bloc `@%s'"
  
! #: tp/Texinfo/Parser.pm:4506
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "@%s a una multitaula buida"
  
! #: tp/Texinfo/Parser.pm:4512
  msgid "@tab before @item"
  msgstr "@tab abans de @item"
  
! #: tp/Texinfo/Parser.pm:4515
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "massa columnes a element multitaula (max %d)"
  
! #: tp/Texinfo/Parser.pm:4552
  msgid "ignoring @tab outside of multitable"
  msgstr "s'ignorarÃ  @tab fora d'una multitaula"
  
! #: tp/Texinfo/Parser.pm:4556
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "@%s fora d'una taula o una llista"
  
! #: tp/Texinfo/Parser.pm:4596
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "ha d'estar a darrera de `@%s' per usar `@%s'"
  
! #: tp/Texinfo/Parser.pm:4638
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "@%s no tÃ© sentit fora d'entorns `@titlepage' i `@quotation'"
  
! #: tp/Texinfo/Parser.pm:4642
  msgid "@dircategory after first node"
  msgstr "@dircategory desprÃ©s del primer node"
  
! #: tp/Texinfo/Parser.pm:4847
  #, 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/Parser.pm:4864
  msgid "@direntry after first node"
  msgstr "@direntry desprÃ©s del primer node"
  
! #: tp/Texinfo/Parser.pm:4872
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "s'ha vist @%s abans del primer @node"
  
! #: tp/Texinfo/Parser.pm:4875
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
***************
*** 2850,3046 ****
  "comptes de @ifinfo?"
  
! #: tp/Texinfo/Parser.pm:5070
  #, 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/Parser.pm:5078
  #, perl-format
  msgid "unknown command `%s'"
  msgstr "ordre `%s' desconeguda"
  
! #: tp/Texinfo/Parser.pm:5088
  msgid "unexpected @"
  msgstr "@ no esperat"
  
! #: tp/Texinfo/Parser.pm:5117
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s no tÃ© sentit fora d'un entorn `@float'"
  
! #: tp/Texinfo/Parser.pm:5122
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr "@%s hauria de estar just a sota de `@float'"
  
! #: tp/Texinfo/Parser.pm:5130
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "s'ignoraran @%s mÃºltiples"
  
! #: tp/Texinfo/Parser.pm:5249
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "l'ordre @%s no accepta arguments"
  
! #: tp/Texinfo/Parser.pm:5273
  #, 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/Parser.pm:5292
  #, 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/Parser.pm:5303
  #, 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/Parser.pm:5316
  msgid "@image missing filename argument"
  msgstr "argument de nom de fitxer que falta a @image"
  
! #: tp/Texinfo/Parser.pm:5348
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "primer argument que falta a @%s"
  
! #: tp/Texinfo/Parser.pm:5393
  #, 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/Parser.pm:5399
  #, 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/Parser.pm:5412
! #, perl-format
! msgid "argument for @U exceeds size of integer: %s"
! msgstr "l'argument per a @U excedeix la mida de l'enter: %s"
! 
! #: tp/Texinfo/Parser.pm:5418
  #, 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/Parser.pm:5546
  msgid "superfluous arguments for node"
  msgstr "arguments superflus per a node"
  
! #: tp/Texinfo/Parser.pm:5596
  #, perl-format
  msgid "expected @end %s"
  msgstr "s'esperava @end %s"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "@%s hauria d'acceptar Ãºnicament una ordre amb @ com argument, no `%s'"
  
! #: tp/Texinfo/Parser.pm:5728
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "argument restant a la lÃ­nia @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5801
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "ordre d'entorn %s com argument per a @%s"
  
! #: tp/Texinfo/Parser.pm:5823
  #, perl-format
  msgid "empty @%s"
  msgstr "@%s buit"
  
! #: tp/Texinfo/Parser.pm:5831
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "la fracciÃ³ de columna no Ã©s un nÃºmero: %s"
  
! #: tp/Texinfo/Parser.pm:5840
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "argument @sp ha de ser numÃ¨ric, no `%s'"
  
! #: tp/Texinfo/Parser.pm:5849
  #, perl-format
  msgid "reserved index name %s"
  msgstr "nom d'Ã­ndex reservat %s"
  
! #: tp/Texinfo/Parser.pm:5868
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "Ã­ndex desconegut de font a @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5871
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "Ã­ndex desconegut de destinaciÃ³ a @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5901
  #, 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/Parser.pm:5914
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "Ã­ndex desconegut `%s' a @printindex"
  
! #: tp/Texinfo/Parser.pm:5920
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr "s'estÃ  imprimint un Ã­ndex `%s' fusionat en un altre `%s'"
  
! #: tp/Texinfo/Parser.pm:5928
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "printindex abans del principi del document: @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5944
  #, 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/Parser.pm:5952
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr "Sols se suporta @%s 10 o 11, no `%s'"
  
! #: tp/Texinfo/Parser.pm:5960
  #, 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/Parser.pm:5968
  #, 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/Parser.pm:5986 tp/Texinfo/Parser.pm:5991
  #, 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/Parser.pm:5999
  #, 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/Parser.pm:6009
  #, 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/Parser.pm:6021
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "s'esperava @%s activat o desactivat, no `%s'"
  
! #: tp/Texinfo/Parser.pm:6031
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
--- 2849,3040 ----
  "comptes de @ifinfo?"
  
! #: tp/Texinfo/Parser.pm:4937
  #, 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/Parser.pm:4945
  #, perl-format
  msgid "unknown command `%s'"
  msgstr "ordre `%s' desconeguda"
  
! #: tp/Texinfo/Parser.pm:4955
  msgid "unexpected @"
  msgstr "@ no esperat"
  
! #: tp/Texinfo/Parser.pm:4983
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s no tÃ© sentit fora d'un entorn `@float'"
  
! #: tp/Texinfo/Parser.pm:4988
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr "@%s hauria de estar just a sota de `@float'"
  
! #: tp/Texinfo/Parser.pm:4996
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "s'ignoraran @%s mÃºltiples"
  
! #: tp/Texinfo/Parser.pm:5114
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "l'ordre @%s no accepta arguments"
  
! #: tp/Texinfo/Parser.pm:5138
  #, 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/Parser.pm:5156
  #, 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/Parser.pm:5167
  #, 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/Parser.pm:5180
  msgid "@image missing filename argument"
  msgstr "argument de nom de fitxer que falta a @image"
  
! #: tp/Texinfo/Parser.pm:5211
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "primer argument que falta a @%s"
  
! #: tp/Texinfo/Parser.pm:5230
  #, 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/Parser.pm:5236
  #, 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/Parser.pm:5253
  #, 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/Parser.pm:5448
  msgid "superfluous arguments for node"
  msgstr "arguments superflus per a node"
  
! #: tp/Texinfo/Parser.pm:5498
  #, perl-format
  msgid "expected @end %s"
  msgstr "s'esperava @end %s"
  
! #: tp/Texinfo/Parser.pm:5607
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "@%s hauria d'acceptar Ãºnicament una ordre amb @ com argument, no `%s'"
  
! #: tp/Texinfo/Parser.pm:5617
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "argument restant a la lÃ­nia @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5689
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "ordre d'entorn %s com argument per a @%s"
  
! #: tp/Texinfo/Parser.pm:5710
  #, perl-format
  msgid "empty @%s"
  msgstr "@%s buit"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "la fracciÃ³ de columna no Ã©s un nÃºmero: %s"
  
! #: tp/Texinfo/Parser.pm:5727
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "argument @sp ha de ser numÃ¨ric, no `%s'"
  
! #: tp/Texinfo/Parser.pm:5736
  #, perl-format
  msgid "reserved index name %s"
  msgstr "nom d'Ã­ndex reservat %s"
  
! #: tp/Texinfo/Parser.pm:5762
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "Ã­ndex desconegut de font a @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5765
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "Ã­ndex desconegut de destinaciÃ³ a @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5793
  #, 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/Parser.pm:5806
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "Ã­ndex desconegut `%s' a @printindex"
  
! #: tp/Texinfo/Parser.pm:5812
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr "s'estÃ  imprimint un Ã­ndex `%s' fusionat en un altre `%s'"
  
! #: tp/Texinfo/Parser.pm:5820
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "printindex abans del principi del document: @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5836
  #, 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/Parser.pm:5844
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr "Sols se suporta @%s 10 o 11, no `%s'"
  
! #: tp/Texinfo/Parser.pm:5852
  #, 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/Parser.pm:5860
  #, 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/Parser.pm:5878 tp/Texinfo/Parser.pm:5883
  #, 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/Parser.pm:5891
  #, 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/Parser.pm:5901
  #, 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/Parser.pm:5913
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "s'esperava @%s activat o desactivat, no `%s'"
  
! #: tp/Texinfo/Parser.pm:5922
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
***************
*** 3048,3057 ****
  "l'argument de @kbdinputstyle ha de ser `code'/`example'/`distinct', no `%s'"
  
! #: tp/Texinfo/Parser.pm:6039
  #, 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/Parser.pm:6047
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
--- 3042,3051 ----
  "l'argument de @kbdinputstyle ha de ser `code'/`example'/`distinct', no `%s'"
  
! #: tp/Texinfo/Parser.pm:5930
  #, 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/Parser.pm:5938
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
***************
*** 3059,3073 ****
  "l'argument de @urefbreakstyle ha de ser `after'/`before'/`none', no `%s'"
  
! #: tp/Texinfo/Structuring.pm:213
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr "s'elevarÃ  el nivell de la secciÃ³ de @%s que Ã©s massa baix"
  
! #: tp/Texinfo/Structuring.pm:245
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "no hi ha una ordre de nivell de capÃ­tol abans de @%s"
  
! #: tp/Texinfo/Structuring.pm:250
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
--- 3053,3067 ----
  "l'argument de @urefbreakstyle ha de ser `after'/`before'/`none', no `%s'"
  
! #: tp/Texinfo/Structuring.pm:216
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr "s'elevarÃ  el nivell de la secciÃ³ de @%s que Ã©s massa baix"
  
! #: tp/Texinfo/Structuring.pm:248
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "no hi ha una ordre de nivell de capÃ­tol abans de @%s"
  
! #: tp/Texinfo/Structuring.pm:253
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
***************
*** 3076,3105 ****
  "inferior"
  
! #: tp/Texinfo/Structuring.pm:339
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "no hi ha una ordre de secciÃ³ associada amb @%s"
  
! #: tp/Texinfo/Structuring.pm:488
  #, perl-format
  msgid "@%s not empty"
  msgstr "@%s no buit"
  
! #: tp/Texinfo/Structuring.pm:544 tp/Texinfo/Structuring.pm:1326
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "referÃ¨ncia @%s a node no existent `%s'"
  
! #: tp/Texinfo/Structuring.pm:557
  #, perl-format
  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:662
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "node sense referenciar `%s'"
  
! #: tp/Texinfo/Structuring.pm:708
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
--- 3070,3099 ----
  "inferior"
  
! #: tp/Texinfo/Structuring.pm:342
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "no hi ha una ordre de secciÃ³ associada amb @%s"
  
! #: tp/Texinfo/Structuring.pm:491
  #, perl-format
  msgid "@%s not empty"
  msgstr "@%s no buit"
  
! #: tp/Texinfo/Structuring.pm:547 tp/Texinfo/Structuring.pm:1325
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "referÃ¨ncia @%s a node no existent `%s'"
  
! #: tp/Texinfo/Structuring.pm:558
  #, perl-format
  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:663
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "node sense referenciar `%s'"
  
! #: tp/Texinfo/Structuring.pm:706
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
***************
*** 3107,3111 ****
  "el node `%s' Ã©s %s per a `%s' a la determinaciÃ³ de seccions perÃ² no al menÃº"
  
! #: tp/Texinfo/Structuring.pm:715
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
--- 3101,3105 ----
  "el node `%s' Ã©s %s per a `%s' a la determinaciÃ³ de seccions perÃ² no al menÃº"
  
! #: tp/Texinfo/Structuring.pm:713
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
***************
*** 3113,3132 ****
  "el node %s `%s' al menÃº `%s' i en el procediment de seccions `%s' difereixen"
  
! #: tp/Texinfo/Structuring.pm:733
  #, 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:787
  #, 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:814
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%s referÃ¨ncia per a `%s' inexistent"
  
! #: tp/Texinfo/Structuring.pm:834
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
--- 3107,3126 ----
  "el node %s `%s' al menÃº `%s' i en el procediment de seccions `%s' difereixen"
  
! #: tp/Texinfo/Structuring.pm:731
  #, 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:786
  #, 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:810
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%s referÃ¨ncia per a `%s' inexistent"
  
! #: tp/Texinfo/Structuring.pm:829
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
***************
*** 3135,3139 ****
  "destÃ­ Amunt"
  
! #: tp/Texinfo/Structuring.pm:842
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
--- 3129,3133 ----
  "destÃ­ Amunt"
  
! #: tp/Texinfo/Structuring.pm:837
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
***************
*** 3145,3149 ****
  msgstr "@%s a `%s', diferent de %s nom `%s'"
  
! #: tp/Texinfo/Structuring.pm:2070
  #, perl-format
  msgid "empty index key in @%s"
--- 3139,3143 ----
  msgstr "@%s a `%s', diferent de %s nom `%s'"
  
! #: tp/Texinfo/Structuring.pm:2067
  #, perl-format
  msgid "empty index key in @%s"
***************
*** 3696,3700 ****
  msgstr "Proveu `%s --help' per a mÃ©s informaciÃ³.\n"
  
! #: tp/texi2any.pl:1232
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
--- 3690,3694 ----
  msgstr "Proveu `%s --help' per a mÃ©s informaciÃ³.\n"
  
! #: tp/texi2any.pl:1239
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
***************
*** 3702,3716 ****
  "ha cap secciÃ³?"
  
! #: tp/texi2any.pl:1255
  #, 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:1261
  #, 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:1286
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
--- 3696,3710 ----
  "ha cap secciÃ³?"
  
! #: tp/texi2any.pl:1262
  #, 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:1268
  #, 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:1293
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
***************
*** 3720,3744 ****
  "resultat. No hi ha cap secciÃ³?"
  
! #: tp/texi2any.pl:1359 tp/texi2any.pl:1435
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%s: error en tancar %s: %s\n"
  
! #: tp/texi2any.pl:1382 tp/texi2any.pl:1416
  #, 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:1388 tp/texi2any.pl:1422
  #, 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"
  
  #~ msgid "--*** Tags out of Date ***"
  #~ msgstr "--*** Etiquetes fora de Data ***"
  
  #~ msgid " Subfile: %s"
  #~ msgstr "Subfitxer: %s"
  
  #~ msgid "%s: unrecognized option `%s'\n"
  #~ msgstr "%s: opciÃ³ no reconeguda '%s'\n"
--- 3714,3750 ----
  "resultat. No hi ha cap secciÃ³?"
  
! #: tp/texi2any.pl:1366 tp/texi2any.pl:1442
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%s: error en tancar %s: %s\n"
  
! #: tp/texi2any.pl:1389 tp/texi2any.pl:1423
  #, 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:1395 tp/texi2any.pl:1429
  #, 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"
  
+ #~ msgid "No file given for node '%s'."
+ #~ msgstr "No s'ha donat un fitxer per al node `%s'."
+ 
  #~ msgid "--*** Tags out of Date ***"
  #~ msgstr "--*** Etiquetes fora de Data ***"
  
+ #~ msgid "-%s---Info: %s, %ld lines --%s--"
+ #~ msgstr "-%s---Info: %s, %ld lÃ­nies --%s--"
+ 
+ #~ msgid "-%s%s-Info: (%s)%s, %ld lines --%s--"
+ #~ msgstr "-%s%s-Info: (%s)%s, %ld lÃ­nies --%s--"
+ 
  #~ msgid " Subfile: %s"
  #~ msgstr "Subfitxer: %s"
  
+ #~ msgid "argument for @U exceeds size of integer: %s"
+ #~ msgstr "l'argument per a @U excedeix la mida de l'enter: %s"
+ 
  #~ msgid "%s: unrecognized option `%s'\n"
  #~ msgstr "%s: opciÃ³ no reconeguda '%s'\n"
Binary files texinfo-6.1/po/cs.gmo and texinfo-6.3/po/cs.gmo differ
diff -Nrc2 texinfo-6.1/po/cs.po texinfo-6.3/po/cs.po
*** texinfo-6.1/po/cs.po	2016-02-06 11:35:49.000000000 +0000
--- texinfo-6.3/po/cs.po	2016-09-10 12:45:50.000000000 +0100
***************
*** 3,7 ****
  # This file is distributed under the same license as the texinfo package.
  # Vladimir Michl <Vladimir.Michl@seznam.cz>, 1997.
! # Petr Pisar <petr.pisar@atlas.cz>, 2014, 2015.
  #
  # Note: 2 messages untranslated, it's ok.
--- 3,7 ----
  # This file is distributed under the same license as the texinfo package.
  # Vladimir Michl <Vladimir.Michl@seznam.cz>, 1997.
! # Petr Pisar <petr.pisar@atlas.cz>, 2014, 2015, 2016.
  #
  # Note: 2 messages untranslated, it's ok.
***************
*** 18,25 ****
  msgid ""
  msgstr ""
! "Project-Id-Version: texinfo 6.0.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
! "PO-Revision-Date: 2015-12-28 16:11+0100\n"
  "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
  "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
--- 18,25 ----
  msgid ""
  msgstr ""
! "Project-Id-Version: texinfo 6.1.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:45+0100\n"
! "PO-Revision-Date: 2016-08-31 19:55+02:00\n"
  "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
  "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
***************
*** 28,31 ****
--- 28,32 ----
  "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=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
  
***************
*** 124,128 ****
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [ or [^"
  msgstr "NepÃ¡rovÃ¡ [ nebo [^"
  
--- 125,130 ----
  
  #: gnulib/lib/regcomp.c:156
! #, fuzzy
! msgid "Unmatched [, [^, [:, [., or [="
  msgstr "NepÃ¡rovÃ¡ [ nebo [^"
  
***************
*** 163,167 ****
  msgstr "NepÃ¡rovÃ¡ ) nebo \\)"
  
! #: gnulib/lib/regcomp.c:711
  msgid "No previous regular expression"
  msgstr "ChybÃ­ pÅ™edchozÃ­ regulÃ¡rnÃ­ vÃ½raz"
--- 165,169 ----
  msgstr "NepÃ¡rovÃ¡ ) nebo \\)"
  
! #: gnulib/lib/regcomp.c:687
  msgid "No previous regular expression"
  msgstr "ChybÃ­ pÅ™edchozÃ­ regulÃ¡rnÃ­ vÃ½raz"
***************
*** 317,321 ****
  msgstr "---------- PoznÃ¡mky pod Ä�arou ----------"
  
! #: info/indices.c:123 info/indices.c:812
  #, c-format
  msgid "Finding index entries..."
--- 319,323 ----
  msgstr "---------- PoznÃ¡mky pod Ä�arou ----------"
  
! #: info/indices.c:123 info/indices.c:822
  #, c-format
  msgid "Finding index entries..."
***************
*** 326,330 ****
  msgstr "VyhledÃ¡nÃ­ Å™etÄ›zce v rejstÅ™Ã­ku tohoto souboru"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:818
  #, c-format
  msgid "No indices found."
--- 328,332 ----
  msgstr "VyhledÃ¡nÃ­ Å™etÄ›zce v rejstÅ™Ã­ku tohoto souboru"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:828
  #, c-format
  msgid "No indices found."
***************
*** 357,389 ****
  msgstr "Å½Ã¡dnÃ© dalÅ¡Ã­ poloÅ¾ky rejstÅ™Ã­ku neobsahujÃ­ â€ž%sâ€œ."
  
! #: info/indices.c:476 info/indices.c:880
  #, c-format
  msgid "No index entries containing '%s'."
  msgstr "Å½Ã¡dnÃ© poloÅ¾ky rejstÅ™Ã­ku neobsahujÃ­ â€ž%sâ€œ."
  
! #: info/indices.c:583
  #, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "ProhledÃ¡vajÃ­ se rejstÅ™Ã­ky â€ž%sâ€œâ€¦"
  
! #: info/indices.c:636
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
  "VyhledÃ¡nÃ­ Å™etÄ›zce ve vÅ¡ech znÃ¡mÃ½ch rejstÅ™Ã­cÃ­ch info souborÅ¯ a vytvoÅ™enÃ­ menu"
  
! #: info/indices.c:644 info/indices.c:646
  msgid "Index apropos"
  msgstr "Hledat vÂ rejstÅ™Ã­ku"
  
! #: info/indices.c:688
  #, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "PoloÅ¾ky rejstÅ™Ã­ku obsahujÃ­cÃ­ â€ž%sâ€œ:\n"
  
! #: info/indices.c:797
  msgid "List all matches of a string in the index"
  msgstr "Zobrazit vÅ¡echny shody Å™etÄ›zce vÂ rejstÅ™Ã­ku"
  
! #: info/indices.c:824 info/indices.c:826
  msgid "Index topic"
  msgstr "TÃ©ma rejstÅ™Ã­ku"
--- 359,391 ----
  msgstr "Å½Ã¡dnÃ© dalÅ¡Ã­ poloÅ¾ky rejstÅ™Ã­ku neobsahujÃ­ â€ž%sâ€œ."
  
! #: info/indices.c:476 info/indices.c:890
  #, c-format
  msgid "No index entries containing '%s'."
  msgstr "Å½Ã¡dnÃ© poloÅ¾ky rejstÅ™Ã­ku neobsahujÃ­ â€ž%sâ€œ."
  
! #: info/indices.c:586
  #, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "ProhledÃ¡vajÃ­ se rejstÅ™Ã­ky â€ž%sâ€œâ€¦"
  
! #: info/indices.c:646
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
  "VyhledÃ¡nÃ­ Å™etÄ›zce ve vÅ¡ech znÃ¡mÃ½ch rejstÅ™Ã­cÃ­ch info souborÅ¯ a vytvoÅ™enÃ­ menu"
  
! #: info/indices.c:654 info/indices.c:656
  msgid "Index apropos"
  msgstr "Hledat vÂ rejstÅ™Ã­ku"
  
! #: info/indices.c:698
  #, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "PoloÅ¾ky rejstÅ™Ã­ku obsahujÃ­cÃ­ â€ž%sâ€œ:\n"
  
! #: info/indices.c:807
  msgid "List all matches of a string in the index"
  msgstr "Zobrazit vÅ¡echny shody Å™etÄ›zce vÂ rejstÅ™Ã­ku"
  
! #: info/indices.c:834 info/indices.c:836
  msgid "Index topic"
  msgstr "TÃ©ma rejstÅ™Ã­ku"
***************
*** 394,448 ****
  msgstr "Å½Ã¡dnÃ© dostupnÃ© info soubory nemajÃ­ ve svÃ½ch rejstÅ™Ã­cÃ­ch â€ž%sâ€œ."
  
! #: info/info-utils.c:892
  #, c-format
  msgid "Error converting file character encoding."
  msgstr "Chyba pÅ™i pÅ™evodu kÃ³dovÃ¡nÃ­ znakÅ¯ souboru."
  
! #: info/info.c:222 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "VÂ uzlu â€ž%2$sâ€œ Å¾Ã¡dnÃ¡ poloÅ¾ka nabÃ­dky â€ž%1$sâ€œ nenÃ­."
  
! #: info/info.c:315
! #, c-format
! msgid "No file given for node '%s'."
! msgstr "Pro uzel â€ž%sâ€œ nebyl zadÃ¡n Å¾Ã¡dnÃ½ soubor."
! 
! #: info/info.c:364 info/info.c:1133
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr "Uzel â€ž%sâ€œ nelze nalÃ©zt."
  
! #: info/info.c:386
  #, c-format
  msgid "No program name given."
  msgstr "NezadÃ¡n Å¾Ã¡dnÃ½ nÃ¡zev programu."
  
! #: info/info.c:577
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "neplatnÃ© Ä�Ã­slo: %s\n"
  
! #: info/info.c:757
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "Å¡patnÄ› zapsanÃ© pÅ™iÅ™azenÃ­ do promÄ›nnÃ©: %s"
  
! #: info/info.c:764 info/infokey.c:537
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: takovÃ¡ promÄ›nnÃ¡ neexistuje"
  
! #: info/info.c:770 info/infokey.c:539
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "hodnota %s nenÃ­ platnÃ¡ pro promÄ›nnou %s"
  
! #: info/info.c:782
  #, c-format
  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:804 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
--- 396,445 ----
  msgstr "Å½Ã¡dnÃ© dostupnÃ© info soubory nemajÃ­ ve svÃ½ch rejstÅ™Ã­cÃ­ch â€ž%sâ€œ."
  
! #: info/info-utils.c:879
  #, c-format
  msgid "Error converting file character encoding."
  msgstr "Chyba pÅ™i pÅ™evodu kÃ³dovÃ¡nÃ­ znakÅ¯ souboru."
  
! #: info/info.c:279 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "VÂ uzlu â€ž%2$sâ€œ Å¾Ã¡dnÃ¡ poloÅ¾ka nabÃ­dky â€ž%1$sâ€œ nenÃ­."
  
! #: info/info.c:416 info/info.c:1148
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr "Uzel â€ž%sâ€œ nelze nalÃ©zt."
  
! #: info/info.c:438
  #, c-format
  msgid "No program name given."
  msgstr "NezadÃ¡n Å¾Ã¡dnÃ½ nÃ¡zev programu."
  
! #: info/info.c:636
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "neplatnÃ© Ä�Ã­slo: %s\n"
  
! #: info/info.c:816
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "Å¡patnÄ› zapsanÃ© pÅ™iÅ™azenÃ­ do promÄ›nnÃ©: %s"
  
! #: info/info.c:823 info/infokey.c:540
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: takovÃ¡ promÄ›nnÃ¡ neexistuje"
  
! #: info/info.c:829 info/infokey.c:542
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "hodnota %s nenÃ­ platnÃ¡ pro promÄ›nnou %s"
  
! #: info/info.c:841
  #, c-format
  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:860 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
***************
*** 459,468 ****
  "NenÃ­ zde Å½Ã�DNÃ� ZÃ�RUKA, jak jen zÃ¡kon dovoluje.\n"
  
! #: info/info.c:981
  #, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "odpovÃ­dajÃ­cÃ­ poloÅ¾ky rejstÅ™Ã­ku nebyly pro â€ž%sâ€œ nalezeny\n"
  
! #: info/info.c:1034
  #, c-format
  msgid ""
--- 456,465 ----
  "NenÃ­ zde Å½Ã�DNÃ� ZÃ�RUKA, jak jen zÃ¡kon dovoluje.\n"
  
! #: info/info.c:999
  #, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "odpovÃ­dajÃ­cÃ­ poloÅ¾ky rejstÅ™Ã­ku nebyly pro â€ž%sâ€œ nalezeny\n"
  
! #: info/info.c:1049
  #, c-format
  msgid ""
***************
*** 475,479 ****
  "ÄŒte dokumentaci ve formÃ¡tu info.\n"
  
! #: info/info.c:1040
  msgid ""
  "Options:\n"
--- 472,476 ----
  "ÄŒte dokumentaci ve formÃ¡tu info.\n"
  
! #: info/info.c:1055
  msgid ""
  "Options:\n"
***************
*** 494,498 ****
  "  -f, --file=MANUÃ�L            otevÅ™e tento info manuÃ¡l."
  
! #: info/info.c:1048
  msgid ""
  "  -h, --help                   display this help and exit.\n"
--- 491,495 ----
  "  -f, --file=MANUÃ�L            otevÅ™e tento info manuÃ¡l."
  
! #: info/info.c:1063
  msgid ""
  "  -h, --help                   display this help and exit.\n"
***************
*** 507,511 ****
  "  -o, --output=SOUBOR          vybranÃ© uzly vypÃ­Å¡e do SOUBORU."
  
! #: info/info.c:1054
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
--- 504,508 ----
  "  -o, --output=SOUBOR          vybranÃ© uzly vypÃ­Å¡e do SOUBORU."
  
! #: info/info.c:1069
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
***************
*** 520,528 ****
  "Å™Ã¡dek."
  
! #: info/info.c:1061
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr "  -b, --speech-friendly        reÅ¾im pro hlasovÃ© syntetizÃ¡tory."
  
! #: info/info.c:1065
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
--- 517,525 ----
  "Å™Ã¡dek."
  
! #: info/info.c:1076
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr "  -b, --speech-friendly        reÅ¾im pro hlasovÃ© syntetizÃ¡tory."
  
! #: info/info.c:1080
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
***************
*** 545,549 ****
  "  -x, --debug=ÄŒÃ�SLO            nastavÃ­ ÃºroveÅˆ ladÄ›nÃ­ (-1 pro vÅ¡e).\n"
  
! #: info/info.c:1074
  msgid ""
  "\n"
--- 542,546 ----
  "  -x, --debug=ÄŒÃ�SLO            nastavÃ­ ÃºroveÅˆ ladÄ›nÃ­ (-1 pro vÅ¡e).\n"
  
! #: info/info.c:1089
  msgid ""
  "\n"
***************
*** 562,566 ****
  "relativnÄ› kÂ prvnÄ› navÅ¡tÃ­venÃ©mu uzlu."
  
! #: info/info.c:1081
  msgid ""
  "\n"
--- 559,563 ----
  "relativnÄ› kÂ prvnÄ› navÅ¡tÃ­venÃ©mu uzlu."
  
! #: info/info.c:1096
  msgid ""
  "\n"
***************
*** 570,574 ****
  "PÅ™ehled klÃ¡vesovÃ½ch zkratek je dostupnÃ½ klÃ¡vesou H."
  
! #: info/info.c:1084
  msgid ""
  "\n"
--- 567,571 ----
  "PÅ™ehled klÃ¡vesovÃ½ch zkratek je dostupnÃ½ klÃ¡vesou H."
  
! #: info/info.c:1099
  msgid ""
  "\n"
***************
*** 600,604 ****
  "neprohledÃ¡vÃ¡"
  
! #: info/info.c:1099 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
--- 597,601 ----
  "neprohledÃ¡vÃ¡"
  
! #: info/info.c:1114 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
***************
*** 612,676 ****
  "DomovskÃ¡ strÃ¡nka texinfa je <http://www.gnu.org/software/texinfo/>."
  
! #: info/info.c:1134
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Uzel â€ž(%s)%sâ€œ nelze nalÃ©zt."
  
! #: info/info.c:1135
  msgid "Cannot find a window!"
  msgstr "Nelze nalÃ©zt okno!"
  
! #: info/info.c:1136
  msgid "Point doesn't appear within this window's node!"
  msgstr "Bod se v oknÄ› tohoto uzlu nevyskytuje!"
  
! #: info/info.c:1137
  msgid "Cannot delete the last window."
  msgstr "PoslednÃ­ okno nelze smazat."
  
! #: info/info.c:1138
  msgid "No menu in this node."
  msgstr "V tomto uzlu nenÃ­ menu."
  
! #: info/info.c:1139
  msgid "No footnotes in this node."
  msgstr "V tomto nejsou poznÃ¡mky pod Ä�arou."
  
! #: info/info.c:1140
  msgid "No cross references in this node."
  msgstr "V tomto uzlu nenÃ­ kÅ™Ã­Å¾ovÃ½ odkaz."
  
! #: info/info.c:1141
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Pro tento uzel nenÃ­ â€ž%sâ€œ ukazatel."
  
! #: info/info.c:1142
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "NeznÃ¡mÃ½ Info pÅ™Ã­kaz â€ž%câ€œ; zkuste â€ž?â€œ pro nÃ¡povÄ›du."
  
! #: info/info.c:1143
  #, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "Typ terminÃ¡lu â€ž%sâ€œ nenÃ­ dostateÄ�nÄ› inteligentnÃ­ pro provoz Infa."
  
! #: info/info.c:1144
  msgid "You are already at the last page of this node."
  msgstr "JiÅ¾ jste na poslednÃ­ strÃ¡nce tohoto uzlu."
  
! #: info/info.c:1145
  msgid "You are already at the first page of this node."
  msgstr "JiÅ¾ jste na prvnÃ­ strÃ¡nce tohoto uzlu."
  
! #: info/info.c:1146
  msgid "Only one window."
  msgstr "Pouze jedno okno."
  
! #: info/info.c:1147
  msgid "Resulting window would be too small."
  msgstr "VÃ½slednÃ© okno by bylo pÅ™Ã­liÅ¡ malÃ©."
  
! #: info/info.c:1148
  msgid "Not enough room for a help window, please delete a window."
  msgstr "NenÃ­ volnÃ© mÃ­sto pro okno nÃ¡povÄ›dy, prosÃ­m smaÅ¾te nÄ›kterÃ© okno."
--- 609,673 ----
  "DomovskÃ¡ strÃ¡nka texinfa je <http://www.gnu.org/software/texinfo/>."
  
! #: info/info.c:1149
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Uzel â€ž(%s)%sâ€œ nelze nalÃ©zt."
  
! #: info/info.c:1150
  msgid "Cannot find a window!"
  msgstr "Nelze nalÃ©zt okno!"
  
! #: info/info.c:1151
  msgid "Point doesn't appear within this window's node!"
  msgstr "Bod se v oknÄ› tohoto uzlu nevyskytuje!"
  
! #: info/info.c:1152
  msgid "Cannot delete the last window."
  msgstr "PoslednÃ­ okno nelze smazat."
  
! #: info/info.c:1153
  msgid "No menu in this node."
  msgstr "V tomto uzlu nenÃ­ menu."
  
! #: info/info.c:1154
  msgid "No footnotes in this node."
  msgstr "V tomto nejsou poznÃ¡mky pod Ä�arou."
  
! #: info/info.c:1155
  msgid "No cross references in this node."
  msgstr "V tomto uzlu nenÃ­ kÅ™Ã­Å¾ovÃ½ odkaz."
  
! #: info/info.c:1156
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Pro tento uzel nenÃ­ â€ž%sâ€œ ukazatel."
  
! #: info/info.c:1157
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "NeznÃ¡mÃ½ Info pÅ™Ã­kaz â€ž%câ€œ; zkuste â€ž?â€œ pro nÃ¡povÄ›du."
  
! #: info/info.c:1158
  #, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "Typ terminÃ¡lu â€ž%sâ€œ nenÃ­ dostateÄ�nÄ› inteligentnÃ­ pro provoz Infa."
  
! #: info/info.c:1159
  msgid "You are already at the last page of this node."
  msgstr "JiÅ¾ jste na poslednÃ­ strÃ¡nce tohoto uzlu."
  
! #: info/info.c:1160
  msgid "You are already at the first page of this node."
  msgstr "JiÅ¾ jste na prvnÃ­ strÃ¡nce tohoto uzlu."
  
! #: info/info.c:1161
  msgid "Only one window."
  msgstr "Pouze jedno okno."
  
! #: info/info.c:1162
  msgid "Resulting window would be too small."
  msgstr "VÃ½slednÃ© okno by bylo pÅ™Ã­liÅ¡ malÃ©."
  
! #: info/info.c:1163
  msgid "Not enough room for a help window, please delete a window."
  msgstr "NenÃ­ volnÃ© mÃ­sto pro okno nÃ¡povÄ›dy, prosÃ­m smaÅ¾te nÄ›kterÃ© okno."
***************
*** 944,978 ****
  msgstr "neznÃ¡mÃ½ Ãºkon â€ž%sâ€œ"
  
! #: info/infokey.c:482
  #, c-format
  msgid "action name too long"
  msgstr "nÃ¡zev Ãºkonu je pÅ™Ã­liÅ¡ dlouhÃ½"
  
! #: info/infokey.c:495
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "po Ãºkonu â€ž%sâ€œ nÃ¡sledujÃ­ zbyteÄ�nÃ© znaky"
  
! #: info/infokey.c:506
  #, c-format
  msgid "missing variable name"
  msgstr "chybÃ­ nÃ¡zev promÄ›nnÃ©"
  
! #: info/infokey.c:515
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "bezprostÅ™ednÄ› po nÃ¡zvu promÄ›nnÃ© chybÃ­ â€ž=â€œ"
  
! #: info/infokey.c:522
  #, c-format
  msgid "variable name too long"
  msgstr "nÃ¡zev promÄ›nnÃ© je pÅ™Ã­liÅ¡ dlouhÃ½"
  
! #: info/infokey.c:546
  #, c-format
  msgid "value too long"
  msgstr "hodnota je pÅ™Ã­liÅ¡ dlouhÃ¡"
  
! #: info/infokey.c:592
  #, c-format
  msgid "\"%s\", line %u: "
--- 941,975 ----
  msgstr "neznÃ¡mÃ½ Ãºkon â€ž%sâ€œ"
  
! #: info/infokey.c:485
  #, c-format
  msgid "action name too long"
  msgstr "nÃ¡zev Ãºkonu je pÅ™Ã­liÅ¡ dlouhÃ½"
  
! #: info/infokey.c:498
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "po Ãºkonu â€ž%sâ€œ nÃ¡sledujÃ­ zbyteÄ�nÃ© znaky"
  
! #: info/infokey.c:509
  #, c-format
  msgid "missing variable name"
  msgstr "chybÃ­ nÃ¡zev promÄ›nnÃ©"
  
! #: info/infokey.c:518
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "bezprostÅ™ednÄ› po nÃ¡zvu promÄ›nnÃ© chybÃ­ â€ž=â€œ"
  
! #: info/infokey.c:525
  #, c-format
  msgid "variable name too long"
  msgstr "nÃ¡zev promÄ›nnÃ© je pÅ™Ã­liÅ¡ dlouhÃ½"
  
! #: info/infokey.c:549
  #, c-format
  msgid "value too long"
  msgstr "hodnota je pÅ™Ã­liÅ¡ dlouhÃ¡"
  
! #: info/infokey.c:595
  #, c-format
  msgid "\"%s\", line %u: "
***************
*** 1306,1644 ****
  msgstr "Uzel, na kterÃ½ se odkazuje â€ž%sâ€œ v â€ž%sâ€œ, nelze najÃ­t."
  
! #: info/session.c:2864
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "ÄŒtenÃ­ seznamu menu zaÄ�Ã­najÃ­ce v adresÃ¡Å™i a pokraÄ�ujÃ­ce dÃ¡le"
  
! #: info/session.c:2866
  msgid "Follow menus: "
  msgstr "NÃ¡sledovÃ¡nÃ­ menu: "
  
! #: info/session.c:2971
  msgid "Select the Next node"
  msgstr "ZobrazenÃ­ nÃ¡sledujÃ­cÃ­ho uzlu"
  
! #: info/session.c:2978
  msgid "Select the Prev node"
  msgstr "ZobrazenÃ­ pÅ™edchozÃ­ho uzlu"
  
! #: info/session.c:2985
  msgid "Select the Up node"
  msgstr "ZobrazenÃ­ vyÅ¡Å¡Ã­ho uzlu"
  
! #: info/session.c:2991
  msgid "Select the last node in this file"
  msgstr "ZobrazenÃ­ poslednÃ­ho uzlu v tomto souboru"
  
! #: info/session.c:3018 info/session.c:3051
  msgid "This window has no additional nodes"
  msgstr "Toto okno nemÃ¡ vÃ­ce dalÅ¡Ã­ch uzlÅ¯"
  
! #: info/session.c:3024
  msgid "Select the first node in this file"
  msgstr "ZobrazenÃ­ prvnÃ­ho uzlu v tomto souboru"
  
! #: info/session.c:3158
  msgid "No more nodes within this document."
  msgstr "V tomto dokumentu jiÅ¾ nejsou dalÅ¡Ã­ uzly."
  
! #: info/session.c:3203 info/session.c:3243
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "V tomto dokumentu nenÃ­ pro tento uzel pÅ™edchozÃ­ nebo vyÅ¡Å¡Ã­ uzel."
  
! #: info/session.c:3256
  msgid "Move forwards or down through node structure"
  msgstr "PÅ™esun na nÃ¡sledujÃ­cÃ­ uzel nebo na prvnÃ­ niÅ¾Å¡Ã­ v uzlovÃ© struktuÅ™e"
  
! #: info/session.c:3273
  msgid "Move backwards or up through node structure"
  msgstr "PÅ™esun na pÅ™edchozÃ­ uzel nebo na prvnÃ­ vyÅ¡Å¡Ã­ v uzlovÃ© struktuÅ™e"
  
! #: info/session.c:3296
  msgid "Read a node name and select it"
  msgstr "ZadÃ¡nÃ­ jmÃ©na uzlu a jeho nÃ¡slednÃ© zobrazenÃ­"
  
! #: info/session.c:3350 info/session.c:3354
  msgid "Goto node: "
  msgstr "PÅ™esun na uzel: "
  
! #: info/session.c:3533
  msgid "Find the node describing program invocation"
  msgstr "NalezenÃ­ uzlu popisujÃ­cÃ­ho pÅ™epÃ­naÄ�e programu"
  
! #: info/session.c:3535
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "NalezenÃ­ uzlu s pÅ™epÃ­naÄ�i programu [%s]: "
  
! #: info/session.c:3580
  msgid "Read a manpage reference and select it"
  msgstr "ZadÃ¡nÃ­ jmÃ©na manuÃ¡lovÃ© strÃ¡nky a nÃ¡slednÃ© zobrazenÃ­"
  
! #: info/session.c:3584
  msgid "Get Manpage: "
  msgstr "ManuÃ¡lovÃ¡ strÃ¡nka: "
  
! #: info/session.c:3605
  msgid "Select the node 'Top' in this file"
  msgstr "ZobrazenÃ­ nejvyÅ¡Å¡Ã­ho uzlu v tomto souboru"
  
! #: info/session.c:3611
  msgid "Select the node '(dir)'"
  msgstr "ZobrazenÃ­ uzlu â€ž(dir)â€œ"
  
! #: info/session.c:3617
  msgid "Show full file name of node being displayed"
  msgstr "ZobrazenÃ­ plnÃ©ho nÃ¡zvu souboru aktuÃ¡lnÃ­ho uzlu"
  
! #: info/session.c:3634
  msgid "Select the most recently selected node"
  msgstr "ZobrazenÃ­ poslednÃ­ dobou nejvÃ­ce navÅ¡tÄ›vovanÃ½ch uzlÅ¯"
  
! #: info/session.c:3639
  #, c-format
  msgid "No earlier node in history"
  msgstr "VÂ historii nenÃ­ dÅ™Ã­vÄ›jÅ¡Ã­ uzel"
  
! #: info/session.c:3643
  msgid "Read the name of a file and select it"
  msgstr "ZadÃ¡nÃ­ jmÃ©na souboru a jeho nÃ¡slednÃ© zobrazenÃ­"
  
! #: info/session.c:3647
  msgid "Find file: "
  msgstr "NalezenÃ­ souboru: "
  
! #: info/session.c:3664
  #, c-format
  msgid "Cannot find '%s'."
  msgstr "Nelze najÃ­t â€ž%sâ€œ."
  
! #: info/session.c:3713
  #, c-format
  msgid "Could not create output file '%s'."
  msgstr "VÃ½stupnÃ­ soubor â€ž%sâ€œ nelze vytvoÅ™it."
  
! #: info/session.c:3727
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "chyba pÅ™i zÃ¡pisu od %s: %s"
  
! #: info/session.c:3736
  #, c-format
  msgid "closing %s"
  msgstr "zavÃ­rÃ¡nÃ­ %s"
  
! #: info/session.c:3785
  #, c-format
  msgid "writing node %s..."
  msgstr "zapisovÃ¡nÃ­ uzlu %sâ€¦"
  
! #: info/session.c:3831
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "PoslÃ¡nÃ­ obsahu tohoto uzlu pÅ™Ã­kazu INFO_PRINT_COMMAND"
  
! #: info/session.c:3859
  #, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Rouru do â€ž%sâ€œ nelze otevÅ™Ã­t."
  
! #: info/session.c:3864
  #, c-format
  msgid "printing node %s..."
  msgstr "ProbÃ­hÃ¡ tisk uzlu %sâ€¦"
  
! #: info/session.c:3872
  #, c-format
  msgid "finished printing node %s"
  msgstr "tisk uzlu %s dokonÄ�en"
  
! #: info/session.c:3904
  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."
  
! #: info/session.c:4169
  msgid "Search continued from the end of the document."
  msgstr "HledÃ¡nÃ­ pokraÄ�ovalo od konce dokumentu."
  
! #: info/session.c:4174
  msgid "Search continued from the beginning of the document."
  msgstr "HledÃ¡nÃ­ pokraÄ�ovalo odÂ zaÄ�Ã¡tku dokumentu."
  
! #: info/session.c:4194
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "ProbÃ­hÃ¡ hledÃ¡nÃ­ podsouboru %sâ€¦"
  
! #: info/session.c:4231
  msgid "Search failed."
  msgstr "Nebylo nalezeno."
  
! #: info/session.c:4248
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Regexp search"
  msgstr "HledÃ¡nÃ­ regulÃ¡rnÃ­m vÃ½razem"
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Search"
  msgstr "HledÃ¡nÃ­"
  
! #: info/session.c:4250 info/session.c:4256
  msgid " case-sensitively"
  msgstr " velikost rozhoduje"
  
! #: info/session.c:4251 info/session.c:4257
  msgid " backward"
  msgstr " zpÄ›tnÃ©"
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s: "
  
! #: info/session.c:4274
  msgid "Search string too short"
  msgstr "HledanÃ½ Å™etÄ›zec je pÅ™Ã­liÅ¡ krÃ¡tkÃ½"
  
! #: info/session.c:4467
  #, c-format
  msgid "Going back to last match from %s"
  msgstr "NÃ¡vrat zpÄ›t na poslednÃ­ shodu %s"
  
! #: info/session.c:4491 info/session.c:4601
  #, c-format
  msgid "No more matches."
  msgstr "Å½Ã¡dnÃ© dalÅ¡Ã­ shody."
  
! #: info/session.c:4628
  msgid "Search this node and subnodes for a string."
  msgstr "ProhledÃ¡nÃ­ tohoto uzlu a poduzlÅ¯ na Å™etÄ›zec."
  
! #: info/session.c:4649
  msgid "Go to next match in Info sub-tree"
  msgstr "PÅ™esun na dalÅ¡Ã­ shodu vÂ podstromÄ› Infa"
  
! #: info/session.c:4653 info/session.c:4665
  #, c-format
  msgid "No active search"
  msgstr "HledÃ¡nÃ­ nenÃ­ aktivnÃ­"
  
! #: info/session.c:4661
  msgid "Go to previous match in Info sub-tree"
  msgstr "PÅ™esun na pÅ™edchozÃ­ shodu vÂ podstromÄ› Infa"
  
! #: info/session.c:4674
  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:4679
  msgid "Read a string and search for it"
  msgstr "PÅ™eÄ�tenÃ­ Å™etÄ›zce a jeho vyhledÃ¡nÃ­"
  
! #: info/session.c:4685
  msgid "Read a string and search backward for it"
  msgstr "PÅ™eÄ�tenÃ­ Å™etÄ›zce a jeho vyhledÃ¡nÃ­ (zpÄ›tnÃ©)"
  
! #: info/session.c:4693
  msgid "Repeat last search in the same direction"
  msgstr "OpakovÃ¡nÃ­ poslednÃ­ho hledÃ¡nÃ­ tÃ­m samÃ½m smÄ›rem"
  
! #: info/session.c:4701 info/session.c:4746
  msgid "No previous search string"
  msgstr "NenÃ­ pÅ™edchozÃ­ hledanÃ½ Å™etÄ›zec"
  
! #: info/session.c:4738
  msgid "Repeat last search in the reverse direction"
  msgstr "OpakovÃ¡nÃ­ poslednÃ­ho hledÃ¡nÃ­ opaÄ�nÃ½m smÄ›rem"
  
! #: info/session.c:4785
  msgid "Clear displayed search matches"
  msgstr "OdstranÃ­ zobrazenÃ© vÃ½sledky hledÃ¡nÃ­"
  
! #: info/session.c:4802 info/session.c:4808
  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:4928
  msgid "Regexp I-search backward: "
  msgstr "ZpÄ›tnÃ© interaktivnÃ­ hledÃ¡nÃ­ regulÃ¡rnÃ­m vÃ½razem: "
  
! #: info/session.c:4929
  msgid "I-search backward: "
  msgstr "ZpÄ›tnÃ© interaktivnÃ­ hledÃ¡nÃ­: "
  
! #: info/session.c:4931
  msgid "Regexp I-search: "
  msgstr "InteraktivnÃ­ hledÃ¡nÃ­ regulÃ¡rnÃ­m vÃ½razem: "
  
! #: info/session.c:4932
  msgid "I-search: "
  msgstr "InteraktivnÃ­ hledÃ¡nÃ­: "
  
! #: info/session.c:4957 info/session.c:4960
  msgid "Failing "
  msgstr "BezvÃ½slednÃ© "
  
! #: info/session.c:5326
  msgid "Cancel current operation"
  msgstr "ZruÅ¡enÃ­ aktuÃ¡lnÃ­ operace"
  
! #: info/session.c:5333
  msgid "Quit"
  msgstr "UkonÄ�enÃ­ operace"
  
! #: info/session.c:5338
  msgid "Display version of Info being run"
  msgstr "ZobrazÃ­ verzi spuÅ¡tÄ›nÃ©ho Infa"
  
! #: info/session.c:5340
  #, c-format
  msgid "GNU Info version %s"
  msgstr "GNU Info verze %s"
  
! #: info/session.c:5345
  msgid "Redraw the display"
  msgstr "PÅ™ekreslenÃ­ obrazovky"
  
! #: info/session.c:5382
  msgid "Quit using Info"
  msgstr "UkonÄ�enÃ­ Infa"
  
! #: info/session.c:5398
  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:5409
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "NeznÃ¡mÃ½ pÅ™Ã­kaz (%s)."
  
! #: info/session.c:5412
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "â€ž%sâ€œ je neplatnÃ©"
  
! #: info/session.c:5413
  #, c-format
  msgid "'%s' is invalid"
  msgstr "â€ž%sâ€œ je neplatnÃ©"
  
! #: info/session.c:5731
  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:5738
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "ZaÄ�Ã¡tek (nebo dÄ›lenÃ­ Ä�tyÅ™mi) aktuÃ¡lnÃ­ho Ä�Ã­selnÃ©ho argumentu"
--- 1303,1641 ----
  msgstr "Uzel, na kterÃ½ se odkazuje â€ž%sâ€œ v â€ž%sâ€œ, nelze najÃ­t."
  
! #: info/session.c:2870
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "ÄŒtenÃ­ seznamu menu zaÄ�Ã­najÃ­ce v adresÃ¡Å™i a pokraÄ�ujÃ­ce dÃ¡le"
  
! #: info/session.c:2872
  msgid "Follow menus: "
  msgstr "NÃ¡sledovÃ¡nÃ­ menu: "
  
! #: info/session.c:2977
  msgid "Select the Next node"
  msgstr "ZobrazenÃ­ nÃ¡sledujÃ­cÃ­ho uzlu"
  
! #: info/session.c:2984
  msgid "Select the Prev node"
  msgstr "ZobrazenÃ­ pÅ™edchozÃ­ho uzlu"
  
! #: info/session.c:2991
  msgid "Select the Up node"
  msgstr "ZobrazenÃ­ vyÅ¡Å¡Ã­ho uzlu"
  
! #: info/session.c:2997
  msgid "Select the last node in this file"
  msgstr "ZobrazenÃ­ poslednÃ­ho uzlu v tomto souboru"
  
! #: info/session.c:3024 info/session.c:3057
  msgid "This window has no additional nodes"
  msgstr "Toto okno nemÃ¡ vÃ­ce dalÅ¡Ã­ch uzlÅ¯"
  
! #: info/session.c:3030
  msgid "Select the first node in this file"
  msgstr "ZobrazenÃ­ prvnÃ­ho uzlu v tomto souboru"
  
! #: info/session.c:3164
  msgid "No more nodes within this document."
  msgstr "V tomto dokumentu jiÅ¾ nejsou dalÅ¡Ã­ uzly."
  
! #: info/session.c:3209 info/session.c:3249
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "V tomto dokumentu nenÃ­ pro tento uzel pÅ™edchozÃ­ nebo vyÅ¡Å¡Ã­ uzel."
  
! #: info/session.c:3262
  msgid "Move forwards or down through node structure"
  msgstr "PÅ™esun na nÃ¡sledujÃ­cÃ­ uzel nebo na prvnÃ­ niÅ¾Å¡Ã­ v uzlovÃ© struktuÅ™e"
  
! #: info/session.c:3279
  msgid "Move backwards or up through node structure"
  msgstr "PÅ™esun na pÅ™edchozÃ­ uzel nebo na prvnÃ­ vyÅ¡Å¡Ã­ v uzlovÃ© struktuÅ™e"
  
! #: info/session.c:3302
  msgid "Read a node name and select it"
  msgstr "ZadÃ¡nÃ­ jmÃ©na uzlu a jeho nÃ¡slednÃ© zobrazenÃ­"
  
! #: info/session.c:3356 info/session.c:3360
  msgid "Goto node: "
  msgstr "PÅ™esun na uzel: "
  
! #: info/session.c:3539
  msgid "Find the node describing program invocation"
  msgstr "NalezenÃ­ uzlu popisujÃ­cÃ­ho pÅ™epÃ­naÄ�e programu"
  
! #: info/session.c:3541
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "NalezenÃ­ uzlu s pÅ™epÃ­naÄ�i programu [%s]: "
  
! #: info/session.c:3586
  msgid "Read a manpage reference and select it"
  msgstr "ZadÃ¡nÃ­ jmÃ©na manuÃ¡lovÃ© strÃ¡nky a nÃ¡slednÃ© zobrazenÃ­"
  
! #: info/session.c:3590
  msgid "Get Manpage: "
  msgstr "ManuÃ¡lovÃ¡ strÃ¡nka: "
  
! #: info/session.c:3611
  msgid "Select the node 'Top' in this file"
  msgstr "ZobrazenÃ­ nejvyÅ¡Å¡Ã­ho uzlu v tomto souboru"
  
! #: info/session.c:3617
  msgid "Select the node '(dir)'"
  msgstr "ZobrazenÃ­ uzlu â€ž(dir)â€œ"
  
! #: info/session.c:3623
  msgid "Show full file name of node being displayed"
  msgstr "ZobrazenÃ­ plnÃ©ho nÃ¡zvu souboru aktuÃ¡lnÃ­ho uzlu"
  
! #: info/session.c:3640
  msgid "Select the most recently selected node"
  msgstr "ZobrazenÃ­ poslednÃ­ dobou nejvÃ­ce navÅ¡tÄ›vovanÃ½ch uzlÅ¯"
  
! #: info/session.c:3645
  #, c-format
  msgid "No earlier node in history"
  msgstr "VÂ historii nenÃ­ dÅ™Ã­vÄ›jÅ¡Ã­ uzel"
  
! #: info/session.c:3649
  msgid "Read the name of a file and select it"
  msgstr "ZadÃ¡nÃ­ jmÃ©na souboru a jeho nÃ¡slednÃ© zobrazenÃ­"
  
! #: info/session.c:3653
  msgid "Find file: "
  msgstr "NalezenÃ­ souboru: "
  
! #: info/session.c:3670
  #, c-format
  msgid "Cannot find '%s'."
  msgstr "Nelze najÃ­t â€ž%sâ€œ."
  
! #: info/session.c:3719
  #, c-format
  msgid "Could not create output file '%s'."
  msgstr "VÃ½stupnÃ­ soubor â€ž%sâ€œ nelze vytvoÅ™it."
  
! #: info/session.c:3733
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "chyba pÅ™i zÃ¡pisu od %s: %s"
  
! #: info/session.c:3742
  #, c-format
  msgid "closing %s"
  msgstr "zavÃ­rÃ¡nÃ­ %s"
  
! #: info/session.c:3791
  #, c-format
  msgid "writing node %s..."
  msgstr "zapisovÃ¡nÃ­ uzlu %sâ€¦"
  
! #: info/session.c:3837
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "PoslÃ¡nÃ­ obsahu tohoto uzlu pÅ™Ã­kazu INFO_PRINT_COMMAND"
  
! #: info/session.c:3865
  #, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Rouru do â€ž%sâ€œ nelze otevÅ™Ã­t."
  
! #: info/session.c:3870
  #, c-format
  msgid "printing node %s..."
  msgstr "ProbÃ­hÃ¡ tisk uzlu %sâ€¦"
  
! #: info/session.c:3878
  #, c-format
  msgid "finished printing node %s"
  msgstr "tisk uzlu %s dokonÄ�en"
  
! #: info/session.c:3910
  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:3914
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr "VyhledÃ¡vÃ¡nÃ­ regulÃ¡rnÃ­m vÃ½razem."
  
! #: info/session.c:3915
  #, c-format
  msgid "Using literal strings for searches."
  msgstr "VyhledÃ¡vÃ¡nÃ­ doslovnÃ½m Å™etÄ›zcem."
  
! #: info/session.c:4175
  msgid "Search continued from the end of the document."
  msgstr "HledÃ¡nÃ­ pokraÄ�ovalo od konce dokumentu."
  
! #: info/session.c:4180
  msgid "Search continued from the beginning of the document."
  msgstr "HledÃ¡nÃ­ pokraÄ�ovalo odÂ zaÄ�Ã¡tku dokumentu."
  
! #: info/session.c:4200
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "ProbÃ­hÃ¡ hledÃ¡nÃ­ podsouboru %sâ€¦"
  
! #: info/session.c:4237
  msgid "Search failed."
  msgstr "Nebylo nalezeno."
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Regexp search"
  msgstr "HledÃ¡nÃ­ regulÃ¡rnÃ­m vÃ½razem"
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Search"
  msgstr "HledÃ¡nÃ­"
  
! #: info/session.c:4256 info/session.c:4262
  msgid " case-sensitively"
  msgstr " velikost rozhoduje"
  
! #: info/session.c:4257 info/session.c:4263
  msgid " backward"
  msgstr " zpÄ›tnÃ©"
  
! #: info/session.c:4260
  #, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s: "
  
! #: info/session.c:4280
  msgid "Search string too short"
  msgstr "HledanÃ½ Å™etÄ›zec je pÅ™Ã­liÅ¡ krÃ¡tkÃ½"
  
! #: info/session.c:4473
  #, c-format
  msgid "Going back to last match from %s"
  msgstr "NÃ¡vrat zpÄ›t na poslednÃ­ shodu %s"
  
! #: info/session.c:4497 info/session.c:4607
  #, c-format
  msgid "No more matches."
  msgstr "Å½Ã¡dnÃ© dalÅ¡Ã­ shody."
  
! #: info/session.c:4634
  msgid "Search this node and subnodes for a string."
  msgstr "ProhledÃ¡nÃ­ tohoto uzlu a poduzlÅ¯ na Å™etÄ›zec."
  
! #: info/session.c:4655
  msgid "Go to next match in Info sub-tree"
  msgstr "PÅ™esun na dalÅ¡Ã­ shodu vÂ podstromÄ› Infa"
  
! #: info/session.c:4659 info/session.c:4671
  #, c-format
  msgid "No active search"
  msgstr "HledÃ¡nÃ­ nenÃ­ aktivnÃ­"
  
! #: info/session.c:4667
  msgid "Go to previous match in Info sub-tree"
  msgstr "PÅ™esun na pÅ™edchozÃ­ shodu vÂ podstromÄ› Infa"
  
! #: info/session.c:4680
  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:4685
  msgid "Read a string and search for it"
  msgstr "PÅ™eÄ�tenÃ­ Å™etÄ›zce a jeho vyhledÃ¡nÃ­"
  
! #: info/session.c:4691
  msgid "Read a string and search backward for it"
  msgstr "PÅ™eÄ�tenÃ­ Å™etÄ›zce a jeho vyhledÃ¡nÃ­ (zpÄ›tnÃ©)"
  
! #: info/session.c:4699
  msgid "Repeat last search in the same direction"
  msgstr "OpakovÃ¡nÃ­ poslednÃ­ho hledÃ¡nÃ­ tÃ­m samÃ½m smÄ›rem"
  
! #: info/session.c:4707 info/session.c:4752
  msgid "No previous search string"
  msgstr "NenÃ­ pÅ™edchozÃ­ hledanÃ½ Å™etÄ›zec"
  
! #: info/session.c:4744
  msgid "Repeat last search in the reverse direction"
  msgstr "OpakovÃ¡nÃ­ poslednÃ­ho hledÃ¡nÃ­ opaÄ�nÃ½m smÄ›rem"
  
! #: info/session.c:4791
  msgid "Clear displayed search matches"
  msgstr "OdstranÃ­ zobrazenÃ© vÃ½sledky hledÃ¡nÃ­"
  
! #: info/session.c:4808 info/session.c:4814
  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:4934
  msgid "Regexp I-search backward: "
  msgstr "ZpÄ›tnÃ© interaktivnÃ­ hledÃ¡nÃ­ regulÃ¡rnÃ­m vÃ½razem: "
  
! #: info/session.c:4935
  msgid "I-search backward: "
  msgstr "ZpÄ›tnÃ© interaktivnÃ­ hledÃ¡nÃ­: "
  
! #: info/session.c:4937
  msgid "Regexp I-search: "
  msgstr "InteraktivnÃ­ hledÃ¡nÃ­ regulÃ¡rnÃ­m vÃ½razem: "
  
! #: info/session.c:4938
  msgid "I-search: "
  msgstr "InteraktivnÃ­ hledÃ¡nÃ­: "
  
! #: info/session.c:4963 info/session.c:4966
  msgid "Failing "
  msgstr "BezvÃ½slednÃ© "
  
! #: info/session.c:5332
  msgid "Cancel current operation"
  msgstr "ZruÅ¡enÃ­ aktuÃ¡lnÃ­ operace"
  
! #: info/session.c:5339
  msgid "Quit"
  msgstr "UkonÄ�enÃ­ operace"
  
! #: info/session.c:5344
  msgid "Display version of Info being run"
  msgstr "ZobrazÃ­ verzi spuÅ¡tÄ›nÃ©ho Infa"
  
! #: info/session.c:5346
  #, c-format
  msgid "GNU Info version %s"
  msgstr "GNU Info verze %s"
  
! #: info/session.c:5351
  msgid "Redraw the display"
  msgstr "PÅ™ekreslenÃ­ obrazovky"
  
! #: info/session.c:5388
  msgid "Quit using Info"
  msgstr "UkonÄ�enÃ­ Infa"
  
! #: info/session.c:5404
  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:5415
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "NeznÃ¡mÃ½ pÅ™Ã­kaz (%s)."
  
! #: info/session.c:5418
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "â€ž%sâ€œ je neplatnÃ©"
  
! #: info/session.c:5419
  #, c-format
  msgid "'%s' is invalid"
  msgstr "â€ž%sâ€œ je neplatnÃ©"
  
! #: info/session.c:5737
  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:5744
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "ZaÄ�Ã¡tek (nebo dÄ›lenÃ­ Ä�tyÅ™mi) aktuÃ¡lnÃ­ho Ä�Ã­selnÃ©ho argumentu"
***************
*** 1778,1795 ****
  msgstr "NastavenÃ­ promÄ›nnÃ© %s na hodnotu (%s): "
  
! #: info/window.c:959
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), Å™Ã¡dkÅ¯ ----, "
  
- #: info/window.c:966
- #, c-format
- msgid "-%s---Info: %s, %ld lines --%s--"
- msgstr "-%s---Info: %s, Å™Ã¡dkÅ¯: %ld --%s--"
- 
- #: info/window.c:970
- #, c-format
- msgid "-%s---Info: (%s)%s, %ld lines --%s--"
- msgstr "-%s---Info: (%s)%s, Å™Ã¡dkÅ¯: %ld --%s--"
- 
  #: install-info/install-info.c:292
  #, c-format
--- 1775,1782 ----
  msgstr "NastavenÃ­ promÄ›nnÃ© %s na hodnotu (%s): "
  
! #: info/window.c:909
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), Å™Ã¡dkÅ¯ ----, "
  
  #: install-info/install-info.c:292
  #, c-format
***************
*** 1980,1984 ****
  "\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"
--- 1967,1971 ----
  "\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"
***************
*** 1996,2000 ****
  "\n"
  "  Tento (AdresÃ¡Å™ovÃ½ uzel) obsahuje nabÃ­dku hlavnÃ­ch tÃ©mat.\n"
! "  Stiskem â€žqâ€œ Info ukonÄ�Ã­te, stiskem â€ž?â€œ zÃ­skÃ¡te seznam vÅ¡ech Info pÅ™Ã­kazÅ¯,\n"
  "  stiskem â€ždâ€œ se vrÃ¡tÃ­te sem, stiskem â€žhâ€œ zÃ­skÃ¡te nÃ¡vod pro zaÄ�Ã¡teÄ�nÃ­ky,\n"
  "  napsÃ¡nÃ­m â€žmEmacsâ€œ a stiskem Enteru zobrazÃ­te nÃ¡vod kÂ Emacsu, atd.\n"
--- 1983,1987 ----
  "\n"
  "  Tento (AdresÃ¡Å™ovÃ½ uzel) obsahuje nabÃ­dku hlavnÃ­ch tÃ©mat.\n"
! "  Stiskem â€žqâ€œ Info ukonÄ�Ã­te, stiskem â€žHâ€œ zÃ­skÃ¡te seznam vÅ¡ech Info pÅ™Ã­kazÅ¯,\n"
  "  stiskem â€ždâ€œ se vrÃ¡tÃ­te sem, stiskem â€žhâ€œ zÃ­skÃ¡te nÃ¡vod pro zaÄ�Ã¡teÄ�nÃ­ky,\n"
  "  napsÃ¡nÃ­m â€žmEmacsâ€œ a stiskem Enteru zobrazÃ­te nÃ¡vod kÂ Emacsu, atd.\n"
***************
*** 2072,2188 ****
  msgstr "pro â€ž%sâ€œ nebyly nalezeny Å¾Ã¡dnÃ© poloÅ¾ky"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:855
! #: tp/Texinfo/Convert/Converter.pm:893 tp/Texinfo/Convert/Converter.pm:1204
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6504
! #: tp/Texinfo/Convert/HTML.pm:6528 tp/Texinfo/Convert/HTML.pm:6905
! #: tp/Texinfo/Convert/HTML.pm:6963 tp/Texinfo/Convert/HTML.pm:7041
! #: tp/Texinfo/Convert/HTML.pm:7118 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:546
! #: tp/Texinfo/Convert/TexinfoXML.pm:457
  #, 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:881
  msgid "recursion is always allowed"
  msgstr "rekurze je vÅ¾dy dovolena"
  
! #: tp/Texinfo/Common.pm:882
  msgid "arguments are quoted by default"
  msgstr "argumenty se standardnÄ› uzavÃ­rajÃ­ do uvozovek"
  
! #: tp/Texinfo/Common.pm:1105
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s nenÃ­ platnÃ½ kÃ³d jazyka"
  
! #: tp/Texinfo/Common.pm:1110
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s nenÃ­ platnÃ½ kÃ³d oblasti"
  
! #: tp/Texinfo/Common.pm:1128
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%s nenÃ­ platnÃ¡ moÅ¾nost dÄ›lenÃ­"
  
! #: tp/Texinfo/Common.pm:1151
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "%s nebylo moÅ¾nÃ© pÅ™eÄ�Ã­st: %s"
  
! #: tp/Texinfo/Common.pm:1170
  #, 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:1176 tp/Texinfo/Parser.pm:3353
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%s: nebylo moÅ¾nÃ© nalÃ©zt %s"
  
! #: tp/Texinfo/Common.pm:1520
! #, 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/Common.pm:1548
! msgid "missing type"
! msgstr "chybÃ­ typ"
! 
! #: tp/Texinfo/Common.pm:1551
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "nerozpoznanÃ½ typ: %s"
! 
! #: tp/Texinfo/Common.pm:1568
! #, 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/Common.pm:1603
  msgid "no node to be renamed"
  msgstr "Å¾Ã¡dnÃ½ uzel nemÃ¡ bÃ½t pÅ™ejmenovÃ¡n"
  
! #: tp/Texinfo/Common.pm:1614
  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:1624 tp/Texinfo/Parser.pm:926
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "%s nebylo moÅ¾nÃ© otevÅ™Ã­t: %s"
  
! #: tp/Texinfo/Common.pm:2144
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr "vÂ @%s nebylo moÅ¾no ochrÃ¡nit znak kÅ™Ã­Å¾ku"
  
! #: tp/Texinfo/Convert/Converter.pm:395 tp/Texinfo/Convert/Converter.pm:414
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "ZastaralÃ¡ promÄ›nnÃ¡ %s\n"
  
! #: tp/Texinfo/Convert/Converter.pm:794
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr "%s: vÃ½stup nenÃ­ kompatibilnÃ­ sÂ dÄ›lenÃ­m"
  
! #: tp/Texinfo/Convert/Converter.pm:876 tp/Texinfo/Convert/Converter.pm:909
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:6931
! #: tp/Texinfo/Convert/HTML.pm:6989 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:476 tp/Texinfo/Parser.pm:2035
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "chyba pÅ™i zavÃ­rÃ¡nÃ­ %s: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, 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:995
  #, perl-format
  msgid "could not create directory `%s': %s"
--- 2059,2169 ----
  msgstr "pro â€ž%sâ€œ nebyly nalezeny Å¾Ã¡dnÃ© poloÅ¾ky"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:847
! #: tp/Texinfo/Convert/Converter.pm:885 tp/Texinfo/Convert/Converter.pm:1196
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6573
! #: tp/Texinfo/Convert/HTML.pm:6597 tp/Texinfo/Convert/HTML.pm:6978
! #: tp/Texinfo/Convert/HTML.pm:7037 tp/Texinfo/Convert/HTML.pm:7115
! #: tp/Texinfo/Convert/HTML.pm:7192 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:547
! #: tp/Texinfo/Convert/TexinfoXML.pm:458
  #, 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:862
  msgid "recursion is always allowed"
  msgstr "rekurze je vÅ¾dy dovolena"
  
! #: tp/Texinfo/Common.pm:863
  msgid "arguments are quoted by default"
  msgstr "argumenty se standardnÄ› uzavÃ­rajÃ­ do uvozovek"
  
! #: tp/Texinfo/Common.pm:866
! 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:869
! msgid ""
! "move your @shortcontents and @contents commands if you want the contents "
! "after the title page"
! msgstr ""
! "pÅ™esune pÅ™Ã­kazy @shortcontents a @contents, chcete-li obsah za strÃ¡nkou "
! "sÂ nadpisem"
! 
! #: tp/Texinfo/Common.pm:1093
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s nenÃ­ platnÃ½ kÃ³d jazyka"
  
! #: tp/Texinfo/Common.pm:1098
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s nenÃ­ platnÃ½ kÃ³d oblasti"
  
! #: tp/Texinfo/Common.pm:1116
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%s nenÃ­ platnÃ¡ moÅ¾nost dÄ›lenÃ­"
  
! #: tp/Texinfo/Common.pm:1139
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "%s nebylo moÅ¾nÃ© pÅ™eÄ�Ã­st: %s"
  
! #: tp/Texinfo/Common.pm:1158
  #, 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:1164 tp/Texinfo/Parser.pm:3193
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%s: nebylo moÅ¾nÃ© nalÃ©zt %s"
  
! #: tp/Texinfo/Common.pm:1637
  msgid "no node to be renamed"
  msgstr "Å¾Ã¡dnÃ½ uzel nemÃ¡ bÃ½t pÅ™ejmenovÃ¡n"
  
! #: tp/Texinfo/Common.pm:1648
  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:1658 tp/Texinfo/Parser.pm:899
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "%s nebylo moÅ¾nÃ© otevÅ™Ã­t: %s"
  
! #: tp/Texinfo/Common.pm:2178
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr "vÂ @%s nebylo moÅ¾no ochrÃ¡nit znak kÅ™Ã­Å¾ku"
  
! #: tp/Texinfo/Convert/Converter.pm:387 tp/Texinfo/Convert/Converter.pm:406
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "ZastaralÃ¡ promÄ›nnÃ¡ %s\n"
  
! #: tp/Texinfo/Convert/Converter.pm:786
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr "%s: vÃ½stup nenÃ­ kompatibilnÃ­ sÂ dÄ›lenÃ­m"
  
! #: tp/Texinfo/Convert/Converter.pm:868 tp/Texinfo/Convert/Converter.pm:901
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:7004
! #: tp/Texinfo/Convert/HTML.pm:7063 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:477 tp/Texinfo/Parser.pm:1996
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "chyba pÅ™i zavÃ­rÃ¡nÃ­ %s: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:979
  #, 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:987
  #, perl-format
  msgid "could not create directory `%s': %s"
***************
*** 2194,2292 ****
  msgstr "@image soubor â€ž%sâ€œ nenalezen, pouÅ¾ije se â€ž%sâ€œ"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5388
  msgid "no argument specified for @U"
  msgstr "pro @U nebyl zadÃ¡n Å¾Ã¡dnÃ½ argument"
  
! #: tp/Texinfo/Convert/HTML.pm:1683
  #, 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:2371
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "syrovÃ½ formÃ¡t %s nenÃ­ pÅ™eveden"
  
! #: tp/Texinfo/Convert/HTML.pm:4888
  msgid "string not closed in css file"
  msgstr "Å™etÄ›zec nebÃ­ uzavÅ™en vÂ souboru CSS"
  
! #: tp/Texinfo/Convert/HTML.pm:4890
  msgid "--css-include ended in comment"
  msgstr "--css-include konÄ�il vÂ komentÃ¡Å™i"
  
! #: tp/Texinfo/Convert/HTML.pm:4892
  msgid "@import not finished in css file"
  msgstr "@import nebyl dokonÄ�en vÂ souboru CSS"
  
! #: tp/Texinfo/Convert/HTML.pm:4918
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "CSS soubor %s nenalezen"
  
! #: tp/Texinfo/Convert/HTML.pm:4924
  #, 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:4934
  #, 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:5801 tp/Texinfo/Convert/HTML.pm:5805
  #, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "pro â€ž%sâ€œ nenalezena Å¾Ã¡dnÃ¡ poloÅ¾ka htmlxref.cnf"
  
! #: tp/Texinfo/Convert/HTML.pm:6499
  #, 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:6523
  #, 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:6638
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr "deskriptor %s ÃºrovnÄ› %s priority %s selhal"
  
! #: tp/Texinfo/Convert/HTML.pm:6839
  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:7048
  #, 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:7073
  #, 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:7079
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "soubor pro pÅ™ejmenovanÃ½ uzel â€ž%sâ€œ je prÃ¡zdnÃ½"
  
! #: tp/Texinfo/Convert/HTML.pm:7093
  #, 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:7125
  #, 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:7163
  msgid "empty node name"
  msgstr "prÃ¡zdnÃ½ nÃ¡zev uzlu"
  
! #: tp/Texinfo/Convert/HTML.pm:7165 tp/Texinfo/Parser.pm:3697
  #, perl-format
  msgid "syntax for an external node used for `%s'"
--- 2175,2292 ----
  msgstr "@image soubor â€ž%sâ€œ nenalezen, pouÅ¾ije se â€ž%sâ€œ"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5225
  msgid "no argument specified for @U"
  msgstr "pro @U nebyl zadÃ¡n Å¾Ã¡dnÃ½ argument"
  
! #: tp/Texinfo/Convert/HTML.pm:1715
  #, 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:2399
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "syrovÃ½ formÃ¡t %s nenÃ­ pÅ™eveden"
  
! #: tp/Texinfo/Convert/HTML.pm:4629
! #, 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:4657
! msgid "missing type"
! msgstr "chybÃ­ typ"
! 
! #: tp/Texinfo/Convert/HTML.pm:4660
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "nerozpoznanÃ½ typ: %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4677
! #, 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:4962
  msgid "string not closed in css file"
  msgstr "Å™etÄ›zec nebÃ­ uzavÅ™en vÂ souboru CSS"
  
! #: tp/Texinfo/Convert/HTML.pm:4964
  msgid "--css-include ended in comment"
  msgstr "--css-include konÄ�il vÂ komentÃ¡Å™i"
  
! #: tp/Texinfo/Convert/HTML.pm:4966
  msgid "@import not finished in css file"
  msgstr "@import nebyl dokonÄ�en vÂ souboru CSS"
  
! #: tp/Texinfo/Convert/HTML.pm:4992
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "CSS soubor %s nenalezen"
  
! #: tp/Texinfo/Convert/HTML.pm:4998
  #, 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:5008
  #, 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:5870 tp/Texinfo/Convert/HTML.pm:5874
  #, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "pro â€ž%sâ€œ nenalezena Å¾Ã¡dnÃ¡ poloÅ¾ka htmlxref.cnf"
  
! #: tp/Texinfo/Convert/HTML.pm:6568
  #, 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:6592
  #, 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:6707
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr "deskriptor %s ÃºrovnÄ› %s priority %s selhal"
  
! #: tp/Texinfo/Convert/HTML.pm:6912
  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:7122
  #, 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:7147
  #, 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:7153
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "soubor pro pÅ™ejmenovanÃ½ uzel â€ž%sâ€œ je prÃ¡zdnÃ½"
  
! #: tp/Texinfo/Convert/HTML.pm:7167
  #, 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:7199
  #, 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:7237
  msgid "empty node name"
  msgstr "prÃ¡zdnÃ½ nÃ¡zev uzlu"
  
! #: tp/Texinfo/Convert/HTML.pm:7239 tp/Texinfo/Parser.pm:3542
  #, perl-format
  msgid "syntax for an external node used for `%s'"
***************
*** 2321,2350 ****
  msgstr "nÃ¡zev @node by nemÄ›l obsahovat â€ž,â€œ: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1334
  #, 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:1381 tp/Texinfo/Parser.pm:2722
  #, 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:1495
  #, 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:1500
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "soubor â€ž%sâ€œ vÂ pÅ™Ã­kazu @image je neÄ�itelnÃ½: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1523
  #, 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:1931
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
--- 2321,2350 ----
  msgstr "nÃ¡zev @node by nemÄ›l obsahovat â€ž,â€œ: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1335
  #, 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:1382 tp/Texinfo/Parser.pm:2568
  #, 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:1496
  #, 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:1501
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "soubor â€ž%sâ€œ vÂ pÅ™Ã­kazu @image je neÄ�itelnÃ½: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1524
  #, 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:1932
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
***************
*** 2353,2670 ****
  "@strong{Noteâ€¦} vytvÃ¡Å™Ã­ nepatÅ™iÄ�nÃ© kÅ™Ã­Å¾ovÃ© odkazy do Infa; pÅ™eformulujte text"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2161
  #, 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:2193
  #, 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:2226
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr "nÃ¡zev uzlu @%s by nemÄ›l obsahovat â€ž:â€œ"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2272
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "â€ž.â€œ nebo â€ž,â€œ musÃ­ nÃ¡sledovat za @xref, ne za %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2275
  msgid "`.' or `,' must follow @xref"
  msgstr "â€ž.â€œ nebo â€ž,â€œ musÃ­ nÃ¡sledovat za @xref"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3118
  #, 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:3129
  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:3145
  msgid "menu entry name should not contain `:'"
  msgstr "nÃ¡zev poloÅ¾ky nabÃ­dky by nemÄ›l obsahovat â€ž:â€œ"
  
! #: tp/Texinfo/Parser.pm:910
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr "@%s by se mÄ›l pouze objevit na zaÄ�Ã¡tku nebo konci dokumentu"
  
! #: tp/Texinfo/Parser.pm:1160 tp/Texinfo/Structuring.pm:594
  #, perl-format
  msgid "multiple @%s"
  msgstr "nÃ¡sobnÃ½ @%s"
  
! #: tp/Texinfo/Parser.pm:1194
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "chybnÃ¡ syntaxe vÂ argumentu @%s: %s"
! 
! #: tp/Texinfo/Parser.pm:1210
  #, perl-format
  msgid "bad or empty @%s formal argument: %s"
  msgstr "chybnÃ½ nebo prÃ¡zdnÃ½ formÃ¡lnÃ­ argument @%s: %s"
  
! #: tp/Texinfo/Parser.pm:1219 tp/Texinfo/Parser.pm:4856
! #: tp/Texinfo/Parser.pm:4882 tp/Texinfo/Parser.pm:5671
! #: tp/Texinfo/Parser.pm:5687 tp/Texinfo/Parser.pm:5702
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s poÅ¾aduje jmÃ©no"
  
! #: tp/Texinfo/Parser.pm:1223 tp/Texinfo/Parser.pm:4859
! #: tp/Texinfo/Parser.pm:4885 tp/Texinfo/Parser.pm:5674
! #: tp/Texinfo/Parser.pm:5690 tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad name for @%s"
  msgstr "chybnÃ½ nÃ¡zev pro @%s"
  
! #: tp/Texinfo/Parser.pm:1341
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr "@end %s se vyskytuje pÅ™es uzavÃ­racÃ­ zÃ¡vorkou @%s"
  
! #: tp/Texinfo/Parser.pm:1345
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "@%s se vyskytuje pÅ™ed uzavÃ­racÃ­ zÃ¡vorkou @%s"
  
! #: tp/Texinfo/Parser.pm:1350
  #, perl-format
! msgid "%c%s missing close brace"
  msgstr "%c%s chybÄ›jÃ­cÃ­ uzavÃ­racÃ­ zÃ¡vorka"
  
! #: tp/Texinfo/Parser.pm:1354
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "@%s chybÄ›jÃ­cÃ­ uzavÃ­racÃ­ oddÄ›lovacÃ­ posloupnost: %s}"
  
! #: tp/Texinfo/Parser.pm:1476
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "@itemx by nemÄ›lo zaÄ�Ã­nat pÅ™Ã­kazem @%s"
  
! #: tp/Texinfo/Parser.pm:1544
  msgid "@itemx must follow @item"
  msgstr "@itemx musÃ­ nÃ¡sledovat pÅ™Ã­kaz @item"
  
! #: tp/Texinfo/Parser.pm:1712
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr "@%s mÃ¡ text ale nemÃ¡ @item"
  
! #: tp/Texinfo/Parser.pm:1743
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "â€ž@endâ€œ vyÅ¾adoval â€ž%sâ€œ, ale vidÄ›l â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:1746
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@%s vidÄ›n pÅ™ed @end %s"
  
! #: tp/Texinfo/Parser.pm:1750
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "chybÃ­ odpovÃ­dajÃ­cÃ­ â€ž%cend %sâ€œ"
  
! #: tp/Texinfo/Parser.pm:1776 tp/Texinfo/Parser.pm:5204
! #: tp/Texinfo/Parser.pm:5470
  #, perl-format
  msgid "misplaced %c"
  msgstr "Å¡patnÄ› umÃ­stÄ›nÃ½ znak %c"
  
! #: tp/Texinfo/Parser.pm:1874 tp/Texinfo/Parser.pm:3312
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "nepÃ¡rovÃ½ â€ž%c%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:2110
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "makro â€ž%sâ€œ volanÃ© sÂ pÅ™Ã­liÅ¡ mnoha argumenty"
  
! #: tp/Texinfo/Parser.pm:2132
  #, perl-format
! msgid "@%s missing close brace"
  msgstr "@%s chybÄ›jÃ­cÃ­ uzavÃ­racÃ­ zÃ¡vorka"
  
! #: tp/Texinfo/Parser.pm:2140
  #, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr "makro â€ž%sâ€œ deklarovanÃ© bez argumentu volanÃ© sÂ argumentem"
  
! #: tp/Texinfo/Parser.pm:2175
  #, 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/Parser.pm:2650
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s â€ž%sâ€œ jiÅ¾ bylo definovÃ¡no"
  
! #: tp/Texinfo/Parser.pm:2655
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "zde je pÅ™edchozÃ­ definice jako @%s"
  
! #: tp/Texinfo/Parser.pm:3016
  #, perl-format
  msgid "missing name for @%s"
  msgstr "chybÃ­ nÃ¡zev pro @%s"
  
! #: tp/Texinfo/Parser.pm:3021
  #, perl-format
  msgid "missing category for @%s"
  msgstr "chybÃ­ kategorie pro @%s"
  
! #: tp/Texinfo/Parser.pm:3073
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "neoÄ�ekÃ¡vanÃ½ argument na Å™Ã¡dku @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3089
  msgid "empty multitable"
  msgstr "prÃ¡zdnÃ¡ multitabulka"
  
! #: tp/Texinfo/Parser.pm:3145 tp/Texinfo/Parser.pm:5784
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "pÅ™ebÃ½vajÃ­cÃ­ argument uÂ @%s"
  
! #: tp/Texinfo/Parser.pm:3151 tp/Texinfo/Parser.pm:5806
! #: tp/Texinfo/Parser.pm:5818
  #, perl-format
  msgid "bad argument to @%s"
  msgstr "Å¡patnÃ½ argument uÂ @%s"
  
! #: tp/Texinfo/Parser.pm:3162
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s vyÅ¾aduje argument : formÃ¡tovaÄ� pro %citem"
  
! #: tp/Texinfo/Parser.pm:3167
  #, 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/Parser.pm:3202
  #, 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/Parser.pm:3290 tp/Texinfo/Parser.pm:3429
! #: tp/Texinfo/Parser.pm:5777
  #, perl-format
  msgid "@%s missing argument"
  msgstr "@%s postrÃ¡dÃ¡ argument"
  
! #: tp/Texinfo/Parser.pm:3302
  #, perl-format
  msgid "unknown @end %s"
  msgstr "neznÃ¡mÃ½ @end %s"
  
! #: tp/Texinfo/Parser.pm:3324 tp/Texinfo/Parser.pm:3943
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "pÅ™ebÃ½vajÃ­cÃ­ argument uÂ @%s %s: %s"
  
! #: tp/Texinfo/Parser.pm:3329 tp/Texinfo/Parser.pm:5861
! #: tp/Texinfo/Parser.pm:5906 tp/Texinfo/Parser.pm:5935
! #: tp/Texinfo/Parser.pm:5976 tp/Texinfo/Parser.pm:6055
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "Å¡patnÃ½ argument uÂ @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3348
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%s: nebylo moÅ¾nÃ© otevÅ™Ã­t %s: %s"
  
! #: tp/Texinfo/Parser.pm:3360
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr "kÃ³dovÃ¡nÃ­ â€ž%sâ€œ nenÃ­ kanonickÃ© kÃ³dovÃ¡nÃ­ texinfa"
  
! #: tp/Texinfo/Parser.pm:3369
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "nerozpoznanÃ½ nÃ¡zev kÃ³dovÃ¡nÃ­ â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:3516
  #, perl-format
  msgid "@%s after the first element"
  msgstr "@%s po prvnÃ­m elementu"
  
! #: tp/Texinfo/Parser.pm:3523
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s mÃ¡ smysl jen na Å™Ã¡dku @multitable"
  
! #: tp/Texinfo/Parser.pm:3563
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "@%s by nemÄ›l bÃ½t spojen sÂ @top"
  
! #: tp/Texinfo/Parser.pm:3575
  #, 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/Parser.pm:3677
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "Å¡patnÃ½ argument vÂ @%s"
  
! #: tp/Texinfo/Parser.pm:3681
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "prÃ¡zdnÃ½ nÃ¡zev uzly po expanzi â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:3724
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "prÃ¡zdnÃ½ nÃ¡zev poloÅ¾ky nabÃ­dky vÂ â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:3732
  msgid "empty node name in menu entry"
  msgstr "prÃ¡zdnÃ½ nÃ¡zev uzlu vÂ poloÅ¾ce nabÃ­dky"
  
! #: tp/Texinfo/Parser.pm:3805
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "@%s by se nemÄ›l objevit vÂ @%s"
  
! #: tp/Texinfo/Parser.pm:3937
  #, perl-format
! msgid "@end %s should only appear at a line beginning"
  msgstr "@end %s by se mÄ›l objevit pouze na zaÄ�Ã¡tku Å™Ã¡dku"
  
! #: tp/Texinfo/Parser.pm:3960
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "makro â€ž%sâ€œ jiÅ¾ bylo definovÃ¡no"
  
! #: tp/Texinfo/Parser.pm:3963
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "zde je pÅ™edchozÃ­ definice â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:3968
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "pÅ™edefinovÃ¡vÃ¡ se pÅ™Ã­kaz jazyka Texinfo: @%s"
  
! #: tp/Texinfo/Parser.pm:4017
  #, perl-format
  msgid "@%s without associated character"
  msgstr "@%s bez spojenÃ©ho znaku"
  
! #: tp/Texinfo/Parser.pm:4087
  #, perl-format
  msgid ""
--- 2353,2671 ----
  "@strong{Noteâ€¦} vytvÃ¡Å™Ã­ nepatÅ™iÄ�nÃ© kÅ™Ã­Å¾ovÃ© odkazy do Infa; pÅ™eformulujte text"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2162
  #, 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:2194
  #, 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:2227
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr "nÃ¡zev uzlu @%s by nemÄ›l obsahovat â€ž:â€œ"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2273
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "â€ž.â€œ nebo â€ž,â€œ musÃ­ nÃ¡sledovat za @xref, ne za %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2276
  msgid "`.' or `,' must follow @xref"
  msgstr "â€ž.â€œ nebo â€ž,â€œ musÃ­ nÃ¡sledovat za @xref"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3086
  #, 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:3097
  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:3113
  msgid "menu entry name should not contain `:'"
  msgstr "nÃ¡zev poloÅ¾ky nabÃ­dky by nemÄ›l obsahovat â€ž:â€œ"
  
! #: tp/Texinfo/Parser.pm:883
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr "@%s by se mÄ›l pouze objevit na zaÄ�Ã¡tku nebo konci dokumentu"
  
! #: tp/Texinfo/Parser.pm:1125 tp/Texinfo/Structuring.pm:595
  #, perl-format
  msgid "multiple @%s"
  msgstr "nÃ¡sobnÃ½ @%s"
  
! #: tp/Texinfo/Parser.pm:1166
  #, perl-format
  msgid "bad or empty @%s formal argument: %s"
  msgstr "chybnÃ½ nebo prÃ¡zdnÃ½ formÃ¡lnÃ­ argument @%s: %s"
  
! #: tp/Texinfo/Parser.pm:1176
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "chybnÃ¡ syntaxe vÂ argumentu @%s: %s"
! 
! #: tp/Texinfo/Parser.pm:1183 tp/Texinfo/Parser.pm:4707
! #: tp/Texinfo/Parser.pm:4733 tp/Texinfo/Parser.pm:5565
! #: tp/Texinfo/Parser.pm:5578 tp/Texinfo/Parser.pm:5592
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s poÅ¾aduje jmÃ©no"
  
! #: tp/Texinfo/Parser.pm:1187 tp/Texinfo/Parser.pm:4710
! #: tp/Texinfo/Parser.pm:4736 tp/Texinfo/Parser.pm:5568
! #: tp/Texinfo/Parser.pm:5581 tp/Texinfo/Parser.pm:5595
  #, perl-format
  msgid "bad name for @%s"
  msgstr "chybnÃ½ nÃ¡zev pro @%s"
  
! #: tp/Texinfo/Parser.pm:1305
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr "@end %s se vyskytuje pÅ™es uzavÃ­racÃ­ zÃ¡vorkou @%s"
  
! #: tp/Texinfo/Parser.pm:1309
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "@%s se vyskytuje pÅ™ed uzavÃ­racÃ­ zÃ¡vorkou @%s"
  
! #: tp/Texinfo/Parser.pm:1314
  #, perl-format
! msgid "%c%s missing closing brace"
  msgstr "%c%s chybÄ›jÃ­cÃ­ uzavÃ­racÃ­ zÃ¡vorka"
  
! #: tp/Texinfo/Parser.pm:1318
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "@%s chybÄ›jÃ­cÃ­ uzavÃ­racÃ­ oddÄ›lovacÃ­ posloupnost: %s}"
  
! #: tp/Texinfo/Parser.pm:1440
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "@itemx by nemÄ›lo zaÄ�Ã­nat pÅ™Ã­kazem @%s"
  
! #: tp/Texinfo/Parser.pm:1508
  msgid "@itemx must follow @item"
  msgstr "@itemx musÃ­ nÃ¡sledovat pÅ™Ã­kaz @item"
  
! #: tp/Texinfo/Parser.pm:1676
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr "@%s mÃ¡ text ale nemÃ¡ @item"
  
! #: tp/Texinfo/Parser.pm:1707
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "â€ž@endâ€œ vyÅ¾adoval â€ž%sâ€œ, ale vidÄ›l â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:1710
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@%s vidÄ›n pÅ™ed @end %s"
  
! #: tp/Texinfo/Parser.pm:1714
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "chybÃ­ odpovÃ­dajÃ­cÃ­ â€ž%cend %sâ€œ"
  
! #: tp/Texinfo/Parser.pm:1738 tp/Texinfo/Parser.pm:5070
! #: tp/Texinfo/Parser.pm:5308
  #, perl-format
  msgid "misplaced %c"
  msgstr "Å¡patnÄ› umÃ­stÄ›nÃ½ znak %c"
  
! #: tp/Texinfo/Parser.pm:1835 tp/Texinfo/Parser.pm:3148
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "nepÃ¡rovÃ½ â€ž%c%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:2072
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "makro â€ž%sâ€œ volanÃ© sÂ pÅ™Ã­liÅ¡ mnoha argumenty"
  
! #: tp/Texinfo/Parser.pm:2094
  #, perl-format
! msgid "@%s missing closing brace"
  msgstr "@%s chybÄ›jÃ­cÃ­ uzavÃ­racÃ­ zÃ¡vorka"
  
! #: tp/Texinfo/Parser.pm:2102
  #, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr "makro â€ž%sâ€œ deklarovanÃ© bez argumentu volanÃ© sÂ argumentem"
  
! #: tp/Texinfo/Parser.pm:2138
  #, 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/Parser.pm:2501
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s â€ž%sâ€œ jiÅ¾ bylo definovÃ¡no"
  
! #: tp/Texinfo/Parser.pm:2506
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "zde je pÅ™edchozÃ­ definice jako @%s"
  
! #: tp/Texinfo/Parser.pm:2850
  #, perl-format
  msgid "missing name for @%s"
  msgstr "chybÃ­ nÃ¡zev pro @%s"
  
! #: tp/Texinfo/Parser.pm:2855
  #, perl-format
  msgid "missing category for @%s"
  msgstr "chybÃ­ kategorie pro @%s"
  
! #: tp/Texinfo/Parser.pm:2890
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "neoÄ�ekÃ¡vanÃ½ argument na Å™Ã¡dku @%s: %s"
  
! #: tp/Texinfo/Parser.pm:2905
  msgid "empty multitable"
  msgstr "prÃ¡zdnÃ¡ multitabulka"
  
! #: tp/Texinfo/Parser.pm:2959 tp/Texinfo/Parser.pm:5673
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "pÅ™ebÃ½vajÃ­cÃ­ argument uÂ @%s"
  
! #: tp/Texinfo/Parser.pm:2965 tp/Texinfo/Parser.pm:5694
! #: tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad argument to @%s"
  msgstr "Å¡patnÃ½ argument uÂ @%s"
  
! #: tp/Texinfo/Parser.pm:2976
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s vyÅ¾aduje argument : formÃ¡tovaÄ� pro %citem"
  
! #: tp/Texinfo/Parser.pm:2981
  #, 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/Parser.pm:3016
  #, 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/Parser.pm:3124 tp/Texinfo/Parser.pm:3277
! #: tp/Texinfo/Parser.pm:5666
  #, perl-format
  msgid "@%s missing argument"
  msgstr "@%s postrÃ¡dÃ¡ argument"
  
! #: tp/Texinfo/Parser.pm:3138
  #, perl-format
  msgid "unknown @end %s"
  msgstr "neznÃ¡mÃ½ @end %s"
  
! #: tp/Texinfo/Parser.pm:3161 tp/Texinfo/Parser.pm:3788
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "pÅ™ebÃ½vajÃ­cÃ­ argument uÂ @%s %s: %s"
  
! #: tp/Texinfo/Parser.pm:3167 tp/Texinfo/Parser.pm:3245
! #: tp/Texinfo/Parser.pm:5755 tp/Texinfo/Parser.pm:5798
! #: tp/Texinfo/Parser.pm:5827 tp/Texinfo/Parser.pm:5868
! #: tp/Texinfo/Parser.pm:5946
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "Å¡patnÃ½ argument uÂ @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3188
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%s: nebylo moÅ¾nÃ© otevÅ™Ã­t %s: %s"
  
! #: tp/Texinfo/Parser.pm:3200
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr "kÃ³dovÃ¡nÃ­ â€ž%sâ€œ nenÃ­ kanonickÃ© kÃ³dovÃ¡nÃ­ texinfa"
  
! #: tp/Texinfo/Parser.pm:3208
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "nerozpoznanÃ½ nÃ¡zev kÃ³dovÃ¡nÃ­ â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:3364
  #, perl-format
  msgid "@%s after the first element"
  msgstr "@%s po prvnÃ­m elementu"
  
! #: tp/Texinfo/Parser.pm:3371
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s mÃ¡ smysl jen na Å™Ã¡dku @multitable"
  
! #: tp/Texinfo/Parser.pm:3408
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "@%s by nemÄ›l bÃ½t spojen sÂ @top"
  
! #: tp/Texinfo/Parser.pm:3420
  #, 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/Parser.pm:3522
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "Å¡patnÃ½ argument vÂ @%s"
  
! #: tp/Texinfo/Parser.pm:3526
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "prÃ¡zdnÃ½ nÃ¡zev uzly po expanzi â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:3569
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "prÃ¡zdnÃ½ nÃ¡zev poloÅ¾ky nabÃ­dky vÂ â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:3577
  msgid "empty node name in menu entry"
  msgstr "prÃ¡zdnÃ½ nÃ¡zev uzlu vÂ poloÅ¾ce nabÃ­dky"
  
! #: tp/Texinfo/Parser.pm:3650
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "@%s by se nemÄ›l objevit vÂ @%s"
  
! #: tp/Texinfo/Parser.pm:3782
  #, 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/Parser.pm:3804
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "makro â€ž%sâ€œ jiÅ¾ bylo definovÃ¡no"
  
! #: tp/Texinfo/Parser.pm:3807
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "zde je pÅ™edchozÃ­ definice â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:3812
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "pÅ™edefinovÃ¡vÃ¡ se pÅ™Ã­kaz jazyka Texinfo: @%s"
  
! #: tp/Texinfo/Parser.pm:3879
  #, perl-format
  msgid "@%s without associated character"
  msgstr "@%s bez spojenÃ©ho znaku"
  
! #: tp/Texinfo/Parser.pm:3949
  #, perl-format
  msgid ""
***************
*** 2673,2677 ****
  "@%s definovÃ¡no sÂ nula nebo vÃ­ce jak jednÃ­m argumentem by se mÄ›lo volat sÂ {}"
  
! #: tp/Texinfo/Parser.pm:4111
  #, perl-format
  msgid ""
--- 2674,2678 ----
  "@%s definovÃ¡no sÂ nula nebo vÃ­ce jak jednÃ­m argumentem by se mÄ›lo volat sÂ {}"
  
! #: tp/Texinfo/Parser.pm:3974
  #, perl-format
  msgid ""
***************
*** 2682,2686 ****
  "souÄ�asnÃ¡ hodnota %d)"
  
! #: tp/Texinfo/Parser.pm:4120
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
--- 2683,2687 ----
  "souÄ�asnÃ¡ hodnota %d)"
  
! #: tp/Texinfo/Parser.pm:3983
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
***************
*** 2688,2808 ****
  "rekurzivnÃ­ volÃ¡nÃ­ makra %s nenÃ­ dovoleno; je-li tÅ™eba, pouÅ¾ijte @rmacro"
  
! #: tp/Texinfo/Parser.pm:4176
  #, 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/Parser.pm:4182
  #, 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/Parser.pm:4195 tp/Texinfo/Parser.pm:5325
  #, 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â€œ"
  
! #: tp/Texinfo/Parser.pm:4207
  #, 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/Parser.pm:4218
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s oÄ�ekÃ¡valo zÃ¡vorky"
  
! #: tp/Texinfo/Parser.pm:4383
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "nedefinovanÃ½ pÅ™Ã­znak: %s"
  
! #: tp/Texinfo/Parser.pm:4386
  msgid "bad syntax for @value"
  msgstr "chybnÃ¡ skladba ve @value"
  
! #: tp/Texinfo/Parser.pm:4393
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s je zastaralÃ©."
  
! #: tp/Texinfo/Parser.pm:4396
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s je zastaralÃ©; %s"
  
! #: tp/Texinfo/Parser.pm:4405
  #, perl-format
! msgid "@%s should only appear at a line beginning"
  msgstr "@%s by se mÄ›lo pouze objevit na zaÄ�Ã¡tku Å™Ã¡dku"
  
! #: tp/Texinfo/Parser.pm:4496
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s nenÃ­ dovoleno uvnitÅ™ bloku â€ž@%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:4505
  #, 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/Parser.pm:4631 tp/Texinfo/Parser.pm:4648
! #: tp/Texinfo/Parser.pm:4698
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s nenÃ­ myslitelnÃ© uvnitÅ™ bloku â€ž@%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:4658
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "@%s vÂ prÃ¡zdnÃ© multitabulce"
  
! #: tp/Texinfo/Parser.pm:4664
  msgid "@tab before @item"
  msgstr "@tab pÅ™ed @item"
  
! #: tp/Texinfo/Parser.pm:4667
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "pÅ™Ã­liÅ¡ mnoho sloupcÅ¯ vÂ multitabulkovÃ© poloÅ¾ce (max. %d)"
  
! #: tp/Texinfo/Parser.pm:4704
  msgid "ignoring @tab outside of multitable"
  msgstr "pÅ™Ã­kaz @tab ignorovÃ¡n, je mimo multitabulku"
  
! #: tp/Texinfo/Parser.pm:4708
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "@%s mimo tabulku nebo seznam"
  
! #: tp/Texinfo/Parser.pm:4745
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "musÃ­ nÃ¡sledovat po â€ž@%sâ€œ, aby Å¡lo pouÅ¾Ã­t â€ž@%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:4787
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "@%s nemÃ¡ smysl mimo prostÅ™edÃ­ â€ž@titlepageâ€œ a â€ž@quotationâ€œ"
  
! #: tp/Texinfo/Parser.pm:4791
  msgid "@dircategory after first node"
  msgstr "@dircategory po prvnÃ­m uzlu"
  
! #: tp/Texinfo/Parser.pm:4979
  #, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "oblast %s uvnitÅ™ oblasti %s nenÃ­ dovolena"
  
! #: tp/Texinfo/Parser.pm:4997
  msgid "@direntry after first node"
  msgstr "@direntry po prvnÃ­m uzlu"
  
! #: tp/Texinfo/Parser.pm:5005
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "@%s spatÅ™eno pÅ™ed prvnÃ­m @node"
  
! #: tp/Texinfo/Parser.pm:5008
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
--- 2689,2809 ----
  "rekurzivnÃ­ volÃ¡nÃ­ makra %s nenÃ­ dovoleno; je-li tÅ™eba, pouÅ¾ijte @rmacro"
  
! #: tp/Texinfo/Parser.pm:4038
  #, 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/Parser.pm:4044
  #, 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/Parser.pm:4057 tp/Texinfo/Parser.pm:5189
  #, 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â€œ"
  
! #: tp/Texinfo/Parser.pm:4068
  #, 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/Parser.pm:4079
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s oÄ�ekÃ¡valo zÃ¡vorky"
  
! #: tp/Texinfo/Parser.pm:4233
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "nedefinovanÃ½ pÅ™Ã­znak: %s"
  
! #: tp/Texinfo/Parser.pm:4236
  msgid "bad syntax for @value"
  msgstr "chybnÃ¡ skladba ve @value"
  
! #: tp/Texinfo/Parser.pm:4243
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s je zastaralÃ©."
  
! #: tp/Texinfo/Parser.pm:4246
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s je zastaralÃ©; %s"
  
! #: tp/Texinfo/Parser.pm:4255
  #, 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/Parser.pm:4346
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s nenÃ­ dovoleno uvnitÅ™ bloku â€ž@%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:4355
  #, 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/Parser.pm:4479 tp/Texinfo/Parser.pm:4496
! #: tp/Texinfo/Parser.pm:4546
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s nenÃ­ myslitelnÃ© uvnitÅ™ bloku â€ž@%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:4506
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "@%s vÂ prÃ¡zdnÃ© multitabulce"
  
! #: tp/Texinfo/Parser.pm:4512
  msgid "@tab before @item"
  msgstr "@tab pÅ™ed @item"
  
! #: tp/Texinfo/Parser.pm:4515
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "pÅ™Ã­liÅ¡ mnoho sloupcÅ¯ vÂ multitabulkovÃ© poloÅ¾ce (max. %d)"
  
! #: tp/Texinfo/Parser.pm:4552
  msgid "ignoring @tab outside of multitable"
  msgstr "pÅ™Ã­kaz @tab ignorovÃ¡n, je mimo multitabulku"
  
! #: tp/Texinfo/Parser.pm:4556
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "@%s mimo tabulku nebo seznam"
  
! #: tp/Texinfo/Parser.pm:4596
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "musÃ­ nÃ¡sledovat po â€ž@%sâ€œ, aby Å¡lo pouÅ¾Ã­t â€ž@%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:4638
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "@%s nemÃ¡ smysl mimo prostÅ™edÃ­ â€ž@titlepageâ€œ a â€ž@quotationâ€œ"
  
! #: tp/Texinfo/Parser.pm:4642
  msgid "@dircategory after first node"
  msgstr "@dircategory po prvnÃ­m uzlu"
  
! #: tp/Texinfo/Parser.pm:4847
  #, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "oblast %s uvnitÅ™ oblasti %s nenÃ­ dovolena"
  
! #: tp/Texinfo/Parser.pm:4864
  msgid "@direntry after first node"
  msgstr "@direntry po prvnÃ­m uzlu"
  
! #: tp/Texinfo/Parser.pm:4872
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "@%s spatÅ™eno pÅ™ed prvnÃ­m @node"
  
! #: tp/Texinfo/Parser.pm:4875
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
***************
*** 2810,3006 ****
  "protoÅ¾e vÃ¡Å¡ uzel @top by mÄ›l bÃ½t uzavÅ™en v @ifnottex spÃ­Å¡e neÅ¾ v @ifinfo?"
  
! #: tp/Texinfo/Parser.pm:5070
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr "@%s by se mÄ›lo objevit jen vÂ matematickÃ©m kontextu"
  
! #: tp/Texinfo/Parser.pm:5078
  #, perl-format
  msgid "unknown command `%s'"
  msgstr "neznÃ¡mÃ½ pÅ™Ã­kaz â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5088
  msgid "unexpected @"
  msgstr "neoÄ�ekÃ¡vanÃ½ @"
  
! #: tp/Texinfo/Parser.pm:5117
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s nemÃ¡ smysl mimo prostÅ™edÃ­ â€ž@floatâ€œ"
  
! #: tp/Texinfo/Parser.pm:5122
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr "@%s by mÄ›lo bÃ½t prÃ¡vÄ› pod â€ž@float"
  
! #: tp/Texinfo/Parser.pm:5130
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "ignoruje se nÃ¡sobnÃ½ @%s"
  
! #: tp/Texinfo/Parser.pm:5249
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "pÅ™Ã­kaz @%s nepÅ™ijÃ­mÃ¡ argumenty"
  
! #: tp/Texinfo/Parser.pm:5273
  #, 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/Parser.pm:5292
  #, 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/Parser.pm:5303
  #, 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/Parser.pm:5316
  msgid "@image missing filename argument"
  msgstr "pÅ™Ã­kaz @image postrÃ¡dÃ¡ jmÃ©no souboru"
  
! #: tp/Texinfo/Parser.pm:5348
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "@%s postrÃ¡dÃ¡ prvnÃ­ argument"
  
! #: tp/Texinfo/Parser.pm:5393
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "argument uÂ @U nemÃ¡ Å¾Ã¡dnÃ© Å¡estnÃ¡ctkovÃ© Ä�Ã­slice: %s"
  
! #: tp/Texinfo/Parser.pm:5399
  #, 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/Parser.pm:5412
! #, perl-format
! msgid "argument for @U exceeds size of integer: %s"
! msgstr "argument uÂ @U pÅ™esahuje velikost celÃ©ho Ä�Ã­sla: %s"
! 
! #: tp/Texinfo/Parser.pm:5418
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr "argument uÂ @U pÅ™esahuje maximÃ¡m Unicodu 0x10FFFF: %s"
  
! #: tp/Texinfo/Parser.pm:5546
  msgid "superfluous arguments for node"
  msgstr "nadbyteÄ�nÃ© argumenty uzlu"
  
! #: tp/Texinfo/Parser.pm:5596
  #, perl-format
  msgid "expected @end %s"
  msgstr "oÄ�ekÃ¡vÃ¡no @end %s"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "@%s by pouze mÄ›lo pÅ™ijÃ­mat pÅ™Ã­kaz @ jako argument, nikoliv â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5728
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "zbÃ½vajÃ­cÃ­ argumenty na Å™Ã¡dku @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5801
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "pÅ™Ã­kaz prostÅ™edÃ­ %s jako argument @%s"
  
! #: tp/Texinfo/Parser.pm:5823
  #, perl-format
  msgid "empty @%s"
  msgstr "prÃ¡zdnÃ© @%s"
  
! #: tp/Texinfo/Parser.pm:5831
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "podÃ­l sloupce nenÃ­ Ä�Ã­slo: %s"
  
! #: tp/Texinfo/Parser.pm:5840
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "@sp argument musÃ­ bÃ½t Ä�Ã­slo, ne â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5849
  #, perl-format
  msgid "reserved index name %s"
  msgstr "vyhrazenÃ½ nÃ¡zev rejstÅ™Ã­ku %s"
  
! #: tp/Texinfo/Parser.pm:5868
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "neznÃ¡mÃ½ rejstÅ™Ã­k zdrojÅ¯ vÂ @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5871
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "neznÃ¡mÃ½ rejstÅ™Ã­k cÃ­lÅ¯ vÂ @%s: %s "
  
! #: tp/Texinfo/Parser.pm:5901
  #, 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/Parser.pm:5914
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "neznÃ¡mÃ½ rejstÅ™Ã­k â€ž%sâ€œ vÂ @printindex"
  
! #: tp/Texinfo/Parser.pm:5920
  #, 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/Parser.pm:5928
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "printindex pÅ™ed zaÄ�Ã¡tkem dokumentu: @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5944
  #, 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/Parser.pm:5952
  #, 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/Parser.pm:5960
  #, 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/Parser.pm:5968
  #, 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/Parser.pm:5986 tp/Texinfo/Parser.pm:5991
  #, 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/Parser.pm:5999
  #, 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/Parser.pm:6009
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
  msgstr "argument @exampleindent musÃ­ bÃ½t Ä�Ã­slo nebo â€žasisâ€œ, ne â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:6021
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "oÄ�ekÃ¡vÃ¡no @%s on nebo off, ne â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:6031
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
--- 2811,3002 ----
  "protoÅ¾e vÃ¡Å¡ uzel @top by mÄ›l bÃ½t uzavÅ™en v @ifnottex spÃ­Å¡e neÅ¾ v @ifinfo?"
  
! #: tp/Texinfo/Parser.pm:4937
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr "@%s by se mÄ›lo objevit jen vÂ matematickÃ©m kontextu"
  
! #: tp/Texinfo/Parser.pm:4945
  #, perl-format
  msgid "unknown command `%s'"
  msgstr "neznÃ¡mÃ½ pÅ™Ã­kaz â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:4955
  msgid "unexpected @"
  msgstr "neoÄ�ekÃ¡vanÃ½ @"
  
! #: tp/Texinfo/Parser.pm:4983
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s nemÃ¡ smysl mimo prostÅ™edÃ­ â€ž@floatâ€œ"
  
! #: tp/Texinfo/Parser.pm:4988
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr "@%s by mÄ›lo bÃ½t prÃ¡vÄ› pod â€ž@float"
  
! #: tp/Texinfo/Parser.pm:4996
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "ignoruje se nÃ¡sobnÃ½ @%s"
  
! #: tp/Texinfo/Parser.pm:5114
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "pÅ™Ã­kaz @%s nepÅ™ijÃ­mÃ¡ argumenty"
  
! #: tp/Texinfo/Parser.pm:5138
  #, 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/Parser.pm:5156
  #, 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/Parser.pm:5167
  #, 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/Parser.pm:5180
  msgid "@image missing filename argument"
  msgstr "pÅ™Ã­kaz @image postrÃ¡dÃ¡ jmÃ©no souboru"
  
! #: tp/Texinfo/Parser.pm:5211
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "@%s postrÃ¡dÃ¡ prvnÃ­ argument"
  
! #: tp/Texinfo/Parser.pm:5230
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "argument uÂ @U nemÃ¡ Å¾Ã¡dnÃ© Å¡estnÃ¡ctkovÃ© Ä�Ã­slice: %s"
  
! #: tp/Texinfo/Parser.pm:5236
  #, 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/Parser.pm:5253
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr "argument uÂ @U pÅ™esahuje maximÃ¡m Unicodu 0x10FFFF: %s"
  
! #: tp/Texinfo/Parser.pm:5448
  msgid "superfluous arguments for node"
  msgstr "nadbyteÄ�nÃ© argumenty uzlu"
  
! #: tp/Texinfo/Parser.pm:5498
  #, perl-format
  msgid "expected @end %s"
  msgstr "oÄ�ekÃ¡vÃ¡no @end %s"
  
! #: tp/Texinfo/Parser.pm:5607
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "@%s by pouze mÄ›lo pÅ™ijÃ­mat pÅ™Ã­kaz @ jako argument, nikoliv â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5617
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "zbÃ½vajÃ­cÃ­ argumenty na Å™Ã¡dku @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5689
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "pÅ™Ã­kaz prostÅ™edÃ­ %s jako argument @%s"
  
! #: tp/Texinfo/Parser.pm:5710
  #, perl-format
  msgid "empty @%s"
  msgstr "prÃ¡zdnÃ© @%s"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "podÃ­l sloupce nenÃ­ Ä�Ã­slo: %s"
  
! #: tp/Texinfo/Parser.pm:5727
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "@sp argument musÃ­ bÃ½t Ä�Ã­slo, ne â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5736
  #, perl-format
  msgid "reserved index name %s"
  msgstr "vyhrazenÃ½ nÃ¡zev rejstÅ™Ã­ku %s"
  
! #: tp/Texinfo/Parser.pm:5762
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "neznÃ¡mÃ½ rejstÅ™Ã­k zdrojÅ¯ vÂ @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5765
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "neznÃ¡mÃ½ rejstÅ™Ã­k cÃ­lÅ¯ vÂ @%s: %s "
  
! #: tp/Texinfo/Parser.pm:5793
  #, 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/Parser.pm:5806
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "neznÃ¡mÃ½ rejstÅ™Ã­k â€ž%sâ€œ vÂ @printindex"
  
! #: tp/Texinfo/Parser.pm:5812
  #, 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/Parser.pm:5820
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "printindex pÅ™ed zaÄ�Ã¡tkem dokumentu: @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5836
  #, 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/Parser.pm:5844
  #, 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/Parser.pm:5852
  #, 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/Parser.pm:5860
  #, 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/Parser.pm:5878 tp/Texinfo/Parser.pm:5883
  #, 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/Parser.pm:5891
  #, 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/Parser.pm:5901
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
  msgstr "argument @exampleindent musÃ­ bÃ½t Ä�Ã­slo nebo â€žasisâ€œ, ne â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5913
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "oÄ�ekÃ¡vÃ¡no @%s on nebo off, ne â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5922
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
***************
*** 3008,3017 ****
  "argument @kbdinputstyle musÃ­ bÃ½t â€žcodeâ€œ, â€žexampleâ€œ nebo â€ždistinctâ€œ, ne â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:6039
  #, 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/Parser.pm:6047
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
--- 3004,3013 ----
  "argument @kbdinputstyle musÃ­ bÃ½t â€žcodeâ€œ, â€žexampleâ€œ nebo â€ždistinctâ€œ, ne â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5930
  #, 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/Parser.pm:5938
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
***************
*** 3019,3088 ****
  "argument @urefbreakstyle musÃ­ bÃ½t â€žafterâ€œ, â€žbeforeâ€œ nebo â€žnoneâ€œ, ne â€ž%sâ€œ"
  
! #: tp/Texinfo/Structuring.pm:213
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr "zvyÅ¡uje se ÃºroveÅˆ oddÃ­lu @%s, kterÃ¡ je pÅ™Ã­liÅ¡ nÃ­zkÃ¡"
  
! #: tp/Texinfo/Structuring.pm:245
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "pÅ™ed @%s nenÃ­ pÅ™Ã­kaz udÃ¡vajÃ­cÃ­ ÃºroveÅˆ kapitoly"
  
! #: tp/Texinfo/Structuring.pm:250
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr "sniÅ¾uje se ÃºroveÅˆ oddÃ­lu @%s, kterÃ½ se vyskytuje po niÅ¾Å¡Ã­m elementu"
  
! #: tp/Texinfo/Structuring.pm:339
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "sÂ @%s se nepojÃ­ Å¾Ã¡dnÃ½ pÅ™Ã­kaz oddÃ­lu"
  
! #: tp/Texinfo/Structuring.pm:488
  #, perl-format
  msgid "@%s not empty"
  msgstr "@%s nenÃ­Â prÃ¡zdnÃ½"
  
! #: tp/Texinfo/Structuring.pm:544 tp/Texinfo/Structuring.pm:1326
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "@%s odkazuje na neexistujÃ­cÃ­ uzel â€ž%sâ€œ"
  
! #: tp/Texinfo/Structuring.pm:557
  #, perl-format
  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:662
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "na uzel â€ž%sâ€œ nesmÄ›Å™uje Å¾Ã¡dnÃ½ odkaz"
  
! #: tp/Texinfo/Structuring.pm:708
  #, 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:715
  #, 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:733
  #, 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:787
  #, 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:814
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%s se odkazuje na neexistujÃ­cÃ­ â€ž%sâ€œ"
  
! #: tp/Texinfo/Structuring.pm:834
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
--- 3015,3084 ----
  "argument @urefbreakstyle musÃ­ bÃ½t â€žafterâ€œ, â€žbeforeâ€œ nebo â€žnoneâ€œ, ne â€ž%sâ€œ"
  
! #: tp/Texinfo/Structuring.pm:216
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr "zvyÅ¡uje se ÃºroveÅˆ oddÃ­lu @%s, kterÃ¡ je pÅ™Ã­liÅ¡ nÃ­zkÃ¡"
  
! #: tp/Texinfo/Structuring.pm:248
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "pÅ™ed @%s nenÃ­ pÅ™Ã­kaz udÃ¡vajÃ­cÃ­ ÃºroveÅˆ kapitoly"
  
! #: tp/Texinfo/Structuring.pm:253
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr "sniÅ¾uje se ÃºroveÅˆ oddÃ­lu @%s, kterÃ½ se vyskytuje po niÅ¾Å¡Ã­m elementu"
  
! #: tp/Texinfo/Structuring.pm:342
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "sÂ @%s se nepojÃ­ Å¾Ã¡dnÃ½ pÅ™Ã­kaz oddÃ­lu"
  
! #: tp/Texinfo/Structuring.pm:491
  #, perl-format
  msgid "@%s not empty"
  msgstr "@%s nenÃ­Â prÃ¡zdnÃ½"
  
! #: tp/Texinfo/Structuring.pm:547 tp/Texinfo/Structuring.pm:1325
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "@%s odkazuje na neexistujÃ­cÃ­ uzel â€ž%sâ€œ"
  
! #: tp/Texinfo/Structuring.pm:558
  #, perl-format
  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:663
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "na uzel â€ž%sâ€œ nesmÄ›Å™uje Å¾Ã¡dnÃ½ odkaz"
  
! #: tp/Texinfo/Structuring.pm:706
  #, 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:713
  #, 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:731
  #, 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:786
  #, 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:810
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%s se odkazuje na neexistujÃ­cÃ­ â€ž%sâ€œ"
  
! #: tp/Texinfo/Structuring.pm:829
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
***************
*** 3091,3095 ****
  "nadÅ™azenÃ½m uzlem"
  
! #: tp/Texinfo/Structuring.pm:842
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
--- 3087,3091 ----
  "nadÅ™azenÃ½m uzlem"
  
! #: tp/Texinfo/Structuring.pm:837
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
***************
*** 3101,3105 ****
  msgstr "@%s do â€ž%sâ€œ se liÅ¡Ã­ od %s nÃ¡zvu â€ž%sâ€œ"
  
! #: tp/Texinfo/Structuring.pm:2070
  #, perl-format
  msgid "empty index key in @%s"
--- 3097,3101 ----
  msgstr "@%s do â€ž%sâ€œ se liÅ¡Ã­ od %s nÃ¡zvu â€ž%sâ€œ"
  
! #: tp/Texinfo/Structuring.pm:2067
  #, perl-format
  msgid "empty index key in @%s"
***************
*** 3632,3651 ****
  msgstr "VÃ­ce informacÃ­ zÃ­skÃ¡te pÅ™Ã­kazem â€ž%s --helpâ€œ.\n"
  
! #: tp/texi2any.pl:1232
  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:1255
  #, 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:1261
  #, 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:1286
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
--- 3628,3647 ----
  msgstr "VÃ­ce informacÃ­ zÃ­skÃ¡te pÅ™Ã­kazem â€ž%s --helpâ€œ.\n"
  
! #: tp/texi2any.pl:1239
  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:1262
  #, 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:1268
  #, 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:1293
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
***************
*** 3655,3673 ****
  "NechybÃ­ oddÃ­l?"
  
! #: tp/texi2any.pl:1359 tp/texi2any.pl:1435
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%s: chyba pÅ™i zavÃ­rÃ¡nÃ­ %s: %s\n"
  
! #: tp/texi2any.pl:1382 tp/texi2any.pl:1416
  #, 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:1388 tp/texi2any.pl:1422
  #, 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"
  
  #~ msgid "--*** Tags out of Date ***"
  #~ msgstr "--*** ZnaÄ�ky jsou zastaralÃ© ***"
--- 3651,3681 ----
  "NechybÃ­ oddÃ­l?"
  
! #: tp/texi2any.pl:1366 tp/texi2any.pl:1442
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%s: chyba pÅ™i zavÃ­rÃ¡nÃ­ %s: %s\n"
  
! #: tp/texi2any.pl:1389 tp/texi2any.pl:1423
  #, 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:1395 tp/texi2any.pl:1429
  #, 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"
  
+ #~ msgid "-%s---Info: %s, %ld lines --%s--"
+ #~ msgstr "-%s---Info: %s, Å™Ã¡dkÅ¯: %ld --%s--"
+ 
+ #~ msgid "-%s---Info: (%s)%s, %ld lines --%s--"
+ #~ msgstr "-%s---Info: (%s)%s, Å™Ã¡dkÅ¯: %ld --%s--"
+ 
+ #~ msgid "No file given for node '%s'."
+ #~ msgstr "Pro uzel â€ž%sâ€œ nebyl zadÃ¡n Å¾Ã¡dnÃ½ soubor."
+ 
+ #~ msgid "argument for @U exceeds size of integer: %s"
+ #~ msgstr "argument uÂ @U pÅ™esahuje velikost celÃ©ho Ä�Ã­sla: %s"
+ 
  #~ msgid "--*** Tags out of Date ***"
  #~ msgstr "--*** ZnaÄ�ky jsou zastaralÃ© ***"
Binary files texinfo-6.1/po/da.gmo and texinfo-6.3/po/da.gmo differ
diff -Nrc2 texinfo-6.1/po/da.po texinfo-6.3/po/da.po
*** texinfo-6.1/po/da.po	2016-02-06 11:35:49.000000000 +0000
--- texinfo-6.3/po/da.po	2016-09-10 12:45:50.000000000 +0100
***************
*** 1,11 ****
  # 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
  #
--- 1,14 ----
  # Danish texinfo translation po-file.
! # Copyright (C) 2016 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, 2016.
  #
  # argument -> parameter
! # brace -> It refers to the {} characters. { is the opening brace and } the closing brace. -> tuborgklamme
! #  Is there a difference between closing brace and close brace? There's no difference, and in my opinion we 
! #  should use "closing brace" consistently.
  # entry -> post
+ # item -> element
  # node -> emne
  #
***************
*** 14,19 ****
  "Project-Id-Version: texinfo 6.0.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+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"
--- 17,22 ----
  "Project-Id-Version: texinfo 6.0.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:45+0100\n"
! "PO-Revision-Date: 2016-03-27 09:13GMT\n"
  "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
  "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
***************
*** 22,25 ****
--- 25,29 ----
  "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"
  
***************
*** 41,55 ****
  #, c-format
  msgid "%s: option '--%s' doesn't allow an argument\n"
! msgstr "%s: tilvalget Â»--%sÂ« tillader ikke et argument\n"
  
  #: gnulib/lib/getopt.c:667 gnulib/lib/getopt.c:672
  #, c-format
  msgid "%s: option '%c%s' doesn't allow an argument\n"
! msgstr "%s: tilvalget Â»%c%sÂ« tillader ikke et argument\n"
  
  #: gnulib/lib/getopt.c:715 gnulib/lib/getopt.c:734
  #, c-format
  msgid "%s: option '--%s' requires an argument\n"
! msgstr "%s: tilvalget Â»--%sÂ« krÃ¦ver et argument\n"
  
  #: gnulib/lib/getopt.c:772 gnulib/lib/getopt.c:775
--- 45,59 ----
  #, c-format
  msgid "%s: option '--%s' doesn't allow an argument\n"
! msgstr "%s: tilvalget Â»--%sÂ« tillader ikke en parameter\n"
  
  #: gnulib/lib/getopt.c:667 gnulib/lib/getopt.c:672
  #, c-format
  msgid "%s: option '%c%s' doesn't allow an argument\n"
! msgstr "%s: tilvalget Â»%c%sÂ« tillader ikke en parameter\n"
  
  #: gnulib/lib/getopt.c:715 gnulib/lib/getopt.c:734
  #, c-format
  msgid "%s: option '--%s' requires an argument\n"
! msgstr "%s: tilvalget Â»--%sÂ« krÃ¦ver en parameter\n"
  
  #: gnulib/lib/getopt.c:772 gnulib/lib/getopt.c:775
***************
*** 72,76 ****
  #, c-format
  msgid "%s: option requires an argument -- '%c'\n"
! msgstr "%s: tilvalget krÃ¦ver et argument -- Â»%cÂ«\n"
  
  #: gnulib/lib/getopt.c:964 gnulib/lib/getopt.c:980
--- 76,80 ----
  #, c-format
  msgid "%s: option requires an argument -- '%c'\n"
! msgstr "%s: tilvalget krÃ¦ver en parameter -- Â»%cÂ«\n"
  
  #: gnulib/lib/getopt.c:964 gnulib/lib/getopt.c:980
***************
*** 82,95 ****
  #, c-format
  msgid "%s: option '-W %s' doesn't allow an argument\n"
! msgstr "%s: tilvalget Â»-W %sÂ« tillader ikke et argument\n"
  
  #: gnulib/lib/getopt.c:1043 gnulib/lib/getopt.c:1061
  #, c-format
  msgid "%s: option '-W %s' requires an argument\n"
! msgstr "%s: tilvalget Â»-W %sÂ« krÃ¦ver et argument\n"
  
  #: gnulib/lib/regcomp.c:135
  msgid "Success"
! msgstr ""
  
  #: gnulib/lib/regcomp.c:138
--- 86,99 ----
  #, c-format
  msgid "%s: option '-W %s' doesn't allow an argument\n"
! msgstr "%s: tilvalget Â»-W %sÂ« tillader ikke en parameter\n"
  
  #: gnulib/lib/getopt.c:1043 gnulib/lib/getopt.c:1061
  #, c-format
  msgid "%s: option '-W %s' requires an argument\n"
! msgstr "%s: tilvalget Â»-W %sÂ« krÃ¦ver en parameter\n"
  
  #: gnulib/lib/regcomp.c:135
  msgid "Success"
! msgstr "Lykkedes"
  
  #: gnulib/lib/regcomp.c:138
***************
*** 119,123 ****
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [ or [^"
  msgstr "Uparret [ eller [^"
  
--- 123,128 ----
  
  #: gnulib/lib/regcomp.c:156
! #, fuzzy
! msgid "Unmatched [, [^, [:, [., or [="
  msgstr "Uparret [ eller [^"
  
***************
*** 158,162 ****
  msgstr "Uparret ) eller \\)"
  
! #: gnulib/lib/regcomp.c:711
  msgid "No previous regular expression"
  msgstr "Intet tidligere regulÃ¦rt udtryk"
--- 163,167 ----
  msgstr "Uparret ) eller \\)"
  
! #: gnulib/lib/regcomp.c:687
  msgid "No previous regular expression"
  msgstr "Intet tidligere regulÃ¦rt udtryk"
***************
*** 310,314 ****
  msgstr "---------- Fodnoter -----------"
  
! #: info/indices.c:123 info/indices.c:812
  #, c-format
  msgid "Finding index entries..."
--- 315,319 ----
  msgstr "---------- Fodnoter -----------"
  
! #: info/indices.c:123 info/indices.c:822
  #, c-format
  msgid "Finding index entries..."
***************
*** 319,323 ****
  msgstr "SlÃ¥ en tekst op i denne fils indeks."
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:818
  #, c-format
  msgid "No indices found."
--- 324,328 ----
  msgstr "SlÃ¥ en tekst op i denne fils indeks."
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:828
  #, c-format
  msgid "No indices found."
***************
*** 348,380 ****
  msgstr "Ikke flere indekspunkter indeholdende Â»%sÂ«."
  
! #: info/indices.c:476 info/indices.c:880
  #, c-format
  msgid "No index entries containing '%s'."
  msgstr "Ingen indeksposter indeholdende Â»%sÂ«."
  
! #: info/indices.c:583
  #, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "Skanner indeks for Â»%sÂ« ..."
  
! #: info/indices.c:636
  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"
  
! #: info/indices.c:644 info/indices.c:646
  msgid "Index apropos"
  msgstr "Indeks apropos"
  
! #: info/indices.c:688
  #, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Indeksposter indeholdende Â»%sÂ«:\n"
  
! #: info/indices.c:797
  msgid "List all matches of a string in the index"
  msgstr "Vis alle match for en streng i indekset"
  
! #: info/indices.c:824 info/indices.c:826
  msgid "Index topic"
  msgstr "Indeksemne"
--- 353,385 ----
  msgstr "Ikke flere indekspunkter indeholdende Â»%sÂ«."
  
! #: info/indices.c:476 info/indices.c:890
  #, c-format
  msgid "No index entries containing '%s'."
  msgstr "Ingen indeksposter indeholdende Â»%sÂ«."
  
! #: info/indices.c:586
  #, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "Skanner indeks for Â»%sÂ« ..."
  
! #: info/indices.c:646
  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"
  
! #: info/indices.c:654 info/indices.c:656
  msgid "Index apropos"
  msgstr "Indeks apropos"
  
! #: info/indices.c:698
  #, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Indeksposter indeholdende Â»%sÂ«:\n"
  
! #: info/indices.c:807
  msgid "List all matches of a string in the index"
  msgstr "Vis alle match for en streng i indekset"
  
! #: info/indices.c:834 info/indices.c:836
  msgid "Index topic"
  msgstr "Indeksemne"
***************
*** 385,439 ****
  msgstr "Ingen tilgÃ¦ngelige info-filer har Â»%sÂ« i deres indeks."
  
! #: info/info-utils.c:892
  #, c-format
  msgid "Error converting file character encoding."
  msgstr "Der opstod en fejl under konvertering af filtegnkodning"
  
! #: info/info.c:222 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "Intet menupunkt Â»%sÂ« i emne Â»%sÂ«."
  
! #: info/info.c:315
! #, c-format
! msgid "No file given for node '%s'."
! msgstr "Ingen fil angivet for emnet Â»%sÂ«."
! 
! #: info/info.c:364 info/info.c:1133
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr "Kan ikke finde emnet Â»%sÂ«."
  
! #: info/info.c:386
  #, c-format
  msgid "No program name given."
  msgstr "Intet programnavn angivet."
  
! #: info/info.c:577
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "ugyldigt nummer: %s\n"
  
! #: info/info.c:757
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "forkert udformet variabeludtryk: %s"
  
! #: info/info.c:764 info/infokey.c:537
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: ingen sÃ¥dan variabel"
  
! #: info/info.c:770 info/infokey.c:539
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "vÃ¦rdien %s er ikke gyldig for variabel %s"
  
! #: info/info.c:782
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "PrÃ¸v --help for yderligere information.\n"
  
! #: info/info.c:804 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
--- 390,439 ----
  msgstr "Ingen tilgÃ¦ngelige info-filer har Â»%sÂ« i deres indeks."
  
! #: info/info-utils.c:879
  #, c-format
  msgid "Error converting file character encoding."
  msgstr "Der opstod en fejl under konvertering af filtegnkodning"
  
! #: info/info.c:279 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "Intet menupunkt Â»%sÂ« i emne Â»%sÂ«."
  
! #: info/info.c:416 info/info.c:1148
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr "Kan ikke finde emnet Â»%sÂ«."
  
! #: info/info.c:438
  #, c-format
  msgid "No program name given."
  msgstr "Intet programnavn angivet."
  
! #: info/info.c:636
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "ugyldigt nummer: %s\n"
  
! #: info/info.c:816
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "forkert udformet variabeludtryk: %s"
  
! #: info/info.c:823 info/infokey.c:540
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: ingen sÃ¥dan variabel"
  
! #: info/info.c:829 info/infokey.c:542
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "vÃ¦rdien %s er ikke gyldig for variabel %s"
  
! #: info/info.c:841
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "PrÃ¸v --help for yderligere information.\n"
  
! #: info/info.c:860 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
***************
*** 452,461 ****
  "\n"
  
! #: info/info.c:981
  #, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "ingen indeksposter fundet for Â«%sÂ»\n"
  
! #: info/info.c:1034
  #, c-format
  msgid ""
--- 452,461 ----
  "\n"
  
! #: info/info.c:999
  #, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "ingen indeksposter fundet for Â«%sÂ»\n"
  
! #: info/info.c:1049
  #, c-format
  msgid ""
***************
*** 468,472 ****
  "LÃ¦s dokumentationen i Info-formatet.\n"
  
! #: info/info.c:1040
  msgid ""
  "Options:\n"
--- 468,472 ----
  "LÃ¦s dokumentationen i Info-formatet.\n"
  
! #: info/info.c:1055
  msgid ""
  "Options:\n"
***************
*** 486,490 ****
  "  -f, --file=MANUAL            specificer Info-manual der skal besÃ¸ges."
  
! #: info/info.c:1048
  msgid ""
  "  -h, --help                   display this help and exit.\n"
--- 486,490 ----
  "  -f, --file=MANUAL            specificer Info-manual der skal besÃ¸ges."
  
! #: info/info.c:1063
  msgid ""
  "  -h, --help                   display this help and exit.\n"
***************
*** 494,503 ****
  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."
  
! #: info/info.c:1054
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
--- 494,503 ----
  msgstr ""
  "  -h, --help                   vis denne hjÃ¦lpetekst og afslut.\n"
! "      --index-search=STRENG    gÃ¥ til emne 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."
  
! #: info/info.c:1069
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
***************
*** 511,519 ****
  "  -O, --show-options, --usage  gÃ¥ til tilvalgsemne for kommandolinjen."
  
! #: info/info.c:1061
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr "  -b, --speech-friendly        vÃ¦r talesyntese-venlig."
  
! #: info/info.c:1065
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
--- 511,519 ----
  "  -O, --show-options, --usage  gÃ¥ til tilvalgsemne for kommandolinjen."
  
! #: info/info.c:1076
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr "  -b, --speech-friendly        vÃ¦r talesyntese-venlig."
  
! #: info/info.c:1080
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
***************
*** 526,531 ****
  "  -x, --debug=NUMBER           set debugging level (-1 for all).\n"
  msgstr ""
  
! #: info/info.c:1074
  msgid ""
  "\n"
--- 526,540 ----
  "  -x, --debug=NUMBER           set debugging level (-1 for all).\n"
  msgstr ""
+ "      --strict-node-location   (for fejlsÃ¸gning) brug Info-filpegere som de "
+ "er.\n"
+ "      --subnodes               rekursive uddatamenuelementer.\n"
+ "  -v, --variable VAR=VÃ†RDI     tildel VÃ†RDI til Info-variablen VAR.\n"
+ "      --vi-keys                brug vi-lignende og less-lignende "
+ "genvejstaster.\n"
+ "      --version                vis versionsinformation og afslut.\n"
+ "  -w, --where, --location      udskriv fysisk placering for Info-fil.\n"
+ "  -x, --debug=NUMMER           angiv fejlsÃ¸gningsniveau (-1 for alle).\n"
  
! #: info/info.c:1089
  msgid ""
  "\n"
***************
*** 536,547 ****
  "items relative to the initial node visited."
  msgstr ""
  
! #: info/info.c:1081
  msgid ""
  "\n"
  "For a summary of key bindings, type H within Info."
  msgstr ""
  
! #: info/info.c:1084
  msgid ""
  "\n"
--- 545,564 ----
  "items relative to the initial node visited."
  msgstr ""
+ "\n"
+ "Den fÃ¸rste ikketilvalgs parameter, hvis til stede, er det menupunktet der\n"
+ "startes fra; der sÃ¸ges efter det i alle Â»mappefilerÂ« sammen med INFOSTI.\n"
+ "Hvis det ikke er til stede, sammenfÃ¸jer info alle mappefiler og viser\n"
+ "resultatet. Alle resterende parametre opfattes som navne for menu-elementer\n"
+ "for det oprindeligt besÃ¸gte emne."
  
! #: info/info.c:1096
  msgid ""
  "\n"
  "For a summary of key bindings, type H within Info."
  msgstr ""
+ "\n"
+ "For et overblik over genvejstaster, tast H indenfor Info."
  
! #: info/info.c:1099
  msgid ""
  "\n"
***************
*** 558,563 ****
  "  info -f ./foo.info         show file ./foo.info, not searching dir"
  msgstr ""
  
! #: info/info.c:1099 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
--- 575,593 ----
  "  info -f ./foo.info         show file ./foo.info, not searching dir"
  msgstr ""
+ "\n"
+ "Eksempler:\n"
+ "  info                       vis mappemenu pÃ¥ Ã¸verste niveau\n"
+ "  info info                  vis den generelle manual for Info-lÃ¦sere\n"
+ "  info info-stnd             vis manualen specifik for dette Info-program\n"
+ "  info emacs                 start ved emacs-emne fra mappe pÃ¥ Ã¸verste "
+ "niveau\n"
+ "  info emacs buffers         vÃ¦lg buffers menupunkt i emacs-manualen\n"
+ "  info emacs -n filer        start ved filer-emne inden i emacs-manualen\n"
+ "  info '(emacs)filer'        alternativ mÃ¥de at starte ved filer-emne\n"
+ "  info --show-options emacs  start ved emne med emacs' kommandolinjetilvalg\n"
+ "  info --subnodes -o ud.txt  emacs dumper hele manualen til ud.txt\n"
+ "  info -f ./foo.info         vis filen ./foo.info, uden at sÃ¸ge i mapper"
  
! #: info/info.c:1114 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
***************
*** 570,634 ****
  "Texinfos hjemmeside: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1134
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Kan ikke finde emne Â»(%s)%sÂ«."
  
! #: info/info.c:1135
  msgid "Cannot find a window!"
  msgstr "Kan ikke finde et vindue!"
  
! #: info/info.c:1136
  msgid "Point doesn't appear within this window's node!"
  msgstr "Punktet optrÃ¦der ikke i dette vindues emne!"
  
! #: info/info.c:1137
  msgid "Cannot delete the last window."
  msgstr "Kan ikke slette det sidste vindue."
  
! #: info/info.c:1138
  msgid "No menu in this node."
  msgstr "Ingen menu i dette emne."
  
! #: info/info.c:1139
  msgid "No footnotes in this node."
  msgstr "Ingen fodnoter i dette emne."
  
! #: info/info.c:1140
  msgid "No cross references in this node."
  msgstr "Ingen krydsreferencer i dette emne."
  
! #: info/info.c:1141
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Ingen Â»%sÂ«-peger mod dette emne."
  
! #: info/info.c:1142
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "Ukendt Info-kommando Â»%cÂ«; prÃ¸v Â»?Â« for hjÃ¦lp."
  
! #: info/info.c:1143
  #, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "Terminaltypen Â»%sÂ« er ikke smart nok til at kÃ¸re Info."
  
! #: info/info.c:1144
  msgid "You are already at the last page of this node."
  msgstr "Du er i forvejen ved emnets sidste side."
  
! #: info/info.c:1145
  msgid "You are already at the first page of this node."
  msgstr "Du er i forvejen ved emnets fÃ¸rste side."
  
! #: info/info.c:1146
  msgid "Only one window."
  msgstr "Kun Ã©t vindue."
  
! #: info/info.c:1147
  msgid "Resulting window would be too small."
  msgstr "Det resulterende vindue ville vÃ¦re for lille."
  
! #: info/info.c:1148
  msgid "Not enough room for a help window, please delete a window."
  msgstr "Ikke nok plads til et hjÃ¦lpevindue. Fjern venligst et vindue."
--- 600,664 ----
  "Texinfos hjemmeside: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1149
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Kan ikke finde emne Â»(%s)%sÂ«."
  
! #: info/info.c:1150
  msgid "Cannot find a window!"
  msgstr "Kan ikke finde et vindue!"
  
! #: info/info.c:1151
  msgid "Point doesn't appear within this window's node!"
  msgstr "Punktet optrÃ¦der ikke i dette vindues emne!"
  
! #: info/info.c:1152
  msgid "Cannot delete the last window."
  msgstr "Kan ikke slette det sidste vindue."
  
! #: info/info.c:1153
  msgid "No menu in this node."
  msgstr "Ingen menu i dette emne."
  
! #: info/info.c:1154
  msgid "No footnotes in this node."
  msgstr "Ingen fodnoter i dette emne."
  
! #: info/info.c:1155
  msgid "No cross references in this node."
  msgstr "Ingen krydsreferencer i dette emne."
  
! #: info/info.c:1156
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Ingen Â»%sÂ«-peger mod dette emne."
  
! #: info/info.c:1157
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "Ukendt Info-kommando Â»%cÂ«; prÃ¸v Â»?Â« for hjÃ¦lp."
  
! #: info/info.c:1158
  #, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "Terminaltypen Â»%sÂ« er ikke smart nok til at kÃ¸re Info."
  
! #: info/info.c:1159
  msgid "You are already at the last page of this node."
  msgstr "Du er i forvejen ved emnets sidste side."
  
! #: info/info.c:1160
  msgid "You are already at the first page of this node."
  msgstr "Du er i forvejen ved emnets fÃ¸rste side."
  
! #: info/info.c:1161
  msgid "Only one window."
  msgstr "Kun Ã©t vindue."
  
! #: info/info.c:1162
  msgid "Resulting window would be too small."
  msgstr "Det resulterende vindue ville vÃ¦re for lille."
  
! #: info/info.c:1163
  msgid "Not enough room for a help window, please delete a window."
  msgstr "Ikke nok plads til et hjÃ¦lpevindue. Fjern venligst et vindue."
***************
*** 896,930 ****
  msgstr "ukendt handling Â»%sÂ«"
  
! #: info/infokey.c:482
  #, c-format
  msgid "action name too long"
  msgstr "handlingsnavn er for langt"
  
! #: info/infokey.c:495
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "ekstra tegn fÃ¸lger handlingen Â»%sÂ«"
  
! #: info/infokey.c:506
  #, c-format
  msgid "missing variable name"
  msgstr "manglende variabelnavn"
  
! #: info/infokey.c:515
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "manglende Â»=Â« umiddelbart efter variabelnavn"
  
! #: info/infokey.c:522
  #, c-format
  msgid "variable name too long"
  msgstr "variabelnavn er for langt"
  
! #: info/infokey.c:546
  #, c-format
  msgid "value too long"
  msgstr "vÃ¦rdien er for lang"
  
! #: info/infokey.c:592
  #, c-format
  msgid "\"%s\", line %u: "
--- 926,960 ----
  msgstr "ukendt handling Â»%sÂ«"
  
! #: info/infokey.c:485
  #, c-format
  msgid "action name too long"
  msgstr "handlingsnavn er for langt"
  
! #: info/infokey.c:498
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "ekstra tegn fÃ¸lger handlingen Â»%sÂ«"
  
! #: info/infokey.c:509
  #, c-format
  msgid "missing variable name"
  msgstr "manglende variabelnavn"
  
! #: info/infokey.c:518
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "manglende Â»=Â« umiddelbart efter variabelnavn"
  
! #: info/infokey.c:525
  #, c-format
  msgid "variable name too long"
  msgstr "variabelnavn er for langt"
  
! #: info/infokey.c:549
  #, c-format
  msgid "value too long"
  msgstr "vÃ¦rdien er for lang"
  
! #: info/infokey.c:595
  #, c-format
  msgid "\"%s\", line %u: "
***************
*** 1252,1591 ****
  msgstr "Kunne ikke finde emnet, der refereres til af Â»%sÂ« i Â»%sÂ«."
  
! #: info/session.c:2864
  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"
  
! #: info/session.c:2866
  msgid "Follow menus: "
  msgstr "FÃ¸lg menuer: "
  
! #: info/session.c:2971
  msgid "Select the Next node"
  msgstr "VÃ¦lg det nÃ¦ste emne"
  
! #: info/session.c:2978
  msgid "Select the Prev node"
  msgstr "VÃ¦lg forrige emne"
  
! #: info/session.c:2985
  msgid "Select the Up node"
  msgstr "VÃ¦lg op-emnet"
  
! #: info/session.c:2991
  msgid "Select the last node in this file"
  msgstr "VÃ¦lg det sidste emne i denne fil"
  
! #: info/session.c:3018 info/session.c:3051
  msgid "This window has no additional nodes"
  msgstr "Dette vindue har ingen yderligere emner"
  
! #: info/session.c:3024
  msgid "Select the first node in this file"
  msgstr "VÃ¦lg det fÃ¸rste emne i denne fil"
  
! #: info/session.c:3158
  msgid "No more nodes within this document."
  msgstr "Ikke flere emner i dette dokument."
  
! #: info/session.c:3203 info/session.c:3243
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "Ingen Â»ForrigeÂ« eller Â»OpÂ« for dette emne i dette dokument."
  
! #: info/session.c:3256
  msgid "Move forwards or down through node structure"
  msgstr "GÃ¥ frem eller ned gennem emne-strukturen"
  
! #: info/session.c:3273
  msgid "Move backwards or up through node structure"
  msgstr "GÃ¥ tilbage eller op gennem emne-strukturen"
  
! #: info/session.c:3296
  msgid "Read a node name and select it"
  msgstr "IndlÃ¦s et emnenavn og vÃ¦lg det"
  
! #: info/session.c:3350 info/session.c:3354
  msgid "Goto node: "
  msgstr "GÃ¥ til emne: "
  
! #: info/session.c:3533
  msgid "Find the node describing program invocation"
  msgstr "Find emnet, der beskriver hvordan programmet startes"
  
! #: info/session.c:3535
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Find programstart emne for [%s]: "
  
! #: info/session.c:3580
  msgid "Read a manpage reference and select it"
  msgstr "IndlÃ¦s en man-side reference og vÃ¦lg den"
  
! #: info/session.c:3584
  msgid "Get Manpage: "
  msgstr "Hent man-side: "
  
! #: info/session.c:3605
  msgid "Select the node 'Top' in this file"
  msgstr "VÃ¦lg emnet Â»TopÂ« i denne fil"
  
! #: info/session.c:3611
  msgid "Select the node '(dir)'"
  msgstr "VÃ¦lg emnet Â»(mappe)Â«"
  
! #: info/session.c:3617
  msgid "Show full file name of node being displayed"
  msgstr "Vis det fulde filnavn for det viste emne"
  
! #: info/session.c:3634
  msgid "Select the most recently selected node"
  msgstr "VÃ¦lg det sidst valgt emne"
  
! #: info/session.c:3639
  #, c-format
  msgid "No earlier node in history"
  msgstr "Intet tidligere emne i historikken"
  
! #: info/session.c:3643
  msgid "Read the name of a file and select it"
  msgstr "LÃ¦s navnet pÃ¥ en fil og vÃ¦lg filen"
  
! #: info/session.c:3647
  msgid "Find file: "
  msgstr "Find fil: "
  
! #: info/session.c:3664
  #, c-format
  msgid "Cannot find '%s'."
  msgstr "Kan ikke finde: Â»%sÂ«."
  
! #: info/session.c:3713
  #, c-format
  msgid "Could not create output file '%s'."
  msgstr "Kunne ikke oprette uddatafilen Â»%sÂ«."
  
! #: info/session.c:3727
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "fejl under skrivning til %s: %s"
  
! #: info/session.c:3736
  #, c-format
  msgid "closing %s"
  msgstr "lukker %s"
  
! #: info/session.c:3785
  #, c-format
  msgid "writing node %s..."
  msgstr "skriver emne %s ..."
  
! #: info/session.c:3831
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr ""
  "Send via en datakanal indholdet af dette emne gennem INFO_PRINT_COMMAND"
  
! #: info/session.c:3859
  #, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Kan ikke Ã¥bne datakanal til Â»%sÂ«."
  
! #: info/session.c:3864
  #, c-format
  msgid "printing node %s..."
  msgstr "udskriver emne %s ..."
  
! #: info/session.c:3872
  #, c-format
  msgid "finished printing node %s"
  msgstr "fÃ¦rdig med at udskrive emne %s"
  
! #: info/session.c:3904
  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."
  
! #: info/session.c:4169
  msgid "Search continued from the end of the document."
  msgstr "SÃ¸gning fortsat fra slutningen af dokumentet."
  
! #: info/session.c:4174
  msgid "Search continued from the beginning of the document."
  msgstr "SÃ¸gning fortsat fra begyndelsen af dokumentet."
  
! #: info/session.c:4194
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "SÃ¸ger i underfilen %s ..."
  
! #: info/session.c:4231
  msgid "Search failed."
  msgstr "SÃ¸gning mislykkedes."
  
! #: info/session.c:4248
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Regexp search"
  msgstr "RegulÃ¦rt udtrykssÃ¸gning"
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Search"
  msgstr "SÃ¸g"
  
! #: info/session.c:4250 info/session.c:4256
  msgid " case-sensitively"
  msgstr " versalfÃ¸lsomhed"
  
! #: info/session.c:4251 info/session.c:4257
  msgid " backward"
  msgstr " baglÃ¦ns"
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s: "
  
! #: info/session.c:4274
  msgid "Search string too short"
  msgstr "SÃ¸gestreng er for kort"
  
! #: info/session.c:4467
  #, c-format
  msgid "Going back to last match from %s"
  msgstr "GÃ¥r tilbage til sidste match fra %s"
  
! #: info/session.c:4491 info/session.c:4601
  #, c-format
  msgid "No more matches."
  msgstr "Ikke flere match."
  
! #: info/session.c:4628
  msgid "Search this node and subnodes for a string."
  msgstr "SÃ¸g i dette emne og underemner efter en streng."
  
! #: info/session.c:4649
  msgid "Go to next match in Info sub-tree"
  msgstr "GÃ¥ til nÃ¦ste match i informationsundertrÃ¦et"
  
! #: info/session.c:4653 info/session.c:4665
  #, c-format
  msgid "No active search"
  msgstr "Ingen aktiv sÃ¸gning"
  
! #: info/session.c:4661
  msgid "Go to previous match in Info sub-tree"
  msgstr "GÃ¥ til forrige match i informationsundertrÃ¦et"
  
! #: info/session.c:4674
  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:4679
  msgid "Read a string and search for it"
  msgstr "IndlÃ¦s en tekst og sÃ¸g for den"
  
! #: info/session.c:4685
  msgid "Read a string and search backward for it"
  msgstr "IndlÃ¦s en tekst og sÃ¸g baglÃ¦ns efter den"
  
! #: info/session.c:4693
  msgid "Repeat last search in the same direction"
  msgstr "Gentag sidste sÃ¸gning i samme retning"
  
! #: info/session.c:4701 info/session.c:4746
  msgid "No previous search string"
  msgstr "Ingen tidligere sÃ¸gestreng"
  
! #: info/session.c:4738
  msgid "Repeat last search in the reverse direction"
  msgstr "Gentag sidste sÃ¸gning i modsat retning"
  
! #: info/session.c:4785
  msgid "Clear displayed search matches"
  msgstr "Ryd viste sÃ¸geresultater"
  
! #: info/session.c:4802 info/session.c:4808
  msgid "Search interactively for a string as you type it"
  msgstr "SÃ¸g interaktivt efter en tekst, mens du skriver den"
  
! #: info/session.c:4928
  msgid "Regexp I-search backward: "
  msgstr "RegulÃ¦rt udtryk I-sÃ¸gning baglÃ¦ns: "
  
! #: info/session.c:4929
  msgid "I-search backward: "
  msgstr "I-sÃ¸gning baglÃ¦ns: "
  
! #: info/session.c:4931
  msgid "Regexp I-search: "
  msgstr "RegulÃ¦rt udtryk I-sÃ¸gning"
  
! #: info/session.c:4932
  msgid "I-search: "
  msgstr "I-sÃ¸gning: "
  
! #: info/session.c:4957 info/session.c:4960
  msgid "Failing "
  msgstr "Fejler "
  
! #: info/session.c:5326
  msgid "Cancel current operation"
  msgstr "Afbryd nuvÃ¦rende handling"
  
! #: info/session.c:5333
  msgid "Quit"
  msgstr "Afslut"
  
! #: info/session.c:5338
  msgid "Display version of Info being run"
  msgstr "Vis version for Info der kÃ¸res"
  
! #: info/session.c:5340
  #, c-format
  msgid "GNU Info version %s"
  msgstr "GNU Info-version %s"
  
! #: info/session.c:5345
  msgid "Redraw the display"
  msgstr "Gentegn skÃ¦rmen"
  
! #: info/session.c:5382
  msgid "Quit using Info"
  msgstr "Afslut Info"
  
! #: info/session.c:5398
  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:5409
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Ukendt kommando (%s)."
  
! #: info/session.c:5412
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "Â»%sÂ« er ikke gyldig"
  
! #: info/session.c:5413
  #, c-format
  msgid "'%s' is invalid"
  msgstr "Â»%sÂ« er ugyldig"
  
! #: info/session.c:5731
  msgid "Add this digit to the current numeric argument"
  msgstr "TilfÃ¸j dette tegn til det nuvÃ¦rende numeriske parameter"
  
! #: info/session.c:5738
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "Start (eller gang med 4) det nuvÃ¦rende numeriske parameter"
--- 1282,1621 ----
  msgstr "Kunne ikke finde emnet, der refereres til af Â»%sÂ« i Â»%sÂ«."
  
! #: info/session.c:2870
  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"
  
! #: info/session.c:2872
  msgid "Follow menus: "
  msgstr "FÃ¸lg menuer: "
  
! #: info/session.c:2977
  msgid "Select the Next node"
  msgstr "VÃ¦lg det nÃ¦ste emne"
  
! #: info/session.c:2984
  msgid "Select the Prev node"
  msgstr "VÃ¦lg forrige emne"
  
! #: info/session.c:2991
  msgid "Select the Up node"
  msgstr "VÃ¦lg op-emnet"
  
! #: info/session.c:2997
  msgid "Select the last node in this file"
  msgstr "VÃ¦lg det sidste emne i denne fil"
  
! #: info/session.c:3024 info/session.c:3057
  msgid "This window has no additional nodes"
  msgstr "Dette vindue har ingen yderligere emner"
  
! #: info/session.c:3030
  msgid "Select the first node in this file"
  msgstr "VÃ¦lg det fÃ¸rste emne i denne fil"
  
! #: info/session.c:3164
  msgid "No more nodes within this document."
  msgstr "Ikke flere emner i dette dokument."
  
! #: info/session.c:3209 info/session.c:3249
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "Ingen Â»ForrigeÂ« eller Â»OpÂ« for dette emne i dette dokument."
  
! #: info/session.c:3262
  msgid "Move forwards or down through node structure"
  msgstr "GÃ¥ frem eller ned gennem emne-strukturen"
  
! #: info/session.c:3279
  msgid "Move backwards or up through node structure"
  msgstr "GÃ¥ tilbage eller op gennem emne-strukturen"
  
! #: info/session.c:3302
  msgid "Read a node name and select it"
  msgstr "IndlÃ¦s et emnenavn og vÃ¦lg det"
  
! #: info/session.c:3356 info/session.c:3360
  msgid "Goto node: "
  msgstr "GÃ¥ til emne: "
  
! #: info/session.c:3539
  msgid "Find the node describing program invocation"
  msgstr "Find emnet, der beskriver hvordan programmet startes"
  
! #: info/session.c:3541
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Find programstart emne for [%s]: "
  
! #: info/session.c:3586
  msgid "Read a manpage reference and select it"
  msgstr "IndlÃ¦s en man-side reference og vÃ¦lg den"
  
! #: info/session.c:3590
  msgid "Get Manpage: "
  msgstr "Hent man-side: "
  
! #: info/session.c:3611
  msgid "Select the node 'Top' in this file"
  msgstr "VÃ¦lg emnet Â»TopÂ« i denne fil"
  
! #: info/session.c:3617
  msgid "Select the node '(dir)'"
  msgstr "VÃ¦lg emnet Â»(mappe)Â«"
  
! #: info/session.c:3623
  msgid "Show full file name of node being displayed"
  msgstr "Vis det fulde filnavn for det viste emne"
  
! #: info/session.c:3640
  msgid "Select the most recently selected node"
  msgstr "VÃ¦lg det sidst valgt emne"
  
! #: info/session.c:3645
  #, c-format
  msgid "No earlier node in history"
  msgstr "Intet tidligere emne i historikken"
  
! #: info/session.c:3649
  msgid "Read the name of a file and select it"
  msgstr "LÃ¦s navnet pÃ¥ en fil og vÃ¦lg filen"
  
! #: info/session.c:3653
  msgid "Find file: "
  msgstr "Find fil: "
  
! #: info/session.c:3670
  #, c-format
  msgid "Cannot find '%s'."
  msgstr "Kan ikke finde: Â»%sÂ«."
  
! #: info/session.c:3719
  #, c-format
  msgid "Could not create output file '%s'."
  msgstr "Kunne ikke oprette uddatafilen Â»%sÂ«."
  
! #: info/session.c:3733
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "fejl under skrivning til %s: %s"
  
! #: info/session.c:3742
  #, c-format
  msgid "closing %s"
  msgstr "lukker %s"
  
! #: info/session.c:3791
  #, c-format
  msgid "writing node %s..."
  msgstr "skriver emne %s ..."
  
! #: info/session.c:3837
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr ""
  "Send via en datakanal indholdet af dette emne gennem INFO_PRINT_COMMAND"
  
! #: info/session.c:3865
  #, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Kan ikke Ã¥bne datakanal til Â»%sÂ«."
  
! #: info/session.c:3870
  #, c-format
  msgid "printing node %s..."
  msgstr "udskriver emne %s ..."
  
! #: info/session.c:3878
  #, c-format
  msgid "finished printing node %s"
  msgstr "fÃ¦rdig med at udskrive emne %s"
  
! #: info/session.c:3910
  msgid "Toggle the usage of regular expressions in searches"
  msgstr "Skift brugen af regulÃ¦re udtryk i sÃ¸gninger"
  
! #: info/session.c:3914
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr "Brug af regulÃ¦re udtryk for sÃ¸gninger."
  
! #: info/session.c:3915
  #, c-format
  msgid "Using literal strings for searches."
  msgstr "Brug af bogstavelige strenge for sÃ¸gninger."
  
! #: info/session.c:4175
  msgid "Search continued from the end of the document."
  msgstr "SÃ¸gning fortsat fra slutningen af dokumentet."
  
! #: info/session.c:4180
  msgid "Search continued from the beginning of the document."
  msgstr "SÃ¸gning fortsat fra begyndelsen af dokumentet."
  
! #: info/session.c:4200
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "SÃ¸ger i underfilen %s ..."
  
! #: info/session.c:4237
  msgid "Search failed."
  msgstr "SÃ¸gning mislykkedes."
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Regexp search"
  msgstr "RegulÃ¦rt udtrykssÃ¸gning"
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Search"
  msgstr "SÃ¸g"
  
! #: info/session.c:4256 info/session.c:4262
  msgid " case-sensitively"
  msgstr " versalfÃ¸lsomhed"
  
! #: info/session.c:4257 info/session.c:4263
  msgid " backward"
  msgstr " baglÃ¦ns"
  
! #: info/session.c:4260
  #, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s: "
  
! #: info/session.c:4280
  msgid "Search string too short"
  msgstr "SÃ¸gestreng er for kort"
  
! #: info/session.c:4473
  #, c-format
  msgid "Going back to last match from %s"
  msgstr "GÃ¥r tilbage til sidste match fra %s"
  
! #: info/session.c:4497 info/session.c:4607
  #, c-format
  msgid "No more matches."
  msgstr "Ikke flere match."
  
! #: info/session.c:4634
  msgid "Search this node and subnodes for a string."
  msgstr "SÃ¸g i dette emne og underemner efter en streng."
  
! #: info/session.c:4655
  msgid "Go to next match in Info sub-tree"
  msgstr "GÃ¥ til nÃ¦ste match i informationsundertrÃ¦et"
  
! #: info/session.c:4659 info/session.c:4671
  #, c-format
  msgid "No active search"
  msgstr "Ingen aktiv sÃ¸gning"
  
! #: info/session.c:4667
  msgid "Go to previous match in Info sub-tree"
  msgstr "GÃ¥ til forrige match i informationsundertrÃ¦et"
  
! #: info/session.c:4680
  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:4685
  msgid "Read a string and search for it"
  msgstr "IndlÃ¦s en tekst og sÃ¸g for den"
  
! #: info/session.c:4691
  msgid "Read a string and search backward for it"
  msgstr "IndlÃ¦s en tekst og sÃ¸g baglÃ¦ns efter den"
  
! #: info/session.c:4699
  msgid "Repeat last search in the same direction"
  msgstr "Gentag sidste sÃ¸gning i samme retning"
  
! #: info/session.c:4707 info/session.c:4752
  msgid "No previous search string"
  msgstr "Ingen tidligere sÃ¸gestreng"
  
! #: info/session.c:4744
  msgid "Repeat last search in the reverse direction"
  msgstr "Gentag sidste sÃ¸gning i modsat retning"
  
! #: info/session.c:4791
  msgid "Clear displayed search matches"
  msgstr "Ryd viste sÃ¸geresultater"
  
! #: info/session.c:4808 info/session.c:4814
  msgid "Search interactively for a string as you type it"
  msgstr "SÃ¸g interaktivt efter en tekst, mens du skriver den"
  
! #: info/session.c:4934
  msgid "Regexp I-search backward: "
  msgstr "RegulÃ¦rt udtryk I-sÃ¸gning baglÃ¦ns: "
  
! #: info/session.c:4935
  msgid "I-search backward: "
  msgstr "I-sÃ¸gning baglÃ¦ns: "
  
! #: info/session.c:4937
  msgid "Regexp I-search: "
  msgstr "RegulÃ¦rt udtryk I-sÃ¸gning"
  
! #: info/session.c:4938
  msgid "I-search: "
  msgstr "I-sÃ¸gning: "
  
! #: info/session.c:4963 info/session.c:4966
  msgid "Failing "
  msgstr "Fejler "
  
! #: info/session.c:5332
  msgid "Cancel current operation"
  msgstr "Afbryd nuvÃ¦rende handling"
  
! #: info/session.c:5339
  msgid "Quit"
  msgstr "Afslut"
  
! #: info/session.c:5344
  msgid "Display version of Info being run"
  msgstr "Vis version for Info der kÃ¸res"
  
! #: info/session.c:5346
  #, c-format
  msgid "GNU Info version %s"
  msgstr "GNU Info-version %s"
  
! #: info/session.c:5351
  msgid "Redraw the display"
  msgstr "Gentegn skÃ¦rmen"
  
! #: info/session.c:5388
  msgid "Quit using Info"
  msgstr "Afslut Info"
  
! #: info/session.c:5404
  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:5415
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Ukendt kommando (%s)."
  
! #: info/session.c:5418
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "Â»%sÂ« er ikke gyldig"
  
! #: info/session.c:5419
  #, c-format
  msgid "'%s' is invalid"
  msgstr "Â»%sÂ« er ugyldig"
  
! #: info/session.c:5737
  msgid "Add this digit to the current numeric argument"
  msgstr "TilfÃ¸j dette tegn til det nuvÃ¦rende numeriske parameter"
  
! #: info/session.c:5744
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "Start (eller gang med 4) det nuvÃ¦rende numeriske parameter"
***************
*** 1698,1702 ****
  #: info/variables.c:158
  msgid "How to print the information line at the start of a node"
! msgstr "Hvordan informationslinjen skal udskrive i begyndelsen af en knude"
  
  #: info/variables.c:165
--- 1728,1732 ----
  #: info/variables.c:158
  msgid "How to print the information line at the start of a node"
! msgstr "Hvordan informationslinjen skal udskrive i begyndelsen af et emne"
  
  #: info/variables.c:165
***************
*** 1726,1743 ****
  msgstr "Angiver %s til vÃ¦rdi (%s): "
  
! #: info/window.c:959
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), linjer ---, "
  
- #: info/window.c:966
- #, c-format
- msgid "-%s---Info: %s, %ld lines --%s--"
- msgstr "-%s---Info: %s, %ld linjer --%s--"
- 
- #: info/window.c:970
- #, c-format
- msgid "-%s---Info: (%s)%s, %ld lines --%s--"
- msgstr "-%s---Info: (%s)%s, %ld linjer --%s--"
- 
  #: install-info/install-info.c:292
  #, c-format
--- 1756,1763 ----
  msgstr "Angiver %s til vÃ¦rdi (%s): "
  
! #: info/window.c:909
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), linjer ---, "
  
  #: install-info/install-info.c:292
  #, c-format
***************
*** 1782,1788 ****
  "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."
  
  #: install-info/install-info.c:555
--- 1802,1808 ----
  "Tilvalg:\n"
  " --add-once          tilfÃ¸j kun til fÃ¸rste matchende sektion, ikke alle.\n"
! " --align=KOL         start beskrivelse af nye poster ved kolonne KOL.\n"
! " --calign=KOL        formater anden og efterfÃ¸lgende beskrivelseslinjer til\n"
! "                     start ved kolonne KOL."
  
  #: install-info/install-info.c:555
***************
*** 1801,1804 ****
--- 1821,1834 ----
  " --dry-run           same as --test."
  msgstr ""
+ " --debug             rapporter det udfÃ¸rte.\n"
+ " --delete            slet eksisterende poster for INFO-FIL fra MAPPE-FIL;\n"
+ "                     indsÃ¦t ikke nye poster.\n"
+ " --defsection=TEKST  som --section, men brug kun TEKST hvis ingen afsnit\n"
+ "                     er til stede i INFO-FIL (erstatter Â»MiscellaneousÂ«).\n"
+ " --description=TEKST beskrivelsen for posten er TEKST; brugt med tilvalget\n"
+ "                     --name for at blive synonym med tilvalget --entry.\n"
+ " --dir-file=NAVN     specificer filnavn for Info-mappefil;\n"
+ "                     svarende til brug af parameteren MAPPE-FIL.\n"
+ " --dry-run           svarer til --test."
  
  #: install-info/install-info.c:568
***************
*** 1813,1816 ****
--- 1843,1856 ----
  "                       from information in the Info file itself."
  msgstr ""
+ " --entry=TEKST        indsÃ¦t TEKST som en Info-mappepost, der\n"
+ "                      overskriver enhver tilsvarende post fra MAPPE-FIL.\n"
+ "                      TEKST skrives som en Info-menuelementlinje efterfulgt\n"
+ "                      af nul eller flere ekstra linjer startende med "
+ "mellemrum.\n"
+ "                      Hvis du specificerer mere end en post, sÃ¥ tilfÃ¸jes "
+ "alle.\n"
+ "                      Hvis du ikke specificerer nogle poster, sÃ¥ bestemmes "
+ "de\n"
+ "                      fra information i selve Info-filen."
  
  #: install-info/install-info.c:577
***************
*** 1824,1831 ****
  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."
  
--- 1864,1871 ----
  msgstr ""
  " --help              vis denne hjÃ¦lpetekst og afslut.\n"
! " --info-dir=MAPPE    svarer til --dir-file=MAPPE/mappe.\n"
! " --info-file=FIL     specificer i informationsfilen installation i mappen;\n"
! "                     svarende til brug af INFO-FILE-parameteren.\n"
! " --item=TEKST        svarer til --entry=TEKST.\n"
  " --keep-old          erstat ikke poster, eller fjern tomme afsnit."
  
***************
*** 1839,1842 ****
--- 1879,1888 ----
  " --quiet             suppress warnings."
  msgstr ""
+ " --maxwidth, --max-width=KOL  omslut beskrivelse ved kolonne KOL.\n"
+ " --menuentry=TEKST   svarer til --name=TEKST.\n"
+ " --name=TEKST        navnet for posten er TEKST; bruges med --description\n"
+ "                     for at blive synonym med tilvalget --entry.\n"
+ " --no-indent         formater ikke nye poster i MAPPE-filen.\n"
+ " --quiet             undertryk advarsler."
  
  #: install-info/install-info.c:593
***************
*** 1858,1861 ****
--- 1904,1922 ----
  " --section R SEC     equivalent to --regex=R --section=SEC --add-once."
  msgstr ""
+ " --regex=R           placer denne fils poster i alle afsnit som matcher det\n"
+ "                     regulÃ¦re udtryk R (ignorerer store/smÃ¥ bogstaver).\n"
+ " --remove            svarer til --delete.\n"
+ " --remove-exactly    fjern kun hvis info-filnavnene matcher prÃ¦cis;\n"
+ "                     suffiks sÃ¥som .info og .gz bliver ikke ignoreret.\n"
+ " --section=SEK       placer poster i afsnit SEK for mappen.\n"
+ "                     Hvis du specificerer mere end et afsnit, tilfÃ¸jes alle\n"
+ "                     posterne i hvert af afsnittene.\n"
+ "                     Hvis du ikke specificerer nogle afsnit, sÃ¥ bestemmes "
+ "de\n"
+ "                     ud fra information i selve Info-filerne;\n"
+ "                     hvis intet er tilgÃ¦ngeligt der, bruges vÃ¦rdien for\n"
+ "                     --defsection; hvis den ikke er specificeret, er\n"
+ "                     standardvÃ¦rdien Â»MiscellaneousÂ«.\n"
+ " --section R SEK     svarer til --regex=R --section=SEK --add-once."
  
  #: install-info/install-info.c:609
***************
*** 1866,1874 ****
  msgstr ""
  " --silent            undertryk advarsler.\n"
! " --test              undertryk opdatering af DIR-FILE.\n"
  " --version           vis versionsinformation og afslut."
  
  #: install-info/install-info.c:642
! #, c-format
  msgid ""
  "This is the file .../info/dir, which contains the\n"
--- 1927,1935 ----
  msgstr ""
  " --silent            undertryk advarsler.\n"
! " --test              undertryk opdatering af MAPPE-FIL.\n"
  " --version           vis versionsinformation og afslut."
  
  #: install-info/install-info.c:642
! #, fuzzy, c-format
  msgid ""
  "This is the file .../info/dir, which contains the\n"
***************
*** 1879,1883 ****
  "\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"
--- 1940,1944 ----
  "\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"
***************
*** 1942,1946 ****
  #, c-format
  msgid "excess command line argument `%s'"
! msgstr "overskydende argument for kommandolinjen Â»%sÂ«"
  
  #: install-info/install-info.c:2281
--- 2003,2007 ----
  #, c-format
  msgid "excess command line argument `%s'"
! msgstr "overskydende parameter for kommandolinjen Â»%sÂ«"
  
  #: install-info/install-info.c:2281
***************
*** 1969,2086 ****
  msgstr "ingen poster fundet for Â»%sÂ«; intet slettet"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:855
! #: tp/Texinfo/Convert/Converter.pm:893 tp/Texinfo/Convert/Converter.pm:1204
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6504
! #: tp/Texinfo/Convert/HTML.pm:6528 tp/Texinfo/Convert/HTML.pm:6905
! #: tp/Texinfo/Convert/HTML.pm:6963 tp/Texinfo/Convert/HTML.pm:7041
! #: tp/Texinfo/Convert/HTML.pm:7118 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:546
! #: tp/Texinfo/Convert/TexinfoXML.pm:457
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "kunne ikke Ã¥bne %s for skrivning: %s"
  
! #: tp/Texinfo/Common.pm:881
  msgid "recursion is always allowed"
  msgstr "rekursion er altid tilladt"
  
! #: tp/Texinfo/Common.pm:882
  msgid "arguments are quoted by default"
  msgstr "parametre placeres som standard i citationstegn"
  
! #: tp/Texinfo/Common.pm:1105
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s er ikke en gyldig sprogkode"
  
! #: tp/Texinfo/Common.pm:1110
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s er ikke en gyldig regionskode"
  
! #: tp/Texinfo/Common.pm:1128
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%s er ikke en gyldig opdelingsmulighed"
  
! #: tp/Texinfo/Common.pm:1151
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "kunne ikke lÃ¦se %s: %s"
  
! #: tp/Texinfo/Common.pm:1170
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "fejl under lukning af @verbatiminclude-filen %s: %s"
  
! #: tp/Texinfo/Common.pm:1176 tp/Texinfo/Parser.pm:3353
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%s: kunne ikke finde: %s"
  
! #: tp/Texinfo/Common.pm:1520
! #, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr "kunne ikke Ã¥bne html-referencekonfigurationsfilen %s: %s"
! 
! #: tp/Texinfo/Common.pm:1548
! msgid "missing type"
! msgstr "manglende type"
! 
! #: tp/Texinfo/Common.pm:1551
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "typen blev ikke genkendt: %s"
! 
! #: tp/Texinfo/Common.pm:1568
! #, 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/Common.pm:1603
  msgid "no node to be renamed"
  msgstr "intet navn at omdÃ¸be"
  
! #: tp/Texinfo/Common.pm:1614
  msgid "nodes without a new name at the end of file"
  msgstr "emner uden et navn i slutningen af filen"
  
! #: tp/Texinfo/Common.pm:1624 tp/Texinfo/Parser.pm:926
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "kunne ikke Ã¥bne %s: %s"
  
! #: tp/Texinfo/Common.pm:2144
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr "kunne ikke beskytte hash-tegn i @%s"
  
! #: tp/Texinfo/Convert/Converter.pm:395 tp/Texinfo/Convert/Converter.pm:414
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "ForÃ¦ldet variabel %s\n"
  
! #: tp/Texinfo/Convert/Converter.pm:794
  #, perl-format
  msgid "%s: output incompatible with split"
! msgstr "%s: uddata er ikke kompatible med opdeling"
  
! #: tp/Texinfo/Convert/Converter.pm:876 tp/Texinfo/Convert/Converter.pm:909
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:6931
! #: tp/Texinfo/Convert/HTML.pm:6989 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:476 tp/Texinfo/Parser.pm:2035
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "der opstod en fejl under lukning af %s: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, 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:995
  #, perl-format
  msgid "could not create directory `%s': %s"
--- 2030,2139 ----
  msgstr "ingen poster fundet for Â»%sÂ«; intet slettet"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:847
! #: tp/Texinfo/Convert/Converter.pm:885 tp/Texinfo/Convert/Converter.pm:1196
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6573
! #: tp/Texinfo/Convert/HTML.pm:6597 tp/Texinfo/Convert/HTML.pm:6978
! #: tp/Texinfo/Convert/HTML.pm:7037 tp/Texinfo/Convert/HTML.pm:7115
! #: tp/Texinfo/Convert/HTML.pm:7192 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:547
! #: tp/Texinfo/Convert/TexinfoXML.pm:458
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "kunne ikke Ã¥bne %s for skrivning: %s"
  
! #: tp/Texinfo/Common.pm:862
  msgid "recursion is always allowed"
  msgstr "rekursion er altid tilladt"
  
! #: tp/Texinfo/Common.pm:863
  msgid "arguments are quoted by default"
  msgstr "parametre placeres som standard i citationstegn"
  
! #: tp/Texinfo/Common.pm:866
! msgid ""
! "move your @contents command if you want the contents after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:869
! msgid ""
! "move your @shortcontents and @contents commands if you want the contents "
! "after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:1093
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s er ikke en gyldig sprogkode"
  
! #: tp/Texinfo/Common.pm:1098
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s er ikke en gyldig regionskode"
  
! #: tp/Texinfo/Common.pm:1116
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%s er ikke en gyldig opdelingsmulighed"
  
! #: tp/Texinfo/Common.pm:1139
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "kunne ikke lÃ¦se %s: %s"
  
! #: tp/Texinfo/Common.pm:1158
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "fejl under lukning af @verbatiminclude-filen %s: %s"
  
! #: tp/Texinfo/Common.pm:1164 tp/Texinfo/Parser.pm:3193
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%s: kunne ikke finde: %s"
  
! #: tp/Texinfo/Common.pm:1637
  msgid "no node to be renamed"
  msgstr "intet navn at omdÃ¸be"
  
! #: tp/Texinfo/Common.pm:1648
  msgid "nodes without a new name at the end of file"
  msgstr "emner uden et navn i slutningen af filen"
  
! #: tp/Texinfo/Common.pm:1658 tp/Texinfo/Parser.pm:899
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "kunne ikke Ã¥bne %s: %s"
  
! #: tp/Texinfo/Common.pm:2178
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr "kunne ikke beskytte hash-tegn i @%s"
  
! #: tp/Texinfo/Convert/Converter.pm:387 tp/Texinfo/Convert/Converter.pm:406
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "ForÃ¦ldet variabel %s\n"
  
! # split er nok programmet split
! #: tp/Texinfo/Convert/Converter.pm:786
  #, perl-format
  msgid "%s: output incompatible with split"
! msgstr "%s: uddata er ikke kompatible med split"
  
! #: tp/Texinfo/Convert/Converter.pm:868 tp/Texinfo/Convert/Converter.pm:901
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:7004
! #: tp/Texinfo/Convert/HTML.pm:7063 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:477 tp/Texinfo/Parser.pm:1996
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "der opstod en fejl under lukning af %s: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:979
  #, 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:987
  #, perl-format
  msgid "could not create directory `%s': %s"
***************
*** 2092,2147 ****
  msgstr "@image-filen Â»%sÂ« blev ikke fundet, anvender Â»%sÂ«"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5388
  msgid "no argument specified for @U"
  msgstr "Intet parameter specificeret for @U"
  
! #: tp/Texinfo/Convert/HTML.pm:1683
  #, 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:2371
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "rÃ¥ format %s er ikke konverteret"
  
! #: tp/Texinfo/Convert/HTML.pm:4888
  msgid "string not closed in css file"
  msgstr "streng ikke lukket i css-fil"
  
! #: tp/Texinfo/Convert/HTML.pm:4890
  msgid "--css-include ended in comment"
  msgstr "--css-include afsluttet i kommentar"
  
! #: tp/Texinfo/Convert/HTML.pm:4892
  msgid "@import not finished in css file"
  msgstr "@import er ikke fÃ¦rdig i css-fil"
  
! #: tp/Texinfo/Convert/HTML.pm:4918
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "CSS-filen %s blev ikke fundet"
  
! #: tp/Texinfo/Convert/HTML.pm:4924
  #, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "kunne ikke Ã¥bne --include-file %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:4934
  #, 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:5801 tp/Texinfo/Convert/HTML.pm:5805
  #, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "ingen htmlxref.cnf-poster blev fundet for Â»%sÂ«"
  
! #: tp/Texinfo/Convert/HTML.pm:6499
  #, 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:6523
  #, perl-format
  msgid "error on closing TOC frame file %s: %s"
--- 2145,2220 ----
  msgstr "@image-filen Â»%sÂ« blev ikke fundet, anvender Â»%sÂ«"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5225
  msgid "no argument specified for @U"
  msgstr "Intet parameter specificeret for @U"
  
! #: tp/Texinfo/Convert/HTML.pm:1715
  #, 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:2399
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "rÃ¥ format %s er ikke konverteret"
  
! #: tp/Texinfo/Convert/HTML.pm:4629
! #, 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:4657
! msgid "missing type"
! msgstr "manglende type"
! 
! #: tp/Texinfo/Convert/HTML.pm:4660
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "typen blev ikke genkendt: %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4677
! #, 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:4962
  msgid "string not closed in css file"
  msgstr "streng ikke lukket i css-fil"
  
! #: tp/Texinfo/Convert/HTML.pm:4964
  msgid "--css-include ended in comment"
  msgstr "--css-include afsluttet i kommentar"
  
! #: tp/Texinfo/Convert/HTML.pm:4966
  msgid "@import not finished in css file"
  msgstr "@import er ikke fÃ¦rdig i css-fil"
  
! #: tp/Texinfo/Convert/HTML.pm:4992
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "CSS-filen %s blev ikke fundet"
  
! #: tp/Texinfo/Convert/HTML.pm:4998
  #, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "kunne ikke Ã¥bne --include-file %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5008
  #, 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:5870 tp/Texinfo/Convert/HTML.pm:5874
  #, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "ingen htmlxref.cnf-poster blev fundet for Â»%sÂ«"
  
! #: tp/Texinfo/Convert/HTML.pm:6568
  #, 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:6592
  #, perl-format
  msgid "error on closing TOC frame file %s: %s"
***************
*** 2149,2182 ****
  "der opstod en fejl under lukning af indholdsfortegnelsens frame-fil %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6638
  #, 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:6839
  msgid "must specify a title with a title command or @top"
  msgstr "skal specificere en titel med en titelkommando eller @top"
  
! #: tp/Texinfo/Convert/HTML.pm:7048
  #, 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:7073
  #, 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:7079
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "fil tom for omdÃ¸bt emne Â»%sÂ«"
  
! #: tp/Texinfo/Convert/HTML.pm:7093
  #, 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:7125
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
--- 2222,2255 ----
  "der opstod en fejl under lukning af indholdsfortegnelsens frame-fil %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6707
  #, 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:6912
  msgid "must specify a title with a title command or @top"
  msgstr "skal specificere en titel med en titelkommando eller @top"
  
! #: tp/Texinfo/Convert/HTML.pm:7122
  #, 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:7147
  #, 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:7153
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "fil tom for omdÃ¸bt emne Â»%sÂ«"
  
! #: tp/Texinfo/Convert/HTML.pm:7167
  #, 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:7199
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
***************
*** 2184,2192 ****
  "der opstod en fejl under lukning af omdÃ¸bt emnevideresendelsesfil %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7163
  msgid "empty node name"
  msgstr "tomt emnenavn"
  
! #: tp/Texinfo/Convert/HTML.pm:7165 tp/Texinfo/Parser.pm:3697
  #, perl-format
  msgid "syntax for an external node used for `%s'"
--- 2257,2265 ----
  "der opstod en fejl under lukning af omdÃ¸bt emnevideresendelsesfil %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7237
  msgid "empty node name"
  msgstr "tomt emnenavn"
  
! #: tp/Texinfo/Convert/HTML.pm:7239 tp/Texinfo/Parser.pm:3542
  #, perl-format
  msgid "syntax for an external node used for `%s'"
***************
*** 2223,2252 ****
  msgstr "@node-navn mÃ¥ ikke indeholde Â»,Â«: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1334
  #, 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:1381 tp/Texinfo/Parser.pm:2722
  #, perl-format
  msgid "entry for index `%s' outside of any node"
  msgstr "post for indeks Â»%sÂ« udenfor et emne"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1495
  #, 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:1500
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "@image-filen Â»%sÂ« er ikke lÃ¦sbar: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1523
  #, 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:1931
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
--- 2296,2325 ----
  msgstr "@node-navn mÃ¥ ikke indeholde Â»,Â«: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1335
  #, 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:1382 tp/Texinfo/Parser.pm:2568
  #, perl-format
  msgid "entry for index `%s' outside of any node"
  msgstr "post for indeks Â»%sÂ« udenfor et emne"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1496
  #, 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:1501
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "@image-filen Â»%sÂ« er ikke lÃ¦sbar: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1524
  #, 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:1932
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
***************
*** 2256,2582 ****
  "dette"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2161
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr "@%s-krydsreferencenavn mÃ¥ ikke indeholde Â»:Â«"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2193
  #, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "@%s-emnenavn mÃ¥ ikke indeholde Â»%sÂ«"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2226
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr "@%s-emnenavn mÃ¥ ikke indeholde Â»:Â«"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2272
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
! msgstr "en @ref skal efterfÃ¸lges af Â».Â« eller Â»,Â«, ikke %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2275
  msgid "`.' or `,' must follow @xref"
  msgstr "en @xref skal efterfÃ¸lges af Â».Â« eller Â»,Â«"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3118
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr "emnenavn for menupunkt mÃ¥ ikke indeholde Â»%sÂ«"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3129
  msgid "menu entry node name should not contain `:'"
  msgstr "menupostens emnenavn mÃ¥ ikke indeholde Â»:Â«"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3145
  msgid "menu entry name should not contain `:'"
  msgstr "menupostens navn mÃ¥ ikke indeholde Â»:Â«"
  
! #: tp/Texinfo/Parser.pm:910
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
! msgstr "@%s mÃ¥ ikke fremgÃ¥ i begyndelsen eller slutningen af dokumentet"
  
! #: tp/Texinfo/Parser.pm:1160 tp/Texinfo/Structuring.pm:594
  #, perl-format
  msgid "multiple @%s"
  msgstr "flere @%s"
  
! #: tp/Texinfo/Parser.pm:1194
  #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "ugyldig syntaks for @%s-parameter: %s"
  
! #: tp/Texinfo/Parser.pm:1210
  #, perl-format
! msgid "bad or empty @%s formal argument: %s"
! msgstr "ugyldig eller tom @%s-formel parameter: %s"
  
! #: tp/Texinfo/Parser.pm:1219 tp/Texinfo/Parser.pm:4856
! #: tp/Texinfo/Parser.pm:4882 tp/Texinfo/Parser.pm:5671
! #: tp/Texinfo/Parser.pm:5687 tp/Texinfo/Parser.pm:5702
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s krÃ¦ver et navn"
  
! #: tp/Texinfo/Parser.pm:1223 tp/Texinfo/Parser.pm:4859
! #: tp/Texinfo/Parser.pm:4885 tp/Texinfo/Parser.pm:5674
! #: tp/Texinfo/Parser.pm:5690 tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad name for @%s"
  msgstr "ugyldigt navn for @%s"
  
! #: tp/Texinfo/Parser.pm:1341
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
! msgstr "@end %s set fÃ¸r @%s-lukket firkantet parentes"
  
! #: tp/Texinfo/Parser.pm:1345
  #, perl-format
  msgid "@%s seen before @%s closing brace"
! msgstr "@%s set fÃ¸r @%s-lukket firkantet parentes"
  
! #: tp/Texinfo/Parser.pm:1350
! #, perl-format
! msgid "%c%s missing close brace"
! msgstr "%c%s mangler afsluttende firkantet parentes"
  
! #: tp/Texinfo/Parser.pm:1354
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:1476
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "@itemx mÃ¥ ikke begynde @%s"
  
! #: tp/Texinfo/Parser.pm:1544
  msgid "@itemx must follow @item"
  msgstr "@itemx skal fÃ¸lge @item"
  
! #: tp/Texinfo/Parser.pm:1712
  #, perl-format
  msgid "@%s has text but no @item"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:1743
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "Â»@endÂ« forventede Â»%sÂ«, men fandt Â»%sÂ«"
  
! #: tp/Texinfo/Parser.pm:1746
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@%s set fÃ¸r @end %s"
  
! #: tp/Texinfo/Parser.pm:1750
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "ingen matchende Â»%cend %sÂ«"
  
! #: tp/Texinfo/Parser.pm:1776 tp/Texinfo/Parser.pm:5204
! #: tp/Texinfo/Parser.pm:5470
  #, perl-format
  msgid "misplaced %c"
  msgstr "fejlplaceret %c"
  
! #: tp/Texinfo/Parser.pm:1874 tp/Texinfo/Parser.pm:3312
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "uparret Â»%c%sÂ«"
  
! #: tp/Texinfo/Parser.pm:2110
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "makro Â»%sÂ« kaldt med for mange parametre"
  
! #: tp/Texinfo/Parser.pm:2132
! #, perl-format
! msgid "@%s missing close brace"
! msgstr "@%s mangler afsluttende firkantet parentes"
  
! #: tp/Texinfo/Parser.pm:2140
  #, 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/Parser.pm:2175
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
! msgstr "\\ i @%s-udfoldelse fulgt af Â»%sÂ« i stedet for parameternavn eller \\"
  
! #: tp/Texinfo/Parser.pm:2650
! #, fuzzy, perl-format
  msgid "@%s `%s' previously defined"
! msgstr "aliasset Â»%sÂ« er allerede defineret"
  
! #: tp/Texinfo/Parser.pm:2655
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "her er den tidligere definition som @%s"
  
! #: tp/Texinfo/Parser.pm:3016
  #, perl-format
  msgid "missing name for @%s"
  msgstr "mangler navn for @%s"
  
! #: tp/Texinfo/Parser.pm:3021
  #, perl-format
  msgid "missing category for @%s"
  msgstr "mangler kategori for @%s"
  
! #: tp/Texinfo/Parser.pm:3073
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "uventet parameter pÃ¥ @%s-linje: %s"
  
! #: tp/Texinfo/Parser.pm:3089
! #, fuzzy
  msgid "empty multitable"
! msgstr "Tom database"
  
! #: tp/Texinfo/Parser.pm:3145 tp/Texinfo/Parser.pm:5784
! #, fuzzy, perl-format
  msgid "superfluous argument to @%s"
! msgstr "Ugyldigt argument til %c%s"
  
! #: tp/Texinfo/Parser.pm:3151 tp/Texinfo/Parser.pm:5806
! #: tp/Texinfo/Parser.pm:5818
! #, fuzzy, perl-format
  msgid "bad argument to @%s"
! msgstr "ugyldig %s%s-argument Â»%sÂ«"
  
! #: tp/Texinfo/Parser.pm:3162
! #, fuzzy, perl-format
  msgid "%s requires an argument: the formatter for %citem"
! msgstr "%s: tilvalget krÃ¦ver et argument -- Â»%cÂ«\n"
  
! #: tp/Texinfo/Parser.pm:3167
  #, perl-format
  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"
  
! #: tp/Texinfo/Parser.pm:3202
! #, fuzzy, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
! msgstr "tilvalget Â»%sÂ« tillader ikke et argument"
  
! #: tp/Texinfo/Parser.pm:3290 tp/Texinfo/Parser.pm:3429
! #: tp/Texinfo/Parser.pm:5777
! #, fuzzy, perl-format
  msgid "@%s missing argument"
! msgstr "mangler argument"
  
! #: tp/Texinfo/Parser.pm:3302
! #, fuzzy, perl-format
  msgid "unknown @end %s"
! msgstr "ukendt ord Â»%sÂ«"
  
! #: tp/Texinfo/Parser.pm:3324 tp/Texinfo/Parser.pm:3943
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:3329 tp/Texinfo/Parser.pm:5861
! #: tp/Texinfo/Parser.pm:5906 tp/Texinfo/Parser.pm:5935
! #: tp/Texinfo/Parser.pm:5976 tp/Texinfo/Parser.pm:6055
! #, fuzzy, perl-format
  msgid "bad argument to @%s: %s"
! msgstr "ugyldigt paramter Â»%sÂ« til tilvalg Â»%sÂ«"
  
! #: tp/Texinfo/Parser.pm:3348
! #, fuzzy, perl-format
  msgid "@%s: could not open %s: %s"
! msgstr "kan ikke Ã¥bne Â»%sÂ«: %s"
  
! #: tp/Texinfo/Parser.pm:3360
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:3369
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "ukendt kodningsnavn Â»%sÂ«"
  
! #: tp/Texinfo/Parser.pm:3516
  #, perl-format
  msgid "@%s after the first element"
  msgstr "@%s efter det fÃ¸rste element"
  
! #: tp/Texinfo/Parser.pm:3523
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:3563
  #, perl-format
  msgid "@%s should not be associated with @top"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:3575
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:3677
! #, fuzzy, perl-format
  msgid "empty argument in @%s"
! msgstr "tomt filnavn i #%s"
  
! #: tp/Texinfo/Parser.pm:3681
  #, perl-format
  msgid "empty node name after expansion `%s'"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:3724
! #, fuzzy, perl-format
  msgid "empty menu entry name in `%s'"
! msgstr "tomt filnavn i #%s"
  
! #: tp/Texinfo/Parser.pm:3732
  msgid "empty node name in menu entry"
  msgstr "tomt emnenavn i menupunkt"
  
! #: tp/Texinfo/Parser.pm:3805
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "@%s bÃ¸r ikke fremgÃ¥ i @%s"
  
! #: tp/Texinfo/Parser.pm:3937
! #, perl-format
! msgid "@end %s should only appear at a line beginning"
! msgstr ""
! 
! #: tp/Texinfo/Parser.pm:3960
  #, fuzzy, perl-format
  msgid "macro `%s' previously defined"
! msgstr "aliasset Â»%sÂ« er allerede defineret"
  
! #: tp/Texinfo/Parser.pm:3963
! #, fuzzy, perl-format
  msgid "here is the previous definition of `%s'"
! msgstr "placering af den forrige definition"
  
! #: tp/Texinfo/Parser.pm:3968
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:4017
! #, fuzzy, perl-format
  msgid "@%s without associated character"
! msgstr "%s uden en Ã¥rsag"
  
! #: tp/Texinfo/Parser.pm:4087
  #, perl-format
  msgid ""
  "@%s defined with zero or more than one argument should be invoked with {}"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:4111
  #, perl-format
  msgid ""
--- 2329,2655 ----
  "dette"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2162
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr "@%s-krydsreferencenavn mÃ¥ ikke indeholde Â»:Â«"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2194
  #, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "@%s-emnenavn mÃ¥ ikke indeholde Â»%sÂ«"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2227
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr "@%s-emnenavn mÃ¥ ikke indeholde Â»:Â«"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2273
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
! msgstr "en @xref skal efterfÃ¸lges af Â».Â« eller Â»,Â«, ikke %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2276
  msgid "`.' or `,' must follow @xref"
  msgstr "en @xref skal efterfÃ¸lges af Â».Â« eller Â»,Â«"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3086
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr "emnenavn for menupunkt mÃ¥ ikke indeholde Â»%sÂ«"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3097
  msgid "menu entry node name should not contain `:'"
  msgstr "menupostens emnenavn mÃ¥ ikke indeholde Â»:Â«"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3113
  msgid "menu entry name should not contain `:'"
  msgstr "menupostens navn mÃ¥ ikke indeholde Â»:Â«"
  
! #: tp/Texinfo/Parser.pm:883
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
! msgstr "@%s mÃ¥ kun fremgÃ¥ i begyndelsen eller slutningen af dokumentet"
  
! #: tp/Texinfo/Parser.pm:1125 tp/Texinfo/Structuring.pm:595
  #, perl-format
  msgid "multiple @%s"
  msgstr "flere @%s"
  
! #: tp/Texinfo/Parser.pm:1166
  #, perl-format
! msgid "bad or empty @%s formal argument: %s"
! msgstr "ugyldig eller tom formel @%s-parameter: %s"
  
! #: tp/Texinfo/Parser.pm:1176
  #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "ugyldig syntaks for @%s-parameter: %s"
  
! #: tp/Texinfo/Parser.pm:1183 tp/Texinfo/Parser.pm:4707
! #: tp/Texinfo/Parser.pm:4733 tp/Texinfo/Parser.pm:5565
! #: tp/Texinfo/Parser.pm:5578 tp/Texinfo/Parser.pm:5592
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s krÃ¦ver et navn"
  
! #: tp/Texinfo/Parser.pm:1187 tp/Texinfo/Parser.pm:4710
! #: tp/Texinfo/Parser.pm:4736 tp/Texinfo/Parser.pm:5568
! #: tp/Texinfo/Parser.pm:5581 tp/Texinfo/Parser.pm:5595
  #, perl-format
  msgid "bad name for @%s"
  msgstr "ugyldigt navn for @%s"
  
! #: tp/Texinfo/Parser.pm:1305
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
! msgstr "@end %s set fÃ¸r @%s-afsluttende tuborgklamme"
  
! #: tp/Texinfo/Parser.pm:1309
  #, perl-format
  msgid "@%s seen before @%s closing brace"
! msgstr "@%s set fÃ¸r @%s-afsluttende tuborgklamme"
  
! #: tp/Texinfo/Parser.pm:1314
! #, fuzzy, perl-format
! msgid "%c%s missing closing brace"
! msgstr "%c%s mangler afsluttende tuborgklamme"
  
! #: tp/Texinfo/Parser.pm:1318
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
! msgstr "@%s mangler afsluttende afgrÃ¦nsningssekvens: %s}"
  
! #: tp/Texinfo/Parser.pm:1440
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "@itemx mÃ¥ ikke begynde @%s"
  
! #: tp/Texinfo/Parser.pm:1508
  msgid "@itemx must follow @item"
  msgstr "@itemx skal fÃ¸lge @item"
  
! #: tp/Texinfo/Parser.pm:1676
  #, perl-format
  msgid "@%s has text but no @item"
! msgstr "@%s har tekst men intet @item"
  
! #: tp/Texinfo/Parser.pm:1707
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "Â»@endÂ« forventede Â»%sÂ«, men fandt Â»%sÂ«"
  
! #: tp/Texinfo/Parser.pm:1710
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@%s set fÃ¸r @end %s"
  
! #: tp/Texinfo/Parser.pm:1714
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "ingen matchende Â»%cend %sÂ«"
  
! #: tp/Texinfo/Parser.pm:1738 tp/Texinfo/Parser.pm:5070
! #: tp/Texinfo/Parser.pm:5308
  #, perl-format
  msgid "misplaced %c"
  msgstr "fejlplaceret %c"
  
! #: tp/Texinfo/Parser.pm:1835 tp/Texinfo/Parser.pm:3148
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "uparret Â»%c%sÂ«"
  
! #: tp/Texinfo/Parser.pm:2072
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "makro Â»%sÂ« kaldt med for mange parametre"
  
! #: tp/Texinfo/Parser.pm:2094
! #, fuzzy, perl-format
! msgid "@%s missing closing brace"
! msgstr "@%s mangler afsluttende tuborgklamme"
  
! #: tp/Texinfo/Parser.pm:2102
  #, 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/Parser.pm:2138
  #, 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/Parser.pm:2501
! #, perl-format
  msgid "@%s `%s' previously defined"
! msgstr "@%s Â»%sÂ« er allerede defineret"
  
! #: tp/Texinfo/Parser.pm:2506
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "her er den tidligere definition som @%s"
  
! #: tp/Texinfo/Parser.pm:2850
  #, perl-format
  msgid "missing name for @%s"
  msgstr "mangler navn for @%s"
  
! #: tp/Texinfo/Parser.pm:2855
  #, perl-format
  msgid "missing category for @%s"
  msgstr "mangler kategori for @%s"
  
! #: tp/Texinfo/Parser.pm:2890
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "uventet parameter pÃ¥ @%s-linje: %s"
  
! #: tp/Texinfo/Parser.pm:2905
  msgid "empty multitable"
! msgstr "tom multitable"
  
! #: tp/Texinfo/Parser.pm:2959 tp/Texinfo/Parser.pm:5673
! #, perl-format
  msgid "superfluous argument to @%s"
! msgstr "overflÃ¸dig parameter til @%s"
  
! #: tp/Texinfo/Parser.pm:2965 tp/Texinfo/Parser.pm:5694
! #: tp/Texinfo/Parser.pm:5705
! #, perl-format
  msgid "bad argument to @%s"
! msgstr "ugyldig parameter til @%s"
  
! #: tp/Texinfo/Parser.pm:2976
! #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
! msgstr "%s krÃ¦ver en parameter: formateringsprogrammet for %citem"
  
! #: tp/Texinfo/Parser.pm:2981
  #, 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/Parser.pm:3016
! #, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
! msgstr "accent-kommandoen Â»@%sÂ« er ikke tilladt som parameter for @%s"
  
! #: tp/Texinfo/Parser.pm:3124 tp/Texinfo/Parser.pm:3277
! #: tp/Texinfo/Parser.pm:5666
! #, perl-format
  msgid "@%s missing argument"
! msgstr "@%s mangler parameter"
  
! #: tp/Texinfo/Parser.pm:3138
! #, perl-format
  msgid "unknown @end %s"
! msgstr "ukendt @end %s"
  
! #: tp/Texinfo/Parser.pm:3161 tp/Texinfo/Parser.pm:3788
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
! msgstr "overflÃ¸dig parameter for @%s %s: %s"
  
! #: tp/Texinfo/Parser.pm:3167 tp/Texinfo/Parser.pm:3245
! #: tp/Texinfo/Parser.pm:5755 tp/Texinfo/Parser.pm:5798
! #: tp/Texinfo/Parser.pm:5827 tp/Texinfo/Parser.pm:5868
! #: tp/Texinfo/Parser.pm:5946
! #, perl-format
  msgid "bad argument to @%s: %s"
! msgstr "ugyldig parameter for @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3188
! #, perl-format
  msgid "@%s: could not open %s: %s"
! msgstr "@%s: kunne ikke Ã¥bne %s: %s"
  
! #: tp/Texinfo/Parser.pm:3200
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
! msgstr "kodningen Â»%sÂ« er ikke en kanonisk texinfo-kodning"
  
! #: tp/Texinfo/Parser.pm:3208
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "ukendt kodningsnavn Â»%sÂ«"
  
! #: tp/Texinfo/Parser.pm:3364
  #, perl-format
  msgid "@%s after the first element"
  msgstr "@%s efter det fÃ¸rste element"
  
! #: tp/Texinfo/Parser.pm:3371
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
! msgstr "@%s er kun meningsfuldt pÃ¥ en @multitable-linje"
  
! #: tp/Texinfo/Parser.pm:3408
  #, perl-format
  msgid "@%s should not be associated with @top"
! msgstr "@%s bÃ¸r ikke associeres med @top"
  
! #: tp/Texinfo/Parser.pm:3420
  #, 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 associeret med emner"
  
! #: tp/Texinfo/Parser.pm:3522
! #, perl-format
  msgid "empty argument in @%s"
! msgstr "tom parameter i @%s"
  
! #: tp/Texinfo/Parser.pm:3526
  #, perl-format
  msgid "empty node name after expansion `%s'"
! msgstr "tomt emnenavn efter udtryk Â»%sÂ«"
  
! #: tp/Texinfo/Parser.pm:3569
! #, perl-format
  msgid "empty menu entry name in `%s'"
! msgstr "tomt menupunktnavn i Â»%sÂ«"
  
! #: tp/Texinfo/Parser.pm:3577
  msgid "empty node name in menu entry"
  msgstr "tomt emnenavn i menupunkt"
  
! #: tp/Texinfo/Parser.pm:3650
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "@%s bÃ¸r ikke fremgÃ¥ i @%s"
  
! #: tp/Texinfo/Parser.pm:3782
  #, fuzzy, perl-format
+ msgid "@end %s should only appear at the beginning of a line"
+ msgstr "@end %s bÃ¸r kun fremgÃ¥ pÃ¥ en linjebegyndelse"
+ 
+ #: tp/Texinfo/Parser.pm:3804
+ #, perl-format
  msgid "macro `%s' previously defined"
! msgstr "makroen Â»%sÂ« er allerede defineret"
  
! #: tp/Texinfo/Parser.pm:3807
! #, perl-format
  msgid "here is the previous definition of `%s'"
! msgstr "her er den tidligere definition af Â»%sÂ«"
  
! #: tp/Texinfo/Parser.pm:3812
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
! msgstr "Ã¦ndrer definition pÃ¥ Texinfo-sprogkommando: @%s"
  
! #: tp/Texinfo/Parser.pm:3879
! #, perl-format
  msgid "@%s without associated character"
! msgstr "@%s uden associeret tegn"
  
! #: tp/Texinfo/Parser.pm:3949
  #, 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/Parser.pm:3974
  #, perl-format
  msgid ""
***************
*** 2584,2895 ****
  "value %d)"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4120
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:4176
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:4182
  #, perl-format
  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"
  
! #: tp/Texinfo/Parser.pm:4195 tp/Texinfo/Parser.pm:5325
! #, fuzzy, perl-format
  msgid "%c%s expects `i' or `j' as argument, not `%s'"
! msgstr "%c%s krÃ¦ver 'i' eller 'j' som parameter, ikke '%c'"
  
! #: tp/Texinfo/Parser.pm:4207
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:4218
  #, perl-format
  msgid "@%s expected braces"
! msgstr "@%s forventede firkantede parenteser"
  
! #: tp/Texinfo/Parser.pm:4383
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "flag er ikke defineret: %s"
  
! #: tp/Texinfo/Parser.pm:4386
  msgid "bad syntax for @value"
  msgstr "ugyldig syntaks for @value"
  
! #: tp/Texinfo/Parser.pm:4393
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s er forÃ¦ldet."
  
! #: tp/Texinfo/Parser.pm:4396
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s er forÃ¦ldet; %s"
  
! #: tp/Texinfo/Parser.pm:4405
! #, perl-format
! msgid "@%s should only appear at a line beginning"
! msgstr ""
! 
! #: tp/Texinfo/Parser.pm:4496
  #, fuzzy, perl-format
  msgid "@%s not allowed inside `@%s' block"
! msgstr "@%s giver ingen mening i en '@%s'-blok"
  
! #: tp/Texinfo/Parser.pm:4505
  #, perl-format
  msgid "@%s should only appear in heading or footing"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:4631 tp/Texinfo/Parser.pm:4648
! #: tp/Texinfo/Parser.pm:4698
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s giver ingen mening i en Â»@%sÂ«-blok"
  
! #: tp/Texinfo/Parser.pm:4658
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "@%s i tom multitable"
  
! #: tp/Texinfo/Parser.pm:4664
  msgid "@tab before @item"
  msgstr "@tab fÃ¸r @item"
  
! #: tp/Texinfo/Parser.pm:4667
! #, fuzzy, perl-format
  msgid "too many columns in multitable item (max %d)"
! msgstr "For mange sÃ¸jler i 'multitable' element (maks %d)"
  
! #: tp/Texinfo/Parser.pm:4704
  msgid "ignoring @tab outside of multitable"
  msgstr "ignorerer @tab udenfor 'multitable'"
  
! #: tp/Texinfo/Parser.pm:4708
  #, perl-format
  msgid "@%s outside of table or list"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:4745
! #, fuzzy, perl-format
  msgid "must be after `@%s' to use `@%s'"
! msgstr "Skal vÃ¦re i '%s' indsÃ¦tning for at bruge '%sx'"
  
! #: tp/Texinfo/Parser.pm:4787
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:4791
  msgid "@dircategory after first node"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:4979
! #, fuzzy, perl-format
  msgid "region %s inside region %s is not allowed"
! msgstr "%s: vÃ¦rdi %s er ikke tilladt"
  
! #: tp/Texinfo/Parser.pm:4997
  msgid "@direntry after first node"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:5005
! #, fuzzy, perl-format
  msgid "@%s seen before first @node"
! msgstr "@menu fundet fÃ¸r fÃ¸rste @node, opretter 'Top' emne"
  
! #: tp/Texinfo/Parser.pm:5008
  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/Parser.pm:5070
  #, perl-format
  msgid "@%s should only appear in math context"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:5078
! #, fuzzy, perl-format
  msgid "unknown command `%s'"
! msgstr "ukendt kommando"
  
! #: tp/Texinfo/Parser.pm:5088
! #, fuzzy
  msgid "unexpected @"
! msgstr "uventet eof (filafslutning)"
  
! #: tp/Texinfo/Parser.pm:5117
! #, fuzzy, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
! msgstr "@%s giver ingen mening i en '@%s'-blok"
  
! #: tp/Texinfo/Parser.pm:5122
  #, perl-format
  msgid "@%s should be right below `@float'"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:5130
! #, fuzzy, perl-format
  msgid "ignoring multiple @%s"
! msgstr "ignorerer ukendt ly-tilvalg: %s"
  
! #: tp/Texinfo/Parser.pm:5249
! #, fuzzy, perl-format
  msgid "command @%s does not accept arguments"
! msgstr "tilvalget Â»%sÂ« tillader ikke et argument"
  
! #: tp/Texinfo/Parser.pm:5273
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:5292
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:5303
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:5316
! #, fuzzy
  msgid "@image missing filename argument"
! msgstr "mangler argument"
  
! #: tp/Texinfo/Parser.pm:5348
! #, fuzzy, perl-format
  msgid "@%s missing first argument"
! msgstr "mangler argument"
  
! #: tp/Texinfo/Parser.pm:5393
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:5399
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
! msgstr ""
! 
! #: tp/Texinfo/Parser.pm:5412
! #, perl-format
! msgid "argument for @U exceeds size of integer: %s"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:5418
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:5546
  msgid "superfluous arguments for node"
  msgstr "overflÃ¸dige parametre for emne"
  
! #: tp/Texinfo/Parser.pm:5596
  #, perl-format
  msgid "expected @end %s"
  msgstr "forventede @end %s"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "@%s bÃ¸r kun acceptere en @-kommando som parameter, ikke Â»%sÂ«"
  
! #: tp/Texinfo/Parser.pm:5728
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "tilbagevÃ¦rende parameter pÃ¥ @%s linje: %s"
  
! #: tp/Texinfo/Parser.pm:5801
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "miljÃ¸kommandoen %s som parameter til @%s"
  
! #: tp/Texinfo/Parser.pm:5823
  #, perl-format
  msgid "empty @%s"
  msgstr "tom @%s"
  
! #: tp/Texinfo/Parser.pm:5831
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "kolonnefraktion er ikke et tal: %s"
  
! #: tp/Texinfo/Parser.pm:5840
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "@sp-parameter skal vÃ¦re numerisk, ikke Â»%sÂ«"
  
! #: tp/Texinfo/Parser.pm:5849
  #, perl-format
  msgid "reserved index name %s"
  msgstr "reserveret indeksnavn %s"
  
! #: tp/Texinfo/Parser.pm:5868
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "ukendt kildeindeks i @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5871
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "ukendt destinatinsindeks i @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:5914
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "ukendt indeks Â»%sÂ« i @printindex"
  
! #: tp/Texinfo/Parser.pm:5920
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr "udskriver et indeks Â»%sÂ« sammenfÃ¸jet i et andet Â»%sÂ«"
  
! #: tp/Texinfo/Parser.pm:5928
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "printindex fÃ¸r dokumentbegyndelse: @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5944
  #, 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/Parser.pm:5952
  #, 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/Parser.pm:5960
  #, 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/Parser.pm:5968
  #, 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/Parser.pm:5986 tp/Texinfo/Parser.pm:5991
  #, 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/Parser.pm:5999
  #, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
--- 2657,2962 ----
  "value %d)"
  msgstr ""
+ "makrokald indlejret for dybt (indstil MAX_NESTED_MACROS til overskrivning; "
+ "nuvÃ¦rende vÃ¦rdi %d)"
  
! #: tp/Texinfo/Parser.pm:3983
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
! msgstr "rekursiv kald af makro %s er ikke tilladt; brug @rmacro hvis krÃ¦vet"
  
! #: tp/Texinfo/Parser.pm:4038
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
! msgstr "accent-kommandoen Â»@%sÂ« mÃ¥ ikke efterfÃ¸lges af mellemrum"
  
! #: tp/Texinfo/Parser.pm:4044
  #, 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/Parser.pm:4057 tp/Texinfo/Parser.pm:5189
! #, 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/Parser.pm:4068
  #, 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/Parser.pm:4079
  #, perl-format
  msgid "@%s expected braces"
! msgstr "@%s forventede tuborgklammer"
  
! #: tp/Texinfo/Parser.pm:4233
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "flag er ikke defineret: %s"
  
! #: tp/Texinfo/Parser.pm:4236
  msgid "bad syntax for @value"
  msgstr "ugyldig syntaks for @value"
  
! #: tp/Texinfo/Parser.pm:4243
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s er forÃ¦ldet."
  
! #: tp/Texinfo/Parser.pm:4246
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s er forÃ¦ldet; %s"
  
! #: tp/Texinfo/Parser.pm:4255
  #, fuzzy, perl-format
+ msgid "@%s should only appear at the beginning of a line"
+ msgstr "@%s bÃ¸r kun fremgÃ¥r ved en linjes begyndelse"
+ 
+ #: tp/Texinfo/Parser.pm:4346
+ #, perl-format
  msgid "@%s not allowed inside `@%s' block"
! msgstr "@%s er ikke tilladt i en Â»@%sÂ«-blok"
  
! #: tp/Texinfo/Parser.pm:4355
  #, perl-format
  msgid "@%s should only appear in heading or footing"
! msgstr "@%s bÃ¸r ikke fremgÃ¥ i teksthoved eller tekstfod"
  
! #: tp/Texinfo/Parser.pm:4479 tp/Texinfo/Parser.pm:4496
! #: tp/Texinfo/Parser.pm:4546
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s giver ingen mening i en Â»@%sÂ«-blok"
  
! #: tp/Texinfo/Parser.pm:4506
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "@%s i tom multitable"
  
! #: tp/Texinfo/Parser.pm:4512
  msgid "@tab before @item"
  msgstr "@tab fÃ¸r @item"
  
! #: tp/Texinfo/Parser.pm:4515
! #, perl-format
  msgid "too many columns in multitable item (max %d)"
! msgstr "for mange kolonner i Â»multitableÂ«-element (maks %d)"
  
! #: tp/Texinfo/Parser.pm:4552
  msgid "ignoring @tab outside of multitable"
  msgstr "ignorerer @tab udenfor 'multitable'"
  
! #: tp/Texinfo/Parser.pm:4556
  #, perl-format
  msgid "@%s outside of table or list"
! msgstr "@%s uden for tabel eller liste"
  
! #: tp/Texinfo/Parser.pm:4596
! #, perl-format
  msgid "must be after `@%s' to use `@%s'"
! msgstr "skal vÃ¦re efter Â»@%sÂ« for at bruge Â»@%sÂ«"
  
! #: tp/Texinfo/Parser.pm:4638
  #, 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/Parser.pm:4642
  msgid "@dircategory after first node"
! msgstr "@dircategory efter fÃ¸rste emne"
  
! #: tp/Texinfo/Parser.pm:4847
! #, perl-format
  msgid "region %s inside region %s is not allowed"
! msgstr "regionen %s inden i region %s er ikke tilladt"
  
! #: tp/Texinfo/Parser.pm:4864
  msgid "@direntry after first node"
! msgstr "@direntry efter fÃ¸rste emne"
  
! #: tp/Texinfo/Parser.pm:4872
! #, perl-format
  msgid "@%s seen before first @node"
! msgstr "@%s fundet fÃ¸r fÃ¸rste @node"
  
! #: tp/Texinfo/Parser.pm:4875
  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/Parser.pm:4937
  #, perl-format
  msgid "@%s should only appear in math context"
! msgstr "@%s bÃ¸r ikke fremgÃ¥ i matematisk kontekst"
  
! #: tp/Texinfo/Parser.pm:4945
! #, perl-format
  msgid "unknown command `%s'"
! msgstr "ukendt kommando Â»%sÂ«"
  
! #: tp/Texinfo/Parser.pm:4955
  msgid "unexpected @"
! msgstr "uventet @"
  
! #: tp/Texinfo/Parser.pm:4983
! #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
! msgstr "@%s giver ingen mening uden for Â»@floatÂ«-miljÃ¸et"
  
! #: tp/Texinfo/Parser.pm:4988
  #, perl-format
  msgid "@%s should be right below `@float'"
! msgstr "@%s skal vÃ¦re lige under Â»@floatÂ«"
  
! #: tp/Texinfo/Parser.pm:4996
! #, perl-format
  msgid "ignoring multiple @%s"
! msgstr "ignorerer flere @%s"
  
! #: tp/Texinfo/Parser.pm:5114
! #, perl-format
  msgid "command @%s does not accept arguments"
! msgstr "kommandoen @%s tillader ikke parametre"
  
! #: tp/Texinfo/Parser.pm:5138
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
! msgstr "kommandoen @%s mangler et emne eller et eksternt manuelt parameter"
  
! #: tp/Texinfo/Parser.pm:5156
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
! msgstr "i @%s tomt krydsreferencenavn efter udvidelse Â»%sÂ«"
  
! #: tp/Texinfo/Parser.pm:5167
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
! msgstr "i @%s tomt krydsreferencetitel efter udvidelse Â»%sÂ«"
  
! #: tp/Texinfo/Parser.pm:5180
  msgid "@image missing filename argument"
! msgstr "@image mangler filnavnparameter"
  
! #: tp/Texinfo/Parser.pm:5211
! #, perl-format
  msgid "@%s missing first argument"
! msgstr "@%s mangler fÃ¸rste parameter"
  
! #: tp/Texinfo/Parser.pm:5230
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
! msgstr "ikke-hex cifre i parameter for @U: %s"
  
! #: tp/Texinfo/Parser.pm:5236
  #, 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/Parser.pm:5253
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
! msgstr "parameter for @U overgÃ¥r Unicodemaksimum 0x10FFFF: %s"
  
! #: tp/Texinfo/Parser.pm:5448
  msgid "superfluous arguments for node"
  msgstr "overflÃ¸dige parametre for emne"
  
! #: tp/Texinfo/Parser.pm:5498
  #, perl-format
  msgid "expected @end %s"
  msgstr "forventede @end %s"
  
! #: tp/Texinfo/Parser.pm:5607
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "@%s bÃ¸r kun acceptere en @-kommando som parameter, ikke Â»%sÂ«"
  
! #: tp/Texinfo/Parser.pm:5617
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "tilbagevÃ¦rende parameter pÃ¥ @%s linje: %s"
  
! #: tp/Texinfo/Parser.pm:5689
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "miljÃ¸kommandoen %s som parameter til @%s"
  
! #: tp/Texinfo/Parser.pm:5710
  #, perl-format
  msgid "empty @%s"
  msgstr "tom @%s"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "kolonnefraktion er ikke et tal: %s"
  
! #: tp/Texinfo/Parser.pm:5727
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "@sp-parameter skal vÃ¦re numerisk, ikke Â»%sÂ«"
  
! #: tp/Texinfo/Parser.pm:5736
  #, perl-format
  msgid "reserved index name %s"
  msgstr "reserveret indeksnavn %s"
  
! #: tp/Texinfo/Parser.pm:5762
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "ukendt kildeindeks i @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5765
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "ukendt destinatinsindeks i @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5793
  #, 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/Parser.pm:5806
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "ukendt indeks Â»%sÂ« i @printindex"
  
! #: tp/Texinfo/Parser.pm:5812
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr "udskriver et indeks Â»%sÂ« sammenfÃ¸jet i et andet Â»%sÂ«"
  
! #: tp/Texinfo/Parser.pm:5820
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "printindex fÃ¸r dokumentbegyndelse: @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5836
  #, 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/Parser.pm:5844
  #, 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/Parser.pm:5852
  #, 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/Parser.pm:5860
  #, 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/Parser.pm:5878 tp/Texinfo/Parser.pm:5883
  #, 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/Parser.pm:5891
  #, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
***************
*** 2897,2911 ****
  "@firstparagraphindent-parameter skal vÃ¦re Â»noneÂ« eller Â»insertÂ«, ikke Â»%sÂ«"
  
! #: tp/Texinfo/Parser.pm:6009
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
  msgstr "@exampleindent-parameter skal vÃ¦re numeric/Â»asisÂ«, ikke Â»%sÂ«"
  
! #: tp/Texinfo/Parser.pm:6021
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "forventede @%s aktiveret eller deaktiveret, ikke Â»%sÂ«"
  
! #: tp/Texinfo/Parser.pm:6031
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
--- 2964,2978 ----
  "@firstparagraphindent-parameter skal vÃ¦re Â»noneÂ« eller Â»insertÂ«, ikke Â»%sÂ«"
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
  msgstr "@exampleindent-parameter skal vÃ¦re numeric/Â»asisÂ«, ikke Â»%sÂ«"
  
! #: tp/Texinfo/Parser.pm:5913
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "forventede @%s aktiveret eller deaktiveret, ikke Â»%sÂ«"
  
! #: tp/Texinfo/Parser.pm:5922
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
***************
*** 2913,2992 ****
  "@kbdinputstyle-parameter skal vÃ¦re Â»codeÂ«/Â»exampleÂ«/Â»distinctÂ«, ikke Â»%sÂ«"
  
! #: tp/Texinfo/Parser.pm:6039
  #, 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/Parser.pm:6047
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
  msgstr "@urefbreakstyle-parameter skal vÃ¦re Â»afterÂ«/Â»beforeÂ«/Â»noneÂ«, ikke Â»%sÂ«"
  
! #: tp/Texinfo/Structuring.pm:213
  #, perl-format
  msgid "raising the section level of @%s which is too low"
! msgstr ""
  
! #: tp/Texinfo/Structuring.pm:245
  #, perl-format
  msgid "no chapter-level command before @%s"
! msgstr ""
  
! #: tp/Texinfo/Structuring.pm:250
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:339
  #, perl-format
  msgid "no sectioning command associated with @%s"
! msgstr ""
  
! #: tp/Texinfo/Structuring.pm:488
  #, perl-format
  msgid "@%s not empty"
  msgstr "@%s er ikke tom"
  
! #: tp/Texinfo/Structuring.pm:544 tp/Texinfo/Structuring.pm:1326
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "@%s-reference til ikkeeksisterende emne Â»%sÂ«"
  
! #: tp/Texinfo/Structuring.pm:557
  #, perl-format
  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:662
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "ikkerefereret emne Â»%sÂ«"
  
! #: tp/Texinfo/Structuring.pm:708
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
! msgstr ""
  
! #: tp/Texinfo/Structuring.pm:715
  #, 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:733
  #, 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:787
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
! msgstr ""
  
! #: tp/Texinfo/Structuring.pm:814
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%s-reference til ikkeeksisterende Â»%sÂ«"
  
! #: tp/Texinfo/Structuring.pm:834
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
--- 2980,3060 ----
  "@kbdinputstyle-parameter skal vÃ¦re Â»codeÂ«/Â»exampleÂ«/Â»distinctÂ«, ikke Â»%sÂ«"
  
! #: tp/Texinfo/Parser.pm:5930
  #, 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/Parser.pm:5938
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
  msgstr "@urefbreakstyle-parameter skal vÃ¦re Â»afterÂ«/Â»beforeÂ«/Â»noneÂ«, ikke Â»%sÂ«"
  
! #: tp/Texinfo/Structuring.pm:216
  #, perl-format
  msgid "raising the section level of @%s which is too low"
! msgstr "forÃ¸ger afsnitniveauet for @%s, der er for lavt"
  
! #: tp/Texinfo/Structuring.pm:248
  #, perl-format
  msgid "no chapter-level command before @%s"
! msgstr "ingen afsnitsniveaukommando fÃ¸r @%s"
  
! #: tp/Texinfo/Structuring.pm:253
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr ""
+ "formindsker afsnitniveauet for @%s, der fremgÃ¥r efter et lavere element"
  
! #: tp/Texinfo/Structuring.pm:342
  #, perl-format
  msgid "no sectioning command associated with @%s"
! msgstr "ingen afsnitsopdeling associeret med @%s"
  
! #: tp/Texinfo/Structuring.pm:491
  #, perl-format
  msgid "@%s not empty"
  msgstr "@%s er ikke tom"
  
! #: tp/Texinfo/Structuring.pm:547 tp/Texinfo/Structuring.pm:1325
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "@%s-reference til ikkeeksisterende emne Â»%sÂ«"
  
! #: tp/Texinfo/Structuring.pm:558
  #, perl-format
  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:663
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "ikkerefereret emne Â»%sÂ«"
  
! #: tp/Texinfo/Structuring.pm:706
  #, 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:713
  #, 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:731
  #, 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:786
  #, 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:810
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%s-reference til ikkeeksisterende Â»%sÂ«"
  
! #: tp/Texinfo/Structuring.pm:829
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
***************
*** 2994,2998 ****
  "emnet Â»%sÂ« mangler menupunkt for Â»%sÂ« pÃ¥ trods af at det er dens Â»OpÂ«-mÃ¥l"
  
! #: tp/Texinfo/Structuring.pm:842
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
--- 3062,3066 ----
  "emnet Â»%sÂ« mangler menupunkt for Â»%sÂ« pÃ¥ trods af at det er dens Â»OpÂ«-mÃ¥l"
  
! #: tp/Texinfo/Structuring.pm:837
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
***************
*** 3004,3008 ****
  msgstr "@%s til Â»%sÂ«, forskellig fra %s navn Â»%sÂ«"
  
! #: tp/Texinfo/Structuring.pm:2070
  #, perl-format
  msgid "empty index key in @%s"
--- 3072,3076 ----
  msgstr "@%s til Â»%sÂ«, forskellig fra %s navn Â»%sÂ«"
  
! #: tp/Texinfo/Structuring.pm:2067
  #, perl-format
  msgid "empty index key in @%s"
***************
*** 3063,3071 ****
  "of items found in the document"
  msgstr ""
  
  #: tp/init/latex2html.pm:534
! #, fuzzy, perl-format
  msgid "l2h: could not determine the fragment %d for @%s"
! msgstr "kunne ikke bestemme dato og tid"
  
  #: tp/init/latex2html.pm:560
--- 3131,3141 ----
  "of items found in the document"
  msgstr ""
+ "latex2html.pm: behandling fremstillede %d elementer i HTML; forventede %d, "
+ "antallet af elementer fundet i dokumentet"
  
  #: tp/init/latex2html.pm:534
! #, 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
***************
*** 3075,3118 ****
  "HTML"
  msgstr ""
  
  #: tp/init/latex2html.pm:621
! #, fuzzy, perl-format
  msgid "l2h: could not load %s: %s"
! msgstr "kan ikke indlÃ¦se fra %s: %s"
  
  #: tp/init/latex2html.pm:634
! #, fuzzy, perl-format
  msgid "l2h: could not open %s for writing: %s"
! msgstr "kan ikke Ã¥bne %s for skrivning: %s"
  
  #: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
! #, fuzzy, perl-format
  msgid "tex4ht.pm: could not open %s: %s"
! msgstr "kan ikke Ã¥bne Â»%sÂ«: %s"
  
  #: 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
--- 3145,3189 ----
  "HTML"
  msgstr ""
+ "l2h: kunne ikke udtrÃ¦kke fragmentet %d for @%s med uddatatÃ¦lleren %d fra HTML"
  
  #: tp/init/latex2html.pm:621
! #, perl-format
  msgid "l2h: could not load %s: %s"
! msgstr "l2h: kunne ikke indlÃ¦se %s: %s"
  
  #: tp/init/latex2html.pm:634
! #, 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
! #, perl-format
  msgid "tex4ht.pm: could not open %s: %s"
! msgstr "tex4ht.pm: kunne ikke Ã¥bne %s: %s"
  
  #: tp/init/tex4ht.pm:219
  #, perl-format
  msgid "tex4ht.pm: chdir %s failed: %s"
! msgstr "tex4ht.pm: chdir %s mislykkedes: %s"
  
  #: tp/init/tex4ht.pm:232
  #, 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
  #, perl-format
  msgid "tex4ht.pm: output file missing: %s"
! msgstr "tex4ht.pm: uddatafil mangler: %s"
  
  #: tp/init/tex4ht.pm:260
  #, perl-format
  msgid "tex4ht.pm: command failed: %s"
! msgstr "tex4ht.pm: kommando mislykkedes: %s"
  
  #: tp/init/tex4ht.pm:294
  #, 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
***************
*** 3122,3130 ****
  "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
--- 3193,3203 ----
  "items found in the document for @%s"
  msgstr ""
+ "tex4ht.pm: behandling fremstillede %d elementer i HTML; forventede %d, "
+ "antallet af elementer fundet i dokumentet for @%s"
  
  #: tp/init/tex4ht.pm:321
  #, 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
***************
*** 3134,3137 ****
--- 3207,3212 ----
  "items found in the document for @%s"
  msgstr ""
+ "tex4ht.pm: behandling hentede %d elementer i HTML; forventede %d, antallet "
+ "af elementer fundet i dokumentet for @%s"
  
  #: tp/texi2any.pl:383
***************
*** 3176,3180 ****
  
  #: tp/texi2any.pl:733
- #, fuzzy
  msgid ""
  "Translate Texinfo source documentation to various other formats, by default\n"
--- 3251,3254 ----
***************
*** 3188,3194 ****
  "Info-filer, der er lavet til at blive lÃ¦st pÃ¥ skÃ¦rmen med Emacs eller GNU "
  "Info.\n"
  
  #: tp/texi2any.pl:739
! #, fuzzy, perl-format
  msgid ""
  "General options:\n"
--- 3262,3271 ----
  "Info-filer, der er lavet til at blive lÃ¦st pÃ¥ skÃ¦rmen med Emacs eller GNU "
  "Info.\n"
+ "\n"
+ "Programmet installeres ofte som bÃ¥de Â»makeinfoÂ« og Â»texi2anyÂ«;\n"
+ "opfÃ¸relsen er identisk, og afhÃ¦nger ikke af det installerede navn.\n"
  
  #: tp/texi2any.pl:739
! #, perl-format
  msgid ""
  "General options:\n"
***************
*** 3208,3211 ****
--- 3285,3291 ----
  msgstr ""
  "Generelle tilvalg:\n"
+ "      --document-language=STR sprog der skal anvendes i oversÃ¦ttelsen af "
+ "Texinfo-nÃ¸gleord\n"
+ "                              for uddatadokumentet (standard er C).\n"
  "      --error-limit=ANTAL     afbryd efter ANTAL fejl (standard %d).\n"
  "      --force                 bevar uddata selvom der opstÃ¥r fejl.\n"
***************
*** 3213,3218 ****
  "      --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"
--- 3293,3301 ----
  "      --no-validate           undertryk validering af emne-krydsreferencer.\n"
  "      --no-warn               undertryk advarsler (men ikke fejl).\n"
! "      --conf-dir=MAPPE        sÃ¸g ogsÃ¥ for initialiseringsfiler i MAPPE.\n"
! "      --init-file=FIL         indlÃ¦s FIL for at Ã¦ndre standardopfÃ¸relsen.\n"
! "  -c, --set-customization-variable VAR=VÃ†RDI  indstil tilpasningsvariabel "
! "VAR \n"
! "                              til vÃ¦rdien VÃ†RDI.\n"
  "  -v, --verbose               forklar, hvad der sker.\n"
  "      --version               vis versionsoplysninger og afslut.\n"
***************
*** 3229,3242 ****
  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"
  
  #: tp/texi2any.pl:763
- #, fuzzy
  msgid ""
  "General output options:\n"
--- 3312,3324 ----
  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\n"
! "                                   format, efter kontrol af validitet for\n"
! "                                   TEXINFO-FIL.\n"
  
  #: tp/texi2any.pl:763
  msgid ""
  "General output options:\n"
***************
*** 3265,3280 ****
  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"
  
  #: tp/texi2any.pl:783
! #, fuzzy, perl-format
  msgid ""
  "Options for Info and plain text:\n"
--- 3347,3372 ----
  msgstr ""
  "Generelle uddatatilvalg:\n"
! "  -E, --macro-expand FIL      send makroekspanderet kildetekst til FIL.\n"
! "                              ignorer eventuelle @setfilename.\n"
! "      --no-headers            undertryk emneadskillere, Node:Â­linjer og "
! "menuer\n"
! "                              fra Infos uddata (og lav dermed simpel tekst)\n"
! "                              eller fra HTML (lav dermed kortere uddata).\n"
! "                              Hvis der fremstilles Info, sÃ¥ skriv til\n"
! "                              standardud som standard.\n"
! "      --no-split              undertryk opdeling af Info eller HTML-uddata,\n"
! "                              lav kun Ã©n uddatafil.\n"
! "      --[no-]number-sections  lav afsnits- og sektionsnumre.\n"
! "                              standard er aktiveret.\n"
! "  -o, --output=DEST           uddata til DEST.\n"
! "                              med opdelt uddata, opret DEST som en mappe\n"
! "                              og placer uddatafilerne der.\n"
! "                              Med ikke opdelt uddata, hvis DEST allerede er\n"
! "                              en mappe eller slutter med et /-tegn,\n"
! "                              sÃ¥ placer uddatafilen der.\n"
! "                              Ellers navngiver DEST uddatafilen.\n"
  
  #: tp/texi2any.pl:783
! #, perl-format
  msgid ""
  "Options for Info and plain text:\n"
***************
*** 3297,3317 ****
  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"
  
--- 3389,3412 ----
  msgstr ""
  "Tilvalg for Info og ren tekst:\n"
! "      --disable-encoding       lav ikke specielle tegn eller tegn med "
! "accent\n"
! "                               i Info-uddata baseret pÃ¥ @documentencoding.\n"
! "      --enable-encoding        konstruer specialtegn i Info-uddata 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"
  
***************
*** 3329,3332 ****
--- 3424,3439 ----
  "                                anchors; default is set only if split.\n"
  msgstr ""
+ "Tilvalg for HTML:\n"
+ "      --css-include=FIL       inkluder FIL i HTML <style> uddata;\n"
+ "                              lÃ¦s standardind hvis FIL er -.\n"
+ "      --css-ref=URL           opret CSS-reference til adresse.\n"
+ "      --internal-links=FIL    fremstil en liste over interne henvisninger i "
+ "FIL.\n"
+ "      --split=SPLIT           opdelt ved SPLIT, hvor SPLIT kan vÃ¦re "
+ "Â»chapterÂ«,\n"
+ "                              Â»sectionÂ« eller Â»nodeÂ«.\n"
+ "      --transliterate-file-names  brug filnavne i ASCII-translitteration.\n"
+ "      --node-files            frem videresendelsesfiler for emner og\n"
+ "                              ankre; standard indstilles kun hvis opdelt.\n"
  
  #: tp/texi2any.pl:811
***************
*** 3335,3338 ****
--- 3442,3447 ----
  "      --output-indent=VAL     does nothing, retained for compatibility.\n"
  msgstr ""
+ "Tilvalg for XML og Docbook:\n"
+ "      --output-indent=VÃ†RDI   gÃ¸r intet, bevaret for kompatibilitet.\n"
  
  #: tp/texi2any.pl:814
***************
*** 3341,3344 ****
--- 3450,3455 ----
  "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
  msgstr ""
+ "Tilvalg for DVI/PS/PDF:\n"
+ "      --Xopt=OPT              send OPT til texi2dvi; kan gentages.\n"
  
  #: tp/texi2any.pl:817
***************
*** 3355,3359 ****
  "      --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"
--- 3466,3470 ----
  "      --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 (en skalparameter).\n"
  "  -I MAPPE                      tilfÃ¸j MAPPE til @include-sÃ¸gestien.\n"
  "  -P MAPPE                      indsÃ¦t MAPPE forrest i @include-sÃ¸gestien.\n"
***************
*** 3362,3366 ****
  
  #: tp/texi2any.pl:825
- #, fuzzy
  msgid ""
  "Conditional processing in input:\n"
--- 3473,3476 ----
***************
*** 3382,3385 ****
--- 3492,3497 ----
  msgstr ""
  "Betinget behandling i inddata:\n"
+ "  --ifdocbook       behandl @ifdocbook og @docbook selv hvis\n"
+ "                    Docbook ikke oprettes.\n"
  "  --ifhtml          behandl @ifhtml og @html selvom der ikke laves HTML.\n"
  "  --ifinfo          behandl @ifinfo-tekst selvom der laves HTML.\n"
***************
*** 3387,3390 ****
--- 3499,3503 ----
  "  --iftex           behandl @iftex og @tex; underforstÃ¥r --no-split.\n"
  "  --ifxml           behandl @ifxml og @xml.\n"
+ "  --no-ifdocbook    behandl ikke @ifdocbook- og @docbook-tekst.\n"
  "  --no-ifhtml       behandl ikke @ifhtml og @html-tekst.\n"
  "  --no-ifinfo       behandl ikke @ifinfo-tekst.\n"
***************
*** 3459,3462 ****
--- 3572,3576 ----
  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 specificeres med -o\n"
  
  #: tp/texi2any.pl:1068
***************
*** 3477,3481 ****
  #, perl-format
  msgid "%s: missing file argument.\n"
! msgstr "%s: mangler filargument.\n"
  
  #: tp/texi2any.pl:1151
--- 3591,3595 ----
  #, perl-format
  msgid "%s: missing file argument.\n"
! msgstr "%s: mangler filparameter.\n"
  
  #: tp/texi2any.pl:1151
***************
*** 3484,3538 ****
  msgstr "PrÃ¸v Â»%s --helpÂ« for yderligere information.\n"
  
! #: tp/texi2any.pl:1232
  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:1255
  #, 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:1261
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "kunne ikke Ã¥bne %s for skrivning: %s\n"
  
! #: tp/texi2any.pl:1286
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
  "section?"
  msgstr ""
  
! #: tp/texi2any.pl:1359 tp/texi2any.pl:1435
  #, 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:1382 tp/texi2any.pl:1416
  #, 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:1388 tp/texi2any.pl:1422
  #, perl-format
  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"
--- 3598,3648 ----
  msgstr "PrÃ¸v Â»%s --helpÂ« for yderligere information.\n"
  
! #: tp/texi2any.pl:1239
  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:1262
  #, 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:1268
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "kunne ikke Ã¥bne %s for skrivning: %s\n"
  
! #: tp/texi2any.pl:1293
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
  "section?"
  msgstr ""
+ "insert_nodes_for_sectioning_commands-transformation returnerer intet "
+ "resultat. Manglende afsnit?"
  
! #: tp/texi2any.pl:1366 tp/texi2any.pl:1442
  #, 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:1389 tp/texi2any.pl:1423
  #, 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:1395 tp/texi2any.pl:1429
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
  msgstr "%s: kunne ikke Ã¥bne %s for skrivning: %s\n"
  
! #~ msgid "No file given for node '%s'."
! #~ msgstr "Ingen fil angivet for emnet Â»%sÂ«."
! 
! #~ 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 "argument for @U exceeds size of integer: %s"
! #~ msgstr "parameter for @U overgÃ¥r stÃ¸rrelsen for heltal: %s"
Binary files texinfo-6.1/po/de.gmo and texinfo-6.3/po/de.gmo differ
diff -Nrc2 texinfo-6.1/po/de.po texinfo-6.3/po/de.po
*** texinfo-6.1/po/de.po	2016-02-06 11:35:49.000000000 +0000
--- texinfo-6.3/po/de.po	2016-09-10 12:45:50.000000000 +0100
***************
*** 36,40 ****
  "Project-Id-Version: texinfo 5.9.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
  "PO-Revision-Date: 2015-03-02 13:41+0100\n"
  "Last-Translator: Mario BlÃ¤ttermann <mario.blaettermann@gmail.com>\n"
--- 36,40 ----
  "Project-Id-Version: texinfo 5.9.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:45+0100\n"
  "PO-Revision-Date: 2015-03-02 13:41+0100\n"
  "Last-Translator: Mario BlÃ¤ttermann <mario.blaettermann@gmail.com>\n"
***************
*** 44,47 ****
--- 44,48 ----
  "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 1.5.4\n"
***************
*** 141,145 ****
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [ or [^"
  msgstr "Nicht Ã¼bereinstimmende [ oder [^"
  
--- 142,147 ----
  
  #: gnulib/lib/regcomp.c:156
! #, fuzzy
! msgid "Unmatched [, [^, [:, [., or [="
  msgstr "Nicht Ã¼bereinstimmende [ oder [^"
  
***************
*** 180,184 ****
  msgstr "Nicht Ã¼bereinstimmende ) oder \\)"
  
! #: gnulib/lib/regcomp.c:711
  msgid "No previous regular expression"
  msgstr "Keine vorheriger regulÃ¤rer Ausdruck"
--- 182,186 ----
  msgstr "Nicht Ã¼bereinstimmende ) oder \\)"
  
! #: gnulib/lib/regcomp.c:687
  msgid "No previous regular expression"
  msgstr "Keine vorheriger regulÃ¤rer Ausdruck"
***************
*** 334,338 ****
  msgstr "---------- FuÃŸnoten ----------"
  
! #: info/indices.c:123 info/indices.c:812
  #, c-format
  msgid "Finding index entries..."
--- 336,340 ----
  msgstr "---------- FuÃŸnoten ----------"
  
! #: info/indices.c:123 info/indices.c:822
  #, c-format
  msgid "Finding index entries..."
***************
*** 343,347 ****
  msgstr "Eine Zeichenkette im Index dieser Datei suchen"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:818
  #, c-format
  msgid "No indices found."
--- 345,349 ----
  msgstr "Eine Zeichenkette im Index dieser Datei suchen"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:828
  #, c-format
  msgid "No indices found."
***************
*** 374,388 ****
  msgstr "Keine weiteren Index-EintrÃ¤ge, die â€ž%sâ€œ enthalten."
  
! #: info/indices.c:476 info/indices.c:880
  #, c-format
  msgid "No index entries containing '%s'."
  msgstr "Keine Index-EintrÃ¤ge, die â€ž%sâ€œ enthalten."
  
! #: info/indices.c:583
  #, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "Die Indizes von â€ž%sâ€œ werden durchsucht â€¦"
  
! #: info/indices.c:636
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
--- 376,390 ----
  msgstr "Keine weiteren Index-EintrÃ¤ge, die â€ž%sâ€œ enthalten."
  
! #: info/indices.c:476 info/indices.c:890
  #, c-format
  msgid "No index entries containing '%s'."
  msgstr "Keine Index-EintrÃ¤ge, die â€ž%sâ€œ enthalten."
  
! #: info/indices.c:586
  #, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "Die Indizes von â€ž%sâ€œ werden durchsucht â€¦"
  
! #: info/indices.c:646
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
***************
*** 390,407 ****
  "     und ein MenÃ¼ erstellen"
  
! #: info/indices.c:644 info/indices.c:646
  msgid "Index apropos"
  msgstr "Index-Apropos: "
  
! #: info/indices.c:688
  #, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Index-EintrÃ¤ge, die â€ž%sâ€œ enthalten:\n"
  
! #: info/indices.c:797
  msgid "List all matches of a string in the index"
  msgstr "Alle Ãœbereinstimmungen einer Zeichenkette im Index anzeigen"
  
! #: info/indices.c:824 info/indices.c:826
  msgid "Index topic"
  msgstr "Index-Thema: "
--- 392,409 ----
  "     und ein MenÃ¼ erstellen"
  
! #: info/indices.c:654 info/indices.c:656
  msgid "Index apropos"
  msgstr "Index-Apropos: "
  
! #: info/indices.c:698
  #, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Index-EintrÃ¤ge, die â€ž%sâ€œ enthalten:\n"
  
! #: info/indices.c:807
  msgid "List all matches of a string in the index"
  msgstr "Alle Ãœbereinstimmungen einer Zeichenkette im Index anzeigen"
  
! #: info/indices.c:834 info/indices.c:836
  msgid "Index topic"
  msgstr "Index-Thema: "
***************
*** 412,466 ****
  msgstr "Keine der verfÃ¼gbaren Info-Dateien hat â€ž%sâ€œ in ihren Indizes."
  
! #: info/info-utils.c:892
  #, c-format
  msgid "Error converting file character encoding."
  msgstr "Fehler bei der Umwandlung der Zeichenkodierung der Datei"
  
! #: info/info.c:222 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "Kein MenÃ¼eintrag â€ž%sâ€œ im Knoten â€ž%sâ€œ."
  
! #: info/info.c:315
! #, c-format
! msgid "No file given for node '%s'."
! msgstr "Keine Datei angegeben fÃ¼r Knoten â€ž%sâ€œ."
! 
! #: info/info.c:364 info/info.c:1133
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr "Knoten â€ž%sâ€œ wurde nicht gefunden."
  
! #: info/info.c:386
  #, c-format
  msgid "No program name given."
  msgstr "Es wurde kein Programmname angegeben."
  
! #: info/info.c:577
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "ungÃ¼ltige Zahl: %s\n"
  
! #: info/info.c:757
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "fehlgeformte Variablenzuweisung: %s"
  
! #: info/info.c:764 info/infokey.c:537
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: unbekannte Variable"
  
! #: info/info.c:770 info/infokey.c:539
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "Wert %s ist nicht gÃ¼ltig fÃ¼r Variable %s"
  
! #: info/info.c:782
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "â€ž--helpâ€œ gibt weitere Informationen.\n"
  
! #: info/info.c:804 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
--- 414,463 ----
  msgstr "Keine der verfÃ¼gbaren Info-Dateien hat â€ž%sâ€œ in ihren Indizes."
  
! #: info/info-utils.c:879
  #, c-format
  msgid "Error converting file character encoding."
  msgstr "Fehler bei der Umwandlung der Zeichenkodierung der Datei"
  
! #: info/info.c:279 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "Kein MenÃ¼eintrag â€ž%sâ€œ im Knoten â€ž%sâ€œ."
  
! #: info/info.c:416 info/info.c:1148
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr "Knoten â€ž%sâ€œ wurde nicht gefunden."
  
! #: info/info.c:438
  #, c-format
  msgid "No program name given."
  msgstr "Es wurde kein Programmname angegeben."
  
! #: info/info.c:636
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "ungÃ¼ltige Zahl: %s\n"
  
! #: info/info.c:816
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "fehlgeformte Variablenzuweisung: %s"
  
! #: info/info.c:823 info/infokey.c:540
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: unbekannte Variable"
  
! #: info/info.c:829 info/infokey.c:542
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "Wert %s ist nicht gÃ¼ltig fÃ¼r Variable %s"
  
! #: info/info.c:841
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "â€ž--helpâ€œ gibt weitere Informationen.\n"
  
! #: info/info.c:860 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
***************
*** 477,486 ****
  "Es gibt KEINERLEI Garantie, soweit es das Gesetz erlaubt.\n"
  
! #: info/info.c:981
  #, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "Keine IndexeintrÃ¤ge fÃ¼r â€ž%sâ€œ gefunden\n"
  
! #: info/info.c:1034
  #, c-format
  msgid ""
--- 474,483 ----
  "Es gibt KEINERLEI Garantie, soweit es das Gesetz erlaubt.\n"
  
! #: info/info.c:999
  #, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "Keine IndexeintrÃ¤ge fÃ¼r â€ž%sâ€œ gefunden\n"
  
! #: info/info.c:1049
  #, c-format
  msgid ""
***************
*** 493,497 ****
  "Zum Lesen von Dokumentation, die im Info-Format vorliegt.\n"
  
! #: info/info.c:1040
  msgid ""
  "Options:\n"
--- 490,494 ----
  "Zum Lesen von Dokumentation, die im Info-Format vorliegt.\n"
  
! #: info/info.c:1055
  msgid ""
  "Options:\n"
***************
*** 510,514 ****
  "  -f, --file=DATEI          zu Ã¶ffnende Info-DATEI angeben"
  
! #: info/info.c:1048
  msgid ""
  "  -h, --help                   display this help and exit.\n"
--- 507,511 ----
  "  -f, --file=DATEI          zu Ã¶ffnende Info-DATEI angeben"
  
! #: info/info.c:1063
  msgid ""
  "  -h, --help                   display this help and exit.\n"
***************
*** 524,528 ****
  "  -o, --output=DATEI        ausgewÃ¤hlte Knoten nach DATEI ausgeben"
  
! #: info/info.c:1054
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
--- 521,525 ----
  "  -o, --output=DATEI        ausgewÃ¤hlte Knoten nach DATEI ausgeben"
  
! #: info/info.c:1069
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
***************
*** 537,545 ****
  "                              Befehlsaufruf gehen"
  
! #: info/info.c:1061
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr "  -b, --speech-friendly     nett zu Sprachsynthesizern sein"
  
! #: info/info.c:1065
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
--- 534,542 ----
  "                              Befehlsaufruf gehen"
  
! #: info/info.c:1076
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr "  -b, --speech-friendly     nett zu Sprachsynthesizern sein"
  
! #: info/info.c:1080
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
***************
*** 561,565 ****
  "  -x, --debug=ZAHL          Debugging-Level setzen (-1 fÃ¼r alles)\n"
  
! #: info/info.c:1074
  msgid ""
  "\n"
--- 558,562 ----
  "  -x, --debug=ZAHL          Debugging-Level setzen (-1 fÃ¼r alles)\n"
  
! #: info/info.c:1089
  msgid ""
  "\n"
***************
*** 579,583 ****
  "besuchenden Knotens angesehen."
  
! #: info/info.c:1081
  msgid ""
  "\n"
--- 576,580 ----
  "besuchenden Knotens angesehen."
  
! #: info/info.c:1096
  msgid ""
  "\n"
***************
*** 587,591 ****
  "FÃ¼r eine Zusammenfassung mÃ¶glicher Tastenkombinationen in Info â€žhâ€œ tippen."
  
! #: info/info.c:1084
  msgid ""
  "\n"
--- 584,588 ----
  "FÃ¼r eine Zusammenfassung mÃ¶glicher Tastenkombinationen in Info â€žhâ€œ tippen."
  
! #: info/info.c:1099
  msgid ""
  "\n"
***************
*** 623,627 ****
  "  info -f ./foo.info         datei ./foo.info anzeigen"
  
! #: info/info.c:1099 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
--- 620,624 ----
  "  info -f ./foo.info         datei ./foo.info anzeigen"
  
! #: info/info.c:1114 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
***************
*** 636,700 ****
  "<translation-team-de@lists.sourceforge.net>"
  
! #: info/info.c:1134
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Knoten â€ž(%s)%sâ€œ kann nicht gefunden werden."
  
! #: info/info.c:1135
  msgid "Cannot find a window!"
  msgstr "Kein Fenster gefunden!"
  
! #: info/info.c:1136
  msgid "Point doesn't appear within this window's node!"
  msgstr "Momentane Position erscheint nicht in dem Knoten dieses Fensters!"
  
! #: info/info.c:1137
  msgid "Cannot delete the last window."
  msgstr "Das letzte Fenster kann nicht gelÃ¶scht werden."
  
! #: info/info.c:1138
  msgid "No menu in this node."
  msgstr "Kein MenÃ¼ in diesem Knoten."
  
! #: info/info.c:1139
  msgid "No footnotes in this node."
  msgstr "Keine FuÃŸnoten in diesem Knoten."
  
! #: info/info.c:1140
  msgid "No cross references in this node."
  msgstr "Keine Querverweise in diesem Knoten."
  
! #: info/info.c:1141
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Kein â€ž%sâ€œ-Verweis fÃ¼r diesen Knoten."
  
! #: info/info.c:1142
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "Unbekannter Info-Befehl â€ž%câ€œ. Geben Sie â€ž?â€œ ein, um Hilfe zu bekommen."
  
! #: info/info.c:1143
  #, c-format
  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:1144
  msgid "You are already at the last page of this node."
  msgstr "Sie sind bereits auf der letzten Seite dieses Knotens."
  
! #: info/info.c:1145
  msgid "You are already at the first page of this node."
  msgstr "Sie sind bereits auf der ersten Seite dieses Knotens."
  
! #: info/info.c:1146
  msgid "Only one window."
  msgstr "Nur ein Fenster."
  
! #: info/info.c:1147
  msgid "Resulting window would be too small."
  msgstr "Das entstehende Fenster wÃ¤re zu klein."
  
! #: info/info.c:1148
  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."
--- 633,697 ----
  "<translation-team-de@lists.sourceforge.net>"
  
! #: info/info.c:1149
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Knoten â€ž(%s)%sâ€œ kann nicht gefunden werden."
  
! #: info/info.c:1150
  msgid "Cannot find a window!"
  msgstr "Kein Fenster gefunden!"
  
! #: info/info.c:1151
  msgid "Point doesn't appear within this window's node!"
  msgstr "Momentane Position erscheint nicht in dem Knoten dieses Fensters!"
  
! #: info/info.c:1152
  msgid "Cannot delete the last window."
  msgstr "Das letzte Fenster kann nicht gelÃ¶scht werden."
  
! #: info/info.c:1153
  msgid "No menu in this node."
  msgstr "Kein MenÃ¼ in diesem Knoten."
  
! #: info/info.c:1154
  msgid "No footnotes in this node."
  msgstr "Keine FuÃŸnoten in diesem Knoten."
  
! #: info/info.c:1155
  msgid "No cross references in this node."
  msgstr "Keine Querverweise in diesem Knoten."
  
! #: info/info.c:1156
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Kein â€ž%sâ€œ-Verweis fÃ¼r diesen Knoten."
  
! #: info/info.c:1157
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "Unbekannter Info-Befehl â€ž%câ€œ. Geben Sie â€ž?â€œ ein, um Hilfe zu bekommen."
  
! #: info/info.c:1158
  #, c-format
  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:1159
  msgid "You are already at the last page of this node."
  msgstr "Sie sind bereits auf der letzten Seite dieses Knotens."
  
! #: info/info.c:1160
  msgid "You are already at the first page of this node."
  msgstr "Sie sind bereits auf der ersten Seite dieses Knotens."
  
! #: info/info.c:1161
  msgid "Only one window."
  msgstr "Nur ein Fenster."
  
! #: info/info.c:1162
  msgid "Resulting window would be too small."
  msgstr "Das entstehende Fenster wÃ¤re zu klein."
  
! #: info/info.c:1163
  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."
***************
*** 972,1006 ****
  msgstr "Unbekannter Befehl â€ž%sâ€œ."
  
! #: info/infokey.c:482
  #, c-format
  msgid "action name too long"
  msgstr "Befehlsname zu lang."
  
! #: info/infokey.c:495
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "Extrazeichen folgen Befehl â€ž%sâ€œ."
  
! #: info/infokey.c:506
  #, c-format
  msgid "missing variable name"
  msgstr "Variablenname fehlt."
  
! #: info/infokey.c:515
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "Fehlendes â€ž=â€œ direkt hinter Variablenname."
  
! #: info/infokey.c:522
  #, c-format
  msgid "variable name too long"
  msgstr "Variablenname zu lang"
  
! #: info/infokey.c:546
  #, c-format
  msgid "value too long"
  msgstr "Wert zu lang"
  
! #: info/infokey.c:592
  #, c-format
  msgid "\"%s\", line %u: "
--- 969,1003 ----
  msgstr "Unbekannter Befehl â€ž%sâ€œ."
  
! #: info/infokey.c:485
  #, c-format
  msgid "action name too long"
  msgstr "Befehlsname zu lang."
  
! #: info/infokey.c:498
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "Extrazeichen folgen Befehl â€ž%sâ€œ."
  
! #: info/infokey.c:509
  #, c-format
  msgid "missing variable name"
  msgstr "Variablenname fehlt."
  
! #: info/infokey.c:518
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "Fehlendes â€ž=â€œ direkt hinter Variablenname."
  
! #: info/infokey.c:525
  #, c-format
  msgid "variable name too long"
  msgstr "Variablenname zu lang"
  
! #: info/infokey.c:549
  #, c-format
  msgid "value too long"
  msgstr "Wert zu lang"
  
! #: info/infokey.c:595
  #, c-format
  msgid "\"%s\", line %u: "
***************
*** 1338,1378 ****
  "Es kann kein Knoten gefunden werden, der von â€ž%sâ€œ in â€ž%sâ€œ referenziert wird."
  
! #: info/session.c:2864
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "MenÃ¼liste lesen; bei â€ždirâ€œ beginnen und ihnen folgen"
  
! #: info/session.c:2866
  msgid "Follow menus: "
  msgstr "MenÃ¼s folgen: "
  
! #: info/session.c:2971
  msgid "Select the Next node"
  msgstr "Den â€žnÃ¤chstenâ€œ Knoten (Next) auswÃ¤hlen"
  
! #: info/session.c:2978
  msgid "Select the Prev node"
  msgstr "Den â€žvorigenâ€œ Knoten (Prev) auswÃ¤hlen"
  
! #: info/session.c:2985
  msgid "Select the Up node"
  msgstr "Den Ã¼bergeordneten Knoten auswÃ¤hlen (â€žaufwÃ¤rtsâ€œ, Up)"
  
! #: info/session.c:2991
  msgid "Select the last node in this file"
  msgstr "Den letzten Knoten dieser Datei auswÃ¤hlen"
  
! #: info/session.c:3018 info/session.c:3051
  msgid "This window has no additional nodes"
  msgstr "Dieses Fenster hat keine weiteren Knoten"
  
! #: info/session.c:3024
  msgid "Select the first node in this file"
  msgstr "Den ersten Knoten dieser Datei auswÃ¤hlen"
  
! #: info/session.c:3158
  msgid "No more nodes within this document."
  msgstr "Keine weiteren Knoten in diesem Dokument."
  
! #: info/session.c:3203 info/session.c:3243
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr ""
--- 1335,1375 ----
  "Es kann kein Knoten gefunden werden, der von â€ž%sâ€œ in â€ž%sâ€œ referenziert wird."
  
! #: info/session.c:2870
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "MenÃ¼liste lesen; bei â€ždirâ€œ beginnen und ihnen folgen"
  
! #: info/session.c:2872
  msgid "Follow menus: "
  msgstr "MenÃ¼s folgen: "
  
! #: info/session.c:2977
  msgid "Select the Next node"
  msgstr "Den â€žnÃ¤chstenâ€œ Knoten (Next) auswÃ¤hlen"
  
! #: info/session.c:2984
  msgid "Select the Prev node"
  msgstr "Den â€žvorigenâ€œ Knoten (Prev) auswÃ¤hlen"
  
! #: info/session.c:2991
  msgid "Select the Up node"
  msgstr "Den Ã¼bergeordneten Knoten auswÃ¤hlen (â€žaufwÃ¤rtsâ€œ, Up)"
  
! #: info/session.c:2997
  msgid "Select the last node in this file"
  msgstr "Den letzten Knoten dieser Datei auswÃ¤hlen"
  
! #: info/session.c:3024 info/session.c:3057
  msgid "This window has no additional nodes"
  msgstr "Dieses Fenster hat keine weiteren Knoten"
  
! #: info/session.c:3030
  msgid "Select the first node in this file"
  msgstr "Den ersten Knoten dieser Datei auswÃ¤hlen"
  
! #: info/session.c:3164
  msgid "No more nodes within this document."
  msgstr "Keine weiteren Knoten in diesem Dokument."
  
! #: info/session.c:3209 info/session.c:3249
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr ""
***************
*** 1380,1471 ****
  "Dokuments."
  
! #: info/session.c:3256
  msgid "Move forwards or down through node structure"
  msgstr "VorwÃ¤rts oder abwÃ¤rts durch die Knotenstruktur bewegen"
  
! #: info/session.c:3273
  msgid "Move backwards or up through node structure"
  msgstr "ZurÃ¼ck oder aufwÃ¤rts durch die Knotenstruktur bewegen"
  
! #: info/session.c:3296
  msgid "Read a node name and select it"
  msgstr "Den Namen eines Knotens lesen und diesen auswÃ¤hlen"
  
! #: info/session.c:3350 info/session.c:3354
  msgid "Goto node: "
  msgstr "Gehe zu Knoten: "
  
! #: info/session.c:3533
  msgid "Find the node describing program invocation"
  msgstr "Den Knoten finden, der den Programmaufruf beschreibt"
  
! #: info/session.c:3535
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Den Programmaufruf-Knoten von [%s] finden: "
  
! #: info/session.c:3580
  msgid "Read a manpage reference and select it"
  msgstr "Einen Verweis auf eine Manpage lesen und diese auswÃ¤hlen"
  
! #: info/session.c:3584
  msgid "Get Manpage: "
  msgstr "Manpage holen: "
  
! #: info/session.c:3605
  msgid "Select the node 'Top' in this file"
  msgstr "Den Knoten â€žTopâ€œ in dieser Datei auswÃ¤hlen"
  
! #: info/session.c:3611
  msgid "Select the node '(dir)'"
  msgstr "Den Knoten â€ž(dir)â€œ auswÃ¤hlen"
  
! #: info/session.c:3617
  msgid "Show full file name of node being displayed"
  msgstr "Vollen Dateinamen des angezeigten Knotens ausgeben"
  
! #: info/session.c:3634
  msgid "Select the most recently selected node"
  msgstr "Den zuletzt gewÃ¤hlten Knoten auswÃ¤hlen"
  
! #: info/session.c:3639
  #, c-format
  msgid "No earlier node in history"
  msgstr "Kein weiter zurÃ¼ckliegender Knoten in der Historie"
  
! #: info/session.c:3643
  msgid "Read the name of a file and select it"
  msgstr "Den Namen einer Datei lesen und diese auswÃ¤hlen"
  
! #: info/session.c:3647
  msgid "Find file: "
  msgstr "Datei finden: "
  
! #: info/session.c:3664
  #, c-format
  msgid "Cannot find '%s'."
  msgstr "â€ž%sâ€œ kann nicht gefunden werden."
  
! #: info/session.c:3713
  #, c-format
  msgid "Could not create output file '%s'."
  msgstr "Ausgabedatei â€ž%sâ€œ kann nicht angelegt werden."
  
! #: info/session.c:3727
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "Fehler beim Schreiben nach %s: %s"
  
! #: info/session.c:3736
  #, c-format
  msgid "closing %s"
  msgstr "%s wird geschlossen"
  
! #: info/session.c:3785
  #, c-format
  msgid "writing node %s..."
  msgstr "Knoten %s wird geschrieben â€¦"
  
! #: info/session.c:3831
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr ""
--- 1377,1468 ----
  "Dokuments."
  
! #: info/session.c:3262
  msgid "Move forwards or down through node structure"
  msgstr "VorwÃ¤rts oder abwÃ¤rts durch die Knotenstruktur bewegen"
  
! #: info/session.c:3279
  msgid "Move backwards or up through node structure"
  msgstr "ZurÃ¼ck oder aufwÃ¤rts durch die Knotenstruktur bewegen"
  
! #: info/session.c:3302
  msgid "Read a node name and select it"
  msgstr "Den Namen eines Knotens lesen und diesen auswÃ¤hlen"
  
! #: info/session.c:3356 info/session.c:3360
  msgid "Goto node: "
  msgstr "Gehe zu Knoten: "
  
! #: info/session.c:3539
  msgid "Find the node describing program invocation"
  msgstr "Den Knoten finden, der den Programmaufruf beschreibt"
  
! #: info/session.c:3541
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Den Programmaufruf-Knoten von [%s] finden: "
  
! #: info/session.c:3586
  msgid "Read a manpage reference and select it"
  msgstr "Einen Verweis auf eine Manpage lesen und diese auswÃ¤hlen"
  
! #: info/session.c:3590
  msgid "Get Manpage: "
  msgstr "Manpage holen: "
  
! #: info/session.c:3611
  msgid "Select the node 'Top' in this file"
  msgstr "Den Knoten â€žTopâ€œ in dieser Datei auswÃ¤hlen"
  
! #: info/session.c:3617
  msgid "Select the node '(dir)'"
  msgstr "Den Knoten â€ž(dir)â€œ auswÃ¤hlen"
  
! #: info/session.c:3623
  msgid "Show full file name of node being displayed"
  msgstr "Vollen Dateinamen des angezeigten Knotens ausgeben"
  
! #: info/session.c:3640
  msgid "Select the most recently selected node"
  msgstr "Den zuletzt gewÃ¤hlten Knoten auswÃ¤hlen"
  
! #: info/session.c:3645
  #, c-format
  msgid "No earlier node in history"
  msgstr "Kein weiter zurÃ¼ckliegender Knoten in der Historie"
  
! #: info/session.c:3649
  msgid "Read the name of a file and select it"
  msgstr "Den Namen einer Datei lesen und diese auswÃ¤hlen"
  
! #: info/session.c:3653
  msgid "Find file: "
  msgstr "Datei finden: "
  
! #: info/session.c:3670
  #, c-format
  msgid "Cannot find '%s'."
  msgstr "â€ž%sâ€œ kann nicht gefunden werden."
  
! #: info/session.c:3719
  #, c-format
  msgid "Could not create output file '%s'."
  msgstr "Ausgabedatei â€ž%sâ€œ kann nicht angelegt werden."
  
! #: info/session.c:3733
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "Fehler beim Schreiben nach %s: %s"
  
! #: info/session.c:3742
  #, c-format
  msgid "closing %s"
  msgstr "%s wird geschlossen"
  
! #: info/session.c:3791
  #, c-format
  msgid "writing node %s..."
  msgstr "Knoten %s wird geschrieben â€¦"
  
! #: info/session.c:3837
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr ""
***************
*** 1473,1658 ****
  "     (mittels einer Pipe)"
  
! #: info/session.c:3859
  #, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Daten kÃ¶nnen nicht an â€ž%sâ€œ weitergereicht werden (mittels einer Pipe)."
  
! #: info/session.c:3864
  #, c-format
  msgid "printing node %s..."
  msgstr "Knoten %s wird ausgegeben â€¦"
  
! #: info/session.c:3872
  #, c-format
  msgid "finished printing node %s"
  msgstr "Ausgabe des Knotens %s ist abgeschlossen"
  
! #: info/session.c:3904
  msgid "Toggle the usage of regular expressions in searches"
  msgstr "Die Verwendung regulÃ¤rer AusdrÃ¼cke in Suchen umschalten"
  
! #: info/session.c:3908
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr "FÃ¼r Suchen werden regulÃ¤re AusdrÃ¼cke benutzt"
  
! #: info/session.c:3909
  #, c-format
  msgid "Using literal strings for searches."
  msgstr "FÃ¼r Suchen werden wortwÃ¶rtliche Zeichenketten benutzt"
  
! #: info/session.c:4169
  msgid "Search continued from the end of the document."
  msgstr "Suche vom Ende des Dokuments fortgesetzt."
  
! #: info/session.c:4174
  msgid "Search continued from the beginning of the document."
  msgstr "Suche vom Anfang des Dokuments fortgesetzt."
  
! #: info/session.c:4194
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "Unterdatei â€ž%sâ€œ wird durchsucht â€¦"
  
! #: info/session.c:4231
  msgid "Search failed."
  msgstr "Suche fehlgeschlagen."
  
! #: info/session.c:4248
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Regexp search"
  msgstr "Suche mit regulÃ¤rem Ausdruck"
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Search"
  msgstr "Suche"
  
! #: info/session.c:4250 info/session.c:4256
  msgid " case-sensitively"
  msgstr " gemÃ¤ÃŸ GroÃŸ-/Kleinschreibung"
  
! #: info/session.c:4251 info/session.c:4257
  msgid " backward"
  msgstr " in RÃ¼ckwÃ¤rtsrichtung"
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s: "
  
! #: info/session.c:4274
  msgid "Search string too short"
  msgstr "Suchzeichenkette zu kurz"
  
! #: info/session.c:4467
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4491 info/session.c:4601
  #, fuzzy, c-format
  msgid "No more matches."
  msgstr "Keine Ãœbereinstimmung"
  
! #: info/session.c:4628
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4649
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4653 info/session.c:4665
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4661
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4674
  msgid "Read a string and search for it case-sensitively"
  msgstr ""
  "Eine Zeichenkette einlesen und danach gemÃ¤ÃŸ GroÃŸ-/Kleinschreibung suchen"
  
! #: info/session.c:4679
  msgid "Read a string and search for it"
  msgstr "Eine Zeichenkette einlesen und danach suchen"
  
! #: info/session.c:4685
  msgid "Read a string and search backward for it"
  msgstr "Eine Zeichenkette einlesen und danach in RÃ¼ckwÃ¤rtsrichtung suchen"
  
! #: info/session.c:4693
  msgid "Repeat last search in the same direction"
  msgstr "Letzte Suche in der gleichen Richtung wiederholen"
  
! #: info/session.c:4701 info/session.c:4746
  msgid "No previous search string"
  msgstr "Keine vorherige Such-Zeichenkette."
  
! #: info/session.c:4738
  msgid "Repeat last search in the reverse direction"
  msgstr "Letzte Suche in der entgegengesetzten Richtung wiederholen"
  
! #: info/session.c:4785
  msgid "Clear displayed search matches"
  msgstr "Die angezeigten Suchtreffer nicht mehr anzeigen"
  
! #: info/session.c:4802 info/session.c:4808
  msgid "Search interactively for a string as you type it"
  msgstr "Interaktiv eine Zeichenkette wÃ¤hrend der Eingabe suchen"
  
! #: info/session.c:4928
  msgid "Regexp I-search backward: "
  msgstr "Interaktive Suche mit regulÃ¤rem Ausdruck in RÃ¼ckwÃ¤rtsrichtung: "
  
! #: info/session.c:4929
  msgid "I-search backward: "
  msgstr "Interaktive Suche in RÃ¼ckwÃ¤rtsrichtung: "
  
! #: info/session.c:4931
  msgid "Regexp I-search: "
  msgstr "Interaktive Suche mit regulÃ¤rem Ausdruck: "
  
! #: info/session.c:4932
  msgid "I-search: "
  msgstr "Interaktive Suche: "
  
! #: info/session.c:4957 info/session.c:4960
  msgid "Failing "
  msgstr "Fehlschlagende "
  
! #: info/session.c:5326
  msgid "Cancel current operation"
  msgstr "Momentane Operation abbrechen"
  
! #: info/session.c:5333
  msgid "Quit"
  msgstr "Beenden"
  
! #: info/session.c:5338
  msgid "Display version of Info being run"
  msgstr "Programmversion anzeigen"
  
! #: info/session.c:5340
  #, c-format
  msgid "GNU Info version %s"
  msgstr "GNU Info Version %s"
  
! #: info/session.c:5345
  msgid "Redraw the display"
  msgstr "Anzeige erneut darstellen"
  
! #: info/session.c:5382
  msgid "Quit using Info"
  msgstr "Info beenden"
  
! #: info/session.c:5398
  msgid "Run command bound to this key's lowercase variant"
  msgstr ""
--- 1470,1655 ----
  "     (mittels einer Pipe)"
  
! #: info/session.c:3865
  #, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Daten kÃ¶nnen nicht an â€ž%sâ€œ weitergereicht werden (mittels einer Pipe)."
  
! #: info/session.c:3870
  #, c-format
  msgid "printing node %s..."
  msgstr "Knoten %s wird ausgegeben â€¦"
  
! #: info/session.c:3878
  #, c-format
  msgid "finished printing node %s"
  msgstr "Ausgabe des Knotens %s ist abgeschlossen"
  
! #: info/session.c:3910
  msgid "Toggle the usage of regular expressions in searches"
  msgstr "Die Verwendung regulÃ¤rer AusdrÃ¼cke in Suchen umschalten"
  
! #: info/session.c:3914
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr "FÃ¼r Suchen werden regulÃ¤re AusdrÃ¼cke benutzt"
  
! #: info/session.c:3915
  #, c-format
  msgid "Using literal strings for searches."
  msgstr "FÃ¼r Suchen werden wortwÃ¶rtliche Zeichenketten benutzt"
  
! #: info/session.c:4175
  msgid "Search continued from the end of the document."
  msgstr "Suche vom Ende des Dokuments fortgesetzt."
  
! #: info/session.c:4180
  msgid "Search continued from the beginning of the document."
  msgstr "Suche vom Anfang des Dokuments fortgesetzt."
  
! #: info/session.c:4200
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "Unterdatei â€ž%sâ€œ wird durchsucht â€¦"
  
! #: info/session.c:4237
  msgid "Search failed."
  msgstr "Suche fehlgeschlagen."
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Regexp search"
  msgstr "Suche mit regulÃ¤rem Ausdruck"
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Search"
  msgstr "Suche"
  
! #: info/session.c:4256 info/session.c:4262
  msgid " case-sensitively"
  msgstr " gemÃ¤ÃŸ GroÃŸ-/Kleinschreibung"
  
! #: info/session.c:4257 info/session.c:4263
  msgid " backward"
  msgstr " in RÃ¼ckwÃ¤rtsrichtung"
  
! #: info/session.c:4260
  #, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s: "
  
! #: info/session.c:4280
  msgid "Search string too short"
  msgstr "Suchzeichenkette zu kurz"
  
! #: info/session.c:4473
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4497 info/session.c:4607
  #, fuzzy, c-format
  msgid "No more matches."
  msgstr "Keine Ãœbereinstimmung"
  
! #: info/session.c:4634
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4655
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4659 info/session.c:4671
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4667
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4680
  msgid "Read a string and search for it case-sensitively"
  msgstr ""
  "Eine Zeichenkette einlesen und danach gemÃ¤ÃŸ GroÃŸ-/Kleinschreibung suchen"
  
! #: info/session.c:4685
  msgid "Read a string and search for it"
  msgstr "Eine Zeichenkette einlesen und danach suchen"
  
! #: info/session.c:4691
  msgid "Read a string and search backward for it"
  msgstr "Eine Zeichenkette einlesen und danach in RÃ¼ckwÃ¤rtsrichtung suchen"
  
! #: info/session.c:4699
  msgid "Repeat last search in the same direction"
  msgstr "Letzte Suche in der gleichen Richtung wiederholen"
  
! #: info/session.c:4707 info/session.c:4752
  msgid "No previous search string"
  msgstr "Keine vorherige Such-Zeichenkette."
  
! #: info/session.c:4744
  msgid "Repeat last search in the reverse direction"
  msgstr "Letzte Suche in der entgegengesetzten Richtung wiederholen"
  
! #: info/session.c:4791
  msgid "Clear displayed search matches"
  msgstr "Die angezeigten Suchtreffer nicht mehr anzeigen"
  
! #: info/session.c:4808 info/session.c:4814
  msgid "Search interactively for a string as you type it"
  msgstr "Interaktiv eine Zeichenkette wÃ¤hrend der Eingabe suchen"
  
! #: info/session.c:4934
  msgid "Regexp I-search backward: "
  msgstr "Interaktive Suche mit regulÃ¤rem Ausdruck in RÃ¼ckwÃ¤rtsrichtung: "
  
! #: info/session.c:4935
  msgid "I-search backward: "
  msgstr "Interaktive Suche in RÃ¼ckwÃ¤rtsrichtung: "
  
! #: info/session.c:4937
  msgid "Regexp I-search: "
  msgstr "Interaktive Suche mit regulÃ¤rem Ausdruck: "
  
! #: info/session.c:4938
  msgid "I-search: "
  msgstr "Interaktive Suche: "
  
! #: info/session.c:4963 info/session.c:4966
  msgid "Failing "
  msgstr "Fehlschlagende "
  
! #: info/session.c:5332
  msgid "Cancel current operation"
  msgstr "Momentane Operation abbrechen"
  
! #: info/session.c:5339
  msgid "Quit"
  msgstr "Beenden"
  
! #: info/session.c:5344
  msgid "Display version of Info being run"
  msgstr "Programmversion anzeigen"
  
! #: info/session.c:5346
  #, c-format
  msgid "GNU Info version %s"
  msgstr "GNU Info Version %s"
  
! #: info/session.c:5351
  msgid "Redraw the display"
  msgstr "Anzeige erneut darstellen"
  
! #: info/session.c:5388
  msgid "Quit using Info"
  msgstr "Info beenden"
  
! #: info/session.c:5404
  msgid "Run command bound to this key's lowercase variant"
  msgstr ""
***************
*** 1660,1683 ****
  "     Taste gebunden ist"
  
! #: info/session.c:5409
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Unbekannter Befehl (%s)."
  
! #: info/session.c:5412
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "â€ž%sâ€œ ist ungÃ¼ltig"
  
! #: info/session.c:5413
  #, c-format
  msgid "'%s' is invalid"
  msgstr "â€ž%sâ€œ ist ungÃ¼ltig"
  
! #: info/session.c:5731
  msgid "Add this digit to the current numeric argument"
  msgstr "Diese Zahl dem aktuellen numerischen Argument hinzufÃ¼gen"
  
! #: info/session.c:5738
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "Das aktuelle numerische Argument beginnen (oder mit 4 multiplizieren)"
--- 1657,1680 ----
  "     Taste gebunden ist"
  
! #: info/session.c:5415
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Unbekannter Befehl (%s)."
  
! #: info/session.c:5418
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "â€ž%sâ€œ ist ungÃ¼ltig"
  
! #: info/session.c:5419
  #, c-format
  msgid "'%s' is invalid"
  msgstr "â€ž%sâ€œ ist ungÃ¼ltig"
  
! #: info/session.c:5737
  msgid "Add this digit to the current numeric argument"
  msgstr "Diese Zahl dem aktuellen numerischen Argument hinzufÃ¼gen"
  
! #: info/session.c:5744
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "Das aktuelle numerische Argument beginnen (oder mit 4 multiplizieren)"
***************
*** 1824,1841 ****
  msgstr "%s auf den Wert (%s) setzen: "
  
! #: info/window.c:959
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), Zeilen ----, "
  
- #: info/window.c:966
- #, c-format
- msgid "-%s---Info: %s, %ld lines --%s--"
- msgstr "-%s---Info: %s, %ld Zeilen --%s--"
- 
- #: info/window.c:970
- #, fuzzy, c-format
- msgid "-%s---Info: (%s)%s, %ld lines --%s--"
- msgstr "-%s%s-Info: (%s)%s, %ld Zeilen --%s--"
- 
  #: install-info/install-info.c:292
  #, c-format
--- 1821,1828 ----
  msgstr "%s auf den Wert (%s) setzen: "
  
! #: info/window.c:909
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), Zeilen ----, "
  
  #: install-info/install-info.c:292
  #, c-format
***************
*** 2017,2021 ****
  
  #: install-info/install-info.c:642
! #, c-format
  msgid ""
  "This is the file .../info/dir, which contains the\n"
--- 2004,2008 ----
  
  #: install-info/install-info.c:642
! #, fuzzy, c-format
  msgid ""
  "This is the file .../info/dir, which contains the\n"
***************
*** 2026,2030 ****
  "\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"
--- 2013,2017 ----
  "\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"
***************
*** 2116,2232 ****
  msgstr "keine EintrÃ¤ge fÃ¼r â€ž%sâ€œ gefunden; nichts entfernt"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:855
! #: tp/Texinfo/Convert/Converter.pm:893 tp/Texinfo/Convert/Converter.pm:1204
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6504
! #: tp/Texinfo/Convert/HTML.pm:6528 tp/Texinfo/Convert/HTML.pm:6905
! #: tp/Texinfo/Convert/HTML.pm:6963 tp/Texinfo/Convert/HTML.pm:7041
! #: tp/Texinfo/Convert/HTML.pm:7118 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:546
! #: tp/Texinfo/Convert/TexinfoXML.pm:457
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "%s konnte nicht zum Schreiben geÃ¶ffnet werden: %s"
  
! #: tp/Texinfo/Common.pm:881
  msgid "recursion is always allowed"
  msgstr "Rekursion ist immer erlaubt"
  
! #: tp/Texinfo/Common.pm:882
  msgid "arguments are quoted by default"
  msgstr "Argumente werden standardmÃ¤ÃŸig in AnfÃ¼hrungszeichen eingeschlossen"
  
! #: tp/Texinfo/Common.pm:1105
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s ist kein gÃ¼ltiges SprachkÃ¼rzel"
  
! #: tp/Texinfo/Common.pm:1110
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s ist kein gÃ¼ltiges RegionskÃ¼rzel"
  
! #: tp/Texinfo/Common.pm:1128
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%s is keine gÃ¼ltige AufspaltmÃ¶glichkeit"
  
! #: tp/Texinfo/Common.pm:1151
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "%s konnte nicht gelesen werden: %s"
  
! #: tp/Texinfo/Common.pm:1170
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "Fehler beim SchlieÃŸen von @verbatiminclude-Datei %s: %s"
  
! #: tp/Texinfo/Common.pm:1176 tp/Texinfo/Parser.pm:3353
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%s: %s konnte nicht gefunden werden"
  
! #: tp/Texinfo/Common.pm:1520
! #, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr "HTML-Refs-Konfigurationsdatei %s konnte nicht gefunden werden: %s"
! 
! #: tp/Texinfo/Common.pm:1548
! msgid "missing type"
! msgstr "fehlender Typ"
! 
! #: tp/Texinfo/Common.pm:1551
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "nicht erkannter Typ: %s"
! 
! #: tp/Texinfo/Common.pm:1568
! #, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr "Fehler beim SchlieÃŸen derHTML-Refs-Konfigurationsdatei %s: %s"
! 
! #: tp/Texinfo/Common.pm:1603
  msgid "no node to be renamed"
  msgstr "kein Knoten zum Umbenennen"
  
! #: tp/Texinfo/Common.pm:1614
  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:1624 tp/Texinfo/Parser.pm:926
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "%s konnte nicht geÃ¶ffnet werden: %s"
  
! #: tp/Texinfo/Common.pm:2144
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr "Hash-Zeichen in @%s konnte nicht geschÃ¼tzt werden"
  
! #: tp/Texinfo/Convert/Converter.pm:395 tp/Texinfo/Convert/Converter.pm:414
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Veraltete Variable %s\n"
  
! #: tp/Texinfo/Convert/Converter.pm:794
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr "%s: die Ausgabe ist ungeeignet fÃ¼r Split"
  
! #: tp/Texinfo/Convert/Converter.pm:876 tp/Texinfo/Convert/Converter.pm:909
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:6931
! #: tp/Texinfo/Convert/HTML.pm:6989 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:476 tp/Texinfo/Parser.pm:2035
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "Fehler beim SchlieÃŸen von %s: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, 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:995
  #, perl-format
  msgid "could not create directory `%s': %s"
--- 2103,2211 ----
  msgstr "keine EintrÃ¤ge fÃ¼r â€ž%sâ€œ gefunden; nichts entfernt"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:847
! #: tp/Texinfo/Convert/Converter.pm:885 tp/Texinfo/Convert/Converter.pm:1196
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6573
! #: tp/Texinfo/Convert/HTML.pm:6597 tp/Texinfo/Convert/HTML.pm:6978
! #: tp/Texinfo/Convert/HTML.pm:7037 tp/Texinfo/Convert/HTML.pm:7115
! #: tp/Texinfo/Convert/HTML.pm:7192 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:547
! #: tp/Texinfo/Convert/TexinfoXML.pm:458
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "%s konnte nicht zum Schreiben geÃ¶ffnet werden: %s"
  
! #: tp/Texinfo/Common.pm:862
  msgid "recursion is always allowed"
  msgstr "Rekursion ist immer erlaubt"
  
! #: tp/Texinfo/Common.pm:863
  msgid "arguments are quoted by default"
  msgstr "Argumente werden standardmÃ¤ÃŸig in AnfÃ¼hrungszeichen eingeschlossen"
  
! #: tp/Texinfo/Common.pm:866
! msgid ""
! "move your @contents command if you want the contents after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:869
! msgid ""
! "move your @shortcontents and @contents commands if you want the contents "
! "after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:1093
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s ist kein gÃ¼ltiges SprachkÃ¼rzel"
  
! #: tp/Texinfo/Common.pm:1098
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s ist kein gÃ¼ltiges RegionskÃ¼rzel"
  
! #: tp/Texinfo/Common.pm:1116
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%s is keine gÃ¼ltige AufspaltmÃ¶glichkeit"
  
! #: tp/Texinfo/Common.pm:1139
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "%s konnte nicht gelesen werden: %s"
  
! #: tp/Texinfo/Common.pm:1158
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "Fehler beim SchlieÃŸen von @verbatiminclude-Datei %s: %s"
  
! #: tp/Texinfo/Common.pm:1164 tp/Texinfo/Parser.pm:3193
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%s: %s konnte nicht gefunden werden"
  
! #: tp/Texinfo/Common.pm:1637
  msgid "no node to be renamed"
  msgstr "kein Knoten zum Umbenennen"
  
! #: tp/Texinfo/Common.pm:1648
  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:1658 tp/Texinfo/Parser.pm:899
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "%s konnte nicht geÃ¶ffnet werden: %s"
  
! #: tp/Texinfo/Common.pm:2178
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr "Hash-Zeichen in @%s konnte nicht geschÃ¼tzt werden"
  
! #: tp/Texinfo/Convert/Converter.pm:387 tp/Texinfo/Convert/Converter.pm:406
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Veraltete Variable %s\n"
  
! #: tp/Texinfo/Convert/Converter.pm:786
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr "%s: die Ausgabe ist ungeeignet fÃ¼r Split"
  
! #: tp/Texinfo/Convert/Converter.pm:868 tp/Texinfo/Convert/Converter.pm:901
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:7004
! #: tp/Texinfo/Convert/HTML.pm:7063 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:477 tp/Texinfo/Parser.pm:1996
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "Fehler beim SchlieÃŸen von %s: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:979
  #, 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:987
  #, perl-format
  msgid "could not create directory `%s': %s"
***************
*** 2238,2327 ****
  msgstr "@image-Datei â€ž%sâ€œ nicht gefunden, â€ž%sâ€œ wird benutzt"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5388
  msgid "no argument specified for @U"
  msgstr "es wurde kein Argument fÃ¼r @U angegeben"
  
! #: tp/Texinfo/Convert/HTML.pm:1683
  #, 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:2371
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "rohes Format %s wird nicht konvertiert"
  
! #: tp/Texinfo/Convert/HTML.pm:4888
  msgid "string not closed in css file"
  msgstr "Zeichenkette in CSS-Datei nicht geschlossen"
  
! #: tp/Texinfo/Convert/HTML.pm:4890
  msgid "--css-include ended in comment"
  msgstr "--css-include endete inmitten eines Kommentars"
  
! #: tp/Texinfo/Convert/HTML.pm:4892
  msgid "@import not finished in css file"
  msgstr "@import in CSS-Datei nicht abgeschlossen"
  
! #: tp/Texinfo/Convert/HTML.pm:4918
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "CSS-Datei %s nicht gefunden"
  
! #: tp/Texinfo/Convert/HTML.pm:4924
  #, 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:4934
  #, 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:5801 tp/Texinfo/Convert/HTML.pm:5805
  #, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "kein Eintrag htmlxref.cnf fÃ¼r â€ž%sâ€œ gefunden"
  
! #: tp/Texinfo/Convert/HTML.pm:6499
  #, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "Fehler beim SchlieÃŸen der Rahmendatei %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6523
  #, 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:6638
  #, 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:6839
  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:7048
  #, 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:7073
  #, 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:7079
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "Datei leer fÃ¼r umbenannten Knoten â€ž%sâ€œ"
  
! #: tp/Texinfo/Convert/HTML.pm:7093
  #, 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:7125
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
--- 2217,2325 ----
  msgstr "@image-Datei â€ž%sâ€œ nicht gefunden, â€ž%sâ€œ wird benutzt"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5225
  msgid "no argument specified for @U"
  msgstr "es wurde kein Argument fÃ¼r @U angegeben"
  
! #: tp/Texinfo/Convert/HTML.pm:1715
  #, 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:2399
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "rohes Format %s wird nicht konvertiert"
  
! #: tp/Texinfo/Convert/HTML.pm:4629
! #, 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:4657
! msgid "missing type"
! msgstr "fehlender Typ"
! 
! #: tp/Texinfo/Convert/HTML.pm:4660
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "nicht erkannter Typ: %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4677
! #, 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:4962
  msgid "string not closed in css file"
  msgstr "Zeichenkette in CSS-Datei nicht geschlossen"
  
! #: tp/Texinfo/Convert/HTML.pm:4964
  msgid "--css-include ended in comment"
  msgstr "--css-include endete inmitten eines Kommentars"
  
! #: tp/Texinfo/Convert/HTML.pm:4966
  msgid "@import not finished in css file"
  msgstr "@import in CSS-Datei nicht abgeschlossen"
  
! #: tp/Texinfo/Convert/HTML.pm:4992
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "CSS-Datei %s nicht gefunden"
  
! #: tp/Texinfo/Convert/HTML.pm:4998
  #, 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:5008
  #, 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:5870 tp/Texinfo/Convert/HTML.pm:5874
  #, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "kein Eintrag htmlxref.cnf fÃ¼r â€ž%sâ€œ gefunden"
  
! #: tp/Texinfo/Convert/HTML.pm:6568
  #, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "Fehler beim SchlieÃŸen der Rahmendatei %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6592
  #, 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:6707
  #, 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:6912
  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:7122
  #, 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:7147
  #, 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:7153
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "Datei leer fÃ¼r umbenannten Knoten â€ž%sâ€œ"
  
! #: tp/Texinfo/Convert/HTML.pm:7167
  #, 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:7199
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
***************
*** 2329,2337 ****
  "Fehler beim SchlieÃŸen der umbenannten Knoten-Weiterleitungsdatei %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7163
  msgid "empty node name"
  msgstr "leerer Knotenname"
  
! #: tp/Texinfo/Convert/HTML.pm:7165 tp/Texinfo/Parser.pm:3697
  #, perl-format
  msgid "syntax for an external node used for `%s'"
--- 2327,2335 ----
  "Fehler beim SchlieÃŸen der umbenannten Knoten-Weiterleitungsdatei %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7237
  msgid "empty node name"
  msgstr "leerer Knotenname"
  
! #: tp/Texinfo/Convert/HTML.pm:7239 tp/Texinfo/Parser.pm:3542
  #, perl-format
  msgid "syntax for an external node used for `%s'"
***************
*** 2366,2390 ****
  msgstr "@node-Name sollte nicht â€ž,â€œ enthalten: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1334
  #, 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:1381 tp/Texinfo/Parser.pm:2722
  #, 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:1495
  #, 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:1500
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "@image-Datei â€ž%sâ€œ nicht lesbar: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1523
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
--- 2364,2388 ----
  msgstr "@node-Name sollte nicht â€ž,â€œ enthalten: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1335
  #, 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:1382 tp/Texinfo/Parser.pm:2568
  #, 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:1496
  #, 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:1501
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "@image-Datei â€ž%sâ€œ nicht lesbar: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1524
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
***************
*** 2392,2396 ****
  "Weder @image-Datei â€ž%s.txtâ€œ noch alternativer Text konnten gefunden werden"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1931
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
--- 2390,2394 ----
  "Weder @image-Datei â€ž%s.txtâ€œ noch alternativer Text konnten gefunden werden"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1932
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
***************
*** 2400,2550 ****
  "umformulieren, um das zu vermeiden"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2161
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr "@%s Querverweis-Name sollte keinen â€ž:â€œ enthalten"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2193
  #, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "@%s Knotenname sollte kein â€ž%sâ€œ enthalten"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2226
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr "@%s Knotenname sollte keinen â€ž:â€œ enthalten"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2272
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "â€ž.â€œ oder â€ž,â€œ muss @xref folgen, nicht %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2275
  msgid "`.' or `,' must follow @xref"
  msgstr "â€ž.â€œ oder â€ž,â€œ muss @xref folgen"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3118
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr "MenÃ¼eintrag-Knotenname sollte kein â€ž%sâ€œ enthalten"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3129
  msgid "menu entry node name should not contain `:'"
  msgstr "MenÃ¼eintrag-Knotenname sollte keinen â€ž:â€œ enthalten"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3145
  msgid "menu entry name should not contain `:'"
  msgstr "MenÃ¼eintrag-Name sollte keinen â€ž:â€œ enthalten"
  
! #: tp/Texinfo/Parser.pm:910
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr "@%s sollte nur am Anfang oder Ende eines Dokuments erscheinen"
  
! #: tp/Texinfo/Parser.pm:1160 tp/Texinfo/Structuring.pm:594
  #, perl-format
  msgid "multiple @%s"
  msgstr "mehrfache @%s"
  
! #: tp/Texinfo/Parser.pm:1194
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "Fehlerhafte Syntax fÃ¼r Argument @%s: %s"
! 
! #: tp/Texinfo/Parser.pm:1210
  #, perl-format
  msgid "bad or empty @%s formal argument: %s"
  msgstr "Fehlerhaftes oder leeres formales Argument @%s: %s"
  
! #: tp/Texinfo/Parser.pm:1219 tp/Texinfo/Parser.pm:4856
! #: tp/Texinfo/Parser.pm:4882 tp/Texinfo/Parser.pm:5671
! #: tp/Texinfo/Parser.pm:5687 tp/Texinfo/Parser.pm:5702
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s erfordert einen Namen"
  
! #: tp/Texinfo/Parser.pm:1223 tp/Texinfo/Parser.pm:4859
! #: tp/Texinfo/Parser.pm:4885 tp/Texinfo/Parser.pm:5674
! #: tp/Texinfo/Parser.pm:5690 tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad name for @%s"
  msgstr "fehlerhafter Name fÃ¼r @%s"
  
! #: tp/Texinfo/Parser.pm:1341
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr "@end %s gesehen vor @%s schlieÃŸender Klammer"
  
! #: tp/Texinfo/Parser.pm:1345
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "@%s gesehen vor schlieÃŸender Klammer von @%s"
  
! #: tp/Texinfo/Parser.pm:1350
! #, perl-format
! msgid "%c%s missing close brace"
  msgstr "%c%s fehlende schlieÃŸende Klammer"
  
! #: tp/Texinfo/Parser.pm:1354
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "@%s fehlende schlieÃŸende Trennsequenz: %s}"
  
! #: tp/Texinfo/Parser.pm:1476
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "@itemx sollte nicht @%s beginnen"
  
! #: tp/Texinfo/Parser.pm:1544
  msgid "@itemx must follow @item"
  msgstr "@itemx muss nach @item kommen"
  
! #: tp/Texinfo/Parser.pm:1712
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr "@%s hat Text aber kein @item"
  
! #: tp/Texinfo/Parser.pm:1743
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "â€ž@endâ€œ erwartete â€ž%sâ€œ, jedoch â€ž%sâ€œ erhalten"
  
! #: tp/Texinfo/Parser.pm:1746
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@%s gesehen vor @end %s"
  
! #: tp/Texinfo/Parser.pm:1750
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "kein Ã¼bereinstimmendes â€ž%cend %sâ€œ"
  
! #: tp/Texinfo/Parser.pm:1776 tp/Texinfo/Parser.pm:5204
! #: tp/Texinfo/Parser.pm:5470
  #, perl-format
  msgid "misplaced %c"
  msgstr "fehlplatziertes %c"
  
! #: tp/Texinfo/Parser.pm:1874 tp/Texinfo/Parser.pm:3312
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "nicht Ã¼bereinstimmendes â€ž%c%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:2110
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "Makro â€ž%sâ€œ mit zu vielen Argumenten aufgerufen"
  
! #: tp/Texinfo/Parser.pm:2132
! #, perl-format
! msgid "@%s missing close brace"
  msgstr "@%s fehlende schlieÃŸende Klammer"
  
! #: tp/Texinfo/Parser.pm:2140
  #, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr "Makro â€ž%sâ€œ deklariert ohne Argument, aber mit Argument aufgerufen"
  
! #: tp/Texinfo/Parser.pm:2175
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
--- 2398,2548 ----
  "umformulieren, um das zu vermeiden"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2162
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr "@%s Querverweis-Name sollte keinen â€ž:â€œ enthalten"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2194
  #, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "@%s Knotenname sollte kein â€ž%sâ€œ enthalten"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2227
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr "@%s Knotenname sollte keinen â€ž:â€œ enthalten"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2273
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "â€ž.â€œ oder â€ž,â€œ muss @xref folgen, nicht %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2276
  msgid "`.' or `,' must follow @xref"
  msgstr "â€ž.â€œ oder â€ž,â€œ muss @xref folgen"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3086
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr "MenÃ¼eintrag-Knotenname sollte kein â€ž%sâ€œ enthalten"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3097
  msgid "menu entry node name should not contain `:'"
  msgstr "MenÃ¼eintrag-Knotenname sollte keinen â€ž:â€œ enthalten"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3113
  msgid "menu entry name should not contain `:'"
  msgstr "MenÃ¼eintrag-Name sollte keinen â€ž:â€œ enthalten"
  
! #: tp/Texinfo/Parser.pm:883
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr "@%s sollte nur am Anfang oder Ende eines Dokuments erscheinen"
  
! #: tp/Texinfo/Parser.pm:1125 tp/Texinfo/Structuring.pm:595
  #, perl-format
  msgid "multiple @%s"
  msgstr "mehrfache @%s"
  
! #: tp/Texinfo/Parser.pm:1166
  #, perl-format
  msgid "bad or empty @%s formal argument: %s"
  msgstr "Fehlerhaftes oder leeres formales Argument @%s: %s"
  
! #: tp/Texinfo/Parser.pm:1176
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "Fehlerhafte Syntax fÃ¼r Argument @%s: %s"
! 
! #: tp/Texinfo/Parser.pm:1183 tp/Texinfo/Parser.pm:4707
! #: tp/Texinfo/Parser.pm:4733 tp/Texinfo/Parser.pm:5565
! #: tp/Texinfo/Parser.pm:5578 tp/Texinfo/Parser.pm:5592
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s erfordert einen Namen"
  
! #: tp/Texinfo/Parser.pm:1187 tp/Texinfo/Parser.pm:4710
! #: tp/Texinfo/Parser.pm:4736 tp/Texinfo/Parser.pm:5568
! #: tp/Texinfo/Parser.pm:5581 tp/Texinfo/Parser.pm:5595
  #, perl-format
  msgid "bad name for @%s"
  msgstr "fehlerhafter Name fÃ¼r @%s"
  
! #: tp/Texinfo/Parser.pm:1305
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr "@end %s gesehen vor @%s schlieÃŸender Klammer"
  
! #: tp/Texinfo/Parser.pm:1309
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "@%s gesehen vor schlieÃŸender Klammer von @%s"
  
! #: tp/Texinfo/Parser.pm:1314
! #, fuzzy, perl-format
! msgid "%c%s missing closing brace"
  msgstr "%c%s fehlende schlieÃŸende Klammer"
  
! #: tp/Texinfo/Parser.pm:1318
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "@%s fehlende schlieÃŸende Trennsequenz: %s}"
  
! #: tp/Texinfo/Parser.pm:1440
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "@itemx sollte nicht @%s beginnen"
  
! #: tp/Texinfo/Parser.pm:1508
  msgid "@itemx must follow @item"
  msgstr "@itemx muss nach @item kommen"
  
! #: tp/Texinfo/Parser.pm:1676
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr "@%s hat Text aber kein @item"
  
! #: tp/Texinfo/Parser.pm:1707
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "â€ž@endâ€œ erwartete â€ž%sâ€œ, jedoch â€ž%sâ€œ erhalten"
  
! #: tp/Texinfo/Parser.pm:1710
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@%s gesehen vor @end %s"
  
! #: tp/Texinfo/Parser.pm:1714
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "kein Ã¼bereinstimmendes â€ž%cend %sâ€œ"
  
! #: tp/Texinfo/Parser.pm:1738 tp/Texinfo/Parser.pm:5070
! #: tp/Texinfo/Parser.pm:5308
  #, perl-format
  msgid "misplaced %c"
  msgstr "fehlplatziertes %c"
  
! #: tp/Texinfo/Parser.pm:1835 tp/Texinfo/Parser.pm:3148
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "nicht Ã¼bereinstimmendes â€ž%c%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:2072
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "Makro â€ž%sâ€œ mit zu vielen Argumenten aufgerufen"
  
! #: tp/Texinfo/Parser.pm:2094
! #, fuzzy, perl-format
! msgid "@%s missing closing brace"
  msgstr "@%s fehlende schlieÃŸende Klammer"
  
! #: tp/Texinfo/Parser.pm:2102
  #, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr "Makro â€ž%sâ€œ deklariert ohne Argument, aber mit Argument aufgerufen"
  
! #: tp/Texinfo/Parser.pm:2138
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
***************
*** 2553,2592 ****
  "\\"
  
! #: tp/Texinfo/Parser.pm:2650
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s â€ž%sâ€œ frÃ¼her definiert"
  
! #: tp/Texinfo/Parser.pm:2655
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "hier ist die frÃ¼here Definition als @%s"
  
! #: tp/Texinfo/Parser.pm:3016
  #, perl-format
  msgid "missing name for @%s"
  msgstr "fehlender Name fÃ¼r @%s"
  
! #: tp/Texinfo/Parser.pm:3021
  #, perl-format
  msgid "missing category for @%s"
  msgstr "fehlende Kategorie fÃ¼r @%s"
  
! #: tp/Texinfo/Parser.pm:3073
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "unerwartetes Argument auf @%s-Zeile: %s"
  
! #: tp/Texinfo/Parser.pm:3089
  msgid "empty multitable"
  msgstr "leere Mehrfachtabelle"
  
! #: tp/Texinfo/Parser.pm:3145 tp/Texinfo/Parser.pm:5784
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "Ã¼berflÃ¼ssiges Argument fÃ¼r @%s"
  
! #: tp/Texinfo/Parser.pm:3151 tp/Texinfo/Parser.pm:5806
! #: tp/Texinfo/Parser.pm:5818
  #, perl-format
  msgid "bad argument to @%s"
--- 2551,2590 ----
  "\\"
  
! #: tp/Texinfo/Parser.pm:2501
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s â€ž%sâ€œ frÃ¼her definiert"
  
! #: tp/Texinfo/Parser.pm:2506
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "hier ist die frÃ¼here Definition als @%s"
  
! #: tp/Texinfo/Parser.pm:2850
  #, perl-format
  msgid "missing name for @%s"
  msgstr "fehlender Name fÃ¼r @%s"
  
! #: tp/Texinfo/Parser.pm:2855
  #, perl-format
  msgid "missing category for @%s"
  msgstr "fehlende Kategorie fÃ¼r @%s"
  
! #: tp/Texinfo/Parser.pm:2890
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "unerwartetes Argument auf @%s-Zeile: %s"
  
! #: tp/Texinfo/Parser.pm:2905
  msgid "empty multitable"
  msgstr "leere Mehrfachtabelle"
  
! #: tp/Texinfo/Parser.pm:2959 tp/Texinfo/Parser.pm:5673
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "Ã¼berflÃ¼ssiges Argument fÃ¼r @%s"
  
! #: tp/Texinfo/Parser.pm:2965 tp/Texinfo/Parser.pm:5694
! #: tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad argument to @%s"
***************
*** 2594,2603 ****
  
  # %citem ist ein Texinfo-Befehl
! #: tp/Texinfo/Parser.pm:3162
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s benÃ¶tigt ein Argument: den Formatierer fÃ¼r %citem"
  
! #: tp/Texinfo/Parser.pm:3167
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
--- 2592,2601 ----
  
  # %citem ist ein Texinfo-Befehl
! #: tp/Texinfo/Parser.pm:2976
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s benÃ¶tigt ein Argument: den Formatierer fÃ¼r %citem"
  
! #: tp/Texinfo/Parser.pm:2981
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
***************
*** 2606,2668 ****
  "%s-Zeile sein"
  
! #: tp/Texinfo/Parser.pm:3202
  #, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "Akzent-Befehl â€ž@%sâ€œ ist als @%s-Argument nicht erlaubt"
  
! #: tp/Texinfo/Parser.pm:3290 tp/Texinfo/Parser.pm:3429
! #: tp/Texinfo/Parser.pm:5777
  #, perl-format
  msgid "@%s missing argument"
  msgstr "@%s fehlendes Argument"
  
! #: tp/Texinfo/Parser.pm:3302
  #, perl-format
  msgid "unknown @end %s"
  msgstr "unbekanntes @end %sâ€œ"
  
! #: tp/Texinfo/Parser.pm:3324 tp/Texinfo/Parser.pm:3943
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "Ã¼berflÃ¼ssiges Argument fÃ¼r @%s %s: %s"
  
! #: tp/Texinfo/Parser.pm:3329 tp/Texinfo/Parser.pm:5861
! #: tp/Texinfo/Parser.pm:5906 tp/Texinfo/Parser.pm:5935
! #: tp/Texinfo/Parser.pm:5976 tp/Texinfo/Parser.pm:6055
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "fehlerhaftes Argument fÃ¼r @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3348
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%s: %s konnte nicht geÃ¶ffnet werden: %s"
  
! #: tp/Texinfo/Parser.pm:3360
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr "Kodierung â€ž%sâ€œ ist keine kanonische texinfo-Zeichenkodierung"
  
! #: tp/Texinfo/Parser.pm:3369
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "nicht erkannter Kodierungsname â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:3516
  #, perl-format
  msgid "@%s after the first element"
  msgstr "@%s nach dem ersten Element"
  
! #: tp/Texinfo/Parser.pm:3523
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s nur sinnvoll auf einer â€ž@multitableâ€œ-Zeile"
  
! #: tp/Texinfo/Parser.pm:3563
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "@%s sollte nicht mit @top assoziiert sein"
  
! #: tp/Texinfo/Parser.pm:3575
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
--- 2604,2667 ----
  "%s-Zeile sein"
  
! #: tp/Texinfo/Parser.pm:3016
  #, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "Akzent-Befehl â€ž@%sâ€œ ist als @%s-Argument nicht erlaubt"
  
! #: tp/Texinfo/Parser.pm:3124 tp/Texinfo/Parser.pm:3277
! #: tp/Texinfo/Parser.pm:5666
  #, perl-format
  msgid "@%s missing argument"
  msgstr "@%s fehlendes Argument"
  
! #: tp/Texinfo/Parser.pm:3138
  #, perl-format
  msgid "unknown @end %s"
  msgstr "unbekanntes @end %sâ€œ"
  
! #: tp/Texinfo/Parser.pm:3161 tp/Texinfo/Parser.pm:3788
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "Ã¼berflÃ¼ssiges Argument fÃ¼r @%s %s: %s"
  
! #: tp/Texinfo/Parser.pm:3167 tp/Texinfo/Parser.pm:3245
! #: tp/Texinfo/Parser.pm:5755 tp/Texinfo/Parser.pm:5798
! #: tp/Texinfo/Parser.pm:5827 tp/Texinfo/Parser.pm:5868
! #: tp/Texinfo/Parser.pm:5946
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "fehlerhaftes Argument fÃ¼r @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3188
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%s: %s konnte nicht geÃ¶ffnet werden: %s"
  
! #: tp/Texinfo/Parser.pm:3200
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr "Kodierung â€ž%sâ€œ ist keine kanonische texinfo-Zeichenkodierung"
  
! #: tp/Texinfo/Parser.pm:3208
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "nicht erkannter Kodierungsname â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:3364
  #, perl-format
  msgid "@%s after the first element"
  msgstr "@%s nach dem ersten Element"
  
! #: tp/Texinfo/Parser.pm:3371
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s nur sinnvoll auf einer â€ž@multitableâ€œ-Zeile"
  
! #: tp/Texinfo/Parser.pm:3408
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "@%s sollte nicht mit @top assoziiert sein"
  
! #: tp/Texinfo/Parser.pm:3420
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
***************
*** 2670,2723 ****
  "@node ist @%s vorangestellt, aber Teile dÃ¼rfen nicht Knoten zugeordnet werden"
  
! #: tp/Texinfo/Parser.pm:3677
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "leeres Argument in @%s"
  
! #: tp/Texinfo/Parser.pm:3681
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "Leerer Knotenname nach der Erweiterung â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:3724
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "Leerer MenÃ¼eintrag-Name in â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:3732
  msgid "empty node name in menu entry"
  msgstr "leerer Knotenname im MenÃ¼eintrag"
  
! #: tp/Texinfo/Parser.pm:3805
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "@%s sollte nicht in @%s erscheinen"
  
! #: tp/Texinfo/Parser.pm:3937
! #, perl-format
! msgid "@end %s should only appear at a line beginning"
  msgstr "@end %s sollte nur an einem Zeilenanfang erscheinen"
  
! #: tp/Texinfo/Parser.pm:3960
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "Makro â€ž%sâ€œ frÃ¼her definiert"
  
! #: tp/Texinfo/Parser.pm:3963
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "hier ist die frÃ¼here Definition von â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:3968
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "Texinfo-Sprachbefehl erneut definiert: @%s"
  
! #: tp/Texinfo/Parser.pm:4017
  #, perl-format
  msgid "@%s without associated character"
  msgstr "@%s ohne zugehÃ¶riges Zeichen"
  
! #: tp/Texinfo/Parser.pm:4087
  #, perl-format
  msgid ""
--- 2669,2722 ----
  "@node ist @%s vorangestellt, aber Teile dÃ¼rfen nicht Knoten zugeordnet werden"
  
! #: tp/Texinfo/Parser.pm:3522
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "leeres Argument in @%s"
  
! #: tp/Texinfo/Parser.pm:3526
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "Leerer Knotenname nach der Erweiterung â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:3569
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "Leerer MenÃ¼eintrag-Name in â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:3577
  msgid "empty node name in menu entry"
  msgstr "leerer Knotenname im MenÃ¼eintrag"
  
! #: tp/Texinfo/Parser.pm:3650
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "@%s sollte nicht in @%s erscheinen"
  
! #: tp/Texinfo/Parser.pm:3782
! #, fuzzy, perl-format
! msgid "@end %s should only appear at the beginning of a line"
  msgstr "@end %s sollte nur an einem Zeilenanfang erscheinen"
  
! #: tp/Texinfo/Parser.pm:3804
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "Makro â€ž%sâ€œ frÃ¼her definiert"
  
! #: tp/Texinfo/Parser.pm:3807
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "hier ist die frÃ¼here Definition von â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:3812
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "Texinfo-Sprachbefehl erneut definiert: @%s"
  
! #: tp/Texinfo/Parser.pm:3879
  #, perl-format
  msgid "@%s without associated character"
  msgstr "@%s ohne zugehÃ¶riges Zeichen"
  
! #: tp/Texinfo/Parser.pm:3949
  #, perl-format
  msgid ""
***************
*** 2727,2731 ****
  "aufgerufen werden"
  
! #: tp/Texinfo/Parser.pm:4111
  #, perl-format
  msgid ""
--- 2726,2730 ----
  "aufgerufen werden"
  
! #: tp/Texinfo/Parser.pm:3974
  #, perl-format
  msgid ""
***************
*** 2736,2740 ****
  "auÃŸer Kraft zu setzen; aktueller Wert ist %d)"
  
! #: tp/Texinfo/Parser.pm:4120
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
--- 2735,2739 ----
  "auÃŸer Kraft zu setzen; aktueller Wert ist %d)"
  
! #: tp/Texinfo/Parser.pm:3983
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
***************
*** 2743,2840 ****
  "falls nÃ¶tig"
  
! #: tp/Texinfo/Parser.pm:4176
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr "Auf den Akzent-Befehl â€ž@%sâ€œ muss ein Leerzeichen folgen"
  
! #: tp/Texinfo/Parser.pm:4182
  #, 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/Parser.pm:4195 tp/Texinfo/Parser.pm:5325
  #, 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/Parser.pm:4207
  #, 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/Parser.pm:4218
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s erwartete geschweifte Klammern"
  
! #: tp/Texinfo/Parser.pm:4383
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "undefiniertes Flag: %s"
  
! #: tp/Texinfo/Parser.pm:4386
  msgid "bad syntax for @value"
  msgstr "Fehlerhafte Syntax fÃ¼r @value"
  
! #: tp/Texinfo/Parser.pm:4393
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s ist obsolet."
  
! #: tp/Texinfo/Parser.pm:4396
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s ist obsolet; %s"
  
! #: tp/Texinfo/Parser.pm:4405
! #, perl-format
! msgid "@%s should only appear at a line beginning"
  msgstr "@%s sollte nur am Zeilenanfang erscheinen"
  
! #: tp/Texinfo/Parser.pm:4496
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s nicht erlaubt innerhalb eines â€ž@%sâ€œ-Blocks"
  
! #: tp/Texinfo/Parser.pm:4505
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr "@%s sollte nur in Kopf- oder FuÃŸzeilen erscheinen"
  
! #: tp/Texinfo/Parser.pm:4631 tp/Texinfo/Parser.pm:4648
! #: tp/Texinfo/Parser.pm:4698
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s nicht sinnvoll innerhalb eines â€ž@%sâ€œ-Blocks"
  
! #: tp/Texinfo/Parser.pm:4658
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "@%s in leerer Multitabelle"
  
! #: tp/Texinfo/Parser.pm:4664
  msgid "@tab before @item"
  msgstr "@tab vor @item"
  
! #: tp/Texinfo/Parser.pm:4667
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "zu viele Spalten im â€ž@multitableâ€œ-Eintrag (maximal %d)"
  
! #: tp/Texinfo/Parser.pm:4704
  msgid "ignoring @tab outside of multitable"
  msgstr "@tab auÃŸerhalb einer â€žmultitableâ€œ wird ignoriert"
  
! #: tp/Texinfo/Parser.pm:4708
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "@%s auÃŸerhalb der Tabelle oder Liste"
  
! #: tp/Texinfo/Parser.pm:4745
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "Muss hinter â€ž@%sâ€œ sein, um â€ž@%sâ€œ zu benutzen"
  
! #: tp/Texinfo/Parser.pm:4787
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
--- 2742,2839 ----
  "falls nÃ¶tig"
  
! #: tp/Texinfo/Parser.pm:4038
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr "Auf den Akzent-Befehl â€ž@%sâ€œ muss ein Leerzeichen folgen"
  
! #: tp/Texinfo/Parser.pm:4044
  #, 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/Parser.pm:4057 tp/Texinfo/Parser.pm:5189
  #, 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/Parser.pm:4068
  #, 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/Parser.pm:4079
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s erwartete geschweifte Klammern"
  
! #: tp/Texinfo/Parser.pm:4233
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "undefiniertes Flag: %s"
  
! #: tp/Texinfo/Parser.pm:4236
  msgid "bad syntax for @value"
  msgstr "Fehlerhafte Syntax fÃ¼r @value"
  
! #: tp/Texinfo/Parser.pm:4243
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s ist obsolet."
  
! #: tp/Texinfo/Parser.pm:4246
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s ist obsolet; %s"
  
! #: tp/Texinfo/Parser.pm:4255
! #, fuzzy, perl-format
! msgid "@%s should only appear at the beginning of a line"
  msgstr "@%s sollte nur am Zeilenanfang erscheinen"
  
! #: tp/Texinfo/Parser.pm:4346
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s nicht erlaubt innerhalb eines â€ž@%sâ€œ-Blocks"
  
! #: tp/Texinfo/Parser.pm:4355
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr "@%s sollte nur in Kopf- oder FuÃŸzeilen erscheinen"
  
! #: tp/Texinfo/Parser.pm:4479 tp/Texinfo/Parser.pm:4496
! #: tp/Texinfo/Parser.pm:4546
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s nicht sinnvoll innerhalb eines â€ž@%sâ€œ-Blocks"
  
! #: tp/Texinfo/Parser.pm:4506
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "@%s in leerer Multitabelle"
  
! #: tp/Texinfo/Parser.pm:4512
  msgid "@tab before @item"
  msgstr "@tab vor @item"
  
! #: tp/Texinfo/Parser.pm:4515
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "zu viele Spalten im â€ž@multitableâ€œ-Eintrag (maximal %d)"
  
! #: tp/Texinfo/Parser.pm:4552
  msgid "ignoring @tab outside of multitable"
  msgstr "@tab auÃŸerhalb einer â€žmultitableâ€œ wird ignoriert"
  
! #: tp/Texinfo/Parser.pm:4556
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "@%s auÃŸerhalb der Tabelle oder Liste"
  
! #: tp/Texinfo/Parser.pm:4596
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "Muss hinter â€ž@%sâ€œ sein, um â€ž@%sâ€œ zu benutzen"
  
! #: tp/Texinfo/Parser.pm:4638
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
***************
*** 2842,2864 ****
  "@%s nicht sinnvoll auÃŸerhalb von â€ž@titlepageâ€œ- und â€ž@quotationâ€œ-Umgebungen"
  
! #: tp/Texinfo/Parser.pm:4791
  msgid "@dircategory after first node"
  msgstr "@dircategory nach dem ersten Knoten"
  
! #: tp/Texinfo/Parser.pm:4979
  #, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "Region %s innerhalb Region %s ist nicht erlaubt"
  
! #: tp/Texinfo/Parser.pm:4997
  msgid "@direntry after first node"
  msgstr "@direntry nach dem ersten Knoten"
  
! #: tp/Texinfo/Parser.pm:5005
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "@%s vor erstem @node gefunden"
  
! #: tp/Texinfo/Parser.pm:5008
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
--- 2841,2863 ----
  "@%s nicht sinnvoll auÃŸerhalb von â€ž@titlepageâ€œ- und â€ž@quotationâ€œ-Umgebungen"
  
! #: tp/Texinfo/Parser.pm:4642
  msgid "@dircategory after first node"
  msgstr "@dircategory nach dem ersten Knoten"
  
! #: tp/Texinfo/Parser.pm:4847
  #, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "Region %s innerhalb Region %s ist nicht erlaubt"
  
! #: tp/Texinfo/Parser.pm:4864
  msgid "@direntry after first node"
  msgstr "@direntry nach dem ersten Knoten"
  
! #: tp/Texinfo/Parser.pm:4872
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "@%s vor erstem @node gefunden"
  
! #: tp/Texinfo/Parser.pm:4875
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
***************
*** 2867,2944 ****
  "umschlossen werden?"
  
! #: tp/Texinfo/Parser.pm:5070
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr "@%s sollte nur in mathematischem Kontext erscheinen"
  
! #: tp/Texinfo/Parser.pm:5078
  #, perl-format
  msgid "unknown command `%s'"
  msgstr "unbekannter Befehl â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5088
  msgid "unexpected @"
  msgstr "unerwartetes @"
  
! #: tp/Texinfo/Parser.pm:5117
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s nicht sinnvoll auÃŸerhalb einer â€ž@floatâ€œ-Umgebung"
  
! #: tp/Texinfo/Parser.pm:5122
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr "@%s sollte sich genau vor â€ž@floatâ€œ befinden"
  
! #: tp/Texinfo/Parser.pm:5130
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "mehrfache @%s werden ignoriert"
  
! #: tp/Texinfo/Parser.pm:5249
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "Befehl @%s akzeptiert keine Argumente"
  
! #: tp/Texinfo/Parser.pm:5273
  #, 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/Parser.pm:5292
  #, 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/Parser.pm:5303
  #, 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/Parser.pm:5316
  msgid "@image missing filename argument"
  msgstr "@image fehlt als Argument ein Dateiname"
  
! #: tp/Texinfo/Parser.pm:5348
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "@%s erstes Argument fehlt"
  
! #: tp/Texinfo/Parser.pm:5393
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "nicht-hexadezimale Ziffern im Argument fÃ¼r @U: %s"
  
! #: tp/Texinfo/Parser.pm:5399
  #, 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/Parser.pm:5412
! #, perl-format
! msgid "argument for @U exceeds size of integer: %s"
! msgstr "das Argument fÃ¼r @U Ã¼bersteigt die Grenze einer Ganzzahl: %s"
! 
! #: tp/Texinfo/Parser.pm:5418
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
--- 2866,2938 ----
  "umschlossen werden?"
  
! #: tp/Texinfo/Parser.pm:4937
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr "@%s sollte nur in mathematischem Kontext erscheinen"
  
! #: tp/Texinfo/Parser.pm:4945
  #, perl-format
  msgid "unknown command `%s'"
  msgstr "unbekannter Befehl â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:4955
  msgid "unexpected @"
  msgstr "unerwartetes @"
  
! #: tp/Texinfo/Parser.pm:4983
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s nicht sinnvoll auÃŸerhalb einer â€ž@floatâ€œ-Umgebung"
  
! #: tp/Texinfo/Parser.pm:4988
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr "@%s sollte sich genau vor â€ž@floatâ€œ befinden"
  
! #: tp/Texinfo/Parser.pm:4996
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "mehrfache @%s werden ignoriert"
  
! #: tp/Texinfo/Parser.pm:5114
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "Befehl @%s akzeptiert keine Argumente"
  
! #: tp/Texinfo/Parser.pm:5138
  #, 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/Parser.pm:5156
  #, 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/Parser.pm:5167
  #, 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/Parser.pm:5180
  msgid "@image missing filename argument"
  msgstr "@image fehlt als Argument ein Dateiname"
  
! #: tp/Texinfo/Parser.pm:5211
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "@%s erstes Argument fehlt"
  
! #: tp/Texinfo/Parser.pm:5230
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "nicht-hexadezimale Ziffern im Argument fÃ¼r @U: %s"
  
! #: tp/Texinfo/Parser.pm:5236
  #, 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/Parser.pm:5253
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
***************
*** 2946,3044 ****
  "das Argument fÃ¼r @U Ã¼bersteigt das Maximum fÃ¼r Unicode von 0x10FFFF: %s"
  
! #: tp/Texinfo/Parser.pm:5546
  msgid "superfluous arguments for node"
  msgstr "Ã¼berflÃ¼ssige Argumente fÃ¼r Knoten"
  
! #: tp/Texinfo/Parser.pm:5596
  #, perl-format
  msgid "expected @end %s"
  msgstr "@end %s wurde erwartet"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "@%s sollte nur einen @-Befehl als Argument akzeptieren, nicht â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5728
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "Verbleibendes Argument in Zeile @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5801
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "Umgebungsbefehl %s als Argument zu @%s"
  
! #: tp/Texinfo/Parser.pm:5823
  #, perl-format
  msgid "empty @%s"
  msgstr "leeres @%s"
  
! #: tp/Texinfo/Parser.pm:5831
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "Spaltenteilung keine Zahl: %s"
  
! #: tp/Texinfo/Parser.pm:5840
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "Argument fÃ¼r @sp muss numerisch sein, nicht â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5849
  #, perl-format
  msgid "reserved index name %s"
  msgstr "reservierte Index-Name %s"
  
! #: tp/Texinfo/Parser.pm:5868
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "Unbekannter Quell-Index @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5871
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "Unbekannter Ziel-Index @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5901
  #, 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/Parser.pm:5914
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "Unbekannter Index â€ž%sâ€œ in @printindex"
  
! #: tp/Texinfo/Parser.pm:5920
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr "Ausgabe eines Index â€ž%sâ€œ wurde in einen anderen â€ž%sâ€œ zusammengefÃ¼hrt"
  
! #: tp/Texinfo/Parser.pm:5928
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "printindex vor dem Anfang des Dokuments: @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5944
  #, 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/Parser.pm:5952
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr "Nur @%s 10 oder 11 unterstÃ¼tzt, nicht â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5960
  #, 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/Parser.pm:5968
  #, 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/Parser.pm:5986 tp/Texinfo/Parser.pm:5991
  #, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
--- 2940,3038 ----
  "das Argument fÃ¼r @U Ã¼bersteigt das Maximum fÃ¼r Unicode von 0x10FFFF: %s"
  
! #: tp/Texinfo/Parser.pm:5448
  msgid "superfluous arguments for node"
  msgstr "Ã¼berflÃ¼ssige Argumente fÃ¼r Knoten"
  
! #: tp/Texinfo/Parser.pm:5498
  #, perl-format
  msgid "expected @end %s"
  msgstr "@end %s wurde erwartet"
  
! #: tp/Texinfo/Parser.pm:5607
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "@%s sollte nur einen @-Befehl als Argument akzeptieren, nicht â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5617
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "Verbleibendes Argument in Zeile @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5689
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "Umgebungsbefehl %s als Argument zu @%s"
  
! #: tp/Texinfo/Parser.pm:5710
  #, perl-format
  msgid "empty @%s"
  msgstr "leeres @%s"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "Spaltenteilung keine Zahl: %s"
  
! #: tp/Texinfo/Parser.pm:5727
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "Argument fÃ¼r @sp muss numerisch sein, nicht â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5736
  #, perl-format
  msgid "reserved index name %s"
  msgstr "reservierte Index-Name %s"
  
! #: tp/Texinfo/Parser.pm:5762
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "Unbekannter Quell-Index @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5765
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "Unbekannter Ziel-Index @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5793
  #, 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/Parser.pm:5806
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "Unbekannter Index â€ž%sâ€œ in @printindex"
  
! #: tp/Texinfo/Parser.pm:5812
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr "Ausgabe eines Index â€ž%sâ€œ wurde in einen anderen â€ž%sâ€œ zusammengefÃ¼hrt"
  
! #: tp/Texinfo/Parser.pm:5820
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "printindex vor dem Anfang des Dokuments: @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5836
  #, 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/Parser.pm:5844
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr "Nur @%s 10 oder 11 unterstÃ¼tzt, nicht â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5852
  #, 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/Parser.pm:5860
  #, 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/Parser.pm:5878 tp/Texinfo/Parser.pm:5883
  #, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
***************
*** 3047,3051 ****
  "â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5999
  #, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
--- 3041,3045 ----
  "â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5891
  #, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
***************
*** 3053,3057 ****
  "Argument fÃ¼r @firstparagraphindent muss â€žnoneâ€œ oder â€žinsertâ€œ sein, nicht â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:6009
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
--- 3047,3051 ----
  "Argument fÃ¼r @firstparagraphindent muss â€žnoneâ€œ oder â€žinsertâ€œ sein, nicht â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
***************
*** 3059,3068 ****
  "Argument fÃ¼r @exampleindent muss â€žnumericâ€œ oder â€žasisâ€œ sein, nicht â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:6021
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "@%s â€žonâ€œ oder â€žoffâ€œ wurde erwartet, nicht â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:6031
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
--- 3053,3062 ----
  "Argument fÃ¼r @exampleindent muss â€žnumericâ€œ oder â€žasisâ€œ sein, nicht â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5913
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "@%s â€žonâ€œ oder â€žoffâ€œ wurde erwartet, nicht â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5922
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
***************
*** 3071,3075 ****
  "nicht â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:6039
  #, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
--- 3065,3069 ----
  "nicht â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5930
  #, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
***************
*** 3077,3081 ****
  "Argument fÃ¼r @allowcodebreaks muss â€žtrueâ€œ oder â€žfalseâ€œ sein, nicht â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:6047
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
--- 3071,3075 ----
  "Argument fÃ¼r @allowcodebreaks muss â€žtrueâ€œ oder â€žfalseâ€œ sein, nicht â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5938
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
***************
*** 3084,3088 ****
  "â€ž%sâ€œ"
  
! #: tp/Texinfo/Structuring.pm:213
  #, perl-format
  msgid "raising the section level of @%s which is too low"
--- 3078,3082 ----
  "â€ž%sâ€œ"
  
! #: tp/Texinfo/Structuring.pm:216
  #, perl-format
  msgid "raising the section level of @%s which is too low"
***************
*** 3091,3100 ****
  "ist"
  
! #: tp/Texinfo/Structuring.pm:245
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "kein chapter-level-Befehl vor @%s"
  
! #: tp/Texinfo/Structuring.pm:250
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
--- 3085,3094 ----
  "ist"
  
! #: tp/Texinfo/Structuring.pm:248
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "kein chapter-level-Befehl vor @%s"
  
! #: tp/Texinfo/Structuring.pm:253
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
***************
*** 3103,3157 ****
  "Ebene abgesenkt"
  
! #: tp/Texinfo/Structuring.pm:339
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "kein Abschnittsbefehl mit @%s verknÃ¼pft"
  
! #: tp/Texinfo/Structuring.pm:488
  #, perl-format
  msgid "@%s not empty"
  msgstr "@%s ist nicht leer"
  
! #: tp/Texinfo/Structuring.pm:544 tp/Texinfo/Structuring.pm:1326
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "@%s-Referenz auf nicht existierenden Knoten â€ž%sâ€œ"
  
! #: tp/Texinfo/Structuring.pm:557
  #, perl-format
  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:662
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "Nicht referenzierter Knoten â€ž%sâ€œ"
  
! #: tp/Texinfo/Structuring.pm:708
  #, 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:715
  #, 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:733
  #, 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:787
  #, 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:814
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%s-Referenz zu nicht existierendem â€ž%sâ€œ"
  
! #: tp/Texinfo/Structuring.pm:834
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
--- 3097,3151 ----
  "Ebene abgesenkt"
  
! #: tp/Texinfo/Structuring.pm:342
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "kein Abschnittsbefehl mit @%s verknÃ¼pft"
  
! #: tp/Texinfo/Structuring.pm:491
  #, perl-format
  msgid "@%s not empty"
  msgstr "@%s ist nicht leer"
  
! #: tp/Texinfo/Structuring.pm:547 tp/Texinfo/Structuring.pm:1325
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "@%s-Referenz auf nicht existierenden Knoten â€ž%sâ€œ"
  
! #: tp/Texinfo/Structuring.pm:558
  #, perl-format
  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:663
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "Nicht referenzierter Knoten â€ž%sâ€œ"
  
! #: tp/Texinfo/Structuring.pm:706
  #, 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:713
  #, 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:731
  #, 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:786
  #, 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:810
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%s-Referenz zu nicht existierendem â€ž%sâ€œ"
  
! #: tp/Texinfo/Structuring.pm:829
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
***************
*** 3160,3164 ****
  "â€žaufwÃ¤rtsâ€œ (Up) ist"
  
! #: tp/Texinfo/Structuring.pm:842
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
--- 3154,3158 ----
  "â€žaufwÃ¤rtsâ€œ (Up) ist"
  
! #: tp/Texinfo/Structuring.pm:837
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
***************
*** 3171,3175 ****
  msgstr "@%s zu â€ž%sâ€œ, unterscheidet sich vom %s-Namen â€ž%sâ€œ"
  
! #: tp/Texinfo/Structuring.pm:2070
  #, perl-format
  msgid "empty index key in @%s"
--- 3165,3169 ----
  msgstr "@%s zu â€ž%sâ€œ, unterscheidet sich vom %s-Namen â€ž%sâ€œ"
  
! #: tp/Texinfo/Structuring.pm:2067
  #, perl-format
  msgid "empty index key in @%s"
***************
*** 3710,3729 ****
  msgstr "â€ž%s --helpâ€œ gibt weitere Informationen.\n"
  
! #: tp/texi2any.pl:1232
  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:1255
  #, 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:1261
  #, 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:1286
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
--- 3704,3723 ----
  msgstr "â€ž%s --helpâ€œ gibt weitere Informationen.\n"
  
! #: tp/texi2any.pl:1239
  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:1262
  #, 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:1268
  #, 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:1293
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
***************
*** 3733,3751 ****
  "Abschnitt?"
  
! #: tp/texi2any.pl:1359 tp/texi2any.pl:1435
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%s: Fehler beim SchlieÃŸen von %s: %s\n"
  
! #: tp/texi2any.pl:1382 tp/texi2any.pl:1416
  #, 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:1388 tp/texi2any.pl:1422
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
  msgstr "%s: %s konnte nicht zum Schreiben geÃ¶ffnet werden: %s\n"
  
  #~ msgid ""
  #~ "\n"
--- 3727,3748 ----
  "Abschnitt?"
  
! #: tp/texi2any.pl:1366 tp/texi2any.pl:1442
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%s: Fehler beim SchlieÃŸen von %s: %s\n"
  
! #: tp/texi2any.pl:1389 tp/texi2any.pl:1423
  #, 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:1395 tp/texi2any.pl:1429
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
  msgstr "%s: %s konnte nicht zum Schreiben geÃ¶ffnet werden: %s\n"
  
+ #~ msgid "No file given for node '%s'."
+ #~ msgstr "Keine Datei angegeben fÃ¼r Knoten â€ž%sâ€œ."
+ 
  #~ msgid ""
  #~ "\n"
***************
*** 3766,3769 ****
--- 3763,3775 ----
  #~ msgstr "--*** Veraltete Tags ***"
  
+ #~ msgid "-%s---Info: %s, %ld lines --%s--"
+ #~ msgstr "-%s---Info: %s, %ld Zeilen --%s--"
+ 
+ #~ msgid "-%s%s-Info: (%s)%s, %ld lines --%s--"
+ #~ msgstr "-%s%s-Info: (%s)%s, %ld Zeilen --%s--"
+ 
  #~ msgid " Subfile: %s"
  #~ msgstr " Unterdatei: %s"
+ 
+ #~ msgid "argument for @U exceeds size of integer: %s"
+ #~ msgstr "das Argument fÃ¼r @U Ã¼bersteigt die Grenze einer Ganzzahl: %s"
Binary files texinfo-6.1/po/de_AT.gmo and texinfo-6.3/po/de_AT.gmo differ
diff -Nrc2 texinfo-6.1/po/de_AT.po texinfo-6.3/po/de_AT.po
*** texinfo-6.1/po/de_AT.po	2016-02-06 11:35:49.000000000 +0000
--- texinfo-6.3/po/de_AT.po	2016-09-10 12:45:50.000000000 +0100
***************
*** 10,14 ****
  "Project-Id-Version: texinfo 3.12d\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
  "PO-Revision-Date: 1999-02-16 21:14+01:00\n"
  "Last-Translator: Karl Eichwalder <ke@suse.de>\n"
--- 10,14 ----
  "Project-Id-Version: texinfo 3.12d\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:45+0100\n"
  "PO-Revision-Date: 1999-02-16 21:14+01:00\n"
  "Last-Translator: Karl Eichwalder <ke@suse.de>\n"
***************
*** 113,117 ****
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [ or [^"
  msgstr ""
  
--- 113,117 ----
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [, [^, [:, [., or [="
  msgstr ""
  
***************
*** 152,156 ****
  msgstr ""
  
! #: gnulib/lib/regcomp.c:711
  msgid "No previous regular expression"
  msgstr ""
--- 152,156 ----
  msgstr ""
  
! #: gnulib/lib/regcomp.c:687
  msgid "No previous regular expression"
  msgstr ""
***************
*** 304,308 ****
  msgstr ""
  
! #: info/indices.c:123 info/indices.c:812
  #, c-format
  msgid "Finding index entries..."
--- 304,308 ----
  msgstr ""
  
! #: info/indices.c:123 info/indices.c:822
  #, c-format
  msgid "Finding index entries..."
***************
*** 313,317 ****
  msgstr ""
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:818
  #, c-format
  msgid "No indices found."
--- 313,317 ----
  msgstr ""
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:828
  #, c-format
  msgid "No indices found."
***************
*** 342,373 ****
  msgstr ""
  
! #: info/indices.c:476 info/indices.c:880
  #, c-format
  msgid "No index entries containing '%s'."
  msgstr ""
  
! #: info/indices.c:583
  #, c-format
  msgid "Scanning indices of '%s'..."
  msgstr ""
  
! #: info/indices.c:636
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
  
! #: info/indices.c:644 info/indices.c:646
  msgid "Index apropos"
  msgstr ""
  
! #: info/indices.c:688
  #, c-format
  msgid "Index entries containing '%s':\n"
  msgstr ""
  
! #: info/indices.c:797
  msgid "List all matches of a string in the index"
  msgstr ""
  
! #: info/indices.c:824 info/indices.c:826
  msgid "Index topic"
  msgstr ""
--- 342,373 ----
  msgstr ""
  
! #: info/indices.c:476 info/indices.c:890
  #, 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:807
  msgid "List all matches of a string in the index"
  msgstr ""
  
! #: info/indices.c:834 info/indices.c:836
  msgid "Index topic"
  msgstr ""
***************
*** 378,432 ****
  msgstr ""
  
! #: info/info-utils.c:892
  #, c-format
  msgid "Error converting file character encoding."
  msgstr ""
  
! #: info/info.c:222 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr ""
  
! #: info/info.c:315
! #, c-format
! msgid "No file given for node '%s'."
! msgstr ""
! 
! #: info/info.c:364 info/info.c:1133
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr ""
  
! #: info/info.c:386
  #, c-format
  msgid "No program name given."
  msgstr ""
  
! #: info/info.c:577
  #, c-format
  msgid "invalid number: %s\n"
  msgstr ""
  
! #: info/info.c:757
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr ""
  
! #: info/info.c:764 info/infokey.c:537
  #, c-format
  msgid "%s: no such variable"
  msgstr ""
  
! #: info/info.c:770 info/infokey.c:539
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr ""
  
! #: info/info.c:782
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr ""
  
! #: info/info.c:804 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
--- 378,427 ----
  msgstr ""
  
! #: info/info-utils.c:879
  #, c-format
  msgid "Error converting file character encoding."
  msgstr ""
  
! #: info/info.c:279 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr ""
  
! #: info/info.c:416 info/info.c:1148
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr ""
  
! #: info/info.c:438
  #, c-format
  msgid "No program name given."
  msgstr ""
  
! #: info/info.c:636
  #, c-format
  msgid "invalid number: %s\n"
  msgstr ""
  
! #: info/info.c:816
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr ""
  
! #: info/info.c:823 info/infokey.c:540
  #, c-format
  msgid "%s: no such variable"
  msgstr ""
  
! #: info/info.c:829 info/infokey.c:542
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr ""
  
! #: info/info.c:841
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr ""
  
! #: info/info.c:860 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
***************
*** 438,447 ****
  msgstr ""
  
! #: info/info.c:981
  #, c-format
  msgid "no index entries found for '%s'\n"
  msgstr ""
  
! #: info/info.c:1034
  #, c-format
  msgid ""
--- 433,442 ----
  msgstr ""
  
! #: info/info.c:999
  #, c-format
  msgid "no index entries found for '%s'\n"
  msgstr ""
  
! #: info/info.c:1049
  #, c-format
  msgid ""
***************
*** 451,455 ****
  msgstr ""
  
! #: info/info.c:1040
  msgid ""
  "Options:\n"
--- 446,450 ----
  msgstr ""
  
! #: info/info.c:1055
  msgid ""
  "Options:\n"
***************
*** 462,466 ****
  msgstr ""
  
! #: info/info.c:1048
  msgid ""
  "  -h, --help                   display this help and exit.\n"
--- 457,461 ----
  msgstr ""
  
! #: info/info.c:1063
  msgid ""
  "  -h, --help                   display this help and exit.\n"
***************
*** 470,474 ****
  msgstr ""
  
! #: info/info.c:1054
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
--- 465,469 ----
  msgstr ""
  
! #: info/info.c:1069
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
***************
*** 478,486 ****
  msgstr ""
  
! #: info/info.c:1061
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr ""
  
! #: info/info.c:1065
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
--- 473,481 ----
  msgstr ""
  
! #: info/info.c:1076
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr ""
  
! #: info/info.c:1080
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
***************
*** 494,498 ****
  msgstr ""
  
! #: info/info.c:1074
  msgid ""
  "\n"
--- 489,493 ----
  msgstr ""
  
! #: info/info.c:1089
  msgid ""
  "\n"
***************
*** 504,508 ****
  msgstr ""
  
! #: info/info.c:1081
  msgid ""
  "\n"
--- 499,503 ----
  msgstr ""
  
! #: info/info.c:1096
  msgid ""
  "\n"
***************
*** 510,514 ****
  msgstr ""
  
! #: info/info.c:1084
  msgid ""
  "\n"
--- 505,509 ----
  msgstr ""
  
! #: info/info.c:1099
  msgid ""
  "\n"
***************
*** 526,530 ****
  msgstr ""
  
! #: info/info.c:1099 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
--- 521,525 ----
  msgstr ""
  
! #: info/info.c:1114 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
***************
*** 533,597 ****
  msgstr ""
  
! #: info/info.c:1134
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr ""
  
! #: info/info.c:1135
  msgid "Cannot find a window!"
  msgstr ""
  
! #: info/info.c:1136
  msgid "Point doesn't appear within this window's node!"
  msgstr ""
  
! #: info/info.c:1137
  msgid "Cannot delete the last window."
  msgstr ""
  
! #: info/info.c:1138
  msgid "No menu in this node."
  msgstr ""
  
! #: info/info.c:1139
  msgid "No footnotes in this node."
  msgstr ""
  
! #: info/info.c:1140
  msgid "No cross references in this node."
  msgstr ""
  
! #: info/info.c:1141
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr ""
  
! #: info/info.c:1142
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr ""
  
! #: info/info.c:1143
  #, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr ""
  
! #: info/info.c:1144
  msgid "You are already at the last page of this node."
  msgstr ""
  
! #: info/info.c:1145
  msgid "You are already at the first page of this node."
  msgstr ""
  
! #: info/info.c:1146
  msgid "Only one window."
  msgstr ""
  
! #: info/info.c:1147
  msgid "Resulting window would be too small."
  msgstr ""
  
! #: info/info.c:1148
  msgid "Not enough room for a help window, please delete a window."
  msgstr ""
--- 528,592 ----
  msgstr ""
  
! #: info/info.c:1149
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr ""
  
! #: info/info.c:1150
  msgid "Cannot find a window!"
  msgstr ""
  
! #: info/info.c:1151
  msgid "Point doesn't appear within this window's node!"
  msgstr ""
  
! #: info/info.c:1152
  msgid "Cannot delete the last window."
  msgstr ""
  
! #: info/info.c:1153
  msgid "No menu in this node."
  msgstr ""
  
! #: info/info.c:1154
  msgid "No footnotes in this node."
  msgstr ""
  
! #: info/info.c:1155
  msgid "No cross references in this node."
  msgstr ""
  
! #: info/info.c:1156
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr ""
  
! #: info/info.c:1157
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr ""
  
! #: info/info.c:1158
  #, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr ""
  
! #: info/info.c:1159
  msgid "You are already at the last page of this node."
  msgstr ""
  
! #: info/info.c:1160
  msgid "You are already at the first page of this node."
  msgstr ""
  
! #: info/info.c:1161
  msgid "Only one window."
  msgstr ""
  
! #: info/info.c:1162
  msgid "Resulting window would be too small."
  msgstr ""
  
! #: info/info.c:1163
  msgid "Not enough room for a help window, please delete a window."
  msgstr ""
***************
*** 849,883 ****
  msgstr ""
  
! #: info/infokey.c:482
  #, c-format
  msgid "action name too long"
  msgstr ""
  
! #: info/infokey.c:495
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr ""
  
! #: info/infokey.c:506
  #, c-format
  msgid "missing variable name"
  msgstr ""
  
! #: info/infokey.c:515
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr ""
  
! #: info/infokey.c:522
  #, c-format
  msgid "variable name too long"
  msgstr ""
  
! #: info/infokey.c:546
  #, c-format
  msgid "value too long"
  msgstr ""
  
! #: info/infokey.c:592
  #, c-format
  msgid "\"%s\", line %u: "
--- 844,878 ----
  msgstr ""
  
! #: info/infokey.c:485
  #, c-format
  msgid "action name too long"
  msgstr ""
  
! #: info/infokey.c:498
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr ""
  
! #: info/infokey.c:509
  #, c-format
  msgid "missing variable name"
  msgstr ""
  
! #: info/infokey.c:518
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr ""
  
! #: info/infokey.c:525
  #, c-format
  msgid "variable name too long"
  msgstr ""
  
! #: info/infokey.c:549
  #, c-format
  msgid "value too long"
  msgstr ""
  
! #: info/infokey.c:595
  #, c-format
  msgid "\"%s\", line %u: "
***************
*** 1194,1532 ****
  msgstr ""
  
! #: info/session.c:2864
  msgid "Read a list of menus starting from dir and follow them"
  msgstr ""
  
! #: info/session.c:2866
  msgid "Follow menus: "
  msgstr ""
  
! #: info/session.c:2971
  msgid "Select the Next node"
  msgstr ""
  
! #: info/session.c:2978
  msgid "Select the Prev node"
  msgstr ""
  
! #: info/session.c:2985
  msgid "Select the Up node"
  msgstr ""
  
! #: info/session.c:2991
  msgid "Select the last node in this file"
  msgstr ""
  
! #: info/session.c:3018 info/session.c:3051
  msgid "This window has no additional nodes"
  msgstr ""
  
! #: info/session.c:3024
  msgid "Select the first node in this file"
  msgstr ""
  
! #: info/session.c:3158
  msgid "No more nodes within this document."
  msgstr ""
  
! #: info/session.c:3203 info/session.c:3243
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr ""
  
! #: info/session.c:3256
  msgid "Move forwards or down through node structure"
  msgstr ""
  
! #: info/session.c:3273
  msgid "Move backwards or up through node structure"
  msgstr ""
  
! #: info/session.c:3296
  msgid "Read a node name and select it"
  msgstr ""
  
! #: info/session.c:3350 info/session.c:3354
  msgid "Goto node: "
  msgstr ""
  
! #: info/session.c:3533
  msgid "Find the node describing program invocation"
  msgstr ""
  
! #: info/session.c:3535
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr ""
  
! #: info/session.c:3580
  msgid "Read a manpage reference and select it"
  msgstr ""
  
! #: info/session.c:3584
  msgid "Get Manpage: "
  msgstr ""
  
! #: info/session.c:3605
  msgid "Select the node 'Top' in this file"
  msgstr ""
  
! #: info/session.c:3611
  msgid "Select the node '(dir)'"
  msgstr ""
  
! #: info/session.c:3617
  msgid "Show full file name of node being displayed"
  msgstr ""
  
! #: info/session.c:3634
  msgid "Select the most recently selected node"
  msgstr ""
  
! #: info/session.c:3639
  #, c-format
  msgid "No earlier node in history"
  msgstr ""
  
! #: info/session.c:3643
  msgid "Read the name of a file and select it"
  msgstr ""
  
! #: info/session.c:3647
  msgid "Find file: "
  msgstr ""
  
! #: info/session.c:3664
  #, 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:4169
  msgid "Search continued from the end of the document."
  msgstr ""
  
! #: info/session.c:4174
  msgid "Search continued from the beginning of the document."
  msgstr ""
  
! #: info/session.c:4194
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr ""
  
! #: info/session.c:4231
  msgid "Search failed."
  msgstr ""
  
! #: info/session.c:4248
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr ""
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Regexp search"
  msgstr ""
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Search"
  msgstr ""
  
! #: info/session.c:4250 info/session.c:4256
  msgid " case-sensitively"
  msgstr ""
  
! #: info/session.c:4251 info/session.c:4257
  msgid " backward"
  msgstr ""
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s: "
  msgstr ""
  
! #: info/session.c:4274
  msgid "Search string too short"
  msgstr ""
  
! #: info/session.c:4467
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4491 info/session.c:4601
  #, c-format
  msgid "No more matches."
  msgstr ""
  
! #: info/session.c:4628
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4649
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4653 info/session.c:4665
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4661
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4674
  msgid "Read a string and search for it case-sensitively"
  msgstr ""
  
! #: info/session.c:4679
  msgid "Read a string and search for it"
  msgstr ""
  
! #: info/session.c:4685
  msgid "Read a string and search backward for it"
  msgstr ""
  
! #: info/session.c:4693
  msgid "Repeat last search in the same direction"
  msgstr ""
  
! #: info/session.c:4701 info/session.c:4746
  msgid "No previous search string"
  msgstr ""
  
! #: info/session.c:4738
  msgid "Repeat last search in the reverse direction"
  msgstr ""
  
! #: info/session.c:4785
  msgid "Clear displayed search matches"
  msgstr ""
  
! #: info/session.c:4802 info/session.c:4808
  msgid "Search interactively for a string as you type it"
  msgstr ""
  
! #: info/session.c:4928
  msgid "Regexp I-search backward: "
  msgstr ""
  
! #: info/session.c:4929
  msgid "I-search backward: "
  msgstr ""
  
! #: info/session.c:4931
  msgid "Regexp I-search: "
  msgstr ""
  
! #: info/session.c:4932
  msgid "I-search: "
  msgstr ""
  
! #: info/session.c:4957 info/session.c:4960
  msgid "Failing "
  msgstr ""
  
! #: info/session.c:5326
  msgid "Cancel current operation"
  msgstr ""
  
! #: info/session.c:5333
  msgid "Quit"
  msgstr ""
  
! #: info/session.c:5338
  msgid "Display version of Info being run"
  msgstr ""
  
! #: info/session.c:5340
  #, c-format
  msgid "GNU Info version %s"
  msgstr ""
  
! #: info/session.c:5345
  msgid "Redraw the display"
  msgstr ""
  
! #: info/session.c:5382
  msgid "Quit using Info"
  msgstr ""
  
! #: info/session.c:5398
  msgid "Run command bound to this key's lowercase variant"
  msgstr ""
  
! #: info/session.c:5409
  #, c-format
  msgid "Unknown command (%s)."
  msgstr ""
  
! #: info/session.c:5412
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr ""
  
! #: info/session.c:5413
  #, c-format
  msgid "'%s' is invalid"
  msgstr ""
  
! #: info/session.c:5731
  msgid "Add this digit to the current numeric argument"
  msgstr ""
  
! #: info/session.c:5738
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr ""
--- 1189,1527 ----
  msgstr ""
  
! #: info/session.c:2870
  msgid "Read a list of menus starting from dir and follow them"
  msgstr ""
  
! #: info/session.c:2872
  msgid "Follow menus: "
  msgstr ""
  
! #: info/session.c:2977
  msgid "Select the Next node"
  msgstr ""
  
! #: info/session.c:2984
  msgid "Select the Prev node"
  msgstr ""
  
! #: info/session.c:2991
  msgid "Select the Up node"
  msgstr ""
  
! #: info/session.c:2997
  msgid "Select the last node in this file"
  msgstr ""
  
! #: info/session.c:3024 info/session.c:3057
  msgid "This window has no additional nodes"
  msgstr ""
  
! #: info/session.c:3030
  msgid "Select the first node in this file"
  msgstr ""
  
! #: info/session.c:3164
  msgid "No more nodes within this document."
  msgstr ""
  
! #: info/session.c:3209 info/session.c:3249
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr ""
  
! #: info/session.c:3262
  msgid "Move forwards or down through node structure"
  msgstr ""
  
! #: info/session.c:3279
  msgid "Move backwards or up through node structure"
  msgstr ""
  
! #: info/session.c:3302
  msgid "Read a node name and select it"
  msgstr ""
  
! #: info/session.c:3356 info/session.c:3360
  msgid "Goto node: "
  msgstr ""
  
! #: info/session.c:3539
  msgid "Find the node describing program invocation"
  msgstr ""
  
! #: info/session.c:3541
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr ""
  
! #: info/session.c:3586
  msgid "Read a manpage reference and select it"
  msgstr ""
  
! #: info/session.c:3590
  msgid "Get Manpage: "
  msgstr ""
  
! #: info/session.c:3611
  msgid "Select the node 'Top' in this file"
  msgstr ""
  
! #: info/session.c:3617
  msgid "Select the node '(dir)'"
  msgstr ""
  
! #: info/session.c:3623
  msgid "Show full file name of node being displayed"
  msgstr ""
  
! #: info/session.c:3640
  msgid "Select the most recently selected node"
  msgstr ""
  
! #: info/session.c:3645
  #, c-format
  msgid "No earlier node in history"
  msgstr ""
  
! #: info/session.c:3649
  msgid "Read the name of a file and select it"
  msgstr ""
  
! #: info/session.c:3653
  msgid "Find file: "
  msgstr ""
  
! #: info/session.c:3670
  #, c-format
  msgid "Cannot find '%s'."
  msgstr ""
  
! #: info/session.c:3719
  #, c-format
  msgid "Could not create output file '%s'."
  msgstr ""
  
! #: info/session.c:3733
  #, c-format
  msgid "error writing to %s: %s"
  msgstr ""
  
! #: info/session.c:3742
  #, c-format
  msgid "closing %s"
  msgstr ""
  
! #: info/session.c:3791
  #, c-format
  msgid "writing node %s..."
  msgstr ""
  
! #: info/session.c:3837
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr ""
  
! #: info/session.c:3865
  #, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr ""
  
! #: info/session.c:3870
  #, c-format
  msgid "printing node %s..."
  msgstr ""
  
! #: info/session.c:3878
  #, c-format
  msgid "finished printing node %s"
  msgstr ""
  
! #: info/session.c:3910
  msgid "Toggle the usage of regular expressions in searches"
  msgstr ""
  
! #: info/session.c:3914
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr ""
  
! #: info/session.c:3915
  #, c-format
  msgid "Using literal strings for searches."
  msgstr ""
  
! #: info/session.c:4175
  msgid "Search continued from the end of the document."
  msgstr ""
  
! #: info/session.c:4180
  msgid "Search continued from the beginning of the document."
  msgstr ""
  
! #: info/session.c:4200
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr ""
  
! #: info/session.c:4237
  msgid "Search failed."
  msgstr ""
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr ""
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Regexp search"
  msgstr ""
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Search"
  msgstr ""
  
! #: info/session.c:4256 info/session.c:4262
  msgid " case-sensitively"
  msgstr ""
  
! #: info/session.c:4257 info/session.c:4263
  msgid " backward"
  msgstr ""
  
! #: info/session.c:4260
  #, c-format
  msgid "%s%s%s: "
  msgstr ""
  
! #: info/session.c:4280
  msgid "Search string too short"
  msgstr ""
  
! #: info/session.c:4473
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4497 info/session.c:4607
  #, c-format
  msgid "No more matches."
  msgstr ""
  
! #: info/session.c:4634
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4655
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4659 info/session.c:4671
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4667
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4680
  msgid "Read a string and search for it case-sensitively"
  msgstr ""
  
! #: info/session.c:4685
  msgid "Read a string and search for it"
  msgstr ""
  
! #: info/session.c:4691
  msgid "Read a string and search backward for it"
  msgstr ""
  
! #: info/session.c:4699
  msgid "Repeat last search in the same direction"
  msgstr ""
  
! #: info/session.c:4707 info/session.c:4752
  msgid "No previous search string"
  msgstr ""
  
! #: info/session.c:4744
  msgid "Repeat last search in the reverse direction"
  msgstr ""
  
! #: info/session.c:4791
  msgid "Clear displayed search matches"
  msgstr ""
  
! #: info/session.c:4808 info/session.c:4814
  msgid "Search interactively for a string as you type it"
  msgstr ""
  
! #: info/session.c:4934
  msgid "Regexp I-search backward: "
  msgstr ""
  
! #: info/session.c:4935
  msgid "I-search backward: "
  msgstr ""
  
! #: info/session.c:4937
  msgid "Regexp I-search: "
  msgstr ""
  
! #: info/session.c:4938
  msgid "I-search: "
  msgstr ""
  
! #: info/session.c:4963 info/session.c:4966
  msgid "Failing "
  msgstr ""
  
! #: info/session.c:5332
  msgid "Cancel current operation"
  msgstr ""
  
! #: info/session.c:5339
  msgid "Quit"
  msgstr ""
  
! #: info/session.c:5344
  msgid "Display version of Info being run"
  msgstr ""
  
! #: info/session.c:5346
  #, c-format
  msgid "GNU Info version %s"
  msgstr ""
  
! #: info/session.c:5351
  msgid "Redraw the display"
  msgstr ""
  
! #: info/session.c:5388
  msgid "Quit using Info"
  msgstr ""
  
! #: info/session.c:5404
  msgid "Run command bound to this key's lowercase variant"
  msgstr ""
  
! #: info/session.c:5415
  #, c-format
  msgid "Unknown command (%s)."
  msgstr ""
  
! #: info/session.c:5418
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr ""
  
! #: info/session.c:5419
  #, c-format
  msgid "'%s' is invalid"
  msgstr ""
  
! #: info/session.c:5737
  msgid "Add this digit to the current numeric argument"
  msgstr ""
  
! #: info/session.c:5744
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr ""
***************
*** 1662,1679 ****
  msgstr ""
  
! #: info/window.c:959
  msgid "-----Info: (), lines ----, "
  msgstr ""
  
- #: info/window.c:966
- #, c-format
- msgid "-%s---Info: %s, %ld lines --%s--"
- msgstr ""
- 
- #: info/window.c:970
- #, c-format
- msgid "-%s---Info: (%s)%s, %ld lines --%s--"
- msgstr ""
- 
  #: install-info/install-info.c:292
  #, c-format
--- 1657,1664 ----
  msgstr ""
  
! #: info/window.c:909
  msgid "-----Info: (), lines ----, "
  msgstr ""
  
  #: install-info/install-info.c:292
  #, c-format
***************
*** 1799,1803 ****
  "\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"
--- 1784,1788 ----
  "\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"
***************
*** 1874,1990 ****
  msgstr ""
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:855
! #: tp/Texinfo/Convert/Converter.pm:893 tp/Texinfo/Convert/Converter.pm:1204
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6504
! #: tp/Texinfo/Convert/HTML.pm:6528 tp/Texinfo/Convert/HTML.pm:6905
! #: tp/Texinfo/Convert/HTML.pm:6963 tp/Texinfo/Convert/HTML.pm:7041
! #: tp/Texinfo/Convert/HTML.pm:7118 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:546
! #: tp/Texinfo/Convert/TexinfoXML.pm:457
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:881
  msgid "recursion is always allowed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:882
  msgid "arguments are quoted by default"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1105
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1110
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1128
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1151
  #, perl-format
  msgid "could not read %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1170
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1176 tp/Texinfo/Parser.pm:3353
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1520
! #, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:1548
! msgid "missing type"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:1551
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:1568
! #, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:1603
  msgid "no node to be renamed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1614
  msgid "nodes without a new name at the end of file"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1624 tp/Texinfo/Parser.pm:926
  #, perl-format
  msgid "could not open %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:2144
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:395 tp/Texinfo/Convert/Converter.pm:414
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:794
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:876 tp/Texinfo/Convert/Converter.pm:909
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:6931
! #: tp/Texinfo/Convert/HTML.pm:6989 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:476 tp/Texinfo/Parser.pm:2035
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, perl-format
  msgid "could not create directories `%s' or `%s': %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:995
  #, perl-format
  msgid "could not create directory `%s': %s"
--- 1859,1967 ----
  msgstr ""
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:847
! #: tp/Texinfo/Convert/Converter.pm:885 tp/Texinfo/Convert/Converter.pm:1196
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6573
! #: tp/Texinfo/Convert/HTML.pm:6597 tp/Texinfo/Convert/HTML.pm:6978
! #: tp/Texinfo/Convert/HTML.pm:7037 tp/Texinfo/Convert/HTML.pm:7115
! #: tp/Texinfo/Convert/HTML.pm:7192 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:547
! #: tp/Texinfo/Convert/TexinfoXML.pm:458
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:862
  msgid "recursion is always allowed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:863
  msgid "arguments are quoted by default"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:866
! msgid ""
! "move your @contents command if you want the contents after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:869
! msgid ""
! "move your @shortcontents and @contents commands if you want the contents "
! "after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:1093
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1098
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1116
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1139
  #, perl-format
  msgid "could not read %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1158
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1164 tp/Texinfo/Parser.pm:3193
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1637
  msgid "no node to be renamed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1648
  msgid "nodes without a new name at the end of file"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1658 tp/Texinfo/Parser.pm:899
  #, perl-format
  msgid "could not open %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:2178
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:387 tp/Texinfo/Convert/Converter.pm:406
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:786
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:868 tp/Texinfo/Convert/Converter.pm:901
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:7004
! #: tp/Texinfo/Convert/HTML.pm:7063 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:477 tp/Texinfo/Parser.pm:1996
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:979
  #, perl-format
  msgid "could not create directories `%s' or `%s': %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, perl-format
  msgid "could not create directory `%s': %s"
***************
*** 1996,2094 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5388
  msgid "no argument specified for @U"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:1683
  #, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:2371
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4888
  msgid "string not closed in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4890
  msgid "--css-include ended in comment"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4892
  msgid "@import not finished in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4918
  #, perl-format
  msgid "CSS file %s not found"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4924
  #, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4934
  #, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:5801 tp/Texinfo/Convert/HTML.pm:5805
  #, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6499
  #, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6523
  #, perl-format
  msgid "error on closing TOC frame file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6638
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6839
  msgid "must specify a title with a title command or @top"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7048
  #, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7073
  #, perl-format
  msgid "old name for `%s' is a node of the document"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7079
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7093
  #, perl-format
  msgid "target node (new name for `%s') not in document: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7125
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7163
  msgid "empty node name"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7165 tp/Texinfo/Parser.pm:3697
  #, perl-format
  msgid "syntax for an external node used for `%s'"
--- 1973,2090 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5225
  msgid "no argument specified for @U"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:1715
  #, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:2399
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4629
! #, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr ""
! 
! #: tp/Texinfo/Convert/HTML.pm:4657
! msgid "missing type"
! msgstr ""
! 
! #: tp/Texinfo/Convert/HTML.pm:4660
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr ""
! 
! #: tp/Texinfo/Convert/HTML.pm:4677
! #, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr ""
! 
! #: tp/Texinfo/Convert/HTML.pm:4962
  msgid "string not closed in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4964
  msgid "--css-include ended in comment"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4966
  msgid "@import not finished in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4992
  #, perl-format
  msgid "CSS file %s not found"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4998
  #, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:5008
  #, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:5870 tp/Texinfo/Convert/HTML.pm:5874
  #, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6568
  #, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6592
  #, perl-format
  msgid "error on closing TOC frame file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6707
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6912
  msgid "must specify a title with a title command or @top"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7122
  #, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7147
  #, perl-format
  msgid "old name for `%s' is a node of the document"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7153
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7167
  #, perl-format
  msgid "target node (new name for `%s') not in document: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7199
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7237
  msgid "empty node name"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7239 tp/Texinfo/Parser.pm:3542
  #, perl-format
  msgid "syntax for an external node used for `%s'"
***************
*** 2123,2152 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1334
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1381 tp/Texinfo/Parser.pm:2722
  #, perl-format
  msgid "entry for index `%s' outside of any node"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1495
  #, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1500
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1523
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1931
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
--- 2119,2148 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1335
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1382 tp/Texinfo/Parser.pm:2568
  #, perl-format
  msgid "entry for index `%s' outside of any node"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1496
  #, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1501
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1524
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1932
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
***************
*** 2154,2471 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2161
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2193
  #, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2226
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2272
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2275
  msgid "`.' or `,' must follow @xref"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3118
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3129
  msgid "menu entry node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3145
  msgid "menu entry name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:910
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1160 tp/Texinfo/Structuring.pm:594
  #, perl-format
  msgid "multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1194
  #, perl-format
! msgid "bad syntax for @%s argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1210
  #, perl-format
! msgid "bad or empty @%s formal argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1219 tp/Texinfo/Parser.pm:4856
! #: tp/Texinfo/Parser.pm:4882 tp/Texinfo/Parser.pm:5671
! #: tp/Texinfo/Parser.pm:5687 tp/Texinfo/Parser.pm:5702
  #, perl-format
  msgid "%c%s requires a name"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1223 tp/Texinfo/Parser.pm:4859
! #: tp/Texinfo/Parser.pm:4885 tp/Texinfo/Parser.pm:5674
! #: tp/Texinfo/Parser.pm:5690 tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad name for @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1341
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1345
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1350
  #, perl-format
! msgid "%c%s missing close brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1354
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1476
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1544
  msgid "@itemx must follow @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1712
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1743
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1746
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1750
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1776 tp/Texinfo/Parser.pm:5204
! #: tp/Texinfo/Parser.pm:5470
  #, perl-format
  msgid "misplaced %c"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1874 tp/Texinfo/Parser.pm:3312
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2110
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2132
  #, perl-format
! msgid "@%s missing close brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2140
  #, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2175
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2650
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2655
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3016
  #, perl-format
  msgid "missing name for @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3021
  #, perl-format
  msgid "missing category for @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3073
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3089
  msgid "empty multitable"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3145 tp/Texinfo/Parser.pm:5784
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3151 tp/Texinfo/Parser.pm:5806
! #: tp/Texinfo/Parser.pm:5818
  #, perl-format
  msgid "bad argument to @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3162
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3167
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3202
  #, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3290 tp/Texinfo/Parser.pm:3429
! #: tp/Texinfo/Parser.pm:5777
  #, perl-format
  msgid "@%s missing argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3302
  #, perl-format
  msgid "unknown @end %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3324 tp/Texinfo/Parser.pm:3943
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3329 tp/Texinfo/Parser.pm:5861
! #: tp/Texinfo/Parser.pm:5906 tp/Texinfo/Parser.pm:5935
! #: tp/Texinfo/Parser.pm:5976 tp/Texinfo/Parser.pm:6055
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3348
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3360
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3369
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3516
  #, perl-format
  msgid "@%s after the first element"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3523
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3563
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3575
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3677
  #, perl-format
  msgid "empty argument in @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3681
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3724
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3732
  msgid "empty node name in menu entry"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3805
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3937
  #, perl-format
! msgid "@end %s should only appear at a line beginning"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3960
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3963
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3968
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4017
  #, perl-format
  msgid "@%s without associated character"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4087
  #, perl-format
  msgid ""
--- 2150,2468 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2162
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2194
  #, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2227
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2273
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2276
  msgid "`.' or `,' must follow @xref"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3086
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3097
  msgid "menu entry node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3113
  msgid "menu entry name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:883
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1125 tp/Texinfo/Structuring.pm:595
  #, perl-format
  msgid "multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1166
  #, perl-format
! msgid "bad or empty @%s formal argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1176
  #, perl-format
! msgid "bad syntax for @%s argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1183 tp/Texinfo/Parser.pm:4707
! #: tp/Texinfo/Parser.pm:4733 tp/Texinfo/Parser.pm:5565
! #: tp/Texinfo/Parser.pm:5578 tp/Texinfo/Parser.pm:5592
  #, perl-format
  msgid "%c%s requires a name"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1187 tp/Texinfo/Parser.pm:4710
! #: tp/Texinfo/Parser.pm:4736 tp/Texinfo/Parser.pm:5568
! #: tp/Texinfo/Parser.pm:5581 tp/Texinfo/Parser.pm:5595
  #, perl-format
  msgid "bad name for @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1305
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1309
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1314
  #, perl-format
! msgid "%c%s missing closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1318
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1440
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1508
  msgid "@itemx must follow @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1676
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1707
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1710
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1714
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1738 tp/Texinfo/Parser.pm:5070
! #: tp/Texinfo/Parser.pm:5308
  #, perl-format
  msgid "misplaced %c"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1835 tp/Texinfo/Parser.pm:3148
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2072
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2094
  #, perl-format
! msgid "@%s missing closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2102
  #, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2138
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2501
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2506
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2850
  #, perl-format
  msgid "missing name for @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2855
  #, perl-format
  msgid "missing category for @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2890
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2905
  msgid "empty multitable"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2959 tp/Texinfo/Parser.pm:5673
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2965 tp/Texinfo/Parser.pm:5694
! #: tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad argument to @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2976
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2981
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3016
  #, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3124 tp/Texinfo/Parser.pm:3277
! #: tp/Texinfo/Parser.pm:5666
  #, perl-format
  msgid "@%s missing argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3138
  #, perl-format
  msgid "unknown @end %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3161 tp/Texinfo/Parser.pm:3788
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3167 tp/Texinfo/Parser.pm:3245
! #: tp/Texinfo/Parser.pm:5755 tp/Texinfo/Parser.pm:5798
! #: tp/Texinfo/Parser.pm:5827 tp/Texinfo/Parser.pm:5868
! #: tp/Texinfo/Parser.pm:5946
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3188
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3200
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3208
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3364
  #, perl-format
  msgid "@%s after the first element"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3371
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3408
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3420
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3522
  #, perl-format
  msgid "empty argument in @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3526
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3569
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3577
  msgid "empty node name in menu entry"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3650
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3782
  #, perl-format
! msgid "@end %s should only appear at the beginning of a line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3804
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3807
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3812
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3879
  #, perl-format
  msgid "@%s without associated character"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3949
  #, perl-format
  msgid ""
***************
*** 2473,2477 ****
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4111
  #, perl-format
  msgid ""
--- 2470,2474 ----
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3974
  #, perl-format
  msgid ""
***************
*** 2480,2887 ****
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4120
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4176
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4182
  #, perl-format
  msgid "use braces to give a command as an argument to @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4195 tp/Texinfo/Parser.pm:5325
  #, perl-format
  msgid "%c%s expects `i' or `j' as argument, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4207
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4218
  #, perl-format
  msgid "@%s expected braces"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4383
  #, perl-format
  msgid "undefined flag: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4386
  msgid "bad syntax for @value"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4393
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4396
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4405
  #, perl-format
! msgid "@%s should only appear at a line beginning"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4496
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4505
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4631 tp/Texinfo/Parser.pm:4648
! #: tp/Texinfo/Parser.pm:4698
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4658
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4664
  msgid "@tab before @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4667
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4704
  msgid "ignoring @tab outside of multitable"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4708
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4745
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4787
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4791
  msgid "@dircategory after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4979
  #, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4997
  msgid "@direntry after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5005
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5008
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5070
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5078
  #, perl-format
  msgid "unknown command `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5088
  msgid "unexpected @"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5117
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5122
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5130
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5249
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5273
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5292
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5303
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5316
  msgid "@image missing filename argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5348
  #, perl-format
  msgid "@%s missing first argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5393
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5399
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5412
! #, perl-format
! msgid "argument for @U exceeds size of integer: %s"
! msgstr ""
! 
! #: tp/Texinfo/Parser.pm:5418
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5546
  msgid "superfluous arguments for node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5596
  #, perl-format
  msgid "expected @end %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5728
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5801
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5823
  #, perl-format
  msgid "empty @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5831
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5840
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5849
  #, perl-format
  msgid "reserved index name %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5868
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5871
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5914
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5920
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5928
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5944
  #, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5952
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5960
  #, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5968
  #, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5986 tp/Texinfo/Parser.pm:5991
  #, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5999
  #, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:6009
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:6021
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:6031
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:6039
  #, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:6047
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:213
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:245
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:250
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:339
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:488
  #, perl-format
  msgid "@%s not empty"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:544 tp/Texinfo/Structuring.pm:1326
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:557
  #, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:662
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:708
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:715
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:733
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:787
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:814
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:834
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:842
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
--- 2477,2879 ----
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3983
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4038
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4044
  #, perl-format
  msgid "use braces to give a command as an argument to @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4057 tp/Texinfo/Parser.pm:5189
  #, perl-format
  msgid "%c%s expects `i' or `j' as argument, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4068
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4079
  #, perl-format
  msgid "@%s expected braces"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4233
  #, perl-format
  msgid "undefined flag: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4236
  msgid "bad syntax for @value"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4243
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4246
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4255
  #, perl-format
! msgid "@%s should only appear at the beginning of a line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4346
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4355
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4479 tp/Texinfo/Parser.pm:4496
! #: tp/Texinfo/Parser.pm:4546
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4506
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4512
  msgid "@tab before @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4515
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4552
  msgid "ignoring @tab outside of multitable"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4556
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4596
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4638
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4642
  msgid "@dircategory after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4847
  #, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4864
  msgid "@direntry after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4872
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4875
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4937
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4945
  #, perl-format
  msgid "unknown command `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4955
  msgid "unexpected @"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4983
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4988
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4996
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5114
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5138
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5156
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5167
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5180
  msgid "@image missing filename argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5211
  #, perl-format
  msgid "@%s missing first argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5230
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5236
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5253
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5448
  msgid "superfluous arguments for node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5498
  #, perl-format
  msgid "expected @end %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5607
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5617
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5689
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5710
  #, perl-format
  msgid "empty @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5727
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5736
  #, perl-format
  msgid "reserved index name %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5762
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5765
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5793
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5806
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5812
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5820
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5836
  #, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5844
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5852
  #, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5860
  #, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5878 tp/Texinfo/Parser.pm:5883
  #, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5891
  #, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5913
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5922
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5930
  #, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5938
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:216
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:248
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:253
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:342
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:491
  #, perl-format
  msgid "@%s not empty"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:547 tp/Texinfo/Structuring.pm:1325
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:558
  #, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:663
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:706
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:713
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:731
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:786
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:810
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:829
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:837
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
***************
*** 2893,2897 ****
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:2070
  #, perl-format
  msgid "empty index key in @%s"
--- 2885,2889 ----
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:2067
  #, perl-format
  msgid "empty index key in @%s"
***************
*** 3275,3293 ****
  msgstr ""
  
! #: tp/texi2any.pl:1232
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
  
! #: tp/texi2any.pl:1255
  #, perl-format
  msgid "error on closing macro expand file %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1261
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1286
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
--- 3267,3285 ----
  msgstr ""
  
! #: tp/texi2any.pl:1239
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
  
! #: tp/texi2any.pl:1262
  #, perl-format
  msgid "error on closing macro expand file %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1268
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1293
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
***************
*** 3295,3309 ****
  msgstr ""
  
! #: tp/texi2any.pl:1359 tp/texi2any.pl:1435
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1382 tp/texi2any.pl:1416
  #, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1388 tp/texi2any.pl:1422
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
--- 3287,3301 ----
  msgstr ""
  
! #: tp/texi2any.pl:1366 tp/texi2any.pl:1442
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1389 tp/texi2any.pl:1423
  #, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1395 tp/texi2any.pl:1429
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
Binary files texinfo-6.1/po/el.gmo and texinfo-6.3/po/el.gmo differ
diff -Nrc2 texinfo-6.1/po/el.po texinfo-6.3/po/el.po
*** texinfo-6.1/po/el.po	1970-01-01 01:00:00.000000000 +0100
--- texinfo-6.3/po/el.po	2016-09-10 12:45:50.000000000 +0100
***************
*** 0 ****
--- 1,3323 ----
+ # 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: 2016-09-10 12:45+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"
+ "Language: el\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"
+ 
+ #: gnulib/lib/error.c:191
+ msgid "Unknown system error"
+ msgstr ""
+ 
+ #: gnulib/lib/getopt.c:575 gnulib/lib/getopt.c:604
+ #, c-format
+ msgid "%s: option '%s' is ambiguous; possibilities:"
+ msgstr "%s: Î· ÎµÏ€Î¹Î»Î¿Î³Î® Â«%sÂ» Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÏƒÎ±Ï†Î®Ï‚Î‡ Î´Ï…Î½Î±Ï„ÏŒÏ„Î·Ï„ÎµÏ‚:"
+ 
+ #: gnulib/lib/getopt.c:619
+ #, c-format
+ msgid "%s: option '%s' is ambiguous\n"
+ msgstr "%s: Î· ÎµÏ€Î¹Î»Î¿Î³Î® Â«%sÂ» Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÏƒÎ±Ï†Î®Ï‚\n"
+ 
+ #: gnulib/lib/getopt.c:654 gnulib/lib/getopt.c:658
+ #, c-format
+ msgid "%s: option '--%s' doesn't allow an argument\n"
+ msgstr "%s: Î· ÎµÏ€Î¹Î»Î¿Î³Î® Â«--%sÂ» Î´ÎµÎ½ ÎµÏ€Î¹Ï„Ï�Î­Ï€ÎµÎ¹ Î¿Ï�Î¯ÏƒÎ¼Î±Ï„Î±\n"
+ 
+ #: gnulib/lib/getopt.c:667 gnulib/lib/getopt.c:672
+ #, c-format
+ msgid "%s: option '%c%s' doesn't allow an argument\n"
+ msgstr "%s: Î· ÎµÏ€Î¹Î»Î¿Î³Î® Â«%c%sÂ» Î´ÎµÎ½ ÎµÏ€Î¹Ï„Ï�Î­Ï€ÎµÎ¹ Î¿Ï�Î¯ÏƒÎ¼Î±Ï„Î±\n"
+ 
+ #: gnulib/lib/getopt.c:715 gnulib/lib/getopt.c:734
+ #, c-format
+ msgid "%s: option '--%s' requires an argument\n"
+ msgstr "%s: Î· ÎµÏ€Î¹Î»Î¿Î³Î® Â«--%sÂ» Î±Ï€Î±Î¹Ï„ÎµÎ¯ Î­Î½Î± ÏŒÏ�Î¹ÏƒÎ¼Î±\n"
+ 
+ #: gnulib/lib/getopt.c:772 gnulib/lib/getopt.c:775
+ #, c-format
+ msgid "%s: unrecognized option '--%s'\n"
+ msgstr "%s: Î¬Î³Î½Ï‰ÏƒÏ„Î· ÎµÏ€Î¹Î»Î¿Î³Î® Â«--%sÂ»\n"
+ 
+ #: gnulib/lib/getopt.c:783 gnulib/lib/getopt.c:786
+ #, c-format
+ msgid "%s: unrecognized option '%c%s'\n"
+ msgstr "%s: Î¬Î³Î½Ï‰ÏƒÏ„Î· ÎµÏ€Î¹Î»Î¿Î³Î® Â«%c%sÂ»\n"
+ 
+ #: gnulib/lib/getopt.c:835 gnulib/lib/getopt.c:838
+ #, c-format
+ msgid "%s: invalid option -- '%c'\n"
+ msgstr "%s: Î¼Î· Î­Î³ÎºÏ…Ï�Î· ÎµÏ€Î¹Î»Î¿Î³Î® -- Â«%cÂ»\n"
+ 
+ #: gnulib/lib/getopt.c:891 gnulib/lib/getopt.c:908 gnulib/lib/getopt.c:1118
+ #: gnulib/lib/getopt.c:1136
+ #, c-format
+ msgid "%s: option requires an argument -- '%c'\n"
+ msgstr "%s: Î· ÎµÏ€Î¹Î»Î¿Î³Î® Î±Ï€Î±Î¹Ï„ÎµÎ¯ Î­Î½Î± ÏŒÏ�Î¹ÏƒÎ¼Î± -- Â«%cÂ»\n"
+ 
+ #: gnulib/lib/getopt.c:964 gnulib/lib/getopt.c:980
+ #, c-format
+ msgid "%s: option '-W %s' is ambiguous\n"
+ msgstr "%s: Î· ÎµÏ€Î¹Î»Î¿Î³Î® Â«-W %sÂ» Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÏƒÎ±Ï†Î®Ï‚\n"
+ 
+ #: gnulib/lib/getopt.c:1004 gnulib/lib/getopt.c:1022
+ #, c-format
+ msgid "%s: option '-W %s' doesn't allow an argument\n"
+ msgstr "%s: Î· ÎµÏ€Î¹Î»Î¿Î³Î® Â«-W %sÂ» Î´ÎµÎ½ ÎµÏ€Î¹Ï„Ï�Î­Ï€ÎµÎ¹ Î¿Ï�Î¯ÏƒÎ¼Î±Ï„Î±\n"
+ 
+ #: gnulib/lib/getopt.c:1043 gnulib/lib/getopt.c:1061
+ #, c-format
+ msgid "%s: option '-W %s' requires an argument\n"
+ msgstr "%s: Î· ÎµÏ€Î¹Î»Î¿Î³Î® Â«-W %sÂ» Î±Ï€Î±Î¹Ï„ÎµÎ¯ Î­Î½Î± ÏŒÏ�Î¹ÏƒÎ¼Î±\n"
+ 
+ #: 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
+ #, fuzzy
+ 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:687
+ msgid "No previous regular expression"
+ msgstr ""
+ 
+ #: gnulib/lib/xalloc-die.c:34
+ msgid "memory exhausted"
+ msgstr ""
+ 
+ #: info/echo-area.c:295 info/session.c:1386
+ msgid "Move forward a character"
+ msgstr ""
+ 
+ #: info/echo-area.c:314 info/session.c:1399
+ msgid "Move backward a character"
+ msgstr ""
+ 
+ #: info/echo-area.c:340
+ msgid "Move to the start of this line"
+ msgstr ""
+ 
+ #: info/echo-area.c:345
+ msgid "Move to the end of this line"
+ msgstr ""
+ 
+ #: info/echo-area.c:353 info/session.c:1414
+ msgid "Move forward a word"
+ msgstr ""
+ 
+ #: info/echo-area.c:393 info/session.c:1428
+ msgid "Move backward a word"
+ msgstr ""
+ 
+ #: info/echo-area.c:433
+ msgid "Delete the character under the cursor"
+ msgstr ""
+ 
+ #: info/echo-area.c:453
+ msgid "Delete the character behind the cursor"
+ msgstr ""
+ 
+ #: info/echo-area.c:480
+ msgid "Cancel or quit operation"
+ msgstr ""
+ 
+ #: info/echo-area.c:495
+ msgid "Accept (or force completion of) this line"
+ msgstr ""
+ 
+ #: info/echo-area.c:500
+ msgid "Insert next character verbatim"
+ msgstr ""
+ 
+ #: info/echo-area.c:532
+ msgid "Insert a TAB character"
+ msgstr ""
+ 
+ #: info/echo-area.c:584
+ msgid "Transpose characters at point"
+ msgstr ""
+ 
+ #: info/echo-area.c:653
+ msgid "Yank back the contents of the last kill"
+ msgstr ""
+ 
+ #: info/echo-area.c:660
+ msgid "Kill ring is empty"
+ msgstr ""
+ 
+ #: info/echo-area.c:673
+ msgid "Yank back a previous kill"
+ msgstr ""
+ 
+ #: info/echo-area.c:706
+ msgid "Kill to the end of the line"
+ msgstr ""
+ 
+ #: info/echo-area.c:719
+ msgid "Kill to the beginning of the line"
+ msgstr ""
+ 
+ #: info/echo-area.c:731
+ msgid "Kill the word following the cursor"
+ msgstr ""
+ 
+ #: info/echo-area.c:751
+ msgid "Kill the word preceding the cursor"
+ msgstr ""
+ 
+ #: info/echo-area.c:983 info/echo-area.c:1041
+ msgid "No completions"
+ msgstr ""
+ 
+ #: info/echo-area.c:985
+ msgid "Not complete"
+ msgstr ""
+ 
+ #: info/echo-area.c:1034
+ msgid "List possible completions"
+ msgstr ""
+ 
+ #: info/echo-area.c:1045
+ msgid "Sole completion"
+ msgstr ""
+ 
+ #: info/echo-area.c:1054
+ #, c-format
+ msgid "%d completion:\n"
+ msgid_plural "%d completions:\n"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
+ #: info/echo-area.c:1171
+ msgid "Insert completion"
+ msgstr ""
+ 
+ #: info/echo-area.c:1273
+ #, c-format
+ msgid "Building completions..."
+ msgstr ""
+ 
+ #: info/echo-area.c:1392
+ msgid "Scroll the completions window"
+ msgstr ""
+ 
+ #: info/filesys.c:90
+ #, c-format
+ msgid "looking for file \"%s\""
+ msgstr ""
+ 
+ #: info/filesys.c:152
+ #, c-format
+ msgid "looking for file %s in %s"
+ msgstr ""
+ 
+ #: info/filesys.c:238 info/filesys.c:252 info/filesys.c:273
+ #, c-format
+ msgid "found file %s"
+ msgstr ""
+ 
+ #: info/footnotes.c:231
+ #, c-format
+ msgid "Footnotes could not be displayed"
+ msgstr ""
+ 
+ #: info/footnotes.c:251
+ msgid "Show the footnotes associated with this node in another window"
+ msgstr ""
+ 
+ #: info/footnotes.h:26
+ msgid "---------- Footnotes ----------"
+ msgstr ""
+ 
+ #: info/indices.c:123 info/indices.c:822
+ #, c-format
+ msgid "Finding index entries..."
+ msgstr ""
+ 
+ #: info/indices.c:203
+ msgid "Look up a string in the index for this file"
+ msgstr ""
+ 
+ #: info/indices.c:215 info/indices.c:321 info/indices.c:828
+ #, c-format
+ msgid "No indices found."
+ msgstr ""
+ 
+ #: info/indices.c:219
+ msgid "Index entry: "
+ 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 info/indices.c:890
+ #, 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:807
+ msgid "List all matches of a string in the index"
+ msgstr ""
+ 
+ #: info/indices.c:834 info/indices.c:836
+ msgid "Index topic"
+ msgstr ""
+ 
+ #: info/indices.h:40
+ #, c-format
+ msgid "No available info files have '%s' in their indices."
+ msgstr ""
+ 
+ #: info/info-utils.c:879
+ #, c-format
+ msgid "Error converting file character encoding."
+ msgstr ""
+ 
+ #: info/info.c:279 info/session.c:2789
+ #, c-format
+ msgid "No menu item '%s' in node '%s'."
+ msgstr ""
+ 
+ #: info/info.c:416 info/info.c:1148
+ #, c-format
+ msgid "Cannot find node '%s'."
+ msgstr ""
+ 
+ #: info/info.c:438
+ #, c-format
+ msgid "No program name given."
+ msgstr ""
+ 
+ #: info/info.c:636
+ #, c-format
+ msgid "invalid number: %s\n"
+ msgstr ""
+ 
+ #: info/info.c:816
+ #, c-format
+ msgid "malformed variable assignment: %s"
+ msgstr ""
+ 
+ #: info/info.c:823 info/infokey.c:540
+ #, c-format
+ msgid "%s: no such variable"
+ msgstr ""
+ 
+ #: info/info.c:829 info/infokey.c:542
+ #, c-format
+ msgid "value %s is not valid for variable %s"
+ msgstr ""
+ 
+ #: info/info.c:841
+ #, c-format
+ msgid "Try --help for more information.\n"
+ msgstr ""
+ 
+ #: info/info.c:860 install-info/install-info.c:2239 tp/texi2any.pl:873
+ #, 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:999
+ #, c-format
+ msgid "no index entries found for '%s'\n"
+ msgstr ""
+ 
+ #: info/info.c:1049
+ #, c-format
+ msgid ""
+ "Usage: %s [OPTION]... [MENU-ITEM...]\n"
+ "\n"
+ "Read documentation in Info format.\n"
+ msgstr ""
+ 
+ #: info/info.c:1055
+ 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 ""
+ 
+ #: info/info.c:1063
+ 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:1069
+ 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 ""
+ 
+ #: info/info.c:1076
+ msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
+ msgstr ""
+ 
+ #: info/info.c:1080
+ 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"
+ msgstr ""
+ 
+ #: info/info.c:1089
+ 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:1096
+ msgid ""
+ "\n"
+ "For a summary of key bindings, type H within Info."
+ msgstr ""
+ 
+ #: info/info.c:1099
+ 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"
+ msgstr ""
+ 
+ #: info/info.c:1114 install-info/install-info.c:616 tp/texi2any.pl:861
+ 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:1149
+ #, c-format
+ msgid "Cannot find node '(%s)%s'."
+ msgstr ""
+ 
+ #: info/info.c:1150
+ msgid "Cannot find a window!"
+ msgstr ""
+ 
+ #: info/info.c:1151
+ msgid "Point doesn't appear within this window's node!"
+ msgstr ""
+ 
+ #: info/info.c:1152
+ msgid "Cannot delete the last window."
+ msgstr ""
+ 
+ #: info/info.c:1153
+ msgid "No menu in this node."
+ msgstr ""
+ 
+ #: info/info.c:1154
+ msgid "No footnotes in this node."
+ msgstr ""
+ 
+ #: info/info.c:1155
+ msgid "No cross references in this node."
+ msgstr ""
+ 
+ #: info/info.c:1156
+ #, c-format
+ msgid "No '%s' pointer for this node."
+ msgstr ""
+ 
+ #: info/info.c:1157
+ #, c-format
+ msgid "Unknown Info command '%c'; try '?' for help."
+ msgstr ""
+ 
+ #: info/info.c:1158
+ #, c-format
+ msgid "Terminal type '%s' is not smart enough to run Info."
+ msgstr ""
+ 
+ #: info/info.c:1159
+ msgid "You are already at the last page of this node."
+ msgstr ""
+ 
+ #: info/info.c:1160
+ msgid "You are already at the first page of this node."
+ msgstr ""
+ 
+ #: info/info.c:1161
+ msgid "Only one window."
+ msgstr ""
+ 
+ #: info/info.c:1162
+ msgid "Resulting window would be too small."
+ msgstr ""
+ 
+ #: info/info.c:1163
+ msgid "Not enough room for a help window, please delete a window."
+ msgstr ""
+ 
+ #: info/infodoc.c:40
+ msgid "Basic Info command keys\n"
+ msgstr "Î’Î±ÏƒÎ¹ÎºÎ­Ï‚ ÎµÎ½Ï„Î¿Î»Î­Ï‚ Info\n"
+ 
+ #: info/infodoc.c:42
+ msgid "\\%-10[quit-help]  Close this help window.\n"
+ msgstr "\\%-10[quit-help]  ÎšÎ»ÎµÎ¯ÏƒÎµ Î±Ï…Ï„ÏŒ Ï„Î¿ Ï€Î±Ï�Î¬Î¸Ï…Ï�Î¿ Î²Î¿Î®Î¸ÎµÎ¹Î±Ï‚.\n"
+ 
+ #: info/infodoc.c:43
+ msgid "\\%-10[quit]  Quit Info altogether.\n"
+ msgstr "\\%-10[quit]  ÎˆÎ¾Î¿Î´Î¿Ï‚ Î±Ï€ÏŒ Ï„Î¿ Info.\n"
+ 
+ #: info/infodoc.c:44
+ msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
+ msgstr "\\%-10[get-info-help-node]  Î•ÎºÎºÎ¯Î½Î·ÏƒÎ· Ï„Î·Ï‚ ÎµÎºÎ¼Î¬Î¸Î·ÏƒÎ·Ï‚ Info.\n"
+ 
+ #: info/infodoc.c:46
+ msgid "\\%-10[prev-line]  Move up one line.\n"
+ msgstr "\\%-10[prev-line]  ÎœÎµÏ„Î±ÎºÎ¯Î½Î·ÏƒÎ· Î¼Î¯Î± Î³Ï�Î±Î¼Î¼Î® Ï€Ï�Î¿Ï‚ Ï„Î± Ï€Î¬Î½Ï‰.\n"
+ 
+ #: info/infodoc.c:47
+ msgid "\\%-10[next-line]  Move down one line.\n"
+ msgstr "\\%-10[next-line]  ÎœÎµÏ„Î±ÎºÎ¯Î½Î·ÏƒÎ· Î¼Î¯Î± Î³Ï�Î±Î¼Î¼Î® Ï€Ï�Î¿Ï‚ Ï„Î± ÎºÎ¬Ï„Ï‰.\n"
+ 
+ #: info/infodoc.c:48
+ msgid "\\%-10[scroll-backward]  Scroll backward one screenful.\n"
+ msgstr ""
+ "\\%-10[scroll-backward]  ÎœÎµÏ„Î±ÎºÎ¯Î½Î·ÏƒÎ· ÏƒÏ„Î·Î½ Ï€Ï�Î¿Î·Î³Î¿Ï�Î¼ÎµÎ½Î· ÏƒÎµÎ»Î¯Î´Î± Ï„Î·Ï‚ Î¿Î¸ÏŒÎ½Î·Ï‚.\n"
+ 
+ #: info/infodoc.c:49
+ msgid "\\%-10[scroll-forward]  Scroll forward one screenful.\n"
+ msgstr "\\%-10[scroll-forward]  ÎœÎµÏ„Î±ÎºÎ¯Î½Î·ÏƒÎ· ÏƒÏ„Î·Î½ ÎµÏ€ÏŒÎ¼ÎµÎ½Î· ÏƒÎµÎ»Î¯Î´Î± Ï„Î·Ï‚ Î¿Î¸ÏŒÎ½Î·Ï‚.\n"
+ 
+ #: info/infodoc.c:50
+ msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+ msgstr "\\%-10[beginning-of-node]  Î Î®Î³Î±Î¹Î½Îµ ÏƒÏ„Î·Î½ Î±Ï�Ï‡Î® Î±Ï…Ï„Î¿Ï� Ï„Î¿Ï… ÎºÏŒÎ¼Î²Î¿Ï….\n"
+ 
+ #: info/infodoc.c:51
+ msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+ msgstr "\\%-10[end-of-node]  Î Î®Î³Î±Î¹Î½Îµ ÏƒÏ„Î¿ Ï„Î­Î»Î¿Ï‚ Î±Ï…Ï„Î¿Ï� Ï„Î¿Ï… ÎºÏŒÎ¼Î²Î¿Ï….\n"
+ 
+ #: info/infodoc.c:53
+ msgid "\\%-10[move-to-next-xref]  Skip to the next hypertext link.\n"
+ msgstr ""
+ "\\%-10[move-to-next-xref]  ÎœÎµÏ„Î¬Î²Î±ÏƒÎ· ÏƒÏ„Î¿Î½ ÎµÏ€ÏŒÎ¼ÎµÎ½Î¿ ÏƒÏ�Î½Î´ÎµÏƒÎ¼Î¿ Ï…Ï€ÎµÏ�ÎºÎµÎ¹Î¼Î­Î½Î¿Ï….\n"
+ 
+ #: info/infodoc.c:54
+ msgid ""
+ "\\%-10[select-reference-this-line]  Follow the hypertext link under the "
+ "cursor.\n"
+ msgstr ""
+ "\\%-10[select-reference-this-line]  Î‘ÎºÎ¿Î»Î¿Ï�Î¸Î·ÏƒÎµ Ï„Î¿ ÏƒÏ�Î½Î´ÎµÏƒÎ¼Î¿ ÎºÎ¬Ï„Ï‰ Î±Ï€ÏŒ Ï„Î¿Î½ "
+ "Î´ÎµÎ¯ÎºÏ„Î· Ï„Î¿Ï… Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï�.\n"
+ 
+ #: info/infodoc.c:55
+ msgid "\\%-10[history-node]  Go back to the last node seen in this window.\n"
+ msgstr ""
+ "\\%-10[history-node]  Î Î®Î³Î±Î¹Î½Îµ Ï€Î¯ÏƒÏ‰ ÏƒÏ„Î¿Î½ Ï„ÎµÎ»ÎµÏ…Ï„Î±Î¯Î¿ ÎºÏŒÎ¼Î²Î¿ Ï€Î¿Ï… ÎµÏ€Î¹ÏƒÎºÎ­Ï†Î¸Î·ÎºÎµÏ‚.\n"
+ 
+ #: info/infodoc.c:57
+ msgid "\\%-10[global-prev-node]  Go to the previous node in the document.\n"
+ msgstr ""
+ "\\%-10[global-prev-node]  Î Î®Î³Î±Î¹Î½Îµ ÏƒÏ„Î¿Î½ Ï€Ï�Î¿Î·Î³Î¿Ï�Î¼ÎµÎ½Î¿ ÎºÏŒÎ¼Î²Î¿ Ï„Î¿Ï… ÎµÎ³Î³Ï�Î¬Ï†Î¿Ï….\n"
+ 
+ #: info/infodoc.c:58
+ msgid "\\%-10[global-next-node]  Go to the next node in the document.\n"
+ msgstr "\\%-10[global-next-node]  Î Î®Î³Î±Î¹Î½Îµ ÏƒÏ„Î¿Î½ ÎµÏ€ÏŒÎ¼ÎµÎ½Î¿ ÎºÏŒÎ¼Î²Î¿ Ï„Î¿Ï… ÎµÎ³Î³Ï�Î¬Ï†Î¿Ï….\n"
+ 
+ #: info/infodoc.c:59
+ msgid "\\%-10[prev-node]  Go to the previous node on this level.\n"
+ msgstr ""
+ "\\%-10[prev-node]  Î Î®Î³Î±Î¹Î½Îµ ÏƒÏ„Î¿Î½ Ï€Ï�Î¿Î·Î³Î¿Ï�Î¼ÎµÎ½Î¿ ÎºÏŒÎ¼Î²Î¿ ÏƒÏ„Î¿ Ï„Ï�Î­Ï‡Î¿Î½ ÎµÏ€Î¯Ï€ÎµÎ´Î¿.\n"
+ 
+ #: info/infodoc.c:60
+ msgid "\\%-10[next-node]  Go to the next node on this level.\n"
+ msgstr "\\%-10[next-node]  Î Î®Î³Î±Î¹Î½Îµ ÏƒÏ„Î¿Î½ ÎµÏ€ÏŒÎ¼ÎµÎ½Î¿ ÎºÏŒÎ¼Î²Î¿ ÏƒÏ„Î¿ Ï„Ï�Î­Ï‡Î¿Î½ ÎµÏ€Î¯Ï€ÎµÎ´Î¿.\n"
+ 
+ #: info/infodoc.c:61
+ msgid "\\%-10[up-node]  Go up one level.\n"
+ msgstr "\\%-10[up-node]  Î Î®Î³Î±Î¹Î½Îµ Ï€Î¬Î½Ï‰ Î­Î½Î± ÎµÏ€Î¯Ï€ÎµÎ´Î¿.\n"
+ 
+ #: info/infodoc.c:62
+ msgid "\\%-10[top-node]  Go to the top node of this document.\n"
+ msgstr "\\%-10[top-node]  Î Î®Î³Î±Î¹Î½Îµ ÏƒÏ„Î¿Î½ Î±Ï�Ï‡Î¹ÎºÏŒ ÎºÏŒÎ¼Î²Î¿ Ï„Î¿Ï… ÎµÎ³Î³Ï�Î¬Ï†Î¿Ï….\n"
+ 
+ #: info/infodoc.c:63
+ msgid "\\%-10[dir-node]  Go to the main 'directory' node.\n"
+ msgstr "\\%-10[dir-node]  Î Î®Î³Î±Î¹Î½Îµ ÏƒÏ„Î¿Î½ ÎºÏŒÎ¼Î²Î¿ Â«ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿Â».\n"
+ 
+ #: info/infodoc.c:65
+ msgid "1...9       Pick the first...ninth item in this node's menu.\n"
+ msgstr ""
+ "1...9       Î”Î¹Î¬Î»ÎµÎ¾Îµ Ï„Î¿ Ï€Ï�ÏŽÏ„Î¿...Î­Î½Î±Ï„Î¿ Î±Î½Ï„Î¹ÎºÎµÎ¯Î¼ÎµÎ½Î¿ ÏƒÏ„Î¿ Î¼ÎµÎ½Î¿Ï� Î±Ï…Ï„Î¿Ï� Ï„Î¿Ï… "
+ "ÎºÏŒÎ¼Î²Î¿Ï….\n"
+ 
+ #: info/infodoc.c:66
+ msgid "\\%-10[last-menu-item]  Pick the last item in this node's menu.\n"
+ msgstr ""
+ "\\%-10[last-menu-item]  Î”Î¹Î¬Î»ÎµÎ¾Îµ Ï„Î¿ Ï„ÎµÎ»ÎµÏ…Ï„Î±Î¯Î¿ Î±Î½Ï„Î¹ÎºÎµÎ¯Î¼ÎµÎ½Î¿ ÏƒÏ„Î¿ Î¼ÎµÎ½Î¿Ï� Î±Ï…Ï„Î¿Ï� Ï„Î¿Ï… "
+ "ÎºÏŒÎ¼Î²Î¿Ï….\n"
+ 
+ #: info/infodoc.c:67
+ msgid "\\%-10[menu-item]  Pick a menu item specified by name.\n"
+ msgstr ""
+ "\\%-10[menu-item]  Î”Î¹Î¬Î»ÎµÎ¾Îµ Î­Î½Î± Î±Î½Ï„Î¹ÎºÎµÎ¯Î¼ÎµÎ½Î¿ Ï„Î¿Ï… Î¼ÎµÎ½Î¿Ï� ÏƒÏ�Î¼Ï†Ï‰Î½Î± Î¼Îµ Ï„Î¿ ÏŒÎ½Î¿Î¼Î±.\n"
+ 
+ #: info/infodoc.c:68
+ msgid "\\%-10[xref-item]  Follow a cross reference specified by name.\n"
+ msgstr "\\%-10[xref-item]  Î‘ÎºÎ¿Î»Î¿Ï�Î¸Î·ÏƒÎµ Î¼Î¯Î± Ï€Î±Ï�Î±Ï€Î¿Î¼Ï€Î® ÏƒÏ�Î¼Ï†Ï‰Î½Î± Î¼Îµ Ï„Î¿ ÏŒÎ½Î¿Î¼Î±.\n"
+ 
+ #: info/infodoc.c:69
+ msgid "\\%-10[goto-node]  Go to a node specified by name.\n"
+ msgstr "\\%-10[goto-node]  Î Î®Î³Î±Î¹Î½Îµ ÏƒÎµ Î­Î½Î±Î½ ÎºÏŒÎ¼Î²Î¿ ÏƒÏ�Î¼Ï†Ï‰Î½Î± Î¼Îµ Ï„Î¿ ÏŒÎ½Î¿Î¼Î±.\n"
+ 
+ #: info/infodoc.c:71
+ msgid "\\%-10[search]  Search forward for a specified string.\n"
+ msgstr "\\%-10[search]  Î¨Î¬Î¾Îµ Î³Î¹Î± Î­Î½Î± Î±Î»Ï†Î±Ï�Î¹Î¸Î¼Î·Ï„Î¹ÎºÏŒ.\n"
+ 
+ #: info/infodoc.c:72
+ msgid "\\%-10[search-previous]  Search for previous occurrence.\n"
+ msgstr "\\%-10[search-previous]  Î¨Î¬Î¾Îµ Î³Î¹Î± Ï€Ï�Î¿Î·Î³Î¿Ï�Î¼ÎµÎ½Î· ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ·.\n"
+ 
+ #: info/infodoc.c:73
+ msgid "\\%-10[search-next]  Search for next occurrence.\n"
+ msgstr "\\%-10[search-next]  Î¨Î¬Î¾Îµ Î³Î¹Î± ÎµÏ€ÏŒÎ¼ÎµÎ½Î· ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ·.\n"
+ 
+ #: info/infodoc.c:74
+ 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"
+ 
+ #: info/infodoc.c:76
+ msgid "\\%-10[virtual-index]  Synthesize menu of matching index entries.\n"
+ msgstr ""
+ "\\%-10[virtual-index]  Î£Ï�Î½Î¸ÎµÏƒÎµ Î­Î½Î± Î¼ÎµÎ½Î¿Ï� Î±Ï€ÏŒ ÎµÎ¹ÏƒÎ±Î³Ï‰Î³Î­Ï‚ Ï€Î¿Ï… Î±Î½Ï„Î¹ÏƒÏ„Î¿Î¹Ï‡Î¿Ï�Î½ ÏƒÏ„Î¿ "
+ "ÎµÏ…Ï�ÎµÏ„Î®Ï�Î¹Î¿.\n"
+ 
+ #: info/infodoc.c:78
+ msgid "\\%-10[abort-key]  Cancel the current operation.\n"
+ msgstr "\\%-10[abort-key]  Î‘ÎºÏ�Ï�Ï‰ÏƒÎµ Ï„Î·Î½ Ï„Ï�Î­Ï‡Î¿Ï…ÏƒÎ± Î»ÎµÎ¹Ï„Î¿Ï…Ï�Î³Î¯Î±.\n"
+ 
+ #: info/infodoc.c:197
+ #, c-format
+ msgid "This is GNU Info version %s.  "
+ msgstr "Î‘Ï…Ï„ÏŒ ÎµÎ¯Î½Î±Î¹ Ï„Î¿ GNU Info, Î­ÎºÎ´Î¿ÏƒÎ· %s.  "
+ 
+ #: info/infodoc.c:198
+ msgid "The current search path is:\n"
+ msgstr "Î¤Î¿ Ï„Ï�Î­Ï‡Î¿Î½ Î¼Î¿Î½Î¿Ï€Î¬Ï„Î¹ Î±Î½Î±Î¶Î®Ï„Î·ÏƒÎ·Ï‚ ÎµÎ¯Î½Î±Î¹:\n"
+ 
+ #: info/infodoc.c:203
+ msgid ""
+ "Commands available in Info windows:\n"
+ "\n"
+ msgstr ""
+ "Î”Î¹Î±Î¸Î­ÏƒÎ¹Î¼ÎµÏ‚ ÎµÎ½Ï„Î¿Î»Î­Ï‚ ÏƒÎµ Ï€Î±Ï�Î¬Î¸Ï…Ï�Î± Ï„Î¿Ï… Info:\n"
+ "\n"
+ 
+ #: info/infodoc.c:206
+ msgid ""
+ "Commands available in the echo area:\n"
+ "\n"
+ msgstr ""
+ 
+ #: info/infodoc.c:226
+ #, c-format
+ msgid ""
+ "The following commands can only be invoked via %s:\n"
+ "\n"
+ msgstr ""
+ 
+ #: info/infodoc.c:231
+ msgid ""
+ "The following commands cannot be invoked at all:\n"
+ "\n"
+ msgstr ""
+ 
+ #: info/infodoc.c:335
+ msgid "Display help message"
+ msgstr ""
+ 
+ #: info/infodoc.c:348
+ msgid "Visit Info node '(info)Help'"
+ msgstr ""
+ 
+ #: info/infodoc.c:452
+ msgid "Print documentation for KEY"
+ msgstr ""
+ 
+ #: info/infodoc.c:463
+ #, c-format
+ msgid "Describe key: %s"
+ msgstr ""
+ 
+ #: info/infodoc.c:473 info/infodoc.c:509
+ #, c-format
+ msgid "%s is undefined."
+ msgstr ""
+ 
+ #: info/infodoc.c:871
+ msgid "Show what to type to execute a given command"
+ msgstr ""
+ 
+ #: info/infodoc.c:875
+ msgid "Where is command: "
+ msgstr ""
+ 
+ #: info/infodoc.c:897
+ #, c-format
+ msgid "'%s' is not on any keys"
+ msgstr ""
+ 
+ #: info/infodoc.c:903
+ #, c-format
+ msgid "%s can only be invoked via %s."
+ msgstr ""
+ 
+ #: info/infodoc.c:907
+ #, c-format
+ msgid "%s can be invoked via %s."
+ msgstr ""
+ 
+ #: info/infodoc.c:912
+ #, c-format
+ msgid "There is no function named '%s'"
+ msgstr ""
+ 
+ #: info/infomap.c:603
+ #, c-format
+ msgid "could not open init file %s"
+ msgstr ""
+ 
+ #: info/infokey.c:229
+ #, c-format
+ msgid "key sequence too long"
+ msgstr ""
+ 
+ #: info/infokey.c:306
+ #, c-format
+ msgid "missing key sequence"
+ msgstr ""
+ 
+ #: info/infokey.c:386
+ #, c-format
+ msgid "NUL character (\\000) not permitted"
+ msgstr ""
+ 
+ #: info/infokey.c:415
+ #, c-format
+ msgid "NUL character (^%c) not permitted"
+ msgstr ""
+ 
+ #: info/infokey.c:438
+ #, c-format
+ msgid "missing action name"
+ msgstr ""
+ 
+ #: info/infokey.c:450
+ #, c-format
+ msgid "cannot bind key sequence to menu-digit"
+ msgstr ""
+ 
+ #: info/infokey.c:458
+ #, c-format
+ msgid "unknown action `%s'"
+ msgstr ""
+ 
+ #: info/infokey.c:485
+ #, c-format
+ msgid "action name too long"
+ msgstr ""
+ 
+ #: info/infokey.c:498
+ #, c-format
+ msgid "extra characters following action `%s'"
+ msgstr ""
+ 
+ #: info/infokey.c:509
+ #, c-format
+ msgid "missing variable name"
+ msgstr ""
+ 
+ #: info/infokey.c:518
+ #, c-format
+ msgid "missing `=' immediately after variable name"
+ msgstr ""
+ 
+ #: info/infokey.c:525
+ #, c-format
+ msgid "variable name too long"
+ msgstr ""
+ 
+ #: info/infokey.c:549
+ #, c-format
+ msgid "value too long"
+ msgstr ""
+ 
+ #: info/infokey.c:595
+ #, c-format
+ msgid "\"%s\", line %u: "
+ msgstr ""
+ 
+ #: info/m-x.c:66
+ msgid "Read the name of an Info command and describe it"
+ msgstr ""
+ 
+ #: info/m-x.c:70
+ msgid "Describe command: "
+ msgstr ""
+ 
+ #: info/m-x.c:93
+ msgid "Read a command name in the echo area and execute it"
+ msgstr ""
+ 
+ #: info/m-x.c:136
+ #, c-format
+ msgid "Cannot execute an 'echo-area' command here."
+ msgstr ""
+ 
+ #: info/m-x.c:149
+ #, c-format
+ msgid "Undefined command: %s"
+ msgstr ""
+ 
+ #: info/m-x.c:155
+ msgid "Set the height of the displayed window"
+ msgstr ""
+ 
+ #: info/m-x.c:168
+ #, c-format
+ msgid "Set screen height to (%d): "
+ msgstr ""
+ 
+ #: info/makedoc.c:141
+ #, c-format
+ msgid ""
+ "   Source files groveled to make this file include:\n"
+ "\n"
+ msgstr ""
+ 
+ #: info/makedoc.c:466
+ #, 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:35
+ msgid ""
+ "\n"
+ "* Menu:\n"
+ "\n"
+ "  (File)Node                        Lines   Size   Containing File\n"
+ "  ----------                        -----   ----   ---------------"
+ msgstr ""
+ 
+ #: info/nodemenu.c:187
+ 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:208
+ msgid "Make a window containing a menu of all of the currently visited nodes"
+ msgstr ""
+ 
+ #: info/nodemenu.c:253
+ msgid "Select a node which has been previously visited in a visible window"
+ msgstr ""
+ 
+ #: info/nodemenu.c:260
+ msgid "Select visited node: "
+ msgstr ""
+ 
+ #: info/nodemenu.c:278 info/session.c:2444
+ #, c-format
+ msgid "The reference disappeared! (%s)."
+ msgstr ""
+ 
+ #: info/pcterm.c:212
+ #, c-format
+ msgid "Terminal cannot be initialized: %s\n"
+ msgstr ""
+ 
+ #: info/search.c:166
+ #, c-format
+ msgid "regexp error: %s"
+ msgstr ""
+ 
+ #: info/session.c:62
+ msgid "Show all matching files"
+ msgstr ""
+ 
+ #: info/session.c:66
+ #, 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:192
+ #, c-format
+ 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] Î³Î¹Î± ÎµÎºÎ¼Î¬Î¸Î·ÏƒÎ·."
+ 
+ #: info/session.c:776
+ #, c-format
+ msgid "can't open %s: %s"
+ msgstr ""
+ 
+ #: info/session.c:782
+ #, c-format
+ msgid "debugging output diverted to \"%s\""
+ msgstr ""
+ 
+ #: info/session.c:1273
+ msgid "Move down to the next line"
+ msgstr ""
+ 
+ #: info/session.c:1288
+ msgid "Move up to the previous line"
+ msgstr ""
+ 
+ #: info/session.c:1304
+ msgid "Move the cursor to a specific line of the window"
+ msgstr ""
+ 
+ #: info/session.c:1336
+ msgid "Move to the end of the line"
+ msgstr ""
+ 
+ #: info/session.c:1361
+ msgid "Move to the start of the line"
+ msgstr ""
+ 
+ #: info/session.c:1443
+ msgid "Move to the start of this node"
+ msgstr ""
+ 
+ #: info/session.c:1450
+ msgid "Move to the end of this node"
+ msgstr ""
+ 
+ #: info/session.c:1541
+ msgid "Scroll forward in this window"
+ msgstr ""
+ 
+ #: info/session.c:1555
+ msgid "Scroll backward in this window"
+ msgstr ""
+ 
+ #: info/session.c:1563
+ msgid "Scroll forward in this window and set default window size"
+ msgstr ""
+ 
+ #: info/session.c:1578
+ msgid "Scroll backward in this window and set default window size"
+ msgstr ""
+ 
+ #: info/session.c:1584
+ msgid "Scroll forward in this window staying within node"
+ msgstr ""
+ 
+ #: info/session.c:1599
+ msgid "Scroll backward in this window staying within node"
+ msgstr ""
+ 
+ #: info/session.c:1607
+ msgid ""
+ "Scroll forward in this window staying within node and set default window size"
+ msgstr ""
+ 
+ #: info/session.c:1634
+ msgid ""
+ "Scroll backward in this window staying within node and set default window "
+ "size"
+ msgstr ""
+ 
+ #: info/session.c:1640
+ msgid "Scroll down by lines"
+ msgstr ""
+ 
+ #: info/session.c:1646
+ msgid "Scroll up by lines"
+ msgstr ""
+ 
+ #: info/session.c:1658
+ msgid "Scroll down by half screen size"
+ msgstr ""
+ 
+ #: info/session.c:1685
+ msgid "Scroll up by half screen size"
+ msgstr ""
+ 
+ #: info/session.c:1691
+ msgid "Scroll the other window"
+ msgstr ""
+ 
+ #: info/session.c:1712
+ msgid "Scroll the other window backward"
+ msgstr ""
+ 
+ #: info/session.c:1826
+ msgid "Select the next window"
+ msgstr ""
+ 
+ #: info/session.c:1863
+ msgid "Select the previous window"
+ msgstr ""
+ 
+ #: info/session.c:1907
+ msgid "Split the current window"
+ msgstr ""
+ 
+ #: info/session.c:1952
+ msgid "Delete the current window"
+ msgstr ""
+ 
+ #: info/session.c:1957
+ msgid "Cannot delete a permanent window"
+ msgstr ""
+ 
+ #: info/session.c:1988
+ msgid "Delete all other windows"
+ msgstr ""
+ 
+ #: info/session.c:2034
+ msgid "Grow (or shrink) this window"
+ msgstr ""
+ 
+ #: info/session.c:2045
+ msgid "Divide the available screen space among the visible windows"
+ msgstr ""
+ 
+ #: info/session.c:2052
+ msgid "Toggle the state of line wrapping in the current window"
+ msgstr ""
+ 
+ #: info/session.c:2206
+ msgid "Select this menu item"
+ msgstr ""
+ 
+ #: info/session.c:2236
+ #, 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:2245
+ msgid "Select the last item in this node's menu"
+ msgstr ""
+ 
+ #: info/session.c:2352 info/session.c:2353
+ #, c-format
+ msgid "Menu item (%s): "
+ msgstr ""
+ 
+ #: info/session.c:2356
+ msgid "Menu item: "
+ msgstr ""
+ 
+ #: info/session.c:2363 info/session.c:2364
+ #, c-format
+ msgid "Follow xref (%s): "
+ msgstr ""
+ 
+ #: info/session.c:2367
+ msgid "Follow xref: "
+ msgstr ""
+ 
+ #: info/session.c:2456
+ msgid "Read a menu item and select its node"
+ msgstr ""
+ 
+ #: info/session.c:2481
+ msgid "Read a footnote or cross reference and select its node"
+ msgstr ""
+ 
+ #: info/session.c:2487
+ msgid "Move to the start of this node's menu"
+ msgstr ""
+ 
+ #: info/session.c:2509
+ msgid "Visit as many menu items at once as possible"
+ msgstr ""
+ 
+ #: info/session.c:2609
+ msgid "Move to the previous cross reference"
+ msgstr ""
+ 
+ #: info/session.c:2672
+ msgid "Move to the next cross reference"
+ msgstr ""
+ 
+ #: info/session.c:2733
+ msgid "Select reference or menu item appearing on this line"
+ msgstr ""
+ 
+ #: info/session.c:2767
+ #, c-format
+ msgid "No menu in node '%s'."
+ msgstr ""
+ 
+ #: info/session.c:2814
+ #, c-format
+ msgid "Unable to find node referenced by '%s' in '%s'."
+ msgstr ""
+ 
+ #: info/session.c:2870
+ msgid "Read a list of menus starting from dir and follow them"
+ msgstr ""
+ 
+ #: info/session.c:2872
+ msgid "Follow menus: "
+ msgstr ""
+ 
+ #: info/session.c:2977
+ msgid "Select the Next node"
+ msgstr ""
+ 
+ #: info/session.c:2984
+ msgid "Select the Prev node"
+ msgstr ""
+ 
+ #: info/session.c:2991
+ msgid "Select the Up node"
+ msgstr ""
+ 
+ #: info/session.c:2997
+ msgid "Select the last node in this file"
+ msgstr ""
+ 
+ #: info/session.c:3024 info/session.c:3057
+ msgid "This window has no additional nodes"
+ msgstr ""
+ 
+ #: info/session.c:3030
+ msgid "Select the first node in this file"
+ msgstr ""
+ 
+ #: info/session.c:3164
+ msgid "No more nodes within this document."
+ msgstr ""
+ 
+ #: info/session.c:3209 info/session.c:3249
+ msgid "No 'Prev' or 'Up' for this node within this document."
+ msgstr ""
+ 
+ #: info/session.c:3262
+ msgid "Move forwards or down through node structure"
+ msgstr ""
+ 
+ #: info/session.c:3279
+ msgid "Move backwards or up through node structure"
+ msgstr ""
+ 
+ #: info/session.c:3302
+ msgid "Read a node name and select it"
+ msgstr ""
+ 
+ #: info/session.c:3356 info/session.c:3360
+ msgid "Goto node: "
+ msgstr ""
+ 
+ #: info/session.c:3539
+ msgid "Find the node describing program invocation"
+ msgstr ""
+ 
+ #: info/session.c:3541
+ #, c-format
+ msgid "Find Invocation node of [%s]: "
+ msgstr ""
+ 
+ #: info/session.c:3586
+ msgid "Read a manpage reference and select it"
+ msgstr ""
+ 
+ #: info/session.c:3590
+ msgid "Get Manpage: "
+ msgstr ""
+ 
+ #: info/session.c:3611
+ msgid "Select the node 'Top' in this file"
+ msgstr ""
+ 
+ #: info/session.c:3617
+ msgid "Select the node '(dir)'"
+ msgstr ""
+ 
+ #: info/session.c:3623
+ msgid "Show full file name of node being displayed"
+ msgstr ""
+ 
+ #: info/session.c:3640
+ msgid "Select the most recently selected node"
+ msgstr ""
+ 
+ #: info/session.c:3645
+ #, c-format
+ msgid "No earlier node in history"
+ msgstr ""
+ 
+ #: info/session.c:3649
+ msgid "Read the name of a file and select it"
+ msgstr ""
+ 
+ #: info/session.c:3653
+ msgid "Find file: "
+ msgstr ""
+ 
+ #: info/session.c:3670
+ #, c-format
+ msgid "Cannot find '%s'."
+ msgstr ""
+ 
+ #: info/session.c:3719
+ #, c-format
+ msgid "Could not create output file '%s'."
+ msgstr ""
+ 
+ #: info/session.c:3733
+ #, c-format
+ msgid "error writing to %s: %s"
+ msgstr ""
+ 
+ #: info/session.c:3742
+ #, c-format
+ msgid "closing %s"
+ msgstr ""
+ 
+ #: info/session.c:3791
+ #, c-format
+ msgid "writing node %s..."
+ msgstr ""
+ 
+ #: info/session.c:3837
+ msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
+ msgstr ""
+ 
+ #: info/session.c:3865
+ #, c-format
+ msgid "Cannot open pipe to '%s'."
+ msgstr ""
+ 
+ #: info/session.c:3870
+ #, c-format
+ msgid "printing node %s..."
+ msgstr ""
+ 
+ #: info/session.c:3878
+ #, c-format
+ msgid "finished printing node %s"
+ msgstr ""
+ 
+ #: info/session.c:3910
+ msgid "Toggle the usage of regular expressions in searches"
+ msgstr ""
+ 
+ #: info/session.c:3914
+ #, c-format
+ msgid "Using regular expressions for searches."
+ msgstr ""
+ 
+ #: info/session.c:3915
+ #, c-format
+ msgid "Using literal strings for searches."
+ msgstr ""
+ 
+ #: info/session.c:4175
+ msgid "Search continued from the end of the document."
+ msgstr ""
+ 
+ #: info/session.c:4180
+ msgid "Search continued from the beginning of the document."
+ msgstr ""
+ 
+ #: info/session.c:4200
+ #, c-format
+ msgid "Searching subfile %s ..."
+ msgstr ""
+ 
+ #: info/session.c:4237
+ msgid "Search failed."
+ msgstr ""
+ 
+ #: info/session.c:4254
+ #, c-format
+ msgid "%s%s%s [%s]: "
+ msgstr ""
+ 
+ #: info/session.c:4255 info/session.c:4261
+ msgid "Regexp search"
+ msgstr ""
+ 
+ #: info/session.c:4255 info/session.c:4261
+ msgid "Search"
+ msgstr ""
+ 
+ #: info/session.c:4256 info/session.c:4262
+ msgid " case-sensitively"
+ msgstr ""
+ 
+ #: info/session.c:4257 info/session.c:4263
+ msgid " backward"
+ msgstr ""
+ 
+ #: info/session.c:4260
+ #, c-format
+ msgid "%s%s%s: "
+ msgstr ""
+ 
+ #: info/session.c:4280
+ msgid "Search string too short"
+ msgstr ""
+ 
+ #: info/session.c:4473
+ #, c-format
+ msgid "Going back to last match from %s"
+ msgstr ""
+ 
+ #: info/session.c:4497 info/session.c:4607
+ #, fuzzy, c-format
+ msgid "No more matches."
+ msgstr "Î”Îµ Î²Ï�Î­Î¸Î·ÎºÎµ"
+ 
+ #: info/session.c:4634
+ msgid "Search this node and subnodes for a string."
+ msgstr ""
+ 
+ #: info/session.c:4655
+ msgid "Go to next match in Info sub-tree"
+ msgstr ""
+ 
+ #: info/session.c:4659 info/session.c:4671
+ #, c-format
+ msgid "No active search"
+ msgstr ""
+ 
+ #: info/session.c:4667
+ msgid "Go to previous match in Info sub-tree"
+ msgstr ""
+ 
+ #: info/session.c:4680
+ msgid "Read a string and search for it case-sensitively"
+ msgstr ""
+ 
+ #: info/session.c:4685
+ msgid "Read a string and search for it"
+ msgstr ""
+ 
+ #: info/session.c:4691
+ msgid "Read a string and search backward for it"
+ msgstr ""
+ 
+ #: info/session.c:4699
+ msgid "Repeat last search in the same direction"
+ msgstr ""
+ 
+ #: info/session.c:4707 info/session.c:4752
+ msgid "No previous search string"
+ msgstr ""
+ 
+ #: info/session.c:4744
+ msgid "Repeat last search in the reverse direction"
+ msgstr ""
+ 
+ #: info/session.c:4791
+ msgid "Clear displayed search matches"
+ msgstr ""
+ 
+ #: info/session.c:4808 info/session.c:4814
+ msgid "Search interactively for a string as you type it"
+ msgstr ""
+ 
+ #: info/session.c:4934
+ msgid "Regexp I-search backward: "
+ msgstr ""
+ 
+ #: info/session.c:4935
+ msgid "I-search backward: "
+ msgstr ""
+ 
+ #: info/session.c:4937
+ msgid "Regexp I-search: "
+ msgstr ""
+ 
+ #: info/session.c:4938
+ msgid "I-search: "
+ msgstr ""
+ 
+ #: info/session.c:4963 info/session.c:4966
+ msgid "Failing "
+ msgstr ""
+ 
+ #: info/session.c:5332
+ msgid "Cancel current operation"
+ msgstr ""
+ 
+ #: info/session.c:5339
+ msgid "Quit"
+ msgstr ""
+ 
+ #: info/session.c:5344
+ msgid "Display version of Info being run"
+ msgstr ""
+ 
+ #: info/session.c:5346
+ #, c-format
+ msgid "GNU Info version %s"
+ msgstr ""
+ 
+ #: info/session.c:5351
+ msgid "Redraw the display"
+ msgstr ""
+ 
+ #: info/session.c:5388
+ msgid "Quit using Info"
+ msgstr ""
+ 
+ #: info/session.c:5404
+ msgid "Run command bound to this key's lowercase variant"
+ msgstr ""
+ 
+ #: info/session.c:5415
+ #, c-format
+ msgid "Unknown command (%s)."
+ msgstr ""
+ 
+ #: info/session.c:5418
+ #, c-format
+ msgid "\"%s\" is invalid"
+ msgstr ""
+ 
+ #: info/session.c:5419
+ #, c-format
+ msgid "'%s' is invalid"
+ msgstr ""
+ 
+ #: info/session.c:5737
+ msgid "Add this digit to the current numeric argument"
+ msgstr ""
+ 
+ #: info/session.c:5744
+ msgid "Start (or multiply by 4) the current numeric argument"
+ msgstr ""
+ 
+ #: info/tilde.c:361
+ #, c-format
+ msgid "readline: Out of virtual memory!\n"
+ msgstr ""
+ 
+ #: info/variables.c:65
+ msgid "When \"On\", footnotes appear and disappear automatically"
+ msgstr ""
+ 
+ #: info/variables.c:69
+ msgid "When \"On\", creating or deleting a window resizes other windows"
+ msgstr ""
+ 
+ #: info/variables.c:73
+ msgid "When \"On\", flash the screen instead of ringing the bell"
+ msgstr ""
+ 
+ #: info/variables.c:77
+ msgid "When \"On\", errors cause the bell to ring"
+ msgstr ""
+ 
+ #: info/variables.c:81
+ msgid "When \"On\", Info garbage collects files which had to be uncompressed"
+ msgstr ""
+ 
+ #: info/variables.c:84
+ msgid "When \"On\", the portion of the matched search string is highlighted"
+ msgstr ""
+ 
+ #: info/variables.c:88
+ msgid "Controls what happens when scrolling is requested at the end of a node"
+ msgstr ""
+ 
+ #: info/variables.c:93
+ msgid "Same as scroll-behaviour"
+ msgstr ""
+ 
+ #: info/variables.c:97
+ msgid "The number lines to scroll when the cursor moves out of the window"
+ msgstr ""
+ 
+ #: info/variables.c:101
+ msgid "Controls whether scroll-behavior affects cursor movement commands"
+ msgstr ""
+ 
+ #: info/variables.c:105
+ msgid "When \"On\", Info accepts and displays ISO Latin characters"
+ msgstr ""
+ 
+ #: info/variables.c:109
+ msgid ""
+ "What to do when a scrolling command is issued at the end of the last node"
+ msgstr ""
+ 
+ #: info/variables.c:114
+ msgid "Minimal length of a search string"
+ msgstr ""
+ 
+ #: info/variables.c:118
+ msgid "Skip current window when searching"
+ msgstr ""
+ 
+ #: info/variables.c:122
+ msgid "Exclude default directories from file search path"
+ msgstr ""
+ 
+ #: info/variables.c:126
+ msgid "Hide some Info file syntax in the text of nodes"
+ msgstr ""
+ 
+ #: info/variables.c:130
+ 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:134
+ msgid "Method to use to track mouse events"
+ msgstr ""
+ 
+ #: info/variables.c:138
+ msgid "How to follow a cross-reference"
+ msgstr ""
+ 
+ #: info/variables.c:142
+ msgid "Highlight search matches"
+ msgstr ""
+ 
+ #: info/variables.c:146
+ msgid "Styles for links"
+ msgstr ""
+ 
+ #: info/variables.c:150
+ msgid "Styles for active links"
+ msgstr ""
+ 
+ #: info/variables.c:154
+ msgid "Styles for search matches"
+ msgstr ""
+ 
+ #: info/variables.c:158
+ msgid "How to print the information line at the start of a node"
+ msgstr ""
+ 
+ #: info/variables.c:165
+ msgid "Explain the use of a variable"
+ msgstr ""
+ 
+ #: info/variables.c:171
+ msgid "Describe variable: "
+ msgstr ""
+ 
+ #: info/variables.c:186
+ msgid "Set the value of an Info variable"
+ msgstr ""
+ 
+ #: info/variables.c:193
+ msgid "Set variable: "
+ msgstr ""
+ 
+ #: info/variables.c:209
+ #, c-format
+ msgid "Set %s to value (%d): "
+ msgstr ""
+ 
+ #: info/variables.c:243
+ #, c-format
+ msgid "Set %s to value (%s): "
+ msgstr ""
+ 
+ #: info/window.c:909
+ msgid "-----Info: (), lines ----, "
+ msgstr ""
+ 
+ #: install-info/install-info.c:292
+ #, c-format
+ msgid "%s: empty file"
+ msgstr ""
+ 
+ #: install-info/install-info.c:294
+ #, c-format
+ msgid "%s for %s"
+ msgstr ""
+ 
+ #: install-info/install-info.c:533
+ #, c-format
+ msgid "\tTry `%s --help' for a complete list of options.\n"
+ msgstr ""
+ 
+ #: install-info/install-info.c:541
+ #, c-format
+ msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+ msgstr ""
+ 
+ #: install-info/install-info.c:543
+ msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
+ msgstr ""
+ 
+ #: install-info/install-info.c:544
+ 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:548
+ 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:555
+ 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:568
+ 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:577
+ 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:585
+ 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:593
+ 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:609
+ msgid ""
+ " --silent            suppress warnings.\n"
+ " --test              suppress updating of DIR-FILE.\n"
+ " --version           display version information and exit."
+ msgstr ""
+ 
+ #: install-info/install-info.c:642
+ #, 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:666
+ #, c-format
+ msgid "%s: could not read (%s) and could not create (%s)"
+ msgstr ""
+ 
+ #: install-info/install-info.c:1154 install-info/install-info.c:1194
+ #, c-format
+ msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
+ msgstr ""
+ 
+ #: install-info/install-info.c:1189
+ #, c-format
+ msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+ msgstr ""
+ 
+ #: install-info/install-info.c:2064 install-info/install-info.c:2074
+ #, c-format
+ msgid "%s: already have dir file: %s\n"
+ msgstr ""
+ 
+ #: install-info/install-info.c:2170
+ #, c-format
+ msgid "%s: Specify the Info file only once.\n"
+ msgstr ""
+ 
+ #: install-info/install-info.c:2203
+ #, c-format
+ msgid "Extra regular expression specified, ignoring `%s'"
+ msgstr ""
+ 
+ #: install-info/install-info.c:2215
+ #, c-format
+ msgid "Error in regular expression `%s': %s"
+ msgstr ""
+ 
+ #: install-info/install-info.c:2277
+ #, c-format
+ msgid "excess command line argument `%s'"
+ msgstr ""
+ 
+ #: install-info/install-info.c:2281
+ #, c-format
+ msgid "No input file specified; try --help for more information."
+ msgstr ""
+ 
+ #: install-info/install-info.c:2283
+ #, c-format
+ msgid "No dir file specified; try --help for more information."
+ msgstr ""
+ 
+ #: install-info/install-info.c:2304
+ #, c-format
+ msgid "Could not read %s."
+ msgstr ""
+ 
+ #: install-info/install-info.c:2451
+ #, c-format
+ msgid "no info dir entry in `%s'"
+ msgstr ""
+ 
+ #: install-info/install-info.c:2699
+ #, c-format
+ msgid "no entries found for `%s'; nothing deleted"
+ msgstr ""
+ 
+ #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:847
+ #: tp/Texinfo/Convert/Converter.pm:885 tp/Texinfo/Convert/Converter.pm:1196
+ #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6573
+ #: tp/Texinfo/Convert/HTML.pm:6597 tp/Texinfo/Convert/HTML.pm:6978
+ #: tp/Texinfo/Convert/HTML.pm:7037 tp/Texinfo/Convert/HTML.pm:7115
+ #: tp/Texinfo/Convert/HTML.pm:7192 tp/Texinfo/Convert/IXIN.pm:293
+ #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:547
+ #: tp/Texinfo/Convert/TexinfoXML.pm:458
+ #, perl-format
+ msgid "could not open %s for writing: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:862
+ msgid "recursion is always allowed"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:863
+ msgid "arguments are quoted by default"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:866
+ msgid ""
+ "move your @contents command if you want the contents after the title page"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:869
+ msgid ""
+ "move your @shortcontents and @contents commands if you want the contents "
+ "after the title page"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:1093
+ #, perl-format
+ msgid "%s is not a valid language code"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:1098
+ #, perl-format
+ msgid "%s is not a valid region code"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:1116
+ #, perl-format
+ msgid "%s is not a valid split possibility"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:1139
+ #, perl-format
+ msgid "could not read %s: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:1158
+ #, perl-format
+ msgid "error on closing @verbatiminclude file %s: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:1164 tp/Texinfo/Parser.pm:3193
+ #, perl-format
+ msgid "@%s: could not find %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:1637
+ msgid "no node to be renamed"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:1648
+ msgid "nodes without a new name at the end of file"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:1658 tp/Texinfo/Parser.pm:899
+ #, perl-format
+ msgid "could not open %s: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:2178
+ #, perl-format
+ msgid "could not protect hash character in @%s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Converter.pm:387 tp/Texinfo/Convert/Converter.pm:406
+ #, perl-format
+ msgid "Obsolete variable %s\n"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Converter.pm:786
+ #, perl-format
+ msgid "%s: output incompatible with split"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Converter.pm:868 tp/Texinfo/Convert/Converter.pm:901
+ #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:7004
+ #: tp/Texinfo/Convert/HTML.pm:7063 tp/Texinfo/Convert/IXIN.pm:915
+ #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
+ #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
+ #: tp/Texinfo/Convert/TexinfoXML.pm:477 tp/Texinfo/Parser.pm:1996
+ #, perl-format
+ msgid "error on closing %s: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Converter.pm:979
+ #, perl-format
+ msgid "could not create directories `%s' or `%s': %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Converter.pm:987
+ #, perl-format
+ msgid "could not create directory `%s': %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:970
+ #, perl-format
+ msgid "@image file `%s' not found, using `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5225
+ msgid "no argument specified for @U"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:1715
+ #, perl-format
+ msgid "@image file `%s' (for HTML) not found, using `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:2399
+ #, perl-format
+ msgid "raw format %s is not converted"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4629
+ #, perl-format
+ msgid "could not open html refs config file %s: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4657
+ msgid "missing type"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4660
+ #, perl-format
+ msgid "unrecognized type: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4677
+ #, perl-format
+ msgid "error on closing html refs config file %s: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4962
+ msgid "string not closed in css file"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4964
+ msgid "--css-include ended in comment"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4966
+ msgid "@import not finished in css file"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4992
+ #, perl-format
+ msgid "CSS file %s not found"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4998
+ #, perl-format
+ msgid "could not open --include-file %s: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:5008
+ #, perl-format
+ msgid "error on closing CSS file %s: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:5870 tp/Texinfo/Convert/HTML.pm:5874
+ #, perl-format
+ msgid "no htmlxref.cnf entry found for `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6568
+ #, perl-format
+ msgid "error on closing frame file %s: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6592
+ #, perl-format
+ msgid "error on closing TOC frame file %s: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6707
+ #, perl-format
+ msgid "handler %s of stage %s priority %s failed"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6912
+ msgid "must specify a title with a title command or @top"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:7122
+ #, perl-format
+ msgid "error on closing redirection node file %s: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:7147
+ #, perl-format
+ msgid "old name for `%s' is a node of the document"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:7153
+ #, perl-format
+ msgid "file empty for renamed node `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:7167
+ #, perl-format
+ msgid "target node (new name for `%s') not in document: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:7199
+ #, perl-format
+ msgid "error on closing renamed node redirection file %s: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:7237
+ msgid "empty node name"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:7239 tp/Texinfo/Parser.pm:3542
+ #, perl-format
+ msgid "syntax for an external node used for `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Info.pm:106
+ msgid "document without nodes"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Info.pm:123
+ msgid "document without Top node"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Info.pm:171
+ #, perl-format
+ msgid "rename %s failed: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Info.pm:247
+ #, perl-format
+ msgid "@%s output more than once: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Info.pm:379
+ #, perl-format
+ msgid "@%s outside of any node"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Info.pm:422
+ #, perl-format
+ msgid "@node name should not contain `,': %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:1335
+ #, perl-format
+ msgid "Index entry in @%s with : produces invalid Info: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:1382 tp/Texinfo/Parser.pm:2568
+ #, perl-format
+ msgid "entry for index `%s' outside of any node"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:1496
+ #, perl-format
+ msgid "error on closing image text file %s: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:1501
+ #, perl-format
+ msgid "@image file `%s' unreadable: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:1524
+ #, perl-format
+ msgid "could not find @image file `%s.txt' nor alternate text"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:1932
+ msgid ""
+ "@strong{Note...} produces a spurious cross-reference in Info; reword to "
+ "avoid that"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2162
+ #, perl-format
+ msgid "@%s cross-reference name should not contain `:'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2194
+ #, perl-format
+ msgid "@%s node name should not contain `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2227
+ #, perl-format
+ msgid "@%s node name should not contain `:'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2273
+ #, perl-format
+ msgid "`.' or `,' must follow @xref, not %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2276
+ msgid "`.' or `,' must follow @xref"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3086
+ #, perl-format
+ msgid "menu entry node name should not contain `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3097
+ msgid "menu entry node name should not contain `:'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3113
+ msgid "menu entry name should not contain `:'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:883
+ #, perl-format
+ msgid "@%s should only appear at beginning or end of document"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:1125 tp/Texinfo/Structuring.pm:595
+ #, perl-format
+ msgid "multiple @%s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:1166
+ #, perl-format
+ msgid "bad or empty @%s formal argument: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:1176
+ #, perl-format
+ msgid "bad syntax for @%s argument: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:1183 tp/Texinfo/Parser.pm:4707
+ #: tp/Texinfo/Parser.pm:4733 tp/Texinfo/Parser.pm:5565
+ #: tp/Texinfo/Parser.pm:5578 tp/Texinfo/Parser.pm:5592
+ #, perl-format
+ msgid "%c%s requires a name"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:1187 tp/Texinfo/Parser.pm:4710
+ #: tp/Texinfo/Parser.pm:4736 tp/Texinfo/Parser.pm:5568
+ #: tp/Texinfo/Parser.pm:5581 tp/Texinfo/Parser.pm:5595
+ #, perl-format
+ msgid "bad name for @%s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:1305
+ #, perl-format
+ msgid "@end %s seen before @%s closing brace"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:1309
+ #, perl-format
+ msgid "@%s seen before @%s closing brace"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:1314
+ #, perl-format
+ msgid "%c%s missing closing brace"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:1318
+ #, perl-format
+ msgid "@%s missing closing delimiter sequence: %s}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:1440
+ #, perl-format
+ msgid "@itemx should not begin @%s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:1508
+ msgid "@itemx must follow @item"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:1676
+ #, perl-format
+ msgid "@%s has text but no @item"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:1707
+ #, perl-format
+ msgid "`@end' expected `%s', but saw `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:1710
+ #, perl-format
+ msgid "@%s seen before @end %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:1714
+ #, perl-format
+ msgid "no matching `%cend %s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:1738 tp/Texinfo/Parser.pm:5070
+ #: tp/Texinfo/Parser.pm:5308
+ #, perl-format
+ msgid "misplaced %c"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:1835 tp/Texinfo/Parser.pm:3148
+ #, perl-format
+ msgid "unmatched `%c%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:2072
+ #, perl-format
+ msgid "macro `%s' called with too many args"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:2094
+ #, perl-format
+ msgid "@%s missing closing brace"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:2102
+ #, perl-format
+ msgid "macro `%s' declared without argument called with an argument"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:2138
+ #, perl-format
+ msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:2501
+ #, perl-format
+ msgid "@%s `%s' previously defined"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:2506
+ #, perl-format
+ msgid "here is the previous definition as @%s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:2850
+ #, perl-format
+ msgid "missing name for @%s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:2855
+ #, perl-format
+ msgid "missing category for @%s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:2890
+ #, perl-format
+ msgid "unexpected argument on @%s line: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:2905
+ msgid "empty multitable"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:2959 tp/Texinfo/Parser.pm:5673
+ #, perl-format
+ msgid "superfluous argument to @%s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:2965 tp/Texinfo/Parser.pm:5694
+ #: tp/Texinfo/Parser.pm:5705
+ #, perl-format
+ msgid "bad argument to @%s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:2976
+ #, perl-format
+ msgid "%s requires an argument: the formatter for %citem"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:2981
+ #, perl-format
+ msgid "command @%s not accepting argument in brace should not be on @%s line"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:3016
+ #, perl-format
+ msgid "accent command `@%s' not allowed as @%s argument"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:3124 tp/Texinfo/Parser.pm:3277
+ #: tp/Texinfo/Parser.pm:5666
+ #, perl-format
+ msgid "@%s missing argument"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:3138
+ #, perl-format
+ msgid "unknown @end %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:3161 tp/Texinfo/Parser.pm:3788
+ #, perl-format
+ msgid "superfluous argument to @%s %s: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:3167 tp/Texinfo/Parser.pm:3245
+ #: tp/Texinfo/Parser.pm:5755 tp/Texinfo/Parser.pm:5798
+ #: tp/Texinfo/Parser.pm:5827 tp/Texinfo/Parser.pm:5868
+ #: tp/Texinfo/Parser.pm:5946
+ #, perl-format
+ msgid "bad argument to @%s: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:3188
+ #, perl-format
+ msgid "@%s: could not open %s: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:3200
+ #, perl-format
+ msgid "encoding `%s' is not a canonical texinfo encoding"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:3208
+ #, perl-format
+ msgid "unrecognized encoding name `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:3364
+ #, perl-format
+ msgid "@%s after the first element"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:3371
+ #, perl-format
+ msgid "@%s only meaningful on a @multitable line"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:3408
+ #, perl-format
+ msgid "@%s should not be associated with @top"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:3420
+ #, perl-format
+ msgid "@node precedes @%s, but parts may not be associated with nodes"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:3522
+ #, perl-format
+ msgid "empty argument in @%s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:3526
+ #, perl-format
+ msgid "empty node name after expansion `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:3569
+ #, perl-format
+ msgid "empty menu entry name in `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:3577
+ msgid "empty node name in menu entry"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:3650
+ #, perl-format
+ msgid "@%s should not appear in @%s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:3782
+ #, perl-format
+ msgid "@end %s should only appear at the beginning of a line"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:3804
+ #, perl-format
+ msgid "macro `%s' previously defined"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:3807
+ #, perl-format
+ msgid "here is the previous definition of `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:3812
+ #, perl-format
+ msgid "redefining Texinfo language command: @%s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:3879
+ #, perl-format
+ msgid "@%s without associated character"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:3949
+ #, perl-format
+ msgid ""
+ "@%s defined with zero or more than one argument should be invoked with {}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:3974
+ #, perl-format
+ msgid ""
+ "macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
+ "value %d)"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:3983
+ #, perl-format
+ msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:4038
+ #, perl-format
+ msgid "accent command `@%s' must not be followed by whitespace"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:4044
+ #, perl-format
+ msgid "use braces to give a command as an argument to @%s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:4057 tp/Texinfo/Parser.pm:5189
+ #, perl-format
+ msgid "%c%s expects `i' or `j' as argument, not `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:4068
+ #, perl-format
+ msgid "accent command `@%s' must not be followed by new line"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:4079
+ #, perl-format
+ msgid "@%s expected braces"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:4233
+ #, perl-format
+ msgid "undefined flag: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:4236
+ msgid "bad syntax for @value"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:4243
+ #, perl-format
+ msgid "%c%s is obsolete."
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:4246
+ #, perl-format
+ msgid "%c%s is obsolete; %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:4255
+ #, perl-format
+ msgid "@%s should only appear at the beginning of a line"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:4346
+ #, perl-format
+ msgid "@%s not allowed inside `@%s' block"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:4355
+ #, perl-format
+ msgid "@%s should only appear in heading or footing"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:4479 tp/Texinfo/Parser.pm:4496
+ #: tp/Texinfo/Parser.pm:4546
+ #, perl-format
+ msgid "@%s not meaningful inside `@%s' block"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:4506
+ #, perl-format
+ msgid "@%s in empty multitable"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:4512
+ msgid "@tab before @item"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:4515
+ #, perl-format
+ msgid "too many columns in multitable item (max %d)"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:4552
+ msgid "ignoring @tab outside of multitable"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:4556
+ #, perl-format
+ msgid "@%s outside of table or list"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:4596
+ #, perl-format
+ msgid "must be after `@%s' to use `@%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:4638
+ #, perl-format
+ msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:4642
+ msgid "@dircategory after first node"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:4847
+ #, perl-format
+ msgid "region %s inside region %s is not allowed"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:4864
+ msgid "@direntry after first node"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:4872
+ #, perl-format
+ msgid "@%s seen before first @node"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:4875
+ msgid ""
+ "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:4937
+ #, perl-format
+ msgid "@%s should only appear in math context"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:4945
+ #, perl-format
+ msgid "unknown command `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:4955
+ msgid "unexpected @"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:4983
+ #, perl-format
+ msgid "@%s is not meaningful outside `@float' environment"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:4988
+ #, perl-format
+ msgid "@%s should be right below `@float'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:4996
+ #, perl-format
+ msgid "ignoring multiple @%s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5114
+ #, perl-format
+ msgid "command @%s does not accept arguments"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5138
+ #, perl-format
+ msgid "command @%s missing a node or external manual argument"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5156
+ #, perl-format
+ msgid "in @%s empty cross reference name after expansion `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5167
+ #, perl-format
+ msgid "in @%s empty cross reference title after expansion `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5180
+ msgid "@image missing filename argument"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5211
+ #, perl-format
+ msgid "@%s missing first argument"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5230
+ #, perl-format
+ msgid "non-hex digits in argument for @U: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5236
+ #, perl-format
+ msgid "fewer than four hex digits in argument for @U: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5253
+ #, perl-format
+ msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5448
+ msgid "superfluous arguments for node"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5498
+ #, perl-format
+ msgid "expected @end %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5607
+ #, perl-format
+ msgid "@%s should only accept a @-command as argument, not `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5617
+ #, perl-format
+ msgid "remaining argument on @%s line: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5689
+ #, perl-format
+ msgid "environment command %s as argument to @%s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5710
+ #, perl-format
+ msgid "empty @%s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5718
+ #, perl-format
+ msgid "column fraction not a number: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5727
+ #, perl-format
+ msgid "@sp arg must be numeric, not `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5736
+ #, perl-format
+ msgid "reserved index name %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5762
+ #, perl-format
+ msgid "unknown source index in @%s: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5765
+ #, perl-format
+ msgid "unknown destination index in @%s: %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5793
+ #, perl-format
+ msgid "@%s leads to a merging of %s in itself, ignoring"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5806
+ #, perl-format
+ msgid "unknown index `%s' in @printindex"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5812
+ #, perl-format
+ msgid "printing an index `%s' merged in another one `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5820
+ #, perl-format
+ msgid "printindex before document beginning: @printindex %s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5836
+ #, perl-format
+ msgid "@%s arg must be `top' or `bottom', not `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5844
+ #, perl-format
+ msgid "Only @%s 10 or 11 is supported, not `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5852
+ #, perl-format
+ msgid "@%s arg must be `separate' or `end', not `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5860
+ #, perl-format
+ msgid "@%s arg must be `on', `off' or `odd', not `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5878 tp/Texinfo/Parser.pm:5883
+ #, perl-format
+ msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5891
+ #, perl-format
+ msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5901
+ #, perl-format
+ msgid "@exampleindent arg must be numeric/`asis', not `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5913
+ #, perl-format
+ msgid "expected @%s on or off, not `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5922
+ #, perl-format
+ msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5930
+ #, perl-format
+ msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:5938
+ #, perl-format
+ msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Structuring.pm:216
+ #, perl-format
+ msgid "raising the section level of @%s which is too low"
+ msgstr ""
+ 
+ #: tp/Texinfo/Structuring.pm:248
+ #, perl-format
+ msgid "no chapter-level command before @%s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Structuring.pm:253
+ #, perl-format
+ msgid "lowering the section level of @%s appearing after a lower element"
+ msgstr ""
+ 
+ #: tp/Texinfo/Structuring.pm:342
+ #, perl-format
+ msgid "no sectioning command associated with @%s"
+ msgstr ""
+ 
+ #: tp/Texinfo/Structuring.pm:491
+ #, perl-format
+ msgid "@%s not empty"
+ msgstr ""
+ 
+ #: tp/Texinfo/Structuring.pm:547 tp/Texinfo/Structuring.pm:1325
+ #, perl-format
+ msgid "@%s reference to nonexistent node `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Structuring.pm:558
+ #, perl-format
+ msgid "@%s entry node name `%s' different from %s name `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Structuring.pm:663
+ #, perl-format
+ msgid "unreferenced node `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Structuring.pm:706
+ #, perl-format
+ msgid "node `%s' is %s for `%s' in sectioning but not in menu"
+ msgstr ""
+ 
+ #: tp/Texinfo/Structuring.pm:713
+ #, perl-format
+ msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
+ msgstr ""
+ 
+ #: tp/Texinfo/Structuring.pm:731
+ #, perl-format
+ msgid "node `%s' is %s for `%s' in menu but not in sectioning"
+ msgstr ""
+ 
+ #: tp/Texinfo/Structuring.pm:786
+ #, perl-format
+ msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Structuring.pm:810
+ #, perl-format
+ msgid "%s reference to nonexistent `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Structuring.pm:829
+ #, perl-format
+ msgid "node `%s' lacks menu item for `%s' despite being its Up target"
+ msgstr ""
+ 
+ #: tp/Texinfo/Structuring.pm:837
+ #, perl-format
+ msgid "for `%s', up in menu `%s' and up `%s' don't match"
+ msgstr ""
+ 
+ #: tp/Texinfo/Structuring.pm:1338
+ #, perl-format
+ msgid "@%s to `%s', different from %s name `%s'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Structuring.pm:2067
+ #, perl-format
+ msgid "empty index key in @%s"
+ msgstr ""
+ 
+ #: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:348
+ #, perl-format
+ msgid "chm.pm: could not open %s for writing: %s\n"
+ msgstr ""
+ 
+ #: tp/init/chm.pm:267 tp/init/chm.pm:338 tp/init/chm.pm:399
+ #, 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:383
+ #, perl-format
+ msgid "error loading %s: %s\n"
+ msgstr ""
+ 
+ #: tp/texi2any.pl:396
+ #, perl-format
+ msgid "%s: unknown variable %s"
+ msgstr ""
+ 
+ #: tp/texi2any.pl:400
+ #, perl-format
+ msgid "%s: obsolete variable %s\n"
+ msgstr ""
+ 
+ #: tp/texi2any.pl:415
+ #, perl-format
+ msgid "%s: unknown variable %s\n"
+ msgstr ""
+ 
+ #: tp/texi2any.pl:419
+ #, perl-format
+ msgid "obsolete variable %s\n"
+ msgstr ""
+ 
+ #: tp/texi2any.pl:484
+ #, perl-format
+ msgid "could not read init file %s"
+ msgstr ""
+ 
+ #: tp/texi2any.pl:647
+ #, perl-format
+ msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
+ msgstr ""
+ 
+ #: tp/texi2any.pl:730
+ #, perl-format
+ msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
+ msgstr ""
+ 
+ #: tp/texi2any.pl:733
+ 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:739
+ #, 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:755
+ 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:763
+ 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:783
+ #, 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:800
+ 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:811
+ msgid ""
+ "Options for XML and Docbook:\n"
+ "      --output-indent=VAL     does nothing, retained for compatibility.\n"
+ msgstr ""
+ 
+ #: tp/texi2any.pl:814
+ msgid ""
+ "Options for DVI/PS/PDF:\n"
+ "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
+ msgstr ""
+ 
+ #: tp/texi2any.pl:817
+ 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:825
+ 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:842
+ 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:849
+ 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:896
+ #, perl-format
+ msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
+ msgstr ""
+ 
+ #: tp/texi2any.pl:987
+ #, perl-format
+ msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
+ msgstr ""
+ 
+ #: tp/texi2any.pl:1064
+ #, perl-format
+ msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
+ msgstr ""
+ 
+ #: tp/texi2any.pl:1068
+ msgid "--Xopt option without printed output"
+ msgstr ""
+ 
+ #: tp/texi2any.pl:1083
+ #, perl-format
+ msgid "unknown tree transformation %s"
+ msgstr ""
+ 
+ #: tp/texi2any.pl:1090
+ #, perl-format
+ msgid "ignoring splitting for format %s"
+ msgstr ""
+ 
+ #: tp/texi2any.pl:1150
+ #, perl-format
+ msgid "%s: missing file argument.\n"
+ msgstr ""
+ 
+ #: tp/texi2any.pl:1151
+ #, perl-format
+ msgid "Try `%s --help' for more information.\n"
+ msgstr ""
+ 
+ #: tp/texi2any.pl:1239
+ msgid "fill_gaps_in_sectioning transformation return no result. No section?"
+ msgstr ""
+ 
+ #: tp/texi2any.pl:1262
+ #, perl-format
+ msgid "error on closing macro expand file %s: %s\n"
+ msgstr ""
+ 
+ #: tp/texi2any.pl:1268
+ #, perl-format
+ msgid "could not open %s for writing: %s\n"
+ msgstr ""
+ 
+ #: tp/texi2any.pl:1293
+ msgid ""
+ "insert_nodes_for_sectioning_commands transformation return no result. No "
+ "section?"
+ msgstr ""
+ 
+ #: tp/texi2any.pl:1366 tp/texi2any.pl:1442
+ #, perl-format
+ msgid "%s: error on closing %s: %s\n"
+ msgstr ""
+ 
+ #: tp/texi2any.pl:1389 tp/texi2any.pl:1423
+ #, perl-format
+ msgid "%s: error on closing internal links file %s: %s\n"
+ msgstr ""
+ 
+ #: tp/texi2any.pl:1395 tp/texi2any.pl:1429
+ #, perl-format
+ msgid "%s: could not open %s for writing: %s\n"
+ msgstr ""
Binary files texinfo-6.1/po/eo.gmo and texinfo-6.3/po/eo.gmo differ
diff -Nrc2 texinfo-6.1/po/eo.po texinfo-6.3/po/eo.po
*** texinfo-6.1/po/eo.po	2016-02-06 11:35:49.000000000 +0000
--- texinfo-6.3/po/eo.po	2016-09-10 12:45:50.000000000 +0100
***************
*** 1,16 ****
  # Esperanto translations for GNU Texinfo.
! # Copyright (C) 2015 Free Software Foundation, Inc.
  # This file is distributed under the same license as the texinfo package.
  #
! # Â« Le bonheur est dans le prÃ©. Â»
  #
! # Benno Schulenberg <benno@vertaalt.nl>, 2010, 2011, 2012, 2013, 2015.
  # Sergio Pokrovskij <sergio.pokrovskij@gmail.com>, 1999-2010.
  msgid ""
  msgstr ""
! "Project-Id-Version: texinfo 5.9.93\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
! "PO-Revision-Date: 2015-06-07 10:23+0200\n"
  "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
  "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
--- 1,16 ----
  # Esperanto translations for GNU Texinfo.
! # Copyright (C) 2016 Free Software Foundation, Inc.
  # This file is distributed under the same license as the texinfo package.
  #
! # "Zo rijk dat ze boter tegen het plafond gooien."
  #
! # Benno Schulenberg <benno@vertaalt.nl>, 2010, 2011, 2012, 2013, 2015, 2016.
  # Sergio Pokrovskij <sergio.pokrovskij@gmail.com>, 1999-2010.
  msgid ""
  msgstr ""
! "Project-Id-Version: texinfo 6.1.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:45+0100\n"
! "PO-Revision-Date: 2016-08-21 11:22+0200\n"
  "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
  "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
***************
*** 19,22 ****
--- 19,23 ----
  "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: Lokalize 1.0\n"
***************
*** 93,97 ****
  #: gnulib/lib/regcomp.c:138
  msgid "No match"
! msgstr "Neniu trafo"
  
  #: gnulib/lib/regcomp.c:141
--- 94,98 ----
  #: gnulib/lib/regcomp.c:138
  msgid "No match"
! msgstr "Neniu kongruo"
  
  #: gnulib/lib/regcomp.c:141
***************
*** 116,120 ****
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [ or [^"
  msgstr "Senpara [ aÅ­ [^"
  
--- 117,122 ----
  
  #: gnulib/lib/regcomp.c:156
! #, fuzzy
! msgid "Unmatched [, [^, [:, [., or [="
  msgstr "Senpara [ aÅ­ [^"
  
***************
*** 155,159 ****
  msgstr "Senpara ) aÅ­ \\)"
  
! #: gnulib/lib/regcomp.c:711
  msgid "No previous regular expression"
  msgstr "Mankas antaÅ­a regulesprimo"
--- 157,161 ----
  msgstr "Senpara ) aÅ­ \\)"
  
! #: gnulib/lib/regcomp.c:687
  msgid "No previous regular expression"
  msgstr "Mankas antaÅ­a regulesprimo"
***************
*** 307,311 ****
  msgstr "---------- Piednotoj ----------"
  
! #: info/indices.c:123 info/indices.c:812
  #, c-format
  msgid "Finding index entries..."
--- 309,313 ----
  msgstr "---------- Piednotoj ----------"
  
! #: info/indices.c:123 info/indices.c:822
  #, c-format
  msgid "Finding index entries..."
***************
*** 316,320 ****
  msgstr "SerÄ‰i Ä‰enon en la indekso por Ä‰i tiu dosiero"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:818
  #, c-format
  msgid "No indices found."
--- 318,322 ----
  msgstr "SerÄ‰i Ä‰enon en la indekso por Ä‰i tiu dosiero"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:828
  #, c-format
  msgid "No indices found."
***************
*** 344,377 ****
  #, c-format
  msgid "No more index entries containing '%s'."
! msgstr "Ne ekzistas pli da indekseroj enhavantaj Â«%sÂ»."
  
! #: info/indices.c:476 info/indices.c:880
  #, c-format
  msgid "No index entries containing '%s'."
  msgstr "Ne ekzistas indekseroj kiuj enhavas Â«%sÂ»."
  
! #: info/indices.c:583
  #, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "SerÄ‰ado en la indeksoj de Â«%sÂ»..."
  
! #: info/indices.c:636
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr "SerÄ‰i Ä‰enon en Ä‰iuj konataj indeksoj Info-dosieraj kaj fari menuon"
  
! #: info/indices.c:644 info/indices.c:646
  msgid "Index apropos"
  msgstr "SerÄ‰i en indekso informon pri"
  
! #: info/indices.c:688
  #, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Indekseroj kiuj enhavas Â«%sÂ»:\n"
  
! #: info/indices.c:797
  msgid "List all matches of a string in the index"
  msgstr "Listigi Ä‰iujn aperojn de signoÄ‰eno en la indekso"
  
! #: info/indices.c:824 info/indices.c:826
  msgid "Index topic"
  msgstr "Indeksa temo"
--- 346,379 ----
  #, c-format
  msgid "No more index entries containing '%s'."
! msgstr "Malestas pli da indekseroj enhavantaj Â«%sÂ»."
  
! #: info/indices.c:476 info/indices.c:890
  #, c-format
  msgid "No index entries containing '%s'."
  msgstr "Ne ekzistas indekseroj kiuj enhavas Â«%sÂ»."
  
! #: info/indices.c:586
  #, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "SerÄ‰ado en la indeksoj de Â«%sÂ»..."
  
! #: info/indices.c:646
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr "SerÄ‰i Ä‰enon en Ä‰iuj konataj indeksoj Info-dosieraj kaj fari menuon"
  
! #: info/indices.c:654 info/indices.c:656
  msgid "Index apropos"
  msgstr "SerÄ‰i en indekso informon pri"
  
! #: info/indices.c:698
  #, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Indekseroj kiuj enhavas Â«%sÂ»:\n"
  
! #: info/indices.c:807
  msgid "List all matches of a string in the index"
  msgstr "Listigi Ä‰iujn aperojn de signoÄ‰eno en la indekso"
  
! #: info/indices.c:834 info/indices.c:836
  msgid "Index topic"
  msgstr "Indeksa temo"
***************
*** 382,436 ****
  msgstr "Malestas Â«%sÂ» en la indeksoj de Ä‰iuj disponeblaj Info-dosieroj."
  
! #: info/info-utils.c:892
  #, c-format
  msgid "Error converting file character encoding."
  msgstr "Eraro dum konverto de signara kodo."
  
! #: info/info.c:222 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "Malestas menuero Â«%sÂ» en nodo Â«%sÂ»."
  
! #: info/info.c:315
! #, c-format
! msgid "No file given for node '%s'."
! msgstr "Neniu dosiero indikatas por nodo Â«%sÂ»."
! 
! #: info/info.c:364 info/info.c:1133
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr "Nodo Â«%sÂ» ne troveblas."
  
! #: info/info.c:386
  #, c-format
  msgid "No program name given."
  msgstr "Programnomo ne indikatas."
  
! #: info/info.c:577
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "nevalida numero: %s\n"
  
! #: info/info.c:757
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "nevalida valorizo de variablo: %s"
  
! #: info/info.c:764 info/infokey.c:537
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: nekonata variablo"
  
! #: info/info.c:770 info/infokey.c:539
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "valoro %s ne estas valida por variablo %s"
  
! #: info/info.c:782
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "Por ricevi pli da informoj uzu la opcion â€œ--helpâ€�.\n"
  
! #: info/info.c:804 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
--- 384,433 ----
  msgstr "Malestas Â«%sÂ» en la indeksoj de Ä‰iuj disponeblaj Info-dosieroj."
  
! #: info/info-utils.c:879
  #, c-format
  msgid "Error converting file character encoding."
  msgstr "Eraro dum konverto de signara kodo."
  
! #: info/info.c:279 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "Malestas menuero Â«%sÂ» en nodo Â«%sÂ»."
  
! #: info/info.c:416 info/info.c:1148
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr "Nodo Â«%sÂ» ne troveblas."
  
! #: info/info.c:438
  #, c-format
  msgid "No program name given."
  msgstr "Programnomo ne indikatas."
  
! #: info/info.c:636
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "nevalida numero: %s\n"
  
! #: info/info.c:816
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "nevalida valorizo de variablo: %s"
  
! #: info/info.c:823 info/infokey.c:540
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: nekonata variablo"
  
! #: info/info.c:829 info/infokey.c:542
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "valoro %s ne estas valida por variablo %s"
  
! #: info/info.c:841
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "Por ricevi pli da informoj uzu la opcion â€œ--helpâ€�.\n"
  
! #: info/info.c:860 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
***************
*** 447,456 ****
  "NENIA garantio estas donita, kiom la leÄ�o tion toleras.\n"
  
! #: info/info.c:981
  #, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "neniu indeksero troviÄ�as por Â«%sÂ»\n"
  
! #: info/info.c:1034
  #, c-format
  msgid ""
--- 444,453 ----
  "NENIA garantio estas donita, kiom la leÄ�o tion toleras.\n"
  
! #: info/info.c:999
  #, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "neniu indeksero troviÄ�as por Â«%sÂ»\n"
  
! #: info/info.c:1049
  #, c-format
  msgid ""
***************
*** 463,467 ****
  "Prezentas dokumentojn en Info-aranÄ�o.\n"
  
! #: info/info.c:1040
  msgid ""
  "Options:\n"
--- 460,464 ----
  "Prezentas dokumentojn en Info-aranÄ�o.\n"
  
! #: info/info.c:1055
  msgid ""
  "Options:\n"
***************
*** 482,486 ****
  "  -f, --file=MANLIBRO          viziti Ä‰i tiun Info-dosieron"
  
! #: info/info.c:1048
  msgid ""
  "  -h, --help                   display this help and exit.\n"
--- 479,483 ----
  "  -f, --file=MANLIBRO          viziti Ä‰i tiun Info-dosieron"
  
! #: info/info.c:1063
  msgid ""
  "  -h, --help                   display this help and exit.\n"
***************
*** 496,500 ****
  "  -o, --output=DOSIERO         eligi la elektotajn nodojn al DOSIERO"
  
! #: info/info.c:1054
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
--- 493,497 ----
  "  -o, --output=DOSIERO         eligi la elektotajn nodojn al DOSIERO"
  
! #: info/info.c:1069
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
***************
*** 508,516 ****
  "  -O, --show-options, --usage  montri la nodon pri komandliniaj opcioj"
  
! #: info/info.c:1061
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr "  -b, --speech-friendly        esti afabla al la parolsinteziloj."
  
! #: info/info.c:1065
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
--- 505,513 ----
  "  -O, --show-options, --usage  montri la nodon pri komandliniaj opcioj"
  
! #: info/info.c:1076
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr "  -b, --speech-friendly        esti afabla al la parolsinteziloj."
  
! #: info/info.c:1080
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
***************
*** 533,537 ****
  "  -x, --debug=NUMERO           erarserÄ‰a nivelo (-1 por ciuj mesaÄ�oj)\n"
  
! #: info/info.c:1074
  msgid ""
  "\n"
--- 530,534 ----
  "  -x, --debug=NUMERO           erarserÄ‰a nivelo (-1 por ciuj mesaÄ�oj)\n"
  
! #: info/info.c:1089
  msgid ""
  "\n"
***************
*** 550,554 ****
  "vizitenda nodo.  Eblas mallongigi tiujn nomojn se ili restas unikaj."
  
! #: info/info.c:1081
  msgid ""
  "\n"
--- 547,551 ----
  "vizitenda nodo.  Eblas mallongigi tiujn nomojn se ili restas unikaj."
  
! #: info/info.c:1096
  msgid ""
  "\n"
***************
*** 558,562 ****
  "Por prezento de la komandoklavoj, tajpu Â«HÂ» ene de 'info'."
  
! #: info/info.c:1084
  msgid ""
  "\n"
--- 555,559 ----
  "Por prezento de la komandoklavoj, tajpu Â«HÂ» ene de 'info'."
  
! #: info/info.c:1099
  msgid ""
  "\n"
***************
*** 587,591 ****
  "  info -f ./UMO.info         eligi la dosieron ./UMO.info sen atenti Â«dirÂ»"
  
! #: info/info.c:1099 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
--- 584,588 ----
  "  info -f ./UMO.info         eligi la dosieron ./UMO.info sen atenti Â«dirÂ»"
  
! #: info/info.c:1114 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
***************
*** 598,662 ****
  "Diskutu Esperantotradukon je <translation-team-eo@lists.sourceforge.net>."
  
! #: info/info.c:1134
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Nodo Â«(%s)%sÂ» ne troveblas."
  
! #: info/info.c:1135
  msgid "Cannot find a window!"
  msgstr "Ne eblas trovi fenestron!"
  
! #: info/info.c:1136
  msgid "Point doesn't appear within this window's node!"
  msgstr "La muskursoro ne estas en Ä‰i-fenestra nodo!"
  
! #: info/info.c:1137
  msgid "Cannot delete the last window."
  msgstr "Maleblas forigi la lastan fenestron."
  
! #: info/info.c:1138
  msgid "No menu in this node."
  msgstr "Malestas menuo en Ä‰i tiu nodo."
  
! #: info/info.c:1139
  msgid "No footnotes in this node."
  msgstr "Malestas piednotoj en Ä‰i tiu nodo."
  
! #: info/info.c:1140
  msgid "No cross references in this node."
  msgstr "Neniu referenco en Ä‰i tiu nodo."
  
! #: info/info.c:1141
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Mankas ligo â€œ%sâ€� por Ä‰i tiu nodo."
  
! #: info/info.c:1142
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "Nekonata Info-komando â€œ%câ€�; tajpu Â«?Â» por helpo."
  
! #: info/info.c:1143
  #, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "Terminalo de tipo Â«%sÂ» ne estas sufiÄ‰e inteligenta por Info."
  
! #: info/info.c:1144
  msgid "You are already at the last page of this node."
  msgstr "Äˆi tiu jam estas la lasta paÄ�o en Ä‰i tiu nodo."
  
! #: info/info.c:1145
  msgid "You are already at the first page of this node."
  msgstr "Äˆi tiu jam estas la unua paÄ�o en Ä‰i tiu nodo."
  
! #: info/info.c:1146
  msgid "Only one window."
  msgstr "Nur unu fenestro."
  
! #: info/info.c:1147
  msgid "Resulting window would be too small."
  msgstr "La fenestro rezultus tro malgranda."
  
! #: info/info.c:1148
  msgid "Not enough room for a help window, please delete a window."
  msgstr "Mankas spaco por helpa fenestro; bonvolu forigi iun fenestron."
--- 595,659 ----
  "Diskutu Esperantotradukon je <translation-team-eo@lists.sourceforge.net>."
  
! #: info/info.c:1149
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Nodo Â«(%s)%sÂ» ne troveblas."
  
! #: info/info.c:1150
  msgid "Cannot find a window!"
  msgstr "Ne eblas trovi fenestron!"
  
! #: info/info.c:1151
  msgid "Point doesn't appear within this window's node!"
  msgstr "La muskursoro ne estas en Ä‰i-fenestra nodo!"
  
! #: info/info.c:1152
  msgid "Cannot delete the last window."
  msgstr "Maleblas forigi la lastan fenestron."
  
! #: info/info.c:1153
  msgid "No menu in this node."
  msgstr "Malestas menuo en Ä‰i tiu nodo."
  
! #: info/info.c:1154
  msgid "No footnotes in this node."
  msgstr "Malestas piednotoj en Ä‰i tiu nodo."
  
! #: info/info.c:1155
  msgid "No cross references in this node."
  msgstr "Neniu referenco en Ä‰i tiu nodo."
  
! #: info/info.c:1156
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Mankas ligo â€œ%sâ€� por Ä‰i tiu nodo."
  
! #: info/info.c:1157
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "Nekonata Info-komando â€œ%câ€�; tajpu Â«?Â» por helpo."
  
! #: info/info.c:1158
  #, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "Terminalo de tipo Â«%sÂ» ne estas sufiÄ‰e inteligenta por Info."
  
! #: info/info.c:1159
  msgid "You are already at the last page of this node."
  msgstr "Äˆi tiu jam estas la lasta paÄ�o en Ä‰i tiu nodo."
  
! #: info/info.c:1160
  msgid "You are already at the first page of this node."
  msgstr "Äˆi tiu jam estas la unua paÄ�o en Ä‰i tiu nodo."
  
! #: info/info.c:1161
  msgid "Only one window."
  msgstr "Nur unu fenestro."
  
! #: info/info.c:1162
  msgid "Resulting window would be too small."
  msgstr "La fenestro rezultus tro malgranda."
  
! #: info/info.c:1163
  msgid "Not enough room for a help window, please delete a window."
  msgstr "Mankas spaco por helpa fenestro; bonvolu forigi iun fenestron."
***************
*** 931,965 ****
  msgstr "nekonata ago Â«%sÂ»."
  
! #: info/infokey.c:482
  #, c-format
  msgid "action name too long"
  msgstr "tro longa agonomo"
  
! #: info/infokey.c:495
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "kromaj signoj post la ago Â«%sÂ»"
  
! #: info/infokey.c:506
  #, c-format
  msgid "missing variable name"
  msgstr "mankas nomo de variablo"
  
! #: info/infokey.c:515
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "mankas '=' tuj post variablonomo"
  
! #: info/infokey.c:522
  #, c-format
  msgid "variable name too long"
  msgstr "tro longa variablonomo"
  
! #: info/infokey.c:546
  #, c-format
  msgid "value too long"
  msgstr "tro longa valoro"
  
! #: info/infokey.c:592
  #, c-format
  msgid "\"%s\", line %u: "
--- 928,962 ----
  msgstr "nekonata ago Â«%sÂ»."
  
! #: info/infokey.c:485
  #, c-format
  msgid "action name too long"
  msgstr "tro longa agonomo"
  
! #: info/infokey.c:498
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "kromaj signoj post la ago Â«%sÂ»"
  
! #: info/infokey.c:509
  #, c-format
  msgid "missing variable name"
  msgstr "mankas nomo de variablo"
  
! #: info/infokey.c:518
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "mankas '=' tuj post variablonomo"
  
! #: info/infokey.c:525
  #, c-format
  msgid "variable name too long"
  msgstr "tro longa variablonomo"
  
! #: info/infokey.c:549
  #, c-format
  msgid "value too long"
  msgstr "tro longa valoro"
  
! #: info/infokey.c:595
  #, c-format
  msgid "\"%s\", line %u: "
***************
*** 1292,1631 ****
  msgstr "Ne eblas trovi nodon referencatan per Â«%sÂ» en Â«%sÂ»."
  
! #: info/session.c:2864
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "Legi liston da menuoj, komencante per Â«dirÂ» kaj sekvante ilin"
  
! #: info/session.c:2866
  msgid "Follow menus: "
  msgstr "Sekvi menuojn: "
  
! #: info/session.c:2971
  msgid "Select the Next node"
  msgstr "Viziti la sekvan nodon (â€œNextâ€�)"
  
! #: info/session.c:2978
  msgid "Select the Prev node"
  msgstr "Viziti la antaÅ­an nodon (â€œPrevâ€�)"
  
! #: info/session.c:2985
  msgid "Select the Up node"
  msgstr "Viziti la supran nodon (â€œUpâ€�)"
  
! #: info/session.c:2991
  msgid "Select the last node in this file"
  msgstr "Viziti la lastan nodon en Ä‰i tiu dosiero"
  
! #: info/session.c:3018 info/session.c:3051
  msgid "This window has no additional nodes"
  msgstr "Äˆi tiu fenestro ne havas pluajn nodojn."
  
! #: info/session.c:3024
  msgid "Select the first node in this file"
  msgstr "Viziti la unuan nodon en Ä‰i tiu dosiero"
  
! #: info/session.c:3158
  msgid "No more nodes within this document."
  msgstr "Malestas pluaj referencoj en la dokumento."
  
! #: info/session.c:3203 info/session.c:3243
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "En la dokumento mankas ligo(j) â€œPrevâ€� aÅ­ â€œUpâ€� por tiu Ä‰i nodo."
  
! #: info/session.c:3256
  msgid "Move forwards or down through node structure"
  msgstr "Iri antaÅ­en aÅ­ suben en la strukturo de nodoj"
  
! #: info/session.c:3273
  msgid "Move backwards or up through node structure"
  msgstr "Iri malantaÅ­en aÅ­ supren en la strukturo de nodoj"
  
! #: info/session.c:3296
  msgid "Read a node name and select it"
  msgstr "Legi nodnomon kaj viziti tiun nodon"
  
! #: info/session.c:3350 info/session.c:3354
  msgid "Goto node: "
  msgstr "Iri al nodo: "
  
! #: info/session.c:3533
  msgid "Find the node describing program invocation"
  msgstr "Trovi la nodon kiu priskribas programvokon"
  
! #: info/session.c:3535
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Trovi la voknodon de [%s]: "
  
! #: info/session.c:3580
  msgid "Read a manpage reference and select it"
  msgstr "Legi referencon al manlibra paÄ�o kaj viziti Ä�in"
  
! #: info/session.c:3584
  msgid "Get Manpage: "
  msgstr "Manlibran paÄ�on: "
  
! #: info/session.c:3605
  msgid "Select the node 'Top' in this file"
  msgstr "Viziti la nodon â€œTopâ€� en Ä‰i tiu dosiero"
  
! #: info/session.c:3611
  msgid "Select the node '(dir)'"
  msgstr "Viziti la nodon â€œ(dir)â€�"
  
! #: info/session.c:3617
  msgid "Show full file name of node being displayed"
  msgstr "Montri kompletan dosiernomon de nodo kiu prezentiÄ�as"
  
! #: info/session.c:3634
  msgid "Select the most recently selected node"
  msgstr "Reviziti nodon plej Äµuse vizititan"
  
! #: info/session.c:3639
  #, c-format
  msgid "No earlier node in history"
  msgstr "Malestas pli frua nodo en historio"
  
! #: info/session.c:3643
  msgid "Read the name of a file and select it"
  msgstr "Legi dosiernomon kaj viziti Ä�in"
  
! #: info/session.c:3647
  msgid "Find file: "
  msgstr "Trovi dosieron: "
  
! #: info/session.c:3664
  #, c-format
  msgid "Cannot find '%s'."
  msgstr "Ne eblas trovi Â«%sÂ»."
  
! #: info/session.c:3713
  #, c-format
  msgid "Could not create output file '%s'."
  msgstr "Ne eblas krei eligan dosieron Â«%sÂ»."
  
! #: info/session.c:3727
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "eraro dum skribo en Â«%sÂ»: %s"
  
! #: info/session.c:3736
  #, c-format
  msgid "closing %s"
  msgstr "fermo de %s"
  
! #: info/session.c:3785
  #, c-format
  msgid "writing node %s..."
  msgstr "skribado de nodo Â«%sÂ»..."
  
! #: info/session.c:3831
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "Meti la enhavon de Ä‰i tiu nodo en la dukton per INFO_PRINT_COMMAND"
  
! #: info/session.c:3859
  #, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Ne eblas malfermi dukton al Â«%sÂ»."
  
! #: info/session.c:3864
  #, c-format
  msgid "printing node %s..."
  msgstr "printado de nodo Â«%sÂ»..."
  
! #: info/session.c:3872
  #, c-format
  msgid "finished printing node %s"
  msgstr "pretas la printado de nodo Â«%sÂ»"
  
! #: info/session.c:3904
  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."
  
! #: info/session.c:4169
  msgid "Search continued from the end of the document."
  msgstr "SerÄ‰o kontinuis ekde la fino de la dokumento."
  
! #: info/session.c:4174
  msgid "Search continued from the beginning of the document."
  msgstr "SerÄ‰o kontinuis ekde la komenco de la dokumento."
  
! #: info/session.c:4194
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "SerÄ‰ado en subdosiero Â«%sÂ»..."
  
! #: info/session.c:4231
  msgid "Search failed."
  msgstr "SerÄ‰o fiaskis."
  
! #: info/session.c:4248
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Regexp search"
  msgstr "SerÄ‰i regulesprime"
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Search"
  msgstr "SerÄ‰i"
  
! #: info/session.c:4250 info/session.c:4256
  msgid " case-sensitively"
  msgstr " usklecodistinge"
  
! #: info/session.c:4251 info/session.c:4257
  msgid " backward"
  msgstr " malantaÅ­en"
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s: "
  
! #: info/session.c:4274
  msgid "Search string too short"
  msgstr "SerÄ‰oÄ‰eno tro mallongas"
  
! #: info/session.c:4467
  #, c-format
  msgid "Going back to last match from %s"
! msgstr ""
  
! #: info/session.c:4491 info/session.c:4601
! #, fuzzy, c-format
  msgid "No more matches."
! msgstr "Neniu trafo"
  
! #: info/session.c:4628
  msgid "Search this node and subnodes for a string."
! msgstr ""
  
! #: info/session.c:4649
  msgid "Go to next match in Info sub-tree"
! msgstr ""
  
! #: info/session.c:4653 info/session.c:4665
  #, c-format
  msgid "No active search"
! msgstr ""
  
! #: info/session.c:4661
  msgid "Go to previous match in Info sub-tree"
! msgstr ""
  
! #: info/session.c:4674
  msgid "Read a string and search for it case-sensitively"
  msgstr "Legi Ä‰enon kaj serÄ‰i Ä�in usklecodistinge"
  
! #: info/session.c:4679
  msgid "Read a string and search for it"
  msgstr "Legi Ä‰enon kaj serÄ‰i Ä�in"
  
! #: info/session.c:4685
  msgid "Read a string and search backward for it"
  msgstr "Legi Ä‰enon kaj serÄ‰i Ä�in malantaÅ­en"
  
! #: info/session.c:4693
  msgid "Repeat last search in the same direction"
  msgstr "Ripeti la Äµusan serÄ‰on samdirekte"
  
! #: info/session.c:4701 info/session.c:4746
  msgid "No previous search string"
  msgstr "Malestas pli frua serÄ‰oÄ‰eno."
  
! #: info/session.c:4738
  msgid "Repeat last search in the reverse direction"
  msgstr "Ripeti la Äµusan serÄ‰on alidirekte"
  
! #: info/session.c:4785
  msgid "Clear displayed search matches"
  msgstr "ViÅ�i la montratajn serÄ‰ajn kongruojn"
  
! #: info/session.c:4802 info/session.c:4808
  msgid "Search interactively for a string as you type it"
  msgstr "SerÄ‰i signoÄ‰enon dum vi tajpas Ä�in"
  
! #: info/session.c:4928
  msgid "Regexp I-search backward: "
  msgstr "SerÄ‰i tajpante regulesprime malantaÅ­en: "
  
! #: info/session.c:4929
  msgid "I-search backward: "
  msgstr "SerÄ‰i tajpante malantaÅ­en: "
  
! #: info/session.c:4931
  msgid "Regexp I-search: "
  msgstr "SerÄ‰i tajpante regulesprime: "
  
! #: info/session.c:4932
  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:4957 info/session.c:4960
  msgid "Failing "
  msgstr "*Fiaskas* "
  
! #: info/session.c:5326
  msgid "Cancel current operation"
  msgstr "Äˆesigi la kurantan operacion"
  
! #: info/session.c:5333
  msgid "Quit"
  msgstr "Fini"
  
! #: info/session.c:5338
  msgid "Display version of Info being run"
  msgstr "Montri la version de la rulanta Info"
  
! #: info/session.c:5340
  #, c-format
  msgid "GNU Info version %s"
  msgstr "GNU Info, versio %s"
  
! #: info/session.c:5345
  msgid "Redraw the display"
  msgstr "RefreÅ�igi la ekranon"
  
! #: info/session.c:5382
  msgid "Quit using Info"
  msgstr "Eliri el Info"
  
! #: info/session.c:5398
  msgid "Run command bound to this key's lowercase variant"
  msgstr "Plenumi komandon asociitan kun Ä‰i tiu klavo minuskligita"
  
! #: info/session.c:5409
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Komando nekonata (%s)."
  
! #: info/session.c:5412
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "Â«%sÂ» ne validas"
  
! #: info/session.c:5413
  #, c-format
  msgid "'%s' is invalid"
  msgstr "'%s' ne validas"
  
! #: info/session.c:5731
  msgid "Add this digit to the current numeric argument"
  msgstr "Aldoni Ä‰i tiun ciferon al la kuranta nombra argumento"
  
! #: info/session.c:5738
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "Komenci (aÅ­ 4-obligi) la kurantan nombran argumenton"
--- 1289,1628 ----
  msgstr "Ne eblas trovi nodon referencatan per Â«%sÂ» en Â«%sÂ»."
  
! #: info/session.c:2870
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "Legi liston da menuoj, komencante per Â«dirÂ» kaj sekvante ilin"
  
! #: info/session.c:2872
  msgid "Follow menus: "
  msgstr "Sekvi menuojn: "
  
! #: info/session.c:2977
  msgid "Select the Next node"
  msgstr "Viziti la sekvan nodon (â€œNextâ€�)"
  
! #: info/session.c:2984
  msgid "Select the Prev node"
  msgstr "Viziti la antaÅ­an nodon (â€œPrevâ€�)"
  
! #: info/session.c:2991
  msgid "Select the Up node"
  msgstr "Viziti la supran nodon (â€œUpâ€�)"
  
! #: info/session.c:2997
  msgid "Select the last node in this file"
  msgstr "Viziti la lastan nodon en Ä‰i tiu dosiero"
  
! #: info/session.c:3024 info/session.c:3057
  msgid "This window has no additional nodes"
  msgstr "Äˆi tiu fenestro ne havas pluajn nodojn."
  
! #: info/session.c:3030
  msgid "Select the first node in this file"
  msgstr "Viziti la unuan nodon en Ä‰i tiu dosiero"
  
! #: info/session.c:3164
  msgid "No more nodes within this document."
  msgstr "Malestas pluaj referencoj en la dokumento."
  
! #: info/session.c:3209 info/session.c:3249
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "En la dokumento mankas ligo(j) â€œPrevâ€� aÅ­ â€œUpâ€� por tiu Ä‰i nodo."
  
! #: info/session.c:3262
  msgid "Move forwards or down through node structure"
  msgstr "Iri antaÅ­en aÅ­ suben en la strukturo de nodoj"
  
! #: info/session.c:3279
  msgid "Move backwards or up through node structure"
  msgstr "Iri malantaÅ­en aÅ­ supren en la strukturo de nodoj"
  
! #: info/session.c:3302
  msgid "Read a node name and select it"
  msgstr "Legi nodnomon kaj viziti tiun nodon"
  
! #: info/session.c:3356 info/session.c:3360
  msgid "Goto node: "
  msgstr "Iri al nodo: "
  
! #: info/session.c:3539
  msgid "Find the node describing program invocation"
  msgstr "Trovi la nodon kiu priskribas programvokon"
  
! #: info/session.c:3541
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Trovi la voknodon de [%s]: "
  
! #: info/session.c:3586
  msgid "Read a manpage reference and select it"
  msgstr "Legi referencon al manlibra paÄ�o kaj viziti Ä�in"
  
! #: info/session.c:3590
  msgid "Get Manpage: "
  msgstr "Manlibran paÄ�on: "
  
! #: info/session.c:3611
  msgid "Select the node 'Top' in this file"
  msgstr "Viziti la nodon â€œTopâ€� en Ä‰i tiu dosiero"
  
! #: info/session.c:3617
  msgid "Select the node '(dir)'"
  msgstr "Viziti la nodon â€œ(dir)â€�"
  
! #: info/session.c:3623
  msgid "Show full file name of node being displayed"
  msgstr "Montri kompletan dosiernomon de nodo kiu prezentiÄ�as"
  
! #: info/session.c:3640
  msgid "Select the most recently selected node"
  msgstr "Reviziti nodon plej Äµuse vizititan"
  
! #: info/session.c:3645
  #, c-format
  msgid "No earlier node in history"
  msgstr "Malestas pli frua nodo en historio"
  
! #: info/session.c:3649
  msgid "Read the name of a file and select it"
  msgstr "Legi dosiernomon kaj viziti Ä�in"
  
! #: info/session.c:3653
  msgid "Find file: "
  msgstr "Trovi dosieron: "
  
! #: info/session.c:3670
  #, c-format
  msgid "Cannot find '%s'."
  msgstr "Ne eblas trovi Â«%sÂ»."
  
! #: info/session.c:3719
  #, c-format
  msgid "Could not create output file '%s'."
  msgstr "Ne eblas krei eligan dosieron Â«%sÂ»."
  
! #: info/session.c:3733
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "eraro dum skribo en Â«%sÂ»: %s"
  
! #: info/session.c:3742
  #, c-format
  msgid "closing %s"
  msgstr "fermo de %s"
  
! #: info/session.c:3791
  #, c-format
  msgid "writing node %s..."
  msgstr "skribado de nodo Â«%sÂ»..."
  
! #: info/session.c:3837
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "Meti la enhavon de Ä‰i tiu nodo en la dukton per INFO_PRINT_COMMAND"
  
! #: info/session.c:3865
  #, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Ne eblas malfermi dukton al Â«%sÂ»."
  
! #: info/session.c:3870
  #, c-format
  msgid "printing node %s..."
  msgstr "printado de nodo Â«%sÂ»..."
  
! #: info/session.c:3878
  #, c-format
  msgid "finished printing node %s"
  msgstr "pretas la printado de nodo Â«%sÂ»"
  
! #: info/session.c:3910
  msgid "Toggle the usage of regular expressions in searches"
  msgstr "BaskulÅ�alti la uzon de regulesprimoj en serÄ‰oj"
  
! #: info/session.c:3914
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr "Regulesprimoj uzatos en serÄ‰oj."
  
! #: info/session.c:3915
  #, c-format
  msgid "Using literal strings for searches."
  msgstr "LaÅ­literaj signoÄ‰enoj uzatos en serÄ‰oj."
  
! #: info/session.c:4175
  msgid "Search continued from the end of the document."
  msgstr "SerÄ‰o kontinuis ekde la fino de la dokumento."
  
! #: info/session.c:4180
  msgid "Search continued from the beginning of the document."
  msgstr "SerÄ‰o kontinuis ekde la komenco de la dokumento."
  
! #: info/session.c:4200
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "SerÄ‰ado en subdosiero Â«%sÂ»..."
  
! #: info/session.c:4237
  msgid "Search failed."
  msgstr "SerÄ‰o fiaskis."
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Regexp search"
  msgstr "SerÄ‰i regulesprime"
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Search"
  msgstr "SerÄ‰i"
  
! #: info/session.c:4256 info/session.c:4262
  msgid " case-sensitively"
  msgstr " usklecodistinge"
  
! #: info/session.c:4257 info/session.c:4263
  msgid " backward"
  msgstr " malantaÅ­en"
  
! #: info/session.c:4260
  #, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s: "
  
! #: info/session.c:4280
  msgid "Search string too short"
  msgstr "SerÄ‰oÄ‰eno tro mallongas"
  
! #: info/session.c:4473
  #, c-format
  msgid "Going back to last match from %s"
! msgstr "Reirante al lasta kongruo de %s"
  
! #: info/session.c:4497 info/session.c:4607
! #, c-format
  msgid "No more matches."
! msgstr "Malestas pluaj kongruoj."
  
! #: info/session.c:4634
  msgid "Search this node and subnodes for a string."
! msgstr "SerÄ‰i signoÄ‰enon en Ä‰i tiu nodo kaj subnodoj"
  
! #: info/session.c:4655
  msgid "Go to next match in Info sub-tree"
! msgstr "Iri al sekva kongruo en Info-subarbo"
  
! #: info/session.c:4659 info/session.c:4671
  #, c-format
  msgid "No active search"
! msgstr "Neniu aktiva serÄ‰o"
  
! #: info/session.c:4667
  msgid "Go to previous match in Info sub-tree"
! msgstr "Iri al antaÅ­a kongruo en Info-subarbo"
  
! #: info/session.c:4680
  msgid "Read a string and search for it case-sensitively"
  msgstr "Legi Ä‰enon kaj serÄ‰i Ä�in usklecodistinge"
  
! #: info/session.c:4685
  msgid "Read a string and search for it"
  msgstr "Legi Ä‰enon kaj serÄ‰i Ä�in"
  
! #: info/session.c:4691
  msgid "Read a string and search backward for it"
  msgstr "Legi Ä‰enon kaj serÄ‰i Ä�in malantaÅ­en"
  
! #: info/session.c:4699
  msgid "Repeat last search in the same direction"
  msgstr "Ripeti la Äµusan serÄ‰on samdirekte"
  
! #: info/session.c:4707 info/session.c:4752
  msgid "No previous search string"
  msgstr "Malestas pli frua serÄ‰oÄ‰eno."
  
! #: info/session.c:4744
  msgid "Repeat last search in the reverse direction"
  msgstr "Ripeti la Äµusan serÄ‰on alidirekte"
  
! #: info/session.c:4791
  msgid "Clear displayed search matches"
  msgstr "ViÅ�i la montratajn serÄ‰ajn kongruojn"
  
! #: info/session.c:4808 info/session.c:4814
  msgid "Search interactively for a string as you type it"
  msgstr "SerÄ‰i signoÄ‰enon dum vi tajpas Ä�in"
  
! #: info/session.c:4934
  msgid "Regexp I-search backward: "
  msgstr "SerÄ‰i tajpante regulesprime malantaÅ­en: "
  
! #: info/session.c:4935
  msgid "I-search backward: "
  msgstr "SerÄ‰i tajpante malantaÅ­en: "
  
! #: info/session.c:4937
  msgid "Regexp I-search: "
  msgstr "SerÄ‰i tajpante regulesprime: "
  
! #: info/session.c:4938
  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:4963 info/session.c:4966
  msgid "Failing "
  msgstr "*Fiaskas* "
  
! #: info/session.c:5332
  msgid "Cancel current operation"
  msgstr "Äˆesigi la kurantan operacion"
  
! #: info/session.c:5339
  msgid "Quit"
  msgstr "Fini"
  
! #: info/session.c:5344
  msgid "Display version of Info being run"
  msgstr "Montri la version de la rulanta Info"
  
! #: info/session.c:5346
  #, c-format
  msgid "GNU Info version %s"
  msgstr "GNU Info, versio %s"
  
! #: info/session.c:5351
  msgid "Redraw the display"
  msgstr "RefreÅ�igi la ekranon"
  
! #: info/session.c:5388
  msgid "Quit using Info"
  msgstr "Eliri el Info"
  
! #: info/session.c:5404
  msgid "Run command bound to this key's lowercase variant"
  msgstr "Plenumi komandon asociitan kun Ä‰i tiu klavo minuskligita"
  
! #: info/session.c:5415
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Komando nekonata (%s)."
  
! #: info/session.c:5418
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "Â«%sÂ» ne validas"
  
! #: info/session.c:5419
  #, c-format
  msgid "'%s' is invalid"
  msgstr "'%s' ne validas"
  
! #: info/session.c:5737
  msgid "Add this digit to the current numeric argument"
  msgstr "Aldoni Ä‰i tiun ciferon al la kuranta nombra argumento"
  
! #: info/session.c:5744
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "Komenci (aÅ­ 4-obligi) la kurantan nombran argumenton"
***************
*** 1715,1721 ****
  
  #: info/variables.c:138
- #, fuzzy
  msgid "How to follow a cross-reference"
! msgstr "Iri al la sekva referenco"
  
  #: info/variables.c:142
--- 1712,1717 ----
  
  #: info/variables.c:138
  msgid "How to follow a cross-reference"
! msgstr "Kiel sekvi referencon"
  
  #: info/variables.c:142
***************
*** 1725,1742 ****
  #: info/variables.c:146
  msgid "Styles for links"
! msgstr ""
  
  #: info/variables.c:150
  msgid "Styles for active links"
! msgstr ""
  
  #: info/variables.c:154
- #, fuzzy
  msgid "Styles for search matches"
! msgstr "ViÅ�i la montratajn serÄ‰ajn kongruojn"
  
  #: info/variables.c:158
  msgid "How to print the information line at the start of a node"
! msgstr ""
  
  #: info/variables.c:165
--- 1721,1737 ----
  #: info/variables.c:146
  msgid "Styles for links"
! msgstr "Stiloj por ligoj"
  
  #: info/variables.c:150
  msgid "Styles for active links"
! msgstr "Stiloj por aktivaj ligoj"
  
  #: info/variables.c:154
  msgid "Styles for search matches"
! msgstr "Stiloj por serÄ‰aj kongruoj"
  
  #: info/variables.c:158
  msgid "How to print the information line at the start of a node"
! msgstr "Kiel montri la infolinion Ä‰e komenco de nodo"
  
  #: info/variables.c:165
***************
*** 1766,1783 ****
  msgstr "Variablo %s ricevu la valoron (%s): "
  
! #: info/window.c:959
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), linioj ----, "
  
- #: info/window.c:966
- #, c-format
- msgid "-%s---Info: %s, %ld lines --%s--"
- msgstr "-%s---Info: %s, %ld linioj --%s--"
- 
- #: info/window.c:970
- #, fuzzy, c-format
- msgid "-%s---Info: (%s)%s, %ld lines --%s--"
- msgstr "-%s%s-Info: (%s)%s, %ld linioj --%s--"
- 
  #: install-info/install-info.c:292
  #, c-format
--- 1761,1768 ----
  msgstr "Variablo %s ricevu la valoron (%s): "
  
! #: info/window.c:909
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), linioj ----, "
  
  #: install-info/install-info.c:292
  #, c-format
***************
*** 1963,1967 ****
  "\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"
--- 1948,1952 ----
  "\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"
***************
*** 1979,1988 ****
  "\n"
  "  Äˆi tie (en la Info-katalogo) estas menuo de la Ä‰efaj temoj.\n"
! "  Tajpu â€œqâ€� por eliri; â€œ?â€� por eligi Ä‰iujn komandojn de Info;\n"
  "  â€œdâ€� por reveni Ä‰i tien; â€œhâ€� vokas lernilon por komencantoj;\n"
! "  â€œmEmacs<Enter>â€� disponigas la manlibron pri Emakso; ktp.\n"
  "\n"
! "  Se vi legas per Emakso, alklaku menueron aÅ­ referencon per\n"
! "  la dua musbutono por elekti tiun temon.\n"
  "\n"
  "%s\n"
--- 1964,1973 ----
  "\n"
  "  Äˆi tie (en la Info-katalogo) estas menuo de la Ä‰efaj temoj.\n"
! "  Tajpu â€œqâ€� por eliri; â€œHâ€� por vidi liston de Ä‰iuj Info-komandoj;\n"
  "  â€œdâ€� por reveni Ä‰i tien; â€œhâ€� vokas lernilon por komencantoj;\n"
! "  â€œmls<Enter>â€� montras la manlibron pri Â«lsÂ»; ktp.\n"
  "\n"
! "  Se vi legas per Emakso, eblas elekti menueron aÅ­ referencon\n"
! "  per alklako kun la dua musbutono.\n"
  "\n"
  "%s\n"
***************
*** 2053,2169 ****
  msgstr "TroviÄ�is nenia Info-kataloga informo pri Â«%sÂ»; nenio forigitas"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:855
! #: tp/Texinfo/Convert/Converter.pm:893 tp/Texinfo/Convert/Converter.pm:1204
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6504
! #: tp/Texinfo/Convert/HTML.pm:6528 tp/Texinfo/Convert/HTML.pm:6905
! #: tp/Texinfo/Convert/HTML.pm:6963 tp/Texinfo/Convert/HTML.pm:7041
! #: tp/Texinfo/Convert/HTML.pm:7118 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:546
! #: tp/Texinfo/Convert/TexinfoXML.pm:457
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "ne eblas malfermi %s por skribi: %s"
  
! #: tp/Texinfo/Common.pm:881
  msgid "recursion is always allowed"
  msgstr "rikuro Ä‰iam permesatas"
  
! #: tp/Texinfo/Common.pm:882
  msgid "arguments are quoted by default"
  msgstr "argumentoj citatas defaÅ­lte"
  
! #: tp/Texinfo/Common.pm:1105
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s ne estas valida lingvokodo"
  
! #: tp/Texinfo/Common.pm:1110
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s ne estas valida regiona kodo"
  
! #: tp/Texinfo/Common.pm:1128
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%s ne estas valida fenda elekto"
  
! #: tp/Texinfo/Common.pm:1151
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "ne eblas legi %s: %s"
  
! #: tp/Texinfo/Common.pm:1170
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "eraro dum fermo de '@verbatiminclude'-dosiero %s: %s"
  
! #: tp/Texinfo/Common.pm:1176 tp/Texinfo/Parser.pm:3353
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%s: ne eblas trovi %s"
  
! #: tp/Texinfo/Common.pm:1520
! #, 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/Common.pm:1548
! msgid "missing type"
! msgstr "mankas tipo"
! 
! #: tp/Texinfo/Common.pm:1551
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "nerekonata tipo: %s"
! 
! #: tp/Texinfo/Common.pm:1568
! #, 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/Common.pm:1603
  msgid "no node to be renamed"
  msgstr "neniu nodo por alinomi"
  
! #: tp/Texinfo/Common.pm:1614
  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:1624 tp/Texinfo/Parser.pm:926
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "ne eblas malfermi %s por skribi: %s"
  
! #: tp/Texinfo/Common.pm:2144
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr "ne eblas Å�irmi kradon en '@%s'"
  
! #: tp/Texinfo/Convert/Converter.pm:395 tp/Texinfo/Convert/Converter.pm:414
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Arkaika variablo %s\n"
  
! #: tp/Texinfo/Convert/Converter.pm:794
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr "%s: eligo malkongruas kun fendo"
  
! #: tp/Texinfo/Convert/Converter.pm:876 tp/Texinfo/Convert/Converter.pm:909
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:6931
! #: tp/Texinfo/Convert/HTML.pm:6989 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:476 tp/Texinfo/Parser.pm:2035
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "eraro dum fermo de %s: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, 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:995
  #, perl-format
  msgid "could not create directory `%s': %s"
--- 2038,2149 ----
  msgstr "TroviÄ�is nenia Info-kataloga informo pri Â«%sÂ»; nenio forigitas"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:847
! #: tp/Texinfo/Convert/Converter.pm:885 tp/Texinfo/Convert/Converter.pm:1196
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6573
! #: tp/Texinfo/Convert/HTML.pm:6597 tp/Texinfo/Convert/HTML.pm:6978
! #: tp/Texinfo/Convert/HTML.pm:7037 tp/Texinfo/Convert/HTML.pm:7115
! #: tp/Texinfo/Convert/HTML.pm:7192 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:547
! #: tp/Texinfo/Convert/TexinfoXML.pm:458
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "ne eblas malfermi %s por skribi: %s"
  
! #: tp/Texinfo/Common.pm:862
  msgid "recursion is always allowed"
  msgstr "rikuro Ä‰iam permesatas"
  
! #: tp/Texinfo/Common.pm:863
  msgid "arguments are quoted by default"
  msgstr "argumentoj citatas defaÅ­lte"
  
! #: tp/Texinfo/Common.pm:866
! 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:869
! msgid ""
! "move your @shortcontents and @contents commands if you want the contents "
! "after the title page"
! msgstr ""
! "movu la @shortcontents- kaj @contents-komandojn se vi deziras la enhavon "
! "post la titola paÄ�o"
! 
! #: tp/Texinfo/Common.pm:1093
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s ne estas valida lingvokodo"
  
! #: tp/Texinfo/Common.pm:1098
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s ne estas valida regiona kodo"
  
! #: tp/Texinfo/Common.pm:1116
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%s ne estas valida fenda elekto"
  
! #: tp/Texinfo/Common.pm:1139
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "ne eblas legi %s: %s"
  
! #: tp/Texinfo/Common.pm:1158
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "eraro dum fermo de '@verbatiminclude'-dosiero %s: %s"
  
! #: tp/Texinfo/Common.pm:1164 tp/Texinfo/Parser.pm:3193
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%s: ne eblas trovi %s"
  
! #: tp/Texinfo/Common.pm:1637
  msgid "no node to be renamed"
  msgstr "neniu nodo por alinomi"
  
! #: tp/Texinfo/Common.pm:1648
  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:1658 tp/Texinfo/Parser.pm:899
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "ne eblas malfermi %s por skribi: %s"
  
! #: tp/Texinfo/Common.pm:2178
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr "ne eblas Å�irmi kradon en '@%s'"
  
! #: tp/Texinfo/Convert/Converter.pm:387 tp/Texinfo/Convert/Converter.pm:406
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Arkaika variablo %s\n"
  
! #: tp/Texinfo/Convert/Converter.pm:786
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr "%s: eligo malkongruas kun fendo"
  
! #: tp/Texinfo/Convert/Converter.pm:868 tp/Texinfo/Convert/Converter.pm:901
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:7004
! #: tp/Texinfo/Convert/HTML.pm:7063 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:477 tp/Texinfo/Parser.pm:1996
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "eraro dum fermo de %s: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:979
  #, 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:987
  #, perl-format
  msgid "could not create directory `%s': %s"
***************
*** 2175,2264 ****
  msgstr "'@image'-dosiero Â«%sÂ» ne troviÄ�as; Â«%sÂ» uziÄ�as"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5388
  msgid "no argument specified for @U"
  msgstr "mankas argumento je @U"
  
! #: tp/Texinfo/Convert/HTML.pm:1683
  #, 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:2371
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "kruda aranÄ�o %s ne konvertiÄ�as"
  
! #: tp/Texinfo/Convert/HTML.pm:4888
  msgid "string not closed in css file"
  msgstr "nefermita signoÄ‰eno en CSS-dosiero"
  
! #: tp/Texinfo/Convert/HTML.pm:4890
  msgid "--css-include ended in comment"
  msgstr "'--css-include' finiÄ�as en komento"
  
! #: tp/Texinfo/Convert/HTML.pm:4892
  msgid "@import not finished in css file"
  msgstr "nefinita komando '@import' en CSS-dosiero"
  
! #: tp/Texinfo/Convert/HTML.pm:4918
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "CSS-dosiero %s ne troviÄ�as"
  
! #: tp/Texinfo/Convert/HTML.pm:4924
  #, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "ne eblas malfermi '--include-file' %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:4934
  #, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "eraro dum fermo de CSS-dosiero %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5801 tp/Texinfo/Convert/HTML.pm:5805
  #, 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:6499
  #, 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:6523
  #, 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:6638
  #, 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:6839
  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:7048
  #, 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:7073
  #, 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:7079
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "vakas la dosiero por alinomita nodo '%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:7093
  #, 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:7125
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
--- 2155,2263 ----
  msgstr "'@image'-dosiero Â«%sÂ» ne troviÄ�as; Â«%sÂ» uziÄ�as"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5225
  msgid "no argument specified for @U"
  msgstr "mankas argumento je @U"
  
! #: tp/Texinfo/Convert/HTML.pm:1715
  #, 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:2399
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "kruda aranÄ�o %s ne konvertiÄ�as"
  
! #: tp/Texinfo/Convert/HTML.pm:4629
! #, 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:4657
! msgid "missing type"
! msgstr "mankas tipo"
! 
! #: tp/Texinfo/Convert/HTML.pm:4660
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "nerekonata tipo: %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4677
! #, 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:4962
  msgid "string not closed in css file"
  msgstr "nefermita signoÄ‰eno en CSS-dosiero"
  
! #: tp/Texinfo/Convert/HTML.pm:4964
  msgid "--css-include ended in comment"
  msgstr "'--css-include' finiÄ�as en komento"
  
! #: tp/Texinfo/Convert/HTML.pm:4966
  msgid "@import not finished in css file"
  msgstr "nefinita komando '@import' en CSS-dosiero"
  
! #: tp/Texinfo/Convert/HTML.pm:4992
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "CSS-dosiero %s ne troviÄ�as"
  
! #: tp/Texinfo/Convert/HTML.pm:4998
  #, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "ne eblas malfermi '--include-file' %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5008
  #, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "eraro dum fermo de CSS-dosiero %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5870 tp/Texinfo/Convert/HTML.pm:5874
  #, 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:6568
  #, 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:6592
  #, 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:6707
  #, 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:6912
  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:7122
  #, 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:7147
  #, 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:7153
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "vakas la dosiero por alinomita nodo '%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:7167
  #, 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:7199
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
***************
*** 2266,2274 ****
  "eraro dum fermo de %s (dosiero de aldirektigoj por alinomitaj nodoj): %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7163
  msgid "empty node name"
  msgstr "vaka nodnomo"
  
! #: tp/Texinfo/Convert/HTML.pm:7165 tp/Texinfo/Parser.pm:3697
  #, perl-format
  msgid "syntax for an external node used for `%s'"
--- 2265,2273 ----
  "eraro dum fermo de %s (dosiero de aldirektigoj por alinomitaj nodoj): %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7237
  msgid "empty node name"
  msgstr "vaka nodnomo"
  
! #: tp/Texinfo/Convert/HTML.pm:7239 tp/Texinfo/Parser.pm:3542
  #, perl-format
  msgid "syntax for an external node used for `%s'"
***************
*** 2303,2327 ****
  msgstr "'@node' -- nomo ne devus enteni Â«,Â»: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1334
  #, 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:1381 tp/Texinfo/Parser.pm:2722
  #, 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:1495
  #, 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:1500
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "Dosiero Â«%sÂ» en komando '@image' ne legeblas: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1523
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
--- 2302,2326 ----
  msgstr "'@node' -- nomo ne devus enteni Â«,Â»: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1335
  #, 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:1382 tp/Texinfo/Parser.pm:2568
  #, 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:1496
  #, 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:1501
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "Dosiero Â«%sÂ» en komando '@image' ne legeblas: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1524
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
***************
*** 2329,2333 ****
  "ne eblas trovi dosieron Â«%s.txtÂ» en komando '@image' nek alternativan tekston"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1931
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
--- 2328,2332 ----
  "ne eblas trovi dosieron Â«%s.txtÂ» en komando '@image' nek alternativan tekston"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1932
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
***************
*** 2337,2487 ****
  "tion"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2161
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr "'@%s' -- referenca nomo ne devus enteni Â«:Â»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2193
  #, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "'@%s' -- nodnomo ne devus enteni Â«%sÂ»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2226
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr "'@%s' -- nodnomo ne devus enteni Â«:Â»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2272
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "Post '@xref' sekvendas Â«.Â» aÅ­ Â«,Â», ne Â«%sÂ»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2275
  msgid "`.' or `,' must follow @xref"
  msgstr "Post '@xref' sekvendas Â«.Â» aÅ­ Â«,Â»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3118
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr "nodnomo en menuero ne devus enteni Â«%sÂ»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3129
  msgid "menu entry node name should not contain `:'"
  msgstr "nodnomo en menuero ne devus enteni Â«:Â»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3145
  msgid "menu entry name should not contain `:'"
  msgstr "menuernomo ne devus enteni Â«:Â»"
  
! #: tp/Texinfo/Parser.pm:910
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr "@%s devus aperi nur je komenco aÅ­ fino de dokumento"
  
! #: tp/Texinfo/Parser.pm:1160 tp/Texinfo/Structuring.pm:594
  #, perl-format
  msgid "multiple @%s"
  msgstr "pluraj '@%s'"
  
! #: tp/Texinfo/Parser.pm:1194
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "misa sintakso por argumento de '@%s': %s"
! 
! #: tp/Texinfo/Parser.pm:1210
  #, perl-format
  msgid "bad or empty @%s formal argument: %s"
  msgstr "misa aÅ­ vaka formala argumento de '@%s': %s"
  
! #: tp/Texinfo/Parser.pm:1219 tp/Texinfo/Parser.pm:4856
! #: tp/Texinfo/Parser.pm:4882 tp/Texinfo/Parser.pm:5671
! #: tp/Texinfo/Parser.pm:5687 tp/Texinfo/Parser.pm:5702
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s bezonas nomon"
  
! #: tp/Texinfo/Parser.pm:1223 tp/Texinfo/Parser.pm:4859
! #: tp/Texinfo/Parser.pm:4885 tp/Texinfo/Parser.pm:5674
! #: tp/Texinfo/Parser.pm:5690 tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad name for @%s"
  msgstr "misa nomo por '@%s'"
  
! #: tp/Texinfo/Parser.pm:1341
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr "'@end %s' renkontiÄ�is antaÅ­ ferma '}' de '@%s'"
  
! #: tp/Texinfo/Parser.pm:1345
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "'@%s' renkontiÄ�is antaÅ­ ferma '}' de '@%s'"
  
! #: tp/Texinfo/Parser.pm:1350
  #, perl-format
! msgid "%c%s missing close brace"
  msgstr "%c%s sen â€œ}â€�"
  
! #: tp/Texinfo/Parser.pm:1354
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "Al @%s mankas ferma disigila sekvenco: %s}"
  
! #: tp/Texinfo/Parser.pm:1476
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "'@itemx' ne devus esti je komenco de '@%s'"
  
! #: tp/Texinfo/Parser.pm:1544
  msgid "@itemx must follow @item"
  msgstr "'@itemx' devas sekvi '@item'"
  
! #: tp/Texinfo/Parser.pm:1712
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr "'@%s' havas tekston sed neniun '@item'"
  
! #: tp/Texinfo/Parser.pm:1743
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "â€œ@endâ€� atendis â€œ%sâ€�, sed renkontis â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:1746
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "'@%s' renkontiÄ�is antaÅ­ '@end %s'"
  
! #: tp/Texinfo/Parser.pm:1750
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "mankas para '%cend %s'"
  
! #: tp/Texinfo/Parser.pm:1776 tp/Texinfo/Parser.pm:5204
! #: tp/Texinfo/Parser.pm:5470
  #, perl-format
  msgid "misplaced %c"
  msgstr "misloka %c"
  
! #: tp/Texinfo/Parser.pm:1874 tp/Texinfo/Parser.pm:3312
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "senpara '%c%s'"
  
! #: tp/Texinfo/Parser.pm:2110
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "makroo Â«%sÂ» havas troajn argumentojn"
  
! #: tp/Texinfo/Parser.pm:2132
  #, perl-format
! msgid "@%s missing close brace"
  msgstr "@%s sen â€œ}â€�"
  
! #: tp/Texinfo/Parser.pm:2140
  #, 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/Parser.pm:2175
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
--- 2336,2486 ----
  "tion"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2162
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr "'@%s' -- referenca nomo ne devus enteni Â«:Â»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2194
  #, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "'@%s' -- nodnomo ne devus enteni Â«%sÂ»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2227
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr "'@%s' -- nodnomo ne devus enteni Â«:Â»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2273
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "Post '@xref' sekvendas Â«.Â» aÅ­ Â«,Â», ne Â«%sÂ»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2276
  msgid "`.' or `,' must follow @xref"
  msgstr "Post '@xref' sekvendas Â«.Â» aÅ­ Â«,Â»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3086
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr "nodnomo en menuero ne devus enteni Â«%sÂ»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3097
  msgid "menu entry node name should not contain `:'"
  msgstr "nodnomo en menuero ne devus enteni Â«:Â»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3113
  msgid "menu entry name should not contain `:'"
  msgstr "menuernomo ne devus enteni Â«:Â»"
  
! #: tp/Texinfo/Parser.pm:883
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr "@%s devus aperi nur je komenco aÅ­ fino de dokumento"
  
! #: tp/Texinfo/Parser.pm:1125 tp/Texinfo/Structuring.pm:595
  #, perl-format
  msgid "multiple @%s"
  msgstr "pluraj '@%s'"
  
! #: tp/Texinfo/Parser.pm:1166
  #, perl-format
  msgid "bad or empty @%s formal argument: %s"
  msgstr "misa aÅ­ vaka formala argumento de '@%s': %s"
  
! #: tp/Texinfo/Parser.pm:1176
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "misa sintakso por argumento de '@%s': %s"
! 
! #: tp/Texinfo/Parser.pm:1183 tp/Texinfo/Parser.pm:4707
! #: tp/Texinfo/Parser.pm:4733 tp/Texinfo/Parser.pm:5565
! #: tp/Texinfo/Parser.pm:5578 tp/Texinfo/Parser.pm:5592
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s bezonas nomon"
  
! #: tp/Texinfo/Parser.pm:1187 tp/Texinfo/Parser.pm:4710
! #: tp/Texinfo/Parser.pm:4736 tp/Texinfo/Parser.pm:5568
! #: tp/Texinfo/Parser.pm:5581 tp/Texinfo/Parser.pm:5595
  #, perl-format
  msgid "bad name for @%s"
  msgstr "misa nomo por '@%s'"
  
! #: tp/Texinfo/Parser.pm:1305
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr "'@end %s' renkontiÄ�is antaÅ­ ferma '}' de '@%s'"
  
! #: tp/Texinfo/Parser.pm:1309
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "'@%s' renkontiÄ�is antaÅ­ ferma '}' de '@%s'"
  
! #: tp/Texinfo/Parser.pm:1314
  #, perl-format
! msgid "%c%s missing closing brace"
  msgstr "%c%s sen â€œ}â€�"
  
! #: tp/Texinfo/Parser.pm:1318
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "Al @%s mankas ferma disigila sekvenco: %s}"
  
! #: tp/Texinfo/Parser.pm:1440
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "'@itemx' ne devus esti je komenco de '@%s'"
  
! #: tp/Texinfo/Parser.pm:1508
  msgid "@itemx must follow @item"
  msgstr "'@itemx' devas sekvi '@item'"
  
! #: tp/Texinfo/Parser.pm:1676
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr "'@%s' havas tekston sed neniun '@item'"
  
! #: tp/Texinfo/Parser.pm:1707
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "â€œ@endâ€� atendis â€œ%sâ€�, sed renkontis â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:1710
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "'@%s' renkontiÄ�is antaÅ­ '@end %s'"
  
! #: tp/Texinfo/Parser.pm:1714
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "mankas para '%cend %s'"
  
! #: tp/Texinfo/Parser.pm:1738 tp/Texinfo/Parser.pm:5070
! #: tp/Texinfo/Parser.pm:5308
  #, perl-format
  msgid "misplaced %c"
  msgstr "misloka %c"
  
! #: tp/Texinfo/Parser.pm:1835 tp/Texinfo/Parser.pm:3148
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "senpara '%c%s'"
  
! #: tp/Texinfo/Parser.pm:2072
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "makroo Â«%sÂ» havas troajn argumentojn"
  
! #: tp/Texinfo/Parser.pm:2094
  #, perl-format
! msgid "@%s missing closing brace"
  msgstr "@%s sen â€œ}â€�"
  
! #: tp/Texinfo/Parser.pm:2102
  #, 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/Parser.pm:2138
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
***************
*** 2489,2538 ****
  "\\ en etendo de '@%s' sekvas post '%s' anstataÅ­ post nomo de parametro aÅ­ \\"
  
! #: tp/Texinfo/Parser.pm:2650
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s '%s' jam difiniÄ�is antaÅ­e"
  
! #: tp/Texinfo/Parser.pm:2655
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "Ä‰i tie estas la antaÅ­a difino kiel '@%s'"
  
! #: tp/Texinfo/Parser.pm:3016
  #, perl-format
  msgid "missing name for @%s"
  msgstr "mankas nomo por '@%s'"
  
! #: tp/Texinfo/Parser.pm:3021
  #, perl-format
  msgid "missing category for @%s"
  msgstr "mankas kategorio por '@%s'"
  
! #: tp/Texinfo/Parser.pm:3073
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "neatendita argumento sur '@%s'-linio: %s"
  
! #: tp/Texinfo/Parser.pm:3089
  msgid "empty multitable"
  msgstr "vaka plurtabelo"
  
! #: tp/Texinfo/Parser.pm:3145 tp/Texinfo/Parser.pm:5784
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "troa argumento por '@%s'"
  
! #: tp/Texinfo/Parser.pm:3151 tp/Texinfo/Parser.pm:5806
! #: tp/Texinfo/Parser.pm:5818
  #, perl-format
  msgid "bad argument to @%s"
  msgstr "misa argumento por '@%s'"
  
! #: tp/Texinfo/Parser.pm:3162
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s bezonas argumenton: la aranÄ�ilon por %citem"
  
! #: tp/Texinfo/Parser.pm:3167
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
--- 2488,2537 ----
  "\\ en etendo de '@%s' sekvas post '%s' anstataÅ­ post nomo de parametro aÅ­ \\"
  
! #: tp/Texinfo/Parser.pm:2501
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s '%s' jam difiniÄ�is antaÅ­e"
  
! #: tp/Texinfo/Parser.pm:2506
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "Ä‰i tie estas la antaÅ­a difino kiel '@%s'"
  
! #: tp/Texinfo/Parser.pm:2850
  #, perl-format
  msgid "missing name for @%s"
  msgstr "mankas nomo por '@%s'"
  
! #: tp/Texinfo/Parser.pm:2855
  #, perl-format
  msgid "missing category for @%s"
  msgstr "mankas kategorio por '@%s'"
  
! #: tp/Texinfo/Parser.pm:2890
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "neatendita argumento sur '@%s'-linio: %s"
  
! #: tp/Texinfo/Parser.pm:2905
  msgid "empty multitable"
  msgstr "vaka plurtabelo"
  
! #: tp/Texinfo/Parser.pm:2959 tp/Texinfo/Parser.pm:5673
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "troa argumento por '@%s'"
  
! #: tp/Texinfo/Parser.pm:2965 tp/Texinfo/Parser.pm:5694
! #: tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad argument to @%s"
  msgstr "misa argumento por '@%s'"
  
! #: tp/Texinfo/Parser.pm:2976
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s bezonas argumenton: la aranÄ�ilon por %citem"
  
! #: tp/Texinfo/Parser.pm:2981
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
***************
*** 2541,2657 ****
  "'@%s'"
  
! #: tp/Texinfo/Parser.pm:3202
  #, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "akcentkomando '@%s' ne permesatas kiel argumento de '@%s'"
  
! #: tp/Texinfo/Parser.pm:3290 tp/Texinfo/Parser.pm:3429
! #: tp/Texinfo/Parser.pm:5777
  #, perl-format
  msgid "@%s missing argument"
  msgstr "Al '@%s' mankas argumento"
  
! #: tp/Texinfo/Parser.pm:3302
  #, perl-format
  msgid "unknown @end %s"
  msgstr "nekonata '@end %s'"
  
! #: tp/Texinfo/Parser.pm:3324 tp/Texinfo/Parser.pm:3943
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "troa argumento por '@%s %s': %s"
  
! #: tp/Texinfo/Parser.pm:3329 tp/Texinfo/Parser.pm:5861
! #: tp/Texinfo/Parser.pm:5906 tp/Texinfo/Parser.pm:5935
! #: tp/Texinfo/Parser.pm:5976 tp/Texinfo/Parser.pm:6055
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "misa argumento por '@%s': %s"
  
! #: tp/Texinfo/Parser.pm:3348
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%s: ne eblas malfermi %s: %s"
  
! #: tp/Texinfo/Parser.pm:3360
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr "kodo Â«%sÂ» ne estas kanonika Texinfo-kodo"
  
! #: tp/Texinfo/Parser.pm:3369
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "nekonata nomo de kodosistemo: Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:3516
  #, perl-format
  msgid "@%s after the first element"
  msgstr "'@%s' post la unua elemento"
  
! #: tp/Texinfo/Parser.pm:3523
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "'@%s' nur sencas en '@multitable'-linio"
  
! #: tp/Texinfo/Parser.pm:3563
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "'@%s' ne devus esti rilatita al '@top'"
  
! #: tp/Texinfo/Parser.pm:3575
  #, 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/Parser.pm:3677
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "vaka argumento en '@%s'"
  
! #: tp/Texinfo/Parser.pm:3681
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "vaka nodnomo post etendo '%s'"
  
! #: tp/Texinfo/Parser.pm:3724
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "vaka menuernomo en '%s'"
  
! #: tp/Texinfo/Parser.pm:3732
  msgid "empty node name in menu entry"
  msgstr "vaka nodnomo en menuero"
  
! #: tp/Texinfo/Parser.pm:3805
  #, perl-format
  msgid "@%s should not appear in @%s"
! msgstr "'@%s' ne devus aperi en '@%s'"
  
! #: tp/Texinfo/Parser.pm:3937
  #, perl-format
! msgid "@end %s should only appear at a line beginning"
! msgstr "'@end %s' devus aperi nur je komenco de linio"
  
! #: tp/Texinfo/Parser.pm:3960
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "makroo Â«%sÂ» jam difiniÄ�is antaÅ­e"
  
! #: tp/Texinfo/Parser.pm:3963
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "Ä‰i tie estas la antaÅ­a difino de Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:3968
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "redifino de Texinfo-komando: @%s"
  
! #: tp/Texinfo/Parser.pm:4017
  #, perl-format
  msgid "@%s without associated character"
  msgstr "@%s sen rilatata signo"
  
! #: tp/Texinfo/Parser.pm:4087
  #, perl-format
  msgid ""
--- 2540,2657 ----
  "'@%s'"
  
! #: tp/Texinfo/Parser.pm:3016
  #, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "akcentkomando '@%s' ne permesatas kiel argumento de '@%s'"
  
! #: tp/Texinfo/Parser.pm:3124 tp/Texinfo/Parser.pm:3277
! #: tp/Texinfo/Parser.pm:5666
  #, perl-format
  msgid "@%s missing argument"
  msgstr "Al '@%s' mankas argumento"
  
! #: tp/Texinfo/Parser.pm:3138
  #, perl-format
  msgid "unknown @end %s"
  msgstr "nekonata '@end %s'"
  
! #: tp/Texinfo/Parser.pm:3161 tp/Texinfo/Parser.pm:3788
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "troa argumento por '@%s %s': %s"
  
! #: tp/Texinfo/Parser.pm:3167 tp/Texinfo/Parser.pm:3245
! #: tp/Texinfo/Parser.pm:5755 tp/Texinfo/Parser.pm:5798
! #: tp/Texinfo/Parser.pm:5827 tp/Texinfo/Parser.pm:5868
! #: tp/Texinfo/Parser.pm:5946
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "misa argumento por '@%s': %s"
  
! #: tp/Texinfo/Parser.pm:3188
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%s: ne eblas malfermi %s: %s"
  
! #: tp/Texinfo/Parser.pm:3200
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr "kodo Â«%sÂ» ne estas kanonika Texinfo-kodo"
  
! #: tp/Texinfo/Parser.pm:3208
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "nekonata nomo de kodosistemo: Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:3364
  #, perl-format
  msgid "@%s after the first element"
  msgstr "'@%s' post la unua elemento"
  
! #: tp/Texinfo/Parser.pm:3371
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "'@%s' nur sencas en '@multitable'-linio"
  
! #: tp/Texinfo/Parser.pm:3408
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "'@%s' ne devus esti rilatita al '@top'"
  
! #: tp/Texinfo/Parser.pm:3420
  #, 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/Parser.pm:3522
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "vaka argumento en '@%s'"
  
! #: tp/Texinfo/Parser.pm:3526
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "vaka nodnomo post etendo '%s'"
  
! #: tp/Texinfo/Parser.pm:3569
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "vaka menuernomo en '%s'"
  
! #: tp/Texinfo/Parser.pm:3577
  msgid "empty node name in menu entry"
  msgstr "vaka nodnomo en menuero"
  
! #: tp/Texinfo/Parser.pm:3650
  #, perl-format
  msgid "@%s should not appear in @%s"
! msgstr "@%s ne devus aperi en @%s"
  
! #: tp/Texinfo/Parser.pm:3782
  #, 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/Parser.pm:3804
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "makroo Â«%sÂ» jam difiniÄ�is antaÅ­e"
  
! #: tp/Texinfo/Parser.pm:3807
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "Ä‰i tie estas la antaÅ­a difino de Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:3812
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "redifino de Texinfo-komando: @%s"
  
! #: tp/Texinfo/Parser.pm:3879
  #, perl-format
  msgid "@%s without associated character"
  msgstr "@%s sen rilatata signo"
  
! #: tp/Texinfo/Parser.pm:3949
  #, perl-format
  msgid ""
***************
*** 2659,2663 ****
  msgstr "'@%s' kiu difiniÄ�is kun nula aÅ­ pluraj argumentoj alvokiÄ�endus kun {}"
  
! #: tp/Texinfo/Parser.pm:4111
  #, perl-format
  msgid ""
--- 2659,2663 ----
  msgstr "'@%s' kiu difiniÄ�is kun nula aÅ­ pluraj argumentoj alvokiÄ�endus kun {}"
  
! #: tp/Texinfo/Parser.pm:3974
  #, perl-format
  msgid ""
***************
*** 2668,2970 ****
  "valoro estas %d)"
  
! #: tp/Texinfo/Parser.pm:4120
  #, 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/Parser.pm:4176
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr "post akcentkomando '@%s' ne devus sekvi blankspaco"
  
! #: tp/Texinfo/Parser.pm:4182
  #, 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/Parser.pm:4195 tp/Texinfo/Parser.pm:5325
  #, 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/Parser.pm:4207
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr "post akcentkomando '@%s' ne devus sekvi linifino"
  
! #: tp/Texinfo/Parser.pm:4218
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s postulas vinkulojn {}"
  
! #: tp/Texinfo/Parser.pm:4383
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "Nedifinita flago: %s"
  
! #: tp/Texinfo/Parser.pm:4386
  msgid "bad syntax for @value"
  msgstr "misa sintakso por '@value'"
  
! #: tp/Texinfo/Parser.pm:4393
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s arkaikiÄ�is."
  
! #: tp/Texinfo/Parser.pm:4396
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s arkaikiÄ�is; %s"
  
! #: tp/Texinfo/Parser.pm:4405
  #, perl-format
! msgid "@%s should only appear at a line beginning"
  msgstr "@%s devus aperi nur je komenco de linio"
  
! #: tp/Texinfo/Parser.pm:4496
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s ne permesatas ene de bloko '@%s'"
  
! #: tp/Texinfo/Parser.pm:4505
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr "@%s devus aperi nur en Ä‰apo aÅ­ subumo"
  
! #: tp/Texinfo/Parser.pm:4631 tp/Texinfo/Parser.pm:4648
! #: tp/Texinfo/Parser.pm:4698
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s estas sensenca ene de bloko '@%s'"
  
! #: tp/Texinfo/Parser.pm:4658
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "@%s en vaka plurtabelo"
  
! #: tp/Texinfo/Parser.pm:4664
  msgid "@tab before @item"
  msgstr "'@tab' antaÅ­ '@item'"
  
! #: tp/Texinfo/Parser.pm:4667
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "tro da kolumnoj en elemento de plurtabelo (%d maksimume)"
  
! #: tp/Texinfo/Parser.pm:4704
  msgid "ignoring @tab outside of multitable"
  msgstr "ignoriÄ�as komando '@tab' ekster plurtabelo"
  
! #: tp/Texinfo/Parser.pm:4708
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "@%s ekster tabelo aÅ­ listo"
  
! #: tp/Texinfo/Parser.pm:4745
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "nur post '@%s' eblas uzi '@%s'"
  
! #: tp/Texinfo/Parser.pm:4787
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "@%s sensencas ekster blokoj '@titlepage' aÅ­ '@quotation'"
  
! #: tp/Texinfo/Parser.pm:4791
  msgid "@dircategory after first node"
  msgstr "'@dircategory' post la unua nodo"
  
! #: tp/Texinfo/Parser.pm:4979
  #, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "regiono %s ene de regiono %s malpermesatas"
  
! #: tp/Texinfo/Parser.pm:4997
  msgid "@direntry after first node"
  msgstr "'@direntry' post la unua nodo"
  
! #: tp/Texinfo/Parser.pm:5005
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "'@%s' renkontiÄ�is jam antaÅ­ la unua '@node'"
  
! #: tp/Texinfo/Parser.pm:5008
  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/Parser.pm:5070
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr "@%s devus aperi nur en matematika kunteksto"
  
! #: tp/Texinfo/Parser.pm:5078
  #, perl-format
  msgid "unknown command `%s'"
  msgstr "nekonata komando '%s'"
  
! #: tp/Texinfo/Parser.pm:5088
  msgid "unexpected @"
  msgstr "neatendita '@'"
  
! #: tp/Texinfo/Parser.pm:5117
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s sensencas ekster bloko '@float'"
  
! #: tp/Texinfo/Parser.pm:5122
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr "@%s devus esti tuj sub '@float'"
  
! #: tp/Texinfo/Parser.pm:5130
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "pluraj '@%s' ignoriÄ�as"
  
! #: tp/Texinfo/Parser.pm:5249
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "komando @%s ne toleras argumentojn"
  
! #: tp/Texinfo/Parser.pm:5273
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr "al komando '@%s' mankas nodo aÅ­ ekstera manlibra argumento"
  
! #: tp/Texinfo/Parser.pm:5292
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr "vaka referenca nomo en '@%s' post etendo '%s'"
  
! #: tp/Texinfo/Parser.pm:5303
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
  msgstr "vaka referenca titolo en '@%s' post etendo '%s'"
  
! #: tp/Texinfo/Parser.pm:5316
  msgid "@image missing filename argument"
  msgstr "mankas dosiera argumento en komando '@image'"
  
! #: tp/Texinfo/Parser.pm:5348
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "al '@%s' mankas unua argumento"
  
! #: tp/Texinfo/Parser.pm:5393
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "nedeksesumaj ciferoj en argumento por @U: %s"
  
! #: tp/Texinfo/Parser.pm:5399
  #, 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/Parser.pm:5412
! #, perl-format
! msgid "argument for @U exceeds size of integer: %s"
! msgstr "argumento por @U preterpasas grandon de entjero: %s"
! 
! #: tp/Texinfo/Parser.pm:5418
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr "argumento por @U preterpasas Unikodan maksimumon 0x10FFFF: %s"
  
! #: tp/Texinfo/Parser.pm:5546
  msgid "superfluous arguments for node"
  msgstr "troaj argumentoj por nodo"
  
! #: tp/Texinfo/Parser.pm:5596
  #, perl-format
  msgid "expected @end %s"
  msgstr "atendatas '@end %s'"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "@%s devas toleri nur @-komando kiel argumento, ne '%s'"
  
! #: tp/Texinfo/Parser.pm:5728
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "restanta argumento sur @%s-linio: %s"
  
! #: tp/Texinfo/Parser.pm:5801
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "media komando %s uziÄ�as kiel argumento de @%s"
  
! #: tp/Texinfo/Parser.pm:5823
  #, perl-format
  msgid "empty @%s"
  msgstr "vaka '@%s'"
  
! #: tp/Texinfo/Parser.pm:5831
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "kolumna frakcio ne estas nombro: %s"
  
! #: tp/Texinfo/Parser.pm:5840
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "argumento de @sp devas esti nombro, ne '%s'"
  
! #: tp/Texinfo/Parser.pm:5849
  #, perl-format
  msgid "reserved index name %s"
  msgstr "rezervita indeksnomo %s"
  
! #: tp/Texinfo/Parser.pm:5868
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "nekonata fontindekso en @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5871
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "nekonata celindekso en @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5901
  #, 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/Parser.pm:5914
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "nekonata indekso Â«%sÂ» en @printindex"
  
! #: tp/Texinfo/Parser.pm:5920
  #, 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/Parser.pm:5928
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "preskomando antaÅ­ komenco de dokumento: @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5944
  #, 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/Parser.pm:5952
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr "por '@%s' nur '10' aÅ­ '11' eblas, ne '%s'"
  
! #: tp/Texinfo/Parser.pm:5960
  #, 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/Parser.pm:5968
  #, 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/Parser.pm:5986 tp/Texinfo/Parser.pm:5991
  #, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
--- 2668,2965 ----
  "valoro estas %d)"
  
! #: tp/Texinfo/Parser.pm:3983
  #, 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/Parser.pm:4038
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr "post akcentkomando '@%s' ne devus sekvi blankspaco"
  
! #: tp/Texinfo/Parser.pm:4044
  #, 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/Parser.pm:4057 tp/Texinfo/Parser.pm:5189
  #, 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/Parser.pm:4068
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr "post akcentkomando '@%s' ne devus sekvi linifino"
  
! #: tp/Texinfo/Parser.pm:4079
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s postulas vinkulojn {}"
  
! #: tp/Texinfo/Parser.pm:4233
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "Nedifinita flago: %s"
  
! #: tp/Texinfo/Parser.pm:4236
  msgid "bad syntax for @value"
  msgstr "misa sintakso por '@value'"
  
! #: tp/Texinfo/Parser.pm:4243
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s arkaikiÄ�is."
  
! #: tp/Texinfo/Parser.pm:4246
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s arkaikiÄ�is; %s"
  
! #: tp/Texinfo/Parser.pm:4255
  #, perl-format
! msgid "@%s should only appear at the beginning of a line"
  msgstr "@%s devus aperi nur je komenco de linio"
  
! #: tp/Texinfo/Parser.pm:4346
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s ne permesatas ene de bloko '@%s'"
  
! #: tp/Texinfo/Parser.pm:4355
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr "@%s devus aperi nur en Ä‰apo aÅ­ subumo"
  
! #: tp/Texinfo/Parser.pm:4479 tp/Texinfo/Parser.pm:4496
! #: tp/Texinfo/Parser.pm:4546
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s estas sensenca ene de bloko '@%s'"
  
! #: tp/Texinfo/Parser.pm:4506
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "@%s en vaka plurtabelo"
  
! #: tp/Texinfo/Parser.pm:4512
  msgid "@tab before @item"
  msgstr "'@tab' antaÅ­ '@item'"
  
! #: tp/Texinfo/Parser.pm:4515
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "tro da kolumnoj en elemento de plurtabelo (%d maksimume)"
  
! #: tp/Texinfo/Parser.pm:4552
  msgid "ignoring @tab outside of multitable"
  msgstr "ignoriÄ�as komando '@tab' ekster plurtabelo"
  
! #: tp/Texinfo/Parser.pm:4556
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "@%s ekster tabelo aÅ­ listo"
  
! #: tp/Texinfo/Parser.pm:4596
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "nur post '@%s' eblas uzi '@%s'"
  
! #: tp/Texinfo/Parser.pm:4638
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "@%s sensencas ekster blokoj '@titlepage' aÅ­ '@quotation'"
  
! #: tp/Texinfo/Parser.pm:4642
  msgid "@dircategory after first node"
  msgstr "'@dircategory' post la unua nodo"
  
! #: tp/Texinfo/Parser.pm:4847
  #, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "regiono %s ene de regiono %s malpermesatas"
  
! #: tp/Texinfo/Parser.pm:4864
  msgid "@direntry after first node"
  msgstr "'@direntry' post la unua nodo"
  
! #: tp/Texinfo/Parser.pm:4872
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "'@%s' renkontiÄ�is jam antaÅ­ la unua '@node'"
  
! #: tp/Texinfo/Parser.pm:4875
  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/Parser.pm:4937
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr "@%s devus aperi nur en matematika kunteksto"
  
! #: tp/Texinfo/Parser.pm:4945
  #, perl-format
  msgid "unknown command `%s'"
  msgstr "nekonata komando '%s'"
  
! #: tp/Texinfo/Parser.pm:4955
  msgid "unexpected @"
  msgstr "neatendita '@'"
  
! #: tp/Texinfo/Parser.pm:4983
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s sensencas ekster bloko '@float'"
  
! #: tp/Texinfo/Parser.pm:4988
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr "@%s devus esti tuj sub '@float'"
  
! #: tp/Texinfo/Parser.pm:4996
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "pluraj '@%s' ignoriÄ�as"
  
! #: tp/Texinfo/Parser.pm:5114
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "komando @%s ne toleras argumentojn"
  
! #: tp/Texinfo/Parser.pm:5138
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr "al komando '@%s' mankas nodo aÅ­ ekstera manlibra argumento"
  
! #: tp/Texinfo/Parser.pm:5156
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr "vaka referenca nomo en '@%s' post etendo '%s'"
  
! #: tp/Texinfo/Parser.pm:5167
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
  msgstr "vaka referenca titolo en '@%s' post etendo '%s'"
  
! #: tp/Texinfo/Parser.pm:5180
  msgid "@image missing filename argument"
  msgstr "mankas dosiera argumento en komando '@image'"
  
! #: tp/Texinfo/Parser.pm:5211
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "al '@%s' mankas unua argumento"
  
! #: tp/Texinfo/Parser.pm:5230
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "nedeksesumaj ciferoj en argumento por @U: %s"
  
! #: tp/Texinfo/Parser.pm:5236
  #, 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/Parser.pm:5253
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr "argumento por @U preterpasas Unikodan maksimumon 0x10FFFF: %s"
  
! #: tp/Texinfo/Parser.pm:5448
  msgid "superfluous arguments for node"
  msgstr "troaj argumentoj por nodo"
  
! #: tp/Texinfo/Parser.pm:5498
  #, perl-format
  msgid "expected @end %s"
  msgstr "atendatas '@end %s'"
  
! #: tp/Texinfo/Parser.pm:5607
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "@%s devas toleri nur @-komando kiel argumento, ne '%s'"
  
! #: tp/Texinfo/Parser.pm:5617
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "restanta argumento sur @%s-linio: %s"
  
! #: tp/Texinfo/Parser.pm:5689
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "media komando %s uziÄ�as kiel argumento de @%s"
  
! #: tp/Texinfo/Parser.pm:5710
  #, perl-format
  msgid "empty @%s"
  msgstr "vaka '@%s'"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "kolumna frakcio ne estas nombro: %s"
  
! #: tp/Texinfo/Parser.pm:5727
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "argumento de @sp devas esti nombro, ne '%s'"
  
! #: tp/Texinfo/Parser.pm:5736
  #, perl-format
  msgid "reserved index name %s"
  msgstr "rezervita indeksnomo %s"
  
! #: tp/Texinfo/Parser.pm:5762
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "nekonata fontindekso en @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5765
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "nekonata celindekso en @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5793
  #, 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/Parser.pm:5806
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "nekonata indekso Â«%sÂ» en @printindex"
  
! #: tp/Texinfo/Parser.pm:5812
  #, 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/Parser.pm:5820
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "preskomando antaÅ­ komenco de dokumento: @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5836
  #, 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/Parser.pm:5844
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr "por '@%s' nur '10' aÅ­ '11' eblas, ne '%s'"
  
! #: tp/Texinfo/Parser.pm:5852
  #, 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/Parser.pm:5860
  #, 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/Parser.pm:5878 tp/Texinfo/Parser.pm:5883
  #, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
***************
*** 2973,2977 ****
  "'%s'"
  
! #: tp/Texinfo/Parser.pm:5999
  #, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
--- 2968,2972 ----
  "'%s'"
  
! #: tp/Texinfo/Parser.pm:5891
  #, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
***************
*** 2979,2993 ****
  "argumento de '@firstparagraphindent' devus esti 'none' aÅ­ 'insert', ne '%s'"
  
! #: tp/Texinfo/Parser.pm:6009
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
  msgstr "argumento de '@exampleindent' devus esti numera aÅ­ 'asis', ne '%s'"
  
! #: tp/Texinfo/Parser.pm:6021
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "post @%s devas sekvi 'on' aÅ­ 'off', ne '%s'"
  
! #: tp/Texinfo/Parser.pm:6031
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
--- 2974,2988 ----
  "argumento de '@firstparagraphindent' devus esti 'none' aÅ­ 'insert', ne '%s'"
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
  msgstr "argumento de '@exampleindent' devus esti numera aÅ­ 'asis', ne '%s'"
  
! #: tp/Texinfo/Parser.pm:5913
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "post @%s devas sekvi 'on' aÅ­ 'off', ne '%s'"
  
! #: tp/Texinfo/Parser.pm:5922
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
***************
*** 2995,3004 ****
  "argumento de '@kbdinputstyle' devus esti 'code'/'example'/'distinct', ne '%s'"
  
! #: tp/Texinfo/Parser.pm:6039
  #, 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/Parser.pm:6047
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
--- 2990,2999 ----
  "argumento de '@kbdinputstyle' devus esti 'code'/'example'/'distinct', ne '%s'"
  
! #: tp/Texinfo/Parser.pm:5930
  #, 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/Parser.pm:5938
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
***************
*** 3006,3020 ****
  "argumento de '@urefbreakstyle' devus esti 'after'/'before'/'none', ne '%s'"
  
! #: tp/Texinfo/Structuring.pm:213
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr "kreskigo de sekcia nivelo de '@%s', kiu tro malaltas"
  
! #: tp/Texinfo/Structuring.pm:245
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "neniu Ä‰apitronivela komando antaÅ­ '@%s'"
  
! #: tp/Texinfo/Structuring.pm:250
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
--- 3001,3015 ----
  "argumento de '@urefbreakstyle' devus esti 'after'/'before'/'none', ne '%s'"
  
! #: tp/Texinfo/Structuring.pm:216
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr "kreskigo de sekcia nivelo de '@%s', kiu tro malaltas"
  
! #: tp/Texinfo/Structuring.pm:248
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "neniu Ä‰apitronivela komando antaÅ­ '@%s'"
  
! #: tp/Texinfo/Structuring.pm:253
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
***************
*** 3022,3081 ****
  "malkreskigo de sekcia nivelo de '@%s', kiu aperas post pli malalta elemento"
  
! #: tp/Texinfo/Structuring.pm:339
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "neniu sekciada komando estas rilatata al '@%s'"
  
! #: tp/Texinfo/Structuring.pm:488
  #, perl-format
  msgid "@%s not empty"
  msgstr "@%s ne vakas"
  
! #: tp/Texinfo/Structuring.pm:544 tp/Texinfo/Structuring.pm:1326
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "@%s referenco al neekzistanta nodo Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:557
  #, perl-format
  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:662
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "nodo Â«%sÂ» ne estas referencita"
  
! #: tp/Texinfo/Structuring.pm:708
  #, 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:715
  #, 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:733
  #, 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:787
  #, 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:814
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%s referenco al neekzistanta Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:834
  #, 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:842
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
--- 3017,3076 ----
  "malkreskigo de sekcia nivelo de '@%s', kiu aperas post pli malalta elemento"
  
! #: tp/Texinfo/Structuring.pm:342
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "neniu sekciada komando estas rilatata al '@%s'"
  
! #: tp/Texinfo/Structuring.pm:491
  #, perl-format
  msgid "@%s not empty"
  msgstr "@%s ne vakas"
  
! #: tp/Texinfo/Structuring.pm:547 tp/Texinfo/Structuring.pm:1325
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "@%s referenco al neekzistanta nodo Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:558
  #, perl-format
  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:663
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "nodo Â«%sÂ» ne estas referencita"
  
! #: tp/Texinfo/Structuring.pm:706
  #, 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:713
  #, 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:731
  #, 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:786
  #, 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:810
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%s referenco al neekzistanta Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:829
  #, 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:837
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
***************
*** 3087,3091 ****
  msgstr "@%s al '%s', malsamas de %s-nomo '%s'"
  
! #: tp/Texinfo/Structuring.pm:2070
  #, perl-format
  msgid "empty index key in @%s"
--- 3082,3086 ----
  msgstr "@%s al '%s', malsamas de %s-nomo '%s'"
  
! #: tp/Texinfo/Structuring.pm:2067
  #, perl-format
  msgid "empty index key in @%s"
***************
*** 3609,3628 ****
  msgstr "Por pluaj detaloj tajpu â€œ%s --helpâ€�.\n"
  
! #: tp/texi2any.pl:1232
  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:1255
  #, 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:1261
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "ne eblas malfermi %s por skribi: %s\n"
  
! #: tp/texi2any.pl:1286
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
--- 3604,3623 ----
  msgstr "Por pluaj detaloj tajpu â€œ%s --helpâ€�.\n"
  
! #: tp/texi2any.pl:1239
  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:1262
  #, 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:1268
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "ne eblas malfermi %s por skribi: %s\n"
  
! #: tp/texi2any.pl:1293
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
***************
*** 3632,3650 ****
  "Neniu sekcio?"
  
! #: tp/texi2any.pl:1359 tp/texi2any.pl:1435
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%s: eraro dum fermo de %s: %s\n"
  
! #: tp/texi2any.pl:1382 tp/texi2any.pl:1416
  #, 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:1388 tp/texi2any.pl:1422
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
  msgstr "%s: ne eblas malfermi %s por skribi: %s\n"
  
  #~ msgid "--*** Tags out of Date ***"
  #~ msgstr "--*** Etikedoj malaktualiÄ�is ***"
--- 3627,3654 ----
  "Neniu sekcio?"
  
! #: tp/texi2any.pl:1366 tp/texi2any.pl:1442
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%s: eraro dum fermo de %s: %s\n"
  
! #: tp/texi2any.pl:1389 tp/texi2any.pl:1423
  #, 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:1395 tp/texi2any.pl:1429
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
  msgstr "%s: ne eblas malfermi %s por skribi: %s\n"
  
+ #~ msgid "-%s---Info: %s, %ld lines --%s--"
+ #~ msgstr "-%s---Info: %s, %ld linioj --%s--"
+ 
+ #~ msgid "-%s---Info: (%s)%s, %ld lines --%s--"
+ #~ msgstr "-%s---Info: (%s)%s, %ld linioj --%s--"
+ 
+ #~ msgid "No file given for node '%s'."
+ #~ msgstr "Neniu dosiero indikatas por nodo Â«%sÂ»."
+ 
  #~ msgid "--*** Tags out of Date ***"
  #~ msgstr "--*** Etikedoj malaktualiÄ�is ***"
***************
*** 3653,3656 ****
--- 3657,3663 ----
  #~ msgstr " Subdosiero: %s"
  
+ #~ msgid "argument for @U exceeds size of integer: %s"
+ #~ msgstr "argumento por @U preterpasas grandon de entjero: %s"
+ 
  #~ msgid "%s: unrecognized option `%s'\n"
  #~ msgstr "%s: nekonata opcio Â«--%sÂ»\n"
Binary files texinfo-6.1/po/es.gmo and texinfo-6.3/po/es.gmo differ
diff -Nrc2 texinfo-6.1/po/es.po texinfo-6.3/po/es.po
*** texinfo-6.1/po/es.po	2016-02-06 11:35:49.000000000 +0000
--- texinfo-6.3/po/es.po	2016-09-10 12:45:50.000000000 +0100
***************
*** 9,13 ****
  "Project-Id-Version: texinfo-6.0.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
  "PO-Revision-Date: 2015-12-31 00:48+0100\n"
  "Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
--- 9,13 ----
  "Project-Id-Version: texinfo-6.0.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:45+0100\n"
  "PO-Revision-Date: 2015-12-31 00:48+0100\n"
  "Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
***************
*** 17,20 ****
--- 17,21 ----
  "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: Lokalize 1.0\n"
***************
*** 114,118 ****
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [ or [^"
  msgstr "Desemparejado '[' o '[^'"
  
--- 115,120 ----
  
  #: gnulib/lib/regcomp.c:156
! #, fuzzy
! msgid "Unmatched [, [^, [:, [., or [="
  msgstr "Desemparejado '[' o '[^'"
  
***************
*** 153,157 ****
  msgstr "')' o '\\)' desemparejado"
  
! #: gnulib/lib/regcomp.c:711
  msgid "No previous regular expression"
  msgstr "No hay expresiÃ³n regular anterior"
--- 155,159 ----
  msgstr "')' o '\\)' desemparejado"
  
! #: gnulib/lib/regcomp.c:687
  msgid "No previous regular expression"
  msgstr "No hay expresiÃ³n regular anterior"
***************
*** 313,317 ****
  msgstr "---- Notas a pie de pÃ¡gina ----"
  
! #: info/indices.c:123 info/indices.c:812
  #, c-format
  msgid "Finding index entries..."
--- 315,319 ----
  msgstr "---- Notas a pie de pÃ¡gina ----"
  
! #: info/indices.c:123 info/indices.c:822
  #, c-format
  msgid "Finding index entries..."
***************
*** 322,326 ****
  msgstr "Buscar un texto en el Ã­ndice de este fichero"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:818
  #, c-format
  msgid "No indices found."
--- 324,328 ----
  msgstr "Buscar un texto en el Ã­ndice de este fichero"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:828
  #, c-format
  msgid "No indices found."
***************
*** 357,389 ****
  msgstr "No existen mÃ¡s entradas en el Ã­ndice que contengan '%s'."
  
! #: info/indices.c:476 info/indices.c:880
  #, c-format
  msgid "No index entries containing '%s'."
  msgstr "No existen entradas en el Ã­ndice que contengan '%s'."
  
! #: info/indices.c:583
  #, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "Buscando Ã­ndices de '%s'..."
  
! #: info/indices.c:636
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
  "Buscar un texto entre todos los ficheros Info disponibles y generar un menÃº"
  
! #: info/indices.c:644 info/indices.c:646
  msgid "Index apropos"
  msgstr "Ã�ndice de apropos"
  
! #: info/indices.c:688
  #, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Entradas en el Ã­ndice que contienen '%s':\n"
  
! #: info/indices.c:797
  msgid "List all matches of a string in the index"
  msgstr "Enumera todas las coincidencias de una cadena de texto en el Ã­ndice."
  
! #: info/indices.c:824 info/indices.c:826
  msgid "Index topic"
  msgstr "Tema del Ã­ndice"
--- 359,391 ----
  msgstr "No existen mÃ¡s entradas en el Ã­ndice que contengan '%s'."
  
! #: info/indices.c:476 info/indices.c:890
  #, c-format
  msgid "No index entries containing '%s'."
  msgstr "No existen entradas en el Ã­ndice que contengan '%s'."
  
! #: info/indices.c:586
  #, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "Buscando Ã­ndices de '%s'..."
  
! #: info/indices.c:646
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
  "Buscar un texto entre todos los ficheros Info disponibles y generar un menÃº"
  
! #: info/indices.c:654 info/indices.c:656
  msgid "Index apropos"
  msgstr "Ã�ndice de apropos"
  
! #: info/indices.c:698
  #, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Entradas en el Ã­ndice que contienen '%s':\n"
  
! #: info/indices.c:807
  msgid "List all matches of a string in the index"
  msgstr "Enumera todas las coincidencias de una cadena de texto en el Ã­ndice."
  
! #: info/indices.c:834 info/indices.c:836
  msgid "Index topic"
  msgstr "Tema del Ã­ndice"
***************
*** 394,448 ****
  msgstr "No existen ficheros Info que contengan la palabra '%s' en sus Ã­ndices."
  
! #: info/info-utils.c:892
  #, c-format
  msgid "Error converting file character encoding."
  msgstr "Error al convertir la codificaciÃ³n de caracteres del fichero."
  
! #: info/info.c:222 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "No existe ningÃºn elemento de menÃº llamado '%s' en el nodo '%s'."
  
! #: info/info.c:315
! #, c-format
! msgid "No file given for node '%s'."
! msgstr "No se ha especificado ningÃºn fichero para el nodo '%s'."
! 
! #: info/info.c:364 info/info.c:1133
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr "El nodo '%s' no se ha encontrado."
  
! #: info/info.c:386
  #, c-format
  msgid "No program name given."
  msgstr "No se ha especificado ningÃºn nombre de programa."
  
! #: info/info.c:577
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "nÃºmero no vÃ¡lido: %s\n"
  
! #: info/info.c:757
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "asignaciÃ³n de variable mal formada: %s"
  
! #: info/info.c:764 info/infokey.c:537
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: no hay tal variable"
  
! #: info/info.c:770 info/infokey.c:539
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "el valor %s no es vÃ¡lido para la variable %s"
  
! #: info/info.c:782
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "Pruebe la opciÃ³n `--help' para obtener mÃ¡s informaciÃ³n.\n"
  
! #: info/info.c:804 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
--- 396,445 ----
  msgstr "No existen ficheros Info que contengan la palabra '%s' en sus Ã­ndices."
  
! #: info/info-utils.c:879
  #, c-format
  msgid "Error converting file character encoding."
  msgstr "Error al convertir la codificaciÃ³n de caracteres del fichero."
  
! #: info/info.c:279 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "No existe ningÃºn elemento de menÃº llamado '%s' en el nodo '%s'."
  
! #: info/info.c:416 info/info.c:1148
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr "El nodo '%s' no se ha encontrado."
  
! #: info/info.c:438
  #, c-format
  msgid "No program name given."
  msgstr "No se ha especificado ningÃºn nombre de programa."
  
! #: info/info.c:636
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "nÃºmero no vÃ¡lido: %s\n"
  
! #: info/info.c:816
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "asignaciÃ³n de variable mal formada: %s"
  
! #: info/info.c:823 info/infokey.c:540
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: no hay tal variable"
  
! #: info/info.c:829 info/infokey.c:542
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "el valor %s no es vÃ¡lido para la variable %s"
  
! #: info/info.c:841
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "Pruebe la opciÃ³n `--help' para obtener mÃ¡s informaciÃ³n.\n"
  
! #: info/info.c:860 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
***************
*** 459,463 ****
  "Dicho software es provisto SIN GARANTÃ�A, hasta donde permite la ley.\n"
  
! #: info/info.c:981
  #, c-format
  msgid "no index entries found for '%s'\n"
--- 456,460 ----
  "Dicho software es provisto SIN GARANTÃ�A, hasta donde permite la ley.\n"
  
! #: info/info.c:999
  #, c-format
  msgid "no index entries found for '%s'\n"
***************
*** 465,469 ****
  "No se encontraron entradas de Ã­ndice que concuerden con la palabra '%s'\n"
  
! #: info/info.c:1034
  #, c-format
  msgid ""
--- 462,466 ----
  "No se encontraron entradas de Ã­ndice que concuerden con la palabra '%s'\n"
  
! #: info/info.c:1049
  #, c-format
  msgid ""
***************
*** 476,480 ****
  "Muestra documentaciÃ³n escrita en formato Info.\n"
  
! #: info/info.c:1040
  msgid ""
  "Options:\n"
--- 473,477 ----
  "Muestra documentaciÃ³n escrita en formato Info.\n"
  
! #: info/info.c:1055
  msgid ""
  "Options:\n"
***************
*** 495,499 ****
  "  -f, --file=FICHERO           el FICHERO Info que visitar."
  
! #: info/info.c:1048
  msgid ""
  "  -h, --help                   display this help and exit.\n"
--- 492,496 ----
  "  -f, --file=FICHERO           el FICHERO Info que visitar."
  
! #: info/info.c:1063
  msgid ""
  "  -h, --help                   display this help and exit.\n"
***************
*** 509,513 ****
  "FICHERO."
  
! #: info/info.c:1054
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
--- 506,510 ----
  "FICHERO."
  
! #: info/info.c:1069
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
***************
*** 527,531 ****
  "                                 fichero Info en cuestiÃ³n se refiere."
  
! #: info/info.c:1061
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr ""
--- 524,528 ----
  "                                 fichero Info en cuestiÃ³n se refiere."
  
! #: info/info.c:1076
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr ""
***************
*** 536,540 ****
  
  # TODO infinitivos en mensajes de ayuda -> 3Âª persona presente indicativo
! #: info/info.c:1065
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
--- 533,537 ----
  
  # TODO infinitivos en mensajes de ayuda -> 3Âª persona presente indicativo
! #: info/info.c:1080
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
***************
*** 561,565 ****
  "                                 todos).\n"
  
! #: info/info.c:1074
  msgid ""
  "\n"
--- 558,562 ----
  "                                 todos).\n"
  
! #: info/info.c:1089
  msgid ""
  "\n"
***************
*** 581,585 ****
  "como nombres de elementos del menÃº con respecto al nodo inicial visitado."
  
! #: info/info.c:1081
  msgid ""
  "\n"
--- 578,582 ----
  "como nombres de elementos del menÃº con respecto al nodo inicial visitado."
  
! #: info/info.c:1096
  msgid ""
  "\n"
***************
*** 589,593 ****
  "Para un resumen de las combinaciones de teclas, teclee 'H' dentro de 'Info'."
  
! #: info/info.c:1084
  msgid ""
  "\n"
--- 586,590 ----
  "Para un resumen de las combinaciones de teclas, teclee 'H' dentro de 'Info'."
  
! #: info/info.c:1099
  msgid ""
  "\n"
***************
*** 623,627 ****
  "                               el directorio"
  
! #: info/info.c:1099 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
--- 620,624 ----
  "                               el directorio"
  
! #: info/info.c:1114 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
***************
*** 635,674 ****
  "El sitio web de Texinfo es: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1134
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "El nodo '(%s)%s' no se ha encontrado."
  
! #: info/info.c:1135
  msgid "Cannot find a window!"
  msgstr "Â¡No se ha podido encontrar una ventana!"
  
  # TODO review point=cursor
! #: info/info.c:1136
  msgid "Point doesn't appear within this window's node!"
  msgstr "Â¡El cursor no parece estar sobre nodo alguno en esta ventana!"
  
! #: info/info.c:1137
  msgid "Cannot delete the last window."
  msgstr "No se puede eliminar la Ãºltima ventana."
  
! #: info/info.c:1138
  msgid "No menu in this node."
  msgstr "No existe un menÃº en este nodo."
  
! #: info/info.c:1139
  msgid "No footnotes in this node."
  msgstr "No hay notas de pie de pÃ¡gina en este nodo."
  
! #: info/info.c:1140
  msgid "No cross references in this node."
  msgstr "No hay referencias cruzadas en este nodo."
  
! #: info/info.c:1141
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Este nodo no contiene enlace alguno a '%s'."
  
! #: info/info.c:1142
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
--- 632,671 ----
  "El sitio web de Texinfo es: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1149
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "El nodo '(%s)%s' no se ha encontrado."
  
! #: info/info.c:1150
  msgid "Cannot find a window!"
  msgstr "Â¡No se ha podido encontrar una ventana!"
  
  # TODO review point=cursor
! #: info/info.c:1151
  msgid "Point doesn't appear within this window's node!"
  msgstr "Â¡El cursor no parece estar sobre nodo alguno en esta ventana!"
  
! #: info/info.c:1152
  msgid "Cannot delete the last window."
  msgstr "No se puede eliminar la Ãºltima ventana."
  
! #: info/info.c:1153
  msgid "No menu in this node."
  msgstr "No existe un menÃº en este nodo."
  
! #: info/info.c:1154
  msgid "No footnotes in this node."
  msgstr "No hay notas de pie de pÃ¡gina en este nodo."
  
! #: info/info.c:1155
  msgid "No cross references in this node."
  msgstr "No hay referencias cruzadas en este nodo."
  
! #: info/info.c:1156
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Este nodo no contiene enlace alguno a '%s'."
  
! #: info/info.c:1157
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
***************
*** 676,701 ****
  "'%c' no es una orden de Info conocida; pruebe con '?' para obtener ayuda."
  
! #: info/info.c:1143
  #, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "El tipo de terminal '%s' es incapaz de ejecutar Info."
  
! #: info/info.c:1144
  msgid "You are already at the last page of this node."
  msgstr "Usted ya se encuentra en la Ãºltima pÃ¡gina de este nodo."
  
! #: info/info.c:1145
  msgid "You are already at the first page of this node."
  msgstr "Usted ya se encuentra en la primera pÃ¡gina de este nodo."
  
! #: info/info.c:1146
  msgid "Only one window."
  msgstr "Una Ãºnica ventana."
  
! #: info/info.c:1147
  msgid "Resulting window would be too small."
  msgstr "La ventana resultante serÃ­a demasiado pequeÃ±a."
  
! #: info/info.c:1148
  msgid "Not enough room for a help window, please delete a window."
  msgstr ""
--- 673,698 ----
  "'%c' no es una orden de Info conocida; pruebe con '?' para obtener ayuda."
  
! #: info/info.c:1158
  #, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "El tipo de terminal '%s' es incapaz de ejecutar Info."
  
! #: info/info.c:1159
  msgid "You are already at the last page of this node."
  msgstr "Usted ya se encuentra en la Ãºltima pÃ¡gina de este nodo."
  
! #: info/info.c:1160
  msgid "You are already at the first page of this node."
  msgstr "Usted ya se encuentra en la primera pÃ¡gina de este nodo."
  
! #: info/info.c:1161
  msgid "Only one window."
  msgstr "Una Ãºnica ventana."
  
! #: info/info.c:1162
  msgid "Resulting window would be too small."
  msgstr "La ventana resultante serÃ­a demasiado pequeÃ±a."
  
! #: info/info.c:1163
  msgid "Not enough room for a help window, please delete a window."
  msgstr ""
***************
*** 977,996 ****
  msgstr "acciÃ³n desconocida '%s'"
  
! #: info/infokey.c:482
  #, c-format
  msgid "action name too long"
  msgstr "nombre de acciÃ³n demasiado largo"
  
! #: info/infokey.c:495
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "caracteres extra tras nombre de acciÃ³n '%s'"
  
! #: info/infokey.c:506
  #, c-format
  msgid "missing variable name"
  msgstr "nombre de variable ausente"
  
! #: info/infokey.c:515
  #, c-format
  msgid "missing `=' immediately after variable name"
--- 974,993 ----
  msgstr "acciÃ³n desconocida '%s'"
  
! #: info/infokey.c:485
  #, c-format
  msgid "action name too long"
  msgstr "nombre de acciÃ³n demasiado largo"
  
! #: info/infokey.c:498
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "caracteres extra tras nombre de acciÃ³n '%s'"
  
! #: info/infokey.c:509
  #, c-format
  msgid "missing variable name"
  msgstr "nombre de variable ausente"
  
! #: info/infokey.c:518
  #, c-format
  msgid "missing `=' immediately after variable name"
***************
*** 998,1012 ****
  "ausencia del carÃ¡cter `=' inmediatamente despuÃ©s del nombre de la variable"
  
! #: info/infokey.c:522
  #, c-format
  msgid "variable name too long"
  msgstr "nombre de variable demasiado largo"
  
! #: info/infokey.c:546
  #, c-format
  msgid "value too long"
  msgstr "valor demasiado largo"
  
! #: info/infokey.c:592
  #, c-format
  msgid "\"%s\", line %u: "
--- 995,1009 ----
  "ausencia del carÃ¡cter `=' inmediatamente despuÃ©s del nombre de la variable"
  
! #: info/infokey.c:525
  #, c-format
  msgid "variable name too long"
  msgstr "nombre de variable demasiado largo"
  
! #: info/infokey.c:549
  #, c-format
  msgid "value too long"
  msgstr "valor demasiado largo"
  
! #: info/infokey.c:595
  #, c-format
  msgid "\"%s\", line %u: "
***************
*** 1343,1347 ****
  msgstr "No se encontrÃ³ ningÃºn nodo referenciado por '%s' en '%s'."
  
! #: info/session.c:2864
  msgid "Read a list of menus starting from dir and follow them"
  msgstr ""
--- 1340,1344 ----
  msgstr "No se encontrÃ³ ningÃºn nodo referenciado por '%s' en '%s'."
  
! #: info/session.c:2870
  msgid "Read a list of menus starting from dir and follow them"
  msgstr ""
***************
*** 1349,1663 ****
  "seguirla"
  
! #: info/session.c:2866
  msgid "Follow menus: "
  msgstr "Seguir los menÃºs: "
  
! #: info/session.c:2971
  msgid "Select the Next node"
  msgstr "Seleccionar el nodo siguiente"
  
! #: info/session.c:2978
  msgid "Select the Prev node"
  msgstr "Seleccionar el nodo anterior"
  
! #: info/session.c:2985
  msgid "Select the Up node"
  msgstr "Seleccionar el nodo superior"
  
! #: info/session.c:2991
  msgid "Select the last node in this file"
  msgstr "Seleccionar el Ãºltimo nodo en este fichero"
  
! #: info/session.c:3018 info/session.c:3051
  msgid "This window has no additional nodes"
  msgstr "Esta ventana no dispone de nodos adicionales"
  
! #: info/session.c:3024
  msgid "Select the first node in this file"
  msgstr "Seleccionar el primer nodo de este fichero"
  
! #: info/session.c:3158
  msgid "No more nodes within this document."
  msgstr "No hay mÃ¡s nodos en este documento."
  
! #: info/session.c:3203 info/session.c:3243
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "Este nodo no tiene 'Anterior' ni 'Superior' en este documento."
  
! #: info/session.c:3256
  msgid "Move forwards or down through node structure"
  msgstr "Moverse hacia adelante o abajo a travÃ©s de la estructura de nodos"
  
! #: info/session.c:3273
  msgid "Move backwards or up through node structure"
  msgstr "Moverse hacia atrÃ¡s o arriba a travÃ©s de la estructura de nodos"
  
! #: info/session.c:3296
  msgid "Read a node name and select it"
  msgstr "Leer un nombre de nodo y seleccionarlo"
  
! #: info/session.c:3350 info/session.c:3354
  msgid "Goto node: "
  msgstr "Ir al nodo: "
  
! #: info/session.c:3533
  msgid "Find the node describing program invocation"
  msgstr "Encontrar el nodo que describe la invocaciÃ³n del programa en cuestiÃ³n"
  
! #: info/session.c:3535
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Encontrar nodo de invocaciÃ³n de [%s]: "
  
! #: info/session.c:3580
  msgid "Read a manpage reference and select it"
  msgstr "Leer una referencia a pÃ¡ginas del manual y seleccionarla"
  
! #: info/session.c:3584
  msgid "Get Manpage: "
  msgstr "PÃ¡gina de manual a buscar: "
  
! #: info/session.c:3605
  msgid "Select the node 'Top' in this file"
  msgstr "Seleccionar el nodo 'Top' de este fichero"
  
! #: info/session.c:3611
  msgid "Select the node '(dir)'"
  msgstr "Seleccionar el nodo '(dir)'"
  
! #: info/session.c:3617
  msgid "Show full file name of node being displayed"
  msgstr ""
  "Mostrar el nombre de fichero completo del nodo que se estÃ¡ visualizando"
  
! #: info/session.c:3634
  msgid "Select the most recently selected node"
  msgstr "Seleccionar el nodo usado mÃ¡s recientemente"
  
! #: info/session.c:3639
  #, c-format
  msgid "No earlier node in history"
  msgstr "No hay nodos anteriores en la historia"
  
! #: info/session.c:3643
  msgid "Read the name of a file and select it"
  msgstr "Leer el nombre de un fichero y seleccionarlo"
  
! #: info/session.c:3647
  msgid "Find file: "
  msgstr "Fichero a buscar: "
  
! #: info/session.c:3664
  #, c-format
  msgid "Cannot find '%s'."
  msgstr "No se encontrÃ³ '%s'."
  
! #: info/session.c:3713
  #, c-format
  msgid "Could not create output file '%s'."
  msgstr "No se pudo crear el fichero '%s'."
  
! #: info/session.c:3727
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "error mientras se escribÃ­a al fichero '%s': %s"
  
! #: info/session.c:3736
  #, c-format
  msgid "closing %s"
  msgstr "cerrando %s"
  
! #: info/session.c:3785
  #, c-format
  msgid "writing node %s..."
  msgstr "escribiendo nodo %s..."
  
! #: info/session.c:3831
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr ""
  "Volcar (vÃ­a Â«pipeÂ») el contenido de este nodo a travÃ©s de INFO_PRINT_COMMAND"
  
! #: info/session.c:3859
  #, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "No se pudo volcar sobre '%s'."
  
! #: info/session.c:3864
  #, c-format
  msgid "printing node %s..."
  msgstr "imprimiendo elnodo %s..."
  
! #: info/session.c:3872
  #, c-format
  msgid "finished printing node %s"
  msgstr "se terminÃ³ de imprimir el nodo %s..."
  
! #: info/session.c:3904
  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."
  
! #: info/session.c:4169
  msgid "Search continued from the end of the document."
  msgstr "La bÃºsqueda continuÃ³ desde el final del documento."
  
! #: info/session.c:4174
  msgid "Search continued from the beginning of the document."
  msgstr "La bÃºsqueda continuÃ³ desde el principio del documento."
  
! #: info/session.c:4194
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "Buscando sub-fichero %s ..."
  
! #: info/session.c:4231
  msgid "Search failed."
  msgstr "La bÃºsqueda finalizÃ³ sin resultados."
  
! #: info/session.c:4248
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Regexp search"
  msgstr "Buscar (exp.reg.)"
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Search"
  msgstr "Buscar"
  
! #: info/session.c:4250 info/session.c:4256
  msgid " case-sensitively"
  msgstr " distinguiendo mayÃºs./minÃºs."
  
! #: info/session.c:4251 info/session.c:4257
  msgid " backward"
  msgstr " hacia atrÃ¡s"
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s: "
  
! #: info/session.c:4274
  msgid "Search string too short"
  msgstr "El texto de bÃºsqueda es demasiado corto."
  
  # TODO review
! #: info/session.c:4467
  #, c-format
  msgid "Going back to last match from %s"
  msgstr "Vuelta atrÃ¡s hasta la Ãºltima coincidencia desde %s"
  
! #: info/session.c:4491 info/session.c:4601
  #, c-format
  msgid "No more matches."
  msgstr "No hay mÃ¡s coincidencias"
  
! #: info/session.c:4628
  msgid "Search this node and subnodes for a string."
  msgstr "Buscar cadena en este nodo y sus subnodos."
  
! #: info/session.c:4649
  msgid "Go to next match in Info sub-tree"
  msgstr "Ir a la siguiente coincidencia en el subÃ¡rbol de Info"
  
! #: info/session.c:4653 info/session.c:4665
  #, c-format
  msgid "No active search"
  msgstr "Ninguna bÃºsqueda activa"
  
! #: info/session.c:4661
  msgid "Go to previous match in Info sub-tree"
  msgstr "Ir a la coincidencia anterior en el subÃ¡rbol de Info"
  
! #: info/session.c:4674
  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:4679
  msgid "Read a string and search for it"
  msgstr "Leer una cadena de texto y buscarla"
  
! #: info/session.c:4685
  msgid "Read a string and search backward for it"
  msgstr "Leer una cadena de texto y buscarla hacia atrÃ¡s"
  
! #: info/session.c:4693
  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:4701 info/session.c:4746
  msgid "No previous search string"
  msgstr "No existe constancia de bÃºsqueda anterior"
  
! #: info/session.c:4738
  msgid "Repeat last search in the reverse direction"
  msgstr "Repetir la Ãºltima bÃºsqueda en direcciÃ³n contraria"
  
! #: info/session.c:4785
  msgid "Clear displayed search matches"
  msgstr "Borra las coincidencias de bÃºsqueda visualizadas"
  
! #: info/session.c:4802 info/session.c:4808
  msgid "Search interactively for a string as you type it"
  msgstr "Buscar de forma interactiva un texto segÃºn se escribe"
  
! #: info/session.c:4928
  msgid "Regexp I-search backward: "
  msgstr "BÃºsqueda interactiva hacia atrÃ¡s (exp.reg.): "
  
! #: info/session.c:4929
  msgid "I-search backward: "
  msgstr "BÃºsqueda interactiva hacia atrÃ¡s: "
  
! #: info/session.c:4931
  msgid "Regexp I-search: "
  msgstr "BÃºsqueda interactiva (exp.reg.): "
  
! #: info/session.c:4932
  msgid "I-search: "
  msgstr "BÃºsqueda interactiva: "
  
! #: info/session.c:4957 info/session.c:4960
  msgid "Failing "
  msgstr "FallÃ³ "
  
! #: info/session.c:5326
  msgid "Cancel current operation"
  msgstr "Cancelar la operaciÃ³n en curso"
  
! #: info/session.c:5333
  msgid "Quit"
  msgstr "Cancelado"
  
! #: info/session.c:5338
  msgid "Display version of Info being run"
  msgstr "Mostrar la versiÃ³n de Info que se estÃ¡ ejecutando"
  
! #: info/session.c:5340
  #, c-format
  msgid "GNU Info version %s"
  msgstr "VersiÃ³n de GNU Info %s"
  
! #: info/session.c:5345
  msgid "Redraw the display"
  msgstr "Redibujar los contenidos de la pantalla"
  
! #: info/session.c:5382
  msgid "Quit using Info"
  msgstr "Salir de Info"
  
! #: info/session.c:5398
  msgid "Run command bound to this key's lowercase variant"
  msgstr ""
--- 1346,1660 ----
  "seguirla"
  
! #: info/session.c:2872
  msgid "Follow menus: "
  msgstr "Seguir los menÃºs: "
  
! #: info/session.c:2977
  msgid "Select the Next node"
  msgstr "Seleccionar el nodo siguiente"
  
! #: info/session.c:2984
  msgid "Select the Prev node"
  msgstr "Seleccionar el nodo anterior"
  
! #: info/session.c:2991
  msgid "Select the Up node"
  msgstr "Seleccionar el nodo superior"
  
! #: info/session.c:2997
  msgid "Select the last node in this file"
  msgstr "Seleccionar el Ãºltimo nodo en este fichero"
  
! #: info/session.c:3024 info/session.c:3057
  msgid "This window has no additional nodes"
  msgstr "Esta ventana no dispone de nodos adicionales"
  
! #: info/session.c:3030
  msgid "Select the first node in this file"
  msgstr "Seleccionar el primer nodo de este fichero"
  
! #: info/session.c:3164
  msgid "No more nodes within this document."
  msgstr "No hay mÃ¡s nodos en este documento."
  
! #: info/session.c:3209 info/session.c:3249
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "Este nodo no tiene 'Anterior' ni 'Superior' en este documento."
  
! #: info/session.c:3262
  msgid "Move forwards or down through node structure"
  msgstr "Moverse hacia adelante o abajo a travÃ©s de la estructura de nodos"
  
! #: info/session.c:3279
  msgid "Move backwards or up through node structure"
  msgstr "Moverse hacia atrÃ¡s o arriba a travÃ©s de la estructura de nodos"
  
! #: info/session.c:3302
  msgid "Read a node name and select it"
  msgstr "Leer un nombre de nodo y seleccionarlo"
  
! #: info/session.c:3356 info/session.c:3360
  msgid "Goto node: "
  msgstr "Ir al nodo: "
  
! #: info/session.c:3539
  msgid "Find the node describing program invocation"
  msgstr "Encontrar el nodo que describe la invocaciÃ³n del programa en cuestiÃ³n"
  
! #: info/session.c:3541
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Encontrar nodo de invocaciÃ³n de [%s]: "
  
! #: info/session.c:3586
  msgid "Read a manpage reference and select it"
  msgstr "Leer una referencia a pÃ¡ginas del manual y seleccionarla"
  
! #: info/session.c:3590
  msgid "Get Manpage: "
  msgstr "PÃ¡gina de manual a buscar: "
  
! #: info/session.c:3611
  msgid "Select the node 'Top' in this file"
  msgstr "Seleccionar el nodo 'Top' de este fichero"
  
! #: info/session.c:3617
  msgid "Select the node '(dir)'"
  msgstr "Seleccionar el nodo '(dir)'"
  
! #: info/session.c:3623
  msgid "Show full file name of node being displayed"
  msgstr ""
  "Mostrar el nombre de fichero completo del nodo que se estÃ¡ visualizando"
  
! #: info/session.c:3640
  msgid "Select the most recently selected node"
  msgstr "Seleccionar el nodo usado mÃ¡s recientemente"
  
! #: info/session.c:3645
  #, c-format
  msgid "No earlier node in history"
  msgstr "No hay nodos anteriores en la historia"
  
! #: info/session.c:3649
  msgid "Read the name of a file and select it"
  msgstr "Leer el nombre de un fichero y seleccionarlo"
  
! #: info/session.c:3653
  msgid "Find file: "
  msgstr "Fichero a buscar: "
  
! #: info/session.c:3670
  #, c-format
  msgid "Cannot find '%s'."
  msgstr "No se encontrÃ³ '%s'."
  
! #: info/session.c:3719
  #, c-format
  msgid "Could not create output file '%s'."
  msgstr "No se pudo crear el fichero '%s'."
  
! #: info/session.c:3733
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "error mientras se escribÃ­a al fichero '%s': %s"
  
! #: info/session.c:3742
  #, c-format
  msgid "closing %s"
  msgstr "cerrando %s"
  
! #: info/session.c:3791
  #, c-format
  msgid "writing node %s..."
  msgstr "escribiendo nodo %s..."
  
! #: info/session.c:3837
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr ""
  "Volcar (vÃ­a Â«pipeÂ») el contenido de este nodo a travÃ©s de INFO_PRINT_COMMAND"
  
! #: info/session.c:3865
  #, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "No se pudo volcar sobre '%s'."
  
! #: info/session.c:3870
  #, c-format
  msgid "printing node %s..."
  msgstr "imprimiendo elnodo %s..."
  
! #: info/session.c:3878
  #, c-format
  msgid "finished printing node %s"
  msgstr "se terminÃ³ de imprimir el nodo %s..."
  
! #: info/session.c:3910
  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:3914
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr "Usando expresiones regulares en las bÃºsquedas."
  
! #: info/session.c:3915
  #, c-format
  msgid "Using literal strings for searches."
  msgstr "Usando texto literal en las bÃºsquedas."
  
! #: info/session.c:4175
  msgid "Search continued from the end of the document."
  msgstr "La bÃºsqueda continuÃ³ desde el final del documento."
  
! #: info/session.c:4180
  msgid "Search continued from the beginning of the document."
  msgstr "La bÃºsqueda continuÃ³ desde el principio del documento."
  
! #: info/session.c:4200
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "Buscando sub-fichero %s ..."
  
! #: info/session.c:4237
  msgid "Search failed."
  msgstr "La bÃºsqueda finalizÃ³ sin resultados."
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Regexp search"
  msgstr "Buscar (exp.reg.)"
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Search"
  msgstr "Buscar"
  
! #: info/session.c:4256 info/session.c:4262
  msgid " case-sensitively"
  msgstr " distinguiendo mayÃºs./minÃºs."
  
! #: info/session.c:4257 info/session.c:4263
  msgid " backward"
  msgstr " hacia atrÃ¡s"
  
! #: info/session.c:4260
  #, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s: "
  
! #: info/session.c:4280
  msgid "Search string too short"
  msgstr "El texto de bÃºsqueda es demasiado corto."
  
  # TODO review
! #: info/session.c:4473
  #, c-format
  msgid "Going back to last match from %s"
  msgstr "Vuelta atrÃ¡s hasta la Ãºltima coincidencia desde %s"
  
! #: info/session.c:4497 info/session.c:4607
  #, c-format
  msgid "No more matches."
  msgstr "No hay mÃ¡s coincidencias"
  
! #: info/session.c:4634
  msgid "Search this node and subnodes for a string."
  msgstr "Buscar cadena en este nodo y sus subnodos."
  
! #: info/session.c:4655
  msgid "Go to next match in Info sub-tree"
  msgstr "Ir a la siguiente coincidencia en el subÃ¡rbol de Info"
  
! #: info/session.c:4659 info/session.c:4671
  #, c-format
  msgid "No active search"
  msgstr "Ninguna bÃºsqueda activa"
  
! #: info/session.c:4667
  msgid "Go to previous match in Info sub-tree"
  msgstr "Ir a la coincidencia anterior en el subÃ¡rbol de Info"
  
! #: info/session.c:4680
  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:4685
  msgid "Read a string and search for it"
  msgstr "Leer una cadena de texto y buscarla"
  
! #: info/session.c:4691
  msgid "Read a string and search backward for it"
  msgstr "Leer una cadena de texto y buscarla hacia atrÃ¡s"
  
! #: info/session.c:4699
  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:4707 info/session.c:4752
  msgid "No previous search string"
  msgstr "No existe constancia de bÃºsqueda anterior"
  
! #: info/session.c:4744
  msgid "Repeat last search in the reverse direction"
  msgstr "Repetir la Ãºltima bÃºsqueda en direcciÃ³n contraria"
  
! #: info/session.c:4791
  msgid "Clear displayed search matches"
  msgstr "Borra las coincidencias de bÃºsqueda visualizadas"
  
! #: info/session.c:4808 info/session.c:4814
  msgid "Search interactively for a string as you type it"
  msgstr "Buscar de forma interactiva un texto segÃºn se escribe"
  
! #: info/session.c:4934
  msgid "Regexp I-search backward: "
  msgstr "BÃºsqueda interactiva hacia atrÃ¡s (exp.reg.): "
  
! #: info/session.c:4935
  msgid "I-search backward: "
  msgstr "BÃºsqueda interactiva hacia atrÃ¡s: "
  
! #: info/session.c:4937
  msgid "Regexp I-search: "
  msgstr "BÃºsqueda interactiva (exp.reg.): "
  
! #: info/session.c:4938
  msgid "I-search: "
  msgstr "BÃºsqueda interactiva: "
  
! #: info/session.c:4963 info/session.c:4966
  msgid "Failing "
  msgstr "FallÃ³ "
  
! #: info/session.c:5332
  msgid "Cancel current operation"
  msgstr "Cancelar la operaciÃ³n en curso"
  
! #: info/session.c:5339
  msgid "Quit"
  msgstr "Cancelado"
  
! #: info/session.c:5344
  msgid "Display version of Info being run"
  msgstr "Mostrar la versiÃ³n de Info que se estÃ¡ ejecutando"
  
! #: info/session.c:5346
  #, c-format
  msgid "GNU Info version %s"
  msgstr "VersiÃ³n de GNU Info %s"
  
! #: info/session.c:5351
  msgid "Redraw the display"
  msgstr "Redibujar los contenidos de la pantalla"
  
! #: info/session.c:5388
  msgid "Quit using Info"
  msgstr "Salir de Info"
  
! #: info/session.c:5404
  msgid "Run command bound to this key's lowercase variant"
  msgstr ""
***************
*** 1665,1688 ****
  "combinaciÃ³n de teclas"
  
! #: info/session.c:5409
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Orden desconocida (%s)."
  
! #: info/session.c:5412
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\" no es vÃ¡lida"
  
! #: info/session.c:5413
  #, c-format
  msgid "'%s' is invalid"
  msgstr "'%s' no es vÃ¡lida"
  
! #: info/session.c:5731
  msgid "Add this digit to the current numeric argument"
  msgstr "Sumar este dÃ­gito al argumento numÃ©rico actual"
  
! #: info/session.c:5738
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "Comenzar (o multiplicar por 4) el argumento numÃ©rico actual"
--- 1662,1685 ----
  "combinaciÃ³n de teclas"
  
! #: info/session.c:5415
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Orden desconocida (%s)."
  
! #: info/session.c:5418
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\" no es vÃ¡lida"
  
! #: info/session.c:5419
  #, c-format
  msgid "'%s' is invalid"
  msgstr "'%s' no es vÃ¡lida"
  
! #: info/session.c:5737
  msgid "Add this digit to the current numeric argument"
  msgstr "Sumar este dÃ­gito al argumento numÃ©rico actual"
  
! #: info/session.c:5744
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "Comenzar (o multiplicar por 4) el argumento numÃ©rico actual"
***************
*** 1837,1854 ****
  msgstr "Dar a %s el valor (%s): "
  
! #: info/window.c:959
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), lÃ­neas ----, "
  
- #: info/window.c:966
- #, c-format
- msgid "-%s---Info: %s, %ld lines --%s--"
- msgstr "-%s---Info: %s, %ld lÃ­neas --%s--"
- 
- #: info/window.c:970
- #, c-format
- msgid "-%s---Info: (%s)%s, %ld lines --%s--"
- msgstr "-%s---Info: (%s)%s, %ld lÃ­neas --%s--"
- 
  #: install-info/install-info.c:292
  #, c-format
--- 1834,1841 ----
  msgstr "Dar a %s el valor (%s): "
  
! #: info/window.c:909
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), lÃ­neas ----, "
  
  #: install-info/install-info.c:292
  #, c-format
***************
*** 2054,2058 ****
  
  #: install-info/install-info.c:642
! #, c-format
  msgid ""
  "This is the file .../info/dir, which contains the\n"
--- 2041,2045 ----
  
  #: install-info/install-info.c:642
! #, fuzzy, c-format
  msgid ""
  "This is the file .../info/dir, which contains the\n"
***************
*** 2063,2067 ****
  "\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"
--- 2050,2054 ----
  "\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"
***************
*** 2166,2283 ****
  msgstr "No se encontraron entradas para '%s'; no se borrarÃ¡ nada"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:855
! #: tp/Texinfo/Convert/Converter.pm:893 tp/Texinfo/Convert/Converter.pm:1204
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6504
! #: tp/Texinfo/Convert/HTML.pm:6528 tp/Texinfo/Convert/HTML.pm:6905
! #: tp/Texinfo/Convert/HTML.pm:6963 tp/Texinfo/Convert/HTML.pm:7041
! #: tp/Texinfo/Convert/HTML.pm:7118 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:546
! #: tp/Texinfo/Convert/TexinfoXML.pm:457
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "no se pudo abrir %s para escribir: %s"
  
! #: tp/Texinfo/Common.pm:881
  msgid "recursion is always allowed"
  msgstr "la recursividad estÃ¡ siempre permitida"
  
! #: tp/Texinfo/Common.pm:882
  msgid "arguments are quoted by default"
  msgstr "los argumentos son entrecomillados por defecto"
  
! #: tp/Texinfo/Common.pm:1105
  #, 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:1110
  #, 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:1128
  #, 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:1151
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "no se pudo leer %s: %s"
  
! #: tp/Texinfo/Common.pm:1170
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "error cerrando el fichero @verbatiminclude %s: %s"
  
! #: tp/Texinfo/Common.pm:1176 tp/Texinfo/Parser.pm:3353
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%s: no se pudo encontrar %s"
  
! #: tp/Texinfo/Common.pm:1520
! #, 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/Common.pm:1548
! msgid "missing type"
! msgstr "tipo ausente"
! 
! #: tp/Texinfo/Common.pm:1551
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "tipo desconocido: %s"
! 
! #: tp/Texinfo/Common.pm:1568
! #, 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/Common.pm:1603
  msgid "no node to be renamed"
  msgstr "ningÃºn nodo que renombrar"
  
! #: tp/Texinfo/Common.pm:1614
  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:1624 tp/Texinfo/Parser.pm:926
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "no se pudo abrir %s: %s"
  
! #: tp/Texinfo/Common.pm:2144
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr "no se ha podido proteger el carÃ¡cter almohadilla en @%s"
  
! #: tp/Texinfo/Convert/Converter.pm:395 tp/Texinfo/Convert/Converter.pm:414
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Variable obsoleta %s\n"
  
! #: tp/Texinfo/Convert/Converter.pm:794
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr "%s: salida incompatible con divisiÃ³n"
  
! #: tp/Texinfo/Convert/Converter.pm:876 tp/Texinfo/Convert/Converter.pm:909
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:6931
! #: tp/Texinfo/Convert/HTML.pm:6989 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:476 tp/Texinfo/Parser.pm:2035
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "error cerrando %s: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, 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:995
  #, perl-format
  msgid "could not create directory `%s': %s"
--- 2153,2261 ----
  msgstr "No se encontraron entradas para '%s'; no se borrarÃ¡ nada"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:847
! #: tp/Texinfo/Convert/Converter.pm:885 tp/Texinfo/Convert/Converter.pm:1196
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6573
! #: tp/Texinfo/Convert/HTML.pm:6597 tp/Texinfo/Convert/HTML.pm:6978
! #: tp/Texinfo/Convert/HTML.pm:7037 tp/Texinfo/Convert/HTML.pm:7115
! #: tp/Texinfo/Convert/HTML.pm:7192 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:547
! #: tp/Texinfo/Convert/TexinfoXML.pm:458
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "no se pudo abrir %s para escribir: %s"
  
! #: tp/Texinfo/Common.pm:862
  msgid "recursion is always allowed"
  msgstr "la recursividad estÃ¡ siempre permitida"
  
! #: tp/Texinfo/Common.pm:863
  msgid "arguments are quoted by default"
  msgstr "los argumentos son entrecomillados por defecto"
  
! #: tp/Texinfo/Common.pm:866
! msgid ""
! "move your @contents command if you want the contents after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:869
! msgid ""
! "move your @shortcontents and @contents commands if you want the contents "
! "after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:1093
  #, 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:1098
  #, 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:1116
  #, 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:1139
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "no se pudo leer %s: %s"
  
! #: tp/Texinfo/Common.pm:1158
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "error cerrando el fichero @verbatiminclude %s: %s"
  
! #: tp/Texinfo/Common.pm:1164 tp/Texinfo/Parser.pm:3193
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%s: no se pudo encontrar %s"
  
! #: tp/Texinfo/Common.pm:1637
  msgid "no node to be renamed"
  msgstr "ningÃºn nodo que renombrar"
  
! #: tp/Texinfo/Common.pm:1648
  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:1658 tp/Texinfo/Parser.pm:899
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "no se pudo abrir %s: %s"
  
! #: tp/Texinfo/Common.pm:2178
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr "no se ha podido proteger el carÃ¡cter almohadilla en @%s"
  
! #: tp/Texinfo/Convert/Converter.pm:387 tp/Texinfo/Convert/Converter.pm:406
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Variable obsoleta %s\n"
  
! #: tp/Texinfo/Convert/Converter.pm:786
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr "%s: salida incompatible con divisiÃ³n"
  
! #: tp/Texinfo/Convert/Converter.pm:868 tp/Texinfo/Convert/Converter.pm:901
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:7004
! #: tp/Texinfo/Convert/HTML.pm:7063 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:477 tp/Texinfo/Parser.pm:1996
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "error cerrando %s: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:979
  #, 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:987
  #, perl-format
  msgid "could not create directory `%s': %s"
***************
*** 2289,2297 ****
  msgstr "El fichero @image '%s' no se ha encontrado; se utilizarÃ¡ '%s'"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5388
  msgid "no argument specified for @U"
  msgstr "no se ha especificado argumento alguno para @U"
  
! #: tp/Texinfo/Convert/HTML.pm:1683
  #, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
--- 2267,2275 ----
  msgstr "El fichero @image '%s' no se ha encontrado; se utilizarÃ¡ '%s'"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5225
  msgid "no argument specified for @U"
  msgstr "no se ha especificado argumento alguno para @U"
  
! #: tp/Texinfo/Convert/HTML.pm:1715
  #, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
***************
*** 2299,2389 ****
  "El fichero @image '%s' (para HTML) no se ha encontrado; se utilizarÃ¡ '%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:2371
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "el formato en bruto %s no se ha convertido"
  
! #: tp/Texinfo/Convert/HTML.pm:4888
  msgid "string not closed in css file"
  msgstr "cadena de texto sin cerrar en el fichero css"
  
! #: tp/Texinfo/Convert/HTML.pm:4890
  msgid "--css-include ended in comment"
  msgstr "'--css-include' finaliza con un comentario"
  
! #: tp/Texinfo/Convert/HTML.pm:4892
  msgid "@import not finished in css file"
  msgstr "@import no finalizado en el fichero css"
  
! #: tp/Texinfo/Convert/HTML.pm:4918
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "No se ha encontrado el fichero CSS %s"
  
! #: tp/Texinfo/Convert/HTML.pm:4924
  #, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "no se pudo abrir '--include-file' %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:4934
  #, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "error cerrando el fichero CSS '%s': %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5801 tp/Texinfo/Convert/HTML.pm:5805
  #, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "no se encontraron entradas htmlxref.cnf para `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:6499
  #, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "error al cerrar el fichero marco %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6523
  #, 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:6638
  #, 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:6839
  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:7048
  #, 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:7073
  #, 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:7079
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "fichero vacÃ­o para el nodo renombrado '%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:7093
  #, 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:7125
  #, 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:7163
  msgid "empty node name"
  msgstr "nombre de nodo vacÃ­o"
  
! #: tp/Texinfo/Convert/HTML.pm:7165 tp/Texinfo/Parser.pm:3697
  #, perl-format
  msgid "syntax for an external node used for `%s'"
--- 2277,2387 ----
  "El fichero @image '%s' (para HTML) no se ha encontrado; se utilizarÃ¡ '%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:2399
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "el formato en bruto %s no se ha convertido"
  
! #: tp/Texinfo/Convert/HTML.pm:4629
! #, 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:4657
! msgid "missing type"
! msgstr "tipo ausente"
! 
! #: tp/Texinfo/Convert/HTML.pm:4660
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "tipo desconocido: %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4677
! #, 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:4962
  msgid "string not closed in css file"
  msgstr "cadena de texto sin cerrar en el fichero css"
  
! #: tp/Texinfo/Convert/HTML.pm:4964
  msgid "--css-include ended in comment"
  msgstr "'--css-include' finaliza con un comentario"
  
! #: tp/Texinfo/Convert/HTML.pm:4966
  msgid "@import not finished in css file"
  msgstr "@import no finalizado en el fichero css"
  
! #: tp/Texinfo/Convert/HTML.pm:4992
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "No se ha encontrado el fichero CSS %s"
  
! #: tp/Texinfo/Convert/HTML.pm:4998
  #, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "no se pudo abrir '--include-file' %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5008
  #, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "error cerrando el fichero CSS '%s': %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5870 tp/Texinfo/Convert/HTML.pm:5874
  #, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "no se encontraron entradas htmlxref.cnf para `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:6568
  #, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "error al cerrar el fichero marco %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6592
  #, 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:6707
  #, 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:6912
  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:7122
  #, 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:7147
  #, 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:7153
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "fichero vacÃ­o para el nodo renombrado '%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:7167
  #, 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:7199
  #, 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:7237
  msgid "empty node name"
  msgstr "nombre de nodo vacÃ­o"
  
! #: tp/Texinfo/Convert/HTML.pm:7239 tp/Texinfo/Parser.pm:3542
  #, perl-format
  msgid "syntax for an external node used for `%s'"
***************
*** 2418,2427 ****
  msgstr "el nombre de @node no puede contener `,': %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1334
  #, 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:1381 tp/Texinfo/Parser.pm:2722
  #, perl-format
  msgid "entry for index `%s' outside of any node"
--- 2416,2425 ----
  msgstr "el nombre de @node no puede contener `,': %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1335
  #, 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:1382 tp/Texinfo/Parser.pm:2568
  #, perl-format
  msgid "entry for index `%s' outside of any node"
***************
*** 2429,2443 ****
  
  # Â TODO ASK
! #: tp/Texinfo/Convert/Plaintext.pm:1495
  #, 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:1500
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "El fichero de imagen '%s' no es accesible: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1523
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
--- 2427,2441 ----
  
  # Â TODO ASK
! #: tp/Texinfo/Convert/Plaintext.pm:1496
  #, 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:1501
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "El fichero de imagen '%s' no es accesible: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1524
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
***************
*** 2446,2450 ****
  "alternativo"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1931
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
--- 2444,2448 ----
  "alternativo"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1932
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
***************
*** 2454,2558 ****
  "reescrÃ­balo para que esto no ocurra"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2161
  #, 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:2193
  #, 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:2226
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr "el nombre de un nodo @%s no puede contener `:'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2272
  #, 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:2275
  msgid "`.' or `,' must follow @xref"
  msgstr "`.' o `,' tiene que ir precedido de @xref"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3118
  #, 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:3129
  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:3145
  msgid "menu entry name should not contain `:'"
  msgstr "el nombre de una entrada de menÃº no debe contener ':'"
  
! #: tp/Texinfo/Parser.pm:910
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr "@%s solo puede aparecer al principio o al final del documento"
  
! #: tp/Texinfo/Parser.pm:1160 tp/Texinfo/Structuring.pm:594
  #, perl-format
  msgid "multiple @%s"
  msgstr "@%s mÃºltiple"
  
! #: tp/Texinfo/Parser.pm:1194
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "sintaxis del argumento @%s incorrecta: %s"
! 
! #: tp/Texinfo/Parser.pm:1210
  #, perl-format
  msgid "bad or empty @%s formal argument: %s"
  msgstr "argumento formal @%s incorrecto o vacÃ­o: %s"
  
! #: tp/Texinfo/Parser.pm:1219 tp/Texinfo/Parser.pm:4856
! #: tp/Texinfo/Parser.pm:4882 tp/Texinfo/Parser.pm:5671
! #: tp/Texinfo/Parser.pm:5687 tp/Texinfo/Parser.pm:5702
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "la construcciÃ³n `%c%s' requiere un nombre"
  
! #: tp/Texinfo/Parser.pm:1223 tp/Texinfo/Parser.pm:4859
! #: tp/Texinfo/Parser.pm:4885 tp/Texinfo/Parser.pm:5674
! #: tp/Texinfo/Parser.pm:5690 tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad name for @%s"
  msgstr "nombre inaceptable para @%s"
  
! #: tp/Texinfo/Parser.pm:1341
  #, 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/Parser.pm:1345
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "hay un @%s antes de la llave de cierre de @%s"
  
! #: tp/Texinfo/Parser.pm:1350
! #, perl-format
! msgid "%c%s missing close brace"
  msgstr "%c%s se esperaba leer `}'"
  
! #: tp/Texinfo/Parser.pm:1354
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "@%s sin secuencia delimitadora de cierre: %s}"
  
! #: tp/Texinfo/Parser.pm:1476
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "@itemx no debe comenzar @%s"
  
! #: tp/Texinfo/Parser.pm:1544
  msgid "@itemx must follow @item"
  msgstr "@itemx tiene que estar despuÃ©s de @item"
  
! #: tp/Texinfo/Parser.pm:1712
  #, perl-format
  msgid "@%s has text but no @item"
--- 2452,2556 ----
  "reescrÃ­balo para que esto no ocurra"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2162
  #, 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:2194
  #, 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:2227
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr "el nombre de un nodo @%s no puede contener `:'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2273
  #, 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:2276
  msgid "`.' or `,' must follow @xref"
  msgstr "`.' o `,' tiene que ir precedido de @xref"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3086
  #, 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:3097
  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:3113
  msgid "menu entry name should not contain `:'"
  msgstr "el nombre de una entrada de menÃº no debe contener ':'"
  
! #: tp/Texinfo/Parser.pm:883
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr "@%s solo puede aparecer al principio o al final del documento"
  
! #: tp/Texinfo/Parser.pm:1125 tp/Texinfo/Structuring.pm:595
  #, perl-format
  msgid "multiple @%s"
  msgstr "@%s mÃºltiple"
  
! #: tp/Texinfo/Parser.pm:1166
  #, perl-format
  msgid "bad or empty @%s formal argument: %s"
  msgstr "argumento formal @%s incorrecto o vacÃ­o: %s"
  
! #: tp/Texinfo/Parser.pm:1176
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "sintaxis del argumento @%s incorrecta: %s"
! 
! #: tp/Texinfo/Parser.pm:1183 tp/Texinfo/Parser.pm:4707
! #: tp/Texinfo/Parser.pm:4733 tp/Texinfo/Parser.pm:5565
! #: tp/Texinfo/Parser.pm:5578 tp/Texinfo/Parser.pm:5592
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "la construcciÃ³n `%c%s' requiere un nombre"
  
! #: tp/Texinfo/Parser.pm:1187 tp/Texinfo/Parser.pm:4710
! #: tp/Texinfo/Parser.pm:4736 tp/Texinfo/Parser.pm:5568
! #: tp/Texinfo/Parser.pm:5581 tp/Texinfo/Parser.pm:5595
  #, perl-format
  msgid "bad name for @%s"
  msgstr "nombre inaceptable para @%s"
  
! #: tp/Texinfo/Parser.pm:1305
  #, 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/Parser.pm:1309
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "hay un @%s antes de la llave de cierre de @%s"
  
! #: tp/Texinfo/Parser.pm:1314
! #, fuzzy, perl-format
! msgid "%c%s missing closing brace"
  msgstr "%c%s se esperaba leer `}'"
  
! #: tp/Texinfo/Parser.pm:1318
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "@%s sin secuencia delimitadora de cierre: %s}"
  
! #: tp/Texinfo/Parser.pm:1440
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "@itemx no debe comenzar @%s"
  
! #: tp/Texinfo/Parser.pm:1508
  msgid "@itemx must follow @item"
  msgstr "@itemx tiene que estar despuÃ©s de @item"
  
! #: tp/Texinfo/Parser.pm:1676
  #, perl-format
  msgid "@%s has text but no @item"
***************
*** 2560,2600 ****
  
  # TODO review
! #: tp/Texinfo/Parser.pm:1743
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "Se esperaba ver `@end' '%s', pero se ha leÃ­do '%s'"
  
! #: tp/Texinfo/Parser.pm:1746
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@%s aparece antes de @end %s"
  
! #: tp/Texinfo/Parser.pm:1750
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "no hay un '%cend %s' correspondiente"
  
! #: tp/Texinfo/Parser.pm:1776 tp/Texinfo/Parser.pm:5204
! #: tp/Texinfo/Parser.pm:5470
  #, perl-format
  msgid "misplaced %c"
  msgstr "carÃ¡cter `%c' fuera de lugar"
  
! #: tp/Texinfo/Parser.pm:1874 tp/Texinfo/Parser.pm:3312
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "`%c%s' desemparejado"
  
! #: tp/Texinfo/Parser.pm:2110
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "La llamada a la macro '%s' contiene demasiados argumentos"
  
! #: tp/Texinfo/Parser.pm:2132
! #, perl-format
! msgid "@%s missing close brace"
  msgstr "@%s se esperaba leer `}'"
  
! #: tp/Texinfo/Parser.pm:2140
  #, perl-format
  msgid "macro `%s' declared without argument called with an argument"
--- 2558,2598 ----
  
  # TODO review
! #: tp/Texinfo/Parser.pm:1707
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "Se esperaba ver `@end' '%s', pero se ha leÃ­do '%s'"
  
! #: tp/Texinfo/Parser.pm:1710
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@%s aparece antes de @end %s"
  
! #: tp/Texinfo/Parser.pm:1714
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "no hay un '%cend %s' correspondiente"
  
! #: tp/Texinfo/Parser.pm:1738 tp/Texinfo/Parser.pm:5070
! #: tp/Texinfo/Parser.pm:5308
  #, perl-format
  msgid "misplaced %c"
  msgstr "carÃ¡cter `%c' fuera de lugar"
  
! #: tp/Texinfo/Parser.pm:1835 tp/Texinfo/Parser.pm:3148
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "`%c%s' desemparejado"
  
! #: tp/Texinfo/Parser.pm:2072
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "La llamada a la macro '%s' contiene demasiados argumentos"
  
! #: tp/Texinfo/Parser.pm:2094
! #, fuzzy, perl-format
! msgid "@%s missing closing brace"
  msgstr "@%s se esperaba leer `}'"
  
! #: tp/Texinfo/Parser.pm:2102
  #, perl-format
  msgid "macro `%s' declared without argument called with an argument"
***************
*** 2602,2606 ****
  "La llamada a la macro '%s', declarada sin argumentos, contiene un argumento"
  
! #: tp/Texinfo/Parser.pm:2175
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
--- 2600,2604 ----
  "La llamada a la macro '%s', declarada sin argumentos, contiene un argumento"
  
! #: tp/Texinfo/Parser.pm:2138
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
***************
*** 2608,2627 ****
  "se leyÃ³ \\, al expandir @%s, tras '%s' en vez de un nombre de parÃ¡metro o \\"
  
! #: tp/Texinfo/Parser.pm:2650
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s '%s' ya ha sido definido anteriormente"
  
! #: tp/Texinfo/Parser.pm:2655
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "la definiciÃ³n previa de `@%s' se encuentra aquÃ­"
  
! #: tp/Texinfo/Parser.pm:3016
  #, perl-format
  msgid "missing name for @%s"
  msgstr "falta un nombre para @%s"
  
! #: tp/Texinfo/Parser.pm:3021
  #, perl-format
  msgid "missing category for @%s"
--- 2606,2625 ----
  "se leyÃ³ \\, al expandir @%s, tras '%s' en vez de un nombre de parÃ¡metro o \\"
  
! #: tp/Texinfo/Parser.pm:2501
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s '%s' ya ha sido definido anteriormente"
  
! #: tp/Texinfo/Parser.pm:2506
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "la definiciÃ³n previa de `@%s' se encuentra aquÃ­"
  
! #: tp/Texinfo/Parser.pm:2850
  #, perl-format
  msgid "missing name for @%s"
  msgstr "falta un nombre para @%s"
  
! #: tp/Texinfo/Parser.pm:2855
  #, perl-format
  msgid "missing category for @%s"
***************
*** 2629,2658 ****
  
  # TODO review
! #: tp/Texinfo/Parser.pm:3073
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "argumento errÃ³neo en una lÃ­nea @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3089
  msgid "empty multitable"
  msgstr "multi-tabla vacÃ­a"
  
! #: tp/Texinfo/Parser.pm:3145 tp/Texinfo/Parser.pm:5784
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "argumento superfluo para @%s"
  
! #: tp/Texinfo/Parser.pm:3151 tp/Texinfo/Parser.pm:5806
! #: tp/Texinfo/Parser.pm:5818
  #, perl-format
  msgid "bad argument to @%s"
  msgstr "argumento errÃ³neo para @%s"
  
! #: tp/Texinfo/Parser.pm:3162
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "`%s' requiere un argumento: el procesador de formato para %citem"
  
! #: tp/Texinfo/Parser.pm:3167
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
--- 2627,2656 ----
  
  # TODO review
! #: tp/Texinfo/Parser.pm:2890
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "argumento errÃ³neo en una lÃ­nea @%s: %s"
  
! #: tp/Texinfo/Parser.pm:2905
  msgid "empty multitable"
  msgstr "multi-tabla vacÃ­a"
  
! #: tp/Texinfo/Parser.pm:2959 tp/Texinfo/Parser.pm:5673
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "argumento superfluo para @%s"
  
! #: tp/Texinfo/Parser.pm:2965 tp/Texinfo/Parser.pm:5694
! #: tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad argument to @%s"
  msgstr "argumento errÃ³neo para @%s"
  
! #: tp/Texinfo/Parser.pm:2976
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "`%s' requiere un argumento: el procesador de formato para %citem"
  
! #: tp/Texinfo/Parser.pm:2981
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
***************
*** 2661,2723 ****
  "lÃ­nea @%s"
  
! #: tp/Texinfo/Parser.pm:3202
  #, 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/Parser.pm:3290 tp/Texinfo/Parser.pm:3429
! #: tp/Texinfo/Parser.pm:5777
  #, perl-format
  msgid "@%s missing argument"
  msgstr "a @%s le falta argumento"
  
! #: tp/Texinfo/Parser.pm:3302
  #, perl-format
  msgid "unknown @end %s"
  msgstr "@end %s desconocido"
  
! #: tp/Texinfo/Parser.pm:3324 tp/Texinfo/Parser.pm:3943
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "argumento superfluo para @%s %s: %s"
  
! #: tp/Texinfo/Parser.pm:3329 tp/Texinfo/Parser.pm:5861
! #: tp/Texinfo/Parser.pm:5906 tp/Texinfo/Parser.pm:5935
! #: tp/Texinfo/Parser.pm:5976 tp/Texinfo/Parser.pm:6055
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "argumento errÃ³neo para @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3348
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%s: no se pudo abrir %s: %s"
  
! #: tp/Texinfo/Parser.pm:3360
  #, 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/Parser.pm:3369
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "`%s' no se corresponde con ningÃºn tipo de codificaciÃ³n conocido"
  
! #: tp/Texinfo/Parser.pm:3516
  #, perl-format
  msgid "@%s after the first element"
  msgstr "@%s despuÃ©s del primer elemento"
  
! #: tp/Texinfo/Parser.pm:3523
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s carece de sentido fuera de una lÃ­nea @multitable"
  
! #: tp/Texinfo/Parser.pm:3563
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "@%s no debe estar asociado con @top"
  
! #: tp/Texinfo/Parser.pm:3575
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
--- 2659,2722 ----
  "lÃ­nea @%s"
  
! #: tp/Texinfo/Parser.pm:3016
  #, 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/Parser.pm:3124 tp/Texinfo/Parser.pm:3277
! #: tp/Texinfo/Parser.pm:5666
  #, perl-format
  msgid "@%s missing argument"
  msgstr "a @%s le falta argumento"
  
! #: tp/Texinfo/Parser.pm:3138
  #, perl-format
  msgid "unknown @end %s"
  msgstr "@end %s desconocido"
  
! #: tp/Texinfo/Parser.pm:3161 tp/Texinfo/Parser.pm:3788
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "argumento superfluo para @%s %s: %s"
  
! #: tp/Texinfo/Parser.pm:3167 tp/Texinfo/Parser.pm:3245
! #: tp/Texinfo/Parser.pm:5755 tp/Texinfo/Parser.pm:5798
! #: tp/Texinfo/Parser.pm:5827 tp/Texinfo/Parser.pm:5868
! #: tp/Texinfo/Parser.pm:5946
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "argumento errÃ³neo para @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3188
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%s: no se pudo abrir %s: %s"
  
! #: tp/Texinfo/Parser.pm:3200
  #, 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/Parser.pm:3208
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "`%s' no se corresponde con ningÃºn tipo de codificaciÃ³n conocido"
  
! #: tp/Texinfo/Parser.pm:3364
  #, perl-format
  msgid "@%s after the first element"
  msgstr "@%s despuÃ©s del primer elemento"
  
! #: tp/Texinfo/Parser.pm:3371
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s carece de sentido fuera de una lÃ­nea @multitable"
  
! #: tp/Texinfo/Parser.pm:3408
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "@%s no debe estar asociado con @top"
  
! #: tp/Texinfo/Parser.pm:3420
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
***************
*** 2725,2778 ****
  "@node precede a @%s, pero las partes no pueden estar asociadas con los nodos"
  
! #: tp/Texinfo/Parser.pm:3677
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "argumento vacÃ­o en @%s"
  
! #: tp/Texinfo/Parser.pm:3681
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "nombre de nodo vacÃ­o tras expandir `%s'"
  
! #: tp/Texinfo/Parser.pm:3724
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "nombre de entrada de menÃº vacÃ­o en `%s'"
  
! #: tp/Texinfo/Parser.pm:3732
  msgid "empty node name in menu entry"
  msgstr "nombre de nodo vacÃ­o en una entrada de menÃº"
  
! #: tp/Texinfo/Parser.pm:3805
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "@%s no puede aparecer en @%s"
  
! #: tp/Texinfo/Parser.pm:3937
! #, perl-format
! msgid "@end %s should only appear at a line beginning"
  msgstr "@end %s solo puede aparecer al comienzo de una lÃ­nea"
  
! #: tp/Texinfo/Parser.pm:3960
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "la macro '%s' ya ha sido definida en este documento"
  
! #: tp/Texinfo/Parser.pm:3963
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "la definiciÃ³n previa de '%s' se encuentra aquÃ­"
  
! #: tp/Texinfo/Parser.pm:3968
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "se redefine la orden del lenguaje Texinfo: @%s"
  
! #: tp/Texinfo/Parser.pm:4017
  #, perl-format
  msgid "@%s without associated character"
  msgstr "@%s sin carÃ¡cter asociado"
  
! #: tp/Texinfo/Parser.pm:4087
  #, perl-format
  msgid ""
--- 2724,2777 ----
  "@node precede a @%s, pero las partes no pueden estar asociadas con los nodos"
  
! #: tp/Texinfo/Parser.pm:3522
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "argumento vacÃ­o en @%s"
  
! #: tp/Texinfo/Parser.pm:3526
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "nombre de nodo vacÃ­o tras expandir `%s'"
  
! #: tp/Texinfo/Parser.pm:3569
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "nombre de entrada de menÃº vacÃ­o en `%s'"
  
! #: tp/Texinfo/Parser.pm:3577
  msgid "empty node name in menu entry"
  msgstr "nombre de nodo vacÃ­o en una entrada de menÃº"
  
! #: tp/Texinfo/Parser.pm:3650
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "@%s no puede aparecer en @%s"
  
! #: tp/Texinfo/Parser.pm:3782
! #, fuzzy, 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/Parser.pm:3804
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "la macro '%s' ya ha sido definida en este documento"
  
! #: tp/Texinfo/Parser.pm:3807
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "la definiciÃ³n previa de '%s' se encuentra aquÃ­"
  
! #: tp/Texinfo/Parser.pm:3812
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "se redefine la orden del lenguaje Texinfo: @%s"
  
! #: tp/Texinfo/Parser.pm:3879
  #, perl-format
  msgid "@%s without associated character"
  msgstr "@%s sin carÃ¡cter asociado"
  
! #: tp/Texinfo/Parser.pm:3949
  #, perl-format
  msgid ""
***************
*** 2782,2786 ****
  "con {}"
  
! #: tp/Texinfo/Parser.pm:4111
  #, perl-format
  msgid ""
--- 2781,2785 ----
  "con {}"
  
! #: tp/Texinfo/Parser.pm:3974
  #, perl-format
  msgid ""
***************
*** 2791,2795 ****
  "MAX_NESTED_MACROS; su valor actual es %d)"
  
! #: tp/Texinfo/Parser.pm:4120
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
--- 2790,2794 ----
  "MAX_NESTED_MACROS; su valor actual es %d)"
  
! #: tp/Texinfo/Parser.pm:3983
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
***************
*** 2798,2895 ****
  "necesita"
  
! #: tp/Texinfo/Parser.pm:4176
  #, 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/Parser.pm:4182
  #, 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/Parser.pm:4195 tp/Texinfo/Parser.pm:5325
  #, 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/Parser.pm:4207
  #, 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/Parser.pm:4218
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s esperaba llaves"
  
! #: tp/Texinfo/Parser.pm:4383
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "etiqueta indefinida: %s"
  
! #: tp/Texinfo/Parser.pm:4386
  msgid "bad syntax for @value"
  msgstr "sintaxis de @value incorrecta"
  
! #: tp/Texinfo/Parser.pm:4393
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s es una sintaxis ya obsoleta."
  
! #: tp/Texinfo/Parser.pm:4396
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s es una sintaxis ya obsoleta; %s"
  
! #: tp/Texinfo/Parser.pm:4405
! #, perl-format
! msgid "@%s should only appear at a line beginning"
  msgstr "@%s solo puede aparecer al comienzo de una lÃ­nea"
  
! #: tp/Texinfo/Parser.pm:4496
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s no estÃ¡ permitido en un bloque `@%s'"
  
! #: tp/Texinfo/Parser.pm:4505
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr "@%s solo puede aparecer en el encabezado o al pie"
  
! #: tp/Texinfo/Parser.pm:4631 tp/Texinfo/Parser.pm:4648
! #: tp/Texinfo/Parser.pm:4698
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "`@%s' carece de sentido bajo la influencia de un bloque `@%s'"
  
! #: tp/Texinfo/Parser.pm:4658
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "@%s en multi-tabla vacÃ­a"
  
! #: tp/Texinfo/Parser.pm:4664
  msgid "@tab before @item"
  msgstr "@tab antes de @item"
  
! #: tp/Texinfo/Parser.pm:4667
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "demasiadas columnas para el elemento multi-tabla (max %d)"
  
! #: tp/Texinfo/Parser.pm:4704
  msgid "ignoring @tab outside of multitable"
  msgstr "ignorando `@tab' no influenciado por el entorno `multitable'"
  
! #: tp/Texinfo/Parser.pm:4708
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "@%s fuera de tabla o lista"
  
! #: tp/Texinfo/Parser.pm:4745
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "tiene que ir despuÃ©s de `@%s' para poder usar `@%s'"
  
! #: tp/Texinfo/Parser.pm:4787
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
--- 2797,2894 ----
  "necesita"
  
! #: tp/Texinfo/Parser.pm:4038
  #, 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/Parser.pm:4044
  #, 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/Parser.pm:4057 tp/Texinfo/Parser.pm:5189
  #, 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/Parser.pm:4068
  #, 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/Parser.pm:4079
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s esperaba llaves"
  
! #: tp/Texinfo/Parser.pm:4233
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "etiqueta indefinida: %s"
  
! #: tp/Texinfo/Parser.pm:4236
  msgid "bad syntax for @value"
  msgstr "sintaxis de @value incorrecta"
  
! #: tp/Texinfo/Parser.pm:4243
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s es una sintaxis ya obsoleta."
  
! #: tp/Texinfo/Parser.pm:4246
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s es una sintaxis ya obsoleta; %s"
  
! #: tp/Texinfo/Parser.pm:4255
! #, fuzzy, 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/Parser.pm:4346
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s no estÃ¡ permitido en un bloque `@%s'"
  
! #: tp/Texinfo/Parser.pm:4355
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr "@%s solo puede aparecer en el encabezado o al pie"
  
! #: tp/Texinfo/Parser.pm:4479 tp/Texinfo/Parser.pm:4496
! #: tp/Texinfo/Parser.pm:4546
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "`@%s' carece de sentido bajo la influencia de un bloque `@%s'"
  
! #: tp/Texinfo/Parser.pm:4506
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "@%s en multi-tabla vacÃ­a"
  
! #: tp/Texinfo/Parser.pm:4512
  msgid "@tab before @item"
  msgstr "@tab antes de @item"
  
! #: tp/Texinfo/Parser.pm:4515
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "demasiadas columnas para el elemento multi-tabla (max %d)"
  
! #: tp/Texinfo/Parser.pm:4552
  msgid "ignoring @tab outside of multitable"
  msgstr "ignorando `@tab' no influenciado por el entorno `multitable'"
  
! #: tp/Texinfo/Parser.pm:4556
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "@%s fuera de tabla o lista"
  
! #: tp/Texinfo/Parser.pm:4596
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "tiene que ir despuÃ©s de `@%s' para poder usar `@%s'"
  
! #: tp/Texinfo/Parser.pm:4638
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
***************
*** 2898,2920 ****
  "`@quotation'"
  
! #: tp/Texinfo/Parser.pm:4791
  msgid "@dircategory after first node"
  msgstr "@dircategory despuÃ©s del primer nodo"
  
! #: tp/Texinfo/Parser.pm:4979
  #, 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/Parser.pm:4997
  msgid "@direntry after first node"
  msgstr "@direntry despuÃ©s del primer nodo"
  
! #: tp/Texinfo/Parser.pm:5005
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "se ha encontrado un @%s antes del primer @node"
  
! #: tp/Texinfo/Parser.pm:5008
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
--- 2897,2919 ----
  "`@quotation'"
  
! #: tp/Texinfo/Parser.pm:4642
  msgid "@dircategory after first node"
  msgstr "@dircategory despuÃ©s del primer nodo"
  
! #: tp/Texinfo/Parser.pm:4847
  #, 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/Parser.pm:4864
  msgid "@direntry after first node"
  msgstr "@direntry despuÃ©s del primer nodo"
  
! #: tp/Texinfo/Parser.pm:4872
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "se ha encontrado un @%s antes del primer @node"
  
! #: tp/Texinfo/Parser.pm:4875
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
***************
*** 2923,2956 ****
  "`@ifnottex' en vez de la de un bloque `@ifinfo'?"
  
! #: tp/Texinfo/Parser.pm:5070
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr "@%s solo puede aparecer en un contexto matemÃ¡tico"
  
! #: tp/Texinfo/Parser.pm:5078
  #, perl-format
  msgid "unknown command `%s'"
  msgstr "orden desconocida `%s'"
  
! #: tp/Texinfo/Parser.pm:5088
  msgid "unexpected @"
  msgstr "no se esperaba @"
  
! #: tp/Texinfo/Parser.pm:5117
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s carece de sentido si se da fuera de entornos `@float'"
  
! #: tp/Texinfo/Parser.pm:5122
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr "@%s debe estar inmediatamente debajo de `@float'"
  
! #: tp/Texinfo/Parser.pm:5130
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "se ignora @%s mÃºltiple"
  
! #: tp/Texinfo/Parser.pm:5249
  #, perl-format
  msgid "command @%s does not accept arguments"
--- 2922,2955 ----
  "`@ifnottex' en vez de la de un bloque `@ifinfo'?"
  
! #: tp/Texinfo/Parser.pm:4937
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr "@%s solo puede aparecer en un contexto matemÃ¡tico"
  
! #: tp/Texinfo/Parser.pm:4945
  #, perl-format
  msgid "unknown command `%s'"
  msgstr "orden desconocida `%s'"
  
! #: tp/Texinfo/Parser.pm:4955
  msgid "unexpected @"
  msgstr "no se esperaba @"
  
! #: tp/Texinfo/Parser.pm:4983
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s carece de sentido si se da fuera de entornos `@float'"
  
! #: tp/Texinfo/Parser.pm:4988
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr "@%s debe estar inmediatamente debajo de `@float'"
  
! #: tp/Texinfo/Parser.pm:4996
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "se ignora @%s mÃºltiple"
  
! #: tp/Texinfo/Parser.pm:5114
  #, perl-format
  msgid "command @%s does not accept arguments"
***************
*** 2958,3100 ****
  
  # TODO review
! #: tp/Texinfo/Parser.pm:5273
  #, 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/Parser.pm:5292
  #, 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/Parser.pm:5303
  #, 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/Parser.pm:5316
  msgid "@image missing filename argument"
  msgstr "la primitiva `@image' carece de referencia a fichero alguno"
  
! #: tp/Texinfo/Parser.pm:5348
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "@%s falta el primer argumento"
  
! #: tp/Texinfo/Parser.pm:5393
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "dÃ­gitos no hexadecimales en el argumento de @U: %s"
  
! #: tp/Texinfo/Parser.pm:5399
  #, 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/Parser.pm:5412
! #, perl-format
! msgid "argument for @U exceeds size of integer: %s"
! msgstr "el argumento de @U excede el tamaÃ±o de los enteros: %s"
! 
! #: tp/Texinfo/Parser.pm:5418
  #, 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/Parser.pm:5546
  msgid "superfluous arguments for node"
  msgstr "argumentos de nodo superfluos"
  
! #: tp/Texinfo/Parser.pm:5596
  #, perl-format
  msgid "expected @end %s"
  msgstr "se esperaba @end %s"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "@%s solo debe aceptar una orden-@ como argumento, no `%s'"
  
! #: tp/Texinfo/Parser.pm:5728
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "argumento restante en la lÃ­nea @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5801
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "orden de entorno %s como argumento de @%s"
  
! #: tp/Texinfo/Parser.pm:5823
  #, perl-format
  msgid "empty @%s"
  msgstr "@%s vacÃ­o"
  
! #: tp/Texinfo/Parser.pm:5831
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "fracciÃ³n de columna no numÃ©rica: %s"
  
! #: tp/Texinfo/Parser.pm:5840
  #, 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/Parser.pm:5849
  #, perl-format
  msgid "reserved index name %s"
  msgstr "nombre de Ã­ndice reservado %s"
  
! #: tp/Texinfo/Parser.pm:5868
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "Ã­ndice de origen desconocido en @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5871
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "Ã­ndice de destino desconocido en @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5901
  #, 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/Parser.pm:5914
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "Ã­ndice desconocido `%s' en `@printindex'"
  
! #: tp/Texinfo/Parser.pm:5920
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr "imprimiendo un Ã­ndice `%s' fusionado en otro `%s'"
  
! #: tp/Texinfo/Parser.pm:5928
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "printindex antes del comienzo del documento: @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5944
  #, 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/Parser.pm:5952
  #, 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/Parser.pm:5960
  #, 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/Parser.pm:5968
  #, 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/Parser.pm:5986 tp/Texinfo/Parser.pm:5991
  #, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
--- 2957,3094 ----
  
  # TODO review
! #: tp/Texinfo/Parser.pm:5138
  #, 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/Parser.pm:5156
  #, 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/Parser.pm:5167
  #, 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/Parser.pm:5180
  msgid "@image missing filename argument"
  msgstr "la primitiva `@image' carece de referencia a fichero alguno"
  
! #: tp/Texinfo/Parser.pm:5211
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "@%s falta el primer argumento"
  
! #: tp/Texinfo/Parser.pm:5230
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "dÃ­gitos no hexadecimales en el argumento de @U: %s"
  
! #: tp/Texinfo/Parser.pm:5236
  #, 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/Parser.pm:5253
  #, 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/Parser.pm:5448
  msgid "superfluous arguments for node"
  msgstr "argumentos de nodo superfluos"
  
! #: tp/Texinfo/Parser.pm:5498
  #, perl-format
  msgid "expected @end %s"
  msgstr "se esperaba @end %s"
  
! #: tp/Texinfo/Parser.pm:5607
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "@%s solo debe aceptar una orden-@ como argumento, no `%s'"
  
! #: tp/Texinfo/Parser.pm:5617
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "argumento restante en la lÃ­nea @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5689
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "orden de entorno %s como argumento de @%s"
  
! #: tp/Texinfo/Parser.pm:5710
  #, perl-format
  msgid "empty @%s"
  msgstr "@%s vacÃ­o"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "fracciÃ³n de columna no numÃ©rica: %s"
  
! #: tp/Texinfo/Parser.pm:5727
  #, 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/Parser.pm:5736
  #, perl-format
  msgid "reserved index name %s"
  msgstr "nombre de Ã­ndice reservado %s"
  
! #: tp/Texinfo/Parser.pm:5762
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "Ã­ndice de origen desconocido en @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5765
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "Ã­ndice de destino desconocido en @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5793
  #, 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/Parser.pm:5806
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "Ã­ndice desconocido `%s' en `@printindex'"
  
! #: tp/Texinfo/Parser.pm:5812
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr "imprimiendo un Ã­ndice `%s' fusionado en otro `%s'"
  
! #: tp/Texinfo/Parser.pm:5820
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "printindex antes del comienzo del documento: @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5836
  #, 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/Parser.pm:5844
  #, 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/Parser.pm:5852
  #, 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/Parser.pm:5860
  #, 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/Parser.pm:5878 tp/Texinfo/Parser.pm:5883
  #, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
***************
*** 3102,3106 ****
  "el argumento de @paragraphindent debe ser numÃ©rico/`none'/`asis', no '%s'"
  
! #: tp/Texinfo/Parser.pm:5999
  #, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
--- 3096,3100 ----
  "el argumento de @paragraphindent debe ser numÃ©rico/`none'/`asis', no '%s'"
  
! #: tp/Texinfo/Parser.pm:5891
  #, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
***************
*** 3108,3122 ****
  "el argumento de @firstparagraphindent debe ser `none' o `insert', no '%s'"
  
! #: tp/Texinfo/Parser.pm:6009
  #, 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/Parser.pm:6021
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "Se esperaba leer @%s \"on\" u \"off\", no '%s'"
  
! #: tp/Texinfo/Parser.pm:6031
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
--- 3102,3116 ----
  "el argumento de @firstparagraphindent debe ser `none' o `insert', no '%s'"
  
! #: tp/Texinfo/Parser.pm:5901
  #, 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/Parser.pm:5913
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "Se esperaba leer @%s \"on\" u \"off\", no '%s'"
  
! #: tp/Texinfo/Parser.pm:5922
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
***************
*** 3124,3133 ****
  "el argumento de @kbdinputstyle debe ser `code'/`example'/`distinct', no '%s'"
  
! #: tp/Texinfo/Parser.pm:6039
  #, 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/Parser.pm:6047
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
--- 3118,3127 ----
  "el argumento de @kbdinputstyle debe ser `code'/`example'/`distinct', no '%s'"
  
! #: tp/Texinfo/Parser.pm:5930
  #, 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/Parser.pm:5938
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
***************
*** 3135,3149 ****
  "el argumento de @urefbreakstyle debe ser `after'/`before'/`none', no '%s'"
  
! #: tp/Texinfo/Structuring.pm:213
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr "se sube el nivel de secciÃ³n de @%s, que es demasiado bajo"
  
! #: tp/Texinfo/Structuring.pm:245
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "no hay Ã³rdenes de nivel de capÃ­tulo antes de @%s"
  
! #: tp/Texinfo/Structuring.pm:250
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
--- 3129,3143 ----
  "el argumento de @urefbreakstyle debe ser `after'/`before'/`none', no '%s'"
  
! #: tp/Texinfo/Structuring.pm:216
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr "se sube el nivel de secciÃ³n de @%s, que es demasiado bajo"
  
! #: tp/Texinfo/Structuring.pm:248
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "no hay Ã³rdenes de nivel de capÃ­tulo antes de @%s"
  
! #: tp/Texinfo/Structuring.pm:253
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
***************
*** 3151,3195 ****
  "se desciende el nivel de secciÃ³n de @%s que aparece tras un elemento inferior"
  
! #: tp/Texinfo/Structuring.pm:339
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "no hay ninguna orden de seccionamiento asociada a @%s"
  
! #: tp/Texinfo/Structuring.pm:488
  #, perl-format
  msgid "@%s not empty"
  msgstr "@%s no vacÃ­o"
  
! #: tp/Texinfo/Structuring.pm:544 tp/Texinfo/Structuring.pm:1326
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "@%s hace referencia a un nodo inexistente (`%s')"
  
! #: tp/Texinfo/Structuring.pm:557
  #, perl-format
  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:662
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "Nodo '%s' no referenciado"
  
! #: tp/Texinfo/Structuring.pm:708
  #, 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:715
  #, 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:733
  #, 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:787
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
--- 3145,3189 ----
  "se desciende el nivel de secciÃ³n de @%s que aparece tras un elemento inferior"
  
! #: tp/Texinfo/Structuring.pm:342
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "no hay ninguna orden de seccionamiento asociada a @%s"
  
! #: tp/Texinfo/Structuring.pm:491
  #, perl-format
  msgid "@%s not empty"
  msgstr "@%s no vacÃ­o"
  
! #: tp/Texinfo/Structuring.pm:547 tp/Texinfo/Structuring.pm:1325
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "@%s hace referencia a un nodo inexistente (`%s')"
  
! #: tp/Texinfo/Structuring.pm:558
  #, perl-format
  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:663
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "Nodo '%s' no referenciado"
  
! #: tp/Texinfo/Structuring.pm:706
  #, 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:713
  #, 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:731
  #, 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:786
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
***************
*** 3197,3206 ****
  "el puntero %s `%s' (para el nodo `%s') es diferente del nombre de %s `%s'"
  
! #: tp/Texinfo/Structuring.pm:814
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%s hace referencia a algo que no existe (`%s')"
  
! #: tp/Texinfo/Structuring.pm:834
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
--- 3191,3200 ----
  "el puntero %s `%s' (para el nodo `%s') es diferente del nombre de %s `%s'"
  
! #: tp/Texinfo/Structuring.pm:810
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%s hace referencia a algo que no existe (`%s')"
  
! #: tp/Texinfo/Structuring.pm:829
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
***************
*** 3209,3213 ****
  "su destino para `Up'"
  
! #: tp/Texinfo/Structuring.pm:842
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
--- 3203,3207 ----
  "su destino para `Up'"
  
! #: tp/Texinfo/Structuring.pm:837
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
***************
*** 3219,3223 ****
  msgstr "@%s para `%s', diferente del nombre de %s `%s'"
  
! #: tp/Texinfo/Structuring.pm:2070
  #, perl-format
  msgid "empty index key in @%s"
--- 3213,3217 ----
  msgstr "@%s para `%s', diferente del nombre de %s `%s'"
  
! #: tp/Texinfo/Structuring.pm:2067
  #, perl-format
  msgid "empty index key in @%s"
***************
*** 3859,3863 ****
  msgstr "Pruebe `%s --help' para obtener mÃ¡s informaciÃ³n.\n"
  
! #: tp/texi2any.pl:1232
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
--- 3853,3857 ----
  msgstr "Pruebe `%s --help' para obtener mÃ¡s informaciÃ³n.\n"
  
! #: tp/texi2any.pl:1239
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
***************
*** 3865,3879 ****
  "Â¿No hay ninguna secciÃ³n?"
  
! #: tp/texi2any.pl:1255
  #, 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:1261
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "no se pudo abrir %s para escriturea: %s\n"
  
! #: tp/texi2any.pl:1286
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
--- 3859,3873 ----
  "Â¿No hay ninguna secciÃ³n?"
  
! #: tp/texi2any.pl:1262
  #, 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:1268
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "no se pudo abrir %s para escriturea: %s\n"
  
! #: tp/texi2any.pl:1293
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
***************
*** 3884,3902 ****
  "Â¿No hay ninguna secciÃ³n?"
  
! #: tp/texi2any.pl:1359 tp/texi2any.pl:1435
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%s: error cerrando %s: %s\n"
  
! #: tp/texi2any.pl:1382 tp/texi2any.pl:1416
  #, 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:1388 tp/texi2any.pl:1422
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
  msgstr "%s: no se pudo abrir %s para escritura: %s\n"
  
  #~ msgid "--*** Tags out of Date ***"
  #~ msgstr "--*** Etiquetas antiguas ***"
--- 3878,3908 ----
  "Â¿No hay ninguna secciÃ³n?"
  
! #: tp/texi2any.pl:1366 tp/texi2any.pl:1442
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%s: error cerrando %s: %s\n"
  
! #: tp/texi2any.pl:1389 tp/texi2any.pl:1423
  #, 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:1395 tp/texi2any.pl:1429
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
  msgstr "%s: no se pudo abrir %s para escritura: %s\n"
  
+ #~ msgid "No file given for node '%s'."
+ #~ msgstr "No se ha especificado ningÃºn fichero para el nodo '%s'."
+ 
+ #~ msgid "-%s---Info: %s, %ld lines --%s--"
+ #~ msgstr "-%s---Info: %s, %ld lÃ­neas --%s--"
+ 
+ #~ msgid "-%s---Info: (%s)%s, %ld lines --%s--"
+ #~ msgstr "-%s---Info: (%s)%s, %ld lÃ­neas --%s--"
+ 
+ #~ msgid "argument for @U exceeds size of integer: %s"
+ #~ msgstr "el argumento de @U excede el tamaÃ±o de los enteros: %s"
+ 
  #~ msgid "--*** Tags out of Date ***"
  #~ msgstr "--*** Etiquetas antiguas ***"
Binary files texinfo-6.1/po/fr.gmo and texinfo-6.3/po/fr.gmo differ
diff -Nrc2 texinfo-6.1/po/fr.po texinfo-6.3/po/fr.po
*** texinfo-6.1/po/fr.po	2016-02-06 11:35:50.000000000 +0000
--- texinfo-6.3/po/fr.po	2016-09-10 12:45:51.000000000 +0100
***************
*** 14,21 ****
  msgid ""
  msgstr ""
! "Project-Id-Version: texinfo 6.0.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
! "PO-Revision-Date: 2015-12-23 14:54+0100\n"
  "Last-Translator: Jean-Charles Malahieude <lilyfan@orange.fr>\n"
  "Language-Team: French <traduc@traduc.org>\n"
--- 14,21 ----
  msgid ""
  msgstr ""
! "Project-Id-Version: texinfo 6.1.92\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:45+0100\n"
! "PO-Revision-Date: 2016-09-10 12:47+0200\n"
  "Last-Translator: Jean-Charles Malahieude <lilyfan@orange.fr>\n"
  "Language-Team: French <traduc@traduc.org>\n"
***************
*** 24,27 ****
--- 24,28 ----
  "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"
  
***************
*** 121,126 ****
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [ or [^"
! msgstr "[ ou [^ sans correspondance"
  
  #: gnulib/lib/regcomp.c:159
--- 122,127 ----
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [, [^, [:, [., or [="
! msgstr "[, [^, [:, [., ou [= sans correspondance"
  
  #: gnulib/lib/regcomp.c:159
***************
*** 160,164 ****
  msgstr ") ou \\) sans correspondance"
  
! #: gnulib/lib/regcomp.c:711
  msgid "No previous regular expression"
  msgstr "Aucune expression rationnelle antÃ©rieure"
--- 161,165 ----
  msgstr ") ou \\) sans correspondance"
  
! #: gnulib/lib/regcomp.c:687
  msgid "No previous regular expression"
  msgstr "Aucune expression rationnelle antÃ©rieure"
***************
*** 313,317 ****
  msgstr "----- Notes de bas de page ----"
  
! #: info/indices.c:123 info/indices.c:812
  #, c-format
  msgid "Finding index entries..."
--- 314,318 ----
  msgstr "----- Notes de bas de page ----"
  
! #: info/indices.c:123 info/indices.c:822
  #, c-format
  msgid "Finding index entries..."
***************
*** 322,326 ****
  msgstr "Recherche une chaÃ®ne dans l'index pour ce fichier"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:818
  #, c-format
  msgid "No indices found."
--- 323,327 ----
  msgstr "Recherche une chaÃ®ne dans l'index pour ce fichier"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:828
  #, c-format
  msgid "No indices found."
***************
*** 352,384 ****
  msgstr "Plus aucune entrÃ©e d'index contenant Â«Â %sÂ Â»."
  
! #: info/indices.c:476 info/indices.c:880
  #, c-format
  msgid "No index entries containing '%s'."
  msgstr "Aucune entrÃ©e d'index contenant Â«Â %sÂ Â»."
  
! #: info/indices.c:583
  #, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "Parcours des index de Â«Â %sÂ Â»..."
  
! #: info/indices.c:636
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
  "Cherche une chaÃ®ne dans tous les index de fichiers info et construit un menu"
  
! #: info/indices.c:644 info/indices.c:646
  msgid "Index apropos"
  msgstr "Description des index"
  
! #: info/indices.c:688
  #, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Aucune entrÃ©e d'index contenant Â«Â %sÂ Â»Â :\n"
  
! #: info/indices.c:797
  msgid "List all matches of a string in the index"
  msgstr "Placer dans l'index toutes les correspondances Ã  une chaÃ®ne"
  
! #: info/indices.c:824 info/indices.c:826
  msgid "Index topic"
  msgstr "Sujet de l'index"
--- 353,385 ----
  msgstr "Plus aucune entrÃ©e d'index contenant Â«Â %sÂ Â»."
  
! #: info/indices.c:476 info/indices.c:890
  #, c-format
  msgid "No index entries containing '%s'."
  msgstr "Aucune entrÃ©e d'index contenant Â«Â %sÂ Â»."
  
! #: info/indices.c:586
  #, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "Parcours des index de Â«Â %sÂ Â»..."
  
! #: info/indices.c:646
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
  "Cherche une chaÃ®ne dans tous les index de fichiers info et construit un menu"
  
! #: info/indices.c:654 info/indices.c:656
  msgid "Index apropos"
  msgstr "Description des index"
  
! #: info/indices.c:698
  #, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Aucune entrÃ©e d'index contenant Â«Â %sÂ Â»Â :\n"
  
! #: info/indices.c:807
  msgid "List all matches of a string in the index"
  msgstr "Placer dans l'index toutes les correspondances Ã  une chaÃ®ne"
  
! #: info/indices.c:834 info/indices.c:836
  msgid "Index topic"
  msgstr "Sujet de l'index"
***************
*** 389,443 ****
  msgstr "Â«Â %sÂ Â» n'est prÃ©sent dans aucun des index disponibles."
  
! #: info/info-utils.c:892
  #, c-format
  msgid "Error converting file character encoding."
  msgstr "Erreur lors de la conversion d'encodage de caracÃ¨res du fichier."
  
! #: info/info.c:222 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "Aucune entrÃ©e de menu Â«Â %sÂ Â» dans le nÅ“ud Â«Â %sÂ Â»."
  
! #: info/info.c:315
! #, c-format
! msgid "No file given for node '%s'."
! msgstr "Aucun menu dans le nÅ“ud Â«Â %sÂ Â»."
! 
! #: info/info.c:364 info/info.c:1133
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr "Impossible de trouver le nÅ“ud Â«Â %sÂ Â»."
  
! #: info/info.c:386
  #, c-format
  msgid "No program name given."
  msgstr "Aucun nom de programme donnÃ©."
  
! #: info/info.c:577
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "nombre invalideÂ : %s\n"
  
! #: info/info.c:757
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "assignation de variable mal formÃ©eÂ : %s"
  
! #: info/info.c:764 info/infokey.c:537
  #, c-format
  msgid "%s: no such variable"
  msgstr "%sÂ : variable inconnue"
  
! #: info/info.c:770 info/infokey.c:539
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "la valeur %s est invalide pour une variable %s"
  
! #: info/info.c:782
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "Utilisez --help pour plus d'informations.\n"
  
! #: info/info.c:804 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
--- 390,439 ----
  msgstr "Â«Â %sÂ Â» n'est prÃ©sent dans aucun des index disponibles."
  
! #: info/info-utils.c:879
  #, c-format
  msgid "Error converting file character encoding."
  msgstr "Erreur lors de la conversion d'encodage de caracÃ¨res du fichier."
  
! #: info/info.c:279 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "Aucune entrÃ©e de menu Â«Â %sÂ Â» dans le nÅ“ud Â«Â %sÂ Â»."
  
! #: info/info.c:416 info/info.c:1148
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr "Impossible de trouver le nÅ“ud Â«Â %sÂ Â»."
  
! #: info/info.c:438
  #, c-format
  msgid "No program name given."
  msgstr "Aucun nom de programme donnÃ©."
  
! #: info/info.c:636
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "nombre invalideÂ : %s\n"
  
! #: info/info.c:816
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "assignation de variable mal formÃ©eÂ : %s"
  
! #: info/info.c:823 info/infokey.c:540
  #, c-format
  msgid "%s: no such variable"
  msgstr "%sÂ : variable inconnue"
  
! #: info/info.c:829 info/infokey.c:542
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "la valeur %s est invalide pour une variable %s"
  
! #: info/info.c:841
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "Utilisez --help pour plus d'informations.\n"
  
! #: info/info.c:860 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
***************
*** 455,464 ****
  "Aucune garantie n'est offerte, dans les limites permises par la loi.\n"
  
! #: info/info.c:981
  #, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "aucune entrÃ©e d'index trouvÃ©e pour Â«Â %sÂ Â»\n"
  
! #: info/info.c:1034
  #, c-format
  msgid ""
--- 451,460 ----
  "Aucune garantie n'est offerte, dans les limites permises par la loi.\n"
  
! #: info/info.c:999
  #, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "aucune entrÃ©e d'index trouvÃ©e pour Â«Â %sÂ Â»\n"
  
! #: info/info.c:1049
  #, c-format
  msgid ""
***************
*** 471,475 ****
  "Lit un document au format Info.\n"
  
! #: info/info.c:1040
  msgid ""
  "Options:\n"
--- 467,471 ----
  "Lit un document au format Info.\n"
  
! #: info/info.c:1055
  msgid ""
  "Options:\n"
***************
*** 489,493 ****
  "  -f, --file=FICHIER           Indique quel fichier Info visiter."
  
! #: info/info.c:1048
  msgid ""
  "  -h, --help                   display this help and exit.\n"
--- 485,489 ----
  "  -f, --file=FICHIER           Indique quel fichier Info visiter."
  
! #: info/info.c:1063
  msgid ""
  "  -h, --help                   display this help and exit.\n"
***************
*** 503,507 ****
  "  -o, --output=FICHIER         Ã‰crit les nÅ“uds sÃ©lectionnÃ©s dans FICHIER."
  
! #: info/info.c:1054
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
--- 499,503 ----
  "  -o, --output=FICHIER         Ã‰crit les nÅ“uds sÃ©lectionnÃ©s dans FICHIER."
  
! #: info/info.c:1069
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
***************
*** 517,526 ****
  "  -O, --show-options, --usage  Va au nÅ“ud des options en ligne de commande."
  
! #: info/info.c:1061
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr ""
  "  -b, --speech-friendly        CompatibilitÃ© avec les synthÃ©tiseurs vocaux."
  
! #: info/info.c:1065
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
--- 513,522 ----
  "  -O, --show-options, --usage  Va au nÅ“ud des options en ligne de commande."
  
! #: info/info.c:1076
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr ""
  "  -b, --speech-friendly        CompatibilitÃ© avec les synthÃ©tiseurs vocaux."
  
! #: info/info.c:1080
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
***************
*** 542,546 ****
  "                                 d'anomalie (-1 pour tout).\n"
  
! #: info/info.c:1074
  msgid ""
  "\n"
--- 538,542 ----
  "                                 d'anomalie (-1 pour tout).\n"
  
! #: info/info.c:1089
  msgid ""
  "\n"
***************
*** 560,564 ****
  "relatif au premier nÅ“ud visitÃ©."
  
! #: info/info.c:1081
  msgid ""
  "\n"
--- 556,560 ----
  "relatif au premier nÅ“ud visitÃ©."
  
! #: info/info.c:1096
  msgid ""
  "\n"
***************
*** 569,573 ****
  "le programme."
  
! #: info/info.c:1084
  msgid ""
  "\n"
--- 565,569 ----
  "le programme."
  
! #: info/info.c:1099
  msgid ""
  "\n"
***************
*** 603,607 ****
  "                             l'arborescence."
  
! #: info/info.c:1099 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
--- 599,603 ----
  "                             l'arborescence."
  
! #: info/info.c:1114 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
***************
*** 614,652 ****
  "Site TexinfoÂ : http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1134
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Impossible de trouver le nÅ“ud Â«Â (%s)%sÂ Â»."
  
! #: info/info.c:1135
  msgid "Cannot find a window!"
  msgstr "Impossible de trouver une fenÃªtreÂ !"
  
! #: info/info.c:1136
  msgid "Point doesn't appear within this window's node!"
  msgstr "Le point n'apparaÃ®t pas dans le nÅ“ud de cette fenÃªtreÂ !"
  
! #: info/info.c:1137
  msgid "Cannot delete the last window."
  msgstr "Impossible de dÃ©truire la derniÃ¨re fenÃªtre."
  
! #: info/info.c:1138
  msgid "No menu in this node."
  msgstr "Aucun menu dans ce nÅ“ud."
  
! #: info/info.c:1139
  msgid "No footnotes in this node."
  msgstr "Aucune note de bas de page dans ce nÅ“ud."
  
! #: info/info.c:1140
  msgid "No cross references in this node."
  msgstr "Aucun renvoi dans ce nÅ“ud."
  
! #: info/info.c:1141
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Aucun pointeur Â«Â %sÂ Â» pour ce nÅ“ud."
  
! #: info/info.c:1142
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
--- 610,648 ----
  "Site TexinfoÂ : http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1149
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Impossible de trouver le nÅ“ud Â«Â (%s)%sÂ Â»."
  
! #: info/info.c:1150
  msgid "Cannot find a window!"
  msgstr "Impossible de trouver une fenÃªtreÂ !"
  
! #: info/info.c:1151
  msgid "Point doesn't appear within this window's node!"
  msgstr "Le point n'apparaÃ®t pas dans le nÅ“ud de cette fenÃªtreÂ !"
  
! #: info/info.c:1152
  msgid "Cannot delete the last window."
  msgstr "Impossible de dÃ©truire la derniÃ¨re fenÃªtre."
  
! #: info/info.c:1153
  msgid "No menu in this node."
  msgstr "Aucun menu dans ce nÅ“ud."
  
! #: info/info.c:1154
  msgid "No footnotes in this node."
  msgstr "Aucune note de bas de page dans ce nÅ“ud."
  
! #: info/info.c:1155
  msgid "No cross references in this node."
  msgstr "Aucun renvoi dans ce nÅ“ud."
  
! #: info/info.c:1156
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Aucun pointeur Â«Â %sÂ Â» pour ce nÅ“ud."
  
! #: info/info.c:1157
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
***************
*** 654,679 ****
  
  # TERM=tty info
! #: info/info.c:1143
  #, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "Le terminal Â«Â %sÂ Â» n'est pas assez Ã©voluÃ© pour lancer Info."
  
! #: info/info.c:1144
  msgid "You are already at the last page of this node."
  msgstr "Vous Ãªtes dÃ©jÃ  Ã  la derniÃ¨re page de ce nÅ“ud."
  
! #: info/info.c:1145
  msgid "You are already at the first page of this node."
  msgstr "Vous Ãªtes dÃ©jÃ  Ã  la premiÃ¨re page de ce nÅ“ud."
  
! #: info/info.c:1146
  msgid "Only one window."
  msgstr "Une seule fenÃªtre."
  
! #: info/info.c:1147
  msgid "Resulting window would be too small."
  msgstr "La fenÃªtre rÃ©sultante serait trop petite."
  
! #: info/info.c:1148
  msgid "Not enough room for a help window, please delete a window."
  msgstr ""
--- 650,675 ----
  
  # TERM=tty info
! #: info/info.c:1158
  #, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "Le terminal Â«Â %sÂ Â» n'est pas assez Ã©voluÃ© pour lancer Info."
  
! #: info/info.c:1159
  msgid "You are already at the last page of this node."
  msgstr "Vous Ãªtes dÃ©jÃ  Ã  la derniÃ¨re page de ce nÅ“ud."
  
! #: info/info.c:1160
  msgid "You are already at the first page of this node."
  msgstr "Vous Ãªtes dÃ©jÃ  Ã  la premiÃ¨re page de ce nÅ“ud."
  
! #: info/info.c:1161
  msgid "Only one window."
  msgstr "Une seule fenÃªtre."
  
! #: info/info.c:1162
  msgid "Resulting window would be too small."
  msgstr "La fenÃªtre rÃ©sultante serait trop petite."
  
! #: info/info.c:1163
  msgid "Not enough room for a help window, please delete a window."
  msgstr ""
***************
*** 948,982 ****
  msgstr "action Â«Â %sÂ Â» inconnue"
  
! #: info/infokey.c:482
  #, c-format
  msgid "action name too long"
  msgstr "nom d'action trop long"
  
! #: info/infokey.c:495
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "caractÃ¨res en surplus dÃ©tectÃ©s aprÃ¨s l'action Â«Â %sÂ Â»"
  
! #: info/infokey.c:506
  #, c-format
  msgid "missing variable name"
  msgstr "nom de variable manquant"
  
! #: info/infokey.c:515
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "Â«Â =Â Â» manquant immÃ©diatement aprÃ¨s la variable"
  
! #: info/infokey.c:522
  #, c-format
  msgid "variable name too long"
  msgstr "nom de variable trop long"
  
! #: info/infokey.c:546
  #, c-format
  msgid "value too long"
  msgstr "valeur trop longue"
  
! #: info/infokey.c:592
  #, c-format
  msgid "\"%s\", line %u: "
--- 944,978 ----
  msgstr "action Â«Â %sÂ Â» inconnue"
  
! #: info/infokey.c:485
  #, c-format
  msgid "action name too long"
  msgstr "nom d'action trop long"
  
! #: info/infokey.c:498
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "caractÃ¨res en surplus dÃ©tectÃ©s aprÃ¨s l'action Â«Â %sÂ Â»"
  
! #: info/infokey.c:509
  #, c-format
  msgid "missing variable name"
  msgstr "nom de variable manquant"
  
! #: info/infokey.c:518
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "Â«Â =Â Â» manquant immÃ©diatement aprÃ¨s la variable"
  
! #: info/infokey.c:525
  #, c-format
  msgid "variable name too long"
  msgstr "nom de variable trop long"
  
! #: info/infokey.c:549
  #, c-format
  msgid "value too long"
  msgstr "valeur trop longue"
  
! #: info/infokey.c:595
  #, c-format
  msgid "\"%s\", line %u: "
***************
*** 1305,1643 ****
  msgstr "Impossible de trouver le nÅ“ud rÃ©fÃ©rencÃ© par Â«Â %sÂ Â» dans Â«Â %sÂ Â»."
  
! #: info/session.c:2864
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "Lit une liste de menus, partant du rÃ©pertoire Â«Â dirÂ Â», et les suit"
  
! #: info/session.c:2866
  msgid "Follow menus: "
  msgstr "Suit les menusÂ : "
  
! #: info/session.c:2971
  msgid "Select the Next node"
  msgstr "SÃ©lectionne le nÅ“ud suivant (Â«Â NextÂ Â»)"
  
! #: info/session.c:2978
  msgid "Select the Prev node"
  msgstr "SÃ©lectionne le nÅ“ud prÃ©cÃ©dent (Â«Â PrevÂ Â»)"
  
! #: info/session.c:2985
  msgid "Select the Up node"
  msgstr "SÃ©lectionne le nÅ“ud supÃ©rieur (Â«Â UpÂ Â»)"
  
! #: info/session.c:2991
  msgid "Select the last node in this file"
  msgstr "SÃ©lectionne le dernier nÅ“ud dans ce fichier"
  
! #: info/session.c:3018 info/session.c:3051
  msgid "This window has no additional nodes"
  msgstr "Cette fenÃªtre n'a aucun nÅ“ud additionnel"
  
! #: info/session.c:3024
  msgid "Select the first node in this file"
  msgstr "SÃ©lectionne le premier nÅ“ud dans ce fichier"
  
! #: info/session.c:3158
  msgid "No more nodes within this document."
  msgstr "Aucun autre nÅ“ud dans ce document."
  
! #: info/session.c:3203 info/session.c:3243
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "Aucun nÅ“ud prÃ©cÃ©dent ou supÃ©rieur pour ce nÅ“ud dans ce document."
  
! #: info/session.c:3256
  msgid "Move forwards or down through node structure"
  msgstr "Avance ou descend dans la structure de nÅ“uds"
  
! #: info/session.c:3273
  msgid "Move backwards or up through node structure"
  msgstr "Recule ou monte dans la structure de nÅ“uds"
  
! #: info/session.c:3296
  msgid "Read a node name and select it"
  msgstr "Lit un nom de nÅ“ud et le sÃ©lectionne"
  
! #: info/session.c:3350 info/session.c:3354
  msgid "Goto node: "
  msgstr "Va au nÅ“udÂ : "
  
! #: info/session.c:3533
  msgid "Find the node describing program invocation"
  msgstr "Trouve le nÅ“ud dÃ©crivant l'appel du programme"
  
! #: info/session.c:3535
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Trouve le nÅ“ud Invocation de [%s]Â : "
  
! #: info/session.c:3580
  msgid "Read a manpage reference and select it"
  msgstr "Lit une rÃ©fÃ©rence de page de manuel et la sÃ©lectionne"
  
! #: info/session.c:3584
  msgid "Get Manpage: "
  msgstr "Obtenir la page de manuelÂ :"
  
! #: info/session.c:3605
  msgid "Select the node 'Top' in this file"
  msgstr "SÃ©lectionne le premier nÅ“ud (Â«Â TopÂ Â») de ce fichier"
  
! #: info/session.c:3611
  msgid "Select the node '(dir)'"
  msgstr "SÃ©lectionne le nÅ“ud Â«Â (dir)Â Â»"
  
! #: info/session.c:3617
  msgid "Show full file name of node being displayed"
  msgstr "Indique le nom de ficher complet du nÅ“ud affichÃ©"
  
! #: info/session.c:3634
  msgid "Select the most recently selected node"
  msgstr "Choisit le nÅ“ud le plus rÃ©cemment sÃ©lectionnÃ©"
  
! #: info/session.c:3639
  #, c-format
  msgid "No earlier node in history"
  msgstr "Aucun nÅ“ud antÃ©rieur dans l'historique."
  
! #: info/session.c:3643
  msgid "Read the name of a file and select it"
  msgstr "Lit le nom d'un fichier et le sÃ©lectionne"
  
! #: info/session.c:3647
  msgid "Find file: "
  msgstr "Trouve le fichierÂ : "
  
! #: info/session.c:3664
  #, c-format
  msgid "Cannot find '%s'."
  msgstr "Impossible de trouver Â«Â %sÂ Â»."
  
! #: info/session.c:3713
  #, c-format
  msgid "Could not create output file '%s'."
  msgstr "Impossible de crÃ©er le fichier de sortie Â«Â %sÂ Â»."
  
! #: info/session.c:3727
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "erreur d'Ã©criture dans %sÂ : %s"
  
! #: info/session.c:3736
  #, c-format
  msgid "closing %s"
  msgstr "fermeture de %s"
  
! #: info/session.c:3785
  #, c-format
  msgid "writing node %s..."
  msgstr "Ã©criture du nÅ“ud %s..."
  
! #: info/session.c:3831
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "Envoie le contenu de ce nÅ“ud Ã  la commande INFO_PRINT_COMMAND"
  
! #: info/session.c:3859
  #, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Impossible d'ouvrir un tube vers Â«Â %sÂ Â»."
  
! #: info/session.c:3864
  #, c-format
  msgid "printing node %s..."
  msgstr "impression du nÅ“ud %s..."
  
! #: info/session.c:3872
  #, c-format
  msgid "finished printing node %s"
  msgstr "impression du nÅ“ud Â«Â %sÂ Â» terminÃ©e"
  
! #: info/session.c:3904
  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."
  
! #: info/session.c:4169
  msgid "Search continued from the end of the document."
  msgstr "Poursuite de la recherche depuis la fin du document."
  
! #: info/session.c:4174
  msgid "Search continued from the beginning of the document."
  msgstr "Poursuite de la recherche depuis le dÃ©but du document."
  
! #: info/session.c:4194
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "Recherche dans le sous-fichier Â«Â %sÂ Â»..."
  
! #: info/session.c:4231
  msgid "Search failed."
  msgstr "Ã‰chec de la recherche."
  
! #: info/session.c:4248
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]Â : "
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Regexp search"
  msgstr "Recherche une expr. rationnelle"
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Search"
  msgstr "Recherche"
  
! #: info/session.c:4250 info/session.c:4256
  msgid " case-sensitively"
  msgstr " respectant la casse"
  
! #: info/session.c:4251 info/session.c:4257
  msgid " backward"
  msgstr " vers l'arriÃ¨re"
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%sÂ : "
  
! #: info/session.c:4274
  msgid "Search string too short"
  msgstr "ChaÃ®ne Ã  rechercher trop courte"
  
! #: info/session.c:4467
  #, c-format
  msgid "Going back to last match from %s"
  msgstr "Va Ã  la derniÃ¨re correspondance Ã  partir de %s"
  
! #: info/session.c:4491 info/session.c:4601
  #, c-format
  msgid "No more matches."
  msgstr "Pas d'autre correspondance"
  
! #: info/session.c:4628
  msgid "Search this node and subnodes for a string."
  msgstr "Recherche une chaÃ®ne dans ce nÅ“ud et ses enfants."
  
! #: info/session.c:4649
  msgid "Go to next match in Info sub-tree"
  msgstr "Va Ã  la correspondance suivante dans l'arborescence Info"
  
! #: info/session.c:4653 info/session.c:4665
  #, c-format
  msgid "No active search"
  msgstr "Pas de recherche en cours"
  
! #: info/session.c:4661
  msgid "Go to previous match in Info sub-tree"
  msgstr "Va Ã  la correspondance prÃ©cÃ©dante dans l'arborescence Info"
  
! #: info/session.c:4674
  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:4679
  msgid "Read a string and search for it"
  msgstr "Lit une chaÃ®ne et la recherche"
  
! #: info/session.c:4685
  msgid "Read a string and search backward for it"
  msgstr "Lit une chaÃ®ne et la recherche vers l'arriÃ¨re"
  
! #: info/session.c:4693
  msgid "Repeat last search in the same direction"
  msgstr "Recommence la derniÃ¨re recherche dans la mÃªme direction"
  
! #: info/session.c:4701 info/session.c:4746
  msgid "No previous search string"
  msgstr "Aucune chaÃ®ne de recherche antÃ©rieure"
  
! #: info/session.c:4738
  msgid "Repeat last search in the reverse direction"
  msgstr "RÃ©pÃ¨te la derniÃ¨re recherche dans la direction opposÃ©e"
  
! #: info/session.c:4785
  msgid "Clear displayed search matches"
  msgstr "Efface les mises en surbrillance"
  
! #: info/session.c:4802 info/session.c:4808
  msgid "Search interactively for a string as you type it"
  msgstr "Recherche interactive de la chaÃ®ne en cours de frappe"
  
! #: info/session.c:4928
  msgid "Regexp I-search backward: "
  msgstr "Recherche arriÃ¨re interactive d'exp. ration.Â : "
  
! #: info/session.c:4929
  msgid "I-search backward: "
  msgstr "Recherche arriÃ¨re interactiveÂ : "
  
! #: info/session.c:4931
  msgid "Regexp I-search: "
  msgstr "Recherche interactive d'exp. ration.Â : "
  
! #: info/session.c:4932
  msgid "I-search: "
  msgstr "Recherche interactiveÂ : "
  
! #: info/session.c:4957 info/session.c:4960
  msgid "Failing "
  msgstr "Ã‰chec "
  
! #: info/session.c:5326
  msgid "Cancel current operation"
  msgstr "Annule l'opÃ©ration en cours"
  
! #: info/session.c:5333
  msgid "Quit"
  msgstr "Quitte"
  
! #: info/session.c:5338
  msgid "Display version of Info being run"
  msgstr "Affiche la version d'Info en cours"
  
! #: info/session.c:5340
  #, c-format
  msgid "GNU Info version %s"
  msgstr "\"GNU Info version %s"
  
! #: info/session.c:5345
  msgid "Redraw the display"
  msgstr "Redessine l'Ã©cran"
  
! #: info/session.c:5382
  msgid "Quit using Info"
  msgstr "Quitte Info"
  
! #: info/session.c:5398
  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:5409
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Commande inconnue (%s)."
  
! #: info/session.c:5412
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "Â«Â %sÂ Â» est invalide"
  
! #: info/session.c:5413
  #, c-format
  msgid "'%s' is invalid"
  msgstr "Â«Â %sÂ Â» est invalide"
  
! #: info/session.c:5731
  msgid "Add this digit to the current numeric argument"
  msgstr "Ajouter ce chiffre Ã  l'argument numÃ©rique courant"
  
! #: info/session.c:5738
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "DÃ©marre (ou multiplie par 4) l'argument numÃ©rique courant"
--- 1301,1639 ----
  msgstr "Impossible de trouver le nÅ“ud rÃ©fÃ©rencÃ© par Â«Â %sÂ Â» dans Â«Â %sÂ Â»."
  
! #: info/session.c:2870
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "Lit une liste de menus, partant du rÃ©pertoire Â«Â dirÂ Â», et les suit"
  
! #: info/session.c:2872
  msgid "Follow menus: "
  msgstr "Suit les menusÂ : "
  
! #: info/session.c:2977
  msgid "Select the Next node"
  msgstr "SÃ©lectionne le nÅ“ud suivant (Â«Â NextÂ Â»)"
  
! #: info/session.c:2984
  msgid "Select the Prev node"
  msgstr "SÃ©lectionne le nÅ“ud prÃ©cÃ©dent (Â«Â PrevÂ Â»)"
  
! #: info/session.c:2991
  msgid "Select the Up node"
  msgstr "SÃ©lectionne le nÅ“ud supÃ©rieur (Â«Â UpÂ Â»)"
  
! #: info/session.c:2997
  msgid "Select the last node in this file"
  msgstr "SÃ©lectionne le dernier nÅ“ud dans ce fichier"
  
! #: info/session.c:3024 info/session.c:3057
  msgid "This window has no additional nodes"
  msgstr "Cette fenÃªtre n'a aucun nÅ“ud additionnel"
  
! #: info/session.c:3030
  msgid "Select the first node in this file"
  msgstr "SÃ©lectionne le premier nÅ“ud dans ce fichier"
  
! #: info/session.c:3164
  msgid "No more nodes within this document."
  msgstr "Aucun autre nÅ“ud dans ce document."
  
! #: info/session.c:3209 info/session.c:3249
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "Aucun nÅ“ud prÃ©cÃ©dent ou supÃ©rieur pour ce nÅ“ud dans ce document."
  
! #: info/session.c:3262
  msgid "Move forwards or down through node structure"
  msgstr "Avance ou descend dans la structure de nÅ“uds"
  
! #: info/session.c:3279
  msgid "Move backwards or up through node structure"
  msgstr "Recule ou monte dans la structure de nÅ“uds"
  
! #: info/session.c:3302
  msgid "Read a node name and select it"
  msgstr "Lit un nom de nÅ“ud et le sÃ©lectionne"
  
! #: info/session.c:3356 info/session.c:3360
  msgid "Goto node: "
  msgstr "Va au nÅ“udÂ : "
  
! #: info/session.c:3539
  msgid "Find the node describing program invocation"
  msgstr "Trouve le nÅ“ud dÃ©crivant l'appel du programme"
  
! #: info/session.c:3541
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Trouve le nÅ“ud Invocation de [%s]Â : "
  
! #: info/session.c:3586
  msgid "Read a manpage reference and select it"
  msgstr "Lit une rÃ©fÃ©rence de page de manuel et la sÃ©lectionne"
  
! #: info/session.c:3590
  msgid "Get Manpage: "
  msgstr "Obtenir la page de manuelÂ :"
  
! #: info/session.c:3611
  msgid "Select the node 'Top' in this file"
  msgstr "SÃ©lectionne le premier nÅ“ud (Â«Â TopÂ Â») de ce fichier"
  
! #: info/session.c:3617
  msgid "Select the node '(dir)'"
  msgstr "SÃ©lectionne le nÅ“ud Â«Â (dir)Â Â»"
  
! #: info/session.c:3623
  msgid "Show full file name of node being displayed"
  msgstr "Indique le nom de ficher complet du nÅ“ud affichÃ©"
  
! #: info/session.c:3640
  msgid "Select the most recently selected node"
  msgstr "Choisit le nÅ“ud le plus rÃ©cemment sÃ©lectionnÃ©"
  
! #: info/session.c:3645
  #, c-format
  msgid "No earlier node in history"
  msgstr "Aucun nÅ“ud antÃ©rieur dans l'historique."
  
! #: info/session.c:3649
  msgid "Read the name of a file and select it"
  msgstr "Lit le nom d'un fichier et le sÃ©lectionne"
  
! #: info/session.c:3653
  msgid "Find file: "
  msgstr "Trouve le fichierÂ : "
  
! #: info/session.c:3670
  #, c-format
  msgid "Cannot find '%s'."
  msgstr "Impossible de trouver Â«Â %sÂ Â»."
  
! #: info/session.c:3719
  #, c-format
  msgid "Could not create output file '%s'."
  msgstr "Impossible de crÃ©er le fichier de sortie Â«Â %sÂ Â»."
  
! #: info/session.c:3733
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "erreur d'Ã©criture dans %sÂ : %s"
  
! #: info/session.c:3742
  #, c-format
  msgid "closing %s"
  msgstr "fermeture de %s"
  
! #: info/session.c:3791
  #, c-format
  msgid "writing node %s..."
  msgstr "Ã©criture du nÅ“ud %s..."
  
! #: info/session.c:3837
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "Envoie le contenu de ce nÅ“ud Ã  la commande INFO_PRINT_COMMAND"
  
! #: info/session.c:3865
  #, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Impossible d'ouvrir un tube vers Â«Â %sÂ Â»."
  
! #: info/session.c:3870
  #, c-format
  msgid "printing node %s..."
  msgstr "impression du nÅ“ud %s..."
  
! #: info/session.c:3878
  #, c-format
  msgid "finished printing node %s"
  msgstr "impression du nÅ“ud Â«Â %sÂ Â» terminÃ©e"
  
! #: info/session.c:3910
  msgid "Toggle the usage of regular expressions in searches"
  msgstr "Marche-arrÃªt des expressions rationnelles dans les recherches"
  
! #: info/session.c:3914
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr "La recherche utilise des expressions rationnelles."
  
! #: info/session.c:3915
  #, c-format
  msgid "Using literal strings for searches."
  msgstr "La recherche utilise des chaÃ®nes littÃ©rales."
  
! #: info/session.c:4175
  msgid "Search continued from the end of the document."
  msgstr "Poursuite de la recherche depuis la fin du document."
  
! #: info/session.c:4180
  msgid "Search continued from the beginning of the document."
  msgstr "Poursuite de la recherche depuis le dÃ©but du document."
  
! #: info/session.c:4200
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "Recherche dans le sous-fichier Â«Â %sÂ Â»..."
  
! #: info/session.c:4237
  msgid "Search failed."
  msgstr "Ã‰chec de la recherche."
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]Â : "
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Regexp search"
  msgstr "Recherche une expr. rationnelle"
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Search"
  msgstr "Recherche"
  
! #: info/session.c:4256 info/session.c:4262
  msgid " case-sensitively"
  msgstr " respectant la casse"
  
! #: info/session.c:4257 info/session.c:4263
  msgid " backward"
  msgstr " vers l'arriÃ¨re"
  
! #: info/session.c:4260
  #, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%sÂ : "
  
! #: info/session.c:4280
  msgid "Search string too short"
  msgstr "ChaÃ®ne Ã  rechercher trop courte"
  
! #: info/session.c:4473
  #, c-format
  msgid "Going back to last match from %s"
  msgstr "Va Ã  la derniÃ¨re correspondance Ã  partir de %s"
  
! #: info/session.c:4497 info/session.c:4607
  #, c-format
  msgid "No more matches."
  msgstr "Pas d'autre correspondance"
  
! #: info/session.c:4634
  msgid "Search this node and subnodes for a string."
  msgstr "Recherche une chaÃ®ne dans ce nÅ“ud et ses enfants."
  
! #: info/session.c:4655
  msgid "Go to next match in Info sub-tree"
  msgstr "Va Ã  la correspondance suivante dans l'arborescence Info"
  
! #: info/session.c:4659 info/session.c:4671
  #, c-format
  msgid "No active search"
  msgstr "Pas de recherche en cours"
  
! #: info/session.c:4667
  msgid "Go to previous match in Info sub-tree"
  msgstr "Va Ã  la correspondance prÃ©cÃ©dante dans l'arborescence Info"
  
! #: info/session.c:4680
  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:4685
  msgid "Read a string and search for it"
  msgstr "Lit une chaÃ®ne et la recherche"
  
! #: info/session.c:4691
  msgid "Read a string and search backward for it"
  msgstr "Lit une chaÃ®ne et la recherche vers l'arriÃ¨re"
  
! #: info/session.c:4699
  msgid "Repeat last search in the same direction"
  msgstr "Recommence la derniÃ¨re recherche dans la mÃªme direction"
  
! #: info/session.c:4707 info/session.c:4752
  msgid "No previous search string"
  msgstr "Aucune chaÃ®ne de recherche antÃ©rieure"
  
! #: info/session.c:4744
  msgid "Repeat last search in the reverse direction"
  msgstr "RÃ©pÃ¨te la derniÃ¨re recherche dans la direction opposÃ©e"
  
! #: info/session.c:4791
  msgid "Clear displayed search matches"
  msgstr "Efface les mises en surbrillance"
  
! #: info/session.c:4808 info/session.c:4814
  msgid "Search interactively for a string as you type it"
  msgstr "Recherche interactive de la chaÃ®ne en cours de frappe"
  
! #: info/session.c:4934
  msgid "Regexp I-search backward: "
  msgstr "Recherche arriÃ¨re interactive d'exp. ration.Â : "
  
! #: info/session.c:4935
  msgid "I-search backward: "
  msgstr "Recherche arriÃ¨re interactiveÂ : "
  
! #: info/session.c:4937
  msgid "Regexp I-search: "
  msgstr "Recherche interactive d'exp. ration.Â : "
  
! #: info/session.c:4938
  msgid "I-search: "
  msgstr "Recherche interactiveÂ : "
  
! #: info/session.c:4963 info/session.c:4966
  msgid "Failing "
  msgstr "Ã‰chec "
  
! #: info/session.c:5332
  msgid "Cancel current operation"
  msgstr "Annule l'opÃ©ration en cours"
  
! #: info/session.c:5339
  msgid "Quit"
  msgstr "Quitte"
  
! #: info/session.c:5344
  msgid "Display version of Info being run"
  msgstr "Affiche la version d'Info en cours"
  
! #: info/session.c:5346
  #, c-format
  msgid "GNU Info version %s"
  msgstr "\"GNU Info version %s"
  
! #: info/session.c:5351
  msgid "Redraw the display"
  msgstr "Redessine l'Ã©cran"
  
! #: info/session.c:5388
  msgid "Quit using Info"
  msgstr "Quitte Info"
  
! #: info/session.c:5404
  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:5415
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Commande inconnue (%s)."
  
! #: info/session.c:5418
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "Â«Â %sÂ Â» est invalide"
  
! #: info/session.c:5419
  #, c-format
  msgid "'%s' is invalid"
  msgstr "Â«Â %sÂ Â» est invalide"
  
! #: info/session.c:5737
  msgid "Add this digit to the current numeric argument"
  msgstr "Ajouter ce chiffre Ã  l'argument numÃ©rique courant"
  
! #: info/session.c:5744
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "DÃ©marre (ou multiplie par 4) l'argument numÃ©rique courant"
***************
*** 1779,1796 ****
  msgstr "Donner Ã  %s la valeur (%s)Â : "
  
! #: info/window.c:959
  msgid "-----Info: (), lines ----, "
  msgstr "-----InfoÂ : (), lignes ----, "
  
- #: info/window.c:966
- #, c-format
- msgid "-%s---Info: %s, %ld lines --%s--"
- msgstr "-%s---InfoÂ : %s, %ld lignes --%s--"
- 
- #: info/window.c:970
- #, c-format
- msgid "-%s---Info: (%s)%s, %ld lines --%s--"
- msgstr "-%s---InfoÂ : (%s)%s, %ld lignes --%s--"
- 
  #: install-info/install-info.c:292
  #, c-format
--- 1775,1782 ----
  msgstr "Donner Ã  %s la valeur (%s)Â : "
  
! #: info/window.c:909
  msgid "-----Info: (), lines ----, "
  msgstr "-----InfoÂ : (), lignes ----, "
  
  #: install-info/install-info.c:292
  #, c-format
***************
*** 1984,1988 ****
  "\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"
--- 1970,1974 ----
  "\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"
***************
*** 2001,2008 ****
  "\n"
  "  Ceci (le nÅ“ud RÃ©pertoire) fournit un menu des sujets majeurs.\n"
! "  Emtrez Â«Â qÂ Â» pour quitter, Â«Â ?Â Â» pour afficher toutes les commandes Info,\n"
  "  Â«Â dÂ Â» pour revenir iciÂ ;, Â«Â hÂ Â» affiche un guide d'initiation pour les\n"
! "  nouveaux venus, Â«Â mEmacs<EntrÃ©e>Â Â» dÃ©marre une consultation du manuel\n"
! "  Emacs, et cÃ¦tera.\n"
  "\n"
  "  Dans Emacs, vous pouvez cliquer avec le deuxiÃ¨me bouton de la souris\n"
--- 1987,1994 ----
  "\n"
  "  Ceci (le nÅ“ud RÃ©pertoire) fournit un menu des sujets majeurs.\n"
! "  Entrez Â«Â qÂ Â» pour quitter, Â«Â HÂ Â» pour afficher toutes les commandes Info,\n"
  "  Â«Â dÂ Â» pour revenir iciÂ ;, Â«Â hÂ Â» affiche un guide d'initiation pour les\n"
! "  nouveaux venus.\n"
! "  Â«Â mEmacs<EntrÃ©e>Â Â» dÃ©marre une consultation du manuel Emacs, et cÃ¦tera.\n"
  "\n"
  "  Dans Emacs, vous pouvez cliquer avec le deuxiÃ¨me bouton de la souris\n"
***************
*** 2076,2192 ****
  msgstr "aucune entrÃ©e pour Â«Â %sÂ Â»Â ; aucune suppression"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:855
! #: tp/Texinfo/Convert/Converter.pm:893 tp/Texinfo/Convert/Converter.pm:1204
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6504
! #: tp/Texinfo/Convert/HTML.pm:6528 tp/Texinfo/Convert/HTML.pm:6905
! #: tp/Texinfo/Convert/HTML.pm:6963 tp/Texinfo/Convert/HTML.pm:7041
! #: tp/Texinfo/Convert/HTML.pm:7118 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:546
! #: tp/Texinfo/Convert/TexinfoXML.pm:457
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "impossible d'ouvrir %s en Ã©critureÂ : %s"
  
! #: tp/Texinfo/Common.pm:881
  msgid "recursion is always allowed"
  msgstr "la rÃ©cursivitÃ© est toujours autorisÃ©e"
  
! #: tp/Texinfo/Common.pm:882
  msgid "arguments are quoted by default"
  msgstr "les arguments sont entre guillemets par dÃ©faut"
  
! #: tp/Texinfo/Common.pm:1105
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s n'est pas un code de langue"
  
! #: tp/Texinfo/Common.pm:1110
  #, 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:1128
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%s n'est pas une division valable"
  
! #: tp/Texinfo/Common.pm:1151
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "impossible de lire %sÂ : %s"
  
! #: tp/Texinfo/Common.pm:1170
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "erreur de fermeture du fichier @verbatiminclude %sÂ : %s"
  
! #: tp/Texinfo/Common.pm:1176 tp/Texinfo/Parser.pm:3353
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%sÂ : impossible de trouver %s"
  
! #: tp/Texinfo/Common.pm:1520
! #, 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/Common.pm:1548
! msgid "missing type"
! msgstr "type manquant"
! 
! #: tp/Texinfo/Common.pm:1551
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "type inconnuÂ : %s"
! 
! #: tp/Texinfo/Common.pm:1568
! #, 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/Common.pm:1603
  msgid "no node to be renamed"
  msgstr "aucun nÅ“ud Ã  renommer"
  
! #: tp/Texinfo/Common.pm:1614
  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:1624 tp/Texinfo/Parser.pm:926
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "impossible d'ouvrir %sÂ : %s"
  
! #: tp/Texinfo/Common.pm:2144
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr "impossible de protÃ©ger le caractÃ¨re hash dans @%s"
  
! #: tp/Texinfo/Convert/Converter.pm:395 tp/Texinfo/Convert/Converter.pm:414
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Variable %s obsolÃ¨te\n"
  
! #: tp/Texinfo/Convert/Converter.pm:794
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr "%sÂ : sotie incompatible avec des divisions"
  
! #: tp/Texinfo/Convert/Converter.pm:876 tp/Texinfo/Convert/Converter.pm:909
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:6931
! #: tp/Texinfo/Convert/HTML.pm:6989 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:476 tp/Texinfo/Parser.pm:2035
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "erreur lors de la fermeture de %sÂ : %s"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, 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:995
  #, perl-format
  msgid "could not create directory `%s': %s"
--- 2062,2174 ----
  msgstr "aucune entrÃ©e pour Â«Â %sÂ Â»Â ; aucune suppression"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:847
! #: tp/Texinfo/Convert/Converter.pm:885 tp/Texinfo/Convert/Converter.pm:1196
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6573
! #: tp/Texinfo/Convert/HTML.pm:6597 tp/Texinfo/Convert/HTML.pm:6978
! #: tp/Texinfo/Convert/HTML.pm:7037 tp/Texinfo/Convert/HTML.pm:7115
! #: tp/Texinfo/Convert/HTML.pm:7192 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:547
! #: tp/Texinfo/Convert/TexinfoXML.pm:458
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "impossible d'ouvrir %s en Ã©critureÂ : %s"
  
! #: tp/Texinfo/Common.pm:862
  msgid "recursion is always allowed"
  msgstr "la rÃ©cursivitÃ© est toujours autorisÃ©e"
  
! #: tp/Texinfo/Common.pm:863
  msgid "arguments are quoted by default"
  msgstr "les arguments sont entre guillemets par dÃ©faut"
  
! #: tp/Texinfo/Common.pm:866
! 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:869
! msgid ""
! "move your @shortcontents and @contents commands if you want the contents "
! "after the title page"
! 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:1093
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s n'est pas un code de langue"
  
! #: tp/Texinfo/Common.pm:1098
  #, 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:1116
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%s n'est pas une division valable"
  
! #: tp/Texinfo/Common.pm:1139
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "impossible de lire %sÂ : %s"
  
! #: tp/Texinfo/Common.pm:1158
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "erreur de fermeture du fichier @verbatiminclude %sÂ : %s"
  
! #: tp/Texinfo/Common.pm:1164 tp/Texinfo/Parser.pm:3193
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%sÂ : impossible de trouver %s"
  
! #: tp/Texinfo/Common.pm:1637
  msgid "no node to be renamed"
  msgstr "aucun nÅ“ud Ã  renommer"
  
! #: tp/Texinfo/Common.pm:1648
  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:1658 tp/Texinfo/Parser.pm:899
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "impossible d'ouvrir %sÂ : %s"
  
! #: tp/Texinfo/Common.pm:2178
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr "impossible de protÃ©ger le caractÃ¨re hash dans @%s"
  
! #: tp/Texinfo/Convert/Converter.pm:387 tp/Texinfo/Convert/Converter.pm:406
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Variable %s obsolÃ¨te\n"
  
! #: tp/Texinfo/Convert/Converter.pm:786
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr "%sÂ : sotie incompatible avec des divisions"
  
! #: tp/Texinfo/Convert/Converter.pm:868 tp/Texinfo/Convert/Converter.pm:901
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:7004
! #: tp/Texinfo/Convert/HTML.pm:7063 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:477 tp/Texinfo/Parser.pm:1996
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "erreur lors de la fermeture de %sÂ : %s"
  
! #: tp/Texinfo/Convert/Converter.pm:979
  #, 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:987
  #, perl-format
  msgid "could not create directory `%s': %s"
***************
*** 2198,2206 ****
  msgstr "fichier @image Â«Â %sÂ Â» non trouvÃ©Â ; utilisation de Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5388
  msgid "no argument specified for @U"
  msgstr "aucun argument spÃ©cifiÃ© Ã  @U"
  
! #: tp/Texinfo/Convert/HTML.pm:1683
  #, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
--- 2180,2188 ----
  msgstr "fichier @image Â«Â %sÂ Â» non trouvÃ©Â ; utilisation de Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5225
  msgid "no argument specified for @U"
  msgstr "aucun argument spÃ©cifiÃ© Ã  @U"
  
! #: tp/Texinfo/Convert/HTML.pm:1715
  #, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
***************
*** 2208,2254 ****
  "fichier @image Â«Â %sÂ Â» (pour le HTML) non trouvÃ©Â ; utilisation de Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Convert/HTML.pm:2371
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "le format brut %s n'est pas converti"
  
! #: tp/Texinfo/Convert/HTML.pm:4888
  msgid "string not closed in css file"
  msgstr "chaÃ®ne non terminÃ©e dans le fichier css"
  
! #: tp/Texinfo/Convert/HTML.pm:4890
  msgid "--css-include ended in comment"
  msgstr "--css-include s'est terminÃ© dans un commentaire"
  
! #: tp/Texinfo/Convert/HTML.pm:4892
  msgid "@import not finished in css file"
  msgstr "@import non terminÃ© dans le fichier css"
  
! #: tp/Texinfo/Convert/HTML.pm:4918
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "fichier CSS %s non trouvÃ©"
  
! #: tp/Texinfo/Convert/HTML.pm:4924
  #, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "impossible d'ouvrir --include-file %sÂ : %s"
  
! #: tp/Texinfo/Convert/HTML.pm:4934
  #, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "erreur de fermeture du fichier CSS %sÂ : %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5801 tp/Texinfo/Convert/HTML.pm:5805
  #, 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:6499
  #, 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:6523
  #, perl-format
  msgid "error on closing TOC frame file %s: %s"
--- 2190,2255 ----
  "fichier @image Â«Â %sÂ Â» (pour le HTML) non trouvÃ©Â ; utilisation de Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Convert/HTML.pm:2399
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "le format brut %s n'est pas converti"
  
! #: tp/Texinfo/Convert/HTML.pm:4629
! #, 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:4657
! msgid "missing type"
! msgstr "type manquant"
! 
! #: tp/Texinfo/Convert/HTML.pm:4660
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "type inconnuÂ : %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4677
! #, 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:4962
  msgid "string not closed in css file"
  msgstr "chaÃ®ne non terminÃ©e dans le fichier css"
  
! #: tp/Texinfo/Convert/HTML.pm:4964
  msgid "--css-include ended in comment"
  msgstr "--css-include s'est terminÃ© dans un commentaire"
  
! #: tp/Texinfo/Convert/HTML.pm:4966
  msgid "@import not finished in css file"
  msgstr "@import non terminÃ© dans le fichier css"
  
! #: tp/Texinfo/Convert/HTML.pm:4992
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "fichier CSS %s non trouvÃ©"
  
! #: tp/Texinfo/Convert/HTML.pm:4998
  #, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "impossible d'ouvrir --include-file %sÂ : %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5008
  #, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "erreur de fermeture du fichier CSS %sÂ : %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5870 tp/Texinfo/Convert/HTML.pm:5874
  #, 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:6568
  #, 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:6592
  #, perl-format
  msgid "error on closing TOC frame file %s: %s"
***************
*** 2256,2289 ****
  "erreur de fermeture du fichier-cadre de table des matiÃ¨res (TOC) %sÂ : %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6638
  #, 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:6839
  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:7048
  #, 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:7073
  #, 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:7079
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "le nÅ“ud renommÃ© Â«Â %sÂ Â» est un fichier vide"
  
! #: tp/Texinfo/Convert/HTML.pm:7093
  #, 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:7125
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
--- 2257,2290 ----
  "erreur de fermeture du fichier-cadre de table des matiÃ¨res (TOC) %sÂ : %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6707
  #, 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:6912
  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:7122
  #, 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:7147
  #, 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:7153
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "le nÅ“ud renommÃ© Â«Â %sÂ Â» est un fichier vide"
  
! #: tp/Texinfo/Convert/HTML.pm:7167
  #, 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:7199
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
***************
*** 2291,2299 ****
  "erreur de fermeture du fichier de redirection des nÅ“uds renommÃ©s %sÂ : %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7163
  msgid "empty node name"
  msgstr "nom de nÅ“ud vide"
  
! #: tp/Texinfo/Convert/HTML.pm:7165 tp/Texinfo/Parser.pm:3697
  #, perl-format
  msgid "syntax for an external node used for `%s'"
--- 2292,2300 ----
  "erreur de fermeture du fichier de redirection des nÅ“uds renommÃ©s %sÂ : %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7237
  msgid "empty node name"
  msgstr "nom de nÅ“ud vide"
  
! #: tp/Texinfo/Convert/HTML.pm:7239 tp/Texinfo/Parser.pm:3542
  #, perl-format
  msgid "syntax for an external node used for `%s'"
***************
*** 2328,2332 ****
  msgstr "nom de @node ne doit pas contenir de Â«Â ,Â Â»Â : %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1334
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
--- 2329,2333 ----
  msgstr "nom de @node ne doit pas contenir de Â«Â ,Â Â»Â : %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1335
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
***************
*** 2334,2358 ****
  "Une entrÃ©e d'index dans @%s comporte un : qui produit de l'Info invalideÂ : %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1381 tp/Texinfo/Parser.pm:2722
  #, 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:1495
  #, 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:1500
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "fichier @image Â«Â %sÂ Â» illisibleÂ : %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1523
  #, 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:1931
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
--- 2335,2359 ----
  "Une entrÃ©e d'index dans @%s comporte un : qui produit de l'Info invalideÂ : %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1382 tp/Texinfo/Parser.pm:2568
  #, 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:1496
  #, 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:1501
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "fichier @image Â«Â %sÂ Â» illisibleÂ : %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1524
  #, 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:1932
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
***************
*** 2362,2512 ****
  "Ã©viter cela"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2161
  #, 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:2193
  #, 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:2226
  #, 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:2272
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "Â«Â .Â Â» ou Â«Â ,Â Â» doit suivre @xref, pas %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2275
  msgid "`.' or `,' must follow @xref"
  msgstr "Â«Â .Â Â» ou Â«Â ,Â Â» doit suivre @xref"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3118
  #, 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:3129
  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:3145
  msgid "menu entry name should not contain `:'"
  msgstr "une entrÃ©e de menu ne devrait pas contenir de Â«Â :Â Â»"
  
! #: tp/Texinfo/Parser.pm:910
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr "@%s est uniquement permis en dÃ©but ou en fin de document"
  
! #: tp/Texinfo/Parser.pm:1160 tp/Texinfo/Structuring.pm:594
  #, perl-format
  msgid "multiple @%s"
  msgstr "@%s multiples"
  
! #: tp/Texinfo/Parser.pm:1194
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "syntaxe incorrecte de l'argument de @%sÂ : %s"
! 
! #: tp/Texinfo/Parser.pm:1210
  #, perl-format
  msgid "bad or empty @%s formal argument: %s"
  msgstr "argument formel @%s erronÃ© ou videÂ : %s"
  
! #: tp/Texinfo/Parser.pm:1219 tp/Texinfo/Parser.pm:4856
! #: tp/Texinfo/Parser.pm:4882 tp/Texinfo/Parser.pm:5671
! #: tp/Texinfo/Parser.pm:5687 tp/Texinfo/Parser.pm:5702
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s a besoin d'un nom"
  
! #: tp/Texinfo/Parser.pm:1223 tp/Texinfo/Parser.pm:4859
! #: tp/Texinfo/Parser.pm:4885 tp/Texinfo/Parser.pm:5674
! #: tp/Texinfo/Parser.pm:5690 tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad name for @%s"
  msgstr "mauvais nom pour @%s"
  
! #: tp/Texinfo/Parser.pm:1341
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr "@end %s prÃ©sent avant l'accolade clÃ´turant @%s"
  
! #: tp/Texinfo/Parser.pm:1345
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "@%s prÃ©sent avant l'accolade clÃ´turant @%s"
  
! #: tp/Texinfo/Parser.pm:1350
  #, perl-format
! msgid "%c%s missing close brace"
  msgstr "%c%s sans accolade fermante"
  
! #: tp/Texinfo/Parser.pm:1354
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "@%s sans sÃ©quence de dÃ©limiteur de fermetureÂ : %s}"
  
! #: tp/Texinfo/Parser.pm:1476
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "@itemx ne doit pas dÃ©buter @%s"
  
! #: tp/Texinfo/Parser.pm:1544
  msgid "@itemx must follow @item"
  msgstr "@itemx doit suivre @item"
  
! #: tp/Texinfo/Parser.pm:1712
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr "@%s contient du texte mais pas d'@item"
  
! #: tp/Texinfo/Parser.pm:1743
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "Â«Â @endÂ Â» attendait Â«Â %sÂ Â», mais a eu Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Parser.pm:1746
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@%s prÃ©sent avant @end %s"
  
! #: tp/Texinfo/Parser.pm:1750
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "aucun Â«Â %cend %sÂ Â» correspondant"
  
! #: tp/Texinfo/Parser.pm:1776 tp/Texinfo/Parser.pm:5204
! #: tp/Texinfo/Parser.pm:5470
  #, perl-format
  msgid "misplaced %c"
  msgstr "%c mal placÃ©e"
  
! #: tp/Texinfo/Parser.pm:1874 tp/Texinfo/Parser.pm:3312
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "Â«Â %c%sÂ Â» sans correspondance"
  
! #: tp/Texinfo/Parser.pm:2110
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "macro Â«Â %sÂ Â» appelÃ©e avec trop d'arguments"
  
! #: tp/Texinfo/Parser.pm:2132
  #, perl-format
! msgid "@%s missing close brace"
  msgstr "@%s sans accolade fermante"
  
! #: tp/Texinfo/Parser.pm:2140
  #, 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/Parser.pm:2175
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
--- 2363,2513 ----
  "Ã©viter cela"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2162
  #, 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:2194
  #, 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:2227
  #, 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:2273
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "Â«Â .Â Â» ou Â«Â ,Â Â» doit suivre @xref, pas %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2276
  msgid "`.' or `,' must follow @xref"
  msgstr "Â«Â .Â Â» ou Â«Â ,Â Â» doit suivre @xref"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3086
  #, 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:3097
  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:3113
  msgid "menu entry name should not contain `:'"
  msgstr "une entrÃ©e de menu ne devrait pas contenir de Â«Â :Â Â»"
  
! #: tp/Texinfo/Parser.pm:883
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr "@%s est uniquement permis en dÃ©but ou en fin de document"
  
! #: tp/Texinfo/Parser.pm:1125 tp/Texinfo/Structuring.pm:595
  #, perl-format
  msgid "multiple @%s"
  msgstr "@%s multiples"
  
! #: tp/Texinfo/Parser.pm:1166
  #, perl-format
  msgid "bad or empty @%s formal argument: %s"
  msgstr "argument formel @%s erronÃ© ou videÂ : %s"
  
! #: tp/Texinfo/Parser.pm:1176
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "syntaxe incorrecte de l'argument de @%sÂ : %s"
! 
! #: tp/Texinfo/Parser.pm:1183 tp/Texinfo/Parser.pm:4707
! #: tp/Texinfo/Parser.pm:4733 tp/Texinfo/Parser.pm:5565
! #: tp/Texinfo/Parser.pm:5578 tp/Texinfo/Parser.pm:5592
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s a besoin d'un nom"
  
! #: tp/Texinfo/Parser.pm:1187 tp/Texinfo/Parser.pm:4710
! #: tp/Texinfo/Parser.pm:4736 tp/Texinfo/Parser.pm:5568
! #: tp/Texinfo/Parser.pm:5581 tp/Texinfo/Parser.pm:5595
  #, perl-format
  msgid "bad name for @%s"
  msgstr "mauvais nom pour @%s"
  
! #: tp/Texinfo/Parser.pm:1305
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr "@end %s prÃ©sent avant l'accolade clÃ´turant @%s"
  
! #: tp/Texinfo/Parser.pm:1309
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "@%s prÃ©sent avant l'accolade clÃ´turant @%s"
  
! #: tp/Texinfo/Parser.pm:1314
  #, perl-format
! msgid "%c%s missing closing brace"
  msgstr "%c%s sans accolade fermante"
  
! #: tp/Texinfo/Parser.pm:1318
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "@%s sans sÃ©quence de dÃ©limiteur de fermetureÂ : %s}"
  
! #: tp/Texinfo/Parser.pm:1440
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "@itemx ne doit pas dÃ©buter @%s"
  
! #: tp/Texinfo/Parser.pm:1508
  msgid "@itemx must follow @item"
  msgstr "@itemx doit suivre @item"
  
! #: tp/Texinfo/Parser.pm:1676
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr "@%s contient du texte mais pas d'@item"
  
! #: tp/Texinfo/Parser.pm:1707
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "Â«Â @endÂ Â» attendait Â«Â %sÂ Â», mais a eu Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Parser.pm:1710
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@%s prÃ©sent avant @end %s"
  
! #: tp/Texinfo/Parser.pm:1714
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "aucun Â«Â %cend %sÂ Â» correspondant"
  
! #: tp/Texinfo/Parser.pm:1738 tp/Texinfo/Parser.pm:5070
! #: tp/Texinfo/Parser.pm:5308
  #, perl-format
  msgid "misplaced %c"
  msgstr "%c mal placÃ©e"
  
! #: tp/Texinfo/Parser.pm:1835 tp/Texinfo/Parser.pm:3148
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "Â«Â %c%sÂ Â» sans correspondance"
  
! #: tp/Texinfo/Parser.pm:2072
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "macro Â«Â %sÂ Â» appelÃ©e avec trop d'arguments"
  
! #: tp/Texinfo/Parser.pm:2094
  #, perl-format
! msgid "@%s missing closing brace"
  msgstr "@%s sans accolade fermante"
  
! #: tp/Texinfo/Parser.pm:2102
  #, 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/Parser.pm:2138
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
***************
*** 2515,2564 ****
  "ou de \\"
  
! #: tp/Texinfo/Parser.pm:2650
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s Â«Â %sÂ Â» dÃ©jÃ  dÃ©fini"
  
! #: tp/Texinfo/Parser.pm:2655
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "voici la dÃ©finition prÃ©cÃ©dente de @%s"
  
! #: tp/Texinfo/Parser.pm:3016
  #, perl-format
  msgid "missing name for @%s"
  msgstr "@%s sans nom"
  
! #: tp/Texinfo/Parser.pm:3021
  #, perl-format
  msgid "missing category for @%s"
  msgstr "@%s sans catÃ©gorie"
  
! #: tp/Texinfo/Parser.pm:3073
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "argument inattendu Ã  la ligne @%sÂ : %s"
  
! #: tp/Texinfo/Parser.pm:3089
  msgid "empty multitable"
  msgstr "multitable vide"
  
! #: tp/Texinfo/Parser.pm:3145 tp/Texinfo/Parser.pm:5784
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "argument superflu Ã  @%s"
  
! #: tp/Texinfo/Parser.pm:3151 tp/Texinfo/Parser.pm:5806
! #: tp/Texinfo/Parser.pm:5818
  #, perl-format
  msgid "bad argument to @%s"
  msgstr "mauvais argument Ã  @%s"
  
! #: tp/Texinfo/Parser.pm:3162
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s nÃ©cessite un argumentÂ : le formateur %citem"
  
! #: tp/Texinfo/Parser.pm:3167
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
--- 2516,2565 ----
  "ou de \\"
  
! #: tp/Texinfo/Parser.pm:2501
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s Â«Â %sÂ Â» dÃ©jÃ  dÃ©fini"
  
! #: tp/Texinfo/Parser.pm:2506
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "voici la dÃ©finition prÃ©cÃ©dente de @%s"
  
! #: tp/Texinfo/Parser.pm:2850
  #, perl-format
  msgid "missing name for @%s"
  msgstr "@%s sans nom"
  
! #: tp/Texinfo/Parser.pm:2855
  #, perl-format
  msgid "missing category for @%s"
  msgstr "@%s sans catÃ©gorie"
  
! #: tp/Texinfo/Parser.pm:2890
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "argument inattendu Ã  la ligne @%sÂ : %s"
  
! #: tp/Texinfo/Parser.pm:2905
  msgid "empty multitable"
  msgstr "multitable vide"
  
! #: tp/Texinfo/Parser.pm:2959 tp/Texinfo/Parser.pm:5673
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "argument superflu Ã  @%s"
  
! #: tp/Texinfo/Parser.pm:2965 tp/Texinfo/Parser.pm:5694
! #: tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad argument to @%s"
  msgstr "mauvais argument Ã  @%s"
  
! #: tp/Texinfo/Parser.pm:2976
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s nÃ©cessite un argumentÂ : le formateur %citem"
  
! #: tp/Texinfo/Parser.pm:2981
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
***************
*** 2567,2629 ****
  "pas se trouver sur une ligne @%s"
  
! #: tp/Texinfo/Parser.pm:3202
  #, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "commande d'accentuation Â«Â @%sÂ Â» interdite en argument Ã  @%s"
  
! #: tp/Texinfo/Parser.pm:3290 tp/Texinfo/Parser.pm:3429
! #: tp/Texinfo/Parser.pm:5777
  #, perl-format
  msgid "@%s missing argument"
  msgstr "@%s sans d'argument"
  
! #: tp/Texinfo/Parser.pm:3302
  #, perl-format
  msgid "unknown @end %s"
  msgstr "@end %s inconnu"
  
! #: tp/Texinfo/Parser.pm:3324 tp/Texinfo/Parser.pm:3943
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "argument superflu Ã  @%s %sÂ : %s"
  
! #: tp/Texinfo/Parser.pm:3329 tp/Texinfo/Parser.pm:5861
! #: tp/Texinfo/Parser.pm:5906 tp/Texinfo/Parser.pm:5935
! #: tp/Texinfo/Parser.pm:5976 tp/Texinfo/Parser.pm:6055
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "mauvais argument Ã  @%sÂ : %s"
  
! #: tp/Texinfo/Parser.pm:3348
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%sÂ : impossible d'ouvrir %sÂ : %s"
  
! #: tp/Texinfo/Parser.pm:3360
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr "le codage Â«Â %sÂ Â» n'est pas acceptÃ© par texinfo"
  
! #: tp/Texinfo/Parser.pm:3369
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "codage Â«Â %sÂ Â» non reconnu"
  
! #: tp/Texinfo/Parser.pm:3516
  #, perl-format
  msgid "@%s after the first element"
  msgstr "@%s aprÃ¨s le premier Ã©lÃ©ment"
  
! #: tp/Texinfo/Parser.pm:3523
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s n'a de sens que sur une ligne @multitable"
  
! #: tp/Texinfo/Parser.pm:3563
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "@%s ne devrait pas Ãªtre associÃ© Ã  @top"
  
! #: tp/Texinfo/Parser.pm:3575
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
--- 2568,2631 ----
  "pas se trouver sur une ligne @%s"
  
! #: tp/Texinfo/Parser.pm:3016
  #, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "commande d'accentuation Â«Â @%sÂ Â» interdite en argument Ã  @%s"
  
! #: tp/Texinfo/Parser.pm:3124 tp/Texinfo/Parser.pm:3277
! #: tp/Texinfo/Parser.pm:5666
  #, perl-format
  msgid "@%s missing argument"
  msgstr "@%s sans d'argument"
  
! #: tp/Texinfo/Parser.pm:3138
  #, perl-format
  msgid "unknown @end %s"
  msgstr "@end %s inconnu"
  
! #: tp/Texinfo/Parser.pm:3161 tp/Texinfo/Parser.pm:3788
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "argument superflu Ã  @%s %sÂ : %s"
  
! #: tp/Texinfo/Parser.pm:3167 tp/Texinfo/Parser.pm:3245
! #: tp/Texinfo/Parser.pm:5755 tp/Texinfo/Parser.pm:5798
! #: tp/Texinfo/Parser.pm:5827 tp/Texinfo/Parser.pm:5868
! #: tp/Texinfo/Parser.pm:5946
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "mauvais argument Ã  @%sÂ : %s"
  
! #: tp/Texinfo/Parser.pm:3188
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%sÂ : impossible d'ouvrir %sÂ : %s"
  
! #: tp/Texinfo/Parser.pm:3200
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr "le codage Â«Â %sÂ Â» n'est pas acceptÃ© par texinfo"
  
! #: tp/Texinfo/Parser.pm:3208
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "codage Â«Â %sÂ Â» non reconnu"
  
! #: tp/Texinfo/Parser.pm:3364
  #, perl-format
  msgid "@%s after the first element"
  msgstr "@%s aprÃ¨s le premier Ã©lÃ©ment"
  
! #: tp/Texinfo/Parser.pm:3371
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s n'a de sens que sur une ligne @multitable"
  
! #: tp/Texinfo/Parser.pm:3408
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "@%s ne devrait pas Ãªtre associÃ© Ã  @top"
  
! #: tp/Texinfo/Parser.pm:3420
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
***************
*** 2631,2684 ****
  "@node prÃ©cÃ¨de @%s, mais des parties ne peuvent Ãªtre associÃ©es Ã  des nÅ“uds"
  
! #: tp/Texinfo/Parser.pm:3677
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "argument vide dans @%s"
  
! #: tp/Texinfo/Parser.pm:3681
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "nom de nÅ“ud vide aprÃ¨s expansion de Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Parser.pm:3724
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "entrÃ©e de menu vide dans Â«Â %sÂ Â»."
  
! #: tp/Texinfo/Parser.pm:3732
  msgid "empty node name in menu entry"
  msgstr "nÅ“ud vide dans l'entrÃ©e de menu"
  
! #: tp/Texinfo/Parser.pm:3805
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "@%s ne devrait pas apparaÃ®tre dans @%s"
  
! #: tp/Texinfo/Parser.pm:3937
  #, perl-format
! msgid "@end %s should only appear at a line beginning"
  msgstr "@end %s ne peut apparaÃ®tre qu'en dÃ©but de ligne"
  
! #: tp/Texinfo/Parser.pm:3960
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "macro Â«Â %sÂ Â» dÃ©jÃ  dÃ©finie"
  
! #: tp/Texinfo/Parser.pm:3963
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "voici la dÃ©finition prÃ©cÃ©dente de Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Parser.pm:3968
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "redÃ©finition de la commande TexinfoÂ : %s"
  
! #: tp/Texinfo/Parser.pm:4017
  #, perl-format
  msgid "@%s without associated character"
  msgstr "@%s sans caractÃ¨re associÃ©"
  
! #: tp/Texinfo/Parser.pm:4087
  #, perl-format
  msgid ""
--- 2633,2686 ----
  "@node prÃ©cÃ¨de @%s, mais des parties ne peuvent Ãªtre associÃ©es Ã  des nÅ“uds"
  
! #: tp/Texinfo/Parser.pm:3522
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "argument vide dans @%s"
  
! #: tp/Texinfo/Parser.pm:3526
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "nom de nÅ“ud vide aprÃ¨s expansion de Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Parser.pm:3569
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "entrÃ©e de menu vide dans Â«Â %sÂ Â»."
  
! #: tp/Texinfo/Parser.pm:3577
  msgid "empty node name in menu entry"
  msgstr "nÅ“ud vide dans l'entrÃ©e de menu"
  
! #: tp/Texinfo/Parser.pm:3650
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "@%s ne devrait pas apparaÃ®tre dans @%s"
  
! #: tp/Texinfo/Parser.pm:3782
  #, 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/Parser.pm:3804
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "macro Â«Â %sÂ Â» dÃ©jÃ  dÃ©finie"
  
! #: tp/Texinfo/Parser.pm:3807
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "voici la dÃ©finition prÃ©cÃ©dente de Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Parser.pm:3812
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "redÃ©finition de la commande TexinfoÂ : %s"
  
! #: tp/Texinfo/Parser.pm:3879
  #, perl-format
  msgid "@%s without associated character"
  msgstr "@%s sans caractÃ¨re associÃ©"
  
! #: tp/Texinfo/Parser.pm:3949
  #, perl-format
  msgid ""
***************
*** 2686,2690 ****
  msgstr "@%s dÃ©fini sans ou avec plus d'un argument s'invoque avec {}"
  
! #: tp/Texinfo/Parser.pm:4111
  #, perl-format
  msgid ""
--- 2688,2692 ----
  msgstr "@%s dÃ©fini sans ou avec plus d'un argument s'invoque avec {}"
  
! #: tp/Texinfo/Parser.pm:3974
  #, perl-format
  msgid ""
***************
*** 2695,2719 ****
  "MAX_NESTED_MACROSÂ ; valeur actuelle %d)"
  
! #: tp/Texinfo/Parser.pm:4120
  #, 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/Parser.pm:4176
  #, 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/Parser.pm:4182
  #, 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/Parser.pm:4195 tp/Texinfo/Parser.pm:5325
  #, 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/Parser.pm:4207
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
--- 2697,2721 ----
  "MAX_NESTED_MACROSÂ ; valeur actuelle %d)"
  
! #: tp/Texinfo/Parser.pm:3983
  #, 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/Parser.pm:4038
  #, 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/Parser.pm:4044
  #, 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/Parser.pm:4057 tp/Texinfo/Parser.pm:5189
  #, 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/Parser.pm:4068
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
***************
*** 2721,2798 ****
  "la commande d'accentuation Â«Â @%sÂ Â» ne doit pas Ãªtre suivie d'un saut de ligne"
  
! #: tp/Texinfo/Parser.pm:4218
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s accolades attendues"
  
! #: tp/Texinfo/Parser.pm:4383
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "drapeau indÃ©finiÂ : %s"
  
! #: tp/Texinfo/Parser.pm:4386
  msgid "bad syntax for @value"
  msgstr "syntaxe de @value incorrecte"
  
! #: tp/Texinfo/Parser.pm:4393
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s est obsolÃ¨te."
  
! #: tp/Texinfo/Parser.pm:4396
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s est obsolÃ¨teÂ ; %s"
  
! #: tp/Texinfo/Parser.pm:4405
  #, perl-format
! msgid "@%s should only appear at a line beginning"
  msgstr "@%s ne doit apparaÃ®tre qu'en dÃ©but de ligne"
  
! #: tp/Texinfo/Parser.pm:4496
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s interdit dans un bloc Â«Â @%sÂ Â»"
  
! #: tp/Texinfo/Parser.pm:4505
  #, 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/Parser.pm:4631 tp/Texinfo/Parser.pm:4648
! #: tp/Texinfo/Parser.pm:4698
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s n'a aucun sens dans un bloc Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Parser.pm:4658
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "@%s dans une multitable vide"
  
! #: tp/Texinfo/Parser.pm:4664
  msgid "@tab before @item"
  msgstr "@tab avant @item"
  
! #: tp/Texinfo/Parser.pm:4667
  #, 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/Parser.pm:4704
  msgid "ignoring @tab outside of multitable"
  msgstr "@tab non pris en compte hors de multitable"
  
! #: tp/Texinfo/Parser.pm:4708
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "@%s en dehors d'une table ou d'une liste"
  
! #: tp/Texinfo/Parser.pm:4745
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "il faut Ãªtre aprÃ¨s Â«Â @%sÂ Â» pour utiliser Â«Â @%sÂ Â»"
  
! #: tp/Texinfo/Parser.pm:4787
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
--- 2723,2800 ----
  "la commande d'accentuation Â«Â @%sÂ Â» ne doit pas Ãªtre suivie d'un saut de ligne"
  
! #: tp/Texinfo/Parser.pm:4079
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s accolades attendues"
  
! #: tp/Texinfo/Parser.pm:4233
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "drapeau indÃ©finiÂ : %s"
  
! #: tp/Texinfo/Parser.pm:4236
  msgid "bad syntax for @value"
  msgstr "syntaxe de @value incorrecte"
  
! #: tp/Texinfo/Parser.pm:4243
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s est obsolÃ¨te."
  
! #: tp/Texinfo/Parser.pm:4246
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s est obsolÃ¨teÂ ; %s"
  
! #: tp/Texinfo/Parser.pm:4255
  #, 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/Parser.pm:4346
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s interdit dans un bloc Â«Â @%sÂ Â»"
  
! #: tp/Texinfo/Parser.pm:4355
  #, 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/Parser.pm:4479 tp/Texinfo/Parser.pm:4496
! #: tp/Texinfo/Parser.pm:4546
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s n'a aucun sens dans un bloc Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Parser.pm:4506
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "@%s dans une multitable vide"
  
! #: tp/Texinfo/Parser.pm:4512
  msgid "@tab before @item"
  msgstr "@tab avant @item"
  
! #: tp/Texinfo/Parser.pm:4515
  #, 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/Parser.pm:4552
  msgid "ignoring @tab outside of multitable"
  msgstr "@tab non pris en compte hors de multitable"
  
! #: tp/Texinfo/Parser.pm:4556
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "@%s en dehors d'une table ou d'une liste"
  
! #: tp/Texinfo/Parser.pm:4596
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "il faut Ãªtre aprÃ¨s Â«Â @%sÂ Â» pour utiliser Â«Â @%sÂ Â»"
  
! #: tp/Texinfo/Parser.pm:4638
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
***************
*** 2800,2822 ****
  "@%s n'a aucun sens hors des environnements Â«Â @titlepageÂ Â» et Â«Â @quotationÂ Â»"
  
! #: tp/Texinfo/Parser.pm:4791
  msgid "@dircategory after first node"
  msgstr "@dircategory aprÃ¨s le premier nÅ“ud"
  
! #: tp/Texinfo/Parser.pm:4979
  #, 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/Parser.pm:4997
  msgid "@direntry after first node"
  msgstr "@direntry aprÃ¨s le premier nÅ“ud"
  
! #: tp/Texinfo/Parser.pm:5005
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "@%s vu avant le premier @node"
  
! #: tp/Texinfo/Parser.pm:5008
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
--- 2802,2824 ----
  "@%s n'a aucun sens hors des environnements Â«Â @titlepageÂ Â» et Â«Â @quotationÂ Â»"
  
! #: tp/Texinfo/Parser.pm:4642
  msgid "@dircategory after first node"
  msgstr "@dircategory aprÃ¨s le premier nÅ“ud"
  
! #: tp/Texinfo/Parser.pm:4847
  #, 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/Parser.pm:4864
  msgid "@direntry after first node"
  msgstr "@direntry aprÃ¨s le premier nÅ“ud"
  
! #: tp/Texinfo/Parser.pm:4872
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "@%s vu avant le premier @node"
  
! #: tp/Texinfo/Parser.pm:4875
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
***************
*** 2824,2995 ****
  "votre nÅ“ud @top ne devrait-il pas Ãªtre dans @ifnottex plutÃ´t que @ifinfoÂ ?"
  
! #: tp/Texinfo/Parser.pm:5070
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr "@%s est rÃ©servÃ© au contexte math"
  
! #: tp/Texinfo/Parser.pm:5078
  #, perl-format
  msgid "unknown command `%s'"
  msgstr "commande Â«Â %sÂ Â» inconnue"
  
! #: tp/Texinfo/Parser.pm:5088
  msgid "unexpected @"
  msgstr "@ inattendu"
  
! #: tp/Texinfo/Parser.pm:5117
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s n'a aucun sens hors de l'environnement Â«Â @floatÂ Â»"
  
! #: tp/Texinfo/Parser.pm:5122
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr "@%s se place juste en dessous de Â«Â @floatÂ Â»"
  
! #: tp/Texinfo/Parser.pm:5130
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "@%s multiples ignorÃ©s"
  
! #: tp/Texinfo/Parser.pm:5249
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "la commande @%s s'emploie sans argument"
  
! #: tp/Texinfo/Parser.pm:5273
  #, 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/Parser.pm:5292
  #, 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/Parser.pm:5303
  #, 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/Parser.pm:5316
  msgid "@image missing filename argument"
  msgstr "@image sans nom de fichier"
  
! #: tp/Texinfo/Parser.pm:5348
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "@%s sans premier argument"
  
! #: tp/Texinfo/Parser.pm:5393
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "nombre non hex en argument Ã  @UÂ : %s"
  
! #: tp/Texinfo/Parser.pm:5399
  #, 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/Parser.pm:5412
! #, perl-format
! msgid "argument for @U exceeds size of integer: %s"
! msgstr "l'argument Ã  @U dÃ©passe la taille d'un entierÂ : %s"
! 
! #: tp/Texinfo/Parser.pm:5418
  #, 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/Parser.pm:5546
  msgid "superfluous arguments for node"
  msgstr "arguments de nÅ“ud superflus"
  
! #: tp/Texinfo/Parser.pm:5596
  #, perl-format
  msgid "expected @end %s"
  msgstr "@end %s attendu"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "@%s ne devrait accepter en argument qu'une @-commande, pas Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Parser.pm:5728
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "argument restant Ã  la ligne @%sÂ : %s"
  
! #: tp/Texinfo/Parser.pm:5801
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "commande d'environnement %s en argument de @%s"
  
! #: tp/Texinfo/Parser.pm:5823
  #, perl-format
  msgid "empty @%s"
  msgstr "@%s vide"
  
! #: tp/Texinfo/Parser.pm:5831
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "fraction de colonne non numÃ©riqueÂ : %s"
  
! #: tp/Texinfo/Parser.pm:5840
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "l'argument de @sp doit Ãªtre numÃ©rique, pas Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Parser.pm:5849
  #, perl-format
  msgid "reserved index name %s"
  msgstr "%s est un nom d'index rÃ©servÃ©"
  
! #: tp/Texinfo/Parser.pm:5868
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "source d'index inconnue dans @%sÂ : %s"
  
! #: tp/Texinfo/Parser.pm:5871
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "destination d'index inconnue dans @%sÂ : %s"
  
! #: tp/Texinfo/Parser.pm:5901
  #, 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/Parser.pm:5914
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "index Â«Â %sÂ Â» inconnu dans @printindex"
  
! #: tp/Texinfo/Parser.pm:5920
  #, 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/Parser.pm:5928
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "printindex avant le dÃ©but du documentÂ : @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5944
  #, 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/Parser.pm:5952
  #, 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/Parser.pm:5960
  #, 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/Parser.pm:5968
  #, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
--- 2826,2992 ----
  "votre nÅ“ud @top ne devrait-il pas Ãªtre dans @ifnottex plutÃ´t que @ifinfoÂ ?"
  
! #: tp/Texinfo/Parser.pm:4937
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr "@%s est rÃ©servÃ© au contexte math"
  
! #: tp/Texinfo/Parser.pm:4945
  #, perl-format
  msgid "unknown command `%s'"
  msgstr "commande Â«Â %sÂ Â» inconnue"
  
! #: tp/Texinfo/Parser.pm:4955
  msgid "unexpected @"
  msgstr "@ inattendu"
  
! #: tp/Texinfo/Parser.pm:4983
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s n'a aucun sens hors de l'environnement Â«Â @floatÂ Â»"
  
! #: tp/Texinfo/Parser.pm:4988
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr "@%s se place juste en dessous de Â«Â @floatÂ Â»"
  
! #: tp/Texinfo/Parser.pm:4996
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "@%s multiples ignorÃ©s"
  
! #: tp/Texinfo/Parser.pm:5114
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "la commande @%s s'emploie sans argument"
  
! #: tp/Texinfo/Parser.pm:5138
  #, 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/Parser.pm:5156
  #, 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/Parser.pm:5167
  #, 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/Parser.pm:5180
  msgid "@image missing filename argument"
  msgstr "@image sans nom de fichier"
  
! #: tp/Texinfo/Parser.pm:5211
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "@%s sans premier argument"
  
! #: tp/Texinfo/Parser.pm:5230
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "nombre non hex en argument Ã  @UÂ : %s"
  
! #: tp/Texinfo/Parser.pm:5236
  #, 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/Parser.pm:5253
  #, 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/Parser.pm:5448
  msgid "superfluous arguments for node"
  msgstr "arguments de nÅ“ud superflus"
  
! #: tp/Texinfo/Parser.pm:5498
  #, perl-format
  msgid "expected @end %s"
  msgstr "@end %s attendu"
  
! #: tp/Texinfo/Parser.pm:5607
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "@%s ne devrait accepter en argument qu'une @-commande, pas Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Parser.pm:5617
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "argument restant Ã  la ligne @%sÂ : %s"
  
! #: tp/Texinfo/Parser.pm:5689
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "commande d'environnement %s en argument de @%s"
  
! #: tp/Texinfo/Parser.pm:5710
  #, perl-format
  msgid "empty @%s"
  msgstr "@%s vide"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "fraction de colonne non numÃ©riqueÂ : %s"
  
! #: tp/Texinfo/Parser.pm:5727
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "l'argument de @sp doit Ãªtre numÃ©rique, pas Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Parser.pm:5736
  #, perl-format
  msgid "reserved index name %s"
  msgstr "%s est un nom d'index rÃ©servÃ©"
  
! #: tp/Texinfo/Parser.pm:5762
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "source d'index inconnue dans @%sÂ : %s"
  
! #: tp/Texinfo/Parser.pm:5765
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "destination d'index inconnue dans @%sÂ : %s"
  
! #: tp/Texinfo/Parser.pm:5793
  #, 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/Parser.pm:5806
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "index Â«Â %sÂ Â» inconnu dans @printindex"
  
! #: tp/Texinfo/Parser.pm:5812
  #, 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/Parser.pm:5820
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "printindex avant le dÃ©but du documentÂ : @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5836
  #, 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/Parser.pm:5844
  #, 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/Parser.pm:5852
  #, 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/Parser.pm:5860
  #, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
***************
*** 2997,3001 ****
  "l'argument de @%s doit Ãªtre Â«Â onÂ Â», Â«Â offÂ Â» ou Â«Â oddÂ Â», mais pas Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Parser.pm:5986 tp/Texinfo/Parser.pm:5991
  #, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
--- 2994,2998 ----
  "l'argument de @%s doit Ãªtre Â«Â onÂ Â», Â«Â offÂ Â» ou Â«Â oddÂ Â», mais pas Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Parser.pm:5878 tp/Texinfo/Parser.pm:5883
  #, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
***************
*** 3004,3008 ****
  "pas Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Parser.pm:5999
  #, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
--- 3001,3005 ----
  "pas Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Parser.pm:5891
  #, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
***************
*** 3011,3015 ****
  "Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Parser.pm:6009
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
--- 3008,3012 ----
  "Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
***************
*** 3017,3026 ****
  "l'argument de @exampleindent doit Ãªtre numÃ©rique ou Â«Â asisÂ Â», pas Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Parser.pm:6021
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "@%s peut Ãªtre Â«Â onÂ Â» ou Â«Â offÂ Â», pas Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Parser.pm:6031
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
--- 3014,3023 ----
  "l'argument de @exampleindent doit Ãªtre numÃ©rique ou Â«Â asisÂ Â», pas Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Parser.pm:5913
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "@%s peut Ãªtre Â«Â onÂ Â» ou Â«Â offÂ Â», pas Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Parser.pm:5922
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
***************
*** 3029,3033 ****
  "Â«Â distinctÂ Â», pas Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Parser.pm:6039
  #, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
--- 3026,3030 ----
  "Â«Â distinctÂ Â», pas Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Parser.pm:5930
  #, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
***************
*** 3035,3039 ****
  "l'argument de @allowcodebreaks doit Ãªtre Â«Â trueÂ Â» ou Â«Â falseÂ Â», pas Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Parser.pm:6047
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
--- 3032,3036 ----
  "l'argument de @allowcodebreaks doit Ãªtre Â«Â trueÂ Â» ou Â«Â falseÂ Â», pas Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Parser.pm:5938
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
***************
*** 3042,3086 ****
  "pas Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Structuring.pm:213
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr "remontÃ©e de la section de @%s qui est trop basse"
  
! #: tp/Texinfo/Structuring.pm:245
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "pas de commande niveau chapitre avant @%s"
  
! #: tp/Texinfo/Structuring.pm:250
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr "descente de la section de @%s qui apparaÃ®t aprÃ¨s un Ã©lÃ©ment subalterne"
  
! #: tp/Texinfo/Structuring.pm:339
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "aucune commande de sectionnement associÃ©e Ã  @%s"
  
! #: tp/Texinfo/Structuring.pm:488
  #, perl-format
  msgid "@%s not empty"
  msgstr "@%s n'est pas vide"
  
! #: tp/Texinfo/Structuring.pm:544 tp/Texinfo/Structuring.pm:1326
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "@%s pointe vers un nÅ“ud Â«Â %sÂ Â» inexistant"
  
! #: tp/Texinfo/Structuring.pm:557
  #, perl-format
  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:662
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "nÅ“ud Â«Â %sÂ Â» non rÃ©fÃ©rencÃ©"
  
! #: tp/Texinfo/Structuring.pm:708
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
--- 3039,3083 ----
  "pas Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Structuring.pm:216
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr "remontÃ©e de la section de @%s qui est trop basse"
  
! #: tp/Texinfo/Structuring.pm:248
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "pas de commande niveau chapitre avant @%s"
  
! #: tp/Texinfo/Structuring.pm:253
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr "descente de la section de @%s qui apparaÃ®t aprÃ¨s un Ã©lÃ©ment subalterne"
  
! #: tp/Texinfo/Structuring.pm:342
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "aucune commande de sectionnement associÃ©e Ã  @%s"
  
! #: tp/Texinfo/Structuring.pm:491
  #, perl-format
  msgid "@%s not empty"
  msgstr "@%s n'est pas vide"
  
! #: tp/Texinfo/Structuring.pm:547 tp/Texinfo/Structuring.pm:1325
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "@%s pointe vers un nÅ“ud Â«Â %sÂ Â» inexistant"
  
! #: tp/Texinfo/Structuring.pm:558
  #, perl-format
  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:663
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "nÅ“ud Â«Â %sÂ Â» non rÃ©fÃ©rencÃ©"
  
! #: tp/Texinfo/Structuring.pm:706
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
***************
*** 3089,3093 ****
  "menu"
  
! #: tp/Texinfo/Structuring.pm:715
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
--- 3086,3090 ----
  "menu"
  
! #: tp/Texinfo/Structuring.pm:713
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
***************
*** 3096,3100 ****
  "Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Structuring.pm:733
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
--- 3093,3097 ----
  "Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Structuring.pm:731
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
***************
*** 3102,3116 ****
  "le nÅ“ud Â«Â %sÂ Â» est %s pour Â«Â %sÂ Â» dans le menu mais pas dans le sectionnement"
  
! #: tp/Texinfo/Structuring.pm:787
  #, 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:814
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%s fait rÃ©fÃ©rence Ã  Â«Â %sÂ Â» qui n'existe pas"
  
! #: tp/Texinfo/Structuring.pm:834
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
--- 3099,3113 ----
  "le nÅ“ud Â«Â %sÂ Â» est %s pour Â«Â %sÂ Â» dans le menu mais pas dans le sectionnement"
  
! #: tp/Texinfo/Structuring.pm:786
  #, 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:810
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%s fait rÃ©fÃ©rence Ã  Â«Â %sÂ Â» qui n'existe pas"
  
! #: tp/Texinfo/Structuring.pm:829
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
***************
*** 3119,3123 ****
  "dÃ©signe"
  
! #: tp/Texinfo/Structuring.pm:842
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
--- 3116,3120 ----
  "dÃ©signe"
  
! #: tp/Texinfo/Structuring.pm:837
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
***************
*** 3131,3135 ****
  msgstr "@%s pour Â«Â %sÂ Â», diffÃ©rent de %s nommÃ© Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Structuring.pm:2070
  #, perl-format
  msgid "empty index key in @%s"
--- 3128,3132 ----
  msgstr "@%s pour Â«Â %sÂ Â», diffÃ©rent de %s nommÃ© Â«Â %sÂ Â»"
  
! #: tp/Texinfo/Structuring.pm:2067
  #, perl-format
  msgid "empty index key in @%s"
***************
*** 3673,3692 ****
  msgstr "Consultez Â«Â %s --helpÂ Â» pour plus d'informations.\n"
  
! #: tp/texi2any.pl:1232
  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:1255
  #, 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:1261
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "impossible d'ouvrir %s en Ã©critureÂ : %s\n"
  
! #: tp/texi2any.pl:1286
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
--- 3670,3689 ----
  msgstr "Consultez Â«Â %s --helpÂ Â» pour plus d'informations.\n"
  
! #: tp/texi2any.pl:1239
  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:1262
  #, 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:1268
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "impossible d'ouvrir %s en Ã©critureÂ : %s\n"
  
! #: tp/texi2any.pl:1293
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
***************
*** 3696,3710 ****
  "de sectionÂ ?"
  
! #: tp/texi2any.pl:1359 tp/texi2any.pl:1435
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%sÂ : erreur de fermeture de %sÂ : %s\n"
  
! #: tp/texi2any.pl:1382 tp/texi2any.pl:1416
  #, 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:1388 tp/texi2any.pl:1422
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
--- 3693,3707 ----
  "de sectionÂ ?"
  
! #: tp/texi2any.pl:1366 tp/texi2any.pl:1442
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%sÂ : erreur de fermeture de %sÂ : %s\n"
  
! #: tp/texi2any.pl:1389 tp/texi2any.pl:1423
  #, 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:1395 tp/texi2any.pl:1429
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
Binary files texinfo-6.1/po/he.gmo and texinfo-6.3/po/he.gmo differ
diff -Nrc2 texinfo-6.1/po/he.po texinfo-6.3/po/he.po
*** texinfo-6.1/po/he.po	2016-02-06 11:35:50.000000000 +0000
--- texinfo-6.3/po/he.po	2016-09-10 12:45:51.000000000 +0100
***************
*** 7,11 ****
  "Project-Id-Version: texinfo 4.2\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
  "PO-Revision-Date: 2002-04-03 12:31+0300\n"
  "Last-Translator: Eli Zaretskii <eliz@gnu.org>\n"
--- 7,11 ----
  "Project-Id-Version: texinfo 4.2\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:45+0100\n"
  "PO-Revision-Date: 2002-04-03 12:31+0300\n"
  "Last-Translator: Eli Zaretskii <eliz@gnu.org>\n"
***************
*** 15,18 ****
--- 15,19 ----
  "Content-Type: text/plain; charset=ISO-8859-8\n"
  "Content-Transfer-Encoding: 8bit\n"
+ "X-Bugs: Report translation errors to the Language-Team address.\n"
  
  #: gnulib/lib/error.c:191
***************
*** 112,118 ****
  
  #: gnulib/lib/regcomp.c:156
! #, fuzzy
! msgid "Unmatched [ or [^"
! msgstr "âåæ-ïá åì ïéàù }"
  
  #: gnulib/lib/regcomp.c:159
--- 113,118 ----
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [, [^, [:, [., or [="
! msgstr ""
  
  #: gnulib/lib/regcomp.c:159
***************
*** 157,161 ****
  msgstr "âåæ-ïá åì ïéàù }"
  
! #: gnulib/lib/regcomp.c:711
  #, fuzzy
  msgid "No previous regular expression"
--- 157,161 ----
  msgstr "âåæ-ïá åì ïéàù }"
  
! #: gnulib/lib/regcomp.c:687
  #, fuzzy
  msgid "No previous regular expression"
***************
*** 311,315 ****
  msgstr "---------- Footnotes ----------"
  
! #: info/indices.c:123 info/indices.c:812
  #, c-format
  msgid "Finding index entries..."
--- 311,315 ----
  msgstr "---------- Footnotes ----------"
  
! #: info/indices.c:123 info/indices.c:822
  #, c-format
  msgid "Finding index entries..."
***************
*** 320,324 ****
  msgstr "äæ õáå÷ ìù ñ÷ãðéàá úæåøçî ùôç"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:818
  #, c-format
  msgid "No indices found."
--- 320,324 ----
  msgstr "äæ õáå÷ ìù ñ÷ãðéàá úæåøçî ùôç"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:828
  #, c-format
  msgid "No indices found."
***************
*** 350,383 ****
  msgstr ".\"%s\" úæåøçî íéìéëîä ñ÷ãðéà éèéøô%s ïéà"
  
! #: info/indices.c:476 info/indices.c:880
  #, fuzzy, c-format
  msgid "No index entries containing '%s'."
  msgstr ".\"%s\" úæåøçî íéìéëîä ñ÷ãðéà éèéøô%s ïéà"
  
! #: info/indices.c:583
  #, fuzzy, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "...\"%s\" ìù íéñ÷ãðéàä ìë úà ÷øåñ"
  
! #: info/indices.c:636
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
  "úàöîù äîî èéøôú äðáå úæåøçî íäá ùôç ,íéòåãé Info éöá÷ ìù íéñ÷ãðéàä ìëá èèç"
  
! #: info/indices.c:644 info/indices.c:646
  #, fuzzy
  msgid "Index apropos"
  msgstr "Index apropos: "
  
! #: info/indices.c:688
  #, fuzzy, c-format
  msgid "Index entries containing '%s':\n"
  msgstr ".\"%s\" úæåøçî íéìéëîä ñ÷ãðéà éèéøô%s ïéà"
  
! #: info/indices.c:797
  msgid "List all matches of a string in the index"
  msgstr ""
  
! #: info/indices.c:824 info/indices.c:826
  #, fuzzy
  msgid "Index topic"
--- 350,383 ----
  msgstr ".\"%s\" úæåøçî íéìéëîä ñ÷ãðéà éèéøô%s ïéà"
  
! #: info/indices.c:476 info/indices.c:890
  #, fuzzy, c-format
  msgid "No index entries containing '%s'."
  msgstr ".\"%s\" úæåøçî íéìéëîä ñ÷ãðéà éèéøô%s ïéà"
  
! #: info/indices.c:586
  #, fuzzy, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "...\"%s\" ìù íéñ÷ãðéàä ìë úà ÷øåñ"
  
! #: info/indices.c:646
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
  "úàöîù äîî èéøôú äðáå úæåøçî íäá ùôç ,íéòåãé Info éöá÷ ìù íéñ÷ãðéàä ìëá èèç"
  
! #: info/indices.c:654 info/indices.c:656
  #, fuzzy
  msgid "Index apropos"
  msgstr "Index apropos: "
  
! #: info/indices.c:698
  #, fuzzy, c-format
  msgid "Index entries containing '%s':\n"
  msgstr ".\"%s\" úæåøçî íéìéëîä ñ÷ãðéà éèéøô%s ïéà"
  
! #: info/indices.c:807
  msgid "List all matches of a string in the index"
  msgstr ""
  
! #: info/indices.c:834 info/indices.c:836
  #, fuzzy
  msgid "Index topic"
***************
*** 389,443 ****
  msgstr ".åìù ñ÷ãðéàá \"%s\" ìéëî ïàë íéð÷úåîäî Info õáå÷ óà"
  
! #: info/info-utils.c:892
  #, c-format
  msgid "Error converting file character encoding."
  msgstr ""
  
! #: info/info.c:222 info/session.c:2789
  #, fuzzy, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr ".`%s' óéòñ ïéà `%s' ä÷ñéô ìù èéøôúá"
  
! #: info/info.c:315
! #, fuzzy, c-format
! msgid "No file given for node '%s'."
! msgstr ".íéèéøôú `%s' ïéà ä÷ñéôá"
! 
! #: info/info.c:364 info/info.c:1133
  #, fuzzy, c-format
  msgid "Cannot find node '%s'."
  msgstr ".äàöîð àì `%s' ä÷ñéô"
  
! #: info/info.c:386
  #, c-format
  msgid "No program name given."
  msgstr ""
  
! #: info/info.c:577
  #, fuzzy, c-format
  msgid "invalid number: %s\n"
  msgstr "`%s' :éåâù (node) ä÷ñéô íù"
  
! #: info/info.c:757
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr ""
  
! #: info/info.c:764 info/infokey.c:537
  #, c-format
  msgid "%s: no such variable"
  msgstr ""
  
! #: info/info.c:770 info/infokey.c:539
  #, fuzzy, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "Info äðúùî ìù êøò äðù"
  
! #: info/info.c:782
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr ".øúåé áø òãéî úâöäì --help äñð\n"
  
! #: info/info.c:804 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
--- 389,438 ----
  msgstr ".åìù ñ÷ãðéàá \"%s\" ìéëî ïàë íéð÷úåîäî Info õáå÷ óà"
  
! #: info/info-utils.c:879
  #, c-format
  msgid "Error converting file character encoding."
  msgstr ""
  
! #: info/info.c:279 info/session.c:2789
  #, fuzzy, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr ".`%s' óéòñ ïéà `%s' ä÷ñéô ìù èéøôúá"
  
! #: info/info.c:416 info/info.c:1148
  #, fuzzy, c-format
  msgid "Cannot find node '%s'."
  msgstr ".äàöîð àì `%s' ä÷ñéô"
  
! #: info/info.c:438
  #, c-format
  msgid "No program name given."
  msgstr ""
  
! #: info/info.c:636
  #, fuzzy, c-format
  msgid "invalid number: %s\n"
  msgstr "`%s' :éåâù (node) ä÷ñéô íù"
  
! #: info/info.c:816
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr ""
  
! #: info/info.c:823 info/infokey.c:540
  #, c-format
  msgid "%s: no such variable"
  msgstr ""
  
! #: info/info.c:829 info/infokey.c:542
  #, fuzzy, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "Info äðúùî ìù êøò äðù"
  
! #: info/info.c:841
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr ".øúåé áø òãéî úâöäì --help äñð\n"
  
! #: info/info.c:860 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
***************
*** 449,458 ****
  msgstr ""
  
! #: info/info.c:981
  #, fuzzy, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "`%s' úæåøçî íéìéëîä ñ÷ãðéà éèéøô ïéà\n"
  
! #: info/info.c:1034
  #, c-format
  msgid ""
--- 444,453 ----
  msgstr ""
  
! #: info/info.c:999
  #, fuzzy, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "`%s' úæåøçî íéìéëîä ñ÷ãðéà éèéøô ïéà\n"
  
! #: info/info.c:1049
  #, c-format
  msgid ""
***************
*** 462,466 ****
  msgstr ""
  
! #: info/info.c:1040
  msgid ""
  "Options:\n"
--- 457,461 ----
  msgstr ""
  
! #: info/info.c:1055
  msgid ""
  "Options:\n"
***************
*** 473,477 ****
  msgstr ""
  
! #: info/info.c:1048
  msgid ""
  "  -h, --help                   display this help and exit.\n"
--- 468,472 ----
  msgstr ""
  
! #: info/info.c:1063
  msgid ""
  "  -h, --help                   display this help and exit.\n"
***************
*** 481,485 ****
  msgstr ""
  
! #: info/info.c:1054
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
--- 476,480 ----
  msgstr ""
  
! #: info/info.c:1069
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
***************
*** 489,493 ****
  msgstr ""
  
! #: info/info.c:1061
  #, fuzzy
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
--- 484,488 ----
  msgstr ""
  
! #: info/info.c:1076
  #, fuzzy
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
***************
*** 495,499 ****
  "      .øåáéã æúðñîì åîéàúäì éãë êñîì äáéúë ïôåà äðù -b, --speech-friendly\n"
  
! #: info/info.c:1065
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
--- 490,494 ----
  "      .øåáéã æúðñîì åîéàúäì éãë êñîì äáéúë ïôåà äðù -b, --speech-friendly\n"
  
! #: info/info.c:1080
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
***************
*** 507,511 ****
  msgstr ""
  
! #: info/info.c:1074
  msgid ""
  "\n"
--- 502,506 ----
  msgstr ""
  
! #: info/info.c:1089
  msgid ""
  "\n"
***************
*** 517,521 ****
  msgstr ""
  
! #: info/info.c:1081
  msgid ""
  "\n"
--- 512,516 ----
  msgstr ""
  
! #: info/info.c:1096
  msgid ""
  "\n"
***************
*** 523,527 ****
  msgstr ""
  
! #: info/info.c:1084
  msgid ""
  "\n"
--- 518,522 ----
  msgstr ""
  
! #: info/info.c:1099
  msgid ""
  "\n"
***************
*** 539,543 ****
  msgstr ""
  
! #: info/info.c:1099 install-info/install-info.c:616 tp/texi2any.pl:861
  #, fuzzy
  msgid ""
--- 534,538 ----
  msgstr ""
  
! #: info/info.c:1114 install-info/install-info.c:616 tp/texi2any.pl:861
  #, fuzzy
  msgid ""
***************
*** 551,615 ****
  "         .http://www.gnu.org/software/texinfo/ :Texinfo ìù úéáä óã"
  
! #: info/info.c:1134
  #, fuzzy, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr ".äàöîð àì `%s' õáå÷á `%s' ä÷ñéô"
  
! #: info/info.c:1135
  msgid "Cannot find a window!"
  msgstr "!ïåìç óà àöîð àì"
  
! #: info/info.c:1136
  msgid "Point doesn't appear within this window's node!"
  msgstr "!äæ ïåìçá úâöåîä ä÷ñéôá àöîð åðéà ïîñä"
  
! #: info/info.c:1137
  msgid "Cannot delete the last window."
  msgstr ".ãéçé ïåìç ÷åçîì ïúéð àì"
  
! #: info/info.c:1138
  msgid "No menu in this node."
  msgstr ".íéèéøôú ïéà åæ ä÷ñéôá"
  
! #: info/info.c:1139
  msgid "No footnotes in this node."
  msgstr ".íééìåù úåøòä ïéà åæ ä÷ñéôá"
  
! #: info/info.c:1140
  msgid "No cross references in this node."
  msgstr ".íéøåùé÷ ïéà åæ ä÷ñéôá"
  
! #: info/info.c:1141
  #, fuzzy, c-format
  msgid "No '%s' pointer for this node."
  msgstr ".%sì äééðôä ïéà åæ ä÷ñéôá"
  
! #: info/info.c:1142
  #, fuzzy, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr ".äøæò úìá÷ì `?' äñð ;Info-ì úøëåî äðéà `%c' äãå÷ô"
  
! #: info/info.c:1143
  #, fuzzy, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr ".Info õéøäì éãë åéã ììëåùî åðéà `%s' âåñî âö"
  
! #: info/info.c:1144
  msgid "You are already at the last page of this node."
  msgstr ".åæ ä÷ñéô ìù ïåøçàä ãåîòá øáë ä/úà"
  
! #: info/info.c:1145
  msgid "You are already at the first page of this node."
  msgstr ".åæ ä÷ñéô ìù ïåùàøä ãåîòá øáë ä/úà"
  
! #: info/info.c:1146
  msgid "Only one window."
  msgstr ".ãçà ïåìç ÷ø íéé÷"
  
! #: info/info.c:1147
  msgid "Resulting window would be too small."
  msgstr ".éãî øúåé ïè÷ äéä ïåìçä"
  
! #: info/info.c:1148
  msgid "Not enough room for a help window, please delete a window."
  msgstr ".åäùìë ïåìç ÷åçîì àð ;äøæò ïåìç âéöäì íå÷î ÷éôñî ïéà"
--- 546,610 ----
  "         .http://www.gnu.org/software/texinfo/ :Texinfo ìù úéáä óã"
  
! #: info/info.c:1149
  #, fuzzy, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr ".äàöîð àì `%s' õáå÷á `%s' ä÷ñéô"
  
! #: info/info.c:1150
  msgid "Cannot find a window!"
  msgstr "!ïåìç óà àöîð àì"
  
! #: info/info.c:1151
  msgid "Point doesn't appear within this window's node!"
  msgstr "!äæ ïåìçá úâöåîä ä÷ñéôá àöîð åðéà ïîñä"
  
! #: info/info.c:1152
  msgid "Cannot delete the last window."
  msgstr ".ãéçé ïåìç ÷åçîì ïúéð àì"
  
! #: info/info.c:1153
  msgid "No menu in this node."
  msgstr ".íéèéøôú ïéà åæ ä÷ñéôá"
  
! #: info/info.c:1154
  msgid "No footnotes in this node."
  msgstr ".íééìåù úåøòä ïéà åæ ä÷ñéôá"
  
! #: info/info.c:1155
  msgid "No cross references in this node."
  msgstr ".íéøåùé÷ ïéà åæ ä÷ñéôá"
  
! #: info/info.c:1156
  #, fuzzy, c-format
  msgid "No '%s' pointer for this node."
  msgstr ".%sì äééðôä ïéà åæ ä÷ñéôá"
  
! #: info/info.c:1157
  #, fuzzy, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr ".äøæò úìá÷ì `?' äñð ;Info-ì úøëåî äðéà `%c' äãå÷ô"
  
! #: info/info.c:1158
  #, fuzzy, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr ".Info õéøäì éãë åéã ììëåùî åðéà `%s' âåñî âö"
  
! #: info/info.c:1159
  msgid "You are already at the last page of this node."
  msgstr ".åæ ä÷ñéô ìù ïåøçàä ãåîòá øáë ä/úà"
  
! #: info/info.c:1160
  msgid "You are already at the first page of this node."
  msgstr ".åæ ä÷ñéô ìù ïåùàøä ãåîòá øáë ä/úà"
  
! #: info/info.c:1161
  msgid "Only one window."
  msgstr ".ãçà ïåìç ÷ø íéé÷"
  
! #: info/info.c:1162
  msgid "Resulting window would be too small."
  msgstr ".éãî øúåé ïè÷ äéä ïåìçä"
  
! #: info/info.c:1163
  msgid "Not enough room for a help window, please delete a window."
  msgstr ".åäùìë ïåìç ÷åçîì àð ;äøæò ïåìç âéöäì íå÷î ÷éôñî ïéà"
***************
*** 901,935 ****
  msgstr "äòåãé äððéà `%s' äãå÷ô"
  
! #: info/infokey.c:482
  #, c-format
  msgid "action name too long"
  msgstr "éãî êåøà äãå÷ô íù"
  
! #: info/infokey.c:495
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "`%s' äãå÷ôì êùîäá íéøúåéî íéåú"
  
! #: info/infokey.c:506
  #, c-format
  msgid "missing variable name"
  msgstr "äðúùîä íù øñç"
  
! #: info/infokey.c:515
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "äðúùîä íù éøçà ãéî `=' øñç"
  
! #: info/infokey.c:522
  #, c-format
  msgid "variable name too long"
  msgstr "éãî êåøà äðúùîä íù"
  
! #: info/infokey.c:546
  #, c-format
  msgid "value too long"
  msgstr "éãî êåøà êøò"
  
! #: info/infokey.c:592
  #, c-format
  msgid "\"%s\", line %u: "
--- 896,930 ----
  msgstr "äòåãé äððéà `%s' äãå÷ô"
  
! #: info/infokey.c:485
  #, c-format
  msgid "action name too long"
  msgstr "éãî êåøà äãå÷ô íù"
  
! #: info/infokey.c:498
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "`%s' äãå÷ôì êùîäá íéøúåéî íéåú"
  
! #: info/infokey.c:509
  #, c-format
  msgid "missing variable name"
  msgstr "äðúùîä íù øñç"
  
! #: info/infokey.c:518
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "äðúùîä íù éøçà ãéî `=' øñç"
  
! #: info/infokey.c:525
  #, c-format
  msgid "variable name too long"
  msgstr "éãî êåøà äðúùîä íù"
  
! #: info/infokey.c:549
  #, c-format
  msgid "value too long"
  msgstr "éãî êåøà êøò"
  
! #: info/infokey.c:595
  #, c-format
  msgid "\"%s\", line %u: "
***************
*** 1260,1384 ****
  msgstr ".`%s' óéòñá äéìà øù÷î `%s'-á èéøôúä øùà ä÷ñéô éúàöî àì"
  
! #: info/session.c:2864
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "íäéøçà áå÷òå dir-î äìéçúîä èéøôú éôéòñ úøãéñ àø÷"
  
! #: info/session.c:2866
  msgid "Follow menus: "
  msgstr "Follow menus: "
  
! #: info/session.c:2971
  msgid "Select the Next node"
  msgstr "äàáä ä÷ñéôá øåáò"
  
! #: info/session.c:2978
  msgid "Select the Prev node"
  msgstr "úîãå÷ä ä÷ñéôì øåáò"
  
! #: info/session.c:2985
  msgid "Select the Up node"
  msgstr "ìòîù ä÷ñéôì øåáò"
  
! #: info/session.c:2991
  msgid "Select the last node in this file"
  msgstr "äæ êîñîá äðåøçàä ä÷ñéôì øåáò"
  
! #: info/session.c:3018 info/session.c:3051
  msgid "This window has no additional nodes"
  msgstr "äæ ïåìçá úåà÷ñéô øúåé ïéà"
  
! #: info/session.c:3024
  msgid "Select the first node in this file"
  msgstr "äæ êîñîá äðåùàøä ä÷ñéôì øåáò"
  
! #: info/session.c:3158
  msgid "No more nodes within this document."
  msgstr ".äæ êîñîá úåà÷ñéô øúåé ïéà"
  
! #: info/session.c:3203 info/session.c:3243
  #, fuzzy
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr ".åæ ä÷ñéô øåáò `Up'-å `Prev' ììåë åðéà äæ êîñî"
  
! #: info/session.c:3256
  msgid "Move forwards or down through node structure"
  msgstr ".úåà÷ñéôä äðáîá øúåé ÷åîò åà äîéã÷ òåð"
  
! #: info/session.c:3273
  msgid "Move backwards or up through node structure"
  msgstr ".úåà÷ñéôä äðáîá äìòî éôìë åà äøåçà òåð"
  
! #: info/session.c:3296
  msgid "Read a node name and select it"
  msgstr "äéìà øåáòå ä÷ñéô ìù íù àø÷"
  
! #: info/session.c:3350 info/session.c:3354
  msgid "Goto node: "
  msgstr "Goto node: "
  
! #: info/session.c:3533
  msgid "Find the node describing program invocation"
  msgstr "úéðëúä õéøäì ãöéë úøàúîä ä÷ñéôä úà àöî"
  
! #: info/session.c:3535
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Find Invocation node of [%s]: "
  
! #: info/session.c:3580
  msgid "Read a manpage reference and select it"
  msgstr "åúåà âöäå manpage-ì äééðôä àø÷"
  
! #: info/session.c:3584
  msgid "Get Manpage: "
  msgstr "Get Manpage: "
  
! #: info/session.c:3605
  #, fuzzy
  msgid "Select the node 'Top' in this file"
  msgstr "äæ êîñîá (`Top') úéùàøä ä÷ñéôì øåáò"
  
! #: info/session.c:3611
  #, fuzzy
  msgid "Select the node '(dir)'"
  msgstr "`(dir)' ä÷ñéôì øåáò"
  
! #: info/session.c:3617
  msgid "Show full file name of node being displayed"
  msgstr ""
  
! #: info/session.c:3634
  msgid "Select the most recently selected node"
  msgstr "äâöåäù äðåøçàä ä÷ñéôì øåæç"
  
! #: info/session.c:3639
  #, c-format
  msgid "No earlier node in history"
  msgstr ""
  
! #: info/session.c:3643
  msgid "Read the name of a file and select it"
  msgstr "åúåà âöäå õáå÷ ìù íù àø÷"
  
! #: info/session.c:3647
  msgid "Find file: "
  msgstr "Find file: "
  
! #: info/session.c:3664
  #, fuzzy, c-format
  msgid "Cannot find '%s'."
  msgstr ".àöîð àì `%s' õáå÷"
  
! #: info/session.c:3713
  #, fuzzy, c-format
  msgid "Could not create output file '%s'."
  msgstr ".`%s' èìô õáå÷ úøéöéá äì÷ú"
  
! #: info/session.c:3727
  #, fuzzy, c-format
  msgid "error writing to %s: %s"
  msgstr "`%s'-ì äáéúëá äì÷ú"
  
! #: info/session.c:3736
  #, c-format
  msgid "closing %s"
--- 1255,1379 ----
  msgstr ".`%s' óéòñá äéìà øù÷î `%s'-á èéøôúä øùà ä÷ñéô éúàöî àì"
  
! #: info/session.c:2870
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "íäéøçà áå÷òå dir-î äìéçúîä èéøôú éôéòñ úøãéñ àø÷"
  
! #: info/session.c:2872
  msgid "Follow menus: "
  msgstr "Follow menus: "
  
! #: info/session.c:2977
  msgid "Select the Next node"
  msgstr "äàáä ä÷ñéôá øåáò"
  
! #: info/session.c:2984
  msgid "Select the Prev node"
  msgstr "úîãå÷ä ä÷ñéôì øåáò"
  
! #: info/session.c:2991
  msgid "Select the Up node"
  msgstr "ìòîù ä÷ñéôì øåáò"
  
! #: info/session.c:2997
  msgid "Select the last node in this file"
  msgstr "äæ êîñîá äðåøçàä ä÷ñéôì øåáò"
  
! #: info/session.c:3024 info/session.c:3057
  msgid "This window has no additional nodes"
  msgstr "äæ ïåìçá úåà÷ñéô øúåé ïéà"
  
! #: info/session.c:3030
  msgid "Select the first node in this file"
  msgstr "äæ êîñîá äðåùàøä ä÷ñéôì øåáò"
  
! #: info/session.c:3164
  msgid "No more nodes within this document."
  msgstr ".äæ êîñîá úåà÷ñéô øúåé ïéà"
  
! #: info/session.c:3209 info/session.c:3249
  #, fuzzy
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr ".åæ ä÷ñéô øåáò `Up'-å `Prev' ììåë åðéà äæ êîñî"
  
! #: info/session.c:3262
  msgid "Move forwards or down through node structure"
  msgstr ".úåà÷ñéôä äðáîá øúåé ÷åîò åà äîéã÷ òåð"
  
! #: info/session.c:3279
  msgid "Move backwards or up through node structure"
  msgstr ".úåà÷ñéôä äðáîá äìòî éôìë åà äøåçà òåð"
  
! #: info/session.c:3302
  msgid "Read a node name and select it"
  msgstr "äéìà øåáòå ä÷ñéô ìù íù àø÷"
  
! #: info/session.c:3356 info/session.c:3360
  msgid "Goto node: "
  msgstr "Goto node: "
  
! #: info/session.c:3539
  msgid "Find the node describing program invocation"
  msgstr "úéðëúä õéøäì ãöéë úøàúîä ä÷ñéôä úà àöî"
  
! #: info/session.c:3541
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Find Invocation node of [%s]: "
  
! #: info/session.c:3586
  msgid "Read a manpage reference and select it"
  msgstr "åúåà âöäå manpage-ì äééðôä àø÷"
  
! #: info/session.c:3590
  msgid "Get Manpage: "
  msgstr "Get Manpage: "
  
! #: info/session.c:3611
  #, fuzzy
  msgid "Select the node 'Top' in this file"
  msgstr "äæ êîñîá (`Top') úéùàøä ä÷ñéôì øåáò"
  
! #: info/session.c:3617
  #, fuzzy
  msgid "Select the node '(dir)'"
  msgstr "`(dir)' ä÷ñéôì øåáò"
  
! #: info/session.c:3623
  msgid "Show full file name of node being displayed"
  msgstr ""
  
! #: info/session.c:3640
  msgid "Select the most recently selected node"
  msgstr "äâöåäù äðåøçàä ä÷ñéôì øåæç"
  
! #: info/session.c:3645
  #, c-format
  msgid "No earlier node in history"
  msgstr ""
  
! #: info/session.c:3649
  msgid "Read the name of a file and select it"
  msgstr "åúåà âöäå õáå÷ ìù íù àø÷"
  
! #: info/session.c:3653
  msgid "Find file: "
  msgstr "Find file: "
  
! #: info/session.c:3670
  #, fuzzy, c-format
  msgid "Cannot find '%s'."
  msgstr ".àöîð àì `%s' õáå÷"
  
! #: info/session.c:3719
  #, fuzzy, c-format
  msgid "Could not create output file '%s'."
  msgstr ".`%s' èìô õáå÷ úøéöéá äì÷ú"
  
! #: info/session.c:3733
  #, fuzzy, c-format
  msgid "error writing to %s: %s"
  msgstr "`%s'-ì äáéúëá äì÷ú"
  
! #: info/session.c:3742
  #, c-format
  msgid "closing %s"
***************
*** 1387,1400 ****
  # No ellipsis because that would look awkward when the translation of
  # "Done." is appended.
! #: info/session.c:3785
  #, fuzzy, c-format
  msgid "writing node %s..."
  msgstr "`%s' ä÷ñéô èìô"
  
! #: info/session.c:3831
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "INFO_PRINT_COMMAND êøã åæ ä÷ñéô ïëåú ñôãä"
  
! #: info/session.c:3859
  #, fuzzy, c-format
  msgid "Cannot open pipe to '%s'."
--- 1382,1395 ----
  # No ellipsis because that would look awkward when the translation of
  # "Done." is appended.
! #: info/session.c:3791
  #, fuzzy, c-format
  msgid "writing node %s..."
  msgstr "`%s' ä÷ñéô èìô"
  
! #: info/session.c:3837
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "INFO_PRINT_COMMAND êøã åæ ä÷ñéô ïëåú ñôãä"
  
! #: info/session.c:3865
  #, fuzzy, c-format
  msgid "Cannot open pipe to '%s'."
***************
*** 1403,1407 ****
  # No ellipsis because that would look awkward when the translation of
  # "Done." is appended.
! #: info/session.c:3864
  #, fuzzy, c-format
  msgid "printing node %s..."
--- 1398,1402 ----
  # No ellipsis because that would look awkward when the translation of
  # "Done." is appended.
! #: info/session.c:3870
  #, fuzzy, c-format
  msgid "printing node %s..."
***************
*** 1410,1464 ****
  # No ellipsis because that would look awkward when the translation of
  # "Done." is appended.
! #: info/session.c:3872
  #, fuzzy, c-format
  msgid "finished printing node %s"
  msgstr "%s ä÷ñéô úñôãä"
  
! #: 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:4169
  msgid "Search continued from the end of the document."
  msgstr ""
  
! #: info/session.c:4174
  #, fuzzy
  msgid "Search continued from the beginning of the document."
  msgstr "äøåù úìéçú ãò ÷çî"
  
! #: info/session.c:4194
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "... %s õáå÷-úú ÷øåñ"
  
! #: info/session.c:4231
  msgid "Search failed."
  msgstr ".äàöîð àì úæåøçîä"
  
! #: info/session.c:4248
  #, fuzzy, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%sfor string [%s]: "
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Regexp search"
  msgstr ""
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Search"
  msgstr "Search"
  
! #: info/session.c:4250 info/session.c:4256
  #, fuzzy
  msgid " case-sensitively"
--- 1405,1459 ----
  # No ellipsis because that would look awkward when the translation of
  # "Done." is appended.
! #: info/session.c:3878
  #, fuzzy, c-format
  msgid "finished printing node %s"
  msgstr "%s ä÷ñéô úñôãä"
  
! #: info/session.c:3910
  msgid "Toggle the usage of regular expressions in searches"
  msgstr ""
  
! #: info/session.c:3914
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr ""
  
! #: info/session.c:3915
  #, c-format
  msgid "Using literal strings for searches."
  msgstr ""
  
! #: info/session.c:4175
  msgid "Search continued from the end of the document."
  msgstr ""
  
! #: info/session.c:4180
  #, fuzzy
  msgid "Search continued from the beginning of the document."
  msgstr "äøåù úìéçú ãò ÷çî"
  
! #: info/session.c:4200
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "... %s õáå÷-úú ÷øåñ"
  
! #: info/session.c:4237
  msgid "Search failed."
  msgstr ".äàöîð àì úæåøçîä"
  
! #: info/session.c:4254
  #, fuzzy, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%sfor string [%s]: "
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Regexp search"
  msgstr ""
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Search"
  msgstr "Search"
  
! #: info/session.c:4256 info/session.c:4262
  #, fuzzy
  msgid " case-sensitively"
***************
*** 1467,1616 ****
  # The following 4 are untranslated because they are used with the
  # format string above in a prompt, and we don't translate prompts.
! #: info/session.c:4251 info/session.c:4257
  #, fuzzy
  msgid " backward"
  msgstr "Search backward"
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s: "
  msgstr ""
  
! #: info/session.c:4274
  msgid "Search string too short"
  msgstr ""
  
! #: info/session.c:4467
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4491 info/session.c:4601
  #, c-format
  msgid "No more matches."
  msgstr ""
  
! #: info/session.c:4628
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4649
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4653 info/session.c:4665
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4661
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4674
  msgid "Read a string and search for it case-sensitively"
  msgstr "úåéùéøá úåáùçúä êåú äúåà ùôçå úæåøçî àø÷"
  
! #: info/session.c:4679
  msgid "Read a string and search for it"
  msgstr "äúåà ùôçå úæåøçî àø÷"
  
! #: info/session.c:4685
  msgid "Read a string and search backward for it"
  msgstr "äøåçà äúåà ùôçå úæåøçî àø÷"
  
! #: info/session.c:4693
  msgid "Repeat last search in the same direction"
  msgstr "ïååéë åúåàá ïåøçà ùåôéç ìò øåæç"
  
! #: info/session.c:4701 info/session.c:4746
  msgid "No previous search string"
  msgstr "ïåøçà ùåôéçî úæåøçî ïéà"
  
! #: info/session.c:4738
  msgid "Repeat last search in the reverse direction"
  msgstr "êåôä ïååéëá ïåøçà ùåôéç ìò øåæç"
  
! #: info/session.c:4785
  msgid "Clear displayed search matches"
  msgstr ""
  
! #: info/session.c:4802 info/session.c:4808
  msgid "Search interactively for a string as you type it"
  msgstr "äúåà ä/ãéì÷î ä/úàù éãë êåú úæåøçî ùôç"
  
! #: info/session.c:4928
  #, fuzzy
  msgid "Regexp I-search backward: "
  msgstr "I-search backward: "
  
! #: info/session.c:4929
  msgid "I-search backward: "
  msgstr "I-search backward: "
  
! #: info/session.c:4931
  #, fuzzy
  msgid "Regexp I-search: "
  msgstr "I-search: "
  
! #: info/session.c:4932
  msgid "I-search: "
  msgstr "I-search: "
  
  # Untranslated because is used with the I-search: prompt.
! #: info/session.c:4957 info/session.c:4960
  msgid "Failing "
  msgstr "Failing "
  
! #: info/session.c:5326
  msgid "Cancel current operation"
  msgstr "úéçëåð äìåòô ìèá"
  
! #: info/session.c:5333
  msgid "Quit"
  msgstr "ìèåá"
  
! #: info/session.c:5338
  #, fuzzy
  msgid "Display version of Info being run"
  msgstr "àöå úéðëúä úñøéâ ìò òãéî âöä"
  
! #: info/session.c:5340
  #, c-format
  msgid "GNU Info version %s"
  msgstr ""
  
! #: info/session.c:5345
  msgid "Redraw the display"
  msgstr "äâåöú ùãç"
  
! #: info/session.c:5382
  msgid "Quit using Info"
  msgstr "Info úéðëåúî àö"
  
! #: info/session.c:5398
  msgid "Run command bound to this key's lowercase variant"
  msgstr "äæ ù÷î ìù úåðè÷ úåéúåà úñøéâì äøåù÷ä äãå÷ô ìòôä"
  
! #: info/session.c:5409
  #, c-format
  msgid "Unknown command (%s)."
  msgstr ".(%s) úøëåî-éúìá äãå÷ô"
  
! #: info/session.c:5412
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\" äéåâù äãå÷ô"
  
! #: info/session.c:5413
  #, fuzzy, c-format
  msgid "'%s' is invalid"
  msgstr "\"%s\" äéåâù äãå÷ô"
  
! #: info/session.c:5731
  msgid "Add this digit to the current numeric argument"
  msgstr "éçëåð éøîåð èðîåâøàì åæ äøôñ óñåä"
  
! #: info/session.c:5738
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "4-á íéé÷ êøò ìåôë åà ,éøîåð èðîåâøà ìù äãì÷ä ìçúä"
--- 1462,1611 ----
  # The following 4 are untranslated because they are used with the
  # format string above in a prompt, and we don't translate prompts.
! #: info/session.c:4257 info/session.c:4263
  #, fuzzy
  msgid " backward"
  msgstr "Search backward"
  
! #: info/session.c:4260
  #, c-format
  msgid "%s%s%s: "
  msgstr ""
  
! #: info/session.c:4280
  msgid "Search string too short"
  msgstr ""
  
! #: info/session.c:4473
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4497 info/session.c:4607
  #, c-format
  msgid "No more matches."
  msgstr ""
  
! #: info/session.c:4634
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4655
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4659 info/session.c:4671
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4667
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4680
  msgid "Read a string and search for it case-sensitively"
  msgstr "úåéùéøá úåáùçúä êåú äúåà ùôçå úæåøçî àø÷"
  
! #: info/session.c:4685
  msgid "Read a string and search for it"
  msgstr "äúåà ùôçå úæåøçî àø÷"
  
! #: info/session.c:4691
  msgid "Read a string and search backward for it"
  msgstr "äøåçà äúåà ùôçå úæåøçî àø÷"
  
! #: info/session.c:4699
  msgid "Repeat last search in the same direction"
  msgstr "ïååéë åúåàá ïåøçà ùåôéç ìò øåæç"
  
! #: info/session.c:4707 info/session.c:4752
  msgid "No previous search string"
  msgstr "ïåøçà ùåôéçî úæåøçî ïéà"
  
! #: info/session.c:4744
  msgid "Repeat last search in the reverse direction"
  msgstr "êåôä ïååéëá ïåøçà ùåôéç ìò øåæç"
  
! #: info/session.c:4791
  msgid "Clear displayed search matches"
  msgstr ""
  
! #: info/session.c:4808 info/session.c:4814
  msgid "Search interactively for a string as you type it"
  msgstr "äúåà ä/ãéì÷î ä/úàù éãë êåú úæåøçî ùôç"
  
! #: info/session.c:4934
  #, fuzzy
  msgid "Regexp I-search backward: "
  msgstr "I-search backward: "
  
! #: info/session.c:4935
  msgid "I-search backward: "
  msgstr "I-search backward: "
  
! #: info/session.c:4937
  #, fuzzy
  msgid "Regexp I-search: "
  msgstr "I-search: "
  
! #: info/session.c:4938
  msgid "I-search: "
  msgstr "I-search: "
  
  # Untranslated because is used with the I-search: prompt.
! #: info/session.c:4963 info/session.c:4966
  msgid "Failing "
  msgstr "Failing "
  
! #: info/session.c:5332
  msgid "Cancel current operation"
  msgstr "úéçëåð äìåòô ìèá"
  
! #: info/session.c:5339
  msgid "Quit"
  msgstr "ìèåá"
  
! #: info/session.c:5344
  #, fuzzy
  msgid "Display version of Info being run"
  msgstr "àöå úéðëúä úñøéâ ìò òãéî âöä"
  
! #: info/session.c:5346
  #, c-format
  msgid "GNU Info version %s"
  msgstr ""
  
! #: info/session.c:5351
  msgid "Redraw the display"
  msgstr "äâåöú ùãç"
  
! #: info/session.c:5388
  msgid "Quit using Info"
  msgstr "Info úéðëåúî àö"
  
! #: info/session.c:5404
  msgid "Run command bound to this key's lowercase variant"
  msgstr "äæ ù÷î ìù úåðè÷ úåéúåà úñøéâì äøåù÷ä äãå÷ô ìòôä"
  
! #: info/session.c:5415
  #, c-format
  msgid "Unknown command (%s)."
  msgstr ".(%s) úøëåî-éúìá äãå÷ô"
  
! #: info/session.c:5418
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\" äéåâù äãå÷ô"
  
! #: info/session.c:5419
  #, fuzzy, c-format
  msgid "'%s' is invalid"
  msgstr "\"%s\" äéåâù äãå÷ô"
  
! #: info/session.c:5737
  msgid "Add this digit to the current numeric argument"
  msgstr "éçëåð éøîåð èðîåâøàì åæ äøôñ óñåä"
  
! #: info/session.c:5744
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "4-á íéé÷ êøò ìåôë åà ,éøîåð èðîåâøà ìù äãì÷ä ìçúä"
***************
*** 1749,1766 ****
  msgstr "Set %s to value (%s): "
  
! #: info/window.c:959
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), lines ----, "
  
- #: info/window.c:966
- #, fuzzy, c-format
- msgid "-%s---Info: %s, %ld lines --%s--"
- msgstr "-%s---Info: %s, %d lines --%s--"
- 
- #: info/window.c:970
- #, fuzzy, c-format
- msgid "-%s---Info: (%s)%s, %ld lines --%s--"
- msgstr "-%s%s-Info: (%s)%s, %d lines --%s--"
- 
  #: install-info/install-info.c:292
  #, c-format
--- 1744,1751 ----
  msgstr "Set %s to value (%s): "
  
! #: info/window.c:909
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), lines ----, "
  
  #: install-info/install-info.c:292
  #, c-format
***************
*** 1886,1890 ****
  "\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"
--- 1871,1875 ----
  "\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"
***************
*** 1976,2093 ****
  msgstr "÷çîð àì íåìë ;`%s' øåáò èéøôú éôéòñ åàöîð àì"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:855
! #: tp/Texinfo/Convert/Converter.pm:893 tp/Texinfo/Convert/Converter.pm:1204
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6504
! #: tp/Texinfo/Convert/HTML.pm:6528 tp/Texinfo/Convert/HTML.pm:6905
! #: tp/Texinfo/Convert/HTML.pm:6963 tp/Texinfo/Convert/HTML.pm:7041
! #: tp/Texinfo/Convert/HTML.pm:7118 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:546
! #: tp/Texinfo/Convert/TexinfoXML.pm:457
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:881
  msgid "recursion is always allowed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:882
  msgid "arguments are quoted by default"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1105
  #, fuzzy, perl-format
  msgid "%s is not a valid language code"
  msgstr "ISO 639 é\"ò íéøëåîä ïåùìä éðîéñî ãçà åðéà %s"
  
! #: tp/Texinfo/Common.pm:1110
  #, fuzzy, perl-format
  msgid "%s is not a valid region code"
  msgstr "ISO 639 é\"ò íéøëåîä ïåùìä éðîéñî ãçà åðéà %s"
  
! #: tp/Texinfo/Common.pm:1128
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1151
  #, perl-format
  msgid "could not read %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1170
  #, fuzzy, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "`%s' èìô õáå÷ úøéâñá äì÷ú"
  
! #: tp/Texinfo/Common.pm:1176 tp/Texinfo/Parser.pm:3353
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1520
! #, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:1548
! #, fuzzy
! msgid "missing type"
! msgstr "äãå÷ô íù øñç"
! 
! #: tp/Texinfo/Common.pm:1551
! #, fuzzy, perl-format
! msgid "unrecognized type: %s"
! msgstr "%s úéðëú øåáò `--%s' ääåæî-éúìá ïééôàî\n"
! 
! #: tp/Texinfo/Common.pm:1568
! #, fuzzy, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr "`%s' èìô õáå÷ úøéâñá äì÷ú"
! 
! #: tp/Texinfo/Common.pm:1603
  msgid "no node to be renamed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1614
  msgid "nodes without a new name at the end of file"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1624 tp/Texinfo/Parser.pm:926
  #, perl-format
  msgid "could not open %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:2144
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:395 tp/Texinfo/Convert/Converter.pm:414
  #, fuzzy, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Set variable: "
  
! #: tp/Texinfo/Convert/Converter.pm:794
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:876 tp/Texinfo/Convert/Converter.pm:909
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:6931
! #: tp/Texinfo/Convert/HTML.pm:6989 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:476 tp/Texinfo/Parser.pm:2035
  #, fuzzy, perl-format
  msgid "error on closing %s: %s"
  msgstr "`%s' èìô õáå÷ úøéâñá äì÷ú"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, fuzzy, perl-format
  msgid "could not create directories `%s' or `%s': %s"
  msgstr "`%s' äé÷éú úøéöéá (%s) äì÷ú"
  
! #: tp/Texinfo/Convert/Converter.pm:995
  #, fuzzy, perl-format
  msgid "could not create directory `%s': %s"
--- 1961,2069 ----
  msgstr "÷çîð àì íåìë ;`%s' øåáò èéøôú éôéòñ åàöîð àì"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:847
! #: tp/Texinfo/Convert/Converter.pm:885 tp/Texinfo/Convert/Converter.pm:1196
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6573
! #: tp/Texinfo/Convert/HTML.pm:6597 tp/Texinfo/Convert/HTML.pm:6978
! #: tp/Texinfo/Convert/HTML.pm:7037 tp/Texinfo/Convert/HTML.pm:7115
! #: tp/Texinfo/Convert/HTML.pm:7192 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:547
! #: tp/Texinfo/Convert/TexinfoXML.pm:458
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:862
  msgid "recursion is always allowed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:863
  msgid "arguments are quoted by default"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:866
! msgid ""
! "move your @contents command if you want the contents after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:869
! msgid ""
! "move your @shortcontents and @contents commands if you want the contents "
! "after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:1093
  #, fuzzy, perl-format
  msgid "%s is not a valid language code"
  msgstr "ISO 639 é\"ò íéøëåîä ïåùìä éðîéñî ãçà åðéà %s"
  
! #: tp/Texinfo/Common.pm:1098
  #, fuzzy, perl-format
  msgid "%s is not a valid region code"
  msgstr "ISO 639 é\"ò íéøëåîä ïåùìä éðîéñî ãçà åðéà %s"
  
! #: tp/Texinfo/Common.pm:1116
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1139
  #, perl-format
  msgid "could not read %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1158
  #, fuzzy, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "`%s' èìô õáå÷ úøéâñá äì÷ú"
  
! #: tp/Texinfo/Common.pm:1164 tp/Texinfo/Parser.pm:3193
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1637
  msgid "no node to be renamed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1648
  msgid "nodes without a new name at the end of file"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1658 tp/Texinfo/Parser.pm:899
  #, perl-format
  msgid "could not open %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:2178
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:387 tp/Texinfo/Convert/Converter.pm:406
  #, fuzzy, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Set variable: "
  
! #: tp/Texinfo/Convert/Converter.pm:786
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:868 tp/Texinfo/Convert/Converter.pm:901
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:7004
! #: tp/Texinfo/Convert/HTML.pm:7063 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:477 tp/Texinfo/Parser.pm:1996
  #, fuzzy, perl-format
  msgid "error on closing %s: %s"
  msgstr "`%s' èìô õáå÷ úøéâñá äì÷ú"
  
! #: tp/Texinfo/Convert/Converter.pm:979
  #, fuzzy, perl-format
  msgid "could not create directories `%s' or `%s': %s"
  msgstr "`%s' äé÷éú úøéöéá (%s) äì÷ú"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, fuzzy, perl-format
  msgid "could not create directory `%s': %s"
***************
*** 2099,2198 ****
  msgstr "@image øåáò `%s' õáå÷ úàéø÷á (%s) äì÷ú"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5388
  #, fuzzy
  msgid "no argument specified for @U"
  msgstr "ä÷ñéô íù àìì `%c%s' äàøåä"
  
! #: tp/Texinfo/Convert/HTML.pm:1683
  #, fuzzy, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
  msgstr "(HTML øåáò ùøãð) @image øåáò `%s' õáå÷ úàéø÷á (%s) äì÷ú"
  
! #: tp/Texinfo/Convert/HTML.pm:2371
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4888
  msgid "string not closed in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4890
  msgid "--css-include ended in comment"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4892
  msgid "@import not finished in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4918
  #, perl-format
  msgid "CSS file %s not found"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4924
  #, fuzzy, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "`%s' èì÷ õáå÷ úçéúôá äì÷ú"
  
! #: tp/Texinfo/Convert/HTML.pm:4934
  #, fuzzy, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "`%s' èìô õáå÷ úøéâñá äì÷ú"
  
! #: tp/Texinfo/Convert/HTML.pm:5801 tp/Texinfo/Convert/HTML.pm:5805
  #, fuzzy, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "`%s' úæåøçî íéìéëîä ñ÷ãðéà éèéøô ïéà\n"
  
! #: tp/Texinfo/Convert/HTML.pm:6499
  #, fuzzy, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "`%s' èìô õáå÷ úøéâñá äì÷ú"
  
! #: tp/Texinfo/Convert/HTML.pm:6523
  #, fuzzy, perl-format
  msgid "error on closing TOC frame file %s: %s"
  msgstr "`%s' èìô õáå÷ úøéâñá äì÷ú"
  
! #: tp/Texinfo/Convert/HTML.pm:6638
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6839
  msgid "must specify a title with a title command or @top"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7048
  #, fuzzy, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr "`%s' èìô õáå÷ úøéâñá äì÷ú"
  
! #: tp/Texinfo/Convert/HTML.pm:7073
  #, fuzzy, perl-format
  msgid "old name for `%s' is a node of the document"
  msgstr ".åæ ä÷ñéô øåáò `Up'-å `Prev' ììåë åðéà äæ êîñî"
  
! #: tp/Texinfo/Convert/HTML.pm:7079
  #, fuzzy, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "øåùé÷ óà ïéà `%s' ä÷ñéôì"
  
! #: tp/Texinfo/Convert/HTML.pm:7093
  #, perl-format
  msgid "target node (new name for `%s') not in document: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7125
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7163
  msgid "empty node name"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7165 tp/Texinfo/Parser.pm:3697
  #, perl-format
  msgid "syntax for an external node used for `%s'"
--- 2075,2194 ----
  msgstr "@image øåáò `%s' õáå÷ úàéø÷á (%s) äì÷ú"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5225
  #, fuzzy
  msgid "no argument specified for @U"
  msgstr "ä÷ñéô íù àìì `%c%s' äàøåä"
  
! #: tp/Texinfo/Convert/HTML.pm:1715
  #, fuzzy, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
  msgstr "(HTML øåáò ùøãð) @image øåáò `%s' õáå÷ úàéø÷á (%s) äì÷ú"
  
! #: tp/Texinfo/Convert/HTML.pm:2399
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4629
! #, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr ""
! 
! #: tp/Texinfo/Convert/HTML.pm:4657
! #, fuzzy
! msgid "missing type"
! msgstr "äãå÷ô íù øñç"
! 
! #: tp/Texinfo/Convert/HTML.pm:4660
! #, fuzzy, perl-format
! msgid "unrecognized type: %s"
! msgstr "%s úéðëú øåáò `--%s' ääåæî-éúìá ïééôàî\n"
! 
! #: tp/Texinfo/Convert/HTML.pm:4677
! #, fuzzy, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr "`%s' èìô õáå÷ úøéâñá äì÷ú"
! 
! #: tp/Texinfo/Convert/HTML.pm:4962
  msgid "string not closed in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4964
  msgid "--css-include ended in comment"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4966
  msgid "@import not finished in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4992
  #, perl-format
  msgid "CSS file %s not found"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4998
  #, fuzzy, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "`%s' èì÷ õáå÷ úçéúôá äì÷ú"
  
! #: tp/Texinfo/Convert/HTML.pm:5008
  #, fuzzy, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "`%s' èìô õáå÷ úøéâñá äì÷ú"
  
! #: tp/Texinfo/Convert/HTML.pm:5870 tp/Texinfo/Convert/HTML.pm:5874
  #, fuzzy, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "`%s' úæåøçî íéìéëîä ñ÷ãðéà éèéøô ïéà\n"
  
! #: tp/Texinfo/Convert/HTML.pm:6568
  #, fuzzy, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "`%s' èìô õáå÷ úøéâñá äì÷ú"
  
! #: tp/Texinfo/Convert/HTML.pm:6592
  #, fuzzy, perl-format
  msgid "error on closing TOC frame file %s: %s"
  msgstr "`%s' èìô õáå÷ úøéâñá äì÷ú"
  
! #: tp/Texinfo/Convert/HTML.pm:6707
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6912
  msgid "must specify a title with a title command or @top"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7122
  #, fuzzy, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr "`%s' èìô õáå÷ úøéâñá äì÷ú"
  
! #: tp/Texinfo/Convert/HTML.pm:7147
  #, fuzzy, perl-format
  msgid "old name for `%s' is a node of the document"
  msgstr ".åæ ä÷ñéô øåáò `Up'-å `Prev' ììåë åðéà äæ êîñî"
  
! #: tp/Texinfo/Convert/HTML.pm:7153
  #, fuzzy, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "øåùé÷ óà ïéà `%s' ä÷ñéôì"
  
! #: tp/Texinfo/Convert/HTML.pm:7167
  #, perl-format
  msgid "target node (new name for `%s') not in document: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7199
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7237
  msgid "empty node name"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7239 tp/Texinfo/Parser.pm:3542
  #, perl-format
  msgid "syntax for an external node used for `%s'"
***************
*** 2228,2257 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1334
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1381 tp/Texinfo/Parser.pm:2722
  #, fuzzy, perl-format
  msgid "entry for index `%s' outside of any node"
  msgstr "ä÷ñéô ìëì õåçî øãâåî `%s' ñ÷ãðéà èéøô"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1495
  #, fuzzy, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr "`%s' èìô õáå÷ úøéâñá äì÷ú"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1500
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "@image øåáò `%s' õáå÷ úàéø÷á (%s) äì÷ú"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1523
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1931
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
--- 2224,2253 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1335
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1382 tp/Texinfo/Parser.pm:2568
  #, fuzzy, perl-format
  msgid "entry for index `%s' outside of any node"
  msgstr "ä÷ñéô ìëì õåçî øãâåî `%s' ñ÷ãðéà èéøô"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1496
  #, fuzzy, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr "`%s' èìô õáå÷ úøéâñá äì÷ú"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1501
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "@image øåáò `%s' õáå÷ úàéø÷á (%s) äì÷ú"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1524
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1932
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
***************
*** 2259,2578 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2161
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2193
  #, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2226
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2272
  #, fuzzy, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "%c àìå `,' åà `.' àåáì êéøö øåùé÷ éøçà"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2275
  #, fuzzy
  msgid "`.' or `,' must follow @xref"
  msgstr "%c àìå `,' åà `.' àåáì êéøö øåùé÷ éøçà"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3118
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3129
  msgid "menu entry node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3145
  msgid "menu entry name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:910
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1160 tp/Texinfo/Structuring.pm:594
  #, perl-format
  msgid "multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1194
  #, perl-format
! msgid "bad syntax for @%s argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1210
  #, perl-format
! msgid "bad or empty @%s formal argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1219 tp/Texinfo/Parser.pm:4856
! #: tp/Texinfo/Parser.pm:4882 tp/Texinfo/Parser.pm:5671
! #: tp/Texinfo/Parser.pm:5687 tp/Texinfo/Parser.pm:5702
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "íù ùøåã %c%s"
  
! #: tp/Texinfo/Parser.pm:1223 tp/Texinfo/Parser.pm:4859
! #: tp/Texinfo/Parser.pm:4885 tp/Texinfo/Parser.pm:5674
! #: tp/Texinfo/Parser.pm:5690 tp/Texinfo/Parser.pm:5705
  #, fuzzy, perl-format
  msgid "bad name for @%s"
  msgstr " for %s"
  
! #: tp/Texinfo/Parser.pm:1341
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1345
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1350
! #, perl-format
! msgid "%c%s missing close brace"
  msgstr "%c%s-ì øñç éðîé øâåñ"
  
! #: tp/Texinfo/Parser.pm:1354
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1476
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1544
  msgid "@itemx must follow @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1712
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1743
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "`%s' àöîð íìåà ,`%s' ì\"ö `@end' éøçà"
  
! #: tp/Texinfo/Parser.pm:1746
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1750
  #, fuzzy, perl-format
  msgid "no matching `%cend %s'"
  msgstr "íàåú `%cend %s' øñç"
  
! #: tp/Texinfo/Parser.pm:1776 tp/Texinfo/Parser.pm:5204
! #: tp/Texinfo/Parser.pm:5470
  #, fuzzy, perl-format
  msgid "misplaced %c"
  msgstr "åîå÷îá åðéàù %c"
  
! #: tp/Texinfo/Parser.pm:1874 tp/Texinfo/Parser.pm:3312
  #, fuzzy, perl-format
  msgid "unmatched `%c%s'"
  msgstr "âåæ-ïá åì ïéàù `%c%s'"
  
! #: tp/Texinfo/Parser.pm:2110
  #, fuzzy, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "éãî íéáø íéèðîåâøà úììåë `%s' åø÷àîì %d äøåùá äúìéçúù äàéø÷"
  
! #: tp/Texinfo/Parser.pm:2132
  #, fuzzy, perl-format
! msgid "@%s missing close brace"
  msgstr "%c%s-ì øñç éðîé øâåñ"
  
! #: tp/Texinfo/Parser.pm:2140
  #, fuzzy, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr "éãî íéáø íéèðîåâøà úììåë `%s' åø÷àîì %d äøåùá äúìéçúù äàéø÷"
  
! #: tp/Texinfo/Parser.pm:2175
  #, fuzzy, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
  msgstr "øèîøô íù åà \\ íå÷îá ,åø÷àî úáçøäá \\ úåá÷òá `%s'"
  
! #: tp/Texinfo/Parser.pm:2650
  #, fuzzy, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "íãï÷ øãâåä øáë `%s' åø÷àî"
  
! #: tp/Texinfo/Parser.pm:2655
  #, fuzzy, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "äðåùàøì øãâåä `%s' ïàë"
  
! #: tp/Texinfo/Parser.pm:3016
  #, fuzzy, perl-format
  msgid "missing name for @%s"
  msgstr "äãå÷ô íù øñç"
  
! #: tp/Texinfo/Parser.pm:3021
  #, perl-format
  msgid "missing category for @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3073
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3089
  #, fuzzy
  msgid "empty multitable"
  msgstr "÷éø åðéä %s õáå÷"
  
! #: tp/Texinfo/Parser.pm:3145 tp/Texinfo/Parser.pm:5784
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s"
  msgstr "%c%s-ì éåâù èðîåâøà"
  
! #: tp/Texinfo/Parser.pm:3151 tp/Texinfo/Parser.pm:5806
! #: tp/Texinfo/Parser.pm:5818
  #, fuzzy, perl-format
  msgid "bad argument to @%s"
  msgstr "%c%s-ì éåâù èðîåâøà"
  
! #: tp/Texinfo/Parser.pm:3162
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s úàøåäá %citem øåáò áåöéò úèéù :èðîåâøà ùøãð"
  
! #: tp/Texinfo/Parser.pm:3167
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3202
  #, fuzzy, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `--%s' ïééôàî\n"
  
! #: tp/Texinfo/Parser.pm:3290 tp/Texinfo/Parser.pm:3429
! #: tp/Texinfo/Parser.pm:5777
  #, fuzzy, perl-format
  msgid "@%s missing argument"
  msgstr ".õáå÷ íù øñç %s úéðëúì\n"
  
! #: tp/Texinfo/Parser.pm:3302
  #, fuzzy, perl-format
  msgid "unknown @end %s"
  msgstr "`%s' øëåî-éúìá ñ÷ãðéà"
  
! #: tp/Texinfo/Parser.pm:3324 tp/Texinfo/Parser.pm:3943
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3329 tp/Texinfo/Parser.pm:5861
! #: tp/Texinfo/Parser.pm:5906 tp/Texinfo/Parser.pm:5935
! #: tp/Texinfo/Parser.pm:5976 tp/Texinfo/Parser.pm:6055
  #, fuzzy, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "%c%s-ì éåâù èðîåâøà"
  
! #: tp/Texinfo/Parser.pm:3348
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3360
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3369
  #, fuzzy, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "`%s' øëåî-éúìá ãåãé÷ íù"
  
! #: tp/Texinfo/Parser.pm:3516
  #, perl-format
  msgid "@%s after the first element"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3523
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3563
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3575
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3677
  #, fuzzy, perl-format
  msgid "empty argument in @%s"
  msgstr "%c%s-ì éåâù èðîåâøà"
  
! #: tp/Texinfo/Parser.pm:3681
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3724
  #, fuzzy, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr ".íéèéøôú `%s' ïéà ä÷ñéôá"
  
! #: tp/Texinfo/Parser.pm:3732
  msgid "empty node name in menu entry"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3805
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3937
! #, perl-format
! msgid "@end %s should only appear at a line beginning"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:3960
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "íãï÷ øãâåä øáë `%s' åø÷àî"
  
! #: tp/Texinfo/Parser.pm:3963
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "äðåùàøì øãâåä `%s' ïàë"
  
! #: tp/Texinfo/Parser.pm:3968
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4017
  #, perl-format
  msgid "@%s without associated character"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4087
  #, perl-format
  msgid ""
--- 2255,2575 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2162
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2194
  #, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2227
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2273
  #, fuzzy, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "%c àìå `,' åà `.' àåáì êéøö øåùé÷ éøçà"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2276
  #, fuzzy
  msgid "`.' or `,' must follow @xref"
  msgstr "%c àìå `,' åà `.' àåáì êéøö øåùé÷ éøçà"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3086
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3097
  msgid "menu entry node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3113
  msgid "menu entry name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:883
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1125 tp/Texinfo/Structuring.pm:595
  #, perl-format
  msgid "multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1166
  #, perl-format
! msgid "bad or empty @%s formal argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1176
  #, perl-format
! msgid "bad syntax for @%s argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1183 tp/Texinfo/Parser.pm:4707
! #: tp/Texinfo/Parser.pm:4733 tp/Texinfo/Parser.pm:5565
! #: tp/Texinfo/Parser.pm:5578 tp/Texinfo/Parser.pm:5592
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "íù ùøåã %c%s"
  
! #: tp/Texinfo/Parser.pm:1187 tp/Texinfo/Parser.pm:4710
! #: tp/Texinfo/Parser.pm:4736 tp/Texinfo/Parser.pm:5568
! #: tp/Texinfo/Parser.pm:5581 tp/Texinfo/Parser.pm:5595
  #, fuzzy, perl-format
  msgid "bad name for @%s"
  msgstr " for %s"
  
! #: tp/Texinfo/Parser.pm:1305
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1309
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1314
! #, fuzzy, perl-format
! msgid "%c%s missing closing brace"
  msgstr "%c%s-ì øñç éðîé øâåñ"
  
! #: tp/Texinfo/Parser.pm:1318
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1440
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1508
  msgid "@itemx must follow @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1676
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1707
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "`%s' àöîð íìåà ,`%s' ì\"ö `@end' éøçà"
  
! #: tp/Texinfo/Parser.pm:1710
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1714
  #, fuzzy, perl-format
  msgid "no matching `%cend %s'"
  msgstr "íàåú `%cend %s' øñç"
  
! #: tp/Texinfo/Parser.pm:1738 tp/Texinfo/Parser.pm:5070
! #: tp/Texinfo/Parser.pm:5308
  #, fuzzy, perl-format
  msgid "misplaced %c"
  msgstr "åîå÷îá åðéàù %c"
  
! #: tp/Texinfo/Parser.pm:1835 tp/Texinfo/Parser.pm:3148
  #, fuzzy, perl-format
  msgid "unmatched `%c%s'"
  msgstr "âåæ-ïá åì ïéàù `%c%s'"
  
! #: tp/Texinfo/Parser.pm:2072
  #, fuzzy, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "éãî íéáø íéèðîåâøà úììåë `%s' åø÷àîì %d äøåùá äúìéçúù äàéø÷"
  
! #: tp/Texinfo/Parser.pm:2094
  #, fuzzy, perl-format
! msgid "@%s missing closing brace"
  msgstr "%c%s-ì øñç éðîé øâåñ"
  
! #: tp/Texinfo/Parser.pm:2102
  #, fuzzy, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr "éãî íéáø íéèðîåâøà úììåë `%s' åø÷àîì %d äøåùá äúìéçúù äàéø÷"
  
! #: tp/Texinfo/Parser.pm:2138
  #, fuzzy, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
  msgstr "øèîøô íù åà \\ íå÷îá ,åø÷àî úáçøäá \\ úåá÷òá `%s'"
  
! #: tp/Texinfo/Parser.pm:2501
  #, fuzzy, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "íãï÷ øãâåä øáë `%s' åø÷àî"
  
! #: tp/Texinfo/Parser.pm:2506
  #, fuzzy, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "äðåùàøì øãâåä `%s' ïàë"
  
! #: tp/Texinfo/Parser.pm:2850
  #, fuzzy, perl-format
  msgid "missing name for @%s"
  msgstr "äãå÷ô íù øñç"
  
! #: tp/Texinfo/Parser.pm:2855
  #, perl-format
  msgid "missing category for @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2890
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2905
  #, fuzzy
  msgid "empty multitable"
  msgstr "÷éø åðéä %s õáå÷"
  
! #: tp/Texinfo/Parser.pm:2959 tp/Texinfo/Parser.pm:5673
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s"
  msgstr "%c%s-ì éåâù èðîåâøà"
  
! #: tp/Texinfo/Parser.pm:2965 tp/Texinfo/Parser.pm:5694
! #: tp/Texinfo/Parser.pm:5705
  #, fuzzy, perl-format
  msgid "bad argument to @%s"
  msgstr "%c%s-ì éåâù èðîåâøà"
  
! #: tp/Texinfo/Parser.pm:2976
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s úàøåäá %citem øåáò áåöéò úèéù :èðîåâøà ùøãð"
  
! #: tp/Texinfo/Parser.pm:2981
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3016
  #, fuzzy, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `--%s' ïééôàî\n"
  
! #: tp/Texinfo/Parser.pm:3124 tp/Texinfo/Parser.pm:3277
! #: tp/Texinfo/Parser.pm:5666
  #, fuzzy, perl-format
  msgid "@%s missing argument"
  msgstr ".õáå÷ íù øñç %s úéðëúì\n"
  
! #: tp/Texinfo/Parser.pm:3138
  #, fuzzy, perl-format
  msgid "unknown @end %s"
  msgstr "`%s' øëåî-éúìá ñ÷ãðéà"
  
! #: tp/Texinfo/Parser.pm:3161 tp/Texinfo/Parser.pm:3788
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3167 tp/Texinfo/Parser.pm:3245
! #: tp/Texinfo/Parser.pm:5755 tp/Texinfo/Parser.pm:5798
! #: tp/Texinfo/Parser.pm:5827 tp/Texinfo/Parser.pm:5868
! #: tp/Texinfo/Parser.pm:5946
  #, fuzzy, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "%c%s-ì éåâù èðîåâøà"
  
! #: tp/Texinfo/Parser.pm:3188
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3200
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3208
  #, fuzzy, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "`%s' øëåî-éúìá ãåãé÷ íù"
  
! #: tp/Texinfo/Parser.pm:3364
  #, perl-format
  msgid "@%s after the first element"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3371
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3408
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3420
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3522
  #, fuzzy, perl-format
  msgid "empty argument in @%s"
  msgstr "%c%s-ì éåâù èðîåâøà"
  
! #: tp/Texinfo/Parser.pm:3526
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3569
  #, fuzzy, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr ".íéèéøôú `%s' ïéà ä÷ñéôá"
  
! #: tp/Texinfo/Parser.pm:3577
  msgid "empty node name in menu entry"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3650
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3782
! #, fuzzy, perl-format
! msgid "@end %s should only appear at the beginning of a line"
! msgstr "äøåù úìéçú ãò ÷çî"
  
! #: tp/Texinfo/Parser.pm:3804
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "íãï÷ øãâåä øáë `%s' åø÷àî"
  
! #: tp/Texinfo/Parser.pm:3807
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "äðåùàøì øãâåä `%s' ïàë"
  
! #: tp/Texinfo/Parser.pm:3812
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3879
  #, perl-format
  msgid "@%s without associated character"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3949
  #, perl-format
  msgid ""
***************
*** 2580,2584 ****
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4111
  #, perl-format
  msgid ""
--- 2577,2581 ----
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3974
  #, perl-format
  msgid ""
***************
*** 2587,2880 ****
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4120
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4176
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4182
  #, fuzzy, perl-format
  msgid "use braces to give a command as an argument to @%s"
  msgstr "íéìñìåñî íééøâåñá êøåö ùé ,@%s-ì èðîåâøà äéäú äàøåäù éãë"
  
! #: tp/Texinfo/Parser.pm:4195 tp/Texinfo/Parser.pm:5325
  #, fuzzy, perl-format
  msgid "%c%s expects `i' or `j' as argument, not `%s'"
  msgstr "`j' åà `i' úåéäì áééç øùà ,%c%s ìù èðîåâøà úåéäì íéàúî åðéà `%c'"
  
! #: tp/Texinfo/Parser.pm:4207
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4218
  #, fuzzy, perl-format
  msgid "@%s expected braces"
  msgstr "`{...}'-ì äôéö %c%s"
  
! #: tp/Texinfo/Parser.pm:4383
  #, perl-format
  msgid "undefined flag: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4386
  msgid "bad syntax for @value"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4393
  #, fuzzy, perl-format
  msgid "%c%s is obsolete."
  msgstr "ïùåéî åðéä %c%s"
  
! #: tp/Texinfo/Parser.pm:4396
  #, fuzzy, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "ïùåéî åðéä %c%s"
  
! #: tp/Texinfo/Parser.pm:4405
! #, perl-format
! msgid "@%s should only appear at a line beginning"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:4496
  #, fuzzy, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "`@%s' êåúá @%s-ì úåòîùî ïéà"
  
! #: tp/Texinfo/Parser.pm:4505
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4631 tp/Texinfo/Parser.pm:4648
! #: tp/Texinfo/Parser.pm:4698
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "`@%s' êåúá @%s-ì úåòîùî ïéà"
  
! #: tp/Texinfo/Parser.pm:4658
  #, fuzzy, perl-format
  msgid "@%s in empty multitable"
  msgstr "÷éø åðéä %s õáå÷"
  
! #: tp/Texinfo/Parser.pm:4664
  msgid "@tab before @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4667
  #, fuzzy, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "(%d ãò øúåî) multitable ìù @item-á úåãåîò éãî øúåé"
  
! #: tp/Texinfo/Parser.pm:4704
  msgid "ignoring @tab outside of multitable"
  msgstr "multitable-ì õåçî @tab-î éúîìòúä"
  
! #: tp/Texinfo/Parser.pm:4708
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4745
  #, fuzzy, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "`%s' êåúá ÷øå êà ùåîéùá øúåî `%sx'"
  
! #: tp/Texinfo/Parser.pm:4787
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4791
  msgid "@dircategory after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4979
  #, fuzzy, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "íééìåù úåøòä êåúá íééìåù úåøòäá äëéîú ïéà"
  
! #: tp/Texinfo/Parser.pm:4997
  msgid "@direntry after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5005
  #, fuzzy, perl-format
  msgid "@%s seen before first @node"
  msgstr "`Top' ú÷ñéô øöåé ,äðåùàøä ä÷ñéôä éðôì àöîð @menu"
  
! #: tp/Texinfo/Parser.pm:5008
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
  msgstr "?@ifinfo íå÷îá @ifnottex-á úô÷åî úåéäì äúéä äëéøö @top ú÷ñéô éë ïëúééä"
  
! #: tp/Texinfo/Parser.pm:5070
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5078
  #, fuzzy, perl-format
  msgid "unknown command `%s'"
  msgstr "`%s' úøëåî-éúìá äàøåä"
  
! #: tp/Texinfo/Parser.pm:5088
  #, fuzzy
  msgid "unexpected @"
  msgstr "`%s' éåôö äéä ïàë"
  
! #: tp/Texinfo/Parser.pm:5117
  #, fuzzy, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "`@%s' êåúá @%s-ì úåòîùî ïéà"
  
! #: tp/Texinfo/Parser.pm:5122
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5130
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5249
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5273
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5292
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5303
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5316
  msgid "@image missing filename argument"
  msgstr "@image úàøåäá øñç õáå÷ íù"
  
! #: tp/Texinfo/Parser.pm:5348
  #, fuzzy, perl-format
  msgid "@%s missing first argument"
  msgstr ".õáå÷ íù øñç %s úéðëúì\n"
  
! #: tp/Texinfo/Parser.pm:5393
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5399
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5412
! #, perl-format
! msgid "argument for @U exceeds size of integer: %s"
! msgstr ""
! 
! #: tp/Texinfo/Parser.pm:5418
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5546
  msgid "superfluous arguments for node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5596
  #, fuzzy, perl-format
  msgid "expected @end %s"
  msgstr "`%s' éåôö äéä ïàë"
  
! #: tp/Texinfo/Parser.pm:5718
  #, fuzzy, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "íéìñìåñî íééøâåñá êøåö ùé ,@%s-ì èðîåâøà äéäú äàøåäù éãë"
  
! #: tp/Texinfo/Parser.pm:5728
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5801
  #, fuzzy, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "íéìñìåñî íééøâåñá êøåö ùé ,@%s-ì èðîåâøà äéäú äàøåäù éãë"
  
! #: tp/Texinfo/Parser.pm:5823
  #, perl-format
  msgid "empty @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5831
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5840
  #, fuzzy, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr ".%s ïééôàî øåáò %s é\"ò ùøãðë ,éøîåð èðîåâøà åðéà `%s'\n"
  
! #: tp/Texinfo/Parser.pm:5849
  #, fuzzy, perl-format
  msgid "reserved index name %s"
  msgstr "`%s' :éåâù (node) ä÷ñéô íù"
  
! #: tp/Texinfo/Parser.pm:5868
  #, fuzzy, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "`%s' øëåî-éúìá ñ÷ãðéà"
  
! #: tp/Texinfo/Parser.pm:5871
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5914
  #, fuzzy, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "@printindex-á `%s' øëåî-éúìá ñ÷ãðéà"
  
! #: tp/Texinfo/Parser.pm:5920
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5928
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5944
  #, fuzzy, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
  msgstr ".%s ïééôàî øåáò %s é\"ò ùøãðë ,éøîåð èðîåâøà åðéà `%s'\n"
  
! #: tp/Texinfo/Parser.pm:5952
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5960
  #, fuzzy, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
--- 2584,2872 ----
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3983
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4038
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4044
  #, fuzzy, perl-format
  msgid "use braces to give a command as an argument to @%s"
  msgstr "íéìñìåñî íééøâåñá êøåö ùé ,@%s-ì èðîåâøà äéäú äàøåäù éãë"
  
! #: tp/Texinfo/Parser.pm:4057 tp/Texinfo/Parser.pm:5189
  #, fuzzy, perl-format
  msgid "%c%s expects `i' or `j' as argument, not `%s'"
  msgstr "`j' åà `i' úåéäì áééç øùà ,%c%s ìù èðîåâøà úåéäì íéàúî åðéà `%c'"
  
! #: tp/Texinfo/Parser.pm:4068
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4079
  #, fuzzy, perl-format
  msgid "@%s expected braces"
  msgstr "`{...}'-ì äôéö %c%s"
  
! #: tp/Texinfo/Parser.pm:4233
  #, perl-format
  msgid "undefined flag: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4236
  msgid "bad syntax for @value"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4243
  #, fuzzy, perl-format
  msgid "%c%s is obsolete."
  msgstr "ïùåéî åðéä %c%s"
  
! #: tp/Texinfo/Parser.pm:4246
  #, fuzzy, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "ïùåéî åðéä %c%s"
  
! #: tp/Texinfo/Parser.pm:4255
! #, fuzzy, perl-format
! msgid "@%s should only appear at the beginning of a line"
! msgstr "äøåù úìéçú ãò ÷çî"
  
! #: tp/Texinfo/Parser.pm:4346
  #, fuzzy, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "`@%s' êåúá @%s-ì úåòîùî ïéà"
  
! #: tp/Texinfo/Parser.pm:4355
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4479 tp/Texinfo/Parser.pm:4496
! #: tp/Texinfo/Parser.pm:4546
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "`@%s' êåúá @%s-ì úåòîùî ïéà"
  
! #: tp/Texinfo/Parser.pm:4506
  #, fuzzy, perl-format
  msgid "@%s in empty multitable"
  msgstr "÷éø åðéä %s õáå÷"
  
! #: tp/Texinfo/Parser.pm:4512
  msgid "@tab before @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4515
  #, fuzzy, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "(%d ãò øúåî) multitable ìù @item-á úåãåîò éãî øúåé"
  
! #: tp/Texinfo/Parser.pm:4552
  msgid "ignoring @tab outside of multitable"
  msgstr "multitable-ì õåçî @tab-î éúîìòúä"
  
! #: tp/Texinfo/Parser.pm:4556
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4596
  #, fuzzy, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "`%s' êåúá ÷øå êà ùåîéùá øúåî `%sx'"
  
! #: tp/Texinfo/Parser.pm:4638
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4642
  msgid "@dircategory after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4847
  #, fuzzy, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "íééìåù úåøòä êåúá íééìåù úåøòäá äëéîú ïéà"
  
! #: tp/Texinfo/Parser.pm:4864
  msgid "@direntry after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4872
  #, fuzzy, perl-format
  msgid "@%s seen before first @node"
  msgstr "`Top' ú÷ñéô øöåé ,äðåùàøä ä÷ñéôä éðôì àöîð @menu"
  
! #: tp/Texinfo/Parser.pm:4875
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
  msgstr "?@ifinfo íå÷îá @ifnottex-á úô÷åî úåéäì äúéä äëéøö @top ú÷ñéô éë ïëúééä"
  
! #: tp/Texinfo/Parser.pm:4937
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4945
  #, fuzzy, perl-format
  msgid "unknown command `%s'"
  msgstr "`%s' úøëåî-éúìá äàøåä"
  
! #: tp/Texinfo/Parser.pm:4955
  #, fuzzy
  msgid "unexpected @"
  msgstr "`%s' éåôö äéä ïàë"
  
! #: tp/Texinfo/Parser.pm:4983
  #, fuzzy, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "`@%s' êåúá @%s-ì úåòîùî ïéà"
  
! #: tp/Texinfo/Parser.pm:4988
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4996
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5114
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5138
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5156
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5167
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5180
  msgid "@image missing filename argument"
  msgstr "@image úàøåäá øñç õáå÷ íù"
  
! #: tp/Texinfo/Parser.pm:5211
  #, fuzzy, perl-format
  msgid "@%s missing first argument"
  msgstr ".õáå÷ íù øñç %s úéðëúì\n"
  
! #: tp/Texinfo/Parser.pm:5230
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5236
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5253
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5448
  msgid "superfluous arguments for node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5498
  #, fuzzy, perl-format
  msgid "expected @end %s"
  msgstr "`%s' éåôö äéä ïàë"
  
! #: tp/Texinfo/Parser.pm:5607
  #, fuzzy, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "íéìñìåñî íééøâåñá êøåö ùé ,@%s-ì èðîåâøà äéäú äàøåäù éãë"
  
! #: tp/Texinfo/Parser.pm:5617
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5689
  #, fuzzy, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "íéìñìåñî íééøâåñá êøåö ùé ,@%s-ì èðîåâøà äéäú äàøåäù éãë"
  
! #: tp/Texinfo/Parser.pm:5710
  #, perl-format
  msgid "empty @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5727
  #, fuzzy, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr ".%s ïééôàî øåáò %s é\"ò ùøãðë ,éøîåð èðîåâøà åðéà `%s'\n"
  
! #: tp/Texinfo/Parser.pm:5736
  #, fuzzy, perl-format
  msgid "reserved index name %s"
  msgstr "`%s' :éåâù (node) ä÷ñéô íù"
  
! #: tp/Texinfo/Parser.pm:5762
  #, fuzzy, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "`%s' øëåî-éúìá ñ÷ãðéà"
  
! #: tp/Texinfo/Parser.pm:5765
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5793
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5806
  #, fuzzy, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "@printindex-á `%s' øëåî-éúìá ñ÷ãðéà"
  
! #: tp/Texinfo/Parser.pm:5812
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5820
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5836
  #, fuzzy, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
  msgstr ".%s ïééôàî øåáò %s é\"ò ùøãðë ,éøîåð èðîåâøà åðéà `%s'\n"
  
! #: tp/Texinfo/Parser.pm:5844
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5852
  #, fuzzy, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
***************
*** 2882,2891 ****
  "%s: `%s' àì ,`end' åà `separate' úåéäì --footnote-style ìù èðîåâøà ìò\n"
  
! #: tp/Texinfo/Parser.pm:5968
  #, fuzzy, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
  msgstr ".%s ïééôàî øåáò %s é\"ò ùøãðë ,éøîåð èðîåâøà åðéà `%s'\n"
  
! #: tp/Texinfo/Parser.pm:5986 tp/Texinfo/Parser.pm:5991
  #, fuzzy, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
--- 2874,2883 ----
  "%s: `%s' àì ,`end' åà `separate' úåéäì --footnote-style ìù èðîåâøà ìò\n"
  
! #: tp/Texinfo/Parser.pm:5860
  #, fuzzy, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
  msgstr ".%s ïééôàî øåáò %s é\"ò ùøãðë ,éøîåð èðîåâøà åðéà `%s'\n"
  
! #: tp/Texinfo/Parser.pm:5878 tp/Texinfo/Parser.pm:5883
  #, fuzzy, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
***************
*** 2893,2897 ****
  "%s: `%s' àì ,`asis'/`none'/éøîåð úåéäì --paragraph-indent ìù èðîåâøà ìò\n"
  
! #: tp/Texinfo/Parser.pm:5999
  #, fuzzy, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
--- 2885,2889 ----
  "%s: `%s' àì ,`asis'/`none'/éøîåð úåéäì --paragraph-indent ìù èðîåâøà ìò\n"
  
! #: tp/Texinfo/Parser.pm:5891
  #, fuzzy, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
***************
*** 2899,2903 ****
  "%s: `%s' àì ,`asis'/`none'/éøîåð úåéäì --paragraph-indent ìù èðîåâøà ìò\n"
  
! #: tp/Texinfo/Parser.pm:6009
  #, fuzzy, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
--- 2891,2895 ----
  "%s: `%s' àì ,`asis'/`none'/éøîåð úåéäì --paragraph-indent ìù èðîåâøà ìò\n"
  
! #: tp/Texinfo/Parser.pm:5901
  #, fuzzy, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
***************
*** 2905,2919 ****
  "%s: `%s' àì ,`asis'/`none'/éøîåð úåéäì --paragraph-indent ìù èðîåâøà ìò\n"
  
! #: tp/Texinfo/Parser.pm:6021
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:6031
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:6039
  #, fuzzy, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
--- 2897,2911 ----
  "%s: `%s' àì ,`asis'/`none'/éøîåð úåéäì --paragraph-indent ìù èðîåâøà ìò\n"
  
! #: tp/Texinfo/Parser.pm:5913
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5922
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5930
  #, fuzzy, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
***************
*** 2921,2925 ****
  "%s: `%s' àì ,`end' åà `separate' úåéäì --footnote-style ìù èðîåâøà ìò\n"
  
! #: tp/Texinfo/Parser.pm:6047
  #, fuzzy, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
--- 2913,2917 ----
  "%s: `%s' àì ,`end' åà `separate' úåéäì --footnote-style ìù èðîåâøà ìò\n"
  
! #: tp/Texinfo/Parser.pm:5938
  #, fuzzy, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
***************
*** 2927,3001 ****
  "%s: `%s' àì ,`end' åà `separate' úåéäì --footnote-style ìù èðîåâøà ìò\n"
  
! #: tp/Texinfo/Structuring.pm:213
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:245
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:250
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:339
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:488
  #, perl-format
  msgid "@%s not empty"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:544 tp/Texinfo/Structuring.pm:1326
  #, fuzzy, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "%sá `%s' úîéé÷ äððéàù ä÷ñéôì äééðôä"
  
! #: tp/Texinfo/Structuring.pm:557
  #, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:662
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "øåùé÷ óà ïéà `%s' ä÷ñéôì"
  
! #: tp/Texinfo/Structuring.pm:708
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:715
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:733
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:787
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:814
  #, fuzzy, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%sá `%s' úîéé÷ äððéàù ä÷ñéôì äééðôä"
  
! #: tp/Texinfo/Structuring.pm:834
  #, fuzzy, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
  msgstr "äøæçá òéáöîù èéøôú óéòñ ïéà ìáà ,`%s' ìò òéáöî `%s' ä÷ñéô ìù Up äãù"
  
! #: tp/Texinfo/Structuring.pm:842
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
--- 2919,2993 ----
  "%s: `%s' àì ,`end' åà `separate' úåéäì --footnote-style ìù èðîåâøà ìò\n"
  
! #: tp/Texinfo/Structuring.pm:216
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:248
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:253
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:342
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:491
  #, perl-format
  msgid "@%s not empty"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:547 tp/Texinfo/Structuring.pm:1325
  #, fuzzy, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "%sá `%s' úîéé÷ äððéàù ä÷ñéôì äééðôä"
  
! #: tp/Texinfo/Structuring.pm:558
  #, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:663
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "øåùé÷ óà ïéà `%s' ä÷ñéôì"
  
! #: tp/Texinfo/Structuring.pm:706
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:713
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:731
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:786
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:810
  #, fuzzy, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%sá `%s' úîéé÷ äððéàù ä÷ñéôì äééðôä"
  
! #: tp/Texinfo/Structuring.pm:829
  #, fuzzy, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
  msgstr "äøæçá òéáöîù èéøôú óéòñ ïéà ìáà ,`%s' ìò òéáöî `%s' ä÷ñéô ìù Up äãù"
  
! #: tp/Texinfo/Structuring.pm:837
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
***************
*** 3007,3011 ****
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:2070
  #, perl-format
  msgid "empty index key in @%s"
--- 2999,3003 ----
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:2067
  #, perl-format
  msgid "empty index key in @%s"
***************
*** 3464,3482 ****
  msgstr ".`%s --help' äñð øúé èåøôì\n"
  
! #: tp/texi2any.pl:1232
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
  
! #: tp/texi2any.pl:1255
  #, fuzzy, perl-format
  msgid "error on closing macro expand file %s: %s\n"
  msgstr "`%s' èìô õáå÷ úøéâñá äì÷ú"
  
! #: tp/texi2any.pl:1261
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1286
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
--- 3456,3474 ----
  msgstr ".`%s --help' äñð øúé èåøôì\n"
  
! #: tp/texi2any.pl:1239
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
  
! #: tp/texi2any.pl:1262
  #, fuzzy, perl-format
  msgid "error on closing macro expand file %s: %s\n"
  msgstr "`%s' èìô õáå÷ úøéâñá äì÷ú"
  
! #: tp/texi2any.pl:1268
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1293
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
***************
*** 3484,3498 ****
  msgstr ""
  
! #: tp/texi2any.pl:1359 tp/texi2any.pl:1435
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1382 tp/texi2any.pl:1416
  #, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1388 tp/texi2any.pl:1422
  #, fuzzy, perl-format
  msgid "%s: could not open %s for writing: %s\n"
--- 3476,3490 ----
  msgstr ""
  
! #: tp/texi2any.pl:1366 tp/texi2any.pl:1442
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1389 tp/texi2any.pl:1423
  #, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1395 tp/texi2any.pl:1429
  #, fuzzy, perl-format
  msgid "%s: could not open %s for writing: %s\n"
***************
*** 3921,3924 ****
--- 3913,3922 ----
  #~ msgstr "--*** úðëãåòî äðéà Tags úìáè ***-- "
  
+ #~ msgid "-%s---Info: %s, %d lines --%s--"
+ #~ msgstr "-%s---Info: %s, %d lines --%s--"
+ 
+ #~ msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
+ #~ msgstr "-%s%s-Info: (%s)%s, %d lines --%s--"
+ 
  #~ msgid " Subfile: %s"
  #~ msgstr " Subfile: %s"
Binary files texinfo-6.1/po/hr.gmo and texinfo-6.3/po/hr.gmo differ
diff -Nrc2 texinfo-6.1/po/hr.po texinfo-6.3/po/hr.po
*** texinfo-6.1/po/hr.po	2016-02-06 11:35:51.000000000 +0000
--- texinfo-6.3/po/hr.po	2016-09-10 12:45:51.000000000 +0100
***************
*** 2,16 ****
  # Copyright Â© 2002, 2012 Free Software Foundation, Inc.
  # This file is distributed under the same license as the texinfo package.
- # Mirsad Todorovac <mtodorov_69@yahoo.com>, 2002.
  #     ... wishes to thank to everybody who helped in good faith.
- # Tomislav Krznar <tomislav.krznar@gmail.com>, 2012, 2013.
  #
  msgid ""
  msgstr ""
! "Project-Id-Version: texinfo 5.0.91\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
! "PO-Revision-Date: 2013-04-18 00:43+0200\n"
! "Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
  "Language-Team: Croatian <lokalizacija@linux.hr>\n"
  "Language: hr\n"
--- 2,17 ----
  # Copyright Â© 2002, 2012 Free Software Foundation, Inc.
  # This file is distributed under the same license as the texinfo package.
  #     ... wishes to thank to everybody who helped in good faith.
  #
+ # Mirsad Todorovac <mtodorov_69@yahoo.com>, 2002.
+ # Tomislav Krznar <tomislav.krznar@gmail.com>, 2012, 2013.
+ # BoÅ¾idar Putanec <bozidarp@yahoo.com>, 2016.
  msgid ""
  msgstr ""
! "Project-Id-Version: texinfo-6.1.92\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:45+0100\n"
! "PO-Revision-Date: 2016-09-09 20:05+0200\n"
! "Last-Translator: BoÅ¾idar Putanec <bozidarp@yahoo.com>\n"
  "Language-Team: Croatian <lokalizacija@linux.hr>\n"
  "Language: hr\n"
***************
*** 18,24 ****
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\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: Gtranslator 2.91.6\n"
  
  #: gnulib/lib/error.c:191
--- 19,27 ----
  "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=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: Poedit 1.8.7.1\n"
! "X-Poedit-SourceCharset: UTF-8\n"
  
  #: gnulib/lib/error.c:191
***************
*** 29,68 ****
  #, c-format
  msgid "%s: option '%s' is ambiguous; possibilities:"
! msgstr "%s: opcija â€ž%sâ€� je viÅ¡eznaÄ�na, moguÄ‡nosti:"
  
  #: gnulib/lib/getopt.c:619
! #, fuzzy, c-format
  msgid "%s: option '%s' is ambiguous\n"
! msgstr "%s: opcija â€ž-W %sâ€� je viÅ¡eznaÄ�na\n"
  
  #: gnulib/lib/getopt.c:654 gnulib/lib/getopt.c:658
  #, c-format
  msgid "%s: option '--%s' doesn't allow an argument\n"
! msgstr "%s: opcija â€ž--%sâ€� ne dozvoljava argument\n"
  
  #: gnulib/lib/getopt.c:667 gnulib/lib/getopt.c:672
  #, c-format
  msgid "%s: option '%c%s' doesn't allow an argument\n"
! msgstr "%s: opcija â€ž%c%sâ€� ne dozvoljava argument\n"
  
  #: gnulib/lib/getopt.c:715 gnulib/lib/getopt.c:734
  #, c-format
  msgid "%s: option '--%s' requires an argument\n"
! msgstr "%s: opcija â€ž--%sâ€� zahtijeva argument\n"
  
  #: gnulib/lib/getopt.c:772 gnulib/lib/getopt.c:775
  #, c-format
  msgid "%s: unrecognized option '--%s'\n"
! msgstr "%s: neprepoznata opcija â€ž--%sâ€�\n"
  
  #: gnulib/lib/getopt.c:783 gnulib/lib/getopt.c:786
  #, c-format
  msgid "%s: unrecognized option '%c%s'\n"
! msgstr "%s: neprepoznata opcija â€ž%c%sâ€�\n"
  
  #: gnulib/lib/getopt.c:835 gnulib/lib/getopt.c:838
  #, c-format
  msgid "%s: invalid option -- '%c'\n"
! msgstr "%s: neispravna opcija -- â€ž%câ€�\n"
  
  #: gnulib/lib/getopt.c:891 gnulib/lib/getopt.c:908 gnulib/lib/getopt.c:1118
--- 32,71 ----
  #, c-format
  msgid "%s: option '%s' is ambiguous; possibilities:"
! msgstr "%s: opcija â€˜%sâ€™ je viÅ¡eznaÄ�na; moguÄ‡nosti:"
  
  #: gnulib/lib/getopt.c:619
! #, c-format
  msgid "%s: option '%s' is ambiguous\n"
! msgstr "%s: opcija â€˜%sâ€™ je viÅ¡eznaÄ�na\n"
  
  #: gnulib/lib/getopt.c:654 gnulib/lib/getopt.c:658
  #, c-format
  msgid "%s: option '--%s' doesn't allow an argument\n"
! msgstr "%s: opcija â€˜--%sâ€™ ne dopuÅ¡ta argument\n"
  
  #: gnulib/lib/getopt.c:667 gnulib/lib/getopt.c:672
  #, c-format
  msgid "%s: option '%c%s' doesn't allow an argument\n"
! msgstr "%s: opcija â€˜%c%sâ€™ ne dopuÅ¡ta argument\n"
  
  #: gnulib/lib/getopt.c:715 gnulib/lib/getopt.c:734
  #, c-format
  msgid "%s: option '--%s' requires an argument\n"
! msgstr "%s: opcija â€˜--%sâ€™ zahtijeva argument\n"
  
  #: gnulib/lib/getopt.c:772 gnulib/lib/getopt.c:775
  #, c-format
  msgid "%s: unrecognized option '--%s'\n"
! msgstr "%s: neprepoznata opcija â€˜--%sâ€™\n"
  
  #: gnulib/lib/getopt.c:783 gnulib/lib/getopt.c:786
  #, c-format
  msgid "%s: unrecognized option '%c%s'\n"
! msgstr "%s: neprepoznata opcija â€˜%c%sâ€™\n"
  
  #: gnulib/lib/getopt.c:835 gnulib/lib/getopt.c:838
  #, c-format
  msgid "%s: invalid option -- '%c'\n"
! msgstr "%s: neispravna opcija -- â€˜%câ€™\n"
  
  #: gnulib/lib/getopt.c:891 gnulib/lib/getopt.c:908 gnulib/lib/getopt.c:1118
***************
*** 70,89 ****
  #, c-format
  msgid "%s: option requires an argument -- '%c'\n"
! msgstr "%s: opcija zahtijeva argument -- â€ž%câ€�\n"
  
  #: gnulib/lib/getopt.c:964 gnulib/lib/getopt.c:980
  #, c-format
  msgid "%s: option '-W %s' is ambiguous\n"
! msgstr "%s: opcija â€ž-W %sâ€� je viÅ¡eznaÄ�na\n"
  
  #: gnulib/lib/getopt.c:1004 gnulib/lib/getopt.c:1022
  #, c-format
  msgid "%s: option '-W %s' doesn't allow an argument\n"
! msgstr "%s: opcija â€ž-W %sâ€� ne dozvoljava argument\n"
  
  #: gnulib/lib/getopt.c:1043 gnulib/lib/getopt.c:1061
  #, c-format
  msgid "%s: option '-W %s' requires an argument\n"
! msgstr "%s: opcija â€ž-W %sâ€� zahtijeva argument\n"
  
  #: gnulib/lib/regcomp.c:135
--- 73,92 ----
  #, c-format
  msgid "%s: option requires an argument -- '%c'\n"
! msgstr "%s: opcija zahtijeva argument -- â€˜%câ€™\n"
  
  #: gnulib/lib/getopt.c:964 gnulib/lib/getopt.c:980
  #, c-format
  msgid "%s: option '-W %s' is ambiguous\n"
! msgstr "%s: opcija â€˜-W %sâ€™ je viÅ¡eznaÄ�na\n"
  
  #: gnulib/lib/getopt.c:1004 gnulib/lib/getopt.c:1022
  #, c-format
  msgid "%s: option '-W %s' doesn't allow an argument\n"
! msgstr "%s: opcija â€˜W %sâ€™ ne dopuÅ¡ta argument\n"
  
  #: gnulib/lib/getopt.c:1043 gnulib/lib/getopt.c:1061
  #, c-format
  msgid "%s: option '-W %s' requires an argument\n"
! msgstr "%s: opcija â€˜-W %sâ€™ zahtijeva argument\n"
  
  #: gnulib/lib/regcomp.c:135
***************
*** 93,97 ****
  #: gnulib/lib/regcomp.c:138
  msgid "No match"
! msgstr "Nema poklapanja"
  
  #: gnulib/lib/regcomp.c:141
--- 96,100 ----
  #: gnulib/lib/regcomp.c:138
  msgid "No match"
! msgstr "Nema podudaranja"
  
  #: gnulib/lib/regcomp.c:141
***************
*** 109,121 ****
  #: gnulib/lib/regcomp.c:150
  msgid "Trailing backslash"
! msgstr "Obrnuta kosa crta na kraju"
  
  #: gnulib/lib/regcomp.c:153
  msgid "Invalid back reference"
! msgstr "Neispravna povratna referenca"
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [ or [^"
! msgstr "Neuparena [ ili [^"
  
  #: gnulib/lib/regcomp.c:159
--- 112,124 ----
  #: gnulib/lib/regcomp.c:150
  msgid "Trailing backslash"
! msgstr "Obratna kosa crta na kraju"
  
  #: gnulib/lib/regcomp.c:153
  msgid "Invalid back reference"
! msgstr "Neispravna povratna referencija"
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [, [^, [:, [., or [="
! msgstr "Neupareni [, [^, [:, [., or [="
  
  #: gnulib/lib/regcomp.c:159
***************
*** 137,141 ****
  #: gnulib/lib/regcomp.c:171
  msgid "Memory exhausted"
! msgstr "Memorija iscrpljena"
  
  #: gnulib/lib/regcomp.c:174
--- 140,144 ----
  #: gnulib/lib/regcomp.c:171
  msgid "Memory exhausted"
! msgstr "Nema dovoljno memorije"
  
  #: gnulib/lib/regcomp.c:174
***************
*** 155,159 ****
  msgstr "Neuparena ) ili \\)"
  
! #: gnulib/lib/regcomp.c:711
  msgid "No previous regular expression"
  msgstr "Nedostaje prethodni regularni izraz"
--- 158,162 ----
  msgstr "Neuparena ) ili \\)"
  
! #: gnulib/lib/regcomp.c:687
  msgid "No previous regular expression"
  msgstr "Nedostaje prethodni regularni izraz"
***************
*** 161,165 ****
  #: gnulib/lib/xalloc-die.c:34
  msgid "memory exhausted"
! msgstr "memorija iscrpljena"
  
  #: info/echo-area.c:295 info/session.c:1386
--- 164,168 ----
  #: gnulib/lib/xalloc-die.c:34
  msgid "memory exhausted"
! msgstr "nema dovoljno memorije"
  
  #: info/echo-area.c:295 info/session.c:1386
***************
*** 245,249 ****
  #: info/echo-area.c:983 info/echo-area.c:1041
  msgid "No completions"
! msgstr "Ne mogu dovrÅ¡iti"
  
  #: info/echo-area.c:985
--- 248,252 ----
  #: info/echo-area.c:983 info/echo-area.c:1041
  msgid "No completions"
! msgstr "Nema zavrÅ¡etka"
  
  #: info/echo-area.c:985
***************
*** 283,302 ****
  #, c-format
  msgid "looking for file \"%s\""
! msgstr ""
  
  #: info/filesys.c:152
! #, fuzzy, c-format
  msgid "looking for file %s in %s"
! msgstr "greÅ¡ka pri zatvaranju datoteke okvira %s: %s"
  
  #: info/filesys.c:238 info/filesys.c:252 info/filesys.c:273
! #, fuzzy, c-format
  msgid "found file %s"
! msgstr "PronaÄ‘i datoteku: "
  
  #: info/footnotes.c:231
  #, c-format
  msgid "Footnotes could not be displayed"
! msgstr "Ne mogu prikazati fusnote"
  
  #: info/footnotes.c:251
--- 286,305 ----
  #, c-format
  msgid "looking for file \"%s\""
! msgstr "traÅ¾im datoteku â€ž%sâ€œ"
  
  #: info/filesys.c:152
! #, c-format
  msgid "looking for file %s in %s"
! msgstr "traÅ¾im datoteku %s u %s"
  
  #: info/filesys.c:238 info/filesys.c:252 info/filesys.c:273
! #, c-format
  msgid "found file %s"
! msgstr "pronaÄ‘ena je datoteka %s"
  
  #: info/footnotes.c:231
  #, c-format
  msgid "Footnotes could not be displayed"
! msgstr "Fusnote nije moguÄ‡e prikazati"
  
  #: info/footnotes.c:251
***************
*** 308,312 ****
  msgstr "----------- Fusnote -----------"
  
! #: info/indices.c:123 info/indices.c:812
  #, c-format
  msgid "Finding index entries..."
--- 311,315 ----
  msgstr "----------- Fusnote -----------"
  
! #: info/indices.c:123 info/indices.c:822
  #, c-format
  msgid "Finding index entries..."
***************
*** 317,321 ****
  msgstr "TraÅ¾i niz u indeksu ove datoteke"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:818
  #, c-format
  msgid "No indices found."
--- 320,324 ----
  msgstr "TraÅ¾i niz u indeksu ove datoteke"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:828
  #, c-format
  msgid "No indices found."
***************
*** 327,340 ****
  
  #: info/indices.c:436
! #, fuzzy, c-format
  msgid "Found '%s' in %s. ('\\[next-index-match]' tries to find next.)"
! msgstr "PronaÄ‘en â€ž%sâ€� u %s. (â€ž\\[next-index-match]â€� pokuÅ¡ava naÄ‡i sljedeÄ‡i.)"
  
  #: info/indices.c:446
- #, fuzzy
  msgid ""
  "Go to the next matching index item from the last '\\[index-search]' command"
  msgstr ""
! "Idi na sljedeÄ‡u odgovarajuÄ‡u stavku indeksa zadnje â€ž\\[index-search]â€� naredbe"
  
  #: info/indices.c:457
--- 330,342 ----
  
  #: info/indices.c:436
! #, c-format
  msgid "Found '%s' in %s. ('\\[next-index-match]' tries to find next.)"
! msgstr "PronaÄ‘en â€˜%sâ€™ u %s. (â€˜\\[next-index-match]â€™ pokuÅ¡ava naÄ‡i sljedeÄ‡i.)"
  
  #: info/indices.c:446
  msgid ""
  "Go to the next matching index item from the last '\\[index-search]' command"
  msgstr ""
! "Idi na sljedeÄ‡u podudarajuÄ‡u stavku indeksa zadnje â€˜\\[index-search]â€™ naredbe"
  
  #: info/indices.c:457
***************
*** 344,440 ****
  
  #: info/indices.c:475
! #, fuzzy, c-format
  msgid "No more index entries containing '%s'."
! msgstr "Nema viÅ¡e stavki indeksa koje sadrÅ¾e â€ž%sâ€�."
  
! #: info/indices.c:476 info/indices.c:880
! #, fuzzy, c-format
  msgid "No index entries containing '%s'."
! msgstr "Nisu pronaÄ‘ene stavke indeksa koje sadrÅ¾e â€ž%sâ€�."
  
! #: info/indices.c:583
! #, fuzzy, c-format
  msgid "Scanning indices of '%s'..."
! msgstr "PretraÅ¾ujem indekse od â€ž%sâ€�..."
  
! #: info/indices.c:636
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr "TraÅ¾i niz u indeksima svih poznatih info datoteka i napravi izbornik"
  
! #: info/indices.c:644 info/indices.c:646
! #, fuzzy
  msgid "Index apropos"
! msgstr "Prikladni indeksi: "
  
! #: info/indices.c:688
! #, fuzzy, c-format
  msgid "Index entries containing '%s':\n"
! msgstr "Nisu pronaÄ‘ene stavke indeksa koje sadrÅ¾e â€ž%sâ€�."
  
! #: info/indices.c:797
  msgid "List all matches of a string in the index"
  msgstr "PrikaÅ¾i svako pojavljivanje niza u indeksu"
  
! #: info/indices.c:824 info/indices.c:826
! #, fuzzy
  msgid "Index topic"
! msgstr "Tema indeksa: "
  
  #: info/indices.h:40
! #, fuzzy, c-format
  msgid "No available info files have '%s' in their indices."
! msgstr "Niti jedna dostupna info datoteka nema â€ž%sâ€� u svom indeksu."
  
! #: info/info-utils.c:892
  #, c-format
  msgid "Error converting file character encoding."
! msgstr ""
  
! #: info/info.c:222 info/session.c:2789
! #, fuzzy, c-format
  msgid "No menu item '%s' in node '%s'."
! msgstr "Nema stavke izbornika â€ž%sâ€� u Ä�voru â€ž%sâ€�."
! 
! #: info/info.c:315
! #, fuzzy, c-format
! msgid "No file given for node '%s'."
! msgstr "Nema izbornika u Ä�voru â€ž%sâ€�."
  
! #: info/info.c:364 info/info.c:1133
! #, fuzzy, c-format
  msgid "Cannot find node '%s'."
! msgstr "Ne mogu pronaÄ‡i Ä�vor â€ž%sâ€�."
  
! #: info/info.c:386
  #, c-format
  msgid "No program name given."
! msgstr ""
  
! #: info/info.c:577
  #, c-format
  msgid "invalid number: %s\n"
! msgstr ""
  
! #: info/info.c:757
  #, c-format
  msgid "malformed variable assignment: %s"
! msgstr ""
  
! #: info/info.c:764 info/infokey.c:537
! #, fuzzy, c-format
  msgid "%s: no such variable"
! msgstr "%s: nepoznata varijabla %s"
  
! #: info/info.c:770 info/infokey.c:539
! #, fuzzy, c-format
  msgid "value %s is not valid for variable %s"
! msgstr "Postavi vrijednost Info varijable"
  
! #: info/info.c:782
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "PokuÅ¡ajte --help za viÅ¡e informacija.\n"
  
! #: info/info.c:804 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
--- 346,435 ----
  
  #: info/indices.c:475
! #, c-format
  msgid "No more index entries containing '%s'."
! msgstr "Nema viÅ¡e stavki indeksa koje sadrÅ¾e â€˜%sâ€™."
  
! #: info/indices.c:476 info/indices.c:890
! #, c-format
  msgid "No index entries containing '%s'."
! msgstr "Nema stavki u indeksu koje sadrÅ¾e â€˜%sâ€™."
  
! #: info/indices.c:586
! #, c-format
  msgid "Scanning indices of '%s'..."
! msgstr "PretraÅ¾ujem indekse od â€˜%sâ€™..."
  
! #: info/indices.c:646
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr "TraÅ¾i niz u indeksima svih poznatih info datoteka i napravi izbornik"
  
! #: info/indices.c:654 info/indices.c:656
  msgid "Index apropos"
! msgstr "Indeks kljuÄ�nih rijeÄ�i za pretraÅ¾ivanje (Index apropos)"
  
! #: info/indices.c:698
! #, c-format
  msgid "Index entries containing '%s':\n"
! msgstr "Stavke indeksa koje sadrÅ¾e â€˜%sâ€™:\n"
  
! #: info/indices.c:807
  msgid "List all matches of a string in the index"
  msgstr "PrikaÅ¾i svako pojavljivanje niza u indeksu"
  
! #: info/indices.c:834 info/indices.c:836
  msgid "Index topic"
! msgstr "Tema indeksa"
  
  #: info/indices.h:40
! #, c-format
  msgid "No available info files have '%s' in their indices."
! msgstr "Nijedna od dostupnih info datoteka nema â€˜%sâ€™ u svojemu indeksu."
  
! #: info/info-utils.c:879
  #, c-format
  msgid "Error converting file character encoding."
! msgstr "GreÅ¡ka pri konverziji kodiranja datoteÄ�nih znakova."
  
! #: info/info.c:279 info/session.c:2789
! #, c-format
  msgid "No menu item '%s' in node '%s'."
! msgstr "Stavke izbornika â€˜%sâ€™ nema u Ä�voru â€˜%sâ€™."
  
! #: info/info.c:416 info/info.c:1148
! #, c-format
  msgid "Cannot find node '%s'."
! msgstr "Ne mogu pronaÄ‡i Ä�vor â€˜%sâ€™."
  
! #: info/info.c:438
  #, c-format
  msgid "No program name given."
! msgstr "Nije dano ime programa."
  
! #: info/info.c:636
  #, c-format
  msgid "invalid number: %s\n"
! msgstr "neispravan broj: %s\n"
  
! #: info/info.c:816
  #, c-format
  msgid "malformed variable assignment: %s"
! msgstr "loÅ¡e formirana namjena varijabli: %s"
  
! #: info/info.c:823 info/infokey.c:540
! #, c-format
  msgid "%s: no such variable"
! msgstr "%s: takva varijabla ne postoji"
  
! #: info/info.c:829 info/infokey.c:542
! #, c-format
  msgid "value %s is not valid for variable %s"
! msgstr "vrijednost %s nije ispravna za varijablu %s"
  
! #: info/info.c:841
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "PokuÅ¡ajte --help za viÅ¡e informacija.\n"
  
! #: info/info.c:860 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
***************
*** 448,460 ****
  "Licenca GPLv3+: GNU GPL inaÄ�ica 3 ili novija <http://gnu.org/licenses/gpl."
  "html>\n"
! "Ovo je slobodan softver: slobodno ga smijete mijenjati i dijeliti.\n"
! "NEMA JAMSTAVA, do krajnje mjere dozvoljene zakonom.\n"
  
! #: info/info.c:981
! #, fuzzy, c-format
  msgid "no index entries found for '%s'\n"
! msgstr "nisu pronaÄ‘ene stavke indeksa za â€ž%sâ€�\n"
  
! #: info/info.c:1034
  #, c-format
  msgid ""
--- 443,455 ----
  "Licenca GPLv3+: GNU GPL inaÄ�ica 3 ili novija <http://gnu.org/licenses/gpl."
  "html>\n"
! "Ovo je slobodan softver: slobodno ga mijenjajte i dijelite.\n"
! "NEMA JAMSTVA, do granica dopuÅ¡tenih zakonom.\n"
  
! #: info/info.c:999
! #, c-format
  msgid "no index entries found for '%s'\n"
! msgstr "nijedna stavka nije naÄ‘ena u indeksu za â€˜%sâ€™\n"
  
! #: info/info.c:1049
  #, c-format
  msgid ""
***************
*** 463,472 ****
  "Read documentation in Info format.\n"
  msgstr ""
! "Uporaba: %s [OPCIJA]... [ELEMENT-IZBORNIKA...]\n"
  "\n"
  "ÄŒitanje dokumentacije u Info obliku.\n"
  
! #: info/info.c:1040
! #, fuzzy
  msgid ""
  "Options:\n"
--- 458,466 ----
  "Read documentation in Info format.\n"
  msgstr ""
! "Uporaba: %s [OPCIJA]... [STAVKA-IZBORNIKA...]\n"
  "\n"
  "ÄŒitanje dokumentacije u Info obliku.\n"
  
! #: info/info.c:1055
  msgid ""
  "Options:\n"
***************
*** 479,489 ****
  msgstr ""
  "Opcije:\n"
  "  -k, --apropos=NIZ            traÅ¾i NIZ u svim indeksima svih priruÄ�nika.\n"
  "  -d, --directory=DIREKTORIJ   dodaj DIREKTORIJ u INFOPATH.\n"
! "      --dribble=DATOTEKA       zapamti funkcije tipki u DATOTECI.\n"
! "  -f, --file=DATOTEKA          navedi Info datoteku za posjet."
  
! #: info/info.c:1048
! #, fuzzy
  msgid ""
  "  -h, --help                   display this help and exit.\n"
--- 473,484 ----
  msgstr ""
  "Opcije:\n"
+ "  -a, --all                    koristi sve podudarajuÄ‡e priruÄ�nike.\n"
  "  -k, --apropos=NIZ            traÅ¾i NIZ u svim indeksima svih priruÄ�nika.\n"
  "  -d, --directory=DIREKTORIJ   dodaj DIREKTORIJ u INFOPATH.\n"
! "      --dribble=DATOTEKA       zapamti slijed tipkanja korisnika u "
! "DATOTECI.\n"
! "  -f, --file=PRIRUÄŒNIK         navedi Info priruÄ�nik za posjet."
  
! #: info/info.c:1063
  msgid ""
  "  -h, --help                   display this help and exit.\n"
***************
*** 492,503 ****
  "  -o, --output=FILE            output selected nodes to FILE."
  msgstr ""
! "  -h, --help                   prikaÅ¾i ovu pomoÄ‡ i izaÄ‘i.\n"
  "      --index-search=NIZ       idi na Ä�vor oznaÄ�en stavkom indeksa NIZ.\n"
! "  -n, --node=IMEÄŒVORA          navedi Ä�vorove u prvoj posjeÄ‡enoj Info "
! "datoteci.\n"
  "  -o, --output=DATOTEKA        ispiÅ¡i izabrane Ä�vorove u DATOTEKU."
  
! #: info/info.c:1054
! #, fuzzy
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
--- 487,497 ----
  "  -o, --output=FILE            output selected nodes to FILE."
  msgstr ""
! "  -h, --help                   prikaÅ¾i ovu pomoÄ‡ i iziÄ‘i.\n"
  "      --index-search=NIZ       idi na Ä�vor oznaÄ�en stavkom indeksa NIZ.\n"
! "  -n, --node=IMEÄŒVORA          navedi Ä�vorove u prvoj posjeÄ‡enoj\n"
! "                                 Info  datoteci.\n"
  "  -o, --output=DATOTEKA        ispiÅ¡i izabrane Ä�vorove u DATOTEKU."
  
! #: info/info.c:1069
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
***************
*** 508,521 ****
  "  -R, --raw-escapes            ispiÅ¡i neobraÄ‘ene ANSI izlaze (zadano).\n"
  "      --no-raw-escapes         ispiÅ¡i izlaze kao doslovni tekst.\n"
! "      --restore=DATOTEKA       proÄ�itaj inicijalne funkcije tipki iz "
  "DATOTEKE.\n"
! "  -O, --show-options, --usage  idi u Ä�vor opcija naredbenog retka."
  
! #: info/info.c:1061
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr "  -b, --speech-friendly        budi prilagoÄ‘en sintetizatorima govora."
  
! #: info/info.c:1065
! #, fuzzy
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
--- 502,514 ----
  "  -R, --raw-escapes            ispiÅ¡i neobraÄ‘ene ANSI izlaze (zadano).\n"
  "      --no-raw-escapes         ispiÅ¡i izlaze kao doslovni tekst.\n"
! "      --restore=DATOTEKA       proÄ�itaj poÄ�etni slijed tipkanja iz "
  "DATOTEKE.\n"
! "  -O, --show-options, --usage  idi u Ä�vor s opcijama iz naredbenog retka."
  
! #: info/info.c:1076
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr "  -b, --speech-friendly        budi prilagoÄ‘en sintetizatorima govora."
  
! #: info/info.c:1080
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
***************
*** 528,541 ****
  "  -x, --debug=NUMBER           set debugging level (-1 for all).\n"
  msgstr ""
! "      --strict-node-location   (za debugiranje) koristi Info pokazivaÄ�e na\n"
! "                                  datoteke as-is.\n"
  "      --subnodes               rekurzivno ispiÅ¡i stavke izbornika.\n"
! "      --vi-keys                koristi funkcije tipki sliÄ�ne programima vi i "
! "less.\n"
! "      --version                prikaÅ¾i informacije o inaÄ�ici i izaÄ‘i.\n"
! "  -w, --where, --location      ispiÅ¡i fiziÄ�ku lokaciju Info datoteke."
  
! #: info/info.c:1074
! #, fuzzy
  msgid ""
  "\n"
--- 521,535 ----
  "  -x, --debug=NUMBER           set debugging level (-1 for all).\n"
  msgstr ""
! "      --strict-node-location   (za debugiranje) koristi Info pokazivaÄ�e "
! "kakvi i\n"
! "                                 jesu (nepromijenjene, as-is)\n"
  "      --subnodes               rekurzivno ispiÅ¡i stavke izbornika.\n"
! "      --vi-keys                koristi funkcije tipki kao u programima\n"
! "                                 vi i less.\n"
! "      --version                prikaÅ¾i informacije o inaÄ�ici i iziÄ‘i.\n"
! "  -w, --where, --location      ispiÅ¡i fiziÄ�ku lokaciju Info datoteke.\n"
! "  -x, --debug=BROJ             postavi razinu debugiranja (-1 za sve).\n"
  
! #: info/info.c:1089
  msgid ""
  "\n"
***************
*** 547,558 ****
  msgstr ""
  "\n"
! "Ako postoji, prvi argument koji nije opcija je stavka izbornika od koje\n"
! "se poÄ�inje i traÅ¾i se u svim â€ždirâ€� datotekama navedenim u INFOPATH.\n"
! "Ako ne postoji, info spaja sve â€ždirâ€� datoteke i prikazuje rezultat.\n"
! "Sa svim ostalim argumentima se postupa kao imenima stavki izbornika\n"
! "relativno prema posjeÄ‡enom poÄ�etnom Ä�voru."
  
! #: info/info.c:1081
! #, fuzzy
  msgid ""
  "\n"
--- 541,552 ----
  msgstr ""
  "\n"
! "Ako postoji, prvi argument koji nije opcija, postaje stavka izbornika od "
! "koje\n"
! "se poÄ�inje; traÅ¾i se u svim â€˜dirâ€™ datotekama navedenim u INFOPATH.\n"
! "Ako ne postoji, onda â€˜infoâ€™ spaja sve â€˜dirâ€™ datoteke i prikazuje rezultat.\n"
! "Svi preostali argumenti se tretiraju kao imena stavki izbornika,\n"
! "relativno u odnosu na prvi posjeÄ‡eni Ä�vor."
  
! #: info/info.c:1096
  msgid ""
  "\n"
***************
*** 560,567 ****
  msgstr ""
  "\n"
! "Za popis funkcija tipki pritisnite h u programu Info."
  
! #: info/info.c:1084
! #, fuzzy
  msgid ""
  "\n"
--- 554,560 ----
  msgstr ""
  "\n"
! "Za popis funkcija tipki (key bindings) pritisnite H u programu Info."
  
! #: info/info.c:1099
  msgid ""
  "\n"
***************
*** 585,595 ****
  "  info emacs                 poÄ�ni na Ä�voru emacs iz vrÅ¡nog direktorija\n"
  "  info emacs buffers         poÄ�ni na Ä�voru buffers u priruÄ�niku emacs\n"
! "  info --show-options emacs  poÄ�ni na Ä�voru s emacsovim opcijama naredbenog "
! "retka\n"
  "  info --subnodes -o out.txt emacs  ispiÅ¡i cijeli priruÄ�nik u out.txt\n"
! "  info -f ./foo.info         prikaÅ¾i datoteku ./foo.info, bez pretraÅ¾ivanja "
! "direktorija"
  
! #: info/info.c:1099 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
--- 578,590 ----
  "  info emacs                 poÄ�ni na Ä�voru emacs iz vrÅ¡nog direktorija\n"
  "  info emacs buffers         poÄ�ni na Ä�voru buffers u priruÄ�niku emacs\n"
! "  info emacs -n Datoteke     poÄ�ni na Ä�voru Datoteke u priruÄ�niku emacs\n"
! "  info '(emacs)Files'        alternativno poÄ�ni na datoteÄ�nom Ä�voru Files\n"
! "  info --show-options emacs  poÄ�ni na Ä�voru s emacsovim opcijama naredbenog\n"
! "                               retka\n"
  "  info --subnodes -o out.txt emacs  ispiÅ¡i cijeli priruÄ�nik u out.txt\n"
! "  info -f ./foo.info         prikaÅ¾i datoteku ./foo.info,\n"
! "                               bez pretraÅ¾ivanja direktorija"
  
! #: info/info.c:1114 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
***************
*** 598,666 ****
  msgstr ""
  "Prijavite greÅ¡ke na bug-texinfo@gnu.org,\n"
! "opÄ‡enita pitanja i diskusije na help-texinfo@gnu.org.\n"
  "Texinfo poÄ�etna stranica: http://www.gnu.org/software/texinfo/\n"
  "Prijavite greÅ¡ke prijevoda na lokalizacija@linux.hr."
  
! #: info/info.c:1134
! #, fuzzy, c-format
  msgid "Cannot find node '(%s)%s'."
! msgstr "Ne mogu pronaÄ‡i Ä�vor â€ž(%s)%sâ€�."
  
! #: info/info.c:1135
  msgid "Cannot find a window!"
  msgstr "Ne mogu pronaÄ‡i prozor!"
  
! #: info/info.c:1136
  msgid "Point doesn't appear within this window's node!"
  msgstr "ToÄ�ka se ne nalazi unutar Ä�vora ovog prozora!"
  
! #: info/info.c:1137
  msgid "Cannot delete the last window."
  msgstr "Ne mogu ukloniti zadnji prozor."
  
! #: info/info.c:1138
  msgid "No menu in this node."
  msgstr "Nema izbornika u ovom Ä�voru."
  
! #: info/info.c:1139
  msgid "No footnotes in this node."
  msgstr "Nema fusnota u ovom Ä�voru."
  
! #: info/info.c:1140
  msgid "No cross references in this node."
! msgstr "Nema unakrsnih referenci u ovom Ä�voru."
  
! #: info/info.c:1141
! #, fuzzy, c-format
  msgid "No '%s' pointer for this node."
! msgstr "Nema â€ž%sâ€� pokazivaÄ�a za ovaj Ä�vor."
  
! #: info/info.c:1142
! #, fuzzy, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
! msgstr "Nepoznata Info naredba â€ž%câ€�, pokuÅ¡ajte â€ž?â€� za pomoÄ‡."
  
! #: info/info.c:1143
! #, fuzzy, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
! msgstr "Terminal vrste â€ž%sâ€� nema dovoljno moguÄ‡nosti za rad programa Info."
  
! #: info/info.c:1144
  msgid "You are already at the last page of this node."
  msgstr "VeÄ‡ se nalazite na zadnjoj stranici ovog Ä�vora."
  
! #: info/info.c:1145
  msgid "You are already at the first page of this node."
  msgstr "VeÄ‡ se nalazite na prvoj stranici ovog Ä�vora."
  
! #: info/info.c:1146
  msgid "Only one window."
  msgstr "Samo jedan prozor."
  
! #: info/info.c:1147
  msgid "Resulting window would be too small."
  msgstr "Nastali prozor bi bio premalen."
  
! #: info/info.c:1148
  msgid "Not enough room for a help window, please delete a window."
  msgstr "Nema dovoljno prostora za prozor pomoÄ‡i, molimo uklonite jedan prozor."
--- 593,661 ----
  msgstr ""
  "Prijavite greÅ¡ke na bug-texinfo@gnu.org,\n"
! "opÄ‡a pitanja i diskusije na help-texinfo@gnu.org.\n"
  "Texinfo poÄ�etna stranica: http://www.gnu.org/software/texinfo/\n"
  "Prijavite greÅ¡ke prijevoda na lokalizacija@linux.hr."
  
! #: info/info.c:1149
! #, c-format
  msgid "Cannot find node '(%s)%s'."
! msgstr "Ne mogu pronaÄ‡i Ä�vor â€˜(%s)%sâ€™."
  
! #: info/info.c:1150
  msgid "Cannot find a window!"
  msgstr "Ne mogu pronaÄ‡i prozor!"
  
! #: info/info.c:1151
  msgid "Point doesn't appear within this window's node!"
  msgstr "ToÄ�ka se ne nalazi unutar Ä�vora ovog prozora!"
  
! #: info/info.c:1152
  msgid "Cannot delete the last window."
  msgstr "Ne mogu ukloniti zadnji prozor."
  
! #: info/info.c:1153
  msgid "No menu in this node."
  msgstr "Nema izbornika u ovom Ä�voru."
  
! #: info/info.c:1154
  msgid "No footnotes in this node."
  msgstr "Nema fusnota u ovom Ä�voru."
  
! #: info/info.c:1155
  msgid "No cross references in this node."
! msgstr "Nema uputnica (cross references) u ovom Ä�voru."
  
! #: info/info.c:1156
! #, c-format
  msgid "No '%s' pointer for this node."
! msgstr "Nema pokazivaÄ�a â€˜%sâ€™ za ovaj Ä�vor."
  
! #: info/info.c:1157
! #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
! msgstr "Nepoznata Info naredba â€˜%câ€™; pokuÅ¡ajte â€˜?â€™ za pomoÄ‡."
  
! #: info/info.c:1158
! #, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
! msgstr "Terminal vrste â€˜%sâ€™ nije dovoljno â€žpametanâ€œ za rad programa Info."
  
! #: info/info.c:1159
  msgid "You are already at the last page of this node."
  msgstr "VeÄ‡ se nalazite na zadnjoj stranici ovog Ä�vora."
  
! #: info/info.c:1160
  msgid "You are already at the first page of this node."
  msgstr "VeÄ‡ se nalazite na prvoj stranici ovog Ä�vora."
  
! #: info/info.c:1161
  msgid "Only one window."
  msgstr "Samo jedan prozor."
  
! #: info/info.c:1162
  msgid "Resulting window would be too small."
  msgstr "Nastali prozor bi bio premalen."
  
! #: info/info.c:1163
  msgid "Not enough room for a help window, please delete a window."
  msgstr "Nema dovoljno prostora za prozor pomoÄ‡i, molimo uklonite jedan prozor."
***************
*** 668,672 ****
  #: info/infodoc.c:40
  msgid "Basic Info command keys\n"
! msgstr "Tipke osnovnih Info naredbi\n"
  
  #: info/infodoc.c:42
--- 663,667 ----
  #: info/infodoc.c:40
  msgid "Basic Info command keys\n"
! msgstr "Tipke za osnovne Info naredbe\n"
  
  #: info/infodoc.c:42
***************
*** 716,720 ****
  "cursor.\n"
  msgstr ""
! "\\%-10[select-reference-this-line]  Slijedi hipertekstualnu vezu ispod "
  "kursora.\n"
  
--- 711,715 ----
  "cursor.\n"
  msgstr ""
! "\\%-10[select-reference-this-line]  Slijedi hipertekstualnu vezu ispod  "
  "kursora.\n"
  
***************
*** 749,755 ****
  
  #: info/infodoc.c:63
- #, fuzzy
  msgid "\\%-10[dir-node]  Go to the main 'directory' node.\n"
! msgstr "\\%-10[dir-node]  Idi na glavni â€ždirectoryâ€� Ä�vor.\n"
  
  #: info/infodoc.c:65
--- 744,749 ----
  
  #: info/infodoc.c:63
  msgid "\\%-10[dir-node]  Go to the main 'directory' node.\n"
! msgstr "\\%-10[dir-node]  Idi na glavni â€˜directoryâ€™ Ä�vor.\n"
  
  #: info/infodoc.c:65
***************
*** 768,772 ****
  #: info/infodoc.c:68
  msgid "\\%-10[xref-item]  Follow a cross reference specified by name.\n"
! msgstr "\\%-10[xref-item]  Slijedi unakrsnu referencu navedenu imenom.\n"
  
  #: info/infodoc.c:69
--- 762,767 ----
  #: info/infodoc.c:68
  msgid "\\%-10[xref-item]  Follow a cross reference specified by name.\n"
! msgstr ""
! "\\%-10[xref-item]  Slijedi uputnicu (cross reference) navedenu imenom.\n"
  
  #: info/infodoc.c:69
***************
*** 801,814 ****
  #: info/infodoc.c:78
  msgid "\\%-10[abort-key]  Cancel the current operation.\n"
! msgstr "\\%-10[abort-key]  PoniÅ¡ti trenutnu operaciju.\n"
  
  #: info/infodoc.c:197
  #, c-format
  msgid "This is GNU Info version %s.  "
! msgstr ""
  
  #: info/infodoc.c:198
  msgid "The current search path is:\n"
! msgstr "Trenutna putanja pretraÅ¾ivanja je:\n"
  
  #: info/infodoc.c:203
--- 796,809 ----
  #: info/infodoc.c:78
  msgid "\\%-10[abort-key]  Cancel the current operation.\n"
! msgstr "\\%-10[abort-key]  PoniÅ¡ti trenutaÄ�nu operaciju.\n"
  
  #: info/infodoc.c:197
  #, c-format
  msgid "This is GNU Info version %s.  "
! msgstr "Ovo je GNU Info inaÄ�ica %s"
  
  #: info/infodoc.c:198
  msgid "The current search path is:\n"
! msgstr "TrenutaÄ�na putanja pretraÅ¾ivanja je:\n"
  
  #: info/infodoc.c:203
***************
*** 850,856 ****
  
  #: info/infodoc.c:348
- #, fuzzy
  msgid "Visit Info node '(info)Help'"
! msgstr "Posjeti Info Ä�vor â€ž(info)Helpâ€�"
  
  #: info/infodoc.c:452
--- 845,850 ----
  
  #: info/infodoc.c:348
  msgid "Visit Info node '(info)Help'"
! msgstr "Posjeti Info Ä�vor â€˜(info)Helpâ€™"
  
  #: info/infodoc.c:452
***************
*** 866,870 ****
  #, c-format
  msgid "%s is undefined."
! msgstr "%s nije definiran."
  
  #: info/infodoc.c:871
--- 860,864 ----
  #, c-format
  msgid "%s is undefined."
! msgstr "nema definicije za %s."
  
  #: info/infodoc.c:871
***************
*** 877,883 ****
  
  #: info/infodoc.c:897
! #, fuzzy, c-format
  msgid "'%s' is not on any keys"
! msgstr "â€ž%sâ€� nije niti na jednoj tipki"
  
  #: info/infodoc.c:903
--- 871,877 ----
  
  #: info/infodoc.c:897
! #, c-format
  msgid "'%s' is not on any keys"
! msgstr "â€˜%sâ€™ nije niti na jednoj tipki"
  
  #: info/infodoc.c:903
***************
*** 892,908 ****
  
  #: info/infodoc.c:912
! #, fuzzy, c-format
  msgid "There is no function named '%s'"
! msgstr "Nema funkcije imena â€ž%sâ€�"
  
  #: info/infomap.c:603
! #, fuzzy, c-format
  msgid "could not open init file %s"
! msgstr "ne mogu Ä�itati datoteku inicijalizacije %s"
  
  #: info/infokey.c:229
  #, c-format
  msgid "key sequence too long"
! msgstr "niz tipki predugaÄ�ak"
  
  #: info/infokey.c:306
--- 886,902 ----
  
  #: info/infodoc.c:912
! #, c-format
  msgid "There is no function named '%s'"
! msgstr "Nema funkcije po imenu â€˜%sâ€™"
  
  #: info/infomap.c:603
! #, c-format
  msgid "could not open init file %s"
! msgstr "ne mogu otvoriti datoteku inicijalizacije %s"
  
  #: info/infokey.c:229
  #, c-format
  msgid "key sequence too long"
! msgstr "niz tipki je predugaÄ�ak"
  
  #: info/infokey.c:306
***************
*** 914,923 ****
  #, c-format
  msgid "NUL character (\\000) not permitted"
! msgstr "NUL znak (\\000) nije dozvoljen"
  
  #: info/infokey.c:415
  #, c-format
  msgid "NUL character (^%c) not permitted"
! msgstr "NUL znak (^%c) nije dozvoljen"
  
  #: info/infokey.c:438
--- 908,917 ----
  #, c-format
  msgid "NUL character (\\000) not permitted"
! msgstr "NUL znak (\\000) nije dopuÅ¡ten"
  
  #: info/infokey.c:415
  #, c-format
  msgid "NUL character (^%c) not permitted"
! msgstr "NUL znak (^%c) nije dopuÅ¡ten"
  
  #: info/infokey.c:438
***************
*** 927,973 ****
  
  #: info/infokey.c:450
! #, fuzzy, c-format
  msgid "cannot bind key sequence to menu-digit"
! msgstr "niz tipki predugaÄ�ak"
  
  #: info/infokey.c:458
  #, c-format
  msgid "unknown action `%s'"
! msgstr "nepoznata radnja â€ž%sâ€�"
  
! #: info/infokey.c:482
  #, c-format
  msgid "action name too long"
! msgstr "predugaÄ�ko ime radnje"
  
! #: info/infokey.c:495
  #, c-format
  msgid "extra characters following action `%s'"
! msgstr "suviÅ¡ni znakovi slijede radnju â€ž%sâ€�"
  
! #: info/infokey.c:506
  #, c-format
  msgid "missing variable name"
  msgstr "nedostaje ime varijable"
  
! #: info/infokey.c:515
  #, c-format
  msgid "missing `=' immediately after variable name"
! msgstr "nedostaje â€ž=â€� odmah iza imena varijable"
  
! #: info/infokey.c:522
  #, c-format
  msgid "variable name too long"
! msgstr "ime varijable predugaÄ�ko"
  
! #: info/infokey.c:546
  #, c-format
  msgid "value too long"
! msgstr "predugaÄ�ka vrijednost"
  
! #: info/infokey.c:592
  #, c-format
  msgid "\"%s\", line %u: "
! msgstr "â€ž%sâ€�, redak %u: "
  
  #: info/m-x.c:66
--- 921,967 ----
  
  #: info/infokey.c:450
! #, c-format
  msgid "cannot bind key sequence to menu-digit"
! msgstr "sekvencija (kombinacija) tipki je predugaÄ�ka"
  
  #: info/infokey.c:458
  #, c-format
  msgid "unknown action `%s'"
! msgstr "nepoznata radnja â€ž%sâ€œ"
  
! #: info/infokey.c:485
  #, c-format
  msgid "action name too long"
! msgstr "predugaÄ�ko ime za radnju"
  
! #: info/infokey.c:498
  #, c-format
  msgid "extra characters following action `%s'"
! msgstr "suviÅ¡ni znakovi slijede radnju â€ž%sâ€œ"
  
! #: info/infokey.c:509
  #, c-format
  msgid "missing variable name"
  msgstr "nedostaje ime varijable"
  
! #: info/infokey.c:518
  #, c-format
  msgid "missing `=' immediately after variable name"
! msgstr "nedostaje â€ž=â€œ odmah iza imena varijable"
  
! #: info/infokey.c:525
  #, c-format
  msgid "variable name too long"
! msgstr "ime varijable je predugaÄ�ko"
  
! #: info/infokey.c:549
  #, c-format
  msgid "value too long"
! msgstr "vrijednost je predugaÄ�ka"
  
! #: info/infokey.c:595
  #, c-format
  msgid "\"%s\", line %u: "
! msgstr "â€ž%sâ€œ, redak %u: "
  
  #: info/m-x.c:66
***************
*** 984,990 ****
  
  #: info/m-x.c:136
! #, fuzzy, c-format
  msgid "Cannot execute an 'echo-area' command here."
! msgstr "Ovdje ne mogu izvrÅ¡iti naredbu â€žecho-areaâ€�."
  
  #: info/m-x.c:149
--- 978,984 ----
  
  #: info/m-x.c:136
! #, c-format
  msgid "Cannot execute an 'echo-area' command here."
! msgstr "Ovdje ne mogu izvrÅ¡iti naredbu â€˜echo-areaâ€™."
  
  #: info/m-x.c:149
***************
*** 1019,1023 ****
  #. it is part of the Info syntax.
  #: info/nodemenu.c:35
- #, fuzzy
  msgid ""
  "\n"
--- 1013,1016 ----
***************
*** 1033,1037 ****
  
  #: info/nodemenu.c:187
- #, fuzzy
  msgid ""
  "Here is the menu of nodes you have recently visited.\n"
--- 1026,1029 ----
***************
*** 1039,1048 ****
  msgstr ""
  "Ovdje je popis Ä�vorova koje ste nedavno posjetili.\n"
! "Izaberite jedan s izbornika ili koristite â€ž\\[history-node]â€� u drugom "
  "prozoru\n"
  
  #: info/nodemenu.c:208
  msgid "Make a window containing a menu of all of the currently visited nodes"
! msgstr "Napravi prozor koji sadrÅ¾i izbornik svih trenutno posjeÄ‡enih Ä�vorova"
  
  #: info/nodemenu.c:253
--- 1031,1040 ----
  msgstr ""
  "Ovdje je popis Ä�vorova koje ste nedavno posjetili.\n"
! "Izaberite jedan s izbornika ili koristite â€˜\\[history-node]â€™ u drugom "
  "prozoru\n"
  
  #: info/nodemenu.c:208
  msgid "Make a window containing a menu of all of the currently visited nodes"
! msgstr "Napravi prozor koji sadrÅ¾i izbornik svih aktualno posjeÄ‡enih Ä�vorova"
  
  #: info/nodemenu.c:253
***************
*** 1057,1061 ****
  #, c-format
  msgid "The reference disappeared! (%s)."
! msgstr "Referenca je nestala! (%s)."
  
  #: info/pcterm.c:212
--- 1049,1053 ----
  #, c-format
  msgid "The reference disappeared! (%s)."
! msgstr "Referencija je nestala! (%s)."
  
  #: info/pcterm.c:212
***************
*** 1071,1080 ****
  #: info/session.c:62
  msgid "Show all matching files"
! msgstr ""
  
  #: info/session.c:66
! #, fuzzy, c-format
  msgid "No file index"
! msgstr "Nema indeksa"
  
  #. TRANSLATORS: Try to keep this message (when "expanded") at most 79
--- 1063,1072 ----
  #: info/session.c:62
  msgid "Show all matching files"
! msgstr "PrikaÅ¾i sve podudarajuÄ‡e datoteke"
  
  #: info/session.c:66
! #, c-format
  msgid "No file index"
! msgstr "Nema indeksne datoteke"
  
  #. TRANSLATORS: Try to keep this message (when "expanded") at most 79
***************
*** 1082,1086 ****
  #. displayed on an 80-column terminal.
  #: info/session.c:192
! #, fuzzy, c-format
  msgid ""
  "Welcome to Info version %s.  Type \\[get-help-window] for help, \\[get-info-"
--- 1074,1078 ----
  #. displayed on an 80-column terminal.
  #: info/session.c:192
! #, c-format
  msgid ""
  "Welcome to Info version %s.  Type \\[get-help-window] for help, \\[get-info-"
***************
*** 1088,1095 ****
  msgstr ""
  "DobrodoÅ¡li u Info inaÄ�icu %s. Utipkajte \\[get-help-window] za pomoÄ‡, "
! "\\[menu-item] za stavku izbornika."
  
  #: info/session.c:776
! #, fuzzy, c-format
  msgid "can't open %s: %s"
  msgstr "ne mogu otvoriti %s: %s"
--- 1080,1087 ----
  msgstr ""
  "DobrodoÅ¡li u Info inaÄ�icu %s. Utipkajte \\[get-help-window] za pomoÄ‡, "
! "\\[menu-item] za tutorial."
  
  #: info/session.c:776
! #, c-format
  msgid "can't open %s: %s"
  msgstr "ne mogu otvoriti %s: %s"
***************
*** 1098,1102 ****
  #, c-format
  msgid "debugging output diverted to \"%s\""
! msgstr ""
  
  #: info/session.c:1273
--- 1090,1094 ----
  #, c-format
  msgid "debugging output diverted to \"%s\""
! msgstr "ispis debugiranja preusmjern je na â€ž%sâ€œ"
  
  #: info/session.c:1273
***************
*** 1110,1114 ****
  #: info/session.c:1304
  msgid "Move the cursor to a specific line of the window"
! msgstr "Pomakni kursor na poseban redak prozora"
  
  #: info/session.c:1336
--- 1102,1106 ----
  #: info/session.c:1304
  msgid "Move the cursor to a specific line of the window"
! msgstr "Pomakni kursor na specificirani redak prozora"
  
  #: info/session.c:1336
***************
*** 1122,1130 ****
  #: info/session.c:1443
  msgid "Move to the start of this node"
! msgstr "Pomakni se na poÄ�etak trenutnog Ä�vora"
  
  #: info/session.c:1450
  msgid "Move to the end of this node"
! msgstr "Pomakni se na kraj trenutnog Ä�vora"
  
  #: info/session.c:1541
--- 1114,1122 ----
  #: info/session.c:1443
  msgid "Move to the start of this node"
! msgstr "Pomakni se na poÄ�etak ovog Ä�vora"
  
  #: info/session.c:1450
  msgid "Move to the end of this node"
! msgstr "Pomakni se na kraj ovog Ä�vora"
  
  #: info/session.c:1541
***************
*** 1201,1209 ****
  #: info/session.c:1907
  msgid "Split the current window"
! msgstr "Podijeli trenutni prozor"
  
  #: info/session.c:1952
  msgid "Delete the current window"
! msgstr "Ukloni trenutni prozor"
  
  #: info/session.c:1957
--- 1193,1201 ----
  #: info/session.c:1907
  msgid "Split the current window"
! msgstr "Podijeli aktualni prozor"
  
  #: info/session.c:1952
  msgid "Delete the current window"
! msgstr "Ukloni aktualni prozor"
  
  #: info/session.c:1957
***************
*** 1225,1229 ****
  #: info/session.c:2052
  msgid "Toggle the state of line wrapping in the current window"
! msgstr "Promijeni stanje prelamanja redaka u trenutnom prozoru"
  
  #: info/session.c:2206
--- 1217,1221 ----
  #: info/session.c:2052
  msgid "Toggle the state of line wrapping in the current window"
! msgstr "Promijeni stanje prelamanja redaka u aktualnom prozoru"
  
  #: info/session.c:2206
***************
*** 1255,1263 ****
  #, c-format
  msgid "Follow xref (%s): "
! msgstr "Slijedi unakrsnu referencu (%s): "
  
  #: info/session.c:2367
  msgid "Follow xref: "
! msgstr "Slijedi unakrsnu referencu: "
  
  #: info/session.c:2456
--- 1247,1255 ----
  #, c-format
  msgid "Follow xref (%s): "
! msgstr "Slijedi uputnicu (cross reference xref) (%s): "
  
  #: info/session.c:2367
  msgid "Follow xref: "
! msgstr "Slijedi uputnicu xref): "
  
  #: info/session.c:2456
***************
*** 1267,1271 ****
  #: info/session.c:2481
  msgid "Read a footnote or cross reference and select its node"
! msgstr "ÄŒitaj fusnotu ili referencu i izaberi njezin Ä�vor"
  
  #: info/session.c:2487
--- 1259,1263 ----
  #: info/session.c:2481
  msgid "Read a footnote or cross reference and select its node"
! msgstr "ÄŒitaj fusnotu ili referenciju i izaberi njezin Ä�vor"
  
  #: info/session.c:2487
***************
*** 1279,1677 ****
  #: info/session.c:2609
  msgid "Move to the previous cross reference"
! msgstr "Idi na prethodnu unakrsnu referencu"
  
  #: info/session.c:2672
  msgid "Move to the next cross reference"
! msgstr "Idi na sljedeÄ‡u unakrsnu referencu"
  
  #: info/session.c:2733
  msgid "Select reference or menu item appearing on this line"
! msgstr "Izaberi referencu ili stavku izbornika koja se pojavljuje u retku"
  
  #: info/session.c:2767
! #, fuzzy, c-format
  msgid "No menu in node '%s'."
! msgstr "Nema izbornika u Ä�voru â€ž%sâ€�."
  
  #: info/session.c:2814
! #, fuzzy, c-format
  msgid "Unable to find node referenced by '%s' in '%s'."
! msgstr "Ne mogu naÄ‡i Ä�vor koji referencira â€ž%sâ€� u â€ž%sâ€�."
  
! #: info/session.c:2864
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "ÄŒitaj popis izbornika poÄ�evÅ¡i od dir i slijedi ih"
  
! #: info/session.c:2866
  msgid "Follow menus: "
  msgstr "Slijedi izbornike: "
  
! #: info/session.c:2971
  msgid "Select the Next node"
  msgstr "Izaberi sljedeÄ‡i (Next) Ä�vor"
  
! #: info/session.c:2978
  msgid "Select the Prev node"
  msgstr "Izaberi prethodni (Prev) Ä�vor"
  
! #: info/session.c:2985
  msgid "Select the Up node"
  msgstr "Izaberi gornji (Up) Ä�vor"
  
! #: info/session.c:2991
  msgid "Select the last node in this file"
  msgstr "Izaberi posljednji Ä�vor u ovoj datoteci"
  
! #: info/session.c:3018 info/session.c:3051
  msgid "This window has no additional nodes"
  msgstr "Ovaj prozor nema dodatnih Ä�vorova"
  
! #: info/session.c:3024
  msgid "Select the first node in this file"
  msgstr "Izaberi prvi Ä�vor u ovoj datoteci"
  
! #: info/session.c:3158
  msgid "No more nodes within this document."
  msgstr "Nema viÅ¡e Ä�vorova u ovom dokumentu."
  
! #: info/session.c:3203 info/session.c:3243
! #, fuzzy
  msgid "No 'Prev' or 'Up' for this node within this document."
! msgstr "Nema â€žPrevâ€� ni â€žUpâ€� za ovaj Ä�vor unutar dokumenta."
  
! #: info/session.c:3256
  msgid "Move forwards or down through node structure"
  msgstr "Idi naprijed ili dolje kroz strukturu Ä�vorova"
  
! #: info/session.c:3273
  msgid "Move backwards or up through node structure"
  msgstr "Idi natrag ili gore kroz strukturu Ä�vorova"
  
! #: info/session.c:3296
  msgid "Read a node name and select it"
! msgstr "ÄŒitaj ime Ä�vora i izaberi ga"
  
! #: info/session.c:3350 info/session.c:3354
  msgid "Goto node: "
  msgstr "Idi na Ä�vor: "
  
! #: info/session.c:3533
  msgid "Find the node describing program invocation"
  msgstr "PronaÄ‘i Ä�vor koji opisuje pozivanje programa"
  
! #: info/session.c:3535
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "PronaÄ‘i Ä�vor pozivanja (Invocation) od [%s]: "
  
! #: info/session.c:3580
  msgid "Read a manpage reference and select it"
! msgstr "ProÄ�itaj referentnu stranicu priruÄ�nika i izaberi je"
  
! #: info/session.c:3584
  msgid "Get Manpage: "
! msgstr "Dohvati stranicu priruÄ�nika: "
  
! #: info/session.c:3605
! #, fuzzy
  msgid "Select the node 'Top' in this file"
! msgstr "Izaberi vrÅ¡ni Ä�vor (â€žTopâ€�) u ovoj datoteci"
  
! #: info/session.c:3611
! #, fuzzy
  msgid "Select the node '(dir)'"
! msgstr "Izaberi Ä�vor â€ž(dir)â€�"
  
! #: info/session.c:3617
  msgid "Show full file name of node being displayed"
! msgstr ""
  
! #: info/session.c:3634
  msgid "Select the most recently selected node"
  msgstr "Izaberi zadnji izabrani Ä�vor"
  
! #: info/session.c:3639
  #, c-format
  msgid "No earlier node in history"
! msgstr ""
  
! #: info/session.c:3643
  msgid "Read the name of a file and select it"
  msgstr "ProÄ�itaj ime datoteke i izaberi je"
  
! #: info/session.c:3647
  msgid "Find file: "
  msgstr "PronaÄ‘i datoteku: "
  
! #: info/session.c:3664
! #, fuzzy, c-format
  msgid "Cannot find '%s'."
! msgstr "Ne mogu pronaÄ‡i â€ž%sâ€�."
  
! #: info/session.c:3713
! #, fuzzy, c-format
  msgid "Could not create output file '%s'."
! msgstr "Ne mogu napraviti izlaznu datoteku â€ž%sâ€�."
  
! #: info/session.c:3727
! #, fuzzy, c-format
  msgid "error writing to %s: %s"
! msgstr "greÅ¡ka pri pisanju u â€ž%sâ€�"
  
! #: info/session.c:3736
! #, fuzzy, c-format
  msgid "closing %s"
! msgstr "Uklanjam %s\n"
  
! #: info/session.c:3785
! #, fuzzy, c-format
  msgid "writing node %s..."
! msgstr "Spremam Ä�vor %s..."
  
! #: info/session.c:3831
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
! msgstr "Propusti sadrÅ¾aj ovog Ä�vora kroz cjevovod prema INFO_PRINT_COMMAND"
  
! #: info/session.c:3859
! #, fuzzy, c-format
  msgid "Cannot open pipe to '%s'."
! msgstr "Ne mogu otvoriti cjevovod prema â€ž%sâ€�."
  
! #: info/session.c:3864
! #, fuzzy, c-format
  msgid "printing node %s..."
! msgstr "Ispisujem Ä�vor %s..."
  
! #: info/session.c:3872
! #, fuzzy, c-format
  msgid "finished printing node %s"
! msgstr "Ispisujem Ä�vor %s..."
  
! #: info/session.c:3904
  msgid "Toggle the usage of regular expressions in searches"
  msgstr "Promijeni koriÅ¡tenje regularnih izraza u pretragama"
  
! #: info/session.c:3908
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr "Koristim regularne izraze za pretrage."
  
! #: info/session.c:3909
  #, c-format
  msgid "Using literal strings for searches."
! msgstr "Koristim konstantne nizove za pretrage."
  
! #: info/session.c:4169
  msgid "Search continued from the end of the document."
  msgstr "Pretraga se nastavlja od kraja dokumenta."
  
! #: info/session.c:4174
  msgid "Search continued from the beginning of the document."
  msgstr "Pretraga se nastavlja od poÄ�etka dokumenta."
  
! #: info/session.c:4194
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "TraÅ¾im poddatoteku %s ..."
  
! #: info/session.c:4231
  msgid "Search failed."
  msgstr "Pretraga nije uspjela."
  
! #: info/session.c:4248
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Regexp search"
! msgstr "Pretraga regularnog izraza"
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Search"
  msgstr "Pretraga"
  
! #: info/session.c:4250 info/session.c:4256
  msgid " case-sensitively"
  msgstr " pazi na veliÄ�inu slova"
  
! #: info/session.c:4251 info/session.c:4257
  msgid " backward"
  msgstr " unatrag"
  
! #: info/session.c:4254
! #, fuzzy, c-format
  msgid "%s%s%s: "
! msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4274
  msgid "Search string too short"
  msgstr "Niz za pretraÅ¾ivanje je prekratak"
  
! #: info/session.c:4467
  #, c-format
  msgid "Going back to last match from %s"
! msgstr ""
  
! #: info/session.c:4491 info/session.c:4601
! #, fuzzy, c-format
  msgid "No more matches."
! msgstr "Nema poklapanja"
  
! #: info/session.c:4628
  msgid "Search this node and subnodes for a string."
! msgstr ""
  
! #: info/session.c:4649
  msgid "Go to next match in Info sub-tree"
! msgstr ""
  
! #: info/session.c:4653 info/session.c:4665
  #, c-format
  msgid "No active search"
! msgstr ""
  
! #: info/session.c:4661
  msgid "Go to previous match in Info sub-tree"
! msgstr ""
  
! #: info/session.c:4674
  msgid "Read a string and search for it case-sensitively"
  msgstr "ProÄ�itaj niz i traÅ¾i ga (pazi na veliÄ�inu slova)"
  
! #: info/session.c:4679
  msgid "Read a string and search for it"
  msgstr "ProÄ�itaj niz i traÅ¾i ga"
  
! #: info/session.c:4685
  msgid "Read a string and search backward for it"
  msgstr "ProÄ�itaj niz i traÅ¾i ga unatrag"
  
! #: info/session.c:4693
  msgid "Repeat last search in the same direction"
  msgstr "Ponovi zadnju pretragu u istom smjeru"
  
! #: info/session.c:4701 info/session.c:4746
  msgid "No previous search string"
  msgstr "Nema prethodnog traÅ¾enog niza"
  
! #: info/session.c:4738
  msgid "Repeat last search in the reverse direction"
  msgstr "Ponovi zadnju pretragu u suprotnom smjeru"
  
! #: info/session.c:4785
  msgid "Clear displayed search matches"
! msgstr ""
  
! #: info/session.c:4802 info/session.c:4808
  msgid "Search interactively for a string as you type it"
  msgstr "TraÅ¾i niz interaktivno za vrijeme tipkanja"
  
! #: info/session.c:4928
  msgid "Regexp I-search backward: "
  msgstr "I-pretraga regularnog izraza unatrag: "
  
! #: info/session.c:4929
  msgid "I-search backward: "
  msgstr "I-pretraga unatrag: "
  
! #: info/session.c:4931
  msgid "Regexp I-search: "
! msgstr "I-pretraga regularnog izraza: "
  
! #: info/session.c:4932
  msgid "I-search: "
  msgstr "I-pretraga: "
  
! #: info/session.c:4957 info/session.c:4960
  msgid "Failing "
! msgstr "Neuspjela "
  
! #: info/session.c:5326
  msgid "Cancel current operation"
! msgstr "PoniÅ¡ti trenutnu operaciju"
  
! #: info/session.c:5333
  msgid "Quit"
! msgstr "IzaÄ‘i"
  
! #: info/session.c:5338
! #, fuzzy
  msgid "Display version of Info being run"
! msgstr "prikaÅ¾i informacije o inaÄ�ici i izaÄ‘i"
  
! #: info/session.c:5340
  #, c-format
  msgid "GNU Info version %s"
! msgstr ""
  
! #: info/session.c:5345
  msgid "Redraw the display"
  msgstr "OsvjeÅ¾i prikaz"
  
! #: info/session.c:5382
  msgid "Quit using Info"
! msgstr "IzaÄ‘i iz programa Info"
  
! #: info/session.c:5398
  msgid "Run command bound to this key's lowercase variant"
  msgstr "IzvrÅ¡i naredbu povezanu s malim slovom ove tipke"
  
! #: info/session.c:5409
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Nepoznata naredba (%s)."
  
! #: info/session.c:5412
  #, c-format
  msgid "\"%s\" is invalid"
! msgstr "â€ž%sâ€� nije ispravan"
  
! #: info/session.c:5413
! #, fuzzy, c-format
  msgid "'%s' is invalid"
! msgstr "â€ž%sâ€� nije ispravan"
  
! #: info/session.c:5731
  msgid "Add this digit to the current numeric argument"
! msgstr "Dodaj ovu znamenku trenutnom brojÄ�anom argumentu"
  
! #: info/session.c:5738
  msgid "Start (or multiply by 4) the current numeric argument"
! msgstr "ZapoÄ�ni (ili pomnoÅ¾i s 4) trenutni brojÄ�ani argument"
  
  #: info/tilde.c:361
  #, c-format
  msgid "readline: Out of virtual memory!\n"
! msgstr "readline: Premalo virtualne memorije!\n"
  
  #: info/variables.c:65
  msgid "When \"On\", footnotes appear and disappear automatically"
! msgstr "Kada je ukljuÄ�eno (â€žOnâ€�), fusnote se automatski pojavljuju i nestaju"
  
  #: info/variables.c:69
  msgid "When \"On\", creating or deleting a window resizes other windows"
  msgstr ""
! "Kada je ukljuÄ�eno (â€žOnâ€�), stvaranje ili zatvaranje prozora mijenja veliÄ�inu "
  "drugih prozora"
  
  #: info/variables.c:73
  msgid "When \"On\", flash the screen instead of ringing the bell"
! msgstr "Kada je ukljuÄ�eno (â€žOnâ€�), koristi bljesak ekrana umjesto zvona"
  
  #: info/variables.c:77
  msgid "When \"On\", errors cause the bell to ring"
! msgstr "Kada je ukljuÄ�eno (â€žOnâ€�), greÅ¡ke uzrokuju zvonjenje"
  
  #: info/variables.c:81
  msgid "When \"On\", Info garbage collects files which had to be uncompressed"
  msgstr ""
! "Kada je ukljuÄ�eno (â€žOnâ€�), Info skuplja smeÄ‡e (â€žgarbage collectionâ€�) datoteka "
  "koje su dekomprimirane"
  
  #: info/variables.c:84
  msgid "When \"On\", the portion of the matched search string is highlighted"
! msgstr ""
! "Kada je ukljuÄ�eno (â€žOnâ€�), dio znakovnog niza koji se podudara je oznaÄ�en"
  
  #: info/variables.c:88
--- 1271,1664 ----
  #: info/session.c:2609
  msgid "Move to the previous cross reference"
! msgstr "Idi na prethodnu uputnicu (cross reference)"
  
  #: info/session.c:2672
  msgid "Move to the next cross reference"
! msgstr "Idi na sljedeÄ‡u uputnicu (cross reference)"
  
  #: info/session.c:2733
  msgid "Select reference or menu item appearing on this line"
! msgstr "Izaberi referenciju ili stavku izbornika koja se pojavljuje u retku"
  
  #: info/session.c:2767
! #, c-format
  msgid "No menu in node '%s'."
! msgstr "Nema izbornika u Ä�voru â€˜%sâ€™."
  
  #: info/session.c:2814
! #, c-format
  msgid "Unable to find node referenced by '%s' in '%s'."
! msgstr "Ne mogu naÄ‡i Ä�vor koji â€˜%sâ€™ referencira u â€˜%sâ€™."
  
! #: info/session.c:2870
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "ÄŒitaj popis izbornika poÄ�evÅ¡i od dir i slijedi ih"
  
! #: info/session.c:2872
  msgid "Follow menus: "
  msgstr "Slijedi izbornike: "
  
! #: info/session.c:2977
  msgid "Select the Next node"
  msgstr "Izaberi sljedeÄ‡i (Next) Ä�vor"
  
! #: info/session.c:2984
  msgid "Select the Prev node"
  msgstr "Izaberi prethodni (Prev) Ä�vor"
  
! #: info/session.c:2991
  msgid "Select the Up node"
  msgstr "Izaberi gornji (Up) Ä�vor"
  
! #: info/session.c:2997
  msgid "Select the last node in this file"
  msgstr "Izaberi posljednji Ä�vor u ovoj datoteci"
  
! #: info/session.c:3024 info/session.c:3057
  msgid "This window has no additional nodes"
  msgstr "Ovaj prozor nema dodatnih Ä�vorova"
  
! #: info/session.c:3030
  msgid "Select the first node in this file"
  msgstr "Izaberi prvi Ä�vor u ovoj datoteci"
  
! #: info/session.c:3164
  msgid "No more nodes within this document."
  msgstr "Nema viÅ¡e Ä�vorova u ovom dokumentu."
  
! #: info/session.c:3209 info/session.c:3249
  msgid "No 'Prev' or 'Up' for this node within this document."
! msgstr "Nema â€˜Prevâ€™ ni â€˜Upâ€™ za ovaj Ä�vor unutar dokumenta."
  
! #: info/session.c:3262
  msgid "Move forwards or down through node structure"
  msgstr "Idi naprijed ili dolje kroz strukturu Ä�vorova"
  
! #: info/session.c:3279
  msgid "Move backwards or up through node structure"
  msgstr "Idi natrag ili gore kroz strukturu Ä�vorova"
  
! #: info/session.c:3302
  msgid "Read a node name and select it"
! msgstr "ProÄ�itaj ime Ä�vora i izaberi ga"
  
! #: info/session.c:3356 info/session.c:3360
  msgid "Goto node: "
  msgstr "Idi na Ä�vor: "
  
! #: info/session.c:3539
  msgid "Find the node describing program invocation"
  msgstr "PronaÄ‘i Ä�vor koji opisuje pozivanje programa"
  
! #: info/session.c:3541
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "PronaÄ‘i Ä�vor pozivanja (Invocation) od [%s]: "
  
! #: info/session.c:3586
  msgid "Read a manpage reference and select it"
! msgstr "ProÄ�itaj referenciju u priruÄ�niku i izaberi je"
  
! #: info/session.c:3590
  msgid "Get Manpage: "
! msgstr "PrikaÅ¾i stranicu priruÄ�nika: "
  
! #: info/session.c:3611
  msgid "Select the node 'Top' in this file"
! msgstr "Izaberi vrÅ¡ni Ä�vor (â€˜Topâ€™) u ovoj datoteci"
  
! #: info/session.c:3617
  msgid "Select the node '(dir)'"
! msgstr "Izaberi Ä�vor â€˜(dir)â€™"
  
! #: info/session.c:3623
  msgid "Show full file name of node being displayed"
! msgstr "IspiÅ¡i puni naziv datoteke Ä�vora koji je prikazan"
  
! #: info/session.c:3640
  msgid "Select the most recently selected node"
  msgstr "Izaberi zadnji izabrani Ä�vor"
  
! #: info/session.c:3645
  #, c-format
  msgid "No earlier node in history"
! msgstr "Nema ranijeg Ä�vora u povijesti"
  
! #: info/session.c:3649
  msgid "Read the name of a file and select it"
  msgstr "ProÄ�itaj ime datoteke i izaberi je"
  
! #: info/session.c:3653
  msgid "Find file: "
  msgstr "PronaÄ‘i datoteku: "
  
! #: info/session.c:3670
! #, c-format
  msgid "Cannot find '%s'."
! msgstr "Ne mogu pronaÄ‡i â€˜%sâ€™."
  
! #: info/session.c:3719
! #, c-format
  msgid "Could not create output file '%s'."
! msgstr "Ne mogu napraviti izlaznu datoteku â€˜%sâ€™."
  
! #: info/session.c:3733
! #, c-format
  msgid "error writing to %s: %s"
! msgstr "greÅ¡ka pri pisanju u %s: %s"
  
! #: info/session.c:3742
! #, c-format
  msgid "closing %s"
! msgstr "zatvaram %s"
  
! #: info/session.c:3791
! #, c-format
  msgid "writing node %s..."
! msgstr "zapisivanje Ä�vora %s..."
  
! #: info/session.c:3837
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
! msgstr "Propusti sadrÅ¾aj ovog Ä�vora kroz cijev prema INFO_PRINT_COMMAND"
  
! #: info/session.c:3865
! #, c-format
  msgid "Cannot open pipe to '%s'."
! msgstr "Ne mogu otvoriti cijev prema â€˜%sâ€™."
  
! #: info/session.c:3870
! #, c-format
  msgid "printing node %s..."
! msgstr "ispisujem Ä�vor %s..."
  
! #: info/session.c:3878
! #, c-format
  msgid "finished printing node %s"
! msgstr "zavrÅ¡en je ispis Ä�vor %s..."
  
! #: info/session.c:3910
  msgid "Toggle the usage of regular expressions in searches"
  msgstr "Promijeni koriÅ¡tenje regularnih izraza u pretragama"
  
! #: info/session.c:3914
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr "Koristim regularne izraze za pretrage."
  
! #: info/session.c:3915
  #, c-format
  msgid "Using literal strings for searches."
! msgstr "Koristim doslovne nizove za pretrage."
  
! #: info/session.c:4175
  msgid "Search continued from the end of the document."
  msgstr "Pretraga se nastavlja od kraja dokumenta."
  
! #: info/session.c:4180
  msgid "Search continued from the beginning of the document."
  msgstr "Pretraga se nastavlja od poÄ�etka dokumenta."
  
! #: info/session.c:4200
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "TraÅ¾im poddatoteku %s ..."
  
! #: info/session.c:4237
  msgid "Search failed."
  msgstr "Pretraga nije uspjela."
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Regexp search"
! msgstr "Pretraga regularnim izrazom"
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Search"
  msgstr "Pretraga"
  
! #: info/session.c:4256 info/session.c:4262
  msgid " case-sensitively"
  msgstr " pazi na veliÄ�inu slova"
  
! #: info/session.c:4257 info/session.c:4263
  msgid " backward"
  msgstr " unatrag"
  
! #: info/session.c:4260
! #, c-format
  msgid "%s%s%s: "
! msgstr "%s%s%s: "
  
! #: info/session.c:4280
  msgid "Search string too short"
  msgstr "Niz za pretraÅ¾ivanje je prekratak"
  
! #: info/session.c:4473
  #, c-format
  msgid "Going back to last match from %s"
! msgstr "VraÄ‡am se na zadnje podudaranje iz %s"
  
! #: info/session.c:4497 info/session.c:4607
! #, c-format
  msgid "No more matches."
! msgstr "Nema viÅ¡e podudaranja."
  
! #: info/session.c:4634
  msgid "Search this node and subnodes for a string."
! msgstr "PretraÅ¾i ovaj Ä�vor i podÄ�vorove za niz (string)."
  
! #: info/session.c:4655
  msgid "Go to next match in Info sub-tree"
! msgstr "Idi na sljedeÄ‡e podudaranje u Info podstablu"
  
! #: info/session.c:4659 info/session.c:4671
  #, c-format
  msgid "No active search"
! msgstr "Nema aktivnog traÅ¾enja"
  
! #: info/session.c:4667
  msgid "Go to previous match in Info sub-tree"
! msgstr "Idi na prethodno podudaranje u Info podstablu"
  
! #: info/session.c:4680
  msgid "Read a string and search for it case-sensitively"
  msgstr "ProÄ�itaj niz i traÅ¾i ga (pazi na veliÄ�inu slova)"
  
! #: info/session.c:4685
  msgid "Read a string and search for it"
  msgstr "ProÄ�itaj niz i traÅ¾i ga"
  
! #: info/session.c:4691
  msgid "Read a string and search backward for it"
  msgstr "ProÄ�itaj niz i traÅ¾i ga unatrag"
  
! #: info/session.c:4699
  msgid "Repeat last search in the same direction"
  msgstr "Ponovi zadnju pretragu u istom smjeru"
  
! #: info/session.c:4707 info/session.c:4752
  msgid "No previous search string"
  msgstr "Nema prethodnog traÅ¾enog niza"
  
! #: info/session.c:4744
  msgid "Repeat last search in the reverse direction"
  msgstr "Ponovi zadnju pretragu u suprotnom smjeru"
  
! #: info/session.c:4791
  msgid "Clear displayed search matches"
! msgstr "PoÄ�isti pretragom prikazana podudaranja"
  
! #: info/session.c:4808 info/session.c:4814
  msgid "Search interactively for a string as you type it"
  msgstr "TraÅ¾i niz interaktivno za vrijeme tipkanja"
  
! #: info/session.c:4934
  msgid "Regexp I-search backward: "
  msgstr "I-pretraga regularnog izraza unatrag: "
  
! #: info/session.c:4935
  msgid "I-search backward: "
  msgstr "I-pretraga unatrag: "
  
! #: info/session.c:4937
  msgid "Regexp I-search: "
! msgstr "I-pretraga regularnim izrazom: "
  
! #: info/session.c:4938
  msgid "I-search: "
  msgstr "I-pretraga: "
  
! #: info/session.c:4963 info/session.c:4966
  msgid "Failing "
! msgstr "Ne uspjeva"
  
! #: info/session.c:5332
  msgid "Cancel current operation"
! msgstr "PoniÅ¡ti trenutaÄ�nu operaciju"
  
! #: info/session.c:5339
  msgid "Quit"
! msgstr "IziÄ‘i"
  
! #: info/session.c:5344
  msgid "Display version of Info being run"
! msgstr "PrikaÅ¾i informacije o inaÄ�ici i iziÄ‘i"
  
! #: info/session.c:5346
  #, c-format
  msgid "GNU Info version %s"
! msgstr "GNU Info inaÄ�ica %s"
  
! #: info/session.c:5351
  msgid "Redraw the display"
  msgstr "OsvjeÅ¾i prikaz"
  
! #: info/session.c:5388
  msgid "Quit using Info"
! msgstr "IziÄ‘i iz programa Info"
  
! #: info/session.c:5404
  msgid "Run command bound to this key's lowercase variant"
  msgstr "IzvrÅ¡i naredbu povezanu s malim slovom ove tipke"
  
! #: info/session.c:5415
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Nepoznata naredba (%s)."
  
! #: info/session.c:5418
  #, c-format
  msgid "\"%s\" is invalid"
! msgstr "â€ž%sâ€œ nije ispravan"
  
! #: info/session.c:5419
! #, c-format
  msgid "'%s' is invalid"
! msgstr "â€˜%sâ€™ nije ispravan"
  
! #: info/session.c:5737
  msgid "Add this digit to the current numeric argument"
! msgstr "Dodaj ovu znamenku trenutaÄ�nom brojÄ�anom argumentu"
  
! #: info/session.c:5744
  msgid "Start (or multiply by 4) the current numeric argument"
! msgstr "ZapoÄ�ni (ili pomnoÅ¾i s 4) trenutaÄ�ni brojÄ�ani argument"
  
  #: info/tilde.c:361
  #, c-format
  msgid "readline: Out of virtual memory!\n"
! msgstr "readline: Nema dovoljno virtualne memorije!\n"
  
  #: info/variables.c:65
  msgid "When \"On\", footnotes appear and disappear automatically"
! msgstr "Kada je ukljuÄ�eno â€žOnâ€œ, fusnote se automatski pojavljuju i nestaju"
  
  #: info/variables.c:69
  msgid "When \"On\", creating or deleting a window resizes other windows"
  msgstr ""
! "Kada je ukljuÄ�eno â€žOnâ€œ, stvaranje ili zatvaranje prozora mijenja veliÄ�inu "
  "drugih prozora"
  
  #: info/variables.c:73
  msgid "When \"On\", flash the screen instead of ringing the bell"
! msgstr "Kada je ukljuÄ�eno â€žOnâ€œ, koristi bljesak ekrana umjesto zvona"
  
  #: info/variables.c:77
  msgid "When \"On\", errors cause the bell to ring"
! msgstr "Kada je ukljuÄ�eno â€žOnâ€œ, greÅ¡ke uzrokuju zvonjenje"
  
  #: info/variables.c:81
  msgid "When \"On\", Info garbage collects files which had to be uncompressed"
  msgstr ""
! "Kada je ukljuÄ�eno â€žOnâ€œ, Info skuplja smeÄ‡e (â€žgarbage collectionâ€œ) datoteka "
  "koje su dekomprimirane"
  
  #: info/variables.c:84
  msgid "When \"On\", the portion of the matched search string is highlighted"
! msgstr "Kada je ukljuÄ�eno â€žOnâ€œ, dio znakovnog niza koji se podudara je oznaÄ�en"
  
  #: info/variables.c:88
***************
*** 1694,1698 ****
  #: info/variables.c:105
  msgid "When \"On\", Info accepts and displays ISO Latin characters"
! msgstr "Kada je ukljuÄ�eno (â€žOnâ€�), Info prihvaÄ‡a i prikazuje ISO Latin znakove"
  
  #: info/variables.c:109
--- 1681,1685 ----
  #: info/variables.c:105
  msgid "When \"On\", Info accepts and displays ISO Latin characters"
! msgstr "Kada je ukljuÄ�eno â€žOnâ€œ, Info prihvaÄ‡a i prikazuje ISO Latin znakove"
  
  #: info/variables.c:109
***************
*** 1707,1719 ****
  #: info/variables.c:118
  msgid "Skip current window when searching"
! msgstr ""
  
  #: info/variables.c:122
  msgid "Exclude default directories from file search path"
! msgstr ""
  
  #: info/variables.c:126
  msgid "Hide some Info file syntax in the text of nodes"
! msgstr ""
  
  #: info/variables.c:130
--- 1694,1706 ----
  #: info/variables.c:118
  msgid "Skip current window when searching"
! msgstr "PreskoÄ�i trenutaÄ�ni prozor pri traÅ¾enju"
  
  #: info/variables.c:122
  msgid "Exclude default directories from file search path"
! msgstr "Izuzmi zadane direktorije iz putanje za traÅ¾enje datoteka"
  
  #: info/variables.c:126
  msgid "Hide some Info file syntax in the text of nodes"
! msgstr "Skrij neke Info datoteÄ�ne sintakse u tekstu Ä�vorova"
  
  #: info/variables.c:130
***************
*** 1722,1754 ****
  "indicating that a key has been pressed"
  msgstr ""
  
  #: info/variables.c:134
  msgid "Method to use to track mouse events"
! msgstr ""
  
  #: info/variables.c:138
- #, fuzzy
  msgid "How to follow a cross-reference"
! msgstr "Idi na sljedeÄ‡u unakrsnu referencu"
  
  #: info/variables.c:142
  msgid "Highlight search matches"
! msgstr ""
  
  #: info/variables.c:146
  msgid "Styles for links"
! msgstr ""
  
  #: info/variables.c:150
  msgid "Styles for active links"
! msgstr ""
  
  #: info/variables.c:154
  msgid "Styles for search matches"
! msgstr ""
  
  #: info/variables.c:158
  msgid "How to print the information line at the start of a node"
! msgstr ""
  
  #: info/variables.c:165
--- 1709,1742 ----
  "indicating that a key has been pressed"
  msgstr ""
+ "Vijeme Ä�ekanja u milisekundama na sljedeÄ‡i bajt u sekvenciji da se indicira "
+ "da je tipka pritisnuta"
  
  #: info/variables.c:134
  msgid "Method to use to track mouse events"
! msgstr "Metoda kojem se prate akcije miÅ¡a"
  
  #: info/variables.c:138
  msgid "How to follow a cross-reference"
! msgstr "Kako slijediti uputnicu (cross reference)"
  
  #: info/variables.c:142
  msgid "Highlight search matches"
! msgstr "Istakni bojama pronaÄ‘ene podudarnosti"
  
  #: info/variables.c:146
  msgid "Styles for links"
! msgstr "Stilovi (naÄ�ini) za veze"
  
  #: info/variables.c:150
  msgid "Styles for active links"
! msgstr "Stilovi (naÄ�ini) za aktivne veze"
  
  #: info/variables.c:154
  msgid "Styles for search matches"
! msgstr "Stilovi (naÄ�ini) za traÅ¾enje podudaranja"
  
  #: info/variables.c:158
  msgid "How to print the information line at the start of a node"
! msgstr "Kako ispisati obavijesni redak (information line) na poÄ�etku Ä�vora"
  
  #: info/variables.c:165
***************
*** 1778,1795 ****
  msgstr "Postavi %s na vrijednost (%s): "
  
! #: info/window.c:959
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), redaka ----,"
  
- #: info/window.c:966
- #, fuzzy, c-format
- msgid "-%s---Info: %s, %ld lines --%s--"
- msgstr "-%s---Info: %s, %d redaka --%s--"
- 
- #: info/window.c:970
- #, fuzzy, c-format
- msgid "-%s---Info: (%s)%s, %ld lines --%s--"
- msgstr "-%s%s-Info: (%s)%s, %d redaka --%s--"
- 
  #: install-info/install-info.c:292
  #, c-format
--- 1766,1773 ----
  msgstr "Postavi %s na vrijednost (%s): "
  
! #: info/window.c:909
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), redaka ----,"
  
  #: install-info/install-info.c:292
  #, c-format
***************
*** 1805,1809 ****
  #, c-format
  msgid "\tTry `%s --help' for a complete list of options.\n"
! msgstr "\tPokuÅ¡ajte â€ž%s --helpâ€� za potpuni popis opcija.\n"
  
  #: install-info/install-info.c:541
--- 1783,1787 ----
  #, c-format
  msgid "\tTry `%s --help' for a complete list of options.\n"
! msgstr "\tPokuÅ¡ajte â€ž%s --helpâ€™ za potpuni popis opcija.\n"
  
  #: install-info/install-info.c:541
***************
*** 1840,1844 ****
  
  #: install-info/install-info.c:555
- #, fuzzy
  msgid ""
  " --debug             report what is being done.\n"
--- 1818,1821 ----
***************
*** 1857,1865 ****
  " --debug             prikaÅ¾i Å¡to se dogaÄ‘a.\n"
  " --delete            ukloni postojeÄ‡e stavke za INFO-DATOTEKU iz\n"
! "                      DIR-DATOTEKE, ne ubacuj nove stavke.\n"
! " --description=TEKST opis stavke je TEKST, ako se koristi uz opciju\n"
! "                      --name, postaje sinonim opcije --entry.\n"
! " --dir-file=IME      navedi ime datoteke Info direktorija,\n"
! "                      isto kao koriÅ¡tenje argumenta DIR-DATOTEKA.\n"
  " --dry-run           isto kao --test."
  
--- 1834,1845 ----
  " --debug             prikaÅ¾i Å¡to se dogaÄ‘a.\n"
  " --delete            ukloni postojeÄ‡e stavke za INFO-DATOTEKU iz\n"
! "                       DIR-DATOTEKE; ne ubacuj nove stavke.\n"
! " --defsection=TEKST  like --section, ali rabi samo TEKST ako nijedne "
! "sekcije\n"
! "                       nema u INFO-DATOTECI (replacing \"Miscellaneous\").\n"
! " --description=TEKST opis stavke je TEKST; ako se koristi uz opciju\n"
! "                       --name postaje sinonim opcije --entry.\n"
! " --dir-file=IME      navedi ime datoteke Info direktorija;\n"
! "                       isto kao koriÅ¡tenje argumenta DIR-DATOTEKA.\n"
  " --dry-run           isto kao --test."
  
***************
*** 1876,1885 ****
  msgstr ""
  " --entry=TEKST       unesi TEKST kao stavku Info direktorija, uz\n"
! "                      zaobilaÅ¾enje postojeÄ‡ih stavki iz DIR-DATOTEKE.\n"
! "                      TEKST se zapisuje kao redak stavke Info izbornika\n"
  "                       nakon Ä�ega slijedi nijedan ili viÅ¡e redaka koji\n"
  "                       poÄ�inju prazninom.\n"
! "                      Ako navedete viÅ¡e od jedne stavke, sve su dodane.\n"
! "                      Ako ne navedete stavke, one se odreÄ‘uju iz podataka\n"
  "                       u samoj Info datoteci."
  
--- 1856,1865 ----
  msgstr ""
  " --entry=TEKST       unesi TEKST kao stavku Info direktorija, uz\n"
! "                       zaobilaÅ¾enje postojeÄ‡ih stavki iz DIR-DATOTEKE.\n"
! "                       TEKST se zapisuje kao redak stavke Info izbornika\n"
  "                       nakon Ä�ega slijedi nijedan ili viÅ¡e redaka koji\n"
  "                       poÄ�inju prazninom.\n"
! "                     Ako navedete viÅ¡e od jedne stavke, sve su dodane.\n"
! "                     Ako ne navedete stavke, one se odreÄ‘uju iz podataka\n"
  "                       u samoj Info datoteci."
  
***************
*** 1893,1900 ****
  " --keep-old          do not replace entries, or remove empty sections."
  msgstr ""
! " --help              prikaÅ¾i ovu pomoÄ‡ i izaÄ‘i.\n"
  " --info-dir=DIR      isto kao --dir-file=DIR/dir.\n"
! " --info-file=DAT     navedi Info datoteku za instalaciju u direktorij,\n"
! "                      isto kao koriÅ¡tenje argumenta INFO-DATOTEKA.\n"
  " --item=TEKST        isto kao --entry=TEKST.\n"
  " --keep-old          ne zamjenjuj stavke, ili ukloni prazne odjeljke."
--- 1873,1880 ----
  " --keep-old          do not replace entries, or remove empty sections."
  msgstr ""
! " --help              prikaÅ¾i ovu pomoÄ‡ i iziÄ‘i.\n"
  " --info-dir=DIR      isto kao --dir-file=DIR/dir.\n"
! " --info-file=DAT     navedi Info datoteku za instalaciju u direktorij;\n"
! "                       isto kao koriÅ¡tenje argumenta INFO-DATOTEKA.\n"
  " --item=TEKST        isto kao --entry=TEKST.\n"
  " --keep-old          ne zamjenjuj stavke, ili ukloni prazne odjeljke."
***************
*** 1911,1921 ****
  " --maxwidth, --max-width=ST  prelomi opis kod stupca ST.\n"
  " --menuentry=TEKST   isto kao --name=TEKST.\n"
! " --name=TEKST        ime stavke je TEKST, ako se koristi uz opciju\n"
! "                      --description, postaje sinonim opcije --entry.\n"
  " --no-indent         ne oblikuj nove stavke u DIR datoteci.\n"
  " --quiet             izostavi upozorenja."
  
  #: install-info/install-info.c:593
- #, fuzzy
  msgid ""
  " --regex=R           put this file's entries in all sections that match the\n"
--- 1891,1900 ----
  " --maxwidth, --max-width=ST  prelomi opis kod stupca ST.\n"
  " --menuentry=TEKST   isto kao --name=TEKST.\n"
! " --name=TEKST        ime stavke je TEKST; ako se koristi uz opciju\n"
! "                       --description postaje sinonim opcije --entry.\n"
  " --no-indent         ne oblikuj nove stavke u DIR datoteci.\n"
  " --quiet             izostavi upozorenja."
  
  #: install-info/install-info.c:593
  msgid ""
  " --regex=R           put this file's entries in all sections that match the\n"
***************
*** 1935,1950 ****
  " --section R SEC     equivalent to --regex=R --section=SEC --add-once."
  msgstr ""
! " --regex=R           spremi stavke ove datoteke u sve odjeljke koji "
  "odgovaraju\n"
! "                      regularnom izrazu R (uz zanemarivanje veliÄ�ine "
  "slova).\n"
  " --remove            isto kao --delete.\n"
! " --remove-exactly    ukloni samo ako je ime info datoteke potpuno jednako,\n"
! "                      sufiksi kao .info i .gz se ne zanemaruju.\n"
  " --section=SEC       spremi stavke u odjeljak SEC direktorija.\n"
! "                      Ako navedete viÅ¡e od jednog odjeljka, sve stavke se\n"
! "                       dodaju u sve odjeljke.\n"
! "                      Ako ne navedete nijedan odjeljak, oni se odreÄ‘uju iz\n"
! "                       podataka u samoj Info datoteci.\n"
  " --section R SEC     ekvivalentno --regex=R --section=SEC --add-once."
  
--- 1914,1932 ----
  " --section R SEC     equivalent to --regex=R --section=SEC --add-once."
  msgstr ""
! " --regex=R           spremi stavke ove datoteke u sve odjeljke koji  "
  "odgovaraju\n"
! "                       regularnom izrazu R (uz zanemarivanje veliÄ�ine "
  "slova).\n"
  " --remove            isto kao --delete.\n"
! " --remove-exactly    ukloni samo ako je ime info datoteke potpuno jednako;\n"
! "                       sufiksi kao .info i .gz se ne zanemaruju.\n"
  " --section=SEC       spremi stavke u odjeljak SEC direktorija.\n"
! "                       Ako navedete viÅ¡e od jednog odjeljka, sve stavke se\n"
! "                         dodaju u sve odjeljke;\n"
! "                       Ako ne navedete nijedan odjeljak, oni se odreÄ‘uju iz\n"
! "                         podataka u samoj Info datoteci;\n"
! "                                                  ako tamo nema niÅ¡ta, rabi "
! "se --defsection vrijednost;\n"
! "                         ako i toga nema, konaÄ�ni rezultat â€žMiscellaneousâ€œ.\n"
  " --section R SEC     ekvivalentno --regex=R --section=SEC --add-once."
  
***************
*** 1957,1964 ****
  " --silent            izostavi upozorenja.\n"
  " --test              ne aÅ¾uriraj DIR-DATOTEKU.\n"
! " --version           prikaÅ¾i informacije o inaÄ�ici i izaÄ‘i."
  
  #: install-info/install-info.c:642
! #, fuzzy, c-format
  msgid ""
  "This is the file .../info/dir, which contains the\n"
--- 1939,1946 ----
  " --silent            izostavi upozorenja.\n"
  " --test              ne aÅ¾uriraj DIR-DATOTEKU.\n"
! " --version           prikaÅ¾i informacije o inaÄ�ici i iziÄ‘i."
  
  #: install-info/install-info.c:642
! #, c-format
  msgid ""
  "This is the file .../info/dir, which contains the\n"
***************
*** 1969,1973 ****
  "\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"
--- 1951,1955 ----
  "\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"
***************
*** 1981,1994 ****
  "Info hijerarhije, nazvan (dir)Top.\n"
  "Prvi put kad pozovete Info poÄ�injete na ovom Ä�voru.\n"
! "\n"
  "%s\tOvo je vrh INFO stabla\n"
  "\n"
! "  Ovo (Ä�vor Direktorij) prikazuje izbornik glavnih tema.\n"
! "  Pritisnite â€žqâ€� za izlaz, â€ž?â€� za ispis svih Info naredbi, â€ždâ€�\n"
! "  za povratak ovdje, â€žhâ€� za prikaz uputa novim korisnicima,\n"
! "  â€žmEmacs<Return>â€� za pregled Emacs priruÄ�nika itd.\n"
  "\n"
  "  U Emacsu moÅ¾ete kliknuti desnom tipkom miÅ¡a na stavku izbornika ili\n"
! "  unakrsnu referencu za njezin izbor.\n"
  "\n"
  "%s\n"
--- 1963,1976 ----
  "Info hijerarhije, nazvan (dir)Top.\n"
  "Prvi put kad pozovete Info poÄ�injete na ovom Ä�voru.\n"
! "%c\n"
  "%s\tOvo je vrh INFO stabla\n"
  "\n"
! "  Ovo (Ä�vor Direktorija) prikazuje izbornik glavnih tema.\n"
! "  Pritisnite â€žqâ€œ za izlaz, â€žHâ€œ za ispis svih Info naredbi, â€ždâ€œ\n"
! "  za povratak ovdje, â€žhâ€œ za prikaz uputa novim korisnicima,\n"
! "  â€žmEmacs<Return>â€œ za pregled Emacs priruÄ�nika itd.\n"
  "\n"
  "  U Emacsu moÅ¾ete kliknuti desnom tipkom miÅ¡a na stavku izbornika ili\n"
! "  na uputnicu (cross reference) za njezin izbor.\n"
  "\n"
  "%s\n"
***************
*** 2022,2271 ****
  #, c-format
  msgid "Extra regular expression specified, ignoring `%s'"
! msgstr "Naveden viÅ¡ak regularnih izraza, zanemarujem â€ž%sâ€�"
  
  #: install-info/install-info.c:2215
  #, c-format
  msgid "Error in regular expression `%s': %s"
! msgstr "GreÅ¡ka u regularnom izrazu â€ž%sâ€�: %s"
  
  #: install-info/install-info.c:2277
  #, c-format
  msgid "excess command line argument `%s'"
! msgstr "viÅ¡ak argumenata naredbenog retka â€ž%sâ€�"
  
  #: install-info/install-info.c:2281
  #, c-format
  msgid "No input file specified; try --help for more information."
! msgstr "Nije navedena ulazna datoteka, pokuÅ¡ajte --help za viÅ¡e informacija."
  
  #: install-info/install-info.c:2283
  #, c-format
  msgid "No dir file specified; try --help for more information."
! msgstr "Nije navedena dir datoteka, pokuÅ¡ajte --help za viÅ¡e informacija."
  
  #: install-info/install-info.c:2304
! #, fuzzy, c-format
  msgid "Could not read %s."
! msgstr "ne mogu Ä�itati %s: %s"
  
  #: install-info/install-info.c:2451
  #, c-format
  msgid "no info dir entry in `%s'"
! msgstr "nema info dir stavke u â€ž%sâ€�"
  
  #: install-info/install-info.c:2699
  #, c-format
  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:855
! #: tp/Texinfo/Convert/Converter.pm:893 tp/Texinfo/Convert/Converter.pm:1204
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6504
! #: tp/Texinfo/Convert/HTML.pm:6528 tp/Texinfo/Convert/HTML.pm:6905
! #: tp/Texinfo/Convert/HTML.pm:6963 tp/Texinfo/Convert/HTML.pm:7041
! #: tp/Texinfo/Convert/HTML.pm:7118 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:546
! #: tp/Texinfo/Convert/TexinfoXML.pm:457
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "ne mogu otvoriti %s za pisanje: %s"
  
! #: tp/Texinfo/Common.pm:881
  msgid "recursion is always allowed"
! msgstr "rekurzija je uvijek dozvoljena"
  
! #: tp/Texinfo/Common.pm:882
  msgid "arguments are quoted by default"
  msgstr "argumenti se uobiÄ�ajeno citiraju"
  
! #: tp/Texinfo/Common.pm:1105
  #, perl-format
  msgid "%s is not a valid language code"
! msgstr "%s nije ispravan jeziÄ�ni kod"
  
! #: tp/Texinfo/Common.pm:1110
  #, perl-format
  msgid "%s is not a valid region code"
! msgstr "%s nije ispravan kod regije"
  
! #: tp/Texinfo/Common.pm:1128
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%s nije ispravna moguÄ‡nost razdvajanja"
  
! #: tp/Texinfo/Common.pm:1151
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "ne mogu Ä�itati %s: %s"
  
! #: tp/Texinfo/Common.pm:1170
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "greÅ¡ka pri zatvaranju @verbatiminclude datoteke %s: %s"
  
! #: tp/Texinfo/Common.pm:1176 tp/Texinfo/Parser.pm:3353
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%s: ne mogu pronaÄ‡i %s"
  
! #: tp/Texinfo/Common.pm:1520
! #, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr "ne mogu otvoriti datoteku postavki html referenci %s: %s"
! 
! #: tp/Texinfo/Common.pm:1548
! msgid "missing type"
! msgstr "nedostaje vrsta"
! 
! #: tp/Texinfo/Common.pm:1551
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "neprepoznata vrsta: %s"
! 
! #: tp/Texinfo/Common.pm:1568
! #, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr "greÅ¡ka pri zatvaranju datoteke postavki html referenci %s: %s"
! 
! #: tp/Texinfo/Common.pm:1603
  msgid "no node to be renamed"
  msgstr "nema Ä�vorova koje treba preimenovati"
  
! #: tp/Texinfo/Common.pm:1614
  msgid "nodes without a new name at the end of file"
  msgstr "Ä�vorovi bez novog imena na kraju datoteke"
  
! #: tp/Texinfo/Common.pm:1624 tp/Texinfo/Parser.pm:926
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "ne mogu otvoriti %s: %s"
  
! #: tp/Texinfo/Common.pm:2144
  #, perl-format
  msgid "could not protect hash character in @%s"
! msgstr "ne mogu zaÅ¡tititi znak rasprÅ¡enja u @%s"
  
! #: tp/Texinfo/Convert/Converter.pm:395 tp/Texinfo/Convert/Converter.pm:414
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Zastarjela varijabla %s\n"
  
! #: tp/Texinfo/Convert/Converter.pm:794
  #, perl-format
  msgid "%s: output incompatible with split"
! msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:876 tp/Texinfo/Convert/Converter.pm:909
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:6931
! #: tp/Texinfo/Convert/HTML.pm:6989 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:476 tp/Texinfo/Parser.pm:2035
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "greÅ¡ka pri zatvaranju %s: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, perl-format
  msgid "could not create directories `%s' or `%s': %s"
! msgstr "ne mogu napraviti direktorije â€ž%sâ€� ili â€ž%sâ€�: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:995
  #, perl-format
  msgid "could not create directory `%s': %s"
! msgstr "ne mogu napraviti direktorij â€ž%sâ€�: %s"
  
  #: tp/Texinfo/Convert/DocBook.pm:970
  #, perl-format
  msgid "@image file `%s' not found, using `%s'"
! msgstr "@image datoteka â€ž%sâ€� nije pronaÄ‘ena, koristim â€ž%sâ€�"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5388
! #, fuzzy
  msgid "no argument specified for @U"
! msgstr "Nije navedeno ime Ä�vora za naredbu â€ž%c%sâ€�"
  
! #: tp/Texinfo/Convert/HTML.pm:1683
  #, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
! msgstr "@image datoteka â€ž%sâ€� (za HTML) nije pronaÄ‘ena, koristim â€ž%sâ€�"
  
! #: tp/Texinfo/Convert/HTML.pm:2371
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "neobraÄ‘eni oblik %s nije pretvoren"
  
! #: tp/Texinfo/Convert/HTML.pm:4888
  msgid "string not closed in css file"
  msgstr "niz nije zatvoren u css datoteci"
  
! #: tp/Texinfo/Convert/HTML.pm:4890
  msgid "--css-include ended in comment"
  msgstr "--css-include zavrÅ¡ava u komentaru"
  
! #: tp/Texinfo/Convert/HTML.pm:4892
  msgid "@import not finished in css file"
  msgstr "@import nije zavrÅ¡en u css datoteci"
  
! #: tp/Texinfo/Convert/HTML.pm:4918
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "CSS datoteka %s nije pronaÄ‘ena"
  
! #: tp/Texinfo/Convert/HTML.pm:4924
  #, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "ne mogu otvoriti --include-file %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:4934
  #, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "greÅ¡ka pri zatvaranju CSS datoteke %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5801 tp/Texinfo/Convert/HTML.pm:5805
  #, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
! msgstr "nije pronaÄ‘ena stavka htmlxref.cnf za â€ž%sâ€�"
  
! #: tp/Texinfo/Convert/HTML.pm:6499
  #, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "greÅ¡ka pri zatvaranju datoteke okvira %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6523
  #, 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:6638
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr "rukovatelj %s faze %s prioriteta %s nije uspio"
  
! #: tp/Texinfo/Convert/HTML.pm:6839
  msgid "must specify a title with a title command or @top"
  msgstr "morate navesti naslov naredbom naslova ili @top"
  
! #: tp/Texinfo/Convert/HTML.pm:7048
  #, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr "greÅ¡ka pri zatvaranju datoteke preusmjeravanja Ä�vora %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7073
  #, 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:7079
  #, perl-format
  msgid "file empty for renamed node `%s'"
! msgstr "prazna datoteka za preimenovani Ä�vor â€ž%sâ€�"
  
! #: tp/Texinfo/Convert/HTML.pm:7093
  #, 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:7125
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
--- 2004,2267 ----
  #, c-format
  msgid "Extra regular expression specified, ignoring `%s'"
! msgstr "Naveden viÅ¡ak regularnih izraza, zanemarujem â€ž%sâ€œ"
  
  #: install-info/install-info.c:2215
  #, c-format
  msgid "Error in regular expression `%s': %s"
! msgstr "GreÅ¡ka u regularnom izrazu â€ž%sâ€œ: %s"
  
  #: install-info/install-info.c:2277
  #, c-format
  msgid "excess command line argument `%s'"
! msgstr "viÅ¡ak argumenata naredbenog retka â€ž%sâ€œ"
  
  #: install-info/install-info.c:2281
  #, c-format
  msgid "No input file specified; try --help for more information."
! msgstr "Nije navedena ulazna datoteka; pokuÅ¡ajte --help za viÅ¡e informacija."
  
  #: install-info/install-info.c:2283
  #, c-format
  msgid "No dir file specified; try --help for more information."
! msgstr "Nije navedena dir datoteka; pokuÅ¡ajte --help za viÅ¡e informacija."
  
  #: install-info/install-info.c:2304
! #, c-format
  msgid "Could not read %s."
! msgstr "Ne mogu Ä�itati %s."
  
  #: install-info/install-info.c:2451
  #, c-format
  msgid "no info dir entry in `%s'"
! msgstr "nema info dir stavke u â€ž%sâ€œ"
  
  #: install-info/install-info.c:2699
  #, c-format
  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:847
! #: tp/Texinfo/Convert/Converter.pm:885 tp/Texinfo/Convert/Converter.pm:1196
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6573
! #: tp/Texinfo/Convert/HTML.pm:6597 tp/Texinfo/Convert/HTML.pm:6978
! #: tp/Texinfo/Convert/HTML.pm:7037 tp/Texinfo/Convert/HTML.pm:7115
! #: tp/Texinfo/Convert/HTML.pm:7192 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:547
! #: tp/Texinfo/Convert/TexinfoXML.pm:458
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "ne mogu otvoriti %s za pisanje: %s"
  
! #: tp/Texinfo/Common.pm:862
  msgid "recursion is always allowed"
! msgstr "rekurzija je uvijek dopuÅ¡tena"
  
! #: tp/Texinfo/Common.pm:863
  msgid "arguments are quoted by default"
  msgstr "argumenti se uobiÄ�ajeno citiraju"
  
! #: tp/Texinfo/Common.pm:866
! msgid ""
! "move your @contents command if you want the contents after the title page"
! msgstr ""
! "pomaknite svoju @contents naredbu Å¾elite li prikaz sadrÅ¾aja nakom naslovne "
! "stranice"
! 
! #: tp/Texinfo/Common.pm:869
! msgid ""
! "move your @shortcontents and @contents commands if you want the contents "
! "after the title page"
! msgstr ""
! "pomoknite svoju @shortcontents i @contents naredbe Å¾elite li prikaz sadrÅ¾aja "
! "nakom naslovne stranice"
! 
! #: tp/Texinfo/Common.pm:1093
  #, perl-format
  msgid "%s is not a valid language code"
! msgstr "%s nije ispravan jeziÄ�ni kÈ�d"
  
! #: tp/Texinfo/Common.pm:1098
  #, perl-format
  msgid "%s is not a valid region code"
! msgstr "%s nije ispravan kÈ�d regije"
  
! #: tp/Texinfo/Common.pm:1116
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%s nije ispravna moguÄ‡nost razdvajanja"
  
! #: tp/Texinfo/Common.pm:1139
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "ne mogu Ä�itati %s: %s"
  
! #: tp/Texinfo/Common.pm:1158
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "greÅ¡ka pri zatvaranju @verbatiminclude datoteke %s: %s"
  
! #: tp/Texinfo/Common.pm:1164 tp/Texinfo/Parser.pm:3193
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%s: ne mogu pronaÄ‡i %s"
  
! #: tp/Texinfo/Common.pm:1637
  msgid "no node to be renamed"
  msgstr "nema Ä�vorova koje treba preimenovati"
  
! #: tp/Texinfo/Common.pm:1648
  msgid "nodes without a new name at the end of file"
  msgstr "Ä�vorovi bez novog imena na kraju datoteke"
  
! #: tp/Texinfo/Common.pm:1658 tp/Texinfo/Parser.pm:899
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "ne mogu otvoriti %s: %s"
  
! #: tp/Texinfo/Common.pm:2178
  #, perl-format
  msgid "could not protect hash character in @%s"
! msgstr "ne mogu zaÅ¡tititi znak rasprÅ¡enja (hash character) u @%s"
  
! #: tp/Texinfo/Convert/Converter.pm:387 tp/Texinfo/Convert/Converter.pm:406
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Zastarjela varijabla %s\n"
  
! #: tp/Texinfo/Convert/Converter.pm:786
  #, perl-format
  msgid "%s: output incompatible with split"
! msgstr "%s: izlaz nije u skladu s podjelom (with split)"
  
! #: tp/Texinfo/Convert/Converter.pm:868 tp/Texinfo/Convert/Converter.pm:901
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:7004
! #: tp/Texinfo/Convert/HTML.pm:7063 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:477 tp/Texinfo/Parser.pm:1996
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "greÅ¡ka pri zatvaranju %s: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:979
  #, perl-format
  msgid "could not create directories `%s' or `%s': %s"
! msgstr "ne mogu napraviti direktorije â€ž%sâ€œ ili â€ž%sâ€œ: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, perl-format
  msgid "could not create directory `%s': %s"
! msgstr "ne mogu napraviti direktorij â€ž%sâ€œ: %s"
  
  #: tp/Texinfo/Convert/DocBook.pm:970
  #, perl-format
  msgid "@image file `%s' not found, using `%s'"
! msgstr "@image datoteka â€ž%sâ€œ nije pronaÄ‘ena, koristim â€ž%sâ€œ"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5225
  msgid "no argument specified for @U"
! msgstr "nijedan argument nije specificran za @U"
  
! #: tp/Texinfo/Convert/HTML.pm:1715
  #, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
! msgstr "@image datoteka â€ž%sâ€œ (za HTML) nije pronaÄ‘ena, koristim â€ž%sâ€œ"
  
! #: tp/Texinfo/Convert/HTML.pm:2399
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "neobraÄ‘eni oblik %s nije pretvoren"
  
! #: tp/Texinfo/Convert/HTML.pm:4629
! #, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr "ne mogu otvoriti datoteku postavki html referenci %s: %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4657
! msgid "missing type"
! msgstr "nedostaje vrsta"
! 
! #: tp/Texinfo/Convert/HTML.pm:4660
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "neprepoznata vrsta: %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4677
! #, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr "greÅ¡ka pri zatvaranju datoteke postavki html referenci %s: %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4962
  msgid "string not closed in css file"
  msgstr "niz nije zatvoren u css datoteci"
  
! #: tp/Texinfo/Convert/HTML.pm:4964
  msgid "--css-include ended in comment"
  msgstr "--css-include zavrÅ¡ava u komentaru"
  
! #: tp/Texinfo/Convert/HTML.pm:4966
  msgid "@import not finished in css file"
  msgstr "@import nije zavrÅ¡en u css datoteci"
  
! #: tp/Texinfo/Convert/HTML.pm:4992
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "CSS datoteka %s nije pronaÄ‘ena"
  
! #: tp/Texinfo/Convert/HTML.pm:4998
  #, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "ne mogu otvoriti --include-file %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5008
  #, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "greÅ¡ka pri zatvaranju CSS datoteke %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5870 tp/Texinfo/Convert/HTML.pm:5874
  #, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
! msgstr "nije pronaÄ‘ena stavka htmlxref.cnf za â€ž%sâ€œ"
  
! #: tp/Texinfo/Convert/HTML.pm:6568
  #, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "greÅ¡ka pri zatvaranju datoteke okvira %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6592
  #, 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:6707
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr "rukovatelj %s faze %s prioriteta %s nije uspio"
  
! #: tp/Texinfo/Convert/HTML.pm:6912
  msgid "must specify a title with a title command or @top"
  msgstr "morate navesti naslov naredbom naslova ili @top"
  
! #: tp/Texinfo/Convert/HTML.pm:7122
  #, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr "greÅ¡ka pri zatvaranju datoteke preusmjeravanja Ä�vora %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7147
  #, 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:7153
  #, perl-format
  msgid "file empty for renamed node `%s'"
! msgstr "prazna datoteka za preimenovani Ä�vor â€ž%sâ€œ"
  
! #: tp/Texinfo/Convert/HTML.pm:7167
  #, 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:7199
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
***************
*** 2273,2284 ****
  "greÅ¡ka pri zatvaranju datoteke preusmjeravanja preimenovanog Ä�vora %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7163
  msgid "empty node name"
  msgstr "prazno ime Ä�vora"
  
! #: tp/Texinfo/Convert/HTML.pm:7165 tp/Texinfo/Parser.pm:3697
  #, perl-format
  msgid "syntax for an external node used for `%s'"
! msgstr "sintaksa za vanjski Ä�vor koriÅ¡tena za â€ž%sâ€�"
  
  #: tp/Texinfo/Convert/Info.pm:106
--- 2269,2280 ----
  "greÅ¡ka pri zatvaranju datoteke preusmjeravanja preimenovanog Ä�vora %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7237
  msgid "empty node name"
  msgstr "prazno ime Ä�vora"
  
! #: tp/Texinfo/Convert/HTML.pm:7239 tp/Texinfo/Parser.pm:3542
  #, perl-format
  msgid "syntax for an external node used for `%s'"
! msgstr "sintaksa za vanjski Ä�vor koriÅ¡tena za â€ž%sâ€œ"
  
  #: tp/Texinfo/Convert/Info.pm:106
***************
*** 2288,2292 ****
  #: tp/Texinfo/Convert/Info.pm:123
  msgid "document without Top node"
! msgstr "dokument nema vrÅ¡ni (â€žTopâ€�) Ä�vor"
  
  #: tp/Texinfo/Convert/Info.pm:171
--- 2284,2288 ----
  #: tp/Texinfo/Convert/Info.pm:123
  msgid "document without Top node"
! msgstr "dokument nema vrÅ¡ni (Top) Ä�vor"
  
  #: tp/Texinfo/Convert/Info.pm:171
***************
*** 2298,2302 ****
  #, perl-format
  msgid "@%s output more than once: %s"
! msgstr "@%s stvara izlaz viÅ¡e puta: %s"
  
  #: tp/Texinfo/Convert/Info.pm:379
--- 2294,2298 ----
  #, perl-format
  msgid "@%s output more than once: %s"
! msgstr "@%s stvara izlaz viÅ¡e od jedamputa: %s"
  
  #: tp/Texinfo/Convert/Info.pm:379
***************
*** 2306,2520 ****
  
  #: tp/Texinfo/Convert/Info.pm:422
! #, fuzzy, perl-format
  msgid "@node name should not contain `,': %s"
! msgstr "@itemx ne bi trebao zapoÄ�eti @%s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1334
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
! msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1381 tp/Texinfo/Parser.pm:2722
  #, 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:1495
  #, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr "greÅ¡ka pri zatvaranju tekstualne datoteke slike %s: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1500
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
! msgstr "@image datoteka â€ž%sâ€� nije Ä�itljiva: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1523
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
! msgstr "ne mogu pronaÄ‡i @image datoteku â€ž%s.txtâ€� niti mijenjati tekst"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1931
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
  "avoid that"
  msgstr ""
! "@strong{BiljeÅ¡ka...} proizvodi laÅ¾nu Info unakrsnu referencu, promijenite "
! "rijeÄ�i za izbjegavanje"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2161
! #, fuzzy, perl-format
  msgid "@%s cross-reference name should not contain `:'"
! msgstr "u @%s prazno ime unakrsne reference nakon proÅ¡irenja â€ž%sâ€�"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2193
! #, fuzzy, perl-format
  msgid "@%s node name should not contain `%s'"
! msgstr "@%s se ne bi trebao pojaviti u @%s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2226
  #, perl-format
  msgid "@%s node name should not contain `:'"
! msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2272
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
! msgstr "nakon @xref mora slijediti â€ž.â€� ili â€ž,â€�, ne %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2275
  msgid "`.' or `,' must follow @xref"
! msgstr "nakon @xref mora slijediti â€ž.â€� ili â€ž,â€�"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3118
! #, fuzzy, perl-format
  msgid "menu entry node name should not contain `%s'"
! msgstr "prazno ime stavke izbornika u â€ž%sâ€�"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3129
  msgid "menu entry node name should not contain `:'"
! msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3145
! #, fuzzy
  msgid "menu entry name should not contain `:'"
! msgstr "prazno ime stavke izbornika u â€ž%sâ€�"
  
! #: tp/Texinfo/Parser.pm:910
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
! msgstr "@%s bi se trebao pojaviti samo an poÄ�etku ili kraju dokumenta"
  
! #: tp/Texinfo/Parser.pm:1160 tp/Texinfo/Structuring.pm:594
  #, perl-format
  msgid "multiple @%s"
  msgstr "viÅ¡estruki @%s"
  
! #: tp/Texinfo/Parser.pm:1194
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "neispravna sintaksa za @%s argument: %s"
! 
! #: tp/Texinfo/Parser.pm:1210
  #, perl-format
  msgid "bad or empty @%s formal argument: %s"
  msgstr "neispravan ili prazan @%s formalni argument: %s"
  
! #: tp/Texinfo/Parser.pm:1219 tp/Texinfo/Parser.pm:4856
! #: tp/Texinfo/Parser.pm:4882 tp/Texinfo/Parser.pm:5671
! #: tp/Texinfo/Parser.pm:5687 tp/Texinfo/Parser.pm:5702
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s zahtijeva ime"
  
! #: tp/Texinfo/Parser.pm:1223 tp/Texinfo/Parser.pm:4859
! #: tp/Texinfo/Parser.pm:4885 tp/Texinfo/Parser.pm:5674
! #: tp/Texinfo/Parser.pm:5690 tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad name for @%s"
  msgstr "nema imena za @%s"
  
! #: tp/Texinfo/Parser.pm:1341
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr "@end %s pronaÄ‘en prije @%s zatvorene zagrade"
  
! #: tp/Texinfo/Parser.pm:1345
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "@%s pronaÄ‘en prije @%s zatvorene zagrade"
  
! #: tp/Texinfo/Parser.pm:1350
  #, perl-format
! msgid "%c%s missing close brace"
! msgstr "%c%s nema zatvorenu zagradu"
  
! #: tp/Texinfo/Parser.pm:1354
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "@%s nema zavrÅ¡ni niz znakova za razdvajanje: %s}"
  
! #: tp/Texinfo/Parser.pm:1476
  #, perl-format
  msgid "@itemx should not begin @%s"
! msgstr "@itemx ne bi trebao zapoÄ�eti @%s"
  
! #: tp/Texinfo/Parser.pm:1544
  msgid "@itemx must follow @item"
  msgstr "@itemx mora slijediti @item"
  
! #: tp/Texinfo/Parser.pm:1712
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr "@%s ima tekst, ali nema @item"
  
! #: tp/Texinfo/Parser.pm:1743
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
! msgstr "â€ž@endâ€� oÄ�ekuje â€ž%sâ€�, pronaÅ¡ao â€ž%sâ€�"
  
! #: tp/Texinfo/Parser.pm:1746
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@%s pronaÄ‘en prije @end %s"
  
! #: tp/Texinfo/Parser.pm:1750
  #, perl-format
  msgid "no matching `%cend %s'"
! msgstr "nema odgovarajuÄ‡eg â€ž%cend %sâ€�"
  
! #: tp/Texinfo/Parser.pm:1776 tp/Texinfo/Parser.pm:5204
! #: tp/Texinfo/Parser.pm:5470
  #, perl-format
  msgid "misplaced %c"
  msgstr "%c na krivom mjestu"
  
! #: tp/Texinfo/Parser.pm:1874 tp/Texinfo/Parser.pm:3312
  #, perl-format
  msgid "unmatched `%c%s'"
! msgstr "neuparen â€ž%c%sâ€�"
  
! #: tp/Texinfo/Parser.pm:2110
  #, perl-format
  msgid "macro `%s' called with too many args"
! msgstr "makro naredba â€ž%sâ€� pozvana s previÅ¡e argumenata"
  
! #: tp/Texinfo/Parser.pm:2132
  #, perl-format
! msgid "@%s missing close brace"
! msgstr "@%s nema zatvorenu zagradu"
  
! #: tp/Texinfo/Parser.pm:2140
  #, perl-format
  msgid "macro `%s' declared without argument called with an argument"
! msgstr "makro naredba â€ž%sâ€� deklarirana bez argumenata pozvana s argumentom"
  
! #: tp/Texinfo/Parser.pm:2175
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
! msgstr "nakon \\ u proÅ¡irenju @%s slijedi â€ž%sâ€� umjesto imena parametra ili \\"
  
! #: tp/Texinfo/Parser.pm:2650
  #, perl-format
  msgid "@%s `%s' previously defined"
! msgstr "@%s â€ž%sâ€� prethodno definirana"
  
! #: tp/Texinfo/Parser.pm:2655
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "ovdje je prethodna definicija kao @%s"
  
! #: tp/Texinfo/Parser.pm:3016
  #, perl-format
  msgid "missing name for @%s"
  msgstr "nema imena za @%s"
  
! #: tp/Texinfo/Parser.pm:3021
  #, perl-format
  msgid "missing category for @%s"
  msgstr "nema kategorije za @%s"
  
! #: tp/Texinfo/Parser.pm:3073
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
--- 2302,2515 ----
  
  #: tp/Texinfo/Convert/Info.pm:422
! #, perl-format
  msgid "@node name should not contain `,': %s"
! msgstr "@node ime ne smije sadrÅ¾avati  â€ž,â€œ: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1335
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
! msgstr "Stavka u indeksu @%s s(a) : pravi neispravni Info: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1382 tp/Texinfo/Parser.pm:2568
  #, 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:1496
  #, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr "greÅ¡ka pri zatvaranju tekstualne datoteke slike %s: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1501
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
! msgstr "@image datoteka â€ž%sâ€œ nije Ä�itljiva: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1524
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
! msgstr "ne mogu pronaÄ‡i @image datoteku â€ž%s.txtâ€œ niti alternativni tekst"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1932
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
  "avoid that"
  msgstr ""
! "@strong{BiljeÅ¡ka...} proizvodi laÅ¾nu Info uputnicu (cross reference); "
! "promijenite rijeÄ�i da to izbjegnete"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2162
! #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
! msgstr "u @%s ime uputnica (cross-reference) ne smije sadrÅ¾avati â€ž:â€œ"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2194
! #, perl-format
  msgid "@%s node name should not contain `%s'"
! msgstr "@%s Ä�vor ne smije sadrÅ¾avati  â€ž%sâ€œ"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2227
  #, perl-format
  msgid "@%s node name should not contain `:'"
! msgstr "@%s Ä�vor ne smije sadrÅ¾avati  â€ž:â€œ"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2273
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
! msgstr "nakon @xref mora slijediti â€ž.â€œ ili â€ž,â€œ, ne %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2276
  msgid "`.' or `,' must follow @xref"
! msgstr "nakon @xref mora slijediti â€ž.â€œ ili â€ž,â€œ"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3086
! #, perl-format
  msgid "menu entry node name should not contain `%s'"
! msgstr "ime Ä�vora u izborniku stavki ne smije sadrÅ¾avati â€ž%sâ€œ"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3097
  msgid "menu entry node name should not contain `:'"
! msgstr "ime stavke izbornika Ä�vora ne smije sadrÅ¾avati â€ž:â€œ"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3113
  msgid "menu entry name should not contain `:'"
! msgstr "ime stavke u izborniku ne smije sadrÅ¾avati â€ž:â€œ"
  
! #: tp/Texinfo/Parser.pm:883
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
! msgstr "@%s bi se trebao pojaviti samo na poÄ�etku ili kraju dokumenta"
  
! #: tp/Texinfo/Parser.pm:1125 tp/Texinfo/Structuring.pm:595
  #, perl-format
  msgid "multiple @%s"
  msgstr "viÅ¡estruki @%s"
  
! #: tp/Texinfo/Parser.pm:1166
  #, perl-format
  msgid "bad or empty @%s formal argument: %s"
  msgstr "neispravan ili prazan @%s formalni argument: %s"
  
! #: tp/Texinfo/Parser.pm:1176
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "neispravna sintaksa za @%s argument: %s"
! 
! #: tp/Texinfo/Parser.pm:1183 tp/Texinfo/Parser.pm:4707
! #: tp/Texinfo/Parser.pm:4733 tp/Texinfo/Parser.pm:5565
! #: tp/Texinfo/Parser.pm:5578 tp/Texinfo/Parser.pm:5592
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s zahtijeva ime"
  
! #: tp/Texinfo/Parser.pm:1187 tp/Texinfo/Parser.pm:4710
! #: tp/Texinfo/Parser.pm:4736 tp/Texinfo/Parser.pm:5568
! #: tp/Texinfo/Parser.pm:5581 tp/Texinfo/Parser.pm:5595
  #, perl-format
  msgid "bad name for @%s"
  msgstr "nema imena za @%s"
  
! #: tp/Texinfo/Parser.pm:1305
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr "@end %s pronaÄ‘en prije @%s zatvorene zagrade"
  
! #: tp/Texinfo/Parser.pm:1309
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "@%s pronaÄ‘en prije @%s zatvorene zagrade"
  
! #: tp/Texinfo/Parser.pm:1314
  #, perl-format
! msgid "%c%s missing closing brace"
! msgstr "%c%s nedostaje zatvorena zagrada"
  
! #: tp/Texinfo/Parser.pm:1318
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "@%s nema zavrÅ¡ni niz znakova za razdvajanje: %s}"
  
! #: tp/Texinfo/Parser.pm:1440
  #, perl-format
  msgid "@itemx should not begin @%s"
! msgstr "@itemx ne smije zapoÄ�eti @%s"
  
! #: tp/Texinfo/Parser.pm:1508
  msgid "@itemx must follow @item"
  msgstr "@itemx mora slijediti @item"
  
! #: tp/Texinfo/Parser.pm:1676
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr "@%s ima tekst, ali nema @item"
  
! #: tp/Texinfo/Parser.pm:1707
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
! msgstr "â€ž@endâ€œ oÄ�ekuje â€ž%sâ€œ, pronaÅ¡ao â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:1710
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@%s pronaÄ‘en prije @end %s"
  
! #: tp/Texinfo/Parser.pm:1714
  #, perl-format
  msgid "no matching `%cend %s'"
! msgstr "nema odgovarajuÄ‡eg â€ž%cend %sâ€œ"
  
! #: tp/Texinfo/Parser.pm:1738 tp/Texinfo/Parser.pm:5070
! #: tp/Texinfo/Parser.pm:5308
  #, perl-format
  msgid "misplaced %c"
  msgstr "%c na krivom mjestu"
  
! #: tp/Texinfo/Parser.pm:1835 tp/Texinfo/Parser.pm:3148
  #, perl-format
  msgid "unmatched `%c%s'"
! msgstr "neuparen â€ž%c%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:2072
  #, perl-format
  msgid "macro `%s' called with too many args"
! msgstr "makro naredba â€ž%sâ€œ pozvana s previÅ¡e argumenata"
  
! #: tp/Texinfo/Parser.pm:2094
  #, perl-format
! msgid "@%s missing closing brace"
! msgstr "@%s nedostaje zatvorena zagrada"
  
! #: tp/Texinfo/Parser.pm:2102
  #, perl-format
  msgid "macro `%s' declared without argument called with an argument"
! msgstr "makro â€ž%sâ€œ je deklariran bez argumenata a pozvan je s argumentom"
  
! #: tp/Texinfo/Parser.pm:2138
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
! msgstr "nakon \\ u proÅ¡irenju @%s slijedi â€ž%sâ€œ umjesto imena parametra ili \\"
  
! #: tp/Texinfo/Parser.pm:2501
  #, perl-format
  msgid "@%s `%s' previously defined"
! msgstr "@%s â€ž%sâ€œ prethodno definiran"
  
! #: tp/Texinfo/Parser.pm:2506
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "ovdje je prethodna definicija kao @%s"
  
! #: tp/Texinfo/Parser.pm:2850
  #, perl-format
  msgid "missing name for @%s"
  msgstr "nema imena za @%s"
  
! #: tp/Texinfo/Parser.pm:2855
  #, perl-format
  msgid "missing category for @%s"
  msgstr "nema kategorije za @%s"
  
! #: tp/Texinfo/Parser.pm:2890
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
***************
*** 2522,2665 ****
  
  # ? (TK)
! #: tp/Texinfo/Parser.pm:3089
  msgid "empty multitable"
! msgstr "prazna multitablica"
  
! #: tp/Texinfo/Parser.pm:3145 tp/Texinfo/Parser.pm:5784
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "suviÅ¡an argument za @%s"
  
! #: tp/Texinfo/Parser.pm:3151 tp/Texinfo/Parser.pm:5806
! #: tp/Texinfo/Parser.pm:5818
  #, perl-format
  msgid "bad argument to @%s"
  msgstr "neispravan argument za @%s"
  
! #: tp/Texinfo/Parser.pm:3162
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s zahtijeva argument: oblikovatelj za %citem"
  
! #: tp/Texinfo/Parser.pm:3167
  #, 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 bi trebala biti u @%s "
! "retku"
  
! #: tp/Texinfo/Parser.pm:3202
  #, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
! msgstr "naredba naglaska â€ž@%sâ€� nije dozvoljena kao @%s argument"
  
! #: tp/Texinfo/Parser.pm:3290 tp/Texinfo/Parser.pm:3429
! #: tp/Texinfo/Parser.pm:5777
  #, perl-format
  msgid "@%s missing argument"
  msgstr "@%s nedostaje argument"
  
! #: tp/Texinfo/Parser.pm:3302
  #, perl-format
  msgid "unknown @end %s"
  msgstr "nepoznat @end %s"
  
! #: tp/Texinfo/Parser.pm:3324 tp/Texinfo/Parser.pm:3943
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "suviÅ¡an argument za @%s %s: %s"
  
! #: tp/Texinfo/Parser.pm:3329 tp/Texinfo/Parser.pm:5861
! #: tp/Texinfo/Parser.pm:5906 tp/Texinfo/Parser.pm:5935
! #: tp/Texinfo/Parser.pm:5976 tp/Texinfo/Parser.pm:6055
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "neispravan argument za @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3348
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%s: ne mogu otvoriti %s: %s"
  
! #: tp/Texinfo/Parser.pm:3360
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
! msgstr "kodiranje â€ž%sâ€� nije kanonsko texinfo kodiranje"
  
! #: tp/Texinfo/Parser.pm:3369
  #, perl-format
  msgid "unrecognized encoding name `%s'"
! msgstr "neprepoznato ime kodiranja â€ž%sâ€�"
  
! #: tp/Texinfo/Parser.pm:3516
  #, perl-format
  msgid "@%s after the first element"
  msgstr "@%s nakon prvog elementa"
  
! #: tp/Texinfo/Parser.pm:3523
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s nema znaÄ�enje u retku @multitable"
  
! #: tp/Texinfo/Parser.pm:3563
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "@%s ne bi trebao biti povezan s @top"
  
! #: tp/Texinfo/Parser.pm:3575
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
  msgstr "@node prethodi @%s, ali dijelovi moÅ¾da nisu povezani s Ä�vorovima"
  
! #: tp/Texinfo/Parser.pm:3677
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "prazan argument u @%s"
  
! #: tp/Texinfo/Parser.pm:3681
  #, perl-format
  msgid "empty node name after expansion `%s'"
! msgstr "prazno ime Ä�vora nakon proÅ¡irenja â€ž%sâ€�"
  
! #: tp/Texinfo/Parser.pm:3724
  #, perl-format
  msgid "empty menu entry name in `%s'"
! msgstr "prazno ime stavke izbornika u â€ž%sâ€�"
  
! #: tp/Texinfo/Parser.pm:3732
  msgid "empty node name in menu entry"
  msgstr "prazan Ä�vor u stavci izbornika"
  
! #: tp/Texinfo/Parser.pm:3805
  #, perl-format
  msgid "@%s should not appear in @%s"
! msgstr "@%s se ne bi trebao pojaviti u @%s"
  
! #: tp/Texinfo/Parser.pm:3937
  #, perl-format
! msgid "@end %s should only appear at a line beginning"
! msgstr "@end %s se smije pojaviti samo na poÄ�etku retka"
  
! #: tp/Texinfo/Parser.pm:3960
  #, perl-format
  msgid "macro `%s' previously defined"
! msgstr "makro naredba â€ž%sâ€� prethodno definirana"
  
! #: tp/Texinfo/Parser.pm:3963
  #, perl-format
  msgid "here is the previous definition of `%s'"
! msgstr "ovdje je prethodna definicija â€ž%sâ€�"
  
! #: tp/Texinfo/Parser.pm:3968
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "ponovo definiram naredbu Texinfo jezika: @%s"
  
! #: tp/Texinfo/Parser.pm:4017
  #, perl-format
  msgid "@%s without associated character"
  msgstr "@%s bez pridruÅ¾enog znaka"
  
! #: tp/Texinfo/Parser.pm:4087
  #, perl-format
  msgid ""
--- 2517,2660 ----
  
  # ? (TK)
! #: tp/Texinfo/Parser.pm:2905
  msgid "empty multitable"
! msgstr "prazna multitablica (multitable)"
  
! #: tp/Texinfo/Parser.pm:2959 tp/Texinfo/Parser.pm:5673
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "suviÅ¡an argument za @%s"
  
! #: tp/Texinfo/Parser.pm:2965 tp/Texinfo/Parser.pm:5694
! #: tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad argument to @%s"
  msgstr "neispravan argument za @%s"
  
! #: tp/Texinfo/Parser.pm:2976
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s zahtijeva argument: oblikovatelj za %citem"
  
! #: tp/Texinfo/Parser.pm:2981
  #, 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/Parser.pm:3016
  #, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
! msgstr "naredba naglaska â€ž@%sâ€œ nije dopuÅ¡tena kao @%s argument"
  
! #: tp/Texinfo/Parser.pm:3124 tp/Texinfo/Parser.pm:3277
! #: tp/Texinfo/Parser.pm:5666
  #, perl-format
  msgid "@%s missing argument"
  msgstr "@%s nedostaje argument"
  
! #: tp/Texinfo/Parser.pm:3138
  #, perl-format
  msgid "unknown @end %s"
  msgstr "nepoznat @end %s"
  
! #: tp/Texinfo/Parser.pm:3161 tp/Texinfo/Parser.pm:3788
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "suviÅ¡an argument za @%s %s: %s"
  
! #: tp/Texinfo/Parser.pm:3167 tp/Texinfo/Parser.pm:3245
! #: tp/Texinfo/Parser.pm:5755 tp/Texinfo/Parser.pm:5798
! #: tp/Texinfo/Parser.pm:5827 tp/Texinfo/Parser.pm:5868
! #: tp/Texinfo/Parser.pm:5946
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "neispravan argument za @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3188
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%s: ne mogu otvoriti %s: %s"
  
! #: tp/Texinfo/Parser.pm:3200
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
! msgstr "kodiranje â€ž%sâ€œ nije kanonsko texinfo kodiranje"
  
! #: tp/Texinfo/Parser.pm:3208
  #, perl-format
  msgid "unrecognized encoding name `%s'"
! msgstr "neprepoznato ime kodiranja â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:3364
  #, perl-format
  msgid "@%s after the first element"
  msgstr "@%s nakon prvog elementa"
  
! #: tp/Texinfo/Parser.pm:3371
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s nema znaÄ�enje u retku @multitable"
  
! #: tp/Texinfo/Parser.pm:3408
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "@%s ne bi trebao biti povezan s @top"
  
! #: tp/Texinfo/Parser.pm:3420
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
  msgstr "@node prethodi @%s, ali dijelovi moÅ¾da nisu povezani s Ä�vorovima"
  
! #: tp/Texinfo/Parser.pm:3522
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "prazan argument u @%s"
  
! #: tp/Texinfo/Parser.pm:3526
  #, perl-format
  msgid "empty node name after expansion `%s'"
! msgstr "prazno ime Ä�vora nakon proÅ¡irenja â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:3569
  #, perl-format
  msgid "empty menu entry name in `%s'"
! msgstr "prazno ime stavke izbornika u â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:3577
  msgid "empty node name in menu entry"
  msgstr "prazan Ä�vor u stavci izbornika"
  
! #: tp/Texinfo/Parser.pm:3650
  #, perl-format
  msgid "@%s should not appear in @%s"
! msgstr "@%s se ne smije pojaviti u @%s"
  
! #: tp/Texinfo/Parser.pm:3782
  #, perl-format
! msgid "@end %s should only appear at the beginning of a line"
! msgstr "@end %s smije se pojaviti samo na poÄ�etku retka"
  
! #: tp/Texinfo/Parser.pm:3804
  #, perl-format
  msgid "macro `%s' previously defined"
! msgstr "makro naredba â€ž%sâ€œ prethodno definirana"
  
! #: tp/Texinfo/Parser.pm:3807
  #, perl-format
  msgid "here is the previous definition of `%s'"
! msgstr "ovdje je prethodna definicija â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:3812
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "ponovo definiram naredbu Texinfo jezika: @%s"
  
! #: tp/Texinfo/Parser.pm:3879
  #, perl-format
  msgid "@%s without associated character"
  msgstr "@%s bez pridruÅ¾enog znaka"
  
! #: tp/Texinfo/Parser.pm:3949
  #, perl-format
  msgid ""
***************
*** 2667,2671 ****
  msgstr "@%s definiranu bez ijednog ili viÅ¡e argumenata treba pozivati s {}"
  
! #: tp/Texinfo/Parser.pm:4111
  #, perl-format
  msgid ""
--- 2662,2666 ----
  msgstr "@%s definiranu bez ijednog ili viÅ¡e argumenata treba pozivati s {}"
  
! #: tp/Texinfo/Parser.pm:3974
  #, perl-format
  msgid ""
***************
*** 2673,3097 ****
  "value %d)"
  msgstr ""
! "poziv makro naredbe je preduboko ugnjeÅ¾Ä‘en (postavite MAX_NESTED_MACROS za "
! "promjenu, trenutna vrijednost %d)"
  
! #: tp/Texinfo/Parser.pm:4120
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
  msgstr ""
! "rekurzivno pozivanje makro naredbe %s nije dozvoljeno, koristite @rmacro ako "
  "je potrebno"
  
! #: tp/Texinfo/Parser.pm:4176
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
! msgstr "nakon naredbe naglaska â€ž@%sâ€� ne smije slijediti praznina"
  
! #: tp/Texinfo/Parser.pm:4182
  #, perl-format
  msgid "use braces to give a command as an argument to @%s"
  msgstr "koristite zagrade da biste naveli naredbu kao argument za @%s."
  
! #: tp/Texinfo/Parser.pm:4195 tp/Texinfo/Parser.pm:5325
  #, perl-format
  msgid "%c%s expects `i' or `j' as argument, not `%s'"
! msgstr "%c%s oÄ�ekuje â€žiâ€� ili â€žjâ€� kao argument, ne â€ž%sâ€�"
  
! #: tp/Texinfo/Parser.pm:4207
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
! msgstr "nakon naredbe naglaska â€ž@%sâ€� ne smije slijediti novi redak"
  
! #: tp/Texinfo/Parser.pm:4218
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s oÄ�ekuje zagrade"
  
! #: tp/Texinfo/Parser.pm:4383
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "nedefinirana zastavica: %s"
  
! #: tp/Texinfo/Parser.pm:4386
  msgid "bad syntax for @value"
  msgstr "neispravna sintaksa za @value"
  
! #: tp/Texinfo/Parser.pm:4393
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s je zastarjelo."
  
! #: tp/Texinfo/Parser.pm:4396
  #, perl-format
  msgid "%c%s is obsolete; %s"
! msgstr "%c%s je zastarjelo, %s"
  
! #: tp/Texinfo/Parser.pm:4405
  #, perl-format
! msgid "@%s should only appear at a line beginning"
! msgstr "@%s se smije pojaviti samo na poÄ�etku retka"
  
! #: tp/Texinfo/Parser.pm:4496
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
! msgstr "@%s nije dozvoljen unutar bloka â€ž@%sâ€�"
  
! #: tp/Texinfo/Parser.pm:4505
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr "@%s se smije pojaviti samo u zaglavlju ili podnoÅ¾ju"
  
! #: tp/Texinfo/Parser.pm:4631 tp/Texinfo/Parser.pm:4648
! #: tp/Texinfo/Parser.pm:4698
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
! msgstr "@%s nema znaÄ�enje unutar bloka â€ž@%sâ€�"
  
! #: tp/Texinfo/Parser.pm:4658
  #, perl-format
  msgid "@%s in empty multitable"
! msgstr "@%s u praznoj multitable"
  
! #: tp/Texinfo/Parser.pm:4664
  msgid "@tab before @item"
  msgstr "@tab prije @item"
  
! #: tp/Texinfo/Parser.pm:4667
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
! msgstr "previÅ¡e stupaca u multitable predmetu (najviÅ¡e %d)"
  
! #: tp/Texinfo/Parser.pm:4704
  msgid "ignoring @tab outside of multitable"
! msgstr "zanemarujem @tab izvan multitable"
  
! #: tp/Texinfo/Parser.pm:4708
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "@%s izvan tablice ili popisa"
  
! #: tp/Texinfo/Parser.pm:4745
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
! msgstr "mora biti nakon â€ž@%sâ€� za koriÅ¡tenje â€ž@%sâ€�"
  
! #: tp/Texinfo/Parser.pm:4787
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
! msgstr "@%s nema znaÄ�enje izvan okolina â€ž@titlepageâ€� i â€ž@quotationâ€�"
  
! #: tp/Texinfo/Parser.pm:4791
  msgid "@dircategory after first node"
  msgstr "@dircategory nakon prvog Ä�vora"
  
! #: tp/Texinfo/Parser.pm:4979
  #, perl-format
  msgid "region %s inside region %s is not allowed"
! msgstr "podruÄ�je %s unutar podruÄ�ja %s nije dozvoljeno"
  
! #: tp/Texinfo/Parser.pm:4997
  msgid "@direntry after first node"
  msgstr "@direntry nakon prvog Ä�vora"
  
! #: tp/Texinfo/Parser.pm:5005
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "@%s pronaÄ‘en prije prvog @node"
  
! #: tp/Texinfo/Parser.pm:5008
  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/Parser.pm:5070
  #, perl-format
  msgid "@%s should only appear in math context"
! msgstr "@%s se smije pojaviti samo u matematiÄ�kom sadrÅ¾aju"
  
! #: tp/Texinfo/Parser.pm:5078
  #, perl-format
  msgid "unknown command `%s'"
! msgstr "nepoznata naredba â€ž%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5088
  msgid "unexpected @"
  msgstr "neoÄ�ekivani @"
  
! #: tp/Texinfo/Parser.pm:5117
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
! msgstr "@%s nema znaÄ�enje izvan okoline â€ž@floatâ€�"
  
! #: tp/Texinfo/Parser.pm:5122
  #, perl-format
  msgid "@%s should be right below `@float'"
! msgstr "@%s mora biti odmah ispod â€ž@floatâ€�"
  
! #: tp/Texinfo/Parser.pm:5130
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "zanemarujem viÅ¡estruke @%s"
  
! #: tp/Texinfo/Parser.pm:5249
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "naredba @%s ne prihvaÄ‡a argumente"
  
! #: tp/Texinfo/Parser.pm:5273
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr "naredbi @%s nedostaje Ä�vor ili vanjski ruÄ�ni argument"
  
! #: tp/Texinfo/Parser.pm:5292
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
! msgstr "u @%s prazno ime unakrsne reference nakon proÅ¡irenja â€ž%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5303
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
! msgstr "u @%s prazan naslov unakrsne reference nakon proÅ¡irenja â€ž%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5316
  msgid "@image missing filename argument"
  msgstr "@image nedostaje argument imena datoteke"
  
! #: tp/Texinfo/Parser.pm:5348
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "@%s nedostaje prvi argument"
  
! #: tp/Texinfo/Parser.pm:5393
! #, fuzzy, perl-format
  msgid "non-hex digits in argument for @U: %s"
! msgstr "neispravan argument za @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5399
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5412
! #, perl-format
! msgid "argument for @U exceeds size of integer: %s"
! msgstr ""
! 
! #: tp/Texinfo/Parser.pm:5418
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:5546
  msgid "superfluous arguments for node"
  msgstr "suviÅ¡ni argumenti za Ä�vor"
  
! #: tp/Texinfo/Parser.pm:5596
  #, perl-format
  msgid "expected @end %s"
  msgstr "oÄ�ekujem @end %s"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
! msgstr "@%s prihvaÄ‡a samo @-naredbe kao argumente, ne â€ž%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5728
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "preostali argumenti u @%s retku: %s"
  
! #: tp/Texinfo/Parser.pm:5801
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "naredba okoline %s kao argument za @%s"
  
! #: tp/Texinfo/Parser.pm:5823
  #, perl-format
  msgid "empty @%s"
  msgstr "prazan @%s"
  
! #: tp/Texinfo/Parser.pm:5831
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "dio stupca nije broj: %s"
  
! #: tp/Texinfo/Parser.pm:5840
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
! msgstr "@sp argument mora biti brojÄ�ani, ne â€ž%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5849
  #, perl-format
  msgid "reserved index name %s"
  msgstr "zauzeto ime indeksa %s"
  
! #: tp/Texinfo/Parser.pm:5868
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "nepoznat indeks izvora u @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5871
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "nepoznat indeks odrediÅ¡ta u @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr "@%s uzrokuje unutarnje spajanje u %s, zanemarujem"
  
! #: tp/Texinfo/Parser.pm:5914
  #, perl-format
  msgid "unknown index `%s' in @printindex"
! msgstr "nepoznat indeks â€ž%sâ€� u @printindex"
  
! #: tp/Texinfo/Parser.pm:5920
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
! msgstr "ispisivanje indeksa â€ž%sâ€� spojeno u drugom â€ž%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5928
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "printindex prije poÄ�etka dokumenta: @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5944
  #, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
! msgstr "@%s argument mora biti â€žtopâ€� ili â€žbottomâ€�, ne â€ž%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5952
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
! msgstr "PodrÅ¾ano je samo @%s 10 ili 11, ne â€ž%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5960
  #, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
! msgstr "@%s argument mora biti â€žseparateâ€� ili â€žendâ€�, ne â€ž%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5968
  #, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
! msgstr "@%s argument mora biti â€žonâ€�, â€žoffâ€� ili â€žoddâ€�, ne â€ž%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5986 tp/Texinfo/Parser.pm:5991
  #, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
! msgstr "@paragraphindent argument mora biti brojÄ�ani/â€žnoneâ€�/â€žasisâ€�, ne â€ž%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5999
  #, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
! msgstr ""
! "@firstparagraphindent argument mora biti brojÄ�ani/â€žnoneâ€�/â€žasisâ€�, ne â€ž%sâ€�"
  
! #: tp/Texinfo/Parser.pm:6009
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
! msgstr "@exampleindent argument mora biti brojÄ�ani/â€žnoneâ€�/â€žasisâ€�, ne â€ž%sâ€�"
  
! #: tp/Texinfo/Parser.pm:6021
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
! msgstr "oÄ�ekujem @%s on ili off, ne â€ž%sâ€�"
  
! #: tp/Texinfo/Parser.pm:6031
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
! msgstr "@kbdinputstyle argument mora biti â€žcodeâ€�/â€žexampleâ€�/â€ždistinctâ€�, ne â€ž%sâ€�"
  
! #: tp/Texinfo/Parser.pm:6039
  #, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
! msgstr "@allowcodebreaks argument mora biti â€žtrueâ€� ili â€žfalseâ€�, ne â€ž%sâ€�"
  
! #: tp/Texinfo/Parser.pm:6047
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
! msgstr "@urefbreakstyle argument mora biti â€žafterâ€�/â€žbeforeâ€�/â€žnoneâ€�, ne â€ž%sâ€�"
  
! #: tp/Texinfo/Structuring.pm:213
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr "poveÄ‡avam razinu odjeljka @%s koja je premalena"
  
! #: tp/Texinfo/Structuring.pm:245
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "nema naredbe chapter-level prije @%s"
  
! #: tp/Texinfo/Structuring.pm:250
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr "smanjujem razinu odjeljka @%s koja se pojavljuje nakon niÅ¾eg elementa"
  
! #: tp/Texinfo/Structuring.pm:339
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "nema naredbe za odjeljke pridruÅ¾ene @%s"
  
! #: tp/Texinfo/Structuring.pm:488
! #, fuzzy, perl-format
  msgid "@%s not empty"
! msgstr "@%s u praznoj multitable"
  
! #: tp/Texinfo/Structuring.pm:544 tp/Texinfo/Structuring.pm:1326
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
! msgstr "%s referencira nepostojeÄ‡i Ä�vor â€ž%sâ€�"
  
! #: tp/Texinfo/Structuring.pm:557
  #, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
! msgstr "@%s ime Ä�vora stavke â€ž%sâ€� razliÄ�ito od %s imena â€ž%sâ€�"
  
! #: tp/Texinfo/Structuring.pm:662
  #, perl-format
  msgid "unreferenced node `%s'"
! msgstr "nereferencirani Ä�vor â€ž%sâ€�"
  
! #: tp/Texinfo/Structuring.pm:708
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
! msgstr "Ä�vor â€ž%sâ€� je %s za â€ž%sâ€� u odjeljcima, ali ne u izborniku"
  
! #: tp/Texinfo/Structuring.pm:715
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
! msgstr "Ä�vor %s â€ž%sâ€� u izborniku â€ž%sâ€� i u odjeljcima â€ž%sâ€� se razlikuje"
  
! #: tp/Texinfo/Structuring.pm:733
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
! msgstr "Ä�vor â€ž%sâ€� je %s za â€ž%sâ€� u izborniku, ali ne u odjeljcima"
  
! #: tp/Texinfo/Structuring.pm:787
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
! msgstr "%s pokazivaÄ� â€ž%sâ€� (za Ä�vor â€ž%sâ€�) razliÄ�it od %s imena â€ž%sâ€�"
  
! #: tp/Texinfo/Structuring.pm:814
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
! msgstr "%s referencira nepostojeÄ‡i â€ž%sâ€�"
  
! #: tp/Texinfo/Structuring.pm:834
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
! msgstr ""
! "Ä�voru â€ž%sâ€� nedostaje stavka izbornika â€ž%sâ€� iako je njegovo gornje odrediÅ¡te"
  
! #: tp/Texinfo/Structuring.pm:842
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
! msgstr "za â€ž%sâ€�, gore u izborniku â€ž%sâ€� i gore â€ž%sâ€� su razliÄ�iti"
  
  #: tp/Texinfo/Structuring.pm:1338
  #, perl-format
  msgid "@%s to `%s', different from %s name `%s'"
! msgstr "@%s za â€ž%sâ€�, razliÄ�it od %s imena â€ž%sâ€�"
  
! #: tp/Texinfo/Structuring.pm:2070
  #, perl-format
  msgid "empty index key in @%s"
--- 2668,3088 ----
  "value %d)"
  msgstr ""
! "poziv makro naredbe je preduboko ugnijeÅ¾Ä‘en (postavite MAX_NESTED_MACROS za "
! "promjenu; trenutaÄ�na vrijednost %d)"
  
! #: tp/Texinfo/Parser.pm:3983
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
  msgstr ""
! "rekurzivno pozivanje makro naredbe %s nije dopuÅ¡teno; koristite @rmacro ako "
  "je potrebno"
  
! #: tp/Texinfo/Parser.pm:4038
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
! msgstr "nakon naredbe naglaska â€ž@%sâ€œ ne smije slijediti bjelina (whitespace)"
  
! #: tp/Texinfo/Parser.pm:4044
  #, perl-format
  msgid "use braces to give a command as an argument to @%s"
  msgstr "koristite zagrade da biste naveli naredbu kao argument za @%s."
  
! #: tp/Texinfo/Parser.pm:4057 tp/Texinfo/Parser.pm:5189
  #, perl-format
  msgid "%c%s expects `i' or `j' as argument, not `%s'"
! msgstr "%c%s oÄ�ekuje â€žiâ€œ ili â€žjâ€œ kao argument, ne â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:4068
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
! msgstr "nakon naredbe naglaska â€ž@%sâ€œ ne smije slijediti novi redak"
  
! #: tp/Texinfo/Parser.pm:4079
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s oÄ�ekuje zagrade"
  
! #: tp/Texinfo/Parser.pm:4233
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "nedefinirana zastavica: %s"
  
! #: tp/Texinfo/Parser.pm:4236
  msgid "bad syntax for @value"
  msgstr "neispravna sintaksa za @value"
  
! #: tp/Texinfo/Parser.pm:4243
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s je zastarjelo."
  
! #: tp/Texinfo/Parser.pm:4246
  #, perl-format
  msgid "%c%s is obsolete; %s"
! msgstr "%c%s je zastarjelo; %s"
  
! #: tp/Texinfo/Parser.pm:4255
  #, perl-format
! msgid "@%s should only appear at the beginning of a line"
! msgstr "@%s smije se pojaviti samo na poÄ�etku retka"
  
! #: tp/Texinfo/Parser.pm:4346
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
! msgstr "@%s nije dopuÅ¡ten unutar bloka â€ž@%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:4355
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr "@%s se smije pojaviti samo u zaglavlju ili podnoÅ¾ju"
  
! #: tp/Texinfo/Parser.pm:4479 tp/Texinfo/Parser.pm:4496
! #: tp/Texinfo/Parser.pm:4546
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
! msgstr "@%s nema znaÄ�enje unutar bloka â€ž@%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:4506
  #, perl-format
  msgid "@%s in empty multitable"
! msgstr "@%s u praznoj multitablici (multitable)"
  
! #: tp/Texinfo/Parser.pm:4512
  msgid "@tab before @item"
  msgstr "@tab prije @item"
  
! #: tp/Texinfo/Parser.pm:4515
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
! msgstr "previÅ¡e stupaca u multitablici (multitable) predmetu (viÅ¡e od %d)"
  
! #: tp/Texinfo/Parser.pm:4552
  msgid "ignoring @tab outside of multitable"
! msgstr "zanemarujem @tab izvan multitablice (multitable)"
  
! #: tp/Texinfo/Parser.pm:4556
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "@%s izvan tablice ili popisa"
  
! #: tp/Texinfo/Parser.pm:4596
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
! msgstr "mora biti nakon â€ž@%sâ€œ za koriÅ¡tenje â€ž@%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:4638
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
! msgstr "@%s nema znaÄ�enje izvan okolina â€ž@titlepageâ€œ i â€ž@quotationâ€œ"
  
! #: tp/Texinfo/Parser.pm:4642
  msgid "@dircategory after first node"
  msgstr "@dircategory nakon prvog Ä�vora"
  
! #: tp/Texinfo/Parser.pm:4847
  #, perl-format
  msgid "region %s inside region %s is not allowed"
! msgstr "podruÄ�je %s unutar podruÄ�ja %s nije dopuÅ¡teno"
  
! #: tp/Texinfo/Parser.pm:4864
  msgid "@direntry after first node"
  msgstr "@direntry nakon prvog Ä�vora"
  
! #: tp/Texinfo/Parser.pm:4872
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "@%s pronaÄ‘en prije prvog @node"
  
! #: tp/Texinfo/Parser.pm:4875
  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/Parser.pm:4937
  #, perl-format
  msgid "@%s should only appear in math context"
! msgstr "@%s se smije pojaviti samo u matematiÄ�kom kontekstu"
  
! #: tp/Texinfo/Parser.pm:4945
  #, perl-format
  msgid "unknown command `%s'"
! msgstr "nepoznata naredba â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:4955
  msgid "unexpected @"
  msgstr "neoÄ�ekivani @"
  
! #: tp/Texinfo/Parser.pm:4983
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
! msgstr "@%s nema znaÄ�enje izvan okoline â€ž@floatâ€œ"
  
! #: tp/Texinfo/Parser.pm:4988
  #, perl-format
  msgid "@%s should be right below `@float'"
! msgstr "@%s mora biti odmah ispod â€ž@floatâ€œ"
  
! #: tp/Texinfo/Parser.pm:4996
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "zanemarujem viÅ¡estruke @%s"
  
! #: tp/Texinfo/Parser.pm:5114
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "naredba @%s ne prihvaÄ‡a argumente"
  
! #: tp/Texinfo/Parser.pm:5138
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr "naredbi @%s nedostaje Ä�vor ili vanjski ruÄ�ni argument"
  
! #: tp/Texinfo/Parser.pm:5156
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
! msgstr "u @%s prazno ime uputnice (cross-reference) nakon proÅ¡irenja â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5167
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
! msgstr "u @%s prazan naslov uputnice (cross reference) nakon proÅ¡irenja â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5180
  msgid "@image missing filename argument"
  msgstr "@image nedostaje argument imena datoteke"
  
! #: tp/Texinfo/Parser.pm:5211
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "@%s nedostaje prvi argument"
  
! #: tp/Texinfo/Parser.pm:5230
! #, perl-format
  msgid "non-hex digits in argument for @U: %s"
! msgstr "ne-heksadecimalne znamenke (non-hex digits) u argumentu za @U: %s"
  
! #: tp/Texinfo/Parser.pm:5236
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr ""
+ "manje od Ä�etiri heksadecimalnih znamenki (hex digits) u argumentu za @U: %s"
  
! #: tp/Texinfo/Parser.pm:5253
  #, 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/Parser.pm:5448
  msgid "superfluous arguments for node"
  msgstr "suviÅ¡ni argumenti za Ä�vor"
  
! #: tp/Texinfo/Parser.pm:5498
  #, perl-format
  msgid "expected @end %s"
  msgstr "oÄ�ekujem @end %s"
  
! #: tp/Texinfo/Parser.pm:5607
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
! msgstr "@%s prihvaÄ‡a samo @-naredbe kao argumente, ne â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5617
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "preostali argumenti u @%s retku: %s"
  
! #: tp/Texinfo/Parser.pm:5689
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "naredba okoline %s kao argument za @%s"
  
! #: tp/Texinfo/Parser.pm:5710
  #, perl-format
  msgid "empty @%s"
  msgstr "prazan @%s"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "dio stupca nije broj: %s"
  
! #: tp/Texinfo/Parser.pm:5727
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
! msgstr "@sp argument mora biti broj, ne â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5736
  #, perl-format
  msgid "reserved index name %s"
  msgstr "zauzeto ime indeksa %s"
  
! #: tp/Texinfo/Parser.pm:5762
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "nepoznat indeks izvora u @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5765
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "nepoznat indeks odrediÅ¡ta u @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5793
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr "@%s uzrokuje unutarnje spajanje u %s, zanemarujem"
  
! #: tp/Texinfo/Parser.pm:5806
  #, perl-format
  msgid "unknown index `%s' in @printindex"
! msgstr "nepoznat indeks â€ž%sâ€œ u @printindex"
  
! #: tp/Texinfo/Parser.pm:5812
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
! msgstr "ispisivanje indeksa â€ž%sâ€œ spojeno u drugom â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5820
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "printindex prije poÄ�etka dokumenta: @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5836
  #, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
! msgstr "@%s argument mora biti â€žtopâ€œ ili â€žbottomâ€œ, ne â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5844
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
! msgstr "PodrÅ¾ano je samo @%s 10 ili 11, ne â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5852
  #, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
! msgstr "@%s argument mora biti â€žseparateâ€œ ili â€žendâ€œ, ne â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5860
  #, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
! msgstr "@%s argument mora biti â€žonâ€œ, â€žoffâ€œ ili â€žoddâ€œ, ne â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5878 tp/Texinfo/Parser.pm:5883
  #, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
! msgstr "@paragraphindent argument mora biti broj, â€žnoneâ€œ ili â€žasisâ€œ, ne â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5891
  #, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
! msgstr "@firstparagraphindent argument mora biti â€žnoneâ€œ ili â€žinsertâ€œ, ne â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
! msgstr "@exampleindent argument mora biti broj ili â€žasisâ€œ, ne â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5913
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
! msgstr "oÄ�ekujem @%s on ili off, ne â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5922
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
! msgstr ""
! "@kbdinputstyle argument mora biti â€žcodeâ€œ, â€žexampleâ€œ ili â€ždistinctâ€œ, ne â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5930
  #, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
! msgstr "@allowcodebreaks argument mora biti â€žtrueâ€œ ili â€žfalseâ€œ, ne â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5938
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
! msgstr ""
! "@urefbreakstyle argument mora biti â€žafterâ€œ, â€žbeforeâ€œ ili â€žnoneâ€œ, ne â€ž%sâ€œ"
  
! #: tp/Texinfo/Structuring.pm:216
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr "poveÄ‡avam razinu odjeljka @%s koja je premalena"
  
! #: tp/Texinfo/Structuring.pm:248
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "nema naredbe chapter-level prije @%s"
  
! #: tp/Texinfo/Structuring.pm:253
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr "smanjujem razinu odjeljka @%s koja se pojavljuje nakon niÅ¾eg elementa"
  
! #: tp/Texinfo/Structuring.pm:342
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "nema naredbe za odjeljke pridruÅ¾ene @%s"
  
! #: tp/Texinfo/Structuring.pm:491
! #, perl-format
  msgid "@%s not empty"
! msgstr "@%s nije prazan"
  
! #: tp/Texinfo/Structuring.pm:547 tp/Texinfo/Structuring.pm:1325
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
! msgstr "%s referencira nepostojeÄ‡i Ä�vor â€ž%sâ€œ"
  
! #: tp/Texinfo/Structuring.pm:558
  #, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
! msgstr "@%s ime Ä�vora stavke â€ž%sâ€œ razliÄ�ito od %s imena â€ž%sâ€œ"
  
! #: tp/Texinfo/Structuring.pm:663
  #, perl-format
  msgid "unreferenced node `%s'"
! msgstr "nereferencirani Ä�vor â€ž%sâ€œ"
  
! #: tp/Texinfo/Structuring.pm:706
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
! msgstr "Ä�vor â€ž%sâ€œ je %s za â€ž%sâ€œ u odjeljcima, ali ne u izborniku"
  
! #: tp/Texinfo/Structuring.pm:713
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
! msgstr "Ä�vor %s â€ž%sâ€œ u izborniku â€ž%sâ€œ i u odjeljcima â€ž%sâ€œ se razlikuje"
  
! #: tp/Texinfo/Structuring.pm:731
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
! msgstr "Ä�vor â€ž%sâ€œ je %s za â€ž%sâ€œ u izborniku, ali ne u odjeljcima"
  
! #: tp/Texinfo/Structuring.pm:786
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
! msgstr "%s pokazivaÄ� â€ž%sâ€œ (za Ä�vor â€ž%sâ€œ) razliÄ�it od %s imena â€ž%sâ€œ"
  
! #: tp/Texinfo/Structuring.pm:810
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
! msgstr "%s referencira nepostojeÄ‡i â€ž%sâ€œ"
  
! #: tp/Texinfo/Structuring.pm:829
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
! msgstr "Ä�voru â€ž%sâ€œ nedostaje stavka izbornika â€ž%sâ€œ iako je njegov Up cilj"
  
! #: tp/Texinfo/Structuring.pm:837
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
! msgstr "za â€ž%sâ€œ, gore (up) u izborniku â€ž%sâ€œ i gore (up) â€ž%sâ€œ su razliÄ�iti"
  
  #: tp/Texinfo/Structuring.pm:1338
  #, perl-format
  msgid "@%s to `%s', different from %s name `%s'"
! msgstr "@%s za â€ž%sâ€œ, razliÄ�it od %s imena â€ž%sâ€œ"
  
! #: tp/Texinfo/Structuring.pm:2067
  #, perl-format
  msgid "empty index key in @%s"
***************
*** 3119,3123 ****
  #: tp/init/latex2html.pm:346
  msgid "l2h: current directory contains a dot"
! msgstr "l2h: trenutni direktorij sadrÅ¾i toÄ�ku"
  
  #: tp/init/latex2html.pm:374
--- 3110,3114 ----
  #: tp/init/latex2html.pm:346
  msgid "l2h: current directory contains a dot"
! msgstr "l2h: aktualni direktorij sadrÅ¾i toÄ�ku"
  
  #: tp/init/latex2html.pm:374
***************
*** 3129,3133 ****
  #, perl-format
  msgid "l2h: image has invalid extension: %s"
! msgstr "l2h: slika ima neispravnu ekstenziju: %s"
  
  #: tp/init/latex2html.pm:438
--- 3120,3124 ----
  #, perl-format
  msgid "l2h: image has invalid extension: %s"
! msgstr "l2h: slika ima neispravni sufiks: %s"
  
  #: tp/init/latex2html.pm:438
***************
*** 3152,3156 ****
  "of items found in the document"
  msgstr ""
! "latex2html.pm: obrada je napravila %d elemenata u HTML-u, oÄ�ekivano je %d, "
  "koliko ih je pronaÄ‘eno u dokumentu"
  
--- 3143,3147 ----
  "of items found in the document"
  msgstr ""
! "latex2html.pm: obrada je napravila %d elemenata u HTML-u; oÄ�ekivano je %d,"
  "koliko ih je pronaÄ‘eno u dokumentu"
  
***************
*** 3213,3217 ****
  "items found in the document for @%s"
  msgstr ""
! "tex4ht.pm: obrada je napravila %d elemenata u HTML-u, oÄ�ekivano je %d, "
  "koliko ih je pronaÄ‘eno u dokumentu za @%s"
  
--- 3204,3208 ----
  "items found in the document for @%s"
  msgstr ""
! "tex4ht.pm: obrada je napravila %d elemenata u HTML-u; oÄ�ekivano je %d, "
  "koliko ih je pronaÄ‘eno u dokumentu za @%s"
  
***************
*** 3227,3231 ****
  "items found in the document for @%s"
  msgstr ""
! "tex4ht.pm: obrada je dohvatila %d elemenata u HTML-u, oÄ�ekivano je %d, "
  "koliko ih je pronaÄ‘eno u dokumentu za @%s"
  
--- 3218,3222 ----
  "items found in the document for @%s"
  msgstr ""
! "tex4ht.pm: obrada je dohvatila %d elemenata u HTML-u; oÄ�ekivano je %d, "
  "koliko ih je pronaÄ‘eno u dokumentu za @%s"
  
***************
*** 3263,3275 ****
  #, perl-format
  msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
! msgstr "zanemarujem neprepoznatu TEXINFO_OUTPUT_FORMAT vrijednost â€ž%sâ€�\n"
  
  #: tp/texi2any.pl:730
! #, fuzzy, perl-format
  msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
! msgstr "Uporaba: %s [OPCIJA]... DATOTEKA...\n"
  
  #: tp/texi2any.pl:733
- #, fuzzy
  msgid ""
  "Translate Texinfo source documentation to various other formats, by default\n"
--- 3254,3265 ----
  #, perl-format
  msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
! msgstr "zanemarujem neprepoznatu TEXINFO_OUTPUT_FORMAT vrijednost â€ž%sâ€œ\n"
  
  #: tp/texi2any.pl:730
! #, perl-format
  msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
! msgstr "Uporaba: %s [OPCIJA]... TEXINFO-DATOTEKA...\n"
  
  #: tp/texi2any.pl:733
  msgid ""
  "Translate Texinfo source documentation to various other formats, by default\n"
***************
*** 3279,3287 ****
  "the behavior is identical, and does not depend on the installed name.\n"
  msgstr ""
! "Prevedi Texinfo izvornu dokumentaciju u razne oblike, uobiÄ�ajeno u Info\n"
! "datoteke prikladne Ä�itanju programima Emacs ili samostalnim GNU Info.\n"
  
  #: tp/texi2any.pl:739
! #, fuzzy, perl-format
  msgid ""
  "General options:\n"
--- 3269,3280 ----
  "the behavior is identical, and does not depend on the installed name.\n"
  msgstr ""
! "Prevedi Texinfo izvornu dokumentaciju u razne formate, uobiÄ�ajeno u Info\n"
! "datoteke prikladne za (online) Ä�itanje s Emacsom ili samostalnim GNU Info.\n"
! "\n"
! "Taj program je normalno instaliran kao â€žmakeinfoâ€œ i â€žtexi2anyâ€œ;\n"
! "ponaÅ¡anje im je identiÄ�no, i ne ovisi o instaliranom imenu.\n"
  
  #: tp/texi2any.pl:739
! #, perl-format
  msgid ""
  "General options:\n"
***************
*** 3300,3322 ****
  "      --version               display version information and exit.\n"
  msgstr ""
! "OpÄ‡enite opcije:\n"
! "      --document-language=STR lokal za koriÅ¡tenje u prevoÄ‘enju Texinfo\n"
! "                              kljuÄ�nih rijeÄ�i izlaznog dokumenta (zadano "
! "C).\n"
! "      --error-limit=BR        izaÄ‘i nakon BR greÅ¡aka (zadano %d).\n"
! "      --force                 oÄ�uvaj izlaz i u sluÄ�aju greÅ¡aka.\n"
! "      --help                  prikaÅ¾i ovu pomoÄ‡ i izaÄ‘i.\n"
! "      --no-validate           izostavi provjeru unakrsnih referenci Ä�vora.\n"
  "      --no-warn               izostavi upozorenja (ali ne greÅ¡ke).\n"
  "      --conf-dir=DIREKTORIJ   traÅ¾i datoteke inicijalizacije u DIREKTORIJU.\n"
! "      --init-file=DATOTEKA    uÄ�itaj DATOTEKU za ureÄ‘ivanje uobiÄ�ajenog "
! "ponaÅ¡anja.\n"
  "  -c, --set-customization-variable VAR=VRIJ  postavi VARijablu prilagodbe u\n"
! "                                VRIJednost.\n"
  "  -v, --verbose               pojasni Å¡to se dogaÄ‘a.\n"
! "      --version               prikaÅ¾i informacije o inaÄ�ici i izaÄ‘i.\n"
  
  #: tp/texi2any.pl:755
- #, fuzzy
  msgid ""
  "Output format selection (default is to produce Info):\n"
--- 3293,3314 ----
  "      --version               display version information and exit.\n"
  msgstr ""
! "OpÄ‡e opcije:\n"
! "      --document-language=STR locale (lokal) za prijevod Texinfo kljuÄ�nih\n"
! "                              rijeÄ�i izlaznog dokumenta (zadano C).\n"
! "      --error-limit=BR        iziÄ‘i nakon BR greÅ¡aka (zadano %d).\n"
! "      --force                 saÄ�uvaj izlaz i u sluÄ�aju greÅ¡aka.\n"
! "      --help                  prikaÅ¾i ovu pomoÄ‡ i iziÄ‘i.\n"
! "      --no-validate           izostavi provjeru uputnica\n"
! "                               (cross-reference) Ä�vora.\n"
  "      --no-warn               izostavi upozorenja (ali ne greÅ¡ke).\n"
  "      --conf-dir=DIREKTORIJ   traÅ¾i datoteke inicijalizacije u DIREKTORIJU.\n"
! "      --init-file=DATOTEKA    uÄ�itaj DATOTEKU za ureÄ‘ivanje\n"
! "                                uobiÄ�ajenog ponaÅ¡anja.\n"
  "  -c, --set-customization-variable VAR=VRIJ  postavi VARijablu prilagodbe u\n"
! "                                               VRIJednost.\n"
  "  -v, --verbose               pojasni Å¡to se dogaÄ‘a.\n"
! "      --version               prikaÅ¾i informacije o inaÄ�ici i iziÄ‘i.\n"
  
  #: tp/texi2any.pl:755
  msgid ""
  "Output format selection (default is to produce Info):\n"
***************
*** 3328,3341 ****
  "                                after checking validity of TEXINFO-FILE.\n"
  msgstr ""
! "Izbor izlaznog oblika (uobiÄ�ajeno se radi Info):\n"
  "      --docbook               napravi Docbook XML umjesto Info.\n"
  "      --html                  napravi HTML umjesto Info.\n"
  "      --plaintext             napravi obiÄ�an text umjesto Info.\n"
  "      --xml                   napravi Texinfo XML umjesto Info.\n"
! "      --dvi, --dvipdf, --ps, --pdf  pozovi texi2dvi za stvaranje odabranog "
! "izlaza.\n"
  
  #: tp/texi2any.pl:763
- #, fuzzy
  msgid ""
  "General output options:\n"
--- 3320,3333 ----
  "                                after checking validity of TEXINFO-FILE.\n"
  msgstr ""
! "Izbor izlaznog oblika (uobiÄ�ajeno je napraviti Info):\n"
  "      --docbook               napravi Docbook XML umjesto Info.\n"
  "      --html                  napravi HTML umjesto Info.\n"
  "      --plaintext             napravi obiÄ�an text umjesto Info.\n"
  "      --xml                   napravi Texinfo XML umjesto Info.\n"
! "      --dvi, --dvipdf, --ps, --pdf  pozovi texi2dvi za stvaranje odabranog\n"
! "                                      izlaza, nakon provjere valjanosti\n"
! "                                      TEXINFO-DATOTEKE.\n"
  
  #: tp/texi2any.pl:763
  msgid ""
  "General output options:\n"
***************
*** 3363,3367 ****
  "                                Otherwise, DEST names the output file.\n"
  msgstr ""
! "OpÄ‡enite izlazne opcije:\n"
  "  -E, --macro-expand=DATOTEKA ispiÅ¡i makro-proÅ¡ireni kod u DATOTEKU,\n"
  "                                zanemarujuÄ‡i svaki @setfilename.\n"
--- 3355,3359 ----
  "                                Otherwise, DEST names the output file.\n"
  msgstr ""
! "OpÄ‡e izlazne opcije:\n"
  "  -E, --macro-expand=DATOTEKA ispiÅ¡i makro-proÅ¡ireni kod u DATOTEKU,\n"
  "                                zanemarujuÄ‡i svaki @setfilename.\n"
***************
*** 3372,3390 ****
  "                                kraÄ‡i izlaz). TakoÄ‘er, ako se radi Info,\n"
  "                                uobiÄ�ajeno koristi standardni izlaz.\n"
! "      --no-split              izostavi razdvajanje izlaza, napravi samo\n"
  "                                jednu izlaznu datoteku.\n"
! "      --[no-]number-sections  ispiÅ¡i brojeve poglavlja i odjeljaka,\n"
  "                                uobiÄ�ajeno je ukljuÄ�eno.\n"
! "  -o, --output=ODREDIÅ TE      koristi ODREDIÅ TE za izlaz.\n"
! "                                U sluÄ�aju rastavljenog izlaza, napravi "
! "direktorij\n"
! "                                 ODREDIÅ TE i tamo spremi izlazne datoteke.\n"
! "                                Ako se ne koristi rastavljeni izlaz, a "
! "ODREDIÅ TE\n"
! "                                 je direktorij ili zavrÅ¡ava s /, spremi "
! "izlazne\n"
! "                                 datoteke u njega.\n"
! "                                U suprotnom, ODREDIÅ TE je ime izlazne "
! "datoteke.\n"
  
  #: tp/texi2any.pl:783
--- 3364,3381 ----
  "                                kraÄ‡i izlaz). TakoÄ‘er, ako se radi Info,\n"
  "                                uobiÄ�ajeno koristi standardni izlaz.\n"
! "      --no-split              izostavi razdvajanje izlaza; napravi samo\n"
  "                                jednu izlaznu datoteku.\n"
! "      --[no-]number-sections  ispiÅ¡i brojeve poglavlja i odjeljaka;\n"
  "                                uobiÄ�ajeno je ukljuÄ�eno.\n"
! "  -o, --output=ODREDIÅ TE      koristi ODREDIÅ TE za izlazne datoteke.\n"
! "                                Ako se koristi rastavljeni izlaz, napravi\n"
! "                                  ODREDIÅ TE kao direktorij i tu spremi\n"
! "                                  izlazne datoteke.\n"
! "                                Ako se ne koristi rastavljeni izlaz,\n"
! "                                  a ODREDIÅ TE je veÄ‡ direktorij ili "
! "zavrÅ¡ava\n"
! "                                  sa /, spremi tu izlazne datoteke.\n"
! "                                U suprotnom, ODREDIÅ TE je ime\n"
! "                                  izlazne datoteke.\n"
  
  #: tp/texi2any.pl:783
***************
*** 3416,3425 ****
  "%d).\n"
  "      --footnote-style=STIL   napravi fusnote za Info prema STILU:\n"
! "                                â€žseparateâ€� za spremanje u vlastite Ä�vorove,\n"
! "                                â€žendâ€� za spremanje na kraj Ä�vora u kojem su\n"
  "                                definirane (ovo je zadano).\n"
  "      --paragraph-indent=VAL  uvuci Info odjeljke VAL mjesta (zadano %d).\n"
! "                                Ako je VAL â€žnoneâ€�, ne uvlaÄ�i, ako je VAL\n"
! "                                â€žasisâ€�, oÄ�uvaj postojeÄ‡e uvlaÄ�enje.\n"
  "      --split-size=BROJ       podijeli Info datoteke na veliÄ�inu BROJ\n"
  "                                (zadano %d).\n"
--- 3407,3416 ----
  "%d).\n"
  "      --footnote-style=STIL   napravi fusnote za Info prema STILU:\n"
! "                                â€žseparateâ€œ za spremanje u vlastite Ä�vorove;\n"
! "                                â€žendâ€œ za spremanje na kraj Ä�vora u kojem su\n"
  "                                definirane (ovo je zadano).\n"
  "      --paragraph-indent=VAL  uvuci Info odjeljke VAL mjesta (zadano %d).\n"
! "                                Ako je VAL â€žnoneâ€œ, ne uvlaÄ�i; ako je VAL\n"
! "                                â€žasisâ€œ, oÄ�uvaj postojeÄ‡e uvlaÄ�enje.\n"
  "      --split-size=BROJ       podijeli Info datoteke na veliÄ�inu BROJ\n"
  "                                (zadano %d).\n"
***************
*** 3439,3453 ****
  msgstr ""
  "Opcije za HTML:\n"
! "      --css-include=DATOTEKA  ukljuÄ�i DATOTEKU u HTML <style> izlaz,\n"
  "                                proÄ�itaj standardni ulaz ako je DATOTEKA -.\n"
  "      --css-ref=URL           napravi CSS referencu na URL.\n"
  "      --internal-links=DAT    napravi popis unutarnjih veza u DAT.\n"
  "      --split=RAST            rastavi pri RAST, gdje RAST moÅ¾e biti\n"
! "                                â€žchapterâ€�, â€žsectionâ€� ili â€žnodeâ€�.\n"
  "      --transliterate-file-names  koristi imena datoteka u ASCII kodiranju.\n"
! "      --node-files            napravi datoteke preusmjeravanja za Ä�vorove "
! "i \n"
! "                              sidra, ukljuÄ�eno samo ako se koristi "
! "rastavljanje.\n"
  
  #: tp/texi2any.pl:811
--- 3430,3443 ----
  msgstr ""
  "Opcije za HTML:\n"
! "      --css-include=DATOTEKA  ukljuÄ�i DATOTEKU u HTML <style> izlaz;\n"
  "                                proÄ�itaj standardni ulaz ako je DATOTEKA -.\n"
  "      --css-ref=URL           napravi CSS referencu na URL.\n"
  "      --internal-links=DAT    napravi popis unutarnjih veza u DAT.\n"
  "      --split=RAST            rastavi pri RAST, gdje RAST moÅ¾e biti\n"
! "                                â€žchapterâ€œ, â€žsectionâ€œ ili â€žnodeâ€œ.\n"
  "      --transliterate-file-names  koristi imena datoteka u ASCII kodiranju.\n"
! "      --node-files            napravi datoteke preusmjeravanja za Ä�vorove i\n"
! "                                sidra; ukljuÄ�eno samo ako se\n"
! "                                koristi rastavljanje.\n"
  
  #: tp/texi2any.pl:811
***************
*** 3465,3473 ****
  msgstr ""
  "Opcije za DVI/PS/PDF:\n"
! "      --Xopt=OPCIJA           navedi OPCIJU za texi2dvi, moÅ¾e se "
  "ponavljati.\n"
  
  #: tp/texi2any.pl:817
- #, fuzzy
  msgid ""
  "Input file options:\n"
--- 3455,3462 ----
  msgstr ""
  "Opcije za DVI/PS/PDF:\n"
! "      --Xopt=OPCIJA           navedi OPCIJU za texi2dvi; moÅ¾e se "
  "ponavljati.\n"
  
  #: tp/texi2any.pl:817
  msgid ""
  "Input file options:\n"
***************
*** 3483,3491 ****
  "kompatibilnosti.\n"
  "  -D VAR                        definiraj varijablu VAR, kao sa @set.\n"
! "  -I DIR                        dodaj DIR na kraj @include putanje "
! "pretraÅ¾ivanja.\n"
! "  -P DIR                        dodaj DIR na poÄ�etak @include putanje "
! "pretraÅ¾ivanja.\n"
! "  -U VAR                        ukloni definiciju varijable VAR, kao sa "
  "@clear.\n"
  
--- 3472,3483 ----
  "kompatibilnosti.\n"
  "  -D VAR                        definiraj varijablu VAR, kao sa @set.\n"
! "  -D 'VAR VAL'                  definiraj varijablu VAR kao vrijednost VAL\n"
! "                                  (jedan argument ljuske)\n"
! "                                  (one shell argument).\n"
! "  -I DIR                        dodaj DIR na kraj @include putanje\n"
! "                                  pretraÅ¾ivanja.\n"
! "  -P DIR                        dodaj DIR na poÄ�etak @include putanje\n"
! "                                  pretraÅ¾ivanja.\n"
! "  -U VAR                        ukloni definiciju varijable VAR, kao s "
  "@clear.\n"
  
***************
*** 3510,3515 ****
  msgstr ""
  "Obrada uvjeta u ulazu:\n"
! "  --ifdocbook       obradi @ifdocbook i @docbook Ä�ak i ako se ne\n"
! "                      stvara Docbook.\n"
  "  --ifhtml          obradi @ifhtml i @html Ä�ak i ako se ne stvara HTML.\n"
  "  --ifinfo          obradi @ifinfo Ä�ak i ako se ne stvara Info.\n"
--- 3502,3507 ----
  msgstr ""
  "Obrada uvjeta u ulazu:\n"
! "  --ifdocbook       obradi @ifdocbook i @docbook Ä�ak i ako se ne stvara "
! "Docbook.\n"
  "  --ifhtml          obradi @ifhtml i @html Ä�ak i ako se ne stvara HTML.\n"
  "  --ifinfo          obradi @ifinfo Ä�ak i ako se ne stvara Info.\n"
***************
*** 3537,3545 ****
  msgstr ""
  "  Zadane vrijednosti @if... uvjeta ovise o izlaznom obliku:\n"
! "  ako se stvara Docbook, --ifdocbook je ukljuÄ�en, a ostali su iskljuÄ�eni,\n"
! "  ako se stvara HTML, --ifhtml je ukljuÄ�en, a ostali su iskljuÄ�eni,\n"
! "  ako se stvara Info, --ifinfo je ukljuÄ�en, a ostali su iskljuÄ�eni,\n"
  "  ako se stvara obiÄ�an tekst, --ifplaintext je ukljuÄ�en, a ostali su "
! "iskljuÄ�eni,\n"
  "  ako se stvara XML, --ifxml je ukljuÄ�en, a ostali su iskljuÄ�eni.\n"
  
--- 3529,3537 ----
  msgstr ""
  "  Zadane vrijednosti @if... uvjeta ovise o izlaznom obliku:\n"
! "  ako se stvara Docbook, --ifdocbook je ukljuÄ�en, a ostali su iskljuÄ�eni;\n"
! "  ako se stvara HTML, --ifhtml je ukljuÄ�en, a ostali su iskljuÄ�eni;\n"
! "  ako se stvara Info, --ifinfo je ukljuÄ�en, a ostali su iskljuÄ�eni;\n"
  "  ako se stvara obiÄ�an tekst, --ifplaintext je ukljuÄ�en, a ostali su "
! "iskljuÄ�eni;\n"
  "  ako se stvara XML, --ifxml je ukljuÄ�en, a ostali su iskljuÄ�eni.\n"
  
***************
*** 3570,3579 ****
  "  makeinfo --pdf foo.texi                napravi PDF koriÅ¡tenjem texi2dvi\n"
  "\n"
! "  makeinfo --html --no-headers foo.texi  napravi html bez redaka Ä�vora, "
  "izbornika\n"
  "  makeinfo --number-sections foo.texi    napravi Info s numeriranim "
  "odjeljcima\n"
! "  makeinfo --no-split foo.texi           napravi jednu Info datoteku "
! "neovisno o veliÄ�ini\n"
  
  #: tp/texi2any.pl:896
--- 3562,3571 ----
  "  makeinfo --pdf foo.texi                napravi PDF koriÅ¡tenjem texi2dvi\n"
  "\n"
! "  makeinfo --html --no-headers foo.texi  napravi html bez redaka Ä�vora,"
  "izbornika\n"
  "  makeinfo --number-sections foo.texi    napravi Info s numeriranim "
  "odjeljcima\n"
! "  makeinfo --no-split foo.texi           napravi jednu Info datoteku o "
! "veliÄ�ini\n"
  
  #: tp/texi2any.pl:896
***************
*** 3581,3585 ****
  msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
  msgstr ""
! "%s: --footnote-style argument mora biti â€žseparateâ€� ili â€žendâ€�, ne â€ž%sâ€�.\n"
  
  #: tp/texi2any.pl:987
--- 3573,3577 ----
  msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
  msgstr ""
! "%s: --footnote-style argument mora biti â€žseparateâ€œ ili â€žendâ€œ, ne â€ž%sâ€œ.\n"
  
  #: tp/texi2any.pl:987
***************
*** 3587,3591 ****
  msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
  msgstr ""
! "%s: --paragraph-indent argument mora biti brojÄ�ani/â€žnoneâ€�/â€žasisâ€�, ne â€ž%sâ€�.\n"
  
  #: tp/texi2any.pl:1064
--- 3579,3583 ----
  msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
  msgstr ""
! "%s: --paragraph-indent argument mora biti broj, â€žnoneâ€œ ili â€žasisâ€œ, ne â€ž%sâ€œ.\n"
  
  #: tp/texi2any.pl:1064
***************
*** 3617,3638 ****
  #, perl-format
  msgid "Try `%s --help' for more information.\n"
! msgstr "PokuÅ¡ajte â€ž%s --helpâ€� za viÅ¡e informacija.\n"
  
! #: tp/texi2any.pl:1232
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
  "fill_gaps_in_sectioning transformacija ne vraÄ‡a rezultat. Nema odjeljka?"
  
! #: tp/texi2any.pl:1255
  #, perl-format
  msgid "error on closing macro expand file %s: %s\n"
  msgstr "greÅ¡ka pri zatvaranju makro proÅ¡irene datoteke %s: %s\n"
  
! #: tp/texi2any.pl:1261
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "ne mogu otvoriti %s za pisanje: %s\n"
  
! #: tp/texi2any.pl:1286
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
--- 3609,3630 ----
  #, perl-format
  msgid "Try `%s --help' for more information.\n"
! msgstr "PokuÅ¡ajte â€ž%s --helpâ€œ za viÅ¡e informacija.\n"
  
! #: tp/texi2any.pl:1239
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
  "fill_gaps_in_sectioning transformacija ne vraÄ‡a rezultat. Nema odjeljka?"
  
! #: tp/texi2any.pl:1262
  #, perl-format
  msgid "error on closing macro expand file %s: %s\n"
  msgstr "greÅ¡ka pri zatvaranju makro proÅ¡irene datoteke %s: %s\n"
  
! #: tp/texi2any.pl:1268
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "ne mogu otvoriti %s za pisanje: %s\n"
  
! #: tp/texi2any.pl:1293
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
***************
*** 3642,3660 ****
  "odjeljka?"
  
! #: tp/texi2any.pl:1359 tp/texi2any.pl:1435
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%s: greÅ¡ka pri zatvaranju %s: %s\n"
  
! #: tp/texi2any.pl:1382 tp/texi2any.pl:1416
  #, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
  msgstr "%s: greÅ¡ka pri zatvaranju datoteke unutarnjih veza %s: %s\n"
  
! #: tp/texi2any.pl:1388 tp/texi2any.pl:1422
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
  msgstr "%s: ne mogu otvoriti %s za pisanje: %s\n"
  
  #~ msgid "Insert this character"
  #~ msgstr "Umetni ovaj znak"
--- 3634,3664 ----
  "odjeljka?"
  
! #: tp/texi2any.pl:1366 tp/texi2any.pl:1442
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%s: greÅ¡ka pri zatvaranju %s: %s\n"
  
! #: tp/texi2any.pl:1389 tp/texi2any.pl:1423
  #, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
  msgstr "%s: greÅ¡ka pri zatvaranju datoteke unutarnjih veza %s: %s\n"
  
! #: tp/texi2any.pl:1395 tp/texi2any.pl:1429
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
  msgstr "%s: ne mogu otvoriti %s za pisanje: %s\n"
  
+ #~ msgid "-%s---Info: %s, %ld lines --%s--"
+ #~ msgstr "-%s---Info: %s, %ld redaka --%s--"
+ 
+ #~ msgid "-%s---Info: (%s)%s, %ld lines --%s--"
+ #~ msgstr "-%s---Info: (%s)%s, %ld redaka --%s--"
+ 
+ #~ msgid "No file given for node '%s'."
+ #~ msgstr "Za Ä�vor â€˜%sâ€™ nijedna datoteka nije zadana."
+ 
+ #~ msgid "argument for @U exceeds size of integer: %s"
+ #~ msgstr "argument za @U je veÄ‡i od broja (integer): %s"
+ 
  #~ msgid "Insert this character"
  #~ msgstr "Umetni ovaj znak"
Binary files texinfo-6.1/po/hu.gmo and texinfo-6.3/po/hu.gmo differ
diff -Nrc2 texinfo-6.1/po/hu.po texinfo-6.3/po/hu.po
*** texinfo-6.1/po/hu.po	2016-02-06 11:35:51.000000000 +0000
--- texinfo-6.3/po/hu.po	2016-09-10 12:45:52.000000000 +0100
***************
*** 7,11 ****
  "Project-Id-Version: texinfo 4.7.x\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
  "PO-Revision-Date: 2006-02-18 16:00+0100\n"
  "Last-Translator: MÃ¡tÃ© LABÃ�DI <labadimate@freemail.hu>\n"
--- 7,11 ----
  "Project-Id-Version: texinfo 4.7.x\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:45+0100\n"
  "PO-Revision-Date: 2006-02-18 16:00+0100\n"
  "Last-Translator: MÃ¡tÃ© LABÃ�DI <labadimate@freemail.hu>\n"
***************
*** 15,18 ****
--- 15,19 ----
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
+ "X-Bugs: Report translation errors to the Language-Team address.\n"
  "X-Generator: KBabel 1.11\n"
  
***************
*** 113,119 ****
  
  #: gnulib/lib/regcomp.c:156
! #, fuzzy
! msgid "Unmatched [ or [^"
! msgstr "PÃ¡r nÃ©lkÃ¼li }"
  
  #: gnulib/lib/regcomp.c:159
--- 114,119 ----
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [, [^, [:, [., or [="
! msgstr ""
  
  #: gnulib/lib/regcomp.c:159
***************
*** 157,161 ****
  
  # keresÃ©si feltÃ©tel / keresÃ©si szÃ¶veg / keresett szÃ¶veg ? LM
! #: gnulib/lib/regcomp.c:711
  #, fuzzy
  msgid "No previous regular expression"
--- 157,161 ----
  
  # keresÃ©si feltÃ©tel / keresÃ©si szÃ¶veg / keresett szÃ¶veg ? LM
! #: gnulib/lib/regcomp.c:687
  #, fuzzy
  msgid "No previous regular expression"
***************
*** 311,315 ****
  msgstr "---------- LÃ¡bjegyzetek ----------"
  
! #: info/indices.c:123 info/indices.c:812
  #, c-format
  msgid "Finding index entries..."
--- 311,315 ----
  msgstr "---------- LÃ¡bjegyzetek ----------"
  
! #: info/indices.c:123 info/indices.c:822
  #, c-format
  msgid "Finding index entries..."
***************
*** 320,324 ****
  msgstr "SzÃ¶veg keresÃ©se a fÃ¡jl tÃ¡rgymutatÃ³jÃ¡ban"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:818
  #, c-format
  msgid "No indices found."
--- 320,324 ----
  msgstr "SzÃ¶veg keresÃ©se a fÃ¡jl tÃ¡rgymutatÃ³jÃ¡ban"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:828
  #, c-format
  msgid "No indices found."
***************
*** 352,366 ****
  msgstr "Nincs %stÃ¡rgymutatÃ³-bejegyzÃ©s, ami â€ž%s!H-t tartalmaznÃ¡."
  
! #: info/indices.c:476 info/indices.c:880
  #, fuzzy, c-format
  msgid "No index entries containing '%s'."
  msgstr "Nincs %stÃ¡rgymutatÃ³-bejegyzÃ©s, ami â€ž%s!H-t tartalmaznÃ¡."
  
! #: info/indices.c:583
  #, fuzzy, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "â€ž%sâ€œ tÃ¡rgymutatÃ³inak Ã¡tnÃ©zÃ©se..."
  
! #: info/indices.c:636
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
--- 352,366 ----
  msgstr "Nincs %stÃ¡rgymutatÃ³-bejegyzÃ©s, ami â€ž%s!H-t tartalmaznÃ¡."
  
! #: info/indices.c:476 info/indices.c:890
  #, fuzzy, c-format
  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'..."
  msgstr "â€ž%sâ€œ tÃ¡rgymutatÃ³inak Ã¡tnÃ©zÃ©se..."
  
! #: info/indices.c:646
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
***************
*** 368,386 ****
  "Ã©pÃ­tÃ©se"
  
! #: info/indices.c:644 info/indices.c:646
  #, fuzzy
  msgid "Index apropos"
  msgstr "TÃ¡rgymutatÃ³ apropÃ³k:"
  
! #: info/indices.c:688
  #, fuzzy, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Nincs %stÃ¡rgymutatÃ³-bejegyzÃ©s, ami â€ž%s!H-t tartalmaznÃ¡."
  
! #: info/indices.c:797
  msgid "List all matches of a string in the index"
  msgstr ""
  
! #: info/indices.c:824 info/indices.c:826
  #, fuzzy
  msgid "Index topic"
--- 368,386 ----
  "Ã©pÃ­tÃ©se"
  
! #: info/indices.c:654 info/indices.c:656
  #, fuzzy
  msgid "Index apropos"
  msgstr "TÃ¡rgymutatÃ³ apropÃ³k:"
  
! #: info/indices.c:698
  #, fuzzy, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Nincs %stÃ¡rgymutatÃ³-bejegyzÃ©s, ami â€ž%s!H-t tartalmaznÃ¡."
  
! #: info/indices.c:807
  msgid "List all matches of a string in the index"
  msgstr ""
  
! #: info/indices.c:834 info/indices.c:836
  #, fuzzy
  msgid "Index topic"
***************
*** 392,446 ****
  msgstr "Nincs elÃ©rhetÅ‘ fÃ¡jl, amely tÃ¡rgymutatÃ³ja tartalmaznÃ¡  â€ž%sâ€œ-t."
  
! #: info/info-utils.c:892
  #, c-format
  msgid "Error converting file character encoding."
  msgstr ""
  
! #: info/info.c:222 info/session.c:2789
  #, fuzzy, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "Nincs â€ž%sâ€œ menÃ¼elem a(z) â€ž%sâ€œ oldalon."
  
! #: info/info.c:315
! #, fuzzy, c-format
! msgid "No file given for node '%s'."
! msgstr "Nincs menÃ¼ a(z) â€ž%sâ€œ oldalon."
! 
! #: info/info.c:364 info/info.c:1133
  #, fuzzy, c-format
  msgid "Cannot find node '%s'."
  msgstr "A(z) â€ž%sâ€œ oldal nem talÃ¡lhatÃ³."
  
! #: info/info.c:386
  #, c-format
  msgid "No program name given."
  msgstr ""
  
! #: info/info.c:577
  #, c-format
  msgid "invalid number: %s\n"
  msgstr ""
  
! #: info/info.c:757
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr ""
  
! #: info/info.c:764 info/infokey.c:537
  #, c-format
  msgid "%s: no such variable"
  msgstr ""
  
! #: info/info.c:770 info/infokey.c:539
  #, fuzzy, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "Egy Info vÃ¡ltozÃ³ beÃ¡llÃ­tÃ¡sa"
  
! #: info/info.c:782
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "A --help tÃ¶bb informÃ¡ciÃ³t ad.\n"
  
! #: info/info.c:804 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
--- 392,441 ----
  msgstr "Nincs elÃ©rhetÅ‘ fÃ¡jl, amely tÃ¡rgymutatÃ³ja tartalmaznÃ¡  â€ž%sâ€œ-t."
  
! #: info/info-utils.c:879
  #, c-format
  msgid "Error converting file character encoding."
  msgstr ""
  
! #: info/info.c:279 info/session.c:2789
  #, fuzzy, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "Nincs â€ž%sâ€œ menÃ¼elem a(z) â€ž%sâ€œ oldalon."
  
! #: info/info.c:416 info/info.c:1148
  #, fuzzy, c-format
  msgid "Cannot find node '%s'."
  msgstr "A(z) â€ž%sâ€œ oldal nem talÃ¡lhatÃ³."
  
! #: info/info.c:438
  #, c-format
  msgid "No program name given."
  msgstr ""
  
! #: info/info.c:636
  #, c-format
  msgid "invalid number: %s\n"
  msgstr ""
  
! #: info/info.c:816
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr ""
  
! #: info/info.c:823 info/infokey.c:540
  #, c-format
  msgid "%s: no such variable"
  msgstr ""
  
! #: info/info.c:829 info/infokey.c:542
  #, fuzzy, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "Egy Info vÃ¡ltozÃ³ beÃ¡llÃ­tÃ¡sa"
  
! #: info/info.c:841
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "A --help tÃ¶bb informÃ¡ciÃ³t ad.\n"
  
! #: info/info.c:860 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
***************
*** 452,461 ****
  msgstr ""
  
! #: info/info.c:981
  #, fuzzy, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "Nincs tÃ¡rgymutatÃ³ ehhez: %s\n"
  
! #: info/info.c:1034
  #, c-format
  msgid ""
--- 447,456 ----
  msgstr ""
  
! #: info/info.c:999
  #, fuzzy, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "Nincs tÃ¡rgymutatÃ³ ehhez: %s\n"
  
! #: info/info.c:1049
  #, c-format
  msgid ""
***************
*** 465,469 ****
  msgstr ""
  
! #: info/info.c:1040
  msgid ""
  "Options:\n"
--- 460,464 ----
  msgstr ""
  
! #: info/info.c:1055
  msgid ""
  "Options:\n"
***************
*** 476,480 ****
  msgstr ""
  
! #: info/info.c:1048
  msgid ""
  "  -h, --help                   display this help and exit.\n"
--- 471,475 ----
  msgstr ""
  
! #: info/info.c:1063
  msgid ""
  "  -h, --help                   display this help and exit.\n"
***************
*** 484,488 ****
  msgstr ""
  
! #: info/info.c:1054
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
--- 479,483 ----
  msgstr ""
  
! #: info/info.c:1069
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
***************
*** 492,500 ****
  msgstr ""
  
! #: info/info.c:1061
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr ""
  
! #: info/info.c:1065
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
--- 487,495 ----
  msgstr ""
  
! #: info/info.c:1076
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr ""
  
! #: info/info.c:1080
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
***************
*** 508,512 ****
  msgstr ""
  
! #: info/info.c:1074
  msgid ""
  "\n"
--- 503,507 ----
  msgstr ""
  
! #: info/info.c:1089
  msgid ""
  "\n"
***************
*** 518,522 ****
  msgstr ""
  
! #: info/info.c:1081
  msgid ""
  "\n"
--- 513,517 ----
  msgstr ""
  
! #: info/info.c:1096
  msgid ""
  "\n"
***************
*** 524,528 ****
  msgstr ""
  
! #: info/info.c:1084
  msgid ""
  "\n"
--- 519,523 ----
  msgstr ""
  
! #: info/info.c:1099
  msgid ""
  "\n"
***************
*** 540,544 ****
  msgstr ""
  
! #: info/info.c:1099 install-info/install-info.c:616 tp/texi2any.pl:861
  #, fuzzy
  msgid ""
--- 535,539 ----
  msgstr ""
  
! #: info/info.c:1114 install-info/install-info.c:616 tp/texi2any.pl:861
  #, fuzzy
  msgid ""
***************
*** 553,571 ****
  "Texinfo honlap: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1134
  #, fuzzy, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "A(z) â€ž(%s)%sâ€œ oldal nem talÃ¡lhatÃ³."
  
! #: info/info.c:1135
  msgid "Cannot find a window!"
  msgstr "Nem talÃ¡lhatÃ³ ablak!"
  
  # ATNEZNI LM
! #: info/info.c:1136
  msgid "Point doesn't appear within this window's node!"
  msgstr "A pont nem jelenik meg az ablakon lÃ¡thatÃ³ oldalon!"
  
! #: info/info.c:1137
  msgid "Cannot delete the last window."
  msgstr "Az utolsÃ³ ablak nem tÃ¶rÃ¶lhetÅ‘!"
--- 548,566 ----
  "Texinfo honlap: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1149
  #, fuzzy, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "A(z) â€ž(%s)%sâ€œ oldal nem talÃ¡lhatÃ³."
  
! #: info/info.c:1150
  msgid "Cannot find a window!"
  msgstr "Nem talÃ¡lhatÃ³ ablak!"
  
  # ATNEZNI LM
! #: info/info.c:1151
  msgid "Point doesn't appear within this window's node!"
  msgstr "A pont nem jelenik meg az ablakon lÃ¡thatÃ³ oldalon!"
  
! #: info/info.c:1152
  msgid "Cannot delete the last window."
  msgstr "Az utolsÃ³ ablak nem tÃ¶rÃ¶lhetÅ‘!"
***************
*** 573,577 ****
  # node = csomÃ³pont? LM
  # vagy csak pont? sas
! #: info/info.c:1138
  msgid "No menu in this node."
  msgstr "Nincs menÃ¼ ezen az oldalon."
--- 568,572 ----
  # node = csomÃ³pont? LM
  # vagy csak pont? sas
! #: info/info.c:1153
  msgid "No menu in this node."
  msgstr "Nincs menÃ¼ ezen az oldalon."
***************
*** 579,583 ****
  # node = csomÃ³pont? LM
  # vagy csak pont? sas
! #: info/info.c:1139
  msgid "No footnotes in this node."
  msgstr "Nincs lÃ¡bjegyezet ezen az oldalon."
--- 574,578 ----
  # node = csomÃ³pont? LM
  # vagy csak pont? sas
! #: info/info.c:1154
  msgid "No footnotes in this node."
  msgstr "Nincs lÃ¡bjegyezet ezen az oldalon."
***************
*** 585,598 ****
  # node = csomÃ³pont? LM
  # vagy csak pont? sas
! #: info/info.c:1140
  msgid "No cross references in this node."
  msgstr "Ez az oldal nem tartalmaz kereszthivatkozÃ¡st."
  
! #: info/info.c:1141
  #, fuzzy, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Nincs â€ž%sâ€œ utalÃ¡s ezen az oldalon."
  
! #: info/info.c:1142
  #, fuzzy, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
--- 580,593 ----
  # node = csomÃ³pont? LM
  # vagy csak pont? sas
! #: info/info.c:1155
  msgid "No cross references in this node."
  msgstr "Ez az oldal nem tartalmaz kereszthivatkozÃ¡st."
  
! #: info/info.c:1156
  #, fuzzy, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Nincs â€ž%sâ€œ utalÃ¡s ezen az oldalon."
  
! #: info/info.c:1157
  #, fuzzy, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
***************
*** 601,605 ****
  # smart = okos vagy smart = modern vagy smart = fejlett ? LM
  # sztem fejlett: sas
! #: info/info.c:1143
  #, fuzzy, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
--- 596,600 ----
  # smart = okos vagy smart = modern vagy smart = fejlett ? LM
  # sztem fejlett: sas
! #: info/info.c:1158
  #, fuzzy, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
***************
*** 608,612 ****
  # tegez/magÃ¡z? LM
  # talÃ¡n egy kicsit jobb a magÃ¡zÃ¡s itt, de ahogy tetszik, de 1sÃ©ges legyen - sas
! #: info/info.c:1144
  msgid "You are already at the last page of this node."
  msgstr "Ã–n mÃ¡r az oldal utolsÃ³ lapjÃ¡t lÃ¡tja."
--- 603,607 ----
  # tegez/magÃ¡z? LM
  # talÃ¡n egy kicsit jobb a magÃ¡zÃ¡s itt, de ahogy tetszik, de 1sÃ©ges legyen - sas
! #: info/info.c:1159
  msgid "You are already at the last page of this node."
  msgstr "Ã–n mÃ¡r az oldal utolsÃ³ lapjÃ¡t lÃ¡tja."
***************
*** 614,622 ****
  # tegez/magÃ¡z? LM
  # talÃ¡n egy kicsit jobb a magÃ¡zÃ¡s itt, de ahogy tetszik, de 1sÃ©ges legyen - sas
! #: info/info.c:1145
  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:1146
  msgid "Only one window."
  msgstr "Csak egy ablak."
--- 609,617 ----
  # tegez/magÃ¡z? LM
  # talÃ¡n egy kicsit jobb a magÃ¡zÃ¡s itt, de ahogy tetszik, de 1sÃ©ges legyen - sas
! #: info/info.c:1160
  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:1161
  msgid "Only one window."
  msgstr "Csak egy ablak."
***************
*** 626,630 ****
  # resulting window = lÃ©trejÃ¶vÅ‘/keletkezÅ‘ ablak
  # LM
! #: info/info.c:1147
  msgid "Resulting window would be too small."
  msgstr "Az eredmÃ©nyablak tÃºl kicsi lenne."
--- 621,625 ----
  # resulting window = lÃ©trejÃ¶vÅ‘/keletkezÅ‘ ablak
  # LM
! #: info/info.c:1162
  msgid "Resulting window would be too small."
  msgstr "Az eredmÃ©nyablak tÃºl kicsi lenne."
***************
*** 632,636 ****
  # tegez/magÃ¡z LM
  # 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:1148
  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!."
--- 627,631 ----
  # tegez/magÃ¡z LM
  # 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:1163
  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!."
***************
*** 967,971 ****
  msgstr "ismeretlen mÅ±velet: â€ž%sâ€œ."
  
! #: info/infokey.c:482
  #, c-format
  msgid "action name too long"
--- 962,966 ----
  msgstr "ismeretlen mÅ±velet: â€ž%sâ€œ."
  
! #: info/infokey.c:485
  #, c-format
  msgid "action name too long"
***************
*** 974,993 ****
  # action=muvelet? LM
  # Ã¡ltalÃ¡ban az - sas
! #: info/infokey.c:495
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "`%s' mÅ±velet utÃ¡ni extra karakterek"
  
! #: info/infokey.c:506
  #, c-format
  msgid "missing variable name"
  msgstr "hiÃ¡nyzÃ³ vÃ¡ltozÃ³nÃ©v"
  
! #: info/infokey.c:515
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "hiÃ¡nyzÃ³ â€ž=â€œ jel kÃ¶zvetlen egy vÃ¡ltozÃ³nÃ©v utÃ¡n"
  
! #: info/infokey.c:522
  #, c-format
  msgid "variable name too long"
--- 969,988 ----
  # action=muvelet? LM
  # Ã¡ltalÃ¡ban az - sas
! #: info/infokey.c:498
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "`%s' mÅ±velet utÃ¡ni extra karakterek"
  
! #: info/infokey.c:509
  #, c-format
  msgid "missing variable name"
  msgstr "hiÃ¡nyzÃ³ vÃ¡ltozÃ³nÃ©v"
  
! #: info/infokey.c:518
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "hiÃ¡nyzÃ³ â€ž=â€œ jel kÃ¶zvetlen egy vÃ¡ltozÃ³nÃ©v utÃ¡n"
  
! #: info/infokey.c:525
  #, c-format
  msgid "variable name too long"
***************
*** 997,1006 ****
  # long = nagy ? LM
  # nagy - kivÃ¡lÃ³ fordÃ­tÃ¡si stÃ­lus! - sas
! #: info/infokey.c:546
  #, c-format
  msgid "value too long"
  msgstr "tÃºl nagy Ã©rtÃ©k"
  
! #: info/infokey.c:592
  #, c-format
  msgid "\"%s\", line %u: "
--- 992,1001 ----
  # long = nagy ? LM
  # nagy - kivÃ¡lÃ³ fordÃ­tÃ¡si stÃ­lus! - sas
! #: info/infokey.c:549
  #, c-format
  msgid "value too long"
  msgstr "tÃºl nagy Ã©rtÃ©k"
  
! #: info/infokey.c:595
  #, c-format
  msgid "\"%s\", line %u: "
***************
*** 1348,1422 ****
  
  # FORDITANI
! #: info/session.c:2864
  msgid "Read a list of menus starting from dir and follow them"
  msgstr ""
  
! #: info/session.c:2866
  msgid "Follow menus: "
  msgstr "MenÃ¼k kÃ¶vetÃ©se: "
  
! #: info/session.c:2971
  msgid "Select the Next node"
  msgstr "KÃ¶vetkezÅ‘ oldal kivÃ¡lasztÃ¡sa"
  
! #: info/session.c:2978
  msgid "Select the Prev node"
  msgstr "ElÅ‘zÅ‘ oldal kivÃ¡lasztÃ¡sa"
  
! #: info/session.c:2985
  msgid "Select the Up node"
  msgstr "SzÃ¼lÅ‘ oldal kivÃ¡lasztÃ¡sa"
  
! #: info/session.c:2991
  msgid "Select the last node in this file"
  msgstr "A fÃ¡jl utolsÃ³ oldala kivÃ¡lasztÃ¡sa"
  
! #: info/session.c:3018 info/session.c:3051
  msgid "This window has no additional nodes"
  msgstr "Jelen ablaknak nincsenek tovÃ¡bbi oldalai"
  
! #: info/session.c:3024
  msgid "Select the first node in this file"
  msgstr "A fÃ¡jl elsÅ‘ oldala kivÃ¡lasztÃ¡sa"
  
  # node=oldal ? LM
! #: info/session.c:3158
  msgid "No more nodes within this document."
  msgstr "Nincs tÃ¶bb oldal e dokumentumban."
  
  # ATNEZNI LM
! #: info/session.c:3203 info/session.c:3243
  #, fuzzy
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "Nincs ElÅ‘zÅ‘ vagy Fel lehetÅ‘sÃ©g e ponthoz e dokumentumban."
  
! #: info/session.c:3256
  msgid "Move forwards or down through node structure"
  msgstr "MozgÃ¡s elÅ‘re vagy le az oldal szerkeztÃ©ben"
  
! #: info/session.c:3273
  msgid "Move backwards or up through node structure"
  msgstr "MozgÃ¡s hÃ¡tra vagy fel az oldal szerkezetÃ©ben"
  
! #: info/session.c:3296
  msgid "Read a node name and select it"
  msgstr "Egy oldalnÃ©v elolvasÃ¡sa Ã©s kivÃ¡lasztÃ¡sa"
  
! #: info/session.c:3350 info/session.c:3354
  msgid "Goto node: "
  msgstr "UgrÃ¡s az oldalra: "
  
  # FORDITANI
! #: info/session.c:3533
  msgid "Find the node describing program invocation"
  msgstr ""
  
  # FORDITANI
! #: info/session.c:3535
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr ""
  
! #: info/session.c:3580
  msgid "Read a manpage reference and select it"
  msgstr "Egy kÃ©zikÃ¶ny oldal hivatkozÃ¡s olvasÃ¡sa Ã©s kivÃ¡lasztÃ¡sa"
--- 1343,1417 ----
  
  # FORDITANI
! #: info/session.c:2870
  msgid "Read a list of menus starting from dir and follow them"
  msgstr ""
  
! #: info/session.c:2872
  msgid "Follow menus: "
  msgstr "MenÃ¼k kÃ¶vetÃ©se: "
  
! #: info/session.c:2977
  msgid "Select the Next node"
  msgstr "KÃ¶vetkezÅ‘ oldal kivÃ¡lasztÃ¡sa"
  
! #: info/session.c:2984
  msgid "Select the Prev node"
  msgstr "ElÅ‘zÅ‘ oldal kivÃ¡lasztÃ¡sa"
  
! #: info/session.c:2991
  msgid "Select the Up node"
  msgstr "SzÃ¼lÅ‘ oldal kivÃ¡lasztÃ¡sa"
  
! #: info/session.c:2997
  msgid "Select the last node in this file"
  msgstr "A fÃ¡jl utolsÃ³ oldala kivÃ¡lasztÃ¡sa"
  
! #: info/session.c:3024 info/session.c:3057
  msgid "This window has no additional nodes"
  msgstr "Jelen ablaknak nincsenek tovÃ¡bbi oldalai"
  
! #: info/session.c:3030
  msgid "Select the first node in this file"
  msgstr "A fÃ¡jl elsÅ‘ oldala kivÃ¡lasztÃ¡sa"
  
  # node=oldal ? LM
! #: info/session.c:3164
  msgid "No more nodes within this document."
  msgstr "Nincs tÃ¶bb oldal e dokumentumban."
  
  # ATNEZNI LM
! #: info/session.c:3209 info/session.c:3249
  #, fuzzy
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "Nincs ElÅ‘zÅ‘ vagy Fel lehetÅ‘sÃ©g e ponthoz e dokumentumban."
  
! #: info/session.c:3262
  msgid "Move forwards or down through node structure"
  msgstr "MozgÃ¡s elÅ‘re vagy le az oldal szerkeztÃ©ben"
  
! #: info/session.c:3279
  msgid "Move backwards or up through node structure"
  msgstr "MozgÃ¡s hÃ¡tra vagy fel az oldal szerkezetÃ©ben"
  
! #: info/session.c:3302
  msgid "Read a node name and select it"
  msgstr "Egy oldalnÃ©v elolvasÃ¡sa Ã©s kivÃ¡lasztÃ¡sa"
  
! #: info/session.c:3356 info/session.c:3360
  msgid "Goto node: "
  msgstr "UgrÃ¡s az oldalra: "
  
  # FORDITANI
! #: info/session.c:3539
  msgid "Find the node describing program invocation"
  msgstr ""
  
  # FORDITANI
! #: info/session.c:3541
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr ""
  
! #: info/session.c:3586
  msgid "Read a manpage reference and select it"
  msgstr "Egy kÃ©zikÃ¶ny oldal hivatkozÃ¡s olvasÃ¡sa Ã©s kivÃ¡lasztÃ¡sa"
***************
*** 1424,1459 ****
  # KÃ©zikÃ¶nyv ? LM
  # Manpage = kÃ©zikÃ¶nyv oldal. Adott esetben egyszerÅ±en manlapkÃ©nt vagy manoldalkÃ©nt is hivatkozhatunk rÃ¡juk, mivel kissÃ© elavultak. A GNU rendszer alapÃ©rtelemzett dokumentÃ¡ciÃ³formÃ¡tuma az Info. EzÃ©rt is olyan fontos a fordÃ­tÃ¡s, amit kÃ©szÃ­tesz :-) (Ã©s amibe ey icipicit besegÃ­tek ...) - sas
! #: info/session.c:3584
  msgid "Get Manpage: "
  msgstr "KÃ©zikÃ¶nyv oldal: "
  
! #: info/session.c:3605
  #, fuzzy
  msgid "Select the node 'Top' in this file"
  msgstr "LegfelsÅ‘ oldal kivÃ¡lasztÃ¡sa e fÃ¡jban"
  
! #: info/session.c:3611
  #, fuzzy
  msgid "Select the node '(dir)'"
  msgstr "A â€ž(dir)â€œ oldal kivÃ¡lasztÃ¡sa"
  
! #: info/session.c:3617
  msgid "Show full file name of node being displayed"
  msgstr ""
  
! #: info/session.c:3634
  msgid "Select the most recently selected node"
  msgstr "A legutÃ³bb vÃ¡lasztott oldal kivÃ¡lasztÃ¡sa"
  
! #: info/session.c:3639
  #, c-format
  msgid "No earlier node in history"
  msgstr ""
  
! #: info/session.c:3643
  msgid "Read the name of a file and select it"
  msgstr "FÃ¡jlnÃ©v beolvasÃ¡sa Ã©s kivÃ¡lasztÃ¡sa"
  
! #: info/session.c:3647
  msgid "Find file: "
  msgstr "FÃ¡jl keresÃ©se: "
--- 1419,1454 ----
  # KÃ©zikÃ¶nyv ? LM
  # Manpage = kÃ©zikÃ¶nyv oldal. Adott esetben egyszerÅ±en manlapkÃ©nt vagy manoldalkÃ©nt is hivatkozhatunk rÃ¡juk, mivel kissÃ© elavultak. A GNU rendszer alapÃ©rtelemzett dokumentÃ¡ciÃ³formÃ¡tuma az Info. EzÃ©rt is olyan fontos a fordÃ­tÃ¡s, amit kÃ©szÃ­tesz :-) (Ã©s amibe ey icipicit besegÃ­tek ...) - sas
! #: info/session.c:3590
  msgid "Get Manpage: "
  msgstr "KÃ©zikÃ¶nyv oldal: "
  
! #: info/session.c:3611
  #, fuzzy
  msgid "Select the node 'Top' in this file"
  msgstr "LegfelsÅ‘ oldal kivÃ¡lasztÃ¡sa e fÃ¡jban"
  
! #: info/session.c:3617
  #, fuzzy
  msgid "Select the node '(dir)'"
  msgstr "A â€ž(dir)â€œ oldal kivÃ¡lasztÃ¡sa"
  
! #: info/session.c:3623
  msgid "Show full file name of node being displayed"
  msgstr ""
  
! #: info/session.c:3640
  msgid "Select the most recently selected node"
  msgstr "A legutÃ³bb vÃ¡lasztott oldal kivÃ¡lasztÃ¡sa"
  
! #: info/session.c:3645
  #, c-format
  msgid "No earlier node in history"
  msgstr ""
  
! #: info/session.c:3649
  msgid "Read the name of a file and select it"
  msgstr "FÃ¡jlnÃ©v beolvasÃ¡sa Ã©s kivÃ¡lasztÃ¡sa"
  
! #: info/session.c:3653
  msgid "Find file: "
  msgstr "FÃ¡jl keresÃ©se: "
***************
*** 1461,1480 ****
  # talÃ¡lhatÃ³ / talÃ¡lom
  # a mondatszerkezet miatt itt jÃ³ a nem talÃ¡lhatÃ³ - sas
! #: info/session.c:3664
  #, fuzzy, c-format
  msgid "Cannot find '%s'."
  msgstr "â€ž%sâ€œ nem talÃ¡lhatÃ³."
  
! #: info/session.c:3713
  #, fuzzy, c-format
  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: %s"
  msgstr "hiba â€ž%sâ€œ Ã­rÃ¡sakor."
  
! #: info/session.c:3736
  #, fuzzy, c-format
  msgid "closing %s"
--- 1456,1475 ----
  # talÃ¡lhatÃ³ / talÃ¡lom
  # a mondatszerkezet miatt itt jÃ³ a nem talÃ¡lhatÃ³ - sas
! #: info/session.c:3670
  #, fuzzy, c-format
  msgid "Cannot find '%s'."
  msgstr "â€ž%sâ€œ nem talÃ¡lhatÃ³."
  
! #: info/session.c:3719
  #, fuzzy, c-format
  msgid "Could not create output file '%s'."
  msgstr "A kimeneti fÃ¡jl (â€ž%sâ€œ) nem hozhatÃ³ lÃ©tre."
  
! #: info/session.c:3733
  #, fuzzy, c-format
  msgid "error writing to %s: %s"
  msgstr "hiba â€ž%sâ€œ Ã­rÃ¡sakor."
  
! #: info/session.c:3742
  #, fuzzy, c-format
  msgid "closing %s"
***************
*** 1483,1487 ****
  # Ã­rÃ¡s / mentÃ©s ? LM
  # Ã­rÃ¡s - sas
! #: info/session.c:3785
  #, fuzzy, c-format
  msgid "writing node %s..."
--- 1478,1482 ----
  # Ã­rÃ¡s / mentÃ©s ? LM
  # Ã­rÃ¡s - sas
! #: info/session.c:3791
  #, fuzzy, c-format
  msgid "writing node %s..."
***************
*** 1490,1494 ****
  # pipe/csÅ‘ ? LM
  # elolvasva, nekem a csÅ‘ tetszik - sas
! #: info/session.c:3831
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "Ezen oldal tartalmÃ¡nak csÅ‘be irÃ¡nyÃ­tÃ¡sa INFO_PRINT_COMMAND -al"
--- 1485,1489 ----
  # pipe/csÅ‘ ? LM
  # elolvasva, nekem a csÅ‘ tetszik - sas
! #: info/session.c:3837
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "Ezen oldal tartalmÃ¡nak csÅ‘be irÃ¡nyÃ­tÃ¡sa INFO_PRINT_COMMAND -al"
***************
*** 1496,1533 ****
  # pipe / csÅ‘ ? LM
  # semmikÃ©pen nem pipe - sas
! #: info/session.c:3859
  #, fuzzy, c-format
  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..."
  msgstr "%s oldal nyomtatÃ¡sa..."
  
! #: info/session.c:3872
  #, fuzzy, c-format
  msgid "finished printing node %s"
  msgstr "%s oldal nyomtatÃ¡sa..."
  
! #: 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:4169
  msgid "Search continued from the end of the document."
  msgstr ""
  
! #: info/session.c:4174
  #, fuzzy
  msgid "Search continued from the beginning of the document."
--- 1491,1528 ----
  # pipe / csÅ‘ ? LM
  # semmikÃ©pen nem pipe - sas
! #: info/session.c:3865
  #, fuzzy, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Nem hozhatÃ³ lÃ©tre csÅ‘ ehhez:  â€ž%sâ€œ."
  
! #: info/session.c:3870
  #, fuzzy, c-format
  msgid "printing node %s..."
  msgstr "%s oldal nyomtatÃ¡sa..."
  
! #: info/session.c:3878
  #, fuzzy, c-format
  msgid "finished printing node %s"
  msgstr "%s oldal nyomtatÃ¡sa..."
  
! #: info/session.c:3910
  msgid "Toggle the usage of regular expressions in searches"
  msgstr ""
  
! #: info/session.c:3914
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr ""
  
! #: info/session.c:3915
  #, c-format
  msgid "Using literal strings for searches."
  msgstr ""
  
! #: info/session.c:4175
  msgid "Search continued from the end of the document."
  msgstr ""
  
! #: info/session.c:4180
  #, fuzzy
  msgid "Search continued from the beginning of the document."
***************
*** 1536,1658 ****
  # alÃ¡llomÃ¡ny ? LM
  # passz - sas
! #: info/session.c:4194
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "â€ž%sâ€œ alÃ¡llomÃ¡ny keresÃ©se..."
  
! #: info/session.c:4231
  msgid "Search failed."
  msgstr "A keresÃ©s sikertelen volt."
  
  # FORDITANI
! #: info/session.c:4248
  #, fuzzy, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%sa sztringhez [%s]: "
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Regexp search"
  msgstr ""
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Search"
  msgstr "KeresÃ©s"
  
  # Ã©rzÃ©kenyen / Ã©rzÃ©kenysÃ©g
! #: info/session.c:4250 info/session.c:4256
  #, fuzzy
  msgid " case-sensitively"
  msgstr "kis/nagybetÅ± Ã©rzÃ©kenyen"
  
! #: info/session.c:4251 info/session.c:4257
  #, fuzzy
  msgid " backward"
  msgstr "KeresÃ©s felfelÃ©"
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s: "
  msgstr ""
  
! #: info/session.c:4274
  msgid "Search string too short"
  msgstr ""
  
! #: info/session.c:4467
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4491 info/session.c:4601
  #, c-format
  msgid "No more matches."
  msgstr ""
  
! #: info/session.c:4628
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4649
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4653 info/session.c:4665
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4661
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4674
  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:4679
  msgid "Read a string and search for it"
  msgstr "SzÃ¶veg beolvasÃ¡sa Ã©s keresÃ©se "
  
! #: info/session.c:4685
  msgid "Read a string and search backward for it"
  msgstr "SzÃ¶veg beolvasÃ¡sa Ã©s keresÃ©se fel"
  
! #: info/session.c:4693
  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:4701 info/session.c:4746
  msgid "No previous search string"
  msgstr "Nincs korÃ¡bbi keresÃ©si feltÃ©tel"
  
! #: info/session.c:4738
  msgid "Repeat last search in the reverse direction"
  msgstr "UtolsÃ³ keresÃ©s ismÃ©tlÃ©se ellenirÃ¡nyban"
  
! #: info/session.c:4785
  msgid "Clear displayed search matches"
  msgstr ""
  
  # JAVITANI ?
! #: info/session.c:4802 info/session.c:4808
  msgid "Search interactively for a string as you type it"
  msgstr "Egy szÃ¶veg interaktÃ­v keresÃ©se gÃ©pelÃ©skor"
  
! #: info/session.c:4928
  #, fuzzy
  msgid "Regexp I-search backward: "
  msgstr "I.-keresÃ©s fel: "
  
! #: info/session.c:4929
  msgid "I-search backward: "
  msgstr "I.-keresÃ©s fel: "
  
! #: info/session.c:4931
  #, fuzzy
  msgid "Regexp I-search: "
  msgstr "I.-keresÃ©s: "
  
! #: info/session.c:4932
  msgid "I-search: "
  msgstr "I.-keresÃ©s: "
--- 1531,1653 ----
  # alÃ¡llomÃ¡ny ? LM
  # passz - sas
! #: info/session.c:4200
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "â€ž%sâ€œ alÃ¡llomÃ¡ny keresÃ©se..."
  
! #: info/session.c:4237
  msgid "Search failed."
  msgstr "A keresÃ©s sikertelen volt."
  
  # FORDITANI
! #: info/session.c:4254
  #, fuzzy, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%sa sztringhez [%s]: "
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Regexp search"
  msgstr ""
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Search"
  msgstr "KeresÃ©s"
  
  # Ã©rzÃ©kenyen / Ã©rzÃ©kenysÃ©g
! #: info/session.c:4256 info/session.c:4262
  #, fuzzy
  msgid " case-sensitively"
  msgstr "kis/nagybetÅ± Ã©rzÃ©kenyen"
  
! #: info/session.c:4257 info/session.c:4263
  #, fuzzy
  msgid " backward"
  msgstr "KeresÃ©s felfelÃ©"
  
! #: info/session.c:4260
  #, c-format
  msgid "%s%s%s: "
  msgstr ""
  
! #: info/session.c:4280
  msgid "Search string too short"
  msgstr ""
  
! #: info/session.c:4473
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4497 info/session.c:4607
  #, c-format
  msgid "No more matches."
  msgstr ""
  
! #: info/session.c:4634
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4655
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4659 info/session.c:4671
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4667
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4680
  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:4685
  msgid "Read a string and search for it"
  msgstr "SzÃ¶veg beolvasÃ¡sa Ã©s keresÃ©se "
  
! #: info/session.c:4691
  msgid "Read a string and search backward for it"
  msgstr "SzÃ¶veg beolvasÃ¡sa Ã©s keresÃ©se fel"
  
! #: info/session.c:4699
  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:4707 info/session.c:4752
  msgid "No previous search string"
  msgstr "Nincs korÃ¡bbi keresÃ©si feltÃ©tel"
  
! #: info/session.c:4744
  msgid "Repeat last search in the reverse direction"
  msgstr "UtolsÃ³ keresÃ©s ismÃ©tlÃ©se ellenirÃ¡nyban"
  
! #: info/session.c:4791
  msgid "Clear displayed search matches"
  msgstr ""
  
  # JAVITANI ?
! #: info/session.c:4808 info/session.c:4814
  msgid "Search interactively for a string as you type it"
  msgstr "Egy szÃ¶veg interaktÃ­v keresÃ©se gÃ©pelÃ©skor"
  
! #: info/session.c:4934
  #, fuzzy
  msgid "Regexp I-search backward: "
  msgstr "I.-keresÃ©s fel: "
  
! #: info/session.c:4935
  msgid "I-search backward: "
  msgstr "I.-keresÃ©s fel: "
  
! #: info/session.c:4937
  #, fuzzy
  msgid "Regexp I-search: "
  msgstr "I.-keresÃ©s: "
  
! #: info/session.c:4938
  msgid "I-search: "
  msgstr "I.-keresÃ©s: "
***************
*** 1660,1686 ****
  # checkit
  # FORDITANI
! #: info/session.c:4957 info/session.c:4960
  msgid "Failing "
  msgstr "Sikertelen"
  
! #: info/session.c:5326
  msgid "Cancel current operation"
  msgstr "Jelen mÅ±velet tÃ¶rlÃ©se"
  
! #: info/session.c:5333
  msgid "Quit"
  msgstr "KilÃ©pÃ©s"
  
! #: info/session.c:5338
  #, fuzzy
  msgid "Display version of Info being run"
  msgstr "kiÃ­rja a verziÃ³informÃ¡ciÃ³t Ã©s kilÃ©p"
  
! #: info/session.c:5340
  #, c-format
  msgid "GNU Info version %s"
  msgstr ""
  
! #: info/session.c:5345
  msgid "Redraw the display"
  msgstr "KÃ©pernyÅ‘ frissÃ­tÃ©se"
--- 1655,1681 ----
  # checkit
  # FORDITANI
! #: info/session.c:4963 info/session.c:4966
  msgid "Failing "
  msgstr "Sikertelen"
  
! #: info/session.c:5332
  msgid "Cancel current operation"
  msgstr "Jelen mÅ±velet tÃ¶rlÃ©se"
  
! #: info/session.c:5339
  msgid "Quit"
  msgstr "KilÃ©pÃ©s"
  
! #: info/session.c:5344
  #, fuzzy
  msgid "Display version of Info being run"
  msgstr "kiÃ­rja a verziÃ³informÃ¡ciÃ³t Ã©s kilÃ©p"
  
! #: info/session.c:5346
  #, c-format
  msgid "GNU Info version %s"
  msgstr ""
  
! #: info/session.c:5351
  msgid "Redraw the display"
  msgstr "KÃ©pernyÅ‘ frissÃ­tÃ©se"
***************
*** 1688,1719 ****
  # 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:5382
  msgid "Quit using Info"
  msgstr "Az Info hasznÃ¡latÃ¡nak befejezÃ©se"
  
! #: info/session.c:5398
  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:5409
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Ismeretlen parancs (%s)."
  
! #: info/session.c:5412
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\" Ã©rvÃ©nytelen"
  
! #: info/session.c:5413
  #, fuzzy, c-format
  msgid "'%s' is invalid"
  msgstr "â€ž%sâ€œ Ã©rvÃ©nytelen"
  
! #: info/session.c:5731
  msgid "Add this digit to the current numeric argument"
  msgstr "Add hozzÃ¡ ezt a szÃ¡mjegyet az aktuÃ¡lis numerikus argumentumhoz"
  
! #: info/session.c:5738
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "Start (vagy szorozd be 4-gyel) az aktuÃ¡lis numerikus argumentumot"
--- 1683,1714 ----
  # 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:5388
  msgid "Quit using Info"
  msgstr "Az Info hasznÃ¡latÃ¡nak befejezÃ©se"
  
! #: info/session.c:5404
  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:5415
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Ismeretlen parancs (%s)."
  
! #: info/session.c:5418
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\" Ã©rvÃ©nytelen"
  
! #: info/session.c:5419
  #, fuzzy, c-format
  msgid "'%s' is invalid"
  msgstr "â€ž%sâ€œ Ã©rvÃ©nytelen"
  
! #: info/session.c:5737
  msgid "Add this digit to the current numeric argument"
  msgstr "Add hozzÃ¡ ezt a szÃ¡mjegyet az aktuÃ¡lis numerikus argumentumhoz"
  
! #: info/session.c:5744
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "Start (vagy szorozd be 4-gyel) az aktuÃ¡lis numerikus argumentumot"
***************
*** 1853,1870 ****
  msgstr "%s beÃ¡llÃ­tÃ¡sa (%s): "
  
! #: info/window.c:959
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), sor ----, "
  
- #: info/window.c:966
- #, fuzzy, c-format
- msgid "-%s---Info: %s, %ld lines --%s--"
- msgstr "-%s---Info: %s, %d sor --%s--"
- 
- #: info/window.c:970
- #, fuzzy, c-format
- msgid "-%s---Info: (%s)%s, %ld lines --%s--"
- msgstr "-%s%s-Info: (%s)%s, %d sor --%s--"
- 
  #: install-info/install-info.c:292
  #, c-format
--- 1848,1855 ----
  msgstr "%s beÃ¡llÃ­tÃ¡sa (%s): "
  
! #: info/window.c:909
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), sor ----, "
  
  #: install-info/install-info.c:292
  #, c-format
***************
*** 1990,1994 ****
  "\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"
--- 1975,1979 ----
  "\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"
***************
*** 2069,2188 ****
  msgstr "â€ž%sâ€œ-hez nem talÃ¡ltam bejegyzÃ©st; nincs mit tÃ¶rÃ¶lni"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:855
! #: tp/Texinfo/Convert/Converter.pm:893 tp/Texinfo/Convert/Converter.pm:1204
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6504
! #: tp/Texinfo/Convert/HTML.pm:6528 tp/Texinfo/Convert/HTML.pm:6905
! #: tp/Texinfo/Convert/HTML.pm:6963 tp/Texinfo/Convert/HTML.pm:7041
! #: tp/Texinfo/Convert/HTML.pm:7118 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:546
! #: tp/Texinfo/Convert/TexinfoXML.pm:457
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "%s: A CSS fÃ¡jl nem nyithatÃ³ meg: %s"
  
! #: tp/Texinfo/Common.pm:881
  msgid "recursion is always allowed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:882
  msgid "arguments are quoted by default"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1105
  #, fuzzy, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s nem egy ISO 639 szabvÃ¡ny szerinti nyelvkÃ³d"
  
! #: tp/Texinfo/Common.pm:1110
  #, fuzzy, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s nem egy ISO 639 szabvÃ¡ny szerinti nyelvkÃ³d"
  
! #: tp/Texinfo/Common.pm:1128
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1151
  #, fuzzy, perl-format
  msgid "could not read %s: %s"
  msgstr "%s: A CSS fÃ¡jl nem nyithatÃ³ meg: %s"
  
! #: tp/Texinfo/Common.pm:1170
  #, fuzzy, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "hiba a(z) â€ž%sâ€œ output fÃ¡jl bezÃ¡rÃ¡sakor"
  
! #: tp/Texinfo/Common.pm:1176 tp/Texinfo/Parser.pm:3353
  #, fuzzy, perl-format
  msgid "@%s: could not find %s"
  msgstr "%s: A CSS fÃ¡jl nem nyithatÃ³ meg: %s"
  
! #: tp/Texinfo/Common.pm:1520
! #, fuzzy, perl-format
! 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/Common.pm:1548
! #, fuzzy
! msgid "missing type"
! msgstr "hiÃ¡nyzÃ³ mÅ±veletnÃ©v"
! 
! #: tp/Texinfo/Common.pm:1551
! #, fuzzy, perl-format
! msgid "unrecognized type: %s"
! msgstr "%s: ismeretlen opciÃ³ â€ž--%sâ€œ\n"
! 
! #: tp/Texinfo/Common.pm:1568
! #, fuzzy, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr "hiba a(z) â€ž%sâ€œ output fÃ¡jl bezÃ¡rÃ¡sakor"
! 
! #: tp/Texinfo/Common.pm:1603
  msgid "no node to be renamed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1614
  msgid "nodes without a new name at the end of file"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1624 tp/Texinfo/Parser.pm:926
  #, fuzzy, perl-format
  msgid "could not open %s: %s"
  msgstr "%s: A CSS fÃ¡jl nem nyithatÃ³ meg: %s"
  
! #: tp/Texinfo/Common.pm:2144
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:395 tp/Texinfo/Convert/Converter.pm:414
  #, fuzzy, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "VÃ¡ltozÃ³ beÃ¡llÃ­tÃ¡sa:"
  
! #: tp/Texinfo/Convert/Converter.pm:794
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:876 tp/Texinfo/Convert/Converter.pm:909
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:6931
! #: tp/Texinfo/Convert/HTML.pm:6989 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:476 tp/Texinfo/Parser.pm:2035
  #, fuzzy, perl-format
  msgid "error on closing %s: %s"
  msgstr "hiba a(z) â€ž%sâ€œ output fÃ¡jl bezÃ¡rÃ¡sakor"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, fuzzy, perl-format
  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:995
  #, fuzzy, perl-format
  msgid "could not create directory `%s': %s"
--- 2054,2162 ----
  msgstr "â€ž%sâ€œ-hez nem talÃ¡ltam bejegyzÃ©st; nincs mit tÃ¶rÃ¶lni"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:847
! #: tp/Texinfo/Convert/Converter.pm:885 tp/Texinfo/Convert/Converter.pm:1196
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6573
! #: tp/Texinfo/Convert/HTML.pm:6597 tp/Texinfo/Convert/HTML.pm:6978
! #: tp/Texinfo/Convert/HTML.pm:7037 tp/Texinfo/Convert/HTML.pm:7115
! #: tp/Texinfo/Convert/HTML.pm:7192 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:547
! #: tp/Texinfo/Convert/TexinfoXML.pm:458
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "%s: A CSS fÃ¡jl nem nyithatÃ³ meg: %s"
  
! #: tp/Texinfo/Common.pm:862
  msgid "recursion is always allowed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:863
  msgid "arguments are quoted by default"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:866
! msgid ""
! "move your @contents command if you want the contents after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:869
! msgid ""
! "move your @shortcontents and @contents commands if you want the contents "
! "after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:1093
  #, fuzzy, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s nem egy ISO 639 szabvÃ¡ny szerinti nyelvkÃ³d"
  
! #: tp/Texinfo/Common.pm:1098
  #, fuzzy, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s nem egy ISO 639 szabvÃ¡ny szerinti nyelvkÃ³d"
  
! #: tp/Texinfo/Common.pm:1116
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1139
  #, fuzzy, perl-format
  msgid "could not read %s: %s"
  msgstr "%s: A CSS fÃ¡jl nem nyithatÃ³ meg: %s"
  
! #: tp/Texinfo/Common.pm:1158
  #, fuzzy, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "hiba a(z) â€ž%sâ€œ output fÃ¡jl bezÃ¡rÃ¡sakor"
  
! #: tp/Texinfo/Common.pm:1164 tp/Texinfo/Parser.pm:3193
  #, fuzzy, perl-format
  msgid "@%s: could not find %s"
  msgstr "%s: A CSS fÃ¡jl nem nyithatÃ³ meg: %s"
  
! #: tp/Texinfo/Common.pm:1637
  msgid "no node to be renamed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1648
  msgid "nodes without a new name at the end of file"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1658 tp/Texinfo/Parser.pm:899
  #, fuzzy, perl-format
  msgid "could not open %s: %s"
  msgstr "%s: A CSS fÃ¡jl nem nyithatÃ³ meg: %s"
  
! #: tp/Texinfo/Common.pm:2178
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:387 tp/Texinfo/Convert/Converter.pm:406
  #, fuzzy, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "VÃ¡ltozÃ³ beÃ¡llÃ­tÃ¡sa:"
  
! #: tp/Texinfo/Convert/Converter.pm:786
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:868 tp/Texinfo/Convert/Converter.pm:901
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:7004
! #: tp/Texinfo/Convert/HTML.pm:7063 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:477 tp/Texinfo/Parser.pm:1996
  #, fuzzy, perl-format
  msgid "error on closing %s: %s"
  msgstr "hiba a(z) â€ž%sâ€œ output fÃ¡jl bezÃ¡rÃ¡sakor"
  
! #: tp/Texinfo/Convert/Converter.pm:979
  #, fuzzy, perl-format
  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:987
  #, fuzzy, perl-format
  msgid "could not create directory `%s': %s"
***************
*** 2194,2265 ****
  msgstr "@image a(z) â€ž%sâ€œ fÃ¡jl nem olvashatÃ³: %s"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5388
  #, fuzzy
  msgid "no argument specified for @U"
  msgstr "A(z) â€ž%c%sâ€œ parancshoz nem lett oldalnÃ©v rendelve"
  
! #: tp/Texinfo/Convert/HTML.pm:1683
  #, fuzzy, perl-format
  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:2371
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4888
  msgid "string not closed in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4890
  #, fuzzy
  msgid "--css-include ended in comment"
  msgstr "%s:%d: --css-file kommenttel vÃ©gzÅ‘dik"
  
! #: tp/Texinfo/Convert/HTML.pm:4892
  msgid "@import not finished in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4918
  #, perl-format
  msgid "CSS file %s not found"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4924
  #, fuzzy, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "%s: A CSS fÃ¡jl nem nyithatÃ³ meg: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:4934
  #, fuzzy, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "hiba a(z) â€ž%sâ€œ output fÃ¡jl bezÃ¡rÃ¡sakor"
  
! #: tp/Texinfo/Convert/HTML.pm:5801 tp/Texinfo/Convert/HTML.pm:5805
  #, fuzzy, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "Nincs tÃ¡rgymutatÃ³ ehhez: %s\n"
  
! #: tp/Texinfo/Convert/HTML.pm:6499
  #, fuzzy, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "hiba a(z) â€ž%sâ€œ output fÃ¡jl bezÃ¡rÃ¡sakor"
  
! #: tp/Texinfo/Convert/HTML.pm:6523
  #, fuzzy, perl-format
  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:6638
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6839
  msgid "must specify a title with a title command or @top"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7048
  #, fuzzy, perl-format
  msgid "error on closing redirection node file %s: %s"
--- 2168,2261 ----
  msgstr "@image a(z) â€ž%sâ€œ fÃ¡jl nem olvashatÃ³: %s"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5225
  #, fuzzy
  msgid "no argument specified for @U"
  msgstr "A(z) â€ž%c%sâ€œ parancshoz nem lett oldalnÃ©v rendelve"
  
! #: tp/Texinfo/Convert/HTML.pm:1715
  #, fuzzy, perl-format
  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:2399
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4629
! #, fuzzy, perl-format
! 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:4657
! #, fuzzy
! msgid "missing type"
! msgstr "hiÃ¡nyzÃ³ mÅ±veletnÃ©v"
! 
! #: tp/Texinfo/Convert/HTML.pm:4660
! #, fuzzy, perl-format
! msgid "unrecognized type: %s"
! msgstr "%s: ismeretlen opciÃ³ â€ž--%sâ€œ\n"
! 
! #: tp/Texinfo/Convert/HTML.pm:4677
! #, fuzzy, perl-format
! 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:4962
  msgid "string not closed in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4964
  #, fuzzy
  msgid "--css-include ended in comment"
  msgstr "%s:%d: --css-file kommenttel vÃ©gzÅ‘dik"
  
! #: tp/Texinfo/Convert/HTML.pm:4966
  msgid "@import not finished in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4992
  #, perl-format
  msgid "CSS file %s not found"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4998
  #, fuzzy, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "%s: A CSS fÃ¡jl nem nyithatÃ³ meg: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5008
  #, fuzzy, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "hiba a(z) â€ž%sâ€œ output fÃ¡jl bezÃ¡rÃ¡sakor"
  
! #: tp/Texinfo/Convert/HTML.pm:5870 tp/Texinfo/Convert/HTML.pm:5874
  #, fuzzy, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "Nincs tÃ¡rgymutatÃ³ ehhez: %s\n"
  
! #: tp/Texinfo/Convert/HTML.pm:6568
  #, fuzzy, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "hiba a(z) â€ž%sâ€œ output fÃ¡jl bezÃ¡rÃ¡sakor"
  
! #: tp/Texinfo/Convert/HTML.pm:6592
  #, fuzzy, perl-format
  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:6707
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6912
  msgid "must specify a title with a title command or @top"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7122
  #, fuzzy, perl-format
  msgid "error on closing redirection node file %s: %s"
***************
*** 2267,2295 ****
  
  # ATNEZNI LM
! #: tp/Texinfo/Convert/HTML.pm:7073
  #, 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:7079
  #, fuzzy, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "nem hivatkozott oldal â€ž%sâ€œ"
  
! #: tp/Texinfo/Convert/HTML.pm:7093
  #, perl-format
  msgid "target node (new name for `%s') not in document: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7125
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7163
  msgid "empty node name"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7165 tp/Texinfo/Parser.pm:3697
  #, perl-format
  msgid "syntax for an external node used for `%s'"
--- 2263,2291 ----
  
  # ATNEZNI LM
! #: tp/Texinfo/Convert/HTML.pm:7147
  #, 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:7153
  #, fuzzy, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "nem hivatkozott oldal â€ž%sâ€œ"
  
! #: tp/Texinfo/Convert/HTML.pm:7167
  #, perl-format
  msgid "target node (new name for `%s') not in document: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7199
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7237
  msgid "empty node name"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7239 tp/Texinfo/Parser.pm:3542
  #, perl-format
  msgid "syntax for an external node used for `%s'"
***************
*** 2327,2356 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1334
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1381 tp/Texinfo/Parser.pm:2722
  #, fuzzy, perl-format
  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:1495
  #, fuzzy, perl-format
  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:1500
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "@image a(z) â€ž%sâ€œ fÃ¡jl nem olvashatÃ³: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1523
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1931
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
--- 2323,2352 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1335
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1382 tp/Texinfo/Parser.pm:2568
  #, fuzzy, perl-format
  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:1496
  #, fuzzy, perl-format
  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:1501
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "@image a(z) â€ž%sâ€œ fÃ¡jl nem olvashatÃ³: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1524
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1932
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
***************
*** 2358,2518 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2161
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2193
  #, fuzzy, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "Nincs %stÃ¡rgymutatÃ³-bejegyzÃ©s, ami â€ž%s!H-t tartalmaznÃ¡."
  
! #: tp/Texinfo/Convert/Plaintext.pm:2226
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2272
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2275
  msgid "`.' or `,' must follow @xref"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3118
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3129
  msgid "menu entry node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3145
  msgid "menu entry name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:910
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1160 tp/Texinfo/Structuring.pm:594
  #, perl-format
  msgid "multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1194
  #, perl-format
! msgid "bad syntax for @%s argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1210
  #, perl-format
! msgid "bad or empty @%s formal argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1219 tp/Texinfo/Parser.pm:4856
! #: tp/Texinfo/Parser.pm:4882 tp/Texinfo/Parser.pm:5671
! #: tp/Texinfo/Parser.pm:5687 tp/Texinfo/Parser.pm:5702
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s egy nevet igÃ©nyel"
  
! #: tp/Texinfo/Parser.pm:1223 tp/Texinfo/Parser.pm:4859
! #: tp/Texinfo/Parser.pm:4885 tp/Texinfo/Parser.pm:5674
! #: tp/Texinfo/Parser.pm:5690 tp/Texinfo/Parser.pm:5705
  #, fuzzy, perl-format
  msgid "bad name for @%s"
  msgstr "Rossz argumentum ide: @%s"
  
! #: tp/Texinfo/Parser.pm:1341
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1345
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1350
! #, perl-format
! msgid "%c%s missing close brace"
  msgstr "%c%s hiÃ¡nyzÃ³ kapcsos bezÃ¡rÃ³jel"
  
! #: tp/Texinfo/Parser.pm:1354
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1476
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1544
  msgid "@itemx must follow @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1712
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1743
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "â€ž@endâ€œ-t vÃ¡rtam â€ž%sâ€œ, de â€ž%sâ€œ-t talÃ¡ltam"
  
! #: tp/Texinfo/Parser.pm:1746
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1750
  #, fuzzy, perl-format
  msgid "no matching `%cend %s'"
  msgstr "Nincs egyezÅ‘ â€ž%cend %sâ€œ"
  
! #: tp/Texinfo/Parser.pm:1776 tp/Texinfo/Parser.pm:5204
! #: tp/Texinfo/Parser.pm:5470
  #, fuzzy, perl-format
  msgid "misplaced %c"
  msgstr "Rossz helyen levÅ‘ %c"
  
! #: tp/Texinfo/Parser.pm:1874 tp/Texinfo/Parser.pm:3312
  #, fuzzy, perl-format
  msgid "unmatched `%c%s'"
  msgstr "Nem egyezÅ‘ â€ž%c%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:2110
  #, fuzzy, perl-format
  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/Parser.pm:2132
  #, fuzzy, perl-format
! msgid "@%s missing close brace"
  msgstr "%c%s hiÃ¡nyzÃ³ kapcsos bezÃ¡rÃ³jel"
  
! #: tp/Texinfo/Parser.pm:2140
  #, fuzzy, perl-format
  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/Parser.pm:2175
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2650
  #, fuzzy, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "a(z) â€ž%sâ€œ makrÃ³ mÃ¡r korÃ¡bban definiÃ¡lt lett"
  
! #: tp/Texinfo/Parser.pm:2655
  #, fuzzy, perl-format
  msgid "here is the previous definition as @%s"
--- 2354,2514 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2162
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2194
  #, fuzzy, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "Nincs %stÃ¡rgymutatÃ³-bejegyzÃ©s, ami â€ž%s!H-t tartalmaznÃ¡."
  
! #: tp/Texinfo/Convert/Plaintext.pm:2227
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2273
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2276
  msgid "`.' or `,' must follow @xref"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3086
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3097
  msgid "menu entry node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3113
  msgid "menu entry name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:883
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1125 tp/Texinfo/Structuring.pm:595
  #, perl-format
  msgid "multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1166
  #, perl-format
! msgid "bad or empty @%s formal argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1176
  #, perl-format
! msgid "bad syntax for @%s argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1183 tp/Texinfo/Parser.pm:4707
! #: tp/Texinfo/Parser.pm:4733 tp/Texinfo/Parser.pm:5565
! #: tp/Texinfo/Parser.pm:5578 tp/Texinfo/Parser.pm:5592
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s egy nevet igÃ©nyel"
  
! #: tp/Texinfo/Parser.pm:1187 tp/Texinfo/Parser.pm:4710
! #: tp/Texinfo/Parser.pm:4736 tp/Texinfo/Parser.pm:5568
! #: tp/Texinfo/Parser.pm:5581 tp/Texinfo/Parser.pm:5595
  #, fuzzy, perl-format
  msgid "bad name for @%s"
  msgstr "Rossz argumentum ide: @%s"
  
! #: tp/Texinfo/Parser.pm:1305
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1309
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1314
! #, fuzzy, perl-format
! msgid "%c%s missing closing brace"
  msgstr "%c%s hiÃ¡nyzÃ³ kapcsos bezÃ¡rÃ³jel"
  
! #: tp/Texinfo/Parser.pm:1318
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1440
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1508
  msgid "@itemx must follow @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1676
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1707
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "â€ž@endâ€œ-t vÃ¡rtam â€ž%sâ€œ, de â€ž%sâ€œ-t talÃ¡ltam"
  
! #: tp/Texinfo/Parser.pm:1710
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1714
  #, fuzzy, perl-format
  msgid "no matching `%cend %s'"
  msgstr "Nincs egyezÅ‘ â€ž%cend %sâ€œ"
  
! #: tp/Texinfo/Parser.pm:1738 tp/Texinfo/Parser.pm:5070
! #: tp/Texinfo/Parser.pm:5308
  #, fuzzy, perl-format
  msgid "misplaced %c"
  msgstr "Rossz helyen levÅ‘ %c"
  
! #: tp/Texinfo/Parser.pm:1835 tp/Texinfo/Parser.pm:3148
  #, fuzzy, perl-format
  msgid "unmatched `%c%s'"
  msgstr "Nem egyezÅ‘ â€ž%c%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:2072
  #, fuzzy, perl-format
  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/Parser.pm:2094
  #, fuzzy, perl-format
! msgid "@%s missing closing brace"
  msgstr "%c%s hiÃ¡nyzÃ³ kapcsos bezÃ¡rÃ³jel"
  
! #: tp/Texinfo/Parser.pm:2102
  #, fuzzy, perl-format
  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/Parser.pm:2138
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2501
  #, fuzzy, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "a(z) â€ž%sâ€œ makrÃ³ mÃ¡r korÃ¡bban definiÃ¡lt lett"
  
! #: tp/Texinfo/Parser.pm:2506
  #, fuzzy, perl-format
  msgid "here is the previous definition as @%s"
***************
*** 2521,2551 ****
  # action=mÅ±velet ? LM
  # Ã¡ltalÃ¡ban az - sas
! #: tp/Texinfo/Parser.pm:3016
  #, fuzzy, perl-format
  msgid "missing name for @%s"
  msgstr "hiÃ¡nyzÃ³ mÅ±veletnÃ©v"
  
! #: tp/Texinfo/Parser.pm:3021
  #, perl-format
  msgid "missing category for @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3073
  #, fuzzy, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "Rossz argumentum ide: %s: %s"
  
! #: tp/Texinfo/Parser.pm:3089
  #, fuzzy
  msgid "empty multitable"
  msgstr "%s: Ã¼res fÃ¡jl"
  
! #: tp/Texinfo/Parser.pm:3145 tp/Texinfo/Parser.pm:5784
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s"
  msgstr "Rossz argumentum ide: @%s"
  
! #: tp/Texinfo/Parser.pm:3151 tp/Texinfo/Parser.pm:5806
! #: tp/Texinfo/Parser.pm:5818
  #, fuzzy, perl-format
  msgid "bad argument to @%s"
--- 2517,2547 ----
  # action=mÅ±velet ? LM
  # Ã¡ltalÃ¡ban az - sas
! #: tp/Texinfo/Parser.pm:2850
  #, fuzzy, perl-format
  msgid "missing name for @%s"
  msgstr "hiÃ¡nyzÃ³ mÅ±veletnÃ©v"
  
! #: tp/Texinfo/Parser.pm:2855
  #, perl-format
  msgid "missing category for @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2890
  #, fuzzy, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "Rossz argumentum ide: %s: %s"
  
! #: tp/Texinfo/Parser.pm:2905
  #, fuzzy
  msgid "empty multitable"
  msgstr "%s: Ã¼res fÃ¡jl"
  
! #: tp/Texinfo/Parser.pm:2959 tp/Texinfo/Parser.pm:5673
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s"
  msgstr "Rossz argumentum ide: @%s"
  
! #: tp/Texinfo/Parser.pm:2965 tp/Texinfo/Parser.pm:5694
! #: tp/Texinfo/Parser.pm:5705
  #, fuzzy, perl-format
  msgid "bad argument to @%s"
***************
*** 2553,2679 ****
  
  # %citem ist ein Texinfo-Befehl
! #: tp/Texinfo/Parser.pm:3162
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s egy argumentumot igÃ©nyel: %citem formÃ¡zÃ¡sÃ¡t"
  
! #: tp/Texinfo/Parser.pm:3167
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3202
  #, fuzzy, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "%s: OpciÃ³ â€ž--%sâ€œ nem fogad argumentumot\n"
  
! #: tp/Texinfo/Parser.pm:3290 tp/Texinfo/Parser.pm:3429
! #: tp/Texinfo/Parser.pm:5777
  #, fuzzy, perl-format
  msgid "@%s missing argument"
  msgstr "%s: hiÃ¡nyzÃ³ fÃ¡jl argumentum.\n"
  
! #: tp/Texinfo/Parser.pm:3302
  #, fuzzy, perl-format
  msgid "unknown @end %s"
  msgstr "Ismeretlen tÃ¡rgymutatÃ³ â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:3324 tp/Texinfo/Parser.pm:3943
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "Rossz argumentum ide: %s: %s"
  
! #: tp/Texinfo/Parser.pm:3329 tp/Texinfo/Parser.pm:5861
! #: tp/Texinfo/Parser.pm:5906 tp/Texinfo/Parser.pm:5935
! #: tp/Texinfo/Parser.pm:5976 tp/Texinfo/Parser.pm:6055
  #, fuzzy, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "Rossz argumentum ide: %s: %s"
  
! #: tp/Texinfo/Parser.pm:3348
  #, fuzzy, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "%s: A CSS fÃ¡jl nem nyithatÃ³ meg: %s"
  
! #: tp/Texinfo/Parser.pm:3360
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3369
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "ismeretlen kÃ³dolÃ¡si nÃ©v: â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:3516
  #, perl-format
  msgid "@%s after the first element"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3523
  #, fuzzy, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "A(z) @%s -nek nincs Ã©rtelme a â€ž@titlepageâ€œ kÃ¶rnyezeten kÃ­vÃ¼l"
  
! #: tp/Texinfo/Parser.pm:3563
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3575
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3677
  #, fuzzy, perl-format
  msgid "empty argument in @%s"
  msgstr "Rossz argumentum ide: @%s"
  
! #: tp/Texinfo/Parser.pm:3681
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3724
  #, fuzzy, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "Nincs menÃ¼ a(z) â€ž%sâ€œ oldalon."
  
! #: tp/Texinfo/Parser.pm:3732
  msgid "empty node name in menu entry"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3805
  #, fuzzy, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "%s: A CSS fÃ¡jl nem nyithatÃ³ meg: %s"
  
! #: tp/Texinfo/Parser.pm:3937
! #, perl-format
! msgid "@end %s should only appear at a line beginning"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:3960
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "a(z) â€ž%sâ€œ makrÃ³ mÃ¡r korÃ¡bban definiÃ¡lt lett"
  
! #: tp/Texinfo/Parser.pm:3963
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "â€ž%sâ€œ korÃ¡bbi definÃ­ciÃ³ja"
  
! #: tp/Texinfo/Parser.pm:3968
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4017
  #, perl-format
  msgid "@%s without associated character"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4087
  #, perl-format
  msgid ""
--- 2549,2676 ----
  
  # %citem ist ein Texinfo-Befehl
! #: tp/Texinfo/Parser.pm:2976
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s egy argumentumot igÃ©nyel: %citem formÃ¡zÃ¡sÃ¡t"
  
! #: tp/Texinfo/Parser.pm:2981
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3016
  #, fuzzy, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "%s: OpciÃ³ â€ž--%sâ€œ nem fogad argumentumot\n"
  
! #: tp/Texinfo/Parser.pm:3124 tp/Texinfo/Parser.pm:3277
! #: tp/Texinfo/Parser.pm:5666
  #, fuzzy, perl-format
  msgid "@%s missing argument"
  msgstr "%s: hiÃ¡nyzÃ³ fÃ¡jl argumentum.\n"
  
! #: tp/Texinfo/Parser.pm:3138
  #, fuzzy, perl-format
  msgid "unknown @end %s"
  msgstr "Ismeretlen tÃ¡rgymutatÃ³ â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:3161 tp/Texinfo/Parser.pm:3788
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "Rossz argumentum ide: %s: %s"
  
! #: tp/Texinfo/Parser.pm:3167 tp/Texinfo/Parser.pm:3245
! #: tp/Texinfo/Parser.pm:5755 tp/Texinfo/Parser.pm:5798
! #: tp/Texinfo/Parser.pm:5827 tp/Texinfo/Parser.pm:5868
! #: tp/Texinfo/Parser.pm:5946
  #, fuzzy, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "Rossz argumentum ide: %s: %s"
  
! #: tp/Texinfo/Parser.pm:3188
  #, fuzzy, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "%s: A CSS fÃ¡jl nem nyithatÃ³ meg: %s"
  
! #: tp/Texinfo/Parser.pm:3200
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3208
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "ismeretlen kÃ³dolÃ¡si nÃ©v: â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:3364
  #, perl-format
  msgid "@%s after the first element"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3371
  #, fuzzy, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "A(z) @%s -nek nincs Ã©rtelme a â€ž@titlepageâ€œ kÃ¶rnyezeten kÃ­vÃ¼l"
  
! #: tp/Texinfo/Parser.pm:3408
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3420
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3522
  #, fuzzy, perl-format
  msgid "empty argument in @%s"
  msgstr "Rossz argumentum ide: @%s"
  
! #: tp/Texinfo/Parser.pm:3526
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3569
  #, fuzzy, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "Nincs menÃ¼ a(z) â€ž%sâ€œ oldalon."
  
! #: tp/Texinfo/Parser.pm:3577
  msgid "empty node name in menu entry"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3650
  #, fuzzy, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "%s: A CSS fÃ¡jl nem nyithatÃ³ meg: %s"
  
! #: tp/Texinfo/Parser.pm:3782
! #, fuzzy, perl-format
! msgid "@end %s should only appear at the beginning of a line"
! msgstr "TÃ¶rlÃ©s a sor elejÃ©ig"
  
! #: tp/Texinfo/Parser.pm:3804
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "a(z) â€ž%sâ€œ makrÃ³ mÃ¡r korÃ¡bban definiÃ¡lt lett"
  
! #: tp/Texinfo/Parser.pm:3807
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "â€ž%sâ€œ korÃ¡bbi definÃ­ciÃ³ja"
  
! #: tp/Texinfo/Parser.pm:3812
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3879
  #, perl-format
  msgid "@%s without associated character"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3949
  #, perl-format
  msgid ""
***************
*** 2681,2685 ****
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4111
  #, perl-format
  msgid ""
--- 2678,2682 ----
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3974
  #, perl-format
  msgid ""
***************
*** 2688,2717 ****
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4120
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4176
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4182
  #, fuzzy, perl-format
  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/Parser.pm:4195 tp/Texinfo/Parser.pm:5325
  #, fuzzy, perl-format
  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/Parser.pm:4207
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4218
  #, fuzzy, perl-format
  msgid "@%s expected braces"
--- 2685,2714 ----
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3983
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4038
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4044
  #, fuzzy, perl-format
  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/Parser.pm:4057 tp/Texinfo/Parser.pm:5189
  #, fuzzy, perl-format
  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/Parser.pm:4068
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4079
  #, fuzzy, perl-format
  msgid "@%s expected braces"
***************
*** 2719,2791 ****
  
  # flag ? LM
! #: tp/Texinfo/Parser.pm:4383
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "ismeretlen flag: %s"
  
! #: tp/Texinfo/Parser.pm:4386
  msgid "bad syntax for @value"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4393
  #, fuzzy, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s elavult"
  
! #: tp/Texinfo/Parser.pm:4396
  #, fuzzy, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s elavult"
  
! #: tp/Texinfo/Parser.pm:4405
! #, perl-format
! msgid "@%s should only appear at a line beginning"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:4496
  #, fuzzy, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s -nek nincs jelentÃ©se a(z) â€ž@%sâ€œ blokkon belÃ¼l"
  
! #: tp/Texinfo/Parser.pm:4505
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4631 tp/Texinfo/Parser.pm:4648
! #: tp/Texinfo/Parser.pm:4698
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s -nek nincs jelentÃ©se a(z) â€ž@%sâ€œ blokkon belÃ¼l"
  
! #: tp/Texinfo/Parser.pm:4658
  #, fuzzy, perl-format
  msgid "@%s in empty multitable"
  msgstr "%s: Ã¼res fÃ¡jl"
  
! #: tp/Texinfo/Parser.pm:4664
  msgid "@tab before @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4667
  #, fuzzy, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "TÃºl sok oszlop szerepel a multitable elemben (max %d)"
  
! #: tp/Texinfo/Parser.pm:4704
  msgid "ignoring @tab outside of multitable"
  msgstr "figyelmen kÃ­vÃ¼l hagyom a multitable-n kÃ­vÃ¼l esÅ‘ @tab-ot"
  
! #: tp/Texinfo/Parser.pm:4708
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4745
  #, fuzzy, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "Csak a(z) â€ž@%sâ€œ kÃ¶rnyezetben hasznÃ¡lhatÃ³ a(z) â€ž@%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:4787
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
--- 2716,2788 ----
  
  # flag ? LM
! #: tp/Texinfo/Parser.pm:4233
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "ismeretlen flag: %s"
  
! #: tp/Texinfo/Parser.pm:4236
  msgid "bad syntax for @value"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4243
  #, fuzzy, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s elavult"
  
! #: tp/Texinfo/Parser.pm:4246
  #, fuzzy, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s elavult"
  
! #: tp/Texinfo/Parser.pm:4255
! #, fuzzy, perl-format
! msgid "@%s should only appear at the beginning of a line"
! msgstr "TÃ¶rlÃ©s a sor elejÃ©ig"
  
! #: tp/Texinfo/Parser.pm:4346
  #, fuzzy, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s -nek nincs jelentÃ©se a(z) â€ž@%sâ€œ blokkon belÃ¼l"
  
! #: tp/Texinfo/Parser.pm:4355
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4479 tp/Texinfo/Parser.pm:4496
! #: tp/Texinfo/Parser.pm:4546
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s -nek nincs jelentÃ©se a(z) â€ž@%sâ€œ blokkon belÃ¼l"
  
! #: tp/Texinfo/Parser.pm:4506
  #, fuzzy, perl-format
  msgid "@%s in empty multitable"
  msgstr "%s: Ã¼res fÃ¡jl"
  
! #: tp/Texinfo/Parser.pm:4512
  msgid "@tab before @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4515
  #, fuzzy, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "TÃºl sok oszlop szerepel a multitable elemben (max %d)"
  
! #: tp/Texinfo/Parser.pm:4552
  msgid "ignoring @tab outside of multitable"
  msgstr "figyelmen kÃ­vÃ¼l hagyom a multitable-n kÃ­vÃ¼l esÅ‘ @tab-ot"
  
! #: tp/Texinfo/Parser.pm:4556
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4596
  #, fuzzy, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "Csak a(z) â€ž@%sâ€œ kÃ¶rnyezetben hasznÃ¡lhatÃ³ a(z) â€ž@%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:4638
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
***************
*** 2794,2811 ****
  "kÃ­vÃ¼l"
  
! #: tp/Texinfo/Parser.pm:4791
  msgid "@dircategory after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4979
  #, fuzzy, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "LÃ¡bjegyzetben nem lehet lÃ¡bjegyzet"
  
! #: tp/Texinfo/Parser.pm:4997
  msgid "@direntry after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5005
  #, fuzzy, perl-format
  msgid "@%s seen before first @node"
--- 2791,2808 ----
  "kÃ­vÃ¼l"
  
! #: tp/Texinfo/Parser.pm:4642
  msgid "@dircategory after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4847
  #, fuzzy, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "LÃ¡bjegyzetben nem lehet lÃ¡bjegyzet"
  
! #: tp/Texinfo/Parser.pm:4864
  msgid "@direntry after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4872
  #, fuzzy, perl-format
  msgid "@%s seen before first @node"
***************
*** 2813,2985 ****
  "@menu-t talÃ¡ltam az elsÅ‘ @node elÅ‘tt. LÃ©trehozom a â€žSzÃ¼lÅ‘â€œ (Top) oldalt"
  
! #: tp/Texinfo/Parser.pm:5008
  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/Parser.pm:5070
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5078
  #, fuzzy, perl-format
  msgid "unknown command `%s'"
  msgstr "Ismeretlen parancs: â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5088
  #, fuzzy
  msgid "unexpected @"
  msgstr "â€ž%sâ€œ-t vÃ¡rok"
  
! #: tp/Texinfo/Parser.pm:5117
  #, fuzzy, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "A(z) @%s -nek nincs Ã©rtelme a â€ž@floatâ€œ kÃ¶rnyezeten kÃ­vÃ¼l"
  
! #: tp/Texinfo/Parser.pm:5122
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5130
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5249
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5273
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5292
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5303
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5316
  msgid "@image missing filename argument"
  msgstr "@image hiÃ¡nyzÃ³ fÃ¡jlnÃ©v argumentum"
  
! #: tp/Texinfo/Parser.pm:5348
  #, fuzzy, perl-format
  msgid "@%s missing first argument"
  msgstr "%s: hiÃ¡nyzÃ³ fÃ¡jl argumentum.\n"
  
! #: tp/Texinfo/Parser.pm:5393
  #, fuzzy, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "Rossz argumentum ide: %s: %s"
  
! #: tp/Texinfo/Parser.pm:5399
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5412
! #, perl-format
! msgid "argument for @U exceeds size of integer: %s"
! msgstr ""
! 
! #: tp/Texinfo/Parser.pm:5418
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5546
  msgid "superfluous arguments for node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5596
  #, fuzzy, perl-format
  msgid "expected @end %s"
  msgstr "â€ž%sâ€œ-t vÃ¡rok"
  
! #: tp/Texinfo/Parser.pm:5718
  #, fuzzy, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "Kapcsos zÃ¡rÃ³jelekkel egy parancsot is megadhat @%s argumentumakÃ©nt"
  
! #: tp/Texinfo/Parser.pm:5728
  #, fuzzy, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "Rossz argumentum ide: %s: %s"
  
! #: tp/Texinfo/Parser.pm:5801
  #, fuzzy, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "Kapcsos zÃ¡rÃ³jelekkel egy parancsot is megadhat @%s argumentumakÃ©nt"
  
! #: tp/Texinfo/Parser.pm:5823
  #, perl-format
  msgid "empty @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5831
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5840
  #, fuzzy, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "%s: a(z) %s argumentumÃ¡nak numerikusnak kell lennie, â€ž%sâ€œ helyett.\n"
  
! #: tp/Texinfo/Parser.pm:5849
  #, perl-format
  msgid "reserved index name %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5868
  #, fuzzy, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "Ismeretlen tÃ¡rgymutatÃ³ â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5871
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5914
  #, fuzzy, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "Ismeretlen tÃ¡rgymutatÃ³ â€ž%sâ€œ itt: @printindex"
  
! #: tp/Texinfo/Parser.pm:5920
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5928
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5944
  #, fuzzy, perl-format
  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/Parser.pm:5952
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5960
  #, fuzzy, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
--- 2810,2977 ----
  "@menu-t talÃ¡ltam az elsÅ‘ @node elÅ‘tt. LÃ©trehozom a â€žSzÃ¼lÅ‘â€œ (Top) oldalt"
  
! #: tp/Texinfo/Parser.pm:4875
  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/Parser.pm:4937
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4945
  #, fuzzy, perl-format
  msgid "unknown command `%s'"
  msgstr "Ismeretlen parancs: â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:4955
  #, fuzzy
  msgid "unexpected @"
  msgstr "â€ž%sâ€œ-t vÃ¡rok"
  
! #: tp/Texinfo/Parser.pm:4983
  #, fuzzy, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "A(z) @%s -nek nincs Ã©rtelme a â€ž@floatâ€œ kÃ¶rnyezeten kÃ­vÃ¼l"
  
! #: tp/Texinfo/Parser.pm:4988
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4996
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5114
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5138
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5156
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5167
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5180
  msgid "@image missing filename argument"
  msgstr "@image hiÃ¡nyzÃ³ fÃ¡jlnÃ©v argumentum"
  
! #: tp/Texinfo/Parser.pm:5211
  #, fuzzy, perl-format
  msgid "@%s missing first argument"
  msgstr "%s: hiÃ¡nyzÃ³ fÃ¡jl argumentum.\n"
  
! #: tp/Texinfo/Parser.pm:5230
  #, fuzzy, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "Rossz argumentum ide: %s: %s"
  
! #: tp/Texinfo/Parser.pm:5236
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5253
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5448
  msgid "superfluous arguments for node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5498
  #, fuzzy, perl-format
  msgid "expected @end %s"
  msgstr "â€ž%sâ€œ-t vÃ¡rok"
  
! #: tp/Texinfo/Parser.pm:5607
  #, fuzzy, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "Kapcsos zÃ¡rÃ³jelekkel egy parancsot is megadhat @%s argumentumakÃ©nt"
  
! #: tp/Texinfo/Parser.pm:5617
  #, fuzzy, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "Rossz argumentum ide: %s: %s"
  
! #: tp/Texinfo/Parser.pm:5689
  #, fuzzy, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "Kapcsos zÃ¡rÃ³jelekkel egy parancsot is megadhat @%s argumentumakÃ©nt"
  
! #: tp/Texinfo/Parser.pm:5710
  #, perl-format
  msgid "empty @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5727
  #, fuzzy, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "%s: a(z) %s argumentumÃ¡nak numerikusnak kell lennie, â€ž%sâ€œ helyett.\n"
  
! #: tp/Texinfo/Parser.pm:5736
  #, perl-format
  msgid "reserved index name %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5762
  #, fuzzy, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "Ismeretlen tÃ¡rgymutatÃ³ â€ž%sâ€œ"
  
! #: tp/Texinfo/Parser.pm:5765
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5793
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5806
  #, fuzzy, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "Ismeretlen tÃ¡rgymutatÃ³ â€ž%sâ€œ itt: @printindex"
  
! #: tp/Texinfo/Parser.pm:5812
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5820
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5836
  #, fuzzy, perl-format
  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/Parser.pm:5844
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5852
  #, fuzzy, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
***************
*** 2988,2997 ****
  "lennie, â€ž%sâ€œ helyett.\n"
  
! #: tp/Texinfo/Parser.pm:5968
  #, fuzzy, perl-format
  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/Parser.pm:5986 tp/Texinfo/Parser.pm:5991
  #, fuzzy, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
--- 2980,2989 ----
  "lennie, â€ž%sâ€œ helyett.\n"
  
! #: tp/Texinfo/Parser.pm:5860
  #, fuzzy, perl-format
  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/Parser.pm:5878 tp/Texinfo/Parser.pm:5883
  #, fuzzy, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
***************
*** 3000,3004 ****
  "â€žasisâ€œ-nek kell lennie, â€ž%sâ€œ helyett.\n"
  
! #: tp/Texinfo/Parser.pm:5999
  #, fuzzy, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
--- 2992,2996 ----
  "â€žasisâ€œ-nek kell lennie, â€ž%sâ€œ helyett.\n"
  
! #: tp/Texinfo/Parser.pm:5891
  #, fuzzy, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
***************
*** 3007,3011 ****
  "â€žasisâ€œ-nek kell lennie, â€ž%sâ€œ helyett.\n"
  
! #: tp/Texinfo/Parser.pm:6009
  #, fuzzy, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
--- 2999,3003 ----
  "â€žasisâ€œ-nek kell lennie, â€ž%sâ€œ helyett.\n"
  
! #: tp/Texinfo/Parser.pm:5901
  #, fuzzy, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
***************
*** 3014,3028 ****
  "â€žasisâ€œ-nek kell lennie, â€ž%sâ€œ helyett.\n"
  
! #: tp/Texinfo/Parser.pm:6021
  #, fuzzy, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "@%s on vagy off-t vÃ¡rtam, â€ž%sâ€œ helyett"
  
! #: tp/Texinfo/Parser.pm:6031
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:6039
  #, fuzzy, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
--- 3006,3020 ----
  "â€žasisâ€œ-nek kell lennie, â€ž%sâ€œ helyett.\n"
  
! #: tp/Texinfo/Parser.pm:5913
  #, fuzzy, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "@%s on vagy off-t vÃ¡rtam, â€ž%sâ€œ helyett"
  
! #: tp/Texinfo/Parser.pm:5922
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5930
  #, fuzzy, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
***************
*** 3031,3035 ****
  "lennie, â€ž%sâ€œ helyett.\n"
  
! #: tp/Texinfo/Parser.pm:6047
  #, fuzzy, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
--- 3023,3027 ----
  "lennie, â€ž%sâ€œ helyett.\n"
  
! #: tp/Texinfo/Parser.pm:5938
  #, fuzzy, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
***************
*** 3038,3067 ****
  "lennie, â€ž%sâ€œ helyett.\n"
  
! #: tp/Texinfo/Structuring.pm:213
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:245
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:250
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:339
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:488
  #, perl-format
  msgid "@%s not empty"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:544 tp/Texinfo/Structuring.pm:1326
  #, fuzzy, perl-format
  msgid "@%s reference to nonexistent node `%s'"
--- 3030,3059 ----
  "lennie, â€ž%sâ€œ helyett.\n"
  
! #: tp/Texinfo/Structuring.pm:216
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:248
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:253
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:342
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:491
  #, perl-format
  msgid "@%s not empty"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:547 tp/Texinfo/Structuring.pm:1325
  #, fuzzy, perl-format
  msgid "@%s reference to nonexistent node `%s'"
***************
*** 3069,3108 ****
  "%s egy nem lÃ©tezÅ‘ oldalra (â€ž%sâ€œ) hivatkozik (esetleg hibÃ¡s szekcionÃ¡lÃ¡s?)"
  
! #: tp/Texinfo/Structuring.pm:557
  #, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:662
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "nem hivatkozott oldal â€ž%sâ€œ"
  
! #: tp/Texinfo/Structuring.pm:708
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:715
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:733
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:787
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:814
  #, fuzzy, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "nem hivatkozott oldal â€ž%sâ€œ"
  
! #: tp/Texinfo/Structuring.pm:834
  #, fuzzy, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
--- 3061,3100 ----
  "%s egy nem lÃ©tezÅ‘ oldalra (â€ž%sâ€œ) hivatkozik (esetleg hibÃ¡s szekcionÃ¡lÃ¡s?)"
  
! #: tp/Texinfo/Structuring.pm:558
  #, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:663
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "nem hivatkozott oldal â€ž%sâ€œ"
  
! #: tp/Texinfo/Structuring.pm:706
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:713
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:731
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:786
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:810
  #, fuzzy, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "nem hivatkozott oldal â€ž%sâ€œ"
  
! #: tp/Texinfo/Structuring.pm:829
  #, fuzzy, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
***************
*** 3110,3114 ****
  "A(z) â€ž%sâ€œ oldal nem tartalmaz menÃ¼elemet â€ž%sâ€œ-hez, bÃ¡r ez uÃ³bbi a szÃ¼lÅ‘je"
  
! #: tp/Texinfo/Structuring.pm:842
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
--- 3102,3106 ----
  "A(z) â€ž%sâ€œ oldal nem tartalmaz menÃ¼elemet â€ž%sâ€œ-hez, bÃ¡r ez uÃ³bbi a szÃ¼lÅ‘je"
  
! #: tp/Texinfo/Structuring.pm:837
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
***************
*** 3120,3124 ****
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:2070
  #, perl-format
  msgid "empty index key in @%s"
--- 3112,3116 ----
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:2067
  #, perl-format
  msgid "empty index key in @%s"
***************
*** 3520,3538 ****
  msgstr "TovÃ¡bbi informÃ¡ciÃ³Ã©rt prÃ³bÃ¡lja meg a â€ž%s --helpâ€œ-t.\n"
  
! #: tp/texi2any.pl:1232
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
  
! #: tp/texi2any.pl:1255
  #, fuzzy, perl-format
  msgid "error on closing macro expand file %s: %s\n"
  msgstr "hiba a(z) â€ž%sâ€œ output fÃ¡jl bezÃ¡rÃ¡sakor"
  
! #: tp/texi2any.pl:1261
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "%s: A CSS fÃ¡jl nem nyithatÃ³ meg: %s"
  
! #: tp/texi2any.pl:1286
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
--- 3512,3530 ----
  msgstr "TovÃ¡bbi informÃ¡ciÃ³Ã©rt prÃ³bÃ¡lja meg a â€ž%s --helpâ€œ-t.\n"
  
! #: tp/texi2any.pl:1239
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
  
! #: tp/texi2any.pl:1262
  #, fuzzy, perl-format
  msgid "error on closing macro expand file %s: %s\n"
  msgstr "hiba a(z) â€ž%sâ€œ output fÃ¡jl bezÃ¡rÃ¡sakor"
  
! #: tp/texi2any.pl:1268
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "%s: A CSS fÃ¡jl nem nyithatÃ³ meg: %s"
  
! #: tp/texi2any.pl:1293
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
***************
*** 3540,3554 ****
  msgstr ""
  
! #: tp/texi2any.pl:1359 tp/texi2any.pl:1435
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1382 tp/texi2any.pl:1416
  #, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1388 tp/texi2any.pl:1422
  #, fuzzy, perl-format
  msgid "%s: could not open %s for writing: %s\n"
--- 3532,3546 ----
  msgstr ""
  
! #: tp/texi2any.pl:1366 tp/texi2any.pl:1442
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1389 tp/texi2any.pl:1423
  #, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1395 tp/texi2any.pl:1429
  #, fuzzy, perl-format
  msgid "%s: could not open %s for writing: %s\n"
***************
*** 3814,3817 ****
--- 3806,3815 ----
  #~ msgstr "--*** lejÃ¡rt dÃ¡tumÃº Tagek ***"
  
+ #~ msgid "-%s---Info: %s, %d lines --%s--"
+ #~ msgstr "-%s---Info: %s, %d sor --%s--"
+ 
+ #~ msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
+ #~ msgstr "-%s%s-Info: (%s)%s, %d sor --%s--"
+ 
  # subfile ? LM
  # Passz - sas
Binary files texinfo-6.1/po/id.gmo and texinfo-6.3/po/id.gmo differ
diff -Nrc2 texinfo-6.1/po/id.po texinfo-6.3/po/id.po
*** texinfo-6.1/po/id.po	2016-02-06 11:35:51.000000000 +0000
--- texinfo-6.3/po/id.po	2016-09-10 12:45:52.000000000 +0100
***************
*** 8,12 ****
  "Project-Id-Version: texinfo 5.1.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
  "PO-Revision-Date: 2014-08-11 17:30+0700\n"
  "Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
--- 8,12 ----
  "Project-Id-Version: texinfo 5.1.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:45+0100\n"
  "PO-Revision-Date: 2014-08-11 17:30+0700\n"
  "Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
***************
*** 16,19 ****
--- 16,20 ----
  "Content-Type: text/plain; charset=ISO-8859-1\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"
  
***************
*** 112,116 ****
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [ or [^"
  msgstr "Tidak cocok [ atau [^"
  
--- 113,118 ----
  
  #: gnulib/lib/regcomp.c:156
! #, fuzzy
! msgid "Unmatched [, [^, [:, [., or [="
  msgstr "Tidak cocok [ atau [^"
  
***************
*** 151,155 ****
  msgstr "Tidak cocok ) atau \\)"
  
! #: gnulib/lib/regcomp.c:711
  msgid "No previous regular expression"
  msgstr "Tidak ada string pencarian sebelumnya"
--- 153,157 ----
  msgstr "Tidak cocok ) atau \\)"
  
! #: gnulib/lib/regcomp.c:687
  msgid "No previous regular expression"
  msgstr "Tidak ada string pencarian sebelumnya"
***************
*** 304,308 ****
  msgstr "---------- Catatan kaki ----------"
  
! #: info/indices.c:123 info/indices.c:812
  #, c-format
  msgid "Finding index entries..."
--- 306,310 ----
  msgstr "---------- Catatan kaki ----------"
  
! #: info/indices.c:123 info/indices.c:822
  #, c-format
  msgid "Finding index entries..."
***************
*** 313,317 ****
  msgstr "Mencari sebuah string dalam indeks untuk berkas ini"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:818
  #, c-format
  msgid "No indices found."
--- 315,319 ----
  msgstr "Mencari sebuah string dalam indeks untuk berkas ini"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:828
  #, c-format
  msgid "No indices found."
***************
*** 346,360 ****
  msgstr "Tidak ada masukan indeks yang berisi `%s'."
  
! #: info/indices.c:476 info/indices.c:880
  #, fuzzy, c-format
  msgid "No index entries containing '%s'."
  msgstr "Tidak ada masukan indeks yang berisi `%s'."
  
! #: info/indices.c:583
  #, fuzzy, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "Menscan indices dari `%s'..."
  
! #: info/indices.c:636
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
--- 348,362 ----
  msgstr "Tidak ada masukan indeks yang berisi `%s'."
  
! #: info/indices.c:476 info/indices.c:890
  #, fuzzy, c-format
  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'..."
  msgstr "Menscan indices dari `%s'..."
  
! #: info/indices.c:646
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
***************
*** 362,380 ****
  "buat sebuah menu"
  
! #: info/indices.c:644 info/indices.c:646
  #, fuzzy
  msgid "Index apropos"
  msgstr "Indeks apropos: "
  
! #: info/indices.c:688
  #, fuzzy, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Tidak ada masukan indeks yang berisi `%s'."
  
! #: info/indices.c:797
  msgid "List all matches of a string in the index"
  msgstr "List all matches of a string in the index"
  
! #: info/indices.c:824 info/indices.c:826
  #, fuzzy
  msgid "Index topic"
--- 364,382 ----
  "buat sebuah menu"
  
! #: info/indices.c:654 info/indices.c:656
  #, fuzzy
  msgid "Index apropos"
  msgstr "Indeks apropos: "
  
! #: info/indices.c:698
  #, fuzzy, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Tidak ada masukan indeks yang berisi `%s'."
  
! #: info/indices.c:807
  msgid "List all matches of a string in the index"
  msgstr "List all matches of a string in the index"
  
! #: info/indices.c:834 info/indices.c:836
  #, fuzzy
  msgid "Index topic"
***************
*** 386,440 ****
  msgstr "Info berkas tidak tersedia memiliki `%s' dalam indicesnya."
  
! #: info/info-utils.c:892
  #, c-format
  msgid "Error converting file character encoding."
  msgstr ""
  
! #: info/info.c:222 info/session.c:2789
  #, fuzzy, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "Tidak ada menu item `%s' dalam titik `%s'."
  
! #: info/info.c:315
! #, fuzzy, c-format
! msgid "No file given for node '%s'."
! msgstr "Tidak ada menu dalam titik `%s'."
! 
! #: info/info.c:364 info/info.c:1133
  #, fuzzy, c-format
  msgid "Cannot find node '%s'."
  msgstr "Tidak dapat menemukan titik `%s'."
  
! #: info/info.c:386
  #, c-format
  msgid "No program name given."
  msgstr ""
  
! #: info/info.c:577
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "invalid number: %s\n"
  
! #: info/info.c:757
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "malformed variable assignment: %s"
  
! #: info/info.c:764 info/infokey.c:537
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: no such variable"
  
! #: info/info.c:770 info/infokey.c:539
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "Set nilai %s dari sebuah variabel Info %s"
  
! #: info/info.c:782
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "Coba --help untuk informasi lebih lanjut.\n"
  
! #: info/info.c:804 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
--- 388,437 ----
  msgstr "Info berkas tidak tersedia memiliki `%s' dalam indicesnya."
  
! #: info/info-utils.c:879
  #, c-format
  msgid "Error converting file character encoding."
  msgstr ""
  
! #: info/info.c:279 info/session.c:2789
  #, fuzzy, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "Tidak ada menu item `%s' dalam titik `%s'."
  
! #: info/info.c:416 info/info.c:1148
  #, fuzzy, c-format
  msgid "Cannot find node '%s'."
  msgstr "Tidak dapat menemukan titik `%s'."
  
! #: info/info.c:438
  #, c-format
  msgid "No program name given."
  msgstr ""
  
! #: info/info.c:636
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "invalid number: %s\n"
  
! #: info/info.c:816
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "malformed variable assignment: %s"
  
! #: info/info.c:823 info/infokey.c:540
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: no such variable"
  
! #: info/info.c:829 info/infokey.c:542
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "Set nilai %s dari sebuah variabel Info %s"
  
! #: info/info.c:841
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "Coba --help untuk informasi lebih lanjut.\n"
  
! #: info/info.c:860 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
***************
*** 453,462 ****
  "berlaku.\n"
  
! #: info/info.c:981
  #, fuzzy, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "tidak ada masukan indeks ditemukan untuk `%s'\n"
  
! #: info/info.c:1034
  #, c-format
  msgid ""
--- 450,459 ----
  "berlaku.\n"
  
! #: info/info.c:999
  #, fuzzy, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "tidak ada masukan indeks ditemukan untuk `%s'\n"
  
! #: info/info.c:1049
  #, c-format
  msgid ""
***************
*** 469,473 ****
  "Baca dokumentasi dalam format Info.\n"
  
! #: info/info.c:1040
  msgid ""
  "Options:\n"
--- 466,470 ----
  "Baca dokumentasi dalam format Info.\n"
  
! #: info/info.c:1055
  msgid ""
  "Options:\n"
***************
*** 487,491 ****
  "  -f, --file=NAMA BERKAS        spesifikasikan berkas Info untuk dikunjungi."
  
! #: info/info.c:1048
  msgid ""
  "  -h, --help                   display this help and exit.\n"
--- 484,488 ----
  "  -f, --file=NAMA BERKAS        spesifikasikan berkas Info untuk dikunjungi."
  
! #: info/info.c:1063
  msgid ""
  "  -h, --help                   display this help and exit.\n"
***************
*** 501,505 ****
  "  -o, --output=NAMA BERKAS     keluarkan titik yang dipilih ke NAMA BERKAS."
  
! #: info/info.c:1054
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
--- 498,502 ----
  "  -o, --output=NAMA BERKAS     keluarkan titik yang dipilih ke NAMA BERKAS."
  
! #: info/info.c:1069
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
***************
*** 514,522 ****
  "  -O, --show-options, --usage  pergi ke titik opsi baris-perintah."
  
! #: info/info.c:1061
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr "  -b, --speech-friendly        jadi ramah untuk berbicara synthesizer."
  
! #: info/info.c:1065
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
--- 511,519 ----
  "  -O, --show-options, --usage  pergi ke titik opsi baris-perintah."
  
! #: info/info.c:1076
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr "  -b, --speech-friendly        jadi ramah untuk berbicara synthesizer."
  
! #: info/info.c:1080
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
***************
*** 538,542 ****
  "--debug=NUMBER           set debugging level (-1 for all).\n"
  
! #: info/info.c:1074
  #, fuzzy
  msgid ""
--- 535,539 ----
  "--debug=NUMBER           set debugging level (-1 for all).\n"
  
! #: info/info.c:1089
  #, fuzzy
  msgid ""
***************
*** 557,561 ****
  "relatif ke titik inisial yang dikunjungi."
  
! #: info/info.c:1081
  #, fuzzy
  msgid ""
--- 554,558 ----
  "relatif ke titik inisial yang dikunjungi."
  
! #: info/info.c:1096
  #, fuzzy
  msgid ""
***************
*** 566,570 ****
  "Untuk sebuah ringkasan dari binding kunci, ketik h didalam Info."
  
! #: info/info.c:1084
  #, fuzzy
  msgid ""
--- 563,567 ----
  "Untuk sebuah ringkasan dari binding kunci, ketik h didalam Info."
  
! #: info/info.c:1099
  #, fuzzy
  msgid ""
***************
*** 595,599 ****
  "  info -f ./foo.info         tampilkan berkas ./foo.info, bukan mencari dir"
  
! #: info/info.c:1099 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
--- 592,596 ----
  "  info -f ./foo.info         tampilkan berkas ./foo.info, bukan mencari dir"
  
! #: info/info.c:1114 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
***************
*** 605,669 ****
  "Texinfo halaman rumah: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1134
  #, fuzzy, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Tidak dapat menemukan titik `(%s)%s'."
  
! #: info/info.c:1135
  msgid "Cannot find a window!"
  msgstr "Tidak dapat menemukan sebuah jendela!"
  
! #: info/info.c:1136
  msgid "Point doesn't appear within this window's node!"
  msgstr "Titik tidak kelihatan didalam titik jendela ini!"
  
! #: info/info.c:1137
  msgid "Cannot delete the last window."
  msgstr "Tidak dapat menghapus jendela terakhir."
  
! #: info/info.c:1138
  msgid "No menu in this node."
  msgstr "Tidak ada menu di titik ini."
  
! #: info/info.c:1139
  msgid "No footnotes in this node."
  msgstr "Tidak ada catatan kaki di titik ini."
  
! #: info/info.c:1140
  msgid "No cross references in this node."
  msgstr "Tidak ada referensi silang di titik ini."
  
! #: info/info.c:1141
  #, fuzzy, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Tidak ada `%s' penunjuk untuk titik ini."
  
! #: info/info.c:1142
  #, fuzzy, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "Perintah Info `%c' tidak diketahui; coba `?' untuk bantuan."
  
! #: info/info.c:1143
  #, fuzzy, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "Tipe terminal `%s' tidak cukup pintar untuk menjalankan Info."
  
! #: info/info.c:1144
  msgid "You are already at the last page of this node."
  msgstr "Anda telah berada di akhir halaman dari titik ini."
  
! #: info/info.c:1145
  msgid "You are already at the first page of this node."
  msgstr "Anda telah berada di halaman pertama dari titik ini."
  
! #: info/info.c:1146
  msgid "Only one window."
  msgstr "Hanya satu jendela."
  
! #: info/info.c:1147
  msgid "Resulting window would be too small."
  msgstr "Menghasilkan jendela yang akan terlalu kecil."
  
! #: info/info.c:1148
  msgid "Not enough room for a help window, please delete a window."
  msgstr ""
--- 602,666 ----
  "Texinfo halaman rumah: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1149
  #, fuzzy, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Tidak dapat menemukan titik `(%s)%s'."
  
! #: info/info.c:1150
  msgid "Cannot find a window!"
  msgstr "Tidak dapat menemukan sebuah jendela!"
  
! #: info/info.c:1151
  msgid "Point doesn't appear within this window's node!"
  msgstr "Titik tidak kelihatan didalam titik jendela ini!"
  
! #: info/info.c:1152
  msgid "Cannot delete the last window."
  msgstr "Tidak dapat menghapus jendela terakhir."
  
! #: info/info.c:1153
  msgid "No menu in this node."
  msgstr "Tidak ada menu di titik ini."
  
! #: info/info.c:1154
  msgid "No footnotes in this node."
  msgstr "Tidak ada catatan kaki di titik ini."
  
! #: info/info.c:1155
  msgid "No cross references in this node."
  msgstr "Tidak ada referensi silang di titik ini."
  
! #: info/info.c:1156
  #, fuzzy, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Tidak ada `%s' penunjuk untuk titik ini."
  
! #: info/info.c:1157
  #, fuzzy, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "Perintah Info `%c' tidak diketahui; coba `?' untuk bantuan."
  
! #: info/info.c:1158
  #, fuzzy, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "Tipe terminal `%s' tidak cukup pintar untuk menjalankan Info."
  
! #: info/info.c:1159
  msgid "You are already at the last page of this node."
  msgstr "Anda telah berada di akhir halaman dari titik ini."
  
! #: info/info.c:1160
  msgid "You are already at the first page of this node."
  msgstr "Anda telah berada di halaman pertama dari titik ini."
  
! #: info/info.c:1161
  msgid "Only one window."
  msgstr "Hanya satu jendela."
  
! #: info/info.c:1162
  msgid "Resulting window would be too small."
  msgstr "Menghasilkan jendela yang akan terlalu kecil."
  
! #: info/info.c:1163
  msgid "Not enough room for a help window, please delete a window."
  msgstr ""
***************
*** 943,977 ****
  msgstr "aksi `%s' tidak dikenal"
  
! #: info/infokey.c:482
  #, c-format
  msgid "action name too long"
  msgstr "nama aksi terlalu panjang"
  
! #: info/infokey.c:495
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "karakter ekstra mengikuti aksi `%s'"
  
! #: info/infokey.c:506
  #, c-format
  msgid "missing variable name"
  msgstr "hilang nama variabel"
  
! #: info/infokey.c:515
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "hilang `=' langsung setelah nama variabel"
  
! #: info/infokey.c:522
  #, c-format
  msgid "variable name too long"
  msgstr "nama variabel terlalu panjang"
  
! #: info/infokey.c:546
  #, c-format
  msgid "value too long"
  msgstr "nilai terlalu panjang"
  
! #: info/infokey.c:592
  #, c-format
  msgid "\"%s\", line %u: "
--- 940,974 ----
  msgstr "aksi `%s' tidak dikenal"
  
! #: info/infokey.c:485
  #, c-format
  msgid "action name too long"
  msgstr "nama aksi terlalu panjang"
  
! #: info/infokey.c:498
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "karakter ekstra mengikuti aksi `%s'"
  
! #: info/infokey.c:509
  #, c-format
  msgid "missing variable name"
  msgstr "hilang nama variabel"
  
! #: info/infokey.c:518
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "hilang `=' langsung setelah nama variabel"
  
! #: info/infokey.c:525
  #, c-format
  msgid "variable name too long"
  msgstr "nama variabel terlalu panjang"
  
! #: info/infokey.c:549
  #, c-format
  msgid "value too long"
  msgstr "nilai terlalu panjang"
  
! #: info/infokey.c:595
  #, c-format
  msgid "\"%s\", line %u: "
***************
*** 1308,1651 ****
  msgstr "Tidak dapat menemukan titik direferensikan oleh `%s' dalam `%s'."
  
! #: info/session.c:2864
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "Baca sebuah daftar dari menu berawal dari dir dan ikuti tersebut"
  
! #: info/session.c:2866
  msgid "Follow menus: "
  msgstr "Ikuti menus: "
  
! #: info/session.c:2971
  msgid "Select the Next node"
  msgstr "Pilih titik Sebelumnya"
  
! #: info/session.c:2978
  msgid "Select the Prev node"
  msgstr "Pilih titik Selanjutnya"
  
! #: info/session.c:2985
  msgid "Select the Up node"
  msgstr "Pilih titik Atas"
  
! #: info/session.c:2991
  msgid "Select the last node in this file"
  msgstr "Pilih titik terakhir dalam berkas ini"
  
! #: info/session.c:3018 info/session.c:3051
  msgid "This window has no additional nodes"
  msgstr "Jendela ini tidak memiliki titik tambahan"
  
! #: info/session.c:3024
  msgid "Select the first node in this file"
  msgstr "Pilih titik pertama dalam berkas ini"
  
! #: info/session.c:3158
  msgid "No more nodes within this document."
  msgstr "Tidak ada titik lagi didalam dokumen ini."
  
! #: info/session.c:3203 info/session.c:3243
  #, fuzzy
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "Tidak ada `Prev' atau `Up' untuk titik ini didalam dokumen ini."
  
! #: info/session.c:3256
  msgid "Move forwards or down through node structure"
  msgstr "Pindah kedepan atau kebawah melalui struktur titik"
  
! #: info/session.c:3273
  msgid "Move backwards or up through node structure"
  msgstr "Pindah kebelakang atau keatas melalui struktur node"
  
! #: info/session.c:3296
  msgid "Read a node name and select it"
  msgstr "Baca sebuah nama titik dan pilih itu"
  
! #: info/session.c:3350 info/session.c:3354
  msgid "Goto node: "
  msgstr "Pergi ke titik: "
  
! #: info/session.c:3533
  msgid "Find the node describing program invocation"
  msgstr "Cari titik yang menjelaskan pemanggilan aplikasi"
  
! #: info/session.c:3535
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Cari titik pemanggilan dari [%s]: "
  
! #: info/session.c:3580
  msgid "Read a manpage reference and select it"
  msgstr "Baca sebuah referensi halaman manual dan pilih itu"
  
! #: info/session.c:3584
  msgid "Get Manpage: "
  msgstr "Dapatkan Halaman manual: "
  
! #: info/session.c:3605
  #, fuzzy
  msgid "Select the node 'Top' in this file"
  msgstr "Pilih titik `Top' dalam berkas ini"
  
! #: info/session.c:3611
  #, fuzzy
  msgid "Select the node '(dir)'"
  msgstr "Pilih titik `(dir)'"
  
! #: info/session.c:3617
  msgid "Show full file name of node being displayed"
  msgstr "Show full file name of node being displayed"
  
! #: info/session.c:3634
  msgid "Select the most recently selected node"
  msgstr "Pilih titik yang dipilih paling baru"
  
! #: info/session.c:3639
  #, c-format
  msgid "No earlier node in history"
  msgstr ""
  
! #: info/session.c:3643
  msgid "Read the name of a file and select it"
  msgstr "Baca nama dari sebuah berkas dan pilih itu"
  
! #: info/session.c:3647
  msgid "Find file: "
  msgstr "Cari berkas: "
  
! #: info/session.c:3664
  #, fuzzy, c-format
  msgid "Cannot find '%s'."
  msgstr "Tidak dapat menemukan `%s'."
  
! #: info/session.c:3713
  #, fuzzy, c-format
  msgid "Could not create output file '%s'."
  msgstr "Tidak dapat membuat berkas keluaran `%s'."
  
! #: info/session.c:3727
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "error menulis ke `%s': %s"
  
! #: info/session.c:3736
  #, c-format
  msgid "closing %s"
  msgstr "Menghapus %s"
  
! #: info/session.c:3785
  #, c-format
  msgid "writing node %s..."
  msgstr "Menulis titik %s..."
  
! #: info/session.c:3831
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "Pipe isi dari titik ini melalui INFO_PRINT_COMMAND"
  
! #: info/session.c:3859
  #, fuzzy, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Tidak dapat membuka pipe ke `%s'."
  
! #: info/session.c:3864
  #, c-format
  msgid "printing node %s..."
  msgstr "Mencetak titik %s..."
  
! #: info/session.c:3872
  #, c-format
  msgid "finished printing node %s"
  msgstr "Mencetak titik %s..."
  
! #: info/session.c:3904
  msgid "Toggle the usage of regular expressions in searches"
  msgstr "Toggle penggunaan dari ekspresi regular dalam pencarian"
  
! #: info/session.c:3908
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr "Menggunakan ekspresi regular untuk pencarian."
  
! #: info/session.c:3909
  #, c-format
  msgid "Using literal strings for searches."
  msgstr "Menggunakan string literal untuk pencarian."
  
! #: info/session.c:4169
  msgid "Search continued from the end of the document."
  msgstr "Pencarian dilanjutkan dari akhir dari dokumen."
  
! #: info/session.c:4174
  msgid "Search continued from the beginning of the document."
  msgstr "Pencarian dilanjutkan dari awal dari dokumen."
  
! #: info/session.c:4194
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "Pencarian subfile %s ..."
  
! #: info/session.c:4231
  msgid "Search failed."
  msgstr "Pencarian gagal."
  
! #: info/session.c:4248
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Regexp search"
  msgstr "Pencarian regexp"
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Search"
  msgstr "Pencarian"
  
! #: info/session.c:4250 info/session.c:4256
  msgid " case-sensitively"
  msgstr " tidak membedakan besar huruf"
  
! #: info/session.c:4251 info/session.c:4257
  msgid " backward"
  msgstr " kebelakang"
  
! #: info/session.c:4254
  #, fuzzy, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4274
  msgid "Search string too short"
  msgstr "Search string too short"
  
! #: info/session.c:4467
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4491 info/session.c:4601
  #, fuzzy, c-format
  msgid "No more matches."
  msgstr "No match"
  
! #: info/session.c:4628
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4649
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4653 info/session.c:4665
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4661
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4674
  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:4679
  msgid "Read a string and search for it"
  msgstr "Baca sebuah string dan cari itu"
  
! #: info/session.c:4685
  msgid "Read a string and search backward for it"
  msgstr "Baca sebuah string dan cari kebelakang untuk itu"
  
! #: info/session.c:4693
  msgid "Repeat last search in the same direction"
  msgstr "Ulangi pencarian terakhir dalam arah yang sama"
  
! #: info/session.c:4701 info/session.c:4746
  msgid "No previous search string"
  msgstr "Tidak ada string pencarian sebelumnya"
  
! #: info/session.c:4738
  msgid "Repeat last search in the reverse direction"
  msgstr "Ulangi pencarian terakhir dalam arah terbalik"
  
! #: info/session.c:4785
  msgid "Clear displayed search matches"
  msgstr ""
  
! #: info/session.c:4802 info/session.c:4808
  msgid "Search interactively for a string as you type it"
  msgstr ""
  "Pencarian secara interaktif untuk sebuah string seperti anda mengetikkannya"
  
! #: info/session.c:4928
  msgid "Regexp I-search backward: "
  msgstr "Regexp I-search kebelakang: "
  
! #: info/session.c:4929
  msgid "I-search backward: "
  msgstr "I-search kebelakang: "
  
! #: info/session.c:4931
  msgid "Regexp I-search: "
  msgstr "Regexp I-search: "
  
! #: info/session.c:4932
  msgid "I-search: "
  msgstr "I-search: "
  
! #: info/session.c:4957 info/session.c:4960
  msgid "Failing "
  msgstr "Menggagalkan "
  
! #: info/session.c:5326
  msgid "Cancel current operation"
  msgstr "Batalkan operasi sekarang"
  
! #: info/session.c:5333
  msgid "Quit"
  msgstr "Berhenti"
  
! #: info/session.c:5338
  #, fuzzy
  msgid "Display version of Info being run"
  msgstr "tampilkan informasi versi dan keluar"
  
! #: info/session.c:5340
  #, c-format
  msgid "GNU Info version %s"
  msgstr ""
  
! #: info/session.c:5345
  msgid "Redraw the display"
  msgstr "Gambar kembali tampilan"
  
! #: info/session.c:5382
  msgid "Quit using Info"
  msgstr "Berhenti menggunakan Info"
  
! #: info/session.c:5398
  msgid "Run command bound to this key's lowercase variant"
  msgstr "Jalankan perintah terikat variasi kunci huruf kecil ini"
  
! #: info/session.c:5409
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Perintah (%s) tidak diketahui."
  
! #: info/session.c:5412
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\" tidak valid"
  
! #: info/session.c:5413
  #, fuzzy, c-format
  msgid "'%s' is invalid"
  msgstr "`%s' tidak valid"
  
! #: info/session.c:5731
  msgid "Add this digit to the current numeric argument"
  msgstr "Tambahkan digit ini ke argumen numerik sekarang"
  
! #: info/session.c:5738
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "Awal (atau kelipatan dari 4) argumen numerik sekarang"
--- 1305,1648 ----
  msgstr "Tidak dapat menemukan titik direferensikan oleh `%s' dalam `%s'."
  
! #: info/session.c:2870
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "Baca sebuah daftar dari menu berawal dari dir dan ikuti tersebut"
  
! #: info/session.c:2872
  msgid "Follow menus: "
  msgstr "Ikuti menus: "
  
! #: info/session.c:2977
  msgid "Select the Next node"
  msgstr "Pilih titik Sebelumnya"
  
! #: info/session.c:2984
  msgid "Select the Prev node"
  msgstr "Pilih titik Selanjutnya"
  
! #: info/session.c:2991
  msgid "Select the Up node"
  msgstr "Pilih titik Atas"
  
! #: info/session.c:2997
  msgid "Select the last node in this file"
  msgstr "Pilih titik terakhir dalam berkas ini"
  
! #: info/session.c:3024 info/session.c:3057
  msgid "This window has no additional nodes"
  msgstr "Jendela ini tidak memiliki titik tambahan"
  
! #: info/session.c:3030
  msgid "Select the first node in this file"
  msgstr "Pilih titik pertama dalam berkas ini"
  
! #: info/session.c:3164
  msgid "No more nodes within this document."
  msgstr "Tidak ada titik lagi didalam dokumen ini."
  
! #: info/session.c:3209 info/session.c:3249
  #, fuzzy
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "Tidak ada `Prev' atau `Up' untuk titik ini didalam dokumen ini."
  
! #: info/session.c:3262
  msgid "Move forwards or down through node structure"
  msgstr "Pindah kedepan atau kebawah melalui struktur titik"
  
! #: info/session.c:3279
  msgid "Move backwards or up through node structure"
  msgstr "Pindah kebelakang atau keatas melalui struktur node"
  
! #: info/session.c:3302
  msgid "Read a node name and select it"
  msgstr "Baca sebuah nama titik dan pilih itu"
  
! #: info/session.c:3356 info/session.c:3360
  msgid "Goto node: "
  msgstr "Pergi ke titik: "
  
! #: info/session.c:3539
  msgid "Find the node describing program invocation"
  msgstr "Cari titik yang menjelaskan pemanggilan aplikasi"
  
! #: info/session.c:3541
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Cari titik pemanggilan dari [%s]: "
  
! #: info/session.c:3586
  msgid "Read a manpage reference and select it"
  msgstr "Baca sebuah referensi halaman manual dan pilih itu"
  
! #: info/session.c:3590
  msgid "Get Manpage: "
  msgstr "Dapatkan Halaman manual: "
  
! #: info/session.c:3611
  #, fuzzy
  msgid "Select the node 'Top' in this file"
  msgstr "Pilih titik `Top' dalam berkas ini"
  
! #: info/session.c:3617
  #, fuzzy
  msgid "Select the node '(dir)'"
  msgstr "Pilih titik `(dir)'"
  
! #: info/session.c:3623
  msgid "Show full file name of node being displayed"
  msgstr "Show full file name of node being displayed"
  
! #: info/session.c:3640
  msgid "Select the most recently selected node"
  msgstr "Pilih titik yang dipilih paling baru"
  
! #: info/session.c:3645
  #, c-format
  msgid "No earlier node in history"
  msgstr ""
  
! #: info/session.c:3649
  msgid "Read the name of a file and select it"
  msgstr "Baca nama dari sebuah berkas dan pilih itu"
  
! #: info/session.c:3653
  msgid "Find file: "
  msgstr "Cari berkas: "
  
! #: info/session.c:3670
  #, fuzzy, c-format
  msgid "Cannot find '%s'."
  msgstr "Tidak dapat menemukan `%s'."
  
! #: info/session.c:3719
  #, fuzzy, c-format
  msgid "Could not create output file '%s'."
  msgstr "Tidak dapat membuat berkas keluaran `%s'."
  
! #: info/session.c:3733
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "error menulis ke `%s': %s"
  
! #: info/session.c:3742
  #, c-format
  msgid "closing %s"
  msgstr "Menghapus %s"
  
! #: info/session.c:3791
  #, c-format
  msgid "writing node %s..."
  msgstr "Menulis titik %s..."
  
! #: info/session.c:3837
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "Pipe isi dari titik ini melalui INFO_PRINT_COMMAND"
  
! #: info/session.c:3865
  #, fuzzy, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Tidak dapat membuka pipe ke `%s'."
  
! #: info/session.c:3870
  #, c-format
  msgid "printing node %s..."
  msgstr "Mencetak titik %s..."
  
! #: info/session.c:3878
  #, c-format
  msgid "finished printing node %s"
  msgstr "Mencetak titik %s..."
  
! #: info/session.c:3910
  msgid "Toggle the usage of regular expressions in searches"
  msgstr "Toggle penggunaan dari ekspresi regular dalam pencarian"
  
! #: info/session.c:3914
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr "Menggunakan ekspresi regular untuk pencarian."
  
! #: info/session.c:3915
  #, c-format
  msgid "Using literal strings for searches."
  msgstr "Menggunakan string literal untuk pencarian."
  
! #: info/session.c:4175
  msgid "Search continued from the end of the document."
  msgstr "Pencarian dilanjutkan dari akhir dari dokumen."
  
! #: info/session.c:4180
  msgid "Search continued from the beginning of the document."
  msgstr "Pencarian dilanjutkan dari awal dari dokumen."
  
! #: info/session.c:4200
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "Pencarian subfile %s ..."
  
! #: info/session.c:4237
  msgid "Search failed."
  msgstr "Pencarian gagal."
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Regexp search"
  msgstr "Pencarian regexp"
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Search"
  msgstr "Pencarian"
  
! #: info/session.c:4256 info/session.c:4262
  msgid " case-sensitively"
  msgstr " tidak membedakan besar huruf"
  
! #: info/session.c:4257 info/session.c:4263
  msgid " backward"
  msgstr " kebelakang"
  
! #: info/session.c:4260
  #, fuzzy, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4280
  msgid "Search string too short"
  msgstr "Search string too short"
  
! #: info/session.c:4473
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4497 info/session.c:4607
  #, fuzzy, c-format
  msgid "No more matches."
  msgstr "No match"
  
! #: info/session.c:4634
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4655
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4659 info/session.c:4671
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4667
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4680
  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:4685
  msgid "Read a string and search for it"
  msgstr "Baca sebuah string dan cari itu"
  
! #: info/session.c:4691
  msgid "Read a string and search backward for it"
  msgstr "Baca sebuah string dan cari kebelakang untuk itu"
  
! #: info/session.c:4699
  msgid "Repeat last search in the same direction"
  msgstr "Ulangi pencarian terakhir dalam arah yang sama"
  
! #: info/session.c:4707 info/session.c:4752
  msgid "No previous search string"
  msgstr "Tidak ada string pencarian sebelumnya"
  
! #: info/session.c:4744
  msgid "Repeat last search in the reverse direction"
  msgstr "Ulangi pencarian terakhir dalam arah terbalik"
  
! #: info/session.c:4791
  msgid "Clear displayed search matches"
  msgstr ""
  
! #: info/session.c:4808 info/session.c:4814
  msgid "Search interactively for a string as you type it"
  msgstr ""
  "Pencarian secara interaktif untuk sebuah string seperti anda mengetikkannya"
  
! #: info/session.c:4934
  msgid "Regexp I-search backward: "
  msgstr "Regexp I-search kebelakang: "
  
! #: info/session.c:4935
  msgid "I-search backward: "
  msgstr "I-search kebelakang: "
  
! #: info/session.c:4937
  msgid "Regexp I-search: "
  msgstr "Regexp I-search: "
  
! #: info/session.c:4938
  msgid "I-search: "
  msgstr "I-search: "
  
! #: info/session.c:4963 info/session.c:4966
  msgid "Failing "
  msgstr "Menggagalkan "
  
! #: info/session.c:5332
  msgid "Cancel current operation"
  msgstr "Batalkan operasi sekarang"
  
! #: info/session.c:5339
  msgid "Quit"
  msgstr "Berhenti"
  
! #: info/session.c:5344
  #, fuzzy
  msgid "Display version of Info being run"
  msgstr "tampilkan informasi versi dan keluar"
  
! #: info/session.c:5346
  #, c-format
  msgid "GNU Info version %s"
  msgstr ""
  
! #: info/session.c:5351
  msgid "Redraw the display"
  msgstr "Gambar kembali tampilan"
  
! #: info/session.c:5388
  msgid "Quit using Info"
  msgstr "Berhenti menggunakan Info"
  
! #: info/session.c:5404
  msgid "Run command bound to this key's lowercase variant"
  msgstr "Jalankan perintah terikat variasi kunci huruf kecil ini"
  
! #: info/session.c:5415
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Perintah (%s) tidak diketahui."
  
! #: info/session.c:5418
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\" tidak valid"
  
! #: info/session.c:5419
  #, fuzzy, c-format
  msgid "'%s' is invalid"
  msgstr "`%s' tidak valid"
  
! #: info/session.c:5737
  msgid "Add this digit to the current numeric argument"
  msgstr "Tambahkan digit ini ke argumen numerik sekarang"
  
! #: info/session.c:5744
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "Awal (atau kelipatan dari 4) argumen numerik sekarang"
***************
*** 1790,1807 ****
  msgstr "Set %s ke nilai (%s): "
  
! #: info/window.c:959
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), baris ---, "
  
- #: info/window.c:966
- #, fuzzy, c-format
- msgid "-%s---Info: %s, %ld lines --%s--"
- msgstr "-%s---Info: %s, %d baris --%s--"
- 
- #: info/window.c:970
- #, fuzzy, c-format
- msgid "-%s---Info: (%s)%s, %ld lines --%s--"
- msgstr "--%s%s-Info: (%s)%s, %d baris --%s--"
- 
  #: install-info/install-info.c:292
  #, c-format
--- 1787,1794 ----
  msgstr "Set %s ke nilai (%s): "
  
! #: info/window.c:909
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), baris ---, "
  
  #: install-info/install-info.c:292
  #, c-format
***************
*** 1983,1987 ****
  
  #: install-info/install-info.c:642
! #, c-format
  msgid ""
  "This is the file .../info/dir, which contains the\n"
--- 1970,1974 ----
  
  #: install-info/install-info.c:642
! #, fuzzy, c-format
  msgid ""
  "This is the file .../info/dir, which contains the\n"
***************
*** 1992,1996 ****
  "\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"
--- 1979,1983 ----
  "\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"
***************
*** 2088,2204 ****
  msgstr "tidak ada masukan ditemukan untuk `%s'; tidak ada yang dihapus"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:855
! #: tp/Texinfo/Convert/Converter.pm:893 tp/Texinfo/Convert/Converter.pm:1204
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6504
! #: tp/Texinfo/Convert/HTML.pm:6528 tp/Texinfo/Convert/HTML.pm:6905
! #: tp/Texinfo/Convert/HTML.pm:6963 tp/Texinfo/Convert/HTML.pm:7041
! #: tp/Texinfo/Convert/HTML.pm:7118 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:546
! #: tp/Texinfo/Convert/TexinfoXML.pm:457
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "tidak dapat membuka %s --css-file: %s"
  
! #: tp/Texinfo/Common.pm:881
  msgid "recursion is always allowed"
  msgstr "recursion is always allowed"
  
! #: tp/Texinfo/Common.pm:882
  msgid "arguments are quoted by default"
  msgstr "@quote-arg sudah ditinggalkan; argumen telah diquote secara baku"
  
! #: tp/Texinfo/Common.pm:1105
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s bukan sebuah kode bahasa ISO 639 yang valid"
  
! #: tp/Texinfo/Common.pm:1110
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s bukan sebuah kode bahasa ISO 639 yang valid"
  
! #: tp/Texinfo/Common.pm:1128
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%s is not a valid split possibility"
  
! #: tp/Texinfo/Common.pm:1151
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "%s: tidak dapat membuka --css-file: %s"
  
! #: tp/Texinfo/Common.pm:1170
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "error menutup berkas keluaran `%s' : %s"
  
! #: tp/Texinfo/Common.pm:1176 tp/Texinfo/Parser.pm:3353
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "%s: tidak dapat membuka --css-file: %s"
  
! #: tp/Texinfo/Common.pm:1520
! #, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr "tidak dapat membuka --css-file: %s: %s"
! 
! #: tp/Texinfo/Common.pm:1548
! msgid "missing type"
! msgstr "hilang nama aksi"
! 
! #: tp/Texinfo/Common.pm:1551
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "opsi tidak dikenal %s"
! 
! #: tp/Texinfo/Common.pm:1568
! #, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr "error menutup berkas keluaran `%s': %s"
! 
! #: tp/Texinfo/Common.pm:1603
  msgid "no node to be renamed"
  msgstr "no node to be renamed"
  
! #: tp/Texinfo/Common.pm:1614
  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:1624 tp/Texinfo/Parser.pm:926
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "%s: tidak dapat membuka --css-file: %s"
  
! #: tp/Texinfo/Common.pm:2144
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr "could not protect hash character in @%s"
  
! #: tp/Texinfo/Convert/Converter.pm:395 tp/Texinfo/Convert/Converter.pm:414
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Set variabel: %s\n"
  
! #: tp/Texinfo/Convert/Converter.pm:794
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:876 tp/Texinfo/Convert/Converter.pm:909
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:6931
! #: tp/Texinfo/Convert/HTML.pm:6989 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:476 tp/Texinfo/Parser.pm:2035
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "error menutup berkas keluaran `%s': %s"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, 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:995
  #, perl-format
  msgid "could not create directory `%s': %s"
--- 2075,2183 ----
  msgstr "tidak ada masukan ditemukan untuk `%s'; tidak ada yang dihapus"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:847
! #: tp/Texinfo/Convert/Converter.pm:885 tp/Texinfo/Convert/Converter.pm:1196
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6573
! #: tp/Texinfo/Convert/HTML.pm:6597 tp/Texinfo/Convert/HTML.pm:6978
! #: tp/Texinfo/Convert/HTML.pm:7037 tp/Texinfo/Convert/HTML.pm:7115
! #: tp/Texinfo/Convert/HTML.pm:7192 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:547
! #: tp/Texinfo/Convert/TexinfoXML.pm:458
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "tidak dapat membuka %s --css-file: %s"
  
! #: tp/Texinfo/Common.pm:862
  msgid "recursion is always allowed"
  msgstr "recursion is always allowed"
  
! #: tp/Texinfo/Common.pm:863
  msgid "arguments are quoted by default"
  msgstr "@quote-arg sudah ditinggalkan; argumen telah diquote secara baku"
  
! #: tp/Texinfo/Common.pm:866
! msgid ""
! "move your @contents command if you want the contents after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:869
! msgid ""
! "move your @shortcontents and @contents commands if you want the contents "
! "after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:1093
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s bukan sebuah kode bahasa ISO 639 yang valid"
  
! #: tp/Texinfo/Common.pm:1098
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s bukan sebuah kode bahasa ISO 639 yang valid"
  
! #: tp/Texinfo/Common.pm:1116
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%s is not a valid split possibility"
  
! #: tp/Texinfo/Common.pm:1139
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "%s: tidak dapat membuka --css-file: %s"
  
! #: tp/Texinfo/Common.pm:1158
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "error menutup berkas keluaran `%s' : %s"
  
! #: tp/Texinfo/Common.pm:1164 tp/Texinfo/Parser.pm:3193
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "%s: tidak dapat membuka --css-file: %s"
  
! #: tp/Texinfo/Common.pm:1637
  msgid "no node to be renamed"
  msgstr "no node to be renamed"
  
! #: tp/Texinfo/Common.pm:1648
  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:1658 tp/Texinfo/Parser.pm:899
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "%s: tidak dapat membuka --css-file: %s"
  
! #: tp/Texinfo/Common.pm:2178
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr "could not protect hash character in @%s"
  
! #: tp/Texinfo/Convert/Converter.pm:387 tp/Texinfo/Convert/Converter.pm:406
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Set variabel: %s\n"
  
! #: tp/Texinfo/Convert/Converter.pm:786
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:868 tp/Texinfo/Convert/Converter.pm:901
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:7004
! #: tp/Texinfo/Convert/HTML.pm:7063 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:477 tp/Texinfo/Parser.pm:1996
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "error menutup berkas keluaran `%s': %s"
  
! #: tp/Texinfo/Convert/Converter.pm:979
  #, 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:987
  #, perl-format
  msgid "could not create directory `%s': %s"
***************
*** 2210,2309 ****
  msgstr "@image berkas `%s' tidak dapat dibaca: %s"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5388
  #, fuzzy
  msgid "no argument specified for @U"
  msgstr "Tidak nama titik dispesifikasikan untuk perintah `%c%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:1683
  #, 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:2371
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "raw format %s is not converted"
  
! #: tp/Texinfo/Convert/HTML.pm:4888
  msgid "string not closed in css file"
  msgstr "string not closed in css file"
  
! #: tp/Texinfo/Convert/HTML.pm:4890
  msgid "--css-include ended in comment"
  msgstr "--css-file berakhir dalam komentar"
  
! #: tp/Texinfo/Convert/HTML.pm:4892
  msgid "@import not finished in css file"
  msgstr "@import not finished in css file"
  
! #: tp/Texinfo/Convert/HTML.pm:4918
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "CSS file %s not found"
  
! #: tp/Texinfo/Convert/HTML.pm:4924
  #, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "tidak dapat membuka --css-file: %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:4934
  #, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "error menutup berkas keluaran `%s': %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5801 tp/Texinfo/Convert/HTML.pm:5805
  #, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "tidak ada masukan indeks ditemukan untuk `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:6499
  #, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "error menutup berkas keluaran `%s': %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6523
  #, perl-format
  msgid "error on closing TOC frame file %s: %s"
  msgstr "error menutup berkas keluaran `%s': %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6638
  #, 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:6839
  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:7048
  #, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr "error menutup berkas keluaran `%s': %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7073
  #, 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:7079
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "titik `%s' tidak tereferensi"
  
! #: tp/Texinfo/Convert/HTML.pm:7093
  #, 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:7125
  #, 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:7163
  msgid "empty node name"
  msgstr "empty node name"
  
! #: tp/Texinfo/Convert/HTML.pm:7165 tp/Texinfo/Parser.pm:3697
  #, perl-format
  msgid "syntax for an external node used for `%s'"
--- 2189,2307 ----
  msgstr "@image berkas `%s' tidak dapat dibaca: %s"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5225
  #, fuzzy
  msgid "no argument specified for @U"
  msgstr "Tidak nama titik dispesifikasikan untuk perintah `%c%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:1715
  #, 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:2399
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "raw format %s is not converted"
  
! #: tp/Texinfo/Convert/HTML.pm:4629
! #, 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:4657
! msgid "missing type"
! msgstr "hilang nama aksi"
! 
! #: tp/Texinfo/Convert/HTML.pm:4660
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "opsi tidak dikenal %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4677
! #, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr "error menutup berkas keluaran `%s': %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4962
  msgid "string not closed in css file"
  msgstr "string not closed in css file"
  
! #: tp/Texinfo/Convert/HTML.pm:4964
  msgid "--css-include ended in comment"
  msgstr "--css-file berakhir dalam komentar"
  
! #: tp/Texinfo/Convert/HTML.pm:4966
  msgid "@import not finished in css file"
  msgstr "@import not finished in css file"
  
! #: tp/Texinfo/Convert/HTML.pm:4992
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "CSS file %s not found"
  
! #: tp/Texinfo/Convert/HTML.pm:4998
  #, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "tidak dapat membuka --css-file: %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5008
  #, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "error menutup berkas keluaran `%s': %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5870 tp/Texinfo/Convert/HTML.pm:5874
  #, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "tidak ada masukan indeks ditemukan untuk `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:6568
  #, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "error menutup berkas keluaran `%s': %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6592
  #, perl-format
  msgid "error on closing TOC frame file %s: %s"
  msgstr "error menutup berkas keluaran `%s': %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6707
  #, 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:6912
  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:7122
  #, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr "error menutup berkas keluaran `%s': %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7147
  #, 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:7153
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "titik `%s' tidak tereferensi"
  
! #: tp/Texinfo/Convert/HTML.pm:7167
  #, 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:7199
  #, 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:7237
  msgid "empty node name"
  msgstr "empty node name"
  
! #: tp/Texinfo/Convert/HTML.pm:7239 tp/Texinfo/Parser.pm:3542
  #, perl-format
  msgid "syntax for an external node used for `%s'"
***************
*** 2338,2367 ****
  msgstr "@node name should not contain `,': %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1334
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1381 tp/Texinfo/Parser.pm:2722
  #, 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:1495
  #, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr "error menutup berkas keluaran `%s': %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1500
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "@image berkas `%s' tidak dapat dibaca: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1523
  #, 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:1931
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
--- 2336,2365 ----
  msgstr "@node name should not contain `,': %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1335
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1382 tp/Texinfo/Parser.pm:2568
  #, 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:1496
  #, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr "error menutup berkas keluaran `%s': %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1501
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "@image berkas `%s' tidak dapat dibaca: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1524
  #, 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:1932
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
***************
*** 2371,2521 ****
  "reword ke untuk menghindari"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2161
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr "@%s cross-reference name should not contain `:'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2193
  #, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "@%s masukan indeks yang berisi `%s'."
  
! #: tp/Texinfo/Convert/Plaintext.pm:2226
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr "@%s node name should not contain `:'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2272
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "`.' atau `,' harus mengikuti, bukan `%s'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2275
  msgid "`.' or `,' must follow @xref"
  msgstr "`.' atau `,' harus mengikuti"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3118
  #, 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:3129
  msgid "menu entry node name should not contain `:'"
  msgstr "menu entry node name should not contain `:'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3145
  msgid "menu entry name should not contain `:'"
  msgstr "menu entry name should not contain `:'"
  
! #: tp/Texinfo/Parser.pm:910
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr "@%s should only appear at beginning or end of document"
  
! #: tp/Texinfo/Parser.pm:1160 tp/Texinfo/Structuring.pm:594
  #, perl-format
  msgid "multiple @%s"
  msgstr "multiple @%s"
  
! #: tp/Texinfo/Parser.pm:1194
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "bad syntax for @%s argument: %s"
! 
! #: tp/Texinfo/Parser.pm:1210
  #, perl-format
  msgid "bad or empty @%s formal argument: %s"
  msgstr "bad or empty @%s formal argument: %s"
  
! #: tp/Texinfo/Parser.pm:1219 tp/Texinfo/Parser.pm:4856
! #: tp/Texinfo/Parser.pm:4882 tp/Texinfo/Parser.pm:5671
! #: tp/Texinfo/Parser.pm:5687 tp/Texinfo/Parser.pm:5702
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s membutuhkan sebuah nama"
  
! #: tp/Texinfo/Parser.pm:1223 tp/Texinfo/Parser.pm:4859
! #: tp/Texinfo/Parser.pm:4885 tp/Texinfo/Parser.pm:5674
! #: tp/Texinfo/Parser.pm:5690 tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad name for @%s"
  msgstr "Argumen ke @%s buruk"
  
! #: tp/Texinfo/Parser.pm:1341
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr "@end %s seen before @%s closing brace"
  
! #: tp/Texinfo/Parser.pm:1345
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "@%s seen before @%s closing brace"
  
! #: tp/Texinfo/Parser.pm:1350
! #, perl-format
! msgid "%c%s missing close brace"
  msgstr "%c%s hilang kurung penutup"
  
! #: tp/Texinfo/Parser.pm:1354
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "@%s missing closing delimiter sequence: %s}"
  
! #: tp/Texinfo/Parser.pm:1476
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "@itemx should not begin @%s"
  
! #: tp/Texinfo/Parser.pm:1544
  msgid "@itemx must follow @item"
  msgstr "@itemx must follow @item"
  
! #: tp/Texinfo/Parser.pm:1712
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr "@%s has text but no @item"
  
! #: tp/Texinfo/Parser.pm:1743
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "`@end' diduga `%s', tetapi terlihat `%s'"
  
! #: tp/Texinfo/Parser.pm:1746
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@%s seen before @end %s"
  
! #: tp/Texinfo/Parser.pm:1750
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "Tidak cocok `%cend %s'"
  
! #: tp/Texinfo/Parser.pm:1776 tp/Texinfo/Parser.pm:5204
! #: tp/Texinfo/Parser.pm:5470
  #, perl-format
  msgid "misplaced %c"
  msgstr "Salah tempat %c"
  
! #: tp/Texinfo/Parser.pm:1874 tp/Texinfo/Parser.pm:3312
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "Tidak cocok `%c%s'"
  
! #: tp/Texinfo/Parser.pm:2110
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "Makro `%s' dipanggil di baris dengan terlalu banyak args"
  
! #: tp/Texinfo/Parser.pm:2132
! #, perl-format
! msgid "@%s missing close brace"
  msgstr "@%s hilang kurung penutup"
  
! #: tp/Texinfo/Parser.pm:2140
  #, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr "Makro `%s' dipanggil di baris dengan terlalu banyak args"
  
! #: tp/Texinfo/Parser.pm:2175
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
--- 2369,2519 ----
  "reword ke untuk menghindari"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2162
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr "@%s cross-reference name should not contain `:'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2194
  #, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "@%s masukan indeks yang berisi `%s'."
  
! #: tp/Texinfo/Convert/Plaintext.pm:2227
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr "@%s node name should not contain `:'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2273
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "`.' atau `,' harus mengikuti, bukan `%s'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2276
  msgid "`.' or `,' must follow @xref"
  msgstr "`.' atau `,' harus mengikuti"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3086
  #, 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:3097
  msgid "menu entry node name should not contain `:'"
  msgstr "menu entry node name should not contain `:'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3113
  msgid "menu entry name should not contain `:'"
  msgstr "menu entry name should not contain `:'"
  
! #: tp/Texinfo/Parser.pm:883
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr "@%s should only appear at beginning or end of document"
  
! #: tp/Texinfo/Parser.pm:1125 tp/Texinfo/Structuring.pm:595
  #, perl-format
  msgid "multiple @%s"
  msgstr "multiple @%s"
  
! #: tp/Texinfo/Parser.pm:1166
  #, perl-format
  msgid "bad or empty @%s formal argument: %s"
  msgstr "bad or empty @%s formal argument: %s"
  
! #: tp/Texinfo/Parser.pm:1176
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "bad syntax for @%s argument: %s"
! 
! #: tp/Texinfo/Parser.pm:1183 tp/Texinfo/Parser.pm:4707
! #: tp/Texinfo/Parser.pm:4733 tp/Texinfo/Parser.pm:5565
! #: tp/Texinfo/Parser.pm:5578 tp/Texinfo/Parser.pm:5592
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s membutuhkan sebuah nama"
  
! #: tp/Texinfo/Parser.pm:1187 tp/Texinfo/Parser.pm:4710
! #: tp/Texinfo/Parser.pm:4736 tp/Texinfo/Parser.pm:5568
! #: tp/Texinfo/Parser.pm:5581 tp/Texinfo/Parser.pm:5595
  #, perl-format
  msgid "bad name for @%s"
  msgstr "Argumen ke @%s buruk"
  
! #: tp/Texinfo/Parser.pm:1305
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr "@end %s seen before @%s closing brace"
  
! #: tp/Texinfo/Parser.pm:1309
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "@%s seen before @%s closing brace"
  
! #: tp/Texinfo/Parser.pm:1314
! #, fuzzy, perl-format
! msgid "%c%s missing closing brace"
  msgstr "%c%s hilang kurung penutup"
  
! #: tp/Texinfo/Parser.pm:1318
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "@%s missing closing delimiter sequence: %s}"
  
! #: tp/Texinfo/Parser.pm:1440
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "@itemx should not begin @%s"
  
! #: tp/Texinfo/Parser.pm:1508
  msgid "@itemx must follow @item"
  msgstr "@itemx must follow @item"
  
! #: tp/Texinfo/Parser.pm:1676
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr "@%s has text but no @item"
  
! #: tp/Texinfo/Parser.pm:1707
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "`@end' diduga `%s', tetapi terlihat `%s'"
  
! #: tp/Texinfo/Parser.pm:1710
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@%s seen before @end %s"
  
! #: tp/Texinfo/Parser.pm:1714
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "Tidak cocok `%cend %s'"
  
! #: tp/Texinfo/Parser.pm:1738 tp/Texinfo/Parser.pm:5070
! #: tp/Texinfo/Parser.pm:5308
  #, perl-format
  msgid "misplaced %c"
  msgstr "Salah tempat %c"
  
! #: tp/Texinfo/Parser.pm:1835 tp/Texinfo/Parser.pm:3148
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "Tidak cocok `%c%s'"
  
! #: tp/Texinfo/Parser.pm:2072
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "Makro `%s' dipanggil di baris dengan terlalu banyak args"
  
! #: tp/Texinfo/Parser.pm:2094
! #, fuzzy, perl-format
! msgid "@%s missing closing brace"
  msgstr "@%s hilang kurung penutup"
  
! #: tp/Texinfo/Parser.pm:2102
  #, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr "Makro `%s' dipanggil di baris dengan terlalu banyak args"
  
! #: tp/Texinfo/Parser.pm:2138
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
***************
*** 2523,2689 ****
  "\\ dalam @%s ekspansi makro diikuti oleh `%s' daripada nama parameter \\"
  
! #: tp/Texinfo/Parser.pm:2650
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s makro `%s' telah didefinisikan sebelumnya"
  
! #: tp/Texinfo/Parser.pm:2655
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "disini adalah definisi sebelumnya dari `%s'"
  
! #: tp/Texinfo/Parser.pm:3016
  #, perl-format
  msgid "missing name for @%s"
  msgstr "hilang nama aksi @%s"
  
! #: tp/Texinfo/Parser.pm:3021
  #, perl-format
  msgid "missing category for @%s"
  msgstr "missing category for @%s"
  
! #: tp/Texinfo/Parser.pm:3073
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "Argumen ke @%s: %s buruk"
  
! #: tp/Texinfo/Parser.pm:3089
  msgid "empty multitable"
  msgstr "berkas kosong"
  
! #: tp/Texinfo/Parser.pm:3145 tp/Texinfo/Parser.pm:5784
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "Argumen ke @%s buruk"
  
! #: tp/Texinfo/Parser.pm:3151 tp/Texinfo/Parser.pm:5806
! #: tp/Texinfo/Parser.pm:5818
  #, perl-format
  msgid "bad argument to @%s"
  msgstr "Argumen ke @%s buruk"
  
! #: tp/Texinfo/Parser.pm:3162
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s membutuhkan sebuah argumen: peformat untuk %c item"
  
! #: tp/Texinfo/Parser.pm:3167
  #, 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/Parser.pm:3202
  #, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "%s: opsi `--%s' tidak mengijinkan sebuah argumen"
  
! #: tp/Texinfo/Parser.pm:3290 tp/Texinfo/Parser.pm:3429
! #: tp/Texinfo/Parser.pm:5777
  #, perl-format
  msgid "@%s missing argument"
  msgstr "%s: hilang argumen berkas."
  
! #: tp/Texinfo/Parser.pm:3302
  #, perl-format
  msgid "unknown @end %s"
  msgstr "Indeks `%s' tidak diketahui"
  
! #: tp/Texinfo/Parser.pm:3324 tp/Texinfo/Parser.pm:3943
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "Argumen ke @%s: %s buruk %s"
  
! #: tp/Texinfo/Parser.pm:3329 tp/Texinfo/Parser.pm:5861
! #: tp/Texinfo/Parser.pm:5906 tp/Texinfo/Parser.pm:5935
! #: tp/Texinfo/Parser.pm:5976 tp/Texinfo/Parser.pm:6055
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "Argumen ke @%s: %s buruk"
  
! #: tp/Texinfo/Parser.pm:3348
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "%s: tidak dapat membuka --css-file: %s %s"
  
! #: tp/Texinfo/Parser.pm:3360
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr "encoding `%s' is not a canonical texinfo encoding"
  
! #: tp/Texinfo/Parser.pm:3369
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "nama pengkodean `%s' tidak diketahui"
  
! #: tp/Texinfo/Parser.pm:3516
  #, perl-format
  msgid "@%s after the first element"
  msgstr "@%s after the first element"
  
! #: tp/Texinfo/Parser.pm:3523
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s tidak berarti diluar lingkungan `@titlepage'"
  
! #: tp/Texinfo/Parser.pm:3563
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "@%s should not be associated with @top"
  
! #: tp/Texinfo/Parser.pm:3575
  #, 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/Parser.pm:3677
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "Argumen ke @%s buruk"
  
! #: tp/Texinfo/Parser.pm:3681
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "empty node name after expansion `%s'"
  
! #: tp/Texinfo/Parser.pm:3724
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "Tidak ada menu dalam titik `%s'."
  
! #: tp/Texinfo/Parser.pm:3732
  msgid "empty node name in menu entry"
  msgstr "empty node name in menu entry"
  
! #: tp/Texinfo/Parser.pm:3805
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "%s: tidak dapat membuka --css-file: %s"
  
! #: tp/Texinfo/Parser.pm:3937
! #, perl-format
! msgid "@end %s should only appear at a line beginning"
  msgstr "@end %s should only appear at a line beginning"
  
! #: tp/Texinfo/Parser.pm:3960
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "makro `%s' telah didefinisikan sebelumnya"
  
! #: tp/Texinfo/Parser.pm:3963
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "disini adalah definisi sebelumnya dari `%s'"
  
! #: tp/Texinfo/Parser.pm:3968
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "redefining Texinfo language command: @%s"
  
! #: tp/Texinfo/Parser.pm:4017
  #, perl-format
  msgid "@%s without associated character"
  msgstr "@%s without associated character"
  
! #: tp/Texinfo/Parser.pm:4087
  #, perl-format
  msgid ""
--- 2521,2688 ----
  "\\ dalam @%s ekspansi makro diikuti oleh `%s' daripada nama parameter \\"
  
! #: tp/Texinfo/Parser.pm:2501
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s makro `%s' telah didefinisikan sebelumnya"
  
! #: tp/Texinfo/Parser.pm:2506
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "disini adalah definisi sebelumnya dari `%s'"
  
! #: tp/Texinfo/Parser.pm:2850
  #, perl-format
  msgid "missing name for @%s"
  msgstr "hilang nama aksi @%s"
  
! #: tp/Texinfo/Parser.pm:2855
  #, perl-format
  msgid "missing category for @%s"
  msgstr "missing category for @%s"
  
! #: tp/Texinfo/Parser.pm:2890
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "Argumen ke @%s: %s buruk"
  
! #: tp/Texinfo/Parser.pm:2905
  msgid "empty multitable"
  msgstr "berkas kosong"
  
! #: tp/Texinfo/Parser.pm:2959 tp/Texinfo/Parser.pm:5673
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "Argumen ke @%s buruk"
  
! #: tp/Texinfo/Parser.pm:2965 tp/Texinfo/Parser.pm:5694
! #: tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad argument to @%s"
  msgstr "Argumen ke @%s buruk"
  
! #: tp/Texinfo/Parser.pm:2976
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s membutuhkan sebuah argumen: peformat untuk %c item"
  
! #: tp/Texinfo/Parser.pm:2981
  #, 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/Parser.pm:3016
  #, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "%s: opsi `--%s' tidak mengijinkan sebuah argumen"
  
! #: tp/Texinfo/Parser.pm:3124 tp/Texinfo/Parser.pm:3277
! #: tp/Texinfo/Parser.pm:5666
  #, perl-format
  msgid "@%s missing argument"
  msgstr "%s: hilang argumen berkas."
  
! #: tp/Texinfo/Parser.pm:3138
  #, perl-format
  msgid "unknown @end %s"
  msgstr "Indeks `%s' tidak diketahui"
  
! #: tp/Texinfo/Parser.pm:3161 tp/Texinfo/Parser.pm:3788
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "Argumen ke @%s: %s buruk %s"
  
! #: tp/Texinfo/Parser.pm:3167 tp/Texinfo/Parser.pm:3245
! #: tp/Texinfo/Parser.pm:5755 tp/Texinfo/Parser.pm:5798
! #: tp/Texinfo/Parser.pm:5827 tp/Texinfo/Parser.pm:5868
! #: tp/Texinfo/Parser.pm:5946
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "Argumen ke @%s: %s buruk"
  
! #: tp/Texinfo/Parser.pm:3188
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "%s: tidak dapat membuka --css-file: %s %s"
  
! #: tp/Texinfo/Parser.pm:3200
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr "encoding `%s' is not a canonical texinfo encoding"
  
! #: tp/Texinfo/Parser.pm:3208
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "nama pengkodean `%s' tidak diketahui"
  
! #: tp/Texinfo/Parser.pm:3364
  #, perl-format
  msgid "@%s after the first element"
  msgstr "@%s after the first element"
  
! #: tp/Texinfo/Parser.pm:3371
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s tidak berarti diluar lingkungan `@titlepage'"
  
! #: tp/Texinfo/Parser.pm:3408
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "@%s should not be associated with @top"
  
! #: tp/Texinfo/Parser.pm:3420
  #, 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/Parser.pm:3522
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "Argumen ke @%s buruk"
  
! #: tp/Texinfo/Parser.pm:3526
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "empty node name after expansion `%s'"
  
! #: tp/Texinfo/Parser.pm:3569
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "Tidak ada menu dalam titik `%s'."
  
! #: tp/Texinfo/Parser.pm:3577
  msgid "empty node name in menu entry"
  msgstr "empty node name in menu entry"
  
! #: tp/Texinfo/Parser.pm:3650
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "%s: tidak dapat membuka --css-file: %s"
  
! #: tp/Texinfo/Parser.pm:3782
! #, fuzzy, perl-format
! msgid "@end %s should only appear at the beginning of a line"
  msgstr "@end %s should only appear at a line beginning"
  
! #: tp/Texinfo/Parser.pm:3804
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "makro `%s' telah didefinisikan sebelumnya"
  
! #: tp/Texinfo/Parser.pm:3807
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "disini adalah definisi sebelumnya dari `%s'"
  
! #: tp/Texinfo/Parser.pm:3812
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "redefining Texinfo language command: @%s"
  
! #: tp/Texinfo/Parser.pm:3879
  #, perl-format
  msgid "@%s without associated character"
  msgstr "@%s without associated character"
  
! #: tp/Texinfo/Parser.pm:3949
  #, perl-format
  msgid ""
***************
*** 2692,2696 ****
  "@%s defined with zero or more than one argument should be invoked with {}"
  
! #: tp/Texinfo/Parser.pm:4111
  #, perl-format
  msgid ""
--- 2691,2695 ----
  "@%s defined with zero or more than one argument should be invoked with {}"
  
! #: tp/Texinfo/Parser.pm:3974
  #, perl-format
  msgid ""
***************
*** 2701,2715 ****
  "value %d)"
  
! #: tp/Texinfo/Parser.pm:4120
  #, 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/Parser.pm:4176
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr "accent command `@%s' must not be followed by whitespace"
  
! #: tp/Texinfo/Parser.pm:4182
  #, perl-format
  msgid "use braces to give a command as an argument to @%s"
--- 2700,2714 ----
  "value %d)"
  
! #: tp/Texinfo/Parser.pm:3983
  #, 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/Parser.pm:4038
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr "accent command `@%s' must not be followed by whitespace"
  
! #: tp/Texinfo/Parser.pm:4044
  #, perl-format
  msgid "use braces to give a command as an argument to @%s"
***************
*** 2717,2827 ****
  "Gunakan kurung untuk memberi sebuah perintah sebagai sebuah argumen ke @%s"
  
! #: tp/Texinfo/Parser.pm:4195 tp/Texinfo/Parser.pm:5325
  #, 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/Parser.pm:4207
  #, 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/Parser.pm:4218
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s diduga kurung"
  
! #: tp/Texinfo/Parser.pm:4383
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "opsi tidak terdefinisi: %s"
  
! #: tp/Texinfo/Parser.pm:4386
  msgid "bad syntax for @value"
  msgstr "bad syntax for @value"
  
! #: tp/Texinfo/Parser.pm:4393
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s sudah ditinggalkan"
  
! #: tp/Texinfo/Parser.pm:4396
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s sudah ditinggalkan %s"
  
! #: tp/Texinfo/Parser.pm:4405
! #, perl-format
! msgid "@%s should only appear at a line beginning"
  msgstr "@%s should only appear at a line beginning"
  
! #: tp/Texinfo/Parser.pm:4496
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s tidak berarti didalam blok `@%s'"
  
! #: tp/Texinfo/Parser.pm:4505
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr "@%s should only appear in heading or footing"
  
! #: tp/Texinfo/Parser.pm:4631 tp/Texinfo/Parser.pm:4648
! #: tp/Texinfo/Parser.pm:4698
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s tidak berarti didalam blok `@%s'"
  
! #: tp/Texinfo/Parser.pm:4658
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "@%s: berkas kosong"
  
! #: tp/Texinfo/Parser.pm:4664
  msgid "@tab before @item"
  msgstr "@tab before @item"
  
! #: tp/Texinfo/Parser.pm:4667
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "Terlalu banyak kolom dalam multitable item (maksimal %d)"
  
! #: tp/Texinfo/Parser.pm:4704
  msgid "ignoring @tab outside of multitable"
  msgstr "mengabaikan @tab diluar dari multitabel"
  
! #: tp/Texinfo/Parser.pm:4708
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "@%s outside of table or list"
  
! #: tp/Texinfo/Parser.pm:4745
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "Harus berada dalam lingkungan `@%s' untuk menggunakan `@%s'"
  
! #: tp/Texinfo/Parser.pm:4787
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "@%s tidak berarti diluar lingkunga `@titlepage' dan `@quotation'"
  
! #: tp/Texinfo/Parser.pm:4791
  msgid "@dircategory after first node"
  msgstr "@dircategory after first node"
  
! #: tp/Texinfo/Parser.pm:4979
  #, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "Catatan %s kaki didalam catatan kaki %s tidak diijinkan"
  
! #: tp/Texinfo/Parser.pm:4997
  msgid "@direntry after first node"
  msgstr "@direntry after first node"
  
! #: tp/Texinfo/Parser.pm:5005
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "@%s terlihat sebelum @node pertama, membuat titik `Top'"
  
! #: tp/Texinfo/Parser.pm:5008
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
--- 2716,2826 ----
  "Gunakan kurung untuk memberi sebuah perintah sebagai sebuah argumen ke @%s"
  
! #: tp/Texinfo/Parser.pm:4057 tp/Texinfo/Parser.pm:5189
  #, 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/Parser.pm:4068
  #, 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/Parser.pm:4079
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s diduga kurung"
  
! #: tp/Texinfo/Parser.pm:4233
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "opsi tidak terdefinisi: %s"
  
! #: tp/Texinfo/Parser.pm:4236
  msgid "bad syntax for @value"
  msgstr "bad syntax for @value"
  
! #: tp/Texinfo/Parser.pm:4243
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s sudah ditinggalkan"
  
! #: tp/Texinfo/Parser.pm:4246
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s sudah ditinggalkan %s"
  
! #: tp/Texinfo/Parser.pm:4255
! #, fuzzy, perl-format
! msgid "@%s should only appear at the beginning of a line"
  msgstr "@%s should only appear at a line beginning"
  
! #: tp/Texinfo/Parser.pm:4346
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s tidak berarti didalam blok `@%s'"
  
! #: tp/Texinfo/Parser.pm:4355
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr "@%s should only appear in heading or footing"
  
! #: tp/Texinfo/Parser.pm:4479 tp/Texinfo/Parser.pm:4496
! #: tp/Texinfo/Parser.pm:4546
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s tidak berarti didalam blok `@%s'"
  
! #: tp/Texinfo/Parser.pm:4506
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "@%s: berkas kosong"
  
! #: tp/Texinfo/Parser.pm:4512
  msgid "@tab before @item"
  msgstr "@tab before @item"
  
! #: tp/Texinfo/Parser.pm:4515
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "Terlalu banyak kolom dalam multitable item (maksimal %d)"
  
! #: tp/Texinfo/Parser.pm:4552
  msgid "ignoring @tab outside of multitable"
  msgstr "mengabaikan @tab diluar dari multitabel"
  
! #: tp/Texinfo/Parser.pm:4556
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "@%s outside of table or list"
  
! #: tp/Texinfo/Parser.pm:4596
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "Harus berada dalam lingkungan `@%s' untuk menggunakan `@%s'"
  
! #: tp/Texinfo/Parser.pm:4638
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "@%s tidak berarti diluar lingkunga `@titlepage' dan `@quotation'"
  
! #: tp/Texinfo/Parser.pm:4642
  msgid "@dircategory after first node"
  msgstr "@dircategory after first node"
  
! #: tp/Texinfo/Parser.pm:4847
  #, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "Catatan %s kaki didalam catatan kaki %s tidak diijinkan"
  
! #: tp/Texinfo/Parser.pm:4864
  msgid "@direntry after first node"
  msgstr "@direntry after first node"
  
! #: tp/Texinfo/Parser.pm:4872
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "@%s terlihat sebelum @node pertama, membuat titik `Top'"
  
! #: tp/Texinfo/Parser.pm:4875
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
***************
*** 2829,2920 ****
  "mungkin titik @top anda seharusnya wrapped dalam @ifnottex daripada @ifinfo?"
  
! #: tp/Texinfo/Parser.pm:5070
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr "@%s should only appear in math context"
  
! #: tp/Texinfo/Parser.pm:5078
  #, perl-format
  msgid "unknown command `%s'"
  msgstr "Perintah `%s' tidak diketahui"
  
! #: tp/Texinfo/Parser.pm:5088
  msgid "unexpected @"
  msgstr "Diduga @"
  
! #: tp/Texinfo/Parser.pm:5117
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s tidak berarti diluar lingkungan `@float'"
  
! #: tp/Texinfo/Parser.pm:5122
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr "@%s should be right below `@float'"
  
! #: tp/Texinfo/Parser.pm:5130
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "ignoring multiple @%s"
  
! #: tp/Texinfo/Parser.pm:5249
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "command @%s does not accept arguments"
  
! #: tp/Texinfo/Parser.pm:5273
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr "command @%s missing a node or external manual argument"
  
! #: tp/Texinfo/Parser.pm:5292
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr "in @%s empty cross reference name after expansion `%s'"
  
! #: tp/Texinfo/Parser.pm:5303
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
  msgstr "in @%s empty cross reference title after expansion `%s'"
  
! #: tp/Texinfo/Parser.pm:5316
  msgid "@image missing filename argument"
  msgstr "@image hilang argumen nama berkas"
  
! #: tp/Texinfo/Parser.pm:5348
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "@%s: hilang argumen berkas."
  
! #: tp/Texinfo/Parser.pm:5393
  #, fuzzy, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "Argumen ke @%s: %s buruk"
  
! #: tp/Texinfo/Parser.pm:5399
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5412
! #, perl-format
! msgid "argument for @U exceeds size of integer: %s"
! msgstr ""
! 
! #: tp/Texinfo/Parser.pm:5418
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5546
  msgid "superfluous arguments for node"
  msgstr "superfluous arguments for node"
  
! #: tp/Texinfo/Parser.pm:5596
  #, perl-format
  msgid "expected @end %s"
  msgstr "Diduga `%s'"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
--- 2828,2914 ----
  "mungkin titik @top anda seharusnya wrapped dalam @ifnottex daripada @ifinfo?"
  
! #: tp/Texinfo/Parser.pm:4937
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr "@%s should only appear in math context"
  
! #: tp/Texinfo/Parser.pm:4945
  #, perl-format
  msgid "unknown command `%s'"
  msgstr "Perintah `%s' tidak diketahui"
  
! #: tp/Texinfo/Parser.pm:4955
  msgid "unexpected @"
  msgstr "Diduga @"
  
! #: tp/Texinfo/Parser.pm:4983
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s tidak berarti diluar lingkungan `@float'"
  
! #: tp/Texinfo/Parser.pm:4988
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr "@%s should be right below `@float'"
  
! #: tp/Texinfo/Parser.pm:4996
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "ignoring multiple @%s"
  
! #: tp/Texinfo/Parser.pm:5114
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "command @%s does not accept arguments"
  
! #: tp/Texinfo/Parser.pm:5138
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr "command @%s missing a node or external manual argument"
  
! #: tp/Texinfo/Parser.pm:5156
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr "in @%s empty cross reference name after expansion `%s'"
  
! #: tp/Texinfo/Parser.pm:5167
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
  msgstr "in @%s empty cross reference title after expansion `%s'"
  
! #: tp/Texinfo/Parser.pm:5180
  msgid "@image missing filename argument"
  msgstr "@image hilang argumen nama berkas"
  
! #: tp/Texinfo/Parser.pm:5211
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "@%s: hilang argumen berkas."
  
! #: tp/Texinfo/Parser.pm:5230
  #, fuzzy, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "Argumen ke @%s: %s buruk"
  
! #: tp/Texinfo/Parser.pm:5236
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5253
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5448
  msgid "superfluous arguments for node"
  msgstr "superfluous arguments for node"
  
! #: tp/Texinfo/Parser.pm:5498
  #, perl-format
  msgid "expected @end %s"
  msgstr "Diduga `%s'"
  
! #: tp/Texinfo/Parser.pm:5607
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
***************
*** 2923,2932 ****
  "%s"
  
! #: tp/Texinfo/Parser.pm:5728
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "Argumen ke @%s: %s buruk"
  
! #: tp/Texinfo/Parser.pm:5801
  #, perl-format
  msgid "environment command %s as argument to @%s"
--- 2917,2926 ----
  "%s"
  
! #: tp/Texinfo/Parser.pm:5617
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "Argumen ke @%s: %s buruk"
  
! #: tp/Texinfo/Parser.pm:5689
  #, perl-format
  msgid "environment command %s as argument to @%s"
***************
*** 2934,2998 ****
  "Gunakan kurung untuk %s memberi sebuah perintah sebagai sebuah argumen ke @%s"
  
! #: tp/Texinfo/Parser.pm:5823
  #, perl-format
  msgid "empty @%s"
  msgstr "empty @%s"
  
! #: tp/Texinfo/Parser.pm:5831
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "column fraction not a number: %s"
  
! #: tp/Texinfo/Parser.pm:5840
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "@sp arg harus berupa numerik, bukan `%s'."
  
! #: tp/Texinfo/Parser.pm:5849
  #, perl-format
  msgid "reserved index name %s"
  msgstr "reserved index name %s"
  
! #: tp/Texinfo/Parser.pm:5868
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "Indeks `%s' tidak diketahui %s"
  
! #: tp/Texinfo/Parser.pm:5871
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "unknown destination index in @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5901
  #, 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/Parser.pm:5914
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "Indeks `%s' tidak diketahui dalam @printindex"
  
! #: tp/Texinfo/Parser.pm:5920
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr "printing an index `%s' merged in another one `%s'"
  
! #: tp/Texinfo/Parser.pm:5928
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "printindex before document beginning: @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5944
  #, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
  msgstr "@%s arg harus berupa numerik, bukan `%s'"
  
! #: tp/Texinfo/Parser.pm:5952
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr "Hanya @%s 10 atau 11 yang didukung, bukan `%s'"
  
! #: tp/Texinfo/Parser.pm:5960
  #, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
--- 2928,2992 ----
  "Gunakan kurung untuk %s memberi sebuah perintah sebagai sebuah argumen ke @%s"
  
! #: tp/Texinfo/Parser.pm:5710
  #, perl-format
  msgid "empty @%s"
  msgstr "empty @%s"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "column fraction not a number: %s"
  
! #: tp/Texinfo/Parser.pm:5727
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "@sp arg harus berupa numerik, bukan `%s'."
  
! #: tp/Texinfo/Parser.pm:5736
  #, perl-format
  msgid "reserved index name %s"
  msgstr "reserved index name %s"
  
! #: tp/Texinfo/Parser.pm:5762
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "Indeks `%s' tidak diketahui %s"
  
! #: tp/Texinfo/Parser.pm:5765
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "unknown destination index in @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5793
  #, 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/Parser.pm:5806
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "Indeks `%s' tidak diketahui dalam @printindex"
  
! #: tp/Texinfo/Parser.pm:5812
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr "printing an index `%s' merged in another one `%s'"
  
! #: tp/Texinfo/Parser.pm:5820
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "printindex before document beginning: @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5836
  #, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
  msgstr "@%s arg harus berupa numerik, bukan `%s'"
  
! #: tp/Texinfo/Parser.pm:5844
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr "Hanya @%s 10 atau 11 yang didukung, bukan `%s'"
  
! #: tp/Texinfo/Parser.pm:5852
  #, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
***************
*** 3000,3069 ****
  "@%s: --footnote-style arg harus berupa `separate' atau `end', bukan `%s'."
  
! #: tp/Texinfo/Parser.pm:5968
  #, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
  msgstr "@%s arg harus berupa numerik, bukan `%s'."
  
! #: tp/Texinfo/Parser.pm:5986 tp/Texinfo/Parser.pm:5991
  #, 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/Parser.pm:5999
  #, 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/Parser.pm:6009
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
  msgstr "--paragraph-indent arg harus berupa numerik/`none'/`asis', bukan `%s'."
  
! #: tp/Texinfo/Parser.pm:6021
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "Diduga @%s on atau off, bukan `%s'"
  
! #: tp/Texinfo/Parser.pm:6031
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
  msgstr "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
  
! #: tp/Texinfo/Parser.pm:6039
  #, 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/Parser.pm:6047
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
  msgstr "--footnote-style arg harus berupa `separate' atau `end', bukan `%s'."
  
! #: tp/Texinfo/Structuring.pm:213
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr "raising the section level of @%s which is too low"
  
! #: tp/Texinfo/Structuring.pm:245
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "no chapter-level command before @%s"
  
! #: tp/Texinfo/Structuring.pm:250
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr "lowering the section level of @%s appearing after a lower element"
  
! #: tp/Texinfo/Structuring.pm:339
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "no sectioning command associated with @%s"
  
! #: tp/Texinfo/Structuring.pm:488
  #, fuzzy, perl-format
  msgid "@%s not empty"
  msgstr "@%s: berkas kosong"
  
! #: tp/Texinfo/Structuring.pm:544 tp/Texinfo/Structuring.pm:1326
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
--- 2994,3063 ----
  "@%s: --footnote-style arg harus berupa `separate' atau `end', bukan `%s'."
  
! #: tp/Texinfo/Parser.pm:5860
  #, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
  msgstr "@%s arg harus berupa numerik, bukan `%s'."
  
! #: tp/Texinfo/Parser.pm:5878 tp/Texinfo/Parser.pm:5883
  #, 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/Parser.pm:5891
  #, 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/Parser.pm:5901
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
  msgstr "--paragraph-indent arg harus berupa numerik/`none'/`asis', bukan `%s'."
  
! #: tp/Texinfo/Parser.pm:5913
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "Diduga @%s on atau off, bukan `%s'"
  
! #: tp/Texinfo/Parser.pm:5922
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
  msgstr "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
  
! #: tp/Texinfo/Parser.pm:5930
  #, 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/Parser.pm:5938
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
  msgstr "--footnote-style arg harus berupa `separate' atau `end', bukan `%s'."
  
! #: tp/Texinfo/Structuring.pm:216
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr "raising the section level of @%s which is too low"
  
! #: tp/Texinfo/Structuring.pm:248
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "no chapter-level command before @%s"
  
! #: tp/Texinfo/Structuring.pm:253
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr "lowering the section level of @%s appearing after a lower element"
  
! #: tp/Texinfo/Structuring.pm:342
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "no sectioning command associated with @%s"
  
! #: tp/Texinfo/Structuring.pm:491
  #, fuzzy, perl-format
  msgid "@%s not empty"
  msgstr "@%s: berkas kosong"
  
! #: tp/Texinfo/Structuring.pm:547 tp/Texinfo/Structuring.pm:1325
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
***************
*** 3071,3115 ****
  "@%s referensi ke titik yang tidak ada `%s' (mungkin pembagian tidak benar?)"
  
! #: tp/Texinfo/Structuring.pm:557
  #, perl-format
  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:662
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "titik `%s' tidak tereferensi"
  
! #: tp/Texinfo/Structuring.pm:708
  #, 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:715
  #, 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:733
  #, 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:787
  #, 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:814
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "titik `%s' tidak tereferensi `%s'"
  
! #: tp/Texinfo/Structuring.pm:834
  #, 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:842
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
--- 3065,3109 ----
  "@%s referensi ke titik yang tidak ada `%s' (mungkin pembagian tidak benar?)"
  
! #: tp/Texinfo/Structuring.pm:558
  #, perl-format
  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:663
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "titik `%s' tidak tereferensi"
  
! #: tp/Texinfo/Structuring.pm:706
  #, 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:713
  #, 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:731
  #, 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:786
  #, 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:810
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "titik `%s' tidak tereferensi `%s'"
  
! #: tp/Texinfo/Structuring.pm:829
  #, 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:837
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
***************
*** 3121,3125 ****
  msgstr "@%s to `%s', different from  %s name `%s'"
  
! #: tp/Texinfo/Structuring.pm:2070
  #, perl-format
  msgid "empty index key in @%s"
--- 3115,3119 ----
  msgstr "@%s to `%s', different from  %s name `%s'"
  
! #: tp/Texinfo/Structuring.pm:2067
  #, perl-format
  msgid "empty index key in @%s"
***************
*** 3626,3644 ****
  msgstr "Coba `%s --help' untuk informasi lebih lanjut.\n"
  
! #: tp/texi2any.pl:1232
  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:1255
  #, perl-format
  msgid "error on closing macro expand file %s: %s\n"
  msgstr "error menutup berkas keluaran `%s': %s\n"
  
! #: tp/texi2any.pl:1261
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "%s: tidak dapat membuka --css-file: %s\n"
  
! #: tp/texi2any.pl:1286
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
--- 3620,3638 ----
  msgstr "Coba `%s --help' untuk informasi lebih lanjut.\n"
  
! #: tp/texi2any.pl:1239
  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:1262
  #, perl-format
  msgid "error on closing macro expand file %s: %s\n"
  msgstr "error menutup berkas keluaran `%s': %s\n"
  
! #: tp/texi2any.pl:1268
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "%s: tidak dapat membuka --css-file: %s\n"
  
! #: tp/texi2any.pl:1293
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
***************
*** 3648,3662 ****
  "section?"
  
! #: tp/texi2any.pl:1359 tp/texi2any.pl:1435
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%s: error on closing %s: %s\n"
  
! #: tp/texi2any.pl:1382 tp/texi2any.pl:1416
  #, 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:1388 tp/texi2any.pl:1422
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
--- 3642,3656 ----
  "section?"
  
! #: tp/texi2any.pl:1366 tp/texi2any.pl:1442
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%s: error on closing %s: %s\n"
  
! #: tp/texi2any.pl:1389 tp/texi2any.pl:1423
  #, 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:1395 tp/texi2any.pl:1429
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
***************
*** 3945,3948 ****
--- 3939,3948 ----
  #~ msgstr "--*** Tags sudah kadaluarsa ***"
  
+ #~ msgid "-%s---Info: %s, %d lines --%s--"
+ #~ msgstr "-%s---Info: %s, %d baris --%s--"
+ 
+ #~ msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
+ #~ msgstr "--%s%s-Info: (%s)%s, %d baris --%s--"
+ 
  #~ msgid " Subfile: %s"
  #~ msgstr " Subfile: %s"
Binary files texinfo-6.1/po/it.gmo and texinfo-6.3/po/it.gmo differ
diff -Nrc2 texinfo-6.1/po/it.po texinfo-6.3/po/it.po
*** texinfo-6.1/po/it.po	2016-02-06 11:35:52.000000000 +0000
--- texinfo-6.3/po/it.po	2016-09-10 12:45:52.000000000 +0100
***************
*** 8,12 ****
  "Project-Id-Version: texinfo 5.1.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
  "PO-Revision-Date: 2013-09-20 13:31+0200\n"
  "Last-Translator: Francesco Groccia <frgroccia@gmail.com>\n"
--- 8,12 ----
  "Project-Id-Version: texinfo 5.1.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:45+0100\n"
  "PO-Revision-Date: 2013-09-20 13:31+0200\n"
  "Last-Translator: Francesco Groccia <frgroccia@gmail.com>\n"
***************
*** 16,19 ****
--- 16,20 ----
  "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"
  
***************
*** 112,116 ****
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [ or [^"
  msgstr "[ o [^ non accoppiate"
  
--- 113,118 ----
  
  #: gnulib/lib/regcomp.c:156
! #, fuzzy
! msgid "Unmatched [, [^, [:, [., or [="
  msgstr "[ o [^ non accoppiate"
  
***************
*** 151,155 ****
  msgstr ") \\) non accoppiate"
  
! #: gnulib/lib/regcomp.c:711
  msgid "No previous regular expression"
  msgstr "Nessuna espressione regolare precedente"
--- 153,157 ----
  msgstr ") \\) non accoppiate"
  
! #: gnulib/lib/regcomp.c:687
  msgid "No previous regular expression"
  msgstr "Nessuna espressione regolare precedente"
***************
*** 304,308 ****
  msgstr "---- Note a piÃ¨ di pagina ----"
  
! #: info/indices.c:123 info/indices.c:812
  #, c-format
  msgid "Finding index entries..."
--- 306,310 ----
  msgstr "---- Note a piÃ¨ di pagina ----"
  
! #: info/indices.c:123 info/indices.c:822
  #, c-format
  msgid "Finding index entries..."
***************
*** 313,317 ****
  msgstr "Cerca un testo nell'indice di questo file"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:818
  #, c-format
  msgid "No indices found."
--- 315,319 ----
  msgstr "Cerca un testo nell'indice di questo file"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:828
  #, c-format
  msgid "No indices found."
***************
*** 347,379 ****
  msgstr "Nessun'altra voce dell'indice contiene Â«%sÂ»."
  
! #: info/indices.c:476 info/indices.c:880
  #, fuzzy, c-format
  msgid "No index entries containing '%s'."
  msgstr "Nessuna voce dell'indice contiene Â«%sÂ»."
  
! #: info/indices.c:583
  #, fuzzy, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "Scansione indici di Â«%sÂ»..."
  
! #: info/indices.c:636
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr "Trova un testo in tutti i file Info disponibili e genera il menÃ¹"
  
! #: info/indices.c:644 info/indices.c:646
  #, fuzzy
  msgid "Index apropos"
  msgstr "Apropos indice: "
  
! #: info/indices.c:688
  #, fuzzy, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Nessuna voce dell'indice contiene Â«%sÂ»."
  
! #: info/indices.c:797
  msgid "List all matches of a string in the index"
  msgstr "Elenca tutte le occorrenze di una stringa nell'indice"
  
! #: info/indices.c:824 info/indices.c:826
  #, fuzzy
  msgid "Index topic"
--- 349,381 ----
  msgstr "Nessun'altra voce dell'indice contiene Â«%sÂ»."
  
! #: info/indices.c:476 info/indices.c:890
  #, fuzzy, c-format
  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'..."
  msgstr "Scansione indici di Â«%sÂ»..."
  
! #: info/indices.c:646
  msgid "Grovel all known info file's indices for a string and build a menu"
  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"
  msgstr "Apropos indice: "
  
! #: info/indices.c:698
  #, fuzzy, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Nessuna voce dell'indice contiene Â«%sÂ»."
  
! #: info/indices.c:807
  msgid "List all matches of a string in the index"
  msgstr "Elenca tutte le occorrenze di una stringa nell'indice"
  
! #: info/indices.c:834 info/indices.c:836
  #, fuzzy
  msgid "Index topic"
***************
*** 385,439 ****
  msgstr "Nessun file Info disponibile ha Â«%sÂ» negli indici."
  
! #: info/info-utils.c:892
  #, c-format
  msgid "Error converting file character encoding."
  msgstr ""
  
! #: info/info.c:222 info/session.c:2789
  #, fuzzy, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "Nessuna voce di menÃ¹ Â«%sÂ» nel nodo Â«%sÂ»."
  
! #: info/info.c:315
! #, fuzzy, c-format
! msgid "No file given for node '%s'."
! msgstr "Nessun menÃ¹ nel nodo Â«%sÂ»."
! 
! #: info/info.c:364 info/info.c:1133
  #, fuzzy, c-format
  msgid "Cannot find node '%s'."
  msgstr "Impossibile trovare il nodo Â«%sÂ»."
  
! #: info/info.c:386
  #, c-format
  msgid "No program name given."
  msgstr ""
  
! #: info/info.c:577
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "numero non valido: %s\n"
  
! #: info/info.c:757
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "errore nell'assegnamento della variabile: %s"
  
! #: info/info.c:764 info/infokey.c:537
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: variabile inesistente"
  
! #: info/info.c:770 info/infokey.c:539
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "il valore %s non Ã¨ valido per la variabile %s"
  
! #: info/info.c:782
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "Usare Â«--helpÂ» per maggiori informazioni.\n"
  
! #: info/info.c:804 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
--- 387,436 ----
  msgstr "Nessun file Info disponibile ha Â«%sÂ» negli indici."
  
! #: info/info-utils.c:879
  #, c-format
  msgid "Error converting file character encoding."
  msgstr ""
  
! #: info/info.c:279 info/session.c:2789
  #, fuzzy, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "Nessuna voce di menÃ¹ Â«%sÂ» nel nodo Â«%sÂ»."
  
! #: info/info.c:416 info/info.c:1148
  #, fuzzy, c-format
  msgid "Cannot find node '%s'."
  msgstr "Impossibile trovare il nodo Â«%sÂ»."
  
! #: info/info.c:438
  #, c-format
  msgid "No program name given."
  msgstr ""
  
! #: info/info.c:636
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "numero non valido: %s\n"
  
! #: info/info.c:816
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "errore nell'assegnamento della variabile: %s"
  
! #: info/info.c:823 info/infokey.c:540
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: variabile inesistente"
  
! #: info/info.c:829 info/infokey.c:542
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "il valore %s non Ã¨ valido per la variabile %s"
  
! #: info/info.c:841
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "Usare Â«--helpÂ» per maggiori informazioni.\n"
  
! #: info/info.c:860 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
***************
*** 450,459 ****
  "Non c'Ã¨ ALCUNA GARANZIA, per quanto consentito dalle leggi vigenti.\n"
  
! #: info/info.c:981
  #, fuzzy, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "nessuna voce dell'indice trovata per Â«%sÂ»\n"
  
! #: info/info.c:1034
  #, c-format
  msgid ""
--- 447,456 ----
  "Non c'Ã¨ ALCUNA GARANZIA, per quanto consentito dalle leggi vigenti.\n"
  
! #: info/info.c:999
  #, fuzzy, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "nessuna voce dell'indice trovata per Â«%sÂ»\n"
  
! #: info/info.c:1049
  #, c-format
  msgid ""
***************
*** 466,470 ****
  "Legge la documentazione nel formato Info.\n"
  
! #: info/info.c:1040
  msgid ""
  "Options:\n"
--- 463,467 ----
  "Legge la documentazione nel formato Info.\n"
  
! #: info/info.c:1055
  msgid ""
  "Options:\n"
***************
*** 486,490 ****
  "  -f, --file=FILE              specifica il file Info da visitare."
  
! #: info/info.c:1048
  msgid ""
  "  -h, --help                   display this help and exit.\n"
--- 483,487 ----
  "  -f, --file=FILE              specifica il file Info da visitare."
  
! #: info/info.c:1063
  msgid ""
  "  -h, --help                   display this help and exit.\n"
***************
*** 500,504 ****
  "  -o, --output=FILE            salva i nodi selezionati nel file FILE."
  
! #: info/info.c:1054
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
--- 497,501 ----
  "  -o, --output=FILE            salva i nodi selezionati nel file FILE."
  
! #: info/info.c:1069
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
***************
*** 516,525 ****
  "comando."
  
! #: info/info.c:1061
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr ""
  "  -b, --speech-friendly       compatibilitÃ  con il sintetizzatore vocale."
  
! #: info/info.c:1065
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
--- 513,522 ----
  "comando."
  
! #: info/info.c:1076
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr ""
  "  -b, --speech-friendly       compatibilitÃ  con il sintetizzatore vocale."
  
! #: info/info.c:1080
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
***************
*** 543,547 ****
  "tutto).\n"
  
! #: info/info.c:1074
  #, fuzzy
  msgid ""
--- 540,544 ----
  "tutto).\n"
  
! #: info/info.c:1089
  #, fuzzy
  msgid ""
***************
*** 562,566 ****
  "relativi al nodo iniziale visitato."
  
! #: info/info.c:1081
  #, fuzzy
  msgid ""
--- 559,563 ----
  "relativi al nodo iniziale visitato."
  
! #: info/info.c:1096
  #, fuzzy
  msgid ""
***************
*** 572,576 ****
  "Info."
  
! #: info/info.c:1084
  #, fuzzy
  msgid ""
--- 569,573 ----
  "Info."
  
! #: info/info.c:1099
  #, fuzzy
  msgid ""
***************
*** 602,606 ****
  "cartella"
  
! #: info/info.c:1099 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
--- 599,603 ----
  "cartella"
  
! #: info/info.c:1114 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
***************
*** 612,676 ****
  "Sito web di Texinfo: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1134
  #, fuzzy, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Impossibile trovare il nodo Â«(%s)%sÂ»."
  
! #: info/info.c:1135
  msgid "Cannot find a window!"
  msgstr "Impossibile trovare una finestra!"
  
! #: info/info.c:1136
  msgid "Point doesn't appear within this window's node!"
  msgstr "Il cursore non appare nel nodo di questa finestra!"
  
! #: info/info.c:1137
  msgid "Cannot delete the last window."
  msgstr "Impossibile eliminare l'ultima finestra."
  
! #: info/info.c:1138
  msgid "No menu in this node."
  msgstr "Nessun menÃ¹ in questo nodo."
  
! #: info/info.c:1139
  msgid "No footnotes in this node."
  msgstr "Nessun piÃ¨ di pagina in questo nodo."
  
! #: info/info.c:1140
  msgid "No cross references in this node."
  msgstr "Nessun riferimento incrociato in questo nodo."
  
! #: info/info.c:1141
  #, fuzzy, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Nessun puntatore a Â«%sÂ» per questo nodo."
  
! #: info/info.c:1142
  #, fuzzy, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "Comando Info Â«%cÂ» sconosciuto; usare Â«?Â» per l'aiuto."
  
! #: info/info.c:1143
  #, fuzzy, c-format
  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:1144
  msgid "You are already at the last page of this node."
  msgstr "Sei giÃ  all'ultima pagina di questo nodo."
  
! #: info/info.c:1145
  msgid "You are already at the first page of this node."
  msgstr "Questa Ã¨ giÃ  la prima pagina del nodo corrente."
  
! #: info/info.c:1146
  msgid "Only one window."
  msgstr "Solo una finestra."
  
! #: info/info.c:1147
  msgid "Resulting window would be too small."
  msgstr "La finestra risultante sarebbe troppo piccola."
  
! #: info/info.c:1148
  msgid "Not enough room for a help window, please delete a window."
  msgstr ""
--- 609,673 ----
  "Sito web di Texinfo: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1149
  #, fuzzy, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Impossibile trovare il nodo Â«(%s)%sÂ»."
  
! #: info/info.c:1150
  msgid "Cannot find a window!"
  msgstr "Impossibile trovare una finestra!"
  
! #: info/info.c:1151
  msgid "Point doesn't appear within this window's node!"
  msgstr "Il cursore non appare nel nodo di questa finestra!"
  
! #: info/info.c:1152
  msgid "Cannot delete the last window."
  msgstr "Impossibile eliminare l'ultima finestra."
  
! #: info/info.c:1153
  msgid "No menu in this node."
  msgstr "Nessun menÃ¹ in questo nodo."
  
! #: info/info.c:1154
  msgid "No footnotes in this node."
  msgstr "Nessun piÃ¨ di pagina in questo nodo."
  
! #: info/info.c:1155
  msgid "No cross references in this node."
  msgstr "Nessun riferimento incrociato in questo nodo."
  
! #: info/info.c:1156
  #, fuzzy, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Nessun puntatore a Â«%sÂ» per questo nodo."
  
! #: info/info.c:1157
  #, fuzzy, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "Comando Info Â«%cÂ» sconosciuto; usare Â«?Â» per l'aiuto."
  
! #: info/info.c:1158
  #, fuzzy, c-format
  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:1159
  msgid "You are already at the last page of this node."
  msgstr "Sei giÃ  all'ultima pagina di questo nodo."
  
! #: info/info.c:1160
  msgid "You are already at the first page of this node."
  msgstr "Questa Ã¨ giÃ  la prima pagina del nodo corrente."
  
! #: info/info.c:1161
  msgid "Only one window."
  msgstr "Solo una finestra."
  
! #: info/info.c:1162
  msgid "Resulting window would be too small."
  msgstr "La finestra risultante sarebbe troppo piccola."
  
! #: info/info.c:1163
  msgid "Not enough room for a help window, please delete a window."
  msgstr ""
***************
*** 948,982 ****
  msgstr "azione Â«%sÂ» sconosciuta"
  
! #: info/infokey.c:482
  #, c-format
  msgid "action name too long"
  msgstr "nome azione troppo lungo"
  
! #: info/infokey.c:495
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "caratteri in piÃ¹ dopo il nome dell'azione Â«%sÂ»"
  
! #: info/infokey.c:506
  #, c-format
  msgid "missing variable name"
  msgstr "nome variabile assente"
  
! #: info/infokey.c:515
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "carattere Â«=Â» assente dopo il nome della variabile"
  
! #: info/infokey.c:522
  #, c-format
  msgid "variable name too long"
  msgstr "nome variabile troppo lungo"
  
! #: info/infokey.c:546
  #, c-format
  msgid "value too long"
  msgstr "valore troppo lungo"
  
! #: info/infokey.c:592
  #, c-format
  msgid "\"%s\", line %u: "
--- 945,979 ----
  msgstr "azione Â«%sÂ» sconosciuta"
  
! #: info/infokey.c:485
  #, c-format
  msgid "action name too long"
  msgstr "nome azione troppo lungo"
  
! #: info/infokey.c:498
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "caratteri in piÃ¹ dopo il nome dell'azione Â«%sÂ»"
  
! #: info/infokey.c:509
  #, c-format
  msgid "missing variable name"
  msgstr "nome variabile assente"
  
! #: info/infokey.c:518
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "carattere Â«=Â» assente dopo il nome della variabile"
  
! #: info/infokey.c:525
  #, c-format
  msgid "variable name too long"
  msgstr "nome variabile troppo lungo"
  
! #: info/infokey.c:549
  #, c-format
  msgid "value too long"
  msgstr "valore troppo lungo"
  
! #: info/infokey.c:595
  #, c-format
  msgid "\"%s\", line %u: "
***************
*** 1317,1659 ****
  msgstr "Impossibile trovare il nodo referenziato da Â«%sÂ» in Â«%sÂ»."
  
! #: info/session.c:2864
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "Leggi l'elenco dei menÃ¹ a partire dalla cartella specificata e seguili"
  
! #: info/session.c:2866
  msgid "Follow menus: "
  msgstr "Segui i menÃ¹: "
  
! #: info/session.c:2971
  msgid "Select the Next node"
  msgstr "Seleziona il nodo successivo"
  
! #: info/session.c:2978
  msgid "Select the Prev node"
  msgstr "Seleziona il nodo precedente"
  
! #: info/session.c:2985
  msgid "Select the Up node"
  msgstr "Seleziona il nodo superiore"
  
! #: info/session.c:2991
  msgid "Select the last node in this file"
  msgstr "Seleziona l'ultimo nodo in questo file"
  
! #: info/session.c:3018 info/session.c:3051
  msgid "This window has no additional nodes"
  msgstr "Questa finestra non ha nodi aggiuntivi"
  
! #: info/session.c:3024
  msgid "Select the first node in this file"
  msgstr "Seleziona il primo nodo in questo file"
  
! #: info/session.c:3158
  msgid "No more nodes within this document."
  msgstr "Nessun altro nodo in questo documento."
  
! #: info/session.c:3203 info/session.c:3243
  #, fuzzy
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "Questo nodo non contiene nessun Â«PrevÂ» o Â«UpÂ» in questo documento."
  
! #: info/session.c:3256
  msgid "Move forwards or down through node structure"
  msgstr "Vai avanti o in basso attraverso la struttura del nodo"
  
! #: info/session.c:3273
  msgid "Move backwards or up through node structure"
  msgstr "Vai indietro o in alto attraverso la struttura del nodo"
  
! #: info/session.c:3296
  msgid "Read a node name and select it"
  msgstr "Leggi il nome di un nodo e selezionalo"
  
! #: info/session.c:3350 info/session.c:3354
  msgid "Goto node: "
  msgstr "Vai al nodo: "
  
! #: info/session.c:3533
  msgid "Find the node describing program invocation"
  msgstr "Cerca il nodo che descrive l'invocazione del programma in questione"
  
! #: info/session.c:3535
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Cerca il nodo di invocazione di [%s]: "
  
! #: info/session.c:3580
  msgid "Read a manpage reference and select it"
  msgstr "Leggi un riferimento alla pagina del manuale e selezionala"
  
! #: info/session.c:3584
  msgid "Get Manpage: "
  msgstr "Cerca pagina di manuale: "
  
! #: info/session.c:3605
  #, fuzzy
  msgid "Select the node 'Top' in this file"
  msgstr "Seleziona il nodo Â«PrincipaleÂ» in questo file"
  
! #: info/session.c:3611
  #, fuzzy
  msgid "Select the node '(dir)'"
  msgstr "Seleziona il nodo Â«(dir)Â»"
  
! #: info/session.c:3617
  msgid "Show full file name of node being displayed"
  msgstr "Mostra il nome file completo del nodo che viene visualizzato"
  
! #: info/session.c:3634
  msgid "Select the most recently selected node"
  msgstr "Seleziona il nodo selezionato piÃ¹ recentemente"
  
! #: info/session.c:3639
  #, c-format
  msgid "No earlier node in history"
  msgstr ""
  
! #: info/session.c:3643
  msgid "Read the name of a file and select it"
  msgstr "Leggi il nome di un file e selezionalo"
  
! #: info/session.c:3647
  msgid "Find file: "
  msgstr "Cerca un file: "
  
! #: info/session.c:3664
  #, fuzzy, c-format
  msgid "Cannot find '%s'."
  msgstr "Impossibile trovare Â«%sÂ»."
  
! #: info/session.c:3713
  #, fuzzy, c-format
  msgid "Could not create output file '%s'."
  msgstr "Impossibile creare il file Â«%sÂ»."
  
! #: info/session.c:3727
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "errore durante la scrittura del file %s: %s"
  
! #: info/session.c:3736
  #, c-format
  msgid "closing %s"
  msgstr "chiusura %s"
  
! #: info/session.c:3785
  #, c-format
  msgid "writing node %s..."
  msgstr "scrittura del nodo %s..."
  
! #: info/session.c:3831
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "Incanala i contenuti di questo nodo mediante INFO_PRINT_COMMAND"
  
! #: info/session.c:3859
  #, fuzzy, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Impossibile incanalare su Â«%sÂ»."
  
! #: info/session.c:3864
  #, c-format
  msgid "printing node %s..."
  msgstr "stampa nodo %s..."
  
! #: info/session.c:3872
  #, c-format
  msgid "finished printing node %s"
  msgstr "stampa del nodo %s terminata"
  
! #: info/session.c:3904
  msgid "Toggle the usage of regular expressions in searches"
  msgstr "Attiva o disattiva l'uso delle espressioni regolari nelle ricerche"
  
! #: info/session.c:3908
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr "Usa le espressioni regolari nelle ricerche."
  
! #: info/session.c:3909
  #, c-format
  msgid "Using literal strings for searches."
  msgstr "Usa il testo letterale nelle ricerche."
  
! #: info/session.c:4169
  msgid "Search continued from the end of the document."
  msgstr "Ricerca continuata a partire dalla fine del documento."
  
! #: info/session.c:4174
  msgid "Search continued from the beginning of the document."
  msgstr "Ricerca continuata a partire dall'inizio del documento."
  
! #: info/session.c:4194
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "Cerca il subfile %s ..."
  
! #: info/session.c:4231
  msgid "Search failed."
  msgstr "Ricerca fallita."
  
! #: info/session.c:4248
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Regexp search"
  msgstr "Cerca espressione regolare"
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Search"
  msgstr "Cerca"
  
! #: info/session.c:4250 info/session.c:4256
  msgid " case-sensitively"
  msgstr " distingue maiuscole/minuscole"
  
! #: info/session.c:4251 info/session.c:4257
  msgid " backward"
  msgstr " indietro"
  
! #: info/session.c:4254
  #, fuzzy, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4274
  msgid "Search string too short"
  msgstr "Stringa di ricerca troppo breve"
  
! #: info/session.c:4467
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4491 info/session.c:4601
  #, fuzzy, c-format
  msgid "No more matches."
  msgstr "Nessuna corrispondenza"
  
! #: info/session.c:4628
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4649
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4653 info/session.c:4665
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4661
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4674
  msgid "Read a string and search for it case-sensitively"
  msgstr "Leggi e cerca un testo (distinguendo le lettere maiuscole/minuscole)"
  
! #: info/session.c:4679
  msgid "Read a string and search for it"
  msgstr "Leggi e cerca un testo"
  
! #: info/session.c:4685
  msgid "Read a string and search backward for it"
  msgstr "Leggi un testo e cerca all'indietro"
  
! #: info/session.c:4693
  msgid "Repeat last search in the same direction"
  msgstr "Ripeti l'ultima ricerca nella stessa direzione"
  
! #: info/session.c:4701 info/session.c:4746
  msgid "No previous search string"
  msgstr "Nessun testo di ricerca precedente"
  
! #: info/session.c:4738
  msgid "Repeat last search in the reverse direction"
  msgstr "Ripeti l'ultima ricerca nella direzione opposta"
  
! #: info/session.c:4785
  msgid "Clear displayed search matches"
  msgstr ""
  
! #: info/session.c:4802 info/session.c:4808
  msgid "Search interactively for a string as you type it"
  msgstr "Cerca interattivamente un testo durante la digitazione"
  
! #: info/session.c:4928
  msgid "Regexp I-search backward: "
  msgstr "Ricerca incrementale all'indietro mediante espressione regolare: "
  
! #: info/session.c:4929
  msgid "I-search backward: "
  msgstr "Ricerca incrementale all'indietro: "
  
! #: info/session.c:4931
  msgid "Regexp I-search: "
  msgstr "Ricerca incrementale mediante espressione regolare: "
  
! #: info/session.c:4932
  msgid "I-search: "
  msgstr "Ricerca incrementale: "
  
! #: info/session.c:4957 info/session.c:4960
  msgid "Failing "
  msgstr "Fallita "
  
! #: info/session.c:5326
  msgid "Cancel current operation"
  msgstr "Annulla l'operazione corrente"
  
! #: info/session.c:5333
  msgid "Quit"
  msgstr "Esci"
  
! #: info/session.c:5338
  #, fuzzy
  msgid "Display version of Info being run"
  msgstr "mostra le informazioni di versione ed esce"
  
! #: info/session.c:5340
  #, c-format
  msgid "GNU Info version %s"
  msgstr ""
  
! #: info/session.c:5345
  msgid "Redraw the display"
  msgstr "Ridisegna lo schermo"
  
! #: info/session.c:5382
  msgid "Quit using Info"
  msgstr "Esci dal programma Info"
  
! #: info/session.c:5398
  msgid "Run command bound to this key's lowercase variant"
  msgstr "Esegui il comando associato alla variante minuscola di questo tasto"
  
! #: info/session.c:5409
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Comando sconosciuto (%s)."
  
! #: info/session.c:5412
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\" non Ã¨ valido"
  
! #: info/session.c:5413
  #, fuzzy, c-format
  msgid "'%s' is invalid"
  msgstr "Â«%sÂ» non Ã¨ valido"
  
! #: info/session.c:5731
  msgid "Add this digit to the current numeric argument"
  msgstr "Aggiungi questa cifra all'argomento numerico attuale"
  
! #: info/session.c:5738
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "Inizia (o moltiplica per quattro) l'argomento numerico attuale"
--- 1314,1656 ----
  msgstr "Impossibile trovare il nodo referenziato da Â«%sÂ» in Â«%sÂ»."
  
! #: info/session.c:2870
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "Leggi l'elenco dei menÃ¹ a partire dalla cartella specificata e seguili"
  
! #: info/session.c:2872
  msgid "Follow menus: "
  msgstr "Segui i menÃ¹: "
  
! #: info/session.c:2977
  msgid "Select the Next node"
  msgstr "Seleziona il nodo successivo"
  
! #: info/session.c:2984
  msgid "Select the Prev node"
  msgstr "Seleziona il nodo precedente"
  
! #: info/session.c:2991
  msgid "Select the Up node"
  msgstr "Seleziona il nodo superiore"
  
! #: info/session.c:2997
  msgid "Select the last node in this file"
  msgstr "Seleziona l'ultimo nodo in questo file"
  
! #: info/session.c:3024 info/session.c:3057
  msgid "This window has no additional nodes"
  msgstr "Questa finestra non ha nodi aggiuntivi"
  
! #: info/session.c:3030
  msgid "Select the first node in this file"
  msgstr "Seleziona il primo nodo in questo file"
  
! #: info/session.c:3164
  msgid "No more nodes within this document."
  msgstr "Nessun altro nodo in questo documento."
  
! #: info/session.c:3209 info/session.c:3249
  #, fuzzy
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "Questo nodo non contiene nessun Â«PrevÂ» o Â«UpÂ» in questo documento."
  
! #: info/session.c:3262
  msgid "Move forwards or down through node structure"
  msgstr "Vai avanti o in basso attraverso la struttura del nodo"
  
! #: info/session.c:3279
  msgid "Move backwards or up through node structure"
  msgstr "Vai indietro o in alto attraverso la struttura del nodo"
  
! #: info/session.c:3302
  msgid "Read a node name and select it"
  msgstr "Leggi il nome di un nodo e selezionalo"
  
! #: info/session.c:3356 info/session.c:3360
  msgid "Goto node: "
  msgstr "Vai al nodo: "
  
! #: info/session.c:3539
  msgid "Find the node describing program invocation"
  msgstr "Cerca il nodo che descrive l'invocazione del programma in questione"
  
! #: info/session.c:3541
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Cerca il nodo di invocazione di [%s]: "
  
! #: info/session.c:3586
  msgid "Read a manpage reference and select it"
  msgstr "Leggi un riferimento alla pagina del manuale e selezionala"
  
! #: info/session.c:3590
  msgid "Get Manpage: "
  msgstr "Cerca pagina di manuale: "
  
! #: info/session.c:3611
  #, fuzzy
  msgid "Select the node 'Top' in this file"
  msgstr "Seleziona il nodo Â«PrincipaleÂ» in questo file"
  
! #: info/session.c:3617
  #, fuzzy
  msgid "Select the node '(dir)'"
  msgstr "Seleziona il nodo Â«(dir)Â»"
  
! #: info/session.c:3623
  msgid "Show full file name of node being displayed"
  msgstr "Mostra il nome file completo del nodo che viene visualizzato"
  
! #: info/session.c:3640
  msgid "Select the most recently selected node"
  msgstr "Seleziona il nodo selezionato piÃ¹ recentemente"
  
! #: info/session.c:3645
  #, c-format
  msgid "No earlier node in history"
  msgstr ""
  
! #: info/session.c:3649
  msgid "Read the name of a file and select it"
  msgstr "Leggi il nome di un file e selezionalo"
  
! #: info/session.c:3653
  msgid "Find file: "
  msgstr "Cerca un file: "
  
! #: info/session.c:3670
  #, fuzzy, c-format
  msgid "Cannot find '%s'."
  msgstr "Impossibile trovare Â«%sÂ»."
  
! #: info/session.c:3719
  #, fuzzy, c-format
  msgid "Could not create output file '%s'."
  msgstr "Impossibile creare il file Â«%sÂ»."
  
! #: info/session.c:3733
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "errore durante la scrittura del file %s: %s"
  
! #: info/session.c:3742
  #, c-format
  msgid "closing %s"
  msgstr "chiusura %s"
  
! #: info/session.c:3791
  #, c-format
  msgid "writing node %s..."
  msgstr "scrittura del nodo %s..."
  
! #: info/session.c:3837
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "Incanala i contenuti di questo nodo mediante INFO_PRINT_COMMAND"
  
! #: info/session.c:3865
  #, fuzzy, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Impossibile incanalare su Â«%sÂ»."
  
! #: info/session.c:3870
  #, c-format
  msgid "printing node %s..."
  msgstr "stampa nodo %s..."
  
! #: info/session.c:3878
  #, c-format
  msgid "finished printing node %s"
  msgstr "stampa del nodo %s terminata"
  
! #: info/session.c:3910
  msgid "Toggle the usage of regular expressions in searches"
  msgstr "Attiva o disattiva l'uso delle espressioni regolari nelle ricerche"
  
! #: info/session.c:3914
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr "Usa le espressioni regolari nelle ricerche."
  
! #: info/session.c:3915
  #, c-format
  msgid "Using literal strings for searches."
  msgstr "Usa il testo letterale nelle ricerche."
  
! #: info/session.c:4175
  msgid "Search continued from the end of the document."
  msgstr "Ricerca continuata a partire dalla fine del documento."
  
! #: info/session.c:4180
  msgid "Search continued from the beginning of the document."
  msgstr "Ricerca continuata a partire dall'inizio del documento."
  
! #: info/session.c:4200
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "Cerca il subfile %s ..."
  
! #: info/session.c:4237
  msgid "Search failed."
  msgstr "Ricerca fallita."
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Regexp search"
  msgstr "Cerca espressione regolare"
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Search"
  msgstr "Cerca"
  
! #: info/session.c:4256 info/session.c:4262
  msgid " case-sensitively"
  msgstr " distingue maiuscole/minuscole"
  
! #: info/session.c:4257 info/session.c:4263
  msgid " backward"
  msgstr " indietro"
  
! #: info/session.c:4260
  #, fuzzy, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4280
  msgid "Search string too short"
  msgstr "Stringa di ricerca troppo breve"
  
! #: info/session.c:4473
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4497 info/session.c:4607
  #, fuzzy, c-format
  msgid "No more matches."
  msgstr "Nessuna corrispondenza"
  
! #: info/session.c:4634
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4655
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4659 info/session.c:4671
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4667
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4680
  msgid "Read a string and search for it case-sensitively"
  msgstr "Leggi e cerca un testo (distinguendo le lettere maiuscole/minuscole)"
  
! #: info/session.c:4685
  msgid "Read a string and search for it"
  msgstr "Leggi e cerca un testo"
  
! #: info/session.c:4691
  msgid "Read a string and search backward for it"
  msgstr "Leggi un testo e cerca all'indietro"
  
! #: info/session.c:4699
  msgid "Repeat last search in the same direction"
  msgstr "Ripeti l'ultima ricerca nella stessa direzione"
  
! #: info/session.c:4707 info/session.c:4752
  msgid "No previous search string"
  msgstr "Nessun testo di ricerca precedente"
  
! #: info/session.c:4744
  msgid "Repeat last search in the reverse direction"
  msgstr "Ripeti l'ultima ricerca nella direzione opposta"
  
! #: info/session.c:4791
  msgid "Clear displayed search matches"
  msgstr ""
  
! #: info/session.c:4808 info/session.c:4814
  msgid "Search interactively for a string as you type it"
  msgstr "Cerca interattivamente un testo durante la digitazione"
  
! #: info/session.c:4934
  msgid "Regexp I-search backward: "
  msgstr "Ricerca incrementale all'indietro mediante espressione regolare: "
  
! #: info/session.c:4935
  msgid "I-search backward: "
  msgstr "Ricerca incrementale all'indietro: "
  
! #: info/session.c:4937
  msgid "Regexp I-search: "
  msgstr "Ricerca incrementale mediante espressione regolare: "
  
! #: info/session.c:4938
  msgid "I-search: "
  msgstr "Ricerca incrementale: "
  
! #: info/session.c:4963 info/session.c:4966
  msgid "Failing "
  msgstr "Fallita "
  
! #: info/session.c:5332
  msgid "Cancel current operation"
  msgstr "Annulla l'operazione corrente"
  
! #: info/session.c:5339
  msgid "Quit"
  msgstr "Esci"
  
! #: info/session.c:5344
  #, fuzzy
  msgid "Display version of Info being run"
  msgstr "mostra le informazioni di versione ed esce"
  
! #: info/session.c:5346
  #, c-format
  msgid "GNU Info version %s"
  msgstr ""
  
! #: info/session.c:5351
  msgid "Redraw the display"
  msgstr "Ridisegna lo schermo"
  
! #: info/session.c:5388
  msgid "Quit using Info"
  msgstr "Esci dal programma Info"
  
! #: info/session.c:5404
  msgid "Run command bound to this key's lowercase variant"
  msgstr "Esegui il comando associato alla variante minuscola di questo tasto"
  
! #: info/session.c:5415
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Comando sconosciuto (%s)."
  
! #: info/session.c:5418
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\" non Ã¨ valido"
  
! #: info/session.c:5419
  #, fuzzy, c-format
  msgid "'%s' is invalid"
  msgstr "Â«%sÂ» non Ã¨ valido"
  
! #: info/session.c:5737
  msgid "Add this digit to the current numeric argument"
  msgstr "Aggiungi questa cifra all'argomento numerico attuale"
  
! #: info/session.c:5744
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "Inizia (o moltiplica per quattro) l'argomento numerico attuale"
***************
*** 1802,1819 ****
  msgstr "Imposta %s al valore (%s): "
  
! #: info/window.c:959
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), righe ----, "
  
- #: info/window.c:966
- #, fuzzy, c-format
- msgid "-%s---Info: %s, %ld lines --%s--"
- msgstr "-%s---Info: %s, %d righe --%s--"
- 
- #: info/window.c:970
- #, fuzzy, c-format
- msgid "-%s---Info: (%s)%s, %ld lines --%s--"
- msgstr "-%s%s-Info: (%s)%s, %d righe --%s--"
- 
  #: install-info/install-info.c:292
  #, c-format
--- 1799,1806 ----
  msgstr "Imposta %s al valore (%s): "
  
! #: info/window.c:909
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), righe ----, "
  
  #: install-info/install-info.c:292
  #, c-format
***************
*** 1993,1997 ****
  
  #: install-info/install-info.c:642
! #, c-format
  msgid ""
  "This is the file .../info/dir, which contains the\n"
--- 1980,1984 ----
  
  #: install-info/install-info.c:642
! #, fuzzy, c-format
  msgid ""
  "This is the file .../info/dir, which contains the\n"
***************
*** 2002,2006 ****
  "\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"
--- 1989,1993 ----
  "\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"
***************
*** 2098,2217 ****
  msgstr "nessuna voce trovata per Â«%sÂ»; nulla da eliminare"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:855
! #: tp/Texinfo/Convert/Converter.pm:893 tp/Texinfo/Convert/Converter.pm:1204
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6504
! #: tp/Texinfo/Convert/HTML.pm:6528 tp/Texinfo/Convert/HTML.pm:6905
! #: tp/Texinfo/Convert/HTML.pm:6963 tp/Texinfo/Convert/HTML.pm:7041
! #: tp/Texinfo/Convert/HTML.pm:7118 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:546
! #: tp/Texinfo/Convert/TexinfoXML.pm:457
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "impossibile aprire %s per la scrittura: %s"
  
! #: tp/Texinfo/Common.pm:881
  msgid "recursion is always allowed"
  msgstr "la ricorsione Ã¨ sempre accettata"
  
! #: tp/Texinfo/Common.pm:882
  msgid "arguments are quoted by default"
  msgstr "gli argomenti vengono quotati come predefinito"
  
! #: tp/Texinfo/Common.pm:1105
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s non Ã¨ un codice di lingua valido"
  
! #: tp/Texinfo/Common.pm:1110
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s non Ã¨ un codice di regione valido"
  
! #: tp/Texinfo/Common.pm:1128
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%s non Ã¨ una valida possibilitÃ  di divisione"
  
! #: tp/Texinfo/Common.pm:1151
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "impossibile leggere %s: %s"
  
! #: tp/Texinfo/Common.pm:1170
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "errore durante la chiusura del file @verbatiminclude %s: %s"
  
! #: tp/Texinfo/Common.pm:1176 tp/Texinfo/Parser.pm:3353
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%s: impossibile trovare %s"
  
! #: tp/Texinfo/Common.pm:1520
! #, 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/Common.pm:1548
! msgid "missing type"
! msgstr "tipo mancante"
! 
! #: tp/Texinfo/Common.pm:1551
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "tipo non riconosciuto: %s"
! 
! #: tp/Texinfo/Common.pm:1568
! #, 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/Common.pm:1603
  msgid "no node to be renamed"
  msgstr "nessun nodo da rinominare"
  
! #: tp/Texinfo/Common.pm:1614
  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:1624 tp/Texinfo/Parser.pm:926
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "impossibile aprire %s: %s"
  
! #: tp/Texinfo/Common.pm:2144
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr "impossibile proteggere il carattere hash in @%s"
  
! #: tp/Texinfo/Convert/Converter.pm:395 tp/Texinfo/Convert/Converter.pm:414
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Variabile %s obsoleta\n"
  
! #: tp/Texinfo/Convert/Converter.pm:794
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:876 tp/Texinfo/Convert/Converter.pm:909
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:6931
! #: tp/Texinfo/Convert/HTML.pm:6989 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:476 tp/Texinfo/Parser.pm:2035
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "errore durante la chiusura di %s: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, 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:995
  #, perl-format
  msgid "could not create directory `%s': %s"
--- 2085,2193 ----
  msgstr "nessuna voce trovata per Â«%sÂ»; nulla da eliminare"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:847
! #: tp/Texinfo/Convert/Converter.pm:885 tp/Texinfo/Convert/Converter.pm:1196
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6573
! #: tp/Texinfo/Convert/HTML.pm:6597 tp/Texinfo/Convert/HTML.pm:6978
! #: tp/Texinfo/Convert/HTML.pm:7037 tp/Texinfo/Convert/HTML.pm:7115
! #: tp/Texinfo/Convert/HTML.pm:7192 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:547
! #: tp/Texinfo/Convert/TexinfoXML.pm:458
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "impossibile aprire %s per la scrittura: %s"
  
! #: tp/Texinfo/Common.pm:862
  msgid "recursion is always allowed"
  msgstr "la ricorsione Ã¨ sempre accettata"
  
! #: tp/Texinfo/Common.pm:863
  msgid "arguments are quoted by default"
  msgstr "gli argomenti vengono quotati come predefinito"
  
! #: tp/Texinfo/Common.pm:866
! msgid ""
! "move your @contents command if you want the contents after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:869
! msgid ""
! "move your @shortcontents and @contents commands if you want the contents "
! "after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:1093
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s non Ã¨ un codice di lingua valido"
  
! #: tp/Texinfo/Common.pm:1098
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s non Ã¨ un codice di regione valido"
  
! #: tp/Texinfo/Common.pm:1116
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%s non Ã¨ una valida possibilitÃ  di divisione"
  
! #: tp/Texinfo/Common.pm:1139
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "impossibile leggere %s: %s"
  
! #: tp/Texinfo/Common.pm:1158
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "errore durante la chiusura del file @verbatiminclude %s: %s"
  
! #: tp/Texinfo/Common.pm:1164 tp/Texinfo/Parser.pm:3193
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%s: impossibile trovare %s"
  
! #: tp/Texinfo/Common.pm:1637
  msgid "no node to be renamed"
  msgstr "nessun nodo da rinominare"
  
! #: tp/Texinfo/Common.pm:1648
  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:1658 tp/Texinfo/Parser.pm:899
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "impossibile aprire %s: %s"
  
! #: tp/Texinfo/Common.pm:2178
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr "impossibile proteggere il carattere hash in @%s"
  
! #: tp/Texinfo/Convert/Converter.pm:387 tp/Texinfo/Convert/Converter.pm:406
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Variabile %s obsoleta\n"
  
! #: tp/Texinfo/Convert/Converter.pm:786
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:868 tp/Texinfo/Convert/Converter.pm:901
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:7004
! #: tp/Texinfo/Convert/HTML.pm:7063 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:477 tp/Texinfo/Parser.pm:1996
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "errore durante la chiusura di %s: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:979
  #, 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:987
  #, perl-format
  msgid "could not create directory `%s': %s"
***************
*** 2223,2322 ****
  msgstr "file @image Â«%sÂ» non trovato, verrÃ  usato Â«%sÂ»"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5388
  #, fuzzy
  msgid "no argument specified for @U"
  msgstr "Nessun nome di nodo specificato per il comando Â«%c%sÂ»"
  
! #: tp/Texinfo/Convert/HTML.pm:1683
  #, 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:2371
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "il formato grezzo %s non Ã¨ convertito"
  
! #: tp/Texinfo/Convert/HTML.pm:4888
  msgid "string not closed in css file"
  msgstr "stringa non chiusa nel file CSS"
  
! #: tp/Texinfo/Convert/HTML.pm:4890
  msgid "--css-include ended in comment"
  msgstr "l'opzione Â«--css-includeÂ» termina con un commento"
  
! #: tp/Texinfo/Convert/HTML.pm:4892
  msgid "@import not finished in css file"
  msgstr "@import non terminato nel file CSS"
  
! #: tp/Texinfo/Convert/HTML.pm:4918
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "file CSS %s non trovato"
  
! #: tp/Texinfo/Convert/HTML.pm:4924
  #, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "impossibile aprire --include-file %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:4934
  #, 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:5801 tp/Texinfo/Convert/HTML.pm:5805
  #, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "nessuna voce htmlxref.cnf trovata per Â«%sÂ»"
  
! #: tp/Texinfo/Convert/HTML.pm:6499
  #, 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:6523
  #, 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:6638
  #, 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:6839
  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:7048
  #, 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:7073
  #, 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:7079
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "file vuoto per il nodo rinominato Â«%sÂ»"
  
! #: tp/Texinfo/Convert/HTML.pm:7093
  #, 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:7125
  #, 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:7163
  msgid "empty node name"
  msgstr "nome del nodo vuoto"
  
! #: tp/Texinfo/Convert/HTML.pm:7165 tp/Texinfo/Parser.pm:3697
  #, perl-format
  msgid "syntax for an external node used for `%s'"
--- 2199,2320 ----
  msgstr "file @image Â«%sÂ» non trovato, verrÃ  usato Â«%sÂ»"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5225
  #, fuzzy
  msgid "no argument specified for @U"
  msgstr "Nessun nome di nodo specificato per il comando Â«%c%sÂ»"
  
! #: tp/Texinfo/Convert/HTML.pm:1715
  #, 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:2399
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "il formato grezzo %s non Ã¨ convertito"
  
! #: tp/Texinfo/Convert/HTML.pm:4629
! #, 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:4657
! msgid "missing type"
! msgstr "tipo mancante"
! 
! #: tp/Texinfo/Convert/HTML.pm:4660
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "tipo non riconosciuto: %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4677
! #, 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:4962
  msgid "string not closed in css file"
  msgstr "stringa non chiusa nel file CSS"
  
! #: tp/Texinfo/Convert/HTML.pm:4964
  msgid "--css-include ended in comment"
  msgstr "l'opzione Â«--css-includeÂ» termina con un commento"
  
! #: tp/Texinfo/Convert/HTML.pm:4966
  msgid "@import not finished in css file"
  msgstr "@import non terminato nel file CSS"
  
! #: tp/Texinfo/Convert/HTML.pm:4992
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "file CSS %s non trovato"
  
! #: tp/Texinfo/Convert/HTML.pm:4998
  #, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "impossibile aprire --include-file %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5008
  #, 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:5870 tp/Texinfo/Convert/HTML.pm:5874
  #, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "nessuna voce htmlxref.cnf trovata per Â«%sÂ»"
  
! #: tp/Texinfo/Convert/HTML.pm:6568
  #, 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:6592
  #, 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:6707
  #, 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:6912
  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:7122
  #, 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:7147
  #, 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:7153
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "file vuoto per il nodo rinominato Â«%sÂ»"
  
! #: tp/Texinfo/Convert/HTML.pm:7167
  #, 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:7199
  #, 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:7237
  msgid "empty node name"
  msgstr "nome del nodo vuoto"
  
! #: tp/Texinfo/Convert/HTML.pm:7239 tp/Texinfo/Parser.pm:3542
  #, perl-format
  msgid "syntax for an external node used for `%s'"
***************
*** 2352,2361 ****
  msgstr "il nome @node non dovrebbe contenere Â«,Â»: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1334
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1381 tp/Texinfo/Parser.pm:2722
  #, perl-format
  msgid "entry for index `%s' outside of any node"
--- 2350,2359 ----
  msgstr "il nome @node non dovrebbe contenere Â«,Â»: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1335
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1382 tp/Texinfo/Parser.pm:2568
  #, perl-format
  msgid "entry for index `%s' outside of any node"
***************
*** 2363,2382 ****
  
  # # non ancora tradotta
! #: tp/Texinfo/Convert/Plaintext.pm:1495
  #, 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:1500
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "file @image Â«%sÂ» non leggibile: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1523
  #, 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:1931
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
--- 2361,2380 ----
  
  # # non ancora tradotta
! #: tp/Texinfo/Convert/Plaintext.pm:1496
  #, 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:1501
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "file @image Â«%sÂ» non leggibile: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1524
  #, 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:1932
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
***************
*** 2386,2495 ****
  "non succeda"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2161
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr "nome del riferimento incrociato @%s non dovrebbe contenere Â«:Â»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2193
  #, 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:2226
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr "il nome del nodo @%s non dovrebbe contenere Â«:Â»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2272
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "Â«.Â» o Â«,Â» devono seguire @xref, non %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2275
  msgid "`.' or `,' must follow @xref"
  msgstr "Â«.Â» o Â«,Â» devono seguire @xref"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3118
  #, 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:3129
  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:3145
  msgid "menu entry name should not contain `:'"
  msgstr "il nome della voce del menÃ¹ non dovrebbe contenere Â«:Â»"
  
! #: tp/Texinfo/Parser.pm:910
  #, 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"
  
! #: tp/Texinfo/Parser.pm:1160 tp/Texinfo/Structuring.pm:594
  #, perl-format
  msgid "multiple @%s"
  msgstr "@%s multiplo"
  
! #: tp/Texinfo/Parser.pm:1194
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "sintassi errata per l'argomento @%s: %s"
! 
! #: tp/Texinfo/Parser.pm:1210
  #, perl-format
  msgid "bad or empty @%s formal argument: %s"
  msgstr "argomento formale @%s errato o vuoto: %s"
  
! #: tp/Texinfo/Parser.pm:1219 tp/Texinfo/Parser.pm:4856
! #: tp/Texinfo/Parser.pm:4882 tp/Texinfo/Parser.pm:5671
! #: tp/Texinfo/Parser.pm:5687 tp/Texinfo/Parser.pm:5702
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s richiede un nome"
  
! #: tp/Texinfo/Parser.pm:1223 tp/Texinfo/Parser.pm:4859
! #: tp/Texinfo/Parser.pm:4885 tp/Texinfo/Parser.pm:5674
! #: tp/Texinfo/Parser.pm:5690 tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad name for @%s"
  msgstr "nome errato per @%s"
  
! #: tp/Texinfo/Parser.pm:1341
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr "@end %s visto prima delle parentesi di chiusura @%s"
  
! #: tp/Texinfo/Parser.pm:1345
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "@%s visto prima delle parentesi di chiusura @%s"
  
! #: tp/Texinfo/Parser.pm:1350
! #, perl-format
! msgid "%c%s missing close brace"
  msgstr "%c%s parentesi di chiusura mancante"
  
! #: tp/Texinfo/Parser.pm:1354
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "sequenza di delimitazione di chiusura mancante in @%s: %s}"
  
! #: tp/Texinfo/Parser.pm:1476
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "@itemx non dovrebbe iniziare @%s"
  
! #: tp/Texinfo/Parser.pm:1544
  msgid "@itemx must follow @item"
  msgstr "@itemx deve seguire @item"
  
! #: tp/Texinfo/Parser.pm:1712
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr "@%s ha testo ma non @item"
  
! #: tp/Texinfo/Parser.pm:1743
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
--- 2384,2493 ----
  "non succeda"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2162
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr "nome del riferimento incrociato @%s non dovrebbe contenere Â«:Â»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2194
  #, 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:2227
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr "il nome del nodo @%s non dovrebbe contenere Â«:Â»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2273
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "Â«.Â» o Â«,Â» devono seguire @xref, non %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2276
  msgid "`.' or `,' must follow @xref"
  msgstr "Â«.Â» o Â«,Â» devono seguire @xref"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3086
  #, 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:3097
  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:3113
  msgid "menu entry name should not contain `:'"
  msgstr "il nome della voce del menÃ¹ non dovrebbe contenere Â«:Â»"
  
! #: tp/Texinfo/Parser.pm:883
  #, 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"
  
! #: tp/Texinfo/Parser.pm:1125 tp/Texinfo/Structuring.pm:595
  #, perl-format
  msgid "multiple @%s"
  msgstr "@%s multiplo"
  
! #: tp/Texinfo/Parser.pm:1166
  #, perl-format
  msgid "bad or empty @%s formal argument: %s"
  msgstr "argomento formale @%s errato o vuoto: %s"
  
! #: tp/Texinfo/Parser.pm:1176
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "sintassi errata per l'argomento @%s: %s"
! 
! #: tp/Texinfo/Parser.pm:1183 tp/Texinfo/Parser.pm:4707
! #: tp/Texinfo/Parser.pm:4733 tp/Texinfo/Parser.pm:5565
! #: tp/Texinfo/Parser.pm:5578 tp/Texinfo/Parser.pm:5592
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s richiede un nome"
  
! #: tp/Texinfo/Parser.pm:1187 tp/Texinfo/Parser.pm:4710
! #: tp/Texinfo/Parser.pm:4736 tp/Texinfo/Parser.pm:5568
! #: tp/Texinfo/Parser.pm:5581 tp/Texinfo/Parser.pm:5595
  #, perl-format
  msgid "bad name for @%s"
  msgstr "nome errato per @%s"
  
! #: tp/Texinfo/Parser.pm:1305
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr "@end %s visto prima delle parentesi di chiusura @%s"
  
! #: tp/Texinfo/Parser.pm:1309
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "@%s visto prima delle parentesi di chiusura @%s"
  
! #: tp/Texinfo/Parser.pm:1314
! #, fuzzy, perl-format
! msgid "%c%s missing closing brace"
  msgstr "%c%s parentesi di chiusura mancante"
  
! #: tp/Texinfo/Parser.pm:1318
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "sequenza di delimitazione di chiusura mancante in @%s: %s}"
  
! #: tp/Texinfo/Parser.pm:1440
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "@itemx non dovrebbe iniziare @%s"
  
! #: tp/Texinfo/Parser.pm:1508
  msgid "@itemx must follow @item"
  msgstr "@itemx deve seguire @item"
  
! #: tp/Texinfo/Parser.pm:1676
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr "@%s ha testo ma non @item"
  
! #: tp/Texinfo/Parser.pm:1707
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
***************
*** 2497,2532 ****
  "Â«@endÂ» si aspettava il carattere Â«%sÂ», ma Ã¨ stato letto il carattere Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:1746
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@%s visto prima di @end %s"
  
! #: tp/Texinfo/Parser.pm:1750
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "nessun corrispondente Â«%cend %sÂ»"
  
! #: tp/Texinfo/Parser.pm:1776 tp/Texinfo/Parser.pm:5204
! #: tp/Texinfo/Parser.pm:5470
  #, perl-format
  msgid "misplaced %c"
  msgstr "%c fuori luogo"
  
! #: tp/Texinfo/Parser.pm:1874 tp/Texinfo/Parser.pm:3312
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "Â«%c%sÂ» senza corrispondenza"
  
! #: tp/Texinfo/Parser.pm:2110
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "macro Â«%sÂ» chiamata con troppi argomenti"
  
! #: tp/Texinfo/Parser.pm:2132
! #, perl-format
! msgid "@%s missing close brace"
  msgstr "@%s parentesi di chiusura mancante"
  
! #: tp/Texinfo/Parser.pm:2140
  #, perl-format
  msgid "macro `%s' declared without argument called with an argument"
--- 2495,2530 ----
  "Â«@endÂ» si aspettava il carattere Â«%sÂ», ma Ã¨ stato letto il carattere Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:1710
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@%s visto prima di @end %s"
  
! #: tp/Texinfo/Parser.pm:1714
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "nessun corrispondente Â«%cend %sÂ»"
  
! #: tp/Texinfo/Parser.pm:1738 tp/Texinfo/Parser.pm:5070
! #: tp/Texinfo/Parser.pm:5308
  #, perl-format
  msgid "misplaced %c"
  msgstr "%c fuori luogo"
  
! #: tp/Texinfo/Parser.pm:1835 tp/Texinfo/Parser.pm:3148
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "Â«%c%sÂ» senza corrispondenza"
  
! #: tp/Texinfo/Parser.pm:2072
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "macro Â«%sÂ» chiamata con troppi argomenti"
  
! #: tp/Texinfo/Parser.pm:2094
! #, fuzzy, perl-format
! msgid "@%s missing closing brace"
  msgstr "@%s parentesi di chiusura mancante"
  
! #: tp/Texinfo/Parser.pm:2102
  #, perl-format
  msgid "macro `%s' declared without argument called with an argument"
***************
*** 2534,2538 ****
  "la macro Â«%sÂ» dichiarata senza argomenti Ã¨ stata chiamata con un argomento"
  
! #: tp/Texinfo/Parser.pm:2175
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
--- 2532,2536 ----
  "la macro Â«%sÂ» dichiarata senza argomenti Ã¨ stata chiamata con un argomento"
  
! #: tp/Texinfo/Parser.pm:2138
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
***************
*** 2541,2590 ****
  "parametro oppure \\"
  
! #: tp/Texinfo/Parser.pm:2650
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s Â«%sÂ» giÃ  definita precedentemente"
  
! #: tp/Texinfo/Parser.pm:2655
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "ecco la definizione precedente come @%s"
  
! #: tp/Texinfo/Parser.pm:3016
  #, perl-format
  msgid "missing name for @%s"
  msgstr "nome mancante per @%s"
  
! #: tp/Texinfo/Parser.pm:3021
  #, perl-format
  msgid "missing category for @%s"
  msgstr "categoria mancante per @%s"
  
! #: tp/Texinfo/Parser.pm:3073
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "argomento inaspettato nella riga @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3089
  msgid "empty multitable"
  msgstr "multitabella vuota"
  
! #: tp/Texinfo/Parser.pm:3145 tp/Texinfo/Parser.pm:5784
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "argomento superfluo per @%s"
  
! #: tp/Texinfo/Parser.pm:3151 tp/Texinfo/Parser.pm:5806
! #: tp/Texinfo/Parser.pm:5818
  #, perl-format
  msgid "bad argument to @%s"
  msgstr "argomento errato per @%s"
  
! #: tp/Texinfo/Parser.pm:3162
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s richiede un argomento: formattatore per %citem"
  
! #: tp/Texinfo/Parser.pm:3167
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
--- 2539,2588 ----
  "parametro oppure \\"
  
! #: tp/Texinfo/Parser.pm:2501
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s Â«%sÂ» giÃ  definita precedentemente"
  
! #: tp/Texinfo/Parser.pm:2506
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "ecco la definizione precedente come @%s"
  
! #: tp/Texinfo/Parser.pm:2850
  #, perl-format
  msgid "missing name for @%s"
  msgstr "nome mancante per @%s"
  
! #: tp/Texinfo/Parser.pm:2855
  #, perl-format
  msgid "missing category for @%s"
  msgstr "categoria mancante per @%s"
  
! #: tp/Texinfo/Parser.pm:2890
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "argomento inaspettato nella riga @%s: %s"
  
! #: tp/Texinfo/Parser.pm:2905
  msgid "empty multitable"
  msgstr "multitabella vuota"
  
! #: tp/Texinfo/Parser.pm:2959 tp/Texinfo/Parser.pm:5673
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "argomento superfluo per @%s"
  
! #: tp/Texinfo/Parser.pm:2965 tp/Texinfo/Parser.pm:5694
! #: tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad argument to @%s"
  msgstr "argomento errato per @%s"
  
! #: tp/Texinfo/Parser.pm:2976
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s richiede un argomento: formattatore per %citem"
  
! #: tp/Texinfo/Parser.pm:2981
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
***************
*** 2593,2597 ****
  "essere sulla riga @%s"
  
! #: tp/Texinfo/Parser.pm:3202
  #, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
--- 2591,2595 ----
  "essere sulla riga @%s"
  
! #: tp/Texinfo/Parser.pm:3016
  #, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
***************
*** 2599,2656 ****
  "il comando per accentare Â«@%sÂ» non Ã¨ stato accettato come argomento @%s"
  
! #: tp/Texinfo/Parser.pm:3290 tp/Texinfo/Parser.pm:3429
! #: tp/Texinfo/Parser.pm:5777
  #, perl-format
  msgid "@%s missing argument"
  msgstr "argomento mancante per @%s"
  
! #: tp/Texinfo/Parser.pm:3302
  #, perl-format
  msgid "unknown @end %s"
  msgstr "@end %s sconosciuto"
  
! #: tp/Texinfo/Parser.pm:3324 tp/Texinfo/Parser.pm:3943
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "argomento superfluo per @%s %s: %s"
  
! #: tp/Texinfo/Parser.pm:3329 tp/Texinfo/Parser.pm:5861
! #: tp/Texinfo/Parser.pm:5906 tp/Texinfo/Parser.pm:5935
! #: tp/Texinfo/Parser.pm:5976 tp/Texinfo/Parser.pm:6055
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "argomento errato per @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3348
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%s: impossibile aprire %s: %s"
  
! #: tp/Texinfo/Parser.pm:3360
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr "la codifica Â«%sÂ» non Ã¨ una codifica texinfo canonica"
  
! #: tp/Texinfo/Parser.pm:3369
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "il nome Â«%sÂ» non corrisponde ad alcun nome di codifica"
  
! #: tp/Texinfo/Parser.pm:3516
  #, perl-format
  msgid "@%s after the first element"
  msgstr "@%s dopo il primo elemento"
  
! #: tp/Texinfo/Parser.pm:3523
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s ha senso solo su una riga @multitable"
  
! #: tp/Texinfo/Parser.pm:3563
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "@%s non dovrebbe essere associato con @top"
  
! #: tp/Texinfo/Parser.pm:3575
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
--- 2597,2655 ----
  "il comando per accentare Â«@%sÂ» non Ã¨ stato accettato come argomento @%s"
  
! #: tp/Texinfo/Parser.pm:3124 tp/Texinfo/Parser.pm:3277
! #: tp/Texinfo/Parser.pm:5666
  #, perl-format
  msgid "@%s missing argument"
  msgstr "argomento mancante per @%s"
  
! #: tp/Texinfo/Parser.pm:3138
  #, perl-format
  msgid "unknown @end %s"
  msgstr "@end %s sconosciuto"
  
! #: tp/Texinfo/Parser.pm:3161 tp/Texinfo/Parser.pm:3788
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "argomento superfluo per @%s %s: %s"
  
! #: tp/Texinfo/Parser.pm:3167 tp/Texinfo/Parser.pm:3245
! #: tp/Texinfo/Parser.pm:5755 tp/Texinfo/Parser.pm:5798
! #: tp/Texinfo/Parser.pm:5827 tp/Texinfo/Parser.pm:5868
! #: tp/Texinfo/Parser.pm:5946
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "argomento errato per @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3188
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%s: impossibile aprire %s: %s"
  
! #: tp/Texinfo/Parser.pm:3200
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr "la codifica Â«%sÂ» non Ã¨ una codifica texinfo canonica"
  
! #: tp/Texinfo/Parser.pm:3208
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "il nome Â«%sÂ» non corrisponde ad alcun nome di codifica"
  
! #: tp/Texinfo/Parser.pm:3364
  #, perl-format
  msgid "@%s after the first element"
  msgstr "@%s dopo il primo elemento"
  
! #: tp/Texinfo/Parser.pm:3371
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s ha senso solo su una riga @multitable"
  
! #: tp/Texinfo/Parser.pm:3408
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "@%s non dovrebbe essere associato con @top"
  
! #: tp/Texinfo/Parser.pm:3420
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
***************
*** 2659,2712 ****
  "nodi"
  
! #: tp/Texinfo/Parser.pm:3677
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "argomento vuoto in @%s"
  
! #: tp/Texinfo/Parser.pm:3681
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "nome del nodo vuoto dopo l'espansione Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:3724
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "nome della voce del menÃ¹ vuoto in Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:3732
  msgid "empty node name in menu entry"
  msgstr "nome nodo vuoto nella voce di menÃ¹"
  
! #: tp/Texinfo/Parser.pm:3805
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "@%s non dovrebbe apparire in @%s"
  
! #: tp/Texinfo/Parser.pm:3937
! #, perl-format
! msgid "@end %s should only appear at a line beginning"
  msgstr "@end %s dovrebbe apparire solo a inizio riga"
  
! #: tp/Texinfo/Parser.pm:3960
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "macro Â«%sÂ» giÃ  definita precedentemente"
  
! #: tp/Texinfo/Parser.pm:3963
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "ecco la definizione precedente di Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:3968
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "ridefinizione del comando del linguaggio Texinfo: @%s"
  
! #: tp/Texinfo/Parser.pm:4017
  #, perl-format
  msgid "@%s without associated character"
  msgstr "@%s senza carattere associato"
  
! #: tp/Texinfo/Parser.pm:4087
  #, perl-format
  msgid ""
--- 2658,2711 ----
  "nodi"
  
! #: tp/Texinfo/Parser.pm:3522
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "argomento vuoto in @%s"
  
! #: tp/Texinfo/Parser.pm:3526
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "nome del nodo vuoto dopo l'espansione Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:3569
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "nome della voce del menÃ¹ vuoto in Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:3577
  msgid "empty node name in menu entry"
  msgstr "nome nodo vuoto nella voce di menÃ¹"
  
! #: tp/Texinfo/Parser.pm:3650
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "@%s non dovrebbe apparire in @%s"
  
! #: tp/Texinfo/Parser.pm:3782
! #, fuzzy, perl-format
! msgid "@end %s should only appear at the beginning of a line"
  msgstr "@end %s dovrebbe apparire solo a inizio riga"
  
! #: tp/Texinfo/Parser.pm:3804
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "macro Â«%sÂ» giÃ  definita precedentemente"
  
! #: tp/Texinfo/Parser.pm:3807
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "ecco la definizione precedente di Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:3812
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "ridefinizione del comando del linguaggio Texinfo: @%s"
  
! #: tp/Texinfo/Parser.pm:3879
  #, perl-format
  msgid "@%s without associated character"
  msgstr "@%s senza carattere associato"
  
! #: tp/Texinfo/Parser.pm:3949
  #, perl-format
  msgid ""
***************
*** 2715,2719 ****
  "@%s definito con zero o piÃ¹ di un argomento dovrebbe essere invocato con {}"
  
! #: tp/Texinfo/Parser.pm:4111
  #, perl-format
  msgid ""
--- 2714,2718 ----
  "@%s definito con zero o piÃ¹ di un argomento dovrebbe essere invocato con {}"
  
! #: tp/Texinfo/Parser.pm:3974
  #, perl-format
  msgid ""
***************
*** 2724,2728 ****
  "valore attuale %d)"
  
! #: tp/Texinfo/Parser.pm:4120
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
--- 2723,2727 ----
  "valore attuale %d)"
  
! #: tp/Texinfo/Parser.pm:3983
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
***************
*** 2730,2749 ****
  "chiamata ricorsiva della macro %s non accettata; usare @rmacro se necessario"
  
! #: tp/Texinfo/Parser.pm:4176
  #, 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/Parser.pm:4182
  #, 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/Parser.pm:4195 tp/Texinfo/Parser.pm:5325
  #, 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/Parser.pm:4207
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
--- 2729,2748 ----
  "chiamata ricorsiva della macro %s non accettata; usare @rmacro se necessario"
  
! #: tp/Texinfo/Parser.pm:4038
  #, 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/Parser.pm:4044
  #, 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/Parser.pm:4057 tp/Texinfo/Parser.pm:5189
  #, 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/Parser.pm:4068
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
***************
*** 2751,2828 ****
  "il comando per accentare Â«@%sÂ» non deve essere seguito da una nuova riga"
  
! #: tp/Texinfo/Parser.pm:4218
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s si aspettava le parentesi graffe"
  
! #: tp/Texinfo/Parser.pm:4383
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "indicatore non definito: %s"
  
! #: tp/Texinfo/Parser.pm:4386
  msgid "bad syntax for @value"
  msgstr "sintassi errata per @value"
  
! #: tp/Texinfo/Parser.pm:4393
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s Ã¨ obsoleto."
  
! #: tp/Texinfo/Parser.pm:4396
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s Ã¨ obsoleto; %s"
  
! #: tp/Texinfo/Parser.pm:4405
! #, perl-format
! msgid "@%s should only appear at a line beginning"
  msgstr "@%s dovrebbe apparire solo a inizio riga"
  
! #: tp/Texinfo/Parser.pm:4496
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s non accettato all'interno del blocco Â«@%sÂ»"
  
! #: tp/Texinfo/Parser.pm:4505
  #, 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/Parser.pm:4631 tp/Texinfo/Parser.pm:4648
! #: tp/Texinfo/Parser.pm:4698
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s Ã¨ privo di significato all'interno del blocco Â«@%sÂ»"
  
! #: tp/Texinfo/Parser.pm:4658
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "@%s nella multitabella vuota"
  
! #: tp/Texinfo/Parser.pm:4664
  msgid "@tab before @item"
  msgstr "@tab prima di @item"
  
! #: tp/Texinfo/Parser.pm:4667
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "troppe colonne nell'elemento multitabella (massimo %d)"
  
! #: tp/Texinfo/Parser.pm:4704
  msgid "ignoring @tab outside of multitable"
  msgstr "ignora @tab fuori della multitabella"
  
! #: tp/Texinfo/Parser.pm:4708
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "@%s fuori da tabella o lista"
  
! #: tp/Texinfo/Parser.pm:4745
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "deve essere dopo Â«@%sÂ» per usare Â«@%sÂ»"
  
! #: tp/Texinfo/Parser.pm:4787
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
--- 2750,2827 ----
  "il comando per accentare Â«@%sÂ» non deve essere seguito da una nuova riga"
  
! #: tp/Texinfo/Parser.pm:4079
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s si aspettava le parentesi graffe"
  
! #: tp/Texinfo/Parser.pm:4233
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "indicatore non definito: %s"
  
! #: tp/Texinfo/Parser.pm:4236
  msgid "bad syntax for @value"
  msgstr "sintassi errata per @value"
  
! #: tp/Texinfo/Parser.pm:4243
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s Ã¨ obsoleto."
  
! #: tp/Texinfo/Parser.pm:4246
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s Ã¨ obsoleto; %s"
  
! #: tp/Texinfo/Parser.pm:4255
! #, fuzzy, perl-format
! msgid "@%s should only appear at the beginning of a line"
  msgstr "@%s dovrebbe apparire solo a inizio riga"
  
! #: tp/Texinfo/Parser.pm:4346
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s non accettato all'interno del blocco Â«@%sÂ»"
  
! #: tp/Texinfo/Parser.pm:4355
  #, 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/Parser.pm:4479 tp/Texinfo/Parser.pm:4496
! #: tp/Texinfo/Parser.pm:4546
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s Ã¨ privo di significato all'interno del blocco Â«@%sÂ»"
  
! #: tp/Texinfo/Parser.pm:4506
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "@%s nella multitabella vuota"
  
! #: tp/Texinfo/Parser.pm:4512
  msgid "@tab before @item"
  msgstr "@tab prima di @item"
  
! #: tp/Texinfo/Parser.pm:4515
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "troppe colonne nell'elemento multitabella (massimo %d)"
  
! #: tp/Texinfo/Parser.pm:4552
  msgid "ignoring @tab outside of multitable"
  msgstr "ignora @tab fuori della multitabella"
  
! #: tp/Texinfo/Parser.pm:4556
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "@%s fuori da tabella o lista"
  
! #: tp/Texinfo/Parser.pm:4596
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "deve essere dopo Â«@%sÂ» per usare Â«@%sÂ»"
  
! #: tp/Texinfo/Parser.pm:4638
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
***************
*** 2831,2853 ****
  "Â«@quotationÂ»"
  
! #: tp/Texinfo/Parser.pm:4791
  msgid "@dircategory after first node"
  msgstr "@dircategory dopo il primo nodo"
  
! #: tp/Texinfo/Parser.pm:4979
  #, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "regione %s all'interno della regione %s non permessa"
  
! #: tp/Texinfo/Parser.pm:4997
  msgid "@direntry after first node"
  msgstr "@direntry dopo il primo nodo"
  
! #: tp/Texinfo/Parser.pm:5005
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "@%s visto prima del primo @node"
  
! #: tp/Texinfo/Parser.pm:5008
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
--- 2830,2852 ----
  "Â«@quotationÂ»"
  
! #: tp/Texinfo/Parser.pm:4642
  msgid "@dircategory after first node"
  msgstr "@dircategory dopo il primo nodo"
  
! #: tp/Texinfo/Parser.pm:4847
  #, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "regione %s all'interno della regione %s non permessa"
  
! #: tp/Texinfo/Parser.pm:4864
  msgid "@direntry after first node"
  msgstr "@direntry dopo il primo nodo"
  
! #: tp/Texinfo/Parser.pm:4872
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "@%s visto prima del primo @node"
  
! #: tp/Texinfo/Parser.pm:4875
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
***************
*** 2856,3032 ****
  "sotto @ifinfo?"
  
! #: tp/Texinfo/Parser.pm:5070
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr "@%s dovrebbe apparire solo in contesti matematici"
  
! #: tp/Texinfo/Parser.pm:5078
  #, perl-format
  msgid "unknown command `%s'"
  msgstr "comando Â«%sÂ» sconosciuto"
  
! #: tp/Texinfo/Parser.pm:5088
  msgid "unexpected @"
  msgstr "@ inaspettato"
  
! #: tp/Texinfo/Parser.pm:5117
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s non Ã¨ significativo al difuori dell'ambiente Â«@floatÂ»"
  
! #: tp/Texinfo/Parser.pm:5122
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr "@%s dovrebbe essere subito sotto Â«@floatÂ»"
  
! #: tp/Texinfo/Parser.pm:5130
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "@%s multipli ignorati"
  
! #: tp/Texinfo/Parser.pm:5249
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "il comando @%s non accetta argomenti"
  
! #: tp/Texinfo/Parser.pm:5273
  #, 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/Parser.pm:5292
  #, 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/Parser.pm:5303
  #, 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/Parser.pm:5316
  msgid "@image missing filename argument"
  msgstr "@image non ha riferimento ad alcun file"
  
! #: tp/Texinfo/Parser.pm:5348
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "primo argomento mancante per @%s"
  
! #: tp/Texinfo/Parser.pm:5393
  #, fuzzy, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "argomento errato per @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5399
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5412
! #, perl-format
! msgid "argument for @U exceeds size of integer: %s"
! msgstr ""
! 
! #: tp/Texinfo/Parser.pm:5418
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5546
  msgid "superfluous arguments for node"
  msgstr "argomenti superflui per il nodo"
  
! #: tp/Texinfo/Parser.pm:5596
  #, perl-format
  msgid "expected @end %s"
  msgstr "si aspettava @end %s"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "@%s dovrebbe accettare solo un @-comando come argomento, non Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5728
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "argomento restante sulla riga @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5801
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "comando d'ambiente %s come argomento per @%s"
  
! #: tp/Texinfo/Parser.pm:5823
  #, perl-format
  msgid "empty @%s"
  msgstr "@%s vuoto"
  
! #: tp/Texinfo/Parser.pm:5831
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "la frazione di colonna non Ã¨ un numero: %s"
  
! #: tp/Texinfo/Parser.pm:5840
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "l'argomento @sp deve essere un numero, non Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5849
  #, perl-format
  msgid "reserved index name %s"
  msgstr "nome indice %s riservato"
  
! #: tp/Texinfo/Parser.pm:5868
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "indice sorgente sconosciuto in @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5871
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "indice di destinazione sconosciuto in @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5901
  #, 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/Parser.pm:5914
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "indice Â«%sÂ» sconosciuto in @printindex"
  
! #: tp/Texinfo/Parser.pm:5920
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr "stampa di un indice Â«%sÂ» unito in un altro indice Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5928
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "printindex prima dell'inizio del documento: @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5944
  #, 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/Parser.pm:5952
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr "Solo @%s \"10\" o \"11\" Ã¨ supportata, non Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5960
  #, 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/Parser.pm:5968
  #, 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/Parser.pm:5986 tp/Texinfo/Parser.pm:5991
  #, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
--- 2855,3026 ----
  "sotto @ifinfo?"
  
! #: tp/Texinfo/Parser.pm:4937
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr "@%s dovrebbe apparire solo in contesti matematici"
  
! #: tp/Texinfo/Parser.pm:4945
  #, perl-format
  msgid "unknown command `%s'"
  msgstr "comando Â«%sÂ» sconosciuto"
  
! #: tp/Texinfo/Parser.pm:4955
  msgid "unexpected @"
  msgstr "@ inaspettato"
  
! #: tp/Texinfo/Parser.pm:4983
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s non Ã¨ significativo al difuori dell'ambiente Â«@floatÂ»"
  
! #: tp/Texinfo/Parser.pm:4988
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr "@%s dovrebbe essere subito sotto Â«@floatÂ»"
  
! #: tp/Texinfo/Parser.pm:4996
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "@%s multipli ignorati"
  
! #: tp/Texinfo/Parser.pm:5114
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "il comando @%s non accetta argomenti"
  
! #: tp/Texinfo/Parser.pm:5138
  #, 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/Parser.pm:5156
  #, 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/Parser.pm:5167
  #, 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/Parser.pm:5180
  msgid "@image missing filename argument"
  msgstr "@image non ha riferimento ad alcun file"
  
! #: tp/Texinfo/Parser.pm:5211
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "primo argomento mancante per @%s"
  
! #: tp/Texinfo/Parser.pm:5230
  #, fuzzy, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "argomento errato per @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5236
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5253
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5448
  msgid "superfluous arguments for node"
  msgstr "argomenti superflui per il nodo"
  
! #: tp/Texinfo/Parser.pm:5498
  #, perl-format
  msgid "expected @end %s"
  msgstr "si aspettava @end %s"
  
! #: tp/Texinfo/Parser.pm:5607
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "@%s dovrebbe accettare solo un @-comando come argomento, non Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5617
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "argomento restante sulla riga @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5689
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "comando d'ambiente %s come argomento per @%s"
  
! #: tp/Texinfo/Parser.pm:5710
  #, perl-format
  msgid "empty @%s"
  msgstr "@%s vuoto"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "la frazione di colonna non Ã¨ un numero: %s"
  
! #: tp/Texinfo/Parser.pm:5727
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "l'argomento @sp deve essere un numero, non Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5736
  #, perl-format
  msgid "reserved index name %s"
  msgstr "nome indice %s riservato"
  
! #: tp/Texinfo/Parser.pm:5762
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "indice sorgente sconosciuto in @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5765
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "indice di destinazione sconosciuto in @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5793
  #, 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/Parser.pm:5806
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "indice Â«%sÂ» sconosciuto in @printindex"
  
! #: tp/Texinfo/Parser.pm:5812
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr "stampa di un indice Â«%sÂ» unito in un altro indice Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5820
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "printindex prima dell'inizio del documento: @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5836
  #, 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/Parser.pm:5844
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr "Solo @%s \"10\" o \"11\" Ã¨ supportata, non Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5852
  #, 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/Parser.pm:5860
  #, 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/Parser.pm:5878 tp/Texinfo/Parser.pm:5883
  #, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
***************
*** 3034,3038 ****
  "l'argomento @paragraphindent deve essere numerico/Â«noneÂ»/Â«asisÂ», non Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5999
  #, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
--- 3028,3032 ----
  "l'argomento @paragraphindent deve essere numerico/Â«noneÂ»/Â«asisÂ», non Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5891
  #, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
***************
*** 3040,3054 ****
  "l'argomento @firstparagraphindent deve essere Â«noneÂ» o Â«insertÂ», non Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:6009
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
  msgstr "l'argomento @exampleindent deve essere numerico/Â«asisÂ», non Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:6021
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "si aspettava la lettura @%s \"on\" oppure \"off\", non Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:6031
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
--- 3034,3048 ----
  "l'argomento @firstparagraphindent deve essere Â«noneÂ» o Â«insertÂ», non Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
  msgstr "l'argomento @exampleindent deve essere numerico/Â«asisÂ», non Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5913
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "si aspettava la lettura @%s \"on\" oppure \"off\", non Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5922
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
***************
*** 3056,3065 ****
  "l'argomento @kbdinputstyle deve essere Â«codeÂ»/Â«exampleÂ»/Â«distinctÂ», non Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:6039
  #, 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/Parser.pm:6047
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
--- 3050,3059 ----
  "l'argomento @kbdinputstyle deve essere Â«codeÂ»/Â«exampleÂ»/Â«distinctÂ», non Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5930
  #, 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/Parser.pm:5938
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
***************
*** 3067,3081 ****
  "l'argomento @urefbreakstyle deve essere Â«afterÂ»/Â«beforeÂ»/Â«noneÂ», non Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:213
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr "il livello della sezione di @%s che Ã¨ troppo basso verrÃ  alzato"
  
! #: tp/Texinfo/Structuring.pm:245
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "nessun comando a livello di capitolo prima di @%s"
  
! #: tp/Texinfo/Structuring.pm:250
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
--- 3061,3075 ----
  "l'argomento @urefbreakstyle deve essere Â«afterÂ»/Â«beforeÂ»/Â«noneÂ», non Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:216
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr "il livello della sezione di @%s che Ã¨ troppo basso verrÃ  alzato"
  
! #: tp/Texinfo/Structuring.pm:248
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "nessun comando a livello di capitolo prima di @%s"
  
! #: tp/Texinfo/Structuring.pm:253
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
***************
*** 3084,3138 ****
  "abbassato"
  
! #: tp/Texinfo/Structuring.pm:339
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "nessun comando di sezionamento associato con @%s"
  
! #: tp/Texinfo/Structuring.pm:488
  #, fuzzy, perl-format
  msgid "@%s not empty"
  msgstr "@%s nella multitabella vuota"
  
! #: tp/Texinfo/Structuring.pm:544 tp/Texinfo/Structuring.pm:1326
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "%s si riferisce al nodo inesistente Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:557
  #, perl-format
  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:662
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "nodo Â«%sÂ» non referenziato"
  
! #: tp/Texinfo/Structuring.pm:708
  #, 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:715
  #, 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:733
  #, 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:787
  #, 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:814
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%s si riferisce all'inesistente Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:834
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
--- 3078,3132 ----
  "abbassato"
  
! #: tp/Texinfo/Structuring.pm:342
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "nessun comando di sezionamento associato con @%s"
  
! #: tp/Texinfo/Structuring.pm:491
  #, fuzzy, perl-format
  msgid "@%s not empty"
  msgstr "@%s nella multitabella vuota"
  
! #: tp/Texinfo/Structuring.pm:547 tp/Texinfo/Structuring.pm:1325
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "%s si riferisce al nodo inesistente Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:558
  #, perl-format
  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:663
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "nodo Â«%sÂ» non referenziato"
  
! #: tp/Texinfo/Structuring.pm:706
  #, 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:713
  #, 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:731
  #, 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:786
  #, 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:810
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%s si riferisce all'inesistente Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:829
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
***************
*** 3141,3145 ****
  "ad Â«UpÂ»"
  
! #: tp/Texinfo/Structuring.pm:842
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
--- 3135,3139 ----
  "ad Â«UpÂ»"
  
! #: tp/Texinfo/Structuring.pm:837
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
***************
*** 3151,3155 ****
  msgstr "@%s a Â«%sÂ», diverso dal nome %s Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:2070
  #, perl-format
  msgid "empty index key in @%s"
--- 3145,3149 ----
  msgstr "@%s a Â«%sÂ», diverso dal nome %s Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:2067
  #, perl-format
  msgid "empty index key in @%s"
***************
*** 3700,3704 ****
  msgstr "Usare Â«%s --helpÂ» per maggiori informazioni.\n"
  
! #: tp/texi2any.pl:1232
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
--- 3694,3698 ----
  msgstr "Usare Â«%s --helpÂ» per maggiori informazioni.\n"
  
! #: tp/texi2any.pl:1239
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
***************
*** 3706,3720 ****
  "Nessuna sezione?"
  
! #: tp/texi2any.pl:1255
  #, 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:1261
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "Impossibile aprire %s per la scrittura: %s\n"
  
! #: tp/texi2any.pl:1286
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
--- 3700,3714 ----
  "Nessuna sezione?"
  
! #: tp/texi2any.pl:1262
  #, 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:1268
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "Impossibile aprire %s per la scrittura: %s\n"
  
! #: tp/texi2any.pl:1293
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
***************
*** 3724,3733 ****
  "alcun risultato. Nessuna sezione?"
  
! #: tp/texi2any.pl:1359 tp/texi2any.pl:1435
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%s: errore durante la chiusura %s: %s\n"
  
! #: tp/texi2any.pl:1382 tp/texi2any.pl:1416
  #, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
--- 3718,3727 ----
  "alcun risultato. Nessuna sezione?"
  
! #: tp/texi2any.pl:1366 tp/texi2any.pl:1442
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%s: errore durante la chiusura %s: %s\n"
  
! #: tp/texi2any.pl:1389 tp/texi2any.pl:1423
  #, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
***************
*** 3735,3739 ****
  "%s: errore durante la chiusura del file dei collegamenti interni %s: %s\n"
  
! #: tp/texi2any.pl:1388 tp/texi2any.pl:1422
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
--- 3729,3733 ----
  "%s: errore durante la chiusura del file dei collegamenti interni %s: %s\n"
  
! #: tp/texi2any.pl:1395 tp/texi2any.pl:1429
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
***************
*** 4027,4030 ****
--- 4021,4030 ----
  #~ msgstr "--*** Etichette non aggiornate ***"
  
+ #~ msgid "-%s---Info: %s, %d lines --%s--"
+ #~ msgstr "-%s---Info: %s, %d righe --%s--"
+ 
+ #~ msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
+ #~ msgstr "-%s%s-Info: (%s)%s, %d righe --%s--"
+ 
  #~ msgid " Subfile: %s"
  #~ msgstr " Subfile: %s"
Binary files texinfo-6.1/po/ja.gmo and texinfo-6.3/po/ja.gmo differ
diff -Nrc2 texinfo-6.1/po/ja.po texinfo-6.3/po/ja.po
*** texinfo-6.1/po/ja.po	2016-02-06 11:35:52.000000000 +0000
--- texinfo-6.3/po/ja.po	2016-09-10 12:45:53.000000000 +0100
***************
*** 14,18 ****
  "Project-Id-Version: texinfo 5.1.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
  "PO-Revision-Date: 2014-11-07 08:03+0000\n"
  "Last-Translator: Yasuaki Taniguchi <yasuakit@gmail.com>\n"
--- 14,18 ----
  "Project-Id-Version: texinfo 5.1.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:45+0100\n"
  "PO-Revision-Date: 2014-11-07 08:03+0000\n"
  "Last-Translator: Yasuaki Taniguchi <yasuakit@gmail.com>\n"
***************
*** 22,25 ****
--- 22,26 ----
  "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=1; plural=0;\n"
  
***************
*** 118,122 ****
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [ or [^"
  msgstr "[ ã�¾ã�Ÿã�¯ [^ ã�Œä¸�ä¸€è‡´ã�§ã�™"
  
--- 119,124 ----
  
  #: gnulib/lib/regcomp.c:156
! #, fuzzy
! msgid "Unmatched [, [^, [:, [., or [="
  msgstr "[ ã�¾ã�Ÿã�¯ [^ ã�Œä¸�ä¸€è‡´ã�§ã�™"
  
***************
*** 157,161 ****
  msgstr ") ã�¾ã�Ÿã�¯ \\) ã�Œä¸�ä¸€è‡´ã�§ã�™"
  
! #: gnulib/lib/regcomp.c:711
  msgid "No previous regular expression"
  msgstr "ä»¥å‰�ã�«æ­£è¦�è¡¨ç�¾ã�Œã�‚ã‚Šã�¾ã�›ã‚“"
--- 159,163 ----
  msgstr ") ã�¾ã�Ÿã�¯ \\) ã�Œä¸�ä¸€è‡´ã�§ã�™"
  
! #: gnulib/lib/regcomp.c:687
  msgid "No previous regular expression"
  msgstr "ä»¥å‰�ã�«æ­£è¦�è¡¨ç�¾ã�Œã�‚ã‚Šã�¾ã�›ã‚“"
***************
*** 308,312 ****
  msgstr "------------ è„šæ³¨ ------------"
  
! #: info/indices.c:123 info/indices.c:812
  #, c-format
  msgid "Finding index entries..."
--- 310,314 ----
  msgstr "------------ è„šæ³¨ ------------"
  
! #: info/indices.c:123 info/indices.c:822
  #, c-format
  msgid "Finding index entries..."
***************
*** 317,321 ****
  msgstr "ã�“ã�®ãƒ•ã‚¡ã‚¤ãƒ«ã�®è¦‹å‡ºã�—ã�‹ã‚‰æ–‡å­—åˆ—ã‚’æ¤œç´¢ã�™ã‚‹"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:818
  #, c-format
  msgid "No indices found."
--- 319,323 ----
  msgstr "ã�“ã�®ãƒ•ã‚¡ã‚¤ãƒ«ã�®è¦‹å‡ºã�—ã�‹ã‚‰æ–‡å­—åˆ—ã‚’æ¤œç´¢ã�™ã‚‹"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:828
  #, c-format
  msgid "No indices found."
***************
*** 348,380 ****
  msgstr "%s ã‚’å�«ã‚€è¦‹å‡ºã�—é …ç›®ã�¯ã�“ã‚Œä»¥ä¸Šã�‚ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: info/indices.c:476 info/indices.c:880
  #, fuzzy, c-format
  msgid "No index entries containing '%s'."
  msgstr "%s ã‚’å�«ã‚€è¦‹å‡ºã�—é …ç›®ã�Œã�‚ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: info/indices.c:583
  #, fuzzy, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "`%s' ã�®è¦‹å‡ºã�—ã‚’èª¿ã�¹ã�¦ã�„ã�¾ã�™..."
  
! #: info/indices.c:636
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr "å…¨ã�¦ã�® info ãƒ•ã‚¡ã‚¤ãƒ«æ–‡å­—åˆ—ã�‹ã‚‰è¦‹å‡ºã�—ã‚’èµ°æŸ»ã�—ã€�ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‚’ä½œæˆ�ã�™ã‚‹"
  
! #: info/indices.c:644 info/indices.c:646
  #, fuzzy
  msgid "Index apropos"
  msgstr "èªžå�¥ã‚’å�«ã‚€é …ç›®ã‚’æ¤œç´¢: "
  
! #: info/indices.c:688
  #, fuzzy, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "%s ã‚’å�«ã‚€è¦‹å‡ºã�—é …ç›®ã�Œã�‚ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: info/indices.c:797
  msgid "List all matches of a string in the index"
  msgstr ""
  
! #: info/indices.c:824 info/indices.c:826
  #, fuzzy
  msgid "Index topic"
--- 350,382 ----
  msgstr "%s ã‚’å�«ã‚€è¦‹å‡ºã�—é …ç›®ã�¯ã�“ã‚Œä»¥ä¸Šã�‚ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: info/indices.c:476 info/indices.c:890
  #, fuzzy, c-format
  msgid "No index entries containing '%s'."
  msgstr "%s ã‚’å�«ã‚€è¦‹å‡ºã�—é …ç›®ã�Œã�‚ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: info/indices.c:586
  #, fuzzy, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "`%s' ã�®è¦‹å‡ºã�—ã‚’èª¿ã�¹ã�¦ã�„ã�¾ã�™..."
  
! #: info/indices.c:646
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr "å…¨ã�¦ã�® info ãƒ•ã‚¡ã‚¤ãƒ«æ–‡å­—åˆ—ã�‹ã‚‰è¦‹å‡ºã�—ã‚’èµ°æŸ»ã�—ã€�ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‚’ä½œæˆ�ã�™ã‚‹"
  
! #: info/indices.c:654 info/indices.c:656
  #, fuzzy
  msgid "Index apropos"
  msgstr "èªžå�¥ã‚’å�«ã‚€é …ç›®ã‚’æ¤œç´¢: "
  
! #: info/indices.c:698
  #, fuzzy, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "%s ã‚’å�«ã‚€è¦‹å‡ºã�—é …ç›®ã�Œã�‚ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: info/indices.c:807
  msgid "List all matches of a string in the index"
  msgstr ""
  
! #: info/indices.c:834 info/indices.c:836
  #, fuzzy
  msgid "Index topic"
***************
*** 386,440 ****
  msgstr "è¦‹å‡ºã�—ã�Œ `%s' ã�® info ãƒ•ã‚¡ã‚¤ãƒ«ã�Œç”¨æ„�ã�•ã‚Œã�¦ã�„ã�¾ã�›ã‚“ã€‚"
  
! #: info/info-utils.c:892
  #, c-format
  msgid "Error converting file character encoding."
  msgstr ""
  
! #: info/info.c:222 info/session.c:2789
  #, fuzzy, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‚¢ã‚¤ãƒ†ãƒ  `%s' ã�¯ãƒŽãƒ¼ãƒ‰ `%s' ä¸­ã�«ã�¯ã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: info/info.c:315
! #, fuzzy, c-format
! msgid "No file given for node '%s'."
! msgstr "ãƒŽãƒ¼ãƒ‰ `%s' ã�«ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã�Œã�‚ã‚Šã�¾ã�›ã‚“ã€‚"
! 
! #: info/info.c:364 info/info.c:1133
  #, fuzzy, c-format
  msgid "Cannot find node '%s'."
  msgstr "`%s' ãƒŽãƒ¼ãƒ‰ã�Œè¦‹ã�¤ã�‹ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: info/info.c:386
  #, c-format
  msgid "No program name given."
  msgstr ""
  
! #: info/info.c:577
  #, fuzzy, c-format
  msgid "invalid number: %s\n"
  msgstr "ç„¡åŠ¹ã�ªæ•°: %s\n"
  
! #: info/info.c:757
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "é–“é�•ã�£ã�Ÿå½¢å¼�ã�®å¤‰æ•°ä»£å…¥: %s"
  
! #: info/info.c:764 info/infokey.c:537
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: ã��ã�®ã‚ˆã�†ã�ªå¤‰æ•°ã�¯ã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: info/info.c:770 info/infokey.c:539
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "å¤‰æ•° %s ã�¯å¤‰æ•° %s ã�®å€¤ã�¨ã�—ã�¦ã�¯ç„¡åŠ¹ã�§ã�™"
  
! #: info/info.c:782
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "è©³ã�—ã��ã�¯ --help ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã‚’è©¦ã�—ã�¦ã�¿ã�¦ã��ã� ã�•ã�„ã€‚\n"
  
! #: info/info.c:804 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
--- 388,437 ----
  msgstr "è¦‹å‡ºã�—ã�Œ `%s' ã�® info ãƒ•ã‚¡ã‚¤ãƒ«ã�Œç”¨æ„�ã�•ã‚Œã�¦ã�„ã�¾ã�›ã‚“ã€‚"
  
! #: info/info-utils.c:879
  #, c-format
  msgid "Error converting file character encoding."
  msgstr ""
  
! #: info/info.c:279 info/session.c:2789
  #, fuzzy, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‚¢ã‚¤ãƒ†ãƒ  `%s' ã�¯ãƒŽãƒ¼ãƒ‰ `%s' ä¸­ã�«ã�¯ã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: info/info.c:416 info/info.c:1148
  #, fuzzy, c-format
  msgid "Cannot find node '%s'."
  msgstr "`%s' ãƒŽãƒ¼ãƒ‰ã�Œè¦‹ã�¤ã�‹ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: info/info.c:438
  #, c-format
  msgid "No program name given."
  msgstr ""
  
! #: info/info.c:636
  #, fuzzy, c-format
  msgid "invalid number: %s\n"
  msgstr "ç„¡åŠ¹ã�ªæ•°: %s\n"
  
! #: info/info.c:816
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "é–“é�•ã�£ã�Ÿå½¢å¼�ã�®å¤‰æ•°ä»£å…¥: %s"
  
! #: info/info.c:823 info/infokey.c:540
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: ã��ã�®ã‚ˆã�†ã�ªå¤‰æ•°ã�¯ã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: info/info.c:829 info/infokey.c:542
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "å¤‰æ•° %s ã�¯å¤‰æ•° %s ã�®å€¤ã�¨ã�—ã�¦ã�¯ç„¡åŠ¹ã�§ã�™"
  
! #: info/info.c:841
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "è©³ã�—ã��ã�¯ --help ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã‚’è©¦ã�—ã�¦ã�¿ã�¦ã��ã� ã�•ã�„ã€‚\n"
  
! #: info/info.c:860 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
***************
*** 451,460 ****
  "There is NO WARRANTY, to the extent permitted by law.\n"
  
! #: info/info.c:981
  #, fuzzy, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "`%s' ã�«å¯¾ã�™ã‚‹é …ç›®ã�Œè¦‹ã�¤ã�‹ã‚Šã�¾ã�›ã‚“\n"
  
! #: info/info.c:1034
  #, c-format
  msgid ""
--- 448,457 ----
  "There is NO WARRANTY, to the extent permitted by law.\n"
  
! #: info/info.c:999
  #, fuzzy, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "`%s' ã�«å¯¾ã�™ã‚‹é …ç›®ã�Œè¦‹ã�¤ã�‹ã‚Šã�¾ã�›ã‚“\n"
  
! #: info/info.c:1049
  #, c-format
  msgid ""
***************
*** 467,471 ****
  "Info å½¢å¼�ã�®æ–‡æ›¸ã‚’èª­ã�¿ã�¾ã�™ã€‚\n"
  
! #: info/info.c:1040
  msgid ""
  "Options:\n"
--- 464,468 ----
  "Info å½¢å¼�ã�®æ–‡æ›¸ã‚’èª­ã�¿ã�¾ã�™ã€‚\n"
  
! #: info/info.c:1055
  msgid ""
  "Options:\n"
***************
*** 485,489 ****
  "  -f, --file=FILENAME          å�‚ç…§ã�™ã‚‹ Info ãƒ•ã‚¡ã‚¤ãƒ«ã‚’æŒ‡å®šã�™ã‚‹ã€‚"
  
! #: info/info.c:1048
  msgid ""
  "  -h, --help                   display this help and exit.\n"
--- 482,486 ----
  "  -f, --file=FILENAME          å�‚ç…§ã�™ã‚‹ Info ãƒ•ã‚¡ã‚¤ãƒ«ã‚’æŒ‡å®šã�™ã‚‹ã€‚"
  
! #: info/info.c:1063
  msgid ""
  "  -h, --help                   display this help and exit.\n"
***************
*** 497,501 ****
  "  -o, --output=FILE            é�¸æŠžã�—ã�ŸãƒŽãƒ¼ãƒ‰ã‚’ FILE ã�«å‡ºåŠ›ã�™ã‚‹ã€‚"
  
! #: info/info.c:1054
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
--- 494,498 ----
  "  -o, --output=FILE            é�¸æŠžã�—ã�ŸãƒŽãƒ¼ãƒ‰ã‚’ FILE ã�«å‡ºåŠ›ã�™ã‚‹ã€‚"
  
! #: info/info.c:1069
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
***************
*** 511,519 ****
  "ã�™ã‚‹ã€‚"
  
! #: info/info.c:1061
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr "  -b, --speech-friendly        éŸ³å£°å�ˆæˆ�å™¨ã�«å¯¾ã�™ã‚‹è¦ªå’Œæ€§ã‚’é«˜ã‚�ã‚‹ã€‚"
  
! #: info/info.c:1065
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
--- 508,516 ----
  "ã�™ã‚‹ã€‚"
  
! #: info/info.c:1076
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr "  -b, --speech-friendly        éŸ³å£°å�ˆæˆ�å™¨ã�«å¯¾ã�™ã‚‹è¦ªå’Œæ€§ã‚’é«˜ã‚�ã‚‹ã€‚"
  
! #: info/info.c:1080
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
***************
*** 536,540 ****
  "\n"
  
! #: info/info.c:1074
  #, fuzzy
  msgid ""
--- 533,537 ----
  "\n"
  
! #: info/info.c:1089
  #, fuzzy
  msgid ""
***************
*** 553,557 ****
  "é …ç›®ã�®å��å‰�ã�¨ã�—ã�¦æ‰±ã‚�ã‚Œã�¾ã�™ã€‚"
  
! #: info/info.c:1081
  #, fuzzy
  msgid ""
--- 550,554 ----
  "é …ç›®ã�®å��å‰�ã�¨ã�—ã�¦æ‰±ã‚�ã‚Œã�¾ã�™ã€‚"
  
! #: info/info.c:1096
  #, fuzzy
  msgid ""
***************
*** 562,566 ****
  "ã‚­ãƒ¼è¨­å®šã�®è¦�ç´„ã�«ã�¤ã�„ã�¦ã�¯ Info å†…ã�§ h ã‚’å…¥åŠ›ã�—ã�¦ã��ã� ã�•ã�„ã€‚"
  
! #: info/info.c:1084
  #, fuzzy
  msgid ""
--- 559,563 ----
  "ã‚­ãƒ¼è¨­å®šã�®è¦�ç´„ã�«ã�¤ã�„ã�¦ã�¯ Info å†…ã�§ h ã‚’å…¥åŠ›ã�—ã�¦ã��ã� ã�•ã�„ã€‚"
  
! #: info/info.c:1099
  #, fuzzy
  msgid ""
***************
*** 592,596 ****
  "ã�™ã‚‹"
  
! #: info/info.c:1099 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
--- 589,593 ----
  "ã�™ã‚‹"
  
! #: info/info.c:1114 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
***************
*** 604,668 ****
  "Texinfoãƒ›ãƒ¼ãƒ ãƒšãƒ¼ã‚¸: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1134
  #, fuzzy, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "`(%s)%s' ãƒŽãƒ¼ãƒ‰ã�Œè¦‹ã�¤ã�‹ã‚Šã�¾ã�›ã‚“"
  
! #: info/info.c:1135
  msgid "Cannot find a window!"
  msgstr "ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã�Œè¦‹ã�¤ã�‹ã‚Šã�¾ã�›ã‚“"
  
! #: info/info.c:1136
  msgid "Point doesn't appear within this window's node!"
  msgstr "ã�“ã�®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãƒŽãƒ¼ãƒ‰å†…ã�«ãƒ�ã‚¤ãƒ³ãƒˆã�Œç�¾ã‚Œã�¾ã�›ã‚“ï¼�"
  
! #: info/info.c:1137
  msgid "Cannot delete the last window."
  msgstr "æœ€å¾Œã�®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã�¯å‰Šé™¤ã�§ã��ã�¾ã�›ã‚“"
  
! #: info/info.c:1138
  msgid "No menu in this node."
  msgstr "ã�“ã�®ãƒŽãƒ¼ãƒ‰ã�«ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã�¯ã�‚ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: info/info.c:1139
  msgid "No footnotes in this node."
  msgstr "ã�“ã�®ãƒŽãƒ¼ãƒ‰ã�«è„šæ³¨ã�¯ã�‚ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: info/info.c:1140
  msgid "No cross references in this node."
  msgstr "ã�“ã�®ãƒŽãƒ¼ãƒ‰ã�«ç›¸äº’å�‚ç…§ã�¯ã�‚ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: info/info.c:1141
  #, fuzzy, c-format
  msgid "No '%s' pointer for this node."
  msgstr "ã�“ã�®ãƒŽãƒ¼ãƒ‰ã�® `%s' ãƒ�ã‚¤ãƒ³ã‚¿ã�Œã�‚ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: info/info.c:1142
  #, fuzzy, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "ä¸�æ˜Žã�ª Info ã‚³ãƒžãƒ³ãƒ‰ `%c' ã�§ã�™ã€‚`?' ã�§ãƒ˜ãƒ«ãƒ—ã‚’å�‚ç…§ã�—ã�¦ã��ã� ã�•ã�„ã€‚"
  
! #: info/info.c:1143
  #, fuzzy, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "ç«¯æœ«ã‚¿ã‚¤ãƒ— `%s' ã�¯ Info ã�Œå‹•ä½œã�™ã‚‹ã�Ÿã‚�ã�®æ©Ÿèƒ½ã�Œã�‚ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: info/info.c:1144
  msgid "You are already at the last page of this node."
  msgstr "ã�“ã�“ã�¯ã‚‚ã�†ã€�ã�“ã�®ãƒŽãƒ¼ãƒ‰ã�®æœ€çµ‚ãƒšãƒ¼ã‚¸ã�§ã�™ã€‚"
  
! #: info/info.c:1145
  msgid "You are already at the first page of this node."
  msgstr "ã�“ã�“ã�¯ã‚‚ã�†ã€�ã�“ã�®ãƒŽãƒ¼ãƒ‰ã�®æœ€åˆ�ã�®ãƒšãƒ¼ã‚¸ã�§ã�™ã€‚"
  
! #: info/info.c:1146
  msgid "Only one window."
  msgstr "å”¯ä¸€ã�®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã�§ã�™ã€‚"
  
! #: info/info.c:1147
  msgid "Resulting window would be too small."
  msgstr "çµ�æžœã�®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã�Œå°�ã�•ã�™ã�Žã�¾ã�™ã€‚"
  
! #: info/info.c:1148
  msgid "Not enough room for a help window, please delete a window."
  msgstr ""
--- 601,665 ----
  "Texinfoãƒ›ãƒ¼ãƒ ãƒšãƒ¼ã‚¸: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1149
  #, fuzzy, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "`(%s)%s' ãƒŽãƒ¼ãƒ‰ã�Œè¦‹ã�¤ã�‹ã‚Šã�¾ã�›ã‚“"
  
! #: info/info.c:1150
  msgid "Cannot find a window!"
  msgstr "ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã�Œè¦‹ã�¤ã�‹ã‚Šã�¾ã�›ã‚“"
  
! #: info/info.c:1151
  msgid "Point doesn't appear within this window's node!"
  msgstr "ã�“ã�®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãƒŽãƒ¼ãƒ‰å†…ã�«ãƒ�ã‚¤ãƒ³ãƒˆã�Œç�¾ã‚Œã�¾ã�›ã‚“ï¼�"
  
! #: info/info.c:1152
  msgid "Cannot delete the last window."
  msgstr "æœ€å¾Œã�®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã�¯å‰Šé™¤ã�§ã��ã�¾ã�›ã‚“"
  
! #: info/info.c:1153
  msgid "No menu in this node."
  msgstr "ã�“ã�®ãƒŽãƒ¼ãƒ‰ã�«ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã�¯ã�‚ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: info/info.c:1154
  msgid "No footnotes in this node."
  msgstr "ã�“ã�®ãƒŽãƒ¼ãƒ‰ã�«è„šæ³¨ã�¯ã�‚ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: info/info.c:1155
  msgid "No cross references in this node."
  msgstr "ã�“ã�®ãƒŽãƒ¼ãƒ‰ã�«ç›¸äº’å�‚ç…§ã�¯ã�‚ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: info/info.c:1156
  #, fuzzy, c-format
  msgid "No '%s' pointer for this node."
  msgstr "ã�“ã�®ãƒŽãƒ¼ãƒ‰ã�® `%s' ãƒ�ã‚¤ãƒ³ã‚¿ã�Œã�‚ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: info/info.c:1157
  #, fuzzy, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "ä¸�æ˜Žã�ª Info ã‚³ãƒžãƒ³ãƒ‰ `%c' ã�§ã�™ã€‚`?' ã�§ãƒ˜ãƒ«ãƒ—ã‚’å�‚ç…§ã�—ã�¦ã��ã� ã�•ã�„ã€‚"
  
! #: info/info.c:1158
  #, fuzzy, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "ç«¯æœ«ã‚¿ã‚¤ãƒ— `%s' ã�¯ Info ã�Œå‹•ä½œã�™ã‚‹ã�Ÿã‚�ã�®æ©Ÿèƒ½ã�Œã�‚ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: info/info.c:1159
  msgid "You are already at the last page of this node."
  msgstr "ã�“ã�“ã�¯ã‚‚ã�†ã€�ã�“ã�®ãƒŽãƒ¼ãƒ‰ã�®æœ€çµ‚ãƒšãƒ¼ã‚¸ã�§ã�™ã€‚"
  
! #: info/info.c:1160
  msgid "You are already at the first page of this node."
  msgstr "ã�“ã�“ã�¯ã‚‚ã�†ã€�ã�“ã�®ãƒŽãƒ¼ãƒ‰ã�®æœ€åˆ�ã�®ãƒšãƒ¼ã‚¸ã�§ã�™ã€‚"
  
! #: info/info.c:1161
  msgid "Only one window."
  msgstr "å”¯ä¸€ã�®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã�§ã�™ã€‚"
  
! #: info/info.c:1162
  msgid "Resulting window would be too small."
  msgstr "çµ�æžœã�®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã�Œå°�ã�•ã�™ã�Žã�¾ã�™ã€‚"
  
! #: info/info.c:1163
  msgid "Not enough room for a help window, please delete a window."
  msgstr ""
***************
*** 930,964 ****
  msgstr "ä¸�æ˜Žã�ªã‚¢ã‚¯ã‚·ãƒ§ãƒ³ `%s' ã�§ã�™"
  
! #: info/infokey.c:482
  #, c-format
  msgid "action name too long"
  msgstr "ã‚¢ã‚¯ã‚·ãƒ§ãƒ³å��ã�Œé•·ã�™ã�Žã�¾ã�™"
  
! #: info/infokey.c:495
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ `%s' ã�«ä½™åˆ†ã�ªæ–‡å­—ã�Œç¶šã�„ã�¦ã�„ã�¾ã�™"
  
! #: info/infokey.c:506
  #, c-format
  msgid "missing variable name"
  msgstr "å¤‰æ•°å��ã�Œã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: info/infokey.c:515
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "å¤‰æ•°å��ã�®ç›´å¾Œã�® `=' ã�Œã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: info/infokey.c:522
  #, c-format
  msgid "variable name too long"
  msgstr "å¤‰æ•°å��ã�Œé•·ã�™ã�Žã�¾ã�™"
  
! #: info/infokey.c:546
  #, c-format
  msgid "value too long"
  msgstr "å€¤ã�Œé•·ã�™ã�Žã�¾ã�™"
  
! #: info/infokey.c:592
  #, c-format
  msgid "\"%s\", line %u: "
--- 927,961 ----
  msgstr "ä¸�æ˜Žã�ªã‚¢ã‚¯ã‚·ãƒ§ãƒ³ `%s' ã�§ã�™"
  
! #: info/infokey.c:485
  #, c-format
  msgid "action name too long"
  msgstr "ã‚¢ã‚¯ã‚·ãƒ§ãƒ³å��ã�Œé•·ã�™ã�Žã�¾ã�™"
  
! #: info/infokey.c:498
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ `%s' ã�«ä½™åˆ†ã�ªæ–‡å­—ã�Œç¶šã�„ã�¦ã�„ã�¾ã�™"
  
! #: info/infokey.c:509
  #, c-format
  msgid "missing variable name"
  msgstr "å¤‰æ•°å��ã�Œã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: info/infokey.c:518
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "å¤‰æ•°å��ã�®ç›´å¾Œã�® `=' ã�Œã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: info/infokey.c:525
  #, c-format
  msgid "variable name too long"
  msgstr "å¤‰æ•°å��ã�Œé•·ã�™ã�Žã�¾ã�™"
  
! #: info/infokey.c:549
  #, c-format
  msgid "value too long"
  msgstr "å€¤ã�Œé•·ã�™ã�Žã�¾ã�™"
  
! #: info/infokey.c:595
  #, c-format
  msgid "\"%s\", line %u: "
***************
*** 1293,1635 ****
  msgstr "`%s' ã�‹ã‚‰å�‚ç…§ã�•ã‚Œã�¦ã�„ã‚‹ãƒŽãƒ¼ãƒ‰ã‚’è¦‹ã�¤ã�‘ã‚‰ã‚Œã�¾ã�›ã‚“(`%s' ä¸­)"
  
! #: info/session.c:2864
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "dir ã�‹ã‚‰ãƒ¡ãƒ‹ãƒ¥ãƒ¼é–‹å§‹ãƒªã‚¹ãƒˆã‚’èª­ã�¿ã€�ã��ã‚Œã‚’ã�Ÿã�©ã‚‹"
  
! #: info/session.c:2866
  msgid "Follow menus: "
  msgstr "ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã�«ç¶šã��: "
  
! #: info/session.c:2971
  msgid "Select the Next node"
  msgstr "æ¬¡ ãƒŽãƒ¼ãƒ‰ã‚’é�¸æŠžã�™ã‚‹"
  
! #: info/session.c:2978
  msgid "Select the Prev node"
  msgstr "å‰� ãƒŽãƒ¼ãƒ‰ã‚’é�¸æŠžã�™ã‚‹"
  
! #: info/session.c:2985
  msgid "Select the Up node"
  msgstr "ä¸Š ãƒŽãƒ¼ãƒ‰ã‚’é�¸æŠžã�™ã‚‹"
  
! #: info/session.c:2991
  msgid "Select the last node in this file"
  msgstr "ã�“ã�®ãƒ•ã‚¡ã‚¤ãƒ«ã�®æœ€å¾Œã�®ãƒŽãƒ¼ãƒ‰ã‚’é�¸æŠžã�™ã‚‹"
  
! #: info/session.c:3018 info/session.c:3051
  msgid "This window has no additional nodes"
  msgstr "ã�“ã�®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã�«ã�¯ãƒŽãƒ¼ãƒ‰ã�Œä»˜ã�„ã�¦ã�„ã�¾ã�›ã‚“"
  
! #: info/session.c:3024
  msgid "Select the first node in this file"
  msgstr "ã�“ã�®ãƒ•ã‚¡ã‚¤ãƒ«ã�®æœ€åˆ�ã�®ãƒŽãƒ¼ãƒ‰ã‚’é�¸æŠžã�™ã‚‹"
  
! #: info/session.c:3158
  msgid "No more nodes within this document."
  msgstr "ã�“ã�®ãƒ‰ã‚­ãƒ¥ãƒ¡ãƒ³ãƒˆã�«ã�¯ã€�ã�“ã‚Œä»¥ä¸Šã�®ãƒŽãƒ¼ãƒ‰ã�¯ã�‚ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: info/session.c:3203 info/session.c:3243
  #, fuzzy
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "ã�“ã�®ãƒ‰ã‚­ãƒ¥ãƒ¡ãƒ³ãƒˆã�§ã�¯ã€�ã�“ã�®ãƒŽãƒ¼ãƒ‰ã�® `å‰�' ã‚„ `ä¸Š' ã�¯ã�‚ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: info/session.c:3256
  msgid "Move forwards or down through node structure"
  msgstr "ãƒŽãƒ¼ãƒ‰æ§‹é€ ã‚’é€šã�˜ã�¦é€²ã‚�ã�Ÿã‚Šä¸‹ã�Œã�£ã�Ÿã‚Šã�™ã‚‹"
  
! #: info/session.c:3273
  msgid "Move backwards or up through node structure"
  msgstr "ãƒŽãƒ¼ãƒ‰æ§‹é€ ã‚’é€šã�˜ã�¦æˆ»ã�£ã�Ÿã‚Šä¸Šã�Œã�£ã�Ÿã‚Šã�™ã‚‹"
  
! #: info/session.c:3296
  msgid "Read a node name and select it"
  msgstr "ãƒŽãƒ¼ãƒ‰å��ã‚’èª­ã‚“ã�§ã€�é�¸æŠžã�™ã‚‹"
  
! #: info/session.c:3350 info/session.c:3354
  msgid "Goto node: "
  msgstr "ãƒŽãƒ¼ãƒ‰ã�¸ç§»å‹•: "
  
! #: info/session.c:3533
  msgid "Find the node describing program invocation"
  msgstr "ãƒ—ãƒ­ã‚°ãƒ©ãƒ èµ·å‹•ã�«é–¢ã�™ã‚‹èª¬æ˜Žã�®ãƒŽãƒ¼ãƒ‰ã‚’è¦‹ã�¤ã�‘ã‚‹"
  
! #: info/session.c:3535
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "[%s] ã�®èµ·å‹•ãƒŽãƒ¼ãƒ‰ã‚’è¦‹ã�¤ã�‘ã‚‹: "
  
! #: info/session.c:3580
  msgid "Read a manpage reference and select it"
  msgstr "man ãƒšãƒ¼ã‚¸ã�¸ã�®å�‚ç…§ã‚’èª­ã‚“ã�§ã€�é�¸æŠžã�™ã‚‹"
  
! #: info/session.c:3584
  msgid "Get Manpage: "
  msgstr "Man ãƒšãƒ¼ã‚¸ã‚’è¡¨ç¤º: "
  
! #: info/session.c:3605
  #, fuzzy
  msgid "Select the node 'Top' in this file"
  msgstr "ã�“ã�®ãƒ•ã‚¡ã‚¤ãƒ«ã�® `å…ˆé ­' ãƒŽãƒ¼ãƒ‰ã‚’é�¸æŠž"
  
! #: info/session.c:3611
  #, fuzzy
  msgid "Select the node '(dir)'"
  msgstr "`(dir)'ãƒŽãƒ¼ãƒ‰ã‚’é�¸æŠžã�™ã‚‹"
  
! #: info/session.c:3617
  msgid "Show full file name of node being displayed"
  msgstr ""
  
! #: info/session.c:3634
  msgid "Select the most recently selected node"
  msgstr "æœ€å¾Œã�«é�¸æŠžã�•ã‚Œã�ŸãƒŽãƒ¼ãƒ‰ã‚’é�¸æŠžã�™ã‚‹"
  
! #: info/session.c:3639
  #, c-format
  msgid "No earlier node in history"
  msgstr ""
  
! #: info/session.c:3643
  msgid "Read the name of a file and select it"
  msgstr "ãƒ•ã‚¡ã‚¤ãƒ«å��ã‚’èª­ã�¿è¾¼ã�¿ã€�é�¸æŠžã�™ã‚‹"
  
! #: info/session.c:3647
  msgid "Find file: "
  msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã‚’æŽ¢ã�™: "
  
! #: info/session.c:3664
  #, fuzzy, c-format
  msgid "Cannot find '%s'."
  msgstr "`%s' ã�Œè¦‹ã�¤ã�‹ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: info/session.c:3713
  #, fuzzy, c-format
  msgid "Could not create output file '%s'."
  msgstr "å‡ºåŠ›ãƒ•ã‚¡ã‚¤ãƒ« `%s' ã‚’ä½œæˆ�ã�§ã��ã�¾ã�›ã‚“ã€‚"
  
! #: info/session.c:3727
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "%s ã�¸ã�®æ›¸ã��è¾¼ã�¿ä¸­ã�«ã‚¨ãƒ©ãƒ¼ã�Œç™ºç”Ÿã�—ã�¾ã�—ã�Ÿ: %s"
  
! #: info/session.c:3736
  #, c-format
  msgid "closing %s"
  msgstr "%s ã‚’é–‰ã�˜ã�¦ã�„ã�¾ã�™"
  
! #: info/session.c:3785
  #, c-format
  msgid "writing node %s..."
  msgstr "ãƒŽãƒ¼ãƒ‰ %s ã�¸æ›¸ã��è¾¼ã�¿ä¸­..."
  
! #: info/session.c:3831
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "INFO_PRINT_COMMAND ã�«ã‚ˆã�£ã�¦ã�“ã�®ãƒŽãƒ¼ãƒ‰ã�®å†…å®¹ã‚’ãƒ‘ã‚¤ãƒ—ã�™ã‚‹"
  
! #: info/session.c:3859
  #, fuzzy, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "`%s' ã�¸ã�®ãƒ‘ã‚¤ãƒ—ã‚’é–‹ã�‘ã�¾ã�›ã‚“ã€‚"
  
! #: info/session.c:3864
  #, fuzzy, c-format
  msgid "printing node %s..."
  msgstr "ãƒŽãƒ¼ãƒ‰ `%s' ã‚’å�°åˆ·ä¸­..."
  
! #: info/session.c:3872
  #, fuzzy, c-format
  msgid "finished printing node %s"
  msgstr "ãƒŽãƒ¼ãƒ‰ `%s' ã‚’å�°åˆ·ä¸­..."
  
! #: 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:4169
  msgid "Search continued from the end of the document."
  msgstr "æ–‡æ›¸ã�®æœ€å¾Œã�‹ã‚‰æ¤œç´¢ã‚’ç¶™ç¶šã�™ã‚‹ã€‚"
  
! #: info/session.c:4174
  msgid "Search continued from the beginning of the document."
  msgstr "æ–‡æ›¸ã�®æœ€åˆ�ã�‹ã‚‰æ¤œç´¢ã‚’ç¶™ç¶šã�™ã‚‹ã€‚"
  
! #: info/session.c:4194
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "å‰¯ãƒ•ã‚¡ã‚¤ãƒ« %s ã‚’æŽ¢ã�—ã�¦ã�„ã�¾ã�™ ..."
  
! #: info/session.c:4231
  msgid "Search failed."
  msgstr "æ¤œç´¢ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚"
  
! #: info/session.c:4248
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Regexp search"
  msgstr "æ­£è¦�è¡¨ç�¾æ¤œç´¢"
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Search"
  msgstr "æ¤œç´¢"
  
! #: info/session.c:4250 info/session.c:4256
  msgid " case-sensitively"
  msgstr " å¤§æ–‡å­—å°�æ–‡å­—ã�®åŒºåˆ¥ã‚’ã�¤ã�‘ã�¦"
  
! #: info/session.c:4251 info/session.c:4257
  msgid " backward"
  msgstr "å¾Œæ–¹"
  
! #: info/session.c:4254
  #, fuzzy, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4274
  msgid "Search string too short"
  msgstr ""
  
! #: info/session.c:4467
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4491 info/session.c:4601
  #, fuzzy, c-format
  msgid "No more matches."
  msgstr "ä¸€è‡´ã�—ã�¾ã�›ã‚“"
  
! #: info/session.c:4628
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4649
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4653 info/session.c:4665
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4661
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4674
  msgid "Read a string and search for it case-sensitively"
  msgstr "æ–‡å­—åˆ—ã‚’èª­ã�¿ã€�å¤§æ–‡å­—å°�æ–‡å­—ã�®åŒºåˆ¥ã‚’ã�¤ã�‘ã�¦æ¤œç´¢ã�™ã‚‹"
  
! #: info/session.c:4679
  msgid "Read a string and search for it"
  msgstr "æ–‡å­—åˆ—ã‚’èª­ã‚“ã�§æ¤œç´¢ã�™ã‚‹"
  
! #: info/session.c:4685
  msgid "Read a string and search backward for it"
  msgstr "æ–‡å­—åˆ—ã‚’èª­ã‚“ã�§å¾Œæ–¹æ¤œç´¢ã�™ã‚‹"
  
! #: info/session.c:4693
  msgid "Repeat last search in the same direction"
  msgstr "å�Œä¸€æ–¹å�‘ã�§æœ€å¾Œã�®æ¤œç´¢ã‚’ç¹°ã‚Šè¿”ã�™"
  
! #: info/session.c:4701 info/session.c:4746
  msgid "No previous search string"
  msgstr "å‰�ã�®æ¤œç´¢æ–‡å­—åˆ—ã�Œã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: info/session.c:4738
  msgid "Repeat last search in the reverse direction"
  msgstr "é€†æ–¹å�‘ã�§æœ€å¾Œã�®æ¤œç´¢ã‚’ç¹°ã‚Šè¿”ã�™"
  
! #: info/session.c:4785
  msgid "Clear displayed search matches"
  msgstr ""
  
! #: info/session.c:4802 info/session.c:4808
  msgid "Search interactively for a string as you type it"
  msgstr "å…¥åŠ›ã�—ã�Ÿæ–‡å­—åˆ—ã�®å¯¾è©±çš„ã�ªæ¤œç´¢"
  
! #: info/session.c:4928
  msgid "Regexp I-search backward: "
  msgstr "æ­£è¦�è¡¨ç�¾é€�æ¬¡å¾Œæ–¹æ¤œç´¢: "
  
! #: info/session.c:4929
  msgid "I-search backward: "
  msgstr "é€�æ¬¡å¾Œæ–¹æ¤œç´¢: "
  
! #: info/session.c:4931
  msgid "Regexp I-search: "
  msgstr "æ­£è¦�è¡¨ç�¾é€�æ¬¡æ¤œç´¢: "
  
! #: info/session.c:4932
  msgid "I-search: "
  msgstr "é€�æ¬¡æ¤œç´¢: "
  
! #: info/session.c:4957 info/session.c:4960
  msgid "Failing "
  msgstr "å¤±æ•— "
  
! #: info/session.c:5326
  msgid "Cancel current operation"
  msgstr "ç�¾åœ¨ã�®æ“�ä½œã‚’ä¸­æ­¢ã�™ã‚‹"
  
! #: info/session.c:5333
  msgid "Quit"
  msgstr "çµ‚äº†"
  
! #: info/session.c:5338
  #, fuzzy
  msgid "Display version of Info being run"
  msgstr "ãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³æƒ…å ±ã‚’è¡¨ç¤ºã�—ã�¦çµ‚äº†ã�™ã‚‹"
  
! #: info/session.c:5340
  #, c-format
  msgid "GNU Info version %s"
  msgstr ""
  
! #: info/session.c:5345
  msgid "Redraw the display"
  msgstr "ç”»é�¢ã‚’å†�æ��ç”»ã�™ã‚‹"
  
! #: info/session.c:5382
  msgid "Quit using Info"
  msgstr "Info ã�®ä½¿ç”¨ã‚’çµ‚äº†ã�™ã‚‹"
  
! #: info/session.c:5398
  msgid "Run command bound to this key's lowercase variant"
  msgstr "ã�“ã�®ã‚­ãƒ¼ã�®å°�æ–‡å­—ã�«å‰²ã‚Šå½“ã�¦ã‚‰ã‚Œã�Ÿã‚³ãƒžãƒ³ãƒ‰ã‚’å®Ÿè¡Œã�™ã‚‹"
  
! #: info/session.c:5409
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "ä¸�æ˜Žã�ªã‚³ãƒžãƒ³ãƒ‰ (%s) ã�§ã�™ã€‚"
  
! #: info/session.c:5412
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\" ã�¯ç„¡åŠ¹ã�§ã�™"
  
! #: info/session.c:5413
  #, fuzzy, c-format
  msgid "'%s' is invalid"
  msgstr "`%s' ã�¯ç„¡åŠ¹ã�§ã�™"
  
! #: info/session.c:5731
  msgid "Add this digit to the current numeric argument"
  msgstr "ç�¾åœ¨ã�®æ•°å€¤å¼•æ•°ã�«ã�“ã�®æ•°å€¤ã‚’åŠ ã�ˆã‚‹"
  
! #: info/session.c:5738
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "ç�¾åœ¨ã�®æ•°å€¤å¼•æ•°ã‚’é–‹å§‹(ã�¾ã�Ÿã�¯ 4 å€�ã�™ã‚‹)"
--- 1290,1632 ----
  msgstr "`%s' ã�‹ã‚‰å�‚ç…§ã�•ã‚Œã�¦ã�„ã‚‹ãƒŽãƒ¼ãƒ‰ã‚’è¦‹ã�¤ã�‘ã‚‰ã‚Œã�¾ã�›ã‚“(`%s' ä¸­)"
  
! #: info/session.c:2870
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "dir ã�‹ã‚‰ãƒ¡ãƒ‹ãƒ¥ãƒ¼é–‹å§‹ãƒªã‚¹ãƒˆã‚’èª­ã�¿ã€�ã��ã‚Œã‚’ã�Ÿã�©ã‚‹"
  
! #: info/session.c:2872
  msgid "Follow menus: "
  msgstr "ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã�«ç¶šã��: "
  
! #: info/session.c:2977
  msgid "Select the Next node"
  msgstr "æ¬¡ ãƒŽãƒ¼ãƒ‰ã‚’é�¸æŠžã�™ã‚‹"
  
! #: info/session.c:2984
  msgid "Select the Prev node"
  msgstr "å‰� ãƒŽãƒ¼ãƒ‰ã‚’é�¸æŠžã�™ã‚‹"
  
! #: info/session.c:2991
  msgid "Select the Up node"
  msgstr "ä¸Š ãƒŽãƒ¼ãƒ‰ã‚’é�¸æŠžã�™ã‚‹"
  
! #: info/session.c:2997
  msgid "Select the last node in this file"
  msgstr "ã�“ã�®ãƒ•ã‚¡ã‚¤ãƒ«ã�®æœ€å¾Œã�®ãƒŽãƒ¼ãƒ‰ã‚’é�¸æŠžã�™ã‚‹"
  
! #: info/session.c:3024 info/session.c:3057
  msgid "This window has no additional nodes"
  msgstr "ã�“ã�®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã�«ã�¯ãƒŽãƒ¼ãƒ‰ã�Œä»˜ã�„ã�¦ã�„ã�¾ã�›ã‚“"
  
! #: info/session.c:3030
  msgid "Select the first node in this file"
  msgstr "ã�“ã�®ãƒ•ã‚¡ã‚¤ãƒ«ã�®æœ€åˆ�ã�®ãƒŽãƒ¼ãƒ‰ã‚’é�¸æŠžã�™ã‚‹"
  
! #: info/session.c:3164
  msgid "No more nodes within this document."
  msgstr "ã�“ã�®ãƒ‰ã‚­ãƒ¥ãƒ¡ãƒ³ãƒˆã�«ã�¯ã€�ã�“ã‚Œä»¥ä¸Šã�®ãƒŽãƒ¼ãƒ‰ã�¯ã�‚ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: info/session.c:3209 info/session.c:3249
  #, fuzzy
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "ã�“ã�®ãƒ‰ã‚­ãƒ¥ãƒ¡ãƒ³ãƒˆã�§ã�¯ã€�ã�“ã�®ãƒŽãƒ¼ãƒ‰ã�® `å‰�' ã‚„ `ä¸Š' ã�¯ã�‚ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: info/session.c:3262
  msgid "Move forwards or down through node structure"
  msgstr "ãƒŽãƒ¼ãƒ‰æ§‹é€ ã‚’é€šã�˜ã�¦é€²ã‚�ã�Ÿã‚Šä¸‹ã�Œã�£ã�Ÿã‚Šã�™ã‚‹"
  
! #: info/session.c:3279
  msgid "Move backwards or up through node structure"
  msgstr "ãƒŽãƒ¼ãƒ‰æ§‹é€ ã‚’é€šã�˜ã�¦æˆ»ã�£ã�Ÿã‚Šä¸Šã�Œã�£ã�Ÿã‚Šã�™ã‚‹"
  
! #: info/session.c:3302
  msgid "Read a node name and select it"
  msgstr "ãƒŽãƒ¼ãƒ‰å��ã‚’èª­ã‚“ã�§ã€�é�¸æŠžã�™ã‚‹"
  
! #: info/session.c:3356 info/session.c:3360
  msgid "Goto node: "
  msgstr "ãƒŽãƒ¼ãƒ‰ã�¸ç§»å‹•: "
  
! #: info/session.c:3539
  msgid "Find the node describing program invocation"
  msgstr "ãƒ—ãƒ­ã‚°ãƒ©ãƒ èµ·å‹•ã�«é–¢ã�™ã‚‹èª¬æ˜Žã�®ãƒŽãƒ¼ãƒ‰ã‚’è¦‹ã�¤ã�‘ã‚‹"
  
! #: info/session.c:3541
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "[%s] ã�®èµ·å‹•ãƒŽãƒ¼ãƒ‰ã‚’è¦‹ã�¤ã�‘ã‚‹: "
  
! #: info/session.c:3586
  msgid "Read a manpage reference and select it"
  msgstr "man ãƒšãƒ¼ã‚¸ã�¸ã�®å�‚ç…§ã‚’èª­ã‚“ã�§ã€�é�¸æŠžã�™ã‚‹"
  
! #: info/session.c:3590
  msgid "Get Manpage: "
  msgstr "Man ãƒšãƒ¼ã‚¸ã‚’è¡¨ç¤º: "
  
! #: info/session.c:3611
  #, fuzzy
  msgid "Select the node 'Top' in this file"
  msgstr "ã�“ã�®ãƒ•ã‚¡ã‚¤ãƒ«ã�® `å…ˆé ­' ãƒŽãƒ¼ãƒ‰ã‚’é�¸æŠž"
  
! #: info/session.c:3617
  #, fuzzy
  msgid "Select the node '(dir)'"
  msgstr "`(dir)'ãƒŽãƒ¼ãƒ‰ã‚’é�¸æŠžã�™ã‚‹"
  
! #: info/session.c:3623
  msgid "Show full file name of node being displayed"
  msgstr ""
  
! #: info/session.c:3640
  msgid "Select the most recently selected node"
  msgstr "æœ€å¾Œã�«é�¸æŠžã�•ã‚Œã�ŸãƒŽãƒ¼ãƒ‰ã‚’é�¸æŠžã�™ã‚‹"
  
! #: info/session.c:3645
  #, c-format
  msgid "No earlier node in history"
  msgstr ""
  
! #: info/session.c:3649
  msgid "Read the name of a file and select it"
  msgstr "ãƒ•ã‚¡ã‚¤ãƒ«å��ã‚’èª­ã�¿è¾¼ã�¿ã€�é�¸æŠžã�™ã‚‹"
  
! #: info/session.c:3653
  msgid "Find file: "
  msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã‚’æŽ¢ã�™: "
  
! #: info/session.c:3670
  #, fuzzy, c-format
  msgid "Cannot find '%s'."
  msgstr "`%s' ã�Œè¦‹ã�¤ã�‹ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: info/session.c:3719
  #, fuzzy, c-format
  msgid "Could not create output file '%s'."
  msgstr "å‡ºåŠ›ãƒ•ã‚¡ã‚¤ãƒ« `%s' ã‚’ä½œæˆ�ã�§ã��ã�¾ã�›ã‚“ã€‚"
  
! #: info/session.c:3733
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "%s ã�¸ã�®æ›¸ã��è¾¼ã�¿ä¸­ã�«ã‚¨ãƒ©ãƒ¼ã�Œç™ºç”Ÿã�—ã�¾ã�—ã�Ÿ: %s"
  
! #: info/session.c:3742
  #, c-format
  msgid "closing %s"
  msgstr "%s ã‚’é–‰ã�˜ã�¦ã�„ã�¾ã�™"
  
! #: info/session.c:3791
  #, c-format
  msgid "writing node %s..."
  msgstr "ãƒŽãƒ¼ãƒ‰ %s ã�¸æ›¸ã��è¾¼ã�¿ä¸­..."
  
! #: info/session.c:3837
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "INFO_PRINT_COMMAND ã�«ã‚ˆã�£ã�¦ã�“ã�®ãƒŽãƒ¼ãƒ‰ã�®å†…å®¹ã‚’ãƒ‘ã‚¤ãƒ—ã�™ã‚‹"
  
! #: info/session.c:3865
  #, fuzzy, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "`%s' ã�¸ã�®ãƒ‘ã‚¤ãƒ—ã‚’é–‹ã�‘ã�¾ã�›ã‚“ã€‚"
  
! #: info/session.c:3870
  #, fuzzy, c-format
  msgid "printing node %s..."
  msgstr "ãƒŽãƒ¼ãƒ‰ `%s' ã‚’å�°åˆ·ä¸­..."
  
! #: info/session.c:3878
  #, fuzzy, c-format
  msgid "finished printing node %s"
  msgstr "ãƒŽãƒ¼ãƒ‰ `%s' ã‚’å�°åˆ·ä¸­..."
  
! #: info/session.c:3910
  msgid "Toggle the usage of regular expressions in searches"
  msgstr "æ¤œç´¢ã�§æ­£è¦�è¡¨ç�¾ã‚’ä½¿ç”¨ã�™ã‚‹ã�‹ã�©ã�†ã�‹ã‚’åˆ‡ã‚Šæ›¿ã�ˆã‚‹"
  
! #: info/session.c:3914
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr "æ¤œç´¢ã�§æ­£è¦�è¡¨ç�¾ã‚’ä½¿ç”¨ã�™ã‚‹ã€‚"
  
! #: info/session.c:3915
  #, c-format
  msgid "Using literal strings for searches."
  msgstr "æ¤œç´¢ã�§æ–‡å­—åˆ—ãƒªãƒ†ãƒ©ãƒ«ã��ã�®ã‚‚ã�®ã‚’ä½¿ç”¨ã�™ã‚‹ã€‚"
  
! #: info/session.c:4175
  msgid "Search continued from the end of the document."
  msgstr "æ–‡æ›¸ã�®æœ€å¾Œã�‹ã‚‰æ¤œç´¢ã‚’ç¶™ç¶šã�™ã‚‹ã€‚"
  
! #: info/session.c:4180
  msgid "Search continued from the beginning of the document."
  msgstr "æ–‡æ›¸ã�®æœ€åˆ�ã�‹ã‚‰æ¤œç´¢ã‚’ç¶™ç¶šã�™ã‚‹ã€‚"
  
! #: info/session.c:4200
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "å‰¯ãƒ•ã‚¡ã‚¤ãƒ« %s ã‚’æŽ¢ã�—ã�¦ã�„ã�¾ã�™ ..."
  
! #: info/session.c:4237
  msgid "Search failed."
  msgstr "æ¤œç´¢ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿã€‚"
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Regexp search"
  msgstr "æ­£è¦�è¡¨ç�¾æ¤œç´¢"
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Search"
  msgstr "æ¤œç´¢"
  
! #: info/session.c:4256 info/session.c:4262
  msgid " case-sensitively"
  msgstr " å¤§æ–‡å­—å°�æ–‡å­—ã�®åŒºåˆ¥ã‚’ã�¤ã�‘ã�¦"
  
! #: info/session.c:4257 info/session.c:4263
  msgid " backward"
  msgstr "å¾Œæ–¹"
  
! #: info/session.c:4260
  #, fuzzy, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4280
  msgid "Search string too short"
  msgstr ""
  
! #: info/session.c:4473
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4497 info/session.c:4607
  #, fuzzy, c-format
  msgid "No more matches."
  msgstr "ä¸€è‡´ã�—ã�¾ã�›ã‚“"
  
! #: info/session.c:4634
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4655
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4659 info/session.c:4671
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4667
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4680
  msgid "Read a string and search for it case-sensitively"
  msgstr "æ–‡å­—åˆ—ã‚’èª­ã�¿ã€�å¤§æ–‡å­—å°�æ–‡å­—ã�®åŒºåˆ¥ã‚’ã�¤ã�‘ã�¦æ¤œç´¢ã�™ã‚‹"
  
! #: info/session.c:4685
  msgid "Read a string and search for it"
  msgstr "æ–‡å­—åˆ—ã‚’èª­ã‚“ã�§æ¤œç´¢ã�™ã‚‹"
  
! #: info/session.c:4691
  msgid "Read a string and search backward for it"
  msgstr "æ–‡å­—åˆ—ã‚’èª­ã‚“ã�§å¾Œæ–¹æ¤œç´¢ã�™ã‚‹"
  
! #: info/session.c:4699
  msgid "Repeat last search in the same direction"
  msgstr "å�Œä¸€æ–¹å�‘ã�§æœ€å¾Œã�®æ¤œç´¢ã‚’ç¹°ã‚Šè¿”ã�™"
  
! #: info/session.c:4707 info/session.c:4752
  msgid "No previous search string"
  msgstr "å‰�ã�®æ¤œç´¢æ–‡å­—åˆ—ã�Œã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: info/session.c:4744
  msgid "Repeat last search in the reverse direction"
  msgstr "é€†æ–¹å�‘ã�§æœ€å¾Œã�®æ¤œç´¢ã‚’ç¹°ã‚Šè¿”ã�™"
  
! #: info/session.c:4791
  msgid "Clear displayed search matches"
  msgstr ""
  
! #: info/session.c:4808 info/session.c:4814
  msgid "Search interactively for a string as you type it"
  msgstr "å…¥åŠ›ã�—ã�Ÿæ–‡å­—åˆ—ã�®å¯¾è©±çš„ã�ªæ¤œç´¢"
  
! #: info/session.c:4934
  msgid "Regexp I-search backward: "
  msgstr "æ­£è¦�è¡¨ç�¾é€�æ¬¡å¾Œæ–¹æ¤œç´¢: "
  
! #: info/session.c:4935
  msgid "I-search backward: "
  msgstr "é€�æ¬¡å¾Œæ–¹æ¤œç´¢: "
  
! #: info/session.c:4937
  msgid "Regexp I-search: "
  msgstr "æ­£è¦�è¡¨ç�¾é€�æ¬¡æ¤œç´¢: "
  
! #: info/session.c:4938
  msgid "I-search: "
  msgstr "é€�æ¬¡æ¤œç´¢: "
  
! #: info/session.c:4963 info/session.c:4966
  msgid "Failing "
  msgstr "å¤±æ•— "
  
! #: info/session.c:5332
  msgid "Cancel current operation"
  msgstr "ç�¾åœ¨ã�®æ“�ä½œã‚’ä¸­æ­¢ã�™ã‚‹"
  
! #: info/session.c:5339
  msgid "Quit"
  msgstr "çµ‚äº†"
  
! #: info/session.c:5344
  #, fuzzy
  msgid "Display version of Info being run"
  msgstr "ãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³æƒ…å ±ã‚’è¡¨ç¤ºã�—ã�¦çµ‚äº†ã�™ã‚‹"
  
! #: info/session.c:5346
  #, c-format
  msgid "GNU Info version %s"
  msgstr ""
  
! #: info/session.c:5351
  msgid "Redraw the display"
  msgstr "ç”»é�¢ã‚’å†�æ��ç”»ã�™ã‚‹"
  
! #: info/session.c:5388
  msgid "Quit using Info"
  msgstr "Info ã�®ä½¿ç”¨ã‚’çµ‚äº†ã�™ã‚‹"
  
! #: info/session.c:5404
  msgid "Run command bound to this key's lowercase variant"
  msgstr "ã�“ã�®ã‚­ãƒ¼ã�®å°�æ–‡å­—ã�«å‰²ã‚Šå½“ã�¦ã‚‰ã‚Œã�Ÿã‚³ãƒžãƒ³ãƒ‰ã‚’å®Ÿè¡Œã�™ã‚‹"
  
! #: info/session.c:5415
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "ä¸�æ˜Žã�ªã‚³ãƒžãƒ³ãƒ‰ (%s) ã�§ã�™ã€‚"
  
! #: info/session.c:5418
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\" ã�¯ç„¡åŠ¹ã�§ã�™"
  
! #: info/session.c:5419
  #, fuzzy, c-format
  msgid "'%s' is invalid"
  msgstr "`%s' ã�¯ç„¡åŠ¹ã�§ã�™"
  
! #: info/session.c:5737
  msgid "Add this digit to the current numeric argument"
  msgstr "ç�¾åœ¨ã�®æ•°å€¤å¼•æ•°ã�«ã�“ã�®æ•°å€¤ã‚’åŠ ã�ˆã‚‹"
  
! #: info/session.c:5744
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "ç�¾åœ¨ã�®æ•°å€¤å¼•æ•°ã‚’é–‹å§‹(ã�¾ã�Ÿã�¯ 4 å€�ã�™ã‚‹)"
***************
*** 1767,1784 ****
  msgstr "%s ã�«å€¤ã‚’è¨­å®š (%s): "
  
! #: info/window.c:959
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), è¡Œæ•° ----, "
  
- #: info/window.c:966
- #, fuzzy, c-format
- msgid "-%s---Info: %s, %ld lines --%s--"
- msgstr "-%s---Info: %s, %d è¡Œ --%s--"
- 
- #: info/window.c:970
- #, fuzzy, c-format
- msgid "-%s---Info: (%s)%s, %ld lines --%s--"
- msgstr "-%s%s-Info: (%s)%s, %d è¡Œ --%s--"
- 
  #: install-info/install-info.c:292
  #, c-format
--- 1764,1771 ----
  msgstr "%s ã�«å€¤ã‚’è¨­å®š (%s): "
  
! #: info/window.c:909
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), è¡Œæ•° ----, "
  
  #: install-info/install-info.c:292
  #, c-format
***************
*** 1973,1977 ****
  "\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"
--- 1960,1964 ----
  "\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"
***************
*** 2068,2186 ****
  msgstr "`%s' é …ç›®ã�Œè¦‹ã�¤ã�‹ã‚Šã�¾ã�›ã‚“ -- ä½•ã‚‚å‰Šé™¤ã�—ã�¾ã�›ã‚“ã�§ã�—ã�Ÿ"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:855
! #: tp/Texinfo/Convert/Converter.pm:893 tp/Texinfo/Convert/Converter.pm:1204
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6504
! #: tp/Texinfo/Convert/HTML.pm:6528 tp/Texinfo/Convert/HTML.pm:6905
! #: tp/Texinfo/Convert/HTML.pm:6963 tp/Texinfo/Convert/HTML.pm:7041
! #: tp/Texinfo/Convert/HTML.pm:7118 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:546
! #: tp/Texinfo/Convert/TexinfoXML.pm:457
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "%s: --css-file %s ã‚’é–‹ã��ã�“ã�¨ã�Œã�§ã��ã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Common.pm:881
  msgid "recursion is always allowed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:882
  #, fuzzy
  msgid "arguments are quoted by default"
  msgstr "@quote-arg ã�¯å»ƒæ­¢ã�•ã‚Œã�¾ã�—ã�Ÿã€‚å¼•æ•°ã�¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã�§å¼•ç”¨ç¬¦ã�§ã��ã��ã‚‰ã‚Œã�¾ã�™"
  
! #: tp/Texinfo/Common.pm:1105
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s ã�¯æœ‰åŠ¹ã�ªè¨€èªžã‚³ãƒ¼ãƒ‰ã�§ã�¯ã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Common.pm:1110
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s ã�¯æœ‰åŠ¹ã�ªåœ°åŸŸã‚³ãƒ¼ãƒ‰ã�§ã�¯ã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Common.pm:1128
  #, fuzzy, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%u ã�¯å¦¥å½“ã�ªé€šçŸ¥ ID ã�§ã�¯ã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Common.pm:1151
  #, fuzzy, perl-format
  msgid "could not read %s: %s"
  msgstr "  @FILE                   ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã‚’ FILE ã�‹ã‚‰èª­ã�¿è¾¼ã‚€\n"
  
! #: tp/Texinfo/Common.pm:1170
  #, fuzzy, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "å‡ºåŠ›ãƒ•ã‚¡ã‚¤ãƒ« `%s' ã‚’é–‰ã�˜ã‚‹éš›ã�«ã‚¨ãƒ©ãƒ¼ã�Œç™ºç”Ÿã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Common.pm:1176 tp/Texinfo/Parser.pm:3353
  #, fuzzy, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%s: `%s' ã�Œè¦‹ã�¤ã�‹ã‚Šã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Common.pm:1520
! #, fuzzy, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr "ãƒ•ã‚¡ã‚¤ãƒ« `%s' ã‚’å‰Šé™¤ã�§ã��ã�¾ã�›ã‚“: %s"
! 
! #: tp/Texinfo/Common.pm:1548
! #, fuzzy
! msgid "missing type"
! msgstr "è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã�®æ¬ è�½ã€‚"
! 
! #: tp/Texinfo/Common.pm:1551
! #, fuzzy, perl-format
! msgid "unrecognized type: %s"
! msgstr "èª�è­˜ã�§ã��ã�ªã�„åž‹ã�§ã�™: %s"
! 
! #: tp/Texinfo/Common.pm:1568
! #, fuzzy, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr "ãƒ•ã‚¡ã‚¤ãƒ« `%s' ã‚’å‰Šé™¤ã�§ã��ã�¾ã�›ã‚“: %s"
! 
! #: tp/Texinfo/Common.pm:1603
  msgid "no node to be renamed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1614
  msgid "nodes without a new name at the end of file"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1624 tp/Texinfo/Parser.pm:926
  #, fuzzy, perl-format
  msgid "could not open %s: %s"
  msgstr "%s: --css-file %s ã‚’é–‹ã��ã�“ã�¨ã�Œã�§ã��ã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Common.pm:2144
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:395 tp/Texinfo/Convert/Converter.pm:414
  #, fuzzy, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "å¤‰æ•°ã‚’è¨­å®š: "
  
! #: tp/Texinfo/Convert/Converter.pm:794
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:876 tp/Texinfo/Convert/Converter.pm:909
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:6931
! #: tp/Texinfo/Convert/HTML.pm:6989 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:476 tp/Texinfo/Parser.pm:2035
  #, fuzzy, perl-format
  msgid "error on closing %s: %s"
  msgstr "%(service)s on %(device)s"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, fuzzy, perl-format
  msgid "could not create directories `%s' or `%s': %s"
  msgstr "ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª `%s' ã�¾ã�Ÿã�¯ `%s'ã‚’ä½œæˆ�ã�§ã��ã�¾ã�›ã‚“: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:995
  #, fuzzy, perl-format
  msgid "could not create directory `%s': %s"
--- 2055,2164 ----
  msgstr "`%s' é …ç›®ã�Œè¦‹ã�¤ã�‹ã‚Šã�¾ã�›ã‚“ -- ä½•ã‚‚å‰Šé™¤ã�—ã�¾ã�›ã‚“ã�§ã�—ã�Ÿ"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:847
! #: tp/Texinfo/Convert/Converter.pm:885 tp/Texinfo/Convert/Converter.pm:1196
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6573
! #: tp/Texinfo/Convert/HTML.pm:6597 tp/Texinfo/Convert/HTML.pm:6978
! #: tp/Texinfo/Convert/HTML.pm:7037 tp/Texinfo/Convert/HTML.pm:7115
! #: tp/Texinfo/Convert/HTML.pm:7192 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:547
! #: tp/Texinfo/Convert/TexinfoXML.pm:458
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "%s: --css-file %s ã‚’é–‹ã��ã�“ã�¨ã�Œã�§ã��ã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Common.pm:862
  msgid "recursion is always allowed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:863
  #, fuzzy
  msgid "arguments are quoted by default"
  msgstr "@quote-arg ã�¯å»ƒæ­¢ã�•ã‚Œã�¾ã�—ã�Ÿã€‚å¼•æ•°ã�¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã�§å¼•ç”¨ç¬¦ã�§ã��ã��ã‚‰ã‚Œã�¾ã�™"
  
! #: tp/Texinfo/Common.pm:866
! msgid ""
! "move your @contents command if you want the contents after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:869
! msgid ""
! "move your @shortcontents and @contents commands if you want the contents "
! "after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:1093
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s ã�¯æœ‰åŠ¹ã�ªè¨€èªžã‚³ãƒ¼ãƒ‰ã�§ã�¯ã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Common.pm:1098
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s ã�¯æœ‰åŠ¹ã�ªåœ°åŸŸã‚³ãƒ¼ãƒ‰ã�§ã�¯ã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Common.pm:1116
  #, fuzzy, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%u ã�¯å¦¥å½“ã�ªé€šçŸ¥ ID ã�§ã�¯ã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Common.pm:1139
  #, fuzzy, perl-format
  msgid "could not read %s: %s"
  msgstr "  @FILE                   ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã‚’ FILE ã�‹ã‚‰èª­ã�¿è¾¼ã‚€\n"
  
! #: tp/Texinfo/Common.pm:1158
  #, fuzzy, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "å‡ºåŠ›ãƒ•ã‚¡ã‚¤ãƒ« `%s' ã‚’é–‰ã�˜ã‚‹éš›ã�«ã‚¨ãƒ©ãƒ¼ã�Œç™ºç”Ÿã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Common.pm:1164 tp/Texinfo/Parser.pm:3193
  #, fuzzy, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%s: `%s' ã�Œè¦‹ã�¤ã�‹ã‚Šã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Common.pm:1637
  msgid "no node to be renamed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1648
  msgid "nodes without a new name at the end of file"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1658 tp/Texinfo/Parser.pm:899
  #, fuzzy, perl-format
  msgid "could not open %s: %s"
  msgstr "%s: --css-file %s ã‚’é–‹ã��ã�“ã�¨ã�Œã�§ã��ã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Common.pm:2178
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:387 tp/Texinfo/Convert/Converter.pm:406
  #, fuzzy, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "å¤‰æ•°ã‚’è¨­å®š: "
  
! #: tp/Texinfo/Convert/Converter.pm:786
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:868 tp/Texinfo/Convert/Converter.pm:901
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:7004
! #: tp/Texinfo/Convert/HTML.pm:7063 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:477 tp/Texinfo/Parser.pm:1996
  #, fuzzy, perl-format
  msgid "error on closing %s: %s"
  msgstr "%(service)s on %(device)s"
  
! #: tp/Texinfo/Convert/Converter.pm:979
  #, fuzzy, perl-format
  msgid "could not create directories `%s' or `%s': %s"
  msgstr "ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª `%s' ã�¾ã�Ÿã�¯ `%s'ã‚’ä½œæˆ�ã�§ã��ã�¾ã�›ã‚“: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, fuzzy, perl-format
  msgid "could not create directory `%s': %s"
***************
*** 2192,2293 ****
  msgstr "@image ãƒ•ã‚¡ã‚¤ãƒ« `%s' ã�Œèª­ã‚�ã�¾ã�›ã‚“: %s"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5388
  msgid "no argument specified for @U"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:1683
  #, fuzzy, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
  msgstr "@image ãƒ•ã‚¡ã‚¤ãƒ« `%s' (HTML ç”¨) ã�Œèª­ã‚�ã�¾ã�›ã‚“: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:2371
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4888
  #, fuzzy
  msgid "string not closed in css file"
  msgstr "æ–‡å­—åˆ—ã�®æ¯”è¼ƒã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Convert/HTML.pm:4890
  #, fuzzy
  msgid "--css-include ended in comment"
  msgstr "%s:%d: --css-include ã�Œã‚³ãƒ¡ãƒ³ãƒˆå†…ã�§çµ‚äº†ã�—ã�¦ã�„ã�¾ã�™"
  
! #: tp/Texinfo/Convert/HTML.pm:4892
  msgid "@import not finished in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4918
  #, fuzzy, perl-format
  msgid "CSS file %s not found"
  msgstr "css ãƒ•ã‚¡ã‚¤ãƒ« %s ã�Œè¦‹ã�¤ã�‹ã‚Šã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Convert/HTML.pm:4924
  #, fuzzy, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "%s: --css-file %s ã‚’é–‹ã��ã�“ã�¨ã�Œã�§ã��ã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Convert/HTML.pm:4934
  #, fuzzy, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã‚¯ãƒ­ãƒ¼ã‚ºã‚¨ãƒ©ãƒ¼"
  
! #: tp/Texinfo/Convert/HTML.pm:5801 tp/Texinfo/Convert/HTML.pm:5805
  #, fuzzy, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "`%s' ã�«å¯¾ã�™ã‚‹é …ç›®ã�Œè¦‹ã�¤ã�‹ã‚Šã�¾ã�›ã‚“\n"
  
! #: tp/Texinfo/Convert/HTML.pm:6499
  #, fuzzy, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "å‡ºåŠ›ãƒ•ã‚¡ã‚¤ãƒ« `%s' ã‚’é–‰ã�˜ã‚‹éš›ã�«ã‚¨ãƒ©ãƒ¼ã�Œç™ºç”Ÿã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Convert/HTML.pm:6523
  #, fuzzy, perl-format
  msgid "error on closing TOC frame file %s: %s"
  msgstr "å‡ºåŠ›ãƒ•ã‚¡ã‚¤ãƒ« `%s' ã‚’é–‰ã�˜ã‚‹éš›ã�«ã‚¨ãƒ©ãƒ¼ã�Œç™ºç”Ÿã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Convert/HTML.pm:6638
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6839
  msgid "must specify a title with a title command or @top"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7048
  #, fuzzy, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr "å‡ºåŠ›ãƒ•ã‚¡ã‚¤ãƒ« `%s' ã‚’é–‰ã�˜ã‚‹éš›ã�«ã‚¨ãƒ©ãƒ¼ã�Œç™ºç”Ÿã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Convert/HTML.pm:7073
  #, fuzzy, perl-format
  msgid "old name for `%s' is a node of the document"
  msgstr "ã�“ã�®ãƒ‰ã‚­ãƒ¥ãƒ¡ãƒ³ãƒˆã�§ã�¯ã€�ã�“ã�®ãƒŽãƒ¼ãƒ‰ã�® `å‰�' ã‚„ `ä¸Š' ã�¯ã�‚ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: tp/Texinfo/Convert/HTML.pm:7079
  #, fuzzy, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "å�‚ç…§ã�•ã‚Œã�¦ã�„ã�ªã�„ãƒŽãƒ¼ãƒ‰ `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:7093
  #, perl-format
  msgid "target node (new name for `%s') not in document: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7125
  #, fuzzy, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
  msgstr "å‡ºåŠ›ãƒ•ã‚¡ã‚¤ãƒ« `%s' ã‚’é–‰ã�˜ã‚‹éš›ã�«ã‚¨ãƒ©ãƒ¼ã�Œç™ºç”Ÿã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Convert/HTML.pm:7163
  #, fuzzy
  msgid "empty node name"
  msgstr "èª�è­˜ã�§ã��ã�ªã�„ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³å�� `%s' ã�§ã�™"
  
! #: tp/Texinfo/Convert/HTML.pm:7165 tp/Texinfo/Parser.pm:3697
  #, perl-format
  msgid "syntax for an external node used for `%s'"
--- 2170,2291 ----
  msgstr "@image ãƒ•ã‚¡ã‚¤ãƒ« `%s' ã�Œèª­ã‚�ã�¾ã�›ã‚“: %s"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5225
  msgid "no argument specified for @U"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:1715
  #, fuzzy, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
  msgstr "@image ãƒ•ã‚¡ã‚¤ãƒ« `%s' (HTML ç”¨) ã�Œèª­ã‚�ã�¾ã�›ã‚“: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:2399
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4629
! #, fuzzy, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr "ãƒ•ã‚¡ã‚¤ãƒ« `%s' ã‚’å‰Šé™¤ã�§ã��ã�¾ã�›ã‚“: %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4657
! #, fuzzy
! msgid "missing type"
! msgstr "è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã�®æ¬ è�½ã€‚"
! 
! #: tp/Texinfo/Convert/HTML.pm:4660
! #, fuzzy, perl-format
! msgid "unrecognized type: %s"
! msgstr "èª�è­˜ã�§ã��ã�ªã�„åž‹ã�§ã�™: %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4677
! #, fuzzy, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr "ãƒ•ã‚¡ã‚¤ãƒ« `%s' ã‚’å‰Šé™¤ã�§ã��ã�¾ã�›ã‚“: %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4962
  #, fuzzy
  msgid "string not closed in css file"
  msgstr "æ–‡å­—åˆ—ã�®æ¯”è¼ƒã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Convert/HTML.pm:4964
  #, fuzzy
  msgid "--css-include ended in comment"
  msgstr "%s:%d: --css-include ã�Œã‚³ãƒ¡ãƒ³ãƒˆå†…ã�§çµ‚äº†ã�—ã�¦ã�„ã�¾ã�™"
  
! #: tp/Texinfo/Convert/HTML.pm:4966
  msgid "@import not finished in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4992
  #, fuzzy, perl-format
  msgid "CSS file %s not found"
  msgstr "css ãƒ•ã‚¡ã‚¤ãƒ« %s ã�Œè¦‹ã�¤ã�‹ã‚Šã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Convert/HTML.pm:4998
  #, fuzzy, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "%s: --css-file %s ã‚’é–‹ã��ã�“ã�¨ã�Œã�§ã��ã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Convert/HTML.pm:5008
  #, fuzzy, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã‚¯ãƒ­ãƒ¼ã‚ºã‚¨ãƒ©ãƒ¼"
  
! #: tp/Texinfo/Convert/HTML.pm:5870 tp/Texinfo/Convert/HTML.pm:5874
  #, fuzzy, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "`%s' ã�«å¯¾ã�™ã‚‹é …ç›®ã�Œè¦‹ã�¤ã�‹ã‚Šã�¾ã�›ã‚“\n"
  
! #: tp/Texinfo/Convert/HTML.pm:6568
  #, fuzzy, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "å‡ºåŠ›ãƒ•ã‚¡ã‚¤ãƒ« `%s' ã‚’é–‰ã�˜ã‚‹éš›ã�«ã‚¨ãƒ©ãƒ¼ã�Œç™ºç”Ÿã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Convert/HTML.pm:6592
  #, fuzzy, perl-format
  msgid "error on closing TOC frame file %s: %s"
  msgstr "å‡ºåŠ›ãƒ•ã‚¡ã‚¤ãƒ« `%s' ã‚’é–‰ã�˜ã‚‹éš›ã�«ã‚¨ãƒ©ãƒ¼ã�Œç™ºç”Ÿã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Convert/HTML.pm:6707
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6912
  msgid "must specify a title with a title command or @top"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7122
  #, fuzzy, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr "å‡ºåŠ›ãƒ•ã‚¡ã‚¤ãƒ« `%s' ã‚’é–‰ã�˜ã‚‹éš›ã�«ã‚¨ãƒ©ãƒ¼ã�Œç™ºç”Ÿã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Convert/HTML.pm:7147
  #, fuzzy, perl-format
  msgid "old name for `%s' is a node of the document"
  msgstr "ã�“ã�®ãƒ‰ã‚­ãƒ¥ãƒ¡ãƒ³ãƒˆã�§ã�¯ã€�ã�“ã�®ãƒŽãƒ¼ãƒ‰ã�® `å‰�' ã‚„ `ä¸Š' ã�¯ã�‚ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: tp/Texinfo/Convert/HTML.pm:7153
  #, fuzzy, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "å�‚ç…§ã�•ã‚Œã�¦ã�„ã�ªã�„ãƒŽãƒ¼ãƒ‰ `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:7167
  #, perl-format
  msgid "target node (new name for `%s') not in document: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7199
  #, fuzzy, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
  msgstr "å‡ºåŠ›ãƒ•ã‚¡ã‚¤ãƒ« `%s' ã‚’é–‰ã�˜ã‚‹éš›ã�«ã‚¨ãƒ©ãƒ¼ã�Œç™ºç”Ÿã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Convert/HTML.pm:7237
  #, fuzzy
  msgid "empty node name"
  msgstr "èª�è­˜ã�§ã��ã�ªã�„ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³å�� `%s' ã�§ã�™"
  
! #: tp/Texinfo/Convert/HTML.pm:7239 tp/Texinfo/Parser.pm:3542
  #, perl-format
  msgid "syntax for an external node used for `%s'"
***************
*** 2324,2353 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1334
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1381 tp/Texinfo/Parser.pm:2722
  #, fuzzy, perl-format
  msgid "entry for index `%s' outside of any node"
  msgstr "`%s' è¦‹å‡ºã�—é …ç›®ã�Œã�‚ã‚‰ã‚†ã‚‹ãƒŽãƒ¼ãƒ‰ã�®å¤–å�´ã�«ã�‚ã‚Šã�¾ã�™"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1495
  #, fuzzy, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr "å‡ºåŠ›ãƒ•ã‚¡ã‚¤ãƒ« `%s' ã‚’é–‰ã�˜ã‚‹éš›ã�«ã‚¨ãƒ©ãƒ¼ã�Œç™ºç”Ÿã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1500
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "@image ãƒ•ã‚¡ã‚¤ãƒ« `%s' ã�Œèª­ã‚�ã�¾ã�›ã‚“: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1523
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1931
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
--- 2322,2351 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1335
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1382 tp/Texinfo/Parser.pm:2568
  #, fuzzy, perl-format
  msgid "entry for index `%s' outside of any node"
  msgstr "`%s' è¦‹å‡ºã�—é …ç›®ã�Œã�‚ã‚‰ã‚†ã‚‹ãƒŽãƒ¼ãƒ‰ã�®å¤–å�´ã�«ã�‚ã‚Šã�¾ã�™"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1496
  #, fuzzy, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr "å‡ºåŠ›ãƒ•ã‚¡ã‚¤ãƒ« `%s' ã‚’é–‰ã�˜ã‚‹éš›ã�«ã‚¨ãƒ©ãƒ¼ã�Œç™ºç”Ÿã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1501
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "@image ãƒ•ã‚¡ã‚¤ãƒ« `%s' ã�Œèª­ã‚�ã�¾ã�›ã‚“: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1524
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1932
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
***************
*** 2357,2678 ****
  "ã�„"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2161
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2193
  #, fuzzy, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "%s: --css-file %s ã‚’é–‹ã��ã�“ã�¨ã�Œã�§ã��ã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2226
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2272
  #, fuzzy, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "`.' ã�¾ã�Ÿã�¯ `,' ã�«ã�¯ `%2$c' ã�§ã�¯ç„¡ã�� @%1$s ã�Œç¶šã�‹ã�ªã�‘ã‚Œã�°ã�„ã�‘ã�¾ã�›ã‚“ã€‚"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2275
  #, fuzzy
  msgid "`.' or `,' must follow @xref"
  msgstr "`.' ã�¾ã�Ÿã�¯ `,' ã�«ã�¯ `%2$c' ã�§ã�¯ç„¡ã�� @%1$s ã�Œç¶šã�‹ã�ªã�‘ã‚Œã�°ã�„ã�‘ã�¾ã�›ã‚“ã€‚"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3118
  #, fuzzy, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr "ãƒŽãƒ¼ãƒ‰ `%s' ã�«ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã�Œã�‚ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3129
  msgid "menu entry node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3145
  #, fuzzy
  msgid "menu entry name should not contain `:'"
  msgstr "ãƒŽãƒ¼ãƒ‰ `%s' ã�«ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã�Œã�‚ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: tp/Texinfo/Parser.pm:910
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1160 tp/Texinfo/Structuring.pm:594
  #, perl-format
  msgid "multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1194
  #, fuzzy, perl-format
! msgid "bad syntax for @%s argument: %s"
  msgstr "å¼•æ•° `%3$s' ã�«å¯¾ã�—ã�¦ %1$s%2$s ã�Œç„¡åŠ¹ã�§ã�™"
  
! #: tp/Texinfo/Parser.pm:1210
  #, fuzzy, perl-format
! msgid "bad or empty @%s formal argument: %s"
  msgstr "å¼•æ•° `%3$s' ã�«å¯¾ã�—ã�¦ %1$s%2$s ã�Œç„¡åŠ¹ã�§ã�™"
  
! #: tp/Texinfo/Parser.pm:1219 tp/Texinfo/Parser.pm:4856
! #: tp/Texinfo/Parser.pm:4882 tp/Texinfo/Parser.pm:5671
! #: tp/Texinfo/Parser.pm:5687 tp/Texinfo/Parser.pm:5702
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s ã�«ã�¯å��å‰�ã�Œå¿…è¦�ã�§ã�™"
  
! #: tp/Texinfo/Parser.pm:1223 tp/Texinfo/Parser.pm:4859
! #: tp/Texinfo/Parser.pm:4885 tp/Texinfo/Parser.pm:5674
! #: tp/Texinfo/Parser.pm:5690 tp/Texinfo/Parser.pm:5705
  #, fuzzy, perl-format
  msgid "bad name for @%s"
  msgstr "ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ãƒ¢ãƒ¼ãƒ‰å��ã�Œã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:1341
  #, fuzzy, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr "ã‚³ãƒ¡ãƒ³ãƒˆå†…ã�§ãƒ•ã‚¡ã‚¤ãƒ«çµ‚ç«¯ (EOF) ã�«é�”ã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Parser.pm:1345
  #, fuzzy, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "ã‚³ãƒ¡ãƒ³ãƒˆå†…ã�§ãƒ•ã‚¡ã‚¤ãƒ«çµ‚ç«¯ (EOF) ã�«é�”ã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Parser.pm:1350
! #, perl-format
! msgid "%c%s missing close brace"
  msgstr "é–‰ã�˜ã‚‹ä¸­æ‹¬å¼§ã�®ã�ªã�„ %c%s"
  
! #: tp/Texinfo/Parser.pm:1354
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1476
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1544
  msgid "@itemx must follow @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1712
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1743
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "`@end' ã�«ã�¯ `%s' ã�Œå¿…è¦�ã�§ã�™ã�Œã€�`%s' ã�Œè¦‹ã�¤ã�‹ã‚Šã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Parser.pm:1746
  #, fuzzy, perl-format
  msgid "@%s seen before @end %s"
  msgstr "ã‚³ãƒ¡ãƒ³ãƒˆå†…ã�§ãƒ•ã‚¡ã‚¤ãƒ«çµ‚ç«¯ (EOF) ã�«é�”ã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Parser.pm:1750
  #, fuzzy, perl-format
  msgid "no matching `%cend %s'"
  msgstr "`%cend %s' ã�¨ã�®å¯¾å¿œã�Œè¦‹ã�¤ã�‹ã‚Šã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:1776 tp/Texinfo/Parser.pm:5204
! #: tp/Texinfo/Parser.pm:5470
  #, fuzzy, perl-format
  msgid "misplaced %c"
  msgstr "é–“é�•ã�£ã�Ÿä½�ç½®ã�« %c ã�Œã�‚ã‚Šã�¾ã�™"
  
! #: tp/Texinfo/Parser.pm:1874 tp/Texinfo/Parser.pm:3312
  #, fuzzy, perl-format
  msgid "unmatched `%c%s'"
  msgstr "`%c%s' ã�¨ã�®å¯¾å¿œã�Œè¦‹ã�¤ã�‹ã‚Šã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:2110
  #, fuzzy, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "ãƒžã‚¯ãƒ­ `%s' å‘¼ã�³å‡ºã�—ã�®å¼•æ•°ã�Œå¤šã�™ã�Žã�¾ã�™"
  
! #: tp/Texinfo/Parser.pm:2132
  #, fuzzy, perl-format
! msgid "@%s missing close brace"
  msgstr "è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã�®æ¬ è�½ã€‚"
  
! #: tp/Texinfo/Parser.pm:2140
  #, fuzzy, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr "ãƒžã‚¯ãƒ­ `%s' ã�¯å¼•æ•°ã�ªã�—ã�§å®£è¨€ã�•ã‚Œã€�å¼•æ•°ã‚’ã�¤ã�‘ã�¦å‘¼ã�³å‡ºã�•ã‚Œã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Parser.pm:2175
  #, fuzzy, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
  msgstr "å¾Œã‚�ã�« `%s' ã�Œç¶šã��ãƒžã‚¯ãƒ­å±•é–‹å†…ã�§ãƒ‘ãƒ©ãƒ¡ãƒ¼ã‚¿å��ã�§ã�¯ã�ªã�� \\ ã�Œã�‚ã‚Šã�¾ã�™"
  
! #: tp/Texinfo/Parser.pm:2650
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s `%s' ã�¯ä»¥å‰�ã�«å®šç¾©ã�•ã‚Œã�¦ã�„ã�¾ã�™"
  
! #: tp/Texinfo/Parser.pm:2655
  #, fuzzy, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "ã�“ã�“ã�¯ã€�`%s' ã�®å‰�ã�®å®šç¾©ã�§ã�™"
  
! #: tp/Texinfo/Parser.pm:3016
  #, fuzzy, perl-format
  msgid "missing name for @%s"
  msgstr "ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ãƒ¢ãƒ¼ãƒ‰å��ã�Œã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:3021
  #, fuzzy, perl-format
  msgid "missing category for @%s"
  msgstr "è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã�®æ¬ è�½ã€‚"
  
! #: tp/Texinfo/Parser.pm:3073
  #, fuzzy, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "@%s ã�«å¯¾ã�™ã‚‹èª¤ã�£ã�Ÿå¼•æ•°ã�§ã�™: %s"
  
! #: tp/Texinfo/Parser.pm:3089
  #, fuzzy
  msgid "empty multitable"
  msgstr "%s: ç©ºã�®ãƒ•ã‚¡ã‚¤ãƒ«"
  
! #: tp/Texinfo/Parser.pm:3145 tp/Texinfo/Parser.pm:5784
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s"
  msgstr "%s: --auto/-a ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã�«å¯¾ã�—ã�¦ä¸�å½“ã�ªå¼•æ•°\n"
  
! #: tp/Texinfo/Parser.pm:3151 tp/Texinfo/Parser.pm:5806
! #: tp/Texinfo/Parser.pm:5818
  #, fuzzy, perl-format
  msgid "bad argument to @%s"
  msgstr "@%s ã�«å¯¾ã�™ã‚‹èª¤ã�£ã�Ÿå¼•æ•°ã�§ã�™"
  
! #: tp/Texinfo/Parser.pm:3162
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s ã�«ã�¯å¼•æ•°ã�Œå¿…è¦�ã�§ã�™: %citem ã‚’æ•´å½¢ã�™ã‚‹ã�Ÿã‚�"
  
! #: tp/Texinfo/Parser.pm:3167
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3202
  #, fuzzy, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "%s: ã‚ªãƒ—ã‚·ãƒ§ãƒ³ `--%s' ã�¯å¼•æ•°ã�Œä¸�è¦�ã�§ã�™\n"
  
! #: tp/Texinfo/Parser.pm:3290 tp/Texinfo/Parser.pm:3429
! #: tp/Texinfo/Parser.pm:5777
  #, fuzzy, perl-format
  msgid "@%s missing argument"
  msgstr "è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã�®æ¬ è�½ã€‚"
  
! #: tp/Texinfo/Parser.pm:3302
  #, fuzzy, perl-format
  msgid "unknown @end %s"
  msgstr "çµ‚äº†ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹"
  
! #: tp/Texinfo/Parser.pm:3324 tp/Texinfo/Parser.pm:3943
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "%s: --auto/-a ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã�«å¯¾ã�—ã�¦ä¸�å½“ã�ªå¼•æ•°\n"
  
! #: tp/Texinfo/Parser.pm:3329 tp/Texinfo/Parser.pm:5861
! #: tp/Texinfo/Parser.pm:5906 tp/Texinfo/Parser.pm:5935
! #: tp/Texinfo/Parser.pm:5976 tp/Texinfo/Parser.pm:6055
  #, fuzzy, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "@%s ã�«å¯¾ã�™ã‚‹èª¤ã�£ã�Ÿå¼•æ•°ã�§ã�™: %s"
  
! #: tp/Texinfo/Parser.pm:3348
  #, fuzzy, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%s: %s ã‚’é–‹ã��ã�“ã�¨ã�Œã�§ã��ã�¾ã�›ã‚“: %s"
  
! #: tp/Texinfo/Parser.pm:3360
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3369
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "èª�è­˜ã�§ã��ã�ªã�„ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰å�� `%s' ã�§ã�™"
  
! #: tp/Texinfo/Parser.pm:3516
  #, perl-format
  msgid "@%s after the first element"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3523
  #, fuzzy, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "`@titlepage' ç’°å¢ƒã�®å¤–å�´ã�§ã�¯ @%s ã�¯æ„�å‘³ã�Œã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:3563
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3575
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3677
  #, fuzzy, perl-format
  msgid "empty argument in @%s"
  msgstr "ã‚³ãƒ¡ãƒ³ãƒˆå†…ã�§ãƒ•ã‚¡ã‚¤ãƒ«çµ‚ç«¯ (EOF) ã�«é�”ã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Parser.pm:3681
  #, fuzzy, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "ãƒŽãƒ¼ãƒ‰ `%s' ã�«ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã�Œã�‚ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: tp/Texinfo/Parser.pm:3724
  #, fuzzy, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "ãƒŽãƒ¼ãƒ‰ `%s' ã�«ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã�Œã�‚ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: tp/Texinfo/Parser.pm:3732
  #, fuzzy
  msgid "empty node name in menu entry"
  msgstr "èª�è­˜ã�§ã��ã�ªã�„ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³å�� `%s' ã�§ã�™"
  
! #: tp/Texinfo/Parser.pm:3805
  #, fuzzy, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "%s: --css-file %s ã‚’é–‹ã��ã�“ã�¨ã�Œã�§ã��ã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:3937
! #, perl-format
! msgid "@end %s should only appear at a line beginning"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:3960
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "ãƒžã‚¯ãƒ­ `%s' ã�¯ä»¥å‰�ã�«å®šç¾©ã�•ã‚Œã�¦ã�„ã�¾ã�™"
  
! #: tp/Texinfo/Parser.pm:3963
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "ã�“ã�“ã�¯ã€�`%s' ã�®å‰�ã�®å®šç¾©ã�§ã�™"
  
! #: tp/Texinfo/Parser.pm:3968
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4017
  #, fuzzy, perl-format
  msgid "@%s without associated character"
  msgstr "ã‚¨ã‚¹ã‚±ãƒ¼ãƒ—æ–‡å­—å†…ã�§ãƒ•ã‚¡ã‚¤ãƒ«çµ‚ç«¯ (EOF) ã�«é�”ã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Parser.pm:4087
  #, perl-format
  msgid ""
--- 2355,2677 ----
  "ã�„"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2162
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2194
  #, fuzzy, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "%s: --css-file %s ã‚’é–‹ã��ã�“ã�¨ã�Œã�§ã��ã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2227
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2273
  #, fuzzy, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "`.' ã�¾ã�Ÿã�¯ `,' ã�«ã�¯ `%2$c' ã�§ã�¯ç„¡ã�� @%1$s ã�Œç¶šã�‹ã�ªã�‘ã‚Œã�°ã�„ã�‘ã�¾ã�›ã‚“ã€‚"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2276
  #, fuzzy
  msgid "`.' or `,' must follow @xref"
  msgstr "`.' ã�¾ã�Ÿã�¯ `,' ã�«ã�¯ `%2$c' ã�§ã�¯ç„¡ã�� @%1$s ã�Œç¶šã�‹ã�ªã�‘ã‚Œã�°ã�„ã�‘ã�¾ã�›ã‚“ã€‚"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3086
  #, fuzzy, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr "ãƒŽãƒ¼ãƒ‰ `%s' ã�«ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã�Œã�‚ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3097
  msgid "menu entry node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3113
  #, fuzzy
  msgid "menu entry name should not contain `:'"
  msgstr "ãƒŽãƒ¼ãƒ‰ `%s' ã�«ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã�Œã�‚ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: tp/Texinfo/Parser.pm:883
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1125 tp/Texinfo/Structuring.pm:595
  #, perl-format
  msgid "multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1166
  #, fuzzy, perl-format
! msgid "bad or empty @%s formal argument: %s"
  msgstr "å¼•æ•° `%3$s' ã�«å¯¾ã�—ã�¦ %1$s%2$s ã�Œç„¡åŠ¹ã�§ã�™"
  
! #: tp/Texinfo/Parser.pm:1176
  #, fuzzy, perl-format
! msgid "bad syntax for @%s argument: %s"
  msgstr "å¼•æ•° `%3$s' ã�«å¯¾ã�—ã�¦ %1$s%2$s ã�Œç„¡åŠ¹ã�§ã�™"
  
! #: tp/Texinfo/Parser.pm:1183 tp/Texinfo/Parser.pm:4707
! #: tp/Texinfo/Parser.pm:4733 tp/Texinfo/Parser.pm:5565
! #: tp/Texinfo/Parser.pm:5578 tp/Texinfo/Parser.pm:5592
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s ã�«ã�¯å��å‰�ã�Œå¿…è¦�ã�§ã�™"
  
! #: tp/Texinfo/Parser.pm:1187 tp/Texinfo/Parser.pm:4710
! #: tp/Texinfo/Parser.pm:4736 tp/Texinfo/Parser.pm:5568
! #: tp/Texinfo/Parser.pm:5581 tp/Texinfo/Parser.pm:5595
  #, fuzzy, perl-format
  msgid "bad name for @%s"
  msgstr "ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ãƒ¢ãƒ¼ãƒ‰å��ã�Œã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:1305
  #, fuzzy, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr "ã‚³ãƒ¡ãƒ³ãƒˆå†…ã�§ãƒ•ã‚¡ã‚¤ãƒ«çµ‚ç«¯ (EOF) ã�«é�”ã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Parser.pm:1309
  #, fuzzy, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "ã‚³ãƒ¡ãƒ³ãƒˆå†…ã�§ãƒ•ã‚¡ã‚¤ãƒ«çµ‚ç«¯ (EOF) ã�«é�”ã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Parser.pm:1314
! #, fuzzy, perl-format
! msgid "%c%s missing closing brace"
  msgstr "é–‰ã�˜ã‚‹ä¸­æ‹¬å¼§ã�®ã�ªã�„ %c%s"
  
! #: tp/Texinfo/Parser.pm:1318
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1440
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1508
  msgid "@itemx must follow @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1676
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1707
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "`@end' ã�«ã�¯ `%s' ã�Œå¿…è¦�ã�§ã�™ã�Œã€�`%s' ã�Œè¦‹ã�¤ã�‹ã‚Šã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Parser.pm:1710
  #, fuzzy, perl-format
  msgid "@%s seen before @end %s"
  msgstr "ã‚³ãƒ¡ãƒ³ãƒˆå†…ã�§ãƒ•ã‚¡ã‚¤ãƒ«çµ‚ç«¯ (EOF) ã�«é�”ã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Parser.pm:1714
  #, fuzzy, perl-format
  msgid "no matching `%cend %s'"
  msgstr "`%cend %s' ã�¨ã�®å¯¾å¿œã�Œè¦‹ã�¤ã�‹ã‚Šã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:1738 tp/Texinfo/Parser.pm:5070
! #: tp/Texinfo/Parser.pm:5308
  #, fuzzy, perl-format
  msgid "misplaced %c"
  msgstr "é–“é�•ã�£ã�Ÿä½�ç½®ã�« %c ã�Œã�‚ã‚Šã�¾ã�™"
  
! #: tp/Texinfo/Parser.pm:1835 tp/Texinfo/Parser.pm:3148
  #, fuzzy, perl-format
  msgid "unmatched `%c%s'"
  msgstr "`%c%s' ã�¨ã�®å¯¾å¿œã�Œè¦‹ã�¤ã�‹ã‚Šã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:2072
  #, fuzzy, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "ãƒžã‚¯ãƒ­ `%s' å‘¼ã�³å‡ºã�—ã�®å¼•æ•°ã�Œå¤šã�™ã�Žã�¾ã�™"
  
! #: tp/Texinfo/Parser.pm:2094
  #, fuzzy, perl-format
! msgid "@%s missing closing brace"
  msgstr "è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã�®æ¬ è�½ã€‚"
  
! #: tp/Texinfo/Parser.pm:2102
  #, fuzzy, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr "ãƒžã‚¯ãƒ­ `%s' ã�¯å¼•æ•°ã�ªã�—ã�§å®£è¨€ã�•ã‚Œã€�å¼•æ•°ã‚’ã�¤ã�‘ã�¦å‘¼ã�³å‡ºã�•ã‚Œã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Parser.pm:2138
  #, fuzzy, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
  msgstr "å¾Œã‚�ã�« `%s' ã�Œç¶šã��ãƒžã‚¯ãƒ­å±•é–‹å†…ã�§ãƒ‘ãƒ©ãƒ¡ãƒ¼ã‚¿å��ã�§ã�¯ã�ªã�� \\ ã�Œã�‚ã‚Šã�¾ã�™"
  
! #: tp/Texinfo/Parser.pm:2501
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s `%s' ã�¯ä»¥å‰�ã�«å®šç¾©ã�•ã‚Œã�¦ã�„ã�¾ã�™"
  
! #: tp/Texinfo/Parser.pm:2506
  #, fuzzy, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "ã�“ã�“ã�¯ã€�`%s' ã�®å‰�ã�®å®šç¾©ã�§ã�™"
  
! #: tp/Texinfo/Parser.pm:2850
  #, fuzzy, perl-format
  msgid "missing name for @%s"
  msgstr "ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ãƒ¢ãƒ¼ãƒ‰å��ã�Œã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:2855
  #, fuzzy, perl-format
  msgid "missing category for @%s"
  msgstr "è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã�®æ¬ è�½ã€‚"
  
! #: tp/Texinfo/Parser.pm:2890
  #, fuzzy, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "@%s ã�«å¯¾ã�™ã‚‹èª¤ã�£ã�Ÿå¼•æ•°ã�§ã�™: %s"
  
! #: tp/Texinfo/Parser.pm:2905
  #, fuzzy
  msgid "empty multitable"
  msgstr "%s: ç©ºã�®ãƒ•ã‚¡ã‚¤ãƒ«"
  
! #: tp/Texinfo/Parser.pm:2959 tp/Texinfo/Parser.pm:5673
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s"
  msgstr "%s: --auto/-a ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã�«å¯¾ã�—ã�¦ä¸�å½“ã�ªå¼•æ•°\n"
  
! #: tp/Texinfo/Parser.pm:2965 tp/Texinfo/Parser.pm:5694
! #: tp/Texinfo/Parser.pm:5705
  #, fuzzy, perl-format
  msgid "bad argument to @%s"
  msgstr "@%s ã�«å¯¾ã�™ã‚‹èª¤ã�£ã�Ÿå¼•æ•°ã�§ã�™"
  
! #: tp/Texinfo/Parser.pm:2976
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s ã�«ã�¯å¼•æ•°ã�Œå¿…è¦�ã�§ã�™: %citem ã‚’æ•´å½¢ã�™ã‚‹ã�Ÿã‚�"
  
! #: tp/Texinfo/Parser.pm:2981
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3016
  #, fuzzy, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "%s: ã‚ªãƒ—ã‚·ãƒ§ãƒ³ `--%s' ã�¯å¼•æ•°ã�Œä¸�è¦�ã�§ã�™\n"
  
! #: tp/Texinfo/Parser.pm:3124 tp/Texinfo/Parser.pm:3277
! #: tp/Texinfo/Parser.pm:5666
  #, fuzzy, perl-format
  msgid "@%s missing argument"
  msgstr "è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã�®æ¬ è�½ã€‚"
  
! #: tp/Texinfo/Parser.pm:3138
  #, fuzzy, perl-format
  msgid "unknown @end %s"
  msgstr "çµ‚äº†ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹"
  
! #: tp/Texinfo/Parser.pm:3161 tp/Texinfo/Parser.pm:3788
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "%s: --auto/-a ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã�«å¯¾ã�—ã�¦ä¸�å½“ã�ªå¼•æ•°\n"
  
! #: tp/Texinfo/Parser.pm:3167 tp/Texinfo/Parser.pm:3245
! #: tp/Texinfo/Parser.pm:5755 tp/Texinfo/Parser.pm:5798
! #: tp/Texinfo/Parser.pm:5827 tp/Texinfo/Parser.pm:5868
! #: tp/Texinfo/Parser.pm:5946
  #, fuzzy, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "@%s ã�«å¯¾ã�™ã‚‹èª¤ã�£ã�Ÿå¼•æ•°ã�§ã�™: %s"
  
! #: tp/Texinfo/Parser.pm:3188
  #, fuzzy, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%s: %s ã‚’é–‹ã��ã�“ã�¨ã�Œã�§ã��ã�¾ã�›ã‚“: %s"
  
! #: tp/Texinfo/Parser.pm:3200
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3208
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "èª�è­˜ã�§ã��ã�ªã�„ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰å�� `%s' ã�§ã�™"
  
! #: tp/Texinfo/Parser.pm:3364
  #, perl-format
  msgid "@%s after the first element"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3371
  #, fuzzy, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "`@titlepage' ç’°å¢ƒã�®å¤–å�´ã�§ã�¯ @%s ã�¯æ„�å‘³ã�Œã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:3408
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3420
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3522
  #, fuzzy, perl-format
  msgid "empty argument in @%s"
  msgstr "ã‚³ãƒ¡ãƒ³ãƒˆå†…ã�§ãƒ•ã‚¡ã‚¤ãƒ«çµ‚ç«¯ (EOF) ã�«é�”ã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Parser.pm:3526
  #, fuzzy, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "ãƒŽãƒ¼ãƒ‰ `%s' ã�«ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã�Œã�‚ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: tp/Texinfo/Parser.pm:3569
  #, fuzzy, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "ãƒŽãƒ¼ãƒ‰ `%s' ã�«ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã�Œã�‚ã‚Šã�¾ã�›ã‚“ã€‚"
  
! #: tp/Texinfo/Parser.pm:3577
  #, fuzzy
  msgid "empty node name in menu entry"
  msgstr "èª�è­˜ã�§ã��ã�ªã�„ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³å�� `%s' ã�§ã�™"
  
! #: tp/Texinfo/Parser.pm:3650
  #, fuzzy, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "%s: --css-file %s ã‚’é–‹ã��ã�“ã�¨ã�Œã�§ã��ã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:3782
! #, fuzzy, perl-format
! msgid "@end %s should only appear at the beginning of a line"
! msgstr "è¡Œé ­ã�¾ã�§ã‚’åˆ‡ã‚Šå�–ã‚‹"
  
! #: tp/Texinfo/Parser.pm:3804
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "ãƒžã‚¯ãƒ­ `%s' ã�¯ä»¥å‰�ã�«å®šç¾©ã�•ã‚Œã�¦ã�„ã�¾ã�™"
  
! #: tp/Texinfo/Parser.pm:3807
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "ã�“ã�“ã�¯ã€�`%s' ã�®å‰�ã�®å®šç¾©ã�§ã�™"
  
! #: tp/Texinfo/Parser.pm:3812
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3879
  #, fuzzy, perl-format
  msgid "@%s without associated character"
  msgstr "ã‚¨ã‚¹ã‚±ãƒ¼ãƒ—æ–‡å­—å†…ã�§ãƒ•ã‚¡ã‚¤ãƒ«çµ‚ç«¯ (EOF) ã�«é�”ã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Parser.pm:3949
  #, perl-format
  msgid ""
***************
*** 2680,2684 ****
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4111
  #, fuzzy, perl-format
  msgid ""
--- 2679,2683 ----
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3974
  #, fuzzy, perl-format
  msgid ""
***************
*** 2689,2985 ****
  "ã�¾ã�™; ç�¾åœ¨ã�¯ %d)"
  
! #: tp/Texinfo/Parser.pm:4120
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4176
  #, fuzzy, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr "%s: ã‚ªãƒ—ã‚·ãƒ§ãƒ³ `--%s' ã�¯å¼•æ•°ã�Œä¸�è¦�ã�§ã�™\n"
  
! #: tp/Texinfo/Parser.pm:4182
  #, fuzzy, perl-format
  msgid "use braces to give a command as an argument to @%s"
  msgstr "@%s ã�¸ã�®å¼•æ•°ã�¨ã�—ã�¦ã‚³ãƒžãƒ³ãƒ‰ã‚’ä¸Žã�ˆã‚‹ã�«ã�¯ã€�ãƒ–ãƒ¬ãƒ¼ã‚¹ã‚’ä½¿ã�„ã�¾ã�—ã‚‡ã�†"
  
! #: tp/Texinfo/Parser.pm:4195 tp/Texinfo/Parser.pm:5325
  #, perl-format
  msgid "%c%s expects `i' or `j' as argument, not `%s'"
  msgstr "%c%s ã�¯ `%s' ã�§ã�¯ã�ªã��ã€�`i' ã�‹ `j' ã‚’å¼•æ•°ã�¨ã�—ã�¦å¿…è¦�ã�¨ã�—ã�¾ã�™"
  
! #: tp/Texinfo/Parser.pm:4207
  #, fuzzy, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr "%s: ã‚ªãƒ—ã‚·ãƒ§ãƒ³ `--%s' ã�¯å¼•æ•°ã�Œä¸�è¦�ã�§ã�™\n"
  
! #: tp/Texinfo/Parser.pm:4218
  #, fuzzy, perl-format
  msgid "@%s expected braces"
  msgstr "%c%s ã�«ã�¯ä¸­æ‹¬å¼§ã�ŒäºˆæœŸã�•ã‚Œã�¾ã�™"
  
! #: tp/Texinfo/Parser.pm:4383
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "å®šç¾©ã�•ã‚Œã�¦ã�„ã�ªã�„ãƒ•ãƒ©ã‚°: %s"
  
! #: tp/Texinfo/Parser.pm:4386
  #, fuzzy
  msgid "bad syntax for @value"
  msgstr "å¼•æ•° `%3$s' ã�«å¯¾ã�—ã�¦ %1$s%2$s ã�Œç„¡åŠ¹ã�§ã�™"
  
! #: tp/Texinfo/Parser.pm:4393
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s ã�¯å»ƒæ­¢äºˆå®š (ã�¾ã�Ÿã�¯å»ƒæ­¢æ¸ˆã�¿) ã�§ã�™ã€‚"
  
! #: tp/Texinfo/Parser.pm:4396
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s ã�¯å»ƒæ­¢äºˆå®š (ã�¾ã�Ÿã�¯å»ƒæ­¢æ¸ˆã�¿) ã�§ã�™; %s"
  
! #: tp/Texinfo/Parser.pm:4405
! #, perl-format
! msgid "@%s should only appear at a line beginning"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:4496
  #, fuzzy, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "`@%2$s' ãƒ–ãƒ­ãƒƒã‚¯ã�®å†…å�´ã�§ã�¯ `@%1$s' ã�¯æ„�å‘³ã�Œã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:4505
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4631 tp/Texinfo/Parser.pm:4648
! #: tp/Texinfo/Parser.pm:4698
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "`@%2$s' ãƒ–ãƒ­ãƒƒã‚¯ã�®å†…å�´ã�§ã�¯ `@%1$s' ã�¯æ„�å‘³ã�Œã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:4658
  #, fuzzy, perl-format
  msgid "@%s in empty multitable"
  msgstr "ã‚³ãƒ¡ãƒ³ãƒˆå†…ã�§ãƒ•ã‚¡ã‚¤ãƒ«çµ‚ç«¯ (EOF) ã�«é�”ã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Parser.pm:4664
  #, fuzzy
  msgid "@tab before @item"
  msgstr "ãƒ�ã‚§ãƒƒã‚¯ãƒ»ãƒ¡ãƒ‹ãƒ¥ãƒ¼é …ç›®"
  
! #: tp/Texinfo/Parser.pm:4667
  #, fuzzy, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "ãƒžãƒ«ãƒ�ãƒ†ãƒ¼ãƒ–ãƒ«é …ç›®å†…ã�®ã‚«ãƒ©ãƒ æ•°ã�Œå¤šã�™ã�Žã�¾ã�™(æœ€å¤§ %d)"
  
! #: tp/Texinfo/Parser.pm:4704
  msgid "ignoring @tab outside of multitable"
  msgstr "ãƒžãƒ«ãƒ�ãƒ†ãƒ¼ãƒ–ãƒ«ã�®å¤–å�´ã�® @tab ã‚’ç„¡è¦–ã�—ã�¾ã�™"
  
! #: tp/Texinfo/Parser.pm:4708
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4745
  #, fuzzy, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "`@%2$s' ã‚’ä½¿ç”¨ã�™ã‚‹ã�Ÿã‚�ã�«ã�¯ `@%1$s' ç’°å¢ƒã�§ã�ªã�‘ã‚Œã�°ã�„ã�‘ã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:4787
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "@%s ã�¯ `@titlepage' ã�Šã‚ˆã�³ `@quotation' ç’°å¢ƒã�®å¤–å�´ã�§ã�¯æ„�å‘³ã�Œã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:4791
  msgid "@dircategory after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4979
  #, fuzzy, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "è„šæ³¨ã�«è„šæ³¨ã‚’å�«ã‚�ã‚‹ã�“ã�¨ã�¯ã�§ã��ã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:4997
  msgid "@direntry after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5005
  #, fuzzy, perl-format
  msgid "@%s seen before first @node"
  msgstr "@menu ã�Œæœ€åˆ�ã�® @node ä»¥å‰�ã�«ç�¾ã‚Œã�¾ã�—ã�Ÿã€‚`Top' ãƒŽãƒ¼ãƒ‰ã‚’ã�¤ã��ã‚Šã�¾ã�™"
  
! #: tp/Texinfo/Parser.pm:5008
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
  msgstr "å¤šåˆ† @top ãƒŽãƒ¼ãƒ‰ã�¯ @ifinfo ã‚ˆã‚Šã�¯ @ifnottex ã�«è¦†ã‚�ã‚Œã‚‹ã�¹ã��ã�§ã�¯ï¼Ÿ"
  
! #: tp/Texinfo/Parser.pm:5070
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5078
  #, fuzzy, perl-format
  msgid "unknown command `%s'"
  msgstr "ä¸�æ˜Žã�ªã‚³ãƒžãƒ³ãƒ‰ `%s'"
  
! #: tp/Texinfo/Parser.pm:5088
  #, fuzzy
  msgid "unexpected @"
  msgstr "äºˆæœŸã�•ã‚Œã�ªã�„ @ ã�§ã�™"
  
! #: tp/Texinfo/Parser.pm:5117
  #, fuzzy, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "`@float' ç’°å¢ƒã�®å¤–å�´ã�§ã�¯ @%s ã�¯æ„�å‘³ã�Œã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:5122
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5130
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5249
  #, fuzzy, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "%s: ã‚ªãƒ—ã‚·ãƒ§ãƒ³ `--%s' ã�¯å¼•æ•°ã�Œä¸�è¦�ã�§ã�™\n"
  
! #: tp/Texinfo/Parser.pm:5273
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5292
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5303
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5316
  msgid "@image missing filename argument"
  msgstr "@image ã�«ãƒ•ã‚¡ã‚¤ãƒ«å��ã�Œä¸Žã�ˆã‚‰ã‚Œã�¦ã�„ã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:5348
  #, fuzzy, perl-format
  msgid "@%s missing first argument"
  msgstr "è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã�®æ¬ è�½ã€‚"
  
! #: tp/Texinfo/Parser.pm:5393
  #, fuzzy, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "@%s ã�«å¯¾ã�™ã‚‹èª¤ã�£ã�Ÿå¼•æ•°ã�§ã�™: %s"
  
! #: tp/Texinfo/Parser.pm:5399
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5412
! #, perl-format
! msgid "argument for @U exceeds size of integer: %s"
! msgstr ""
! 
! #: tp/Texinfo/Parser.pm:5418
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5546
  #, fuzzy
  msgid "superfluous arguments for node"
  msgstr "%2$s ã�«å¯¾ã�™ã‚‹å¼•æ•° %1$s ã�Œæ›–æ˜§ã�§ã�™"
  
! #: tp/Texinfo/Parser.pm:5596
  #, fuzzy, perl-format
  msgid "expected @end %s"
  msgstr "çµ‚äº†ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹"
  
! #: tp/Texinfo/Parser.pm:5718
  #, fuzzy, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "@%s ã�¸ã�®å¼•æ•°ã�¨ã�—ã�¦ã‚³ãƒžãƒ³ãƒ‰ã‚’ä¸Žã�ˆã‚‹ã�«ã�¯ã€�ãƒ–ãƒ¬ãƒ¼ã‚¹ã‚’ä½¿ã�„ã�¾ã�—ã‚‡ã�†"
  
! #: tp/Texinfo/Parser.pm:5728
  #, fuzzy, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "@%s ã�«å¯¾ã�™ã‚‹èª¤ã�£ã�Ÿå¼•æ•°ã�§ã�™: %s"
  
! #: tp/Texinfo/Parser.pm:5801
  #, fuzzy, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "@%s ã�¸ã�®å¼•æ•°ã�¨ã�—ã�¦ã‚³ãƒžãƒ³ãƒ‰ã‚’ä¸Žã�ˆã‚‹ã�«ã�¯ã€�ãƒ–ãƒ¬ãƒ¼ã‚¹ã‚’ä½¿ã�„ã�¾ã�—ã‚‡ã�†"
  
! #: tp/Texinfo/Parser.pm:5823
  #, perl-format
  msgid "empty @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5831
  #, fuzzy, perl-format
  msgid "column fraction not a number: %s"
  msgstr "iconv é–¢æ•°ã�Œä½¿ã�ˆã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:5840
  #, fuzzy, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "%s: %s å¼•æ•°ã�¯ `%s' ã�§ã�¯ã�ªã��ã�¦ã€�æ•°å€¤ã�§ã�ªã�‘ã‚Œã�°ã�ªã‚Šã�¾ã�›ã‚“ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:5849
  #, fuzzy, perl-format
  msgid "reserved index name %s"
  msgstr "èª�è­˜ã�§ã��ã�ªã�„ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³å�� `%s' ã�§ã�™"
  
! #: tp/Texinfo/Parser.pm:5868
  #, fuzzy, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "ä¸�æ˜Žã�ªã‚¨ã‚¹ã‚±ãƒ¼ãƒ— '\\%c' ã�Œæ–‡å­—åˆ—å†…ã�«ã�‚ã‚Šã�¾ã�™ã€‚ç„¡è¦–ã�•ã‚Œã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Parser.pm:5871
  #, fuzzy, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "ä¸�æ˜Žã�ªç´¢å¼• `%s' ã�§ã�™"
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5914
  #, fuzzy, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "@printindex ã�«ä¸�æ˜Žã�ªè¦‹å‡ºã�— `%s' ã�Œã�‚ã‚Šã�¾ã�™"
  
! #: tp/Texinfo/Parser.pm:5920
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5928
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5944
  #, fuzzy, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
  msgstr "%s: %s å¼•æ•°ã�¯ `%s' ã�§ã�¯ã�ªã��ã�¦ã€�æ•°å€¤ã�§ã�ªã�‘ã‚Œã�°ã�ªã‚Šã�¾ã�›ã‚“ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:5952
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr "@%s 10 ã�¾ã�Ÿã�¯ 11 ã�Œã‚µãƒ�ãƒ¼ãƒˆã�•ã‚Œã�¦ã�„ã�¾ã�™ã€‚`%s' ã�¯ã‚µãƒ�ãƒ¼ãƒˆã�•ã‚Œã�¦ã�„ã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:5960
  #, fuzzy, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
--- 2688,2979 ----
  "ã�¾ã�™; ç�¾åœ¨ã�¯ %d)"
  
! #: tp/Texinfo/Parser.pm:3983
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4038
  #, fuzzy, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr "%s: ã‚ªãƒ—ã‚·ãƒ§ãƒ³ `--%s' ã�¯å¼•æ•°ã�Œä¸�è¦�ã�§ã�™\n"
  
! #: tp/Texinfo/Parser.pm:4044
  #, fuzzy, perl-format
  msgid "use braces to give a command as an argument to @%s"
  msgstr "@%s ã�¸ã�®å¼•æ•°ã�¨ã�—ã�¦ã‚³ãƒžãƒ³ãƒ‰ã‚’ä¸Žã�ˆã‚‹ã�«ã�¯ã€�ãƒ–ãƒ¬ãƒ¼ã‚¹ã‚’ä½¿ã�„ã�¾ã�—ã‚‡ã�†"
  
! #: tp/Texinfo/Parser.pm:4057 tp/Texinfo/Parser.pm:5189
  #, perl-format
  msgid "%c%s expects `i' or `j' as argument, not `%s'"
  msgstr "%c%s ã�¯ `%s' ã�§ã�¯ã�ªã��ã€�`i' ã�‹ `j' ã‚’å¼•æ•°ã�¨ã�—ã�¦å¿…è¦�ã�¨ã�—ã�¾ã�™"
  
! #: tp/Texinfo/Parser.pm:4068
  #, fuzzy, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr "%s: ã‚ªãƒ—ã‚·ãƒ§ãƒ³ `--%s' ã�¯å¼•æ•°ã�Œä¸�è¦�ã�§ã�™\n"
  
! #: tp/Texinfo/Parser.pm:4079
  #, fuzzy, perl-format
  msgid "@%s expected braces"
  msgstr "%c%s ã�«ã�¯ä¸­æ‹¬å¼§ã�ŒäºˆæœŸã�•ã‚Œã�¾ã�™"
  
! #: tp/Texinfo/Parser.pm:4233
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "å®šç¾©ã�•ã‚Œã�¦ã�„ã�ªã�„ãƒ•ãƒ©ã‚°: %s"
  
! #: tp/Texinfo/Parser.pm:4236
  #, fuzzy
  msgid "bad syntax for @value"
  msgstr "å¼•æ•° `%3$s' ã�«å¯¾ã�—ã�¦ %1$s%2$s ã�Œç„¡åŠ¹ã�§ã�™"
  
! #: tp/Texinfo/Parser.pm:4243
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s ã�¯å»ƒæ­¢äºˆå®š (ã�¾ã�Ÿã�¯å»ƒæ­¢æ¸ˆã�¿) ã�§ã�™ã€‚"
  
! #: tp/Texinfo/Parser.pm:4246
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s ã�¯å»ƒæ­¢äºˆå®š (ã�¾ã�Ÿã�¯å»ƒæ­¢æ¸ˆã�¿) ã�§ã�™; %s"
  
! #: tp/Texinfo/Parser.pm:4255
! #, fuzzy, perl-format
! msgid "@%s should only appear at the beginning of a line"
! msgstr "è¡Œé ­ã�¾ã�§ã‚’åˆ‡ã‚Šå�–ã‚‹"
  
! #: tp/Texinfo/Parser.pm:4346
  #, fuzzy, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "`@%2$s' ãƒ–ãƒ­ãƒƒã‚¯ã�®å†…å�´ã�§ã�¯ `@%1$s' ã�¯æ„�å‘³ã�Œã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:4355
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4479 tp/Texinfo/Parser.pm:4496
! #: tp/Texinfo/Parser.pm:4546
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "`@%2$s' ãƒ–ãƒ­ãƒƒã‚¯ã�®å†…å�´ã�§ã�¯ `@%1$s' ã�¯æ„�å‘³ã�Œã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:4506
  #, fuzzy, perl-format
  msgid "@%s in empty multitable"
  msgstr "ã‚³ãƒ¡ãƒ³ãƒˆå†…ã�§ãƒ•ã‚¡ã‚¤ãƒ«çµ‚ç«¯ (EOF) ã�«é�”ã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Parser.pm:4512
  #, fuzzy
  msgid "@tab before @item"
  msgstr "ãƒ�ã‚§ãƒƒã‚¯ãƒ»ãƒ¡ãƒ‹ãƒ¥ãƒ¼é …ç›®"
  
! #: tp/Texinfo/Parser.pm:4515
  #, fuzzy, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "ãƒžãƒ«ãƒ�ãƒ†ãƒ¼ãƒ–ãƒ«é …ç›®å†…ã�®ã‚«ãƒ©ãƒ æ•°ã�Œå¤šã�™ã�Žã�¾ã�™(æœ€å¤§ %d)"
  
! #: tp/Texinfo/Parser.pm:4552
  msgid "ignoring @tab outside of multitable"
  msgstr "ãƒžãƒ«ãƒ�ãƒ†ãƒ¼ãƒ–ãƒ«ã�®å¤–å�´ã�® @tab ã‚’ç„¡è¦–ã�—ã�¾ã�™"
  
! #: tp/Texinfo/Parser.pm:4556
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4596
  #, fuzzy, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "`@%2$s' ã‚’ä½¿ç”¨ã�™ã‚‹ã�Ÿã‚�ã�«ã�¯ `@%1$s' ç’°å¢ƒã�§ã�ªã�‘ã‚Œã�°ã�„ã�‘ã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:4638
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "@%s ã�¯ `@titlepage' ã�Šã‚ˆã�³ `@quotation' ç’°å¢ƒã�®å¤–å�´ã�§ã�¯æ„�å‘³ã�Œã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:4642
  msgid "@dircategory after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4847
  #, fuzzy, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "è„šæ³¨ã�«è„šæ³¨ã‚’å�«ã‚�ã‚‹ã�“ã�¨ã�¯ã�§ã��ã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:4864
  msgid "@direntry after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4872
  #, fuzzy, perl-format
  msgid "@%s seen before first @node"
  msgstr "@menu ã�Œæœ€åˆ�ã�® @node ä»¥å‰�ã�«ç�¾ã‚Œã�¾ã�—ã�Ÿã€‚`Top' ãƒŽãƒ¼ãƒ‰ã‚’ã�¤ã��ã‚Šã�¾ã�™"
  
! #: tp/Texinfo/Parser.pm:4875
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
  msgstr "å¤šåˆ† @top ãƒŽãƒ¼ãƒ‰ã�¯ @ifinfo ã‚ˆã‚Šã�¯ @ifnottex ã�«è¦†ã‚�ã‚Œã‚‹ã�¹ã��ã�§ã�¯ï¼Ÿ"
  
! #: tp/Texinfo/Parser.pm:4937
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4945
  #, fuzzy, perl-format
  msgid "unknown command `%s'"
  msgstr "ä¸�æ˜Žã�ªã‚³ãƒžãƒ³ãƒ‰ `%s'"
  
! #: tp/Texinfo/Parser.pm:4955
  #, fuzzy
  msgid "unexpected @"
  msgstr "äºˆæœŸã�•ã‚Œã�ªã�„ @ ã�§ã�™"
  
! #: tp/Texinfo/Parser.pm:4983
  #, fuzzy, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "`@float' ç’°å¢ƒã�®å¤–å�´ã�§ã�¯ @%s ã�¯æ„�å‘³ã�Œã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:4988
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4996
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5114
  #, fuzzy, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "%s: ã‚ªãƒ—ã‚·ãƒ§ãƒ³ `--%s' ã�¯å¼•æ•°ã�Œä¸�è¦�ã�§ã�™\n"
  
! #: tp/Texinfo/Parser.pm:5138
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5156
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5167
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5180
  msgid "@image missing filename argument"
  msgstr "@image ã�«ãƒ•ã‚¡ã‚¤ãƒ«å��ã�Œä¸Žã�ˆã‚‰ã‚Œã�¦ã�„ã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:5211
  #, fuzzy, perl-format
  msgid "@%s missing first argument"
  msgstr "è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã�®æ¬ è�½ã€‚"
  
! #: tp/Texinfo/Parser.pm:5230
  #, fuzzy, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "@%s ã�«å¯¾ã�™ã‚‹èª¤ã�£ã�Ÿå¼•æ•°ã�§ã�™: %s"
  
! #: tp/Texinfo/Parser.pm:5236
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5253
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5448
  #, fuzzy
  msgid "superfluous arguments for node"
  msgstr "%2$s ã�«å¯¾ã�™ã‚‹å¼•æ•° %1$s ã�Œæ›–æ˜§ã�§ã�™"
  
! #: tp/Texinfo/Parser.pm:5498
  #, fuzzy, perl-format
  msgid "expected @end %s"
  msgstr "çµ‚äº†ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹"
  
! #: tp/Texinfo/Parser.pm:5607
  #, fuzzy, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "@%s ã�¸ã�®å¼•æ•°ã�¨ã�—ã�¦ã‚³ãƒžãƒ³ãƒ‰ã‚’ä¸Žã�ˆã‚‹ã�«ã�¯ã€�ãƒ–ãƒ¬ãƒ¼ã‚¹ã‚’ä½¿ã�„ã�¾ã�—ã‚‡ã�†"
  
! #: tp/Texinfo/Parser.pm:5617
  #, fuzzy, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "@%s ã�«å¯¾ã�™ã‚‹èª¤ã�£ã�Ÿå¼•æ•°ã�§ã�™: %s"
  
! #: tp/Texinfo/Parser.pm:5689
  #, fuzzy, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "@%s ã�¸ã�®å¼•æ•°ã�¨ã�—ã�¦ã‚³ãƒžãƒ³ãƒ‰ã‚’ä¸Žã�ˆã‚‹ã�«ã�¯ã€�ãƒ–ãƒ¬ãƒ¼ã‚¹ã‚’ä½¿ã�„ã�¾ã�—ã‚‡ã�†"
  
! #: tp/Texinfo/Parser.pm:5710
  #, perl-format
  msgid "empty @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5718
  #, fuzzy, perl-format
  msgid "column fraction not a number: %s"
  msgstr "iconv é–¢æ•°ã�Œä½¿ã�ˆã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:5727
  #, fuzzy, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "%s: %s å¼•æ•°ã�¯ `%s' ã�§ã�¯ã�ªã��ã�¦ã€�æ•°å€¤ã�§ã�ªã�‘ã‚Œã�°ã�ªã‚Šã�¾ã�›ã‚“ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:5736
  #, fuzzy, perl-format
  msgid "reserved index name %s"
  msgstr "èª�è­˜ã�§ã��ã�ªã�„ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³å�� `%s' ã�§ã�™"
  
! #: tp/Texinfo/Parser.pm:5762
  #, fuzzy, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "ä¸�æ˜Žã�ªã‚¨ã‚¹ã‚±ãƒ¼ãƒ— '\\%c' ã�Œæ–‡å­—åˆ—å†…ã�«ã�‚ã‚Šã�¾ã�™ã€‚ç„¡è¦–ã�•ã‚Œã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Parser.pm:5765
  #, fuzzy, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "ä¸�æ˜Žã�ªç´¢å¼• `%s' ã�§ã�™"
  
! #: tp/Texinfo/Parser.pm:5793
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5806
  #, fuzzy, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "@printindex ã�«ä¸�æ˜Žã�ªè¦‹å‡ºã�— `%s' ã�Œã�‚ã‚Šã�¾ã�™"
  
! #: tp/Texinfo/Parser.pm:5812
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5820
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5836
  #, fuzzy, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
  msgstr "%s: %s å¼•æ•°ã�¯ `%s' ã�§ã�¯ã�ªã��ã�¦ã€�æ•°å€¤ã�§ã�ªã�‘ã‚Œã�°ã�ªã‚Šã�¾ã�›ã‚“ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:5844
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr "@%s 10 ã�¾ã�Ÿã�¯ 11 ã�Œã‚µãƒ�ãƒ¼ãƒˆã�•ã‚Œã�¦ã�„ã�¾ã�™ã€‚`%s' ã�¯ã‚µãƒ�ãƒ¼ãƒˆã�•ã‚Œã�¦ã�„ã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:5852
  #, fuzzy, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
***************
*** 2988,2997 ****
  "    ã�ªã‚Šã�¾ã�›ã‚“ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:5968
  #, fuzzy, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
  msgstr "%s: %s å¼•æ•°ã�¯ `%s' ã�§ã�¯ã�ªã��ã�¦ã€�æ•°å€¤ã�§ã�ªã�‘ã‚Œã�°ã�ªã‚Šã�¾ã�›ã‚“ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:5986 tp/Texinfo/Parser.pm:5991
  #, fuzzy, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
--- 2982,2991 ----
  "    ã�ªã‚Šã�¾ã�›ã‚“ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:5860
  #, fuzzy, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
  msgstr "%s: %s å¼•æ•°ã�¯ `%s' ã�§ã�¯ã�ªã��ã�¦ã€�æ•°å€¤ã�§ã�ªã�‘ã‚Œã�°ã�ªã‚Šã�¾ã�›ã‚“ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:5878 tp/Texinfo/Parser.pm:5883
  #, fuzzy, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
***************
*** 3000,3004 ****
  "    ã�ªã‚Šã�¾ã�›ã‚“ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:5999
  #, fuzzy, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
--- 2994,2998 ----
  "    ã�ªã‚Šã�¾ã�›ã‚“ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:5891
  #, fuzzy, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
***************
*** 3007,3011 ****
  "    ã�ªã‚Šã�¾ã�›ã‚“ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:6009
  #, fuzzy, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
--- 3001,3005 ----
  "    ã�ªã‚Šã�¾ã�›ã‚“ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:5901
  #, fuzzy, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
***************
*** 3014,3028 ****
  "    ã�ªã‚Šã�¾ã�›ã‚“ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:6021
  #, fuzzy, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "@%s ã�¯ on ã�¾ã�Ÿã�¯ off ã�ŒäºˆæœŸã�•ã‚Œã�¾ã�™ã€‚`%s' ã�§ã�¯ã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:6031
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:6039
  #, fuzzy, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
--- 3008,3022 ----
  "    ã�ªã‚Šã�¾ã�›ã‚“ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:5913
  #, fuzzy, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "@%s ã�¯ on ã�¾ã�Ÿã�¯ off ã�ŒäºˆæœŸã�•ã‚Œã�¾ã�™ã€‚`%s' ã�§ã�¯ã�‚ã‚Šã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Parser.pm:5922
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5930
  #, fuzzy, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
***************
*** 3031,3035 ****
  "    ã�ªã‚Šã�¾ã�›ã‚“ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:6047
  #, fuzzy, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
--- 3025,3029 ----
  "    ã�ªã‚Šã�¾ã�›ã‚“ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:5938
  #, fuzzy, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
***************
*** 3038,3067 ****
  "    ã�ªã‚Šã�¾ã�›ã‚“ã€‚\n"
  
! #: tp/Texinfo/Structuring.pm:213
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:245
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:250
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:339
  #, fuzzy, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "ãƒ›ã‚¹ãƒˆå��ã�«ã‚¢ãƒ‰ãƒ¬ã‚¹ã�Œå‰²ã‚Šå½“ã�¦ã‚‰ã‚Œã�¦ã�„ã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Structuring.pm:488
  #, fuzzy, perl-format
  msgid "@%s not empty"
  msgstr "ã‚³ãƒ¡ãƒ³ãƒˆå†…ã�§ãƒ•ã‚¡ã‚¤ãƒ«çµ‚ç«¯ (EOF) ã�«é�”ã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Structuring.pm:544 tp/Texinfo/Structuring.pm:1326
  #, fuzzy, perl-format
  msgid "@%s reference to nonexistent node `%s'"
--- 3032,3061 ----
  "    ã�ªã‚Šã�¾ã�›ã‚“ã€‚\n"
  
! #: tp/Texinfo/Structuring.pm:216
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:248
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:253
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:342
  #, fuzzy, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "ãƒ›ã‚¹ãƒˆå��ã�«ã‚¢ãƒ‰ãƒ¬ã‚¹ã�Œå‰²ã‚Šå½“ã�¦ã‚‰ã‚Œã�¦ã�„ã�¾ã�›ã‚“"
  
! #: tp/Texinfo/Structuring.pm:491
  #, fuzzy, perl-format
  msgid "@%s not empty"
  msgstr "ã‚³ãƒ¡ãƒ³ãƒˆå†…ã�§ãƒ•ã‚¡ã‚¤ãƒ«çµ‚ç«¯ (EOF) ã�«é�”ã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/Texinfo/Structuring.pm:547 tp/Texinfo/Structuring.pm:1325
  #, fuzzy, perl-format
  msgid "@%s reference to nonexistent node `%s'"
***************
*** 3070,3109 ****
  "ã‚‹ã�‹ã‚‚ã�—ã‚Œã�¾ã�›ã‚“?)"
  
! #: tp/Texinfo/Structuring.pm:557
  #, fuzzy, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
  msgstr "å��å‰�ã�®å�–å¾—ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿ: %s"
  
! #: tp/Texinfo/Structuring.pm:662
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "å�‚ç…§ã�•ã‚Œã�¦ã�„ã�ªã�„ãƒŽãƒ¼ãƒ‰ `%s'"
  
! #: tp/Texinfo/Structuring.pm:708
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:715
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:733
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:787
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:814
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%s ã�¯å­˜åœ¨ã�—ã�ªã�„ `%s' ã‚’å�‚ç…§ã�—ã�¦ã�„ã�¾ã�™"
  
! #: tp/Texinfo/Structuring.pm:834
  #, fuzzy, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
--- 3064,3103 ----
  "ã‚‹ã�‹ã‚‚ã�—ã‚Œã�¾ã�›ã‚“?)"
  
! #: tp/Texinfo/Structuring.pm:558
  #, fuzzy, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
  msgstr "å��å‰�ã�®å�–å¾—ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿ: %s"
  
! #: tp/Texinfo/Structuring.pm:663
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "å�‚ç…§ã�•ã‚Œã�¦ã�„ã�ªã�„ãƒŽãƒ¼ãƒ‰ `%s'"
  
! #: tp/Texinfo/Structuring.pm:706
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:713
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:731
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:786
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:810
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%s ã�¯å­˜åœ¨ã�—ã�ªã�„ `%s' ã‚’å�‚ç…§ã�—ã�¦ã�„ã�¾ã�™"
  
! #: tp/Texinfo/Structuring.pm:829
  #, fuzzy, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
***************
*** 3111,3115 ****
  "ãƒŽãƒ¼ãƒ‰ `%s' ã�«ã�¯ ä¸Šä½�é …ç›®ã�Œã�‚ã‚‹ã�®ã�«ã€�`%s' ã�¸ã�®ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‚¢ã‚¤ãƒ†ãƒ ã‚’æ¬ ã�„ã�¦ã�„ã�¾ã�™"
  
! #: tp/Texinfo/Structuring.pm:842
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
--- 3105,3109 ----
  "ãƒŽãƒ¼ãƒ‰ `%s' ã�«ã�¯ ä¸Šä½�é …ç›®ã�Œã�‚ã‚‹ã�®ã�«ã€�`%s' ã�¸ã�®ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‚¢ã‚¤ãƒ†ãƒ ã‚’æ¬ ã�„ã�¦ã�„ã�¾ã�™"
  
! #: tp/Texinfo/Structuring.pm:837
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
***************
*** 3121,3125 ****
  msgstr "å��å‰�ã�®å�–å¾—ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿ: %s"
  
! #: tp/Texinfo/Structuring.pm:2070
  #, fuzzy, perl-format
  msgid "empty index key in @%s"
--- 3115,3119 ----
  msgstr "å��å‰�ã�®å�–å¾—ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿ: %s"
  
! #: tp/Texinfo/Structuring.pm:2067
  #, fuzzy, perl-format
  msgid "empty index key in @%s"
***************
*** 3635,3653 ****
  msgstr "è©³ã�—ã��ã�¯ `%s --help' ã‚’å®Ÿè¡Œã�—ã�¦ã��ã� ã�•ã�„ã€‚\n"
  
! #: tp/texi2any.pl:1232
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
  
! #: tp/texi2any.pl:1255
  #, fuzzy, perl-format
  msgid "error on closing macro expand file %s: %s\n"
  msgstr "å‡ºåŠ›ãƒ•ã‚¡ã‚¤ãƒ« `%s' ã‚’é–‰ã�˜ã‚‹éš›ã�«ã‚¨ãƒ©ãƒ¼ã�Œç™ºç”Ÿã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/texi2any.pl:1261
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "%s: --css-file %s ã‚’é–‹ã��ã�“ã�¨ã�Œã�§ã��ã�¾ã�›ã‚“"
  
! #: tp/texi2any.pl:1286
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
--- 3629,3647 ----
  msgstr "è©³ã�—ã��ã�¯ `%s --help' ã‚’å®Ÿè¡Œã�—ã�¦ã��ã� ã�•ã�„ã€‚\n"
  
! #: tp/texi2any.pl:1239
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
  
! #: tp/texi2any.pl:1262
  #, fuzzy, perl-format
  msgid "error on closing macro expand file %s: %s\n"
  msgstr "å‡ºåŠ›ãƒ•ã‚¡ã‚¤ãƒ« `%s' ã‚’é–‰ã�˜ã‚‹éš›ã�«ã‚¨ãƒ©ãƒ¼ã�Œç™ºç”Ÿã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/texi2any.pl:1268
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "%s: --css-file %s ã‚’é–‹ã��ã�“ã�¨ã�Œã�§ã��ã�¾ã�›ã‚“"
  
! #: tp/texi2any.pl:1293
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
***************
*** 3655,3669 ****
  msgstr ""
  
! #: tp/texi2any.pl:1359 tp/texi2any.pl:1435
  #, fuzzy, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%(service)s on %(device)s"
  
! #: tp/texi2any.pl:1382 tp/texi2any.pl:1416
  #, fuzzy, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
  msgstr "å‡ºåŠ›ãƒ•ã‚¡ã‚¤ãƒ« `%s' ã‚’é–‰ã�˜ã‚‹éš›ã�«ã‚¨ãƒ©ãƒ¼ã�Œç™ºç”Ÿã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/texi2any.pl:1388 tp/texi2any.pl:1422
  #, fuzzy, perl-format
  msgid "%s: could not open %s for writing: %s\n"
--- 3649,3663 ----
  msgstr ""
  
! #: tp/texi2any.pl:1366 tp/texi2any.pl:1442
  #, fuzzy, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%(service)s on %(device)s"
  
! #: tp/texi2any.pl:1389 tp/texi2any.pl:1423
  #, fuzzy, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
  msgstr "å‡ºåŠ›ãƒ•ã‚¡ã‚¤ãƒ« `%s' ã‚’é–‰ã�˜ã‚‹éš›ã�«ã‚¨ãƒ©ãƒ¼ã�Œç™ºç”Ÿã�—ã�¾ã�—ã�Ÿ"
  
! #: tp/texi2any.pl:1395 tp/texi2any.pl:1429
  #, fuzzy, perl-format
  msgid "%s: could not open %s for writing: %s\n"
***************
*** 3954,3957 ****
--- 3948,3957 ----
  #~ msgstr "--*** æ—§å¼�ã�®ã‚¿ã‚° ***"
  
+ #~ msgid "-%s---Info: %s, %d lines --%s--"
+ #~ msgstr "-%s---Info: %s, %d è¡Œ --%s--"
+ 
+ #~ msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
+ #~ msgstr "-%s%s-Info: (%s)%s, %d è¡Œ --%s--"
+ 
  #~ msgid " Subfile: %s"
  #~ msgstr " å‰¯ãƒ•ã‚¡ã‚¤ãƒ«: %s"
Binary files texinfo-6.1/po/nb.gmo and texinfo-6.3/po/nb.gmo differ
diff -Nrc2 texinfo-6.1/po/nb.po texinfo-6.3/po/nb.po
*** texinfo-6.1/po/nb.po	2016-02-06 11:35:52.000000000 +0000
--- texinfo-6.3/po/nb.po	2016-09-10 12:45:54.000000000 +0100
***************
*** 22,26 ****
  "Project-Id-Version: texinfo 4.7.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
  "PO-Revision-Date: 2004-12-05 15:37+0100\n"
  "Last-Translator: Trond Endrestøl <Trond.Endrestol@gtf.ol.no>\n"
--- 22,26 ----
  "Project-Id-Version: texinfo 4.7.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:45+0100\n"
  "PO-Revision-Date: 2004-12-05 15:37+0100\n"
  "Last-Translator: Trond Endrestøl <Trond.Endrestol@gtf.ol.no>\n"
***************
*** 30,33 ****
--- 30,34 ----
  "Content-Type: text/plain; charset=ISO-8859-1\n"
  "Content-Transfer-Encoding: 8bit\n"
+ "X-Bugs: Report translation errors to the Language-Team address.\n"
  
  #: gnulib/lib/error.c:191
***************
*** 127,133 ****
  
  #: gnulib/lib/regcomp.c:156
! #, fuzzy
! msgid "Unmatched [ or [^"
! msgstr "Umatchet }"
  
  #: gnulib/lib/regcomp.c:159
--- 128,133 ----
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [, [^, [:, [., or [="
! msgstr ""
  
  #: gnulib/lib/regcomp.c:159
***************
*** 170,174 ****
  msgstr "Umatchet }"
  
! #: gnulib/lib/regcomp.c:711
  #, fuzzy
  msgid "No previous regular expression"
--- 170,174 ----
  msgstr "Umatchet }"
  
! #: gnulib/lib/regcomp.c:687
  #, fuzzy
  msgid "No previous regular expression"
***************
*** 323,327 ****
  msgstr "---------- Fotnoter -----------"
  
! #: info/indices.c:123 info/indices.c:812
  #, c-format
  msgid "Finding index entries..."
--- 323,327 ----
  msgstr "---------- Fotnoter -----------"
  
! #: info/indices.c:123 info/indices.c:822
  #, c-format
  msgid "Finding index entries..."
***************
*** 332,336 ****
  msgstr "Lete opp en streng i indeksen til denne filen"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:818
  #, c-format
  msgid "No indices found."
--- 332,336 ----
  msgstr "Lete opp en streng i indeksen til denne filen"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:828
  #, c-format
  msgid "No indices found."
***************
*** 364,378 ****
  msgstr "Ingen %sindeksinnslag inneholdende «%s»."
  
! #: info/indices.c:476 info/indices.c:880
  #, fuzzy, c-format
  msgid "No index entries containing '%s'."
  msgstr "Ingen %sindeksinnslag inneholdende «%s»."
  
! #: info/indices.c:583
  #, fuzzy, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "Sjekker indekser i «%s»..."
  
! #: info/indices.c:636
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
--- 364,378 ----
  msgstr "Ingen %sindeksinnslag inneholdende «%s»."
  
! #: info/indices.c:476 info/indices.c:890
  #, fuzzy, c-format
  msgid "No index entries containing '%s'."
  msgstr "Ingen %sindeksinnslag inneholdende «%s»."
  
! #: info/indices.c:586
  #, fuzzy, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "Sjekker indekser i «%s»..."
  
! #: info/indices.c:646
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
***************
*** 380,398 ****
  "       og bygge opp en meny"
  
! #: info/indices.c:644 info/indices.c:646
  #, fuzzy
  msgid "Index apropos"
  msgstr "Indeksapropos: "
  
! #: info/indices.c:688
  #, fuzzy, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Ingen %sindeksinnslag inneholdende «%s»."
  
! #: info/indices.c:797
  msgid "List all matches of a string in the index"
  msgstr ""
  
! #: info/indices.c:824 info/indices.c:826
  #, fuzzy
  msgid "Index topic"
--- 380,398 ----
  "       og bygge opp en meny"
  
! #: info/indices.c:654 info/indices.c:656
  #, fuzzy
  msgid "Index apropos"
  msgstr "Indeksapropos: "
  
! #: info/indices.c:698
  #, fuzzy, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Ingen %sindeksinnslag inneholdende «%s»."
  
! #: info/indices.c:807
  msgid "List all matches of a string in the index"
  msgstr ""
  
! #: info/indices.c:834 info/indices.c:836
  #, fuzzy
  msgid "Index topic"
***************
*** 404,458 ****
  msgstr "Ingen av de tilgjengelig infofilene har «%s» i deres indekser."
  
! #: info/info-utils.c:892
  #, c-format
  msgid "Error converting file character encoding."
  msgstr ""
  
! #: info/info.c:222 info/session.c:2789
  #, fuzzy, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "Ingen menypunkt «%s» i noden «%s»."
  
! #: info/info.c:315
! #, fuzzy, c-format
! msgid "No file given for node '%s'."
! msgstr "Ingen meny i noden «%s»."
! 
! #: info/info.c:364 info/info.c:1133
  #, fuzzy, c-format
  msgid "Cannot find node '%s'."
  msgstr "Kan ikke finne noden «%s»."
  
! #: info/info.c:386
  #, c-format
  msgid "No program name given."
  msgstr ""
  
! #: info/info.c:577
  #, c-format
  msgid "invalid number: %s\n"
  msgstr ""
  
! #: info/info.c:757
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr ""
  
! #: info/info.c:764 info/infokey.c:537
  #, c-format
  msgid "%s: no such variable"
  msgstr ""
  
! #: info/info.c:770 info/infokey.c:539
  #, fuzzy, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "Sette verdien til en Infovariabel"
  
! #: info/info.c:782
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "Prøv --help for mer informasjon.\n"
  
! #: info/info.c:804 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
--- 404,453 ----
  msgstr "Ingen av de tilgjengelig infofilene har «%s» i deres indekser."
  
! #: info/info-utils.c:879
  #, c-format
  msgid "Error converting file character encoding."
  msgstr ""
  
! #: info/info.c:279 info/session.c:2789
  #, fuzzy, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "Ingen menypunkt «%s» i noden «%s»."
  
! #: info/info.c:416 info/info.c:1148
  #, fuzzy, c-format
  msgid "Cannot find node '%s'."
  msgstr "Kan ikke finne noden «%s»."
  
! #: info/info.c:438
  #, c-format
  msgid "No program name given."
  msgstr ""
  
! #: info/info.c:636
  #, c-format
  msgid "invalid number: %s\n"
  msgstr ""
  
! #: info/info.c:816
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr ""
  
! #: info/info.c:823 info/infokey.c:540
  #, c-format
  msgid "%s: no such variable"
  msgstr ""
  
! #: info/info.c:829 info/infokey.c:542
  #, fuzzy, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "Sette verdien til en Infovariabel"
  
! #: info/info.c:841
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "Prøv --help for mer informasjon.\n"
  
! #: info/info.c:860 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
***************
*** 464,473 ****
  msgstr ""
  
! #: info/info.c:981
  #, fuzzy, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "ingen innslag funnet for «%s»\n"
  
! #: info/info.c:1034
  #, c-format
  msgid ""
--- 459,468 ----
  msgstr ""
  
! #: info/info.c:999
  #, fuzzy, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "ingen innslag funnet for «%s»\n"
  
! #: info/info.c:1049
  #, c-format
  msgid ""
***************
*** 477,481 ****
  msgstr ""
  
! #: info/info.c:1040
  msgid ""
  "Options:\n"
--- 472,476 ----
  msgstr ""
  
! #: info/info.c:1055
  msgid ""
  "Options:\n"
***************
*** 488,492 ****
  msgstr ""
  
! #: info/info.c:1048
  msgid ""
  "  -h, --help                   display this help and exit.\n"
--- 483,487 ----
  msgstr ""
  
! #: info/info.c:1063
  msgid ""
  "  -h, --help                   display this help and exit.\n"
***************
*** 496,500 ****
  msgstr ""
  
! #: info/info.c:1054
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
--- 491,495 ----
  msgstr ""
  
! #: info/info.c:1069
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
***************
*** 504,508 ****
  msgstr ""
  
! #: info/info.c:1061
  #, fuzzy
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
--- 499,503 ----
  msgstr ""
  
! #: info/info.c:1076
  #, fuzzy
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
***************
*** 510,514 ****
  "  -b, --speech-friendly        vær vennlig ovenfor talesyntetisatorer.\n"
  
! #: info/info.c:1065
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
--- 505,509 ----
  "  -b, --speech-friendly        vær vennlig ovenfor talesyntetisatorer.\n"
  
! #: info/info.c:1080
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
***************
*** 522,526 ****
  msgstr ""
  
! #: info/info.c:1074
  msgid ""
  "\n"
--- 517,521 ----
  msgstr ""
  
! #: info/info.c:1089
  msgid ""
  "\n"
***************
*** 532,536 ****
  msgstr ""
  
! #: info/info.c:1081
  msgid ""
  "\n"
--- 527,531 ----
  msgstr ""
  
! #: info/info.c:1096
  msgid ""
  "\n"
***************
*** 538,542 ****
  msgstr ""
  
! #: info/info.c:1084
  msgid ""
  "\n"
--- 533,537 ----
  msgstr ""
  
! #: info/info.c:1099
  msgid ""
  "\n"
***************
*** 554,558 ****
  msgstr ""
  
! #: info/info.c:1099 install-info/install-info.c:616 tp/texi2any.pl:861
  #, fuzzy
  msgid ""
--- 549,553 ----
  msgstr ""
  
! #: info/info.c:1114 install-info/install-info.c:616 tp/texi2any.pl:861
  #, fuzzy
  msgid ""
***************
*** 566,630 ****
  "Websida for Texinfo: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1134
  #, fuzzy, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Kan ikke finne noden «(%s)%s»."
  
! #: info/info.c:1135
  msgid "Cannot find a window!"
  msgstr "Kan ikke finne et vindu!"
  
! #: info/info.c:1136
  msgid "Point doesn't appear within this window's node!"
  msgstr "Markøren vises ikke innen dette vinduets node!"
  
! #: info/info.c:1137
  msgid "Cannot delete the last window."
  msgstr "Kan ikke slette det siste vinduet."
  
! #: info/info.c:1138
  msgid "No menu in this node."
  msgstr "Ingen meny i denne noden."
  
! #: info/info.c:1139
  msgid "No footnotes in this node."
  msgstr "Ingen fotnoter i denne noden."
  
! #: info/info.c:1140
  msgid "No cross references in this node."
  msgstr "Ingen kryssreferanser i denne noden."
  
! #: info/info.c:1141
  #, fuzzy, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Ingen «%s»-peker for denne noden."
  
! #: info/info.c:1142
  #, fuzzy, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "Ukjent Info-kommando «%c»; prøv «?» for hjelp."
  
! #: info/info.c:1143
  #, fuzzy, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "Terminaltypen «%s» er ikke smart nok for å kjøre Info."
  
! #: info/info.c:1144
  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:1145
  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:1146
  msgid "Only one window."
  msgstr "Bare et vindu."
  
! #: info/info.c:1147
  msgid "Resulting window would be too small."
  msgstr "Resulterende vindu ville blitt for lite."
  
! #: info/info.c:1148
  msgid "Not enough room for a help window, please delete a window."
  msgstr "Ikke nok plass for et hjelpevindu, vennligst slett et vindu."
--- 561,625 ----
  "Websida for Texinfo: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1149
  #, fuzzy, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Kan ikke finne noden «(%s)%s»."
  
! #: info/info.c:1150
  msgid "Cannot find a window!"
  msgstr "Kan ikke finne et vindu!"
  
! #: info/info.c:1151
  msgid "Point doesn't appear within this window's node!"
  msgstr "Markøren vises ikke innen dette vinduets node!"
  
! #: info/info.c:1152
  msgid "Cannot delete the last window."
  msgstr "Kan ikke slette det siste vinduet."
  
! #: info/info.c:1153
  msgid "No menu in this node."
  msgstr "Ingen meny i denne noden."
  
! #: info/info.c:1154
  msgid "No footnotes in this node."
  msgstr "Ingen fotnoter i denne noden."
  
! #: info/info.c:1155
  msgid "No cross references in this node."
  msgstr "Ingen kryssreferanser i denne noden."
  
! #: info/info.c:1156
  #, fuzzy, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Ingen «%s»-peker for denne noden."
  
! #: info/info.c:1157
  #, fuzzy, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "Ukjent Info-kommando «%c»; prøv «?» for hjelp."
  
! #: info/info.c:1158
  #, fuzzy, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "Terminaltypen «%s» er ikke smart nok for å kjøre Info."
  
! #: info/info.c:1159
  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:1160
  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:1161
  msgid "Only one window."
  msgstr "Bare et vindu."
  
! #: info/info.c:1162
  msgid "Resulting window would be too small."
  msgstr "Resulterende vindu ville blitt for lite."
  
! #: info/info.c:1163
  msgid "Not enough room for a help window, please delete a window."
  msgstr "Ikke nok plass for et hjelpevindu, vennligst slett et vindu."
***************
*** 924,958 ****
  msgstr "Ukjent handling «%s»"
  
! #: info/infokey.c:482
  #, c-format
  msgid "action name too long"
  msgstr "handlingsnavn for langt"
  
! #: info/infokey.c:495
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "ekstra tegn følger handlingen «%s»"
  
! #: info/infokey.c:506
  #, c-format
  msgid "missing variable name"
  msgstr "manglende variabelnavn"
  
! #: info/infokey.c:515
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "manglende «=» umiddelbart etter variabelnavn"
  
! #: info/infokey.c:522
  #, c-format
  msgid "variable name too long"
  msgstr "variabelnavn for langt"
  
! #: info/infokey.c:546
  #, c-format
  msgid "value too long"
  msgstr "verdi for lang"
  
! #: info/infokey.c:592
  #, c-format
  msgid "\"%s\", line %u: "
--- 919,953 ----
  msgstr "Ukjent handling «%s»"
  
! #: info/infokey.c:485
  #, c-format
  msgid "action name too long"
  msgstr "handlingsnavn for langt"
  
! #: info/infokey.c:498
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "ekstra tegn følger handlingen «%s»"
  
! #: info/infokey.c:509
  #, c-format
  msgid "missing variable name"
  msgstr "manglende variabelnavn"
  
! #: info/infokey.c:518
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "manglende «=» umiddelbart etter variabelnavn"
  
! #: info/infokey.c:525
  #, c-format
  msgid "variable name too long"
  msgstr "variabelnavn for langt"
  
! #: info/infokey.c:549
  #, c-format
  msgid "value too long"
  msgstr "verdi for lang"
  
! #: info/infokey.c:595
  #, c-format
  msgid "\"%s\", line %u: "
***************
*** 1285,1414 ****
  msgstr "Klarte ikke å finne noden referert av «%s» i «%s»."
  
! #: info/session.c:2864
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "Lese en liste over menyer fra dir og følge dem"
  
! #: info/session.c:2866
  msgid "Follow menus: "
  msgstr "Følge menyer: "
  
! #: info/session.c:2971
  msgid "Select the Next node"
  msgstr "Velge neste node"
  
! #: info/session.c:2978
  msgid "Select the Prev node"
  msgstr "Velge forrige node"
  
! #: info/session.c:2985
  msgid "Select the Up node"
  msgstr "Velge oppnoden"
  
! #: info/session.c:2991
  msgid "Select the last node in this file"
  msgstr "Velge den siste noden i denne filen"
  
! #: info/session.c:3018 info/session.c:3051
  msgid "This window has no additional nodes"
  msgstr "Dette vinduet har ingen andre noder"
  
! #: info/session.c:3024
  msgid "Select the first node in this file"
  msgstr "Velge første node i denne filen"
  
! #: info/session.c:3158
  msgid "No more nodes within this document."
  msgstr "Ingen flere noder i dette dokumentet."
  
! #: info/session.c:3203 info/session.c:3243
  #, fuzzy
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "Ingen «forrige» eller «opp» for denne noden i dette dokumentet."
  
! #: info/session.c:3256
  msgid "Move forwards or down through node structure"
  msgstr "Flytte forover eller ned gjennom nodestrukturen"
  
! #: info/session.c:3273
  msgid "Move backwards or up through node structure"
  msgstr "Flytte tilbake eller opp gjennom nodestrukturen"
  
! #: info/session.c:3296
  msgid "Read a node name and select it"
  msgstr "Lese et nodenavn og velge det"
  
! #: info/session.c:3350 info/session.c:3354
  msgid "Goto node: "
  msgstr "Gå til node: "
  
! #: info/session.c:3533
  msgid "Find the node describing program invocation"
  msgstr "Finne noden som beskriver bruksmåten for programmet"
  
! #: info/session.c:3535
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Finne Invocation-noden til [%s]: "
  
! #: info/session.c:3580
  msgid "Read a manpage reference and select it"
  msgstr "Lese en manualside-referanse og velge den"
  
! #: info/session.c:3584
  msgid "Get Manpage: "
  msgstr "Hent manualsiden: "
  
! #: info/session.c:3605
  #, fuzzy
  msgid "Select the node 'Top' in this file"
  msgstr "Velge «Top»-noden i denne filen"
  
! #: info/session.c:3611
  #, fuzzy
  msgid "Select the node '(dir)'"
  msgstr "Velge noden «(dir)»"
  
! #: info/session.c:3617
  msgid "Show full file name of node being displayed"
  msgstr ""
  
! #: info/session.c:3634
  msgid "Select the most recently selected node"
  msgstr "Velge den sist valgte noden"
  
! #: info/session.c:3639
  #, c-format
  msgid "No earlier node in history"
  msgstr ""
  
! #: info/session.c:3643
  msgid "Read the name of a file and select it"
  msgstr "Lese inn navnet på en fil og velge den"
  
! #: info/session.c:3647
  msgid "Find file: "
  msgstr "Finne fil: "
  
! #: info/session.c:3664
  #, fuzzy, c-format
  msgid "Cannot find '%s'."
  msgstr "Kan ikke finne «%s»."
  
! #: info/session.c:3713
  #, fuzzy, c-format
  msgid "Could not create output file '%s'."
  msgstr "Kunne ikke opprette utskriftsfil «%s»."
  
! #: info/session.c:3727
  #, fuzzy, c-format
  msgid "error writing to %s: %s"
  msgstr "feil ved skriving til «%s»"
  
! #: info/session.c:3736
  #, fuzzy, c-format
  msgid "closing %s"
  msgstr "Fjerner %s\n"
  
! #: info/session.c:3785
  #, fuzzy, c-format
  msgid "writing node %s..."
--- 1280,1409 ----
  msgstr "Klarte ikke å finne noden referert av «%s» i «%s»."
  
! #: info/session.c:2870
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "Lese en liste over menyer fra dir og følge dem"
  
! #: info/session.c:2872
  msgid "Follow menus: "
  msgstr "Følge menyer: "
  
! #: info/session.c:2977
  msgid "Select the Next node"
  msgstr "Velge neste node"
  
! #: info/session.c:2984
  msgid "Select the Prev node"
  msgstr "Velge forrige node"
  
! #: info/session.c:2991
  msgid "Select the Up node"
  msgstr "Velge oppnoden"
  
! #: info/session.c:2997
  msgid "Select the last node in this file"
  msgstr "Velge den siste noden i denne filen"
  
! #: info/session.c:3024 info/session.c:3057
  msgid "This window has no additional nodes"
  msgstr "Dette vinduet har ingen andre noder"
  
! #: info/session.c:3030
  msgid "Select the first node in this file"
  msgstr "Velge første node i denne filen"
  
! #: info/session.c:3164
  msgid "No more nodes within this document."
  msgstr "Ingen flere noder i dette dokumentet."
  
! #: info/session.c:3209 info/session.c:3249
  #, fuzzy
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "Ingen «forrige» eller «opp» for denne noden i dette dokumentet."
  
! #: info/session.c:3262
  msgid "Move forwards or down through node structure"
  msgstr "Flytte forover eller ned gjennom nodestrukturen"
  
! #: info/session.c:3279
  msgid "Move backwards or up through node structure"
  msgstr "Flytte tilbake eller opp gjennom nodestrukturen"
  
! #: info/session.c:3302
  msgid "Read a node name and select it"
  msgstr "Lese et nodenavn og velge det"
  
! #: info/session.c:3356 info/session.c:3360
  msgid "Goto node: "
  msgstr "Gå til node: "
  
! #: info/session.c:3539
  msgid "Find the node describing program invocation"
  msgstr "Finne noden som beskriver bruksmåten for programmet"
  
! #: info/session.c:3541
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Finne Invocation-noden til [%s]: "
  
! #: info/session.c:3586
  msgid "Read a manpage reference and select it"
  msgstr "Lese en manualside-referanse og velge den"
  
! #: info/session.c:3590
  msgid "Get Manpage: "
  msgstr "Hent manualsiden: "
  
! #: info/session.c:3611
  #, fuzzy
  msgid "Select the node 'Top' in this file"
  msgstr "Velge «Top»-noden i denne filen"
  
! #: info/session.c:3617
  #, fuzzy
  msgid "Select the node '(dir)'"
  msgstr "Velge noden «(dir)»"
  
! #: info/session.c:3623
  msgid "Show full file name of node being displayed"
  msgstr ""
  
! #: info/session.c:3640
  msgid "Select the most recently selected node"
  msgstr "Velge den sist valgte noden"
  
! #: info/session.c:3645
  #, c-format
  msgid "No earlier node in history"
  msgstr ""
  
! #: info/session.c:3649
  msgid "Read the name of a file and select it"
  msgstr "Lese inn navnet på en fil og velge den"
  
! #: info/session.c:3653
  msgid "Find file: "
  msgstr "Finne fil: "
  
! #: info/session.c:3670
  #, fuzzy, c-format
  msgid "Cannot find '%s'."
  msgstr "Kan ikke finne «%s»."
  
! #: info/session.c:3719
  #, fuzzy, c-format
  msgid "Could not create output file '%s'."
  msgstr "Kunne ikke opprette utskriftsfil «%s»."
  
! #: info/session.c:3733
  #, fuzzy, c-format
  msgid "error writing to %s: %s"
  msgstr "feil ved skriving til «%s»"
  
! #: info/session.c:3742
  #, fuzzy, c-format
  msgid "closing %s"
  msgstr "Fjerner %s\n"
  
! #: info/session.c:3791
  #, fuzzy, c-format
  msgid "writing node %s..."
***************
*** 1417,1635 ****
  # I need a better substitute for the verb «to pipe».
  # «Å pipe» sounds no good to me.
! #: info/session.c:3831
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "«Pipe» innholdet av denne noden gjennom INFO_PRINT_COMMAND"
  
! #: info/session.c:3859
  #, fuzzy, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Kan ikke åpne «pipe» til «%s»."
  
! #: info/session.c:3864
  #, fuzzy, c-format
  msgid "printing node %s..."
  msgstr "Skriver ut noden «%s»..."
  
! #: info/session.c:3872
  #, fuzzy, c-format
  msgid "finished printing node %s"
  msgstr "Skriver ut noden «%s»..."
  
! #: 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:4169
  msgid "Search continued from the end of the document."
  msgstr ""
  
! #: info/session.c:4174
  #, fuzzy
  msgid "Search continued from the beginning of the document."
  msgstr "Slette til begynnelsen av linjen"
  
! #: info/session.c:4194
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "Søker i delfil «%s»..."
  
! #: info/session.c:4231
  msgid "Search failed."
  msgstr "Søk mislyktes"
  
! #: info/session.c:4248
  #, fuzzy, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%setter streng [%s]: "
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Regexp search"
  msgstr ""
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Search"
  msgstr "Søke"
  
! #: info/session.c:4250 info/session.c:4256
  #, fuzzy
  msgid " case-sensitively"
  msgstr " med skille på store og små bokstaver "
  
! #: info/session.c:4251 info/session.c:4257
  #, fuzzy
  msgid " backward"
  msgstr "Søke bakover"
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s: "
  msgstr ""
  
! #: info/session.c:4274
  msgid "Search string too short"
  msgstr ""
  
! #: info/session.c:4467
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4491 info/session.c:4601
  #, c-format
  msgid "No more matches."
  msgstr ""
  
! #: info/session.c:4628
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4649
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4653 info/session.c:4665
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4661
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4674
  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:4679
  msgid "Read a string and search for it"
  msgstr "Lese inn en streng og søke etter den"
  
! #: info/session.c:4685
  msgid "Read a string and search backward for it"
  msgstr "Lese inn en streng og søke bakover etter den"
  
! #: info/session.c:4693
  msgid "Repeat last search in the same direction"
  msgstr "Gjenta forrige søk i samme retning"
  
! #: info/session.c:4701 info/session.c:4746
  msgid "No previous search string"
  msgstr "Ingen tidligere søkestreng"
  
! #: info/session.c:4738
  msgid "Repeat last search in the reverse direction"
  msgstr "Gjenta forrige søk i motsatt retning"
  
! #: info/session.c:4785
  msgid "Clear displayed search matches"
  msgstr ""
  
! #: info/session.c:4802 info/session.c:4808
  msgid "Search interactively for a string as you type it"
  msgstr "Søke interaktivt for en streng mens du skriver"
  
! #: info/session.c:4928
  #, fuzzy
  msgid "Regexp I-search backward: "
  msgstr "I-søk bakover: "
  
! #: info/session.c:4929
  msgid "I-search backward: "
  msgstr "I-søk bakover: "
  
! #: info/session.c:4931
  #, fuzzy
  msgid "Regexp I-search: "
  msgstr "I-søk: "
  
! #: info/session.c:4932
  msgid "I-search: "
  msgstr "I-søk: "
  
! #: info/session.c:4957 info/session.c:4960
  msgid "Failing "
  msgstr "Mislyktes "
  
! #: info/session.c:5326
  msgid "Cancel current operation"
  msgstr "Avbryte gjeldende operasjon"
  
! #: info/session.c:5333
  msgid "Quit"
  msgstr "Avbrutt"
  
! #: info/session.c:5338
  #, fuzzy
  msgid "Display version of Info being run"
  msgstr "vise programversjon og avslutte"
  
! #: info/session.c:5340
  #, c-format
  msgid "GNU Info version %s"
  msgstr ""
  
! #: info/session.c:5345
  msgid "Redraw the display"
  msgstr "Tegne skjermen på nytt"
  
! #: info/session.c:5382
  msgid "Quit using Info"
  msgstr "Avslutte Info"
  
! #: info/session.c:5398
  msgid "Run command bound to this key's lowercase variant"
  msgstr "Kjør kommandoen knyttet til denne tastens «liten-bokstav-variant»"
  
! #: info/session.c:5409
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Ukjent kommando (%s)."
  
! #: info/session.c:5412
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "«%s» er ugyldig"
  
! #: info/session.c:5413
  #, fuzzy, c-format
  msgid "'%s' is invalid"
  msgstr "«%s» er ugyldig"
  
! #: info/session.c:5731
  msgid "Add this digit to the current numeric argument"
  msgstr "Legge til dette siffret til det gjeldende numeriske argumentet"
  
! #: info/session.c:5738
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "Starte (eller multiplisere med 4) den gjeldende numeriske argumentet"
--- 1412,1630 ----
  # I need a better substitute for the verb «to pipe».
  # «Å pipe» sounds no good to me.
! #: info/session.c:3837
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "«Pipe» innholdet av denne noden gjennom INFO_PRINT_COMMAND"
  
! #: info/session.c:3865
  #, fuzzy, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Kan ikke åpne «pipe» til «%s»."
  
! #: info/session.c:3870
  #, fuzzy, c-format
  msgid "printing node %s..."
  msgstr "Skriver ut noden «%s»..."
  
! #: info/session.c:3878
  #, fuzzy, c-format
  msgid "finished printing node %s"
  msgstr "Skriver ut noden «%s»..."
  
! #: info/session.c:3910
  msgid "Toggle the usage of regular expressions in searches"
  msgstr ""
  
! #: info/session.c:3914
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr ""
  
! #: info/session.c:3915
  #, c-format
  msgid "Using literal strings for searches."
  msgstr ""
  
! #: info/session.c:4175
  msgid "Search continued from the end of the document."
  msgstr ""
  
! #: info/session.c:4180
  #, fuzzy
  msgid "Search continued from the beginning of the document."
  msgstr "Slette til begynnelsen av linjen"
  
! #: info/session.c:4200
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "Søker i delfil «%s»..."
  
! #: info/session.c:4237
  msgid "Search failed."
  msgstr "Søk mislyktes"
  
! #: info/session.c:4254
  #, fuzzy, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%setter streng [%s]: "
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Regexp search"
  msgstr ""
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Search"
  msgstr "Søke"
  
! #: info/session.c:4256 info/session.c:4262
  #, fuzzy
  msgid " case-sensitively"
  msgstr " med skille på store og små bokstaver "
  
! #: info/session.c:4257 info/session.c:4263
  #, fuzzy
  msgid " backward"
  msgstr "Søke bakover"
  
! #: info/session.c:4260
  #, c-format
  msgid "%s%s%s: "
  msgstr ""
  
! #: info/session.c:4280
  msgid "Search string too short"
  msgstr ""
  
! #: info/session.c:4473
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4497 info/session.c:4607
  #, c-format
  msgid "No more matches."
  msgstr ""
  
! #: info/session.c:4634
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4655
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4659 info/session.c:4671
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4667
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4680
  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:4685
  msgid "Read a string and search for it"
  msgstr "Lese inn en streng og søke etter den"
  
! #: info/session.c:4691
  msgid "Read a string and search backward for it"
  msgstr "Lese inn en streng og søke bakover etter den"
  
! #: info/session.c:4699
  msgid "Repeat last search in the same direction"
  msgstr "Gjenta forrige søk i samme retning"
  
! #: info/session.c:4707 info/session.c:4752
  msgid "No previous search string"
  msgstr "Ingen tidligere søkestreng"
  
! #: info/session.c:4744
  msgid "Repeat last search in the reverse direction"
  msgstr "Gjenta forrige søk i motsatt retning"
  
! #: info/session.c:4791
  msgid "Clear displayed search matches"
  msgstr ""
  
! #: info/session.c:4808 info/session.c:4814
  msgid "Search interactively for a string as you type it"
  msgstr "Søke interaktivt for en streng mens du skriver"
  
! #: info/session.c:4934
  #, fuzzy
  msgid "Regexp I-search backward: "
  msgstr "I-søk bakover: "
  
! #: info/session.c:4935
  msgid "I-search backward: "
  msgstr "I-søk bakover: "
  
! #: info/session.c:4937
  #, fuzzy
  msgid "Regexp I-search: "
  msgstr "I-søk: "
  
! #: info/session.c:4938
  msgid "I-search: "
  msgstr "I-søk: "
  
! #: info/session.c:4963 info/session.c:4966
  msgid "Failing "
  msgstr "Mislyktes "
  
! #: info/session.c:5332
  msgid "Cancel current operation"
  msgstr "Avbryte gjeldende operasjon"
  
! #: info/session.c:5339
  msgid "Quit"
  msgstr "Avbrutt"
  
! #: info/session.c:5344
  #, fuzzy
  msgid "Display version of Info being run"
  msgstr "vise programversjon og avslutte"
  
! #: info/session.c:5346
  #, c-format
  msgid "GNU Info version %s"
  msgstr ""
  
! #: info/session.c:5351
  msgid "Redraw the display"
  msgstr "Tegne skjermen på nytt"
  
! #: info/session.c:5388
  msgid "Quit using Info"
  msgstr "Avslutte Info"
  
! #: info/session.c:5404
  msgid "Run command bound to this key's lowercase variant"
  msgstr "Kjør kommandoen knyttet til denne tastens «liten-bokstav-variant»"
  
! #: info/session.c:5415
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Ukjent kommando (%s)."
  
! #: info/session.c:5418
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "«%s» er ugyldig"
  
! #: info/session.c:5419
  #, fuzzy, c-format
  msgid "'%s' is invalid"
  msgstr "«%s» er ugyldig"
  
! #: info/session.c:5737
  msgid "Add this digit to the current numeric argument"
  msgstr "Legge til dette siffret til det gjeldende numeriske argumentet"
  
! #: info/session.c:5744
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "Starte (eller multiplisere med 4) den gjeldende numeriske argumentet"
***************
*** 1770,1787 ****
  msgstr "Sette %s til verdien (%s): "
  
! #: info/window.c:959
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), linjer ----, "
  
- #: info/window.c:966
- #, fuzzy, c-format
- msgid "-%s---Info: %s, %ld lines --%s--"
- msgstr "-%s---Info: %s, %d linjer --%s--"
- 
- #: info/window.c:970
- #, fuzzy, c-format
- msgid "-%s---Info: (%s)%s, %ld lines --%s--"
- msgstr "-%s%s-Info: (%s)%s, %d linjer --%s--"
- 
  #: install-info/install-info.c:292
  #, c-format
--- 1765,1772 ----
  msgstr "Sette %s til verdien (%s): "
  
! #: info/window.c:909
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), linjer ----, "
  
  #: install-info/install-info.c:292
  #, c-format
***************
*** 1907,1911 ****
  "\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"
--- 1892,1896 ----
  "\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"
***************
*** 1998,2115 ****
  msgstr "fant ingen oppføringer for «%s»; ingenting slettet"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:855
! #: tp/Texinfo/Convert/Converter.pm:893 tp/Texinfo/Convert/Converter.pm:1204
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6504
! #: tp/Texinfo/Convert/HTML.pm:6528 tp/Texinfo/Convert/HTML.pm:6905
! #: tp/Texinfo/Convert/HTML.pm:6963 tp/Texinfo/Convert/HTML.pm:7041
! #: tp/Texinfo/Convert/HTML.pm:7118 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:546
! #: tp/Texinfo/Convert/TexinfoXML.pm:457
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "%s: kunne ikke åpne --css-file: %s"
  
! #: tp/Texinfo/Common.pm:881
  msgid "recursion is always allowed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:882
  msgid "arguments are quoted by default"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1105
  #, fuzzy, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s er ikke en gyldig ISO 639-språkkode"
  
! #: tp/Texinfo/Common.pm:1110
  #, fuzzy, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s er ikke en gyldig ISO 639-språkkode"
  
! #: tp/Texinfo/Common.pm:1128
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1151
  #, fuzzy, perl-format
  msgid "could not read %s: %s"
  msgstr "%s: kunne ikke åpne --css-file: %s"
  
! #: tp/Texinfo/Common.pm:1170
  #, fuzzy, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "Feil ved lukking av outputfila «%s»"
  
! #: tp/Texinfo/Common.pm:1176 tp/Texinfo/Parser.pm:3353
  #, fuzzy, perl-format
  msgid "@%s: could not find %s"
  msgstr "%s: kunne ikke åpne --css-file: %s"
  
! #: tp/Texinfo/Common.pm:1520
! #, fuzzy, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr "%s: kunne ikke åpne --css-file: %s"
! 
! #: tp/Texinfo/Common.pm:1548
! #, fuzzy
! msgid "missing type"
! msgstr "manglende handlingsnavn"
! 
! #: tp/Texinfo/Common.pm:1551
! #, fuzzy, perl-format
! msgid "unrecognized type: %s"
! msgstr "%s: ukjent valg «--%s»\n"
! 
! #: tp/Texinfo/Common.pm:1568
! #, fuzzy, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr "Feil ved lukking av outputfila «%s»"
! 
! #: tp/Texinfo/Common.pm:1603
  msgid "no node to be renamed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1614
  msgid "nodes without a new name at the end of file"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1624 tp/Texinfo/Parser.pm:926
  #, fuzzy, perl-format
  msgid "could not open %s: %s"
  msgstr "%s: kunne ikke åpne --css-file: %s"
  
! #: tp/Texinfo/Common.pm:2144
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:395 tp/Texinfo/Convert/Converter.pm:414
  #, fuzzy, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Sett variabel: "
  
! #: tp/Texinfo/Convert/Converter.pm:794
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:876 tp/Texinfo/Convert/Converter.pm:909
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:6931
! #: tp/Texinfo/Convert/HTML.pm:6989 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:476 tp/Texinfo/Parser.pm:2035
  #, fuzzy, perl-format
  msgid "error on closing %s: %s"
  msgstr "Feil ved lukking av outputfila «%s»"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, fuzzy, perl-format
  msgid "could not create directories `%s' or `%s': %s"
  msgstr "Kan ikke opprette katalogen «%s»: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:995
  #, fuzzy, perl-format
  msgid "could not create directory `%s': %s"
--- 1983,2091 ----
  msgstr "fant ingen oppføringer for «%s»; ingenting slettet"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:847
! #: tp/Texinfo/Convert/Converter.pm:885 tp/Texinfo/Convert/Converter.pm:1196
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6573
! #: tp/Texinfo/Convert/HTML.pm:6597 tp/Texinfo/Convert/HTML.pm:6978
! #: tp/Texinfo/Convert/HTML.pm:7037 tp/Texinfo/Convert/HTML.pm:7115
! #: tp/Texinfo/Convert/HTML.pm:7192 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:547
! #: tp/Texinfo/Convert/TexinfoXML.pm:458
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "%s: kunne ikke åpne --css-file: %s"
  
! #: tp/Texinfo/Common.pm:862
  msgid "recursion is always allowed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:863
  msgid "arguments are quoted by default"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:866
! msgid ""
! "move your @contents command if you want the contents after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:869
! msgid ""
! "move your @shortcontents and @contents commands if you want the contents "
! "after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:1093
  #, fuzzy, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s er ikke en gyldig ISO 639-språkkode"
  
! #: tp/Texinfo/Common.pm:1098
  #, fuzzy, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s er ikke en gyldig ISO 639-språkkode"
  
! #: tp/Texinfo/Common.pm:1116
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1139
  #, fuzzy, perl-format
  msgid "could not read %s: %s"
  msgstr "%s: kunne ikke åpne --css-file: %s"
  
! #: tp/Texinfo/Common.pm:1158
  #, fuzzy, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "Feil ved lukking av outputfila «%s»"
  
! #: tp/Texinfo/Common.pm:1164 tp/Texinfo/Parser.pm:3193
  #, fuzzy, perl-format
  msgid "@%s: could not find %s"
  msgstr "%s: kunne ikke åpne --css-file: %s"
  
! #: tp/Texinfo/Common.pm:1637
  msgid "no node to be renamed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1648
  msgid "nodes without a new name at the end of file"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1658 tp/Texinfo/Parser.pm:899
  #, fuzzy, perl-format
  msgid "could not open %s: %s"
  msgstr "%s: kunne ikke åpne --css-file: %s"
  
! #: tp/Texinfo/Common.pm:2178
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:387 tp/Texinfo/Convert/Converter.pm:406
  #, fuzzy, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Sett variabel: "
  
! #: tp/Texinfo/Convert/Converter.pm:786
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:868 tp/Texinfo/Convert/Converter.pm:901
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:7004
! #: tp/Texinfo/Convert/HTML.pm:7063 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:477 tp/Texinfo/Parser.pm:1996
  #, fuzzy, perl-format
  msgid "error on closing %s: %s"
  msgstr "Feil ved lukking av outputfila «%s»"
  
! #: tp/Texinfo/Convert/Converter.pm:979
  #, fuzzy, perl-format
  msgid "could not create directories `%s' or `%s': %s"
  msgstr "Kan ikke opprette katalogen «%s»: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, fuzzy, perl-format
  msgid "could not create directory `%s': %s"
***************
*** 2121,2221 ****
  msgstr "@image-fil «%s» er uleselig: %s"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5388
  #, fuzzy
  msgid "no argument specified for @U"
  msgstr "Ingen nodenavn spesifisert for «%c%s»-kommandoen"
  
! #: tp/Texinfo/Convert/HTML.pm:1683
  #, fuzzy, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
  msgstr "@image-fil «%s» (for HTML) er uleselig: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:2371
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4888
  msgid "string not closed in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4890
  #, fuzzy
  msgid "--css-include ended in comment"
  msgstr "%s:%d: --css-file endte i en kommentar"
  
! #: tp/Texinfo/Convert/HTML.pm:4892
  msgid "@import not finished in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4918
  #, perl-format
  msgid "CSS file %s not found"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4924
  #, fuzzy, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "%s: kunne ikke åpne --css-file: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:4934
  #, fuzzy, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "Feil ved lukking av outputfila «%s»"
  
! #: tp/Texinfo/Convert/HTML.pm:5801 tp/Texinfo/Convert/HTML.pm:5805
  #, fuzzy, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "ingen innslag funnet for «%s»\n"
  
! #: tp/Texinfo/Convert/HTML.pm:6499
  #, fuzzy, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "Feil ved lukking av outputfila «%s»"
  
! #: tp/Texinfo/Convert/HTML.pm:6523
  #, fuzzy, perl-format
  msgid "error on closing TOC frame file %s: %s"
  msgstr "Feil ved lukking av outputfila «%s»"
  
! #: tp/Texinfo/Convert/HTML.pm:6638
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6839
  msgid "must specify a title with a title command or @top"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7048
  #, fuzzy, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr "Feil ved lukking av outputfila «%s»"
  
! #: tp/Texinfo/Convert/HTML.pm:7073
  #, fuzzy, perl-format
  msgid "old name for `%s' is a node of the document"
  msgstr "Ingen «forrige» eller «opp» for denne noden i dette dokumentet."
  
! #: tp/Texinfo/Convert/HTML.pm:7079
  #, fuzzy, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "ureferert node «%s»"
  
! #: tp/Texinfo/Convert/HTML.pm:7093
  #, perl-format
  msgid "target node (new name for `%s') not in document: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7125
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7163
  msgid "empty node name"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7165 tp/Texinfo/Parser.pm:3697
  #, perl-format
  msgid "syntax for an external node used for `%s'"
--- 2097,2217 ----
  msgstr "@image-fil «%s» er uleselig: %s"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5225
  #, fuzzy
  msgid "no argument specified for @U"
  msgstr "Ingen nodenavn spesifisert for «%c%s»-kommandoen"
  
! #: tp/Texinfo/Convert/HTML.pm:1715
  #, fuzzy, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
  msgstr "@image-fil «%s» (for HTML) er uleselig: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:2399
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4629
! #, fuzzy, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr "%s: kunne ikke åpne --css-file: %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4657
! #, fuzzy
! msgid "missing type"
! msgstr "manglende handlingsnavn"
! 
! #: tp/Texinfo/Convert/HTML.pm:4660
! #, fuzzy, perl-format
! msgid "unrecognized type: %s"
! msgstr "%s: ukjent valg «--%s»\n"
! 
! #: tp/Texinfo/Convert/HTML.pm:4677
! #, fuzzy, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr "Feil ved lukking av outputfila «%s»"
! 
! #: tp/Texinfo/Convert/HTML.pm:4962
  msgid "string not closed in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4964
  #, fuzzy
  msgid "--css-include ended in comment"
  msgstr "%s:%d: --css-file endte i en kommentar"
  
! #: tp/Texinfo/Convert/HTML.pm:4966
  msgid "@import not finished in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4992
  #, perl-format
  msgid "CSS file %s not found"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4998
  #, fuzzy, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "%s: kunne ikke åpne --css-file: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5008
  #, fuzzy, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "Feil ved lukking av outputfila «%s»"
  
! #: tp/Texinfo/Convert/HTML.pm:5870 tp/Texinfo/Convert/HTML.pm:5874
  #, fuzzy, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "ingen innslag funnet for «%s»\n"
  
! #: tp/Texinfo/Convert/HTML.pm:6568
  #, fuzzy, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "Feil ved lukking av outputfila «%s»"
  
! #: tp/Texinfo/Convert/HTML.pm:6592
  #, fuzzy, perl-format
  msgid "error on closing TOC frame file %s: %s"
  msgstr "Feil ved lukking av outputfila «%s»"
  
! #: tp/Texinfo/Convert/HTML.pm:6707
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6912
  msgid "must specify a title with a title command or @top"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7122
  #, fuzzy, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr "Feil ved lukking av outputfila «%s»"
  
! #: tp/Texinfo/Convert/HTML.pm:7147
  #, fuzzy, perl-format
  msgid "old name for `%s' is a node of the document"
  msgstr "Ingen «forrige» eller «opp» for denne noden i dette dokumentet."
  
! #: tp/Texinfo/Convert/HTML.pm:7153
  #, fuzzy, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "ureferert node «%s»"
  
! #: tp/Texinfo/Convert/HTML.pm:7167
  #, perl-format
  msgid "target node (new name for `%s') not in document: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7199
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7237
  msgid "empty node name"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7239 tp/Texinfo/Parser.pm:3542
  #, perl-format
  msgid "syntax for an external node used for `%s'"
***************
*** 2251,2280 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1334
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1381 tp/Texinfo/Parser.pm:2722
  #, fuzzy, perl-format
  msgid "entry for index `%s' outside of any node"
  msgstr "Innslag for indeksen «%s» utenfor node"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1495
  #, fuzzy, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr "Feil ved lukking av outputfila «%s»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1500
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "@image-fil «%s» er uleselig: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1523
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1931
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
--- 2247,2276 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1335
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1382 tp/Texinfo/Parser.pm:2568
  #, fuzzy, perl-format
  msgid "entry for index `%s' outside of any node"
  msgstr "Innslag for indeksen «%s» utenfor node"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1496
  #, fuzzy, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr "Feil ved lukking av outputfila «%s»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1501
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "@image-fil «%s» er uleselig: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1524
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1932
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
***************
*** 2284,2602 ****
  "unngå dette"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2161
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2193
  #, fuzzy, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "Ingen %sindeksinnslag inneholdende «%s»."
  
! #: tp/Texinfo/Convert/Plaintext.pm:2226
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2272
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2275
  msgid "`.' or `,' must follow @xref"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3118
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3129
  msgid "menu entry node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3145
  msgid "menu entry name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:910
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1160 tp/Texinfo/Structuring.pm:594
  #, perl-format
  msgid "multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1194
  #, perl-format
! msgid "bad syntax for @%s argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1210
  #, perl-format
! msgid "bad or empty @%s formal argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1219 tp/Texinfo/Parser.pm:4856
! #: tp/Texinfo/Parser.pm:4882 tp/Texinfo/Parser.pm:5671
! #: tp/Texinfo/Parser.pm:5687 tp/Texinfo/Parser.pm:5702
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s krever et navn"
  
! #: tp/Texinfo/Parser.pm:1223 tp/Texinfo/Parser.pm:4859
! #: tp/Texinfo/Parser.pm:4885 tp/Texinfo/Parser.pm:5674
! #: tp/Texinfo/Parser.pm:5690 tp/Texinfo/Parser.pm:5705
  #, fuzzy, perl-format
  msgid "bad name for @%s"
  msgstr "Ugyldig argument til @%s"
  
! #: tp/Texinfo/Parser.pm:1341
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1345
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1350
! #, perl-format
! msgid "%c%s missing close brace"
  msgstr "%c%s mangler avsluttende krøllparentes"
  
! #: tp/Texinfo/Parser.pm:1354
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1476
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1544
  msgid "@itemx must follow @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1712
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1743
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "`@end' forventet «%s», men så «%s»"
  
! #: tp/Texinfo/Parser.pm:1746
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1750
  #, fuzzy, perl-format
  msgid "no matching `%cend %s'"
  msgstr "Ingen tilsvarende «%cend %s»"
  
! #: tp/Texinfo/Parser.pm:1776 tp/Texinfo/Parser.pm:5204
! #: tp/Texinfo/Parser.pm:5470
  #, fuzzy, perl-format
  msgid "misplaced %c"
  msgstr "Feilplassert %c"
  
! #: tp/Texinfo/Parser.pm:1874 tp/Texinfo/Parser.pm:3312
  #, fuzzy, perl-format
  msgid "unmatched `%c%s'"
  msgstr "Umatchet «%c%s»"
  
! #: tp/Texinfo/Parser.pm:2110
  #, fuzzy, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "Makroen «%s» kalt på linje %d med for mange argumenter"
  
! #: tp/Texinfo/Parser.pm:2132
  #, fuzzy, perl-format
! msgid "@%s missing close brace"
  msgstr "%c%s mangler avsluttende krøllparentes"
  
! #: tp/Texinfo/Parser.pm:2140
  #, fuzzy, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr "Makroen «%s» kalt på linje %d med for mange argumenter"
  
! #: tp/Texinfo/Parser.pm:2175
  #, fuzzy, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
  msgstr "\\ i makroekspansjon fulgt av «%s» istedet for parameternavn"
  
! #: tp/Texinfo/Parser.pm:2650
  #, fuzzy, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "makroen «%s» er tidligere definert"
  
! #: tp/Texinfo/Parser.pm:2655
  #, fuzzy, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "her er den tidligere definisjonen av «%s»"
  
! #: tp/Texinfo/Parser.pm:3016
  #, fuzzy, perl-format
  msgid "missing name for @%s"
  msgstr "manglende handlingsnavn"
  
! #: tp/Texinfo/Parser.pm:3021
  #, perl-format
  msgid "missing category for @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3073
  #, fuzzy, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "argumentene til @%s ble ignorert"
  
! #: tp/Texinfo/Parser.pm:3089
  #, fuzzy
  msgid "empty multitable"
  msgstr "%s: tom fil"
  
! #: tp/Texinfo/Parser.pm:3145 tp/Texinfo/Parser.pm:5784
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s"
  msgstr "Ugyldig argument til @%s"
  
! #: tp/Texinfo/Parser.pm:3151 tp/Texinfo/Parser.pm:5806
! #: tp/Texinfo/Parser.pm:5818
  #, fuzzy, perl-format
  msgid "bad argument to @%s"
  msgstr "Ugyldig argument til @%s"
  
! #: tp/Texinfo/Parser.pm:3162
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s krever et argument: formattereren for %citem"
  
! #: tp/Texinfo/Parser.pm:3167
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3202
  #, fuzzy, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "%s: valget «--%s» tillater ikke et argument\n"
  
! #: tp/Texinfo/Parser.pm:3290 tp/Texinfo/Parser.pm:3429
! #: tp/Texinfo/Parser.pm:5777
  #, fuzzy, perl-format
  msgid "@%s missing argument"
  msgstr "%s: mangler filargument.\n"
  
! #: tp/Texinfo/Parser.pm:3302
  #, fuzzy, perl-format
  msgid "unknown @end %s"
  msgstr "Ukjent indeks «%s»"
  
! #: tp/Texinfo/Parser.pm:3324 tp/Texinfo/Parser.pm:3943
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "Ugyldig argument til @%s"
  
! #: tp/Texinfo/Parser.pm:3329 tp/Texinfo/Parser.pm:5861
! #: tp/Texinfo/Parser.pm:5906 tp/Texinfo/Parser.pm:5935
! #: tp/Texinfo/Parser.pm:5976 tp/Texinfo/Parser.pm:6055
  #, fuzzy, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "Ugyldig argument til @%s"
  
! #: tp/Texinfo/Parser.pm:3348
  #, fuzzy, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "%s: kunne ikke åpne --css-file: %s"
  
! #: tp/Texinfo/Parser.pm:3360
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3369
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "ugjenkjennelig kodingsnavn «%s»"
  
! #: tp/Texinfo/Parser.pm:3516
  #, perl-format
  msgid "@%s after the first element"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3523
  #, fuzzy, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s er meningsløs utenfor et «@titlepage»-miljø"
  
! #: tp/Texinfo/Parser.pm:3563
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3575
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3677
  #, fuzzy, perl-format
  msgid "empty argument in @%s"
  msgstr "Ugyldig argument til @%s"
  
! #: tp/Texinfo/Parser.pm:3681
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3724
  #, fuzzy, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "Ingen meny i noden «%s»."
  
! #: tp/Texinfo/Parser.pm:3732
  msgid "empty node name in menu entry"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3805
  #, fuzzy, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "%s: kunne ikke åpne --css-file: %s"
  
! #: tp/Texinfo/Parser.pm:3937
! #, perl-format
! msgid "@end %s should only appear at a line beginning"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:3960
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "makroen «%s» er tidligere definert"
  
! #: tp/Texinfo/Parser.pm:3963
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "her er den tidligere definisjonen av «%s»"
  
! #: tp/Texinfo/Parser.pm:3968
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4017
  #, perl-format
  msgid "@%s without associated character"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4087
  #, perl-format
  msgid ""
--- 2280,2599 ----
  "unngå dette"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2162
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2194
  #, fuzzy, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "Ingen %sindeksinnslag inneholdende «%s»."
  
! #: tp/Texinfo/Convert/Plaintext.pm:2227
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2273
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2276
  msgid "`.' or `,' must follow @xref"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3086
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3097
  msgid "menu entry node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3113
  msgid "menu entry name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:883
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1125 tp/Texinfo/Structuring.pm:595
  #, perl-format
  msgid "multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1166
  #, perl-format
! msgid "bad or empty @%s formal argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1176
  #, perl-format
! msgid "bad syntax for @%s argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1183 tp/Texinfo/Parser.pm:4707
! #: tp/Texinfo/Parser.pm:4733 tp/Texinfo/Parser.pm:5565
! #: tp/Texinfo/Parser.pm:5578 tp/Texinfo/Parser.pm:5592
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s krever et navn"
  
! #: tp/Texinfo/Parser.pm:1187 tp/Texinfo/Parser.pm:4710
! #: tp/Texinfo/Parser.pm:4736 tp/Texinfo/Parser.pm:5568
! #: tp/Texinfo/Parser.pm:5581 tp/Texinfo/Parser.pm:5595
  #, fuzzy, perl-format
  msgid "bad name for @%s"
  msgstr "Ugyldig argument til @%s"
  
! #: tp/Texinfo/Parser.pm:1305
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1309
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1314
! #, fuzzy, perl-format
! msgid "%c%s missing closing brace"
  msgstr "%c%s mangler avsluttende krøllparentes"
  
! #: tp/Texinfo/Parser.pm:1318
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1440
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1508
  msgid "@itemx must follow @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1676
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1707
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "`@end' forventet «%s», men så «%s»"
  
! #: tp/Texinfo/Parser.pm:1710
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1714
  #, fuzzy, perl-format
  msgid "no matching `%cend %s'"
  msgstr "Ingen tilsvarende «%cend %s»"
  
! #: tp/Texinfo/Parser.pm:1738 tp/Texinfo/Parser.pm:5070
! #: tp/Texinfo/Parser.pm:5308
  #, fuzzy, perl-format
  msgid "misplaced %c"
  msgstr "Feilplassert %c"
  
! #: tp/Texinfo/Parser.pm:1835 tp/Texinfo/Parser.pm:3148
  #, fuzzy, perl-format
  msgid "unmatched `%c%s'"
  msgstr "Umatchet «%c%s»"
  
! #: tp/Texinfo/Parser.pm:2072
  #, fuzzy, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "Makroen «%s» kalt på linje %d med for mange argumenter"
  
! #: tp/Texinfo/Parser.pm:2094
  #, fuzzy, perl-format
! msgid "@%s missing closing brace"
  msgstr "%c%s mangler avsluttende krøllparentes"
  
! #: tp/Texinfo/Parser.pm:2102
  #, fuzzy, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr "Makroen «%s» kalt på linje %d med for mange argumenter"
  
! #: tp/Texinfo/Parser.pm:2138
  #, fuzzy, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
  msgstr "\\ i makroekspansjon fulgt av «%s» istedet for parameternavn"
  
! #: tp/Texinfo/Parser.pm:2501
  #, fuzzy, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "makroen «%s» er tidligere definert"
  
! #: tp/Texinfo/Parser.pm:2506
  #, fuzzy, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "her er den tidligere definisjonen av «%s»"
  
! #: tp/Texinfo/Parser.pm:2850
  #, fuzzy, perl-format
  msgid "missing name for @%s"
  msgstr "manglende handlingsnavn"
  
! #: tp/Texinfo/Parser.pm:2855
  #, perl-format
  msgid "missing category for @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2890
  #, fuzzy, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "argumentene til @%s ble ignorert"
  
! #: tp/Texinfo/Parser.pm:2905
  #, fuzzy
  msgid "empty multitable"
  msgstr "%s: tom fil"
  
! #: tp/Texinfo/Parser.pm:2959 tp/Texinfo/Parser.pm:5673
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s"
  msgstr "Ugyldig argument til @%s"
  
! #: tp/Texinfo/Parser.pm:2965 tp/Texinfo/Parser.pm:5694
! #: tp/Texinfo/Parser.pm:5705
  #, fuzzy, perl-format
  msgid "bad argument to @%s"
  msgstr "Ugyldig argument til @%s"
  
! #: tp/Texinfo/Parser.pm:2976
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s krever et argument: formattereren for %citem"
  
! #: tp/Texinfo/Parser.pm:2981
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3016
  #, fuzzy, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "%s: valget «--%s» tillater ikke et argument\n"
  
! #: tp/Texinfo/Parser.pm:3124 tp/Texinfo/Parser.pm:3277
! #: tp/Texinfo/Parser.pm:5666
  #, fuzzy, perl-format
  msgid "@%s missing argument"
  msgstr "%s: mangler filargument.\n"
  
! #: tp/Texinfo/Parser.pm:3138
  #, fuzzy, perl-format
  msgid "unknown @end %s"
  msgstr "Ukjent indeks «%s»"
  
! #: tp/Texinfo/Parser.pm:3161 tp/Texinfo/Parser.pm:3788
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "Ugyldig argument til @%s"
  
! #: tp/Texinfo/Parser.pm:3167 tp/Texinfo/Parser.pm:3245
! #: tp/Texinfo/Parser.pm:5755 tp/Texinfo/Parser.pm:5798
! #: tp/Texinfo/Parser.pm:5827 tp/Texinfo/Parser.pm:5868
! #: tp/Texinfo/Parser.pm:5946
  #, fuzzy, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "Ugyldig argument til @%s"
  
! #: tp/Texinfo/Parser.pm:3188
  #, fuzzy, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "%s: kunne ikke åpne --css-file: %s"
  
! #: tp/Texinfo/Parser.pm:3200
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3208
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "ugjenkjennelig kodingsnavn «%s»"
  
! #: tp/Texinfo/Parser.pm:3364
  #, perl-format
  msgid "@%s after the first element"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3371
  #, fuzzy, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s er meningsløs utenfor et «@titlepage»-miljø"
  
! #: tp/Texinfo/Parser.pm:3408
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3420
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3522
  #, fuzzy, perl-format
  msgid "empty argument in @%s"
  msgstr "Ugyldig argument til @%s"
  
! #: tp/Texinfo/Parser.pm:3526
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3569
  #, fuzzy, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "Ingen meny i noden «%s»."
  
! #: tp/Texinfo/Parser.pm:3577
  msgid "empty node name in menu entry"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3650
  #, fuzzy, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "%s: kunne ikke åpne --css-file: %s"
  
! #: tp/Texinfo/Parser.pm:3782
! #, fuzzy, perl-format
! msgid "@end %s should only appear at the beginning of a line"
! msgstr "Slette til begynnelsen av linjen"
  
! #: tp/Texinfo/Parser.pm:3804
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "makroen «%s» er tidligere definert"
  
! #: tp/Texinfo/Parser.pm:3807
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "her er den tidligere definisjonen av «%s»"
  
! #: tp/Texinfo/Parser.pm:3812
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3879
  #, perl-format
  msgid "@%s without associated character"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3949
  #, perl-format
  msgid ""
***************
*** 2604,2608 ****
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4111
  #, perl-format
  msgid ""
--- 2601,2605 ----
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3974
  #, perl-format
  msgid ""
***************
*** 2611,2736 ****
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4120
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4176
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4182
  #, fuzzy, 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/Parser.pm:4195 tp/Texinfo/Parser.pm:5325
  #, fuzzy, perl-format
  msgid "%c%s expects `i' or `j' as argument, not `%s'"
  msgstr "%c%s forventer «i» eller «j» som argument, ikke «%c»"
  
! #: tp/Texinfo/Parser.pm:4207
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4218
  #, fuzzy, perl-format
  msgid "@%s expected braces"
  msgstr "%c%s forventet krøllparanteser"
  
! #: tp/Texinfo/Parser.pm:4383
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "udefinert flagg: %s"
  
! #: tp/Texinfo/Parser.pm:4386
  msgid "bad syntax for @value"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4393
  #, fuzzy, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s er utgått"
  
! #: tp/Texinfo/Parser.pm:4396
  #, fuzzy, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s er utgått"
  
! #: tp/Texinfo/Parser.pm:4405
! #, perl-format
! msgid "@%s should only appear at a line beginning"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:4496
  #, fuzzy, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s er meningsløs innenfor en «@%s»-blokk"
  
! #: tp/Texinfo/Parser.pm:4505
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4631 tp/Texinfo/Parser.pm:4648
! #: tp/Texinfo/Parser.pm:4698
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s er meningsløs innenfor en «@%s»-blokk"
  
! #: tp/Texinfo/Parser.pm:4658
  #, fuzzy, perl-format
  msgid "@%s in empty multitable"
  msgstr "%s: tom fil"
  
! #: tp/Texinfo/Parser.pm:4664
  msgid "@tab before @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4667
  #, fuzzy, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "For mange kolonner i multitabellrad (maks %d)"
  
! #: tp/Texinfo/Parser.pm:4704
  msgid "ignoring @tab outside of multitable"
  msgstr "ignorerer @tab utenfor multitabell"
  
! #: tp/Texinfo/Parser.pm:4708
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4745
  #, fuzzy, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "Må være i et «@%s»-miljø for å bruke «@%s»"
  
! #: tp/Texinfo/Parser.pm:4787
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "@%s gir ikke mening utenfor «@titlepage»- og «@quotation»-miljøer"
  
! #: tp/Texinfo/Parser.pm:4791
  msgid "@dircategory after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4979
  #, fuzzy, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "Fotnoter i fotnoter er ikke tillatt"
  
! #: tp/Texinfo/Parser.pm:4997
  msgid "@direntry after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5005
  #, fuzzy, perl-format
  msgid "@%s seen before first @node"
  msgstr "@menu sett før første @node, oppretter «Top»-noden"
  
! #: tp/Texinfo/Parser.pm:5008
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
--- 2608,2733 ----
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3983
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4038
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4044
  #, fuzzy, 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/Parser.pm:4057 tp/Texinfo/Parser.pm:5189
  #, fuzzy, perl-format
  msgid "%c%s expects `i' or `j' as argument, not `%s'"
  msgstr "%c%s forventer «i» eller «j» som argument, ikke «%c»"
  
! #: tp/Texinfo/Parser.pm:4068
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4079
  #, fuzzy, perl-format
  msgid "@%s expected braces"
  msgstr "%c%s forventet krøllparanteser"
  
! #: tp/Texinfo/Parser.pm:4233
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "udefinert flagg: %s"
  
! #: tp/Texinfo/Parser.pm:4236
  msgid "bad syntax for @value"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4243
  #, fuzzy, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s er utgått"
  
! #: tp/Texinfo/Parser.pm:4246
  #, fuzzy, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s er utgått"
  
! #: tp/Texinfo/Parser.pm:4255
! #, fuzzy, perl-format
! msgid "@%s should only appear at the beginning of a line"
! msgstr "Slette til begynnelsen av linjen"
  
! #: tp/Texinfo/Parser.pm:4346
  #, fuzzy, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s er meningsløs innenfor en «@%s»-blokk"
  
! #: tp/Texinfo/Parser.pm:4355
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4479 tp/Texinfo/Parser.pm:4496
! #: tp/Texinfo/Parser.pm:4546
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s er meningsløs innenfor en «@%s»-blokk"
  
! #: tp/Texinfo/Parser.pm:4506
  #, fuzzy, perl-format
  msgid "@%s in empty multitable"
  msgstr "%s: tom fil"
  
! #: tp/Texinfo/Parser.pm:4512
  msgid "@tab before @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4515
  #, fuzzy, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "For mange kolonner i multitabellrad (maks %d)"
  
! #: tp/Texinfo/Parser.pm:4552
  msgid "ignoring @tab outside of multitable"
  msgstr "ignorerer @tab utenfor multitabell"
  
! #: tp/Texinfo/Parser.pm:4556
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4596
  #, fuzzy, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "Må være i et «@%s»-miljø for å bruke «@%s»"
  
! #: tp/Texinfo/Parser.pm:4638
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "@%s gir ikke mening utenfor «@titlepage»- og «@quotation»-miljøer"
  
! #: tp/Texinfo/Parser.pm:4642
  msgid "@dircategory after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4847
  #, fuzzy, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "Fotnoter i fotnoter er ikke tillatt"
  
! #: tp/Texinfo/Parser.pm:4864
  msgid "@direntry after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4872
  #, fuzzy, perl-format
  msgid "@%s seen before first @node"
  msgstr "@menu sett før første @node, oppretter «Top»-noden"
  
! #: tp/Texinfo/Parser.pm:4875
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
***************
*** 2738,2915 ****
  "kanskje burde din @top-node bli pakket inn i @ifnottex istedet for @ifinfo?"
  
! #: tp/Texinfo/Parser.pm:5070
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5078
  #, fuzzy, perl-format
  msgid "unknown command `%s'"
  msgstr "Ukjent kommando «%s»"
  
! #: tp/Texinfo/Parser.pm:5088
  #, fuzzy
  msgid "unexpected @"
  msgstr "Forventet «%s»"
  
! #: tp/Texinfo/Parser.pm:5117
  #, fuzzy, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s er meningsløs utenfor et «@float»-miljø"
  
! #: tp/Texinfo/Parser.pm:5122
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5130
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5249
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5273
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5292
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5303
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5316
  msgid "@image missing filename argument"
  msgstr "@image mangler filnavn"
  
! #: tp/Texinfo/Parser.pm:5348
  #, fuzzy, perl-format
  msgid "@%s missing first argument"
  msgstr "%s: mangler filargument.\n"
  
! #: tp/Texinfo/Parser.pm:5393
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5399
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5412
! #, perl-format
! msgid "argument for @U exceeds size of integer: %s"
! msgstr ""
! 
! #: tp/Texinfo/Parser.pm:5418
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5546
  msgid "superfluous arguments for node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5596
  #, fuzzy, perl-format
  msgid "expected @end %s"
  msgstr "Forventet «%s»"
  
! #: tp/Texinfo/Parser.pm:5718
  #, fuzzy, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "Bruk krøllparenteser for å gi en kommando som et argument til @%s"
  
! #: tp/Texinfo/Parser.pm:5728
  #, fuzzy, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "argumentene til @%s ble ignorert"
  
! #: tp/Texinfo/Parser.pm:5801
  #, fuzzy, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "Bruk krøllparenteser for å gi en kommando som et argument til @%s"
  
! #: tp/Texinfo/Parser.pm:5823
  #, perl-format
  msgid "empty @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5831
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5840
  #, fuzzy, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "%s: %s arg må være numerisk, ikke «%s».\n"
  
! #: tp/Texinfo/Parser.pm:5849
  #, perl-format
  msgid "reserved index name %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5868
  #, fuzzy, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "Ukjent indeks «%s»"
  
! #: tp/Texinfo/Parser.pm:5871
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5914
  #, fuzzy, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "Ukjent indeks «%s» i @printindex"
  
! #: tp/Texinfo/Parser.pm:5920
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5928
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5944
  #, fuzzy, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
  msgstr "%s: %s arg må være numerisk, ikke «%s».\n"
  
! #: tp/Texinfo/Parser.pm:5952
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5960
  #, fuzzy, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
  msgstr "%s: --footnote-style arg må være «separate» eller «end», ikke «%s».\n"
  
! #: tp/Texinfo/Parser.pm:5968
  #, fuzzy, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
  msgstr "%s: %s arg må være numerisk, ikke «%s».\n"
  
! #: tp/Texinfo/Parser.pm:5986 tp/Texinfo/Parser.pm:5991
  #, fuzzy, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
--- 2735,2907 ----
  "kanskje burde din @top-node bli pakket inn i @ifnottex istedet for @ifinfo?"
  
! #: tp/Texinfo/Parser.pm:4937
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4945
  #, fuzzy, perl-format
  msgid "unknown command `%s'"
  msgstr "Ukjent kommando «%s»"
  
! #: tp/Texinfo/Parser.pm:4955
  #, fuzzy
  msgid "unexpected @"
  msgstr "Forventet «%s»"
  
! #: tp/Texinfo/Parser.pm:4983
  #, fuzzy, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s er meningsløs utenfor et «@float»-miljø"
  
! #: tp/Texinfo/Parser.pm:4988
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4996
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5114
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5138
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5156
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5167
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5180
  msgid "@image missing filename argument"
  msgstr "@image mangler filnavn"
  
! #: tp/Texinfo/Parser.pm:5211
  #, fuzzy, perl-format
  msgid "@%s missing first argument"
  msgstr "%s: mangler filargument.\n"
  
! #: tp/Texinfo/Parser.pm:5230
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5236
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5253
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5448
  msgid "superfluous arguments for node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5498
  #, fuzzy, perl-format
  msgid "expected @end %s"
  msgstr "Forventet «%s»"
  
! #: tp/Texinfo/Parser.pm:5607
  #, fuzzy, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "Bruk krøllparenteser for å gi en kommando som et argument til @%s"
  
! #: tp/Texinfo/Parser.pm:5617
  #, fuzzy, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "argumentene til @%s ble ignorert"
  
! #: tp/Texinfo/Parser.pm:5689
  #, fuzzy, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "Bruk krøllparenteser for å gi en kommando som et argument til @%s"
  
! #: tp/Texinfo/Parser.pm:5710
  #, perl-format
  msgid "empty @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5727
  #, fuzzy, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "%s: %s arg må være numerisk, ikke «%s».\n"
  
! #: tp/Texinfo/Parser.pm:5736
  #, perl-format
  msgid "reserved index name %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5762
  #, fuzzy, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "Ukjent indeks «%s»"
  
! #: tp/Texinfo/Parser.pm:5765
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5793
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5806
  #, fuzzy, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "Ukjent indeks «%s» i @printindex"
  
! #: tp/Texinfo/Parser.pm:5812
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5820
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5836
  #, fuzzy, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
  msgstr "%s: %s arg må være numerisk, ikke «%s».\n"
  
! #: tp/Texinfo/Parser.pm:5844
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5852
  #, fuzzy, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
  msgstr "%s: --footnote-style arg må være «separate» eller «end», ikke «%s».\n"
  
! #: tp/Texinfo/Parser.pm:5860
  #, fuzzy, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
  msgstr "%s: %s arg må være numerisk, ikke «%s».\n"
  
! #: tp/Texinfo/Parser.pm:5878 tp/Texinfo/Parser.pm:5883
  #, fuzzy, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
***************
*** 2917,2921 ****
  "%s: --paragraph-indent arg må være numerisk/«none»/«asis», ikke «%s».\n"
  
! #: tp/Texinfo/Parser.pm:5999
  #, fuzzy, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
--- 2909,2913 ----
  "%s: --paragraph-indent arg må være numerisk/«none»/«asis», ikke «%s».\n"
  
! #: tp/Texinfo/Parser.pm:5891
  #, fuzzy, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
***************
*** 2923,2927 ****
  "%s: --paragraph-indent arg må være numerisk/«none»/«asis», ikke «%s».\n"
  
! #: tp/Texinfo/Parser.pm:6009
  #, fuzzy, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
--- 2915,2919 ----
  "%s: --paragraph-indent arg må være numerisk/«none»/«asis», ikke «%s».\n"
  
! #: tp/Texinfo/Parser.pm:5901
  #, fuzzy, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
***************
*** 2929,2978 ****
  "%s: --paragraph-indent arg må være numerisk/«none»/«asis», ikke «%s».\n"
  
! #: tp/Texinfo/Parser.pm:6021
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:6031
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:6039
  #, fuzzy, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
  msgstr "%s: --footnote-style arg må være «separate» eller «end», ikke «%s».\n"
  
! #: tp/Texinfo/Parser.pm:6047
  #, fuzzy, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
  msgstr "%s: --footnote-style arg må være «separate» eller «end», ikke «%s».\n"
  
! #: tp/Texinfo/Structuring.pm:213
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:245
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:250
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:339
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:488
  #, perl-format
  msgid "@%s not empty"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:544 tp/Texinfo/Structuring.pm:1326
  #, fuzzy, perl-format
  msgid "@%s reference to nonexistent node `%s'"
--- 2921,2970 ----
  "%s: --paragraph-indent arg må være numerisk/«none»/«asis», ikke «%s».\n"
  
! #: tp/Texinfo/Parser.pm:5913
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5922
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5930
  #, fuzzy, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
  msgstr "%s: --footnote-style arg må være «separate» eller «end», ikke «%s».\n"
  
! #: tp/Texinfo/Parser.pm:5938
  #, fuzzy, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
  msgstr "%s: --footnote-style arg må være «separate» eller «end», ikke «%s».\n"
  
! #: tp/Texinfo/Structuring.pm:216
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:248
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:253
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:342
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:491
  #, perl-format
  msgid "@%s not empty"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:547 tp/Texinfo/Structuring.pm:1325
  #, fuzzy, perl-format
  msgid "@%s reference to nonexistent node `%s'"
***************
*** 2980,3024 ****
  "%s referanse til ikke-eksisterende node «%s» (kanskje ugyldig inndeling?)"
  
! #: tp/Texinfo/Structuring.pm:557
  #, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:662
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "ureferert node «%s»"
  
! #: tp/Texinfo/Structuring.pm:708
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:715
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:733
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:787
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:814
  #, fuzzy, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "ureferert node «%s»"
  
! #: tp/Texinfo/Structuring.pm:834
  #, fuzzy, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
  msgstr "Noden «%s» mangler et menypunkt for «%s» selv om den er dens oppmål"
  
! #: tp/Texinfo/Structuring.pm:842
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
--- 2972,3016 ----
  "%s referanse til ikke-eksisterende node «%s» (kanskje ugyldig inndeling?)"
  
! #: tp/Texinfo/Structuring.pm:558
  #, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:663
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "ureferert node «%s»"
  
! #: tp/Texinfo/Structuring.pm:706
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:713
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:731
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:786
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:810
  #, fuzzy, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "ureferert node «%s»"
  
! #: tp/Texinfo/Structuring.pm:829
  #, fuzzy, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
  msgstr "Noden «%s» mangler et menypunkt for «%s» selv om den er dens oppmål"
  
! #: tp/Texinfo/Structuring.pm:837
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
***************
*** 3030,3034 ****
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:2070
  #, perl-format
  msgid "empty index key in @%s"
--- 3022,3026 ----
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:2067
  #, perl-format
  msgid "empty index key in @%s"
***************
*** 3512,3530 ****
  msgstr "Prøv «%s --help» for mer informasjon.\n"
  
! #: tp/texi2any.pl:1232
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
  
! #: tp/texi2any.pl:1255
  #, fuzzy, perl-format
  msgid "error on closing macro expand file %s: %s\n"
  msgstr "Feil ved lukking av outputfila «%s»"
  
! #: tp/texi2any.pl:1261
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "%s: kunne ikke åpne --css-file: %s"
  
! #: tp/texi2any.pl:1286
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
--- 3504,3522 ----
  msgstr "Prøv «%s --help» for mer informasjon.\n"
  
! #: tp/texi2any.pl:1239
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
  
! #: tp/texi2any.pl:1262
  #, fuzzy, perl-format
  msgid "error on closing macro expand file %s: %s\n"
  msgstr "Feil ved lukking av outputfila «%s»"
  
! #: tp/texi2any.pl:1268
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "%s: kunne ikke åpne --css-file: %s"
  
! #: tp/texi2any.pl:1293
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
***************
*** 3532,3546 ****
  msgstr ""
  
! #: tp/texi2any.pl:1359 tp/texi2any.pl:1435
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1382 tp/texi2any.pl:1416
  #, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1388 tp/texi2any.pl:1422
  #, fuzzy, perl-format
  msgid "%s: could not open %s for writing: %s\n"
--- 3524,3538 ----
  msgstr ""
  
! #: tp/texi2any.pl:1366 tp/texi2any.pl:1442
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1389 tp/texi2any.pl:1423
  #, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1395 tp/texi2any.pl:1429
  #, fuzzy, perl-format
  msgid "%s: could not open %s for writing: %s\n"
***************
*** 3976,3979 ****
--- 3968,3977 ----
  #~ msgstr "--*** Tagger er ute av synk ***"
  
+ #~ msgid "-%s---Info: %s, %d lines --%s--"
+ #~ msgstr "-%s---Info: %s, %d linjer --%s--"
+ 
+ #~ msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
+ #~ msgstr "-%s%s-Info: (%s)%s, %d linjer --%s--"
+ 
  #~ msgid " Subfile: %s"
  #~ msgstr " Delfil: %s"
Binary files texinfo-6.1/po/nl.gmo and texinfo-6.3/po/nl.gmo differ
diff -Nrc2 texinfo-6.1/po/nl.po texinfo-6.3/po/nl.po
*** texinfo-6.1/po/nl.po	2016-02-06 11:35:52.000000000 +0000
--- texinfo-6.3/po/nl.po	2016-09-10 12:45:54.000000000 +0100
***************
*** 14,21 ****
  msgid ""
  msgstr ""
! "Project-Id-Version: texinfo-6.0.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
! "PO-Revision-Date: 2016-01-01 17:34+0100\n"
  "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
  "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
--- 14,21 ----
  msgid ""
  msgstr ""
! "Project-Id-Version: texinfo-6.1.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:45+0100\n"
! "PO-Revision-Date: 2016-08-21 10:52+0200\n"
  "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
  "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
***************
*** 24,27 ****
--- 24,28 ----
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
+ "X-Bugs: Report translation errors to the Language-Team address.\n"
  "X-Generator: Lokalize 1.0\n"
  "Plural-Forms: nplurals=2; plural=(n != 1);\n"
***************
*** 121,125 ****
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [ or [^"
  msgstr "Ongepaarde [ of [^"
  
--- 122,127 ----
  
  #: gnulib/lib/regcomp.c:156
! #, fuzzy
! msgid "Unmatched [, [^, [:, [., or [="
  msgstr "Ongepaarde [ of [^"
  
***************
*** 160,164 ****
  msgstr "Ongepaarde ) of \\)"
  
! #: gnulib/lib/regcomp.c:711
  msgid "No previous regular expression"
  msgstr "Geen eerdere reguliere expressie"
--- 162,166 ----
  msgstr "Ongepaarde ) of \\)"
  
! #: gnulib/lib/regcomp.c:687
  msgid "No previous regular expression"
  msgstr "Geen eerdere reguliere expressie"
***************
*** 313,317 ****
  msgstr "---------- Voetnoten ----------"
  
! #: info/indices.c:123 info/indices.c:812
  #, c-format
  msgid "Finding index entries..."
--- 315,319 ----
  msgstr "---------- Voetnoten ----------"
  
! #: info/indices.c:123 info/indices.c:822
  #, c-format
  msgid "Finding index entries..."
***************
*** 322,326 ****
  msgstr "Een tekenreeks opzoeken in de index van dit bestand"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:818
  #, c-format
  msgid "No indices found."
--- 324,328 ----
  msgstr "Een tekenreeks opzoeken in de index van dit bestand"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:828
  #, c-format
  msgid "No indices found."
***************
*** 353,385 ****
  msgstr "Er zijn geen index-items meer die '%s' bevatten."
  
! #: info/indices.c:476 info/indices.c:880
  #, c-format
  msgid "No index entries containing '%s'."
  msgstr "Er zijn geen index-items die '%s' bevatten."
  
! #: info/indices.c:583
  #, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "Zoeken in de indexen van '%s'..."
  
! #: info/indices.c:636
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
  "Alle Info-bestandsindexen doorzoeken naar een tekenreeks en een menu maken"
  
! #: info/indices.c:644 info/indices.c:646
  msgid "Index apropos"
  msgstr "Index-apropos:"
  
! #: info/indices.c:688
  #, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Index-items die '%s' bevatten:\n"
  
! #: info/indices.c:797
  msgid "List all matches of a string in the index"
  msgstr "Alle voorkomens tonen van een tekenreeks in de index"
  
! #: info/indices.c:824 info/indices.c:826
  msgid "Index topic"
  msgstr "Index-onderwerp"
--- 355,387 ----
  msgstr "Er zijn geen index-items meer die '%s' bevatten."
  
! #: info/indices.c:476 info/indices.c:890
  #, c-format
  msgid "No index entries containing '%s'."
  msgstr "Er zijn geen index-items die '%s' bevatten."
  
! #: info/indices.c:586
  #, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "Zoeken in de indexen van '%s'..."
  
! #: info/indices.c:646
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
  "Alle Info-bestandsindexen doorzoeken naar een tekenreeks en een menu maken"
  
! #: info/indices.c:654 info/indices.c:656
  msgid "Index apropos"
  msgstr "Index-apropos:"
  
! #: info/indices.c:698
  #, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Index-items die '%s' bevatten:\n"
  
! #: info/indices.c:807
  msgid "List all matches of a string in the index"
  msgstr "Alle voorkomens tonen van een tekenreeks in de index"
  
! #: info/indices.c:834 info/indices.c:836
  msgid "Index topic"
  msgstr "Index-onderwerp"
***************
*** 390,444 ****
  msgstr "Geen van de beschikbare Info-bestanden heeft '%s' in z'n index."
  
! #: info/info-utils.c:892
  #, c-format
  msgid "Error converting file character encoding."
  msgstr "Fout tijdens converteren van tekencodering van bestand."
  
! #: info/info.c:222 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "Er is geen menu-item '%s' op pagina '%s'."
  
! #: info/info.c:315
! #, c-format
! msgid "No file given for node '%s'."
! msgstr "Er is geen bestand gegeven voor pagina '%s'."
! 
! #: info/info.c:364 info/info.c:1133
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr "Kan pagina '%s' niet vinden."
  
! #: info/info.c:386
  #, c-format
  msgid "No program name given."
  msgstr "Geen programmanaam gegeven."
  
! #: info/info.c:577
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "ongeldig aantal: %s\n"
  
! #: info/info.c:757
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "ongeldige toekenning aan variabele: %s"
  
! #: info/info.c:764 info/infokey.c:537
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: onbekende variabele"
  
! #: info/info.c:770 info/infokey.c:539
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "waarde %s is niet geldig voor variabele %s"
  
! #: info/info.c:782
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "Gebruik '--help' voor meer informatie.\n"
  
! #: info/info.c:804 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
--- 392,441 ----
  msgstr "Geen van de beschikbare Info-bestanden heeft '%s' in z'n index."
  
! #: info/info-utils.c:879
  #, c-format
  msgid "Error converting file character encoding."
  msgstr "Fout tijdens converteren van tekencodering van bestand."
  
! #: info/info.c:279 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "Er is geen menu-item '%s' op pagina '%s'."
  
! #: info/info.c:416 info/info.c:1148
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr "Kan pagina '%s' niet vinden."
  
! #: info/info.c:438
  #, c-format
  msgid "No program name given."
  msgstr "Geen programmanaam gegeven."
  
! #: info/info.c:636
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "ongeldig aantal: %s\n"
  
! #: info/info.c:816
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "ongeldige toekenning aan variabele: %s"
  
! #: info/info.c:823 info/infokey.c:540
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: onbekende variabele"
  
! #: info/info.c:829 info/infokey.c:542
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "waarde %s is niet geldig voor variabele %s"
  
! #: info/info.c:841
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "Gebruik '--help' voor meer informatie.\n"
  
! #: info/info.c:860 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
***************
*** 455,464 ****
  "Er is GEEN GARANTIE, voor zover de wet dit toestaat.\n"
  
! #: info/info.c:981
  #, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "geen index-items gevonden voor '%s'\n"
  
! #: info/info.c:1034
  #, c-format
  msgid ""
--- 452,461 ----
  "Er is GEEN GARANTIE, voor zover de wet dit toestaat.\n"
  
! #: info/info.c:999
  #, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "geen index-items gevonden voor '%s'\n"
  
! #: info/info.c:1049
  #, c-format
  msgid ""
***************
*** 471,475 ****
  "Documentatie in Info-opmaak lezen.\n"
  
! #: info/info.c:1040
  msgid ""
  "Options:\n"
--- 468,472 ----
  "Documentatie in Info-opmaak lezen.\n"
  
! #: info/info.c:1055
  msgid ""
  "Options:\n"
***************
*** 490,494 ****
  "  -f, --file=HANDLEIDING       het te bekijken Info-bestand"
  
! #: info/info.c:1048
  msgid ""
  "  -h, --help                   display this help and exit.\n"
--- 487,491 ----
  "  -f, --file=HANDLEIDING       het te bekijken Info-bestand"
  
! #: info/info.c:1063
  msgid ""
  "  -h, --help                   display this help and exit.\n"
***************
*** 503,507 ****
  "  -o, --output=BESTAND         de gekozen pagina's naar dit bestand schrijven"
  
! #: info/info.c:1054
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
--- 500,504 ----
  "  -o, --output=BESTAND         de gekozen pagina's naar dit bestand schrijven"
  
! #: info/info.c:1069
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
***************
*** 517,526 ****
  "  -O, --show-options, --usage  de pagina met de commandoregelopties tonen"
  
! #: info/info.c:1061
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr ""
  "  -b, --speech-friendly        uitvoer toesnijden op spraaksynthesizers"
  
! #: info/info.c:1065
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
--- 514,523 ----
  "  -O, --show-options, --usage  de pagina met de commandoregelopties tonen"
  
! #: info/info.c:1076
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr ""
  "  -b, --speech-friendly        uitvoer toesnijden op spraaksynthesizers"
  
! #: info/info.c:1080
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
***************
*** 544,548 ****
  "allerhoogste)\n"
  
! #: info/info.c:1074
  msgid ""
  "\n"
--- 541,545 ----
  "allerhoogste)\n"
  
! #: info/info.c:1089
  msgid ""
  "\n"
***************
*** 561,565 ****
  "menu-item in de op dat moment bereikte pagina."
  
! #: info/info.c:1081
  msgid ""
  "\n"
--- 558,562 ----
  "menu-item in de op dat moment bereikte pagina."
  
! #: info/info.c:1096
  msgid ""
  "\n"
***************
*** 569,573 ****
  "Voor een overzicht van de commandotoetsen in 'info', typ hoofdletter 'H'."
  
! #: info/info.c:1084
  msgid ""
  "\n"
--- 566,570 ----
  "Voor een overzicht van de commandotoetsen in 'info', typ hoofdletter 'H'."
  
! #: info/info.c:1099
  msgid ""
  "\n"
***************
*** 605,609 ****
  "  info -f ./foo.info           het bestand './foo.info' tonen"
  
! #: info/info.c:1099 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
--- 602,606 ----
  "  info -f ./foo.info           het bestand './foo.info' tonen"
  
! #: info/info.c:1114 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
***************
*** 616,680 ****
  "De Texinfo-webpagina is: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1134
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Kan pagina '(%s)%s' niet vinden."
  
! #: info/info.c:1135
  msgid "Cannot find a window!"
  msgstr "Kan geen venster vinden!"
  
! #: info/info.c:1136
  msgid "Point doesn't appear within this window's node!"
  msgstr "Het punt bevindt zich niet in de pagina van dit venster!"
  
! #: info/info.c:1137
  msgid "Cannot delete the last window."
  msgstr "Het laatste venster kan niet gesloten worden."
  
! #: info/info.c:1138
  msgid "No menu in this node."
  msgstr "Er is geen menu op deze pagina."
  
! #: info/info.c:1139
  msgid "No footnotes in this node."
  msgstr "Er zijn geen voetnoten op deze pagina."
  
! #: info/info.c:1140
  msgid "No cross references in this node."
  msgstr "Er zijn geen kruisverwijzingen op deze pagina."
  
! #: info/info.c:1141
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Er is geen '%s'-koppeling op deze pagina."
  
! #: info/info.c:1142
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "Onbekend Info-commando '%c'; typ '?' voor hulp."
  
! #: info/info.c:1143
  #, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "Terminaltype '%s' is niet krachtig genoeg voor Info."
  
! #: info/info.c:1144
  msgid "You are already at the last page of this node."
  msgstr "U bent al aan het eind van deze pagina."
  
! #: info/info.c:1145
  msgid "You are already at the first page of this node."
  msgstr "U bent al aan het begin van deze pagina."
  
! #: info/info.c:1146
  msgid "Only one window."
  msgstr "Slechts Ã©Ã©n venster."
  
! #: info/info.c:1147
  msgid "Resulting window would be too small."
  msgstr "Het resulterende venster zou te klein zijn."
  
! #: info/info.c:1148
  msgid "Not enough room for a help window, please delete a window."
  msgstr "Niet genoeg ruimte voor een hulp-venster; sluit een venster."
--- 613,677 ----
  "De Texinfo-webpagina is: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1149
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Kan pagina '(%s)%s' niet vinden."
  
! #: info/info.c:1150
  msgid "Cannot find a window!"
  msgstr "Kan geen venster vinden!"
  
! #: info/info.c:1151
  msgid "Point doesn't appear within this window's node!"
  msgstr "Het punt bevindt zich niet in de pagina van dit venster!"
  
! #: info/info.c:1152
  msgid "Cannot delete the last window."
  msgstr "Het laatste venster kan niet gesloten worden."
  
! #: info/info.c:1153
  msgid "No menu in this node."
  msgstr "Er is geen menu op deze pagina."
  
! #: info/info.c:1154
  msgid "No footnotes in this node."
  msgstr "Er zijn geen voetnoten op deze pagina."
  
! #: info/info.c:1155
  msgid "No cross references in this node."
  msgstr "Er zijn geen kruisverwijzingen op deze pagina."
  
! #: info/info.c:1156
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Er is geen '%s'-koppeling op deze pagina."
  
! #: info/info.c:1157
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "Onbekend Info-commando '%c'; typ '?' voor hulp."
  
! #: info/info.c:1158
  #, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "Terminaltype '%s' is niet krachtig genoeg voor Info."
  
! #: info/info.c:1159
  msgid "You are already at the last page of this node."
  msgstr "U bent al aan het eind van deze pagina."
  
! #: info/info.c:1160
  msgid "You are already at the first page of this node."
  msgstr "U bent al aan het begin van deze pagina."
  
! #: info/info.c:1161
  msgid "Only one window."
  msgstr "Slechts Ã©Ã©n venster."
  
! #: info/info.c:1162
  msgid "Resulting window would be too small."
  msgstr "Het resulterende venster zou te klein zijn."
  
! #: info/info.c:1163
  msgid "Not enough room for a help window, please delete a window."
  msgstr "Niet genoeg ruimte voor een hulp-venster; sluit een venster."
***************
*** 957,991 ****
  msgstr "onbekende actie '%s'"
  
! #: info/infokey.c:482
  #, c-format
  msgid "action name too long"
  msgstr "actienaam is te lang"
  
! #: info/infokey.c:495
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "extra tekens na actie '%s'"
  
! #: info/infokey.c:506
  #, c-format
  msgid "missing variable name"
  msgstr "ontbrekende naam van variabele"
  
! #: info/infokey.c:515
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "ontbrekende '=' na naam van variabele"
  
! #: info/infokey.c:522
  #, c-format
  msgid "variable name too long"
  msgstr "naam van variabele is te lang"
  
! #: info/infokey.c:546
  #, c-format
  msgid "value too long"
  msgstr "waarde is te lang"
  
! #: info/infokey.c:592
  #, c-format
  msgid "\"%s\", line %u: "
--- 954,988 ----
  msgstr "onbekende actie '%s'"
  
! #: info/infokey.c:485
  #, c-format
  msgid "action name too long"
  msgstr "actienaam is te lang"
  
! #: info/infokey.c:498
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "extra tekens na actie '%s'"
  
! #: info/infokey.c:509
  #, c-format
  msgid "missing variable name"
  msgstr "ontbrekende naam van variabele"
  
! #: info/infokey.c:518
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "ontbrekende '=' na naam van variabele"
  
! #: info/infokey.c:525
  #, c-format
  msgid "variable name too long"
  msgstr "naam van variabele is te lang"
  
! #: info/infokey.c:549
  #, c-format
  msgid "value too long"
  msgstr "waarde is te lang"
  
! #: info/infokey.c:595
  #, c-format
  msgid "\"%s\", line %u: "
***************
*** 1317,1357 ****
  msgstr "Kan de pagina waarnaar verwezen werd door '%s' niet vinden in '%s'."
  
! #: info/session.c:2864
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "Een reeks menu-items lezen en deze vanaf de inhoudspagina volgen"
  
! #: info/session.c:2866
  msgid "Follow menus: "
  msgstr "Te volgen reeks menu-items: "
  
! #: info/session.c:2971
  msgid "Select the Next node"
  msgstr "Naar de volgende pagina op dit niveau"
  
! #: info/session.c:2978
  msgid "Select the Prev node"
  msgstr "Naar de voorgaande pagina op dit niveau"
  
! #: info/session.c:2985
  msgid "Select the Up node"
  msgstr "Naar de bovenliggende pagina"
  
! #: info/session.c:2991
  msgid "Select the last node in this file"
  msgstr "Naar de laatste pagina van dit document"
  
! #: info/session.c:3018 info/session.c:3051
  msgid "This window has no additional nodes"
  msgstr "Dit venster heeft geen extra pagina's."
  
! #: info/session.c:3024
  msgid "Select the first node in this file"
  msgstr "Naar de eerste pagina van dit document"
  
! #: info/session.c:3158
  msgid "No more nodes within this document."
  msgstr "Dit is de laatste pagina van dit document."
  
! #: info/session.c:3203 info/session.c:3243
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr ""
--- 1314,1354 ----
  msgstr "Kan de pagina waarnaar verwezen werd door '%s' niet vinden in '%s'."
  
! #: info/session.c:2870
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "Een reeks menu-items lezen en deze vanaf de inhoudspagina volgen"
  
! #: info/session.c:2872
  msgid "Follow menus: "
  msgstr "Te volgen reeks menu-items: "
  
! #: info/session.c:2977
  msgid "Select the Next node"
  msgstr "Naar de volgende pagina op dit niveau"
  
! #: info/session.c:2984
  msgid "Select the Prev node"
  msgstr "Naar de voorgaande pagina op dit niveau"
  
! #: info/session.c:2991
  msgid "Select the Up node"
  msgstr "Naar de bovenliggende pagina"
  
! #: info/session.c:2997
  msgid "Select the last node in this file"
  msgstr "Naar de laatste pagina van dit document"
  
! #: info/session.c:3024 info/session.c:3057
  msgid "This window has no additional nodes"
  msgstr "Dit venster heeft geen extra pagina's."
  
! #: info/session.c:3030
  msgid "Select the first node in this file"
  msgstr "Naar de eerste pagina van dit document"
  
! #: info/session.c:3164
  msgid "No more nodes within this document."
  msgstr "Dit is de laatste pagina van dit document."
  
! #: info/session.c:3209 info/session.c:3249
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr ""
***************
*** 1359,1660 ****
  "pagina."
  
! #: info/session.c:3256
  msgid "Move forwards or down through node structure"
  msgstr "Voorwaarts door alle pagina's van een document bladeren"
  
! #: info/session.c:3273
  msgid "Move backwards or up through node structure"
  msgstr "Achterwaarts door alle pagina's van een document bladeren"
  
! #: info/session.c:3296
  msgid "Read a node name and select it"
  msgstr "De naam van een pagina lezen en deze selecteren"
  
! #: info/session.c:3350 info/session.c:3354
  msgid "Goto node: "
  msgstr "Te bezoeken pagina: "
  
! #: info/session.c:3533
  msgid "Find the node describing program invocation"
  msgstr "De pagina zoeken die de aanroepwijze van het programma beschrijft"
  
! #: info/session.c:3535
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Aanroepbeschrijving bekijken van [%s]: "
  
! #: info/session.c:3580
  msgid "Read a manpage reference and select it"
  msgstr "Een man-paginaverwijzing lezen en deze selecteren"
  
! #: info/session.c:3584
  msgid "Get Manpage: "
  msgstr "Te bekijken man-pagina: "
  
! #: info/session.c:3605
  msgid "Select the node 'Top' in this file"
  msgstr "Naar de eerste pagina van dit bestand"
  
! #: info/session.c:3611
  msgid "Select the node '(dir)'"
  msgstr "Naar de hoofd-inhoudspagina"
  
! #: info/session.c:3617
  msgid "Show full file name of node being displayed"
  msgstr "Volledige bestandsnaam van getoonde pagina tonen"
  
! #: info/session.c:3634
  msgid "Select the most recently selected node"
  msgstr "Terug naar de laatst geziene pagina"
  
! #: info/session.c:3639
  #, c-format
  msgid "No earlier node in history"
  msgstr "Er is geen vroegere pagina in de geschiedenis"
  
! #: info/session.c:3643
  msgid "Read the name of a file and select it"
  msgstr "De naam van een bestand lezen en deze selecteren"
  
! #: info/session.c:3647
  msgid "Find file: "
  msgstr "Te bezoeken bestand: "
  
! #: info/session.c:3664
  #, c-format
  msgid "Cannot find '%s'."
  msgstr "Kan '%s' niet vinden."
  
! #: info/session.c:3713
  #, c-format
  msgid "Could not create output file '%s'."
  msgstr "Kan uitvoerbestand '%s' niet aanmaken."
  
! #: info/session.c:3727
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "fout bij het schrijven naar '%s': %s"
  
! #: info/session.c:3736
  #, c-format
  msgid "closing %s"
  msgstr "sluiten van %s"
  
! #: info/session.c:3785
  #, c-format
  msgid "writing node %s..."
  msgstr "schrijven van pagina %s..."
  
! #: info/session.c:3831
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "De inhoud van deze pagina doorsluizen naar het INFO_PRINT_COMMAND"
  
! #: info/session.c:3859
  #, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Kan geen pijp naar '%s' openen."
  
! #: info/session.c:3864
  #, c-format
  msgid "printing node %s..."
  msgstr "afdrukken van pagina %s..."
  
! #: info/session.c:3872
  #, c-format
  msgid "finished printing node %s"
  msgstr "klaar met afdrukken van pagina %s"
  
! #: info/session.c:3904
  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."
  
! #: info/session.c:4169
  msgid "Search continued from the end of the document."
  msgstr "Het zoeken is verdergegaan vanaf het einde."
  
! #: info/session.c:4174
  msgid "Search continued from the beginning of the document."
  msgstr "Het zoeken is verdergegaan vanaf het begin."
  
! #: info/session.c:4194
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "Zoeken naar subbestand %s..."
  
! #: info/session.c:4231
  msgid "Search failed."
  msgstr "Niet gevonden."
  
! #: info/session.c:4248
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [\"%s\"]: "
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Regexp search"
  msgstr "Zoeken naar expressie"
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Search"
  msgstr "Zoeken"
  
! #: info/session.c:4250 info/session.c:4256
  msgid " case-sensitively"
  msgstr " (hooflettergevoelig)"
  
! #: info/session.c:4251 info/session.c:4257
  msgid " backward"
  msgstr " (achterwaarts)"
  
  # FIXME: huh?
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s: "
  
! #: info/session.c:4274
  msgid "Search string too short"
  msgstr "Zoektekenreeks is te kort."
  
! #: info/session.c:4467
  #, c-format
  msgid "Going back to last match from %s"
  msgstr "Terugkerend naar de laatste overeenkomst van %s"
  
! #: info/session.c:4491 info/session.c:4601
  #, c-format
  msgid "No more matches."
  msgstr "Geen verdere overeenkomsten."
  
! #: info/session.c:4628
  msgid "Search this node and subnodes for a string."
  msgstr "Deze pagina en subpagina's doorzoeken naar een tekenreeks"
  
! #: info/session.c:4649
  msgid "Go to next match in Info sub-tree"
  msgstr "Naar de volgende overeenkomst in de Info-subboom gaan"
  
! #: info/session.c:4653 info/session.c:4665
  #, c-format
  msgid "No active search"
  msgstr "Geen actieve zoekopdracht."
  
! #: info/session.c:4661
  msgid "Go to previous match in Info sub-tree"
  msgstr "Naar de voorgaande overeenkomst in de Info-subboom gaan"
  
! #: info/session.c:4674
  msgid "Read a string and search for it case-sensitively"
  msgstr "Een tekenreeks lezen en er hoofdlettergevoelig naar zoeken"
  
! #: info/session.c:4679
  msgid "Read a string and search for it"
  msgstr "Een tekenreeks lezen en er naar zoeken"
  
! #: info/session.c:4685
  msgid "Read a string and search backward for it"
  msgstr "Een tekenreeks lezen en er achterwaarts naar zoeken"
  
! #: info/session.c:4693
  msgid "Repeat last search in the same direction"
  msgstr "De laatste zoekopdracht in dezelfde richting herhalen"
  
! #: info/session.c:4701 info/session.c:4746
  msgid "No previous search string"
  msgstr "Geen eerdere zoektekenreeks."
  
! #: info/session.c:4738
  msgid "Repeat last search in the reverse direction"
  msgstr "De laatste zoekopdracht in tegenovergestelde richting herhalen"
  
! #: info/session.c:4785
  msgid "Clear displayed search matches"
  msgstr "Getoonde zoekresultaten wissen"
  
! #: info/session.c:4802 info/session.c:4808
  msgid "Search interactively for a string as you type it"
  msgstr "Naar een tekenreeks zoeken terwijl u deze intypt"
  
! #: info/session.c:4928
  msgid "Regexp I-search backward: "
  msgstr "Achterwaarts typend-zoeken naar expressie: "
  
! #: info/session.c:4929
  msgid "I-search backward: "
  msgstr "Achterwaarts typend-zoeken: "
  
! #: info/session.c:4931
  msgid "Regexp I-search: "
  msgstr "Typend-zoeken naar expressie: "
  
! #: info/session.c:4932
  msgid "I-search: "
  msgstr "Typend-zoeken: "
  
! #: info/session.c:4957 info/session.c:4960
  msgid "Failing "
  msgstr "*Ongevonden* "
  
! #: info/session.c:5326
  msgid "Cancel current operation"
  msgstr "Huidige operatie annuleren"
  
  # Dit is een reactie op bovenstaande 'Cancel current operation'.
! #: info/session.c:5333
  msgid "Quit"
  msgstr "Geannuleerd"
  
! #: info/session.c:5338
  msgid "Display version of Info being run"
  msgstr "De versie van Info tonen"
  
! #: info/session.c:5340
  #, c-format
  msgid "GNU Info version %s"
  msgstr "GNU Info, versie %s"
  
! #: info/session.c:5345
  msgid "Redraw the display"
  msgstr "Het venster opnieuw schrijven"
  
! #: info/session.c:5382
  msgid "Quit using Info"
  msgstr "Info afsluiten"
  
! #: info/session.c:5398
  msgid "Run command bound to this key's lowercase variant"
  msgstr ""
  "Commando uitvoeren dat behoort bij de kleinelettervariant van deze toets"
  
! #: info/session.c:5409
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Onbekend commando (%s)."
  
! #: info/session.c:5412
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\" is ongeldig"
  
! #: info/session.c:5413
  #, c-format
  msgid "'%s' is invalid"
  msgstr "'%s' is ongeldig"
  
! #: info/session.c:5731
  msgid "Add this digit to the current numeric argument"
  msgstr "Dit cijfer toevoegen aan het huidige numerieke argument"
  
! #: info/session.c:5738
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr ""
--- 1356,1657 ----
  "pagina."
  
! #: info/session.c:3262
  msgid "Move forwards or down through node structure"
  msgstr "Voorwaarts door alle pagina's van een document bladeren"
  
! #: info/session.c:3279
  msgid "Move backwards or up through node structure"
  msgstr "Achterwaarts door alle pagina's van een document bladeren"
  
! #: info/session.c:3302
  msgid "Read a node name and select it"
  msgstr "De naam van een pagina lezen en deze selecteren"
  
! #: info/session.c:3356 info/session.c:3360
  msgid "Goto node: "
  msgstr "Te bezoeken pagina: "
  
! #: info/session.c:3539
  msgid "Find the node describing program invocation"
  msgstr "De pagina zoeken die de aanroepwijze van het programma beschrijft"
  
! #: info/session.c:3541
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Aanroepbeschrijving bekijken van [%s]: "
  
! #: info/session.c:3586
  msgid "Read a manpage reference and select it"
  msgstr "Een man-paginaverwijzing lezen en deze selecteren"
  
! #: info/session.c:3590
  msgid "Get Manpage: "
  msgstr "Te bekijken man-pagina: "
  
! #: info/session.c:3611
  msgid "Select the node 'Top' in this file"
  msgstr "Naar de eerste pagina van dit bestand"
  
! #: info/session.c:3617
  msgid "Select the node '(dir)'"
  msgstr "Naar de hoofd-inhoudspagina"
  
! #: info/session.c:3623
  msgid "Show full file name of node being displayed"
  msgstr "Volledige bestandsnaam van getoonde pagina tonen"
  
! #: info/session.c:3640
  msgid "Select the most recently selected node"
  msgstr "Terug naar de laatst geziene pagina"
  
! #: info/session.c:3645
  #, c-format
  msgid "No earlier node in history"
  msgstr "Er is geen vroegere pagina in de geschiedenis"
  
! #: info/session.c:3649
  msgid "Read the name of a file and select it"
  msgstr "De naam van een bestand lezen en deze selecteren"
  
! #: info/session.c:3653
  msgid "Find file: "
  msgstr "Te bezoeken bestand: "
  
! #: info/session.c:3670
  #, c-format
  msgid "Cannot find '%s'."
  msgstr "Kan '%s' niet vinden."
  
! #: info/session.c:3719
  #, c-format
  msgid "Could not create output file '%s'."
  msgstr "Kan uitvoerbestand '%s' niet aanmaken."
  
! #: info/session.c:3733
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "fout bij het schrijven naar '%s': %s"
  
! #: info/session.c:3742
  #, c-format
  msgid "closing %s"
  msgstr "sluiten van %s"
  
! #: info/session.c:3791
  #, c-format
  msgid "writing node %s..."
  msgstr "schrijven van pagina %s..."
  
! #: info/session.c:3837
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "De inhoud van deze pagina doorsluizen naar het INFO_PRINT_COMMAND"
  
! #: info/session.c:3865
  #, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Kan geen pijp naar '%s' openen."
  
! #: info/session.c:3870
  #, c-format
  msgid "printing node %s..."
  msgstr "afdrukken van pagina %s..."
  
! #: info/session.c:3878
  #, c-format
  msgid "finished printing node %s"
  msgstr "klaar met afdrukken van pagina %s"
  
! #: info/session.c:3910
  msgid "Toggle the usage of regular expressions in searches"
  msgstr "Het gebruik van reguliere expressies bij zoekopdrachten aan-/uitzetten"
  
! #: info/session.c:3914
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr "Zoeken gebruikt reguliere expressies."
  
! #: info/session.c:3915
  #, c-format
  msgid "Using literal strings for searches."
  msgstr "Zoeken gebruikt letterlijke tekst."
  
! #: info/session.c:4175
  msgid "Search continued from the end of the document."
  msgstr "Het zoeken is verdergegaan vanaf het einde."
  
! #: info/session.c:4180
  msgid "Search continued from the beginning of the document."
  msgstr "Het zoeken is verdergegaan vanaf het begin."
  
! #: info/session.c:4200
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "Zoeken naar subbestand %s..."
  
! #: info/session.c:4237
  msgid "Search failed."
  msgstr "Niet gevonden."
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [\"%s\"]: "
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Regexp search"
  msgstr "Zoeken naar expressie"
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Search"
  msgstr "Zoeken"
  
! #: info/session.c:4256 info/session.c:4262
  msgid " case-sensitively"
  msgstr " (hooflettergevoelig)"
  
! #: info/session.c:4257 info/session.c:4263
  msgid " backward"
  msgstr " (achterwaarts)"
  
  # FIXME: huh?
! #: info/session.c:4260
  #, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s: "
  
! #: info/session.c:4280
  msgid "Search string too short"
  msgstr "Zoektekenreeks is te kort."
  
! #: info/session.c:4473
  #, c-format
  msgid "Going back to last match from %s"
  msgstr "Terugkerend naar de laatste overeenkomst van %s"
  
! #: info/session.c:4497 info/session.c:4607
  #, c-format
  msgid "No more matches."
  msgstr "Geen verdere overeenkomsten."
  
! #: info/session.c:4634
  msgid "Search this node and subnodes for a string."
  msgstr "Deze pagina en subpagina's doorzoeken naar een tekenreeks"
  
! #: info/session.c:4655
  msgid "Go to next match in Info sub-tree"
  msgstr "Naar de volgende overeenkomst in de Info-subboom gaan"
  
! #: info/session.c:4659 info/session.c:4671
  #, c-format
  msgid "No active search"
  msgstr "Geen actieve zoekopdracht."
  
! #: info/session.c:4667
  msgid "Go to previous match in Info sub-tree"
  msgstr "Naar de voorgaande overeenkomst in de Info-subboom gaan"
  
! #: info/session.c:4680
  msgid "Read a string and search for it case-sensitively"
  msgstr "Een tekenreeks lezen en er hoofdlettergevoelig naar zoeken"
  
! #: info/session.c:4685
  msgid "Read a string and search for it"
  msgstr "Een tekenreeks lezen en er naar zoeken"
  
! #: info/session.c:4691
  msgid "Read a string and search backward for it"
  msgstr "Een tekenreeks lezen en er achterwaarts naar zoeken"
  
! #: info/session.c:4699
  msgid "Repeat last search in the same direction"
  msgstr "De laatste zoekopdracht in dezelfde richting herhalen"
  
! #: info/session.c:4707 info/session.c:4752
  msgid "No previous search string"
  msgstr "Geen eerdere zoektekenreeks."
  
! #: info/session.c:4744
  msgid "Repeat last search in the reverse direction"
  msgstr "De laatste zoekopdracht in tegenovergestelde richting herhalen"
  
! #: info/session.c:4791
  msgid "Clear displayed search matches"
  msgstr "Getoonde zoekresultaten wissen"
  
! #: info/session.c:4808 info/session.c:4814
  msgid "Search interactively for a string as you type it"
  msgstr "Naar een tekenreeks zoeken terwijl u deze intypt"
  
! #: info/session.c:4934
  msgid "Regexp I-search backward: "
  msgstr "Achterwaarts typend-zoeken naar expressie: "
  
! #: info/session.c:4935
  msgid "I-search backward: "
  msgstr "Achterwaarts typend-zoeken: "
  
! #: info/session.c:4937
  msgid "Regexp I-search: "
  msgstr "Typend-zoeken naar expressie: "
  
! #: info/session.c:4938
  msgid "I-search: "
  msgstr "Typend-zoeken: "
  
! #: info/session.c:4963 info/session.c:4966
  msgid "Failing "
  msgstr "*Ongevonden* "
  
! #: info/session.c:5332
  msgid "Cancel current operation"
  msgstr "Huidige operatie annuleren"
  
  # Dit is een reactie op bovenstaande 'Cancel current operation'.
! #: info/session.c:5339
  msgid "Quit"
  msgstr "Geannuleerd"
  
! #: info/session.c:5344
  msgid "Display version of Info being run"
  msgstr "De versie van Info tonen"
  
! #: info/session.c:5346
  #, c-format
  msgid "GNU Info version %s"
  msgstr "GNU Info, versie %s"
  
! #: info/session.c:5351
  msgid "Redraw the display"
  msgstr "Het venster opnieuw schrijven"
  
! #: info/session.c:5388
  msgid "Quit using Info"
  msgstr "Info afsluiten"
  
! #: info/session.c:5404
  msgid "Run command bound to this key's lowercase variant"
  msgstr ""
  "Commando uitvoeren dat behoort bij de kleinelettervariant van deze toets"
  
! #: info/session.c:5415
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Onbekend commando (%s)."
  
! #: info/session.c:5418
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\" is ongeldig"
  
! #: info/session.c:5419
  #, c-format
  msgid "'%s' is invalid"
  msgstr "'%s' is ongeldig"
  
! #: info/session.c:5737
  msgid "Add this digit to the current numeric argument"
  msgstr "Dit cijfer toevoegen aan het huidige numerieke argument"
  
! #: info/session.c:5744
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr ""
***************
*** 1793,1810 ****
  msgstr "Variabele %s deze waarde geven (%s): "
  
! #: info/window.c:959
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), regels ----, "
  
- #: info/window.c:966
- #, c-format
- msgid "-%s---Info: %s, %ld lines --%s--"
- msgstr "-%s---Info: %s, %ld regels --%s--"
- 
- #: info/window.c:970
- #, c-format
- msgid "-%s---Info: (%s)%s, %ld lines --%s--"
- msgstr "-%s---Info: (%s)%s, %ld regels --%s--"
- 
  #: install-info/install-info.c:292
  #, c-format
--- 1790,1797 ----
  msgstr "Variabele %s deze waarde geven (%s): "
  
! #: info/window.c:909
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), regels ----, "
  
  #: install-info/install-info.c:292
  #, c-format
***************
*** 2001,2005 ****
  "\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"
--- 1988,1992 ----
  "\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"
***************
*** 2017,2021 ****
  "  Deze inhoudspagina toont een menu met hoofdonderwerpen.\n"
  "  Een \"q\" sluit het programma af, een \"d\" brengt u hier terug,\n"
! "  \"?\" toont een hulpvenster met alle Info-commando's,\n"
  "  \"h\" gaat naar een handleiding voor nieuwe gebruikers,\n"
  "  \"mls<Enter>\" toont u de pagina's van het 'ls'-commando, enzovoort.\n"
--- 2004,2008 ----
  "  Deze inhoudspagina toont een menu met hoofdonderwerpen.\n"
  "  Een \"q\" sluit het programma af, een \"d\" brengt u hier terug,\n"
! "  \"H\" toont een hulpvenster met alle Info-commando's,\n"
  "  \"h\" gaat naar een handleiding voor nieuwe gebruikers,\n"
  "  \"mls<Enter>\" toont u de pagina's van het 'ls'-commando, enzovoort.\n"
***************
*** 2088,2204 ****
  msgstr "geen items voor '%s' gevonden; er is niets verwijderd"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:855
! #: tp/Texinfo/Convert/Converter.pm:893 tp/Texinfo/Convert/Converter.pm:1204
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6504
! #: tp/Texinfo/Convert/HTML.pm:6528 tp/Texinfo/Convert/HTML.pm:6905
! #: tp/Texinfo/Convert/HTML.pm:6963 tp/Texinfo/Convert/HTML.pm:7041
! #: tp/Texinfo/Convert/HTML.pm:7118 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:546
! #: tp/Texinfo/Convert/TexinfoXML.pm:457
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "kan %s niet openen om te schrijven: %s"
  
! #: tp/Texinfo/Common.pm:881
  msgid "recursion is always allowed"
  msgstr "recursie is altijd toegestaan"
  
! #: tp/Texinfo/Common.pm:882
  msgid "arguments are quoted by default"
  msgstr "argumenten hebben standaard aanhalingstekens"
  
! #: tp/Texinfo/Common.pm:1105
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s is geen geldige taalcode"
  
! #: tp/Texinfo/Common.pm:1110
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s is geen geldige regiocode"
  
! #: tp/Texinfo/Common.pm:1128
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%s is geen geldige splitsmogelijkheid"
  
! #: tp/Texinfo/Common.pm:1151
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "kan %s niet lezen: %s"
  
! #: tp/Texinfo/Common.pm:1170
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "fout bij sluiten van '@verbatiminclude'-bestand %s: %s"
  
! #: tp/Texinfo/Common.pm:1176 tp/Texinfo/Parser.pm:3353
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%s: kan %s niet vinden"
  
! #: tp/Texinfo/Common.pm:1520
! #, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr "kan instellingenbestand %s voor HTML-referenties niet openen: %s"
! 
! #: tp/Texinfo/Common.pm:1548
! msgid "missing type"
! msgstr "ontbrekend type"
! 
! #: tp/Texinfo/Common.pm:1551
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "onbekend type: %s"
! 
! #: tp/Texinfo/Common.pm:1568
! #, 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/Common.pm:1603
  msgid "no node to be renamed"
  msgstr "geen pagina om te hernoemen"
  
! #: tp/Texinfo/Common.pm:1614
  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:1624 tp/Texinfo/Parser.pm:926
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "kan %s niet openen: %s"
  
! #: tp/Texinfo/Common.pm:2144
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr "kan hekje in @%s niet beschermen"
  
! #: tp/Texinfo/Convert/Converter.pm:395 tp/Texinfo/Convert/Converter.pm:414
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Verouderde variabele %s\n"
  
! #: tp/Texinfo/Convert/Converter.pm:794
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr "%s: uitvoer is incompatibel met splitsing"
  
! #: tp/Texinfo/Convert/Converter.pm:876 tp/Texinfo/Convert/Converter.pm:909
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:6931
! #: tp/Texinfo/Convert/HTML.pm:6989 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:476 tp/Texinfo/Parser.pm:2035
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "fout bij sluiten van %s: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, 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:995
  #, perl-format
  msgid "could not create directory `%s': %s"
--- 2075,2186 ----
  msgstr "geen items voor '%s' gevonden; er is niets verwijderd"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:847
! #: tp/Texinfo/Convert/Converter.pm:885 tp/Texinfo/Convert/Converter.pm:1196
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6573
! #: tp/Texinfo/Convert/HTML.pm:6597 tp/Texinfo/Convert/HTML.pm:6978
! #: tp/Texinfo/Convert/HTML.pm:7037 tp/Texinfo/Convert/HTML.pm:7115
! #: tp/Texinfo/Convert/HTML.pm:7192 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:547
! #: tp/Texinfo/Convert/TexinfoXML.pm:458
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "kan %s niet openen om te schrijven: %s"
  
! #: tp/Texinfo/Common.pm:862
  msgid "recursion is always allowed"
  msgstr "recursie is altijd toegestaan"
  
! #: tp/Texinfo/Common.pm:863
  msgid "arguments are quoted by default"
  msgstr "argumenten hebben standaard aanhalingstekens"
  
! #: tp/Texinfo/Common.pm:866
! 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:869
! msgid ""
! "move your @shortcontents and @contents commands if you want the contents "
! "after the title page"
! msgstr ""
! "verplaats uw @shortcontents- en @contents-commando's als u de inhoudsopgave "
! "na de titelpagina wilt"
! 
! #: tp/Texinfo/Common.pm:1093
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s is geen geldige taalcode"
  
! #: tp/Texinfo/Common.pm:1098
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s is geen geldige regiocode"
  
! #: tp/Texinfo/Common.pm:1116
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%s is geen geldige splitsmogelijkheid"
  
! #: tp/Texinfo/Common.pm:1139
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "kan %s niet lezen: %s"
  
! #: tp/Texinfo/Common.pm:1158
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "fout bij sluiten van '@verbatiminclude'-bestand %s: %s"
  
! #: tp/Texinfo/Common.pm:1164 tp/Texinfo/Parser.pm:3193
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%s: kan %s niet vinden"
  
! #: tp/Texinfo/Common.pm:1637
  msgid "no node to be renamed"
  msgstr "geen pagina om te hernoemen"
  
! #: tp/Texinfo/Common.pm:1648
  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:1658 tp/Texinfo/Parser.pm:899
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "kan %s niet openen: %s"
  
! #: tp/Texinfo/Common.pm:2178
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr "kan hekje in @%s niet beschermen"
  
! #: tp/Texinfo/Convert/Converter.pm:387 tp/Texinfo/Convert/Converter.pm:406
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Verouderde variabele %s\n"
  
! #: tp/Texinfo/Convert/Converter.pm:786
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr "%s: uitvoer is incompatibel met splitsing"
  
! #: tp/Texinfo/Convert/Converter.pm:868 tp/Texinfo/Convert/Converter.pm:901
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:7004
! #: tp/Texinfo/Convert/HTML.pm:7063 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:477 tp/Texinfo/Parser.pm:1996
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "fout bij sluiten van %s: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:979
  #, 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:987
  #, perl-format
  msgid "could not create directory `%s': %s"
***************
*** 2210,2218 ****
  msgstr "@image-bestand '%s' is niet gevonden; '%s' wordt gebruikt"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5388
  msgid "no argument specified for @U"
  msgstr "geen argument opgegeven voor @U"
  
! #: tp/Texinfo/Convert/HTML.pm:1683
  #, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
--- 2192,2200 ----
  msgstr "@image-bestand '%s' is niet gevonden; '%s' wordt gebruikt"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5225
  msgid "no argument specified for @U"
  msgstr "geen argument opgegeven voor @U"
  
! #: tp/Texinfo/Convert/HTML.pm:1715
  #, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
***************
*** 2220,2295 ****
  
  # XXX Zet ook elders "ruw" om naar "rauw".
! #: tp/Texinfo/Convert/HTML.pm:2371
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "rauwe opmaak %s is niet omgezet"
  
! #: tp/Texinfo/Convert/HTML.pm:4888
  msgid "string not closed in css file"
  msgstr "tekenreeks niet afgesloten in CSS-bestand"
  
! #: tp/Texinfo/Convert/HTML.pm:4890
  msgid "--css-include ended in comment"
  msgstr "'--css-include' eindigt in commentaar"
  
! #: tp/Texinfo/Convert/HTML.pm:4892
  msgid "@import not finished in css file"
  msgstr "'@import' is niet afgesloten in CSS-bestand"
  
! #: tp/Texinfo/Convert/HTML.pm:4918
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "CSS-bestand %s is niet gevonden"
  
! #: tp/Texinfo/Convert/HTML.pm:4924
  #, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "kan '--include-file'-bestand %s niet openen: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:4934
  #, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "fout bij sluiten van CSS-bestand %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5801 tp/Texinfo/Convert/HTML.pm:5805
  #, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "geen 'htmlxref.cnf'-item gevonden voor '%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:6499
  #, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "fout bij sluiten van frames-bestand %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6523
  #, 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:6638
  #, 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:6839
  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:7048
  #, 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:7073
  #, 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:7079
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "bestand is leeg voor hernoemde pagina '%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:7093
  #, perl-format
  msgid "target node (new name for `%s') not in document: %s"
--- 2202,2296 ----
  
  # XXX Zet ook elders "ruw" om naar "rauw".
! #: tp/Texinfo/Convert/HTML.pm:2399
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "rauwe opmaak %s is niet omgezet"
  
! #: tp/Texinfo/Convert/HTML.pm:4629
! #, 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:4657
! msgid "missing type"
! msgstr "ontbrekend type"
! 
! #: tp/Texinfo/Convert/HTML.pm:4660
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "onbekend type: %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4677
! #, 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:4962
  msgid "string not closed in css file"
  msgstr "tekenreeks niet afgesloten in CSS-bestand"
  
! #: tp/Texinfo/Convert/HTML.pm:4964
  msgid "--css-include ended in comment"
  msgstr "'--css-include' eindigt in commentaar"
  
! #: tp/Texinfo/Convert/HTML.pm:4966
  msgid "@import not finished in css file"
  msgstr "'@import' is niet afgesloten in CSS-bestand"
  
! #: tp/Texinfo/Convert/HTML.pm:4992
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "CSS-bestand %s is niet gevonden"
  
! #: tp/Texinfo/Convert/HTML.pm:4998
  #, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "kan '--include-file'-bestand %s niet openen: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5008
  #, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "fout bij sluiten van CSS-bestand %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5870 tp/Texinfo/Convert/HTML.pm:5874
  #, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "geen 'htmlxref.cnf'-item gevonden voor '%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:6568
  #, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "fout bij sluiten van frames-bestand %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6592
  #, 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:6707
  #, 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:6912
  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:7122
  #, 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:7147
  #, 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:7153
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "bestand is leeg voor hernoemde pagina '%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:7167
  #, perl-format
  msgid "target node (new name for `%s') not in document: %s"
***************
*** 2297,2301 ****
  
  # XXX Is het node of nodes?
! #: tp/Texinfo/Convert/HTML.pm:7125
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
--- 2298,2302 ----
  
  # XXX Is het node of nodes?
! #: tp/Texinfo/Convert/HTML.pm:7199
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
***************
*** 2304,2312 ****
  "pagina's: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7163
  msgid "empty node name"
  msgstr "lege paginanaam"
  
! #: tp/Texinfo/Convert/HTML.pm:7165 tp/Texinfo/Parser.pm:3697
  #, perl-format
  msgid "syntax for an external node used for `%s'"
--- 2305,2313 ----
  "pagina's: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7237
  msgid "empty node name"
  msgstr "lege paginanaam"
  
! #: tp/Texinfo/Convert/HTML.pm:7239 tp/Texinfo/Parser.pm:3542
  #, perl-format
  msgid "syntax for an external node used for `%s'"
***************
*** 2341,2370 ****
  msgstr "@node -- naam hoort geen ',' te bevatten: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1334
  #, 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:1381 tp/Texinfo/Parser.pm:2722
  #, 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:1495
  #, 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:1500
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "@image-bestand '%s' is onleesbaar: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1523
  #, 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:1931
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
--- 2342,2371 ----
  msgstr "@node -- naam hoort geen ',' te bevatten: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1335
  #, 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:1382 tp/Texinfo/Parser.pm:2568
  #, 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:1496
  #, 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:1501
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "@image-bestand '%s' is onleesbaar: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1524
  #, 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:1932
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
***************
*** 2374,2454 ****
  "woord om dat te vermijden"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2161
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr "@%s -- kruisverwijzingsnaam hoort geen ':' te bevatten"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2193
  #, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "@%s -- paginanaam hoort geen '%s' te bevatten"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2226
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr "@%s -- paginanaam hoort geen ':' te bevatten"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2272
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "'.' of ',' moet volgen op @xref, niet '%s'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2275
  msgid "`.' or `,' must follow @xref"
  msgstr "'.' of ',' moet volgen op '@xref'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3118
  #, 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:3129
  msgid "menu entry node name should not contain `:'"
  msgstr "paginanaam in menu-item hoort geen ':' te bevatten"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3145
  msgid "menu entry name should not contain `:'"
  msgstr "menu-itemnaam hoort geen ':' te bevatten"
  
! #: tp/Texinfo/Parser.pm:910
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr "@%s hoort alleen voor te komen aan begin of eind van document"
  
! #: tp/Texinfo/Parser.pm:1160 tp/Texinfo/Structuring.pm:594
  #, perl-format
  msgid "multiple @%s"
  msgstr "meerdere @%s"
  
! #: tp/Texinfo/Parser.pm:1194
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "onjuiste syntax voor argument van @%s: %s"
! 
! #: tp/Texinfo/Parser.pm:1210
  #, perl-format
  msgid "bad or empty @%s formal argument: %s"
  msgstr "onjuist of leeg formeel argument van @%s: %s"
  
! #: tp/Texinfo/Parser.pm:1219 tp/Texinfo/Parser.pm:4856
! #: tp/Texinfo/Parser.pm:4882 tp/Texinfo/Parser.pm:5671
! #: tp/Texinfo/Parser.pm:5687 tp/Texinfo/Parser.pm:5702
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s vereist een naam"
  
! #: tp/Texinfo/Parser.pm:1223 tp/Texinfo/Parser.pm:4859
! #: tp/Texinfo/Parser.pm:4885 tp/Texinfo/Parser.pm:5674
! #: tp/Texinfo/Parser.pm:5690 tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad name for @%s"
  msgstr "foute naam voor @%s"
  
! #: tp/Texinfo/Parser.pm:1341
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr "@end %s gevonden vÃ³Ã³r sluitaccolade van @%s"
  
! #: tp/Texinfo/Parser.pm:1345
  #, perl-format
  msgid "@%s seen before @%s closing brace"
--- 2375,2455 ----
  "woord om dat te vermijden"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2162
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr "@%s -- kruisverwijzingsnaam hoort geen ':' te bevatten"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2194
  #, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "@%s -- paginanaam hoort geen '%s' te bevatten"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2227
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr "@%s -- paginanaam hoort geen ':' te bevatten"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2273
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "'.' of ',' moet volgen op @xref, niet '%s'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2276
  msgid "`.' or `,' must follow @xref"
  msgstr "'.' of ',' moet volgen op '@xref'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3086
  #, 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:3097
  msgid "menu entry node name should not contain `:'"
  msgstr "paginanaam in menu-item hoort geen ':' te bevatten"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3113
  msgid "menu entry name should not contain `:'"
  msgstr "menu-itemnaam hoort geen ':' te bevatten"
  
! #: tp/Texinfo/Parser.pm:883
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr "@%s hoort alleen voor te komen aan begin of eind van document"
  
! #: tp/Texinfo/Parser.pm:1125 tp/Texinfo/Structuring.pm:595
  #, perl-format
  msgid "multiple @%s"
  msgstr "meerdere @%s"
  
! #: tp/Texinfo/Parser.pm:1166
  #, perl-format
  msgid "bad or empty @%s formal argument: %s"
  msgstr "onjuist of leeg formeel argument van @%s: %s"
  
! #: tp/Texinfo/Parser.pm:1176
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "onjuiste syntax voor argument van @%s: %s"
! 
! #: tp/Texinfo/Parser.pm:1183 tp/Texinfo/Parser.pm:4707
! #: tp/Texinfo/Parser.pm:4733 tp/Texinfo/Parser.pm:5565
! #: tp/Texinfo/Parser.pm:5578 tp/Texinfo/Parser.pm:5592
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s vereist een naam"
  
! #: tp/Texinfo/Parser.pm:1187 tp/Texinfo/Parser.pm:4710
! #: tp/Texinfo/Parser.pm:4736 tp/Texinfo/Parser.pm:5568
! #: tp/Texinfo/Parser.pm:5581 tp/Texinfo/Parser.pm:5595
  #, perl-format
  msgid "bad name for @%s"
  msgstr "foute naam voor @%s"
  
! #: tp/Texinfo/Parser.pm:1305
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr "@end %s gevonden vÃ³Ã³r sluitaccolade van @%s"
  
! #: tp/Texinfo/Parser.pm:1309
  #, perl-format
  msgid "@%s seen before @%s closing brace"
***************
*** 2456,2510 ****
  
  # XXX Maybe "closing brace"?  And "is missing a" or ":"?
! #: tp/Texinfo/Parser.pm:1350
  #, perl-format
! msgid "%c%s missing close brace"
  msgstr "%c%s: ontbrekende sluitaccolade"
  
! #: tp/Texinfo/Parser.pm:1354
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "@%s: afsluitende scheidingstekens ontbreken: %s}"
  
! #: tp/Texinfo/Parser.pm:1476
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "@itemx hoort niet aan begin van @%s"
  
! #: tp/Texinfo/Parser.pm:1544
  msgid "@itemx must follow @item"
  msgstr "@itemx hoort na @item"
  
! #: tp/Texinfo/Parser.pm:1712
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr "@%s bevat tekst maar geen @item"
  
! #: tp/Texinfo/Parser.pm:1743
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "'@end' verwachtte '%s', maar vond '%s'"
  
! #: tp/Texinfo/Parser.pm:1746
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@%s gevonden vÃ³Ã³r @end %s"
  
! #: tp/Texinfo/Parser.pm:1750
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "geen overeenkomende '%cend %s'"
  
! #: tp/Texinfo/Parser.pm:1776 tp/Texinfo/Parser.pm:5204
! #: tp/Texinfo/Parser.pm:5470
  #, perl-format
  msgid "misplaced %c"
  msgstr "verkeerd geplaatste %c"
  
! #: tp/Texinfo/Parser.pm:1874 tp/Texinfo/Parser.pm:3312
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "ongepaarde '%c%s'"
  
! #: tp/Texinfo/Parser.pm:2110
  #, perl-format
  msgid "macro `%s' called with too many args"
--- 2457,2511 ----
  
  # XXX Maybe "closing brace"?  And "is missing a" or ":"?
! #: tp/Texinfo/Parser.pm:1314
  #, perl-format
! msgid "%c%s missing closing brace"
  msgstr "%c%s: ontbrekende sluitaccolade"
  
! #: tp/Texinfo/Parser.pm:1318
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "@%s: afsluitende scheidingstekens ontbreken: %s}"
  
! #: tp/Texinfo/Parser.pm:1440
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "@itemx hoort niet aan begin van @%s"
  
! #: tp/Texinfo/Parser.pm:1508
  msgid "@itemx must follow @item"
  msgstr "@itemx hoort na @item"
  
! #: tp/Texinfo/Parser.pm:1676
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr "@%s bevat tekst maar geen @item"
  
! #: tp/Texinfo/Parser.pm:1707
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "'@end' verwachtte '%s', maar vond '%s'"
  
! #: tp/Texinfo/Parser.pm:1710
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@%s gevonden vÃ³Ã³r @end %s"
  
! #: tp/Texinfo/Parser.pm:1714
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "geen overeenkomende '%cend %s'"
  
! #: tp/Texinfo/Parser.pm:1738 tp/Texinfo/Parser.pm:5070
! #: tp/Texinfo/Parser.pm:5308
  #, perl-format
  msgid "misplaced %c"
  msgstr "verkeerd geplaatste %c"
  
! #: tp/Texinfo/Parser.pm:1835 tp/Texinfo/Parser.pm:3148
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "ongepaarde '%c%s'"
  
! #: tp/Texinfo/Parser.pm:2072
  #, perl-format
  msgid "macro `%s' called with too many args"
***************
*** 2512,2521 ****
  
  # XXX Maybe "closing brace"?  And "is missing a" or ":"?
! #: tp/Texinfo/Parser.pm:2132
  #, perl-format
! msgid "@%s missing close brace"
! msgstr "@%s ontbrekende sluitaccolade"
  
! #: tp/Texinfo/Parser.pm:2140
  #, perl-format
  msgid "macro `%s' declared without argument called with an argument"
--- 2513,2522 ----
  
  # XXX Maybe "closing brace"?  And "is missing a" or ":"?
! #: tp/Texinfo/Parser.pm:2094
  #, perl-format
! msgid "@%s missing closing brace"
! msgstr "@%s: ontbrekende sluitaccolade"
  
! #: tp/Texinfo/Parser.pm:2102
  #, perl-format
  msgid "macro `%s' declared without argument called with an argument"
***************
*** 2524,2528 ****
  "argument"
  
! #: tp/Texinfo/Parser.pm:2175
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
--- 2525,2529 ----
  "argument"
  
! #: tp/Texinfo/Parser.pm:2138
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
***************
*** 2531,2570 ****
  "of '\\'"
  
! #: tp/Texinfo/Parser.pm:2650
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s '%s' is al eerder gedefinieerd"
  
! #: tp/Texinfo/Parser.pm:2655
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "hier was de eerdere definitie van @%s"
  
! #: tp/Texinfo/Parser.pm:3016
  #, perl-format
  msgid "missing name for @%s"
  msgstr "ontbrekende naam voor @%s"
  
! #: tp/Texinfo/Parser.pm:3021
  #, perl-format
  msgid "missing category for @%s"
  msgstr "ontbrekende categorie voor @%s"
  
! #: tp/Texinfo/Parser.pm:3073
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "onverwacht argument op @%s-regel: %s"
  
! #: tp/Texinfo/Parser.pm:3089
  msgid "empty multitable"
  msgstr "lege multitabel"
  
! #: tp/Texinfo/Parser.pm:3145 tp/Texinfo/Parser.pm:5784
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "overtollig argument van @%s"
  
! #: tp/Texinfo/Parser.pm:3151 tp/Texinfo/Parser.pm:5806
! #: tp/Texinfo/Parser.pm:5818
  #, perl-format
  msgid "bad argument to @%s"
--- 2532,2571 ----
  "of '\\'"
  
! #: tp/Texinfo/Parser.pm:2501
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s '%s' is al eerder gedefinieerd"
  
! #: tp/Texinfo/Parser.pm:2506
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "hier was de eerdere definitie van @%s"
  
! #: tp/Texinfo/Parser.pm:2850
  #, perl-format
  msgid "missing name for @%s"
  msgstr "ontbrekende naam voor @%s"
  
! #: tp/Texinfo/Parser.pm:2855
  #, perl-format
  msgid "missing category for @%s"
  msgstr "ontbrekende categorie voor @%s"
  
! #: tp/Texinfo/Parser.pm:2890
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "onverwacht argument op @%s-regel: %s"
  
! #: tp/Texinfo/Parser.pm:2905
  msgid "empty multitable"
  msgstr "lege multitabel"
  
! #: tp/Texinfo/Parser.pm:2959 tp/Texinfo/Parser.pm:5673
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "overtollig argument van @%s"
  
! #: tp/Texinfo/Parser.pm:2965 tp/Texinfo/Parser.pm:5694
! #: tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad argument to @%s"
***************
*** 2572,2581 ****
  
  # FIXME: formatter?
! #: tp/Texinfo/Parser.pm:3162
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s vereist een argument: de formatteerder voor %c-item"
  
! #: tp/Texinfo/Parser.pm:3167
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
--- 2573,2582 ----
  
  # FIXME: formatter?
! #: tp/Texinfo/Parser.pm:2976
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s vereist een argument: de formatteerder voor %c-item"
  
! #: tp/Texinfo/Parser.pm:2981
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
***************
*** 2584,2646 ****
  "%s-regel"
  
! #: tp/Texinfo/Parser.pm:3202
  #, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "accentcommando '@%s' is niet toegestaan als argument van @%s"
  
! #: tp/Texinfo/Parser.pm:3290 tp/Texinfo/Parser.pm:3429
! #: tp/Texinfo/Parser.pm:5777
  #, perl-format
  msgid "@%s missing argument"
  msgstr "@%s: ontbrekend argument"
  
! #: tp/Texinfo/Parser.pm:3302
  #, perl-format
  msgid "unknown @end %s"
  msgstr "onbekende @end %s"
  
! #: tp/Texinfo/Parser.pm:3324 tp/Texinfo/Parser.pm:3943
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "overtollig argument van @%s %s: %s"
  
! #: tp/Texinfo/Parser.pm:3329 tp/Texinfo/Parser.pm:5861
! #: tp/Texinfo/Parser.pm:5906 tp/Texinfo/Parser.pm:5935
! #: tp/Texinfo/Parser.pm:5976 tp/Texinfo/Parser.pm:6055
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "fout argument van @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3348
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%s: kan %s niet openen: %s"
  
! #: tp/Texinfo/Parser.pm:3360
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr "codering '%s' is geen kanonieke Texinfo-codering"
  
! #: tp/Texinfo/Parser.pm:3369
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "onbekende coderingsnaam '%s'"
  
! #: tp/Texinfo/Parser.pm:3516
  #, perl-format
  msgid "@%s after the first element"
  msgstr "@%s na het eerste element"
  
! #: tp/Texinfo/Parser.pm:3523
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s is alleen zinvolÂ op een '@multitable'-regel"
  
! #: tp/Texinfo/Parser.pm:3563
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "@%s hoort niet gerelateerd te zijn aan @top"
  
! #: tp/Texinfo/Parser.pm:3575
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
--- 2585,2648 ----
  "%s-regel"
  
! #: tp/Texinfo/Parser.pm:3016
  #, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "accentcommando '@%s' is niet toegestaan als argument van @%s"
  
! #: tp/Texinfo/Parser.pm:3124 tp/Texinfo/Parser.pm:3277
! #: tp/Texinfo/Parser.pm:5666
  #, perl-format
  msgid "@%s missing argument"
  msgstr "@%s: ontbrekend argument"
  
! #: tp/Texinfo/Parser.pm:3138
  #, perl-format
  msgid "unknown @end %s"
  msgstr "onbekende @end %s"
  
! #: tp/Texinfo/Parser.pm:3161 tp/Texinfo/Parser.pm:3788
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "overtollig argument van @%s %s: %s"
  
! #: tp/Texinfo/Parser.pm:3167 tp/Texinfo/Parser.pm:3245
! #: tp/Texinfo/Parser.pm:5755 tp/Texinfo/Parser.pm:5798
! #: tp/Texinfo/Parser.pm:5827 tp/Texinfo/Parser.pm:5868
! #: tp/Texinfo/Parser.pm:5946
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "fout argument van @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3188
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%s: kan %s niet openen: %s"
  
! #: tp/Texinfo/Parser.pm:3200
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr "codering '%s' is geen kanonieke Texinfo-codering"
  
! #: tp/Texinfo/Parser.pm:3208
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "onbekende coderingsnaam '%s'"
  
! #: tp/Texinfo/Parser.pm:3364
  #, perl-format
  msgid "@%s after the first element"
  msgstr "@%s na het eerste element"
  
! #: tp/Texinfo/Parser.pm:3371
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s is alleen zinvolÂ op een '@multitable'-regel"
  
! #: tp/Texinfo/Parser.pm:3408
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "@%s hoort niet gerelateerd te zijn aan @top"
  
! #: tp/Texinfo/Parser.pm:3420
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
***************
*** 2648,2701 ****
  "@node gevonden vÃ³Ã³r @%s, maar delen mogen niet gerelateerd zijn aan pagina's"
  
! #: tp/Texinfo/Parser.pm:3677
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "leeg argument in @%s"
  
! #: tp/Texinfo/Parser.pm:3681
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "lege paginanaam na expansie '%s'"
  
! #: tp/Texinfo/Parser.pm:3724
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "lege menu-itemnaam in '%s'"
  
! #: tp/Texinfo/Parser.pm:3732
  msgid "empty node name in menu entry"
  msgstr "lege paginanaam in menu-item"
  
! #: tp/Texinfo/Parser.pm:3805
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "@%s hoort niet voor te komen in @%s"
  
! #: tp/Texinfo/Parser.pm:3937
  #, perl-format
! msgid "@end %s should only appear at a line beginning"
  msgstr "@end %s hoort alleen voor te komen aan begin van regel"
  
! #: tp/Texinfo/Parser.pm:3960
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "macro '%s' is al eerder gedefinieerd"
  
! #: tp/Texinfo/Parser.pm:3963
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "hier was de eerdere definitie van '%s'"
  
! #: tp/Texinfo/Parser.pm:3968
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "herdefiniÃ«ren van Texinfo-commando: @%s"
  
! #: tp/Texinfo/Parser.pm:4017
  #, perl-format
  msgid "@%s without associated character"
  msgstr "@%s zonder gerelateerd teken"
  
! #: tp/Texinfo/Parser.pm:4087
  #, perl-format
  msgid ""
--- 2650,2703 ----
  "@node gevonden vÃ³Ã³r @%s, maar delen mogen niet gerelateerd zijn aan pagina's"
  
! #: tp/Texinfo/Parser.pm:3522
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "leeg argument in @%s"
  
! #: tp/Texinfo/Parser.pm:3526
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "lege paginanaam na expansie '%s'"
  
! #: tp/Texinfo/Parser.pm:3569
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "lege menu-itemnaam in '%s'"
  
! #: tp/Texinfo/Parser.pm:3577
  msgid "empty node name in menu entry"
  msgstr "lege paginanaam in menu-item"
  
! #: tp/Texinfo/Parser.pm:3650
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "@%s hoort niet voor te komen in @%s"
  
! #: tp/Texinfo/Parser.pm:3782
  #, 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/Parser.pm:3804
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "macro '%s' is al eerder gedefinieerd"
  
! #: tp/Texinfo/Parser.pm:3807
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "hier was de eerdere definitie van '%s'"
  
! #: tp/Texinfo/Parser.pm:3812
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "herdefiniÃ«ren van Texinfo-commando: @%s"
  
! #: tp/Texinfo/Parser.pm:3879
  #, perl-format
  msgid "@%s without associated character"
  msgstr "@%s zonder gerelateerd teken"
  
! #: tp/Texinfo/Parser.pm:3949
  #, perl-format
  msgid ""
***************
*** 2705,2709 ****
  "aangeroepen te worden met {}"
  
! #: tp/Texinfo/Parser.pm:4111
  #, perl-format
  msgid ""
--- 2707,2711 ----
  "aangeroepen te worden met {}"
  
! #: tp/Texinfo/Parser.pm:3974
  #, perl-format
  msgid ""
***************
*** 2714,2718 ****
  "waarde is %d)"
  
! #: tp/Texinfo/Parser.pm:4120
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
--- 2716,2720 ----
  "waarde is %d)"
  
! #: tp/Texinfo/Parser.pm:3983
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
***************
*** 2721,2841 ****
  "'@rmacro'"
  
! #: tp/Texinfo/Parser.pm:4176
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr "na accentcommando '@%s' hoort geen witruimte te komen"
  
! #: tp/Texinfo/Parser.pm:4182
  #, 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/Parser.pm:4195 tp/Texinfo/Parser.pm:5325
  #, 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/Parser.pm:4207
  #, 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/Parser.pm:4218
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s verwachtte '{...}'"
  
! #: tp/Texinfo/Parser.pm:4383
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "ongedefinieerde vlag: %s"
  
! #: tp/Texinfo/Parser.pm:4386
  msgid "bad syntax for @value"
  msgstr "onjuiste syntax voor @value"
  
! #: tp/Texinfo/Parser.pm:4393
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s is verouderd."
  
! #: tp/Texinfo/Parser.pm:4396
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s is verouderd; %s"
  
! #: tp/Texinfo/Parser.pm:4405
  #, perl-format
! msgid "@%s should only appear at a line beginning"
  msgstr "@%s hoort alleen voor te komen aan begin van regel"
  
! #: tp/Texinfo/Parser.pm:4496
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s is niet toegestaan in een '@%s'-blok"
  
! #: tp/Texinfo/Parser.pm:4505
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr "@%s hoort alleen voor te komen in kop- of voetregel"
  
! #: tp/Texinfo/Parser.pm:4631 tp/Texinfo/Parser.pm:4648
! #: tp/Texinfo/Parser.pm:4698
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s is zinloos in een '@%s'-blok"
  
! #: tp/Texinfo/Parser.pm:4658
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "@%s in een lege multitabel"
  
! #: tp/Texinfo/Parser.pm:4664
  msgid "@tab before @item"
  msgstr "@tab vÃ³Ã³r @item"
  
! #: tp/Texinfo/Parser.pm:4667
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "te veel kolommen in multitabel-item (maximaal %d)"
  
! #: tp/Texinfo/Parser.pm:4704
  msgid "ignoring @tab outside of multitable"
  msgstr "@tab buiten een multitabel wordt genegeerd"
  
! #: tp/Texinfo/Parser.pm:4708
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "@%s buiten tabel of lijst"
  
! #: tp/Texinfo/Parser.pm:4745
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "moet na '@%s' zijn om '@%s' te kunnen gebruiken"
  
! #: tp/Texinfo/Parser.pm:4787
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "@%s is niet zinvol buiten '@titlepage'- en '@quotation'-omgevingen"
  
! #: tp/Texinfo/Parser.pm:4791
  msgid "@dircategory after first node"
  msgstr "@dircategory na eerste pagina"
  
! #: tp/Texinfo/Parser.pm:4979
  #, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "regio %s binnen regio %s is niet toegestaan"
  
! #: tp/Texinfo/Parser.pm:4997
  msgid "@direntry after first node"
  msgstr "@direntry na eerste pagina"
  
! #: tp/Texinfo/Parser.pm:5005
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "@%s gevonden vÃ³Ã³r de eerste @node"
  
! #: tp/Texinfo/Parser.pm:5008
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
--- 2723,2843 ----
  "'@rmacro'"
  
! #: tp/Texinfo/Parser.pm:4038
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr "na accentcommando '@%s' hoort geen witruimte te komen"
  
! #: tp/Texinfo/Parser.pm:4044
  #, 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/Parser.pm:4057 tp/Texinfo/Parser.pm:5189
  #, 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/Parser.pm:4068
  #, 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/Parser.pm:4079
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s verwachtte '{...}'"
  
! #: tp/Texinfo/Parser.pm:4233
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "ongedefinieerde vlag: %s"
  
! #: tp/Texinfo/Parser.pm:4236
  msgid "bad syntax for @value"
  msgstr "onjuiste syntax voor @value"
  
! #: tp/Texinfo/Parser.pm:4243
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s is verouderd."
  
! #: tp/Texinfo/Parser.pm:4246
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s is verouderd; %s"
  
! #: tp/Texinfo/Parser.pm:4255
  #, 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/Parser.pm:4346
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s is niet toegestaan in een '@%s'-blok"
  
! #: tp/Texinfo/Parser.pm:4355
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr "@%s hoort alleen voor te komen in kop- of voetregel"
  
! #: tp/Texinfo/Parser.pm:4479 tp/Texinfo/Parser.pm:4496
! #: tp/Texinfo/Parser.pm:4546
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s is zinloos in een '@%s'-blok"
  
! #: tp/Texinfo/Parser.pm:4506
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "@%s in een lege multitabel"
  
! #: tp/Texinfo/Parser.pm:4512
  msgid "@tab before @item"
  msgstr "@tab vÃ³Ã³r @item"
  
! #: tp/Texinfo/Parser.pm:4515
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "te veel kolommen in multitabel-item (maximaal %d)"
  
! #: tp/Texinfo/Parser.pm:4552
  msgid "ignoring @tab outside of multitable"
  msgstr "@tab buiten een multitabel wordt genegeerd"
  
! #: tp/Texinfo/Parser.pm:4556
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "@%s buiten tabel of lijst"
  
! #: tp/Texinfo/Parser.pm:4596
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "moet na '@%s' zijn om '@%s' te kunnen gebruiken"
  
! #: tp/Texinfo/Parser.pm:4638
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "@%s is niet zinvol buiten '@titlepage'- en '@quotation'-omgevingen"
  
! #: tp/Texinfo/Parser.pm:4642
  msgid "@dircategory after first node"
  msgstr "@dircategory na eerste pagina"
  
! #: tp/Texinfo/Parser.pm:4847
  #, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "regio %s binnen regio %s is niet toegestaan"
  
! #: tp/Texinfo/Parser.pm:4864
  msgid "@direntry after first node"
  msgstr "@direntry na eerste pagina"
  
! #: tp/Texinfo/Parser.pm:4872
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "@%s gevonden vÃ³Ã³r de eerste @node"
  
! #: tp/Texinfo/Parser.pm:4875
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
***************
*** 2844,2882 ****
  "@ifinfo?"
  
! #: tp/Texinfo/Parser.pm:5070
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr "@%s hoort alleen voor te komen in mathematische context"
  
! #: tp/Texinfo/Parser.pm:5078
  #, perl-format
  msgid "unknown command `%s'"
  msgstr "onbekend commando '%s'"
  
! #: tp/Texinfo/Parser.pm:5088
  msgid "unexpected @"
  msgstr "onverwachte @"
  
! #: tp/Texinfo/Parser.pm:5117
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s is niet zinvol buiten een '@float'-omgeving"
  
! #: tp/Texinfo/Parser.pm:5122
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr "@%s hoort direct onder '@float'"
  
! #: tp/Texinfo/Parser.pm:5130
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "meerdere @%s worden genegeerd"
  
! #: tp/Texinfo/Parser.pm:5249
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "commando @%s accepteert geen argumenten"
  
! #: tp/Texinfo/Parser.pm:5273
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
--- 2846,2884 ----
  "@ifinfo?"
  
! #: tp/Texinfo/Parser.pm:4937
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr "@%s hoort alleen voor te komen in mathematische context"
  
! #: tp/Texinfo/Parser.pm:4945
  #, perl-format
  msgid "unknown command `%s'"
  msgstr "onbekend commando '%s'"
  
! #: tp/Texinfo/Parser.pm:4955
  msgid "unexpected @"
  msgstr "onverwachte @"
  
! #: tp/Texinfo/Parser.pm:4983
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s is niet zinvol buiten een '@float'-omgeving"
  
! #: tp/Texinfo/Parser.pm:4988
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr "@%s hoort direct onder '@float'"
  
! #: tp/Texinfo/Parser.pm:4996
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "meerdere @%s worden genegeerd"
  
! #: tp/Texinfo/Parser.pm:5114
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "commando @%s accepteert geen argumenten"
  
! #: tp/Texinfo/Parser.pm:5138
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
***************
*** 2884,2981 ****
  "bij commando @%s ontbreekt een paginanaam of een extern handleidingsargument"
  
! #: tp/Texinfo/Parser.pm:5292
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr "een lege kruisverwijzingsnaam in @%s na expansie '%s'"
  
! #: tp/Texinfo/Parser.pm:5303
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
  msgstr "een lege kruisverwijzingstitel in @%s na expansie '%s'"
  
! #: tp/Texinfo/Parser.pm:5316
  msgid "@image missing filename argument"
  msgstr "ontbrekend bestandsnaamargument van @image"
  
! #: tp/Texinfo/Parser.pm:5348
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "bij @%s ontbreekt eerste argument"
  
! #: tp/Texinfo/Parser.pm:5393
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "niet-hexadecimale cijfers in argument van @U: %s"
  
! #: tp/Texinfo/Parser.pm:5399
  #, 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/Parser.pm:5412
! #, perl-format
! msgid "argument for @U exceeds size of integer: %s"
! msgstr "argument van @U overschrijdt maximale grootte van integer: %s"
! 
! #: tp/Texinfo/Parser.pm:5418
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr "argument van @U overschrijdt Unicode-maximum 0x10FFFF: %s"
  
! #: tp/Texinfo/Parser.pm:5546
  msgid "superfluous arguments for node"
  msgstr "overtollige argumenten voor pagina"
  
! #: tp/Texinfo/Parser.pm:5596
  #, perl-format
  msgid "expected @end %s"
  msgstr "verwachtte @end %s"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "@%s hoort alleen een @-commando als argument te accepteren, niet '%s'"
  
! #: tp/Texinfo/Parser.pm:5728
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "overblijvend argument op @%s-regel: %s"
  
! #: tp/Texinfo/Parser.pm:5801
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "omgevingscommando %s is gebruikt als argument van @%s"
  
! #: tp/Texinfo/Parser.pm:5823
  #, perl-format
  msgid "empty @%s"
  msgstr "lege @%s"
  
! #: tp/Texinfo/Parser.pm:5831
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "Kolomfractie is geen getal: %s"
  
! #: tp/Texinfo/Parser.pm:5840
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "Argument van @sp moet numeriek zijn, niet '%s'"
  
! #: tp/Texinfo/Parser.pm:5849
  #, perl-format
  msgid "reserved index name %s"
  msgstr "gereserveerde indexnaam %s"
  
! #: tp/Texinfo/Parser.pm:5868
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "onbekende bronindex in @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5871
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "onbekende doelindex in @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
--- 2886,2978 ----
  "bij commando @%s ontbreekt een paginanaam of een extern handleidingsargument"
  
! #: tp/Texinfo/Parser.pm:5156
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr "een lege kruisverwijzingsnaam in @%s na expansie '%s'"
  
! #: tp/Texinfo/Parser.pm:5167
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
  msgstr "een lege kruisverwijzingstitel in @%s na expansie '%s'"
  
! #: tp/Texinfo/Parser.pm:5180
  msgid "@image missing filename argument"
  msgstr "ontbrekend bestandsnaamargument van @image"
  
! #: tp/Texinfo/Parser.pm:5211
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "bij @%s ontbreekt eerste argument"
  
! #: tp/Texinfo/Parser.pm:5230
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "niet-hexadecimale cijfers in argument van @U: %s"
  
! #: tp/Texinfo/Parser.pm:5236
  #, 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/Parser.pm:5253
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr "argument van @U overschrijdt Unicode-maximum 0x10FFFF: %s"
  
! #: tp/Texinfo/Parser.pm:5448
  msgid "superfluous arguments for node"
  msgstr "overtollige argumenten voor pagina"
  
! #: tp/Texinfo/Parser.pm:5498
  #, perl-format
  msgid "expected @end %s"
  msgstr "verwachtte @end %s"
  
! #: tp/Texinfo/Parser.pm:5607
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "@%s hoort alleen een @-commando als argument te accepteren, niet '%s'"
  
! #: tp/Texinfo/Parser.pm:5617
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "overblijvend argument op @%s-regel: %s"
  
! #: tp/Texinfo/Parser.pm:5689
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "omgevingscommando %s is gebruikt als argument van @%s"
  
! #: tp/Texinfo/Parser.pm:5710
  #, perl-format
  msgid "empty @%s"
  msgstr "lege @%s"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "Kolomfractie is geen getal: %s"
  
! #: tp/Texinfo/Parser.pm:5727
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "Argument van @sp moet numeriek zijn, niet '%s'"
  
! #: tp/Texinfo/Parser.pm:5736
  #, perl-format
  msgid "reserved index name %s"
  msgstr "gereserveerde indexnaam %s"
  
! #: tp/Texinfo/Parser.pm:5762
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "onbekende bronindex in @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5765
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "onbekende doelindex in @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5793
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
***************
*** 2983,3022 ****
  "@%s zou leiden tot het samenvoegen van %s met zichzelf -- wordt genegeerd"
  
! #: tp/Texinfo/Parser.pm:5914
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "onbekende index '%s' in @printindex"
  
! #: tp/Texinfo/Parser.pm:5920
  #, 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/Parser.pm:5928
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "afdrukopdracht voor begin van document: @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5944
  #, 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/Parser.pm:5952
  #, 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/Parser.pm:5960
  #, 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/Parser.pm:5968
  #, 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/Parser.pm:5986 tp/Texinfo/Parser.pm:5991
  #, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
--- 2980,3019 ----
  "@%s zou leiden tot het samenvoegen van %s met zichzelf -- wordt genegeerd"
  
! #: tp/Texinfo/Parser.pm:5806
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "onbekende index '%s' in @printindex"
  
! #: tp/Texinfo/Parser.pm:5812
  #, 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/Parser.pm:5820
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "afdrukopdracht voor begin van document: @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5836
  #, 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/Parser.pm:5844
  #, 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/Parser.pm:5852
  #, 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/Parser.pm:5860
  #, 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/Parser.pm:5878 tp/Texinfo/Parser.pm:5883
  #, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
***************
*** 3024,3028 ****
  "Argument van @paragraphindent moet numeriek, 'none' of 'asis' zijn, niet '%s'"
  
! #: tp/Texinfo/Parser.pm:5999
  #, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
--- 3021,3025 ----
  "Argument van @paragraphindent moet numeriek, 'none' of 'asis' zijn, niet '%s'"
  
! #: tp/Texinfo/Parser.pm:5891
  #, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
***************
*** 3030,3044 ****
  "Argument van @firstparagraphindent moet 'none' of 'insert' zijn, niet '%s'"
  
! #: tp/Texinfo/Parser.pm:6009
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
  msgstr "Argument van @exampleindent moet numeriek of 'asis' zijn, niet '%s'"
  
! #: tp/Texinfo/Parser.pm:6021
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "bij @%s werd 'on' of 'off' verwacht, niet '%s'"
  
! #: tp/Texinfo/Parser.pm:6031
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
--- 3027,3041 ----
  "Argument van @firstparagraphindent moet 'none' of 'insert' zijn, niet '%s'"
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
  msgstr "Argument van @exampleindent moet numeriek of 'asis' zijn, niet '%s'"
  
! #: tp/Texinfo/Parser.pm:5913
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "bij @%s werd 'on' of 'off' verwacht, niet '%s'"
  
! #: tp/Texinfo/Parser.pm:5922
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
***************
*** 3047,3056 ****
  "'%s'"
  
! #: tp/Texinfo/Parser.pm:6039
  #, 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/Parser.pm:6047
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
--- 3044,3053 ----
  "'%s'"
  
! #: tp/Texinfo/Parser.pm:5930
  #, 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/Parser.pm:5938
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
***************
*** 3058,3072 ****
  "Argument van @urefbreakstyle moet 'after', 'before' of 'none' zijn, niet '%s'"
  
! #: tp/Texinfo/Structuring.pm:213
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr "verhoging van sectioneringsniveau van @%s, want te laag"
  
! #: tp/Texinfo/Structuring.pm:245
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "er is geen hoofdstuksniveaucommando vÃ³Ã³r @%s"
  
! #: tp/Texinfo/Structuring.pm:250
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
--- 3055,3069 ----
  "Argument van @urefbreakstyle moet 'after', 'before' of 'none' zijn, niet '%s'"
  
! #: tp/Texinfo/Structuring.pm:216
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr "verhoging van sectioneringsniveau van @%s, want te laag"
  
! #: tp/Texinfo/Structuring.pm:248
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "er is geen hoofdstuksniveaucommando vÃ³Ã³r @%s"
  
! #: tp/Texinfo/Structuring.pm:253
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
***************
*** 3074,3128 ****
  "verlaging van sectioneringsniveau van @%s verschijnt na een lager element"
  
! #: tp/Texinfo/Structuring.pm:339
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "er is geen sectioneringscommando gerelateerd aan @%s"
  
! #: tp/Texinfo/Structuring.pm:488
  #, perl-format
  msgid "@%s not empty"
  msgstr "@%s is niet leeg"
  
! #: tp/Texinfo/Structuring.pm:544 tp/Texinfo/Structuring.pm:1326
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "@%s verwijst naar niet-bestaande pagina '%s'"
  
! #: tp/Texinfo/Structuring.pm:557
  #, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
  msgstr "@%s-paginanaam '%s' verschilt van %s-naam '%s'"
  
! #: tp/Texinfo/Structuring.pm:662
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "naar pagina '%s' wordt niet verwezen"
  
! #: tp/Texinfo/Structuring.pm:708
  #, 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:715
  #, 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:733
  #, 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:787
  #, 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:814
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%s verwijst naar niet-bestaande '%s'"
  
! #: tp/Texinfo/Structuring.pm:834
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
--- 3071,3125 ----
  "verlaging van sectioneringsniveau van @%s verschijnt na een lager element"
  
! #: tp/Texinfo/Structuring.pm:342
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "er is geen sectioneringscommando gerelateerd aan @%s"
  
! #: tp/Texinfo/Structuring.pm:491
  #, perl-format
  msgid "@%s not empty"
  msgstr "@%s is niet leeg"
  
! #: tp/Texinfo/Structuring.pm:547 tp/Texinfo/Structuring.pm:1325
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "@%s verwijst naar niet-bestaande pagina '%s'"
  
! #: tp/Texinfo/Structuring.pm:558
  #, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
  msgstr "@%s-paginanaam '%s' verschilt van %s-naam '%s'"
  
! #: tp/Texinfo/Structuring.pm:663
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "naar pagina '%s' wordt niet verwezen"
  
! #: tp/Texinfo/Structuring.pm:706
  #, 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:713
  #, 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:731
  #, 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:786
  #, 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:810
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%s verwijst naar niet-bestaande '%s'"
  
! #: tp/Texinfo/Structuring.pm:829
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
***************
*** 3131,3135 ****
  "ondanks dat de eerste het 'Up'-doel van de laatste is"
  
! #: tp/Texinfo/Structuring.pm:842
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
--- 3128,3132 ----
  "ondanks dat de eerste het 'Up'-doel van de laatste is"
  
! #: tp/Texinfo/Structuring.pm:837
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
***************
*** 3141,3145 ****
  msgstr "@%s naar '%s', verschilt van %s-naam '%s'"
  
! #: tp/Texinfo/Structuring.pm:2070
  #, perl-format
  msgid "empty index key in @%s"
--- 3138,3142 ----
  msgstr "@%s naar '%s', verschilt van %s-naam '%s'"
  
! #: tp/Texinfo/Structuring.pm:2067
  #, perl-format
  msgid "empty index key in @%s"
***************
*** 3671,3675 ****
  msgstr "Typ '%s --help' voor meer informatie.\n"
  
! #: tp/texi2any.pl:1232
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
--- 3668,3672 ----
  msgstr "Typ '%s --help' voor meer informatie.\n"
  
! #: tp/texi2any.pl:1239
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
***************
*** 3677,3691 ****
  "sectie?"
  
! #: tp/texi2any.pl:1255
  #, 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:1261
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "kan %s niet openen om te schrijven: %s\n"
  
! #: tp/texi2any.pl:1286
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
--- 3674,3688 ----
  "sectie?"
  
! #: tp/texi2any.pl:1262
  #, 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:1268
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "kan %s niet openen om te schrijven: %s\n"
  
! #: tp/texi2any.pl:1293
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
***************
*** 3695,3713 ****
  "resultaat af. Geen sectie?"
  
! #: tp/texi2any.pl:1359 tp/texi2any.pl:1435
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%s: fout bij sluiten van %s: %s\n"
  
! #: tp/texi2any.pl:1382 tp/texi2any.pl:1416
  #, 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:1388 tp/texi2any.pl:1422
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
  msgstr "%s: kan %s niet openen om te schrijven: %s\n"
  
  #~ msgid "--*** Tags out of Date ***"
  #~ msgstr "--*** Tags zijn verouderd ***"
--- 3692,3722 ----
  "resultaat af. Geen sectie?"
  
! #: tp/texi2any.pl:1366 tp/texi2any.pl:1442
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%s: fout bij sluiten van %s: %s\n"
  
! #: tp/texi2any.pl:1389 tp/texi2any.pl:1423
  #, 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:1395 tp/texi2any.pl:1429
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
  msgstr "%s: kan %s niet openen om te schrijven: %s\n"
  
+ #~ msgid "-%s---Info: %s, %ld lines --%s--"
+ #~ msgstr "-%s---Info: %s, %ld regels --%s--"
+ 
+ #~ msgid "-%s---Info: (%s)%s, %ld lines --%s--"
+ #~ msgstr "-%s---Info: (%s)%s, %ld regels --%s--"
+ 
+ #~ msgid "No file given for node '%s'."
+ #~ msgstr "Er is geen bestand gegeven voor pagina '%s'."
+ 
+ #~ msgid "argument for @U exceeds size of integer: %s"
+ #~ msgstr "argument van @U overschrijdt maximale grootte van integer: %s"
+ 
  #~ msgid "--*** Tags out of Date ***"
  #~ msgstr "--*** Tags zijn verouderd ***"
Binary files texinfo-6.1/po/pl.gmo and texinfo-6.3/po/pl.gmo differ
diff -Nrc2 texinfo-6.1/po/pl.po texinfo-6.3/po/pl.po
*** texinfo-6.1/po/pl.po	2016-02-06 11:35:53.000000000 +0000
--- texinfo-6.3/po/pl.po	2016-09-10 12:45:54.000000000 +0100
***************
*** 1,13 ****
  # Polish translation for texinfo.
! # Copyright (C) 2003, 2004, 2007, 2008, 2012, 2013, 2015 Free Software Foundation, Inc.
  # This file is distributed under the same license as the texinfo package.
! # Jakub Bogusz <qboosh@pld-linux.org>, 2003-2015.
  #
  msgid ""
  msgstr ""
! "Project-Id-Version: texinfo 6.0.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
! "PO-Revision-Date: 2015-12-22 18:32+0100\n"
  "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
  "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
--- 1,13 ----
  # Polish translation for texinfo.
! # Copyright (C) 2003, 2004, 2007, 2008, 2012, 2013, 2015, 2016 Free Software Foundation, Inc.
  # This file is distributed under the same license as the texinfo package.
! # Jakub Bogusz <qboosh@pld-linux.org>, 2003-2016.
  #
  msgid ""
  msgstr ""
! "Project-Id-Version: texinfo 6.1.92\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:45+0100\n"
! "PO-Revision-Date: 2016-09-09 19:09+0200\n"
  "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
  "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
***************
*** 16,19 ****
--- 16,20 ----
  "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=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
  "|| n%100>=20) ? 1 : 2;\n"
***************
*** 113,118 ****
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [ or [^"
! msgstr "Niesparowane [ lub [^"
  
  #: gnulib/lib/regcomp.c:159
--- 114,119 ----
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [, [^, [:, [., or [="
! msgstr "Niesparowane [, [^, [:, [. lub [="
  
  #: gnulib/lib/regcomp.c:159
***************
*** 152,156 ****
  msgstr "Niesparowane ) lub \\)"
  
! #: gnulib/lib/regcomp.c:711
  msgid "No previous regular expression"
  msgstr "Brak poprzedniego wyraÅ¼enia regularnego"
--- 153,157 ----
  msgstr "Niesparowane ) lub \\)"
  
! #: gnulib/lib/regcomp.c:687
  msgid "No previous regular expression"
  msgstr "Brak poprzedniego wyraÅ¼enia regularnego"
***************
*** 305,309 ****
  msgstr "---------- Przypisy -----------"
  
! #: info/indices.c:123 info/indices.c:812
  #, c-format
  msgid "Finding index entries..."
--- 306,310 ----
  msgstr "---------- Przypisy -----------"
  
! #: info/indices.c:123 info/indices.c:822
  #, c-format
  msgid "Finding index entries..."
***************
*** 314,318 ****
  msgstr "Szukanie Å‚aÅ„cucha w indeksie tego pliku"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:818
  #, c-format
  msgid "No indices found."
--- 315,319 ----
  msgstr "Szukanie Å‚aÅ„cucha w indeksie tego pliku"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:828
  #, c-format
  msgid "No indices found."
***************
*** 345,376 ****
  msgstr "Nie ma wiÄ™cej wpisÃ³w w indeksie zawierajÄ…cych '%s'."
  
! #: info/indices.c:476 info/indices.c:880
  #, c-format
  msgid "No index entries containing '%s'."
  msgstr "Nie ma wpisÃ³w w indeksie zawierajÄ…cych '%s'."
  
! #: info/indices.c:583
  #, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "Przeszukiwanie indeksÃ³w '%s'..."
  
! #: info/indices.c:636
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr "Szukanie Å‚aÅ„cucha w znanych indeksach plikÃ³w info i zbudowanie menu"
  
! #: info/indices.c:644 info/indices.c:646
  msgid "Index apropos"
  msgstr "Indeks dla Å‚aÅ„cucha"
  
! #: info/indices.c:688
  #, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Wpisy w indeksie zawierajÄ…ce '%s':\n"
  
! #: info/indices.c:797
  msgid "List all matches of a string in the index"
  msgstr "Lista wszystkich dopasowaÅ„ Å‚aÅ„cucha w indeksie"
  
! #: info/indices.c:824 info/indices.c:826
  msgid "Index topic"
  msgstr "Temat indeksu"
--- 346,377 ----
  msgstr "Nie ma wiÄ™cej wpisÃ³w w indeksie zawierajÄ…cych '%s'."
  
! #: info/indices.c:476 info/indices.c:890
  #, c-format
  msgid "No index entries containing '%s'."
  msgstr "Nie ma wpisÃ³w w indeksie zawierajÄ…cych '%s'."
  
! #: info/indices.c:586
  #, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "Przeszukiwanie indeksÃ³w '%s'..."
  
! #: info/indices.c:646
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr "Szukanie Å‚aÅ„cucha w znanych indeksach plikÃ³w info i zbudowanie menu"
  
! #: info/indices.c:654 info/indices.c:656
  msgid "Index apropos"
  msgstr "Indeks dla Å‚aÅ„cucha"
  
! #: info/indices.c:698
  #, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Wpisy w indeksie zawierajÄ…ce '%s':\n"
  
! #: info/indices.c:807
  msgid "List all matches of a string in the index"
  msgstr "Lista wszystkich dopasowaÅ„ Å‚aÅ„cucha w indeksie"
  
! #: info/indices.c:834 info/indices.c:836
  msgid "Index topic"
  msgstr "Temat indeksu"
***************
*** 381,435 ****
  msgstr "Å»aden z dostÄ™pnych plikÃ³w info nie zawiera '%s' w swoich indeksach."
  
! #: info/info-utils.c:892
  #, c-format
  msgid "Error converting file character encoding."
  msgstr "BÅ‚Ä…d przy konwersji kodowania znakÃ³w pliku."
  
! #: info/info.c:222 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "Brak elementu menu '%s' w wÄ™Åºle '%s'."
  
! #: info/info.c:315
! #, c-format
! msgid "No file given for node '%s'."
! msgstr "Nie podano pliku dla wÄ™zÅ‚a '%s'."
! 
! #: info/info.c:364 info/info.c:1133
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr "Nie moÅ¼na znaleÅºÄ‡ wÄ™zÅ‚a '%s'."
  
! #: info/info.c:386
  #, c-format
  msgid "No program name given."
  msgstr "Nie podano nazwy programu."
  
! #: info/info.c:577
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "bÅ‚Ä™dna liczba: %s\n"
  
! #: info/info.c:757
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "Åºle sformuÅ‚owane przypisanie zmiennej: %s"
  
! #: info/info.c:764 info/infokey.c:537
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: brak zmiennej"
  
! #: info/info.c:770 info/infokey.c:539
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "wartoÅ›Ä‡ %s nie jest prawidÅ‚owa dla zmiennej %s"
  
! #: info/info.c:782
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "WiÄ™cej informacji moÅ¼na uzyskaÄ‡ przez --help.\n"
  
! #: info/info.c:804 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
--- 382,431 ----
  msgstr "Å»aden z dostÄ™pnych plikÃ³w info nie zawiera '%s' w swoich indeksach."
  
! #: info/info-utils.c:879
  #, c-format
  msgid "Error converting file character encoding."
  msgstr "BÅ‚Ä…d przy konwersji kodowania znakÃ³w pliku."
  
! #: info/info.c:279 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "Brak elementu menu '%s' w wÄ™Åºle '%s'."
  
! #: info/info.c:416 info/info.c:1148
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr "Nie moÅ¼na znaleÅºÄ‡ wÄ™zÅ‚a '%s'."
  
! #: info/info.c:438
  #, c-format
  msgid "No program name given."
  msgstr "Nie podano nazwy programu."
  
! #: info/info.c:636
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "bÅ‚Ä™dna liczba: %s\n"
  
! #: info/info.c:816
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "Åºle sformuÅ‚owane przypisanie zmiennej: %s"
  
! #: info/info.c:823 info/infokey.c:540
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: brak zmiennej"
  
! #: info/info.c:829 info/infokey.c:542
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "wartoÅ›Ä‡ %s nie jest prawidÅ‚owa dla zmiennej %s"
  
! #: info/info.c:841
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "WiÄ™cej informacji moÅ¼na uzyskaÄ‡ przez --help.\n"
  
! #: info/info.c:860 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
***************
*** 447,456 ****
  "Nie ma Å»ADNEJ GWARANCJI w zakresie dopuszczalnym przez prawo.\n"
  
! #: info/info.c:981
  #, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "nie znaleziono wpisÃ³w w indeksie dla '%s'\n"
  
! #: info/info.c:1034
  #, c-format
  msgid ""
--- 443,452 ----
  "Nie ma Å»ADNEJ GWARANCJI w zakresie dopuszczalnym przez prawo.\n"
  
! #: info/info.c:999
  #, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "nie znaleziono wpisÃ³w w indeksie dla '%s'\n"
  
! #: info/info.c:1049
  #, c-format
  msgid ""
***************
*** 463,467 ****
  "PrzeglÄ…danie dokumentacji w formacie Info.\n"
  
! #: info/info.c:1040
  msgid ""
  "Options:\n"
--- 459,463 ----
  "PrzeglÄ…danie dokumentacji w formacie Info.\n"
  
! #: info/info.c:1055
  msgid ""
  "Options:\n"
***************
*** 481,485 ****
  "  -f, --file=PODRÄ˜CZNIK        okreÅ›lenie podrÄ™cznika Info do odwiedzenia."
  
! #: info/info.c:1048
  msgid ""
  "  -h, --help                   display this help and exit.\n"
--- 477,481 ----
  "  -f, --file=PODRÄ˜CZNIK        okreÅ›lenie podrÄ™cznika Info do odwiedzenia."
  
! #: info/info.c:1063
  msgid ""
  "  -h, --help                   display this help and exit.\n"
***************
*** 494,498 ****
  "  -o, --output=PLIK            zapis wybranych wÄ™zÅ‚Ã³w do PLIKU."
  
! #: info/info.c:1054
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
--- 490,494 ----
  "  -o, --output=PLIK            zapis wybranych wÄ™zÅ‚Ã³w do PLIKU."
  
! #: info/info.c:1069
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
***************
*** 508,516 ****
  "  -O, --show-options, --usage  przejÅ›cie do wÄ™zÅ‚a z opcjami linii poleceÅ„."
  
! #: info/info.c:1061
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr "  -b, --speech-friendly        tryb przyjazny dla syntezatorÃ³w mowy."
  
! #: info/info.c:1065
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
--- 504,512 ----
  "  -O, --show-options, --usage  przejÅ›cie do wÄ™zÅ‚a z opcjami linii poleceÅ„."
  
! #: info/info.c:1076
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr "  -b, --speech-friendly        tryb przyjazny dla syntezatorÃ³w mowy."
  
! #: info/info.c:1080
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
***************
*** 537,541 ****
  "(-1=wszystko).\n"
  
! #: info/info.c:1074
  msgid ""
  "\n"
--- 533,537 ----
  "(-1=wszystko).\n"
  
! #: info/info.c:1089
  msgid ""
  "\n"
***************
*** 556,560 ****
  "poczÄ…tkowo odwiedzonego wÄ™zÅ‚a."
  
! #: info/info.c:1081
  msgid ""
  "\n"
--- 552,556 ----
  "poczÄ…tkowo odwiedzonego wÄ™zÅ‚a."
  
! #: info/info.c:1096
  msgid ""
  "\n"
***************
*** 564,568 ****
  "Opis dziaÅ‚ania klawiszy jest dostÄ™pny pod H w Info."
  
! #: info/info.c:1084
  msgid ""
  "\n"
--- 560,564 ----
  "Opis dziaÅ‚ania klawiszy jest dostÄ™pny pod H w Info."
  
! #: info/info.c:1099
  msgid ""
  "\n"
***************
*** 597,601 ****
  "katalogu"
  
! #: info/info.c:1099 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
--- 593,597 ----
  "katalogu"
  
! #: info/info.c:1114 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
***************
*** 607,671 ****
  "Strona domowa texinfo: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1134
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Nie moÅ¼na znaleÅºÄ‡ wÄ™zÅ‚a '(%s)%s'."
  
! #: info/info.c:1135
  msgid "Cannot find a window!"
  msgstr "Nie moÅ¼na znaleÅºÄ‡ okna!"
  
! #: info/info.c:1136
  msgid "Point doesn't appear within this window's node!"
  msgstr "Kropka nie wystÄ™puje w wÄ™Åºle z tego okna!"
  
! #: info/info.c:1137
  msgid "Cannot delete the last window."
  msgstr "Nie moÅ¼na usunÄ…Ä‡ ostatniego okna."
  
! #: info/info.c:1138
  msgid "No menu in this node."
  msgstr "Brak menu w tym wÄ™Åºle."
  
! #: info/info.c:1139
  msgid "No footnotes in this node."
  msgstr "Brak przypisÃ³w w tym wÄ™Åºle."
  
! #: info/info.c:1140
  msgid "No cross references in this node."
  msgstr "Brak odsyÅ‚aczy w tym wÄ™Åºle."
  
! #: info/info.c:1141
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Brak wskaÅºnika '%s' dla tego wÄ™zÅ‚a."
  
! #: info/info.c:1142
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "Nieznane polecenie Info '%c'; '?' przywoÅ‚uje pomoc."
  
! #: info/info.c:1143
  #, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "Typ terminala '%s' nie jest wystarczajÄ…cy do uruchomienia Info."
  
! #: info/info.c:1144
  msgid "You are already at the last page of this node."
  msgstr "To juÅ¼ jest ostatnia strona tego wÄ™zÅ‚a."
  
! #: info/info.c:1145
  msgid "You are already at the first page of this node."
  msgstr "To juÅ¼ jest pierwsza strona tego wÄ™zÅ‚a."
  
! #: info/info.c:1146
  msgid "Only one window."
  msgstr "Tylko jedno okno."
  
! #: info/info.c:1147
  msgid "Resulting window would be too small."
  msgstr "Wynikowe okno byÅ‚oby zbyt maÅ‚e."
  
! #: info/info.c:1148
  msgid "Not enough room for a help window, please delete a window."
  msgstr "Za maÅ‚o miejsca na okno pomocy, proszÄ™ usunÄ…Ä‡ okno."
--- 603,667 ----
  "Strona domowa texinfo: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1149
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Nie moÅ¼na znaleÅºÄ‡ wÄ™zÅ‚a '(%s)%s'."
  
! #: info/info.c:1150
  msgid "Cannot find a window!"
  msgstr "Nie moÅ¼na znaleÅºÄ‡ okna!"
  
! #: info/info.c:1151
  msgid "Point doesn't appear within this window's node!"
  msgstr "Kropka nie wystÄ™puje w wÄ™Åºle z tego okna!"
  
! #: info/info.c:1152
  msgid "Cannot delete the last window."
  msgstr "Nie moÅ¼na usunÄ…Ä‡ ostatniego okna."
  
! #: info/info.c:1153
  msgid "No menu in this node."
  msgstr "Brak menu w tym wÄ™Åºle."
  
! #: info/info.c:1154
  msgid "No footnotes in this node."
  msgstr "Brak przypisÃ³w w tym wÄ™Åºle."
  
! #: info/info.c:1155
  msgid "No cross references in this node."
  msgstr "Brak odsyÅ‚aczy w tym wÄ™Åºle."
  
! #: info/info.c:1156
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Brak wskaÅºnika '%s' dla tego wÄ™zÅ‚a."
  
! #: info/info.c:1157
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "Nieznane polecenie Info '%c'; '?' przywoÅ‚uje pomoc."
  
! #: info/info.c:1158
  #, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "Typ terminala '%s' nie jest wystarczajÄ…cy do uruchomienia Info."
  
! #: info/info.c:1159
  msgid "You are already at the last page of this node."
  msgstr "To juÅ¼ jest ostatnia strona tego wÄ™zÅ‚a."
  
! #: info/info.c:1160
  msgid "You are already at the first page of this node."
  msgstr "To juÅ¼ jest pierwsza strona tego wÄ™zÅ‚a."
  
! #: info/info.c:1161
  msgid "Only one window."
  msgstr "Tylko jedno okno."
  
! #: info/info.c:1162
  msgid "Resulting window would be too small."
  msgstr "Wynikowe okno byÅ‚oby zbyt maÅ‚e."
  
! #: info/info.c:1163
  msgid "Not enough room for a help window, please delete a window."
  msgstr "Za maÅ‚o miejsca na okno pomocy, proszÄ™ usunÄ…Ä‡ okno."
***************
*** 940,974 ****
  msgstr "nieznana akcja `%s'"
  
! #: info/infokey.c:482
  #, c-format
  msgid "action name too long"
  msgstr "nazwa akcji zbyt dÅ‚uga"
  
! #: info/infokey.c:495
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "nadmiarowe znaki po akcji `%s'"
  
! #: info/infokey.c:506
  #, c-format
  msgid "missing variable name"
  msgstr "brakujÄ…ca nazwa zmiennej"
  
! #: info/infokey.c:515
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "brakujÄ…cy `=' bezpoÅ›rednio po nazwie zmiennej"
  
! #: info/infokey.c:522
  #, c-format
  msgid "variable name too long"
  msgstr "nazwa zmiennej zbyt dÅ‚uga"
  
! #: info/infokey.c:546
  #, c-format
  msgid "value too long"
  msgstr "wartoÅ›Ä‡ zbyt dÅ‚uga"
  
! #: info/infokey.c:592
  #, c-format
  msgid "\"%s\", line %u: "
--- 936,970 ----
  msgstr "nieznana akcja `%s'"
  
! #: info/infokey.c:485
  #, c-format
  msgid "action name too long"
  msgstr "nazwa akcji zbyt dÅ‚uga"
  
! #: info/infokey.c:498
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "nadmiarowe znaki po akcji `%s'"
  
! #: info/infokey.c:509
  #, c-format
  msgid "missing variable name"
  msgstr "brakujÄ…ca nazwa zmiennej"
  
! #: info/infokey.c:518
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "brakujÄ…cy `=' bezpoÅ›rednio po nazwie zmiennej"
  
! #: info/infokey.c:525
  #, c-format
  msgid "variable name too long"
  msgstr "nazwa zmiennej zbyt dÅ‚uga"
  
! #: info/infokey.c:549
  #, c-format
  msgid "value too long"
  msgstr "wartoÅ›Ä‡ zbyt dÅ‚uga"
  
! #: info/infokey.c:595
  #, c-format
  msgid "\"%s\", line %u: "
***************
*** 1301,1640 ****
  msgstr "Nie moÅ¼na znaleÅºÄ‡ wÄ™zÅ‚a wskazywanego przez '%s' w '%s'."
  
! #: info/session.c:2864
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "Odczytanie listy menu poczÄ…wszy od katalogu i podÄ…Å¼anie za niÄ…"
  
! #: info/session.c:2866
  msgid "Follow menus: "
  msgstr "PodÄ…Å¼anie za menu: "
  
! #: info/session.c:2971
  msgid "Select the Next node"
  msgstr "Wybranie wÄ™zÅ‚a NastÄ™pny"
  
! #: info/session.c:2978
  msgid "Select the Prev node"
  msgstr "Wybranie wÄ™zÅ‚a Poprzedni"
  
! #: info/session.c:2985
  msgid "Select the Up node"
  msgstr "Wybranie wÄ™zÅ‚a W gÃ³rÄ™"
  
! #: info/session.c:2991
  msgid "Select the last node in this file"
  msgstr "Wybranie ostatniego wÄ™zÅ‚a w tym pliku"
  
! #: info/session.c:3018 info/session.c:3051
  msgid "This window has no additional nodes"
  msgstr "To okno nie ma dodatkowych wÄ™zÅ‚Ã³w"
  
! #: info/session.c:3024
  msgid "Select the first node in this file"
  msgstr "Wybranie pierwszego wÄ™zÅ‚a w tym pliku"
  
! #: info/session.c:3158
  msgid "No more nodes within this document."
  msgstr "Nie ma wiÄ™cej wÄ™zÅ‚Ã³w w tym dokumencie."
  
! #: info/session.c:3203 info/session.c:3243
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr ""
  "Nie ma wÄ™zÅ‚Ã³w 'Poprzedni' ani 'W gÃ³rÄ™' dla tego wÄ™zÅ‚a w tym dokumencie."
  
! #: info/session.c:3256
  msgid "Move forwards or down through node structure"
  msgstr "PrzejÅ›cie do przodu lub w dÃ³Å‚ struktury wÄ™zÅ‚a"
  
! #: info/session.c:3273
  msgid "Move backwards or up through node structure"
  msgstr "PrzejÅ›cie do tyÅ‚u lub w gÃ³rÄ™ struktury wÄ™zÅ‚a"
  
! #: info/session.c:3296
  msgid "Read a node name and select it"
  msgstr "Odczytanie nazwy wÄ™zÅ‚a i wybranie go"
  
! #: info/session.c:3350 info/session.c:3354
  msgid "Goto node: "
  msgstr "PrzejÅ›cie do wÄ™zÅ‚a: "
  
! #: info/session.c:3533
  msgid "Find the node describing program invocation"
  msgstr "Szukanie wÄ™zÅ‚a opisujÄ…cego wywoÅ‚anie programu"
  
! #: info/session.c:3535
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Szukanie wÄ™zÅ‚a Invocation dla [%s]: "
  
! #: info/session.c:3580
  msgid "Read a manpage reference and select it"
  msgstr "Odczytanie odnoÅ›nika do strony podrÄ™cznika i wybranie go"
  
! #: info/session.c:3584
  msgid "Get Manpage: "
  msgstr "Pobranie strony podrÄ™cznika: "
  
! #: info/session.c:3605
  msgid "Select the node 'Top' in this file"
  msgstr "Wybranie wÄ™zÅ‚a 'Szczytowy' w tym pliku"
  
! #: info/session.c:3611
  msgid "Select the node '(dir)'"
  msgstr "Wybranie wÄ™zÅ‚a '(dir)'"
  
! #: info/session.c:3617
  msgid "Show full file name of node being displayed"
  msgstr "Pokazywanie peÅ‚nej nazwy pliku wyÅ›wietlanego wÄ™zÅ‚a"
  
! #: info/session.c:3634
  msgid "Select the most recently selected node"
  msgstr "Wybranie ostatnio wybranego wÄ™zÅ‚a"
  
! #: info/session.c:3639
  #, c-format
  msgid "No earlier node in history"
  msgstr "Brak wczeÅ›niejszego wÄ™zÅ‚a w historii"
  
! #: info/session.c:3643
  msgid "Read the name of a file and select it"
  msgstr "Odczytanie nazwy pliku i wybranie go"
  
! #: info/session.c:3647
  msgid "Find file: "
  msgstr "Szukanie pliku: "
  
! #: info/session.c:3664
  #, c-format
  msgid "Cannot find '%s'."
  msgstr "Nie moÅ¼na znaleÅºÄ‡ '%s'."
  
! #: info/session.c:3713
  #, c-format
  msgid "Could not create output file '%s'."
  msgstr "Nie udaÅ‚o siÄ™ utworzyÄ‡ pliku wyjÅ›ciowego '%s'."
  
! #: info/session.c:3727
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "bÅ‚Ä…d podczas zapisu do %s: %s"
  
! #: info/session.c:3736
  #, c-format
  msgid "closing %s"
  msgstr "zamykanie %s"
  
! #: info/session.c:3785
  #, c-format
  msgid "writing node %s..."
  msgstr "zapisywanie wÄ™zÅ‚a %s..."
  
! #: info/session.c:3831
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "Przepuszczenie zawartoÅ›ci tego pliku przez INFO_PRINT_COMMAND"
  
! #: info/session.c:3859
  #, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Nie moÅ¼na otworzyÄ‡ potoku do '%s'."
  
! #: info/session.c:3864
  #, c-format
  msgid "printing node %s..."
  msgstr "drukowanie wÄ™zÅ‚a %s..."
  
! #: info/session.c:3872
  #, c-format
  msgid "finished printing node %s"
  msgstr "zakoÅ„czono drukowanie wÄ™zÅ‚a %s"
  
! #: info/session.c:3904
  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."
  
! #: info/session.c:4169
  msgid "Search continued from the end of the document."
  msgstr "Kontynuacja szukania od koÅ„ca dokumentu."
  
! #: info/session.c:4174
  msgid "Search continued from the beginning of the document."
  msgstr "Kontynuacja szukania od poczÄ…tku dokumentu."
  
! #: info/session.c:4194
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "Szukanie podpliku %s ..."
  
! #: info/session.c:4231
  msgid "Search failed."
  msgstr "Wyszukiwanie nie powiodÅ‚o siÄ™."
  
! #: info/session.c:4248
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Regexp search"
  msgstr "Szukanie wyr.reg."
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Search"
  msgstr "Szukanie"
  
! #: info/session.c:4250 info/session.c:4256
  msgid " case-sensitively"
  msgstr " z uwzgl. wielkoÅ›ci liter"
  
! #: info/session.c:4251 info/session.c:4257
  msgid " backward"
  msgstr " wstecz"
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s: "
  
! #: info/session.c:4274
  msgid "Search string too short"
  msgstr "Wyszukiwany Å‚aÅ„cuch jest zbyt krÃ³tki"
  
! #: info/session.c:4467
  #, c-format
  msgid "Going back to last match from %s"
  msgstr "PowrÃ³t do ostatniego dopasowania z %s"
  
! #: info/session.c:4491 info/session.c:4601
  #, c-format
  msgid "No more matches."
  msgstr "Nic wiÄ™cej nie pasuje."
  
! #: info/session.c:4628
  msgid "Search this node and subnodes for a string."
  msgstr "Wyszukanie Å‚aÅ„cucha w tym wÄ™Åºle i podwÄ™zÅ‚ach."
  
! #: info/session.c:4649
  msgid "Go to next match in Info sub-tree"
  msgstr "PrzejÅ›cie do nastÄ™pnego dopasowania w poddrzewie Info"
  
! #: info/session.c:4653 info/session.c:4665
  #, c-format
  msgid "No active search"
  msgstr "Brak aktywnego wyszukiwania"
  
! #: info/session.c:4661
  msgid "Go to previous match in Info sub-tree"
  msgstr "PrzejÅ›cie do poprzedniego dopasowania w poddrzewie Info"
  
! #: info/session.c:4674
  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:4679
  msgid "Read a string and search for it"
  msgstr "Odczytanie Å‚aÅ„cucha i poszukiwanie go"
  
! #: info/session.c:4685
  msgid "Read a string and search backward for it"
  msgstr "Odczytanie Å‚aÅ„cucha i poszukiwanie go w tyÅ‚"
  
! #: info/session.c:4693
  msgid "Repeat last search in the same direction"
  msgstr "PowtÃ³rzenie ostatniego poszukiwania w tym samym kierunku"
  
! #: info/session.c:4701 info/session.c:4746
  msgid "No previous search string"
  msgstr "Brak poprzedniego szukanego Å‚aÅ„cucha"
  
! #: info/session.c:4738
  msgid "Repeat last search in the reverse direction"
  msgstr "PowtÃ³rzenie ostatniego poszukiwania w odwrotnym kierunku"
  
! #: info/session.c:4785
  msgid "Clear displayed search matches"
  msgstr "Wyczyszczenie wyÅ›wietlonych wynikÃ³w wyszukiwania"
  
! #: info/session.c:4802 info/session.c:4808
  msgid "Search interactively for a string as you type it"
  msgstr "Interaktywne poszukiwanie Å‚aÅ„cucha w trakcie wpisywania go"
  
! #: info/session.c:4928
  msgid "Regexp I-search backward: "
  msgstr "Interaktywne szukanie wyr.reg. wstecz: "
  
! #: info/session.c:4929
  msgid "I-search backward: "
  msgstr "Interaktywne szukanie wstecz: "
  
! #: info/session.c:4931
  msgid "Regexp I-search: "
  msgstr "Interaktywne szukanie wyr.reg.: "
  
! #: info/session.c:4932
  msgid "I-search: "
  msgstr "Interaktywne szukanie: "
  
! #: info/session.c:4957 info/session.c:4960
  msgid "Failing "
  msgstr "Bez powodzenia "
  
! #: info/session.c:5326
  msgid "Cancel current operation"
  msgstr "Anulowanie bieÅ¼Ä…cej operacji"
  
! #: info/session.c:5333
  msgid "Quit"
  msgstr "WyjÅ›cie"
  
! #: info/session.c:5338
  msgid "Display version of Info being run"
  msgstr "wyÅ›wietlenie wersji uruchomionego Info"
  
! #: info/session.c:5340
  #, c-format
  msgid "GNU Info version %s"
  msgstr "GNU Info wersja %s"
  
! #: info/session.c:5345
  msgid "Redraw the display"
  msgstr "Odrysowanie ekranu"
  
! #: info/session.c:5382
  msgid "Quit using Info"
  msgstr "WyjÅ›cie z Info"
  
! #: info/session.c:5398
  msgid "Run command bound to this key's lowercase variant"
  msgstr "Uruchomienie polecenia przypisanego do wariantu klawisza z maÅ‚Ä… literÄ…"
  
! #: info/session.c:5409
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Nieznane polecenie (%s)."
  
! #: info/session.c:5412
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\" jest niepoprawne"
  
! #: info/session.c:5413
  #, c-format
  msgid "'%s' is invalid"
  msgstr "'%s' jest niepoprawne"
  
! #: info/session.c:5731
  msgid "Add this digit to the current numeric argument"
  msgstr "Dodanie tej cyfry do aktualnego argumentu liczbowego"
  
! #: info/session.c:5738
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "RozpoczÄ™cie (lub pomnoÅ¼enie przez 4) aktualnego argumentu liczbowego"
--- 1297,1636 ----
  msgstr "Nie moÅ¼na znaleÅºÄ‡ wÄ™zÅ‚a wskazywanego przez '%s' w '%s'."
  
! #: info/session.c:2870
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "Odczytanie listy menu poczÄ…wszy od katalogu i podÄ…Å¼anie za niÄ…"
  
! #: info/session.c:2872
  msgid "Follow menus: "
  msgstr "PodÄ…Å¼anie za menu: "
  
! #: info/session.c:2977
  msgid "Select the Next node"
  msgstr "Wybranie wÄ™zÅ‚a NastÄ™pny"
  
! #: info/session.c:2984
  msgid "Select the Prev node"
  msgstr "Wybranie wÄ™zÅ‚a Poprzedni"
  
! #: info/session.c:2991
  msgid "Select the Up node"
  msgstr "Wybranie wÄ™zÅ‚a W gÃ³rÄ™"
  
! #: info/session.c:2997
  msgid "Select the last node in this file"
  msgstr "Wybranie ostatniego wÄ™zÅ‚a w tym pliku"
  
! #: info/session.c:3024 info/session.c:3057
  msgid "This window has no additional nodes"
  msgstr "To okno nie ma dodatkowych wÄ™zÅ‚Ã³w"
  
! #: info/session.c:3030
  msgid "Select the first node in this file"
  msgstr "Wybranie pierwszego wÄ™zÅ‚a w tym pliku"
  
! #: info/session.c:3164
  msgid "No more nodes within this document."
  msgstr "Nie ma wiÄ™cej wÄ™zÅ‚Ã³w w tym dokumencie."
  
! #: info/session.c:3209 info/session.c:3249
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr ""
  "Nie ma wÄ™zÅ‚Ã³w 'Poprzedni' ani 'W gÃ³rÄ™' dla tego wÄ™zÅ‚a w tym dokumencie."
  
! #: info/session.c:3262
  msgid "Move forwards or down through node structure"
  msgstr "PrzejÅ›cie do przodu lub w dÃ³Å‚ struktury wÄ™zÅ‚a"
  
! #: info/session.c:3279
  msgid "Move backwards or up through node structure"
  msgstr "PrzejÅ›cie do tyÅ‚u lub w gÃ³rÄ™ struktury wÄ™zÅ‚a"
  
! #: info/session.c:3302
  msgid "Read a node name and select it"
  msgstr "Odczytanie nazwy wÄ™zÅ‚a i wybranie go"
  
! #: info/session.c:3356 info/session.c:3360
  msgid "Goto node: "
  msgstr "PrzejÅ›cie do wÄ™zÅ‚a: "
  
! #: info/session.c:3539
  msgid "Find the node describing program invocation"
  msgstr "Szukanie wÄ™zÅ‚a opisujÄ…cego wywoÅ‚anie programu"
  
! #: info/session.c:3541
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Szukanie wÄ™zÅ‚a Invocation dla [%s]: "
  
! #: info/session.c:3586
  msgid "Read a manpage reference and select it"
  msgstr "Odczytanie odnoÅ›nika do strony podrÄ™cznika i wybranie go"
  
! #: info/session.c:3590
  msgid "Get Manpage: "
  msgstr "Pobranie strony podrÄ™cznika: "
  
! #: info/session.c:3611
  msgid "Select the node 'Top' in this file"
  msgstr "Wybranie wÄ™zÅ‚a 'Szczytowy' w tym pliku"
  
! #: info/session.c:3617
  msgid "Select the node '(dir)'"
  msgstr "Wybranie wÄ™zÅ‚a '(dir)'"
  
! #: info/session.c:3623
  msgid "Show full file name of node being displayed"
  msgstr "Pokazywanie peÅ‚nej nazwy pliku wyÅ›wietlanego wÄ™zÅ‚a"
  
! #: info/session.c:3640
  msgid "Select the most recently selected node"
  msgstr "Wybranie ostatnio wybranego wÄ™zÅ‚a"
  
! #: info/session.c:3645
  #, c-format
  msgid "No earlier node in history"
  msgstr "Brak wczeÅ›niejszego wÄ™zÅ‚a w historii"
  
! #: info/session.c:3649
  msgid "Read the name of a file and select it"
  msgstr "Odczytanie nazwy pliku i wybranie go"
  
! #: info/session.c:3653
  msgid "Find file: "
  msgstr "Szukanie pliku: "
  
! #: info/session.c:3670
  #, c-format
  msgid "Cannot find '%s'."
  msgstr "Nie moÅ¼na znaleÅºÄ‡ '%s'."
  
! #: info/session.c:3719
  #, c-format
  msgid "Could not create output file '%s'."
  msgstr "Nie udaÅ‚o siÄ™ utworzyÄ‡ pliku wyjÅ›ciowego '%s'."
  
! #: info/session.c:3733
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "bÅ‚Ä…d podczas zapisu do %s: %s"
  
! #: info/session.c:3742
  #, c-format
  msgid "closing %s"
  msgstr "zamykanie %s"
  
! #: info/session.c:3791
  #, c-format
  msgid "writing node %s..."
  msgstr "zapisywanie wÄ™zÅ‚a %s..."
  
! #: info/session.c:3837
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "Przepuszczenie zawartoÅ›ci tego pliku przez INFO_PRINT_COMMAND"
  
! #: info/session.c:3865
  #, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Nie moÅ¼na otworzyÄ‡ potoku do '%s'."
  
! #: info/session.c:3870
  #, c-format
  msgid "printing node %s..."
  msgstr "drukowanie wÄ™zÅ‚a %s..."
  
! #: info/session.c:3878
  #, c-format
  msgid "finished printing node %s"
  msgstr "zakoÅ„czono drukowanie wÄ™zÅ‚a %s"
  
! #: info/session.c:3910
  msgid "Toggle the usage of regular expressions in searches"
  msgstr "PrzeÅ‚Ä…czenie uÅ¼ywania wyraÅ¼eÅ„ regularnych przy wyszukiwaniu"
  
! #: info/session.c:3914
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr "UÅ¼ywanie wyraÅ¼eÅ„ regularnych przy wyszukiwaniu."
  
! #: info/session.c:3915
  #, c-format
  msgid "Using literal strings for searches."
  msgstr "UÅ¼ywanie dosÅ‚ownego tekstu przy wyszukiwaniu."
  
! #: info/session.c:4175
  msgid "Search continued from the end of the document."
  msgstr "Kontynuacja szukania od koÅ„ca dokumentu."
  
! #: info/session.c:4180
  msgid "Search continued from the beginning of the document."
  msgstr "Kontynuacja szukania od poczÄ…tku dokumentu."
  
! #: info/session.c:4200
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "Szukanie podpliku %s ..."
  
! #: info/session.c:4237
  msgid "Search failed."
  msgstr "Wyszukiwanie nie powiodÅ‚o siÄ™."
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Regexp search"
  msgstr "Szukanie wyr.reg."
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Search"
  msgstr "Szukanie"
  
! #: info/session.c:4256 info/session.c:4262
  msgid " case-sensitively"
  msgstr " z uwzgl. wielkoÅ›ci liter"
  
! #: info/session.c:4257 info/session.c:4263
  msgid " backward"
  msgstr " wstecz"
  
! #: info/session.c:4260
  #, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s: "
  
! #: info/session.c:4280
  msgid "Search string too short"
  msgstr "Wyszukiwany Å‚aÅ„cuch jest zbyt krÃ³tki"
  
! #: info/session.c:4473
  #, c-format
  msgid "Going back to last match from %s"
  msgstr "PowrÃ³t do ostatniego dopasowania z %s"
  
! #: info/session.c:4497 info/session.c:4607
  #, c-format
  msgid "No more matches."
  msgstr "Nic wiÄ™cej nie pasuje."
  
! #: info/session.c:4634
  msgid "Search this node and subnodes for a string."
  msgstr "Wyszukanie Å‚aÅ„cucha w tym wÄ™Åºle i podwÄ™zÅ‚ach."
  
! #: info/session.c:4655
  msgid "Go to next match in Info sub-tree"
  msgstr "PrzejÅ›cie do nastÄ™pnego dopasowania w poddrzewie Info"
  
! #: info/session.c:4659 info/session.c:4671
  #, c-format
  msgid "No active search"
  msgstr "Brak aktywnego wyszukiwania"
  
! #: info/session.c:4667
  msgid "Go to previous match in Info sub-tree"
  msgstr "PrzejÅ›cie do poprzedniego dopasowania w poddrzewie Info"
  
! #: info/session.c:4680
  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:4685
  msgid "Read a string and search for it"
  msgstr "Odczytanie Å‚aÅ„cucha i poszukiwanie go"
  
! #: info/session.c:4691
  msgid "Read a string and search backward for it"
  msgstr "Odczytanie Å‚aÅ„cucha i poszukiwanie go w tyÅ‚"
  
! #: info/session.c:4699
  msgid "Repeat last search in the same direction"
  msgstr "PowtÃ³rzenie ostatniego poszukiwania w tym samym kierunku"
  
! #: info/session.c:4707 info/session.c:4752
  msgid "No previous search string"
  msgstr "Brak poprzedniego szukanego Å‚aÅ„cucha"
  
! #: info/session.c:4744
  msgid "Repeat last search in the reverse direction"
  msgstr "PowtÃ³rzenie ostatniego poszukiwania w odwrotnym kierunku"
  
! #: info/session.c:4791
  msgid "Clear displayed search matches"
  msgstr "Wyczyszczenie wyÅ›wietlonych wynikÃ³w wyszukiwania"
  
! #: info/session.c:4808 info/session.c:4814
  msgid "Search interactively for a string as you type it"
  msgstr "Interaktywne poszukiwanie Å‚aÅ„cucha w trakcie wpisywania go"
  
! #: info/session.c:4934
  msgid "Regexp I-search backward: "
  msgstr "Interaktywne szukanie wyr.reg. wstecz: "
  
! #: info/session.c:4935
  msgid "I-search backward: "
  msgstr "Interaktywne szukanie wstecz: "
  
! #: info/session.c:4937
  msgid "Regexp I-search: "
  msgstr "Interaktywne szukanie wyr.reg.: "
  
! #: info/session.c:4938
  msgid "I-search: "
  msgstr "Interaktywne szukanie: "
  
! #: info/session.c:4963 info/session.c:4966
  msgid "Failing "
  msgstr "Bez powodzenia "
  
! #: info/session.c:5332
  msgid "Cancel current operation"
  msgstr "Anulowanie bieÅ¼Ä…cej operacji"
  
! #: info/session.c:5339
  msgid "Quit"
  msgstr "WyjÅ›cie"
  
! #: info/session.c:5344
  msgid "Display version of Info being run"
  msgstr "wyÅ›wietlenie wersji uruchomionego Info"
  
! #: info/session.c:5346
  #, c-format
  msgid "GNU Info version %s"
  msgstr "GNU Info wersja %s"
  
! #: info/session.c:5351
  msgid "Redraw the display"
  msgstr "Odrysowanie ekranu"
  
! #: info/session.c:5388
  msgid "Quit using Info"
  msgstr "WyjÅ›cie z Info"
  
! #: info/session.c:5404
  msgid "Run command bound to this key's lowercase variant"
  msgstr "Uruchomienie polecenia przypisanego do wariantu klawisza z maÅ‚Ä… literÄ…"
  
! #: info/session.c:5415
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Nieznane polecenie (%s)."
  
! #: info/session.c:5418
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\" jest niepoprawne"
  
! #: info/session.c:5419
  #, c-format
  msgid "'%s' is invalid"
  msgstr "'%s' jest niepoprawne"
  
! #: info/session.c:5737
  msgid "Add this digit to the current numeric argument"
  msgstr "Dodanie tej cyfry do aktualnego argumentu liczbowego"
  
! #: info/session.c:5744
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "RozpoczÄ™cie (lub pomnoÅ¼enie przez 4) aktualnego argumentu liczbowego"
***************
*** 1772,1789 ****
  msgstr "Ustawienie %s na wartoÅ›Ä‡ (%s): "
  
! #: info/window.c:959
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), linii ----, "
  
- #: info/window.c:966
- #, c-format
- msgid "-%s---Info: %s, %ld lines --%s--"
- msgstr "-%s---Info: %s, %ld linii --%s--"
- 
- #: info/window.c:970
- #, c-format
- msgid "-%s---Info: (%s)%s, %ld lines --%s--"
- msgstr "-%s---Info: (%s)%s, %ld linii --%s--"
- 
  #: install-info/install-info.c:292
  #, c-format
--- 1768,1775 ----
  msgstr "Ustawienie %s na wartoÅ›Ä‡ (%s): "
  
! #: info/window.c:909
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), linii ----, "
  
  #: install-info/install-info.c:292
  #, c-format
***************
*** 1973,1977 ****
  "\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"
--- 1959,1963 ----
  "\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"
***************
*** 1989,1993 ****
  "\n"
  "  To (wÄ™zeÅ‚ Katalog) zawiera menu dla gÅ‚Ã³wnych tematÃ³w.\n"
! "  NaciÅ›niÄ™cie \"q\" koÅ„czy przeglÄ…danie, \"?\" wyÅ›wietla wszystkie "
  "polecenia\n"
  "  Info, \"d\" wraca tutaj, \"h\" pokazuje wprowadzenie dla nowicjuszy,\n"
--- 1975,1979 ----
  "\n"
  "  To (wÄ™zeÅ‚ Katalog) zawiera menu dla gÅ‚Ã³wnych tematÃ³w.\n"
! "  NaciÅ›niÄ™cie \"q\" koÅ„czy przeglÄ…danie, \"H\" wyÅ›wietla wszystkie "
  "polecenia\n"
  "  Info, \"d\" wraca tutaj, \"h\" pokazuje wprowadzenie dla nowicjuszy,\n"
***************
*** 2064,2180 ****
  msgstr "nie znaleziono wpisÃ³w dla `%s'; nic nie usuniÄ™to"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:855
! #: tp/Texinfo/Convert/Converter.pm:893 tp/Texinfo/Convert/Converter.pm:1204
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6504
! #: tp/Texinfo/Convert/HTML.pm:6528 tp/Texinfo/Convert/HTML.pm:6905
! #: tp/Texinfo/Convert/HTML.pm:6963 tp/Texinfo/Convert/HTML.pm:7041
! #: tp/Texinfo/Convert/HTML.pm:7118 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:546
! #: tp/Texinfo/Convert/TexinfoXML.pm:457
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "nie moÅ¼na otworzyÄ‡ %s do zapisu: %s"
  
! #: tp/Texinfo/Common.pm:881
  msgid "recursion is always allowed"
  msgstr "rekurencja jest zawsze dozwolona"
  
! #: tp/Texinfo/Common.pm:882
  msgid "arguments are quoted by default"
  msgstr "argumenty sÄ… domyÅ›lnie cytowane"
  
! #: tp/Texinfo/Common.pm:1105
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s nie jest poprawnym kodem jÄ™zyka"
  
! #: tp/Texinfo/Common.pm:1110
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s nie jest poprawnym kodem regionu"
  
! #: tp/Texinfo/Common.pm:1128
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%s nie jest poprawnÄ… opcjÄ… podziaÅ‚u"
  
! #: tp/Texinfo/Common.pm:1151
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "nie moÅ¼na odczytaÄ‡ %s: %s"
  
! #: tp/Texinfo/Common.pm:1170
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "bÅ‚Ä…d podczas zamykania pliku @verbatiminclude %s: %s"
  
! #: tp/Texinfo/Common.pm:1176 tp/Texinfo/Parser.pm:3353
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%s: nie moÅ¼na znaleÅºÄ‡ %s"
  
! #: tp/Texinfo/Common.pm:1520
! #, 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/Common.pm:1548
! msgid "missing type"
! msgstr "brak typu"
! 
! #: tp/Texinfo/Common.pm:1551
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "nieznany typ: %s"
! 
! #: tp/Texinfo/Common.pm:1568
! #, 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/Common.pm:1603
  msgid "no node to be renamed"
  msgstr "brak wÄ™zÅ‚a do przemianowania"
  
! #: tp/Texinfo/Common.pm:1614
  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:1624 tp/Texinfo/Parser.pm:926
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "nie moÅ¼na otworzyÄ‡ %s: %s"
  
! #: tp/Texinfo/Common.pm:2144
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr "nie moÅ¼na zabezpieczyÄ‡ znaku hash w @%s"
  
! #: tp/Texinfo/Convert/Converter.pm:395 tp/Texinfo/Convert/Converter.pm:414
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "PrzestarzaÅ‚a zmienna %s\n"
  
! #: tp/Texinfo/Convert/Converter.pm:794
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr "%s: wyjÅ›cie niezgodne z podziaÅ‚em na pliki"
  
! #: tp/Texinfo/Convert/Converter.pm:876 tp/Texinfo/Convert/Converter.pm:909
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:6931
! #: tp/Texinfo/Convert/HTML.pm:6989 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:476 tp/Texinfo/Parser.pm:2035
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "bÅ‚Ä…d podczas zamykania %s: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, 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:995
  #, perl-format
  msgid "could not create directory `%s': %s"
--- 2050,2162 ----
  msgstr "nie znaleziono wpisÃ³w dla `%s'; nic nie usuniÄ™to"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:847
! #: tp/Texinfo/Convert/Converter.pm:885 tp/Texinfo/Convert/Converter.pm:1196
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6573
! #: tp/Texinfo/Convert/HTML.pm:6597 tp/Texinfo/Convert/HTML.pm:6978
! #: tp/Texinfo/Convert/HTML.pm:7037 tp/Texinfo/Convert/HTML.pm:7115
! #: tp/Texinfo/Convert/HTML.pm:7192 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:547
! #: tp/Texinfo/Convert/TexinfoXML.pm:458
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "nie moÅ¼na otworzyÄ‡ %s do zapisu: %s"
  
! #: tp/Texinfo/Common.pm:862
  msgid "recursion is always allowed"
  msgstr "rekurencja jest zawsze dozwolona"
  
! #: tp/Texinfo/Common.pm:863
  msgid "arguments are quoted by default"
  msgstr "argumenty sÄ… domyÅ›lnie cytowane"
  
! #: tp/Texinfo/Common.pm:866
! 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:869
! msgid ""
! "move your @shortcontents and @contents commands if you want the contents "
! "after the title page"
! msgstr ""
! "proszÄ™ przenieÅ›Ä‡ polecenia @shortcontents oraz @contents, jeÅ›li spis treÅ›ci "
! "ma byÄ‡ po stronie tytuÅ‚owej"
! 
! #: tp/Texinfo/Common.pm:1093
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s nie jest poprawnym kodem jÄ™zyka"
  
! #: tp/Texinfo/Common.pm:1098
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s nie jest poprawnym kodem regionu"
  
! #: tp/Texinfo/Common.pm:1116
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%s nie jest poprawnÄ… opcjÄ… podziaÅ‚u"
  
! #: tp/Texinfo/Common.pm:1139
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "nie moÅ¼na odczytaÄ‡ %s: %s"
  
! #: tp/Texinfo/Common.pm:1158
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "bÅ‚Ä…d podczas zamykania pliku @verbatiminclude %s: %s"
  
! #: tp/Texinfo/Common.pm:1164 tp/Texinfo/Parser.pm:3193
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%s: nie moÅ¼na znaleÅºÄ‡ %s"
  
! #: tp/Texinfo/Common.pm:1637
  msgid "no node to be renamed"
  msgstr "brak wÄ™zÅ‚a do przemianowania"
  
! #: tp/Texinfo/Common.pm:1648
  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:1658 tp/Texinfo/Parser.pm:899
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "nie moÅ¼na otworzyÄ‡ %s: %s"
  
! #: tp/Texinfo/Common.pm:2178
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr "nie moÅ¼na zabezpieczyÄ‡ znaku hash w @%s"
  
! #: tp/Texinfo/Convert/Converter.pm:387 tp/Texinfo/Convert/Converter.pm:406
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "PrzestarzaÅ‚a zmienna %s\n"
  
! #: tp/Texinfo/Convert/Converter.pm:786
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr "%s: wyjÅ›cie niezgodne z podziaÅ‚em na pliki"
  
! #: tp/Texinfo/Convert/Converter.pm:868 tp/Texinfo/Convert/Converter.pm:901
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:7004
! #: tp/Texinfo/Convert/HTML.pm:7063 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:477 tp/Texinfo/Parser.pm:1996
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "bÅ‚Ä…d podczas zamykania %s: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:979
  #, 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:987
  #, perl-format
  msgid "could not create directory `%s': %s"
***************
*** 2186,2275 ****
  msgstr "Plik @image `%s' nie znaleziony, uÅ¼yto `%s'"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5388
  msgid "no argument specified for @U"
  msgstr "nie podano argumentu dla @U"
  
! #: tp/Texinfo/Convert/HTML.pm:1683
  #, 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:2371
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "format surowy %s nie jest przekonwertowany"
  
! #: tp/Texinfo/Convert/HTML.pm:4888
  msgid "string not closed in css file"
  msgstr "niedomkniÄ™ty Å‚aÅ„cuch w pliku css"
  
! #: tp/Texinfo/Convert/HTML.pm:4890
  msgid "--css-include ended in comment"
  msgstr "plik --css-include zakoÅ„czyÅ‚ siÄ™ wewnÄ…trz komentarza"
  
! #: tp/Texinfo/Convert/HTML.pm:4892
  msgid "@import not finished in css file"
  msgstr "@import nie zakoÅ„czony w pliku css"
  
! #: tp/Texinfo/Convert/HTML.pm:4918
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "nie znaleziono pliku css %s"
  
! #: tp/Texinfo/Convert/HTML.pm:4924
  #, 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:4934
  #, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "bÅ‚Ä…d podczas zamykania pliku CSS %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5801 tp/Texinfo/Convert/HTML.pm:5805
  #, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "brak wpisu htmlxref.cnf dla `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:6499
  #, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "bÅ‚Ä…d podczas zamykania pliku ramki %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6523
  #, 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:6638
  #, 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:6839
  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:7048
  #, 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:7073
  #, 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:7079
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "pusty plik dla przemianowanego wÄ™zÅ‚a `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:7093
  #, 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:7125
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
--- 2168,2276 ----
  msgstr "Plik @image `%s' nie znaleziony, uÅ¼yto `%s'"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5225
  msgid "no argument specified for @U"
  msgstr "nie podano argumentu dla @U"
  
! #: tp/Texinfo/Convert/HTML.pm:1715
  #, 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:2399
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "format surowy %s nie jest przekonwertowany"
  
! #: tp/Texinfo/Convert/HTML.pm:4629
! #, 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:4657
! msgid "missing type"
! msgstr "brak typu"
! 
! #: tp/Texinfo/Convert/HTML.pm:4660
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "nieznany typ: %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4677
! #, 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:4962
  msgid "string not closed in css file"
  msgstr "niedomkniÄ™ty Å‚aÅ„cuch w pliku css"
  
! #: tp/Texinfo/Convert/HTML.pm:4964
  msgid "--css-include ended in comment"
  msgstr "plik --css-include zakoÅ„czyÅ‚ siÄ™ wewnÄ…trz komentarza"
  
! #: tp/Texinfo/Convert/HTML.pm:4966
  msgid "@import not finished in css file"
  msgstr "@import nie zakoÅ„czony w pliku css"
  
! #: tp/Texinfo/Convert/HTML.pm:4992
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "nie znaleziono pliku css %s"
  
! #: tp/Texinfo/Convert/HTML.pm:4998
  #, 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:5008
  #, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "bÅ‚Ä…d podczas zamykania pliku CSS %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5870 tp/Texinfo/Convert/HTML.pm:5874
  #, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "brak wpisu htmlxref.cnf dla `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:6568
  #, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "bÅ‚Ä…d podczas zamykania pliku ramki %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6592
  #, 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:6707
  #, 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:6912
  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:7122
  #, 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:7147
  #, 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:7153
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "pusty plik dla przemianowanego wÄ™zÅ‚a `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:7167
  #, 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:7199
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
***************
*** 2277,2285 ****
  "bÅ‚Ä…d podczas zamykania przekierowanego pliku przemianowanego wÄ™zÅ‚a %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7163
  msgid "empty node name"
  msgstr "pusta nazwa wÄ™zÅ‚a"
  
! #: tp/Texinfo/Convert/HTML.pm:7165 tp/Texinfo/Parser.pm:3697
  #, perl-format
  msgid "syntax for an external node used for `%s'"
--- 2278,2286 ----
  "bÅ‚Ä…d podczas zamykania przekierowanego pliku przemianowanego wÄ™zÅ‚a %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7237
  msgid "empty node name"
  msgstr "pusta nazwa wÄ™zÅ‚a"
  
! #: tp/Texinfo/Convert/HTML.pm:7239 tp/Texinfo/Parser.pm:3542
  #, perl-format
  msgid "syntax for an external node used for `%s'"
***************
*** 2314,2343 ****
  msgstr "nazwa @node nie powinna zawieraÄ‡ `,': %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1334
  #, 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:1381 tp/Texinfo/Parser.pm:2722
  #, 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:1495
  #, 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:1500
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "Plik @image `%s' nieczytelny: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1523
  #, 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:1931
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
--- 2315,2344 ----
  msgstr "nazwa @node nie powinna zawieraÄ‡ `,': %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1335
  #, 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:1382 tp/Texinfo/Parser.pm:2568
  #, 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:1496
  #, 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:1501
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "Plik @image `%s' nieczytelny: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1524
  #, 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:1932
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
***************
*** 2347,2547 ****
  "przeredagowaÄ‡ aby zapobiec temu"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2161
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr "nazwa odwoÅ‚ania @%s nie powinna zawieraÄ‡ `:'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2193
  #, 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:2226
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr "nazwa wÄ™zÅ‚a @%s nie powinna zawieraÄ‡ `:'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2272
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "Po @xref musi wystÄ…piÄ‡ `.' lub `,', a nie %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2275
  msgid "`.' or `,' must follow @xref"
  msgstr "Po @xref musi wystÄ…piÄ‡ `.' lub `,'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3118
  #, 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:3129
  msgid "menu entry node name should not contain `:'"
  msgstr "nazwa wÄ™zÅ‚a wpisu menu nie powinna zawieraÄ‡ `:'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3145
  msgid "menu entry name should not contain `:'"
  msgstr "nazwa wpisu menu nie powinna zawieraÄ‡ `:'"
  
! #: tp/Texinfo/Parser.pm:910
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr "@%s powinno wystÄ…piÄ‡ tylko na poczÄ…tku lub na koÅ„cu dokumentu"
  
! #: tp/Texinfo/Parser.pm:1160 tp/Texinfo/Structuring.pm:594
  #, perl-format
  msgid "multiple @%s"
  msgstr "wiele @%s"
  
! #: tp/Texinfo/Parser.pm:1194
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "bÅ‚Ä™dna skÅ‚adnia argumentu @%s: %s"
! 
! #: tp/Texinfo/Parser.pm:1210
  #, perl-format
  msgid "bad or empty @%s formal argument: %s"
  msgstr "niewÅ‚aÅ›ciwy lub pusty argument formalny @%s: %s"
  
! #: tp/Texinfo/Parser.pm:1219 tp/Texinfo/Parser.pm:4856
! #: tp/Texinfo/Parser.pm:4882 tp/Texinfo/Parser.pm:5671
! #: tp/Texinfo/Parser.pm:5687 tp/Texinfo/Parser.pm:5702
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s wymaga nazwy"
  
! #: tp/Texinfo/Parser.pm:1223 tp/Texinfo/Parser.pm:4859
! #: tp/Texinfo/Parser.pm:4885 tp/Texinfo/Parser.pm:5674
! #: tp/Texinfo/Parser.pm:5690 tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad name for @%s"
  msgstr "niewÅ‚aÅ›ciwa nazwa dla @%s"
  
! #: tp/Texinfo/Parser.pm:1341
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr "@end %s wystÄ…piÅ‚o przed nawiasem zamykajÄ…cym @%s"
  
! #: tp/Texinfo/Parser.pm:1345
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "@%s wystÄ…piÅ‚o przed nawiasem zamykajÄ…cym @%s"
  
! #: tp/Texinfo/Parser.pm:1350
  #, perl-format
! msgid "%c%s missing close brace"
  msgstr "w %c%s brakuje klamry zamykajÄ…cej"
  
! #: tp/Texinfo/Parser.pm:1354
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "Brak ograniczajÄ…cej sekwencji zamykajÄ…cej @%s: %s}"
  
! #: tp/Texinfo/Parser.pm:1476
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "@itemx nie powinien zaczynaÄ‡ @%s"
  
! #: tp/Texinfo/Parser.pm:1544
  msgid "@itemx must follow @item"
  msgstr "@itemx musi wystÄ…piÄ‡ po @item"
  
! #: tp/Texinfo/Parser.pm:1712
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr "@%s zawiera tekst, ale nie ma @item"
  
! #: tp/Texinfo/Parser.pm:1743
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "`@end' oczekiwaÅ‚o `%s', ale napotkano `%s'"
  
! #: tp/Texinfo/Parser.pm:1746
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@%s wystÄ…piÅ‚o przed @end %s"
  
! #: tp/Texinfo/Parser.pm:1750
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "brak pasujÄ…cego `%cend %s'"
  
! #: tp/Texinfo/Parser.pm:1776 tp/Texinfo/Parser.pm:5204
! #: tp/Texinfo/Parser.pm:5470
  #, perl-format
  msgid "misplaced %c"
  msgstr "Åºle umieszczone %c"
  
! #: tp/Texinfo/Parser.pm:1874 tp/Texinfo/Parser.pm:3312
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "niedopasowane `%c%s'"
  
! #: tp/Texinfo/Parser.pm:2110
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "makro `%s' wywoÅ‚ane ze zbyt duÅ¼Ä… liczbÄ… argumentÃ³w"
  
! #: tp/Texinfo/Parser.pm:2132
  #, perl-format
! msgid "@%s missing close brace"
  msgstr "Brak klamry zamykajÄ…cej @%s"
  
! #: tp/Texinfo/Parser.pm:2140
  #, 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/Parser.pm:2175
  #, 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/Parser.pm:2650
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s `%s' juÅ¼ zostaÅ‚o zdefiniowane"
  
! #: tp/Texinfo/Parser.pm:2655
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "oto poprzednia definicja jako @%s"
  
! #: tp/Texinfo/Parser.pm:3016
  #, perl-format
  msgid "missing name for @%s"
  msgstr "brak nazwy dla @%s"
  
! #: tp/Texinfo/Parser.pm:3021
  #, perl-format
  msgid "missing category for @%s"
  msgstr "brak kategorii dla @%s"
  
! #: tp/Texinfo/Parser.pm:3073
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "nieoczekiwany argument w linii @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3089
  msgid "empty multitable"
  msgstr "puste multitable"
  
! #: tp/Texinfo/Parser.pm:3145 tp/Texinfo/Parser.pm:5784
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "nadmiarowy argument dla @%s"
  
! #: tp/Texinfo/Parser.pm:3151 tp/Texinfo/Parser.pm:5806
! #: tp/Texinfo/Parser.pm:5818
  #, perl-format
  msgid "bad argument to @%s"
  msgstr "zÅ‚y argument dla @%s"
  
! #: tp/Texinfo/Parser.pm:3162
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s wymaga argumentu: formatowania dla %citem"
  
! #: tp/Texinfo/Parser.pm:3167
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
--- 2348,2548 ----
  "przeredagowaÄ‡ aby zapobiec temu"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2162
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr "nazwa odwoÅ‚ania @%s nie powinna zawieraÄ‡ `:'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2194
  #, 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:2227
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr "nazwa wÄ™zÅ‚a @%s nie powinna zawieraÄ‡ `:'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2273
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "Po @xref musi wystÄ…piÄ‡ `.' lub `,', a nie %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2276
  msgid "`.' or `,' must follow @xref"
  msgstr "Po @xref musi wystÄ…piÄ‡ `.' lub `,'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3086
  #, 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:3097
  msgid "menu entry node name should not contain `:'"
  msgstr "nazwa wÄ™zÅ‚a wpisu menu nie powinna zawieraÄ‡ `:'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3113
  msgid "menu entry name should not contain `:'"
  msgstr "nazwa wpisu menu nie powinna zawieraÄ‡ `:'"
  
! #: tp/Texinfo/Parser.pm:883
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr "@%s powinno wystÄ…piÄ‡ tylko na poczÄ…tku lub na koÅ„cu dokumentu"
  
! #: tp/Texinfo/Parser.pm:1125 tp/Texinfo/Structuring.pm:595
  #, perl-format
  msgid "multiple @%s"
  msgstr "wiele @%s"
  
! #: tp/Texinfo/Parser.pm:1166
  #, perl-format
  msgid "bad or empty @%s formal argument: %s"
  msgstr "niewÅ‚aÅ›ciwy lub pusty argument formalny @%s: %s"
  
! #: tp/Texinfo/Parser.pm:1176
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "bÅ‚Ä™dna skÅ‚adnia argumentu @%s: %s"
! 
! #: tp/Texinfo/Parser.pm:1183 tp/Texinfo/Parser.pm:4707
! #: tp/Texinfo/Parser.pm:4733 tp/Texinfo/Parser.pm:5565
! #: tp/Texinfo/Parser.pm:5578 tp/Texinfo/Parser.pm:5592
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s wymaga nazwy"
  
! #: tp/Texinfo/Parser.pm:1187 tp/Texinfo/Parser.pm:4710
! #: tp/Texinfo/Parser.pm:4736 tp/Texinfo/Parser.pm:5568
! #: tp/Texinfo/Parser.pm:5581 tp/Texinfo/Parser.pm:5595
  #, perl-format
  msgid "bad name for @%s"
  msgstr "niewÅ‚aÅ›ciwa nazwa dla @%s"
  
! #: tp/Texinfo/Parser.pm:1305
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr "@end %s wystÄ…piÅ‚o przed nawiasem zamykajÄ…cym @%s"
  
! #: tp/Texinfo/Parser.pm:1309
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "@%s wystÄ…piÅ‚o przed nawiasem zamykajÄ…cym @%s"
  
! #: tp/Texinfo/Parser.pm:1314
  #, perl-format
! msgid "%c%s missing closing brace"
  msgstr "w %c%s brakuje klamry zamykajÄ…cej"
  
! #: tp/Texinfo/Parser.pm:1318
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "Brak ograniczajÄ…cej sekwencji zamykajÄ…cej @%s: %s}"
  
! #: tp/Texinfo/Parser.pm:1440
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "@itemx nie powinien zaczynaÄ‡ @%s"
  
! #: tp/Texinfo/Parser.pm:1508
  msgid "@itemx must follow @item"
  msgstr "@itemx musi wystÄ…piÄ‡ po @item"
  
! #: tp/Texinfo/Parser.pm:1676
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr "@%s zawiera tekst, ale nie ma @item"
  
! #: tp/Texinfo/Parser.pm:1707
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "`@end' oczekiwaÅ‚o `%s', ale napotkano `%s'"
  
! #: tp/Texinfo/Parser.pm:1710
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@%s wystÄ…piÅ‚o przed @end %s"
  
! #: tp/Texinfo/Parser.pm:1714
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "brak pasujÄ…cego `%cend %s'"
  
! #: tp/Texinfo/Parser.pm:1738 tp/Texinfo/Parser.pm:5070
! #: tp/Texinfo/Parser.pm:5308
  #, perl-format
  msgid "misplaced %c"
  msgstr "Åºle umieszczone %c"
  
! #: tp/Texinfo/Parser.pm:1835 tp/Texinfo/Parser.pm:3148
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "niedopasowane `%c%s'"
  
! #: tp/Texinfo/Parser.pm:2072
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "makro `%s' wywoÅ‚ane ze zbyt duÅ¼Ä… liczbÄ… argumentÃ³w"
  
! #: tp/Texinfo/Parser.pm:2094
  #, perl-format
! msgid "@%s missing closing brace"
  msgstr "Brak klamry zamykajÄ…cej @%s"
  
! #: tp/Texinfo/Parser.pm:2102
  #, 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/Parser.pm:2138
  #, 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/Parser.pm:2501
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s `%s' juÅ¼ zostaÅ‚o zdefiniowane"
  
! #: tp/Texinfo/Parser.pm:2506
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "oto poprzednia definicja jako @%s"
  
! #: tp/Texinfo/Parser.pm:2850
  #, perl-format
  msgid "missing name for @%s"
  msgstr "brak nazwy dla @%s"
  
! #: tp/Texinfo/Parser.pm:2855
  #, perl-format
  msgid "missing category for @%s"
  msgstr "brak kategorii dla @%s"
  
! #: tp/Texinfo/Parser.pm:2890
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "nieoczekiwany argument w linii @%s: %s"
  
! #: tp/Texinfo/Parser.pm:2905
  msgid "empty multitable"
  msgstr "puste multitable"
  
! #: tp/Texinfo/Parser.pm:2959 tp/Texinfo/Parser.pm:5673
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "nadmiarowy argument dla @%s"
  
! #: tp/Texinfo/Parser.pm:2965 tp/Texinfo/Parser.pm:5694
! #: tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad argument to @%s"
  msgstr "zÅ‚y argument dla @%s"
  
! #: tp/Texinfo/Parser.pm:2976
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s wymaga argumentu: formatowania dla %citem"
  
! #: tp/Texinfo/Parser.pm:2981
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
***************
*** 2550,2666 ****
  "linii @%s"
  
! #: tp/Texinfo/Parser.pm:3202
  #, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "polecenie akcentu `@%s' nie jest dozwolone jako argument @%s"
  
! #: tp/Texinfo/Parser.pm:3290 tp/Texinfo/Parser.pm:3429
! #: tp/Texinfo/Parser.pm:5777
  #, perl-format
  msgid "@%s missing argument"
  msgstr "Brak argumentu @%s"
  
! #: tp/Texinfo/Parser.pm:3302
  #, perl-format
  msgid "unknown @end %s"
  msgstr "nieznany @end %s"
  
! #: tp/Texinfo/Parser.pm:3324 tp/Texinfo/Parser.pm:3943
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "nadmiarowy argument dla @%s %s: %s"
  
! #: tp/Texinfo/Parser.pm:3329 tp/Texinfo/Parser.pm:5861
! #: tp/Texinfo/Parser.pm:5906 tp/Texinfo/Parser.pm:5935
! #: tp/Texinfo/Parser.pm:5976 tp/Texinfo/Parser.pm:6055
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "niewÅ‚aÅ›ciwy argument dla @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3348
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%s: nie moÅ¼na otworzyÄ‡ pliku %s: %s"
  
! #: tp/Texinfo/Parser.pm:3360
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr "kodowanie `%s' nie jest kanonicznym kodowaniem texinfo"
  
! #: tp/Texinfo/Parser.pm:3369
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "nierozpoznana nazwa kodowania `%s'"
  
! #: tp/Texinfo/Parser.pm:3516
  #, perl-format
  msgid "@%s after the first element"
  msgstr "@%s po pierwszym elemencie"
  
! #: tp/Texinfo/Parser.pm:3523
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s ma znaczenie tylko w linii @multitable"
  
! #: tp/Texinfo/Parser.pm:3563
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "@%s nie powinno byÄ‡ wiÄ…zane z @top"
  
! #: tp/Texinfo/Parser.pm:3575
  #, 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/Parser.pm:3677
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "pusty argument w @%s"
  
! #: tp/Texinfo/Parser.pm:3681
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "pusta nazwa wÄ™zÅ‚a po rozwiniÄ™ciu `%s'"
  
! #: tp/Texinfo/Parser.pm:3724
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "pusta nazwa wpisu menu w `%s'"
  
! #: tp/Texinfo/Parser.pm:3732
  msgid "empty node name in menu entry"
  msgstr "pusty wÄ™zeÅ‚ we wpisie menu"
  
! #: tp/Texinfo/Parser.pm:3805
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "@%s nie powinno wystÄ…piÄ‡ w @%s"
  
! #: tp/Texinfo/Parser.pm:3937
  #, perl-format
! msgid "@end %s should only appear at a line beginning"
  msgstr "@end %s powinno wystÄ…piÄ‡ tylko na poczÄ…tku linii"
  
! #: tp/Texinfo/Parser.pm:3960
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "makro `%s' juÅ¼ zostaÅ‚o zdefiniowane"
  
! #: tp/Texinfo/Parser.pm:3963
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "oto poprzednia definicja `%s'"
  
! #: tp/Texinfo/Parser.pm:3968
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "ponowna definicja polecenia jÄ™zyka Texinfo: @%s"
  
! #: tp/Texinfo/Parser.pm:4017
  #, perl-format
  msgid "@%s without associated character"
  msgstr "@%s bez powiÄ…zanego znaku"
  
! #: tp/Texinfo/Parser.pm:4087
  #, perl-format
  msgid ""
--- 2551,2668 ----
  "linii @%s"
  
! #: tp/Texinfo/Parser.pm:3016
  #, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "polecenie akcentu `@%s' nie jest dozwolone jako argument @%s"
  
! #: tp/Texinfo/Parser.pm:3124 tp/Texinfo/Parser.pm:3277
! #: tp/Texinfo/Parser.pm:5666
  #, perl-format
  msgid "@%s missing argument"
  msgstr "Brak argumentu @%s"
  
! #: tp/Texinfo/Parser.pm:3138
  #, perl-format
  msgid "unknown @end %s"
  msgstr "nieznany @end %s"
  
! #: tp/Texinfo/Parser.pm:3161 tp/Texinfo/Parser.pm:3788
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "nadmiarowy argument dla @%s %s: %s"
  
! #: tp/Texinfo/Parser.pm:3167 tp/Texinfo/Parser.pm:3245
! #: tp/Texinfo/Parser.pm:5755 tp/Texinfo/Parser.pm:5798
! #: tp/Texinfo/Parser.pm:5827 tp/Texinfo/Parser.pm:5868
! #: tp/Texinfo/Parser.pm:5946
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "niewÅ‚aÅ›ciwy argument dla @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3188
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%s: nie moÅ¼na otworzyÄ‡ pliku %s: %s"
  
! #: tp/Texinfo/Parser.pm:3200
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr "kodowanie `%s' nie jest kanonicznym kodowaniem texinfo"
  
! #: tp/Texinfo/Parser.pm:3208
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "nierozpoznana nazwa kodowania `%s'"
  
! #: tp/Texinfo/Parser.pm:3364
  #, perl-format
  msgid "@%s after the first element"
  msgstr "@%s po pierwszym elemencie"
  
! #: tp/Texinfo/Parser.pm:3371
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s ma znaczenie tylko w linii @multitable"
  
! #: tp/Texinfo/Parser.pm:3408
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "@%s nie powinno byÄ‡ wiÄ…zane z @top"
  
! #: tp/Texinfo/Parser.pm:3420
  #, 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/Parser.pm:3522
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "pusty argument w @%s"
  
! #: tp/Texinfo/Parser.pm:3526
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "pusta nazwa wÄ™zÅ‚a po rozwiniÄ™ciu `%s'"
  
! #: tp/Texinfo/Parser.pm:3569
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "pusta nazwa wpisu menu w `%s'"
  
! #: tp/Texinfo/Parser.pm:3577
  msgid "empty node name in menu entry"
  msgstr "pusty wÄ™zeÅ‚ we wpisie menu"
  
! #: tp/Texinfo/Parser.pm:3650
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "@%s nie powinno wystÄ…piÄ‡ w @%s"
  
! #: tp/Texinfo/Parser.pm:3782
  #, 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/Parser.pm:3804
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "makro `%s' juÅ¼ zostaÅ‚o zdefiniowane"
  
! #: tp/Texinfo/Parser.pm:3807
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "oto poprzednia definicja `%s'"
  
! #: tp/Texinfo/Parser.pm:3812
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "ponowna definicja polecenia jÄ™zyka Texinfo: @%s"
  
! #: tp/Texinfo/Parser.pm:3879
  #, perl-format
  msgid "@%s without associated character"
  msgstr "@%s bez powiÄ…zanego znaku"
  
! #: tp/Texinfo/Parser.pm:3949
  #, perl-format
  msgid ""
***************
*** 2670,2674 ****
  "wywoÅ‚ywane z {}"
  
! #: tp/Texinfo/Parser.pm:4111
  #, perl-format
  msgid ""
--- 2672,2676 ----
  "wywoÅ‚ywane z {}"
  
! #: tp/Texinfo/Parser.pm:3974
  #, perl-format
  msgid ""
***************
*** 2679,2683 ****
  "MAX_NESTED_MACROS; obecna wartoÅ›Ä‡ %d)"
  
! #: tp/Texinfo/Parser.pm:4120
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
--- 2681,2685 ----
  "MAX_NESTED_MACROS; obecna wartoÅ›Ä‡ %d)"
  
! #: tp/Texinfo/Parser.pm:3983
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
***************
*** 2686,2695 ****
  "uÅ¼yÄ‡ @rmacro"
  
! #: tp/Texinfo/Parser.pm:4176
  #, 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/Parser.pm:4182
  #, perl-format
  msgid "use braces to give a command as an argument to @%s"
--- 2688,2697 ----
  "uÅ¼yÄ‡ @rmacro"
  
! #: tp/Texinfo/Parser.pm:4038
  #, 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/Parser.pm:4044
  #, perl-format
  msgid "use braces to give a command as an argument to @%s"
***************
*** 2697,2846 ****
  "naleÅ¼y uÅ¼yÄ‡ nawiasÃ³w klamrowych, aby podaÄ‡ polecenie jako argument dla @%s"
  
! #: tp/Texinfo/Parser.pm:4195 tp/Texinfo/Parser.pm:5325
  #, 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/Parser.pm:4207
  #, 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/Parser.pm:4218
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s oczekiwaÅ‚o nawiasÃ³w klamrowych"
  
! #: tp/Texinfo/Parser.pm:4383
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "niezdefiniowana flaga: %s"
  
! #: tp/Texinfo/Parser.pm:4386
  msgid "bad syntax for @value"
  msgstr "bÅ‚Ä™dna skÅ‚adnia dla @value"
  
! #: tp/Texinfo/Parser.pm:4393
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s jest przestarzaÅ‚e."
  
! #: tp/Texinfo/Parser.pm:4396
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s jest przestarzaÅ‚e; %s"
  
! #: tp/Texinfo/Parser.pm:4405
  #, perl-format
! msgid "@%s should only appear at a line beginning"
  msgstr "@%s powinno wystÄ…piÄ‡ tylko na poczÄ…tku linii"
  
! #: tp/Texinfo/Parser.pm:4496
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s nie jest dozwolone wewnÄ…trz bloku `@%s'"
  
! #: tp/Texinfo/Parser.pm:4505
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr "@%s powinno wystÄ…piÄ‡ tylko w nagÅ‚Ã³wku lub stopce"
  
! #: tp/Texinfo/Parser.pm:4631 tp/Texinfo/Parser.pm:4648
! #: tp/Texinfo/Parser.pm:4698
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s nic nie znaczy wewnÄ…trz bloku `@%s'"
  
! #: tp/Texinfo/Parser.pm:4658
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "@%s w pustym multitable"
  
! #: tp/Texinfo/Parser.pm:4664
  msgid "@tab before @item"
  msgstr "@tab przed @item"
  
! #: tp/Texinfo/Parser.pm:4667
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "zbyt duÅ¼o kolumn w elemencie multitable (maksymalnie %d)"
  
! #: tp/Texinfo/Parser.pm:4704
  msgid "ignoring @tab outside of multitable"
  msgstr "zignorowano @tab poza multitable"
  
! #: tp/Texinfo/Parser.pm:4708
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "@%s poza tabelÄ… lub listÄ…"
  
! #: tp/Texinfo/Parser.pm:4745
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "tylko po `@%s' moÅ¼na uÅ¼yÄ‡ `@%s'"
  
! #: tp/Texinfo/Parser.pm:4787
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "@%s nic nie znaczy poza Å›rodowiskami `@titlepage' i `@quotation'"
  
! #: tp/Texinfo/Parser.pm:4791
  msgid "@dircategory after first node"
  msgstr "@dircategory po pierwszym wÄ™Åºle"
  
! #: tp/Texinfo/Parser.pm:4979
  #, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "region %s wewnÄ…trz regionu %s nie jest dozwolony"
  
! #: tp/Texinfo/Parser.pm:4997
  msgid "@direntry after first node"
  msgstr "@direntry po pierwszym wÄ™Åºle"
  
! #: tp/Texinfo/Parser.pm:5005
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "@%s napotkano przed pierwszym @node"
  
! #: tp/Texinfo/Parser.pm:5008
  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/Parser.pm:5070
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr "@%s powinno wystÄ…piÄ‡ tylko w kontekÅ›cie matematycznym"
  
! #: tp/Texinfo/Parser.pm:5078
  #, perl-format
  msgid "unknown command `%s'"
  msgstr "nieznane polecenie `%s'"
  
! #: tp/Texinfo/Parser.pm:5088
  msgid "unexpected @"
  msgstr "nieoczekiwane @"
  
! #: tp/Texinfo/Parser.pm:5117
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s nic nie znaczy poza Å›rodowiskiem `@float'"
  
! #: tp/Texinfo/Parser.pm:5122
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr "@%s powinno byÄ‡ zaraz poniÅ¼ej `@float'"
  
! #: tp/Texinfo/Parser.pm:5130
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "zigorowano wiele @%s"
  
! #: tp/Texinfo/Parser.pm:5249
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "polecenie @%s nie moÅ¼e mieÄ‡ argumentÃ³w"
  
! #: tp/Texinfo/Parser.pm:5273
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
--- 2699,2848 ----
  "naleÅ¼y uÅ¼yÄ‡ nawiasÃ³w klamrowych, aby podaÄ‡ polecenie jako argument dla @%s"
  
! #: tp/Texinfo/Parser.pm:4057 tp/Texinfo/Parser.pm:5189
  #, 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/Parser.pm:4068
  #, 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/Parser.pm:4079
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s oczekiwaÅ‚o nawiasÃ³w klamrowych"
  
! #: tp/Texinfo/Parser.pm:4233
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "niezdefiniowana flaga: %s"
  
! #: tp/Texinfo/Parser.pm:4236
  msgid "bad syntax for @value"
  msgstr "bÅ‚Ä™dna skÅ‚adnia dla @value"
  
! #: tp/Texinfo/Parser.pm:4243
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s jest przestarzaÅ‚e."
  
! #: tp/Texinfo/Parser.pm:4246
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s jest przestarzaÅ‚e; %s"
  
! #: tp/Texinfo/Parser.pm:4255
  #, 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/Parser.pm:4346
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s nie jest dozwolone wewnÄ…trz bloku `@%s'"
  
! #: tp/Texinfo/Parser.pm:4355
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr "@%s powinno wystÄ…piÄ‡ tylko w nagÅ‚Ã³wku lub stopce"
  
! #: tp/Texinfo/Parser.pm:4479 tp/Texinfo/Parser.pm:4496
! #: tp/Texinfo/Parser.pm:4546
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s nic nie znaczy wewnÄ…trz bloku `@%s'"
  
! #: tp/Texinfo/Parser.pm:4506
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "@%s w pustym multitable"
  
! #: tp/Texinfo/Parser.pm:4512
  msgid "@tab before @item"
  msgstr "@tab przed @item"
  
! #: tp/Texinfo/Parser.pm:4515
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "zbyt duÅ¼o kolumn w elemencie multitable (maksymalnie %d)"
  
! #: tp/Texinfo/Parser.pm:4552
  msgid "ignoring @tab outside of multitable"
  msgstr "zignorowano @tab poza multitable"
  
! #: tp/Texinfo/Parser.pm:4556
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "@%s poza tabelÄ… lub listÄ…"
  
! #: tp/Texinfo/Parser.pm:4596
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "tylko po `@%s' moÅ¼na uÅ¼yÄ‡ `@%s'"
  
! #: tp/Texinfo/Parser.pm:4638
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "@%s nic nie znaczy poza Å›rodowiskami `@titlepage' i `@quotation'"
  
! #: tp/Texinfo/Parser.pm:4642
  msgid "@dircategory after first node"
  msgstr "@dircategory po pierwszym wÄ™Åºle"
  
! #: tp/Texinfo/Parser.pm:4847
  #, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "region %s wewnÄ…trz regionu %s nie jest dozwolony"
  
! #: tp/Texinfo/Parser.pm:4864
  msgid "@direntry after first node"
  msgstr "@direntry po pierwszym wÄ™Åºle"
  
! #: tp/Texinfo/Parser.pm:4872
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "@%s napotkano przed pierwszym @node"
  
! #: tp/Texinfo/Parser.pm:4875
  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/Parser.pm:4937
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr "@%s powinno wystÄ…piÄ‡ tylko w kontekÅ›cie matematycznym"
  
! #: tp/Texinfo/Parser.pm:4945
  #, perl-format
  msgid "unknown command `%s'"
  msgstr "nieznane polecenie `%s'"
  
! #: tp/Texinfo/Parser.pm:4955
  msgid "unexpected @"
  msgstr "nieoczekiwane @"
  
! #: tp/Texinfo/Parser.pm:4983
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s nic nie znaczy poza Å›rodowiskiem `@float'"
  
! #: tp/Texinfo/Parser.pm:4988
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr "@%s powinno byÄ‡ zaraz poniÅ¼ej `@float'"
  
! #: tp/Texinfo/Parser.pm:4996
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "zigorowano wiele @%s"
  
! #: tp/Texinfo/Parser.pm:5114
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "polecenie @%s nie moÅ¼e mieÄ‡ argumentÃ³w"
  
! #: tp/Texinfo/Parser.pm:5138
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
***************
*** 2848,2985 ****
  "brak argumentu bÄ™dÄ…cego wÄ™zÅ‚em lub zewnÄ™trznym podrÄ™cznikiem w poleceniu @%s"
  
! #: tp/Texinfo/Parser.pm:5292
  #, 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/Parser.pm:5303
  #, 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/Parser.pm:5316
  msgid "@image missing filename argument"
  msgstr "Po @image brakuje argumentu plikowego"
  
! #: tp/Texinfo/Parser.pm:5348
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "brak pierwszego argumentu @%s"
  
! #: tp/Texinfo/Parser.pm:5393
  #, 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/Parser.pm:5399
  #, 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/Parser.pm:5412
! #, perl-format
! msgid "argument for @U exceeds size of integer: %s"
! msgstr "argument dla @U przekracza rozmiar typu integer: %s"
! 
! #: tp/Texinfo/Parser.pm:5418
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr "argument dla @U przekracza maksimum dla Unicode 0x10FFFF: %s"
  
! #: tp/Texinfo/Parser.pm:5546
  msgid "superfluous arguments for node"
  msgstr "nadmiarowe argumenty dla wÄ™zÅ‚a"
  
! #: tp/Texinfo/Parser.pm:5596
  #, perl-format
  msgid "expected @end %s"
  msgstr "oczekiwano @end %s"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "@%s powinno mieÄ‡ tylko polecenie typu @ jako argument, a nie `%s'"
  
! #: tp/Texinfo/Parser.pm:5728
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "pozostaÅ‚y argument w linii @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5801
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "polecenie Å›rodowiska %s jako argument dla @%s"
  
! #: tp/Texinfo/Parser.pm:5823
  #, perl-format
  msgid "empty @%s"
  msgstr "puste @%s"
  
! #: tp/Texinfo/Parser.pm:5831
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "szerokoÅ›Ä‡ kolumny nie jest liczbÄ…: %s"
  
! #: tp/Texinfo/Parser.pm:5840
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "argument @sp musi byÄ‡ liczbÄ…, a nie `%s'"
  
! #: tp/Texinfo/Parser.pm:5849
  #, perl-format
  msgid "reserved index name %s"
  msgstr "zarezerwowana nazwa indeksu %s"
  
! #: tp/Texinfo/Parser.pm:5868
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "nieznany indeks ÅºrÃ³dÅ‚owy w @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5871
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "nieznany indeks docelowy w @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5901
  #, 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/Parser.pm:5914
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "nieznany indeks `%s' w @printindex"
  
! #: tp/Texinfo/Parser.pm:5920
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr "wydruk indeksu `%s' wÅ‚Ä…czony w innym `%s'"
  
! #: tp/Texinfo/Parser.pm:5928
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "polecenie printindex przed poczÄ…tkiem dokumentu: @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5944
  #, 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/Parser.pm:5952
  #, 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/Parser.pm:5960
  #, 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/Parser.pm:5968
  #, 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/Parser.pm:5986 tp/Texinfo/Parser.pm:5991
  #, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
--- 2850,2982 ----
  "brak argumentu bÄ™dÄ…cego wÄ™zÅ‚em lub zewnÄ™trznym podrÄ™cznikiem w poleceniu @%s"
  
! #: tp/Texinfo/Parser.pm:5156
  #, 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/Parser.pm:5167
  #, 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/Parser.pm:5180
  msgid "@image missing filename argument"
  msgstr "Po @image brakuje argumentu plikowego"
  
! #: tp/Texinfo/Parser.pm:5211
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "brak pierwszego argumentu @%s"
  
! #: tp/Texinfo/Parser.pm:5230
  #, 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/Parser.pm:5236
  #, 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/Parser.pm:5253
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr "argument dla @U przekracza maksimum dla Unicode 0x10FFFF: %s"
  
! #: tp/Texinfo/Parser.pm:5448
  msgid "superfluous arguments for node"
  msgstr "nadmiarowe argumenty dla wÄ™zÅ‚a"
  
! #: tp/Texinfo/Parser.pm:5498
  #, perl-format
  msgid "expected @end %s"
  msgstr "oczekiwano @end %s"
  
! #: tp/Texinfo/Parser.pm:5607
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "@%s powinno mieÄ‡ tylko polecenie typu @ jako argument, a nie `%s'"
  
! #: tp/Texinfo/Parser.pm:5617
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "pozostaÅ‚y argument w linii @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5689
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "polecenie Å›rodowiska %s jako argument dla @%s"
  
! #: tp/Texinfo/Parser.pm:5710
  #, perl-format
  msgid "empty @%s"
  msgstr "puste @%s"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "szerokoÅ›Ä‡ kolumny nie jest liczbÄ…: %s"
  
! #: tp/Texinfo/Parser.pm:5727
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "argument @sp musi byÄ‡ liczbÄ…, a nie `%s'"
  
! #: tp/Texinfo/Parser.pm:5736
  #, perl-format
  msgid "reserved index name %s"
  msgstr "zarezerwowana nazwa indeksu %s"
  
! #: tp/Texinfo/Parser.pm:5762
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "nieznany indeks ÅºrÃ³dÅ‚owy w @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5765
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "nieznany indeks docelowy w @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5793
  #, 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/Parser.pm:5806
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "nieznany indeks `%s' w @printindex"
  
! #: tp/Texinfo/Parser.pm:5812
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr "wydruk indeksu `%s' wÅ‚Ä…czony w innym `%s'"
  
! #: tp/Texinfo/Parser.pm:5820
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "polecenie printindex przed poczÄ…tkiem dokumentu: @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5836
  #, 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/Parser.pm:5844
  #, 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/Parser.pm:5852
  #, 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/Parser.pm:5860
  #, 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/Parser.pm:5878 tp/Texinfo/Parser.pm:5883
  #, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
***************
*** 2987,2991 ****
  "argumentem @paragraphindent musi byÄ‡ liczba, `none' lub `asis', a nie `%s'"
  
! #: tp/Texinfo/Parser.pm:5999
  #, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
--- 2984,2988 ----
  "argumentem @paragraphindent musi byÄ‡ liczba, `none' lub `asis', a nie `%s'"
  
! #: tp/Texinfo/Parser.pm:5891
  #, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
***************
*** 2993,3007 ****
  "argumentem @firstparagraphindent musi byÄ‡ `none' lub `insert', a nie `%s'"
  
! #: tp/Texinfo/Parser.pm:6009
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
  msgstr "argumentem @exampleindent musi byÄ‡ liczba lub `asis', a nie `%s'"
  
! #: tp/Texinfo/Parser.pm:6021
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "oczekiwano @%s on lub off, a nie `%s'"
  
! #: tp/Texinfo/Parser.pm:6031
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
--- 2990,3004 ----
  "argumentem @firstparagraphindent musi byÄ‡ `none' lub `insert', a nie `%s'"
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
  msgstr "argumentem @exampleindent musi byÄ‡ liczba lub `asis', a nie `%s'"
  
! #: tp/Texinfo/Parser.pm:5913
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "oczekiwano @%s on lub off, a nie `%s'"
  
! #: tp/Texinfo/Parser.pm:5922
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
***************
*** 3010,3019 ****
  "%s'"
  
! #: tp/Texinfo/Parser.pm:6039
  #, 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/Parser.pm:6047
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
--- 3007,3016 ----
  "%s'"
  
! #: tp/Texinfo/Parser.pm:5930
  #, 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/Parser.pm:5938
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
***************
*** 3021,3090 ****
  "argumentem @urefbreakstyle musi byÄ‡ `after', `before' lub `none', a nie `%s'"
  
! #: tp/Texinfo/Structuring.pm:213
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr "zwiÄ™kszanie poziomu sekcji @%s, ktÃ³ry jest zbyt maÅ‚y"
  
! #: tp/Texinfo/Structuring.pm:245
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "brak polecenia poziomu rozdziaÅ‚u przed @%s"
  
! #: tp/Texinfo/Structuring.pm:250
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr "zmniejszanie poziomu sekcji @%s, wystÄ™pujÄ…cej po niÅ¼szym elemencie"
  
! #: tp/Texinfo/Structuring.pm:339
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "brak polecenia sekcjonowania zwiÄ…zanego z @%s"
  
! #: tp/Texinfo/Structuring.pm:488
  #, perl-format
  msgid "@%s not empty"
  msgstr "@%s nie jest pusty"
  
! #: tp/Texinfo/Structuring.pm:544 tp/Texinfo/Structuring.pm:1326
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "odwoÅ‚anie @%s do nie istniejÄ…cego wÄ™zÅ‚a `%s'"
  
! #: tp/Texinfo/Structuring.pm:557
  #, perl-format
  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:662
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "nie wskazywany wÄ™zeÅ‚ `%s'"
  
! #: tp/Texinfo/Structuring.pm:708
  #, 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:715
  #, 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:733
  #, 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:787
  #, 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:814
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "odwoÅ‚anie %s do nie istniejÄ…cego `%s'"
  
! #: tp/Texinfo/Structuring.pm:834
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
--- 3018,3087 ----
  "argumentem @urefbreakstyle musi byÄ‡ `after', `before' lub `none', a nie `%s'"
  
! #: tp/Texinfo/Structuring.pm:216
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr "zwiÄ™kszanie poziomu sekcji @%s, ktÃ³ry jest zbyt maÅ‚y"
  
! #: tp/Texinfo/Structuring.pm:248
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "brak polecenia poziomu rozdziaÅ‚u przed @%s"
  
! #: tp/Texinfo/Structuring.pm:253
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr "zmniejszanie poziomu sekcji @%s, wystÄ™pujÄ…cej po niÅ¼szym elemencie"
  
! #: tp/Texinfo/Structuring.pm:342
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "brak polecenia sekcjonowania zwiÄ…zanego z @%s"
  
! #: tp/Texinfo/Structuring.pm:491
  #, perl-format
  msgid "@%s not empty"
  msgstr "@%s nie jest pusty"
  
! #: tp/Texinfo/Structuring.pm:547 tp/Texinfo/Structuring.pm:1325
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "odwoÅ‚anie @%s do nie istniejÄ…cego wÄ™zÅ‚a `%s'"
  
! #: tp/Texinfo/Structuring.pm:558
  #, perl-format
  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:663
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "nie wskazywany wÄ™zeÅ‚ `%s'"
  
! #: tp/Texinfo/Structuring.pm:706
  #, 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:713
  #, 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:731
  #, 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:786
  #, 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:810
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "odwoÅ‚anie %s do nie istniejÄ…cego `%s'"
  
! #: tp/Texinfo/Structuring.pm:829
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
***************
*** 3092,3096 ****
  "wÄ™zeÅ‚ `%s' nie ma elementu menu dla `%s' pomimo bycia jego celem W gÃ³rÄ™"
  
! #: tp/Texinfo/Structuring.pm:842
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
--- 3089,3093 ----
  "wÄ™zeÅ‚ `%s' nie ma elementu menu dla `%s' pomimo bycia jego celem W gÃ³rÄ™"
  
! #: tp/Texinfo/Structuring.pm:837
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
***************
*** 3102,3106 ****
  msgstr "@%s do `%s' rÃ³Å¼ne od nazwy %s `%s'"
  
! #: tp/Texinfo/Structuring.pm:2070
  #, perl-format
  msgid "empty index key in @%s"
--- 3099,3103 ----
  msgstr "@%s do `%s' rÃ³Å¼ne od nazwy %s `%s'"
  
! #: tp/Texinfo/Structuring.pm:2067
  #, perl-format
  msgid "empty index key in @%s"
***************
*** 3648,3667 ****
  msgstr "Polecenie `%s --help' poda wiÄ™cej informacji.\n"
  
! #: tp/texi2any.pl:1232
  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:1255
  #, 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:1261
  #, 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:1286
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
--- 3645,3664 ----
  msgstr "Polecenie `%s --help' poda wiÄ™cej informacji.\n"
  
! #: tp/texi2any.pl:1239
  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:1262
  #, 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:1268
  #, 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:1293
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
***************
*** 3671,3685 ****
  "Brak sekcji?"
  
! #: tp/texi2any.pl:1359 tp/texi2any.pl:1435
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%s: bÅ‚Ä…d podczas zamykania %s: %s\n"
  
! #: tp/texi2any.pl:1382 tp/texi2any.pl:1416
  #, 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:1388 tp/texi2any.pl:1422
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
--- 3668,3682 ----
  "Brak sekcji?"
  
! #: tp/texi2any.pl:1366 tp/texi2any.pl:1442
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%s: bÅ‚Ä…d podczas zamykania %s: %s\n"
  
! #: tp/texi2any.pl:1389 tp/texi2any.pl:1423
  #, 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:1395 tp/texi2any.pl:1429
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
Binary files texinfo-6.1/po/pt_BR.gmo and texinfo-6.3/po/pt_BR.gmo differ
diff -Nrc2 texinfo-6.1/po/pt_BR.po texinfo-6.3/po/pt_BR.po
*** texinfo-6.1/po/pt_BR.po	2016-02-06 11:35:53.000000000 +0000
--- texinfo-6.3/po/pt_BR.po	2016-09-10 12:45:54.000000000 +0100
***************
*** 2,13 ****
  # Copyright (C) 2005 Free Software Foundation, Inc.
  # This file is distributed under the same license as the texinfo package.
! # Jorge Barros de Abreu <ficmatin10@gmail.com>, 2015.
  #
  msgid ""
  msgstr ""
! "Project-Id-Version: texinfo 5.9.93\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
! "PO-Revision-Date: 2015-06-07 05:40-0300\n"
  "Last-Translator: Jorge Barros de Abreu <ficmatin10@gmail.com>\n"
  "Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
--- 2,13 ----
  # Copyright (C) 2005 Free Software Foundation, Inc.
  # This file is distributed under the same license as the texinfo package.
! # Jorge Barros de Abreu <ficmatin10@gmail.com>, 2016.
  #
  msgid ""
  msgstr ""
! "Project-Id-Version: texinfo 6.1.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:45+0100\n"
! "PO-Revision-Date: 2016-08-17 19:57-0300\n"
  "Last-Translator: Jorge Barros de Abreu <ficmatin10@gmail.com>\n"
  "Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
***************
*** 17,20 ****
--- 17,21 ----
  "Content-Type: text/plain; charset=us-ascii\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"
  
***************
*** 113,117 ****
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [ or [^"
  msgstr "N@~{a}o coincidiu [ ou [^"
  
--- 114,119 ----
  
  #: gnulib/lib/regcomp.c:156
! #, fuzzy
! msgid "Unmatched [, [^, [:, [., or [="
  msgstr "N@~{a}o coincidiu [ ou [^"
  
***************
*** 152,156 ****
  msgstr "N@~{a}o coincidiu ) ou \\)"
  
! #: gnulib/lib/regcomp.c:711
  msgid "No previous regular expression"
  msgstr "Nenhuma express@~{a}o regular anterior"
--- 154,158 ----
  msgstr "N@~{a}o coincidiu ) ou \\)"
  
! #: gnulib/lib/regcomp.c:687
  msgid "No previous regular expression"
  msgstr "Nenhuma express@~{a}o regular anterior"
***************
*** 304,308 ****
  msgstr "---------- Notas de Rodap@'{e} ----------"
  
! #: info/indices.c:123 info/indices.c:812
  #, c-format
  msgid "Finding index entries..."
--- 306,310 ----
  msgstr "---------- Notas de Rodap@'{e} ----------"
  
! #: info/indices.c:123 info/indices.c:822
  #, c-format
  msgid "Finding index entries..."
***************
*** 314,318 ****
  "Procurando uma sequ@^{e}ncia de caracteres no @'{i}ndice do arquivo atual"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:818
  #, c-format
  msgid "No indices found."
--- 316,320 ----
  "Procurando uma sequ@^{e}ncia de caracteres no @'{i}ndice do arquivo atual"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:828
  #, c-format
  msgid "No indices found."
***************
*** 346,360 ****
  msgstr "N@~{a}o existem mais entradas de @'{i}ndice contendo '%s'."
  
! #: info/indices.c:476 info/indices.c:880
  #, c-format
  msgid "No index entries containing '%s'."
  msgstr "N@~{a}o existem entradas de @'{i}ndice contendo '%s'."
  
! #: info/indices.c:583
  #, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "Buscando informa@,{c}@~{o}es dos indices de '%s'..."
  
! #: info/indices.c:636
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
--- 348,362 ----
  msgstr "N@~{a}o existem mais entradas de @'{i}ndice contendo '%s'."
  
! #: info/indices.c:476 info/indices.c:890
  #, c-format
  msgid "No index entries containing '%s'."
  msgstr "N@~{a}o existem entradas de @'{i}ndice contendo '%s'."
  
! #: info/indices.c:586
  #, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "Buscando informa@,{c}@~{o}es dos indices de '%s'..."
  
! #: info/indices.c:646
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
***************
*** 362,375 ****
  "ncia de caracteres e construindo um menu"
  
! #: info/indices.c:644 info/indices.c:646
  msgid "Index apropos"
  msgstr "@'{I}ndice apropos"
  
! #: info/indices.c:688
  #, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "N@~{a}o existem entradas de @'{i}ndice contendo '%s':\n"
  
! #: info/indices.c:797
  msgid "List all matches of a string in the index"
  msgstr ""
--- 364,377 ----
  "ncia de caracteres e construindo um menu"
  
! #: info/indices.c:654 info/indices.c:656
  msgid "Index apropos"
  msgstr "@'{I}ndice apropos"
  
! #: info/indices.c:698
  #, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "N@~{a}o existem entradas de @'{i}ndice contendo '%s':\n"
  
! #: info/indices.c:807
  msgid "List all matches of a string in the index"
  msgstr ""
***************
*** 377,381 ****
  "ndice"
  
! #: info/indices.c:824 info/indices.c:826
  msgid "Index topic"
  msgstr "T@'{o}pico de @'{i}ndice"
--- 379,383 ----
  "ndice"
  
! #: info/indices.c:834 info/indices.c:836
  msgid "Index topic"
  msgstr "T@'{o}pico de @'{i}ndice"
***************
*** 388,442 ****
  "@'{i}ndices."
  
! #: info/info-utils.c:892
  #, c-format
  msgid "Error converting file character encoding."
  msgstr "Erro na convers@~{a}o de codifica@,{c}@~{a}o de caractere do arquivo."
  
! #: info/info.c:222 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "Nenhum item de menu '%s' no nodo '%s'."
  
! #: info/info.c:315
! #, c-format
! msgid "No file given for node '%s'."
! msgstr "Nenhum arquivo para nodo '%s'."
! 
! #: info/info.c:364 info/info.c:1133
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr "N@~{a}o encontro o nodo '%s'."
  
! #: info/info.c:386
  #, c-format
  msgid "No program name given."
  msgstr "Nenhum nome de programa fornecido."
  
! #: info/info.c:577
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "n@'{u}mero inv@'{a}lido: %s\n"
  
! #: info/info.c:757
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "atribui@,{c}@~{a}o de vari@'{a}vel incorreta: %s"
  
! #: info/info.c:764 info/infokey.c:537
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: n@~{a}o existe tal vari@'{a}vel"
  
! #: info/info.c:770 info/infokey.c:539
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "o valor %s n@~{a}o @'{e} v@'{a}lido para a vari@'{a}vel %s"
  
! #: info/info.c:782
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "Tente --help para mais informa@,{c}@~{a}o.\n"
  
! #: info/info.c:804 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
--- 390,439 ----
  "@'{i}ndices."
  
! #: info/info-utils.c:879
  #, c-format
  msgid "Error converting file character encoding."
  msgstr "Erro na convers@~{a}o de codifica@,{c}@~{a}o de caractere do arquivo."
  
! #: info/info.c:279 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "Nenhum item de menu '%s' no nodo '%s'."
  
! #: info/info.c:416 info/info.c:1148
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr "N@~{a}o encontro o nodo '%s'."
  
! #: info/info.c:438
  #, c-format
  msgid "No program name given."
  msgstr "Nenhum nome de programa fornecido."
  
! #: info/info.c:636
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "n@'{u}mero inv@'{a}lido: %s\n"
  
! #: info/info.c:816
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "atribui@,{c}@~{a}o de vari@'{a}vel incorreta: %s"
  
! #: info/info.c:823 info/infokey.c:540
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: n@~{a}o existe tal vari@'{a}vel"
  
! #: info/info.c:829 info/infokey.c:542
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "o valor %s n@~{a}o @'{e} v@'{a}lido para a vari@'{a}vel %s"
  
! #: info/info.c:841
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "Tente --help para mais informa@,{c}@~{a}o.\n"
  
! #: info/info.c:860 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
***************
*** 454,463 ****
  "Sem NENHUMA GARANTIA, respeitando os limites das leis atuais.\n"
  
! #: info/info.c:981
  #, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "nenhum @'{i}ndice para `%s'\n"
  
! #: info/info.c:1034
  #, c-format
  msgid ""
--- 451,460 ----
  "Sem NENHUMA GARANTIA, respeitando os limites das leis atuais.\n"
  
! #: info/info.c:999
  #, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "nenhum @'{i}ndice para `%s'\n"
  
! #: info/info.c:1049
  #, c-format
  msgid ""
***************
*** 470,474 ****
  "Leia a documenta@,{c}@~{a}ono formato Info.\n"
  
! #: info/info.c:1040
  msgid ""
  "Options:\n"
--- 467,471 ----
  "Leia a documenta@,{c}@~{a}ono formato Info.\n"
  
! #: info/info.c:1055
  msgid ""
  "Options:\n"
***************
*** 489,493 ****
  "  -f, --file=MANUAL            especifica o manual Info a ser visitado."
  
! #: info/info.c:1048
  msgid ""
  "  -h, --help                   display this help and exit.\n"
--- 486,490 ----
  "  -f, --file=MANUAL            especifica o manual Info a ser visitado."
  
! #: info/info.c:1063
  msgid ""
  "  -h, --help                   display this help and exit.\n"
***************
*** 503,507 ****
  "ARQUIVO."
  
! #: info/info.c:1054
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
--- 500,504 ----
  "ARQUIVO."
  
! #: info/info.c:1069
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
***************
*** 518,522 ****
  "de comando."
  
! #: info/info.c:1061
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr ""
--- 515,519 ----
  "de comando."
  
! #: info/info.c:1076
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr ""
***************
*** 524,528 ****
  "voz."
  
! #: info/info.c:1065
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
--- 521,525 ----
  "voz."
  
! #: info/info.c:1080
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
***************
*** 547,551 ****
  "mostrar tudo).\n"
  
! #: info/info.c:1074
  msgid ""
  "\n"
--- 544,548 ----
  "mostrar tudo).\n"
  
! #: info/info.c:1089
  msgid ""
  "\n"
***************
*** 566,570 ****
  "menu relativos ao nodo inicial visitado."
  
! #: info/info.c:1081
  msgid ""
  "\n"
--- 563,567 ----
  "menu relativos ao nodo inicial visitado."
  
! #: info/info.c:1096
  msgid ""
  "\n"
***************
*** 574,578 ****
  "Para um resumo das associa@,{c}@~{o}es de tecla, digite H dentro do Info."
  
! #: info/info.c:1084
  msgid ""
  "\n"
--- 571,575 ----
  "Para um resumo das associa@,{c}@~{o}es de tecla, digite H dentro do Info."
  
! #: info/info.c:1099
  msgid ""
  "\n"
***************
*** 608,612 ****
  "  info -f ./foo.info         mostra o arquivo ./foo.info, sem buscar dir"
  
! #: info/info.c:1099 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
--- 605,609 ----
  "  info -f ./foo.info         mostra o arquivo ./foo.info, sem buscar dir"
  
! #: info/info.c:1114 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
***************
*** 618,682 ****
  "Texinfo home page: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1134
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "N@~{a}o encontro o nodo '(%s)%s'."
  
! #: info/info.c:1135
  msgid "Cannot find a window!"
  msgstr "N@~{a}o posso encontrar uma janela!"
  
! #: info/info.c:1136
  msgid "Point doesn't appear within this window's node!"
  msgstr "O apontador n@~{a}o aparece dentro desse nodo de janela!"
  
! #: info/info.c:1137
  msgid "Cannot delete the last window."
  msgstr "N@~{a}o posso apagar a @'{u}ltimo janela."
  
! #: info/info.c:1138
  msgid "No menu in this node."
  msgstr "Nenhum menu nesse nodo."
  
! #: info/info.c:1139
  msgid "No footnotes in this node."
  msgstr "Nenhuma nota de rodamp@'{e} nesse nodo."
  
! #: info/info.c:1140
  msgid "No cross references in this node."
  msgstr "Nenhuma refer@^{e}ncia cruzada nesse nodo."
  
! #: info/info.c:1141
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Nenhum apontador '%s' para esse nodo."
  
! #: info/info.c:1142
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "Comando Info desconhecido '%c'; tente '?' para ajuda."
  
! #: info/info.c:1143
  #, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "Terminal do tipo '%s' @'{e} incapaz de executar o programa Info."
  
! #: info/info.c:1144
  msgid "You are already at the last page of this node."
  msgstr "Voc@^{e} j@'{a} est@'{a} na @'{u}ltima p@'{a}gina desse nodo."
  
! #: info/info.c:1145
  msgid "You are already at the first page of this node."
  msgstr "Voc@^{e} j@'{a} est@'{a} na primeira p@'{a}gina desse nodo."
  
! #: info/info.c:1146
  msgid "Only one window."
  msgstr "Janela @'{u}nica"
  
! #: info/info.c:1147
  msgid "Resulting window would be too small."
  msgstr "A janela resultante ser@'{a} muito pequena."
  
! #: info/info.c:1148
  msgid "Not enough room for a help window, please delete a window."
  msgstr ""
--- 615,679 ----
  "Texinfo home page: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1149
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "N@~{a}o encontro o nodo '(%s)%s'."
  
! #: info/info.c:1150
  msgid "Cannot find a window!"
  msgstr "N@~{a}o posso encontrar uma janela!"
  
! #: info/info.c:1151
  msgid "Point doesn't appear within this window's node!"
  msgstr "O apontador n@~{a}o aparece dentro desse nodo de janela!"
  
! #: info/info.c:1152
  msgid "Cannot delete the last window."
  msgstr "N@~{a}o posso apagar a @'{u}ltimo janela."
  
! #: info/info.c:1153
  msgid "No menu in this node."
  msgstr "Nenhum menu nesse nodo."
  
! #: info/info.c:1154
  msgid "No footnotes in this node."
  msgstr "Nenhuma nota de rodamp@'{e} nesse nodo."
  
! #: info/info.c:1155
  msgid "No cross references in this node."
  msgstr "Nenhuma refer@^{e}ncia cruzada nesse nodo."
  
! #: info/info.c:1156
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Nenhum apontador '%s' para esse nodo."
  
! #: info/info.c:1157
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "Comando Info desconhecido '%c'; tente '?' para ajuda."
  
! #: info/info.c:1158
  #, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "Terminal do tipo '%s' @'{e} incapaz de executar o programa Info."
  
! #: info/info.c:1159
  msgid "You are already at the last page of this node."
  msgstr "Voc@^{e} j@'{a} est@'{a} na @'{u}ltima p@'{a}gina desse nodo."
  
! #: info/info.c:1160
  msgid "You are already at the first page of this node."
  msgstr "Voc@^{e} j@'{a} est@'{a} na primeira p@'{a}gina desse nodo."
  
! #: info/info.c:1161
  msgid "Only one window."
  msgstr "Janela @'{u}nica"
  
! #: info/info.c:1162
  msgid "Resulting window would be too small."
  msgstr "A janela resultante ser@'{a} muito pequena."
  
! #: info/info.c:1163
  msgid "Not enough room for a help window, please delete a window."
  msgstr ""
***************
*** 955,989 ****
  msgstr "a@,{c}@~{a}o desconhecida `%s'"
  
! #: info/infokey.c:482
  #, c-format
  msgid "action name too long"
  msgstr "nome de a@,{c}@~{a}o muito longo"
  
! #: info/infokey.c:495
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "caracteres extras adiante da a@,{c}@~{a}o `%s'"
  
! #: info/infokey.c:506
  #, c-format
  msgid "missing variable name"
  msgstr "nome de vari@'{a}vel faltando"
  
! #: info/infokey.c:515
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "faltando `=' imediatamente ap@'{o}s o nome da vari@'{a}vel"
  
! #: info/infokey.c:522
  #, c-format
  msgid "variable name too long"
  msgstr "nome de vari@'{a}vel muito grande"
  
! #: info/infokey.c:546
  #, c-format
  msgid "value too long"
  msgstr "valor muito grande"
  
! #: info/infokey.c:592
  #, c-format
  msgid "\"%s\", line %u: "
--- 952,986 ----
  msgstr "a@,{c}@~{a}o desconhecida `%s'"
  
! #: info/infokey.c:485
  #, c-format
  msgid "action name too long"
  msgstr "nome de a@,{c}@~{a}o muito longo"
  
! #: info/infokey.c:498
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "caracteres extras adiante da a@,{c}@~{a}o `%s'"
  
! #: info/infokey.c:509
  #, c-format
  msgid "missing variable name"
  msgstr "nome de vari@'{a}vel faltando"
  
! #: info/infokey.c:518
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "faltando `=' imediatamente ap@'{o}s o nome da vari@'{a}vel"
  
! #: info/infokey.c:525
  #, c-format
  msgid "variable name too long"
  msgstr "nome de vari@'{a}vel muito grande"
  
! #: info/infokey.c:549
  #, c-format
  msgid "value too long"
  msgstr "valor muito grande"
  
! #: info/infokey.c:595
  #, c-format
  msgid "\"%s\", line %u: "
***************
*** 1316,1447 ****
  msgstr "Incapaz de encontrar o nodo referenciado por '%s' em `%s'."
  
! #: info/session.c:2864
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "L@^{e} uma lista de menus iniciando a parti de dir e seguindo-o"
  
! #: info/session.c:2866
  msgid "Follow menus: "
  msgstr "Segue os menus: "
  
! #: info/session.c:2971
  msgid "Select the Next node"
  msgstr "Seleciona o nodo adiante"
  
! #: info/session.c:2978
  msgid "Select the Prev node"
  msgstr "Seleciona o nodo anterior"
  
! #: info/session.c:2985
  msgid "Select the Up node"
  msgstr "Seleciona o nodo acima"
  
! #: info/session.c:2991
  msgid "Select the last node in this file"
  msgstr "Seleciona o @'{u}ltimo nodo nesse arquivo"
  
! #: info/session.c:3018 info/session.c:3051
  msgid "This window has no additional nodes"
  msgstr "Essa janela n@~{a}o tem nodos adicionais"
  
! #: info/session.c:3024
  msgid "Select the first node in this file"
  msgstr "Seleciona o primeiro nodo nesse arquivo"
  
! #: info/session.c:3158
  msgid "No more nodes within this document."
  msgstr "Nenhum nodo dentro desse documento"
  
! #: info/session.c:3203 info/session.c:3243
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "Nenhum 'Prev' ou 'Up' para esse nodo dentro desse documento."
  
! #: info/session.c:3256
  msgid "Move forwards or down through node structure"
  msgstr "Move adiante ou abaixo atrav@'{e}s da estrutura de nodos"
  
! #: info/session.c:3273
  msgid "Move backwards or up through node structure"
  msgstr "Volta ou sobe atrav@'{e}s da estrutura de nodos"
  
! #: info/session.c:3296
  msgid "Read a node name and select it"
  msgstr "L@^{e} um nome de nodo e seleciona-o"
  
! #: info/session.c:3350 info/session.c:3354
  msgid "Goto node: "
  msgstr "Vai para o nodo: "
  
! #: info/session.c:3533
  msgid "Find the node describing program invocation"
  msgstr "Encontra o nodo descrevendo como chamar o programa"
  
! #: info/session.c:3535
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Encontra o nodo como chamar de [%s]: "
  
! #: info/session.c:3580
  msgid "Read a manpage reference and select it"
  msgstr "L@^{e} uma refer@^{e}ncia de p@'{a}gina de manual e seleciona-a"
  
! #: info/session.c:3584
  msgid "Get Manpage: "
  msgstr "Pega P@'{a}gina de Manual: "
  
! #: info/session.c:3605
  msgid "Select the node 'Top' in this file"
  msgstr "Seleciona o nodo 'Topo' desse arquivo"
  
! #: info/session.c:3611
  msgid "Select the node '(dir)'"
  msgstr "Seleciona o nodo '(dir)'"
  
! #: info/session.c:3617
  msgid "Show full file name of node being displayed"
  msgstr "Mostra o nome de arquivo completo do nodo sendo mostrado"
  
! #: info/session.c:3634
  msgid "Select the most recently selected node"
  msgstr "Seleciona o nodo mais recentemente selecionado"
  
! #: info/session.c:3639
  #, c-format
  msgid "No earlier node in history"
  msgstr "Nenhum nodo anterior no hist@'{o}rico"
  
! #: info/session.c:3643
  msgid "Read the name of a file and select it"
  msgstr "L@^{e} o nome de um arquivo e seleciona-o"
  
! #: info/session.c:3647
  msgid "Find file: "
  msgstr "Encontra o arquivo: "
  
! #: info/session.c:3664
  #, c-format
  msgid "Cannot find '%s'."
  msgstr "Desconhecido '%s'."
  
! #: info/session.c:3713
  #, c-format
  msgid "Could not create output file '%s'."
  msgstr "N@~{a}o posso criar arquivo de sa@'{i}da '%s'."
  
! #: info/session.c:3727
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "erro ao gravar em %s: %s"
  
! #: info/session.c:3736
  #, c-format
  msgid "closing %s"
  msgstr "fechando %s"
  
! #: info/session.c:3785
  #, c-format
  msgid "writing node %s..."
  msgstr "gravando nodo %s..."
  
! #: info/session.c:3831
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr ""
--- 1313,1444 ----
  msgstr "Incapaz de encontrar o nodo referenciado por '%s' em `%s'."
  
! #: info/session.c:2870
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "L@^{e} uma lista de menus iniciando a parti de dir e seguindo-o"
  
! #: info/session.c:2872
  msgid "Follow menus: "
  msgstr "Segue os menus: "
  
! #: info/session.c:2977
  msgid "Select the Next node"
  msgstr "Seleciona o nodo adiante"
  
! #: info/session.c:2984
  msgid "Select the Prev node"
  msgstr "Seleciona o nodo anterior"
  
! #: info/session.c:2991
  msgid "Select the Up node"
  msgstr "Seleciona o nodo acima"
  
! #: info/session.c:2997
  msgid "Select the last node in this file"
  msgstr "Seleciona o @'{u}ltimo nodo nesse arquivo"
  
! #: info/session.c:3024 info/session.c:3057
  msgid "This window has no additional nodes"
  msgstr "Essa janela n@~{a}o tem nodos adicionais"
  
! #: info/session.c:3030
  msgid "Select the first node in this file"
  msgstr "Seleciona o primeiro nodo nesse arquivo"
  
! #: info/session.c:3164
  msgid "No more nodes within this document."
  msgstr "Nenhum nodo dentro desse documento"
  
! #: info/session.c:3209 info/session.c:3249
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "Nenhum 'Prev' ou 'Up' para esse nodo dentro desse documento."
  
! #: info/session.c:3262
  msgid "Move forwards or down through node structure"
  msgstr "Move adiante ou abaixo atrav@'{e}s da estrutura de nodos"
  
! #: info/session.c:3279
  msgid "Move backwards or up through node structure"
  msgstr "Volta ou sobe atrav@'{e}s da estrutura de nodos"
  
! #: info/session.c:3302
  msgid "Read a node name and select it"
  msgstr "L@^{e} um nome de nodo e seleciona-o"
  
! #: info/session.c:3356 info/session.c:3360
  msgid "Goto node: "
  msgstr "Vai para o nodo: "
  
! #: info/session.c:3539
  msgid "Find the node describing program invocation"
  msgstr "Encontra o nodo descrevendo como chamar o programa"
  
! #: info/session.c:3541
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Encontra o nodo como chamar de [%s]: "
  
! #: info/session.c:3586
  msgid "Read a manpage reference and select it"
  msgstr "L@^{e} uma refer@^{e}ncia de p@'{a}gina de manual e seleciona-a"
  
! #: info/session.c:3590
  msgid "Get Manpage: "
  msgstr "Pega P@'{a}gina de Manual: "
  
! #: info/session.c:3611
  msgid "Select the node 'Top' in this file"
  msgstr "Seleciona o nodo 'Topo' desse arquivo"
  
! #: info/session.c:3617
  msgid "Select the node '(dir)'"
  msgstr "Seleciona o nodo '(dir)'"
  
! #: info/session.c:3623
  msgid "Show full file name of node being displayed"
  msgstr "Mostra o nome de arquivo completo do nodo sendo mostrado"
  
! #: info/session.c:3640
  msgid "Select the most recently selected node"
  msgstr "Seleciona o nodo mais recentemente selecionado"
  
! #: info/session.c:3645
  #, c-format
  msgid "No earlier node in history"
  msgstr "Nenhum nodo anterior no hist@'{o}rico"
  
! #: info/session.c:3649
  msgid "Read the name of a file and select it"
  msgstr "L@^{e} o nome de um arquivo e seleciona-o"
  
! #: info/session.c:3653
  msgid "Find file: "
  msgstr "Encontra o arquivo: "
  
! #: info/session.c:3670
  #, c-format
  msgid "Cannot find '%s'."
  msgstr "Desconhecido '%s'."
  
! #: info/session.c:3719
  #, c-format
  msgid "Could not create output file '%s'."
  msgstr "N@~{a}o posso criar arquivo de sa@'{i}da '%s'."
  
! #: info/session.c:3733
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "erro ao gravar em %s: %s"
  
! #: info/session.c:3742
  #, c-format
  msgid "closing %s"
  msgstr "fechando %s"
  
! #: info/session.c:3791
  #, c-format
  msgid "writing node %s..."
  msgstr "gravando nodo %s..."
  
! #: info/session.c:3837
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr ""
***************
*** 1449,1585 ****
  "INFO_PRINT_COMMAND"
  
! #: info/session.c:3859
  #, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "N@~{a}o posso abrir um pipe para '%s'."
  
! #: info/session.c:3864
  #, c-format
  msgid "printing node %s..."
  msgstr "imprimindo o nodo %s..."
  
! #: info/session.c:3872
  #, c-format
  msgid "finished printing node %s"
  msgstr "terminada a impress@~{a}o do nodo %s"
  
! #: info/session.c:3904
  msgid "Toggle the usage of regular expressions in searches"
  msgstr "Muda o uso de express@~{o}es regulares em buscas"
  
! #: info/session.c:3908
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr "Usando express@~{o}es regulares para buscas."
  
! #: info/session.c:3909
  #, c-format
  msgid "Using literal strings for searches."
  msgstr "Usando sequ@^{e}ncias de caracteres literais para buscas."
  
! #: info/session.c:4169
  msgid "Search continued from the end of the document."
  msgstr "Busca continuada a partir do fim do documento."
  
! #: info/session.c:4174
  msgid "Search continued from the beginning of the document."
  msgstr "Busca continuada a partir do in@'{i}cio do documento."
  
! #: info/session.c:4194
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "Buscando subarquivo %s ..."
  
! #: info/session.c:4231
  msgid "Search failed."
  msgstr "N@~{a}o encontrado."
  
! #: info/session.c:4248
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Regexp search"
  msgstr "Busca de regexp"
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Search"
  msgstr "Busca"
  
! #: info/session.c:4250 info/session.c:4256
  msgid " case-sensitively"
  msgstr "sensivelmente @`{a} caixa"
  
! #: info/session.c:4251 info/session.c:4257
  msgid " backward"
  msgstr "para tr@'{a}s"
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s: "
  
! #: info/session.c:4274
  msgid "Search string too short"
  msgstr "Sequ@^{e}ncia de caractere de busca muito curta"
  
! #: info/session.c:4467
  #, c-format
  msgid "Going back to last match from %s"
! msgstr ""
  
! #: info/session.c:4491 info/session.c:4601
! #, fuzzy, c-format
  msgid "No more matches."
! msgstr "N@~{a}o coincide"
  
! #: info/session.c:4628
  msgid "Search this node and subnodes for a string."
! msgstr ""
  
! #: info/session.c:4649
  msgid "Go to next match in Info sub-tree"
! msgstr ""
  
! #: info/session.c:4653 info/session.c:4665
  #, c-format
  msgid "No active search"
! msgstr ""
  
! #: info/session.c:4661
  msgid "Go to previous match in Info sub-tree"
! msgstr ""
  
! #: info/session.c:4674
  msgid "Read a string and search for it case-sensitively"
  msgstr ""
  "L@^{e} uma sequ@^{e}ncia de caracteres e busca-a sensivelmente @`{a} caixa"
  
! #: info/session.c:4679
  msgid "Read a string and search for it"
  msgstr "L@^{e} uma sequ@^{e}ncia de caracteres e busca-a"
  
! #: info/session.c:4685
  msgid "Read a string and search backward for it"
  msgstr "L@^{e} uma sequ@^{e}ncia de caracteres e busca-a voltando"
  
! #: info/session.c:4693
  msgid "Repeat last search in the same direction"
  msgstr "Repita a @'{u}ltima busca na mesma dire@,{c}@~{a}o"
  
! #: info/session.c:4701 info/session.c:4746
  msgid "No previous search string"
  msgstr "Nenhuma sequ@^{e}ncia de caracteres de busca anterior"
  
! #: info/session.c:4738
  msgid "Repeat last search in the reverse direction"
  msgstr "Repita a @'{u}ltima busca na dire@,{c}@~{a}o contr@'{a}ria"
  
! #: info/session.c:4785
  msgid "Clear displayed search matches"
  msgstr "Limpar padr@~{o}es de busca mostrados"
  
! #: info/session.c:4802 info/session.c:4808
  msgid "Search interactively for a string as you type it"
  msgstr ""
--- 1446,1582 ----
  "INFO_PRINT_COMMAND"
  
! #: info/session.c:3865
  #, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "N@~{a}o posso abrir um pipe para '%s'."
  
! #: info/session.c:3870
  #, c-format
  msgid "printing node %s..."
  msgstr "imprimindo o nodo %s..."
  
! #: info/session.c:3878
  #, c-format
  msgid "finished printing node %s"
  msgstr "terminada a impress@~{a}o do nodo %s"
  
! #: info/session.c:3910
  msgid "Toggle the usage of regular expressions in searches"
  msgstr "Muda o uso de express@~{o}es regulares em buscas"
  
! #: info/session.c:3914
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr "Usando express@~{o}es regulares para buscas."
  
! #: info/session.c:3915
  #, c-format
  msgid "Using literal strings for searches."
  msgstr "Usando sequ@^{e}ncias de caracteres literais para buscas."
  
! #: info/session.c:4175
  msgid "Search continued from the end of the document."
  msgstr "Busca continuada a partir do fim do documento."
  
! #: info/session.c:4180
  msgid "Search continued from the beginning of the document."
  msgstr "Busca continuada a partir do in@'{i}cio do documento."
  
! #: info/session.c:4200
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "Buscando subarquivo %s ..."
  
! #: info/session.c:4237
  msgid "Search failed."
  msgstr "N@~{a}o encontrado."
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Regexp search"
  msgstr "Busca de regexp"
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Search"
  msgstr "Busca"
  
! #: info/session.c:4256 info/session.c:4262
  msgid " case-sensitively"
  msgstr "sensivelmente @`{a} caixa"
  
! #: info/session.c:4257 info/session.c:4263
  msgid " backward"
  msgstr "para tr@'{a}s"
  
! #: info/session.c:4260
  #, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s: "
  
! #: info/session.c:4280
  msgid "Search string too short"
  msgstr "Sequ@^{e}ncia de caractere de busca muito curta"
  
! #: info/session.c:4473
  #, c-format
  msgid "Going back to last match from %s"
! msgstr "Voltando ao anterior que coincide com %s"
  
! #: info/session.c:4497 info/session.c:4607
! #, c-format
  msgid "No more matches."
! msgstr "Sem coincidentes."
  
! #: info/session.c:4634
  msgid "Search this node and subnodes for a string."
! msgstr "Busca no nodo e nos subnodos por caracteres."
  
! #: info/session.c:4655
  msgid "Go to next match in Info sub-tree"
! msgstr "V@'{a} para o pr@'{o}ximo coincidente nos n@'{i}veis abaixo"
  
! #: info/session.c:4659 info/session.c:4671
  #, c-format
  msgid "No active search"
! msgstr "Nenhuma busca ativa"
  
! #: info/session.c:4667
  msgid "Go to previous match in Info sub-tree"
! msgstr "V@'{a} para o coincidente anterior nos n@'{i}veis abaixo"
  
! #: info/session.c:4680
  msgid "Read a string and search for it case-sensitively"
  msgstr ""
  "L@^{e} uma sequ@^{e}ncia de caracteres e busca-a sensivelmente @`{a} caixa"
  
! #: info/session.c:4685
  msgid "Read a string and search for it"
  msgstr "L@^{e} uma sequ@^{e}ncia de caracteres e busca-a"
  
! #: info/session.c:4691
  msgid "Read a string and search backward for it"
  msgstr "L@^{e} uma sequ@^{e}ncia de caracteres e busca-a voltando"
  
! #: info/session.c:4699
  msgid "Repeat last search in the same direction"
  msgstr "Repita a @'{u}ltima busca na mesma dire@,{c}@~{a}o"
  
! #: info/session.c:4707 info/session.c:4752
  msgid "No previous search string"
  msgstr "Nenhuma sequ@^{e}ncia de caracteres de busca anterior"
  
! #: info/session.c:4744
  msgid "Repeat last search in the reverse direction"
  msgstr "Repita a @'{u}ltima busca na dire@,{c}@~{a}o contr@'{a}ria"
  
! #: info/session.c:4791
  msgid "Clear displayed search matches"
  msgstr "Limpar padr@~{o}es de busca mostrados"
  
! #: info/session.c:4808 info/session.c:4814
  msgid "Search interactively for a string as you type it"
  msgstr ""
***************
*** 1587,1659 ****
  "digitada"
  
! #: info/session.c:4928
  msgid "Regexp I-search backward: "
  msgstr "Regexp I-search para tr@'{a}s: "
  
! #: info/session.c:4929
  msgid "I-search backward: "
  msgstr "I-search de volta: "
  
! #: info/session.c:4931
  msgid "Regexp I-search: "
  msgstr "Regexp I-search: "
  
! #: info/session.c:4932
  msgid "I-search: "
  msgstr "I-search: "
  
! #: info/session.c:4957 info/session.c:4960
  msgid "Failing "
  msgstr "Falha "
  
! #: info/session.c:5326
  msgid "Cancel current operation"
  msgstr "Cancela a opera@,{c}@~{a}o atual"
  
! #: info/session.c:5333
  msgid "Quit"
  msgstr "Sair"
  
! #: info/session.c:5338
  msgid "Display version of Info being run"
  msgstr "Mostre informa@,{c}@~{a}o do Info de agora"
  
! #: info/session.c:5340
  #, c-format
  msgid "GNU Info version %s"
  msgstr "Vers@~{a}o Info %s GNU"
  
! #: info/session.c:5345
  msgid "Redraw the display"
  msgstr "Atualiza a tela"
  
! #: info/session.c:5382
  msgid "Quit using Info"
  msgstr "Sair usando Info"
  
! #: info/session.c:5398
  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:5409
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Comando desconhecido (%s)."
  
! #: info/session.c:5412
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\" inv@'{a}lido"
  
! #: info/session.c:5413
  #, c-format
  msgid "'%s' is invalid"
  msgstr "'%s' inv@'{a}lido"
  
! #: info/session.c:5731
  msgid "Add this digit to the current numeric argument"
  msgstr "Adiciona esse d@'{i}gito ao argumento num@'{e}rico atual"
  
! #: info/session.c:5738
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "Inicia (ou multiplica por 4) o argumento num@'{e}rico atual"
--- 1584,1656 ----
  "digitada"
  
! #: info/session.c:4934
  msgid "Regexp I-search backward: "
  msgstr "Regexp I-search para tr@'{a}s: "
  
! #: info/session.c:4935
  msgid "I-search backward: "
  msgstr "I-search de volta: "
  
! #: info/session.c:4937
  msgid "Regexp I-search: "
  msgstr "Regexp I-search: "
  
! #: info/session.c:4938
  msgid "I-search: "
  msgstr "I-search: "
  
! #: info/session.c:4963 info/session.c:4966
  msgid "Failing "
  msgstr "Falha "
  
! #: info/session.c:5332
  msgid "Cancel current operation"
  msgstr "Cancela a opera@,{c}@~{a}o atual"
  
! #: info/session.c:5339
  msgid "Quit"
  msgstr "Sair"
  
! #: info/session.c:5344
  msgid "Display version of Info being run"
  msgstr "Mostre informa@,{c}@~{a}o do Info de agora"
  
! #: info/session.c:5346
  #, c-format
  msgid "GNU Info version %s"
  msgstr "Vers@~{a}o Info %s GNU"
  
! #: info/session.c:5351
  msgid "Redraw the display"
  msgstr "Atualiza a tela"
  
! #: info/session.c:5388
  msgid "Quit using Info"
  msgstr "Sair usando Info"
  
! #: info/session.c:5404
  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:5415
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Comando desconhecido (%s)."
  
! #: info/session.c:5418
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\" inv@'{a}lido"
  
! #: info/session.c:5419
  #, c-format
  msgid "'%s' is invalid"
  msgstr "'%s' inv@'{a}lido"
  
! #: info/session.c:5737
  msgid "Add this digit to the current numeric argument"
  msgstr "Adiciona esse d@'{i}gito ao argumento num@'{e}rico atual"
  
! #: info/session.c:5744
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "Inicia (ou multiplica por 4) o argumento num@'{e}rico atual"
***************
*** 1751,1757 ****
  
  #: info/variables.c:138
- #, fuzzy
  msgid "How to follow a cross-reference"
! msgstr "Vai para a refer@^{e}ncia cruzada anterior"
  
  #: info/variables.c:142
--- 1748,1753 ----
  
  #: info/variables.c:138
  msgid "How to follow a cross-reference"
! msgstr "Como seguir uma refer@^{e}ncia cruzada"
  
  #: info/variables.c:142
***************
*** 1761,1778 ****
  #: info/variables.c:146
  msgid "Styles for links"
! msgstr ""
  
  #: info/variables.c:150
  msgid "Styles for active links"
! msgstr ""
  
  #: info/variables.c:154
- #, fuzzy
  msgid "Styles for search matches"
! msgstr "Limpar padr@~{o}es de busca mostrados"
  
  #: info/variables.c:158
  msgid "How to print the information line at the start of a node"
! msgstr ""
  
  #: info/variables.c:165
--- 1757,1773 ----
  #: info/variables.c:146
  msgid "Styles for links"
! msgstr "Estilos para links"
  
  #: info/variables.c:150
  msgid "Styles for active links"
! msgstr "Estilos para links ativos"
  
  #: info/variables.c:154
  msgid "Styles for search matches"
! msgstr "Estilos para buscar coincidentes"
  
  #: info/variables.c:158
  msgid "How to print the information line at the start of a node"
! msgstr "Como imprimir a linha de informa@,{c}@~{a}o no in@{i}cio de um nodo"
  
  #: info/variables.c:165
***************
*** 1802,1819 ****
  msgstr "Ajsute %s para o valor (%s): "
  
! #: info/window.c:959
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), linhas ----, "
  
- #: info/window.c:966
- #, c-format
- msgid "-%s---Info: %s, %ld lines --%s--"
- msgstr "-%s---Info: %s, %ld linhas --%s--"
- 
- #: info/window.c:970
- #, fuzzy, c-format
- msgid "-%s---Info: (%s)%s, %ld lines --%s--"
- msgstr "-%s%s-Info: (%s)%s, %ld linhas --%s--"
- 
  #: install-info/install-info.c:292
  #, c-format
--- 1797,1804 ----
  msgstr "Ajsute %s para o valor (%s): "
  
! #: info/window.c:909
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), linhas ----, "
  
  #: install-info/install-info.c:292
  #, c-format
***************
*** 2016,2020 ****
  "\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"
--- 2001,2005 ----
  "\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"
***************
*** 2027,2043 ****
  "Esse @'{e} o arquivo .../info/dir, que cont@'{e}m o\n"
  "nodo principal da hierarquia Info, chamado (dir)Topo.\n"
! "Na primeira vez que voc@^{e} chamar o Info voc@^{e} ver@'{a} esse nodo.\n"
  "%c\n"
! "%s\tEstamos no topo da @'{a}rvore do INFO\n"
  "\n"
  "  Fornece (o nodo do diret@'{o}rio mais alto) um menu de t@'{o}picos "
  "principais.\n"
! "  Digitando \"q\" sai, \"?\" lista todos os comandos Info, \"d\" retorna "
  "para c@'{a},\n"
  "  \"h\" fornece uma cartilha para iniciantes,\n"
  "  \"mEmacs<Return>\" visita o manual do Emacs, etc.\n"
  "\n"
! "  No Emacs, voc6e pode clicar no bot@~{a}o 2 do mouse sobre um item de menu "
! "ou refer@^{e}ncia cruzada\n"
  "  para selecion@'{a}-lo.\n"
  "\n"
--- 2012,2028 ----
  "Esse @'{e} o arquivo .../info/dir, que cont@'{e}m o\n"
  "nodo principal da hierarquia Info, chamado (dir)Topo.\n"
! "A primeira vez que voc@^{e} chamar o Info voc@^{e} ver@'{a} esse nodo.\n"
  "%c\n"
! "%s\tEsse @'{e} o topo da @'{a}rvore do INFO\n"
  "\n"
  "  Fornece (o nodo do diret@'{o}rio mais alto) um menu de t@'{o}picos "
  "principais.\n"
! "  Digitando \"q\" sai, \"H\" lista todos os comandos Info, \"d\" retorna "
  "para c@'{a},\n"
  "  \"h\" fornece uma cartilha para iniciantes,\n"
  "  \"mEmacs<Return>\" visita o manual do Emacs, etc.\n"
  "\n"
! "  No Emacs, voc@^{e} pode clicar no bot@~{a}o 2 do mouse sobre um item de "
! "menu ou refer@^{e}ncia cruzada\n"
  "  para selecion@'{a}-lo.\n"
  "\n"
***************
*** 2113,2233 ****
  msgstr "nenhuma entrada encontrada em `%s'; nada apagado"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:855
! #: tp/Texinfo/Convert/Converter.pm:893 tp/Texinfo/Convert/Converter.pm:1204
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6504
! #: tp/Texinfo/Convert/HTML.pm:6528 tp/Texinfo/Convert/HTML.pm:6905
! #: tp/Texinfo/Convert/HTML.pm:6963 tp/Texinfo/Convert/HTML.pm:7041
! #: tp/Texinfo/Convert/HTML.pm:7118 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:546
! #: tp/Texinfo/Convert/TexinfoXML.pm:457
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "n@~{a}o posso abrir %s para escrita: %s"
  
! #: tp/Texinfo/Common.pm:881
  msgid "recursion is always allowed"
  msgstr "recurssividade @'{e} sempre permitido"
  
! #: tp/Texinfo/Common.pm:882
  msgid "arguments are quoted by default"
  msgstr "argumentos s@~{a}o sempre colocados entre aspas duplas por padr@~{a}o"
  
! #: tp/Texinfo/Common.pm:1105
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s @'{e} um c@'{o}digo inv@'{a}lido de linguagem"
  
! #: tp/Texinfo/Common.pm:1110
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s @'{e} um c@'{o}digo de regi@~{a}o inv@'{a}lido"
  
! #: tp/Texinfo/Common.pm:1128
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%s @'{e} uma possibilidade de particionamento inv@'{a}lida"
  
! #: tp/Texinfo/Common.pm:1151
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "n@~{a}o posso ler %s: %s"
  
! #: tp/Texinfo/Common.pm:1170
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "erro ao fechar o arquivo @verbatiminclude %s: %s"
  
! #: tp/Texinfo/Common.pm:1176 tp/Texinfo/Parser.pm:3353
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%s: n@~{a}o encontrado %s"
  
! #: tp/Texinfo/Common.pm:1520
! #, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr ""
! "imposs@'{i}vel abrir arquivo html de configura@,{c}@~{a}o de refer@^{e}ncia "
! "%s: %s"
! 
! #: tp/Texinfo/Common.pm:1548
! msgid "missing type"
! msgstr "tipo omitido"
! 
! #: tp/Texinfo/Common.pm:1551
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "tipo desconhecido: %s"
! 
! #: tp/Texinfo/Common.pm:1568
! #, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr ""
! "erro ao fechar o arquivo html de configura@,{c}@~{a}o de refer@^{e}ncia %s: "
! "%s"
! 
! #: tp/Texinfo/Common.pm:1603
  msgid "no node to be renamed"
  msgstr "nenhum nodo para ser renomeado"
  
! #: tp/Texinfo/Common.pm:1614
  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:1624 tp/Texinfo/Parser.pm:926
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "n@~{a}o posso abrir %s: %s"
  
! #: tp/Texinfo/Common.pm:2144
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr "n@~{a}o posso proteger o caractere de hash em @%s"
  
! #: tp/Texinfo/Convert/Converter.pm:395 tp/Texinfo/Convert/Converter.pm:414
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Var@'{a}vel obsoleta %s\n"
  
! #: tp/Texinfo/Convert/Converter.pm:794
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr "%s: sa@'{i}da incompat@'{i}vel com quebra"
  
! #: tp/Texinfo/Convert/Converter.pm:876 tp/Texinfo/Convert/Converter.pm:909
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:6931
! #: tp/Texinfo/Convert/HTML.pm:6989 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:476 tp/Texinfo/Parser.pm:2035
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "erro ao fechar %s: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, perl-format
  msgid "could not create directories `%s' or `%s': %s"
  msgstr "n@~{a}o posso criar diret@'{o}rios `%s' ou `%s': %s"
  
! #: tp/Texinfo/Convert/Converter.pm:995
  #, perl-format
  msgid "could not create directory `%s': %s"
--- 2098,2210 ----
  msgstr "nenhuma entrada encontrada em `%s'; nada apagado"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:847
! #: tp/Texinfo/Convert/Converter.pm:885 tp/Texinfo/Convert/Converter.pm:1196
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6573
! #: tp/Texinfo/Convert/HTML.pm:6597 tp/Texinfo/Convert/HTML.pm:6978
! #: tp/Texinfo/Convert/HTML.pm:7037 tp/Texinfo/Convert/HTML.pm:7115
! #: tp/Texinfo/Convert/HTML.pm:7192 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:547
! #: tp/Texinfo/Convert/TexinfoXML.pm:458
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "n@~{a}o posso abrir %s para escrita: %s"
  
! #: tp/Texinfo/Common.pm:862
  msgid "recursion is always allowed"
  msgstr "recurssividade @'{e} sempre permitido"
  
! #: tp/Texinfo/Common.pm:863
  msgid "arguments are quoted by default"
  msgstr "argumentos s@~{a}o sempre colocados entre aspas duplas por padr@~{a}o"
  
! #: tp/Texinfo/Common.pm:866
! msgid ""
! "move your @contents command if you want the contents after the title page"
! msgstr ""
! "move seu comando @contents se voc@^{e} desejar os conte@'{u}dos ap@'{o}s a "
! "p@'{a}gina t@'{i}tulo"
! 
! #: tp/Texinfo/Common.pm:869
! msgid ""
! "move your @shortcontents and @contents commands if you want the contents "
! "after the title page"
! msgstr ""
! "move seus comandos @shortcontents e @contents se voc@^{e} desejar os "
! "conte@'{u}dos ap@'{o}s a p@'{a}gina t@'{i}tulo"
! 
! #: tp/Texinfo/Common.pm:1093
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s @'{e} um c@'{o}digo inv@'{a}lido de linguagem"
  
! #: tp/Texinfo/Common.pm:1098
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s @'{e} um c@'{o}digo de regi@~{a}o inv@'{a}lido"
  
! #: tp/Texinfo/Common.pm:1116
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%s @'{e} uma possibilidade de particionamento inv@'{a}lida"
  
! #: tp/Texinfo/Common.pm:1139
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "n@~{a}o posso ler %s: %s"
  
! #: tp/Texinfo/Common.pm:1158
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "erro ao fechar o arquivo @verbatiminclude %s: %s"
  
! #: tp/Texinfo/Common.pm:1164 tp/Texinfo/Parser.pm:3193
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%s: n@~{a}o encontrado %s"
  
! #: tp/Texinfo/Common.pm:1637
  msgid "no node to be renamed"
  msgstr "nenhum nodo para ser renomeado"
  
! #: tp/Texinfo/Common.pm:1648
  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:1658 tp/Texinfo/Parser.pm:899
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "n@~{a}o posso abrir %s: %s"
  
! #: tp/Texinfo/Common.pm:2178
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr "n@~{a}o posso proteger o caractere de hash em @%s"
  
! #: tp/Texinfo/Convert/Converter.pm:387 tp/Texinfo/Convert/Converter.pm:406
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Var@'{a}vel obsoleta %s\n"
  
! #: tp/Texinfo/Convert/Converter.pm:786
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr "%s: sa@'{i}da incompat@'{i}vel com quebra"
  
! #: tp/Texinfo/Convert/Converter.pm:868 tp/Texinfo/Convert/Converter.pm:901
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:7004
! #: tp/Texinfo/Convert/HTML.pm:7063 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:477 tp/Texinfo/Parser.pm:1996
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "erro ao fechar %s: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:979
  #, perl-format
  msgid "could not create directories `%s' or `%s': %s"
  msgstr "n@~{a}o posso criar diret@'{o}rios `%s' ou `%s': %s"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, perl-format
  msgid "could not create directory `%s': %s"
***************
*** 2239,2337 ****
  msgstr "arquivo @image `%s' n@~{a}o encontrado, usando `%s'"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5388
  msgid "no argument specified for @U"
  msgstr "nenhum argumento especificado para @U"
  
! #: tp/Texinfo/Convert/HTML.pm:1683
  #, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
  msgstr "arquivo @image `%s' (para o HTML) n@~{a}o encontrado, usando `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:2371
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "formato raw %s n@~{a}o convertido"
  
! #: tp/Texinfo/Convert/HTML.pm:4888
  msgid "string not closed in css file"
  msgstr "sequ@^{e}ncia de caracteres aberta no arquivo css"
  
! #: tp/Texinfo/Convert/HTML.pm:4890
  msgid "--css-include ended in comment"
  msgstr "--css-include terminou em coment@'{a}rio"
  
! #: tp/Texinfo/Convert/HTML.pm:4892
  msgid "@import not finished in css file"
  msgstr "@import n@~{a}o terminado no arquivo css"
  
! #: tp/Texinfo/Convert/HTML.pm:4918
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "Arquivo CSS %s n@~{a}o encontrado"
  
! #: tp/Texinfo/Convert/HTML.pm:4924
  #, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "N@~{a}o posso abrir --include-file %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:4934
  #, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "erro ao fechar arquivo CSS %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5801 tp/Texinfo/Convert/HTML.pm:5805
  #, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "nenhuma entrada htmlxref.cnf encontrada para `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:6499
  #, 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:6523
  #, 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:6638
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr "controlador %s de est@'{a}gio %s prioridade %s falhou"
  
! #: tp/Texinfo/Convert/HTML.pm:6839
  msgid "must specify a title with a title command or @top"
  msgstr "deve especificar um comando de t@'{i}tulo ou @top"
  
! #: tp/Texinfo/Convert/HTML.pm:7048
  #, 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:7073
  #, perl-format
  msgid "old name for `%s' is a node of the document"
  msgstr "nome antigo de `%s' @'{e} um nodo do documento"
  
! #: tp/Texinfo/Convert/HTML.pm:7079
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "arquivo vazio para o nodo renomeado `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:7093
  #, perl-format
  msgid "target node (new name for `%s') not in document: %s"
  msgstr "nodo alvo (novo nome `%s') n@~{a}o est@'{a} no documento: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7125
  #, 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:7163
  msgid "empty node name"
  msgstr "nome de nodo vazio"
  
! #: tp/Texinfo/Convert/HTML.pm:7165 tp/Texinfo/Parser.pm:3697
  #, perl-format
  msgid "syntax for an external node used for `%s'"
--- 2216,2337 ----
  msgstr "arquivo @image `%s' n@~{a}o encontrado, usando `%s'"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5225
  msgid "no argument specified for @U"
  msgstr "nenhum argumento especificado para @U"
  
! #: tp/Texinfo/Convert/HTML.pm:1715
  #, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
  msgstr "arquivo @image `%s' (para o HTML) n@~{a}o encontrado, usando `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:2399
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "formato raw %s n@~{a}o convertido"
  
! #: tp/Texinfo/Convert/HTML.pm:4629
! #, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr ""
! "imposs@'{i}vel abrir arquivo html de configura@,{c}@~{a}o de refer@^{e}ncia "
! "%s: %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4657
! msgid "missing type"
! msgstr "tipo omitido"
! 
! #: tp/Texinfo/Convert/HTML.pm:4660
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "tipo desconhecido: %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4677
! #, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr ""
! "erro ao fechar o arquivo html de configura@,{c}@~{a}o de refer@^{e}ncia %s: "
! "%s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4962
  msgid "string not closed in css file"
  msgstr "sequ@^{e}ncia de caracteres aberta no arquivo css"
  
! #: tp/Texinfo/Convert/HTML.pm:4964
  msgid "--css-include ended in comment"
  msgstr "--css-include terminou em coment@'{a}rio"
  
! #: tp/Texinfo/Convert/HTML.pm:4966
  msgid "@import not finished in css file"
  msgstr "@import n@~{a}o terminado no arquivo css"
  
! #: tp/Texinfo/Convert/HTML.pm:4992
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "Arquivo CSS %s n@~{a}o encontrado"
  
! #: tp/Texinfo/Convert/HTML.pm:4998
  #, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "N@~{a}o posso abrir --include-file %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5008
  #, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "erro ao fechar arquivo CSS %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5870 tp/Texinfo/Convert/HTML.pm:5874
  #, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "nenhuma entrada htmlxref.cnf encontrada para `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:6568
  #, 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:6592
  #, 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:6707
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr "controlador %s de est@'{a}gio %s prioridade %s falhou"
  
! #: tp/Texinfo/Convert/HTML.pm:6912
  msgid "must specify a title with a title command or @top"
  msgstr "deve especificar um comando de t@'{i}tulo ou @top"
  
! #: tp/Texinfo/Convert/HTML.pm:7122
  #, 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:7147
  #, perl-format
  msgid "old name for `%s' is a node of the document"
  msgstr "nome antigo de `%s' @'{e} um nodo do documento"
  
! #: tp/Texinfo/Convert/HTML.pm:7153
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "arquivo vazio para o nodo renomeado `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:7167
  #, perl-format
  msgid "target node (new name for `%s') not in document: %s"
  msgstr "nodo alvo (novo nome `%s') n@~{a}o est@'{a} no documento: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7199
  #, 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:7237
  msgid "empty node name"
  msgstr "nome de nodo vazio"
  
! #: tp/Texinfo/Convert/HTML.pm:7239 tp/Texinfo/Parser.pm:3542
  #, perl-format
  msgid "syntax for an external node used for `%s'"
***************
*** 2366,2390 ****
  msgstr "o nome @node n@~{a}o deve conter `,': %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1334
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr "Entrada de @{'}indice em %s com : produz Info inv@'{a}lido: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1381 tp/Texinfo/Parser.pm:2722
  #, perl-format
  msgid "entry for index `%s' outside of any node"
  msgstr "entrada para o @'{i}ndice `%s' fora de qualquer nodo"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1495
  #, 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:1500
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "arquivo @image `%s' inleg@'{i}vel: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1523
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
--- 2366,2390 ----
  msgstr "o nome @node n@~{a}o deve conter `,': %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1335
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr "Entrada de @{'}indice em %s com : produz Info inv@'{a}lido: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1382 tp/Texinfo/Parser.pm:2568
  #, perl-format
  msgid "entry for index `%s' outside of any node"
  msgstr "entrada para o @'{i}ndice `%s' fora de qualquer nodo"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1496
  #, 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:1501
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "arquivo @image `%s' inleg@'{i}vel: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1524
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
***************
*** 2392,2396 ****
  "n@~{a}o posso encontrar o arquivo @image `%s.txt' nem seu texo alternativo"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1931
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
--- 2392,2396 ----
  "n@~{a}o posso encontrar o arquivo @image `%s.txt' nem seu texo alternativo"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1932
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
***************
*** 2400,2550 ****
  "reescreva de forma a evitar que isso ocorra novamente"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2161
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr "o nome @%s de refer6encia cruzada n@~{a}o deve conter `:'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2193
  #, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "o nome de nodo @%s n@~{a}o deve conter `%s'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2226
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr "o nome de nodo @%s n@~{a}o deve conter `:'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2272
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "`.' ou `,' deve seguir @xref, n@~{a}o %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2275
  msgid "`.' or `,' must follow @xref"
  msgstr "`.' ou `,' deve seguir @xref"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3118
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr "entrada de menu com nome de nodo n@~{a}o deve conter `%s'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3129
  msgid "menu entry node name should not contain `:'"
  msgstr "entrada de menu com nome de nodo n@~{a}o deve conter `:'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3145
  msgid "menu entry name should not contain `:'"
  msgstr "nome de entrada de menu n@~{a}o deve conter `:'"
  
! #: tp/Texinfo/Parser.pm:910
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr "@%s deve somente aparecer no in@'{i}cio do no fim do documento"
  
! #: tp/Texinfo/Parser.pm:1160 tp/Texinfo/Structuring.pm:594
  #, perl-format
  msgid "multiple @%s"
  msgstr "multiplos @%s"
  
! #: tp/Texinfo/Parser.pm:1194
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "sintaxe err@^{o}nea para argumento @%s: %s"
! 
! #: tp/Texinfo/Parser.pm:1210
  #, perl-format
  msgid "bad or empty @%s formal argument: %s"
  msgstr "formato do argumento @%s err@^{o}nea ou vazia: %s"
  
! #: tp/Texinfo/Parser.pm:1219 tp/Texinfo/Parser.pm:4856
! #: tp/Texinfo/Parser.pm:4882 tp/Texinfo/Parser.pm:5671
! #: tp/Texinfo/Parser.pm:5687 tp/Texinfo/Parser.pm:5702
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s requer um nome"
  
! #: tp/Texinfo/Parser.pm:1223 tp/Texinfo/Parser.pm:4859
! #: tp/Texinfo/Parser.pm:4885 tp/Texinfo/Parser.pm:5674
! #: tp/Texinfo/Parser.pm:5690 tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad name for @%s"
  msgstr "nome err@^{o}neo para @%s"
  
! #: tp/Texinfo/Parser.pm:1341
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr "@end %s visto antes de @%s fechando a chave"
  
! #: tp/Texinfo/Parser.pm:1345
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "@%s visto antes de @%s fechando a chave"
  
! #: tp/Texinfo/Parser.pm:1350
  #, perl-format
! msgid "%c%s missing close brace"
! msgstr "%c%s fechamento de chave omitido"
  
! #: tp/Texinfo/Parser.pm:1354
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "@%s omitido fechamento de delimitador de sequ@^{e}ncia: %s}"
  
! #: tp/Texinfo/Parser.pm:1476
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "@itemx n@~{a}o deve come@,{c}ar @%s"
  
! #: tp/Texinfo/Parser.pm:1544
  msgid "@itemx must follow @item"
  msgstr "@itemx deve seguir @item"
  
! #: tp/Texinfo/Parser.pm:1712
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr "@%s tem texo mas nenhum @item"
  
! #: tp/Texinfo/Parser.pm:1743
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "`@end' espera `%s', mas recebeu `%s'"
  
! #: tp/Texinfo/Parser.pm:1746
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@%s recebido antes de @end %s"
  
! #: tp/Texinfo/Parser.pm:1750
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "n@~{a}o coincide `%cend %s'"
  
! #: tp/Texinfo/Parser.pm:1776 tp/Texinfo/Parser.pm:5204
! #: tp/Texinfo/Parser.pm:5470
  #, perl-format
  msgid "misplaced %c"
  msgstr "perdido %c"
  
! #: tp/Texinfo/Parser.pm:1874 tp/Texinfo/Parser.pm:3312
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "n@~{a}o coincidiu `%c%s'"
  
! #: tp/Texinfo/Parser.pm:2110
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "macro `%s' chamada com muitos argumentos"
  
! #: tp/Texinfo/Parser.pm:2132
  #, perl-format
! msgid "@%s missing close brace"
! msgstr "@%s omitido o fechamento da chave"
  
! #: tp/Texinfo/Parser.pm:2140
  #, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr "macro `%s' declarada sem argumento foi chamado com argumento"
  
! #: tp/Texinfo/Parser.pm:2175
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
--- 2400,2550 ----
  "reescreva de forma a evitar que isso ocorra novamente"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2162
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr "o nome @%s de refer6encia cruzada n@~{a}o deve conter `:'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2194
  #, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "o nome de nodo @%s n@~{a}o deve conter `%s'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2227
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr "o nome de nodo @%s n@~{a}o deve conter `:'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2273
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "`.' ou `,' deve seguir @xref, n@~{a}o %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2276
  msgid "`.' or `,' must follow @xref"
  msgstr "`.' ou `,' deve seguir @xref"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3086
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr "entrada de menu com nome de nodo n@~{a}o deve conter `%s'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3097
  msgid "menu entry node name should not contain `:'"
  msgstr "entrada de menu com nome de nodo n@~{a}o deve conter `:'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3113
  msgid "menu entry name should not contain `:'"
  msgstr "nome de entrada de menu n@~{a}o deve conter `:'"
  
! #: tp/Texinfo/Parser.pm:883
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr "@%s deve somente aparecer no in@'{i}cio do no fim do documento"
  
! #: tp/Texinfo/Parser.pm:1125 tp/Texinfo/Structuring.pm:595
  #, perl-format
  msgid "multiple @%s"
  msgstr "multiplos @%s"
  
! #: tp/Texinfo/Parser.pm:1166
  #, perl-format
  msgid "bad or empty @%s formal argument: %s"
  msgstr "formato do argumento @%s err@^{o}nea ou vazia: %s"
  
! #: tp/Texinfo/Parser.pm:1176
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "sintaxe err@^{o}nea para argumento @%s: %s"
! 
! #: tp/Texinfo/Parser.pm:1183 tp/Texinfo/Parser.pm:4707
! #: tp/Texinfo/Parser.pm:4733 tp/Texinfo/Parser.pm:5565
! #: tp/Texinfo/Parser.pm:5578 tp/Texinfo/Parser.pm:5592
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s requer um nome"
  
! #: tp/Texinfo/Parser.pm:1187 tp/Texinfo/Parser.pm:4710
! #: tp/Texinfo/Parser.pm:4736 tp/Texinfo/Parser.pm:5568
! #: tp/Texinfo/Parser.pm:5581 tp/Texinfo/Parser.pm:5595
  #, perl-format
  msgid "bad name for @%s"
  msgstr "nome err@^{o}neo para @%s"
  
! #: tp/Texinfo/Parser.pm:1305
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr "@end %s visto antes de @%s fechando a chave"
  
! #: tp/Texinfo/Parser.pm:1309
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "@%s visto antes de @%s fechando a chave"
  
! #: tp/Texinfo/Parser.pm:1314
  #, perl-format
! msgid "%c%s missing closing brace"
! msgstr "%c%s fechamento de chave faltando"
  
! #: tp/Texinfo/Parser.pm:1318
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "@%s omitido fechamento de delimitador de sequ@^{e}ncia: %s}"
  
! #: tp/Texinfo/Parser.pm:1440
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "@itemx n@~{a}o deve come@,{c}ar @%s"
  
! #: tp/Texinfo/Parser.pm:1508
  msgid "@itemx must follow @item"
  msgstr "@itemx deve seguir @item"
  
! #: tp/Texinfo/Parser.pm:1676
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr "@%s tem texo mas nenhum @item"
  
! #: tp/Texinfo/Parser.pm:1707
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "`@end' espera `%s', mas recebeu `%s'"
  
! #: tp/Texinfo/Parser.pm:1710
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@%s recebido antes de @end %s"
  
! #: tp/Texinfo/Parser.pm:1714
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "n@~{a}o coincide `%cend %s'"
  
! #: tp/Texinfo/Parser.pm:1738 tp/Texinfo/Parser.pm:5070
! #: tp/Texinfo/Parser.pm:5308
  #, perl-format
  msgid "misplaced %c"
  msgstr "perdido %c"
  
! #: tp/Texinfo/Parser.pm:1835 tp/Texinfo/Parser.pm:3148
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "n@~{a}o coincidiu `%c%s'"
  
! #: tp/Texinfo/Parser.pm:2072
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "macro `%s' chamada com muitos argumentos"
  
! #: tp/Texinfo/Parser.pm:2094
  #, perl-format
! msgid "@%s missing closing brace"
! msgstr "@%s faltando fechamento da chave"
  
! #: tp/Texinfo/Parser.pm:2102
  #, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr "macro `%s' declarada sem argumento foi chamado com argumento"
  
! #: tp/Texinfo/Parser.pm:2138
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
***************
*** 2553,2602 ****
  "\\"
  
! #: tp/Texinfo/Parser.pm:2650
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s `%s' definido anteriormente"
  
! #: tp/Texinfo/Parser.pm:2655
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "aqui est@'{a} a definic@~{a}o anterior de @%s"
  
! #: tp/Texinfo/Parser.pm:3016
  #, perl-format
  msgid "missing name for @%s"
  msgstr "omitido o nome para @%s"
  
! #: tp/Texinfo/Parser.pm:3021
  #, perl-format
  msgid "missing category for @%s"
  msgstr "omitida a categoria de @%s"
  
! #: tp/Texinfo/Parser.pm:3073
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "argumento inesperado sobre @%s linha: %s"
  
! #: tp/Texinfo/Parser.pm:3089
  msgid "empty multitable"
  msgstr "tabela multipla vazia"
  
! #: tp/Texinfo/Parser.pm:3145 tp/Texinfo/Parser.pm:5784
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "argumento sup@'{e}fluo para @%s"
  
! #: tp/Texinfo/Parser.pm:3151 tp/Texinfo/Parser.pm:5806
! #: tp/Texinfo/Parser.pm:5818
  #, perl-format
  msgid "bad argument to @%s"
  msgstr "argumento err@^{o}neo para @%s"
  
! #: tp/Texinfo/Parser.pm:3162
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s requer um argumento: o formatador para %citem"
  
! #: tp/Texinfo/Parser.pm:3167
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
--- 2553,2602 ----
  "\\"
  
! #: tp/Texinfo/Parser.pm:2501
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s `%s' definido anteriormente"
  
! #: tp/Texinfo/Parser.pm:2506
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "aqui est@'{a} a definic@~{a}o anterior de @%s"
  
! #: tp/Texinfo/Parser.pm:2850
  #, perl-format
  msgid "missing name for @%s"
  msgstr "omitido o nome para @%s"
  
! #: tp/Texinfo/Parser.pm:2855
  #, perl-format
  msgid "missing category for @%s"
  msgstr "omitida a categoria de @%s"
  
! #: tp/Texinfo/Parser.pm:2890
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "argumento inesperado sobre @%s linha: %s"
  
! #: tp/Texinfo/Parser.pm:2905
  msgid "empty multitable"
  msgstr "tabela multipla vazia"
  
! #: tp/Texinfo/Parser.pm:2959 tp/Texinfo/Parser.pm:5673
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "argumento sup@'{e}fluo para @%s"
  
! #: tp/Texinfo/Parser.pm:2965 tp/Texinfo/Parser.pm:5694
! #: tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad argument to @%s"
  msgstr "argumento err@^{o}neo para @%s"
  
! #: tp/Texinfo/Parser.pm:2976
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s requer um argumento: o formatador para %citem"
  
! #: tp/Texinfo/Parser.pm:2981
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
***************
*** 2605,2609 ****
  "@%s"
  
! #: tp/Texinfo/Parser.pm:3202
  #, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
--- 2605,2609 ----
  "@%s"
  
! #: tp/Texinfo/Parser.pm:3016
  #, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
***************
*** 2611,2643 ****
  "comando de acentua@,{c}@`{a}o `@%s' n@~{a}o permitido como argumento @%s"
  
! #: tp/Texinfo/Parser.pm:3290 tp/Texinfo/Parser.pm:3429
! #: tp/Texinfo/Parser.pm:5777
  #, perl-format
  msgid "@%s missing argument"
  msgstr "argumento @%s falando"
  
! #: tp/Texinfo/Parser.pm:3302
  #, perl-format
  msgid "unknown @end %s"
  msgstr "@end %s desconhecido"
  
! #: tp/Texinfo/Parser.pm:3324 tp/Texinfo/Parser.pm:3943
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "arumento sup@'{e}fluo a @%s %s: %s"
  
! #: tp/Texinfo/Parser.pm:3329 tp/Texinfo/Parser.pm:5861
! #: tp/Texinfo/Parser.pm:5906 tp/Texinfo/Parser.pm:5935
! #: tp/Texinfo/Parser.pm:5976 tp/Texinfo/Parser.pm:6055
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "argumento err@^{o}neo a @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3348
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%s: n@~{a}o posso abrir %s: %s"
  
! #: tp/Texinfo/Parser.pm:3360
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
--- 2611,2644 ----
  "comando de acentua@,{c}@`{a}o `@%s' n@~{a}o permitido como argumento @%s"
  
! #: tp/Texinfo/Parser.pm:3124 tp/Texinfo/Parser.pm:3277
! #: tp/Texinfo/Parser.pm:5666
  #, perl-format
  msgid "@%s missing argument"
  msgstr "argumento @%s falando"
  
! #: tp/Texinfo/Parser.pm:3138
  #, perl-format
  msgid "unknown @end %s"
  msgstr "@end %s desconhecido"
  
! #: tp/Texinfo/Parser.pm:3161 tp/Texinfo/Parser.pm:3788
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "arumento sup@'{e}fluo a @%s %s: %s"
  
! #: tp/Texinfo/Parser.pm:3167 tp/Texinfo/Parser.pm:3245
! #: tp/Texinfo/Parser.pm:5755 tp/Texinfo/Parser.pm:5798
! #: tp/Texinfo/Parser.pm:5827 tp/Texinfo/Parser.pm:5868
! #: tp/Texinfo/Parser.pm:5946
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "argumento err@^{o}neo a @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3188
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%s: n@~{a}o posso abrir %s: %s"
  
! #: tp/Texinfo/Parser.pm:3200
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
***************
*** 2646,2670 ****
  "do texinfo"
  
! #: tp/Texinfo/Parser.pm:3369
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "nome de codifica@,{c}@~{a}o n@~{a}o reconhecido `%s'"
  
! #: tp/Texinfo/Parser.pm:3516
  #, perl-format
  msgid "@%s after the first element"
  msgstr "@%s ap@'{o}s o primeiro elemento"
  
! #: tp/Texinfo/Parser.pm:3523
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s somente tem significado em uma linha @multitable"
  
! #: tp/Texinfo/Parser.pm:3563
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "@%s n@~{a}o deve ser associado a @top"
  
! #: tp/Texinfo/Parser.pm:3575
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
--- 2647,2671 ----
  "do texinfo"
  
! #: tp/Texinfo/Parser.pm:3208
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "nome de codifica@,{c}@~{a}o n@~{a}o reconhecido `%s'"
  
! #: tp/Texinfo/Parser.pm:3364
  #, perl-format
  msgid "@%s after the first element"
  msgstr "@%s ap@'{o}s o primeiro elemento"
  
! #: tp/Texinfo/Parser.pm:3371
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s somente tem significado em uma linha @multitable"
  
! #: tp/Texinfo/Parser.pm:3408
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "@%s n@~{a}o deve ser associado a @top"
  
! #: tp/Texinfo/Parser.pm:3420
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
***************
*** 2672,2725 ****
  "@node precede @%s, mas algumas partes podem n@~{a}o ser associadas a nodos"
  
! #: tp/Texinfo/Parser.pm:3677
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "argumento vazio em @%s"
  
! #: tp/Texinfo/Parser.pm:3681
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "nome de nodo vazio ap@'{o}s expans@~{a}o `%s'"
  
! #: tp/Texinfo/Parser.pm:3724
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "nome de entrada de menu vazio em `%s'"
  
! #: tp/Texinfo/Parser.pm:3732
  msgid "empty node name in menu entry"
  msgstr "nome de nodo vazio na entrada de menu"
  
! #: tp/Texinfo/Parser.pm:3805
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "@%s n@~{a}o deve aparecer em @%s"
  
! #: tp/Texinfo/Parser.pm:3937
  #, perl-format
! msgid "@end %s should only appear at a line beginning"
! msgstr "@end %s n@~{a}o deve aparecer em uma linha de in@'{i}cio"
  
! #: tp/Texinfo/Parser.pm:3960
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "macro `%s' j@'{a} definida"
  
! #: tp/Texinfo/Parser.pm:3963
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "a defini@,{c}@~{a}o j@'{a} existente de `%s' @'{e}"
  
! #: tp/Texinfo/Parser.pm:3968
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "redefinindo o comando de linguagem Texinfo: @%s"
  
! #: tp/Texinfo/Parser.pm:4017
  #, perl-format
  msgid "@%s without associated character"
  msgstr "@%s sem caractere associado"
  
! #: tp/Texinfo/Parser.pm:4087
  #, perl-format
  msgid ""
--- 2673,2726 ----
  "@node precede @%s, mas algumas partes podem n@~{a}o ser associadas a nodos"
  
! #: tp/Texinfo/Parser.pm:3522
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "argumento vazio em @%s"
  
! #: tp/Texinfo/Parser.pm:3526
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "nome de nodo vazio ap@'{o}s expans@~{a}o `%s'"
  
! #: tp/Texinfo/Parser.pm:3569
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "nome de entrada de menu vazio em `%s'"
  
! #: tp/Texinfo/Parser.pm:3577
  msgid "empty node name in menu entry"
  msgstr "nome de nodo vazio na entrada de menu"
  
! #: tp/Texinfo/Parser.pm:3650
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "@%s n@~{a}o deve aparecer em @%s"
  
! #: tp/Texinfo/Parser.pm:3782
  #, perl-format
! msgid "@end %s should only appear at the beginning of a line"
! msgstr "@end %s deve somente aparecer no in@'{i}cio de uma linha"
  
! #: tp/Texinfo/Parser.pm:3804
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "macro `%s' j@'{a} definida"
  
! #: tp/Texinfo/Parser.pm:3807
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "a defini@,{c}@~{a}o j@'{a} existente de `%s' @'{e}"
  
! #: tp/Texinfo/Parser.pm:3812
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "redefinindo o comando de linguagem Texinfo: @%s"
  
! #: tp/Texinfo/Parser.pm:3879
  #, perl-format
  msgid "@%s without associated character"
  msgstr "@%s sem caractere associado"
  
! #: tp/Texinfo/Parser.pm:3949
  #, perl-format
  msgid ""
***************
*** 2727,2731 ****
  msgstr "@%s definido com zero mais que um argumento deve ser chamado com {}"
  
! #: tp/Texinfo/Parser.pm:4111
  #, perl-format
  msgid ""
--- 2728,2732 ----
  msgstr "@%s definido com zero mais que um argumento deve ser chamado com {}"
  
! #: tp/Texinfo/Parser.pm:3974
  #, perl-format
  msgid ""
***************
*** 2736,2740 ****
  "MAX_NESTED_MACROS para aument@'{a}-la; o valor atual @'{e} %d)"
  
! #: tp/Texinfo/Parser.pm:4120
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
--- 2737,2741 ----
  "MAX_NESTED_MACROS para aument@'{a}-la; o valor atual @'{e} %d)"
  
! #: tp/Texinfo/Parser.pm:3983
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
***************
*** 2743,2747 ****
  "necess@'{a}rio"
  
! #: tp/Texinfo/Parser.pm:4176
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
--- 2744,2748 ----
  "necess@'{a}rio"
  
! #: tp/Texinfo/Parser.pm:4038
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
***************
*** 2750,2764 ****
  "em branco"
  
! #: tp/Texinfo/Parser.pm:4182
  #, 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/Parser.pm:4195 tp/Texinfo/Parser.pm:5325
  #, perl-format
  msgid "%c%s expects `i' or `j' as argument, not `%s'"
  msgstr "%c%s espera `i' ou `j' como argumento, n@~{a}o `%s'"
  
! #: tp/Texinfo/Parser.pm:4207
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
--- 2751,2765 ----
  "em branco"
  
! #: tp/Texinfo/Parser.pm:4044
  #, 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/Parser.pm:4057 tp/Texinfo/Parser.pm:5189
  #, perl-format
  msgid "%c%s expects `i' or `j' as argument, not `%s'"
  msgstr "%c%s espera `i' ou `j' como argumento, n@~{a}o `%s'"
  
! #: tp/Texinfo/Parser.pm:4068
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
***************
*** 2766,2866 ****
  "comando de acentua@,{c}@~{a}o `@%s' n@~{a}o deve ser seguido por nova linha"
  
! #: tp/Texinfo/Parser.pm:4218
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s esperado chaves"
  
! #: tp/Texinfo/Parser.pm:4383
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "sinalizador indefinido: %s"
  
! #: tp/Texinfo/Parser.pm:4386
  msgid "bad syntax for @value"
  msgstr "sintaxe err@^{o}nea para @value"
  
! #: tp/Texinfo/Parser.pm:4393
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s est@'{a} obsoleto."
  
! #: tp/Texinfo/Parser.pm:4396
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s est@'{a} obsoleto; %s"
  
! #: tp/Texinfo/Parser.pm:4405
  #, perl-format
! msgid "@%s should only appear at a line beginning"
  msgstr "@%s deve somente aparecer em um come@,{c}o de linha"
  
! #: tp/Texinfo/Parser.pm:4496
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s n@~{a}o permitido dentro do bloco `@%s'"
  
! #: tp/Texinfo/Parser.pm:4505
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr "@%s deve somente aparecer em cabe@,{c}alho ou rodap@'{e}"
  
! #: tp/Texinfo/Parser.pm:4631 tp/Texinfo/Parser.pm:4648
! #: tp/Texinfo/Parser.pm:4698
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s n@~{a}o @'{e} significativo dentro do bloco `@%s'"
  
! #: tp/Texinfo/Parser.pm:4658
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "@%s em tabela multipla vazia"
  
! #: tp/Texinfo/Parser.pm:4664
  msgid "@tab before @item"
  msgstr "@tab antes de @item"
  
! #: tp/Texinfo/Parser.pm:4667
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "muitas colunas em item de tabela m@'{u}ltipla (o m@'{a}ximo @'{e} %d)"
  
! #: tp/Texinfo/Parser.pm:4704
  msgid "ignoring @tab outside of multitable"
  msgstr "ignorando @tab fora de tabela m@'{u}ltipla"
  
! #: tp/Texinfo/Parser.pm:4708
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "@%s ofora de tabela ou lista"
  
! #: tp/Texinfo/Parser.pm:4745
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "deve estar ap@'{o}s `@%s' para usar `@%s'"
  
! #: tp/Texinfo/Parser.pm:4787
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "@%s insignificante fora dos ambientes `@titlepage' e `@quotation'"
  
! #: tp/Texinfo/Parser.pm:4791
  msgid "@dircategory after first node"
  msgstr "@dircategory ap@'{o}s o primeiro nodo"
  
! #: tp/Texinfo/Parser.pm:4979
  #, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "regi@~{a}o %s dentro da regi@~{a}o %s n@~{a}o @'{e} permitida"
  
! #: tp/Texinfo/Parser.pm:4997
  msgid "@direntry after first node"
  msgstr "@direntry ap@'{o}s o primeiro nodo"
  
! #: tp/Texinfo/Parser.pm:5005
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "@%s visto antes do primeiro @node"
  
! #: tp/Texinfo/Parser.pm:5008
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
--- 2767,2867 ----
  "comando de acentua@,{c}@~{a}o `@%s' n@~{a}o deve ser seguido por nova linha"
  
! #: tp/Texinfo/Parser.pm:4079
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s esperado chaves"
  
! #: tp/Texinfo/Parser.pm:4233
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "sinalizador indefinido: %s"
  
! #: tp/Texinfo/Parser.pm:4236
  msgid "bad syntax for @value"
  msgstr "sintaxe err@^{o}nea para @value"
  
! #: tp/Texinfo/Parser.pm:4243
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s est@'{a} obsoleto."
  
! #: tp/Texinfo/Parser.pm:4246
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s est@'{a} obsoleto; %s"
  
! #: tp/Texinfo/Parser.pm:4255
  #, perl-format
! msgid "@%s should only appear at the beginning of a line"
  msgstr "@%s deve somente aparecer em um come@,{c}o de linha"
  
! #: tp/Texinfo/Parser.pm:4346
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s n@~{a}o permitido dentro do bloco `@%s'"
  
! #: tp/Texinfo/Parser.pm:4355
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr "@%s deve somente aparecer em cabe@,{c}alho ou rodap@'{e}"
  
! #: tp/Texinfo/Parser.pm:4479 tp/Texinfo/Parser.pm:4496
! #: tp/Texinfo/Parser.pm:4546
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s n@~{a}o @'{e} significativo dentro do bloco `@%s'"
  
! #: tp/Texinfo/Parser.pm:4506
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "@%s em tabela multipla vazia"
  
! #: tp/Texinfo/Parser.pm:4512
  msgid "@tab before @item"
  msgstr "@tab antes de @item"
  
! #: tp/Texinfo/Parser.pm:4515
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "muitas colunas em item de tabela m@'{u}ltipla (o m@'{a}ximo @'{e} %d)"
  
! #: tp/Texinfo/Parser.pm:4552
  msgid "ignoring @tab outside of multitable"
  msgstr "ignorando @tab fora de tabela m@'{u}ltipla"
  
! #: tp/Texinfo/Parser.pm:4556
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "@%s ofora de tabela ou lista"
  
! #: tp/Texinfo/Parser.pm:4596
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "deve estar ap@'{o}s `@%s' para usar `@%s'"
  
! #: tp/Texinfo/Parser.pm:4638
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "@%s insignificante fora dos ambientes `@titlepage' e `@quotation'"
  
! #: tp/Texinfo/Parser.pm:4642
  msgid "@dircategory after first node"
  msgstr "@dircategory ap@'{o}s o primeiro nodo"
  
! #: tp/Texinfo/Parser.pm:4847
  #, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "regi@~{a}o %s dentro da regi@~{a}o %s n@~{a}o @'{e} permitida"
  
! #: tp/Texinfo/Parser.pm:4864
  msgid "@direntry after first node"
  msgstr "@direntry ap@'{o}s o primeiro nodo"
  
! #: tp/Texinfo/Parser.pm:4872
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "@%s visto antes do primeiro @node"
  
! #: tp/Texinfo/Parser.pm:4875
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
***************
*** 2869,2912 ****
  "inv@'{e}s de um @ifinfo?"
  
! #: tp/Texinfo/Parser.pm:5070
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr "@%s deve somente aparecer em contexto matem@'{a}tico"
  
! #: tp/Texinfo/Parser.pm:5078
  #, perl-format
  msgid "unknown command `%s'"
  msgstr "comando desconhecido `%s'"
  
! #: tp/Texinfo/Parser.pm:5088
  msgid "unexpected @"
  msgstr "@ inesperado"
  
! #: tp/Texinfo/Parser.pm:5117
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s n@~{a}o tem significado fora do ambiente `@float'"
  
! #: tp/Texinfo/Parser.pm:5122
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr "@%s deve estar imediatamente ap@'{o}s `@float'"
  
! #: tp/Texinfo/Parser.pm:5130
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "ignoring multiplos @%s"
  
! #: tp/Texinfo/Parser.pm:5249
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "o comando @%s n@~{a}o aceita argumentos"
  
! #: tp/Texinfo/Parser.pm:5273
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr "o comando @%s omitiu um nodo ou argulento externo de manual"
  
! #: tp/Texinfo/Parser.pm:5292
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
--- 2870,2913 ----
  "inv@'{e}s de um @ifinfo?"
  
! #: tp/Texinfo/Parser.pm:4937
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr "@%s deve somente aparecer em contexto matem@'{a}tico"
  
! #: tp/Texinfo/Parser.pm:4945
  #, perl-format
  msgid "unknown command `%s'"
  msgstr "comando desconhecido `%s'"
  
! #: tp/Texinfo/Parser.pm:4955
  msgid "unexpected @"
  msgstr "@ inesperado"
  
! #: tp/Texinfo/Parser.pm:4983
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s n@~{a}o tem significado fora do ambiente `@float'"
  
! #: tp/Texinfo/Parser.pm:4988
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr "@%s deve estar imediatamente ap@'{o}s `@float'"
  
! #: tp/Texinfo/Parser.pm:4996
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "ignoring multiplos @%s"
  
! #: tp/Texinfo/Parser.pm:5114
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "o comando @%s n@~{a}o aceita argumentos"
  
! #: tp/Texinfo/Parser.pm:5138
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr "o comando @%s omitiu um nodo ou argulento externo de manual"
  
! #: tp/Texinfo/Parser.pm:5156
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
***************
*** 2914,2918 ****
  "em @%s tem-se uma refer@^{e}ncia cruzada vazia ap@'{o}s a expans@~{a}o `%s'"
  
! #: tp/Texinfo/Parser.pm:5303
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
--- 2915,2919 ----
  "em @%s tem-se uma refer@^{e}ncia cruzada vazia ap@'{o}s a expans@~{a}o `%s'"
  
! #: tp/Texinfo/Parser.pm:5167
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
***************
*** 2920,3092 ****
  "em @%s tem-se uma refer@^{e}ncia cruzada vazia ap@'{o}s a expans@~{a}o `%s'"
  
! #: tp/Texinfo/Parser.pm:5316
  msgid "@image missing filename argument"
  msgstr "@image faltando o argumento nome de arquivo"
  
! #: tp/Texinfo/Parser.pm:5348
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "@%s faltando primeiro argumento"
  
! #: tp/Texinfo/Parser.pm:5393
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "d@'{i}gitos n@'{a}-hex no argumento a @U: %s"
  
! #: tp/Texinfo/Parser.pm:5399
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr "menos que quatro d@'{i}gitos hexadecimais para @U: %s"
  
! #: tp/Texinfo/Parser.pm:5412
! #, perl-format
! msgid "argument for @U exceeds size of integer: %s"
! msgstr "argumento a @U excede o tamanho de inteiro: %s"
! 
! #: tp/Texinfo/Parser.pm:5418
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr "argumento a @U excede o maior Unicode 0x10FFFF: %s"
  
! #: tp/Texinfo/Parser.pm:5546
  msgid "superfluous arguments for node"
  msgstr "argumento sup@'{e}rfluo para nodo"
  
! #: tp/Texinfo/Parser.pm:5596
  #, perl-format
  msgid "expected @end %s"
  msgstr "esperado %s"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "@%s deve somente aceitar um @-comando como argumento, n@~{a}o `%s'"
  
! #: tp/Texinfo/Parser.pm:5728
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "resta argumento na linha @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5801
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "comando de ambiente %s como argumento a @%s"
  
! #: tp/Texinfo/Parser.pm:5823
  #, perl-format
  msgid "empty @%s"
  msgstr "@%s vazio"
  
! #: tp/Texinfo/Parser.pm:5831
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "fra@,{c}@~{a}o de coluna n@~{a}o um n@'{u}mero: %s"
  
! #: tp/Texinfo/Parser.pm:5840
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "@sp arg deve ser num@'{e}rico, n@~{a}o `%s'"
  
! #: tp/Texinfo/Parser.pm:5849
  #, perl-format
  msgid "reserved index name %s"
  msgstr "nome de @'{i}ndice reservado %s"
  
! #: tp/Texinfo/Parser.pm:5868
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "nome de @'{i}ndice desconhecido em @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5871
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "@'{i}ndice de destina@,{c}@`{a}o desconhecido em @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr "@%s conduz a uma a@,{c}@~{a}o de %s consigo mesmo, ignorando"
  
! #: tp/Texinfo/Parser.pm:5914
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "@'{i}ndice desconhecido `%s' em @printindex"
  
! #: tp/Texinfo/Parser.pm:5920
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr "imprimindo um @'{i}ndice `%s' misturado a outro `%s'"
  
! #: tp/Texinfo/Parser.pm:5928
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "printindex antes de in@'{i}cio de documento: @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5944
  #, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
  msgstr "@%s arg deve ser `top' ou `bottom', n@~{a}o `%s'"
  
! #: tp/Texinfo/Parser.pm:5952
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr "Somente @%s 10 ou 11 @'{e} suportado, n@~{a}o `%s'"
  
! #: tp/Texinfo/Parser.pm:5960
  #, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
  msgstr "@%s arg deve ser `separate' ou `end', n@~{a}o `%s'"
  
! #: tp/Texinfo/Parser.pm:5968
  #, 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/Parser.pm:5986 tp/Texinfo/Parser.pm:5991
  #, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
  msgstr "@paragraphindent arg deve ser numeric/`none'/`asis', n@~{a}o `%s'"
  
! #: tp/Texinfo/Parser.pm:5999
  #, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
  msgstr "@firstparagraphindent arg deve ser `none' ou `insert', n@~{a}o `%s'"
  
! #: tp/Texinfo/Parser.pm:6009
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
  msgstr "@exampleindent arg deve ser numeric/`asis', n@~{a}o `%s'"
  
! #: tp/Texinfo/Parser.pm:6021
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "esperado @%s on ou off, n@~{a}o `%s'"
  
! #: tp/Texinfo/Parser.pm:6031
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
  msgstr "@kbdinputstyle arg deve ser `code'/`example'/`distinct', n@~{a}o `%s'"
  
! #: tp/Texinfo/Parser.pm:6039
  #, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
  msgstr "@allowcodebreaks arg deve ser `true' ou `false', n@~{a}o `%s'"
  
! #: tp/Texinfo/Parser.pm:6047
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
  msgstr "@urefbreakstyle arg deve ser `after'/`before'/`none', n@~{a}o `%s'"
  
! #: tp/Texinfo/Structuring.pm:213
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr "elevando o n@'{i}vel de se@,{c}@~{a}o de @%s que @'{e} muito baixo"
  
! #: tp/Texinfo/Structuring.pm:245
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "nehum comando cap@'{i}tulo-n@'{i}vel antes de @%s"
  
! #: tp/Texinfo/Structuring.pm:250
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
--- 2921,3088 ----
  "em @%s tem-se uma refer@^{e}ncia cruzada vazia ap@'{o}s a expans@~{a}o `%s'"
  
! #: tp/Texinfo/Parser.pm:5180
  msgid "@image missing filename argument"
  msgstr "@image faltando o argumento nome de arquivo"
  
! #: tp/Texinfo/Parser.pm:5211
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "@%s faltando primeiro argumento"
  
! #: tp/Texinfo/Parser.pm:5230
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "d@'{i}gitos n@'{a}-hex no argumento a @U: %s"
  
! #: tp/Texinfo/Parser.pm:5236
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr "menos que quatro d@'{i}gitos hexadecimais para @U: %s"
  
! #: tp/Texinfo/Parser.pm:5253
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr "argumento a @U excede o maior Unicode 0x10FFFF: %s"
  
! #: tp/Texinfo/Parser.pm:5448
  msgid "superfluous arguments for node"
  msgstr "argumento sup@'{e}rfluo para nodo"
  
! #: tp/Texinfo/Parser.pm:5498
  #, perl-format
  msgid "expected @end %s"
  msgstr "esperado %s"
  
! #: tp/Texinfo/Parser.pm:5607
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "@%s deve somente aceitar um @-comando como argumento, n@~{a}o `%s'"
  
! #: tp/Texinfo/Parser.pm:5617
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "resta argumento na linha @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5689
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "comando de ambiente %s como argumento a @%s"
  
! #: tp/Texinfo/Parser.pm:5710
  #, perl-format
  msgid "empty @%s"
  msgstr "@%s vazio"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "fra@,{c}@~{a}o de coluna n@~{a}o um n@'{u}mero: %s"
  
! #: tp/Texinfo/Parser.pm:5727
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "@sp arg deve ser num@'{e}rico, n@~{a}o `%s'"
  
! #: tp/Texinfo/Parser.pm:5736
  #, perl-format
  msgid "reserved index name %s"
  msgstr "nome de @'{i}ndice reservado %s"
  
! #: tp/Texinfo/Parser.pm:5762
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "nome de @'{i}ndice desconhecido em @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5765
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "@'{i}ndice de destina@,{c}@`{a}o desconhecido em @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5793
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr "@%s conduz a uma a@,{c}@~{a}o de %s consigo mesmo, ignorando"
  
! #: tp/Texinfo/Parser.pm:5806
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "@'{i}ndice desconhecido `%s' em @printindex"
  
! #: tp/Texinfo/Parser.pm:5812
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr "imprimindo um @'{i}ndice `%s' misturado a outro `%s'"
  
! #: tp/Texinfo/Parser.pm:5820
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "printindex antes de in@'{i}cio de documento: @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5836
  #, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
  msgstr "@%s arg deve ser `top' ou `bottom', n@~{a}o `%s'"
  
! #: tp/Texinfo/Parser.pm:5844
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr "Somente @%s 10 ou 11 @'{e} suportado, n@~{a}o `%s'"
  
! #: tp/Texinfo/Parser.pm:5852
  #, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
  msgstr "@%s arg deve ser `separate' ou `end', n@~{a}o `%s'"
  
! #: tp/Texinfo/Parser.pm:5860
  #, 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/Parser.pm:5878 tp/Texinfo/Parser.pm:5883
  #, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
  msgstr "@paragraphindent arg deve ser numeric/`none'/`asis', n@~{a}o `%s'"
  
! #: tp/Texinfo/Parser.pm:5891
  #, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
  msgstr "@firstparagraphindent arg deve ser `none' ou `insert', n@~{a}o `%s'"
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
  msgstr "@exampleindent arg deve ser numeric/`asis', n@~{a}o `%s'"
  
! #: tp/Texinfo/Parser.pm:5913
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "esperado @%s on ou off, n@~{a}o `%s'"
  
! #: tp/Texinfo/Parser.pm:5922
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
  msgstr "@kbdinputstyle arg deve ser `code'/`example'/`distinct', n@~{a}o `%s'"
  
! #: tp/Texinfo/Parser.pm:5930
  #, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
  msgstr "@allowcodebreaks arg deve ser `true' ou `false', n@~{a}o `%s'"
  
! #: tp/Texinfo/Parser.pm:5938
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
  msgstr "@urefbreakstyle arg deve ser `after'/`before'/`none', n@~{a}o `%s'"
  
! #: tp/Texinfo/Structuring.pm:216
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr "elevando o n@'{i}vel de se@,{c}@~{a}o de @%s que @'{e} muito baixo"
  
! #: tp/Texinfo/Structuring.pm:248
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "nehum comando cap@'{i}tulo-n@'{i}vel antes de @%s"
  
! #: tp/Texinfo/Structuring.pm:253
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
***************
*** 3095,3149 ****
  "inferior"
  
! #: tp/Texinfo/Structuring.pm:339
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "nenhum comando de se@,{c}@~{a}o associado a @%s"
  
! #: tp/Texinfo/Structuring.pm:488
  #, perl-format
  msgid "@%s not empty"
  msgstr "@%s n@~{a}o vazio"
  
! #: tp/Texinfo/Structuring.pm:544 tp/Texinfo/Structuring.pm:1326
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "@%s referencia a um nodo n@~{a}o existente `%s'"
  
! #: tp/Texinfo/Structuring.pm:557
  #, perl-format
  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:662
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "nodo n@~{a}o referenciado `%s'"
  
! #: tp/Texinfo/Structuring.pm:708
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr "nodo `%s' @'{e} %s para `%s' na se@,{c}@~{a}o mas n@~{a}o no menu"
  
! #: tp/Texinfo/Structuring.pm:715
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
  msgstr "nodo %s `%s' no menu `%s' e na se@,{c}@~{a}o `%s' diferem"
  
! #: tp/Texinfo/Structuring.pm:733
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
  msgstr "nodo `%s' @'{e} %s para `%s' no menu mas n@~{a}o na se@,{c}@~{a}o"
  
! #: tp/Texinfo/Structuring.pm:787
  #, 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:814
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%s referencia a `%s' o qual n@~{a}o existe"
  
! #: tp/Texinfo/Structuring.pm:834
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
--- 3091,3145 ----
  "inferior"
  
! #: tp/Texinfo/Structuring.pm:342
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "nenhum comando de se@,{c}@~{a}o associado a @%s"
  
! #: tp/Texinfo/Structuring.pm:491
  #, perl-format
  msgid "@%s not empty"
  msgstr "@%s n@~{a}o vazio"
  
! #: tp/Texinfo/Structuring.pm:547 tp/Texinfo/Structuring.pm:1325
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "@%s referencia a um nodo n@~{a}o existente `%s'"
  
! #: tp/Texinfo/Structuring.pm:558
  #, perl-format
  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:663
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "nodo n@~{a}o referenciado `%s'"
  
! #: tp/Texinfo/Structuring.pm:706
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr "nodo `%s' @'{e} %s para `%s' na se@,{c}@~{a}o mas n@~{a}o no menu"
  
! #: tp/Texinfo/Structuring.pm:713
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
  msgstr "nodo %s `%s' no menu `%s' e na se@,{c}@~{a}o `%s' diferem"
  
! #: tp/Texinfo/Structuring.pm:731
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
  msgstr "nodo `%s' @'{e} %s para `%s' no menu mas n@~{a}o na se@,{c}@~{a}o"
  
! #: tp/Texinfo/Structuring.pm:786
  #, 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:810
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%s referencia a `%s' o qual n@~{a}o existe"
  
! #: tp/Texinfo/Structuring.pm:829
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
***************
*** 3151,3155 ****
  "nodo `%s' precisa de um item de menu para `%s' apesar de ser seu alvo Acima"
  
! #: tp/Texinfo/Structuring.pm:842
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
--- 3147,3151 ----
  "nodo `%s' precisa de um item de menu para `%s' apesar de ser seu alvo Acima"
  
! #: tp/Texinfo/Structuring.pm:837
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
***************
*** 3161,3165 ****
  msgstr "@%s para `%s', diferente do %s nome `%s'"
  
! #: tp/Texinfo/Structuring.pm:2070
  #, perl-format
  msgid "empty index key in @%s"
--- 3157,3161 ----
  msgstr "@%s para `%s', diferente do %s nome `%s'"
  
! #: tp/Texinfo/Structuring.pm:2067
  #, perl-format
  msgid "empty index key in @%s"
***************
*** 3730,3734 ****
  msgstr "Tente `%s --help' para mais informa@,{c}@~{a}o.\n"
  
! #: tp/texi2any.pl:1232
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
--- 3726,3730 ----
  msgstr "Tente `%s --help' para mais informa@,{c}@~{a}o.\n"
  
! #: tp/texi2any.pl:1239
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
***************
*** 3736,3750 ****
  "Nenhuma se@,{c}@~{a}o?"
  
! #: tp/texi2any.pl:1255
  #, 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:1261
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "n@~{a}o posso abrir %s para escrita: %s\n"
  
! #: tp/texi2any.pl:1286
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
--- 3732,3746 ----
  "Nenhuma se@,{c}@~{a}o?"
  
! #: tp/texi2any.pl:1262
  #, 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:1268
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "n@~{a}o posso abrir %s para escrita: %s\n"
  
! #: tp/texi2any.pl:1293
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
***************
*** 3754,3821 ****
  "nada. Nenhuma se@,{c}@~{a}o?"
  
! #: tp/texi2any.pl:1359 tp/texi2any.pl:1435
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%s: erro ao fechar %s: %s\n"
  
! #: tp/texi2any.pl:1382 tp/texi2any.pl:1416
  #, 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:1388 tp/texi2any.pl:1422
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
  msgstr "%s: n@~{a}o posso abrir %s para escrita: %s\n"
  
! #~ msgid "--*** Tags out of Date ***"
! #~ msgstr "--*** Tags Desatualizadas ***"
! 
! #~ msgid " Subfile: %s"
! #~ msgstr " Subarquivo: %s"
! 
! #, fuzzy
! #~| msgid "%s: unrecognized option '--%s'\n"
! #~ msgid "%s: unrecognized option `%s'\n"
! #~ msgstr "%s: op@,{c}@~{a}o desconhecida '--%s'\n"
! 
! #, fuzzy
! #~| msgid "%s is not a valid region code"
! #~ msgid "%s is not a Texinfo index file\n"
! #~ msgstr "%s @'{e} um c@'{o}digo de regi@~{a}o inv@'{a}lido"
! 
! #~ msgid "%s:%d: Bad key %s in record\n"
! #~ msgstr "%s:%d: Chave errada %s no registro\n"
! 
! #~ msgid "%s:%d: Bad entry; expected three fields, not %d\n"
! #~ msgstr "%s:%d: Entrada errada; esperado tr@^{e}s campos, n@~{a}o %d\n"
! 
! #~ msgid "%s:%d: Bad entry; expected %s at column %d\n"
! #~ msgstr "%s:%d: Entrada errada; esperado %s na coluna %d\n"
! 
! #~ msgid "..."
! #~ msgstr "..."
! 
! #, fuzzy
! #~| msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
! #~ msgid "Usage: %s [OPTION]... FILE...\n"
! #~ msgstr "Uso: %s [OP@,{C}@~{A}O]... ARQUIVO-TEXI...\n"
! 
! #~ msgid "Generate a sorted index for each TeX output FILE."
! #~ msgstr "Gerado um @'{i}ndice ordenado para cada ARQUIVO TeX de sa@'{i}da."
! 
! #~ msgid "Usually FILE... is specified as `foo.??' for a document `foo.texi'."
! #~ msgstr ""
! #~ "Geralmente em ARQUIVO... temos `algumacoisa.??' para `algumacoisa.texi'."
! 
! #~ msgid "Options:"
! #~ msgstr "Op@,{c}@~{o}es:"
! 
! #~ msgid " -h, --help   display this help and exit"
! #~ msgstr " -h, --help   exibe essa ajuda e sai"
! 
! #~ msgid " --version    display version information and exit"
! #~ msgstr " --version    exibe dados de vers@~{a}o e sai"
  
! #~ msgid " --           end option processing"
! #~ msgstr " --           fim do tratamento de op@,{c}@~{a}o"
--- 3750,3771 ----
  "nada. Nenhuma se@,{c}@~{a}o?"
  
! #: tp/texi2any.pl:1366 tp/texi2any.pl:1442
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%s: erro ao fechar %s: %s\n"
  
! #: tp/texi2any.pl:1389 tp/texi2any.pl:1423
  #, 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:1395 tp/texi2any.pl:1429
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
  msgstr "%s: n@~{a}o posso abrir %s para escrita: %s\n"
  
! #~ msgid "-%s---Info: %s, %ld lines --%s--"
! #~ msgstr "-%s---Info: %s, %ld linhas --%s--"
  
! #~ msgid "-%s---Info: (%s)%s, %ld lines --%s--"
! #~ msgstr "-%s---Info: (%s)%s, %ld linhas --%s--"
Binary files texinfo-6.1/po/ro.gmo and texinfo-6.3/po/ro.gmo differ
diff -Nrc2 texinfo-6.1/po/ro.po texinfo-6.3/po/ro.po
*** texinfo-6.1/po/ro.po	2016-02-06 11:35:53.000000000 +0000
--- texinfo-6.3/po/ro.po	2016-09-10 12:45:55.000000000 +0100
***************
*** 9,13 ****
  "Project-Id-Version: texinfo 4.7.94\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
  "PO-Revision-Date: 2005-05-03 12:00+05\n"
  "Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
--- 9,13 ----
  "Project-Id-Version: texinfo 4.7.94\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:45+0100\n"
  "PO-Revision-Date: 2005-05-03 12:00+05\n"
  "Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
***************
*** 17,20 ****
--- 17,21 ----
  "Content-Type: text/plain; charset=ISO-8859-2\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"
  
***************
*** 115,121 ****
  
  #: gnulib/lib/regcomp.c:156
! #, fuzzy
! msgid "Unmatched [ or [^"
! msgstr "} fãrã pereche"
  
  #: gnulib/lib/regcomp.c:159
--- 116,121 ----
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [, [^, [:, [., or [="
! msgstr ""
  
  #: gnulib/lib/regcomp.c:159
***************
*** 158,162 ****
  msgstr "} fãrã pereche"
  
! #: gnulib/lib/regcomp.c:711
  #, fuzzy
  msgid "No previous regular expression"
--- 158,162 ----
  msgstr "} fãrã pereche"
  
! #: gnulib/lib/regcomp.c:687
  #, fuzzy
  msgid "No previous regular expression"
***************
*** 311,315 ****
  msgstr "------- Note de subsol  -------"
  
! #: info/indices.c:123 info/indices.c:812
  #, c-format
  msgid "Finding index entries..."
--- 311,315 ----
  msgstr "------- Note de subsol  -------"
  
! #: info/indices.c:123 info/indices.c:822
  #, c-format
  msgid "Finding index entries..."
***************
*** 320,324 ****
  msgstr "Cautã un ºir în indexul acestui fiºier"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:818
  #, c-format
  msgid "No indices found."
--- 320,324 ----
  msgstr "Cautã un ºir în indexul acestui fiºier"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:828
  #, c-format
  msgid "No indices found."
***************
*** 353,386 ****
  msgstr "Nici o intrare în %sindex conþinând `%s'."
  
! #: info/indices.c:476 info/indices.c:880
  #, fuzzy, c-format
  msgid "No index entries containing '%s'."
  msgstr "Nici o intrare în %sindex conþinând `%s'."
  
! #: info/indices.c:583
  #, fuzzy, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "Scanãm indexurile pentru `%s'..."
  
! #: info/indices.c:636
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
  "Cautã în toþi indexurile fiºierului pentru un ºir ºi contruieºte un meniu"
  
! #: info/indices.c:644 info/indices.c:646
  #, fuzzy
  msgid "Index apropos"
  msgstr "Index apropos: "
  
! #: info/indices.c:688
  #, fuzzy, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Nici o intrare în %sindex conþinând `%s'."
  
! #: info/indices.c:797
  msgid "List all matches of a string in the index"
  msgstr ""
  
! #: info/indices.c:824 info/indices.c:826
  #, fuzzy
  msgid "Index topic"
--- 353,386 ----
  msgstr "Nici o intrare în %sindex conþinând `%s'."
  
! #: info/indices.c:476 info/indices.c:890
  #, fuzzy, c-format
  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'..."
  msgstr "Scanãm indexurile pentru `%s'..."
  
! #: info/indices.c:646
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
  "Cautã în toþi indexurile fiºierului pentru un ºir ºi contruieºte un meniu"
  
! #: info/indices.c:654 info/indices.c:656
  #, fuzzy
  msgid "Index apropos"
  msgstr "Index apropos: "
  
! #: info/indices.c:698
  #, fuzzy, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Nici o intrare în %sindex conþinând `%s'."
  
! #: info/indices.c:807
  msgid "List all matches of a string in the index"
  msgstr ""
  
! #: info/indices.c:834 info/indices.c:836
  #, fuzzy
  msgid "Index topic"
***************
*** 392,446 ****
  msgstr "Nici un fiºier info nu are `%s' în indexurile lor."
  
! #: info/info-utils.c:892
  #, c-format
  msgid "Error converting file character encoding."
  msgstr ""
  
! #: info/info.c:222 info/session.c:2789
  #, fuzzy, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "Nici un articol de meniu `%s' în nod `%s'."
  
! #: info/info.c:315
! #, fuzzy, c-format
! msgid "No file given for node '%s'."
! msgstr "Nici un meniu în nod `%s'."
! 
! #: info/info.c:364 info/info.c:1133
  #, fuzzy, c-format
  msgid "Cannot find node '%s'."
  msgstr "Nu pot gãsi nodul `%s'."
  
! #: info/info.c:386
  #, c-format
  msgid "No program name given."
  msgstr ""
  
! #: info/info.c:577
  #, c-format
  msgid "invalid number: %s\n"
  msgstr ""
  
! #: info/info.c:757
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr ""
  
! #: info/info.c:764 info/infokey.c:537
  #, c-format
  msgid "%s: no such variable"
  msgstr ""
  
! #: info/info.c:770 info/infokey.c:539
  #, fuzzy, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "Seteazã valoarea unei variabile Info"
  
! #: info/info.c:782
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "Încercaþi --help pentru informaþii suplimentare.\n"
  
! #: info/info.c:804 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
--- 392,441 ----
  msgstr "Nici un fiºier info nu are `%s' în indexurile lor."
  
! #: info/info-utils.c:879
  #, c-format
  msgid "Error converting file character encoding."
  msgstr ""
  
! #: info/info.c:279 info/session.c:2789
  #, fuzzy, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "Nici un articol de meniu `%s' în nod `%s'."
  
! #: info/info.c:416 info/info.c:1148
  #, fuzzy, c-format
  msgid "Cannot find node '%s'."
  msgstr "Nu pot gãsi nodul `%s'."
  
! #: info/info.c:438
  #, c-format
  msgid "No program name given."
  msgstr ""
  
! #: info/info.c:636
  #, c-format
  msgid "invalid number: %s\n"
  msgstr ""
  
! #: info/info.c:816
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr ""
  
! #: info/info.c:823 info/infokey.c:540
  #, c-format
  msgid "%s: no such variable"
  msgstr ""
  
! #: info/info.c:829 info/infokey.c:542
  #, fuzzy, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "Seteazã valoarea unei variabile Info"
  
! #: info/info.c:841
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "Încercaþi --help pentru informaþii suplimentare.\n"
  
! #: info/info.c:860 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
***************
*** 452,461 ****
  msgstr ""
  
! #: info/info.c:981
  #, fuzzy, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "nici o intrare de index a fost gãsitã pentru `%s'\n"
  
! #: info/info.c:1034
  #, c-format
  msgid ""
--- 447,456 ----
  msgstr ""
  
! #: info/info.c:999
  #, fuzzy, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "nici o intrare de index a fost gãsitã pentru `%s'\n"
  
! #: info/info.c:1049
  #, c-format
  msgid ""
***************
*** 465,469 ****
  msgstr ""
  
! #: info/info.c:1040
  msgid ""
  "Options:\n"
--- 460,464 ----
  msgstr ""
  
! #: info/info.c:1055
  msgid ""
  "Options:\n"
***************
*** 476,480 ****
  msgstr ""
  
! #: info/info.c:1048
  msgid ""
  "  -h, --help                   display this help and exit.\n"
--- 471,475 ----
  msgstr ""
  
! #: info/info.c:1063
  msgid ""
  "  -h, --help                   display this help and exit.\n"
***************
*** 484,488 ****
  msgstr ""
  
! #: info/info.c:1054
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
--- 479,483 ----
  msgstr ""
  
! #: info/info.c:1069
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
***************
*** 492,496 ****
  msgstr ""
  
! #: info/info.c:1061
  #, fuzzy
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
--- 487,491 ----
  msgstr ""
  
! #: info/info.c:1076
  #, fuzzy
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
***************
*** 499,503 ****
  "vorbire.\n"
  
! #: info/info.c:1065
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
--- 494,498 ----
  "vorbire.\n"
  
! #: info/info.c:1080
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
***************
*** 511,515 ****
  msgstr ""
  
! #: info/info.c:1074
  msgid ""
  "\n"
--- 506,510 ----
  msgstr ""
  
! #: info/info.c:1089
  msgid ""
  "\n"
***************
*** 521,525 ****
  msgstr ""
  
! #: info/info.c:1081
  msgid ""
  "\n"
--- 516,520 ----
  msgstr ""
  
! #: info/info.c:1096
  msgid ""
  "\n"
***************
*** 527,531 ****
  msgstr ""
  
! #: info/info.c:1084
  msgid ""
  "\n"
--- 522,526 ----
  msgstr ""
  
! #: info/info.c:1099
  msgid ""
  "\n"
***************
*** 543,547 ****
  msgstr ""
  
! #: info/info.c:1099 install-info/install-info.c:616 tp/texi2any.pl:861
  #, fuzzy
  msgid ""
--- 538,542 ----
  msgstr ""
  
! #: info/info.c:1114 install-info/install-info.c:616 tp/texi2any.pl:861
  #, fuzzy
  msgid ""
***************
*** 555,619 ****
  "Texinfo homepage: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1134
  #, fuzzy, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Nu pot gãsi nodul `(%s)%s'."
  
! #: info/info.c:1135
  msgid "Cannot find a window!"
  msgstr "Nu pot gãsi o fereastrã!"
  
! #: info/info.c:1136
  msgid "Point doesn't appear within this window's node!"
  msgstr "Punctul nu apare în interiorul nodului acestei ferestre!"
  
! #: info/info.c:1137
  msgid "Cannot delete the last window."
  msgstr "Nu pot ºterge ultima fereastrã."
  
! #: info/info.c:1138
  msgid "No menu in this node."
  msgstr "Nici un meniu în acest nod"
  
! #: info/info.c:1139
  msgid "No footnotes in this node."
  msgstr "Nici o notã de subsol în acest nod."
  
! #: info/info.c:1140
  msgid "No cross references in this node."
  msgstr "Nici o referinþã la acelaºi pasaj în acest nod."
  
! #: info/info.c:1141
  #, fuzzy, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Nici un pointer `%s' pentru acest nod."
  
! #: info/info.c:1142
  #, fuzzy, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "Comandã Info necunoscutã `%c';încercaþi `?' pentru ajutor."
  
! #: info/info.c:1143
  #, fuzzy, c-format
  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:1144
  msgid "You are already at the last page of this node."
  msgstr "Sunteþi deja la ultima paginã a acestui nod."
  
! #: info/info.c:1145
  msgid "You are already at the first page of this node."
  msgstr "Sunteþi deja la prima paginã a acestui nod."
  
! #: info/info.c:1146
  msgid "Only one window."
  msgstr "O singurã fereastrã."
  
! #: info/info.c:1147
  msgid "Resulting window would be too small."
  msgstr "Fereastra rezultantã ar fi prea micã."
  
! #: info/info.c:1148
  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ã."
--- 550,614 ----
  "Texinfo homepage: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1149
  #, fuzzy, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Nu pot gãsi nodul `(%s)%s'."
  
! #: info/info.c:1150
  msgid "Cannot find a window!"
  msgstr "Nu pot gãsi o fereastrã!"
  
! #: info/info.c:1151
  msgid "Point doesn't appear within this window's node!"
  msgstr "Punctul nu apare în interiorul nodului acestei ferestre!"
  
! #: info/info.c:1152
  msgid "Cannot delete the last window."
  msgstr "Nu pot ºterge ultima fereastrã."
  
! #: info/info.c:1153
  msgid "No menu in this node."
  msgstr "Nici un meniu în acest nod"
  
! #: info/info.c:1154
  msgid "No footnotes in this node."
  msgstr "Nici o notã de subsol în acest nod."
  
! #: info/info.c:1155
  msgid "No cross references in this node."
  msgstr "Nici o referinþã la acelaºi pasaj în acest nod."
  
! #: info/info.c:1156
  #, fuzzy, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Nici un pointer `%s' pentru acest nod."
  
! #: info/info.c:1157
  #, fuzzy, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "Comandã Info necunoscutã `%c';încercaþi `?' pentru ajutor."
  
! #: info/info.c:1158
  #, fuzzy, c-format
  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:1159
  msgid "You are already at the last page of this node."
  msgstr "Sunteþi deja la ultima paginã a acestui nod."
  
! #: info/info.c:1160
  msgid "You are already at the first page of this node."
  msgstr "Sunteþi deja la prima paginã a acestui nod."
  
! #: info/info.c:1161
  msgid "Only one window."
  msgstr "O singurã fereastrã."
  
! #: info/info.c:1162
  msgid "Resulting window would be too small."
  msgstr "Fereastra rezultantã ar fi prea micã."
  
! #: info/info.c:1163
  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ã."
***************
*** 913,947 ****
  msgstr "acþiune necunoscutã `%s'"
  
! #: info/infokey.c:482
  #, c-format
  msgid "action name too long"
  msgstr "nume de acþiune prea lung"
  
! #: info/infokey.c:495
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "extra caractere dupã acþiunea `%s'"
  
! #: info/infokey.c:506
  #, c-format
  msgid "missing variable name"
  msgstr "nume de variabilã inexistent"
  
! #: info/infokey.c:515
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "caracterul `=' lipseºte imediat dupã numele de variabilã"
  
! #: info/infokey.c:522
  #, c-format
  msgid "variable name too long"
  msgstr "nume de variabilã prea lung"
  
! #: info/infokey.c:546
  #, c-format
  msgid "value too long"
  msgstr "valoare prea lungã"
  
! #: info/infokey.c:592
  #, c-format
  msgid "\"%s\", line %u: "
--- 908,942 ----
  msgstr "acþiune necunoscutã `%s'"
  
! #: info/infokey.c:485
  #, c-format
  msgid "action name too long"
  msgstr "nume de acþiune prea lung"
  
! #: info/infokey.c:498
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "extra caractere dupã acþiunea `%s'"
  
! #: info/infokey.c:509
  #, c-format
  msgid "missing variable name"
  msgstr "nume de variabilã inexistent"
  
! #: info/infokey.c:518
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "caracterul `=' lipseºte imediat dupã numele de variabilã"
  
! #: info/infokey.c:525
  #, c-format
  msgid "variable name too long"
  msgstr "nume de variabilã prea lung"
  
! #: info/infokey.c:549
  #, c-format
  msgid "value too long"
  msgstr "valoare prea lungã"
  
! #: info/infokey.c:595
  #, c-format
  msgid "\"%s\", line %u: "
***************
*** 1281,1628 ****
  msgstr "Nu pot gãsi nodul referit de `%s' în `%s'."
  
! #: info/session.c:2864
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "Citeºte o listã de meniuri pornind din dir ºi urmãreºte-le"
  
! #: info/session.c:2866
  msgid "Follow menus: "
  msgstr "Urmeazã meniurile: "
  
! #: info/session.c:2971
  msgid "Select the Next node"
  msgstr "Selecteazã nodul Urmãtor"
  
! #: info/session.c:2978
  msgid "Select the Prev node"
  msgstr "Selectezã nodul Prec"
  
! #: info/session.c:2985
  msgid "Select the Up node"
  msgstr "Selecteazã nodul Sus"
  
! #: info/session.c:2991
  msgid "Select the last node in this file"
  msgstr "Selecteazã ultimul nod din acest fiºier"
  
! #: info/session.c:3018 info/session.c:3051
  msgid "This window has no additional nodes"
  msgstr "Acestã fereastrã nu mai are nici un nod"
  
! #: info/session.c:3024
  msgid "Select the first node in this file"
  msgstr "Selecteazã primul nod din acest fiºier"
  
! #: info/session.c:3158
  msgid "No more nodes within this document."
  msgstr "Nu mai sunt alte noduri în acest document."
  
! #: info/session.c:3203 info/session.c:3243
  #, fuzzy
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "Nici un `Prec' sau `Sus' pentru acest nod în acest document."
  
! #: info/session.c:3256
  msgid "Move forwards or down through node structure"
  msgstr "Mergi înainte sau jos prin structura de noduri"
  
! #: info/session.c:3273
  msgid "Move backwards or up through node structure"
  msgstr "Mergi înapoi sau sus prin structura de noduri"
  
! #: info/session.c:3296
  msgid "Read a node name and select it"
  msgstr "Citeºte numele unui nod ºi selecteazã-l"
  
! #: info/session.c:3350 info/session.c:3354
  msgid "Goto node: "
  msgstr "Du-te la nod: "
  
! #: info/session.c:3533
  msgid "Find the node describing program invocation"
  msgstr "Gãseºte nodul ce descrie invocarea programului"
  
! #: info/session.c:3535
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Gãseºte nodul Invocare pentru [%s]: "
  
! #: info/session.c:3580
  msgid "Read a manpage reference and select it"
  msgstr "Citeºte o referinþã de paginã de manul ºi selecteazã-o"
  
! #: info/session.c:3584
  msgid "Get Manpage: "
  msgstr "Obþine paginã manual (manpage): "
  
! #: info/session.c:3605
  #, fuzzy
  msgid "Select the node 'Top' in this file"
  msgstr "Selecteazã nodul `Vârf' în acest fiºier"
  
! #: info/session.c:3611
  #, fuzzy
  msgid "Select the node '(dir)'"
  msgstr "Selecteazã nodul `(dir)'"
  
! #: info/session.c:3617
  msgid "Show full file name of node being displayed"
  msgstr ""
  
! #: info/session.c:3634
  msgid "Select the most recently selected node"
  msgstr "Selecteazã cel mai recent nod selectat"
  
! #: info/session.c:3639
  #, c-format
  msgid "No earlier node in history"
  msgstr ""
  
! #: info/session.c:3643
  msgid "Read the name of a file and select it"
  msgstr "Citeºte numele unui fiºier ºi selecteazã-l"
  
! #: info/session.c:3647
  msgid "Find file: "
  msgstr "Gãseºte fiºier: "
  
! #: info/session.c:3664
  #, fuzzy, c-format
  msgid "Cannot find '%s'."
  msgstr "Nu pot gãsi `%s'."
  
! #: info/session.c:3713
  #, fuzzy, c-format
  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: %s"
  msgstr "eroare la scrierea în `%s'"
  
! #: info/session.c:3736
  #, fuzzy, c-format
  msgid "closing %s"
  msgstr "ªterg %s\n"
  
! #: info/session.c:3785
  #, fuzzy, c-format
  msgid "writing node %s..."
  msgstr "Scriu nod %s..."
  
! #: info/session.c:3831
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "Conectez (pipe) conþinutul acestui nod prin INFO_PRINT_COMMAND"
  
! #: info/session.c:3859
  #, fuzzy, c-format
  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..."
  msgstr "Tipãresc nod %s..."
  
! #: info/session.c:3872
  #, fuzzy, c-format
  msgid "finished printing node %s"
  msgstr "Tipãresc nod %s..."
  
! #: 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:4169
  msgid "Search continued from the end of the document."
  msgstr ""
  
! #: info/session.c:4174
  #, fuzzy
  msgid "Search continued from the beginning of the document."
  msgstr "ªterge (kill) pânã la începutul liniei"
  
! #: info/session.c:4194
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "Caut subfiºier %s ..."
  
! #: info/session.c:4231
  msgid "Search failed."
  msgstr "Cãutare eºuatã."
  
! #: info/session.c:4248
  #, fuzzy, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s pentru ºir [%s]: "
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Regexp search"
  msgstr ""
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Search"
  msgstr "Cautã"
  
! #: info/session.c:4250 info/session.c:4256
  #, fuzzy
  msgid " case-sensitively"
  msgstr " þinând cont de litere mari/mici"
  
! #: info/session.c:4251 info/session.c:4257
  #, fuzzy
  msgid " backward"
  msgstr "Cautã înapoi"
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s: "
  msgstr ""
  
! #: info/session.c:4274
  msgid "Search string too short"
  msgstr ""
  
! #: info/session.c:4467
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4491 info/session.c:4601
  #, c-format
  msgid "No more matches."
  msgstr ""
  
! #: info/session.c:4628
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4649
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4653 info/session.c:4665
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4661
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4674
  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:4679
  msgid "Read a string and search for it"
  msgstr "Citeºte un ºir ºi cautã-l"
  
! #: info/session.c:4685
  msgid "Read a string and search backward for it"
  msgstr "Citeºte un ºir ºi cautã-l înapoi"
  
! #: info/session.c:4693
  msgid "Repeat last search in the same direction"
  msgstr "Repetã ultima cãutare în aceeaºi direcþie"
  
! #: info/session.c:4701 info/session.c:4746
  msgid "No previous search string"
  msgstr "Nici un ºir cãutat anterior"
  
! #: info/session.c:4738
  msgid "Repeat last search in the reverse direction"
  msgstr "Repetã ultima cãutare în direcþie opusã"
  
! #: info/session.c:4785
  msgid "Clear displayed search matches"
  msgstr ""
  
! #: info/session.c:4802 info/session.c:4808
  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:4928
  #, fuzzy
  msgid "Regexp I-search backward: "
  msgstr "I-cautã înapoi: "
  
! #: info/session.c:4929
  msgid "I-search backward: "
  msgstr "I-cautã înapoi: "
  
! #: info/session.c:4931
  #, fuzzy
  msgid "Regexp I-search: "
  msgstr "I-cautã: "
  
! #: info/session.c:4932
  msgid "I-search: "
  msgstr "I-cautã: "
  
! #: info/session.c:4957 info/session.c:4960
  msgid "Failing "
  msgstr "Eºuez "
  
! #: info/session.c:5326
  msgid "Cancel current operation"
  msgstr "Renunþã la operaþia curentã"
  
! #: info/session.c:5333
  msgid "Quit"
  msgstr "Ieºi"
  
! #: info/session.c:5338
  #, fuzzy
  msgid "Display version of Info being run"
  msgstr "afiºeazã informaþii despre versiune ºi terminã"
  
! #: info/session.c:5340
  #, c-format
  msgid "GNU Info version %s"
  msgstr ""
  
! #: info/session.c:5345
  msgid "Redraw the display"
  msgstr "Redeseneazã ecranul"
  
! #: info/session.c:5382
  msgid "Quit using Info"
  msgstr "Ieºi din Info"
  
! #: info/session.c:5398
  msgid "Run command bound to this key's lowercase variant"
  msgstr "Ruleazã comanda legatã de litera micã de pe tastã"
  
! #: info/session.c:5409
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Comandã necunoscutã (%s)."
  
! #: info/session.c:5412
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\" este invalid"
  
! #: info/session.c:5413
  #, fuzzy, c-format
  msgid "'%s' is invalid"
  msgstr "`%s' este invalid"
  
! #: info/session.c:5731
  msgid "Add this digit to the current numeric argument"
  msgstr "Adaugã aceastã cifrã la argumentul numeric curent"
  
! #: info/session.c:5738
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "Începe (sau înmulþeºte cu 4) argumentul numeric curent"
--- 1276,1623 ----
  msgstr "Nu pot gãsi nodul referit de `%s' în `%s'."
  
! #: info/session.c:2870
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "Citeºte o listã de meniuri pornind din dir ºi urmãreºte-le"
  
! #: info/session.c:2872
  msgid "Follow menus: "
  msgstr "Urmeazã meniurile: "
  
! #: info/session.c:2977
  msgid "Select the Next node"
  msgstr "Selecteazã nodul Urmãtor"
  
! #: info/session.c:2984
  msgid "Select the Prev node"
  msgstr "Selectezã nodul Prec"
  
! #: info/session.c:2991
  msgid "Select the Up node"
  msgstr "Selecteazã nodul Sus"
  
! #: info/session.c:2997
  msgid "Select the last node in this file"
  msgstr "Selecteazã ultimul nod din acest fiºier"
  
! #: info/session.c:3024 info/session.c:3057
  msgid "This window has no additional nodes"
  msgstr "Acestã fereastrã nu mai are nici un nod"
  
! #: info/session.c:3030
  msgid "Select the first node in this file"
  msgstr "Selecteazã primul nod din acest fiºier"
  
! #: info/session.c:3164
  msgid "No more nodes within this document."
  msgstr "Nu mai sunt alte noduri în acest document."
  
! #: info/session.c:3209 info/session.c:3249
  #, fuzzy
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "Nici un `Prec' sau `Sus' pentru acest nod în acest document."
  
! #: info/session.c:3262
  msgid "Move forwards or down through node structure"
  msgstr "Mergi înainte sau jos prin structura de noduri"
  
! #: info/session.c:3279
  msgid "Move backwards or up through node structure"
  msgstr "Mergi înapoi sau sus prin structura de noduri"
  
! #: info/session.c:3302
  msgid "Read a node name and select it"
  msgstr "Citeºte numele unui nod ºi selecteazã-l"
  
! #: info/session.c:3356 info/session.c:3360
  msgid "Goto node: "
  msgstr "Du-te la nod: "
  
! #: info/session.c:3539
  msgid "Find the node describing program invocation"
  msgstr "Gãseºte nodul ce descrie invocarea programului"
  
! #: info/session.c:3541
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Gãseºte nodul Invocare pentru [%s]: "
  
! #: info/session.c:3586
  msgid "Read a manpage reference and select it"
  msgstr "Citeºte o referinþã de paginã de manul ºi selecteazã-o"
  
! #: info/session.c:3590
  msgid "Get Manpage: "
  msgstr "Obþine paginã manual (manpage): "
  
! #: info/session.c:3611
  #, fuzzy
  msgid "Select the node 'Top' in this file"
  msgstr "Selecteazã nodul `Vârf' în acest fiºier"
  
! #: info/session.c:3617
  #, fuzzy
  msgid "Select the node '(dir)'"
  msgstr "Selecteazã nodul `(dir)'"
  
! #: info/session.c:3623
  msgid "Show full file name of node being displayed"
  msgstr ""
  
! #: info/session.c:3640
  msgid "Select the most recently selected node"
  msgstr "Selecteazã cel mai recent nod selectat"
  
! #: info/session.c:3645
  #, c-format
  msgid "No earlier node in history"
  msgstr ""
  
! #: info/session.c:3649
  msgid "Read the name of a file and select it"
  msgstr "Citeºte numele unui fiºier ºi selecteazã-l"
  
! #: info/session.c:3653
  msgid "Find file: "
  msgstr "Gãseºte fiºier: "
  
! #: info/session.c:3670
  #, fuzzy, c-format
  msgid "Cannot find '%s'."
  msgstr "Nu pot gãsi `%s'."
  
! #: info/session.c:3719
  #, fuzzy, c-format
  msgid "Could not create output file '%s'."
  msgstr "Nu am putut crea fiºier ieºire `%s'."
  
! #: info/session.c:3733
  #, fuzzy, c-format
  msgid "error writing to %s: %s"
  msgstr "eroare la scrierea în `%s'"
  
! #: info/session.c:3742
  #, fuzzy, c-format
  msgid "closing %s"
  msgstr "ªterg %s\n"
  
! #: info/session.c:3791
  #, fuzzy, c-format
  msgid "writing node %s..."
  msgstr "Scriu nod %s..."
  
! #: info/session.c:3837
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "Conectez (pipe) conþinutul acestui nod prin INFO_PRINT_COMMAND"
  
! #: info/session.c:3865
  #, fuzzy, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Nu pot deschide conexiune (pipe) cãtre `%s'."
  
! #: info/session.c:3870
  #, fuzzy, c-format
  msgid "printing node %s..."
  msgstr "Tipãresc nod %s..."
  
! #: info/session.c:3878
  #, fuzzy, c-format
  msgid "finished printing node %s"
  msgstr "Tipãresc nod %s..."
  
! #: info/session.c:3910
  msgid "Toggle the usage of regular expressions in searches"
  msgstr ""
  
! #: info/session.c:3914
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr ""
  
! #: info/session.c:3915
  #, c-format
  msgid "Using literal strings for searches."
  msgstr ""
  
! #: info/session.c:4175
  msgid "Search continued from the end of the document."
  msgstr ""
  
! #: info/session.c:4180
  #, fuzzy
  msgid "Search continued from the beginning of the document."
  msgstr "ªterge (kill) pânã la începutul liniei"
  
! #: info/session.c:4200
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "Caut subfiºier %s ..."
  
! #: info/session.c:4237
  msgid "Search failed."
  msgstr "Cãutare eºuatã."
  
! #: info/session.c:4254
  #, fuzzy, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s pentru ºir [%s]: "
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Regexp search"
  msgstr ""
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Search"
  msgstr "Cautã"
  
! #: info/session.c:4256 info/session.c:4262
  #, fuzzy
  msgid " case-sensitively"
  msgstr " þinând cont de litere mari/mici"
  
! #: info/session.c:4257 info/session.c:4263
  #, fuzzy
  msgid " backward"
  msgstr "Cautã înapoi"
  
! #: info/session.c:4260
  #, c-format
  msgid "%s%s%s: "
  msgstr ""
  
! #: info/session.c:4280
  msgid "Search string too short"
  msgstr ""
  
! #: info/session.c:4473
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4497 info/session.c:4607
  #, c-format
  msgid "No more matches."
  msgstr ""
  
! #: info/session.c:4634
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4655
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4659 info/session.c:4671
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4667
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4680
  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:4685
  msgid "Read a string and search for it"
  msgstr "Citeºte un ºir ºi cautã-l"
  
! #: info/session.c:4691
  msgid "Read a string and search backward for it"
  msgstr "Citeºte un ºir ºi cautã-l înapoi"
  
! #: info/session.c:4699
  msgid "Repeat last search in the same direction"
  msgstr "Repetã ultima cãutare în aceeaºi direcþie"
  
! #: info/session.c:4707 info/session.c:4752
  msgid "No previous search string"
  msgstr "Nici un ºir cãutat anterior"
  
! #: info/session.c:4744
  msgid "Repeat last search in the reverse direction"
  msgstr "Repetã ultima cãutare în direcþie opusã"
  
! #: info/session.c:4791
  msgid "Clear displayed search matches"
  msgstr ""
  
! #: info/session.c:4808 info/session.c:4814
  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:4934
  #, fuzzy
  msgid "Regexp I-search backward: "
  msgstr "I-cautã înapoi: "
  
! #: info/session.c:4935
  msgid "I-search backward: "
  msgstr "I-cautã înapoi: "
  
! #: info/session.c:4937
  #, fuzzy
  msgid "Regexp I-search: "
  msgstr "I-cautã: "
  
! #: info/session.c:4938
  msgid "I-search: "
  msgstr "I-cautã: "
  
! #: info/session.c:4963 info/session.c:4966
  msgid "Failing "
  msgstr "Eºuez "
  
! #: info/session.c:5332
  msgid "Cancel current operation"
  msgstr "Renunþã la operaþia curentã"
  
! #: info/session.c:5339
  msgid "Quit"
  msgstr "Ieºi"
  
! #: info/session.c:5344
  #, fuzzy
  msgid "Display version of Info being run"
  msgstr "afiºeazã informaþii despre versiune ºi terminã"
  
! #: info/session.c:5346
  #, c-format
  msgid "GNU Info version %s"
  msgstr ""
  
! #: info/session.c:5351
  msgid "Redraw the display"
  msgstr "Redeseneazã ecranul"
  
! #: info/session.c:5388
  msgid "Quit using Info"
  msgstr "Ieºi din Info"
  
! #: info/session.c:5404
  msgid "Run command bound to this key's lowercase variant"
  msgstr "Ruleazã comanda legatã de litera micã de pe tastã"
  
! #: info/session.c:5415
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Comandã necunoscutã (%s)."
  
! #: info/session.c:5418
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\" este invalid"
  
! #: info/session.c:5419
  #, fuzzy, c-format
  msgid "'%s' is invalid"
  msgstr "`%s' este invalid"
  
! #: info/session.c:5737
  msgid "Add this digit to the current numeric argument"
  msgstr "Adaugã aceastã cifrã la argumentul numeric curent"
  
! #: info/session.c:5744
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "Începe (sau înmulþeºte cu 4) argumentul numeric curent"
***************
*** 1767,1784 ****
  msgstr "Seteazã %s cu valoarea (%s): "
  
! #: info/window.c:959
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), linii ----, "
  
- #: info/window.c:966
- #, fuzzy, c-format
- msgid "-%s---Info: %s, %ld lines --%s--"
- msgstr "-%s---Info: %s, %d linii --%s--"
- 
- #: info/window.c:970
- #, fuzzy, c-format
- msgid "-%s---Info: (%s)%s, %ld lines --%s--"
- msgstr "-%s%s-Info: (%s)%s, %d linii --%s--"
- 
  #: install-info/install-info.c:292
  #, c-format
--- 1762,1769 ----
  msgstr "Seteazã %s cu valoarea (%s): "
  
! #: info/window.c:909
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), linii ----, "
  
  #: install-info/install-info.c:292
  #, c-format
***************
*** 1904,1908 ****
  "\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"
--- 1889,1893 ----
  "\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"
***************
*** 2000,2117 ****
  msgstr "nici o intrare gãsitã pentru `%s'; n-am ºters nimic"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:855
! #: tp/Texinfo/Convert/Converter.pm:893 tp/Texinfo/Convert/Converter.pm:1204
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6504
! #: tp/Texinfo/Convert/HTML.pm:6528 tp/Texinfo/Convert/HTML.pm:6905
! #: tp/Texinfo/Convert/HTML.pm:6963 tp/Texinfo/Convert/HTML.pm:7041
! #: tp/Texinfo/Convert/HTML.pm:7118 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:546
! #: tp/Texinfo/Convert/TexinfoXML.pm:457
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "%s: nu am putut deschide --css-file: %s"
  
! #: tp/Texinfo/Common.pm:881
  msgid "recursion is always allowed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:882
  msgid "arguments are quoted by default"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1105
  #, fuzzy, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s nu este un cod de limbã valid conform ISO 639"
  
! #: tp/Texinfo/Common.pm:1110
  #, fuzzy, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s nu este un cod de limbã valid conform ISO 639"
  
! #: tp/Texinfo/Common.pm:1128
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1151
  #, fuzzy, perl-format
  msgid "could not read %s: %s"
  msgstr "%s: nu am putut deschide --css-file: %s"
  
! #: tp/Texinfo/Common.pm:1170
  #, fuzzy, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "eroare la închiderea fiºierului de ieºire `%s'"
  
! #: tp/Texinfo/Common.pm:1176 tp/Texinfo/Parser.pm:3353
  #, fuzzy, perl-format
  msgid "@%s: could not find %s"
  msgstr "%s: nu am putut deschide --css-file: %s"
  
! #: tp/Texinfo/Common.pm:1520
! #, fuzzy, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr "%s: nu am putut deschide --css-file: %s"
! 
! #: tp/Texinfo/Common.pm:1548
! #, fuzzy
! msgid "missing type"
! msgstr "nume de acþiune inexistent"
! 
! #: tp/Texinfo/Common.pm:1551
! #, fuzzy, perl-format
! msgid "unrecognized type: %s"
! msgstr "%s: opþiune nerecunoscutã `--%s'\n"
! 
! #: tp/Texinfo/Common.pm:1568
! #, fuzzy, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr "eroare la închiderea fiºierului de ieºire `%s'"
! 
! #: tp/Texinfo/Common.pm:1603
  msgid "no node to be renamed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1614
  msgid "nodes without a new name at the end of file"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1624 tp/Texinfo/Parser.pm:926
  #, fuzzy, perl-format
  msgid "could not open %s: %s"
  msgstr "%s: nu am putut deschide --css-file: %s"
  
! #: tp/Texinfo/Common.pm:2144
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:395 tp/Texinfo/Convert/Converter.pm:414
  #, fuzzy, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Seteazã variabilã: "
  
! #: tp/Texinfo/Convert/Converter.pm:794
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:876 tp/Texinfo/Convert/Converter.pm:909
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:6931
! #: tp/Texinfo/Convert/HTML.pm:6989 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:476 tp/Texinfo/Parser.pm:2035
  #, fuzzy, perl-format
  msgid "error on closing %s: %s"
  msgstr "eroare la închiderea fiºierului de ieºire `%s'"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, fuzzy, perl-format
  msgid "could not create directories `%s' or `%s': %s"
  msgstr "Nu pot crea directorul `%s': %s"
  
! #: tp/Texinfo/Convert/Converter.pm:995
  #, fuzzy, perl-format
  msgid "could not create directory `%s': %s"
--- 1985,2093 ----
  msgstr "nici o intrare gãsitã pentru `%s'; n-am ºters nimic"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:847
! #: tp/Texinfo/Convert/Converter.pm:885 tp/Texinfo/Convert/Converter.pm:1196
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6573
! #: tp/Texinfo/Convert/HTML.pm:6597 tp/Texinfo/Convert/HTML.pm:6978
! #: tp/Texinfo/Convert/HTML.pm:7037 tp/Texinfo/Convert/HTML.pm:7115
! #: tp/Texinfo/Convert/HTML.pm:7192 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:547
! #: tp/Texinfo/Convert/TexinfoXML.pm:458
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "%s: nu am putut deschide --css-file: %s"
  
! #: tp/Texinfo/Common.pm:862
  msgid "recursion is always allowed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:863
  msgid "arguments are quoted by default"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:866
! msgid ""
! "move your @contents command if you want the contents after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:869
! msgid ""
! "move your @shortcontents and @contents commands if you want the contents "
! "after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:1093
  #, fuzzy, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s nu este un cod de limbã valid conform ISO 639"
  
! #: tp/Texinfo/Common.pm:1098
  #, fuzzy, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s nu este un cod de limbã valid conform ISO 639"
  
! #: tp/Texinfo/Common.pm:1116
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1139
  #, fuzzy, perl-format
  msgid "could not read %s: %s"
  msgstr "%s: nu am putut deschide --css-file: %s"
  
! #: tp/Texinfo/Common.pm:1158
  #, fuzzy, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "eroare la închiderea fiºierului de ieºire `%s'"
  
! #: tp/Texinfo/Common.pm:1164 tp/Texinfo/Parser.pm:3193
  #, fuzzy, perl-format
  msgid "@%s: could not find %s"
  msgstr "%s: nu am putut deschide --css-file: %s"
  
! #: tp/Texinfo/Common.pm:1637
  msgid "no node to be renamed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1648
  msgid "nodes without a new name at the end of file"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1658 tp/Texinfo/Parser.pm:899
  #, fuzzy, perl-format
  msgid "could not open %s: %s"
  msgstr "%s: nu am putut deschide --css-file: %s"
  
! #: tp/Texinfo/Common.pm:2178
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:387 tp/Texinfo/Convert/Converter.pm:406
  #, fuzzy, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Seteazã variabilã: "
  
! #: tp/Texinfo/Convert/Converter.pm:786
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:868 tp/Texinfo/Convert/Converter.pm:901
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:7004
! #: tp/Texinfo/Convert/HTML.pm:7063 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:477 tp/Texinfo/Parser.pm:1996
  #, fuzzy, perl-format
  msgid "error on closing %s: %s"
  msgstr "eroare la închiderea fiºierului de ieºire `%s'"
  
! #: tp/Texinfo/Convert/Converter.pm:979
  #, fuzzy, perl-format
  msgid "could not create directories `%s' or `%s': %s"
  msgstr "Nu pot crea directorul `%s': %s"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, fuzzy, perl-format
  msgid "could not create directory `%s': %s"
***************
*** 2123,2223 ****
  msgstr "Fiºierul @image `%s' nu poate fi citit: %s"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5388
  #, fuzzy
  msgid "no argument specified for @U"
  msgstr "Nici un nume specificat pentru comanda `%c%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:1683
  #, fuzzy, perl-format
  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:2371
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4888
  msgid "string not closed in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4890
  #, fuzzy
  msgid "--css-include ended in comment"
  msgstr "%s:%d: --css-file s-a terminat cu un comentariu"
  
! #: tp/Texinfo/Convert/HTML.pm:4892
  msgid "@import not finished in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4918
  #, perl-format
  msgid "CSS file %s not found"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4924
  #, fuzzy, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "%s: nu am putut deschide --css-file: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:4934
  #, fuzzy, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "eroare la închiderea fiºierului de ieºire `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:5801 tp/Texinfo/Convert/HTML.pm:5805
  #, fuzzy, perl-format
  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:6499
  #, fuzzy, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "eroare la închiderea fiºierului de ieºire `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:6523
  #, fuzzy, perl-format
  msgid "error on closing TOC frame file %s: %s"
  msgstr "eroare la închiderea fiºierului de ieºire `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:6638
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6839
  msgid "must specify a title with a title command or @top"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7048
  #, fuzzy, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr "eroare la închiderea fiºierului de ieºire `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:7073
  #, 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:7079
  #, fuzzy, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "nod nereferit `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:7093
  #, perl-format
  msgid "target node (new name for `%s') not in document: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7125
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7163
  msgid "empty node name"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7165 tp/Texinfo/Parser.pm:3697
  #, perl-format
  msgid "syntax for an external node used for `%s'"
--- 2099,2219 ----
  msgstr "Fiºierul @image `%s' nu poate fi citit: %s"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5225
  #, fuzzy
  msgid "no argument specified for @U"
  msgstr "Nici un nume specificat pentru comanda `%c%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:1715
  #, fuzzy, perl-format
  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:2399
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4629
! #, fuzzy, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr "%s: nu am putut deschide --css-file: %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4657
! #, fuzzy
! msgid "missing type"
! msgstr "nume de acþiune inexistent"
! 
! #: tp/Texinfo/Convert/HTML.pm:4660
! #, fuzzy, perl-format
! msgid "unrecognized type: %s"
! msgstr "%s: opþiune nerecunoscutã `--%s'\n"
! 
! #: tp/Texinfo/Convert/HTML.pm:4677
! #, fuzzy, perl-format
! 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:4962
  msgid "string not closed in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4964
  #, fuzzy
  msgid "--css-include ended in comment"
  msgstr "%s:%d: --css-file s-a terminat cu un comentariu"
  
! #: tp/Texinfo/Convert/HTML.pm:4966
  msgid "@import not finished in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4992
  #, perl-format
  msgid "CSS file %s not found"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4998
  #, fuzzy, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "%s: nu am putut deschide --css-file: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5008
  #, fuzzy, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "eroare la închiderea fiºierului de ieºire `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:5870 tp/Texinfo/Convert/HTML.pm:5874
  #, fuzzy, perl-format
  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:6568
  #, fuzzy, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "eroare la închiderea fiºierului de ieºire `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:6592
  #, fuzzy, perl-format
  msgid "error on closing TOC frame file %s: %s"
  msgstr "eroare la închiderea fiºierului de ieºire `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:6707
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6912
  msgid "must specify a title with a title command or @top"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7122
  #, fuzzy, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr "eroare la închiderea fiºierului de ieºire `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:7147
  #, 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:7153
  #, fuzzy, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "nod nereferit `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:7167
  #, perl-format
  msgid "target node (new name for `%s') not in document: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7199
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7237
  msgid "empty node name"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7239 tp/Texinfo/Parser.pm:3542
  #, perl-format
  msgid "syntax for an external node used for `%s'"
***************
*** 2253,2282 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1334
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1381 tp/Texinfo/Parser.pm:2722
  #, fuzzy, perl-format
  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:1495
  #, fuzzy, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr "eroare la închiderea fiºierului de ieºire `%s'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1500
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "Fiºierul @image `%s' nu poate fi citit: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1523
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1931
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
--- 2249,2278 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1335
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1382 tp/Texinfo/Parser.pm:2568
  #, fuzzy, perl-format
  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:1496
  #, fuzzy, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr "eroare la închiderea fiºierului de ieºire `%s'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1501
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "Fiºierul @image `%s' nu poate fi citit: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1524
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1932
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
***************
*** 2286,2604 ****
  "pentru a o evita"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2161
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2193
  #, fuzzy, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "Nici o intrare în %sindex conþinând `%s'."
  
! #: tp/Texinfo/Convert/Plaintext.pm:2226
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2272
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2275
  msgid "`.' or `,' must follow @xref"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3118
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3129
  msgid "menu entry node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3145
  msgid "menu entry name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:910
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1160 tp/Texinfo/Structuring.pm:594
  #, perl-format
  msgid "multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1194
  #, perl-format
! msgid "bad syntax for @%s argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1210
  #, perl-format
! msgid "bad or empty @%s formal argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1219 tp/Texinfo/Parser.pm:4856
! #: tp/Texinfo/Parser.pm:4882 tp/Texinfo/Parser.pm:5671
! #: tp/Texinfo/Parser.pm:5687 tp/Texinfo/Parser.pm:5702
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s necesitã un nume"
  
! #: tp/Texinfo/Parser.pm:1223 tp/Texinfo/Parser.pm:4859
! #: tp/Texinfo/Parser.pm:4885 tp/Texinfo/Parser.pm:5674
! #: tp/Texinfo/Parser.pm:5690 tp/Texinfo/Parser.pm:5705
  #, fuzzy, perl-format
  msgid "bad name for @%s"
  msgstr "Argument nepotrivit pentru @%s"
  
! #: tp/Texinfo/Parser.pm:1341
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1345
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1350
! #, perl-format
! msgid "%c%s missing close brace"
  msgstr "%c%s lipseºte paranteza de închidere"
  
! #: tp/Texinfo/Parser.pm:1354
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1476
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1544
  msgid "@itemx must follow @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1712
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1743
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "`@end' a aºteptat `%s', dar a vãzut `%s'"
  
! #: tp/Texinfo/Parser.pm:1746
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1750
  #, fuzzy, perl-format
  msgid "no matching `%cend %s'"
  msgstr "Nici o potrivire %cend %s'"
  
! #: tp/Texinfo/Parser.pm:1776 tp/Texinfo/Parser.pm:5204
! #: tp/Texinfo/Parser.pm:5470
  #, fuzzy, perl-format
  msgid "misplaced %c"
  msgstr "%c nelalocul lui"
  
! #: tp/Texinfo/Parser.pm:1874 tp/Texinfo/Parser.pm:3312
  #, fuzzy, perl-format
  msgid "unmatched `%c%s'"
  msgstr "`%c%s' fãrã pereche"
  
! #: tp/Texinfo/Parser.pm:2110
  #, fuzzy, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "Macro `%s' chemat pe linia %d cu prea multe argumente"
  
! #: tp/Texinfo/Parser.pm:2132
  #, fuzzy, perl-format
! msgid "@%s missing close brace"
  msgstr "%c%s lipseºte paranteza de închidere"
  
! #: tp/Texinfo/Parser.pm:2140
  #, fuzzy, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr "Macro `%s' chemat pe linia %d cu prea multe argumente"
  
! #: tp/Texinfo/Parser.pm:2175
  #, fuzzy, perl-format
  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/Parser.pm:2650
  #, fuzzy, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "macro-ul `%s' definit anterior"
  
! #: tp/Texinfo/Parser.pm:2655
  #, fuzzy, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "aici este definiþia anterioarã a lui `%s'"
  
! #: tp/Texinfo/Parser.pm:3016
  #, fuzzy, perl-format
  msgid "missing name for @%s"
  msgstr "nume de acþiune inexistent"
  
! #: tp/Texinfo/Parser.pm:3021
  #, perl-format
  msgid "missing category for @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3073
  #, fuzzy, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "argumentele pentru @%s ignorate"
  
! #: tp/Texinfo/Parser.pm:3089
  #, fuzzy
  msgid "empty multitable"
  msgstr "%s: fiºier gol"
  
! #: tp/Texinfo/Parser.pm:3145 tp/Texinfo/Parser.pm:5784
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s"
  msgstr "Argument nepotrivit pentru @%s"
  
! #: tp/Texinfo/Parser.pm:3151 tp/Texinfo/Parser.pm:5806
! #: tp/Texinfo/Parser.pm:5818
  #, fuzzy, perl-format
  msgid "bad argument to @%s"
  msgstr "Argument nepotrivit pentru @%s"
  
! #: tp/Texinfo/Parser.pm:3162
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s necesitã un argument: formatatorul pentru %citem"
  
! #: tp/Texinfo/Parser.pm:3167
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3202
  #, fuzzy, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "%s: opþiunea `--%s' nu permite un argument\n"
  
! #: tp/Texinfo/Parser.pm:3290 tp/Texinfo/Parser.pm:3429
! #: tp/Texinfo/Parser.pm:5777
  #, fuzzy, perl-format
  msgid "@%s missing argument"
  msgstr "%s: lipseºte fiºierul argument.\n"
  
! #: tp/Texinfo/Parser.pm:3302
  #, fuzzy, perl-format
  msgid "unknown @end %s"
  msgstr "Index necunoscut `%s'"
  
! #: tp/Texinfo/Parser.pm:3324 tp/Texinfo/Parser.pm:3943
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "Argument nepotrivit pentru @%s"
  
! #: tp/Texinfo/Parser.pm:3329 tp/Texinfo/Parser.pm:5861
! #: tp/Texinfo/Parser.pm:5906 tp/Texinfo/Parser.pm:5935
! #: tp/Texinfo/Parser.pm:5976 tp/Texinfo/Parser.pm:6055
  #, fuzzy, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "Argument nepotrivit pentru @%s"
  
! #: tp/Texinfo/Parser.pm:3348
  #, fuzzy, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "%s: nu am putut deschide --css-file: %s"
  
! #: tp/Texinfo/Parser.pm:3360
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3369
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "nume de codare nerecunoscut `%s'"
  
! #: tp/Texinfo/Parser.pm:3516
  #, perl-format
  msgid "@%s after the first element"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3523
  #, fuzzy, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s nu are sens în exteriorul mediului `@titlepage'"
  
! #: tp/Texinfo/Parser.pm:3563
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3575
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3677
  #, fuzzy, perl-format
  msgid "empty argument in @%s"
  msgstr "Argument nepotrivit pentru @%s"
  
! #: tp/Texinfo/Parser.pm:3681
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3724
  #, fuzzy, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "Nici un meniu în nod `%s'."
  
! #: tp/Texinfo/Parser.pm:3732
  msgid "empty node name in menu entry"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3805
  #, fuzzy, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "%s: nu am putut deschide --css-file: %s"
  
! #: tp/Texinfo/Parser.pm:3937
! #, perl-format
! msgid "@end %s should only appear at a line beginning"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:3960
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "macro-ul `%s' definit anterior"
  
! #: tp/Texinfo/Parser.pm:3963
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "aici este definiþia anterioarã a lui `%s'"
  
! #: tp/Texinfo/Parser.pm:3968
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4017
  #, perl-format
  msgid "@%s without associated character"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4087
  #, perl-format
  msgid ""
--- 2282,2601 ----
  "pentru a o evita"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2162
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2194
  #, fuzzy, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "Nici o intrare în %sindex conþinând `%s'."
  
! #: tp/Texinfo/Convert/Plaintext.pm:2227
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2273
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2276
  msgid "`.' or `,' must follow @xref"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3086
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3097
  msgid "menu entry node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3113
  msgid "menu entry name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:883
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1125 tp/Texinfo/Structuring.pm:595
  #, perl-format
  msgid "multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1166
  #, perl-format
! msgid "bad or empty @%s formal argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1176
  #, perl-format
! msgid "bad syntax for @%s argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1183 tp/Texinfo/Parser.pm:4707
! #: tp/Texinfo/Parser.pm:4733 tp/Texinfo/Parser.pm:5565
! #: tp/Texinfo/Parser.pm:5578 tp/Texinfo/Parser.pm:5592
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s necesitã un nume"
  
! #: tp/Texinfo/Parser.pm:1187 tp/Texinfo/Parser.pm:4710
! #: tp/Texinfo/Parser.pm:4736 tp/Texinfo/Parser.pm:5568
! #: tp/Texinfo/Parser.pm:5581 tp/Texinfo/Parser.pm:5595
  #, fuzzy, perl-format
  msgid "bad name for @%s"
  msgstr "Argument nepotrivit pentru @%s"
  
! #: tp/Texinfo/Parser.pm:1305
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1309
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1314
! #, fuzzy, perl-format
! msgid "%c%s missing closing brace"
  msgstr "%c%s lipseºte paranteza de închidere"
  
! #: tp/Texinfo/Parser.pm:1318
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1440
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1508
  msgid "@itemx must follow @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1676
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1707
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "`@end' a aºteptat `%s', dar a vãzut `%s'"
  
! #: tp/Texinfo/Parser.pm:1710
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1714
  #, fuzzy, perl-format
  msgid "no matching `%cend %s'"
  msgstr "Nici o potrivire %cend %s'"
  
! #: tp/Texinfo/Parser.pm:1738 tp/Texinfo/Parser.pm:5070
! #: tp/Texinfo/Parser.pm:5308
  #, fuzzy, perl-format
  msgid "misplaced %c"
  msgstr "%c nelalocul lui"
  
! #: tp/Texinfo/Parser.pm:1835 tp/Texinfo/Parser.pm:3148
  #, fuzzy, perl-format
  msgid "unmatched `%c%s'"
  msgstr "`%c%s' fãrã pereche"
  
! #: tp/Texinfo/Parser.pm:2072
  #, fuzzy, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "Macro `%s' chemat pe linia %d cu prea multe argumente"
  
! #: tp/Texinfo/Parser.pm:2094
  #, fuzzy, perl-format
! msgid "@%s missing closing brace"
  msgstr "%c%s lipseºte paranteza de închidere"
  
! #: tp/Texinfo/Parser.pm:2102
  #, fuzzy, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr "Macro `%s' chemat pe linia %d cu prea multe argumente"
  
! #: tp/Texinfo/Parser.pm:2138
  #, fuzzy, perl-format
  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/Parser.pm:2501
  #, fuzzy, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "macro-ul `%s' definit anterior"
  
! #: tp/Texinfo/Parser.pm:2506
  #, fuzzy, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "aici este definiþia anterioarã a lui `%s'"
  
! #: tp/Texinfo/Parser.pm:2850
  #, fuzzy, perl-format
  msgid "missing name for @%s"
  msgstr "nume de acþiune inexistent"
  
! #: tp/Texinfo/Parser.pm:2855
  #, perl-format
  msgid "missing category for @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2890
  #, fuzzy, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "argumentele pentru @%s ignorate"
  
! #: tp/Texinfo/Parser.pm:2905
  #, fuzzy
  msgid "empty multitable"
  msgstr "%s: fiºier gol"
  
! #: tp/Texinfo/Parser.pm:2959 tp/Texinfo/Parser.pm:5673
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s"
  msgstr "Argument nepotrivit pentru @%s"
  
! #: tp/Texinfo/Parser.pm:2965 tp/Texinfo/Parser.pm:5694
! #: tp/Texinfo/Parser.pm:5705
  #, fuzzy, perl-format
  msgid "bad argument to @%s"
  msgstr "Argument nepotrivit pentru @%s"
  
! #: tp/Texinfo/Parser.pm:2976
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s necesitã un argument: formatatorul pentru %citem"
  
! #: tp/Texinfo/Parser.pm:2981
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3016
  #, fuzzy, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "%s: opþiunea `--%s' nu permite un argument\n"
  
! #: tp/Texinfo/Parser.pm:3124 tp/Texinfo/Parser.pm:3277
! #: tp/Texinfo/Parser.pm:5666
  #, fuzzy, perl-format
  msgid "@%s missing argument"
  msgstr "%s: lipseºte fiºierul argument.\n"
  
! #: tp/Texinfo/Parser.pm:3138
  #, fuzzy, perl-format
  msgid "unknown @end %s"
  msgstr "Index necunoscut `%s'"
  
! #: tp/Texinfo/Parser.pm:3161 tp/Texinfo/Parser.pm:3788
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "Argument nepotrivit pentru @%s"
  
! #: tp/Texinfo/Parser.pm:3167 tp/Texinfo/Parser.pm:3245
! #: tp/Texinfo/Parser.pm:5755 tp/Texinfo/Parser.pm:5798
! #: tp/Texinfo/Parser.pm:5827 tp/Texinfo/Parser.pm:5868
! #: tp/Texinfo/Parser.pm:5946
  #, fuzzy, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "Argument nepotrivit pentru @%s"
  
! #: tp/Texinfo/Parser.pm:3188
  #, fuzzy, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "%s: nu am putut deschide --css-file: %s"
  
! #: tp/Texinfo/Parser.pm:3200
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3208
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "nume de codare nerecunoscut `%s'"
  
! #: tp/Texinfo/Parser.pm:3364
  #, perl-format
  msgid "@%s after the first element"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3371
  #, fuzzy, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s nu are sens în exteriorul mediului `@titlepage'"
  
! #: tp/Texinfo/Parser.pm:3408
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3420
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3522
  #, fuzzy, perl-format
  msgid "empty argument in @%s"
  msgstr "Argument nepotrivit pentru @%s"
  
! #: tp/Texinfo/Parser.pm:3526
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3569
  #, fuzzy, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "Nici un meniu în nod `%s'."
  
! #: tp/Texinfo/Parser.pm:3577
  msgid "empty node name in menu entry"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3650
  #, fuzzy, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "%s: nu am putut deschide --css-file: %s"
  
! #: tp/Texinfo/Parser.pm:3782
! #, fuzzy, perl-format
! msgid "@end %s should only appear at the beginning of a line"
! msgstr "ªterge (kill) pânã la începutul liniei"
  
! #: tp/Texinfo/Parser.pm:3804
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "macro-ul `%s' definit anterior"
  
! #: tp/Texinfo/Parser.pm:3807
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "aici este definiþia anterioarã a lui `%s'"
  
! #: tp/Texinfo/Parser.pm:3812
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3879
  #, perl-format
  msgid "@%s without associated character"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3949
  #, perl-format
  msgid ""
***************
*** 2606,2610 ****
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4111
  #, perl-format
  msgid ""
--- 2603,2607 ----
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3974
  #, perl-format
  msgid ""
***************
*** 2613,2738 ****
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4120
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4176
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4182
  #, fuzzy, perl-format
  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/Parser.pm:4195 tp/Texinfo/Parser.pm:5325
  #, fuzzy, perl-format
  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/Parser.pm:4207
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4218
  #, fuzzy, perl-format
  msgid "@%s expected braces"
  msgstr "%c%s am aºteptat paranteze"
  
! #: tp/Texinfo/Parser.pm:4383
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "marcaj nedefinit: %s"
  
! #: tp/Texinfo/Parser.pm:4386
  msgid "bad syntax for @value"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4393
  #, fuzzy, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s este depãsit"
  
! #: tp/Texinfo/Parser.pm:4396
  #, fuzzy, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s este depãsit"
  
! #: tp/Texinfo/Parser.pm:4405
! #, perl-format
! msgid "@%s should only appear at a line beginning"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:4496
  #, fuzzy, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s nu are sens în interiorul blocului `@%s'"
  
! #: tp/Texinfo/Parser.pm:4505
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4631 tp/Texinfo/Parser.pm:4648
! #: tp/Texinfo/Parser.pm:4698
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s nu are sens în interiorul blocului `@%s'"
  
! #: tp/Texinfo/Parser.pm:4658
  #, fuzzy, perl-format
  msgid "@%s in empty multitable"
  msgstr "%s: fiºier gol"
  
! #: tp/Texinfo/Parser.pm:4664
  msgid "@tab before @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4667
  #, fuzzy, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "Prea multe coloane în articol multitabel (max %d)"
  
! #: tp/Texinfo/Parser.pm:4704
  msgid "ignoring @tab outside of multitable"
  msgstr "ignor @tab în afara multitabelului"
  
! #: tp/Texinfo/Parser.pm:4708
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4745
  #, fuzzy, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "Trebuie sã fiþi în mediul `@%s' pentru a folosi `@%s'"
  
! #: tp/Texinfo/Parser.pm:4787
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "@%s nu are sens în exteriorul mediilor `@titlepage' ºi `@quotation'"
  
! #: tp/Texinfo/Parser.pm:4791
  msgid "@dircategory after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4979
  #, fuzzy, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "Nu sun permise note de subsol în note de subsol"
  
! #: tp/Texinfo/Parser.pm:4997
  msgid "@direntry after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5005
  #, fuzzy, perl-format
  msgid "@%s seen before first @node"
  msgstr "@menu vãzut înainte de primul @node, creez nodul `Vârf'"
  
! #: tp/Texinfo/Parser.pm:5008
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
--- 2610,2735 ----
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3983
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4038
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4044
  #, fuzzy, perl-format
  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/Parser.pm:4057 tp/Texinfo/Parser.pm:5189
  #, fuzzy, perl-format
  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/Parser.pm:4068
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4079
  #, fuzzy, perl-format
  msgid "@%s expected braces"
  msgstr "%c%s am aºteptat paranteze"
  
! #: tp/Texinfo/Parser.pm:4233
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "marcaj nedefinit: %s"
  
! #: tp/Texinfo/Parser.pm:4236
  msgid "bad syntax for @value"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4243
  #, fuzzy, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s este depãsit"
  
! #: tp/Texinfo/Parser.pm:4246
  #, fuzzy, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s este depãsit"
  
! #: tp/Texinfo/Parser.pm:4255
! #, fuzzy, perl-format
! msgid "@%s should only appear at the beginning of a line"
! msgstr "ªterge (kill) pânã la începutul liniei"
  
! #: tp/Texinfo/Parser.pm:4346
  #, fuzzy, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s nu are sens în interiorul blocului `@%s'"
  
! #: tp/Texinfo/Parser.pm:4355
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4479 tp/Texinfo/Parser.pm:4496
! #: tp/Texinfo/Parser.pm:4546
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s nu are sens în interiorul blocului `@%s'"
  
! #: tp/Texinfo/Parser.pm:4506
  #, fuzzy, perl-format
  msgid "@%s in empty multitable"
  msgstr "%s: fiºier gol"
  
! #: tp/Texinfo/Parser.pm:4512
  msgid "@tab before @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4515
  #, fuzzy, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "Prea multe coloane în articol multitabel (max %d)"
  
! #: tp/Texinfo/Parser.pm:4552
  msgid "ignoring @tab outside of multitable"
  msgstr "ignor @tab în afara multitabelului"
  
! #: tp/Texinfo/Parser.pm:4556
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4596
  #, fuzzy, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "Trebuie sã fiþi în mediul `@%s' pentru a folosi `@%s'"
  
! #: tp/Texinfo/Parser.pm:4638
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "@%s nu are sens în exteriorul mediilor `@titlepage' ºi `@quotation'"
  
! #: tp/Texinfo/Parser.pm:4642
  msgid "@dircategory after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4847
  #, fuzzy, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "Nu sun permise note de subsol în note de subsol"
  
! #: tp/Texinfo/Parser.pm:4864
  msgid "@direntry after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4872
  #, fuzzy, perl-format
  msgid "@%s seen before first @node"
  msgstr "@menu vãzut înainte de primul @node, creez nodul `Vârf'"
  
! #: tp/Texinfo/Parser.pm:4875
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
***************
*** 2741,2908 ****
  "@ifinfo?"
  
! #: tp/Texinfo/Parser.pm:5070
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5078
  #, fuzzy, perl-format
  msgid "unknown command `%s'"
  msgstr "Comandã necunoscutã `%s'"
  
! #: tp/Texinfo/Parser.pm:5088
  #, fuzzy
  msgid "unexpected @"
  msgstr "Am aºteptat `%s'"
  
! #: tp/Texinfo/Parser.pm:5117
  #, fuzzy, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s nu are sens în exteriorul mediului `@float'"
  
! #: tp/Texinfo/Parser.pm:5122
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5130
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5249
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5273
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5292
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5303
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5316
  msgid "@image missing filename argument"
  msgstr "@image lipseºte fiºierul argument."
  
! #: tp/Texinfo/Parser.pm:5348
  #, fuzzy, perl-format
  msgid "@%s missing first argument"
  msgstr "%s: lipseºte fiºierul argument.\n"
  
! #: tp/Texinfo/Parser.pm:5393
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5399
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5412
! #, perl-format
! msgid "argument for @U exceeds size of integer: %s"
! msgstr ""
! 
! #: tp/Texinfo/Parser.pm:5418
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5546
  msgid "superfluous arguments for node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5596
  #, fuzzy, perl-format
  msgid "expected @end %s"
  msgstr "Am aºteptat `%s'"
  
! #: tp/Texinfo/Parser.pm:5718
  #, fuzzy, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "Folosiþi paranteze pentru a da o comandã ca argument lui @%s"
  
! #: tp/Texinfo/Parser.pm:5728
  #, fuzzy, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "argumentele pentru @%s ignorate"
  
! #: tp/Texinfo/Parser.pm:5801
  #, fuzzy, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "Folosiþi paranteze pentru a da o comandã ca argument lui @%s"
  
! #: tp/Texinfo/Parser.pm:5823
  #, perl-format
  msgid "empty @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5831
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5840
  #, fuzzy, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "%s: %s arg trebuie sã fie numeric, nu `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5849
  #, perl-format
  msgid "reserved index name %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5868
  #, fuzzy, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "Index necunoscut `%s'"
  
! #: tp/Texinfo/Parser.pm:5871
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5914
  #, fuzzy, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "Index necunoscut `%s' în @printindex"
  
! #: tp/Texinfo/Parser.pm:5920
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5928
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5944
  #, fuzzy, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
  msgstr "%s: %s arg trebuie sã fie numeric, nu `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5952
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5960
  #, fuzzy, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
--- 2738,2900 ----
  "@ifinfo?"
  
! #: tp/Texinfo/Parser.pm:4937
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4945
  #, fuzzy, perl-format
  msgid "unknown command `%s'"
  msgstr "Comandã necunoscutã `%s'"
  
! #: tp/Texinfo/Parser.pm:4955
  #, fuzzy
  msgid "unexpected @"
  msgstr "Am aºteptat `%s'"
  
! #: tp/Texinfo/Parser.pm:4983
  #, fuzzy, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s nu are sens în exteriorul mediului `@float'"
  
! #: tp/Texinfo/Parser.pm:4988
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4996
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5114
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5138
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5156
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5167
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5180
  msgid "@image missing filename argument"
  msgstr "@image lipseºte fiºierul argument."
  
! #: tp/Texinfo/Parser.pm:5211
  #, fuzzy, perl-format
  msgid "@%s missing first argument"
  msgstr "%s: lipseºte fiºierul argument.\n"
  
! #: tp/Texinfo/Parser.pm:5230
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5236
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5253
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5448
  msgid "superfluous arguments for node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5498
  #, fuzzy, perl-format
  msgid "expected @end %s"
  msgstr "Am aºteptat `%s'"
  
! #: tp/Texinfo/Parser.pm:5607
  #, fuzzy, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "Folosiþi paranteze pentru a da o comandã ca argument lui @%s"
  
! #: tp/Texinfo/Parser.pm:5617
  #, fuzzy, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "argumentele pentru @%s ignorate"
  
! #: tp/Texinfo/Parser.pm:5689
  #, fuzzy, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "Folosiþi paranteze pentru a da o comandã ca argument lui @%s"
  
! #: tp/Texinfo/Parser.pm:5710
  #, perl-format
  msgid "empty @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5727
  #, fuzzy, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "%s: %s arg trebuie sã fie numeric, nu `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5736
  #, perl-format
  msgid "reserved index name %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5762
  #, fuzzy, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "Index necunoscut `%s'"
  
! #: tp/Texinfo/Parser.pm:5765
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5793
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5806
  #, fuzzy, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "Index necunoscut `%s' în @printindex"
  
! #: tp/Texinfo/Parser.pm:5812
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5820
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5836
  #, fuzzy, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
  msgstr "%s: %s arg trebuie sã fie numeric, nu `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5844
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5852
  #, fuzzy, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
***************
*** 2910,2919 ****
  "%s: --footnote-style arg trebuie sã fie `separate' sau `end', nu `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5968
  #, fuzzy, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
  msgstr "%s: %s arg trebuie sã fie numeric, nu `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5986 tp/Texinfo/Parser.pm:5991
  #, fuzzy, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
--- 2902,2911 ----
  "%s: --footnote-style arg trebuie sã fie `separate' sau `end', nu `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5860
  #, fuzzy, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
  msgstr "%s: %s arg trebuie sã fie numeric, nu `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5878 tp/Texinfo/Parser.pm:5883
  #, fuzzy, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
***************
*** 2921,2925 ****
  "%s: --paragraph-indent arg trebuie sã fie numeric/`none'/`asis', nu `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5999
  #, fuzzy, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
--- 2913,2917 ----
  "%s: --paragraph-indent arg trebuie sã fie numeric/`none'/`asis', nu `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5891
  #, fuzzy, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
***************
*** 2927,2931 ****
  "%s: --paragraph-indent arg trebuie sã fie numeric/`none'/`asis', nu `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:6009
  #, fuzzy, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
--- 2919,2923 ----
  "%s: --paragraph-indent arg trebuie sã fie numeric/`none'/`asis', nu `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5901
  #, fuzzy, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
***************
*** 2933,2947 ****
  "%s: --paragraph-indent arg trebuie sã fie numeric/`none'/`asis', nu `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:6021
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:6031
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:6039
  #, fuzzy, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
--- 2925,2939 ----
  "%s: --paragraph-indent arg trebuie sã fie numeric/`none'/`asis', nu `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5913
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5922
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5930
  #, fuzzy, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
***************
*** 2949,2953 ****
  "%s: --footnote-style arg trebuie sã fie `separate' sau `end', nu `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:6047
  #, fuzzy, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
--- 2941,2945 ----
  "%s: --footnote-style arg trebuie sã fie `separate' sau `end', nu `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5938
  #, fuzzy, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
***************
*** 2955,2984 ****
  "%s: --footnote-style arg trebuie sã fie `separate' sau `end', nu `%s'.\n"
  
! #: tp/Texinfo/Structuring.pm:213
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:245
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:250
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:339
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:488
  #, perl-format
  msgid "@%s not empty"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:544 tp/Texinfo/Structuring.pm:1326
  #, fuzzy, perl-format
  msgid "@%s reference to nonexistent node `%s'"
--- 2947,2976 ----
  "%s: --footnote-style arg trebuie sã fie `separate' sau `end', nu `%s'.\n"
  
! #: tp/Texinfo/Structuring.pm:216
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:248
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:253
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:342
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:491
  #, perl-format
  msgid "@%s not empty"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:547 tp/Texinfo/Structuring.pm:1325
  #, fuzzy, perl-format
  msgid "@%s reference to nonexistent node `%s'"
***************
*** 2986,3030 ****
  "referinþa %s cãtre nodul inexistent `%s' (probabil secþionare incorectã?)"
  
! #: tp/Texinfo/Structuring.pm:557
  #, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:662
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "nod nereferit `%s'"
  
! #: tp/Texinfo/Structuring.pm:708
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:715
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:733
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:787
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:814
  #, fuzzy, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "nod nereferit `%s'"
  
! #: tp/Texinfo/Structuring.pm:834
  #, fuzzy, perl-format
  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:842
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
--- 2978,3022 ----
  "referinþa %s cãtre nodul inexistent `%s' (probabil secþionare incorectã?)"
  
! #: tp/Texinfo/Structuring.pm:558
  #, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:663
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "nod nereferit `%s'"
  
! #: tp/Texinfo/Structuring.pm:706
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:713
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:731
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:786
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:810
  #, fuzzy, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "nod nereferit `%s'"
  
! #: tp/Texinfo/Structuring.pm:829
  #, fuzzy, perl-format
  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:837
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
***************
*** 3036,3040 ****
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:2070
  #, perl-format
  msgid "empty index key in @%s"
--- 3028,3032 ----
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:2067
  #, perl-format
  msgid "empty index key in @%s"
***************
*** 3521,3539 ****
  msgstr "Încercaþi `%s --help' pentru informaþii suplimentare.\n"
  
! #: tp/texi2any.pl:1232
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
  
! #: tp/texi2any.pl:1255
  #, fuzzy, perl-format
  msgid "error on closing macro expand file %s: %s\n"
  msgstr "eroare la închiderea fiºierului de ieºire `%s'"
  
! #: tp/texi2any.pl:1261
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "%s: nu am putut deschide --css-file: %s"
  
! #: tp/texi2any.pl:1286
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
--- 3513,3531 ----
  msgstr "Încercaþi `%s --help' pentru informaþii suplimentare.\n"
  
! #: tp/texi2any.pl:1239
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
  
! #: tp/texi2any.pl:1262
  #, fuzzy, perl-format
  msgid "error on closing macro expand file %s: %s\n"
  msgstr "eroare la închiderea fiºierului de ieºire `%s'"
  
! #: tp/texi2any.pl:1268
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "%s: nu am putut deschide --css-file: %s"
  
! #: tp/texi2any.pl:1293
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
***************
*** 3541,3555 ****
  msgstr ""
  
! #: tp/texi2any.pl:1359 tp/texi2any.pl:1435
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1382 tp/texi2any.pl:1416
  #, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1388 tp/texi2any.pl:1422
  #, fuzzy, perl-format
  msgid "%s: could not open %s for writing: %s\n"
--- 3533,3547 ----
  msgstr ""
  
! #: tp/texi2any.pl:1366 tp/texi2any.pl:1442
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1389 tp/texi2any.pl:1423
  #, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1395 tp/texi2any.pl:1429
  #, fuzzy, perl-format
  msgid "%s: could not open %s for writing: %s\n"
***************
*** 3997,4000 ****
--- 3989,3998 ----
  #~ msgstr "--*** Tag-uri Vechi ***"
  
+ #~ msgid "-%s---Info: %s, %d lines --%s--"
+ #~ msgstr "-%s---Info: %s, %d linii --%s--"
+ 
+ #~ msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
+ #~ msgstr "-%s%s-Info: (%s)%s, %d linii --%s--"
+ 
  #~ msgid " Subfile: %s"
  #~ msgstr " Subfiºier: %s"
Binary files texinfo-6.1/po/ru.gmo and texinfo-6.3/po/ru.gmo differ
diff -Nrc2 texinfo-6.1/po/ru.po texinfo-6.3/po/ru.po
*** texinfo-6.1/po/ru.po	2016-02-06 11:35:54.000000000 +0000
--- texinfo-6.3/po/ru.po	2016-09-10 12:45:55.000000000 +0100
***************
*** 5,15 ****
  #
  # Oleg S. Tihonov <ost@tatnipi.ru>, 1999, 2001, 2002, 2003, 2004, 2005.
! # Yuri Kozlov <yuray@komyakino.ru>, 2013, 2015.
  msgid ""
  msgstr ""
! "Project-Id-Version: texinfo 6.0.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
! "PO-Revision-Date: 2015-12-23 19:00+0300\n"
  "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
  "Language-Team: Russian <gnu@d07.ru>\n"
--- 5,15 ----
  #
  # Oleg S. Tihonov <ost@tatnipi.ru>, 1999, 2001, 2002, 2003, 2004, 2005.
! # Yuri Kozlov <yuray@komyakino.ru>, 2013, 2015, 2016.
  msgid ""
  msgstr ""
! "Project-Id-Version: texinfo 6.1.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:45+0100\n"
! "PO-Revision-Date: 2016-08-18 18:56+0300\n"
  "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
  "Language-Team: Russian <gnu@d07.ru>\n"
***************
*** 18,21 ****
--- 18,22 ----
  "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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
  "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
***************
*** 116,120 ****
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [ or [^"
  msgstr "Ð�ÐµÐ¿Ð°Ñ€Ð½Ð°Ñ� [ Ð¸Ð»Ð¸ [^"
  
--- 117,122 ----
  
  #: gnulib/lib/regcomp.c:156
! #, fuzzy
! msgid "Unmatched [, [^, [:, [., or [="
  msgstr "Ð�ÐµÐ¿Ð°Ñ€Ð½Ð°Ñ� [ Ð¸Ð»Ð¸ [^"
  
***************
*** 155,159 ****
  msgstr "Ð�ÐµÐ¿Ð°Ñ€Ð½Ð°Ñ� ) Ð¸Ð»Ð¸ \\)"
  
! #: gnulib/lib/regcomp.c:711
  msgid "No previous regular expression"
  msgstr "Ð�ÐµÑ‚ Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰ÐµÐ³Ð¾ Ñ€ÐµÐ³ÑƒÐ»Ñ�Ñ€Ð½Ð¾Ð³Ð¾ Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ�"
--- 157,161 ----
  msgstr "Ð�ÐµÐ¿Ð°Ñ€Ð½Ð°Ñ� ) Ð¸Ð»Ð¸ \\)"
  
! #: gnulib/lib/regcomp.c:687
  msgid "No previous regular expression"
  msgstr "Ð�ÐµÑ‚ Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰ÐµÐ³Ð¾ Ñ€ÐµÐ³ÑƒÐ»Ñ�Ñ€Ð½Ð¾Ð³Ð¾ Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ�"
***************
*** 308,312 ****
  msgstr "----------   Ð¡Ð½Ð¾Ñ�ÐºÐ¸  ----------"
  
! #: info/indices.c:123 info/indices.c:812
  #, c-format
  msgid "Finding index entries..."
--- 310,314 ----
  msgstr "----------   Ð¡Ð½Ð¾Ñ�ÐºÐ¸  ----------"
  
! #: info/indices.c:123 info/indices.c:822
  #, c-format
  msgid "Finding index entries..."
***************
*** 317,321 ****
  msgstr "Ð�Ð°Ð¹Ñ‚Ð¸ Ñ�Ñ‚Ñ€Ð¾ÐºÑƒ Ð² Ð°Ð»Ñ„Ð°Ð²Ð¸Ñ‚Ð½Ð¾Ð¼ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ðµ Ð´Ð»Ñ� Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ Ñ„Ð°Ð¹Ð»Ð°"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:818
  #, c-format
  msgid "No indices found."
--- 319,323 ----
  msgstr "Ð�Ð°Ð¹Ñ‚Ð¸ Ñ�Ñ‚Ñ€Ð¾ÐºÑƒ Ð² Ð°Ð»Ñ„Ð°Ð²Ð¸Ñ‚Ð½Ð¾Ð¼ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ðµ Ð´Ð»Ñ� Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ Ñ„Ð°Ð¹Ð»Ð°"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:828
  #, c-format
  msgid "No indices found."
***************
*** 349,363 ****
  msgstr "Ð’ Ð°Ð»Ñ„Ð°Ð²Ð¸Ñ‚Ð½Ð¾Ð¼ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ðµ Ð±Ð¾Ð»ÑŒÑˆÐµ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ð¿ÑƒÐ½ÐºÑ‚Ð¾Ð², Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð°Ñ‰Ð¸Ñ… Â«%sÂ»."
  
! #: info/indices.c:476 info/indices.c:880
  #, c-format
  msgid "No index entries containing '%s'."
  msgstr "Ð’ Ð°Ð»Ñ„Ð°Ð²Ð¸Ñ‚Ð½Ð¾Ð¼ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ðµ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ñ‹ Ð¿ÑƒÐ½ÐºÑ‚Ñ‹, Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð°Ñ‰Ð¸Ðµ Â«%sÂ»."
  
! #: info/indices.c:583
  #, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "ÐŸÐ¾Ð¸Ñ�Ðº Ð² Ð°Ð»Ñ„Ð°Ð²Ð¸Ñ‚Ð½Ð¾Ð¼ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ðµ Ñ„Ð°Ð¹Ð»Ð° Â«%sÂ»â€¦"
  
! #: info/indices.c:636
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
--- 351,365 ----
  msgstr "Ð’ Ð°Ð»Ñ„Ð°Ð²Ð¸Ñ‚Ð½Ð¾Ð¼ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ðµ Ð±Ð¾Ð»ÑŒÑˆÐµ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ð¿ÑƒÐ½ÐºÑ‚Ð¾Ð², Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð°Ñ‰Ð¸Ñ… Â«%sÂ»."
  
! #: info/indices.c:476 info/indices.c:890
  #, c-format
  msgid "No index entries containing '%s'."
  msgstr "Ð’ Ð°Ð»Ñ„Ð°Ð²Ð¸Ñ‚Ð½Ð¾Ð¼ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ðµ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ñ‹ Ð¿ÑƒÐ½ÐºÑ‚Ñ‹, Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð°Ñ‰Ð¸Ðµ Â«%sÂ»."
  
! #: info/indices.c:586
  #, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "ÐŸÐ¾Ð¸Ñ�Ðº Ð² Ð°Ð»Ñ„Ð°Ð²Ð¸Ñ‚Ð½Ð¾Ð¼ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ðµ Ñ„Ð°Ð¹Ð»Ð° Â«%sÂ»â€¦"
  
! #: info/indices.c:646
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
***************
*** 365,382 ****
  "Ð¼ÐµÐ½ÑŽ"
  
! #: info/indices.c:644 info/indices.c:646
  msgid "Index apropos"
  msgstr "ÐšÐ»ÑŽÑ‡ÐµÐ²Ð¾Ðµ Ñ�Ð»Ð¾Ð²Ð¾ Ð´Ð»Ñ� Ð¿Ð¾Ð¸Ñ�ÐºÐ°"
  
! #: info/indices.c:688
  #, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Ð’ Ð°Ð»Ñ„Ð°Ð²Ð¸Ñ‚Ð½Ð¾Ð¼ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ñ‹ Ð¿ÑƒÐ½ÐºÑ‚Ñ‹, Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð°Ñ‰Ð¸Ðµ Â«%sÂ»:\n"
  
! #: info/indices.c:797
  msgid "List all matches of a string in the index"
  msgstr "Ð¡Ð¿Ð¸Ñ�Ð¾Ðº Ð²Ñ�ÐµÑ… Ñ�Ð¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ð¹ Ñ�Ñ‚Ñ€Ð¾ÐºÐ¸ Ð² ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ðµ"
  
! #: info/indices.c:824 info/indices.c:826
  msgid "Index topic"
  msgstr "Ð£ÐºÐ°Ð·Ð°Ñ‚ÐµÐ»ÑŒ Ñ‚ÐµÐ¼"
--- 367,384 ----
  "Ð¼ÐµÐ½ÑŽ"
  
! #: 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 "Ð’ Ð°Ð»Ñ„Ð°Ð²Ð¸Ñ‚Ð½Ð¾Ð¼ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ñ‹ Ð¿ÑƒÐ½ÐºÑ‚Ñ‹, Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð°Ñ‰Ð¸Ðµ Â«%sÂ»:\n"
  
! #: info/indices.c:807
  msgid "List all matches of a string in the index"
  msgstr "Ð¡Ð¿Ð¸Ñ�Ð¾Ðº Ð²Ñ�ÐµÑ… Ñ�Ð¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ð¹ Ñ�Ñ‚Ñ€Ð¾ÐºÐ¸ Ð² ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ðµ"
  
! #: info/indices.c:834 info/indices.c:836
  msgid "Index topic"
  msgstr "Ð£ÐºÐ°Ð·Ð°Ñ‚ÐµÐ»ÑŒ Ñ‚ÐµÐ¼"
***************
*** 387,441 ****
  msgstr "Ð�Ð¸ Ð¾Ð´Ð¸Ð½ Ð¸Ð· info-Ñ„Ð°Ð¹Ð»Ð¾Ð² Ð½Ðµ Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð¸Ñ‚ Â«%sÂ» Ð² Ð°Ð»Ñ„Ð°Ð²Ð¸Ñ‚Ð½Ñ‹Ñ… ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ�Ñ…."
  
! #: info/info-utils.c:892
  #, c-format
  msgid "Error converting file character encoding."
  msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ð¸ ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ¸ Ñ�Ð¸Ð¼Ð²Ð¾Ð»Ð¾Ð² Ñ„Ð°Ð¹Ð»Ð°."
  
! #: info/info.c:222 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "ÐŸÑƒÐ½ÐºÑ‚ Ð¼ÐµÐ½ÑŽ Â«%sÂ» Ð¾Ñ‚Ñ�ÑƒÑ‚Ñ�Ñ‚Ð²ÑƒÐµÑ‚ Ð² Ð½Ð¾Ð´Ðµ Â«%sÂ»."
  
! #: info/info.c:315
! #, c-format
! msgid "No file given for node '%s'."
! msgstr "Ð’ Ð½Ð¾Ð´Ðµ Â«%sÂ» Ð½Ðµ ÑƒÐºÐ°Ð·Ð°Ð½ Ñ„Ð°Ð¹Ð»."
! 
! #: info/info.c:364 info/info.c:1133
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr "Ð�ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð¹Ñ‚Ð¸ Ð½Ð¾Ð´Ñƒ Â«%sÂ»."
  
! #: info/info.c:386
  #, c-format
  msgid "No program name given."
  msgstr "Ð�Ðµ Ð·Ð°Ð´Ð°Ð½Ð¾ Ð¸Ð¼Ñ� Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹."
  
! #: info/info.c:577
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "Ð½ÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹ Ð½Ð¾Ð¼ÐµÑ€: %s\n"
  
! #: info/info.c:757
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾Ðµ Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹: %s"
  
! #: info/info.c:764 info/infokey.c:537
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: Ð½ÐµÑ‚ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹ Ñ� Ñ‚Ð°ÐºÐ¸Ð¼ Ð¸Ð¼ÐµÐ½ÐµÐ¼"
  
! #: info/info.c:770 info/infokey.c:539
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ %s Ð½ÐµÐ´Ð¾Ð¿ÑƒÑ�Ñ‚Ð¸Ð¼Ð¾ Ð´Ð»Ñ� Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹ %s"
  
! #: info/info.c:782
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "ÐŸÐ¾Ð¿Ñ€Ð¾Ð±ÑƒÐ¹Ñ‚Ðµ --help Ð´Ð»Ñ� Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ� Ð±Ð¾Ð»ÐµÐµ Ð¿Ð¾Ð´Ñ€Ð¾Ð±Ð½Ð¾Ð³Ð¾ Ð¾Ð¿Ð¸Ñ�Ð°Ð½Ð¸Ñ�.\n"
  
! #: info/info.c:804 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
--- 389,438 ----
  msgstr "Ð�Ð¸ Ð¾Ð´Ð¸Ð½ Ð¸Ð· info-Ñ„Ð°Ð¹Ð»Ð¾Ð² Ð½Ðµ Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð¸Ñ‚ Â«%sÂ» Ð² Ð°Ð»Ñ„Ð°Ð²Ð¸Ñ‚Ð½Ñ‹Ñ… ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ�Ñ…."
  
! #: info/info-utils.c:879
  #, c-format
  msgid "Error converting file character encoding."
  msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ð¸ ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ¸ Ñ�Ð¸Ð¼Ð²Ð¾Ð»Ð¾Ð² Ñ„Ð°Ð¹Ð»Ð°."
  
! #: info/info.c:279 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "ÐŸÑƒÐ½ÐºÑ‚ Ð¼ÐµÐ½ÑŽ Â«%sÂ» Ð¾Ñ‚Ñ�ÑƒÑ‚Ñ�Ñ‚Ð²ÑƒÐµÑ‚ Ð² Ð½Ð¾Ð´Ðµ Â«%sÂ»."
  
! #: info/info.c:416 info/info.c:1148
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr "Ð�ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð¹Ñ‚Ð¸ Ð½Ð¾Ð´Ñƒ Â«%sÂ»."
  
! #: info/info.c:438
  #, c-format
  msgid "No program name given."
  msgstr "Ð�Ðµ Ð·Ð°Ð´Ð°Ð½Ð¾ Ð¸Ð¼Ñ� Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹."
  
! #: info/info.c:636
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "Ð½ÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹ Ð½Ð¾Ð¼ÐµÑ€: %s\n"
  
! #: info/info.c:816
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾Ðµ Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹: %s"
  
! #: info/info.c:823 info/infokey.c:540
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: Ð½ÐµÑ‚ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹ Ñ� Ñ‚Ð°ÐºÐ¸Ð¼ Ð¸Ð¼ÐµÐ½ÐµÐ¼"
  
! #: info/info.c:829 info/infokey.c:542
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ %s Ð½ÐµÐ´Ð¾Ð¿ÑƒÑ�Ñ‚Ð¸Ð¼Ð¾ Ð´Ð»Ñ� Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹ %s"
  
! #: info/info.c:841
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "ÐŸÐ¾Ð¿Ñ€Ð¾Ð±ÑƒÐ¹Ñ‚Ðµ --help Ð´Ð»Ñ� Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ� Ð±Ð¾Ð»ÐµÐµ Ð¿Ð¾Ð´Ñ€Ð¾Ð±Ð½Ð¾Ð³Ð¾ Ð¾Ð¿Ð¸Ñ�Ð°Ð½Ð¸Ñ�.\n"
  
! #: info/info.c:860 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
***************
*** 452,461 ****
  "Ð�ÐµÑ‚ Ð�Ð˜ÐšÐ�ÐšÐ˜Ð¥ Ð“Ð�Ð Ð�Ð�Ð¢Ð˜Ð™ Ð´Ð¾ Ñ�Ñ‚ÐµÐ¿ÐµÐ½Ð¸, Ñ€Ð°Ð·Ñ€ÐµÑˆÑ‘Ð½Ð½Ð¾Ð¹ Ð·Ð°ÐºÐ¾Ð½Ð¾Ð¼.\n"
  
! #: info/info.c:981
  #, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "Ð´Ð»Ñ� Â«%sÂ» Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ñ�Ð»ÐµÐ¼ÐµÐ½Ñ‚Ð¾Ð² Ð² Ð¸Ð¼ÐµÐ½Ð½Ð¾Ð¼ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ðµ\n"
  
! #: info/info.c:1034
  #, c-format
  msgid ""
--- 449,458 ----
  "Ð�ÐµÑ‚ Ð�Ð˜ÐšÐ�ÐšÐ˜Ð¥ Ð“Ð�Ð Ð�Ð�Ð¢Ð˜Ð™ Ð´Ð¾ Ñ�Ñ‚ÐµÐ¿ÐµÐ½Ð¸, Ñ€Ð°Ð·Ñ€ÐµÑˆÑ‘Ð½Ð½Ð¾Ð¹ Ð·Ð°ÐºÐ¾Ð½Ð¾Ð¼.\n"
  
! #: info/info.c:999
  #, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "Ð´Ð»Ñ� Â«%sÂ» Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ñ�Ð»ÐµÐ¼ÐµÐ½Ñ‚Ð¾Ð² Ð² Ð¸Ð¼ÐµÐ½Ð½Ð¾Ð¼ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ðµ\n"
  
! #: info/info.c:1049
  #, c-format
  msgid ""
***************
*** 468,472 ****
  "Ð§Ñ‚ÐµÐ½Ð¸Ðµ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ð¸Ð¸ Ð² Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ðµ Info.\n"
  
! #: info/info.c:1040
  msgid ""
  "Options:\n"
--- 465,469 ----
  "Ð§Ñ‚ÐµÐ½Ð¸Ðµ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ð¸Ð¸ Ð² Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ðµ Info.\n"
  
! #: info/info.c:1055
  msgid ""
  "Options:\n"
***************
*** 487,491 ****
  "  -f, --file=Ð¡ÐŸÐ Ð�Ð’ÐžÐ§Ð�Ð˜Ðš        Ð·Ð°Ð´Ð°Ñ‚ÑŒ Ð¾Ñ‚ÐºÑ€Ñ‹Ð²Ð°ÐµÐ¼Ñ‹Ð¹ Info-Ñ�Ð¿Ñ€Ð°Ð²Ð¾Ñ‡Ð½Ð¸Ðº"
  
! #: info/info.c:1048
  msgid ""
  "  -h, --help                   display this help and exit.\n"
--- 484,488 ----
  "  -f, --file=Ð¡ÐŸÐ Ð�Ð’ÐžÐ§Ð�Ð˜Ðš        Ð·Ð°Ð´Ð°Ñ‚ÑŒ Ð¾Ñ‚ÐºÑ€Ñ‹Ð²Ð°ÐµÐ¼Ñ‹Ð¹ Info-Ñ�Ð¿Ñ€Ð°Ð²Ð¾Ñ‡Ð½Ð¸Ðº"
  
! #: info/info.c:1063
  msgid ""
  "  -h, --help                   display this help and exit.\n"
***************
*** 500,504 ****
  "  -o, --output=Ð¤Ð�Ð™Ð›            Ð·Ð°Ð¿Ð¸Ñ�ÑŒ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ñ… Ð½Ð¾Ð´ Ð² Ð¤Ð�Ð™Ð›"
  
! #: info/info.c:1054
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
--- 497,501 ----
  "  -o, --output=Ð¤Ð�Ð™Ð›            Ð·Ð°Ð¿Ð¸Ñ�ÑŒ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ñ… Ð½Ð¾Ð´ Ð² Ð¤Ð�Ð™Ð›"
  
! #: info/info.c:1069
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
***************
*** 517,521 ****
  "                               ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ Ñ�Ñ‚Ñ€Ð¾ÐºÐ¸"
  
! #: info/info.c:1061
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr ""
--- 514,518 ----
  "                               ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ Ñ�Ñ‚Ñ€Ð¾ÐºÐ¸"
  
! #: info/info.c:1076
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr ""
***************
*** 523,527 ****
  "                               Ñ�Ð¸Ð½Ñ‚ÐµÐ·Ð°Ñ‚Ð¾Ñ€Ð¾Ð² Ñ€ÐµÑ‡Ð¸"
  
! #: info/info.c:1065
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
--- 520,524 ----
  "                               Ñ�Ð¸Ð½Ñ‚ÐµÐ·Ð°Ñ‚Ð¾Ñ€Ð¾Ð² Ñ€ÐµÑ‡Ð¸"
  
! #: info/info.c:1080
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
***************
*** 543,547 ****
  "  -x, --debug=Ð�ÐžÐœÐ•Ð             Ð·Ð°Ð´Ð°Ñ‚ÑŒ ÑƒÑ€Ð¾Ð²ÐµÐ½ÑŒ Ð¾Ñ‚Ð»Ð°Ð´ÐºÐ¸ (-1 Ð´Ð»Ñ� Ð²Ñ�ÐµÑ…).\n"
  
! #: info/info.c:1074
  msgid ""
  "\n"
--- 540,544 ----
  "  -x, --debug=Ð�ÐžÐœÐ•Ð             Ð·Ð°Ð´Ð°Ñ‚ÑŒ ÑƒÑ€Ð¾Ð²ÐµÐ½ÑŒ Ð¾Ñ‚Ð»Ð°Ð´ÐºÐ¸ (-1 Ð´Ð»Ñ� Ð²Ñ�ÐµÑ…).\n"
  
! #: info/info.c:1089
  msgid ""
  "\n"
***************
*** 559,563 ****
  "Ð¼ÐµÐ½ÑŽ Ð¾Ñ‚Ð½Ð¾Ñ�Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ Ð¿ÐµÑ€Ð²Ð¾Ð¹ Ð¿Ð¾Ñ�ÐµÑ‰Ñ‘Ð½Ð½Ð¾Ð¹ Ð½Ð¾Ð´Ñ‹."
  
! #: info/info.c:1081
  msgid ""
  "\n"
--- 556,560 ----
  "Ð¼ÐµÐ½ÑŽ Ð¾Ñ‚Ð½Ð¾Ñ�Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ Ð¿ÐµÑ€Ð²Ð¾Ð¹ Ð¿Ð¾Ñ�ÐµÑ‰Ñ‘Ð½Ð½Ð¾Ð¹ Ð½Ð¾Ð´Ñ‹."
  
! #: info/info.c:1096
  msgid ""
  "\n"
***************
*** 567,571 ****
  "Ð”Ð»Ñ� Ð²Ñ‹Ð´Ð°Ñ‡Ð¸ Ñ�Ð¿Ñ€Ð°Ð²ÐºÐ¸ Ð¿Ð¾ Ð¿Ñ€Ð¸Ð²Ñ�Ð·ÐºÐ°Ð¼ ÐºÐ»Ð°Ð²Ð¸Ñˆ Ð½Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ H Ð² Info."
  
! #: info/info.c:1084
  msgid ""
  "\n"
--- 564,568 ----
  "Ð”Ð»Ñ� Ð²Ñ‹Ð´Ð°Ñ‡Ð¸ Ñ�Ð¿Ñ€Ð°Ð²ÐºÐ¸ Ð¿Ð¾ Ð¿Ñ€Ð¸Ð²Ñ�Ð·ÐºÐ°Ð¼ ÐºÐ»Ð°Ð²Ð¸Ñˆ Ð½Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ H Ð² Info."
  
! #: info/info.c:1099
  msgid ""
  "\n"
***************
*** 597,601 ****
  "  info -f ./foo.info         Ð¿Ð¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» ./foo.info, Ð½Ðµ Ð¸Ñ�ÐºÐ°Ñ‚ÑŒ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³"
  
! #: info/info.c:1099 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
--- 594,598 ----
  "  info -f ./foo.info         Ð¿Ð¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» ./foo.info, Ð½Ðµ Ð¸Ñ�ÐºÐ°Ñ‚ÑŒ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³"
  
! #: info/info.c:1114 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
***************
*** 607,650 ****
  "Ð”Ð¾Ð¼Ð°ÑˆÐ½Ñ�Ñ� Ñ�Ñ‚Ñ€Ð°Ð½Ð¸Ñ†Ð° Texinfo: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1134
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Ð�ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð¹Ñ‚Ð¸ Ð½Ð¾Ð´Ñƒ Â«(%s)%sÂ»."
  
! #: info/info.c:1135
  msgid "Cannot find a window!"
  msgstr "Ð�ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð¹Ñ‚Ð¸ Ð¾ÐºÐ½Ð¾!"
  
! #: info/info.c:1136
  msgid "Point doesn't appear within this window's node!"
  msgstr "Ð¢Ð¾Ñ‡ÐºÐ° Ð½Ð°Ñ…Ð¾Ð´Ð¸Ñ‚Ñ�Ñ� Ð²Ð½Ðµ Ð½Ð¾Ð´Ñ‹ Ñ�Ñ‚Ð¾Ð³Ð¾ Ð¾ÐºÐ½Ð°!"
  
! #: info/info.c:1137
  msgid "Cannot delete the last window."
  msgstr "Ð�ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¿Ð¾Ñ�Ð»ÐµÐ´Ð½ÐµÐµ Ð¾ÐºÐ½Ð¾."
  
! #: info/info.c:1138
  msgid "No menu in this node."
  msgstr "Ð’ Ñ�Ñ‚Ð¾Ð¹ Ð½Ð¾Ð´Ðµ Ð½ÐµÑ‚ Ð¼ÐµÐ½ÑŽ."
  
! #: info/info.c:1139
  msgid "No footnotes in this node."
  msgstr "Ð’ Ñ�Ñ‚Ð¾Ð¹ Ð½Ð¾Ð´Ðµ Ð½ÐµÑ‚ Ñ�Ð½Ð¾Ñ�Ð¾Ðº."
  
! #: info/info.c:1140
  msgid "No cross references in this node."
  msgstr "Ð’ Ñ�Ñ‚Ð¾Ð¹ Ð½Ð¾Ð´Ðµ Ð½ÐµÑ‚ Ð¿ÐµÑ€ÐµÐºÑ€Ñ‘Ñ�Ñ‚Ð½Ñ‹Ñ… Ñ�Ñ�Ñ‹Ð»Ð¾Ðº."
  
! #: info/info.c:1141
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Ð”Ð»Ñ� Ñ�Ñ‚Ð¾Ð¹ Ð½Ð¾Ð´Ñ‹ Ð½ÐµÑ‚ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ� Â«%sÂ»."
  
! #: info/info.c:1142
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "ÐšÐ¾Ð¼Ð°Ð½Ð´Ð° Info Â«%cÂ» Ð½ÐµÐ¸Ð·Ð²ÐµÑ�Ñ‚Ð½Ð°; Ð¿Ð¾Ð¿Ñ€Ð¾Ð±ÑƒÐ¹Ñ‚Ðµ Â«?Â» Ð´Ð»Ñ� Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ� Ñ�Ð¿Ñ€Ð°Ð²ÐºÐ¸."
  
! #: info/info.c:1143
  #, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
--- 604,647 ----
  "Ð”Ð¾Ð¼Ð°ÑˆÐ½Ñ�Ñ� Ñ�Ñ‚Ñ€Ð°Ð½Ð¸Ñ†Ð° Texinfo: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1149
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Ð�ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð¹Ñ‚Ð¸ Ð½Ð¾Ð´Ñƒ Â«(%s)%sÂ»."
  
! #: info/info.c:1150
  msgid "Cannot find a window!"
  msgstr "Ð�ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð¹Ñ‚Ð¸ Ð¾ÐºÐ½Ð¾!"
  
! #: info/info.c:1151
  msgid "Point doesn't appear within this window's node!"
  msgstr "Ð¢Ð¾Ñ‡ÐºÐ° Ð½Ð°Ñ…Ð¾Ð´Ð¸Ñ‚Ñ�Ñ� Ð²Ð½Ðµ Ð½Ð¾Ð´Ñ‹ Ñ�Ñ‚Ð¾Ð³Ð¾ Ð¾ÐºÐ½Ð°!"
  
! #: info/info.c:1152
  msgid "Cannot delete the last window."
  msgstr "Ð�ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¿Ð¾Ñ�Ð»ÐµÐ´Ð½ÐµÐµ Ð¾ÐºÐ½Ð¾."
  
! #: info/info.c:1153
  msgid "No menu in this node."
  msgstr "Ð’ Ñ�Ñ‚Ð¾Ð¹ Ð½Ð¾Ð´Ðµ Ð½ÐµÑ‚ Ð¼ÐµÐ½ÑŽ."
  
! #: info/info.c:1154
  msgid "No footnotes in this node."
  msgstr "Ð’ Ñ�Ñ‚Ð¾Ð¹ Ð½Ð¾Ð´Ðµ Ð½ÐµÑ‚ Ñ�Ð½Ð¾Ñ�Ð¾Ðº."
  
! #: info/info.c:1155
  msgid "No cross references in this node."
  msgstr "Ð’ Ñ�Ñ‚Ð¾Ð¹ Ð½Ð¾Ð´Ðµ Ð½ÐµÑ‚ Ð¿ÐµÑ€ÐµÐºÑ€Ñ‘Ñ�Ñ‚Ð½Ñ‹Ñ… Ñ�Ñ�Ñ‹Ð»Ð¾Ðº."
  
! #: info/info.c:1156
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Ð”Ð»Ñ� Ñ�Ñ‚Ð¾Ð¹ Ð½Ð¾Ð´Ñ‹ Ð½ÐµÑ‚ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ� Â«%sÂ»."
  
! #: info/info.c:1157
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "ÐšÐ¾Ð¼Ð°Ð½Ð´Ð° Info Â«%cÂ» Ð½ÐµÐ¸Ð·Ð²ÐµÑ�Ñ‚Ð½Ð°; Ð¿Ð¾Ð¿Ñ€Ð¾Ð±ÑƒÐ¹Ñ‚Ðµ Â«?Â» Ð´Ð»Ñ� Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ� Ñ�Ð¿Ñ€Ð°Ð²ÐºÐ¸."
  
! #: info/info.c:1158
  #, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
***************
*** 652,672 ****
  "Ð¢Ð¸Ð¿ Ñ‚ÐµÑ€Ð¼Ð¸Ð½Ð°Ð»Ð° Â«%sÂ» Ð½Ðµ Ð¾Ð±Ð»Ð°Ð´Ð°ÐµÑ‚ Ð´Ð¾Ñ�Ñ‚Ð°Ñ‚Ð¾Ñ‡Ð½Ñ‹Ð¼Ð¸ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñ�Ñ‚Ñ�Ð¼Ð¸ Ð´Ð»Ñ� Ð·Ð°Ð¿ÑƒÑ�ÐºÐ° Info."
  
! #: info/info.c:1144
  msgid "You are already at the last page of this node."
  msgstr "Ð’Ñ‹ ÑƒÐ¶Ðµ Ð½Ð°Ñ…Ð¾Ð´Ð¸Ñ‚ÐµÑ�ÑŒ Ð½Ð° Ð¿Ð¾Ñ�Ð»ÐµÐ´Ð½ÐµÐ¹ Ñ�Ñ‚Ñ€Ð°Ð½Ð¸Ñ†Ðµ Ñ�Ñ‚Ð¾Ð¹ Ð½Ð¾Ð´Ñ‹."
  
! #: info/info.c:1145
  msgid "You are already at the first page of this node."
  msgstr "Ð’Ñ‹ ÑƒÐ¶Ðµ Ð½Ð°Ñ…Ð¾Ð´Ð¸Ñ‚ÐµÑ�ÑŒ Ð½Ð° Ð¿ÐµÑ€Ð²Ð¾Ð¹ Ñ�Ñ‚Ñ€Ð°Ð½Ð¸Ñ†Ðµ Ñ�Ñ‚Ð¾Ð¹ Ð½Ð¾Ð´Ñ‹."
  
! #: info/info.c:1146
  msgid "Only one window."
  msgstr "Ð¢Ð¾Ð»ÑŒÐºÐ¾ Ð¾Ð´Ð½Ð¾ Ð¾ÐºÐ½Ð¾."
  
! #: info/info.c:1147
  msgid "Resulting window would be too small."
  msgstr "ÐŸÐ¾Ð»ÑƒÑ‡Ð¸Ð²ÑˆÐµÐµÑ�Ñ� Ð¾ÐºÐ½Ð¾ Ð±Ñ‹Ð»Ð¾ Ð±Ñ‹ Ñ�Ð»Ð¸ÑˆÐºÐ¾Ð¼ Ð¼Ð°Ð»ÐµÐ½ÑŒÐºÐ¸Ð¼."
  
! #: info/info.c:1148
  msgid "Not enough room for a help window, please delete a window."
  msgstr ""
--- 649,669 ----
  "Ð¢Ð¸Ð¿ Ñ‚ÐµÑ€Ð¼Ð¸Ð½Ð°Ð»Ð° Â«%sÂ» Ð½Ðµ Ð¾Ð±Ð»Ð°Ð´Ð°ÐµÑ‚ Ð´Ð¾Ñ�Ñ‚Ð°Ñ‚Ð¾Ñ‡Ð½Ñ‹Ð¼Ð¸ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñ�Ñ‚Ñ�Ð¼Ð¸ Ð´Ð»Ñ� Ð·Ð°Ð¿ÑƒÑ�ÐºÐ° Info."
  
! #: info/info.c:1159
  msgid "You are already at the last page of this node."
  msgstr "Ð’Ñ‹ ÑƒÐ¶Ðµ Ð½Ð°Ñ…Ð¾Ð´Ð¸Ñ‚ÐµÑ�ÑŒ Ð½Ð° Ð¿Ð¾Ñ�Ð»ÐµÐ´Ð½ÐµÐ¹ Ñ�Ñ‚Ñ€Ð°Ð½Ð¸Ñ†Ðµ Ñ�Ñ‚Ð¾Ð¹ Ð½Ð¾Ð´Ñ‹."
  
! #: info/info.c:1160
  msgid "You are already at the first page of this node."
  msgstr "Ð’Ñ‹ ÑƒÐ¶Ðµ Ð½Ð°Ñ…Ð¾Ð´Ð¸Ñ‚ÐµÑ�ÑŒ Ð½Ð° Ð¿ÐµÑ€Ð²Ð¾Ð¹ Ñ�Ñ‚Ñ€Ð°Ð½Ð¸Ñ†Ðµ Ñ�Ñ‚Ð¾Ð¹ Ð½Ð¾Ð´Ñ‹."
  
! #: info/info.c:1161
  msgid "Only one window."
  msgstr "Ð¢Ð¾Ð»ÑŒÐºÐ¾ Ð¾Ð´Ð½Ð¾ Ð¾ÐºÐ½Ð¾."
  
! #: info/info.c:1162
  msgid "Resulting window would be too small."
  msgstr "ÐŸÐ¾Ð»ÑƒÑ‡Ð¸Ð²ÑˆÐµÐµÑ�Ñ� Ð¾ÐºÐ½Ð¾ Ð±Ñ‹Ð»Ð¾ Ð±Ñ‹ Ñ�Ð»Ð¸ÑˆÐºÐ¾Ð¼ Ð¼Ð°Ð»ÐµÐ½ÑŒÐºÐ¸Ð¼."
  
! #: info/info.c:1163
  msgid "Not enough room for a help window, please delete a window."
  msgstr ""
***************
*** 937,971 ****
  msgstr "Ð½ÐµÐ¸Ð·Ð²ÐµÑ�Ñ‚Ð½Ð¾Ðµ Ð´ÐµÐ¹Ñ�Ñ‚Ð²Ð¸Ðµ Â«%sÂ»"
  
! #: info/infokey.c:482
  #, c-format
  msgid "action name too long"
  msgstr "Ð¸Ð¼Ñ� Ð´ÐµÐ¹Ñ�Ñ‚Ð²Ð¸Ñ� Ñ�Ð»Ð¸ÑˆÐºÐ¾Ð¼ Ð´Ð»Ð¸Ð½Ð½Ð¾Ðµ"
  
! #: info/infokey.c:495
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "Ð»Ð¸ÑˆÐ½Ð¸Ðµ Ñ�Ð¸Ð¼Ð²Ð¾Ð»Ñ‹ Ð¿Ð¾Ñ�Ð»Ðµ Ð´ÐµÐ¹Ñ�Ñ‚Ð²Ð¸Ñ� Â«%sÂ»"
  
! #: info/infokey.c:506
  #, c-format
  msgid "missing variable name"
  msgstr "Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½Ð¾ Ð¸Ð¼Ñ� Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹"
  
! #: info/infokey.c:515
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½ Ð·Ð½Ð°Ðº Â«=Â» Ñ�Ñ€Ð°Ð·Ñƒ Ð¿Ð¾Ñ�Ð»Ðµ Ð¸Ð¼ÐµÐ½Ð¸ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹"
  
! #: info/infokey.c:522
  #, c-format
  msgid "variable name too long"
  msgstr "Ð¸Ð¼Ñ� Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹ Ñ�Ð»Ð¸ÑˆÐºÐ¾Ð¼ Ð´Ð»Ð¸Ð½Ð½Ð¾Ðµ"
  
! #: info/infokey.c:546
  #, c-format
  msgid "value too long"
  msgstr "Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ñ�Ð»Ð¸ÑˆÐºÐ¾Ð¼ Ð´Ð»Ð¸Ð½Ð½Ð¾Ðµ"
  
! #: info/infokey.c:592
  #, c-format
  msgid "\"%s\", line %u: "
--- 934,968 ----
  msgstr "Ð½ÐµÐ¸Ð·Ð²ÐµÑ�Ñ‚Ð½Ð¾Ðµ Ð´ÐµÐ¹Ñ�Ñ‚Ð²Ð¸Ðµ Â«%sÂ»"
  
! #: info/infokey.c:485
  #, c-format
  msgid "action name too long"
  msgstr "Ð¸Ð¼Ñ� Ð´ÐµÐ¹Ñ�Ñ‚Ð²Ð¸Ñ� Ñ�Ð»Ð¸ÑˆÐºÐ¾Ð¼ Ð´Ð»Ð¸Ð½Ð½Ð¾Ðµ"
  
! #: info/infokey.c:498
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "Ð»Ð¸ÑˆÐ½Ð¸Ðµ Ñ�Ð¸Ð¼Ð²Ð¾Ð»Ñ‹ Ð¿Ð¾Ñ�Ð»Ðµ Ð´ÐµÐ¹Ñ�Ñ‚Ð²Ð¸Ñ� Â«%sÂ»"
  
! #: info/infokey.c:509
  #, c-format
  msgid "missing variable name"
  msgstr "Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½Ð¾ Ð¸Ð¼Ñ� Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹"
  
! #: info/infokey.c:518
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½ Ð·Ð½Ð°Ðº Â«=Â» Ñ�Ñ€Ð°Ð·Ñƒ Ð¿Ð¾Ñ�Ð»Ðµ Ð¸Ð¼ÐµÐ½Ð¸ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹"
  
! #: info/infokey.c:525
  #, c-format
  msgid "variable name too long"
  msgstr "Ð¸Ð¼Ñ� Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹ Ñ�Ð»Ð¸ÑˆÐºÐ¾Ð¼ Ð´Ð»Ð¸Ð½Ð½Ð¾Ðµ"
  
! #: info/infokey.c:549
  #, c-format
  msgid "value too long"
  msgstr "Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ñ�Ð»Ð¸ÑˆÐºÐ¾Ð¼ Ð´Ð»Ð¸Ð½Ð½Ð¾Ðµ"
  
! #: info/infokey.c:595
  #, c-format
  msgid "\"%s\", line %u: "
***************
*** 1298,1636 ****
  msgstr "Ð�ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð¹Ñ‚Ð¸ Ð½Ð¾Ð´Ñƒ Ð¿Ð¾ Ñ�Ñ�Ñ‹Ð»ÐºÐµ Â«%sÂ» Ð² Â«%sÂ»."
  
! #: info/session.c:2864
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "Ð¡Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ Ñ�Ð¿Ð¸Ñ�Ð¾Ðº Ð¼ÐµÐ½ÑŽ, Ð½Ð°Ñ‡Ð¸Ð½Ð°ÑŽÑ‰Ð¸Ð¹Ñ�Ñ� Ñ� dir Ð¸ Ð¿Ñ€Ð¾Ñ�Ð»ÐµÐ´Ð¾Ð²Ð°Ñ‚ÑŒ Ð¿Ð¾ Ð½Ð¸Ð¼"
  
! #: info/session.c:2866
  msgid "Follow menus: "
  msgstr "ÐŸÑ€Ð¾Ñ�Ð»ÐµÐ´Ð¾Ð²Ð°Ñ‚ÑŒ Ð¿Ð¾ Ð¼ÐµÐ½ÑŽ: "
  
! #: info/session.c:2971
  msgid "Select the Next node"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð½Ð° Â«Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰ÑƒÑŽÂ» Ð½Ð¾Ð´Ñƒ"
  
! #: info/session.c:2978
  msgid "Select the Prev node"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð½Ð° Â«ÐŸÑ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰ÑƒÑŽÂ» Ð½Ð¾Ð´Ñƒ"
  
! #: info/session.c:2985
  msgid "Select the Up node"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð½Ð° Â«Ð’ÐµÑ€Ñ…Ð½ÑŽÑŽÂ» Ð½Ð¾Ð´Ñƒ"
  
! #: info/session.c:2991
  msgid "Select the last node in this file"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð½Ð° Ð¿Ð¾Ñ�Ð»ÐµÐ´Ð½ÑŽÑŽ Ð½Ð¾Ð´Ñƒ Ð² Ñ„Ð°Ð¹Ð»Ðµ"
  
! #: info/session.c:3018 info/session.c:3051
  msgid "This window has no additional nodes"
  msgstr "Ð­Ñ‚Ð¾ Ð¾ÐºÐ½Ð¾ Ð½Ðµ Ð¸Ð¼ÐµÐµÑ‚ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ñ… Ð½Ð¾Ð´"
  
! #: info/session.c:3024
  msgid "Select the first node in this file"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð½Ð° Ð¿ÐµÑ€Ð²ÑƒÑŽ Ð½Ð¾Ð´Ñƒ Ð² Ñ„Ð°Ð¹Ð»Ðµ"
  
! #: info/session.c:3158
  msgid "No more nodes within this document."
  msgstr "Ð’ Ñ�Ñ‚Ð¾Ð¼ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ðµ Ð±Ð¾Ð»ÑŒÑˆÐµ Ð½ÐµÑ‚ Ð½Ð¾Ð´."
  
! #: info/session.c:3203 info/session.c:3243
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "Ð’ Ñ�Ñ‚Ð¾Ð¼ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ðµ Ð½ÐµÑ‚ Ñ�Ñ�Ñ‹Ð»ÐºÐ¸ Â«ÐŸÑ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰Ð°Ñ�Â» Ð¸Ð»Ð¸ Â«Ð’Ð²ÐµÑ€Ñ…Â» Ð´Ð»Ñ� Ñ�Ñ‚Ð¾Ð¹ Ð½Ð¾Ð´Ñ‹."
  
! #: info/session.c:3256
  msgid "Move forwards or down through node structure"
  msgstr "ÐŸÑ€Ð¾Ð´Ð²Ð¸Ð³Ð°Ñ‚ÑŒÑ�Ñ� Ð²Ð¿ÐµÑ€Ñ‘Ð´ Ð¸Ð»Ð¸ Ð²Ð½Ð¸Ð· Ð¿Ð¾ Ñ�Ñ‚Ñ€ÑƒÐºÑ‚ÑƒÑ€Ðµ Ð½Ð¾Ð´"
  
! #: info/session.c:3273
  msgid "Move backwards or up through node structure"
  msgstr "ÐŸÑ€Ð¾Ð´Ð²Ð¸Ð³Ð°Ñ‚ÑŒÑ�Ñ� Ð½Ð°Ð·Ð°Ð´ Ð¸Ð»Ð¸ Ð²Ð²ÐµÑ€Ñ… Ð¿Ð¾ Ñ�Ñ‚Ñ€ÑƒÐºÑ‚ÑƒÑ€Ðµ Ð½Ð¾Ð´"
  
! #: info/session.c:3296
  msgid "Read a node name and select it"
  msgstr "Ð¡Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ Ð¸Ð¼Ñ� Ð½Ð¾Ð´Ñ‹ Ð¸ Ð¿ÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ðº Ð½ÐµÐ¹"
  
! #: info/session.c:3350 info/session.c:3354
  msgid "Goto node: "
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ðº Ð½Ð¾Ð´Ðµ: "
  
! #: info/session.c:3533
  msgid "Find the node describing program invocation"
  msgstr "Ð�Ð°Ð¹Ñ‚Ð¸ Ð½Ð¾Ð´Ñƒ, Ð¾Ð¿Ð¸Ñ�Ñ‹Ð²Ð°ÑŽÑ‰ÑƒÑŽ, ÐºÐ°Ðº Ð²Ñ‹Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñƒ"
  
! #: info/session.c:3535
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Ð�Ð°Ð¹Ñ‚Ð¸ Ð½Ð¾Ð´Ñƒ Invocation Ð´Ð»Ñ� [%s]: "
  
! #: info/session.c:3580
  msgid "Read a manpage reference and select it"
  msgstr "Ð¡Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ Ñ�Ñ�Ñ‹Ð»ÐºÑƒ Ð½Ð° Ñ�Ð¿Ñ€Ð°Ð²Ð¾Ñ‡Ð½ÑƒÑŽ Ñ�Ñ‚Ñ€Ð°Ð½Ð¸Ñ†Ñƒ (manpage) Ð¸ Ð¿ÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ðº Ð½ÐµÐ¹"
  
! #: info/session.c:3584
  msgid "Get Manpage: "
  msgstr "ÐŸÑ€Ð¾Ñ�Ð¼Ð¾Ñ‚Ñ€ÐµÑ‚ÑŒ Ñ�Ð¿Ñ€Ð°Ð²Ð¾Ñ‡Ð½ÑƒÑŽ Ñ�Ñ‚Ñ€Ð°Ð½Ð¸Ñ†Ñƒ (manpage): "
  
! #: info/session.c:3605
  msgid "Select the node 'Top' in this file"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð½Ð° Â«ÐŸÐµÑ€Ð²ÑƒÑŽÂ» Ð½Ð¾Ð´Ñƒ Ð² Ñ�Ñ‚Ð¾Ð¼ Ñ„Ð°Ð¹Ð»Ðµ"
  
! #: info/session.c:3611
  msgid "Select the node '(dir)'"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð½Ð° Ð½Ð¾Ð´Ñƒ Â«(dir)Â»"
  
! #: info/session.c:3617
  msgid "Show full file name of node being displayed"
  msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¿Ð¾Ð»Ð½Ð¾Ðµ Ð¸Ð¼Ñ� Ñ„Ð°Ð¹Ð»Ð° Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°ÐµÐ¼Ð¾Ð¹ Ð½Ð¾Ð´Ñ‹"
  
! #: info/session.c:3634
  msgid "Select the most recently selected node"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ðº Ð¿Ð¾Ñ�Ð»ÐµÐ´Ð½ÐµÐ¹ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð¾Ð¹ Ð½Ð¾Ð´Ðµ"
  
! #: info/session.c:3639
  #, c-format
  msgid "No earlier node in history"
  msgstr "Ð’ Ð¸Ñ�Ñ‚Ð¾Ñ€Ð¸Ð¸ Ð½ÐµÑ‚ Ð±Ð¾Ð»ÐµÐµ Ñ€Ð°Ð½Ð½ÐµÐ¹ Ð½Ð¾Ð´Ñ‹"
  
! #: info/session.c:3643
  msgid "Read the name of a file and select it"
  msgstr "Ð¡Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ Ð¸Ð¼Ñ� Ñ„Ð°Ð¹Ð»Ð° Ð¸ Ð¿ÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ðº Ð½ÐµÐ¼Ñƒ"
  
! #: info/session.c:3647
  msgid "Find file: "
  msgstr "Ð�Ð°Ð¹Ñ‚Ð¸ Ñ„Ð°Ð¹Ð»: "
  
! #: info/session.c:3664
  #, c-format
  msgid "Cannot find '%s'."
  msgstr "Ð�ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð¹Ñ‚Ð¸ Â«%sÂ»."
  
! #: info/session.c:3713
  #, c-format
  msgid "Could not create output file '%s'."
  msgstr "Ð�ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ñ�Ð¾Ð·Ð´Ð°Ñ‚ÑŒ Ð²Ñ‹Ñ…Ð¾Ð´Ð½Ð¾Ð¹ Ñ„Ð°Ð¹Ð» Â«%sÂ»."
  
! #: info/session.c:3727
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð·Ð°Ð¿Ð¸Ñ�Ð¸ Ð² %s: %s"
  
! #: info/session.c:3736
  #, c-format
  msgid "closing %s"
  msgstr "Ð·Ð°ÐºÑ€Ñ‹Ð²Ð°ÐµÑ‚Ñ�Ñ� %s"
  
! #: info/session.c:3785
  #, c-format
  msgid "writing node %s..."
  msgstr "Ð·Ð°Ð¿Ð¸Ñ�ÑŒ Ð½Ð¾Ð´Ñ‹ %sâ€¦"
  
! #: info/session.c:3831
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "ÐŸÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð¸Ð¼Ð¾Ðµ Ñ�Ñ‚Ð¾Ð¹ Ð½Ð¾Ð´Ñ‹ Ð½Ð° Ð²Ñ…Ð¾Ð´ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹ INFO_PRINT_COMMAND"
  
! #: info/session.c:3859
  #, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Ð�ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ ÐºÐ°Ð½Ð°Ð» Ðº Â«%sÂ»."
  
! #: info/session.c:3864
  #, c-format
  msgid "printing node %s..."
  msgstr "Ð¿ÐµÑ‡Ð°Ñ‚Ð°ÐµÑ‚Ñ�Ñ� Ð½Ð¾Ð´Ð° %s"
  
! #: info/session.c:3872
  #, c-format
  msgid "finished printing node %s"
  msgstr "Ð¿ÐµÑ‡Ð°Ñ‚ÑŒ Ð½Ð¾Ð´Ñ‹ %s Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð°"
  
! #: 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:4169
  msgid "Search continued from the end of the document."
  msgstr "ÐŸÐ¾Ð¸Ñ�Ðº Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚Ñ�Ñ� Ñ� ÐºÐ¾Ð½Ñ†Ð° Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°."
  
! #: info/session.c:4174
  msgid "Search continued from the beginning of the document."
  msgstr "ÐŸÐ¾Ð¸Ñ�Ðº Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚Ñ�Ñ� Ñ� Ð½Ð°Ñ‡Ð°Ð»Ð° Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°."
  
! #: info/session.c:4194
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "ÐŸÐ¾Ð¸Ñ�Ðº Ð¿Ð¾Ð´Ñ„Ð°Ð¹Ð»Ð° %sâ€¦"
  
! #: info/session.c:4231
  msgid "Search failed."
  msgstr "Ð�Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾."
  
! #: info/session.c:4248
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Regexp search"
  msgstr "ÐŸÐ¾Ð¸Ñ�Ðº Ð¿Ð¾ Ñ€ÐµÐ³ÑƒÐ»Ñ�Ñ€Ð½Ñ‹Ð¼ Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ�Ð¼"
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Search"
  msgstr "ÐŸÐ¾Ð¸Ñ�Ðº"
  
! #: info/session.c:4250 info/session.c:4256
  msgid " case-sensitively"
  msgstr " c ÑƒÑ‡Ñ‘Ñ‚Ð¾Ð¼ Ñ€ÐµÐ³Ð¸Ñ�Ñ‚Ñ€Ð°"
  
! #: info/session.c:4251 info/session.c:4257
  msgid " backward"
  msgstr " Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ñ‹Ð¹ Ð¿Ð¾Ð¸Ñ�Ðº"
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s: "
  
! #: info/session.c:4274
  msgid "Search string too short"
  msgstr "Ð¡Ð»Ð¸ÑˆÐºÐ¾Ð¼ ÐºÐ¾Ñ€Ð¾Ñ‚ÐºÐ°Ñ� Ñ�Ñ‚Ñ€Ð¾ÐºÐ° Ð¿Ð¾Ð¸Ñ�ÐºÐ°"
  
! #: info/session.c:4467
  #, c-format
  msgid "Going back to last match from %s"
  msgstr "ÐŸÐµÑ€ÐµÑ…Ð¾Ð´Ð¸Ð¼ Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ð¾ Ðº Ð¿Ð¾Ñ�Ð»ÐµÐ´Ð½ÐµÐ¼Ñƒ Ñ�Ð¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸ÑŽ Ð¸Ð· %s"
  
! #: info/session.c:4491 info/session.c:4601
  #, c-format
  msgid "No more matches."
  msgstr "Ð‘Ð¾Ð»ÑŒÑˆÐµ Ð½ÐµÑ‚ Ñ�Ð¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ð¹."
  
! #: info/session.c:4628
  msgid "Search this node and subnodes for a string."
  msgstr "Ð˜Ñ�ÐºÐ°Ñ‚ÑŒ Ñ�Ñ‚Ñ€Ð¾ÐºÑƒ Ð² Ñ�Ñ‚Ð¾Ð¹ Ð½Ð¾Ð´Ðµ Ð¸ Ð¿Ð¾Ð´Ð½Ð¾Ð´Ð°Ñ…."
  
! #: info/session.c:4649
  msgid "Go to next match in Info sub-tree"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ðº Ñ�Ð»ÐµÐ´ÑƒÑŽÑ‰ÐµÐ¼Ñƒ Ñ�Ð¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸ÑŽ Ð² Ð¿Ð¾Ð´Ð´ÐµÑ€ÐµÐ²Ðµ Info"
  
! #: info/session.c:4653 info/session.c:4665
  #, c-format
  msgid "No active search"
  msgstr "Ð�ÐµÑ‚ Ð°ÐºÑ‚Ð¸Ð²Ð½Ð¾Ð³Ð¾ Ð¿Ð¾Ð¸Ñ�ÐºÐ°"
  
! #: info/session.c:4661
  msgid "Go to previous match in Info sub-tree"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ðº Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰ÐµÐ¼Ñƒ Ñ�Ð¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸ÑŽ Ð² Ð¿Ð¾Ð´Ð´ÐµÑ€ÐµÐ²Ðµ Info"
  
! #: info/session.c:4674
  msgid "Read a string and search for it case-sensitively"
  msgstr "Ð¡Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ Ñ�Ñ‚Ñ€Ð¾ÐºÑƒ Ð¸ Ð·Ð°Ð¿ÑƒÑ�Ñ‚Ð¸Ñ‚ÑŒ Ñ€ÐµÐ³Ð¸Ñ�Ñ‚Ñ€Ð¾Ð·Ð°Ð²Ð¸Ñ�Ð¸Ð¼Ñ‹Ð¹ Ð¿Ð¾Ð¸Ñ�Ðº"
  
! #: info/session.c:4679
  msgid "Read a string and search for it"
  msgstr "Ð¡Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ Ñ�Ñ‚Ñ€Ð¾ÐºÑƒ Ð¸ Ð·Ð°Ð¿ÑƒÑ�Ñ‚Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð¸Ñ�Ðº"
  
! #: info/session.c:4685
  msgid "Read a string and search backward for it"
  msgstr "Ð¡Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ Ñ�Ñ‚Ñ€Ð¾ÐºÑƒ Ð¸ Ð·Ð°Ð¿ÑƒÑ�Ñ‚Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð¸Ñ�Ðº Ð² Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ð¾Ð¼ Ð½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ð¸"
  
! #: info/session.c:4693
  msgid "Repeat last search in the same direction"
  msgstr "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚ÑŒ Ð¿Ð¾Ñ�Ð»ÐµÐ´Ð½Ð¸Ð¹ Ð¿Ð¾Ð¸Ñ�Ðº Ð² Ñ‚Ð¾Ð¼ Ð¶Ðµ Ð½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ð¸"
  
! #: info/session.c:4701 info/session.c:4746
  msgid "No previous search string"
  msgstr "Ð�ÐµÑ‚ Ñ�Ñ‚Ñ€Ð¾ÐºÐ¸ Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰ÐµÐ³Ð¾ Ð¿Ð¾Ð¸Ñ�ÐºÐ°"
  
! #: info/session.c:4738
  msgid "Repeat last search in the reverse direction"
  msgstr "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚ÑŒ Ð¿Ð¾Ñ�Ð»ÐµÐ´Ð½Ð¸Ð¹ Ð¿Ð¾Ð¸Ñ�Ðº Ð² Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ð¾Ð¼ Ð½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ð¸"
  
! #: info/session.c:4785
  msgid "Clear displayed search matches"
  msgstr "ÐžÑ‡Ð¸Ñ�Ñ‚Ð¸Ñ‚ÑŒ Ð¿Ð¾ÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ðµ Ñ�Ð¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ� Ð¿Ð¾Ð¸Ñ�ÐºÐ°"
  
! #: info/session.c:4802 info/session.c:4808
  msgid "Search interactively for a string as you type it"
  msgstr "Ð—Ð°Ð¿ÑƒÑ�Ñ‚Ð¸Ñ‚ÑŒ Ð¸Ð½Ñ‚ÐµÑ€Ð°ÐºÑ‚Ð¸Ð²Ð½Ñ‹Ð¹ Ð¿Ð¾Ð¸Ñ�Ðº Ð¿Ð¾ Ð¼ÐµÑ€Ðµ Ð²Ð²Ð¾Ð´Ð° Ñ�Ñ‚Ñ€Ð¾ÐºÐ¸"
  
! #: info/session.c:4928
  msgid "Regexp I-search backward: "
  msgstr "Ð�Ð°Ñ€Ð°Ñ‰Ð¸Ð²Ð°ÐµÐ¼Ñ‹Ð¹ Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ñ‹Ð¹ Ð¿Ð¾Ð¸Ñ�Ðº Ð¿Ð¾ Ñ€ÐµÐ³ÑƒÐ»Ñ�Ñ€Ð½Ð¾Ð¼Ñƒ Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸ÑŽ: "
  
! #: info/session.c:4929
  msgid "I-search backward: "
  msgstr "Ð�Ð°Ñ€Ð°Ñ‰Ð¸Ð²Ð°ÐµÐ¼Ñ‹Ð¹ Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ñ‹Ð¹ Ð¿Ð¾Ð¸Ñ�Ðº: "
  
! #: info/session.c:4931
  msgid "Regexp I-search: "
  msgstr "Ð�Ð°Ñ€Ð°Ñ‰Ð¸Ð²Ð°ÐµÐ¼Ñ‹Ð¹ Ð¿Ð¾Ð¸Ñ�Ðº Ð¿Ð¾ Ñ€ÐµÐ³ÑƒÐ»Ñ�Ñ€Ð½Ð¾Ð¼Ñƒ Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸ÑŽ: "
  
! #: info/session.c:4932
  msgid "I-search: "
  msgstr "Ð�Ð°Ñ€Ð°Ñ‰Ð¸Ð²Ð°ÐµÐ¼Ñ‹Ð¹ Ð¿Ð¾Ð¸Ñ�Ðº: "
  
! #: info/session.c:4957 info/session.c:4960
  msgid "Failing "
  msgstr "Ð�Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ "
  
! #: info/session.c:5326
  msgid "Cancel current operation"
  msgstr "ÐžÑ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹"
  
! #: info/session.c:5333
  msgid "Quit"
  msgstr "Ð’Ñ‹Ñ…Ð¾Ð´"
  
! #: info/session.c:5338
  msgid "Display version of Info being run"
  msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð²ÐµÑ€Ñ�Ð¸ÑŽ Ð·Ð°Ð¿ÑƒÑ‰ÐµÐ½Ð½Ð¾Ð¹ Info"
  
! #: info/session.c:5340
  #, c-format
  msgid "GNU Info version %s"
  msgstr "GNU Info, Ð²ÐµÑ€Ñ�Ð¸Ñ� %s"
  
! #: info/session.c:5345
  msgid "Redraw the display"
  msgstr "ÐŸÐµÑ€ÐµÑ€Ð¸Ñ�Ð¾Ð²Ð°Ñ‚ÑŒ Ñ�ÐºÑ€Ð°Ð½"
  
! #: info/session.c:5382
  msgid "Quit using Info"
  msgstr "Ð’Ñ‹Ð¹Ñ‚Ð¸ Ð¸Ð· Info"
  
! #: info/session.c:5398
  msgid "Run command bound to this key's lowercase variant"
  msgstr "Ð—Ð°Ð¿ÑƒÑ�Ñ‚Ð¸Ñ‚ÑŒ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ, Ð¿Ñ€Ð¸Ð²Ñ�Ð·Ð°Ð½Ð½ÑƒÑŽ Ðº Ñ�Ñ‚Ð¾Ð¹ ÐºÐ»Ð°Ð²Ð¸ÑˆÐµ Ð² Ð½Ð¸Ð¶Ð½ÐµÐ¼ Ñ€ÐµÐ³Ð¸Ñ�Ñ‚Ñ€Ðµ"
  
! #: info/session.c:5409
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Ð�ÐµÐ¸Ð·Ð²ÐµÑ�Ñ‚Ð½Ð°Ñ� ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° (%s)."
  
! #: info/session.c:5412
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "Ð�ÐµÐ²ÐµÑ€Ð½Ð°Ñ� ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Â«%sÂ»"
  
! #: info/session.c:5413
  #, c-format
  msgid "'%s' is invalid"
  msgstr "Â«%sÂ» Ð½ÐµÐ²ÐµÑ€Ð½Ð¾"
  
! #: info/session.c:5731
  msgid "Add this digit to the current numeric argument"
  msgstr "Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ Ñ†Ð¸Ñ„Ñ€Ñƒ Ðº Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¼Ñƒ Ñ‡Ð¸Ñ�Ð»Ð¾Ð²Ð¾Ð¼Ñƒ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñƒ"
  
! #: info/session.c:5738
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "Ð�Ð°Ñ‡Ð°Ñ‚ÑŒ (Ð¸Ð»Ð¸ ÑƒÐ¼Ð½Ð¾Ð¶Ð¸Ñ‚ÑŒ Ð½Ð° 4) Ñ‚ÐµÐºÑƒÑ‰Ð¸Ð¹ Ñ‡Ð¸Ñ�Ð»Ð¾Ð²Ð¾Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚"
--- 1295,1633 ----
  msgstr "Ð�ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð¹Ñ‚Ð¸ Ð½Ð¾Ð´Ñƒ Ð¿Ð¾ Ñ�Ñ�Ñ‹Ð»ÐºÐµ Â«%sÂ» Ð² Â«%sÂ»."
  
! #: info/session.c:2870
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "Ð¡Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ Ñ�Ð¿Ð¸Ñ�Ð¾Ðº Ð¼ÐµÐ½ÑŽ, Ð½Ð°Ñ‡Ð¸Ð½Ð°ÑŽÑ‰Ð¸Ð¹Ñ�Ñ� Ñ� dir Ð¸ Ð¿Ñ€Ð¾Ñ�Ð»ÐµÐ´Ð¾Ð²Ð°Ñ‚ÑŒ Ð¿Ð¾ Ð½Ð¸Ð¼"
  
! #: info/session.c:2872
  msgid "Follow menus: "
  msgstr "ÐŸÑ€Ð¾Ñ�Ð»ÐµÐ´Ð¾Ð²Ð°Ñ‚ÑŒ Ð¿Ð¾ Ð¼ÐµÐ½ÑŽ: "
  
! #: info/session.c:2977
  msgid "Select the Next node"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð½Ð° Â«Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰ÑƒÑŽÂ» Ð½Ð¾Ð´Ñƒ"
  
! #: info/session.c:2984
  msgid "Select the Prev node"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð½Ð° Â«ÐŸÑ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰ÑƒÑŽÂ» Ð½Ð¾Ð´Ñƒ"
  
! #: info/session.c:2991
  msgid "Select the Up node"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð½Ð° Â«Ð’ÐµÑ€Ñ…Ð½ÑŽÑŽÂ» Ð½Ð¾Ð´Ñƒ"
  
! #: info/session.c:2997
  msgid "Select the last node in this file"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð½Ð° Ð¿Ð¾Ñ�Ð»ÐµÐ´Ð½ÑŽÑŽ Ð½Ð¾Ð´Ñƒ Ð² Ñ„Ð°Ð¹Ð»Ðµ"
  
! #: info/session.c:3024 info/session.c:3057
  msgid "This window has no additional nodes"
  msgstr "Ð­Ñ‚Ð¾ Ð¾ÐºÐ½Ð¾ Ð½Ðµ Ð¸Ð¼ÐµÐµÑ‚ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ñ… Ð½Ð¾Ð´"
  
! #: info/session.c:3030
  msgid "Select the first node in this file"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð½Ð° Ð¿ÐµÑ€Ð²ÑƒÑŽ Ð½Ð¾Ð´Ñƒ Ð² Ñ„Ð°Ð¹Ð»Ðµ"
  
! #: info/session.c:3164
  msgid "No more nodes within this document."
  msgstr "Ð’ Ñ�Ñ‚Ð¾Ð¼ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ðµ Ð±Ð¾Ð»ÑŒÑˆÐµ Ð½ÐµÑ‚ Ð½Ð¾Ð´."
  
! #: info/session.c:3209 info/session.c:3249
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "Ð’ Ñ�Ñ‚Ð¾Ð¼ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ðµ Ð½ÐµÑ‚ Ñ�Ñ�Ñ‹Ð»ÐºÐ¸ Â«ÐŸÑ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰Ð°Ñ�Â» Ð¸Ð»Ð¸ Â«Ð’Ð²ÐµÑ€Ñ…Â» Ð´Ð»Ñ� Ñ�Ñ‚Ð¾Ð¹ Ð½Ð¾Ð´Ñ‹."
  
! #: info/session.c:3262
  msgid "Move forwards or down through node structure"
  msgstr "ÐŸÑ€Ð¾Ð´Ð²Ð¸Ð³Ð°Ñ‚ÑŒÑ�Ñ� Ð²Ð¿ÐµÑ€Ñ‘Ð´ Ð¸Ð»Ð¸ Ð²Ð½Ð¸Ð· Ð¿Ð¾ Ñ�Ñ‚Ñ€ÑƒÐºÑ‚ÑƒÑ€Ðµ Ð½Ð¾Ð´"
  
! #: info/session.c:3279
  msgid "Move backwards or up through node structure"
  msgstr "ÐŸÑ€Ð¾Ð´Ð²Ð¸Ð³Ð°Ñ‚ÑŒÑ�Ñ� Ð½Ð°Ð·Ð°Ð´ Ð¸Ð»Ð¸ Ð²Ð²ÐµÑ€Ñ… Ð¿Ð¾ Ñ�Ñ‚Ñ€ÑƒÐºÑ‚ÑƒÑ€Ðµ Ð½Ð¾Ð´"
  
! #: info/session.c:3302
  msgid "Read a node name and select it"
  msgstr "Ð¡Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ Ð¸Ð¼Ñ� Ð½Ð¾Ð´Ñ‹ Ð¸ Ð¿ÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ðº Ð½ÐµÐ¹"
  
! #: info/session.c:3356 info/session.c:3360
  msgid "Goto node: "
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ðº Ð½Ð¾Ð´Ðµ: "
  
! #: info/session.c:3539
  msgid "Find the node describing program invocation"
  msgstr "Ð�Ð°Ð¹Ñ‚Ð¸ Ð½Ð¾Ð´Ñƒ, Ð¾Ð¿Ð¸Ñ�Ñ‹Ð²Ð°ÑŽÑ‰ÑƒÑŽ, ÐºÐ°Ðº Ð²Ñ‹Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñƒ"
  
! #: info/session.c:3541
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Ð�Ð°Ð¹Ñ‚Ð¸ Ð½Ð¾Ð´Ñƒ Invocation Ð´Ð»Ñ� [%s]: "
  
! #: info/session.c:3586
  msgid "Read a manpage reference and select it"
  msgstr "Ð¡Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ Ñ�Ñ�Ñ‹Ð»ÐºÑƒ Ð½Ð° Ñ�Ð¿Ñ€Ð°Ð²Ð¾Ñ‡Ð½ÑƒÑŽ Ñ�Ñ‚Ñ€Ð°Ð½Ð¸Ñ†Ñƒ (manpage) Ð¸ Ð¿ÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ðº Ð½ÐµÐ¹"
  
! #: info/session.c:3590
  msgid "Get Manpage: "
  msgstr "ÐŸÑ€Ð¾Ñ�Ð¼Ð¾Ñ‚Ñ€ÐµÑ‚ÑŒ Ñ�Ð¿Ñ€Ð°Ð²Ð¾Ñ‡Ð½ÑƒÑŽ Ñ�Ñ‚Ñ€Ð°Ð½Ð¸Ñ†Ñƒ (manpage): "
  
! #: info/session.c:3611
  msgid "Select the node 'Top' in this file"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð½Ð° Â«ÐŸÐµÑ€Ð²ÑƒÑŽÂ» Ð½Ð¾Ð´Ñƒ Ð² Ñ�Ñ‚Ð¾Ð¼ Ñ„Ð°Ð¹Ð»Ðµ"
  
! #: info/session.c:3617
  msgid "Select the node '(dir)'"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð½Ð° Ð½Ð¾Ð´Ñƒ Â«(dir)Â»"
  
! #: info/session.c:3623
  msgid "Show full file name of node being displayed"
  msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¿Ð¾Ð»Ð½Ð¾Ðµ Ð¸Ð¼Ñ� Ñ„Ð°Ð¹Ð»Ð° Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°ÐµÐ¼Ð¾Ð¹ Ð½Ð¾Ð´Ñ‹"
  
! #: info/session.c:3640
  msgid "Select the most recently selected node"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ðº Ð¿Ð¾Ñ�Ð»ÐµÐ´Ð½ÐµÐ¹ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð¾Ð¹ Ð½Ð¾Ð´Ðµ"
  
! #: info/session.c:3645
  #, c-format
  msgid "No earlier node in history"
  msgstr "Ð’ Ð¸Ñ�Ñ‚Ð¾Ñ€Ð¸Ð¸ Ð½ÐµÑ‚ Ð±Ð¾Ð»ÐµÐµ Ñ€Ð°Ð½Ð½ÐµÐ¹ Ð½Ð¾Ð´Ñ‹"
  
! #: info/session.c:3649
  msgid "Read the name of a file and select it"
  msgstr "Ð¡Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ Ð¸Ð¼Ñ� Ñ„Ð°Ð¹Ð»Ð° Ð¸ Ð¿ÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ðº Ð½ÐµÐ¼Ñƒ"
  
! #: info/session.c:3653
  msgid "Find file: "
  msgstr "Ð�Ð°Ð¹Ñ‚Ð¸ Ñ„Ð°Ð¹Ð»: "
  
! #: info/session.c:3670
  #, c-format
  msgid "Cannot find '%s'."
  msgstr "Ð�ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð¹Ñ‚Ð¸ Â«%sÂ»."
  
! #: info/session.c:3719
  #, c-format
  msgid "Could not create output file '%s'."
  msgstr "Ð�ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ñ�Ð¾Ð·Ð´Ð°Ñ‚ÑŒ Ð²Ñ‹Ñ…Ð¾Ð´Ð½Ð¾Ð¹ Ñ„Ð°Ð¹Ð» Â«%sÂ»."
  
! #: info/session.c:3733
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð·Ð°Ð¿Ð¸Ñ�Ð¸ Ð² %s: %s"
  
! #: info/session.c:3742
  #, c-format
  msgid "closing %s"
  msgstr "Ð·Ð°ÐºÑ€Ñ‹Ð²Ð°ÐµÑ‚Ñ�Ñ� %s"
  
! #: info/session.c:3791
  #, c-format
  msgid "writing node %s..."
  msgstr "Ð·Ð°Ð¿Ð¸Ñ�ÑŒ Ð½Ð¾Ð´Ñ‹ %sâ€¦"
  
! #: info/session.c:3837
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "ÐŸÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð¸Ð¼Ð¾Ðµ Ñ�Ñ‚Ð¾Ð¹ Ð½Ð¾Ð´Ñ‹ Ð½Ð° Ð²Ñ…Ð¾Ð´ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹ INFO_PRINT_COMMAND"
  
! #: info/session.c:3865
  #, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Ð�ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ ÐºÐ°Ð½Ð°Ð» Ðº Â«%sÂ»."
  
! #: info/session.c:3870
  #, c-format
  msgid "printing node %s..."
  msgstr "Ð¿ÐµÑ‡Ð°Ñ‚Ð°ÐµÑ‚Ñ�Ñ� Ð½Ð¾Ð´Ð° %s"
  
! #: info/session.c:3878
  #, c-format
  msgid "finished printing node %s"
  msgstr "Ð¿ÐµÑ‡Ð°Ñ‚ÑŒ Ð½Ð¾Ð´Ñ‹ %s Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð°"
  
! #: info/session.c:3910
  msgid "Toggle the usage of regular expressions in searches"
  msgstr "ÐŸÐµÑ€ÐµÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð¸Ñ�Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ñ€ÐµÐ³ÑƒÐ»Ñ�Ñ€Ð½Ñ‹Ñ… Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ð¹ Ð² Ð¿Ð¾Ð¸Ñ�ÐºÐµ"
  
! #: info/session.c:3914
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr "Ð˜Ñ�Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ñ€ÐµÐ³ÑƒÐ»Ñ�Ñ€Ð½Ñ‹Ñ… Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ð¹ Ð¿Ñ€Ð¸ Ð¿Ð¾Ð¸Ñ�ÐºÐµ."
  
! #: info/session.c:3915
  #, c-format
  msgid "Using literal strings for searches."
  msgstr "Ð˜Ñ�Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ñ… Ñ�Ñ‚Ñ€Ð¾Ðº Ð¿Ñ€Ð¸ Ð¿Ð¾Ð¸Ñ�ÐºÐµ."
  
! #: info/session.c:4175
  msgid "Search continued from the end of the document."
  msgstr "ÐŸÐ¾Ð¸Ñ�Ðº Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚Ñ�Ñ� Ñ� ÐºÐ¾Ð½Ñ†Ð° Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°."
  
! #: info/session.c:4180
  msgid "Search continued from the beginning of the document."
  msgstr "ÐŸÐ¾Ð¸Ñ�Ðº Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚Ñ�Ñ� Ñ� Ð½Ð°Ñ‡Ð°Ð»Ð° Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°."
  
! #: info/session.c:4200
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "ÐŸÐ¾Ð¸Ñ�Ðº Ð¿Ð¾Ð´Ñ„Ð°Ð¹Ð»Ð° %sâ€¦"
  
! #: info/session.c:4237
  msgid "Search failed."
  msgstr "Ð�Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾."
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Regexp search"
  msgstr "ÐŸÐ¾Ð¸Ñ�Ðº Ð¿Ð¾ Ñ€ÐµÐ³ÑƒÐ»Ñ�Ñ€Ð½Ñ‹Ð¼ Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ�Ð¼"
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Search"
  msgstr "ÐŸÐ¾Ð¸Ñ�Ðº"
  
! #: info/session.c:4256 info/session.c:4262
  msgid " case-sensitively"
  msgstr " c ÑƒÑ‡Ñ‘Ñ‚Ð¾Ð¼ Ñ€ÐµÐ³Ð¸Ñ�Ñ‚Ñ€Ð°"
  
! #: info/session.c:4257 info/session.c:4263
  msgid " backward"
  msgstr " Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ñ‹Ð¹ Ð¿Ð¾Ð¸Ñ�Ðº"
  
! #: info/session.c:4260
  #, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s: "
  
! #: info/session.c:4280
  msgid "Search string too short"
  msgstr "Ð¡Ð»Ð¸ÑˆÐºÐ¾Ð¼ ÐºÐ¾Ñ€Ð¾Ñ‚ÐºÐ°Ñ� Ñ�Ñ‚Ñ€Ð¾ÐºÐ° Ð¿Ð¾Ð¸Ñ�ÐºÐ°"
  
! #: info/session.c:4473
  #, c-format
  msgid "Going back to last match from %s"
  msgstr "ÐŸÐµÑ€ÐµÑ…Ð¾Ð´Ð¸Ð¼ Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ð¾ Ðº Ð¿Ð¾Ñ�Ð»ÐµÐ´Ð½ÐµÐ¼Ñƒ Ñ�Ð¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸ÑŽ Ð¸Ð· %s"
  
! #: info/session.c:4497 info/session.c:4607
  #, c-format
  msgid "No more matches."
  msgstr "Ð‘Ð¾Ð»ÑŒÑˆÐµ Ð½ÐµÑ‚ Ñ�Ð¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ð¹."
  
! #: info/session.c:4634
  msgid "Search this node and subnodes for a string."
  msgstr "Ð˜Ñ�ÐºÐ°Ñ‚ÑŒ Ñ�Ñ‚Ñ€Ð¾ÐºÑƒ Ð² Ñ�Ñ‚Ð¾Ð¹ Ð½Ð¾Ð´Ðµ Ð¸ Ð¿Ð¾Ð´Ð½Ð¾Ð´Ð°Ñ…."
  
! #: info/session.c:4655
  msgid "Go to next match in Info sub-tree"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ðº Ñ�Ð»ÐµÐ´ÑƒÑŽÑ‰ÐµÐ¼Ñƒ Ñ�Ð¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸ÑŽ Ð² Ð¿Ð¾Ð´Ð´ÐµÑ€ÐµÐ²Ðµ Info"
  
! #: info/session.c:4659 info/session.c:4671
  #, c-format
  msgid "No active search"
  msgstr "Ð�ÐµÑ‚ Ð°ÐºÑ‚Ð¸Ð²Ð½Ð¾Ð³Ð¾ Ð¿Ð¾Ð¸Ñ�ÐºÐ°"
  
! #: info/session.c:4667
  msgid "Go to previous match in Info sub-tree"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ðº Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰ÐµÐ¼Ñƒ Ñ�Ð¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸ÑŽ Ð² Ð¿Ð¾Ð´Ð´ÐµÑ€ÐµÐ²Ðµ Info"
  
! #: info/session.c:4680
  msgid "Read a string and search for it case-sensitively"
  msgstr "Ð¡Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ Ñ�Ñ‚Ñ€Ð¾ÐºÑƒ Ð¸ Ð·Ð°Ð¿ÑƒÑ�Ñ‚Ð¸Ñ‚ÑŒ Ñ€ÐµÐ³Ð¸Ñ�Ñ‚Ñ€Ð¾Ð·Ð°Ð²Ð¸Ñ�Ð¸Ð¼Ñ‹Ð¹ Ð¿Ð¾Ð¸Ñ�Ðº"
  
! #: info/session.c:4685
  msgid "Read a string and search for it"
  msgstr "Ð¡Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ Ñ�Ñ‚Ñ€Ð¾ÐºÑƒ Ð¸ Ð·Ð°Ð¿ÑƒÑ�Ñ‚Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð¸Ñ�Ðº"
  
! #: info/session.c:4691
  msgid "Read a string and search backward for it"
  msgstr "Ð¡Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ Ñ�Ñ‚Ñ€Ð¾ÐºÑƒ Ð¸ Ð·Ð°Ð¿ÑƒÑ�Ñ‚Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð¸Ñ�Ðº Ð² Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ð¾Ð¼ Ð½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ð¸"
  
! #: info/session.c:4699
  msgid "Repeat last search in the same direction"
  msgstr "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚ÑŒ Ð¿Ð¾Ñ�Ð»ÐµÐ´Ð½Ð¸Ð¹ Ð¿Ð¾Ð¸Ñ�Ðº Ð² Ñ‚Ð¾Ð¼ Ð¶Ðµ Ð½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ð¸"
  
! #: info/session.c:4707 info/session.c:4752
  msgid "No previous search string"
  msgstr "Ð�ÐµÑ‚ Ñ�Ñ‚Ñ€Ð¾ÐºÐ¸ Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰ÐµÐ³Ð¾ Ð¿Ð¾Ð¸Ñ�ÐºÐ°"
  
! #: info/session.c:4744
  msgid "Repeat last search in the reverse direction"
  msgstr "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚ÑŒ Ð¿Ð¾Ñ�Ð»ÐµÐ´Ð½Ð¸Ð¹ Ð¿Ð¾Ð¸Ñ�Ðº Ð² Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ð¾Ð¼ Ð½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ð¸"
  
! #: info/session.c:4791
  msgid "Clear displayed search matches"
  msgstr "ÐžÑ‡Ð¸Ñ�Ñ‚Ð¸Ñ‚ÑŒ Ð¿Ð¾ÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ðµ Ñ�Ð¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ� Ð¿Ð¾Ð¸Ñ�ÐºÐ°"
  
! #: info/session.c:4808 info/session.c:4814
  msgid "Search interactively for a string as you type it"
  msgstr "Ð—Ð°Ð¿ÑƒÑ�Ñ‚Ð¸Ñ‚ÑŒ Ð¸Ð½Ñ‚ÐµÑ€Ð°ÐºÑ‚Ð¸Ð²Ð½Ñ‹Ð¹ Ð¿Ð¾Ð¸Ñ�Ðº Ð¿Ð¾ Ð¼ÐµÑ€Ðµ Ð²Ð²Ð¾Ð´Ð° Ñ�Ñ‚Ñ€Ð¾ÐºÐ¸"
  
! #: info/session.c:4934
  msgid "Regexp I-search backward: "
  msgstr "Ð�Ð°Ñ€Ð°Ñ‰Ð¸Ð²Ð°ÐµÐ¼Ñ‹Ð¹ Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ñ‹Ð¹ Ð¿Ð¾Ð¸Ñ�Ðº Ð¿Ð¾ Ñ€ÐµÐ³ÑƒÐ»Ñ�Ñ€Ð½Ð¾Ð¼Ñƒ Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸ÑŽ: "
  
! #: info/session.c:4935
  msgid "I-search backward: "
  msgstr "Ð�Ð°Ñ€Ð°Ñ‰Ð¸Ð²Ð°ÐµÐ¼Ñ‹Ð¹ Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ñ‹Ð¹ Ð¿Ð¾Ð¸Ñ�Ðº: "
  
! #: info/session.c:4937
  msgid "Regexp I-search: "
  msgstr "Ð�Ð°Ñ€Ð°Ñ‰Ð¸Ð²Ð°ÐµÐ¼Ñ‹Ð¹ Ð¿Ð¾Ð¸Ñ�Ðº Ð¿Ð¾ Ñ€ÐµÐ³ÑƒÐ»Ñ�Ñ€Ð½Ð¾Ð¼Ñƒ Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸ÑŽ: "
  
! #: info/session.c:4938
  msgid "I-search: "
  msgstr "Ð�Ð°Ñ€Ð°Ñ‰Ð¸Ð²Ð°ÐµÐ¼Ñ‹Ð¹ Ð¿Ð¾Ð¸Ñ�Ðº: "
  
! #: info/session.c:4963 info/session.c:4966
  msgid "Failing "
  msgstr "Ð�Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ "
  
! #: info/session.c:5332
  msgid "Cancel current operation"
  msgstr "ÐžÑ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹"
  
! #: info/session.c:5339
  msgid "Quit"
  msgstr "Ð’Ñ‹Ñ…Ð¾Ð´"
  
! #: info/session.c:5344
  msgid "Display version of Info being run"
  msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð²ÐµÑ€Ñ�Ð¸ÑŽ Ð·Ð°Ð¿ÑƒÑ‰ÐµÐ½Ð½Ð¾Ð¹ Info"
  
! #: info/session.c:5346
  #, c-format
  msgid "GNU Info version %s"
  msgstr "GNU Info, Ð²ÐµÑ€Ñ�Ð¸Ñ� %s"
  
! #: info/session.c:5351
  msgid "Redraw the display"
  msgstr "ÐŸÐµÑ€ÐµÑ€Ð¸Ñ�Ð¾Ð²Ð°Ñ‚ÑŒ Ñ�ÐºÑ€Ð°Ð½"
  
! #: info/session.c:5388
  msgid "Quit using Info"
  msgstr "Ð’Ñ‹Ð¹Ñ‚Ð¸ Ð¸Ð· Info"
  
! #: info/session.c:5404
  msgid "Run command bound to this key's lowercase variant"
  msgstr "Ð—Ð°Ð¿ÑƒÑ�Ñ‚Ð¸Ñ‚ÑŒ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ, Ð¿Ñ€Ð¸Ð²Ñ�Ð·Ð°Ð½Ð½ÑƒÑŽ Ðº Ñ�Ñ‚Ð¾Ð¹ ÐºÐ»Ð°Ð²Ð¸ÑˆÐµ Ð² Ð½Ð¸Ð¶Ð½ÐµÐ¼ Ñ€ÐµÐ³Ð¸Ñ�Ñ‚Ñ€Ðµ"
  
! #: info/session.c:5415
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Ð�ÐµÐ¸Ð·Ð²ÐµÑ�Ñ‚Ð½Ð°Ñ� ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° (%s)."
  
! #: info/session.c:5418
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "Ð�ÐµÐ²ÐµÑ€Ð½Ð°Ñ� ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Â«%sÂ»"
  
! #: info/session.c:5419
  #, c-format
  msgid "'%s' is invalid"
  msgstr "Â«%sÂ» Ð½ÐµÐ²ÐµÑ€Ð½Ð¾"
  
! #: info/session.c:5737
  msgid "Add this digit to the current numeric argument"
  msgstr "Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ Ñ†Ð¸Ñ„Ñ€Ñƒ Ðº Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¼Ñƒ Ñ‡Ð¸Ñ�Ð»Ð¾Ð²Ð¾Ð¼Ñƒ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñƒ"
  
! #: info/session.c:5744
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "Ð�Ð°Ñ‡Ð°Ñ‚ÑŒ (Ð¸Ð»Ð¸ ÑƒÐ¼Ð½Ð¾Ð¶Ð¸Ñ‚ÑŒ Ð½Ð° 4) Ñ‚ÐµÐºÑƒÑ‰Ð¸Ð¹ Ñ‡Ð¸Ñ�Ð»Ð¾Ð²Ð¾Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚"
***************
*** 1775,1792 ****
  msgstr "Ð£Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ %s Ñ€Ð°Ð²Ð½Ñ‹Ð¼ (%s): "
  
! #: info/window.c:959
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), Ñ�Ñ‚Ñ€Ð¾Ðº ----, "
  
- #: info/window.c:966
- #, c-format
- msgid "-%s---Info: %s, %ld lines --%s--"
- msgstr "-%s---Info: %s, Ñ�Ñ‚Ñ€Ð¾Ðº: %ld --%s--"
- 
- #: info/window.c:970
- #, c-format
- msgid "-%s---Info: (%s)%s, %ld lines --%s--"
- msgstr "-%s---Info: (%s)%s, %ld Ñ�Ñ‚Ñ€Ð¾Ðº --%s--"
- 
  #: install-info/install-info.c:292
  #, c-format
--- 1772,1779 ----
  msgstr "Ð£Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ %s Ñ€Ð°Ð²Ð½Ñ‹Ð¼ (%s): "
  
! #: info/window.c:909
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), Ñ�Ñ‚Ñ€Ð¾Ðº ----, "
  
  #: install-info/install-info.c:292
  #, c-format
***************
*** 1969,1973 ****
  "\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"
--- 1956,1960 ----
  "\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"
***************
*** 1984,1988 ****
  "\n"
  "  Ð—Ð´ÐµÑ�ÑŒ (Ð² Ð½Ð¾Ð´Ðµ Directory) Ð¿Ñ€ÐµÐ´Ñ�Ñ‚Ð°Ð²Ð»ÐµÐ½Ð¾ Ð¼ÐµÐ½ÑŽ Ð¿Ð¾ Ð¾Ñ�Ð½Ð¾Ð²Ð½Ñ‹Ð¼ Ñ‚ÐµÐ¼Ð°Ð¼.\n"
! "  Ð�Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ Â«qÂ», Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð²Ñ‹Ð¹Ñ‚Ð¸; Â«?Â», Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ð¾Ñ�Ð¼Ð¾Ñ‚Ñ€ÐµÑ‚ÑŒ Ð²Ñ�Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹ Info;\n"
  "  Â«dÂ», Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð²ÐµÑ€Ð½ÑƒÑ‚ÑŒÑ�Ñ� Ñ�ÑŽÐ´Ð°; Â«hÂ», Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ Ñ€ÑƒÐºÐ¾Ð²Ð¾Ð´Ñ�Ñ‚Ð²Ð¾ Ð´Ð»Ñ� Ð½Ð¾Ð²Ð¸Ñ‡ÐºÐ¾Ð²;\n"
  "  Â«mEmacs<Return>Â», Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ Ñ€ÑƒÐºÐ¾Ð²Ð¾Ð´Ñ�Ñ‚Ð²Ð¾ Ð¿Ð¾ Emacs.\n"
--- 1971,1975 ----
  "\n"
  "  Ð—Ð´ÐµÑ�ÑŒ (Ð² Ð½Ð¾Ð´Ðµ Directory) Ð¿Ñ€ÐµÐ´Ñ�Ñ‚Ð°Ð²Ð»ÐµÐ½Ð¾ Ð¼ÐµÐ½ÑŽ Ð¿Ð¾ Ð¾Ñ�Ð½Ð¾Ð²Ð½Ñ‹Ð¼ Ñ‚ÐµÐ¼Ð°Ð¼.\n"
! "  Ð�Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ Â«qÂ», Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð²Ñ‹Ð¹Ñ‚Ð¸; Â«HÂ», Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ð¾Ñ�Ð¼Ð¾Ñ‚Ñ€ÐµÑ‚ÑŒ Ð²Ñ�Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹ Info;\n"
  "  Â«dÂ», Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð²ÐµÑ€Ð½ÑƒÑ‚ÑŒÑ�Ñ� Ñ�ÑŽÐ´Ð°; Â«hÂ», Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ Ñ€ÑƒÐºÐ¾Ð²Ð¾Ð´Ñ�Ñ‚Ð²Ð¾ Ð´Ð»Ñ� Ð½Ð¾Ð²Ð¸Ñ‡ÐºÐ¾Ð²;\n"
  "  Â«mEmacs<Return>Â», Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ Ñ€ÑƒÐºÐ¾Ð²Ð¾Ð´Ñ�Ñ‚Ð²Ð¾ Ð¿Ð¾ Emacs.\n"
***************
*** 2063,2179 ****
  msgstr "Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ñ‹ Ñ�Ð»ÐµÐ¼ÐµÐ½Ñ‚Ñ‹ Ð´Ð»Ñ� Â«%sÂ»; Ð½Ð¸Ñ‡ÐµÐ³Ð¾ Ð½Ðµ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¾"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:855
! #: tp/Texinfo/Convert/Converter.pm:893 tp/Texinfo/Convert/Converter.pm:1204
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6504
! #: tp/Texinfo/Convert/HTML.pm:6528 tp/Texinfo/Convert/HTML.pm:6905
! #: tp/Texinfo/Convert/HTML.pm:6963 tp/Texinfo/Convert/HTML.pm:7041
! #: tp/Texinfo/Convert/HTML.pm:7118 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:546
! #: tp/Texinfo/Convert/TexinfoXML.pm:457
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ %s Ð½Ð° Ð·Ð°Ð¿Ð¸Ñ�ÑŒ: %s"
  
! #: tp/Texinfo/Common.pm:881
  msgid "recursion is always allowed"
  msgstr "Ñ€ÐµÐºÑƒÑ€Ñ�Ð¸Ñ� Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð° Ð²Ñ�ÐµÐ³Ð´Ð°"
  
! #: tp/Texinfo/Common.pm:882
  msgid "arguments are quoted by default"
  msgstr "Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñ‹ Ð² ÐºÐ°Ð²Ñ‹Ñ‡ÐºÐ°Ñ…"
  
! #: tp/Texinfo/Common.pm:1105
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s Ð½Ðµ Ñ�Ð²Ð»Ñ�ÐµÑ‚Ñ�Ñ� Ð´Ð¾Ð¿ÑƒÑ�Ñ‚Ð¸Ð¼Ñ‹Ð¼ ÐºÐ¾Ð´Ð¾Ð¼ Ñ�Ð·Ñ‹ÐºÐ°"
  
! #: tp/Texinfo/Common.pm:1110
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s Ð½Ðµ Ñ�Ð²Ð»Ñ�ÐµÑ‚Ñ�Ñ� Ð´Ð¾Ð¿ÑƒÑ�Ñ‚Ð¸Ð¼Ñ‹Ð¼ ÐºÐ¾Ð´Ð¾Ð¼ Ð¾Ð±Ð»Ð°Ñ�Ñ‚Ð¸"
  
! #: tp/Texinfo/Common.pm:1128
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%s Ð½Ðµ Ñ�Ð²Ð»Ñ�ÐµÑ‚Ñ�Ñ� Ð´Ð¾Ð¿ÑƒÑ�Ñ‚Ð¸Ð¼Ð¾Ð¹ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñ�Ñ‚ÑŒÑŽ Ñ€Ð°Ð·Ð´ÐµÐ»ÐµÐ½Ð¸Ñ�"
  
! #: tp/Texinfo/Common.pm:1151
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ %s: %s"
  
! #: tp/Texinfo/Common.pm:1170
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ Ñ„Ð°Ð¹Ð»Ð° @verbatiminclude %s: %s"
  
! #: tp/Texinfo/Common.pm:1176 tp/Texinfo/Parser.pm:3353
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%s: Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð¹Ñ‚Ð¸ %s"
  
! #: tp/Texinfo/Common.pm:1520
! #, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr "Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» Ð½Ð°Ñ�Ñ‚Ñ€Ð¾ÐµÐº Ñ�Ñ�Ñ‹Ð»Ð¾Ðº html %s: %s"
! 
! #: tp/Texinfo/Common.pm:1548
! msgid "missing type"
! msgstr "Ð¾Ñ‚Ñ�ÑƒÑ‚Ñ�Ñ‚Ð²ÑƒÐµÑ‚ Ñ‚Ð¸Ð¿"
! 
! #: tp/Texinfo/Common.pm:1551
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "Ð½ÐµÑ€Ð°Ñ�Ð¿Ð¾Ð·Ð½Ð°Ð½Ð½Ñ‹Ð¹ Ñ‚Ð¸Ð¿: %s"
! 
! #: tp/Texinfo/Common.pm:1568
! #, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr "Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ Ñ„Ð°Ð¹Ð»Ð° Ð½Ð°Ñ�Ñ‚Ñ€Ð¾ÐµÐº Ñ�Ñ�Ñ‹Ð»Ð¾Ðº html %s: %s"
! 
! #: tp/Texinfo/Common.pm:1603
  msgid "no node to be renamed"
  msgstr "Ð¾Ñ‚Ñ�ÑƒÑ‚Ñ�Ñ‚Ð²ÑƒÐµÑ‚ Ð½Ð¾Ð´Ð° Ð´Ð»Ñ� Ð¿ÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ�"
  
! #: tp/Texinfo/Common.pm:1614
  msgid "nodes without a new name at the end of file"
  msgstr "Ð½Ð¾Ð´Ñ‹ Ð±ÐµÐ· Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ð¸Ð¼ÐµÐ½Ð¸ Ð² ÐºÐ¾Ð½Ñ†Ðµ Ñ„Ð°Ð¹Ð»Ð°"
  
! #: tp/Texinfo/Common.pm:1624 tp/Texinfo/Parser.pm:926
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ %s: %s"
  
! #: tp/Texinfo/Common.pm:2144
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr "Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð·Ð°Ñ‰Ð¸Ñ‚Ð¸Ñ‚ÑŒ Ñ…Ñ�Ñˆ-Ñ�Ð¸Ð¼Ð²Ð¾Ð» Ð² @%s"
  
! #: tp/Texinfo/Convert/Converter.pm:395 tp/Texinfo/Convert/Converter.pm:414
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Ð£Ñ�Ñ‚Ð°Ñ€ÐµÐ²ÑˆÐ°Ñ� Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ� %s\n"
  
! #: tp/Texinfo/Convert/Converter.pm:794
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr "%s: Ð²Ñ‹Ð²Ð¾Ð´ Ð½ÐµÑ�Ð¾Ð²Ð¼ÐµÑ�Ñ‚Ð¸Ð¼ Ñ� Ñ€Ð°Ð·Ð´ÐµÐ»ÐµÐ½Ð¸ÐµÐ¼"
  
! #: tp/Texinfo/Convert/Converter.pm:876 tp/Texinfo/Convert/Converter.pm:909
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:6931
! #: tp/Texinfo/Convert/HTML.pm:6989 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:476 tp/Texinfo/Parser.pm:2035
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ %s: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, perl-format
  msgid "could not create directories `%s' or `%s': %s"
  msgstr "Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ñ�Ð¾Ð·Ð´Ð°Ñ‚ÑŒ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³ Â«%sÂ» Ð¸Ð»Ð¸ Â«%sÂ»: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:995
  #, perl-format
  msgid "could not create directory `%s': %s"
--- 2050,2162 ----
  msgstr "Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ñ‹ Ñ�Ð»ÐµÐ¼ÐµÐ½Ñ‚Ñ‹ Ð´Ð»Ñ� Â«%sÂ»; Ð½Ð¸Ñ‡ÐµÐ³Ð¾ Ð½Ðµ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¾"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:847
! #: tp/Texinfo/Convert/Converter.pm:885 tp/Texinfo/Convert/Converter.pm:1196
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6573
! #: tp/Texinfo/Convert/HTML.pm:6597 tp/Texinfo/Convert/HTML.pm:6978
! #: tp/Texinfo/Convert/HTML.pm:7037 tp/Texinfo/Convert/HTML.pm:7115
! #: tp/Texinfo/Convert/HTML.pm:7192 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:547
! #: tp/Texinfo/Convert/TexinfoXML.pm:458
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ %s Ð½Ð° Ð·Ð°Ð¿Ð¸Ñ�ÑŒ: %s"
  
! #: tp/Texinfo/Common.pm:862
  msgid "recursion is always allowed"
  msgstr "Ñ€ÐµÐºÑƒÑ€Ñ�Ð¸Ñ� Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð° Ð²Ñ�ÐµÐ³Ð´Ð°"
  
! #: tp/Texinfo/Common.pm:863
  msgid "arguments are quoted by default"
  msgstr "Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñ‹ Ð² ÐºÐ°Ð²Ñ‹Ñ‡ÐºÐ°Ñ…"
  
! #: tp/Texinfo/Common.pm:866
! msgid ""
! "move your @contents command if you want the contents after the title page"
! msgstr ""
! "Ð¿ÐµÑ€ÐµÐ¼ÐµÑ�Ñ‚Ð¸Ñ‚Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ @contents, ÐµÑ�Ð»Ð¸ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð²Ð¸Ð´ÐµÑ‚ÑŒ Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð¸Ð¼Ð¾Ðµ Ð¿Ð¾Ñ�Ð»Ðµ Ñ‚Ð¸Ñ‚ÑƒÐ»ÑŒÐ½Ð¾Ð¹ "
! "Ñ�Ñ‚Ñ€Ð°Ð½Ð¸Ñ†Ñ‹"
! 
! #: tp/Texinfo/Common.pm:869
! msgid ""
! "move your @shortcontents and @contents commands if you want the contents "
! "after the title page"
! msgstr ""
! "Ð¿ÐµÑ€ÐµÐ¼ÐµÑ�Ñ‚Ð¸Ñ‚Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹ @shortcontents Ð¸ @contents, ÐµÑ�Ð»Ð¸ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð²Ð¸Ð´ÐµÑ‚ÑŒ "
! "Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð¸Ð¼Ð¾Ðµ Ð¿Ð¾Ñ�Ð»Ðµ Ñ‚Ð¸Ñ‚ÑƒÐ»ÑŒÐ½Ð¾Ð¹ Ñ�Ñ‚Ñ€Ð°Ð½Ð¸Ñ†Ñ‹"
! 
! #: tp/Texinfo/Common.pm:1093
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s Ð½Ðµ Ñ�Ð²Ð»Ñ�ÐµÑ‚Ñ�Ñ� Ð´Ð¾Ð¿ÑƒÑ�Ñ‚Ð¸Ð¼Ñ‹Ð¼ ÐºÐ¾Ð´Ð¾Ð¼ Ñ�Ð·Ñ‹ÐºÐ°"
  
! #: tp/Texinfo/Common.pm:1098
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s Ð½Ðµ Ñ�Ð²Ð»Ñ�ÐµÑ‚Ñ�Ñ� Ð´Ð¾Ð¿ÑƒÑ�Ñ‚Ð¸Ð¼Ñ‹Ð¼ ÐºÐ¾Ð´Ð¾Ð¼ Ð¾Ð±Ð»Ð°Ñ�Ñ‚Ð¸"
  
! #: tp/Texinfo/Common.pm:1116
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%s Ð½Ðµ Ñ�Ð²Ð»Ñ�ÐµÑ‚Ñ�Ñ� Ð´Ð¾Ð¿ÑƒÑ�Ñ‚Ð¸Ð¼Ð¾Ð¹ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñ�Ñ‚ÑŒÑŽ Ñ€Ð°Ð·Ð´ÐµÐ»ÐµÐ½Ð¸Ñ�"
  
! #: tp/Texinfo/Common.pm:1139
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ %s: %s"
  
! #: tp/Texinfo/Common.pm:1158
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ Ñ„Ð°Ð¹Ð»Ð° @verbatiminclude %s: %s"
  
! #: tp/Texinfo/Common.pm:1164 tp/Texinfo/Parser.pm:3193
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%s: Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð¹Ñ‚Ð¸ %s"
  
! #: tp/Texinfo/Common.pm:1637
  msgid "no node to be renamed"
  msgstr "Ð¾Ñ‚Ñ�ÑƒÑ‚Ñ�Ñ‚Ð²ÑƒÐµÑ‚ Ð½Ð¾Ð´Ð° Ð´Ð»Ñ� Ð¿ÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ�"
  
! #: tp/Texinfo/Common.pm:1648
  msgid "nodes without a new name at the end of file"
  msgstr "Ð½Ð¾Ð´Ñ‹ Ð±ÐµÐ· Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ð¸Ð¼ÐµÐ½Ð¸ Ð² ÐºÐ¾Ð½Ñ†Ðµ Ñ„Ð°Ð¹Ð»Ð°"
  
! #: tp/Texinfo/Common.pm:1658 tp/Texinfo/Parser.pm:899
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ %s: %s"
  
! #: tp/Texinfo/Common.pm:2178
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr "Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð·Ð°Ñ‰Ð¸Ñ‚Ð¸Ñ‚ÑŒ Ñ…Ñ�Ñˆ-Ñ�Ð¸Ð¼Ð²Ð¾Ð» Ð² @%s"
  
! #: tp/Texinfo/Convert/Converter.pm:387 tp/Texinfo/Convert/Converter.pm:406
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Ð£Ñ�Ñ‚Ð°Ñ€ÐµÐ²ÑˆÐ°Ñ� Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ� %s\n"
  
! #: tp/Texinfo/Convert/Converter.pm:786
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr "%s: Ð²Ñ‹Ð²Ð¾Ð´ Ð½ÐµÑ�Ð¾Ð²Ð¼ÐµÑ�Ñ‚Ð¸Ð¼ Ñ� Ñ€Ð°Ð·Ð´ÐµÐ»ÐµÐ½Ð¸ÐµÐ¼"
  
! #: tp/Texinfo/Convert/Converter.pm:868 tp/Texinfo/Convert/Converter.pm:901
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:7004
! #: tp/Texinfo/Convert/HTML.pm:7063 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:477 tp/Texinfo/Parser.pm:1996
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ %s: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:979
  #, perl-format
  msgid "could not create directories `%s' or `%s': %s"
  msgstr "Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ñ�Ð¾Ð·Ð´Ð°Ñ‚ÑŒ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³ Â«%sÂ» Ð¸Ð»Ð¸ Â«%sÂ»: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, perl-format
  msgid "could not create directory `%s': %s"
***************
*** 2185,2283 ****
  msgstr "Ñ„Ð°Ð¹Ð» @image Â«%sÂ» Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½, Ð¸Ñ�Ð¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚Ñ�Ñ� Â«%sÂ»"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5388
  msgid "no argument specified for @U"
  msgstr "Ð½Ðµ Ð·Ð°Ð´Ð°Ð½ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð»Ñ� @U"
  
! #: tp/Texinfo/Convert/HTML.pm:1683
  #, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
  msgstr "Ñ„Ð°Ð¹Ð» @image Â«%sÂ» (Ð´Ð»Ñ� HTML) Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½, Ð¸Ñ�Ð¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚Ñ�Ñ� Â«%sÂ»"
  
! #: tp/Texinfo/Convert/HTML.pm:2371
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "Ð½ÐµÑ�Ñ‚Ñ€ÑƒÐºÑ‚ÑƒÑ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ð¹ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ %s Ð½Ðµ Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½"
  
! #: tp/Texinfo/Convert/HTML.pm:4888
  msgid "string not closed in css file"
  msgstr "Ð½ÐµÐ·Ð°ÐºÑ€Ñ‹Ñ‚Ð°Ñ� Ñ�Ñ‚Ñ€Ð¾ÐºÐ° Ð² Ñ„Ð°Ð¹Ð»Ðµ css"
  
! #: tp/Texinfo/Convert/HTML.pm:4890
  msgid "--css-include ended in comment"
  msgstr "--css-include Ð¾Ð±Ñ€Ñ‹Ð²Ð°ÐµÑ‚Ñ�Ñ� Ð² ÐºÐ¾Ð¼Ð¼ÐµÐ½Ñ‚Ð°Ñ€Ð¸Ð¸"
  
! #: tp/Texinfo/Convert/HTML.pm:4892
  msgid "@import not finished in css file"
  msgstr "@import Ð½Ðµ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð° Ð² Ñ„Ð°Ð¹Ð»Ðµ css"
  
! #: tp/Texinfo/Convert/HTML.pm:4918
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "Ð¤Ð°Ð¹Ð» CSS %s Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½"
  
! #: tp/Texinfo/Convert/HTML.pm:4924
  #, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ --include-file %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:4934
  #, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ Ñ„Ð°Ð¹Ð»Ð° CSS %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5801 tp/Texinfo/Convert/HTML.pm:5805
  #, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "Ñ�Ð»ÐµÐ¼ÐµÐ½Ñ‚ htmlxref.cnf Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½ Ð² Â«%sÂ»"
  
! #: tp/Texinfo/Convert/HTML.pm:6499
  #, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ Ñ„Ð°Ð¹Ð»Ð° frame %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6523
  #, perl-format
  msgid "error on closing TOC frame file %s: %s"
  msgstr "Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ Ñ„Ð°Ð¹Ð»Ð° TOC frame %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6638
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr "Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚Ñ‡Ð¸ÐºÐ° %s Ð½Ð° Ñ�Ñ‚Ð°Ð´Ð¸Ð¸ %s Ñ� Ð¿Ñ€Ð¸Ð¾Ñ€Ð¸Ñ‚ÐµÑ‚Ð¾Ð¼ %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6839
  msgid "must specify a title with a title command or @top"
  msgstr "Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ð·Ð°Ð´Ð°Ð½ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ° Ð¸Ð»Ð¸ @top"
  
! #: tp/Texinfo/Convert/HTML.pm:7048
  #, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr "Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ Ñ„Ð°Ð¹Ð»Ð° Ð½Ð¾Ð´Ñ‹ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ� %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7073
  #, perl-format
  msgid "old name for `%s' is a node of the document"
  msgstr "Ñ�Ñ‚Ð°Ñ€Ð¾Ðµ Ð¸Ð¼Ñ� Â«%sÂ» â€” Ñ�Ñ‚Ð¾ Ð½Ð¾Ð´Ð° Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°"
  
! #: tp/Texinfo/Convert/HTML.pm:7079
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "Ñ„Ð°Ð¹Ð» Ð¿ÑƒÑ�Ñ‚ Ð´Ð»Ñ� Ð¿ÐµÑ€ÐµÐ¸Ð¼ÐµÐ½ÑƒÐµÐ¼Ð¾Ð¹ Ð½Ð¾Ð´Ñ‹ Â«%sÂ»"
  
! #: tp/Texinfo/Convert/HTML.pm:7093
  #, perl-format
  msgid "target node (new name for `%s') not in document: %s"
  msgstr "Ð½Ð¾Ð´Ð° Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ� (Ð½Ð¾Ð²Ð¾Ðµ Ð¸Ð¼Ñ� Ð´Ð»Ñ� Â«%sÂ») Ð¾Ñ‚Ñ�ÑƒÑ‚Ñ�Ñ‚Ð²ÑƒÐµÑ‚ Ð² Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ðµ: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7125
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
  msgstr "Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ Ñ„Ð°Ð¹Ð»Ð° Ð¿ÐµÑ€ÐµÐ¸Ð¼ÐµÐ½ÑƒÐµÐ¼Ð¾Ð¹ Ð½Ð¾Ð´Ñ‹ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ� %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7163
  msgid "empty node name"
  msgstr "Ð¿ÑƒÑ�Ñ‚Ð¾Ðµ Ð¸Ð¼Ñ� Ð½Ð¾Ð´Ñ‹"
  
! #: tp/Texinfo/Convert/HTML.pm:7165 tp/Texinfo/Parser.pm:3697
  #, perl-format
  msgid "syntax for an external node used for `%s'"
--- 2168,2285 ----
  msgstr "Ñ„Ð°Ð¹Ð» @image Â«%sÂ» Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½, Ð¸Ñ�Ð¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚Ñ�Ñ� Â«%sÂ»"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5225
  msgid "no argument specified for @U"
  msgstr "Ð½Ðµ Ð·Ð°Ð´Ð°Ð½ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð»Ñ� @U"
  
! #: tp/Texinfo/Convert/HTML.pm:1715
  #, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
  msgstr "Ñ„Ð°Ð¹Ð» @image Â«%sÂ» (Ð´Ð»Ñ� HTML) Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½, Ð¸Ñ�Ð¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚Ñ�Ñ� Â«%sÂ»"
  
! #: tp/Texinfo/Convert/HTML.pm:2399
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "Ð½ÐµÑ�Ñ‚Ñ€ÑƒÐºÑ‚ÑƒÑ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ð¹ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ %s Ð½Ðµ Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½"
  
! #: tp/Texinfo/Convert/HTML.pm:4629
! #, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr "Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» Ð½Ð°Ñ�Ñ‚Ñ€Ð¾ÐµÐº Ñ�Ñ�Ñ‹Ð»Ð¾Ðº html %s: %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4657
! msgid "missing type"
! msgstr "Ð¾Ñ‚Ñ�ÑƒÑ‚Ñ�Ñ‚Ð²ÑƒÐµÑ‚ Ñ‚Ð¸Ð¿"
! 
! #: tp/Texinfo/Convert/HTML.pm:4660
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "Ð½ÐµÑ€Ð°Ñ�Ð¿Ð¾Ð·Ð½Ð°Ð½Ð½Ñ‹Ð¹ Ñ‚Ð¸Ð¿: %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4677
! #, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr "Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ Ñ„Ð°Ð¹Ð»Ð° Ð½Ð°Ñ�Ñ‚Ñ€Ð¾ÐµÐº Ñ�Ñ�Ñ‹Ð»Ð¾Ðº html %s: %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4962
  msgid "string not closed in css file"
  msgstr "Ð½ÐµÐ·Ð°ÐºÑ€Ñ‹Ñ‚Ð°Ñ� Ñ�Ñ‚Ñ€Ð¾ÐºÐ° Ð² Ñ„Ð°Ð¹Ð»Ðµ css"
  
! #: tp/Texinfo/Convert/HTML.pm:4964
  msgid "--css-include ended in comment"
  msgstr "--css-include Ð¾Ð±Ñ€Ñ‹Ð²Ð°ÐµÑ‚Ñ�Ñ� Ð² ÐºÐ¾Ð¼Ð¼ÐµÐ½Ñ‚Ð°Ñ€Ð¸Ð¸"
  
! #: tp/Texinfo/Convert/HTML.pm:4966
  msgid "@import not finished in css file"
  msgstr "@import Ð½Ðµ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð° Ð² Ñ„Ð°Ð¹Ð»Ðµ css"
  
! #: tp/Texinfo/Convert/HTML.pm:4992
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "Ð¤Ð°Ð¹Ð» CSS %s Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½"
  
! #: tp/Texinfo/Convert/HTML.pm:4998
  #, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ --include-file %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5008
  #, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ Ñ„Ð°Ð¹Ð»Ð° CSS %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5870 tp/Texinfo/Convert/HTML.pm:5874
  #, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "Ñ�Ð»ÐµÐ¼ÐµÐ½Ñ‚ htmlxref.cnf Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½ Ð² Â«%sÂ»"
  
! #: tp/Texinfo/Convert/HTML.pm:6568
  #, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ Ñ„Ð°Ð¹Ð»Ð° frame %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6592
  #, perl-format
  msgid "error on closing TOC frame file %s: %s"
  msgstr "Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ Ñ„Ð°Ð¹Ð»Ð° TOC frame %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6707
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr "Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚Ñ‡Ð¸ÐºÐ° %s Ð½Ð° Ñ�Ñ‚Ð°Ð´Ð¸Ð¸ %s Ñ� Ð¿Ñ€Ð¸Ð¾Ñ€Ð¸Ñ‚ÐµÑ‚Ð¾Ð¼ %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6912
  msgid "must specify a title with a title command or @top"
  msgstr "Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ð·Ð°Ð´Ð°Ð½ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ° Ð¸Ð»Ð¸ @top"
  
! #: tp/Texinfo/Convert/HTML.pm:7122
  #, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr "Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ Ñ„Ð°Ð¹Ð»Ð° Ð½Ð¾Ð´Ñ‹ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ� %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7147
  #, perl-format
  msgid "old name for `%s' is a node of the document"
  msgstr "Ñ�Ñ‚Ð°Ñ€Ð¾Ðµ Ð¸Ð¼Ñ� Â«%sÂ» â€” Ñ�Ñ‚Ð¾ Ð½Ð¾Ð´Ð° Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°"
  
! #: tp/Texinfo/Convert/HTML.pm:7153
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "Ñ„Ð°Ð¹Ð» Ð¿ÑƒÑ�Ñ‚ Ð´Ð»Ñ� Ð¿ÐµÑ€ÐµÐ¸Ð¼ÐµÐ½ÑƒÐµÐ¼Ð¾Ð¹ Ð½Ð¾Ð´Ñ‹ Â«%sÂ»"
  
! #: tp/Texinfo/Convert/HTML.pm:7167
  #, perl-format
  msgid "target node (new name for `%s') not in document: %s"
  msgstr "Ð½Ð¾Ð´Ð° Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ� (Ð½Ð¾Ð²Ð¾Ðµ Ð¸Ð¼Ñ� Ð´Ð»Ñ� Â«%sÂ») Ð¾Ñ‚Ñ�ÑƒÑ‚Ñ�Ñ‚Ð²ÑƒÐµÑ‚ Ð² Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ðµ: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7199
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
  msgstr "Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ Ñ„Ð°Ð¹Ð»Ð° Ð¿ÐµÑ€ÐµÐ¸Ð¼ÐµÐ½ÑƒÐµÐ¼Ð¾Ð¹ Ð½Ð¾Ð´Ñ‹ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ� %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7237
  msgid "empty node name"
  msgstr "Ð¿ÑƒÑ�Ñ‚Ð¾Ðµ Ð¸Ð¼Ñ� Ð½Ð¾Ð´Ñ‹"
  
! #: tp/Texinfo/Convert/HTML.pm:7239 tp/Texinfo/Parser.pm:3542
  #, perl-format
  msgid "syntax for an external node used for `%s'"
***************
*** 2312,2341 ****
  msgstr "Ð¸Ð¼Ñ� @node Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð°Ñ‚ÑŒ Â«,Â»: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1334
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr "ÐŸÑƒÐ½ÐºÑ‚ Ð² Ð°Ð»Ñ„Ð°Ð²Ð¸Ñ‚Ð½Ð¾Ð¼ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ðµ @%s Ñ� : Ñ�Ð¾Ð·Ð´Ð°Ñ‘Ñ‚ Ð½ÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ñ‹Ð¹ Info: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1381 tp/Texinfo/Parser.pm:2722
  #, perl-format
  msgid "entry for index `%s' outside of any node"
  msgstr "Ñ�Ð»ÐµÐ¼ÐµÐ½Ñ‚Ðµ Ð´Ð»Ñ� Ð¸Ð¼ÐµÐ½Ð½Ð¾Ð³Ð¾ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ� Â«%sÂ» Ð²Ð½Ðµ ÐºÐ°ÐºÐ¾Ð¹-Ð»Ð¸Ð±Ð¾ Ð½Ð¾Ð´Ñ‹"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1495
  #, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr "Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ Ñ„Ð°Ð¹Ð»Ð° Ñ‚ÐµÐºÑ�Ñ‚Ð° Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ� %s: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1500
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» @image Â«%sÂ»: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1523
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
  msgstr "Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð¹Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» @image Â«%s.txtÂ» Ð¸Ð»Ð¸ Ð°Ð»ÑŒÑ‚ÐµÑ€Ð½Ð°Ñ‚Ð¸Ð²Ð½Ñ‹Ð¹ Ñ‚ÐµÐºÑ�Ñ‚"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1931
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
--- 2314,2343 ----
  msgstr "Ð¸Ð¼Ñ� @node Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð°Ñ‚ÑŒ Â«,Â»: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1335
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr "ÐŸÑƒÐ½ÐºÑ‚ Ð² Ð°Ð»Ñ„Ð°Ð²Ð¸Ñ‚Ð½Ð¾Ð¼ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ðµ @%s Ñ� : Ñ�Ð¾Ð·Ð´Ð°Ñ‘Ñ‚ Ð½ÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ñ‹Ð¹ Info: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1382 tp/Texinfo/Parser.pm:2568
  #, perl-format
  msgid "entry for index `%s' outside of any node"
  msgstr "Ñ�Ð»ÐµÐ¼ÐµÐ½Ñ‚Ðµ Ð´Ð»Ñ� Ð¸Ð¼ÐµÐ½Ð½Ð¾Ð³Ð¾ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ� Â«%sÂ» Ð²Ð½Ðµ ÐºÐ°ÐºÐ¾Ð¹-Ð»Ð¸Ð±Ð¾ Ð½Ð¾Ð´Ñ‹"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1496
  #, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr "Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ Ñ„Ð°Ð¹Ð»Ð° Ñ‚ÐµÐºÑ�Ñ‚Ð° Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ� %s: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1501
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» @image Â«%sÂ»: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1524
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
  msgstr "Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð¹Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» @image Â«%s.txtÂ» Ð¸Ð»Ð¸ Ð°Ð»ÑŒÑ‚ÐµÑ€Ð½Ð°Ñ‚Ð¸Ð²Ð½Ñ‹Ð¹ Ñ‚ÐµÐºÑ�Ñ‚"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1932
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
***************
*** 2345,2545 ****
  "Ñ‚ÐµÐºÑ�Ñ‚, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¸Ð·Ð±ÐµÐ¶Ð°Ñ‚ÑŒ Ñ�Ñ‚Ð¾Ð³Ð¾"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2161
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr "Ð¸Ð¼Ñ� Ð¿ÐµÑ€ÐµÐºÑ€Ñ‘Ñ�Ñ‚Ð½Ð¾Ð¹ Ñ�Ñ�Ñ‹Ð»ÐºÐ¸ @%s Ð½Ðµ Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð¸Ñ‚ Â«:Â»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2193
  #, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "Ð¸Ð¼Ñ� Ð½Ð¾Ð´Ñ‹ @%s Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð°Ñ‚ÑŒ Â«%sÂ»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2226
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr "Ð¸Ð¼Ñ� Ð½Ð¾Ð´Ñ‹ @%s Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð°Ñ‚ÑŒ Â«:Â»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2272
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "Ð¿Ð¾Ñ�Ð»Ðµ Â«.Â» Ð¸Ð»Ð¸ Â«,Â» Ð´Ð¾Ð»Ð¶ÐµÐ½ Ñ�Ð»ÐµÐ´Ð¾Ð²Ð°Ñ‚ÑŒ @xref, Ð° Ð½Ðµ %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2275
  msgid "`.' or `,' must follow @xref"
  msgstr "Ð¿Ð¾Ñ�Ð»Ðµ Â«.Â» Ð¸Ð»Ð¸ Â«,Â» Ð´Ð¾Ð»Ð¶ÐµÐ½ Ñ�Ð»ÐµÐ´Ð¾Ð²Ð°Ñ‚ÑŒ @xref"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3118
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr "Ð¸Ð¼Ñ� Ð½Ð¾Ð´Ñ‹ Ñ�Ð»ÐµÐ¼ÐµÐ½Ñ‚Ð° Ð¼ÐµÐ½ÑŽ Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð°Ñ‚ÑŒ Â«%sÂ»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3129
  msgid "menu entry node name should not contain `:'"
  msgstr "Ð¸Ð¼Ñ� Ð½Ð¾Ð´Ñ‹ Ñ�Ð»ÐµÐ¼ÐµÐ½Ñ‚Ð° Ð¼ÐµÐ½ÑŽ Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð°Ñ‚ÑŒ Â«:Â»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3145
  msgid "menu entry name should not contain `:'"
  msgstr "Ð¸Ð¼Ñ� Ñ�Ð»ÐµÐ¼ÐµÐ½Ñ‚Ð° Ð¼ÐµÐ½ÑŽ Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð°Ñ‚ÑŒ Â«:Â»"
  
! #: tp/Texinfo/Parser.pm:910
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr "@%s Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð¿Ð¾Ñ�Ð²Ð»Ñ�Ñ‚ÑŒÑ�Ñ� Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð² Ð½Ð°Ñ‡Ð°Ð»Ðµ Ð¸Ð»Ð¸ Ð² ÐºÐ¾Ð½Ñ†Ðµ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°"
  
! #: tp/Texinfo/Parser.pm:1160 tp/Texinfo/Structuring.pm:594
  #, perl-format
  msgid "multiple @%s"
  msgstr "Ð½ÐµÑ�ÐºÐ¾Ð»ÑŒÐºÐ¾ @%s"
  
! #: tp/Texinfo/Parser.pm:1194
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "Ð½ÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹ Ñ�Ð¸Ð½Ñ‚Ð°ÐºÑ�Ð¸Ñ� Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð° @%s: %s"
! 
! #: tp/Texinfo/Parser.pm:1210
  #, perl-format
  msgid "bad or empty @%s formal argument: %s"
  msgstr "Ð½ÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹ Ð¸Ð»Ð¸ Ð¿ÑƒÑ�Ñ‚Ð¾Ð¹ Ñ„Ð¾Ñ€Ð¼Ð°Ð»ÑŒÐ½Ñ‹Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ @%s: %s"
  
! #: tp/Texinfo/Parser.pm:1219 tp/Texinfo/Parser.pm:4856
! #: tp/Texinfo/Parser.pm:4882 tp/Texinfo/Parser.pm:5671
! #: tp/Texinfo/Parser.pm:5687 tp/Texinfo/Parser.pm:5702
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "ÐºÐ¾Ð¼Ð°Ð½Ð´Ðµ %c%s Ð½ÑƒÐ¶Ð½Ð¾ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¸Ð¼Ñ�"
  
! #: tp/Texinfo/Parser.pm:1223 tp/Texinfo/Parser.pm:4859
! #: tp/Texinfo/Parser.pm:4885 tp/Texinfo/Parser.pm:5674
! #: tp/Texinfo/Parser.pm:5690 tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad name for @%s"
  msgstr "Ð½ÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾Ðµ Ð¸Ð¼Ñ� Ð´Ð»Ñ� @%s"
  
! #: tp/Texinfo/Parser.pm:1341
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr "@end %s Ð¿ÐµÑ€ÐµÐ´ Ð·Ð°ÐºÑ€Ñ‹Ð²Ð°ÑŽÑ‰ÐµÐ¹ Ñ�ÐºÐ¾Ð±ÐºÐ¾Ð¹ @%s"
  
! #: tp/Texinfo/Parser.pm:1345
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "@%s Ð¿ÐµÑ€ÐµÐ´ Ð·Ð°ÐºÑ€Ñ‹Ð²Ð°ÑŽÑ‰ÐµÐ¹ Ñ�ÐºÐ¾Ð±ÐºÐ¾Ð¹ @%s"
  
! #: tp/Texinfo/Parser.pm:1350
  #, perl-format
! msgid "%c%s missing close brace"
  msgstr "%c%s Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½Ð° Ð·Ð°ÐºÑ€Ñ‹Ð²Ð°ÑŽÑ‰Ð°Ñ� Ñ�ÐºÐ¾Ð±ÐºÐ°"
  
! #: tp/Texinfo/Parser.pm:1354
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "@%s Ð¾Ñ‚Ñ�ÑƒÑ‚Ñ�Ñ‚Ð²ÑƒÐµÑ‚ Ð·Ð°ÐºÑ€Ñ‹Ð²Ð°ÑŽÑ‰Ð°Ñ� Ñ€Ð°Ð·Ð´ÐµÐ»Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ� Ð¿Ð¾Ñ�Ð»ÐµÐ´Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ñ�Ñ‚ÑŒ: %s}"
  
! #: tp/Texinfo/Parser.pm:1476
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "@itemx Ð½Ðµ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ‚ÑŒÑ�Ñ� Ñ� @%s"
  
! #: tp/Texinfo/Parser.pm:1544
  msgid "@itemx must follow @item"
  msgstr "@itemx Ð´Ð¾Ð»Ð¶ÐµÐ½ Ñ�Ð»ÐµÐ´Ð¾Ð²Ð°Ñ‚ÑŒ Ð·Ð° @item"
  
! #: tp/Texinfo/Parser.pm:1712
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr "@%s Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð¸Ñ‚ Ñ‚ÐµÐºÑ�Ñ‚, Ð½Ð¾ Ð½Ðµ @item"
  
! #: tp/Texinfo/Parser.pm:1743
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "Ð¾Ð¶Ð¸Ð´Ð°Ð»Ð¾Ñ�ÑŒ Â«@endÂ» Ñ� Â«%sÂ», Ð²Ñ�Ñ‚Ñ€ÐµÑ‡ÐµÐ½Ð¾ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:1746
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@%s Ð¿ÐµÑ€ÐµÐ´ @end %s"
  
! #: tp/Texinfo/Parser.pm:1750
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "Ð½ÐµÑ‚ Ð¿Ð°Ñ€Ð½Ð¾Ð¹ Â«%cend %sÂ»"
  
! #: tp/Texinfo/Parser.pm:1776 tp/Texinfo/Parser.pm:5204
! #: tp/Texinfo/Parser.pm:5470
  #, perl-format
  msgid "misplaced %c"
  msgstr "Ð·Ð´ÐµÑ�ÑŒ Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ð±Ñ‹Ñ‚ÑŒ %c"
  
! #: tp/Texinfo/Parser.pm:1874 tp/Texinfo/Parser.pm:3312
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "Ð½ÐµÐ¿Ð°Ñ€Ð½Ð°Ñ� Â«%c%sÂ»"
  
! #: tp/Texinfo/Parser.pm:2110
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "Ð¼Ð°ÐºÑ€Ð¾Ñ� Â«%sÂ» Ð²Ñ‹Ð·Ð²Ð°Ð½ Ñ� Ð¸Ð·Ð»Ð¸ÑˆÐ½Ð¸Ð¼Ð¸ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð°Ð¼Ð¸"
  
! #: tp/Texinfo/Parser.pm:2132
  #, perl-format
! msgid "@%s missing close brace"
  msgstr "@%s Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½Ð° Ð·Ð°ÐºÑ€Ñ‹Ð²Ð°ÑŽÑ‰Ð°Ñ� Ñ�ÐºÐ¾Ð±ÐºÐ°"
  
! #: tp/Texinfo/Parser.pm:2140
  #, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr "Ð¼Ð°ÐºÑ€Ð¾Ñ� Â«%sÂ», Ð¾Ð±ÑŠÑ�Ð²Ð»ÐµÐ½Ð½Ñ‹Ð¹ Ð±ÐµÐ· Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð°, Ð²Ñ‹Ð·Ð²Ð°Ð½ Ñ� Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð¼"
  
! #: tp/Texinfo/Parser.pm:2175
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
  msgstr "\\ Ð² Ñ€Ð°Ñ�ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ @%s Ñ�Ð»ÐµÐ´ÑƒÐµÑ‚ Â«%sÂ», Ð° Ð½Ðµ Ð¸Ð¼Ñ� Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° Ð¸Ð»Ð¸ \\"
  
! #: tp/Texinfo/Parser.pm:2650
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s Â«%sÂ» Ð±Ñ‹Ð»Ð¾ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¾ Ñ€Ð°Ð½ÑŒÑˆÐµ"
  
! #: tp/Texinfo/Parser.pm:2655
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "Ð¼ÐµÑ�Ñ‚Ð¾ Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰ÐµÐ³Ð¾ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ� @%s"
  
! #: tp/Texinfo/Parser.pm:3016
  #, perl-format
  msgid "missing name for @%s"
  msgstr "Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½Ð¾ Ð¸Ð¼Ñ� Ð´Ð»Ñ� @%s"
  
! #: tp/Texinfo/Parser.pm:3021
  #, perl-format
  msgid "missing category for @%s"
  msgstr "Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½Ð° ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ� Ð´Ð»Ñ� @%s"
  
! #: tp/Texinfo/Parser.pm:3073
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "Ð½ÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ñ‹Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð½Ð° Ñ�Ñ‚Ñ€Ð¾ÐºÐµ @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3089
  msgid "empty multitable"
  msgstr "Ð¿ÑƒÑ�Ñ‚Ð°Ñ� Ð¼ÑƒÐ»ÑŒÑ‚Ð¸Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ð°"
  
! #: tp/Texinfo/Parser.pm:3145 tp/Texinfo/Parser.pm:5784
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "Ð»Ð¸ÑˆÐ½Ð¸Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð»Ñ� @%s"
  
! #: tp/Texinfo/Parser.pm:3151 tp/Texinfo/Parser.pm:5806
! #: tp/Texinfo/Parser.pm:5818
  #, perl-format
  msgid "bad argument to @%s"
  msgstr "Ð½ÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ñ‹Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð»Ñ� @%s"
  
! #: tp/Texinfo/Parser.pm:3162
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s Ð´Ð¾Ð»Ð¶Ð½Ð° Ð¸Ñ�Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒÑ�Ñ� c Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð¼: Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð¾Ð¼ Ð´Ð»Ñ� %citem"
  
! #: tp/Texinfo/Parser.pm:3167
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
--- 2347,2547 ----
  "Ñ‚ÐµÐºÑ�Ñ‚, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¸Ð·Ð±ÐµÐ¶Ð°Ñ‚ÑŒ Ñ�Ñ‚Ð¾Ð³Ð¾"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2162
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr "Ð¸Ð¼Ñ� Ð¿ÐµÑ€ÐµÐºÑ€Ñ‘Ñ�Ñ‚Ð½Ð¾Ð¹ Ñ�Ñ�Ñ‹Ð»ÐºÐ¸ @%s Ð½Ðµ Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð¸Ñ‚ Â«:Â»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2194
  #, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "Ð¸Ð¼Ñ� Ð½Ð¾Ð´Ñ‹ @%s Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð°Ñ‚ÑŒ Â«%sÂ»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2227
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr "Ð¸Ð¼Ñ� Ð½Ð¾Ð´Ñ‹ @%s Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð°Ñ‚ÑŒ Â«:Â»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2273
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "Ð¿Ð¾Ñ�Ð»Ðµ Â«.Â» Ð¸Ð»Ð¸ Â«,Â» Ð´Ð¾Ð»Ð¶ÐµÐ½ Ñ�Ð»ÐµÐ´Ð¾Ð²Ð°Ñ‚ÑŒ @xref, Ð° Ð½Ðµ %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2276
  msgid "`.' or `,' must follow @xref"
  msgstr "Ð¿Ð¾Ñ�Ð»Ðµ Â«.Â» Ð¸Ð»Ð¸ Â«,Â» Ð´Ð¾Ð»Ð¶ÐµÐ½ Ñ�Ð»ÐµÐ´Ð¾Ð²Ð°Ñ‚ÑŒ @xref"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3086
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr "Ð¸Ð¼Ñ� Ð½Ð¾Ð´Ñ‹ Ñ�Ð»ÐµÐ¼ÐµÐ½Ñ‚Ð° Ð¼ÐµÐ½ÑŽ Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð°Ñ‚ÑŒ Â«%sÂ»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3097
  msgid "menu entry node name should not contain `:'"
  msgstr "Ð¸Ð¼Ñ� Ð½Ð¾Ð´Ñ‹ Ñ�Ð»ÐµÐ¼ÐµÐ½Ñ‚Ð° Ð¼ÐµÐ½ÑŽ Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð°Ñ‚ÑŒ Â«:Â»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3113
  msgid "menu entry name should not contain `:'"
  msgstr "Ð¸Ð¼Ñ� Ñ�Ð»ÐµÐ¼ÐµÐ½Ñ‚Ð° Ð¼ÐµÐ½ÑŽ Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð°Ñ‚ÑŒ Â«:Â»"
  
! #: tp/Texinfo/Parser.pm:883
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr "@%s Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð¿Ð¾Ñ�Ð²Ð»Ñ�Ñ‚ÑŒÑ�Ñ� Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð² Ð½Ð°Ñ‡Ð°Ð»Ðµ Ð¸Ð»Ð¸ Ð² ÐºÐ¾Ð½Ñ†Ðµ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°"
  
! #: tp/Texinfo/Parser.pm:1125 tp/Texinfo/Structuring.pm:595
  #, perl-format
  msgid "multiple @%s"
  msgstr "Ð½ÐµÑ�ÐºÐ¾Ð»ÑŒÐºÐ¾ @%s"
  
! #: tp/Texinfo/Parser.pm:1166
  #, perl-format
  msgid "bad or empty @%s formal argument: %s"
  msgstr "Ð½ÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹ Ð¸Ð»Ð¸ Ð¿ÑƒÑ�Ñ‚Ð¾Ð¹ Ñ„Ð¾Ñ€Ð¼Ð°Ð»ÑŒÐ½Ñ‹Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ @%s: %s"
  
! #: tp/Texinfo/Parser.pm:1176
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "Ð½ÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹ Ñ�Ð¸Ð½Ñ‚Ð°ÐºÑ�Ð¸Ñ� Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð° @%s: %s"
! 
! #: tp/Texinfo/Parser.pm:1183 tp/Texinfo/Parser.pm:4707
! #: tp/Texinfo/Parser.pm:4733 tp/Texinfo/Parser.pm:5565
! #: tp/Texinfo/Parser.pm:5578 tp/Texinfo/Parser.pm:5592
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "ÐºÐ¾Ð¼Ð°Ð½Ð´Ðµ %c%s Ð½ÑƒÐ¶Ð½Ð¾ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¸Ð¼Ñ�"
  
! #: tp/Texinfo/Parser.pm:1187 tp/Texinfo/Parser.pm:4710
! #: tp/Texinfo/Parser.pm:4736 tp/Texinfo/Parser.pm:5568
! #: tp/Texinfo/Parser.pm:5581 tp/Texinfo/Parser.pm:5595
  #, perl-format
  msgid "bad name for @%s"
  msgstr "Ð½ÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾Ðµ Ð¸Ð¼Ñ� Ð´Ð»Ñ� @%s"
  
! #: tp/Texinfo/Parser.pm:1305
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr "@end %s Ð¿ÐµÑ€ÐµÐ´ Ð·Ð°ÐºÑ€Ñ‹Ð²Ð°ÑŽÑ‰ÐµÐ¹ Ñ�ÐºÐ¾Ð±ÐºÐ¾Ð¹ @%s"
  
! #: tp/Texinfo/Parser.pm:1309
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "@%s Ð¿ÐµÑ€ÐµÐ´ Ð·Ð°ÐºÑ€Ñ‹Ð²Ð°ÑŽÑ‰ÐµÐ¹ Ñ�ÐºÐ¾Ð±ÐºÐ¾Ð¹ @%s"
  
! #: tp/Texinfo/Parser.pm:1314
  #, perl-format
! msgid "%c%s missing closing brace"
  msgstr "%c%s Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½Ð° Ð·Ð°ÐºÑ€Ñ‹Ð²Ð°ÑŽÑ‰Ð°Ñ� Ñ�ÐºÐ¾Ð±ÐºÐ°"
  
! #: tp/Texinfo/Parser.pm:1318
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "@%s Ð¾Ñ‚Ñ�ÑƒÑ‚Ñ�Ñ‚Ð²ÑƒÐµÑ‚ Ð·Ð°ÐºÑ€Ñ‹Ð²Ð°ÑŽÑ‰Ð°Ñ� Ñ€Ð°Ð·Ð´ÐµÐ»Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ� Ð¿Ð¾Ñ�Ð»ÐµÐ´Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ñ�Ñ‚ÑŒ: %s}"
  
! #: tp/Texinfo/Parser.pm:1440
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "@itemx Ð½Ðµ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ‚ÑŒÑ�Ñ� Ñ� @%s"
  
! #: tp/Texinfo/Parser.pm:1508
  msgid "@itemx must follow @item"
  msgstr "@itemx Ð´Ð¾Ð»Ð¶ÐµÐ½ Ñ�Ð»ÐµÐ´Ð¾Ð²Ð°Ñ‚ÑŒ Ð·Ð° @item"
  
! #: tp/Texinfo/Parser.pm:1676
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr "@%s Ñ�Ð¾Ð´ÐµÑ€Ð¶Ð¸Ñ‚ Ñ‚ÐµÐºÑ�Ñ‚, Ð½Ð¾ Ð½Ðµ @item"
  
! #: tp/Texinfo/Parser.pm:1707
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "Ð¾Ð¶Ð¸Ð´Ð°Ð»Ð¾Ñ�ÑŒ Â«@endÂ» Ñ� Â«%sÂ», Ð²Ñ�Ñ‚Ñ€ÐµÑ‡ÐµÐ½Ð¾ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:1710
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@%s Ð¿ÐµÑ€ÐµÐ´ @end %s"
  
! #: tp/Texinfo/Parser.pm:1714
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "Ð½ÐµÑ‚ Ð¿Ð°Ñ€Ð½Ð¾Ð¹ Â«%cend %sÂ»"
  
! #: tp/Texinfo/Parser.pm:1738 tp/Texinfo/Parser.pm:5070
! #: tp/Texinfo/Parser.pm:5308
  #, perl-format
  msgid "misplaced %c"
  msgstr "Ð·Ð´ÐµÑ�ÑŒ Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ð±Ñ‹Ñ‚ÑŒ %c"
  
! #: tp/Texinfo/Parser.pm:1835 tp/Texinfo/Parser.pm:3148
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "Ð½ÐµÐ¿Ð°Ñ€Ð½Ð°Ñ� Â«%c%sÂ»"
  
! #: tp/Texinfo/Parser.pm:2072
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "Ð¼Ð°ÐºÑ€Ð¾Ñ� Â«%sÂ» Ð²Ñ‹Ð·Ð²Ð°Ð½ Ñ� Ð¸Ð·Ð»Ð¸ÑˆÐ½Ð¸Ð¼Ð¸ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð°Ð¼Ð¸"
  
! #: tp/Texinfo/Parser.pm:2094
  #, perl-format
! msgid "@%s missing closing brace"
  msgstr "@%s Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½Ð° Ð·Ð°ÐºÑ€Ñ‹Ð²Ð°ÑŽÑ‰Ð°Ñ� Ñ�ÐºÐ¾Ð±ÐºÐ°"
  
! #: tp/Texinfo/Parser.pm:2102
  #, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr "Ð¼Ð°ÐºÑ€Ð¾Ñ� Â«%sÂ», Ð¾Ð±ÑŠÑ�Ð²Ð»ÐµÐ½Ð½Ñ‹Ð¹ Ð±ÐµÐ· Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð°, Ð²Ñ‹Ð·Ð²Ð°Ð½ Ñ� Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð¼"
  
! #: tp/Texinfo/Parser.pm:2138
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
  msgstr "\\ Ð² Ñ€Ð°Ñ�ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ @%s Ñ�Ð»ÐµÐ´ÑƒÐµÑ‚ Â«%sÂ», Ð° Ð½Ðµ Ð¸Ð¼Ñ� Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° Ð¸Ð»Ð¸ \\"
  
! #: tp/Texinfo/Parser.pm:2501
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s Â«%sÂ» Ð±Ñ‹Ð»Ð¾ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¾ Ñ€Ð°Ð½ÑŒÑˆÐµ"
  
! #: tp/Texinfo/Parser.pm:2506
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "Ð¼ÐµÑ�Ñ‚Ð¾ Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰ÐµÐ³Ð¾ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ� @%s"
  
! #: tp/Texinfo/Parser.pm:2850
  #, perl-format
  msgid "missing name for @%s"
  msgstr "Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½Ð¾ Ð¸Ð¼Ñ� Ð´Ð»Ñ� @%s"
  
! #: tp/Texinfo/Parser.pm:2855
  #, perl-format
  msgid "missing category for @%s"
  msgstr "Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½Ð° ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ� Ð´Ð»Ñ� @%s"
  
! #: tp/Texinfo/Parser.pm:2890
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "Ð½ÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ñ‹Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð½Ð° Ñ�Ñ‚Ñ€Ð¾ÐºÐµ @%s: %s"
  
! #: tp/Texinfo/Parser.pm:2905
  msgid "empty multitable"
  msgstr "Ð¿ÑƒÑ�Ñ‚Ð°Ñ� Ð¼ÑƒÐ»ÑŒÑ‚Ð¸Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ð°"
  
! #: tp/Texinfo/Parser.pm:2959 tp/Texinfo/Parser.pm:5673
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "Ð»Ð¸ÑˆÐ½Ð¸Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð»Ñ� @%s"
  
! #: tp/Texinfo/Parser.pm:2965 tp/Texinfo/Parser.pm:5694
! #: tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad argument to @%s"
  msgstr "Ð½ÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ñ‹Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð»Ñ� @%s"
  
! #: tp/Texinfo/Parser.pm:2976
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s Ð´Ð¾Ð»Ð¶Ð½Ð° Ð¸Ñ�Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒÑ�Ñ� c Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð¼: Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð¾Ð¼ Ð´Ð»Ñ� %citem"
  
! #: tp/Texinfo/Parser.pm:2981
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
***************
*** 2547,2663 ****
  "ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹ @%s, Ð½Ðµ Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°ÑŽÑ‰ÐµÐ¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð² Ð² Ñ�ÐºÐ¾Ð±ÐºÐ°Ñ…, Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ð±Ñ‹Ñ‚ÑŒ Ð² Ñ�Ñ‚Ñ€Ð¾ÐºÐµ @%s"
  
! #: tp/Texinfo/Parser.pm:3202
  #, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð½Ð°Ñ� ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Â«@%sÂ» Ð½ÐµÐ´Ð¾Ð¿ÑƒÑ�Ñ‚Ð¸Ð¼Ð° ÐºÐ°Ðº Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ @%s"
  
! #: tp/Texinfo/Parser.pm:3290 tp/Texinfo/Parser.pm:3429
! #: tp/Texinfo/Parser.pm:5777
  #, perl-format
  msgid "@%s missing argument"
  msgstr "@%s Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚"
  
! #: tp/Texinfo/Parser.pm:3302
  #, perl-format
  msgid "unknown @end %s"
  msgstr "Ð½ÐµÐ¸Ð·Ð²ÐµÑ�Ñ‚Ð½Ñ‹Ð¹ @end %s"
  
! #: tp/Texinfo/Parser.pm:3324 tp/Texinfo/Parser.pm:3943
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "Ð»Ð¸ÑˆÐ½Ð¸Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð»Ñ� @%s %s: %s"
  
! #: tp/Texinfo/Parser.pm:3329 tp/Texinfo/Parser.pm:5861
! #: tp/Texinfo/Parser.pm:5906 tp/Texinfo/Parser.pm:5935
! #: tp/Texinfo/Parser.pm:5976 tp/Texinfo/Parser.pm:6055
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "Ð½ÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð»Ñ� @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3348
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%s: Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ %s: %s"
  
! #: tp/Texinfo/Parser.pm:3360
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr "ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ° Â«%sÂ» Ð½Ðµ Ñ�Ð²Ð»Ñ�ÐµÑ‚Ñ�Ñ� ÐºÐ°Ð½Ð¾Ð½Ð¸Ñ‡Ð½Ð¾Ð¹ ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ¾Ð¹ texinfo"
  
! #: tp/Texinfo/Parser.pm:3369
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "Ð¸Ð¼Ñ� ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ¸ Â«%sÂ» Ð½Ðµ Ñ€Ð°Ñ�Ð¿Ð¾Ð·Ð½Ð°Ð½Ð¾"
  
! #: tp/Texinfo/Parser.pm:3516
  #, perl-format
  msgid "@%s after the first element"
  msgstr "@%s Ð¿Ð¾Ñ�Ð»Ðµ Ð¿ÐµÑ€Ð²Ð¾Ð³Ð¾ Ñ�Ð»ÐµÐ¼ÐµÐ½Ñ‚Ð°"
  
! #: tp/Texinfo/Parser.pm:3523
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s Ð¸Ð¼ÐµÐµÑ‚ Ñ�Ð¼Ñ‹Ñ�Ð» Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð² Ñ�Ñ‚Ñ€Ð¾ÐºÐµ @multitable"
  
! #: tp/Texinfo/Parser.pm:3563
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "@%s Ð½Ðµ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ñ�Ð²Ñ�Ð·Ð°Ð½ Ñ� @top"
  
! #: tp/Texinfo/Parser.pm:3575
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
  msgstr "@node Ñ�Ñ‚Ð¾Ð¸Ñ‚ Ð´Ð¾ @%s, Ð½Ð¾ Ñ‡Ð°Ñ�Ñ‚Ð¸ Ð½Ðµ Ð¼Ð¾Ð³ÑƒÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ñ�Ð²Ñ�Ð·Ð°Ð½Ñ‹ Ñ� Ð½Ð¾Ð´Ð°Ð¼Ð¸"
  
! #: tp/Texinfo/Parser.pm:3677
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "Ð¿ÑƒÑ�Ñ‚Ð¾Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð² @%s"
  
! #: tp/Texinfo/Parser.pm:3681
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "Ð¿ÑƒÑ�Ñ‚Ð¾Ðµ Ð¸Ð¼Ñ� Ð½Ð¾Ð´Ñ‹ Ð¿Ð¾Ñ�Ð»Ðµ Ñ€Ð°Ñ�ÐºÑ€Ñ‹Ñ‚Ð¸Ñ� Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:3724
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "Ð¿ÑƒÑ�Ñ‚Ð¾Ðµ Ð¸Ð¼Ñ� Ñ�Ð»ÐµÐ¼ÐµÐ½Ñ‚Ð° Ð¼ÐµÐ½ÑŽ Ð² Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:3732
  msgid "empty node name in menu entry"
  msgstr "Ð¿ÑƒÑ�Ñ‚Ð¾Ðµ Ð¸Ð¼Ñ� Ð½Ð¾Ð´Ñ‹ Ð² Ñ�Ð»ÐµÐ¼ÐµÐ½Ñ‚Ðµ Ð¼ÐµÐ½ÑŽ"
  
! #: tp/Texinfo/Parser.pm:3805
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "@%s Ð½Ðµ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð¿Ð¾Ñ�Ð²Ð»Ñ�Ñ‚ÑŒÑ�Ñ� Ð² @%s"
  
! #: tp/Texinfo/Parser.pm:3937
  #, perl-format
! msgid "@end %s should only appear at a line beginning"
  msgstr "@end %s Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð¿Ð¾Ñ�Ð²Ð»Ñ�Ñ‚ÑŒÑ�Ñ� Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð² Ð½Ð°Ñ‡Ð°Ð»Ðµ Ñ�Ñ‚Ñ€Ð¾ÐºÐ¸"
  
! #: tp/Texinfo/Parser.pm:3960
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "Ð¼Ð°ÐºÑ€Ð¾Ñ� Â«%sÂ» Ð±Ñ‹Ð» Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ñ‘Ð½ Ñ€Ð°Ð½ÑŒÑˆÐµ"
  
! #: tp/Texinfo/Parser.pm:3963
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "Ð¼ÐµÑ�Ñ‚Ð¾ Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰ÐµÐ³Ð¾ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ� Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:3968
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "Ð¿ÐµÑ€ÐµÐ¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹ Ñ�Ð·Ñ‹ÐºÐ° Texinfo: @%s"
  
! #: tp/Texinfo/Parser.pm:4017
  #, perl-format
  msgid "@%s without associated character"
  msgstr "@%s Ð±ÐµÐ· Ñ�Ð¾Ð¾Ñ‚Ð²ÐµÑ‚Ñ�Ñ‚Ð²ÑƒÑŽÑ‰ÐµÐ³Ð¾ Ñ�Ð¸Ð¼Ð²Ð¾Ð»Ð°"
  
! #: tp/Texinfo/Parser.pm:4087
  #, perl-format
  msgid ""
--- 2549,2666 ----
  "ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹ @%s, Ð½Ðµ Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°ÑŽÑ‰ÐµÐ¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð² Ð² Ñ�ÐºÐ¾Ð±ÐºÐ°Ñ…, Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ð±Ñ‹Ñ‚ÑŒ Ð² Ñ�Ñ‚Ñ€Ð¾ÐºÐµ @%s"
  
! #: tp/Texinfo/Parser.pm:3016
  #, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð½Ð°Ñ� ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Â«@%sÂ» Ð½ÐµÐ´Ð¾Ð¿ÑƒÑ�Ñ‚Ð¸Ð¼Ð° ÐºÐ°Ðº Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ @%s"
  
! #: tp/Texinfo/Parser.pm:3124 tp/Texinfo/Parser.pm:3277
! #: tp/Texinfo/Parser.pm:5666
  #, perl-format
  msgid "@%s missing argument"
  msgstr "@%s Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚"
  
! #: tp/Texinfo/Parser.pm:3138
  #, perl-format
  msgid "unknown @end %s"
  msgstr "Ð½ÐµÐ¸Ð·Ð²ÐµÑ�Ñ‚Ð½Ñ‹Ð¹ @end %s"
  
! #: tp/Texinfo/Parser.pm:3161 tp/Texinfo/Parser.pm:3788
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "Ð»Ð¸ÑˆÐ½Ð¸Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð»Ñ� @%s %s: %s"
  
! #: tp/Texinfo/Parser.pm:3167 tp/Texinfo/Parser.pm:3245
! #: tp/Texinfo/Parser.pm:5755 tp/Texinfo/Parser.pm:5798
! #: tp/Texinfo/Parser.pm:5827 tp/Texinfo/Parser.pm:5868
! #: tp/Texinfo/Parser.pm:5946
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "Ð½ÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð»Ñ� @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3188
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%s: Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ %s: %s"
  
! #: tp/Texinfo/Parser.pm:3200
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr "ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ° Â«%sÂ» Ð½Ðµ Ñ�Ð²Ð»Ñ�ÐµÑ‚Ñ�Ñ� ÐºÐ°Ð½Ð¾Ð½Ð¸Ñ‡Ð½Ð¾Ð¹ ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ¾Ð¹ texinfo"
  
! #: tp/Texinfo/Parser.pm:3208
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "Ð¸Ð¼Ñ� ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ¸ Â«%sÂ» Ð½Ðµ Ñ€Ð°Ñ�Ð¿Ð¾Ð·Ð½Ð°Ð½Ð¾"
  
! #: tp/Texinfo/Parser.pm:3364
  #, perl-format
  msgid "@%s after the first element"
  msgstr "@%s Ð¿Ð¾Ñ�Ð»Ðµ Ð¿ÐµÑ€Ð²Ð¾Ð³Ð¾ Ñ�Ð»ÐµÐ¼ÐµÐ½Ñ‚Ð°"
  
! #: tp/Texinfo/Parser.pm:3371
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s Ð¸Ð¼ÐµÐµÑ‚ Ñ�Ð¼Ñ‹Ñ�Ð» Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð² Ñ�Ñ‚Ñ€Ð¾ÐºÐµ @multitable"
  
! #: tp/Texinfo/Parser.pm:3408
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "@%s Ð½Ðµ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ñ�Ð²Ñ�Ð·Ð°Ð½ Ñ� @top"
  
! #: tp/Texinfo/Parser.pm:3420
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
  msgstr "@node Ñ�Ñ‚Ð¾Ð¸Ñ‚ Ð´Ð¾ @%s, Ð½Ð¾ Ñ‡Ð°Ñ�Ñ‚Ð¸ Ð½Ðµ Ð¼Ð¾Ð³ÑƒÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ñ�Ð²Ñ�Ð·Ð°Ð½Ñ‹ Ñ� Ð½Ð¾Ð´Ð°Ð¼Ð¸"
  
! #: tp/Texinfo/Parser.pm:3522
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "Ð¿ÑƒÑ�Ñ‚Ð¾Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð² @%s"
  
! #: tp/Texinfo/Parser.pm:3526
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "Ð¿ÑƒÑ�Ñ‚Ð¾Ðµ Ð¸Ð¼Ñ� Ð½Ð¾Ð´Ñ‹ Ð¿Ð¾Ñ�Ð»Ðµ Ñ€Ð°Ñ�ÐºÑ€Ñ‹Ñ‚Ð¸Ñ� Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:3569
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "Ð¿ÑƒÑ�Ñ‚Ð¾Ðµ Ð¸Ð¼Ñ� Ñ�Ð»ÐµÐ¼ÐµÐ½Ñ‚Ð° Ð¼ÐµÐ½ÑŽ Ð² Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:3577
  msgid "empty node name in menu entry"
  msgstr "Ð¿ÑƒÑ�Ñ‚Ð¾Ðµ Ð¸Ð¼Ñ� Ð½Ð¾Ð´Ñ‹ Ð² Ñ�Ð»ÐµÐ¼ÐµÐ½Ñ‚Ðµ Ð¼ÐµÐ½ÑŽ"
  
! #: tp/Texinfo/Parser.pm:3650
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "@%s Ð½Ðµ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð¿Ð¾Ñ�Ð²Ð»Ñ�Ñ‚ÑŒÑ�Ñ� Ð² @%s"
  
! #: tp/Texinfo/Parser.pm:3782
  #, perl-format
! msgid "@end %s should only appear at the beginning of a line"
  msgstr "@end %s Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð¿Ð¾Ñ�Ð²Ð»Ñ�Ñ‚ÑŒÑ�Ñ� Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð² Ð½Ð°Ñ‡Ð°Ð»Ðµ Ñ�Ñ‚Ñ€Ð¾ÐºÐ¸"
  
! #: tp/Texinfo/Parser.pm:3804
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "Ð¼Ð°ÐºÑ€Ð¾Ñ� Â«%sÂ» Ð±Ñ‹Ð» Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ñ‘Ð½ Ñ€Ð°Ð½ÑŒÑˆÐµ"
  
! #: tp/Texinfo/Parser.pm:3807
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "Ð¼ÐµÑ�Ñ‚Ð¾ Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰ÐµÐ³Ð¾ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ� Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:3812
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "Ð¿ÐµÑ€ÐµÐ¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹ Ñ�Ð·Ñ‹ÐºÐ° Texinfo: @%s"
  
! #: tp/Texinfo/Parser.pm:3879
  #, perl-format
  msgid "@%s without associated character"
  msgstr "@%s Ð±ÐµÐ· Ñ�Ð¾Ð¾Ñ‚Ð²ÐµÑ‚Ñ�Ñ‚Ð²ÑƒÑŽÑ‰ÐµÐ³Ð¾ Ñ�Ð¸Ð¼Ð²Ð¾Ð»Ð°"
  
! #: tp/Texinfo/Parser.pm:3949
  #, perl-format
  msgid ""
***************
*** 2666,2670 ****
  "@%s Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ñ‘Ð½ Ñ� Ð½ÑƒÐ»Ñ‘Ð¼ Ð¸Ð»Ð¸ Ð±Ð¾Ð»ÐµÐµ Ñ‡ÐµÐ¼ Ð¾Ð´Ð½Ð¸Ð¼ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð¼, Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð²Ñ‹Ð·Ñ‹Ð²Ð°Ñ‚ÑŒÑ�Ñ� Ñ� {}"
  
! #: tp/Texinfo/Parser.pm:4111
  #, perl-format
  msgid ""
--- 2669,2673 ----
  "@%s Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ñ‘Ð½ Ñ� Ð½ÑƒÐ»Ñ‘Ð¼ Ð¸Ð»Ð¸ Ð±Ð¾Ð»ÐµÐµ Ñ‡ÐµÐ¼ Ð¾Ð´Ð½Ð¸Ð¼ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð¼, Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð²Ñ‹Ð·Ñ‹Ð²Ð°Ñ‚ÑŒÑ�Ñ� Ñ� {}"
  
! #: tp/Texinfo/Parser.pm:3974
  #, perl-format
  msgid ""
***************
*** 2675,2679 ****
  "MAX_NESTED_MACROS; Ñ‚ÐµÐºÑƒÑ‰ÐµÐµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ: %d)"
  
! #: tp/Texinfo/Parser.pm:4120
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
--- 2678,2682 ----
  "MAX_NESTED_MACROS; Ñ‚ÐµÐºÑƒÑ‰ÐµÐµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ: %d)"
  
! #: tp/Texinfo/Parser.pm:3983
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
***************
*** 2681,2690 ****
  "Ñ€ÐµÐºÑƒÑ€Ñ�Ð¸Ð²Ð½Ñ‹Ð¹ Ð²Ñ‹Ð·Ð¾Ð² Ð¼Ð°ÐºÑ€Ð¾Ñ�Ð° %s Ð½Ðµ Ð´Ð¾Ð¿ÑƒÑ�ÐºÐ°ÐµÑ‚Ñ�Ñ�; ÐµÑ�Ð»Ð¸ Ð½ÑƒÐ¶Ð½Ð¾, Ð¸Ñ�Ð¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ @rmacro"
  
! #: tp/Texinfo/Parser.pm:4176
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr "Ð¿Ð¾Ñ�Ð»Ðµ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð½Ð¾Ð¹ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹ Â«@%sÂ» Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ð±Ñ‹Ñ‚ÑŒ Ð¿Ñ€Ð¾Ð±ÐµÐ»ÑŒÐ½Ð¾Ð³Ð¾ Ñ�Ð¸Ð¼Ð²Ð¾Ð»Ð°"
  
! #: tp/Texinfo/Parser.pm:4182
  #, perl-format
  msgid "use braces to give a command as an argument to @%s"
--- 2684,2693 ----
  "Ñ€ÐµÐºÑƒÑ€Ñ�Ð¸Ð²Ð½Ñ‹Ð¹ Ð²Ñ‹Ð·Ð¾Ð² Ð¼Ð°ÐºÑ€Ð¾Ñ�Ð° %s Ð½Ðµ Ð´Ð¾Ð¿ÑƒÑ�ÐºÐ°ÐµÑ‚Ñ�Ñ�; ÐµÑ�Ð»Ð¸ Ð½ÑƒÐ¶Ð½Ð¾, Ð¸Ñ�Ð¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ @rmacro"
  
! #: tp/Texinfo/Parser.pm:4038
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr "Ð¿Ð¾Ñ�Ð»Ðµ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð½Ð¾Ð¹ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹ Â«@%sÂ» Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ð±Ñ‹Ñ‚ÑŒ Ð¿Ñ€Ð¾Ð±ÐµÐ»ÑŒÐ½Ð¾Ð³Ð¾ Ñ�Ð¸Ð¼Ð²Ð¾Ð»Ð°"
  
! #: tp/Texinfo/Parser.pm:4044
  #, perl-format
  msgid "use braces to give a command as an argument to @%s"
***************
*** 2692,2851 ****
  "Ð¸Ñ�Ð¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ Ñ„Ð¸Ð³ÑƒÑ€Ð½Ñ‹Ðµ Ñ�ÐºÐ¾Ð±ÐºÐ¸, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‚ÑŒ @%s ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ Ð² ÐºÐ°Ñ‡ÐµÑ�Ñ‚Ð²Ðµ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð°"
  
! #: tp/Texinfo/Parser.pm:4195 tp/Texinfo/Parser.pm:5325
  #, perl-format
  msgid "%c%s expects `i' or `j' as argument, not `%s'"
  msgstr "%c%s Ð¾Ð¶Ð¸Ð´Ð°ÐµÑ‚ Ð² ÐºÐ°Ñ‡ÐµÑ�Ñ‚Ð²Ðµ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð° Â«iÂ» Ð¸Ð»Ð¸ Â«jÂ», Ð° Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:4207
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr "Ð¿Ð¾Ñ�Ð»Ðµ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð½Ð¾Ð¹ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹ Â«@%sÂ» Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ð±Ñ‹Ñ‚ÑŒ Ð½Ð¾Ð²Ð¾Ð¹ Ñ�Ñ‚Ñ€Ð¾ÐºÐ¸"
  
! #: tp/Texinfo/Parser.pm:4218
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s Ð¿Ð¾Ð´Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ²Ð°ÐµÑ‚ Ñ„Ð¸Ð³ÑƒÑ€Ð½Ñ‹Ðµ Ñ�ÐºÐ¾Ð±ÐºÐ¸"
  
! #: tp/Texinfo/Parser.pm:4383
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "Ð½ÐµÐ¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð½Ñ‹Ð¹ Ñ„Ð»Ð°Ð³: %s"
  
! #: tp/Texinfo/Parser.pm:4386
  msgid "bad syntax for @value"
  msgstr "Ð½ÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹ Ñ�Ð¸Ð½Ñ‚Ð°ÐºÑ�Ð¸Ñ� @value"
  
! #: tp/Texinfo/Parser.pm:4393
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "ÐšÐ¾Ð¼Ð°Ð½Ð´Ð° %c%s ÑƒÑ�Ñ‚Ð°Ñ€ÐµÐ»Ð°."
  
! #: tp/Texinfo/Parser.pm:4396
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "ÐšÐ¾Ð¼Ð°Ð½Ð´Ð° %c%s ÑƒÑ�Ñ‚Ð°Ñ€ÐµÐ»Ð°; %s"
  
! #: tp/Texinfo/Parser.pm:4405
  #, perl-format
! msgid "@%s should only appear at a line beginning"
  msgstr "@%s Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð¿Ð¾Ñ�Ð²Ð»Ñ�Ñ‚ÑŒÑ�Ñ� Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð² Ð½Ð°Ñ‡Ð°Ð»Ðµ Ñ�Ñ‚Ñ€Ð¾ÐºÐ¸"
  
! #: tp/Texinfo/Parser.pm:4496
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s Ð½Ðµ Ð´Ð¾Ð¿ÑƒÑ�ÐºÐ°ÐµÑ‚Ñ�Ñ� Ð²Ð½ÑƒÑ‚Ñ€Ð¸ Ð±Ð»Ð¾ÐºÐ° Â«@%sÂ»"
  
! #: tp/Texinfo/Parser.pm:4505
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr "@%s Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð¿Ð¾Ñ�Ð²Ð»Ñ�Ñ‚ÑŒÑ�Ñ� Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð² Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐµ Ð¸Ð»Ð¸ Ð½Ð¸Ð¶Ð½ÐµÐ¼ ÐºÐ¾Ð»Ð¾Ð½Ñ‚Ð¸Ñ‚ÑƒÐ»Ðµ"
  
! #: tp/Texinfo/Parser.pm:4631 tp/Texinfo/Parser.pm:4648
! #: tp/Texinfo/Parser.pm:4698
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s Ð½Ðµ Ð¸Ð¼ÐµÐµÑ‚ Ñ�Ð¼Ñ‹Ñ�Ð»Ð° Ð²Ð½ÑƒÑ‚Ñ€Ð¸ Ð±Ð»Ð¾ÐºÐ° Â«@%sÂ»"
  
! #: tp/Texinfo/Parser.pm:4658
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "@%s Ð² Ð¿ÑƒÑ�Ñ‚Ð¾Ð¹ Ð¼ÑƒÐ»ÑŒÑ‚Ð¸Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ðµ"
  
! #: tp/Texinfo/Parser.pm:4664
  msgid "@tab before @item"
  msgstr "@tab Ð¿ÐµÑ€ÐµÐ´ @item"
  
! #: tp/Texinfo/Parser.pm:4667
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "Ñ�Ð»Ð¸ÑˆÐºÐ¾Ð¼ Ð¼Ð½Ð¾Ð³Ð¾ Ñ�Ñ‚Ð¾Ð»Ð±Ñ†Ð¾Ð² Ð² Ð¼ÑƒÐ»ÑŒÑ‚Ð¸Ñ‚Ð°Ð±Ð»Ð¸Ñ‡Ð½Ð¾Ð¼ Ñ�Ð»ÐµÐ¼ÐµÐ½Ñ‚Ðµ (Ð¼Ð°ÐºÑ�Ð¸Ð¼ÑƒÐ¼ %d)"
  
! #: tp/Texinfo/Parser.pm:4704
  msgid "ignoring @tab outside of multitable"
  msgstr "@tab Ð²Ð½Ðµ Ð¼ÑƒÐ»ÑŒÑ‚Ð¸Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ‹ Ð¸Ð³Ð½Ð¾Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½"
  
! #: tp/Texinfo/Parser.pm:4708
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "@%s Ð²Ð½Ðµ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ‹ Ð¸Ð»Ð¸ Ñ�Ð¿Ð¸Ñ�ÐºÐ°"
  
! #: tp/Texinfo/Parser.pm:4745
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ð±Ñ‹Ñ‚ÑŒ Ð¿Ð¾Ñ�Ð»Ðµ Â«@%sÂ», Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¸Ñ�Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Â«@%sÂ»"
  
! #: tp/Texinfo/Parser.pm:4787
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "@%s Ð½Ðµ Ð¸Ð¼ÐµÐµÑ‚ Ñ�Ð¼Ñ‹Ñ�Ð»Ð° Ð²Ð½Ðµ Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ� Â«@titlepageÂ» Ð¸Ð»Ð¸ Â«@quotationÂ»"
  
! #: tp/Texinfo/Parser.pm:4791
  msgid "@dircategory after first node"
  msgstr "@dircategory Ð¿Ð¾Ñ�Ð»Ðµ Ð¿ÐµÑ€Ð²Ð¾Ð¹ Ð½Ð¾Ð´Ñ‹"
  
! #: tp/Texinfo/Parser.pm:4979
  #, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "Ð½Ðµ Ð´Ð¾Ð¿ÑƒÑ�ÐºÐ°ÐµÑ‚Ñ�Ñ� ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ðµ Ð¾Ð±Ð»Ð°Ñ�Ñ‚Ð¸ %s Ð²Ð½ÑƒÑ‚Ñ€Ð¸ Ð¾Ð±Ð»Ð°Ñ�Ñ‚Ð¸ %s"
  
! #: tp/Texinfo/Parser.pm:4997
  msgid "@direntry after first node"
  msgstr "@direntry Ð¿Ð¾Ñ�Ð»Ðµ Ð¿ÐµÑ€Ð²Ð¾Ð¹ Ð½Ð¾Ð´Ñ‹"
  
! #: tp/Texinfo/Parser.pm:5005
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "@%s Ð²Ñ�Ñ‚Ñ€ÐµÑ‡ÐµÐ½Ð¾ Ð¿ÐµÑ€ÐµÐ´ Ð¿ÐµÑ€Ð²Ð¾Ð¹ @node"
  
! #: tp/Texinfo/Parser.pm:5008
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
  msgstr "Ð²ÐµÑ€Ð¾Ñ�Ñ‚Ð½Ð¾, Ð²Ð°ÑˆÐ° Ð½Ð¾Ð´Ð° @top Ð´Ð¾Ð»Ð¶Ð½Ð° Ð±Ñ‹Ñ‚ÑŒ Ð² @ifnottex, Ð° Ð½Ðµ Ð² @ifinfo?"
  
! #: tp/Texinfo/Parser.pm:5070
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr "@%s Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð¿Ð¾Ñ�Ð²Ð»Ñ�Ñ‚ÑŒÑ�Ñ� Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð² Ñ�Ð¾Ð²Ð¿Ð°Ð´Ð°ÑŽÑ‰ÐµÐ¼ ÐºÐ¾Ð½Ñ‚ÐµÐºÑ�Ñ‚Ðµ"
  
! #: tp/Texinfo/Parser.pm:5078
  #, perl-format
  msgid "unknown command `%s'"
  msgstr "Ð½ÐµÐ¸Ð·Ð²ÐµÑ�Ñ‚Ð½Ð°Ñ� ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5088
  msgid "unexpected @"
  msgstr "Ð½ÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ñ‹Ð¹ Ñ�Ð¸Ð¼Ð²Ð¾Ð» @"
  
! #: tp/Texinfo/Parser.pm:5117
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s Ð½Ðµ Ð¸Ð¼ÐµÐµÑ‚ Ñ�Ð¼Ñ‹Ñ�Ð»Ð° Ð²Ð½Ðµ Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ� Â«@floatÂ»"
  
! #: tp/Texinfo/Parser.pm:5122
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr "@%s Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ñ�Ñ€Ð°Ð·Ñƒ Ð¿Ð¾Ñ�Ð»Ðµ Â«@floatÂ»"
  
! #: tp/Texinfo/Parser.pm:5130
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "Ð¸Ð³Ð½Ð¾Ñ€Ð¸Ñ€ÑƒÐµÑ‚Ñ�Ñ� Ð¼Ð½Ð¾Ð³Ð¾ÐºÑ€Ð°Ñ‚Ð½Ñ‹Ð¹ @%s"
  
! #: tp/Texinfo/Parser.pm:5249
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° @%s Ð½Ðµ Ð´Ð¾Ð¿ÑƒÑ�ÐºÐ°ÐµÑ‚ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð²"
  
! #: tp/Texinfo/Parser.pm:5273
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr "Ñƒ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° @%s Ð¾Ñ‚Ñ�ÑƒÑ‚Ñ�Ñ‚Ð²ÑƒÐµÑ‚ Ð½Ð¾Ð´Ð° Ð¸Ð»Ð¸ Ð²Ð½ÐµÑˆÐ½Ð¸Ð¹ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ð¹ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚"
  
! #: tp/Texinfo/Parser.pm:5292
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr "Ð² @%s ÑƒÐºÐ°Ð·Ð°Ð½Ð° Ð¿ÑƒÑ�Ñ‚Ð¾Ðµ Ð¸Ð¼Ñ� Ð¿ÐµÑ€ÐµÐºÑ€Ñ‘Ñ�Ñ‚Ð½Ð¾Ð¹ Ñ�Ñ�Ñ‹Ð»ÐºÐ¸ Ð¿Ð¾Ñ�Ð»Ðµ Ñ€Ð°Ñ�ÐºÑ€Ñ‹Ñ‚Ð¾Ð³Ð¾ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5303
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
--- 2695,2854 ----
  "Ð¸Ñ�Ð¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ Ñ„Ð¸Ð³ÑƒÑ€Ð½Ñ‹Ðµ Ñ�ÐºÐ¾Ð±ÐºÐ¸, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‚ÑŒ @%s ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ Ð² ÐºÐ°Ñ‡ÐµÑ�Ñ‚Ð²Ðµ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð°"
  
! #: tp/Texinfo/Parser.pm:4057 tp/Texinfo/Parser.pm:5189
  #, perl-format
  msgid "%c%s expects `i' or `j' as argument, not `%s'"
  msgstr "%c%s Ð¾Ð¶Ð¸Ð´Ð°ÐµÑ‚ Ð² ÐºÐ°Ñ‡ÐµÑ�Ñ‚Ð²Ðµ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð° Â«iÂ» Ð¸Ð»Ð¸ Â«jÂ», Ð° Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:4068
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr "Ð¿Ð¾Ñ�Ð»Ðµ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð½Ð¾Ð¹ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹ Â«@%sÂ» Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ð±Ñ‹Ñ‚ÑŒ Ð½Ð¾Ð²Ð¾Ð¹ Ñ�Ñ‚Ñ€Ð¾ÐºÐ¸"
  
! #: tp/Texinfo/Parser.pm:4079
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s Ð¿Ð¾Ð´Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ²Ð°ÐµÑ‚ Ñ„Ð¸Ð³ÑƒÑ€Ð½Ñ‹Ðµ Ñ�ÐºÐ¾Ð±ÐºÐ¸"
  
! #: tp/Texinfo/Parser.pm:4233
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "Ð½ÐµÐ¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð½Ñ‹Ð¹ Ñ„Ð»Ð°Ð³: %s"
  
! #: tp/Texinfo/Parser.pm:4236
  msgid "bad syntax for @value"
  msgstr "Ð½ÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹ Ñ�Ð¸Ð½Ñ‚Ð°ÐºÑ�Ð¸Ñ� @value"
  
! #: tp/Texinfo/Parser.pm:4243
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "ÐšÐ¾Ð¼Ð°Ð½Ð´Ð° %c%s ÑƒÑ�Ñ‚Ð°Ñ€ÐµÐ»Ð°."
  
! #: tp/Texinfo/Parser.pm:4246
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "ÐšÐ¾Ð¼Ð°Ð½Ð´Ð° %c%s ÑƒÑ�Ñ‚Ð°Ñ€ÐµÐ»Ð°; %s"
  
! #: tp/Texinfo/Parser.pm:4255
  #, perl-format
! msgid "@%s should only appear at the beginning of a line"
  msgstr "@%s Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð¿Ð¾Ñ�Ð²Ð»Ñ�Ñ‚ÑŒÑ�Ñ� Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð² Ð½Ð°Ñ‡Ð°Ð»Ðµ Ñ�Ñ‚Ñ€Ð¾ÐºÐ¸"
  
! #: tp/Texinfo/Parser.pm:4346
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s Ð½Ðµ Ð´Ð¾Ð¿ÑƒÑ�ÐºÐ°ÐµÑ‚Ñ�Ñ� Ð²Ð½ÑƒÑ‚Ñ€Ð¸ Ð±Ð»Ð¾ÐºÐ° Â«@%sÂ»"
  
! #: tp/Texinfo/Parser.pm:4355
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr "@%s Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð¿Ð¾Ñ�Ð²Ð»Ñ�Ñ‚ÑŒÑ�Ñ� Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð² Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐµ Ð¸Ð»Ð¸ Ð½Ð¸Ð¶Ð½ÐµÐ¼ ÐºÐ¾Ð»Ð¾Ð½Ñ‚Ð¸Ñ‚ÑƒÐ»Ðµ"
  
! #: tp/Texinfo/Parser.pm:4479 tp/Texinfo/Parser.pm:4496
! #: tp/Texinfo/Parser.pm:4546
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s Ð½Ðµ Ð¸Ð¼ÐµÐµÑ‚ Ñ�Ð¼Ñ‹Ñ�Ð»Ð° Ð²Ð½ÑƒÑ‚Ñ€Ð¸ Ð±Ð»Ð¾ÐºÐ° Â«@%sÂ»"
  
! #: tp/Texinfo/Parser.pm:4506
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "@%s Ð² Ð¿ÑƒÑ�Ñ‚Ð¾Ð¹ Ð¼ÑƒÐ»ÑŒÑ‚Ð¸Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ðµ"
  
! #: tp/Texinfo/Parser.pm:4512
  msgid "@tab before @item"
  msgstr "@tab Ð¿ÐµÑ€ÐµÐ´ @item"
  
! #: tp/Texinfo/Parser.pm:4515
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "Ñ�Ð»Ð¸ÑˆÐºÐ¾Ð¼ Ð¼Ð½Ð¾Ð³Ð¾ Ñ�Ñ‚Ð¾Ð»Ð±Ñ†Ð¾Ð² Ð² Ð¼ÑƒÐ»ÑŒÑ‚Ð¸Ñ‚Ð°Ð±Ð»Ð¸Ñ‡Ð½Ð¾Ð¼ Ñ�Ð»ÐµÐ¼ÐµÐ½Ñ‚Ðµ (Ð¼Ð°ÐºÑ�Ð¸Ð¼ÑƒÐ¼ %d)"
  
! #: tp/Texinfo/Parser.pm:4552
  msgid "ignoring @tab outside of multitable"
  msgstr "@tab Ð²Ð½Ðµ Ð¼ÑƒÐ»ÑŒÑ‚Ð¸Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ‹ Ð¸Ð³Ð½Ð¾Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½"
  
! #: tp/Texinfo/Parser.pm:4556
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "@%s Ð²Ð½Ðµ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ‹ Ð¸Ð»Ð¸ Ñ�Ð¿Ð¸Ñ�ÐºÐ°"
  
! #: tp/Texinfo/Parser.pm:4596
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ð±Ñ‹Ñ‚ÑŒ Ð¿Ð¾Ñ�Ð»Ðµ Â«@%sÂ», Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¸Ñ�Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Â«@%sÂ»"
  
! #: tp/Texinfo/Parser.pm:4638
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "@%s Ð½Ðµ Ð¸Ð¼ÐµÐµÑ‚ Ñ�Ð¼Ñ‹Ñ�Ð»Ð° Ð²Ð½Ðµ Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ� Â«@titlepageÂ» Ð¸Ð»Ð¸ Â«@quotationÂ»"
  
! #: tp/Texinfo/Parser.pm:4642
  msgid "@dircategory after first node"
  msgstr "@dircategory Ð¿Ð¾Ñ�Ð»Ðµ Ð¿ÐµÑ€Ð²Ð¾Ð¹ Ð½Ð¾Ð´Ñ‹"
  
! #: tp/Texinfo/Parser.pm:4847
  #, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "Ð½Ðµ Ð´Ð¾Ð¿ÑƒÑ�ÐºÐ°ÐµÑ‚Ñ�Ñ� ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ðµ Ð¾Ð±Ð»Ð°Ñ�Ñ‚Ð¸ %s Ð²Ð½ÑƒÑ‚Ñ€Ð¸ Ð¾Ð±Ð»Ð°Ñ�Ñ‚Ð¸ %s"
  
! #: tp/Texinfo/Parser.pm:4864
  msgid "@direntry after first node"
  msgstr "@direntry Ð¿Ð¾Ñ�Ð»Ðµ Ð¿ÐµÑ€Ð²Ð¾Ð¹ Ð½Ð¾Ð´Ñ‹"
  
! #: tp/Texinfo/Parser.pm:4872
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "@%s Ð²Ñ�Ñ‚Ñ€ÐµÑ‡ÐµÐ½Ð¾ Ð¿ÐµÑ€ÐµÐ´ Ð¿ÐµÑ€Ð²Ð¾Ð¹ @node"
  
! #: tp/Texinfo/Parser.pm:4875
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
  msgstr "Ð²ÐµÑ€Ð¾Ñ�Ñ‚Ð½Ð¾, Ð²Ð°ÑˆÐ° Ð½Ð¾Ð´Ð° @top Ð´Ð¾Ð»Ð¶Ð½Ð° Ð±Ñ‹Ñ‚ÑŒ Ð² @ifnottex, Ð° Ð½Ðµ Ð² @ifinfo?"
  
! #: tp/Texinfo/Parser.pm:4937
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr "@%s Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð¿Ð¾Ñ�Ð²Ð»Ñ�Ñ‚ÑŒÑ�Ñ� Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð² Ñ�Ð¾Ð²Ð¿Ð°Ð´Ð°ÑŽÑ‰ÐµÐ¼ ÐºÐ¾Ð½Ñ‚ÐµÐºÑ�Ñ‚Ðµ"
  
! #: tp/Texinfo/Parser.pm:4945
  #, perl-format
  msgid "unknown command `%s'"
  msgstr "Ð½ÐµÐ¸Ð·Ð²ÐµÑ�Ñ‚Ð½Ð°Ñ� ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:4955
  msgid "unexpected @"
  msgstr "Ð½ÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ñ‹Ð¹ Ñ�Ð¸Ð¼Ð²Ð¾Ð» @"
  
! #: tp/Texinfo/Parser.pm:4983
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s Ð½Ðµ Ð¸Ð¼ÐµÐµÑ‚ Ñ�Ð¼Ñ‹Ñ�Ð»Ð° Ð²Ð½Ðµ Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ� Â«@floatÂ»"
  
! #: tp/Texinfo/Parser.pm:4988
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr "@%s Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ñ�Ñ€Ð°Ð·Ñƒ Ð¿Ð¾Ñ�Ð»Ðµ Â«@floatÂ»"
  
! #: tp/Texinfo/Parser.pm:4996
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "Ð¸Ð³Ð½Ð¾Ñ€Ð¸Ñ€ÑƒÐµÑ‚Ñ�Ñ� Ð¼Ð½Ð¾Ð³Ð¾ÐºÑ€Ð°Ñ‚Ð½Ñ‹Ð¹ @%s"
  
! #: tp/Texinfo/Parser.pm:5114
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° @%s Ð½Ðµ Ð´Ð¾Ð¿ÑƒÑ�ÐºÐ°ÐµÑ‚ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð²"
  
! #: tp/Texinfo/Parser.pm:5138
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr "Ñƒ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° @%s Ð¾Ñ‚Ñ�ÑƒÑ‚Ñ�Ñ‚Ð²ÑƒÐµÑ‚ Ð½Ð¾Ð´Ð° Ð¸Ð»Ð¸ Ð²Ð½ÐµÑˆÐ½Ð¸Ð¹ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ð¹ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚"
  
! #: tp/Texinfo/Parser.pm:5156
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr "Ð² @%s ÑƒÐºÐ°Ð·Ð°Ð½Ð° Ð¿ÑƒÑ�Ñ‚Ð¾Ðµ Ð¸Ð¼Ñ� Ð¿ÐµÑ€ÐµÐºÑ€Ñ‘Ñ�Ñ‚Ð½Ð¾Ð¹ Ñ�Ñ�Ñ‹Ð»ÐºÐ¸ Ð¿Ð¾Ñ�Ð»Ðµ Ñ€Ð°Ñ�ÐºÑ€Ñ‹Ñ‚Ð¾Ð³Ð¾ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5167
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
***************
*** 2853,2871 ****
  "Ð² @%s ÑƒÐºÐ°Ð·Ð°Ð½ Ð¿ÑƒÑ�Ñ‚Ð¾Ð¹ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð¿ÐµÑ€ÐµÐºÑ€Ñ‘Ñ�Ñ‚Ð½Ð¾Ð¹ Ñ�Ñ�Ñ‹Ð»ÐºÐ¸ Ð¿Ð¾Ñ�Ð»Ðµ Ñ€Ð°Ñ�ÐºÑ€Ñ‹Ñ‚Ð¾Ð³Ð¾ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5316
  msgid "@image missing filename argument"
  msgstr "Ð¿Ð¾Ñ�Ð»Ðµ @image Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚, Ð·Ð°Ð´Ð°ÑŽÑ‰Ð¸Ð¹ Ñ„Ð°Ð¹Ð»"
  
! #: tp/Texinfo/Parser.pm:5348
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "Ñƒ @%s Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½ Ð¿ÐµÑ€Ð²Ñ‹Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚"
  
! #: tp/Texinfo/Parser.pm:5393
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "Ð½Ð°Ð¹Ð´ÐµÐ½Ñ‹ Ð½Ðµ ÑˆÐµÑ�Ñ‚Ð½Ð°Ð´Ñ†Ð°Ñ‚ÐµÑ€Ð¸Ñ‡Ð½Ñ‹Ðµ Ñ†Ð¸Ñ„Ñ€Ñ‹ Ð² Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ðµ Ð´Ð»Ñ� @U: %s"
  
! #: tp/Texinfo/Parser.pm:5399
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
--- 2856,2874 ----
  "Ð² @%s ÑƒÐºÐ°Ð·Ð°Ð½ Ð¿ÑƒÑ�Ñ‚Ð¾Ð¹ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð¿ÐµÑ€ÐµÐºÑ€Ñ‘Ñ�Ñ‚Ð½Ð¾Ð¹ Ñ�Ñ�Ñ‹Ð»ÐºÐ¸ Ð¿Ð¾Ñ�Ð»Ðµ Ñ€Ð°Ñ�ÐºÑ€Ñ‹Ñ‚Ð¾Ð³Ð¾ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5180
  msgid "@image missing filename argument"
  msgstr "Ð¿Ð¾Ñ�Ð»Ðµ @image Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚, Ð·Ð°Ð´Ð°ÑŽÑ‰Ð¸Ð¹ Ñ„Ð°Ð¹Ð»"
  
! #: tp/Texinfo/Parser.pm:5211
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "Ñƒ @%s Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½ Ð¿ÐµÑ€Ð²Ñ‹Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚"
  
! #: tp/Texinfo/Parser.pm:5230
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "Ð½Ð°Ð¹Ð´ÐµÐ½Ñ‹ Ð½Ðµ ÑˆÐµÑ�Ñ‚Ð½Ð°Ð´Ñ†Ð°Ñ‚ÐµÑ€Ð¸Ñ‡Ð½Ñ‹Ðµ Ñ†Ð¸Ñ„Ñ€Ñ‹ Ð² Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ðµ Ð´Ð»Ñ� @U: %s"
  
! #: tp/Texinfo/Parser.pm:5236
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
***************
*** 2873,2981 ****
  "ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑ�Ñ‚Ð²Ð¾ ÑˆÐµÑ�Ñ‚Ð½Ð°Ð´Ñ†Ð°Ñ‚ÐµÑ€Ð¸Ñ‡Ð½Ñ‹Ñ… Ñ†Ð¸Ñ„Ñ€ Ð² Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ðµ Ð±Ð¾Ð»ÑŒÑˆÐµ Ñ‡ÐµÑ‚Ñ‹Ñ€Ñ‘Ñ… Ð´Ð»Ñ� @U : %s"
  
! #: tp/Texinfo/Parser.pm:5412
! #, perl-format
! msgid "argument for @U exceeds size of integer: %s"
! msgstr "Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ @U Ð¿Ñ€ÐµÐ²Ñ‹ÑˆÐ°ÐµÑ‚ Ñ€Ð°Ð·Ð¼ÐµÑ€ integer: %s"
! 
! #: tp/Texinfo/Parser.pm:5418
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr "Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ @U Ð¿Ñ€ÐµÐ²Ñ‹ÑˆÐ°ÐµÑ‚ Ð¼Ð°ÐºÑ�Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ðµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ 0x10FFFF Ð®Ð½Ð¸ÐºÐ¾Ð´Ð°: %s"
  
! #: tp/Texinfo/Parser.pm:5546
  msgid "superfluous arguments for node"
  msgstr "Ð»Ð¸ÑˆÐ½Ð¸Ðµ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñ‹ Ñƒ Ð½Ð¾Ð´Ñ‹"
  
! #: tp/Texinfo/Parser.pm:5596
  #, perl-format
  msgid "expected @end %s"
  msgstr "Ð¾Ð¶Ð¸Ð´Ð°Ð»Ñ�Ñ� @end %s"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "@%s Ð´Ð¾Ð»Ð¶Ð½Ð° Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°Ñ‚ÑŒ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ @-ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ Ð² ÐºÐ°Ñ‡ÐµÑ�Ñ‚Ð²Ðµ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð°, Ð° Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5728
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "Ð¾Ñ�Ñ‚Ð°Ð²ÑˆÐ¸Ð¹Ñ�Ñ� Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð² Ñ�Ñ‚Ñ€Ð¾ÐºÐµ @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5801
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ� %s Ð² ÐºÐ°Ñ‡ÐµÑ�Ñ‚Ð²Ðµ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð° Ð´Ð»Ñ� @%s"
  
! #: tp/Texinfo/Parser.pm:5823
  #, perl-format
  msgid "empty @%s"
  msgstr "Ð¿ÑƒÑ�Ñ‚Ð°Ñ� @%s"
  
! #: tp/Texinfo/Parser.pm:5831
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "Ñ‡Ð°Ñ�Ñ‚ÑŒ Ñ�Ñ‚Ð¾Ð»Ð±Ñ†Ð° Ð½Ðµ Ñ�Ð²Ð»Ñ�ÐµÑ‚Ñ�Ñ� Ñ‡Ð¸Ñ�Ð»Ð¾Ð¼: %s"
  
! #: tp/Texinfo/Parser.pm:5840
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "@sp Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ñ‡Ð¸Ñ�Ð»Ð¾Ð²Ñ‹Ð¼, Ð° Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5849
  #, perl-format
  msgid "reserved index name %s"
  msgstr "Ð·Ð°Ñ€ÐµÐ·ÐµÑ€Ð²Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ� Ð°Ð»Ñ„Ð°Ð²Ð¸Ñ‚Ð½Ð¾Ð³Ð¾ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ� %s"
  
! #: tp/Texinfo/Parser.pm:5868
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "Ð½ÐµÐ¸Ð·Ð²ÐµÑ�Ñ‚Ð½Ñ‹Ð¹ Ð¸Ñ�Ñ‚Ð¾Ñ‡Ð½Ð¸Ðº Ð°Ð»Ñ„Ð°Ð²Ð¸Ñ‚Ð½Ð¾Ð³Ð¾ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ� Ð² @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5871
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "Ð½ÐµÐ¸Ð·Ð²ÐµÑ�Ñ‚Ð½Ð¾Ðµ Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð°Ð»Ñ„Ð°Ð²Ð¸Ñ‚Ð½Ð¾Ð³Ð¾ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ� Ð² @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr "@%s Ð²ÐµÐ´Ñ‘Ñ‚ Ðº Ñ�Ð»Ð¸Ñ�Ð½Ð¸ÑŽ %s Ñ� Ñ�Ð°Ð¼Ð¸Ð¼ Ñ�Ð¾Ð±Ð¾Ð¹, Ð¸Ð³Ð½Ð¾Ñ€Ð¸Ñ€ÑƒÐµÑ‚Ñ�Ñ�"
  
! #: tp/Texinfo/Parser.pm:5914
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "Ð½ÐµÐ¸Ð·Ð²ÐµÑ�Ñ‚Ð½Ñ‹Ð¹ Ð°Ð»Ñ„Ð°Ð²Ð¸Ñ‚Ð½Ñ‹Ð¹ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»ÑŒ Â«%sÂ» Ð² @printindex"
  
! #: tp/Texinfo/Parser.pm:5920
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr "Ð²Ñ‹Ð²Ð¾Ð´Ð¸Ñ‚Ñ�Ñ� Ð°Ð»Ñ„Ð°Ð²Ð¸Ñ‚Ð½Ñ‹Ð¹ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»ÑŒ Â«%sÂ», Ð¾Ð±ÑŠÐµÐ´Ð¸Ð½Ñ‘Ð½Ð½Ñ‹Ð¹ Ð² Ð´Ñ€ÑƒÐ³Ð¾Ð¹ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5928
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "printindex Ð´Ð¾ Ð½Ð°Ñ‡Ð°Ð»Ð° Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°: @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5944
  #, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
  msgstr "@%s Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Â«topÂ» Ð¸Ð»Ð¸ Â«bottomÂ», Ð° Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5952
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr "ÐŸÐ¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÑŽÑ‚Ñ�Ñ� Ñ‚Ð¾Ð»ÑŒÐºÐ¾ @%s 10 Ð¸Ð»Ð¸ 11, Ð° Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5960
  #, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
  msgstr "@%s Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Â«separateÂ» Ð¸Ð»Ð¸ Â«endÂ», Ð° Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5968
  #, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
  msgstr "@%s Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Â«onÂ», Â«offÂ» Ð¸Ð»Ð¸ Â«oddÂ», Ð° Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5986 tp/Texinfo/Parser.pm:5991
  #, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
--- 2876,2979 ----
  "ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑ�Ñ‚Ð²Ð¾ ÑˆÐµÑ�Ñ‚Ð½Ð°Ð´Ñ†Ð°Ñ‚ÐµÑ€Ð¸Ñ‡Ð½Ñ‹Ñ… Ñ†Ð¸Ñ„Ñ€ Ð² Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ðµ Ð±Ð¾Ð»ÑŒÑˆÐµ Ñ‡ÐµÑ‚Ñ‹Ñ€Ñ‘Ñ… Ð´Ð»Ñ� @U : %s"
  
! #: tp/Texinfo/Parser.pm:5253
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr "Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ @U Ð¿Ñ€ÐµÐ²Ñ‹ÑˆÐ°ÐµÑ‚ Ð¼Ð°ÐºÑ�Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ðµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ 0x10FFFF Ð®Ð½Ð¸ÐºÐ¾Ð´Ð°: %s"
  
! #: tp/Texinfo/Parser.pm:5448
  msgid "superfluous arguments for node"
  msgstr "Ð»Ð¸ÑˆÐ½Ð¸Ðµ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñ‹ Ñƒ Ð½Ð¾Ð´Ñ‹"
  
! #: tp/Texinfo/Parser.pm:5498
  #, perl-format
  msgid "expected @end %s"
  msgstr "Ð¾Ð¶Ð¸Ð´Ð°Ð»Ñ�Ñ� @end %s"
  
! #: tp/Texinfo/Parser.pm:5607
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "@%s Ð´Ð¾Ð»Ð¶Ð½Ð° Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°Ñ‚ÑŒ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ @-ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ Ð² ÐºÐ°Ñ‡ÐµÑ�Ñ‚Ð²Ðµ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð°, Ð° Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5617
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "Ð¾Ñ�Ñ‚Ð°Ð²ÑˆÐ¸Ð¹Ñ�Ñ� Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð² Ñ�Ñ‚Ñ€Ð¾ÐºÐµ @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5689
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ� %s Ð² ÐºÐ°Ñ‡ÐµÑ�Ñ‚Ð²Ðµ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð° Ð´Ð»Ñ� @%s"
  
! #: tp/Texinfo/Parser.pm:5710
  #, perl-format
  msgid "empty @%s"
  msgstr "Ð¿ÑƒÑ�Ñ‚Ð°Ñ� @%s"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "Ñ‡Ð°Ñ�Ñ‚ÑŒ Ñ�Ñ‚Ð¾Ð»Ð±Ñ†Ð° Ð½Ðµ Ñ�Ð²Ð»Ñ�ÐµÑ‚Ñ�Ñ� Ñ‡Ð¸Ñ�Ð»Ð¾Ð¼: %s"
  
! #: tp/Texinfo/Parser.pm:5727
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "@sp Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ñ‡Ð¸Ñ�Ð»Ð¾Ð²Ñ‹Ð¼, Ð° Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5736
  #, perl-format
  msgid "reserved index name %s"
  msgstr "Ð·Ð°Ñ€ÐµÐ·ÐµÑ€Ð²Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ� Ð°Ð»Ñ„Ð°Ð²Ð¸Ñ‚Ð½Ð¾Ð³Ð¾ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ� %s"
  
! #: tp/Texinfo/Parser.pm:5762
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "Ð½ÐµÐ¸Ð·Ð²ÐµÑ�Ñ‚Ð½Ñ‹Ð¹ Ð¸Ñ�Ñ‚Ð¾Ñ‡Ð½Ð¸Ðº Ð°Ð»Ñ„Ð°Ð²Ð¸Ñ‚Ð½Ð¾Ð³Ð¾ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ� Ð² @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5765
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "Ð½ÐµÐ¸Ð·Ð²ÐµÑ�Ñ‚Ð½Ð¾Ðµ Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð°Ð»Ñ„Ð°Ð²Ð¸Ñ‚Ð½Ð¾Ð³Ð¾ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ� Ð² @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5793
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr "@%s Ð²ÐµÐ´Ñ‘Ñ‚ Ðº Ñ�Ð»Ð¸Ñ�Ð½Ð¸ÑŽ %s Ñ� Ñ�Ð°Ð¼Ð¸Ð¼ Ñ�Ð¾Ð±Ð¾Ð¹, Ð¸Ð³Ð½Ð¾Ñ€Ð¸Ñ€ÑƒÐµÑ‚Ñ�Ñ�"
  
! #: tp/Texinfo/Parser.pm:5806
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "Ð½ÐµÐ¸Ð·Ð²ÐµÑ�Ñ‚Ð½Ñ‹Ð¹ Ð°Ð»Ñ„Ð°Ð²Ð¸Ñ‚Ð½Ñ‹Ð¹ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»ÑŒ Â«%sÂ» Ð² @printindex"
  
! #: tp/Texinfo/Parser.pm:5812
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr "Ð²Ñ‹Ð²Ð¾Ð´Ð¸Ñ‚Ñ�Ñ� Ð°Ð»Ñ„Ð°Ð²Ð¸Ñ‚Ð½Ñ‹Ð¹ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»ÑŒ Â«%sÂ», Ð¾Ð±ÑŠÐµÐ´Ð¸Ð½Ñ‘Ð½Ð½Ñ‹Ð¹ Ð² Ð´Ñ€ÑƒÐ³Ð¾Ð¹ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5820
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "printindex Ð´Ð¾ Ð½Ð°Ñ‡Ð°Ð»Ð° Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°: @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5836
  #, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
  msgstr "@%s Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Â«topÂ» Ð¸Ð»Ð¸ Â«bottomÂ», Ð° Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5844
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr "ÐŸÐ¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÑŽÑ‚Ñ�Ñ� Ñ‚Ð¾Ð»ÑŒÐºÐ¾ @%s 10 Ð¸Ð»Ð¸ 11, Ð° Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5852
  #, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
  msgstr "@%s Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Â«separateÂ» Ð¸Ð»Ð¸ Â«endÂ», Ð° Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5860
  #, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
  msgstr "@%s Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Â«onÂ», Â«offÂ» Ð¸Ð»Ð¸ Â«oddÂ», Ð° Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5878 tp/Texinfo/Parser.pm:5883
  #, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
***************
*** 2983,2987 ****
  "@paragraphindent Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ñ‡Ð¸Ñ�Ð»Ð¾Ð²Ñ‹Ð¼/Â«noneÂ»/Â«asisÂ», Ð° Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5999
  #, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
--- 2981,2985 ----
  "@paragraphindent Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ñ‡Ð¸Ñ�Ð»Ð¾Ð²Ñ‹Ð¼/Â«noneÂ»/Â«asisÂ», Ð° Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5891
  #, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
***************
*** 2989,3003 ****
  "@firstparagraphindent Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Â«noneÂ» Ð¸Ð»Ð¸ Â«insertÂ», Ð° Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:6009
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
  msgstr "@exampleindent Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ñ‡Ð¸Ñ�Ð»Ð¾Ð²Ñ‹Ð¼/Â«asisÂ», Ð° Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:6021
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "Ð¾Ð¶Ð¸Ð´Ð°Ð»Ñ�Ñ� @%s on Ð¸Ð»Ð¸ off, Ð° Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:6031
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
--- 2987,3001 ----
  "@firstparagraphindent Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Â«noneÂ» Ð¸Ð»Ð¸ Â«insertÂ», Ð° Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
  msgstr "@exampleindent Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ñ‡Ð¸Ñ�Ð»Ð¾Ð²Ñ‹Ð¼/Â«asisÂ», Ð° Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5913
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "Ð¾Ð¶Ð¸Ð´Ð°Ð»Ñ�Ñ� @%s on Ð¸Ð»Ð¸ off, Ð° Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5922
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
***************
*** 3005,3014 ****
  "@kbdinputstyle Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Â«codeÂ»/Â«exampleÂ»/Â«distinctÂ», Ð° Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:6039
  #, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
  msgstr "@allowcodebreaks Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Â«trueÂ» Ð¸Ð»Ð¸ Â«falseÂ», Ð° Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:6047
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
--- 3003,3012 ----
  "@kbdinputstyle Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Â«codeÂ»/Â«exampleÂ»/Â«distinctÂ», Ð° Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5930
  #, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
  msgstr "@allowcodebreaks Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Â«trueÂ» Ð¸Ð»Ð¸ Â«falseÂ», Ð° Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5938
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
***************
*** 3016,3030 ****
  "@urefbreakstyle Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Â«afterÂ»/Â«beforeÂ»/Â«noneÂ», Ð° Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:213
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr "Ð¿Ð¾Ð²Ñ‹ÑˆÐ°ÐµÑ‚Ñ�Ñ� ÑƒÑ€Ð¾Ð²ÐµÐ½ÑŒ Ñ€Ð°Ð·Ð´ÐµÐ» @%s, Ñ‚Ð°Ðº ÐºÐ°Ðº Ñ�Ð»Ð¸ÑˆÐºÐ¾Ð¼ Ð¼Ð°Ð»"
  
! #: tp/Texinfo/Structuring.pm:245
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "Ð¾Ñ‚Ñ�ÑƒÑ‚Ñ�Ñ‚Ð²ÑƒÐµÑ‚ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° chapter-level Ð´Ð¾ @%s"
  
! #: tp/Texinfo/Structuring.pm:250
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
--- 3014,3028 ----
  "@urefbreakstyle Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Â«afterÂ»/Â«beforeÂ»/Â«noneÂ», Ð° Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:216
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr "Ð¿Ð¾Ð²Ñ‹ÑˆÐ°ÐµÑ‚Ñ�Ñ� ÑƒÑ€Ð¾Ð²ÐµÐ½ÑŒ Ñ€Ð°Ð·Ð´ÐµÐ» @%s, Ñ‚Ð°Ðº ÐºÐ°Ðº Ñ�Ð»Ð¸ÑˆÐºÐ¾Ð¼ Ð¼Ð°Ð»"
  
! #: tp/Texinfo/Structuring.pm:248
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "Ð¾Ñ‚Ñ�ÑƒÑ‚Ñ�Ñ‚Ð²ÑƒÐµÑ‚ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° chapter-level Ð´Ð¾ @%s"
  
! #: tp/Texinfo/Structuring.pm:253
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
***************
*** 3032,3041 ****
  "Ð¿Ð¾Ð½Ð¸Ð¶Ð°ÐµÑ‚Ñ�Ñ� ÑƒÑ€Ð¾Ð²ÐµÐ½ÑŒ Ñ€Ð°Ð·Ð´ÐµÐ»Ð° @%s, Ð¿Ð¾Ñ�Ð²Ð¸Ð²ÑˆÐµÐ³Ð¾Ñ�Ñ� Ð¿Ð¾Ñ�Ð»Ðµ Ð¿Ð¾Ð½Ð¸Ð¶Ð°ÑŽÑ‰ÐµÐ³Ð¾ Ñ�Ð»ÐµÐ¼ÐµÐ½Ñ‚Ð°"
  
! #: tp/Texinfo/Structuring.pm:339
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "Ð¾Ñ‚Ñ�ÑƒÑ‚Ñ�Ñ‚Ð²ÑƒÐµÑ‚ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Ñ€Ð°Ð·Ð´ÐµÐ»Ð°, Ñ�Ð²Ñ�Ð·Ð°Ð½Ð½Ð°Ñ� Ñ� @%s"
  
! #: tp/Texinfo/Structuring.pm:488
  #, perl-format
  msgid "@%s not empty"
--- 3030,3039 ----
  "Ð¿Ð¾Ð½Ð¸Ð¶Ð°ÐµÑ‚Ñ�Ñ� ÑƒÑ€Ð¾Ð²ÐµÐ½ÑŒ Ñ€Ð°Ð·Ð´ÐµÐ»Ð° @%s, Ð¿Ð¾Ñ�Ð²Ð¸Ð²ÑˆÐµÐ³Ð¾Ñ�Ñ� Ð¿Ð¾Ñ�Ð»Ðµ Ð¿Ð¾Ð½Ð¸Ð¶Ð°ÑŽÑ‰ÐµÐ³Ð¾ Ñ�Ð»ÐµÐ¼ÐµÐ½Ñ‚Ð°"
  
! #: tp/Texinfo/Structuring.pm:342
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "Ð¾Ñ‚Ñ�ÑƒÑ‚Ñ�Ñ‚Ð²ÑƒÐµÑ‚ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Ñ€Ð°Ð·Ð´ÐµÐ»Ð°, Ñ�Ð²Ñ�Ð·Ð°Ð½Ð½Ð°Ñ� Ñ� @%s"
  
! #: tp/Texinfo/Structuring.pm:491
  #, perl-format
  msgid "@%s not empty"
***************
*** 3043,3092 ****
  
  #  Ð·Ð´ÐµÑ�ÑŒ %s Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ `cross' Ð¸Ð»Ð¸ `menu'
! #: tp/Texinfo/Structuring.pm:544 tp/Texinfo/Structuring.pm:1326
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "@%s Ñ�Ñ�Ñ‹Ð»Ð°ÐµÑ‚Ñ�Ñ� Ð½Ð° Ð½ÐµÑ�ÑƒÑ‰ÐµÑ�Ñ‚Ð²ÑƒÑŽÑ‰ÑƒÑŽ Ð½Ð¾Ð´Ñƒ Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:557
  #, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
  msgstr "@%s Ð¸Ð¼Ñ� Ð¿Ð¾Ñ�Ð²Ð¸Ð²ÑˆÐµÐ¹Ñ�Ñ� Ð½Ð¾Ð´Ñ‹ Â«%sÂ» Ð¾Ñ‚Ð»Ð¸Ñ‡Ð°ÐµÑ‚Ñ�Ñ� Ð¾Ñ‚ %s Ð¸Ð¼ÐµÐ½Ð¸ Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:662
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "Ð½Ð° Ð½Ð¾Ð´Ñƒ Â«%sÂ» Ð½ÐµÑ‚ Ñ�Ñ�Ñ‹Ð»Ð¾Ðº"
  
! #: tp/Texinfo/Structuring.pm:708
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr "Ð½Ð¾Ð´Ð° Â«%sÂ» Ñ�Ð¾Ð¾Ñ‚Ð²ÐµÑ‚Ñ�Ñ‚Ð²ÑƒÐµÑ‚ %s Ð´Ð»Ñ� Â«%sÂ» Ð² Ñ€Ð°Ð·Ð´ÐµÐ»Ð°Ñ…, Ð½Ð¾ Ð½Ðµ Ð² Ð¼ÐµÐ½ÑŽ"
  
! #: tp/Texinfo/Structuring.pm:715
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
  msgstr "Ð½Ð¾Ð´Ð° %s Â«%sÂ» Ð² Ð¼ÐµÐ½ÑŽ Â«%sÂ» Ð¸ Ð² Ñ€Ð°Ð·Ð´ÐµÐ»Ð°Ñ… Â«%sÂ» Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð½Ð°"
  
! #: tp/Texinfo/Structuring.pm:733
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
  msgstr "Ð½Ð¾Ð´Ð° Â«%sÂ» Ñ�Ð¾Ð¾Ñ‚Ð²ÐµÑ‚Ñ�Ñ‚Ð²ÑƒÐµÑ‚ %s Ð´Ð»Ñ� Â«%sÂ» Ð² Ð¼ÐµÐ½ÑŽ, Ð½Ð¾ Ð½Ðµ Ð² Ñ€Ð°Ð·Ð´ÐµÐ»Ð°Ñ…"
  
! #: tp/Texinfo/Structuring.pm:787
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
  msgstr "%s ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»ÑŒ Â«%sÂ» (Ð´Ð»Ñ� Ð½Ð¾Ð´Ñ‹ Â«%sÂ») Ð¾Ñ‚Ð»Ð¸Ñ‡Ð°ÐµÑ‚Ñ�Ñ� Ð¾Ñ‚ %s Ñ� Ð¸Ð¼ÐµÐ½ÐµÐ¼ Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:814
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%s Ñ�Ñ�Ñ‹Ð»Ð°ÐµÑ‚Ñ�Ñ� Ð½Ð° Ð½ÐµÑ�ÑƒÑ‰ÐµÑ�Ñ‚Ð²ÑƒÑŽÑ‰Ð¸Ð¹ Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:834
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
  msgstr "Ð½Ð¾Ð´Ð° Â«%sÂ» Ð½Ðµ Ð¸Ð¼ÐµÐµÑ‚ Ð¿ÑƒÐ½ÐºÑ‚Ð° Ð¼ÐµÐ½ÑŽ Ð´Ð»Ñ� Â«%sÂ», Ñ…Ð¾Ñ‚Ñ� Ð½Ð° Ð½ÐµÑ‘ Ñ�Ñ�Ñ‹Ð»Ð°ÐµÑ‚Ñ�Ñ� Ñ†ÐµÐ»ÑŒ Up"
  
! #: tp/Texinfo/Structuring.pm:842
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
--- 3041,3090 ----
  
  #  Ð·Ð´ÐµÑ�ÑŒ %s Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ `cross' Ð¸Ð»Ð¸ `menu'
! #: tp/Texinfo/Structuring.pm:547 tp/Texinfo/Structuring.pm:1325
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "@%s Ñ�Ñ�Ñ‹Ð»Ð°ÐµÑ‚Ñ�Ñ� Ð½Ð° Ð½ÐµÑ�ÑƒÑ‰ÐµÑ�Ñ‚Ð²ÑƒÑŽÑ‰ÑƒÑŽ Ð½Ð¾Ð´Ñƒ Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:558
  #, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
  msgstr "@%s Ð¸Ð¼Ñ� Ð¿Ð¾Ñ�Ð²Ð¸Ð²ÑˆÐµÐ¹Ñ�Ñ� Ð½Ð¾Ð´Ñ‹ Â«%sÂ» Ð¾Ñ‚Ð»Ð¸Ñ‡Ð°ÐµÑ‚Ñ�Ñ� Ð¾Ñ‚ %s Ð¸Ð¼ÐµÐ½Ð¸ Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:663
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "Ð½Ð° Ð½Ð¾Ð´Ñƒ Â«%sÂ» Ð½ÐµÑ‚ Ñ�Ñ�Ñ‹Ð»Ð¾Ðº"
  
! #: tp/Texinfo/Structuring.pm:706
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr "Ð½Ð¾Ð´Ð° Â«%sÂ» Ñ�Ð¾Ð¾Ñ‚Ð²ÐµÑ‚Ñ�Ñ‚Ð²ÑƒÐµÑ‚ %s Ð´Ð»Ñ� Â«%sÂ» Ð² Ñ€Ð°Ð·Ð´ÐµÐ»Ð°Ñ…, Ð½Ð¾ Ð½Ðµ Ð² Ð¼ÐµÐ½ÑŽ"
  
! #: tp/Texinfo/Structuring.pm:713
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
  msgstr "Ð½Ð¾Ð´Ð° %s Â«%sÂ» Ð² Ð¼ÐµÐ½ÑŽ Â«%sÂ» Ð¸ Ð² Ñ€Ð°Ð·Ð´ÐµÐ»Ð°Ñ… Â«%sÂ» Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð½Ð°"
  
! #: tp/Texinfo/Structuring.pm:731
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
  msgstr "Ð½Ð¾Ð´Ð° Â«%sÂ» Ñ�Ð¾Ð¾Ñ‚Ð²ÐµÑ‚Ñ�Ñ‚Ð²ÑƒÐµÑ‚ %s Ð´Ð»Ñ� Â«%sÂ» Ð² Ð¼ÐµÐ½ÑŽ, Ð½Ð¾ Ð½Ðµ Ð² Ñ€Ð°Ð·Ð´ÐµÐ»Ð°Ñ…"
  
! #: tp/Texinfo/Structuring.pm:786
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
  msgstr "%s ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»ÑŒ Â«%sÂ» (Ð´Ð»Ñ� Ð½Ð¾Ð´Ñ‹ Â«%sÂ») Ð¾Ñ‚Ð»Ð¸Ñ‡Ð°ÐµÑ‚Ñ�Ñ� Ð¾Ñ‚ %s Ñ� Ð¸Ð¼ÐµÐ½ÐµÐ¼ Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:810
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%s Ñ�Ñ�Ñ‹Ð»Ð°ÐµÑ‚Ñ�Ñ� Ð½Ð° Ð½ÐµÑ�ÑƒÑ‰ÐµÑ�Ñ‚Ð²ÑƒÑŽÑ‰Ð¸Ð¹ Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:829
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
  msgstr "Ð½Ð¾Ð´Ð° Â«%sÂ» Ð½Ðµ Ð¸Ð¼ÐµÐµÑ‚ Ð¿ÑƒÐ½ÐºÑ‚Ð° Ð¼ÐµÐ½ÑŽ Ð´Ð»Ñ� Â«%sÂ», Ñ…Ð¾Ñ‚Ñ� Ð½Ð° Ð½ÐµÑ‘ Ñ�Ñ�Ñ‹Ð»Ð°ÐµÑ‚Ñ�Ñ� Ñ†ÐµÐ»ÑŒ Up"
  
! #: tp/Texinfo/Structuring.pm:837
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
***************
*** 3098,3102 ****
  msgstr "@%s Ð½Ð° Â«%sÂ», Ð¾Ñ‚Ð»Ð¸Ñ‡Ð°ÐµÑ‚Ñ�Ñ� Ð¾Ñ‚ %s Ñ� Ð¸Ð¼ÐµÐ½ÐµÐ¼ Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:2070
  #, perl-format
  msgid "empty index key in @%s"
--- 3096,3100 ----
  msgstr "@%s Ð½Ð° Â«%sÂ», Ð¾Ñ‚Ð»Ð¸Ñ‡Ð°ÐµÑ‚Ñ�Ñ� Ð¾Ñ‚ %s Ñ� Ð¸Ð¼ÐµÐ½ÐµÐ¼ Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:2067
  #, perl-format
  msgid "empty index key in @%s"
***************
*** 3624,3643 ****
  msgstr "ÐŸÐ¾Ð¿Ñ€Ð¾Ð±ÑƒÐ¹Ñ‚Ðµ Â«%s --helpÂ» Ð´Ð»Ñ� Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ� Ð±Ð¾Ð»ÐµÐµ Ð¿Ð¾Ð´Ñ€Ð¾Ð±Ð½Ð¾Ð³Ð¾ Ð¾Ð¿Ð¸Ñ�Ð°Ð½Ð¸Ñ�.\n"
  
! #: tp/texi2any.pl:1232
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
  "ÐŸÑ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ðµ fill_gaps_in_sectioning Ð½Ðµ Ð´Ð°Ð»Ð¾ Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ð°. Ð�ÐµÑ‚ Ñ€Ð°Ð·Ð´ÐµÐ»Ð°?"
  
! #: tp/texi2any.pl:1255
  #, perl-format
  msgid "error on closing macro expand file %s: %s\n"
  msgstr "Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ Ñ€Ð°Ñ�ÑˆÐ¸Ñ€Ñ�ÑŽÑ‰ÐµÐ³Ð¾ Ð¼Ð°ÐºÑ€Ð¾Ñ� Ñ„Ð°Ð¹Ð»Ð° %s: %s\n"
  
! #: tp/texi2any.pl:1261
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ %s Ð´Ð»Ñ� Ð·Ð°Ð¿Ð¸Ñ�Ð¸: %s\n"
  
! #: tp/texi2any.pl:1286
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
--- 3622,3641 ----
  msgstr "ÐŸÐ¾Ð¿Ñ€Ð¾Ð±ÑƒÐ¹Ñ‚Ðµ Â«%s --helpÂ» Ð´Ð»Ñ� Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ� Ð±Ð¾Ð»ÐµÐµ Ð¿Ð¾Ð´Ñ€Ð¾Ð±Ð½Ð¾Ð³Ð¾ Ð¾Ð¿Ð¸Ñ�Ð°Ð½Ð¸Ñ�.\n"
  
! #: tp/texi2any.pl:1239
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
  "ÐŸÑ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ðµ fill_gaps_in_sectioning Ð½Ðµ Ð´Ð°Ð»Ð¾ Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ð°. Ð�ÐµÑ‚ Ñ€Ð°Ð·Ð´ÐµÐ»Ð°?"
  
! #: tp/texi2any.pl:1262
  #, perl-format
  msgid "error on closing macro expand file %s: %s\n"
  msgstr "Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ Ñ€Ð°Ñ�ÑˆÐ¸Ñ€Ñ�ÑŽÑ‰ÐµÐ³Ð¾ Ð¼Ð°ÐºÑ€Ð¾Ñ� Ñ„Ð°Ð¹Ð»Ð° %s: %s\n"
  
! #: tp/texi2any.pl:1268
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ %s Ð´Ð»Ñ� Ð·Ð°Ð¿Ð¸Ñ�Ð¸: %s\n"
  
! #: tp/texi2any.pl:1293
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
***************
*** 3647,3665 ****
  "Ñ€Ð°Ð·Ð´ÐµÐ»Ð°?"
  
! #: tp/texi2any.pl:1359 tp/texi2any.pl:1435
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%s: Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ %s: %s\n"
  
! #: tp/texi2any.pl:1382 tp/texi2any.pl:1416
  #, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
  msgstr "%s: Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ Ñ„Ð°Ð¹Ð»Ð° Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½Ð¸Ñ… Ñ�Ñ�Ñ‹Ð»Ð¾Ðº %s: %s\n"
  
! #: tp/texi2any.pl:1388 tp/texi2any.pl:1422
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
  msgstr "%s: Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ %s Ð´Ð»Ñ� Ð·Ð°Ð¿Ð¸Ñ�Ð¸: %s\n"
  
  #~ msgid ""
  #~ "\n"
--- 3645,3675 ----
  "Ñ€Ð°Ð·Ð´ÐµÐ»Ð°?"
  
! #: tp/texi2any.pl:1366 tp/texi2any.pl:1442
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%s: Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ %s: %s\n"
  
! #: tp/texi2any.pl:1389 tp/texi2any.pl:1423
  #, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
  msgstr "%s: Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ Ñ„Ð°Ð¹Ð»Ð° Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½Ð¸Ñ… Ñ�Ñ�Ñ‹Ð»Ð¾Ðº %s: %s\n"
  
! #: tp/texi2any.pl:1395 tp/texi2any.pl:1429
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
  msgstr "%s: Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ %s Ð´Ð»Ñ� Ð·Ð°Ð¿Ð¸Ñ�Ð¸: %s\n"
  
+ #~ msgid "-%s---Info: %s, %ld lines --%s--"
+ #~ msgstr "-%s---Info: %s, Ñ�Ñ‚Ñ€Ð¾Ðº: %ld --%s--"
+ 
+ #~ msgid "-%s---Info: (%s)%s, %ld lines --%s--"
+ #~ msgstr "-%s---Info: (%s)%s, %ld Ñ�Ñ‚Ñ€Ð¾Ðº --%s--"
+ 
+ #~ msgid "No file given for node '%s'."
+ #~ msgstr "Ð’ Ð½Ð¾Ð´Ðµ Â«%sÂ» Ð½Ðµ ÑƒÐºÐ°Ð·Ð°Ð½ Ñ„Ð°Ð¹Ð»."
+ 
+ #~ msgid "argument for @U exceeds size of integer: %s"
+ #~ msgstr "Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ @U Ð¿Ñ€ÐµÐ²Ñ‹ÑˆÐ°ÐµÑ‚ Ñ€Ð°Ð·Ð¼ÐµÑ€ integer: %s"
+ 
  #~ msgid ""
  #~ "\n"
Binary files texinfo-6.1/po/rw.gmo and texinfo-6.3/po/rw.gmo differ
diff -Nrc2 texinfo-6.1/po/rw.po texinfo-6.3/po/rw.po
*** texinfo-6.1/po/rw.po	2016-02-06 11:35:54.000000000 +0000
--- texinfo-6.3/po/rw.po	2016-09-10 12:45:55.000000000 +0100
***************
*** 17,21 ****
  "Project-Id-Version: texinfo 4.7.94\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
  "PO-Revision-Date: 2005-04-04 10:55-0700\n"
  "Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n"
--- 17,21 ----
  "Project-Id-Version: texinfo 4.7.94\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:45+0100\n"
  "PO-Revision-Date: 2005-04-04 10:55-0700\n"
  "Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n"
***************
*** 123,127 ****
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [ or [^"
  msgstr ""
  
--- 123,127 ----
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [, [^, [:, [., or [="
  msgstr ""
  
***************
*** 165,169 ****
  msgstr ""
  
! #: gnulib/lib/regcomp.c:711
  #, fuzzy
  msgid "No previous regular expression"
--- 165,169 ----
  msgstr ""
  
! #: gnulib/lib/regcomp.c:687
  #, fuzzy
  msgid "No previous regular expression"
***************
*** 344,348 ****
  msgstr ""
  
! #: info/indices.c:123 info/indices.c:812
  #, fuzzy, c-format
  msgid "Finding index entries..."
--- 344,348 ----
  msgstr ""
  
! #: info/indices.c:123 info/indices.c:822
  #, fuzzy, c-format
  msgid "Finding index entries..."
***************
*** 354,358 ****
  msgstr "Hejuru a Ikurikiranyanyuguti in i Umubarendanga kugirango iyi IDOSIYE"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:818
  #, fuzzy, c-format
  msgid "No indices found."
--- 354,358 ----
  msgstr "Hejuru a Ikurikiranyanyuguti in i Umubarendanga kugirango iyi IDOSIYE"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:828
  #, fuzzy, c-format
  msgid "No indices found."
***************
*** 388,402 ****
  msgstr "Ibyinjijwe"
  
! #: info/indices.c:476 info/indices.c:880
  #, fuzzy, c-format
  msgid "No index entries containing '%s'."
  msgstr "Ibyinjijwe"
  
! #: info/indices.c:583
  #, fuzzy, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "ibimenyetso Bya"
  
! #: info/indices.c:636
  #, fuzzy
  msgid "Grovel all known info file's indices for a string and build a menu"
--- 388,402 ----
  msgstr "Ibyinjijwe"
  
! #: info/indices.c:476 info/indices.c:890
  #, fuzzy, c-format
  msgid "No index entries containing '%s'."
  msgstr "Ibyinjijwe"
  
! #: info/indices.c:586
  #, fuzzy, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "ibimenyetso Bya"
  
! #: info/indices.c:646
  #, fuzzy
  msgid "Grovel all known info file's indices for a string and build a menu"
***************
*** 406,425 ****
  
  # sw/source\ui\inc\swmn.hrc:_MN_EDIT.FN_EDIT_IDX_ENTRY_DLG.text
! #: info/indices.c:644 info/indices.c:646
  #, fuzzy
  msgid "Index apropos"
  msgstr "Ikinjizwa mu mubarendanga...."
  
! #: info/indices.c:688
  #, fuzzy, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Ibyinjijwe"
  
! #: info/indices.c:797
  msgid "List all matches of a string in the index"
  msgstr ""
  
  # sw/source\ui\inc\swmn.hrc:_MN_EDIT.FN_EDIT_IDX_ENTRY_DLG.text
! #: info/indices.c:824 info/indices.c:826
  #, fuzzy
  msgid "Index topic"
--- 406,425 ----
  
  # sw/source\ui\inc\swmn.hrc:_MN_EDIT.FN_EDIT_IDX_ENTRY_DLG.text
! #: info/indices.c:654 info/indices.c:656
  #, fuzzy
  msgid "Index apropos"
  msgstr "Ikinjizwa mu mubarendanga...."
  
! #: info/indices.c:698
  #, fuzzy, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Ibyinjijwe"
  
! #: info/indices.c:807
  msgid "List all matches of a string in the index"
  msgstr ""
  
  # sw/source\ui\inc\swmn.hrc:_MN_EDIT.FN_EDIT_IDX_ENTRY_DLG.text
! #: info/indices.c:834 info/indices.c:836
  #, fuzzy
  msgid "Index topic"
***************
*** 431,485 ****
  msgstr "Bihari Ibisobanuro Idosiye in ibimenyetso"
  
! #: info/info-utils.c:892
  #, c-format
  msgid "Error converting file character encoding."
  msgstr ""
  
! #: info/info.c:222 info/session.c:2789
  #, fuzzy, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "Ibikubiyemo Ikintu in"
  
! #: info/info.c:315
! #, fuzzy, c-format
! msgid "No file given for node '%s'."
! msgstr "Ibikubiyemo in"
! 
! #: info/info.c:364 info/info.c:1133
  #, fuzzy, c-format
  msgid "Cannot find node '%s'."
  msgstr "Gushaka"
  
! #: info/info.c:386
  #, c-format
  msgid "No program name given."
  msgstr ""
  
! #: info/info.c:577
  #, c-format
  msgid "invalid number: %s\n"
  msgstr ""
  
! #: info/info.c:757
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr ""
  
! #: info/info.c:764 info/infokey.c:537
  #, fuzzy, c-format
  msgid "%s: no such variable"
  msgstr "Komandi:"
  
! #: info/info.c:770 info/infokey.c:539
  #, fuzzy, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "i Agaciro Bya IMPINDURAGACIRO"
  
! #: info/info.c:782
  #, fuzzy, c-format
  msgid "Try --help for more information.\n"
  msgstr "Ifashayobora kugirango Birenzeho Ibisobanuro"
  
! #: info/info.c:804 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
--- 431,480 ----
  msgstr "Bihari Ibisobanuro Idosiye in ibimenyetso"
  
! #: info/info-utils.c:879
  #, c-format
  msgid "Error converting file character encoding."
  msgstr ""
  
! #: info/info.c:279 info/session.c:2789
  #, fuzzy, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "Ibikubiyemo Ikintu in"
  
! #: info/info.c:416 info/info.c:1148
  #, fuzzy, c-format
  msgid "Cannot find node '%s'."
  msgstr "Gushaka"
  
! #: info/info.c:438
  #, c-format
  msgid "No program name given."
  msgstr ""
  
! #: info/info.c:636
  #, c-format
  msgid "invalid number: %s\n"
  msgstr ""
  
! #: info/info.c:816
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr ""
  
! #: info/info.c:823 info/infokey.c:540
  #, fuzzy, c-format
  msgid "%s: no such variable"
  msgstr "Komandi:"
  
! #: info/info.c:829 info/infokey.c:542
  #, fuzzy, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "i Agaciro Bya IMPINDURAGACIRO"
  
! #: info/info.c:841
  #, fuzzy, c-format
  msgid "Try --help for more information.\n"
  msgstr "Ifashayobora kugirango Birenzeho Ibisobanuro"
  
! #: info/info.c:860 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
***************
*** 491,500 ****
  msgstr ""
  
! #: info/info.c:981
  #, fuzzy, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "Oya Umubarendanga Ibyinjijwe Byabonetse kugirango"
  
! #: info/info.c:1034
  #, c-format
  msgid ""
--- 486,495 ----
  msgstr ""
  
! #: info/info.c:999
  #, fuzzy, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "Oya Umubarendanga Ibyinjijwe Byabonetse kugirango"
  
! #: info/info.c:1049
  #, c-format
  msgid ""
***************
*** 504,508 ****
  msgstr ""
  
! #: info/info.c:1040
  msgid ""
  "Options:\n"
--- 499,503 ----
  msgstr ""
  
! #: info/info.c:1055
  msgid ""
  "Options:\n"
***************
*** 515,519 ****
  msgstr ""
  
! #: info/info.c:1048
  msgid ""
  "  -h, --help                   display this help and exit.\n"
--- 510,514 ----
  msgstr ""
  
! #: info/info.c:1063
  msgid ""
  "  -h, --help                   display this help and exit.\n"
***************
*** 523,527 ****
  msgstr ""
  
! #: info/info.c:1054
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
--- 518,522 ----
  msgstr ""
  
! #: info/info.c:1069
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
***************
*** 531,540 ****
  msgstr ""
  
! #: info/info.c:1061
  #, fuzzy
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr "-B Kuri"
  
! #: info/info.c:1065
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
--- 526,535 ----
  msgstr ""
  
! #: info/info.c:1076
  #, fuzzy
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr "-B Kuri"
  
! #: info/info.c:1080
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
***************
*** 548,552 ****
  msgstr ""
  
! #: info/info.c:1074
  msgid ""
  "\n"
--- 543,547 ----
  msgstr ""
  
! #: info/info.c:1089
  msgid ""
  "\n"
***************
*** 558,562 ****
  msgstr ""
  
! #: info/info.c:1081
  msgid ""
  "\n"
--- 553,557 ----
  msgstr ""
  
! #: info/info.c:1096
  msgid ""
  "\n"
***************
*** 564,568 ****
  msgstr ""
  
! #: info/info.c:1084
  msgid ""
  "\n"
--- 559,563 ----
  msgstr ""
  
! #: info/info.c:1099
  msgid ""
  "\n"
***************
*** 580,584 ****
  msgstr ""
  
! #: info/info.c:1099 install-info/install-info.c:616 tp/texi2any.pl:861
  #, fuzzy
  msgid ""
--- 575,579 ----
  msgstr ""
  
! #: info/info.c:1114 install-info/install-info.c:616 tp/texi2any.pl:861
  #, fuzzy
  msgid ""
***************
*** 588,662 ****
  msgstr "org."
  
! #: info/info.c:1134
  #, fuzzy, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Gushaka"
  
! #: info/info.c:1135
  #, fuzzy
  msgid "Cannot find a window!"
  msgstr "Gushaka a Idirishya"
  
! #: info/info.c:1136
  #, fuzzy
  msgid "Point doesn't appear within this window's node!"
  msgstr "Kugaragara muri iyi"
  
! #: info/info.c:1137
  #, fuzzy
  msgid "Cannot delete the last window."
  msgstr "Gusiba i Iheruka Idirishya"
  
! #: info/info.c:1138
  #, fuzzy
  msgid "No menu in this node."
  msgstr "Ibikubiyemo in iyi"
  
! #: info/info.c:1139
  #, fuzzy
  msgid "No footnotes in this node."
  msgstr "Ubusobanuro mpezarupapuro in iyi"
  
! #: info/info.c:1140
  #, fuzzy
  msgid "No cross references in this node."
  msgstr "Kwambukiranya Indango in iyi"
  
! #: info/info.c:1141
  #, fuzzy, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Mweretsi kugirango iyi"
  
! #: info/info.c:1142
  #, fuzzy, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "Komandi: kugirango Ifashayobora"
  
! #: info/info.c:1143
  #, fuzzy, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "Ubwoko ni OYA Cyiza Kuri Gukoresha"
  
! #: info/info.c:1144
  #, fuzzy
  msgid "You are already at the last page of this node."
  msgstr "ku i Iheruka Ipaji Bya iyi"
  
! #: info/info.c:1145
  #, fuzzy
  msgid "You are already at the first page of this node."
  msgstr "ku i Itangira Ipaji Bya iyi"
  
! #: info/info.c:1146
  #, fuzzy
  msgid "Only one window."
  msgstr "Idirishya"
  
! #: info/info.c:1147
  #, fuzzy
  msgid "Resulting window would be too small."
  msgstr "Idirishya Gitoya"
  
! #: info/info.c:1148
  #, fuzzy
  msgid "Not enough room for a help window, please delete a window."
--- 583,657 ----
  msgstr "org."
  
! #: info/info.c:1149
  #, fuzzy, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Gushaka"
  
! #: info/info.c:1150
  #, fuzzy
  msgid "Cannot find a window!"
  msgstr "Gushaka a Idirishya"
  
! #: info/info.c:1151
  #, fuzzy
  msgid "Point doesn't appear within this window's node!"
  msgstr "Kugaragara muri iyi"
  
! #: info/info.c:1152
  #, fuzzy
  msgid "Cannot delete the last window."
  msgstr "Gusiba i Iheruka Idirishya"
  
! #: info/info.c:1153
  #, fuzzy
  msgid "No menu in this node."
  msgstr "Ibikubiyemo in iyi"
  
! #: info/info.c:1154
  #, fuzzy
  msgid "No footnotes in this node."
  msgstr "Ubusobanuro mpezarupapuro in iyi"
  
! #: info/info.c:1155
  #, fuzzy
  msgid "No cross references in this node."
  msgstr "Kwambukiranya Indango in iyi"
  
! #: info/info.c:1156
  #, fuzzy, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Mweretsi kugirango iyi"
  
! #: info/info.c:1157
  #, fuzzy, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "Komandi: kugirango Ifashayobora"
  
! #: info/info.c:1158
  #, fuzzy, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "Ubwoko ni OYA Cyiza Kuri Gukoresha"
  
! #: info/info.c:1159
  #, fuzzy
  msgid "You are already at the last page of this node."
  msgstr "ku i Iheruka Ipaji Bya iyi"
  
! #: info/info.c:1160
  #, fuzzy
  msgid "You are already at the first page of this node."
  msgstr "ku i Itangira Ipaji Bya iyi"
  
! #: info/info.c:1161
  #, fuzzy
  msgid "Only one window."
  msgstr "Idirishya"
  
! #: info/info.c:1162
  #, fuzzy
  msgid "Resulting window would be too small."
  msgstr "Idirishya Gitoya"
  
! #: info/info.c:1163
  #, fuzzy
  msgid "Not enough room for a help window, please delete a window."
***************
*** 959,993 ****
  msgstr "Kitazwi Igikorwa"
  
! #: info/infokey.c:482
  #, fuzzy, c-format
  msgid "action name too long"
  msgstr "Igikorwa Izina:"
  
! #: info/infokey.c:495
  #, fuzzy, c-format
  msgid "extra characters following action `%s'"
  msgstr "Birenga Inyuguti Igikorwa"
  
! #: info/infokey.c:506
  #, fuzzy, c-format
  msgid "missing variable name"
  msgstr "Ibuze IMPINDURAGACIRO Izina:"
  
! #: info/infokey.c:515
  #, fuzzy, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "Ibuze Ako kanya Nyuma IMPINDURAGACIRO Izina:"
  
! #: info/infokey.c:522
  #, fuzzy, c-format
  msgid "variable name too long"
  msgstr "IMPINDURAGACIRO Izina:"
  
! #: info/infokey.c:546
  #, fuzzy, c-format
  msgid "value too long"
  msgstr "Agaciro"
  
! #: info/infokey.c:592
  #, fuzzy, c-format
  msgid "\"%s\", line %u: "
--- 954,988 ----
  msgstr "Kitazwi Igikorwa"
  
! #: info/infokey.c:485
  #, fuzzy, c-format
  msgid "action name too long"
  msgstr "Igikorwa Izina:"
  
! #: info/infokey.c:498
  #, fuzzy, c-format
  msgid "extra characters following action `%s'"
  msgstr "Birenga Inyuguti Igikorwa"
  
! #: info/infokey.c:509
  #, fuzzy, c-format
  msgid "missing variable name"
  msgstr "Ibuze IMPINDURAGACIRO Izina:"
  
! #: info/infokey.c:518
  #, fuzzy, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "Ibuze Ako kanya Nyuma IMPINDURAGACIRO Izina:"
  
! #: info/infokey.c:525
  #, fuzzy, c-format
  msgid "variable name too long"
  msgstr "IMPINDURAGACIRO Izina:"
  
! #: info/infokey.c:549
  #, fuzzy, c-format
  msgid "value too long"
  msgstr "Agaciro"
  
! #: info/infokey.c:595
  #, fuzzy, c-format
  msgid "\"%s\", line %u: "
***************
*** 1360,1741 ****
  msgstr "Kuri Gushaka ku in"
  
! #: info/session.c:2864
  #, fuzzy
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "a Urutonde Bya Ibikubiyemo Bivuye Na"
  
! #: info/session.c:2866
  #, fuzzy
  msgid "Follow menus: "
  msgstr "Ibikubiyemo"
  
! #: info/session.c:2971
  #, fuzzy
  msgid "Select the Next node"
  msgstr "i"
  
! #: info/session.c:2978
  #, fuzzy
  msgid "Select the Prev node"
  msgstr "i"
  
! #: info/session.c:2985
  #, fuzzy
  msgid "Select the Up node"
  msgstr "i"
  
! #: info/session.c:2991
  #, fuzzy
  msgid "Select the last node in this file"
  msgstr "i Iheruka in iyi IDOSIYE"
  
! #: info/session.c:3018 info/session.c:3051
  #, fuzzy
  msgid "This window has no additional nodes"
  msgstr "Idirishya Oya"
  
! #: info/session.c:3024
  #, fuzzy
  msgid "Select the first node in this file"
  msgstr "i Itangira in iyi IDOSIYE"
  
! #: info/session.c:3158
  #, fuzzy
  msgid "No more nodes within this document."
  msgstr "Birenzeho muri iyi Inyandiko"
  
! #: info/session.c:3203 info/session.c:3243
  #, fuzzy
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "Cyangwa kugirango iyi muri iyi Inyandiko"
  
! #: info/session.c:3256
  #, fuzzy
  msgid "Move forwards or down through node structure"
  msgstr "Cyangwa Hasi Gihinguranya Imiterere"
  
! #: info/session.c:3273
  #, fuzzy
  msgid "Move backwards or up through node structure"
  msgstr "Inyuma Cyangwa Hejuru Gihinguranya Imiterere"
  
! #: info/session.c:3296
  #, fuzzy
  msgid "Read a node name and select it"
  msgstr "a Izina: Na Guhitamo"
  
! #: info/session.c:3350 info/session.c:3354
  msgid "Goto node: "
  msgstr ""
  
! #: info/session.c:3533
  #, fuzzy
  msgid "Find the node describing program invocation"
  msgstr "i Porogaramu"
  
! #: info/session.c:3535
  #, fuzzy, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Bya"
  
! #: info/session.c:3580
  #, fuzzy
  msgid "Read a manpage reference and select it"
  msgstr "a Indango Na Guhitamo"
  
! #: info/session.c:3584
  msgid "Get Manpage: "
  msgstr ""
  
! #: info/session.c:3605
  #, fuzzy
  msgid "Select the node 'Top' in this file"
  msgstr "i in iyi IDOSIYE"
  
! #: info/session.c:3611
  #, fuzzy
  msgid "Select the node '(dir)'"
  msgstr "i"
  
! #: info/session.c:3617
  msgid "Show full file name of node being displayed"
  msgstr ""
  
! #: info/session.c:3634
  #, fuzzy
  msgid "Select the most recently selected node"
  msgstr "i Byahiswemo"
  
! #: info/session.c:3639
  #, c-format
  msgid "No earlier node in history"
  msgstr ""
  
! #: info/session.c:3643
  #, fuzzy
  msgid "Read the name of a file and select it"
  msgstr "i Izina: Bya a IDOSIYE Na Guhitamo"
  
! #: info/session.c:3647
  #, fuzzy
  msgid "Find file: "
  msgstr "IDOSIYE"
  
! #: info/session.c:3664
  #, fuzzy, c-format
  msgid "Cannot find '%s'."
  msgstr "Gushaka"
  
! #: info/session.c:3713
  #, fuzzy, c-format
  msgid "Could not create output file '%s'."
  msgstr "OYA Kurema Ibisohoka IDOSIYE"
  
! #: info/session.c:3727
  #, fuzzy, c-format
  msgid "error writing to %s: %s"
  msgstr "Ikosa Kuri"
  
! #: info/session.c:3736
  #, fuzzy, c-format
  msgid "closing %s"
  msgstr "Ikosa Kuri"
  
! #: info/session.c:3785
  #, fuzzy, c-format
  msgid "writing node %s..."
  msgstr "Umubarendanga Ibyinjijwe"
  
! #: info/session.c:3831
  #, fuzzy
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "i Ibigize Bya iyi Gihinguranya"
  
! #: info/session.c:3859
  #, fuzzy, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Gufungura Kuri"
  
! #: info/session.c:3864
  #, fuzzy, c-format
  msgid "printing node %s..."
  msgstr "Umubarendanga Ibyinjijwe"
  
! #: info/session.c:3872
  #, fuzzy, c-format
  msgid "finished printing node %s"
  msgstr "Umubarendanga Ibyinjijwe"
  
! #: 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:4169
  #, fuzzy
  msgid "Search continued from the end of the document."
  msgstr "Kuri i Itangiriro Bya i Umurongo"
  
! #: info/session.c:4174
  #, fuzzy
  msgid "Search continued from the beginning of the document."
  msgstr "Kuri i Itangiriro Bya i Umurongo"
  
! #: info/session.c:4194
  #, fuzzy, c-format
  msgid "Searching subfile %s ..."
  msgstr "Byanze"
  
! #: info/session.c:4231
  #, fuzzy
  msgid "Search failed."
  msgstr "Byanze"
  
! #: info/session.c:4248
  #, fuzzy, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%sforIkurikiranyanyuguti"
  
! #: info/session.c:4249 info/session.c:4255
  #, fuzzy
  msgid "Regexp search"
  msgstr "Gushaka"
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Search"
  msgstr "Gushaka"
  
! #: info/session.c:4250 info/session.c:4256
  msgid " case-sensitively"
  msgstr ""
  
! #: info/session.c:4251 info/session.c:4257
  #, fuzzy
  msgid " backward"
  msgstr "Gushaka usubira inyuma"
  
! #: info/session.c:4254
  #, fuzzy, c-format
  msgid "%s%s%s: "
  msgstr "%s%sforIkurikiranyanyuguti"
  
! #: info/session.c:4274
  msgid "Search string too short"
  msgstr ""
  
! #: info/session.c:4467
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4491 info/session.c:4601
  #, c-format
  msgid "No more matches."
  msgstr ""
  
! #: info/session.c:4628
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4649
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4653 info/session.c:4665
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4661
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4674
  #, fuzzy
  msgid "Read a string and search for it case-sensitively"
  msgstr "a Ikurikiranyanyuguti Na Gushaka kugirango"
  
! #: info/session.c:4679
  #, fuzzy
  msgid "Read a string and search for it"
  msgstr "a Ikurikiranyanyuguti Na Gushaka kugirango"
  
! #: info/session.c:4685
  #, fuzzy
  msgid "Read a string and search backward for it"
  msgstr "a Ikurikiranyanyuguti Na Gushaka subira inyuma kugirango"
  
! #: info/session.c:4693
  #, fuzzy
  msgid "Repeat last search in the same direction"
  msgstr "Iheruka Gushaka in i Icyerekezo"
  
! #: info/session.c:4701 info/session.c:4746
  #, fuzzy
  msgid "No previous search string"
  msgstr "Ibanjirije Gushaka Ikurikiranyanyuguti"
  
! #: info/session.c:4738
  #, fuzzy
  msgid "Repeat last search in the reverse direction"
  msgstr "Iheruka Gushaka in i Ihindurakerekezo Icyerekezo"
  
! #: info/session.c:4785
  msgid "Clear displayed search matches"
  msgstr ""
  
! #: info/session.c:4802 info/session.c:4808
  #, fuzzy
  msgid "Search interactively for a string as you type it"
  msgstr "kugirango a Ikurikiranyanyuguti Nka Ubwoko"
  
! #: info/session.c:4928
  #, fuzzy
  msgid "Regexp I-search backward: "
  msgstr "Gushaka subira inyuma"
  
! #: info/session.c:4929
  #, fuzzy
  msgid "I-search backward: "
  msgstr "Gushaka subira inyuma"
  
! #: info/session.c:4931
  #, fuzzy
  msgid "Regexp I-search: "
  msgstr "Gushaka"
  
! #: info/session.c:4932
  #, fuzzy
  msgid "I-search: "
  msgstr "Gushaka"
  
! #: info/session.c:4957 info/session.c:4960
  msgid "Failing "
  msgstr ""
  
! #: info/session.c:5326
  #, fuzzy
  msgid "Cancel current operation"
  msgstr "KIGEZWEHO"
  
! #: info/session.c:5333
  msgid "Quit"
  msgstr "Kuvamo"
  
! #: info/session.c:5338
  #, fuzzy
  msgid "Display version of Info being run"
  msgstr "Kugaragaza Verisiyo Ibisobanuro Na Gusohoka"
  
! #: info/session.c:5340
  #, fuzzy, c-format
  msgid "GNU Info version %s"
  msgstr "ni ku Verisiyo Bivuye"
  
! #: info/session.c:5345
  #, fuzzy
  msgid "Redraw the display"
  msgstr "i Kugaragaza"
  
! #: info/session.c:5382
  #, fuzzy
  msgid "Quit using Info"
  msgstr "ikoresha"
  
! #: info/session.c:5398
  #, fuzzy
  msgid "Run command bound to this key's lowercase variant"
  msgstr "Komandi: Kuri iyi Inyuguti nto"
  
! #: info/session.c:5409
  #, fuzzy, c-format
  msgid "Unknown command (%s)."
  msgstr "Komandi:"
  
! #: info/session.c:5412
  #, fuzzy, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\"ni Sibyo"
  
! #: info/session.c:5413
  #, fuzzy, c-format
  msgid "'%s' is invalid"
  msgstr "`%s'ni Sibyo"
  
! #: info/session.c:5731
  #, fuzzy
  msgid "Add this digit to the current numeric argument"
  msgstr "iyi Kuri i KIGEZWEHO Bikurikije umubare"
  
! #: info/session.c:5738
  #, fuzzy
  msgid "Start (or multiply by 4) the current numeric argument"
--- 1355,1736 ----
  msgstr "Kuri Gushaka ku in"
  
! #: info/session.c:2870
  #, fuzzy
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "a Urutonde Bya Ibikubiyemo Bivuye Na"
  
! #: info/session.c:2872
  #, fuzzy
  msgid "Follow menus: "
  msgstr "Ibikubiyemo"
  
! #: info/session.c:2977
  #, fuzzy
  msgid "Select the Next node"
  msgstr "i"
  
! #: info/session.c:2984
  #, fuzzy
  msgid "Select the Prev node"
  msgstr "i"
  
! #: info/session.c:2991
  #, fuzzy
  msgid "Select the Up node"
  msgstr "i"
  
! #: info/session.c:2997
  #, fuzzy
  msgid "Select the last node in this file"
  msgstr "i Iheruka in iyi IDOSIYE"
  
! #: info/session.c:3024 info/session.c:3057
  #, fuzzy
  msgid "This window has no additional nodes"
  msgstr "Idirishya Oya"
  
! #: info/session.c:3030
  #, fuzzy
  msgid "Select the first node in this file"
  msgstr "i Itangira in iyi IDOSIYE"
  
! #: info/session.c:3164
  #, fuzzy
  msgid "No more nodes within this document."
  msgstr "Birenzeho muri iyi Inyandiko"
  
! #: info/session.c:3209 info/session.c:3249
  #, fuzzy
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "Cyangwa kugirango iyi muri iyi Inyandiko"
  
! #: info/session.c:3262
  #, fuzzy
  msgid "Move forwards or down through node structure"
  msgstr "Cyangwa Hasi Gihinguranya Imiterere"
  
! #: info/session.c:3279
  #, fuzzy
  msgid "Move backwards or up through node structure"
  msgstr "Inyuma Cyangwa Hejuru Gihinguranya Imiterere"
  
! #: info/session.c:3302
  #, fuzzy
  msgid "Read a node name and select it"
  msgstr "a Izina: Na Guhitamo"
  
! #: info/session.c:3356 info/session.c:3360
  msgid "Goto node: "
  msgstr ""
  
! #: info/session.c:3539
  #, fuzzy
  msgid "Find the node describing program invocation"
  msgstr "i Porogaramu"
  
! #: info/session.c:3541
  #, fuzzy, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Bya"
  
! #: info/session.c:3586
  #, fuzzy
  msgid "Read a manpage reference and select it"
  msgstr "a Indango Na Guhitamo"
  
! #: info/session.c:3590
  msgid "Get Manpage: "
  msgstr ""
  
! #: info/session.c:3611
  #, fuzzy
  msgid "Select the node 'Top' in this file"
  msgstr "i in iyi IDOSIYE"
  
! #: info/session.c:3617
  #, fuzzy
  msgid "Select the node '(dir)'"
  msgstr "i"
  
! #: info/session.c:3623
  msgid "Show full file name of node being displayed"
  msgstr ""
  
! #: info/session.c:3640
  #, fuzzy
  msgid "Select the most recently selected node"
  msgstr "i Byahiswemo"
  
! #: info/session.c:3645
  #, c-format
  msgid "No earlier node in history"
  msgstr ""
  
! #: info/session.c:3649
  #, fuzzy
  msgid "Read the name of a file and select it"
  msgstr "i Izina: Bya a IDOSIYE Na Guhitamo"
  
! #: info/session.c:3653
  #, fuzzy
  msgid "Find file: "
  msgstr "IDOSIYE"
  
! #: info/session.c:3670
  #, fuzzy, c-format
  msgid "Cannot find '%s'."
  msgstr "Gushaka"
  
! #: info/session.c:3719
  #, fuzzy, c-format
  msgid "Could not create output file '%s'."
  msgstr "OYA Kurema Ibisohoka IDOSIYE"
  
! #: info/session.c:3733
  #, fuzzy, c-format
  msgid "error writing to %s: %s"
  msgstr "Ikosa Kuri"
  
! #: info/session.c:3742
  #, fuzzy, c-format
  msgid "closing %s"
  msgstr "Ikosa Kuri"
  
! #: info/session.c:3791
  #, fuzzy, c-format
  msgid "writing node %s..."
  msgstr "Umubarendanga Ibyinjijwe"
  
! #: info/session.c:3837
  #, fuzzy
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "i Ibigize Bya iyi Gihinguranya"
  
! #: info/session.c:3865
  #, fuzzy, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Gufungura Kuri"
  
! #: info/session.c:3870
  #, fuzzy, c-format
  msgid "printing node %s..."
  msgstr "Umubarendanga Ibyinjijwe"
  
! #: info/session.c:3878
  #, fuzzy, c-format
  msgid "finished printing node %s"
  msgstr "Umubarendanga Ibyinjijwe"
  
! #: info/session.c:3910
  msgid "Toggle the usage of regular expressions in searches"
  msgstr ""
  
! #: info/session.c:3914
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr ""
  
! #: info/session.c:3915
  #, c-format
  msgid "Using literal strings for searches."
  msgstr ""
  
! #: info/session.c:4175
  #, fuzzy
  msgid "Search continued from the end of the document."
  msgstr "Kuri i Itangiriro Bya i Umurongo"
  
! #: info/session.c:4180
  #, fuzzy
  msgid "Search continued from the beginning of the document."
  msgstr "Kuri i Itangiriro Bya i Umurongo"
  
! #: info/session.c:4200
  #, fuzzy, c-format
  msgid "Searching subfile %s ..."
  msgstr "Byanze"
  
! #: info/session.c:4237
  #, fuzzy
  msgid "Search failed."
  msgstr "Byanze"
  
! #: info/session.c:4254
  #, fuzzy, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%sforIkurikiranyanyuguti"
  
! #: info/session.c:4255 info/session.c:4261
  #, fuzzy
  msgid "Regexp search"
  msgstr "Gushaka"
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Search"
  msgstr "Gushaka"
  
! #: info/session.c:4256 info/session.c:4262
  msgid " case-sensitively"
  msgstr ""
  
! #: info/session.c:4257 info/session.c:4263
  #, fuzzy
  msgid " backward"
  msgstr "Gushaka usubira inyuma"
  
! #: info/session.c:4260
  #, fuzzy, c-format
  msgid "%s%s%s: "
  msgstr "%s%sforIkurikiranyanyuguti"
  
! #: info/session.c:4280
  msgid "Search string too short"
  msgstr ""
  
! #: info/session.c:4473
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4497 info/session.c:4607
  #, c-format
  msgid "No more matches."
  msgstr ""
  
! #: info/session.c:4634
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4655
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4659 info/session.c:4671
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4667
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4680
  #, fuzzy
  msgid "Read a string and search for it case-sensitively"
  msgstr "a Ikurikiranyanyuguti Na Gushaka kugirango"
  
! #: info/session.c:4685
  #, fuzzy
  msgid "Read a string and search for it"
  msgstr "a Ikurikiranyanyuguti Na Gushaka kugirango"
  
! #: info/session.c:4691
  #, fuzzy
  msgid "Read a string and search backward for it"
  msgstr "a Ikurikiranyanyuguti Na Gushaka subira inyuma kugirango"
  
! #: info/session.c:4699
  #, fuzzy
  msgid "Repeat last search in the same direction"
  msgstr "Iheruka Gushaka in i Icyerekezo"
  
! #: info/session.c:4707 info/session.c:4752
  #, fuzzy
  msgid "No previous search string"
  msgstr "Ibanjirije Gushaka Ikurikiranyanyuguti"
  
! #: info/session.c:4744
  #, fuzzy
  msgid "Repeat last search in the reverse direction"
  msgstr "Iheruka Gushaka in i Ihindurakerekezo Icyerekezo"
  
! #: info/session.c:4791
  msgid "Clear displayed search matches"
  msgstr ""
  
! #: info/session.c:4808 info/session.c:4814
  #, fuzzy
  msgid "Search interactively for a string as you type it"
  msgstr "kugirango a Ikurikiranyanyuguti Nka Ubwoko"
  
! #: info/session.c:4934
  #, fuzzy
  msgid "Regexp I-search backward: "
  msgstr "Gushaka subira inyuma"
  
! #: info/session.c:4935
  #, fuzzy
  msgid "I-search backward: "
  msgstr "Gushaka subira inyuma"
  
! #: info/session.c:4937
  #, fuzzy
  msgid "Regexp I-search: "
  msgstr "Gushaka"
  
! #: info/session.c:4938
  #, fuzzy
  msgid "I-search: "
  msgstr "Gushaka"
  
! #: info/session.c:4963 info/session.c:4966
  msgid "Failing "
  msgstr ""
  
! #: info/session.c:5332
  #, fuzzy
  msgid "Cancel current operation"
  msgstr "KIGEZWEHO"
  
! #: info/session.c:5339
  msgid "Quit"
  msgstr "Kuvamo"
  
! #: info/session.c:5344
  #, fuzzy
  msgid "Display version of Info being run"
  msgstr "Kugaragaza Verisiyo Ibisobanuro Na Gusohoka"
  
! #: info/session.c:5346
  #, fuzzy, c-format
  msgid "GNU Info version %s"
  msgstr "ni ku Verisiyo Bivuye"
  
! #: info/session.c:5351
  #, fuzzy
  msgid "Redraw the display"
  msgstr "i Kugaragaza"
  
! #: info/session.c:5388
  #, fuzzy
  msgid "Quit using Info"
  msgstr "ikoresha"
  
! #: info/session.c:5404
  #, fuzzy
  msgid "Run command bound to this key's lowercase variant"
  msgstr "Komandi: Kuri iyi Inyuguti nto"
  
! #: info/session.c:5415
  #, fuzzy, c-format
  msgid "Unknown command (%s)."
  msgstr "Komandi:"
  
! #: info/session.c:5418
  #, fuzzy, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\"ni Sibyo"
  
! #: info/session.c:5419
  #, fuzzy, c-format
  msgid "'%s' is invalid"
  msgstr "`%s'ni Sibyo"
  
! #: info/session.c:5737
  #, fuzzy
  msgid "Add this digit to the current numeric argument"
  msgstr "iyi Kuri i KIGEZWEHO Bikurikije umubare"
  
! #: info/session.c:5744
  #, fuzzy
  msgid "Start (or multiply by 4) the current numeric argument"
***************
*** 1888,1906 ****
  msgstr "Kuri Agaciro"
  
! #: info/window.c:959
  #, fuzzy
  msgid "-----Info: (), lines ----, "
  msgstr "-----Imirongo"
  
- #: info/window.c:966
- #, fuzzy, c-format
- msgid "-%s---Info: %s, %ld lines --%s--"
- msgstr "-%s---Info:%s,%dImirongo"
- 
- #: info/window.c:970
- #, fuzzy, c-format
- msgid "-%s---Info: (%s)%s, %ld lines --%s--"
- msgstr "-%s%s-Info:(%s)%s,%dImirongo"
- 
  #: install-info/install-info.c:292
  #, fuzzy, c-format
--- 1883,1891 ----
  msgstr "Kuri Agaciro"
  
! #: info/window.c:909
  #, fuzzy
  msgid "-----Info: (), lines ----, "
  msgstr "-----Imirongo"
  
  #: install-info/install-info.c:292
  #, fuzzy, c-format
***************
*** 2026,2030 ****
  "\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"
--- 2011,2015 ----
  "\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"
***************
*** 2105,2192 ****
  msgstr "Oya Ibyinjijwe Byabonetse kugirango Cyasibwe"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:855
! #: tp/Texinfo/Convert/Converter.pm:893 tp/Texinfo/Convert/Converter.pm:1204
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6504
! #: tp/Texinfo/Convert/HTML.pm:6528 tp/Texinfo/Convert/HTML.pm:6905
! #: tp/Texinfo/Convert/HTML.pm:6963 tp/Texinfo/Convert/HTML.pm:7041
! #: tp/Texinfo/Convert/HTML.pm:7118 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:546
! #: tp/Texinfo/Convert/TexinfoXML.pm:457
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Common.pm:881
  msgid "recursion is always allowed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:882
  msgid "arguments are quoted by default"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1105
  #, fuzzy, perl-format
  msgid "%s is not a valid language code"
  msgstr "%sni OYA a Byemewe Ururimi ITEGEKONGENGA"
  
! #: tp/Texinfo/Common.pm:1110
  #, fuzzy, perl-format
  msgid "%s is not a valid region code"
  msgstr "%sni OYA a Byemewe Ururimi ITEGEKONGENGA"
  
! #: tp/Texinfo/Common.pm:1128
  #, fuzzy, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%sni OYA a Byemewe Ururimi ITEGEKONGENGA"
  
! #: tp/Texinfo/Common.pm:1151
  #, fuzzy, perl-format
  msgid "could not read %s: %s"
  msgstr "Kurema bushyinguro"
  
! #: tp/Texinfo/Common.pm:1170
  #, fuzzy, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "Ikosa Ibisohoka IDOSIYE"
  
! #: tp/Texinfo/Common.pm:1176 tp/Texinfo/Parser.pm:3353
  #, fuzzy, perl-format
  msgid "@%s: could not find %s"
  msgstr "Gushaka"
  
! #: tp/Texinfo/Common.pm:1520
! #, fuzzy, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr "Gukuraho... IDOSIYE"
! 
! #: tp/Texinfo/Common.pm:1548
! #, fuzzy
! msgid "missing type"
! msgstr "Ibuze Igikorwa Izina:"
! 
! #: tp/Texinfo/Common.pm:1551
! #, fuzzy, perl-format
! msgid "unrecognized type: %s"
! msgstr "%s:Ihitamo"
! 
! #: tp/Texinfo/Common.pm:1568
! #, fuzzy, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr "Gukuraho... IDOSIYE"
! 
! #: tp/Texinfo/Common.pm:1603
  msgid "no node to be renamed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1614
  msgid "nodes without a new name at the end of file"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1624 tp/Texinfo/Parser.pm:926
  #, fuzzy, perl-format
  msgid "could not open %s: %s"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Common.pm:2144
  #, fuzzy, perl-format
  msgid "could not protect hash character in @%s"
--- 2090,2168 ----
  msgstr "Oya Ibyinjijwe Byabonetse kugirango Cyasibwe"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:847
! #: tp/Texinfo/Convert/Converter.pm:885 tp/Texinfo/Convert/Converter.pm:1196
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6573
! #: tp/Texinfo/Convert/HTML.pm:6597 tp/Texinfo/Convert/HTML.pm:6978
! #: tp/Texinfo/Convert/HTML.pm:7037 tp/Texinfo/Convert/HTML.pm:7115
! #: tp/Texinfo/Convert/HTML.pm:7192 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:547
! #: tp/Texinfo/Convert/TexinfoXML.pm:458
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Common.pm:862
  msgid "recursion is always allowed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:863
  msgid "arguments are quoted by default"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:866
! msgid ""
! "move your @contents command if you want the contents after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:869
! msgid ""
! "move your @shortcontents and @contents commands if you want the contents "
! "after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:1093
  #, fuzzy, perl-format
  msgid "%s is not a valid language code"
  msgstr "%sni OYA a Byemewe Ururimi ITEGEKONGENGA"
  
! #: tp/Texinfo/Common.pm:1098
  #, fuzzy, perl-format
  msgid "%s is not a valid region code"
  msgstr "%sni OYA a Byemewe Ururimi ITEGEKONGENGA"
  
! #: tp/Texinfo/Common.pm:1116
  #, fuzzy, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%sni OYA a Byemewe Ururimi ITEGEKONGENGA"
  
! #: tp/Texinfo/Common.pm:1139
  #, fuzzy, perl-format
  msgid "could not read %s: %s"
  msgstr "Kurema bushyinguro"
  
! #: tp/Texinfo/Common.pm:1158
  #, fuzzy, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "Ikosa Ibisohoka IDOSIYE"
  
! #: tp/Texinfo/Common.pm:1164 tp/Texinfo/Parser.pm:3193
  #, fuzzy, perl-format
  msgid "@%s: could not find %s"
  msgstr "Gushaka"
  
! #: tp/Texinfo/Common.pm:1637
  msgid "no node to be renamed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1648
  msgid "nodes without a new name at the end of file"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1658 tp/Texinfo/Parser.pm:899
  #, fuzzy, perl-format
  msgid "could not open %s: %s"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Common.pm:2178
  #, fuzzy, perl-format
  msgid "could not protect hash character in @%s"
***************
*** 2194,2223 ****
  
  # sw/source\ui\fldui\fldui.src:STR_SETFLD.text
! #: tp/Texinfo/Convert/Converter.pm:395 tp/Texinfo/Convert/Converter.pm:414
  #, fuzzy, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Gushyiraho igihinduka"
  
! #: tp/Texinfo/Convert/Converter.pm:794
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:876 tp/Texinfo/Convert/Converter.pm:909
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:6931
! #: tp/Texinfo/Convert/HTML.pm:6989 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:476 tp/Texinfo/Parser.pm:2035
  #, fuzzy, perl-format
  msgid "error on closing %s: %s"
  msgstr "Ikosa Kuri"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, fuzzy, perl-format
  msgid "could not create directories `%s' or `%s': %s"
  msgstr "Kurema bushyinguro"
  
! #: tp/Texinfo/Convert/Converter.pm:995
  #, fuzzy, perl-format
  msgid "could not create directory `%s': %s"
--- 2170,2199 ----
  
  # sw/source\ui\fldui\fldui.src:STR_SETFLD.text
! #: tp/Texinfo/Convert/Converter.pm:387 tp/Texinfo/Convert/Converter.pm:406
  #, fuzzy, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Gushyiraho igihinduka"
  
! #: tp/Texinfo/Convert/Converter.pm:786
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:868 tp/Texinfo/Convert/Converter.pm:901
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:7004
! #: tp/Texinfo/Convert/HTML.pm:7063 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:477 tp/Texinfo/Parser.pm:1996
  #, fuzzy, perl-format
  msgid "error on closing %s: %s"
  msgstr "Ikosa Kuri"
  
! #: tp/Texinfo/Convert/Converter.pm:979
  #, fuzzy, perl-format
  msgid "could not create directories `%s' or `%s': %s"
  msgstr "Kurema bushyinguro"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, fuzzy, perl-format
  msgid "could not create directory `%s': %s"
***************
*** 2229,2330 ****
  msgstr "@Ishusho IDOSIYE"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5388
  #, fuzzy
  msgid "no argument specified for @U"
  msgstr "Izina: kugirango Komandi:"
  
! #: tp/Texinfo/Convert/HTML.pm:1683
  #, fuzzy, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
  msgstr "@Ishusho IDOSIYE kugirango OYA"
  
! #: tp/Texinfo/Convert/HTML.pm:2371
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4888
  msgid "string not closed in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4890
  #, fuzzy
  msgid "--css-include ended in comment"
  msgstr "%s:%d:--IDOSIYE in Icyo wongeraho"
  
! #: tp/Texinfo/Convert/HTML.pm:4892
  msgid "@import not finished in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4918
  #, fuzzy, perl-format
  msgid "CSS file %s not found"
  msgstr "%cendMakoro OYA Byabonetse"
  
! #: tp/Texinfo/Convert/HTML.pm:4924
  #, fuzzy, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Convert/HTML.pm:4934
  #, fuzzy, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "Ikosa Ibisohoka IDOSIYE"
  
! #: tp/Texinfo/Convert/HTML.pm:5801 tp/Texinfo/Convert/HTML.pm:5805
  #, fuzzy, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "Oya Umubarendanga Ibyinjijwe Byabonetse kugirango"
  
! #: tp/Texinfo/Convert/HTML.pm:6499
  #, fuzzy, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "Ikosa Ibisohoka IDOSIYE"
  
! #: tp/Texinfo/Convert/HTML.pm:6523
  #, fuzzy, perl-format
  msgid "error on closing TOC frame file %s: %s"
  msgstr "Ikosa Ibisohoka IDOSIYE"
  
! #: tp/Texinfo/Convert/HTML.pm:6638
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6839
  msgid "must specify a title with a title command or @top"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7048
  #, fuzzy, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr "Ikosa Ibisohoka IDOSIYE"
  
! #: tp/Texinfo/Convert/HTML.pm:7073
  #, 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:7079
  #, fuzzy, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "Ibikubiyemo in"
  
! #: tp/Texinfo/Convert/HTML.pm:7093
  #, 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:7125
  #, fuzzy, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
  msgstr "Ikosa Ibisohoka IDOSIYE"
  
! #: tp/Texinfo/Convert/HTML.pm:7163
  #, fuzzy
  msgid "empty node name"
  msgstr "Oya Umubarendanga Ibyinjijwe Byabonetse kugirango"
  
! #: tp/Texinfo/Convert/HTML.pm:7165 tp/Texinfo/Parser.pm:3697
  #, perl-format
  msgid "syntax for an external node used for `%s'"
--- 2205,2326 ----
  msgstr "@Ishusho IDOSIYE"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5225
  #, fuzzy
  msgid "no argument specified for @U"
  msgstr "Izina: kugirango Komandi:"
  
! #: tp/Texinfo/Convert/HTML.pm:1715
  #, fuzzy, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
  msgstr "@Ishusho IDOSIYE kugirango OYA"
  
! #: tp/Texinfo/Convert/HTML.pm:2399
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4629
! #, fuzzy, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr "Gukuraho... IDOSIYE"
! 
! #: tp/Texinfo/Convert/HTML.pm:4657
! #, fuzzy
! msgid "missing type"
! msgstr "Ibuze Igikorwa Izina:"
! 
! #: tp/Texinfo/Convert/HTML.pm:4660
! #, fuzzy, perl-format
! msgid "unrecognized type: %s"
! msgstr "%s:Ihitamo"
! 
! #: tp/Texinfo/Convert/HTML.pm:4677
! #, fuzzy, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr "Gukuraho... IDOSIYE"
! 
! #: tp/Texinfo/Convert/HTML.pm:4962
  msgid "string not closed in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4964
  #, fuzzy
  msgid "--css-include ended in comment"
  msgstr "%s:%d:--IDOSIYE in Icyo wongeraho"
  
! #: tp/Texinfo/Convert/HTML.pm:4966
  msgid "@import not finished in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4992
  #, fuzzy, perl-format
  msgid "CSS file %s not found"
  msgstr "%cendMakoro OYA Byabonetse"
  
! #: tp/Texinfo/Convert/HTML.pm:4998
  #, fuzzy, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Convert/HTML.pm:5008
  #, fuzzy, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "Ikosa Ibisohoka IDOSIYE"
  
! #: tp/Texinfo/Convert/HTML.pm:5870 tp/Texinfo/Convert/HTML.pm:5874
  #, fuzzy, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "Oya Umubarendanga Ibyinjijwe Byabonetse kugirango"
  
! #: tp/Texinfo/Convert/HTML.pm:6568
  #, fuzzy, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "Ikosa Ibisohoka IDOSIYE"
  
! #: tp/Texinfo/Convert/HTML.pm:6592
  #, fuzzy, perl-format
  msgid "error on closing TOC frame file %s: %s"
  msgstr "Ikosa Ibisohoka IDOSIYE"
  
! #: tp/Texinfo/Convert/HTML.pm:6707
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6912
  msgid "must specify a title with a title command or @top"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7122
  #, fuzzy, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr "Ikosa Ibisohoka IDOSIYE"
  
! #: tp/Texinfo/Convert/HTML.pm:7147
  #, 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:7153
  #, fuzzy, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "Ibikubiyemo in"
  
! #: tp/Texinfo/Convert/HTML.pm:7167
  #, 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:7199
  #, fuzzy, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
  msgstr "Ikosa Ibisohoka IDOSIYE"
  
! #: tp/Texinfo/Convert/HTML.pm:7237
  #, fuzzy
  msgid "empty node name"
  msgstr "Oya Umubarendanga Ibyinjijwe Byabonetse kugirango"
  
! #: tp/Texinfo/Convert/HTML.pm:7239 tp/Texinfo/Parser.pm:3542
  #, perl-format
  msgid "syntax for an external node used for `%s'"
***************
*** 2361,2390 ****
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1334
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1381 tp/Texinfo/Parser.pm:2722
  #, fuzzy, perl-format
  msgid "entry for index `%s' outside of any node"
  msgstr "kugirango Umubarendanga Hanze Bya"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1495
  #, fuzzy, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr "Ikosa Ibisohoka IDOSIYE"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1500
  #, fuzzy, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "@Ishusho IDOSIYE"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1523
  #, fuzzy, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
  msgstr "Gushaka"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1931
  #, fuzzy
  msgid ""
--- 2357,2386 ----
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1335
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1382 tp/Texinfo/Parser.pm:2568
  #, fuzzy, perl-format
  msgid "entry for index `%s' outside of any node"
  msgstr "kugirango Umubarendanga Hanze Bya"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1496
  #, fuzzy, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr "Ikosa Ibisohoka IDOSIYE"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1501
  #, fuzzy, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "@Ishusho IDOSIYE"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1524
  #, fuzzy, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
  msgstr "Gushaka"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1932
  #, fuzzy
  msgid ""
***************
*** 2393,2714 ****
  msgstr "@a Kwambukiranya Indango in Kuri"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2161
  #, fuzzy, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2193
  #, fuzzy, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2226
  #, fuzzy, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2272
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2275
  msgid "`.' or `,' must follow @xref"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3118
  #, fuzzy, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr "Kuri"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3129
  #, fuzzy
  msgid "menu entry node name should not contain `:'"
  msgstr "Kuri"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3145
  #, fuzzy
  msgid "menu entry name should not contain `:'"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:910
  #, fuzzy, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:1160 tp/Texinfo/Structuring.pm:594
  #, perl-format
  msgid "multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1194
  #, fuzzy, perl-format
! msgid "bad syntax for @%s argument: %s"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:1210
  #, fuzzy, perl-format
! msgid "bad or empty @%s formal argument: %s"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:1219 tp/Texinfo/Parser.pm:4856
! #: tp/Texinfo/Parser.pm:4882 tp/Texinfo/Parser.pm:5671
! #: tp/Texinfo/Parser.pm:5687 tp/Texinfo/Parser.pm:5702
  #, fuzzy, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%sa Izina:"
  
! #: tp/Texinfo/Parser.pm:1223 tp/Texinfo/Parser.pm:4859
! #: tp/Texinfo/Parser.pm:4885 tp/Texinfo/Parser.pm:5674
! #: tp/Texinfo/Parser.pm:5690 tp/Texinfo/Parser.pm:5705
  #, fuzzy, perl-format
  msgid "bad name for @%s"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:1341
  #, fuzzy, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr "@Ibikubiyemo Mbere Itangira"
  
! #: tp/Texinfo/Parser.pm:1345
  #, fuzzy, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "@Ibikubiyemo Mbere Itangira"
  
! #: tp/Texinfo/Parser.pm:1350
  #, fuzzy, perl-format
! msgid "%c%s missing close brace"
  msgstr "%c%sIbuze Gufunga"
  
! #: tp/Texinfo/Parser.pm:1354
  #, fuzzy, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "%c%sIbuze Gufunga"
  
! #: tp/Texinfo/Parser.pm:1476
  #, fuzzy, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:1544
  msgid "@itemx must follow @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1712
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1743
  #, fuzzy, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "`@Ikitezwe:"
  
! #: tp/Texinfo/Parser.pm:1746
  #, fuzzy, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@Ibikubiyemo Mbere Itangira"
  
! #: tp/Texinfo/Parser.pm:1750
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1776 tp/Texinfo/Parser.pm:5204
! #: tp/Texinfo/Parser.pm:5470
  #, perl-format
  msgid "misplaced %c"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1874 tp/Texinfo/Parser.pm:3312
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2110
  #, fuzzy, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "ku Umurongo Na:"
  
! #: tp/Texinfo/Parser.pm:2132
  #, fuzzy, perl-format
! msgid "@%s missing close brace"
  msgstr "%c%sIbuze Gufunga"
  
! #: tp/Texinfo/Parser.pm:2140
  #, fuzzy, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr "ku Umurongo Na:"
  
! #: tp/Texinfo/Parser.pm:2175
  #, fuzzy, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
  msgstr "\\ in Makoro ku Bya Izina:"
  
! #: tp/Texinfo/Parser.pm:2650
  #, fuzzy, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "Makoro"
  
! #: tp/Texinfo/Parser.pm:2655
  #, fuzzy, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "ni i Ibanjirije Insobanuro Bya"
  
! #: tp/Texinfo/Parser.pm:3016
  #, fuzzy, perl-format
  msgid "missing name for @%s"
  msgstr "in"
  
! #: tp/Texinfo/Parser.pm:3021
  #, fuzzy, perl-format
  msgid "missing category for @%s"
  msgstr "in"
  
! #: tp/Texinfo/Parser.pm:3073
  #, fuzzy, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:3089
  #, fuzzy
  msgid "empty multitable"
  msgstr "%s:ubusa IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:3145 tp/Texinfo/Parser.pm:5784
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:3151 tp/Texinfo/Parser.pm:5806
! #: tp/Texinfo/Parser.pm:5818
  #, fuzzy, perl-format
  msgid "bad argument to @%s"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:3162
  #, fuzzy, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%si kugirango"
  
! #: tp/Texinfo/Parser.pm:3167
  #, fuzzy, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
  msgstr "@Ikintu OYA in Kuri"
  
! #: tp/Texinfo/Parser.pm:3202
  #, fuzzy, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "@Ikintu OYA in Kuri"
  
! #: tp/Texinfo/Parser.pm:3290 tp/Texinfo/Parser.pm:3429
! #: tp/Texinfo/Parser.pm:5777
  #, fuzzy, perl-format
  msgid "@%s missing argument"
  msgstr "%s:Ibuze IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:3302
  #, fuzzy, perl-format
  msgid "unknown @end %s"
  msgstr "Umubarendanga"
  
! #: tp/Texinfo/Parser.pm:3324 tp/Texinfo/Parser.pm:3943
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:3329 tp/Texinfo/Parser.pm:5861
! #: tp/Texinfo/Parser.pm:5906 tp/Texinfo/Parser.pm:5935
! #: tp/Texinfo/Parser.pm:5976 tp/Texinfo/Parser.pm:6055
  #, fuzzy, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:3348
  #, fuzzy, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "Gushaka"
  
! #: tp/Texinfo/Parser.pm:3360
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3369
  #, fuzzy, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "Imisobekere: Izina:"
  
! #: tp/Texinfo/Parser.pm:3516
  #, perl-format
  msgid "@%s after the first element"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3523
  #, fuzzy, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%sOYA Hanze"
  
! #: tp/Texinfo/Parser.pm:3563
  #, fuzzy, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:3575
  #, fuzzy, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:3677
  #, fuzzy, perl-format
  msgid "empty argument in @%s"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:3681
  #, fuzzy, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:3724
  #, fuzzy, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:3732
  #, fuzzy
  msgid "empty node name in menu entry"
  msgstr "Oya Umubarendanga Ibyinjijwe Byabonetse kugirango"
  
! #: tp/Texinfo/Parser.pm:3805
  #, fuzzy, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:3937
  #, fuzzy, perl-format
! msgid "@end %s should only appear at a line beginning"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:3960
  #, fuzzy, perl-format
  msgid "macro `%s' previously defined"
  msgstr "Makoro"
  
! #: tp/Texinfo/Parser.pm:3963
  #, fuzzy, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "ni i Ibanjirije Insobanuro Bya"
  
! #: tp/Texinfo/Parser.pm:3968
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4017
  #, fuzzy, perl-format
  msgid "@%s without associated character"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:4087
  #, perl-format
  msgid ""
--- 2389,2711 ----
  msgstr "@a Kwambukiranya Indango in Kuri"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2162
  #, fuzzy, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2194
  #, fuzzy, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2227
  #, fuzzy, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2273
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2276
  msgid "`.' or `,' must follow @xref"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3086
  #, fuzzy, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr "Kuri"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3097
  #, fuzzy
  msgid "menu entry node name should not contain `:'"
  msgstr "Kuri"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3113
  #, fuzzy
  msgid "menu entry name should not contain `:'"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:883
  #, fuzzy, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:1125 tp/Texinfo/Structuring.pm:595
  #, perl-format
  msgid "multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1166
  #, fuzzy, perl-format
! msgid "bad or empty @%s formal argument: %s"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:1176
  #, fuzzy, perl-format
! msgid "bad syntax for @%s argument: %s"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:1183 tp/Texinfo/Parser.pm:4707
! #: tp/Texinfo/Parser.pm:4733 tp/Texinfo/Parser.pm:5565
! #: tp/Texinfo/Parser.pm:5578 tp/Texinfo/Parser.pm:5592
  #, fuzzy, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%sa Izina:"
  
! #: tp/Texinfo/Parser.pm:1187 tp/Texinfo/Parser.pm:4710
! #: tp/Texinfo/Parser.pm:4736 tp/Texinfo/Parser.pm:5568
! #: tp/Texinfo/Parser.pm:5581 tp/Texinfo/Parser.pm:5595
  #, fuzzy, perl-format
  msgid "bad name for @%s"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:1305
  #, fuzzy, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr "@Ibikubiyemo Mbere Itangira"
  
! #: tp/Texinfo/Parser.pm:1309
  #, fuzzy, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "@Ibikubiyemo Mbere Itangira"
  
! #: tp/Texinfo/Parser.pm:1314
  #, fuzzy, perl-format
! msgid "%c%s missing closing brace"
  msgstr "%c%sIbuze Gufunga"
  
! #: tp/Texinfo/Parser.pm:1318
  #, fuzzy, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "%c%sIbuze Gufunga"
  
! #: tp/Texinfo/Parser.pm:1440
  #, fuzzy, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:1508
  msgid "@itemx must follow @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1676
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1707
  #, fuzzy, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "`@Ikitezwe:"
  
! #: tp/Texinfo/Parser.pm:1710
  #, fuzzy, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@Ibikubiyemo Mbere Itangira"
  
! #: tp/Texinfo/Parser.pm:1714
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1738 tp/Texinfo/Parser.pm:5070
! #: tp/Texinfo/Parser.pm:5308
  #, perl-format
  msgid "misplaced %c"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1835 tp/Texinfo/Parser.pm:3148
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2072
  #, fuzzy, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "ku Umurongo Na:"
  
! #: tp/Texinfo/Parser.pm:2094
  #, fuzzy, perl-format
! msgid "@%s missing closing brace"
  msgstr "%c%sIbuze Gufunga"
  
! #: tp/Texinfo/Parser.pm:2102
  #, fuzzy, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr "ku Umurongo Na:"
  
! #: tp/Texinfo/Parser.pm:2138
  #, fuzzy, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
  msgstr "\\ in Makoro ku Bya Izina:"
  
! #: tp/Texinfo/Parser.pm:2501
  #, fuzzy, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "Makoro"
  
! #: tp/Texinfo/Parser.pm:2506
  #, fuzzy, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "ni i Ibanjirije Insobanuro Bya"
  
! #: tp/Texinfo/Parser.pm:2850
  #, fuzzy, perl-format
  msgid "missing name for @%s"
  msgstr "in"
  
! #: tp/Texinfo/Parser.pm:2855
  #, fuzzy, perl-format
  msgid "missing category for @%s"
  msgstr "in"
  
! #: tp/Texinfo/Parser.pm:2890
  #, fuzzy, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:2905
  #, fuzzy
  msgid "empty multitable"
  msgstr "%s:ubusa IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:2959 tp/Texinfo/Parser.pm:5673
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:2965 tp/Texinfo/Parser.pm:5694
! #: tp/Texinfo/Parser.pm:5705
  #, fuzzy, perl-format
  msgid "bad argument to @%s"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:2976
  #, fuzzy, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%si kugirango"
  
! #: tp/Texinfo/Parser.pm:2981
  #, fuzzy, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
  msgstr "@Ikintu OYA in Kuri"
  
! #: tp/Texinfo/Parser.pm:3016
  #, fuzzy, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "@Ikintu OYA in Kuri"
  
! #: tp/Texinfo/Parser.pm:3124 tp/Texinfo/Parser.pm:3277
! #: tp/Texinfo/Parser.pm:5666
  #, fuzzy, perl-format
  msgid "@%s missing argument"
  msgstr "%s:Ibuze IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:3138
  #, fuzzy, perl-format
  msgid "unknown @end %s"
  msgstr "Umubarendanga"
  
! #: tp/Texinfo/Parser.pm:3161 tp/Texinfo/Parser.pm:3788
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:3167 tp/Texinfo/Parser.pm:3245
! #: tp/Texinfo/Parser.pm:5755 tp/Texinfo/Parser.pm:5798
! #: tp/Texinfo/Parser.pm:5827 tp/Texinfo/Parser.pm:5868
! #: tp/Texinfo/Parser.pm:5946
  #, fuzzy, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:3188
  #, fuzzy, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "Gushaka"
  
! #: tp/Texinfo/Parser.pm:3200
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3208
  #, fuzzy, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "Imisobekere: Izina:"
  
! #: tp/Texinfo/Parser.pm:3364
  #, perl-format
  msgid "@%s after the first element"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3371
  #, fuzzy, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%sOYA Hanze"
  
! #: tp/Texinfo/Parser.pm:3408
  #, fuzzy, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:3420
  #, fuzzy, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:3522
  #, fuzzy, perl-format
  msgid "empty argument in @%s"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:3526
  #, fuzzy, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:3569
  #, fuzzy, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:3577
  #, fuzzy
  msgid "empty node name in menu entry"
  msgstr "Oya Umubarendanga Ibyinjijwe Byabonetse kugirango"
  
! #: tp/Texinfo/Parser.pm:3650
  #, fuzzy, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:3782
  #, fuzzy, perl-format
! msgid "@end %s should only appear at the beginning of a line"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:3804
  #, fuzzy, perl-format
  msgid "macro `%s' previously defined"
  msgstr "Makoro"
  
! #: tp/Texinfo/Parser.pm:3807
  #, fuzzy, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "ni i Ibanjirije Insobanuro Bya"
  
! #: tp/Texinfo/Parser.pm:3812
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3879
  #, fuzzy, perl-format
  msgid "@%s without associated character"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:3949
  #, perl-format
  msgid ""
***************
*** 2716,2720 ****
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4111
  #, perl-format
  msgid ""
--- 2713,2717 ----
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3974
  #, perl-format
  msgid ""
***************
*** 2723,2853 ****
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4120
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4176
  #, fuzzy, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr "@Ikintu OYA in Kuri"
  
! #: tp/Texinfo/Parser.pm:4182
  #, fuzzy, perl-format
  msgid "use braces to give a command as an argument to @%s"
  msgstr "Ingirwadusodeko Kuri a Komandi: Nka Kuri"
  
! #: tp/Texinfo/Parser.pm:4195 tp/Texinfo/Parser.pm:5325
  #, fuzzy, perl-format
  msgid "%c%s expects `i' or `j' as argument, not `%s'"
  msgstr "%c%sCyangwa Nka OYA"
  
! #: tp/Texinfo/Parser.pm:4207
  #, fuzzy, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr "@Ikintu OYA in Kuri"
  
! #: tp/Texinfo/Parser.pm:4218
  #, fuzzy, perl-format
  msgid "@%s expected braces"
  msgstr "%c%sIkitezwe: Ingirwadusodeko"
  
! #: tp/Texinfo/Parser.pm:4383
  #, fuzzy, perl-format
  msgid "undefined flag: %s"
  msgstr "kidasobanuye Ibendera"
  
! #: tp/Texinfo/Parser.pm:4386
  #, fuzzy
  msgid "bad syntax for @value"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:4393
  #, fuzzy, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%sni"
  
! #: tp/Texinfo/Parser.pm:4396
  #, fuzzy, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%sni"
  
! #: tp/Texinfo/Parser.pm:4405
  #, fuzzy, perl-format
! msgid "@%s should only appear at a line beginning"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:4496
  #, fuzzy, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%sOYA Mo Imbere Funga"
  
! #: tp/Texinfo/Parser.pm:4505
  #, fuzzy, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:4631 tp/Texinfo/Parser.pm:4648
! #: tp/Texinfo/Parser.pm:4698
  #, fuzzy, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%sOYA Mo Imbere Funga"
  
! #: tp/Texinfo/Parser.pm:4658
  #, fuzzy, perl-format
  msgid "@%s in empty multitable"
  msgstr "%s:ubusa IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:4664
  #, fuzzy
  msgid "@tab before @item"
  msgstr "@Ibikubiyemo Mbere Itangira"
  
! #: tp/Texinfo/Parser.pm:4667
  #, fuzzy, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "Inkingi in Ikintu KININI"
  
! #: tp/Texinfo/Parser.pm:4704
  #, fuzzy
  msgid "ignoring @tab outside of multitable"
  msgstr "Isunika Hanze Bya"
  
! #: tp/Texinfo/Parser.pm:4708
  #, fuzzy, perl-format
  msgid "@%s outside of table or list"
  msgstr "(Hanze Bya"
  
! #: tp/Texinfo/Parser.pm:4745
  #, fuzzy, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "in Kuri Gukoresha"
  
! #: tp/Texinfo/Parser.pm:4787
  #, fuzzy, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "@%sOYA Hanze Na"
  
! #: tp/Texinfo/Parser.pm:4791
  #, fuzzy
  msgid "@dircategory after first node"
  msgstr "@Ibikubiyemo Mbere Itangira"
  
! #: tp/Texinfo/Parser.pm:4979
  #, fuzzy, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "Mo Imbere Ubusobanuro mpezarupapuro OYA"
  
! #: tp/Texinfo/Parser.pm:4997
  #, fuzzy
  msgid "@direntry after first node"
  msgstr "@Ibikubiyemo Mbere Itangira"
  
! #: tp/Texinfo/Parser.pm:5005
  #, fuzzy, perl-format
  msgid "@%s seen before first @node"
  msgstr "@Ibikubiyemo Mbere Itangira"
  
! #: tp/Texinfo/Parser.pm:5008
  #, fuzzy
  msgid ""
--- 2720,2850 ----
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3983
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4038
  #, fuzzy, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr "@Ikintu OYA in Kuri"
  
! #: tp/Texinfo/Parser.pm:4044
  #, fuzzy, perl-format
  msgid "use braces to give a command as an argument to @%s"
  msgstr "Ingirwadusodeko Kuri a Komandi: Nka Kuri"
  
! #: tp/Texinfo/Parser.pm:4057 tp/Texinfo/Parser.pm:5189
  #, fuzzy, perl-format
  msgid "%c%s expects `i' or `j' as argument, not `%s'"
  msgstr "%c%sCyangwa Nka OYA"
  
! #: tp/Texinfo/Parser.pm:4068
  #, fuzzy, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr "@Ikintu OYA in Kuri"
  
! #: tp/Texinfo/Parser.pm:4079
  #, fuzzy, perl-format
  msgid "@%s expected braces"
  msgstr "%c%sIkitezwe: Ingirwadusodeko"
  
! #: tp/Texinfo/Parser.pm:4233
  #, fuzzy, perl-format
  msgid "undefined flag: %s"
  msgstr "kidasobanuye Ibendera"
  
! #: tp/Texinfo/Parser.pm:4236
  #, fuzzy
  msgid "bad syntax for @value"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:4243
  #, fuzzy, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%sni"
  
! #: tp/Texinfo/Parser.pm:4246
  #, fuzzy, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%sni"
  
! #: tp/Texinfo/Parser.pm:4255
  #, fuzzy, perl-format
! msgid "@%s should only appear at the beginning of a line"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:4346
  #, fuzzy, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%sOYA Mo Imbere Funga"
  
! #: tp/Texinfo/Parser.pm:4355
  #, fuzzy, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:4479 tp/Texinfo/Parser.pm:4496
! #: tp/Texinfo/Parser.pm:4546
  #, fuzzy, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%sOYA Mo Imbere Funga"
  
! #: tp/Texinfo/Parser.pm:4506
  #, fuzzy, perl-format
  msgid "@%s in empty multitable"
  msgstr "%s:ubusa IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:4512
  #, fuzzy
  msgid "@tab before @item"
  msgstr "@Ibikubiyemo Mbere Itangira"
  
! #: tp/Texinfo/Parser.pm:4515
  #, fuzzy, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "Inkingi in Ikintu KININI"
  
! #: tp/Texinfo/Parser.pm:4552
  #, fuzzy
  msgid "ignoring @tab outside of multitable"
  msgstr "Isunika Hanze Bya"
  
! #: tp/Texinfo/Parser.pm:4556
  #, fuzzy, perl-format
  msgid "@%s outside of table or list"
  msgstr "(Hanze Bya"
  
! #: tp/Texinfo/Parser.pm:4596
  #, fuzzy, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "in Kuri Gukoresha"
  
! #: tp/Texinfo/Parser.pm:4638
  #, fuzzy, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "@%sOYA Hanze Na"
  
! #: tp/Texinfo/Parser.pm:4642
  #, fuzzy
  msgid "@dircategory after first node"
  msgstr "@Ibikubiyemo Mbere Itangira"
  
! #: tp/Texinfo/Parser.pm:4847
  #, fuzzy, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "Mo Imbere Ubusobanuro mpezarupapuro OYA"
  
! #: tp/Texinfo/Parser.pm:4864
  #, fuzzy
  msgid "@direntry after first node"
  msgstr "@Ibikubiyemo Mbere Itangira"
  
! #: tp/Texinfo/Parser.pm:4872
  #, fuzzy, perl-format
  msgid "@%s seen before first @node"
  msgstr "@Ibikubiyemo Mbere Itangira"
  
! #: tp/Texinfo/Parser.pm:4875
  #, fuzzy
  msgid ""
***************
*** 2855,3139 ****
  msgstr "Hejuru: in"
  
! #: tp/Texinfo/Parser.pm:5070
  #, fuzzy, perl-format
  msgid "@%s should only appear in math context"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:5078
  #, fuzzy, perl-format
  msgid "unknown command `%s'"
  msgstr "Komandi:"
  
! #: tp/Texinfo/Parser.pm:5088
  #, fuzzy
  msgid "unexpected @"
  msgstr "Ikitezwe:"
  
! #: tp/Texinfo/Parser.pm:5117
  #, fuzzy, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%sOYA Hanze"
  
! #: tp/Texinfo/Parser.pm:5122
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5130
  #, fuzzy, perl-format
  msgid "ignoring multiple @%s"
  msgstr "IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:5249
  #, fuzzy, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "@Ikintu OYA in Kuri"
  
! #: tp/Texinfo/Parser.pm:5273
  #, fuzzy, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr "%s:Ibuze IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:5292
  #, fuzzy, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:5303
  #, fuzzy, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:5316
  #, fuzzy
  msgid "@image missing filename argument"
  msgstr "@Ishusho Ibuze Izina ry'idosiye:"
  
! #: tp/Texinfo/Parser.pm:5348
  #, fuzzy, perl-format
  msgid "@%s missing first argument"
  msgstr "%s:Ibuze IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:5393
  #, fuzzy, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "@Ikintu OYA in Kuri"
  
! #: tp/Texinfo/Parser.pm:5399
  #, fuzzy, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr "@Ikintu OYA in Kuri"
  
! #: tp/Texinfo/Parser.pm:5412
! #, perl-format
! msgid "argument for @U exceeds size of integer: %s"
! msgstr ""
! 
! #: tp/Texinfo/Parser.pm:5418
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5546
  #, fuzzy
  msgid "superfluous arguments for node"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:5596
  #, fuzzy, perl-format
  msgid "expected @end %s"
  msgstr "Ikitezwe:"
  
! #: tp/Texinfo/Parser.pm:5718
  #, fuzzy, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "Ingirwadusodeko Kuri a Komandi: Nka Kuri"
  
! #: tp/Texinfo/Parser.pm:5728
  #, fuzzy, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:5801
  #, fuzzy, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "Ingirwadusodeko Kuri a Komandi: Nka Kuri"
  
! #: tp/Texinfo/Parser.pm:5823
  #, fuzzy, perl-format
  msgid "empty @%s"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:5831
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5840
  #, fuzzy, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "%s:%sBikurikije umubare OYA"
  
! #: tp/Texinfo/Parser.pm:5849
  #, perl-format
  msgid "reserved index name %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5868
  #, fuzzy, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "Umubarendanga"
  
! #: tp/Texinfo/Parser.pm:5871
  #, fuzzy, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "Umubarendanga"
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5914
  #, fuzzy, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "Umubarendanga in"
  
! #: tp/Texinfo/Parser.pm:5920
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5928
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5944
  #, fuzzy, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
  msgstr "%s:%sBikurikije umubare OYA"
  
! #: tp/Texinfo/Parser.pm:5952
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5960
  #, fuzzy, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
  msgstr "%s:--Ubusobanuro mpezarupapuro IMISUSIRE Cyangwa OYA"
  
! #: tp/Texinfo/Parser.pm:5968
  #, fuzzy, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
  msgstr "%s:%sBikurikije umubare OYA"
  
! #: tp/Texinfo/Parser.pm:5986 tp/Texinfo/Parser.pm:5991
  #, fuzzy, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
  msgstr "%s:--Igika Ikurura Bikurikije umubare OYA"
  
! #: tp/Texinfo/Parser.pm:5999
  #, fuzzy, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
  msgstr "%s:--Igika Ikurura Bikurikije umubare OYA"
  
! #: tp/Texinfo/Parser.pm:6009
  #, fuzzy, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
  msgstr "%s:--Igika Ikurura Bikurikije umubare OYA"
  
! #: tp/Texinfo/Parser.pm:6021
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:6031
  #, fuzzy, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
  msgstr "%s:--Ubusobanuro mpezarupapuro IMISUSIRE Cyangwa OYA"
  
! #: tp/Texinfo/Parser.pm:6039
  #, fuzzy, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
  msgstr "%s:--Ubusobanuro mpezarupapuro IMISUSIRE Cyangwa OYA"
  
! #: tp/Texinfo/Parser.pm:6047
  #, fuzzy, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
  msgstr "%s:--Ubusobanuro mpezarupapuro IMISUSIRE Cyangwa OYA"
  
! #: tp/Texinfo/Structuring.pm:213
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:245
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:250
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:339
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:488
  #, fuzzy, perl-format
  msgid "@%s not empty"
  msgstr "%s:ubusa IDOSIYE"
  
! #: tp/Texinfo/Structuring.pm:544 tp/Texinfo/Structuring.pm:1326
  #, fuzzy, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "%sIndango Kuri"
  
! #: tp/Texinfo/Structuring.pm:557
  #, fuzzy, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
  msgstr "Kuri"
  
! #: tp/Texinfo/Structuring.pm:662
  #, fuzzy, perl-format
  msgid "unreferenced node `%s'"
  msgstr "%sIndango Kuri"
  
! #: tp/Texinfo/Structuring.pm:708
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:715
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:733
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:787
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:814
  #, fuzzy, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%sIndango Kuri"
  
! #: tp/Texinfo/Structuring.pm:834
  #, 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:842
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
--- 2852,3131 ----
  msgstr "Hejuru: in"
  
! #: tp/Texinfo/Parser.pm:4937
  #, fuzzy, perl-format
  msgid "@%s should only appear in math context"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:4945
  #, fuzzy, perl-format
  msgid "unknown command `%s'"
  msgstr "Komandi:"
  
! #: tp/Texinfo/Parser.pm:4955
  #, fuzzy
  msgid "unexpected @"
  msgstr "Ikitezwe:"
  
! #: tp/Texinfo/Parser.pm:4983
  #, fuzzy, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%sOYA Hanze"
  
! #: tp/Texinfo/Parser.pm:4988
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4996
  #, fuzzy, perl-format
  msgid "ignoring multiple @%s"
  msgstr "IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:5114
  #, fuzzy, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "@Ikintu OYA in Kuri"
  
! #: tp/Texinfo/Parser.pm:5138
  #, fuzzy, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr "%s:Ibuze IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:5156
  #, fuzzy, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:5167
  #, fuzzy, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:5180
  #, fuzzy
  msgid "@image missing filename argument"
  msgstr "@Ishusho Ibuze Izina ry'idosiye:"
  
! #: tp/Texinfo/Parser.pm:5211
  #, fuzzy, perl-format
  msgid "@%s missing first argument"
  msgstr "%s:Ibuze IDOSIYE"
  
! #: tp/Texinfo/Parser.pm:5230
  #, fuzzy, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "@Ikintu OYA in Kuri"
  
! #: tp/Texinfo/Parser.pm:5236
  #, fuzzy, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr "@Ikintu OYA in Kuri"
  
! #: tp/Texinfo/Parser.pm:5253
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5448
  #, fuzzy
  msgid "superfluous arguments for node"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:5498
  #, fuzzy, perl-format
  msgid "expected @end %s"
  msgstr "Ikitezwe:"
  
! #: tp/Texinfo/Parser.pm:5607
  #, fuzzy, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "Ingirwadusodeko Kuri a Komandi: Nka Kuri"
  
! #: tp/Texinfo/Parser.pm:5617
  #, fuzzy, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:5689
  #, fuzzy, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "Ingirwadusodeko Kuri a Komandi: Nka Kuri"
  
! #: tp/Texinfo/Parser.pm:5710
  #, fuzzy, perl-format
  msgid "empty @%s"
  msgstr "Kuri"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5727
  #, fuzzy, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "%s:%sBikurikije umubare OYA"
  
! #: tp/Texinfo/Parser.pm:5736
  #, perl-format
  msgid "reserved index name %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5762
  #, fuzzy, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "Umubarendanga"
  
! #: tp/Texinfo/Parser.pm:5765
  #, fuzzy, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "Umubarendanga"
  
! #: tp/Texinfo/Parser.pm:5793
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5806
  #, fuzzy, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "Umubarendanga in"
  
! #: tp/Texinfo/Parser.pm:5812
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5820
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5836
  #, fuzzy, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
  msgstr "%s:%sBikurikije umubare OYA"
  
! #: tp/Texinfo/Parser.pm:5844
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5852
  #, fuzzy, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
  msgstr "%s:--Ubusobanuro mpezarupapuro IMISUSIRE Cyangwa OYA"
  
! #: tp/Texinfo/Parser.pm:5860
  #, fuzzy, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
  msgstr "%s:%sBikurikije umubare OYA"
  
! #: tp/Texinfo/Parser.pm:5878 tp/Texinfo/Parser.pm:5883
  #, fuzzy, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
  msgstr "%s:--Igika Ikurura Bikurikije umubare OYA"
  
! #: tp/Texinfo/Parser.pm:5891
  #, fuzzy, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
  msgstr "%s:--Igika Ikurura Bikurikije umubare OYA"
  
! #: tp/Texinfo/Parser.pm:5901
  #, fuzzy, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
  msgstr "%s:--Igika Ikurura Bikurikije umubare OYA"
  
! #: tp/Texinfo/Parser.pm:5913
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5922
  #, fuzzy, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
  msgstr "%s:--Ubusobanuro mpezarupapuro IMISUSIRE Cyangwa OYA"
  
! #: tp/Texinfo/Parser.pm:5930
  #, fuzzy, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
  msgstr "%s:--Ubusobanuro mpezarupapuro IMISUSIRE Cyangwa OYA"
  
! #: tp/Texinfo/Parser.pm:5938
  #, fuzzy, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
  msgstr "%s:--Ubusobanuro mpezarupapuro IMISUSIRE Cyangwa OYA"
  
! #: tp/Texinfo/Structuring.pm:216
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:248
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:253
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:342
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:491
  #, fuzzy, perl-format
  msgid "@%s not empty"
  msgstr "%s:ubusa IDOSIYE"
  
! #: tp/Texinfo/Structuring.pm:547 tp/Texinfo/Structuring.pm:1325
  #, fuzzy, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "%sIndango Kuri"
  
! #: tp/Texinfo/Structuring.pm:558
  #, fuzzy, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
  msgstr "Kuri"
  
! #: tp/Texinfo/Structuring.pm:663
  #, fuzzy, perl-format
  msgid "unreferenced node `%s'"
  msgstr "%sIndango Kuri"
  
! #: tp/Texinfo/Structuring.pm:706
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:713
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:731
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:786
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:810
  #, fuzzy, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%sIndango Kuri"
  
! #: tp/Texinfo/Structuring.pm:829
  #, 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:837
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
***************
*** 3145,3149 ****
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:2070
  #, fuzzy, perl-format
  msgid "empty index key in @%s"
--- 3137,3141 ----
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:2067
  #, fuzzy, perl-format
  msgid "empty index key in @%s"
***************
*** 3573,3591 ****
  msgstr "kugirango Birenzeho Ibisobanuro"
  
! #: tp/texi2any.pl:1232
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
  
! #: tp/texi2any.pl:1255
  #, fuzzy, perl-format
  msgid "error on closing macro expand file %s: %s\n"
  msgstr "Ikosa Ibisohoka IDOSIYE"
  
! #: tp/texi2any.pl:1261
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/texi2any.pl:1286
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
--- 3565,3583 ----
  msgstr "kugirango Birenzeho Ibisobanuro"
  
! #: tp/texi2any.pl:1239
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
  
! #: tp/texi2any.pl:1262
  #, fuzzy, perl-format
  msgid "error on closing macro expand file %s: %s\n"
  msgstr "Ikosa Ibisohoka IDOSIYE"
  
! #: tp/texi2any.pl:1268
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "%s:OYA Gufungura IDOSIYE"
  
! #: tp/texi2any.pl:1293
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
***************
*** 3593,3607 ****
  msgstr ""
  
! #: tp/texi2any.pl:1359 tp/texi2any.pl:1435
  #, fuzzy, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "Ikosa Kuri"
  
! #: tp/texi2any.pl:1382 tp/texi2any.pl:1416
  #, fuzzy, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
  msgstr "Ikosa Ibisohoka IDOSIYE"
  
! #: tp/texi2any.pl:1388 tp/texi2any.pl:1422
  #, fuzzy, perl-format
  msgid "%s: could not open %s for writing: %s\n"
--- 3585,3599 ----
  msgstr ""
  
! #: tp/texi2any.pl:1366 tp/texi2any.pl:1442
  #, fuzzy, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "Ikosa Kuri"
  
! #: tp/texi2any.pl:1389 tp/texi2any.pl:1423
  #, fuzzy, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
  msgstr "Ikosa Ibisohoka IDOSIYE"
  
! #: tp/texi2any.pl:1395 tp/texi2any.pl:1429
  #, fuzzy, perl-format
  msgid "%s: could not open %s for writing: %s\n"
***************
*** 3609,3612 ****
--- 3601,3616 ----
  
  #, fuzzy
+ #~ msgid "-%s---Info: %s, %ld lines --%s--"
+ #~ msgstr "-%s---Info:%s,%dImirongo"
+ 
+ #, fuzzy
+ #~ msgid "-%s---Info: (%s)%s, %ld lines --%s--"
+ #~ msgstr "-%s%s-Info:(%s)%s,%dImirongo"
+ 
+ #, fuzzy
+ #~ msgid "No file given for node '%s'."
+ #~ msgstr "Ibikubiyemo in"
+ 
+ #, fuzzy
  #~ msgid "%s: unrecognized option `%s'\n"
  #~ msgstr "%s:Ihitamo"
Binary files texinfo-6.1/po/sl.gmo and texinfo-6.3/po/sl.gmo differ
diff -Nrc2 texinfo-6.1/po/sl.po texinfo-6.3/po/sl.po
*** texinfo-6.1/po/sl.po	2016-02-06 11:35:55.000000000 +0000
--- texinfo-6.3/po/sl.po	2016-09-10 12:45:56.000000000 +0100
***************
*** 10,14 ****
  "Project-Id-Version: texinfo 4.13\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
  "PO-Revision-Date: 2012-08-10 18:31+0100\n"
  "Last-Translator: Klemen KoÅ¡ir <klemen.kosir@gmx.com>\n"
--- 10,14 ----
  "Project-Id-Version: texinfo 4.13\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:45+0100\n"
  "PO-Revision-Date: 2012-08-10 18:31+0100\n"
  "Last-Translator: Klemen KoÅ¡ir <klemen.kosir@gmx.com>\n"
***************
*** 18,21 ****
--- 18,22 ----
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
+ "X-Bugs: Report translation errors to the Language-Team address.\n"
  
  #: gnulib/lib/error.c:191
***************
*** 116,122 ****
  
  #: gnulib/lib/regcomp.c:156
! #, fuzzy
! msgid "Unmatched [ or [^"
! msgstr "NeujemajoÄ� }"
  
  #: gnulib/lib/regcomp.c:159
--- 117,122 ----
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [, [^, [:, [., or [="
! msgstr ""
  
  #: gnulib/lib/regcomp.c:159
***************
*** 163,167 ****
  msgstr "NeujemajoÄ� }"
  
! #: gnulib/lib/regcomp.c:711
  #, fuzzy
  msgid "No previous regular expression"
--- 163,167 ----
  msgstr "NeujemajoÄ� }"
  
! #: gnulib/lib/regcomp.c:687
  #, fuzzy
  msgid "No previous regular expression"
***************
*** 316,320 ****
  msgstr "---------- Sprotne opombe ----------"
  
! #: info/indices.c:123 info/indices.c:812
  #, c-format
  msgid "Finding index entries..."
--- 316,320 ----
  msgstr "---------- Sprotne opombe ----------"
  
! #: info/indices.c:123 info/indices.c:822
  #, c-format
  msgid "Finding index entries..."
***************
*** 325,329 ****
  msgstr "PoiÅ¡Ä�i niz v kazalu za to datoteko"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:818
  #, c-format
  msgid "No indices found."
--- 325,329 ----
  msgstr "PoiÅ¡Ä�i niz v kazalu za to datoteko"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:828
  #, c-format
  msgid "No indices found."
***************
*** 357,388 ****
  msgstr "Brez vnosov %skazala, ki vsebuje `%s'."
  
! #: info/indices.c:476 info/indices.c:880
  #, fuzzy, c-format
  msgid "No index entries containing '%s'."
  msgstr "Brez vnosov %skazala, ki vsebuje `%s'."
  
! #: info/indices.c:583
  #, fuzzy, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "Preiskovanje kazal od `%s' ..."
  
! #: info/indices.c:636
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
  
! #: info/indices.c:644 info/indices.c:646
  msgid "Index apropos"
  msgstr ""
  
! #: info/indices.c:688
  #, fuzzy, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Brez vnosov %skazala, ki vsebuje `%s'."
  
! #: info/indices.c:797
  msgid "List all matches of a string in the index"
  msgstr ""
  
! #: info/indices.c:824 info/indices.c:826
  msgid "Index topic"
  msgstr ""
--- 357,388 ----
  msgstr "Brez vnosov %skazala, ki vsebuje `%s'."
  
! #: info/indices.c:476 info/indices.c:890
  #, fuzzy, c-format
  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'..."
  msgstr "Preiskovanje kazal od `%s' ..."
  
! #: 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
  #, fuzzy, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Brez vnosov %skazala, ki vsebuje `%s'."
  
! #: info/indices.c:807
  msgid "List all matches of a string in the index"
  msgstr ""
  
! #: info/indices.c:834 info/indices.c:836
  msgid "Index topic"
  msgstr ""
***************
*** 393,447 ****
  msgstr "Nobena razpoloÅ¾ljiva podatkovna datoteka nima `%s' v svojih kazalih."
  
! #: info/info-utils.c:892
  #, c-format
  msgid "Error converting file character encoding."
  msgstr ""
  
! #: info/info.c:222 info/session.c:2789
  #, fuzzy, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "V vozliÅ¡Ä�u `%s' ni predmetov menijev `%s'."
  
! #: info/info.c:315
! #, fuzzy, c-format
! msgid "No file given for node '%s'."
! msgstr "V vozliÅ¡Ä�u `%s' ni menijev."
! 
! #: info/info.c:364 info/info.c:1133
  #, fuzzy, c-format
  msgid "Cannot find node '%s'."
  msgstr "Ni mogoÄ�e najti vozliÅ¡Ä�a `%s'."
  
! #: info/info.c:386
  #, c-format
  msgid "No program name given."
  msgstr ""
  
! #: info/info.c:577
  #, c-format
  msgid "invalid number: %s\n"
  msgstr ""
  
! #: info/info.c:757
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr ""
  
! #: info/info.c:764 info/infokey.c:537
  #, c-format
  msgid "%s: no such variable"
  msgstr ""
  
! #: info/info.c:770 info/infokey.c:539
  #, fuzzy, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "Nastavi vrednost spremenljivke Info"
  
! #: info/info.c:782
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "Za veÄ� podrobnosti poskusite --help.\n"
  
! #: info/info.c:804 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
--- 393,442 ----
  msgstr "Nobena razpoloÅ¾ljiva podatkovna datoteka nima `%s' v svojih kazalih."
  
! #: info/info-utils.c:879
  #, c-format
  msgid "Error converting file character encoding."
  msgstr ""
  
! #: info/info.c:279 info/session.c:2789
  #, fuzzy, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "V vozliÅ¡Ä�u `%s' ni predmetov menijev `%s'."
  
! #: info/info.c:416 info/info.c:1148
  #, fuzzy, c-format
  msgid "Cannot find node '%s'."
  msgstr "Ni mogoÄ�e najti vozliÅ¡Ä�a `%s'."
  
! #: info/info.c:438
  #, c-format
  msgid "No program name given."
  msgstr ""
  
! #: info/info.c:636
  #, c-format
  msgid "invalid number: %s\n"
  msgstr ""
  
! #: info/info.c:816
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr ""
  
! #: info/info.c:823 info/infokey.c:540
  #, c-format
  msgid "%s: no such variable"
  msgstr ""
  
! #: info/info.c:829 info/infokey.c:542
  #, fuzzy, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "Nastavi vrednost spremenljivke Info"
  
! #: info/info.c:841
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "Za veÄ� podrobnosti poskusite --help.\n"
  
! #: info/info.c:860 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
***************
*** 458,467 ****
  "Je BREZ KAKRÅ NEKOLI GARANCIJE, v obsegu, ki ga dovoljuje zakonodaja.\n"
  
! #: info/info.c:981
  #, fuzzy, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "Za `%s' ni najdenih nobenih vnosov kazal\n"
  
! #: info/info.c:1034
  #, c-format
  msgid ""
--- 453,462 ----
  "Je BREZ KAKRÅ NEKOLI GARANCIJE, v obsegu, ki ga dovoljuje zakonodaja.\n"
  
! #: info/info.c:999
  #, fuzzy, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "Za `%s' ni najdenih nobenih vnosov kazal\n"
  
! #: info/info.c:1049
  #, c-format
  msgid ""
***************
*** 474,478 ****
  "Preberite dokumentacijo v obliki Info.\n"
  
! #: info/info.c:1040
  #, fuzzy
  msgid ""
--- 469,473 ----
  "Preberite dokumentacijo v obliki Info.\n"
  
! #: info/info.c:1055
  #, fuzzy
  msgid ""
***************
*** 492,496 ****
  "  -f, --file=IME_DATOTEKE doloÄ�i datoteko podrobnosti za ogled."
  
! #: info/info.c:1048
  #, fuzzy
  msgid ""
--- 487,491 ----
  "  -f, --file=IME_DATOTEKE doloÄ�i datoteko podrobnosti za ogled."
  
! #: info/info.c:1063
  #, fuzzy
  msgid ""
***************
*** 506,510 ****
  "  -o, --output=IME_DATOTEKE izpiÅ¡i izbrana vozliÅ¡Ä�a v IME_DATOTEKE."
  
! #: info/info.c:1054
  #, fuzzy
  msgid ""
--- 501,505 ----
  "  -o, --output=IME_DATOTEKE izpiÅ¡i izbrana vozliÅ¡Ä�a v IME_DATOTEKE."
  
! #: info/info.c:1069
  #, fuzzy
  msgid ""
***************
*** 519,527 ****
  "  -O, --show-options, --usage pojdi do vozliÅ¡Ä�a moÅ¾nosti ukazne vrstice."
  
! #: info/info.c:1061
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr "  -b, --speech-friendly bodi prijazen do sintetizatorjev govora."
  
! #: info/info.c:1065
  #, fuzzy
  msgid ""
--- 514,522 ----
  "  -O, --show-options, --usage pojdi do vozliÅ¡Ä�a moÅ¾nosti ukazne vrstice."
  
! #: info/info.c:1076
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr "  -b, --speech-friendly bodi prijazen do sintetizatorjev govora."
  
! #: info/info.c:1080
  #, fuzzy
  msgid ""
***************
*** 540,544 ****
  "  -w, --where, --location izpiÅ¡i fiziÄ�no mesto datoteke Info."
  
! #: info/info.c:1074
  #, fuzzy
  msgid ""
--- 535,539 ----
  "  -w, --where, --location izpiÅ¡i fiziÄ�no mesto datoteke Info."
  
! #: info/info.c:1089
  #, fuzzy
  msgid ""
***************
*** 557,561 ****
  "glede na zaÄ�etno obiskano vozliÅ¡Ä�e."
  
! #: info/info.c:1081
  #, fuzzy
  msgid ""
--- 552,556 ----
  "glede na zaÄ�etno obiskano vozliÅ¡Ä�e."
  
! #: info/info.c:1096
  #, fuzzy
  msgid ""
***************
*** 566,570 ****
  "Za povzetek tipkovnih bliÅ¾njic, vnesite h znotraj Info."
  
! #: info/info.c:1084
  #, fuzzy
  msgid ""
--- 561,565 ----
  "Za povzetek tipkovnih bliÅ¾njic, vnesite h znotraj Info."
  
! #: info/info.c:1099
  #, fuzzy
  msgid ""
***************
*** 596,600 ****
  "  info -f ./foo.info prikaÅ¾i datoteko /foo.info brez iskanja mape"
  
! #: info/info.c:1099 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
--- 591,595 ----
  "  info -f ./foo.info prikaÅ¾i datoteko /foo.info brez iskanja mape"
  
! #: info/info.c:1114 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
***************
*** 606,670 ****
  "DomaÄ�a stran texinfo: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1134
  #, fuzzy, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Ni mogoÄ�e najti vozliÅ¡Ä�a `(%s)%s'."
  
! #: info/info.c:1135
  msgid "Cannot find a window!"
  msgstr "Ni mogoÄ�e najti okna!"
  
! #: info/info.c:1136
  msgid "Point doesn't appear within this window's node!"
  msgstr "ToÄ�ka se ne prikaÅ¾e znotraj vozliÅ¡Ä�a okna!"
  
! #: info/info.c:1137
  msgid "Cannot delete the last window."
  msgstr "Zadnjega okna ni mogoÄ�e izbrisati."
  
! #: info/info.c:1138
  msgid "No menu in this node."
  msgstr "V tem vozliÅ¡Ä�u ni menijev."
  
! #: info/info.c:1139
  msgid "No footnotes in this node."
  msgstr "V tem vozliÅ¡Ä�u ni sprotnih opomb."
  
! #: info/info.c:1140
  msgid "No cross references in this node."
  msgstr "V tem vozliÅ¡Ä�u ni navzkriÅ¾nih sklicev."
  
! #: info/info.c:1141
  #, fuzzy, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Za to vozliÅ¡Ä�e ni kazalcev `%s'."
  
! #: info/info.c:1142
  #, fuzzy, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "Neznan ukaz Info `%c'; za pomoÄ� poskusite `?'."
  
! #: info/info.c:1143
  #, fuzzy, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "Vrsta terminala `%s' ni dovolj napredna za zagon Info."
  
! #: info/info.c:1144
  msgid "You are already at the last page of this node."
  msgstr "Ste Å¾e na zadnji strani tega vozliÅ¡Ä�a."
  
! #: info/info.c:1145
  msgid "You are already at the first page of this node."
  msgstr "Ste Å¾e na prvi strani tega vozliÅ¡Ä�a."
  
! #: info/info.c:1146
  msgid "Only one window."
  msgstr "Samo eno okno."
  
! #: info/info.c:1147
  msgid "Resulting window would be too small."
  msgstr "KonÄ�no okno bi bilo premajhno."
  
! #: info/info.c:1148
  msgid "Not enough room for a help window, please delete a window."
  msgstr "Za okno pomoÄ�i ni dovolj prostora, izbriÅ¡ite okno."
--- 601,665 ----
  "DomaÄ�a stran texinfo: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1149
  #, fuzzy, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Ni mogoÄ�e najti vozliÅ¡Ä�a `(%s)%s'."
  
! #: info/info.c:1150
  msgid "Cannot find a window!"
  msgstr "Ni mogoÄ�e najti okna!"
  
! #: info/info.c:1151
  msgid "Point doesn't appear within this window's node!"
  msgstr "ToÄ�ka se ne prikaÅ¾e znotraj vozliÅ¡Ä�a okna!"
  
! #: info/info.c:1152
  msgid "Cannot delete the last window."
  msgstr "Zadnjega okna ni mogoÄ�e izbrisati."
  
! #: info/info.c:1153
  msgid "No menu in this node."
  msgstr "V tem vozliÅ¡Ä�u ni menijev."
  
! #: info/info.c:1154
  msgid "No footnotes in this node."
  msgstr "V tem vozliÅ¡Ä�u ni sprotnih opomb."
  
! #: info/info.c:1155
  msgid "No cross references in this node."
  msgstr "V tem vozliÅ¡Ä�u ni navzkriÅ¾nih sklicev."
  
! #: info/info.c:1156
  #, fuzzy, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Za to vozliÅ¡Ä�e ni kazalcev `%s'."
  
! #: info/info.c:1157
  #, fuzzy, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "Neznan ukaz Info `%c'; za pomoÄ� poskusite `?'."
  
! #: info/info.c:1158
  #, fuzzy, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "Vrsta terminala `%s' ni dovolj napredna za zagon Info."
  
! #: info/info.c:1159
  msgid "You are already at the last page of this node."
  msgstr "Ste Å¾e na zadnji strani tega vozliÅ¡Ä�a."
  
! #: info/info.c:1160
  msgid "You are already at the first page of this node."
  msgstr "Ste Å¾e na prvi strani tega vozliÅ¡Ä�a."
  
! #: info/info.c:1161
  msgid "Only one window."
  msgstr "Samo eno okno."
  
! #: info/info.c:1162
  msgid "Resulting window would be too small."
  msgstr "KonÄ�no okno bi bilo premajhno."
  
! #: info/info.c:1163
  msgid "Not enough room for a help window, please delete a window."
  msgstr "Za okno pomoÄ�i ni dovolj prostora, izbriÅ¡ite okno."
***************
*** 937,971 ****
  msgstr "neznano dejanje `%s'"
  
! #: info/infokey.c:482
  #, c-format
  msgid "action name too long"
  msgstr "ime dejanja je predolgo"
  
! #: info/infokey.c:495
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "dodatni znaki sledijo dejanju `%s'"
  
! #: info/infokey.c:506
  #, c-format
  msgid "missing variable name"
  msgstr "manjka ime spremenljivke"
  
! #: info/infokey.c:515
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "takoj za imenom spremenljivke manjka `='"
  
! #: info/infokey.c:522
  #, c-format
  msgid "variable name too long"
  msgstr "ime spremenljivke je predolgo"
  
! #: info/infokey.c:546
  #, c-format
  msgid "value too long"
  msgstr "vrednost je predolga"
  
! #: info/infokey.c:592
  #, c-format
  msgid "\"%s\", line %u: "
--- 932,966 ----
  msgstr "neznano dejanje `%s'"
  
! #: info/infokey.c:485
  #, c-format
  msgid "action name too long"
  msgstr "ime dejanja je predolgo"
  
! #: info/infokey.c:498
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "dodatni znaki sledijo dejanju `%s'"
  
! #: info/infokey.c:509
  #, c-format
  msgid "missing variable name"
  msgstr "manjka ime spremenljivke"
  
! #: info/infokey.c:518
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "takoj za imenom spremenljivke manjka `='"
  
! #: info/infokey.c:525
  #, c-format
  msgid "variable name too long"
  msgstr "ime spremenljivke je predolgo"
  
! #: info/infokey.c:549
  #, c-format
  msgid "value too long"
  msgstr "vrednost je predolga"
  
! #: info/infokey.c:595
  #, c-format
  msgid "\"%s\", line %u: "
***************
*** 1297,1639 ****
  msgstr "Ni mogoÄ�e najti vozliÅ¡Ä�a, sklicevanega s strani `%s' v `%s'."
  
! #: info/session.c:2864
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "Preberi seznam menijev, ki se zaÄ�nejo v mapi in jim sledi"
  
! #: info/session.c:2866
  msgid "Follow menus: "
  msgstr "Sledi menijem: "
  
! #: info/session.c:2971
  msgid "Select the Next node"
  msgstr "Izberi nasled. vozliÅ¡Ä�e"
  
! #: info/session.c:2978
  msgid "Select the Prev node"
  msgstr "Izberi pred. vozliÅ¡Ä�e"
  
! #: info/session.c:2985
  msgid "Select the Up node"
  msgstr "Izberi zgor. vozliÅ¡Ä�e"
  
! #: info/session.c:2991
  msgid "Select the last node in this file"
  msgstr "Izberi zadnje vozliÅ¡Ä�e v tej datoteki"
  
! #: info/session.c:3018 info/session.c:3051
  msgid "This window has no additional nodes"
  msgstr "To okno nima dodatnih vozliÅ¡Ä�"
  
! #: info/session.c:3024
  msgid "Select the first node in this file"
  msgstr "Izberi prvo vozliÅ¡Ä�e v tej datoteki"
  
! #: info/session.c:3158
  msgid "No more nodes within this document."
  msgstr "V tem dokumentu ni veÄ� vozliÅ¡Ä�."
  
! #: info/session.c:3203 info/session.c:3243
  #, fuzzy
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "Brez `Pred' ali `Gor' za to vozliÅ¡Ä�e znotraj tega dokumenta."
  
! #: info/session.c:3256
  msgid "Move forwards or down through node structure"
  msgstr "Pomakni se naprej ali dol skozi strukturo vozliÅ¡Ä�a"
  
! #: info/session.c:3273
  msgid "Move backwards or up through node structure"
  msgstr "Pomakni se nazaj ali gor skozi strukturo vozliÅ¡Ä�a"
  
! #: info/session.c:3296
  msgid "Read a node name and select it"
  msgstr "Preberi ime vozliÅ¡Ä�a in ga izberi"
  
! #: info/session.c:3350 info/session.c:3354
  msgid "Goto node: "
  msgstr "Pojdi v vozliÅ¡Ä�e: "
  
! #: info/session.c:3533
  msgid "Find the node describing program invocation"
  msgstr "Najdi vozliÅ¡Ä�e, ki opisuje priklic programa"
  
! #: info/session.c:3535
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Najdi vozliÅ¡Ä�e priklica [%s]: "
  
! #: info/session.c:3580
  msgid "Read a manpage reference and select it"
  msgstr "preberi priroÄ�niÅ¡ko stran in jo izberi"
  
! #: info/session.c:3584
  msgid "Get Manpage: "
  msgstr "Pridobi stran priroÄ�nika: "
  
! #: info/session.c:3605
  #, fuzzy
  msgid "Select the node 'Top' in this file"
  msgstr "Izberi vozliÅ¡Ä�e `Top' v tej datoteki"
  
! #: info/session.c:3611
  #, fuzzy
  msgid "Select the node '(dir)'"
  msgstr "Izberi vozliÅ¡Ä�e `(dir)'"
  
! #: info/session.c:3617
  msgid "Show full file name of node being displayed"
  msgstr ""
  
! #: info/session.c:3634
  msgid "Select the most recently selected node"
  msgstr "Izberi nedavno izbrano vozliÅ¡Ä�e"
  
! #: info/session.c:3639
  #, c-format
  msgid "No earlier node in history"
  msgstr ""
  
! #: info/session.c:3643
  msgid "Read the name of a file and select it"
  msgstr "Preberi ime vozliÅ¡Ä�a in ga izberi"
  
! #: info/session.c:3647
  msgid "Find file: "
  msgstr "Najdi datoteko: "
  
! #: info/session.c:3664
  #, fuzzy, c-format
  msgid "Cannot find '%s'."
  msgstr "Ni mogoÄ�e najti `%s'."
  
! #: info/session.c:3713
  #, fuzzy, c-format
  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: %s"
  msgstr "napaka med branjem v `%s'"
  
! #: info/session.c:3736
  #, fuzzy, c-format
  msgid "closing %s"
  msgstr "Odstranjevanje %s\n"
  
! #: info/session.c:3785
  #, fuzzy, c-format
  msgid "writing node %s..."
  msgstr "Zapisovanje vozliÅ¡Ä�a %s ..."
  
! #: info/session.c:3831
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  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'."
  msgstr "Ni mogoÄ�e odpreti cevi v `%s'."
  
! #: info/session.c:3864
  #, fuzzy, c-format
  msgid "printing node %s..."
  msgstr "Izpisovanje vozliÅ¡Ä�a %s ..."
  
! #: info/session.c:3872
  #, fuzzy, c-format
  msgid "finished printing node %s"
  msgstr "Izpisovanje vozliÅ¡Ä�a %s ..."
  
! #: info/session.c:3904
  msgid "Toggle the usage of regular expressions in searches"
  msgstr "Preklopi uporabo logiÄ�nih izrazov v iskanjih"
  
! #: info/session.c:3908
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr "Uporaba logiÄ�nih izrazov za iskanja"
  
! #: info/session.c:3909
  #, c-format
  msgid "Using literal strings for searches."
  msgstr "Uporaba znakovnih nizov za iskanja"
  
! #: info/session.c:4169
  msgid "Search continued from the end of the document."
  msgstr "Iskanje se nadaljuje od konca dokumenta."
  
! #: info/session.c:4174
  msgid "Search continued from the beginning of the document."
  msgstr "Iskanje se nadaljuje od zaÄ�etka dokumenta."
  
! #: info/session.c:4194
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "Iskanje poddatoteke %s ..."
  
! #: info/session.c:4231
  msgid "Search failed."
  msgstr "Iskanje je spodletelo."
  
! #: info/session.c:4248
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Regexp search"
  msgstr "Iskanje logiÄ�nega izraza"
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Search"
  msgstr "Iskanje"
  
! #: info/session.c:4250 info/session.c:4256
  msgid " case-sensitively"
  msgstr " loÄ�evanje velikosti Ä�rk"
  
! #: info/session.c:4251 info/session.c:4257
  msgid " backward"
  msgstr " vzvratno"
  
! #: info/session.c:4254
  #, fuzzy, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4274
  msgid "Search string too short"
  msgstr ""
  
! #: info/session.c:4467
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4491 info/session.c:4601
  #, c-format
  msgid "No more matches."
  msgstr ""
  
! #: info/session.c:4628
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4649
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4653 info/session.c:4665
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4661
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4674
  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:4679
  msgid "Read a string and search for it"
  msgstr "Preberi niz in ga poiÅ¡Ä�i"
  
! #: info/session.c:4685
  msgid "Read a string and search backward for it"
  msgstr "Preberi niz in ga poiÅ¡Ä�i v smeri nazaj"
  
! #: info/session.c:4693
  msgid "Repeat last search in the same direction"
  msgstr "Ponovi zadnje iskanje v isti smeri"
  
! #: info/session.c:4701 info/session.c:4746
  msgid "No previous search string"
  msgstr "Brez niza predhodnega iskanja"
  
! #: info/session.c:4738
  msgid "Repeat last search in the reverse direction"
  msgstr "Ponovi zadnje iskanje v obratni smeri"
  
! #: info/session.c:4785
  msgid "Clear displayed search matches"
  msgstr ""
  
! #: info/session.c:4802 info/session.c:4808
  msgid "Search interactively for a string as you type it"
  msgstr "Ko se vpisuje niz, ga iÅ¡Ä�i vzajemno"
  
! #: info/session.c:4928
  msgid "Regexp I-search backward: "
  msgstr "Vzvratno I-iskanje logiÄ�nega izraza: "
  
! #: info/session.c:4929
  msgid "I-search backward: "
  msgstr "I-iskanje vzvratno: "
  
! #: info/session.c:4931
  msgid "Regexp I-search: "
  msgstr "I-iskanje logiÄ�nega izraza: "
  
! #: info/session.c:4932
  msgid "I-search: "
  msgstr "I-iskanje: "
  
! #: info/session.c:4957 info/session.c:4960
  msgid "Failing "
  msgstr "Spodletelo "
  
! #: info/session.c:5326
  msgid "Cancel current operation"
  msgstr "PrekliÄ�i trenutno opravilo"
  
! #: info/session.c:5333
  msgid "Quit"
  msgstr "KonÄ�aj"
  
! #: info/session.c:5338
  #, fuzzy
  msgid "Display version of Info being run"
  msgstr "prikaÅ¾i podrobnosti razliÄ�ice in konÄ�aj"
  
! #: info/session.c:5340
  #, c-format
  msgid "GNU Info version %s"
  msgstr ""
  
! #: info/session.c:5345
  msgid "Redraw the display"
  msgstr "OsveÅ¾i zaslon"
  
! #: info/session.c:5382
  msgid "Quit using Info"
  msgstr "KonÄ�aj z uporabo Info"
  
! #: info/session.c:5398
  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:5409
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Neznan ukaz (%s)."
  
! #: info/session.c:5412
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\" je neveljaven"
  
! #: info/session.c:5413
  #, fuzzy, c-format
  msgid "'%s' is invalid"
  msgstr "`%s' je neveljaven"
  
! #: info/session.c:5731
  msgid "Add this digit to the current numeric argument"
  msgstr "Dodaj to Å¡tevko trenutnemu Å¡tevilskemu argumentu"
  
! #: info/session.c:5738
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "ZaÄ�ni (ali zmnoÅ¾i s 4) trenutni Å¡tevilski argument"
--- 1292,1634 ----
  msgstr "Ni mogoÄ�e najti vozliÅ¡Ä�a, sklicevanega s strani `%s' v `%s'."
  
! #: info/session.c:2870
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "Preberi seznam menijev, ki se zaÄ�nejo v mapi in jim sledi"
  
! #: info/session.c:2872
  msgid "Follow menus: "
  msgstr "Sledi menijem: "
  
! #: info/session.c:2977
  msgid "Select the Next node"
  msgstr "Izberi nasled. vozliÅ¡Ä�e"
  
! #: info/session.c:2984
  msgid "Select the Prev node"
  msgstr "Izberi pred. vozliÅ¡Ä�e"
  
! #: info/session.c:2991
  msgid "Select the Up node"
  msgstr "Izberi zgor. vozliÅ¡Ä�e"
  
! #: info/session.c:2997
  msgid "Select the last node in this file"
  msgstr "Izberi zadnje vozliÅ¡Ä�e v tej datoteki"
  
! #: info/session.c:3024 info/session.c:3057
  msgid "This window has no additional nodes"
  msgstr "To okno nima dodatnih vozliÅ¡Ä�"
  
! #: info/session.c:3030
  msgid "Select the first node in this file"
  msgstr "Izberi prvo vozliÅ¡Ä�e v tej datoteki"
  
! #: info/session.c:3164
  msgid "No more nodes within this document."
  msgstr "V tem dokumentu ni veÄ� vozliÅ¡Ä�."
  
! #: info/session.c:3209 info/session.c:3249
  #, fuzzy
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "Brez `Pred' ali `Gor' za to vozliÅ¡Ä�e znotraj tega dokumenta."
  
! #: info/session.c:3262
  msgid "Move forwards or down through node structure"
  msgstr "Pomakni se naprej ali dol skozi strukturo vozliÅ¡Ä�a"
  
! #: info/session.c:3279
  msgid "Move backwards or up through node structure"
  msgstr "Pomakni se nazaj ali gor skozi strukturo vozliÅ¡Ä�a"
  
! #: info/session.c:3302
  msgid "Read a node name and select it"
  msgstr "Preberi ime vozliÅ¡Ä�a in ga izberi"
  
! #: info/session.c:3356 info/session.c:3360
  msgid "Goto node: "
  msgstr "Pojdi v vozliÅ¡Ä�e: "
  
! #: info/session.c:3539
  msgid "Find the node describing program invocation"
  msgstr "Najdi vozliÅ¡Ä�e, ki opisuje priklic programa"
  
! #: info/session.c:3541
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Najdi vozliÅ¡Ä�e priklica [%s]: "
  
! #: info/session.c:3586
  msgid "Read a manpage reference and select it"
  msgstr "preberi priroÄ�niÅ¡ko stran in jo izberi"
  
! #: info/session.c:3590
  msgid "Get Manpage: "
  msgstr "Pridobi stran priroÄ�nika: "
  
! #: info/session.c:3611
  #, fuzzy
  msgid "Select the node 'Top' in this file"
  msgstr "Izberi vozliÅ¡Ä�e `Top' v tej datoteki"
  
! #: info/session.c:3617
  #, fuzzy
  msgid "Select the node '(dir)'"
  msgstr "Izberi vozliÅ¡Ä�e `(dir)'"
  
! #: info/session.c:3623
  msgid "Show full file name of node being displayed"
  msgstr ""
  
! #: info/session.c:3640
  msgid "Select the most recently selected node"
  msgstr "Izberi nedavno izbrano vozliÅ¡Ä�e"
  
! #: info/session.c:3645
  #, c-format
  msgid "No earlier node in history"
  msgstr ""
  
! #: info/session.c:3649
  msgid "Read the name of a file and select it"
  msgstr "Preberi ime vozliÅ¡Ä�a in ga izberi"
  
! #: info/session.c:3653
  msgid "Find file: "
  msgstr "Najdi datoteko: "
  
! #: info/session.c:3670
  #, fuzzy, c-format
  msgid "Cannot find '%s'."
  msgstr "Ni mogoÄ�e najti `%s'."
  
! #: info/session.c:3719
  #, fuzzy, c-format
  msgid "Could not create output file '%s'."
  msgstr "Ni bilo mogoÄ�e ustvariti izhodne datoteke `%s'."
  
! #: info/session.c:3733
  #, fuzzy, c-format
  msgid "error writing to %s: %s"
  msgstr "napaka med branjem v `%s'"
  
! #: info/session.c:3742
  #, fuzzy, c-format
  msgid "closing %s"
  msgstr "Odstranjevanje %s\n"
  
! #: info/session.c:3791
  #, fuzzy, c-format
  msgid "writing node %s..."
  msgstr "Zapisovanje vozliÅ¡Ä�a %s ..."
  
! #: info/session.c:3837
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "Uporabi cev za vsebino tega vozliÅ¡Ä�a skozi INFO_PRINT_COMMAND"
  
! #: info/session.c:3865
  #, fuzzy, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Ni mogoÄ�e odpreti cevi v `%s'."
  
! #: info/session.c:3870
  #, fuzzy, c-format
  msgid "printing node %s..."
  msgstr "Izpisovanje vozliÅ¡Ä�a %s ..."
  
! #: info/session.c:3878
  #, fuzzy, c-format
  msgid "finished printing node %s"
  msgstr "Izpisovanje vozliÅ¡Ä�a %s ..."
  
! #: info/session.c:3910
  msgid "Toggle the usage of regular expressions in searches"
  msgstr "Preklopi uporabo logiÄ�nih izrazov v iskanjih"
  
! #: info/session.c:3914
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr "Uporaba logiÄ�nih izrazov za iskanja"
  
! #: info/session.c:3915
  #, c-format
  msgid "Using literal strings for searches."
  msgstr "Uporaba znakovnih nizov za iskanja"
  
! #: info/session.c:4175
  msgid "Search continued from the end of the document."
  msgstr "Iskanje se nadaljuje od konca dokumenta."
  
! #: info/session.c:4180
  msgid "Search continued from the beginning of the document."
  msgstr "Iskanje se nadaljuje od zaÄ�etka dokumenta."
  
! #: info/session.c:4200
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "Iskanje poddatoteke %s ..."
  
! #: info/session.c:4237
  msgid "Search failed."
  msgstr "Iskanje je spodletelo."
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Regexp search"
  msgstr "Iskanje logiÄ�nega izraza"
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Search"
  msgstr "Iskanje"
  
! #: info/session.c:4256 info/session.c:4262
  msgid " case-sensitively"
  msgstr " loÄ�evanje velikosti Ä�rk"
  
! #: info/session.c:4257 info/session.c:4263
  msgid " backward"
  msgstr " vzvratno"
  
! #: info/session.c:4260
  #, fuzzy, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4280
  msgid "Search string too short"
  msgstr ""
  
! #: info/session.c:4473
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4497 info/session.c:4607
  #, c-format
  msgid "No more matches."
  msgstr ""
  
! #: info/session.c:4634
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4655
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4659 info/session.c:4671
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4667
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4680
  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:4685
  msgid "Read a string and search for it"
  msgstr "Preberi niz in ga poiÅ¡Ä�i"
  
! #: info/session.c:4691
  msgid "Read a string and search backward for it"
  msgstr "Preberi niz in ga poiÅ¡Ä�i v smeri nazaj"
  
! #: info/session.c:4699
  msgid "Repeat last search in the same direction"
  msgstr "Ponovi zadnje iskanje v isti smeri"
  
! #: info/session.c:4707 info/session.c:4752
  msgid "No previous search string"
  msgstr "Brez niza predhodnega iskanja"
  
! #: info/session.c:4744
  msgid "Repeat last search in the reverse direction"
  msgstr "Ponovi zadnje iskanje v obratni smeri"
  
! #: info/session.c:4791
  msgid "Clear displayed search matches"
  msgstr ""
  
! #: info/session.c:4808 info/session.c:4814
  msgid "Search interactively for a string as you type it"
  msgstr "Ko se vpisuje niz, ga iÅ¡Ä�i vzajemno"
  
! #: info/session.c:4934
  msgid "Regexp I-search backward: "
  msgstr "Vzvratno I-iskanje logiÄ�nega izraza: "
  
! #: info/session.c:4935
  msgid "I-search backward: "
  msgstr "I-iskanje vzvratno: "
  
! #: info/session.c:4937
  msgid "Regexp I-search: "
  msgstr "I-iskanje logiÄ�nega izraza: "
  
! #: info/session.c:4938
  msgid "I-search: "
  msgstr "I-iskanje: "
  
! #: info/session.c:4963 info/session.c:4966
  msgid "Failing "
  msgstr "Spodletelo "
  
! #: info/session.c:5332
  msgid "Cancel current operation"
  msgstr "PrekliÄ�i trenutno opravilo"
  
! #: info/session.c:5339
  msgid "Quit"
  msgstr "KonÄ�aj"
  
! #: info/session.c:5344
  #, fuzzy
  msgid "Display version of Info being run"
  msgstr "prikaÅ¾i podrobnosti razliÄ�ice in konÄ�aj"
  
! #: info/session.c:5346
  #, c-format
  msgid "GNU Info version %s"
  msgstr ""
  
! #: info/session.c:5351
  msgid "Redraw the display"
  msgstr "OsveÅ¾i zaslon"
  
! #: info/session.c:5388
  msgid "Quit using Info"
  msgstr "KonÄ�aj z uporabo Info"
  
! #: info/session.c:5404
  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:5415
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Neznan ukaz (%s)."
  
! #: info/session.c:5418
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\" je neveljaven"
  
! #: info/session.c:5419
  #, fuzzy, c-format
  msgid "'%s' is invalid"
  msgstr "`%s' je neveljaven"
  
! #: info/session.c:5737
  msgid "Add this digit to the current numeric argument"
  msgstr "Dodaj to Å¡tevko trenutnemu Å¡tevilskemu argumentu"
  
! #: info/session.c:5744
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "ZaÄ�ni (ali zmnoÅ¾i s 4) trenutni Å¡tevilski argument"
***************
*** 1775,1792 ****
  msgstr "Nastavi %s na vrednost (%s): "
  
! #: info/window.c:959
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), vrstice ----, "
  
- #: info/window.c:966
- #, fuzzy, c-format
- msgid "-%s---Info: %s, %ld lines --%s--"
- msgstr "-%s---Info: %s, %d vrstic --%s--"
- 
- #: info/window.c:970
- #, fuzzy, c-format
- msgid "-%s---Info: (%s)%s, %ld lines --%s--"
- msgstr "-%s%s-Info: (%s)%s, %d vrstic --%s--"
- 
  #: install-info/install-info.c:292
  #, c-format
--- 1770,1777 ----
  msgstr "Nastavi %s na vrednost (%s): "
  
! #: info/window.c:909
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), vrstice ----, "
  
  #: install-info/install-info.c:292
  #, c-format
***************
*** 1963,1967 ****
  "\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"
--- 1948,1952 ----
  "\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"
***************
*** 2053,2171 ****
  msgstr "za `%s' ni najdenih nobenih vnosov; niÄ� ni izbrisano"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:855
! #: tp/Texinfo/Convert/Converter.pm:893 tp/Texinfo/Convert/Converter.pm:1204
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6504
! #: tp/Texinfo/Convert/HTML.pm:6528 tp/Texinfo/Convert/HTML.pm:6905
! #: tp/Texinfo/Convert/HTML.pm:6963 tp/Texinfo/Convert/HTML.pm:7041
! #: tp/Texinfo/Convert/HTML.pm:7118 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:546
! #: tp/Texinfo/Convert/TexinfoXML.pm:457
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "%s: ni mogoÄ�e odpreti --css-file: %s"
  
! #: tp/Texinfo/Common.pm:881
  msgid "recursion is always allowed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:882
  #, fuzzy
  msgid "arguments are quoted by default"
  msgstr "@quote-arg je zastarel; argumenti so privzeto navedeni"
  
! #: tp/Texinfo/Common.pm:1105
  #, fuzzy, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s ni veljavna koda jezika ISO 639"
  
! #: tp/Texinfo/Common.pm:1110
  #, fuzzy, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s ni veljavna koda jezika ISO 639"
  
! #: tp/Texinfo/Common.pm:1128
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1151
  #, fuzzy, perl-format
  msgid "could not read %s: %s"
  msgstr "%s: ni mogoÄ�e odpreti --css-file: %s"
  
! #: tp/Texinfo/Common.pm:1170
  #, fuzzy, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "napaka med konÄ�anjem datoteke vnosa `%s'"
  
! #: tp/Texinfo/Common.pm:1176 tp/Texinfo/Parser.pm:3353
  #, fuzzy, perl-format
  msgid "@%s: could not find %s"
  msgstr "%s: ni mogoÄ�e odpreti --css-file: %s"
  
! #: tp/Texinfo/Common.pm:1520
! #, fuzzy, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr "%s: ni mogoÄ�e odpreti --css-file: %s"
! 
! #: tp/Texinfo/Common.pm:1548
! #, fuzzy
! msgid "missing type"
! msgstr "manjka ime dejanja"
! 
! #: tp/Texinfo/Common.pm:1551
! #, fuzzy, perl-format
! msgid "unrecognized type: %s"
! msgstr "%s: neprepoznana moÅ¾nost `--%s'\n"
! 
! #: tp/Texinfo/Common.pm:1568
! #, fuzzy, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr "napaka med konÄ�anjem datoteke vnosa `%s'"
! 
! #: tp/Texinfo/Common.pm:1603
  msgid "no node to be renamed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1614
  msgid "nodes without a new name at the end of file"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1624 tp/Texinfo/Parser.pm:926
  #, fuzzy, perl-format
  msgid "could not open %s: %s"
  msgstr "%s: ni mogoÄ�e odpreti --css-file: %s"
  
! #: tp/Texinfo/Common.pm:2144
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:395 tp/Texinfo/Convert/Converter.pm:414
  #, fuzzy, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Nastavi spremenljivko: "
  
! #: tp/Texinfo/Convert/Converter.pm:794
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:876 tp/Texinfo/Convert/Converter.pm:909
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:6931
! #: tp/Texinfo/Convert/HTML.pm:6989 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:476 tp/Texinfo/Parser.pm:2035
  #, fuzzy, perl-format
  msgid "error on closing %s: %s"
  msgstr "napaka med konÄ�anjem datoteke vnosa `%s'"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, fuzzy, perl-format
  msgid "could not create directories `%s' or `%s': %s"
  msgstr "Ni mogoÄ�e ustvariti mape `%s': %s"
  
! #: tp/Texinfo/Convert/Converter.pm:995
  #, fuzzy, perl-format
  msgid "could not create directory `%s': %s"
--- 2038,2147 ----
  msgstr "za `%s' ni najdenih nobenih vnosov; niÄ� ni izbrisano"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:847
! #: tp/Texinfo/Convert/Converter.pm:885 tp/Texinfo/Convert/Converter.pm:1196
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6573
! #: tp/Texinfo/Convert/HTML.pm:6597 tp/Texinfo/Convert/HTML.pm:6978
! #: tp/Texinfo/Convert/HTML.pm:7037 tp/Texinfo/Convert/HTML.pm:7115
! #: tp/Texinfo/Convert/HTML.pm:7192 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:547
! #: tp/Texinfo/Convert/TexinfoXML.pm:458
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "%s: ni mogoÄ�e odpreti --css-file: %s"
  
! #: tp/Texinfo/Common.pm:862
  msgid "recursion is always allowed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:863
  #, fuzzy
  msgid "arguments are quoted by default"
  msgstr "@quote-arg je zastarel; argumenti so privzeto navedeni"
  
! #: tp/Texinfo/Common.pm:866
! msgid ""
! "move your @contents command if you want the contents after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:869
! msgid ""
! "move your @shortcontents and @contents commands if you want the contents "
! "after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:1093
  #, fuzzy, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s ni veljavna koda jezika ISO 639"
  
! #: tp/Texinfo/Common.pm:1098
  #, fuzzy, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s ni veljavna koda jezika ISO 639"
  
! #: tp/Texinfo/Common.pm:1116
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1139
  #, fuzzy, perl-format
  msgid "could not read %s: %s"
  msgstr "%s: ni mogoÄ�e odpreti --css-file: %s"
  
! #: tp/Texinfo/Common.pm:1158
  #, fuzzy, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "napaka med konÄ�anjem datoteke vnosa `%s'"
  
! #: tp/Texinfo/Common.pm:1164 tp/Texinfo/Parser.pm:3193
  #, fuzzy, perl-format
  msgid "@%s: could not find %s"
  msgstr "%s: ni mogoÄ�e odpreti --css-file: %s"
  
! #: tp/Texinfo/Common.pm:1637
  msgid "no node to be renamed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1648
  msgid "nodes without a new name at the end of file"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1658 tp/Texinfo/Parser.pm:899
  #, fuzzy, perl-format
  msgid "could not open %s: %s"
  msgstr "%s: ni mogoÄ�e odpreti --css-file: %s"
  
! #: tp/Texinfo/Common.pm:2178
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:387 tp/Texinfo/Convert/Converter.pm:406
  #, fuzzy, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Nastavi spremenljivko: "
  
! #: tp/Texinfo/Convert/Converter.pm:786
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:868 tp/Texinfo/Convert/Converter.pm:901
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:7004
! #: tp/Texinfo/Convert/HTML.pm:7063 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:477 tp/Texinfo/Parser.pm:1996
  #, fuzzy, perl-format
  msgid "error on closing %s: %s"
  msgstr "napaka med konÄ�anjem datoteke vnosa `%s'"
  
! #: tp/Texinfo/Convert/Converter.pm:979
  #, fuzzy, perl-format
  msgid "could not create directories `%s' or `%s': %s"
  msgstr "Ni mogoÄ�e ustvariti mape `%s': %s"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, fuzzy, perl-format
  msgid "could not create directory `%s': %s"
***************
*** 2177,2277 ****
  msgstr "datoteka @image `%s' je neberljiva: %s"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5388
  #, fuzzy
  msgid "no argument specified for @U"
  msgstr "Za ukaz `%c%s' ni navedenega nobenega imena vozliÅ¡Ä�a"
  
! #: tp/Texinfo/Convert/HTML.pm:1683
  #, fuzzy, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
  msgstr "@image datoteka `%s' (za HTML) ni berljiva: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:2371
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4888
  msgid "string not closed in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4890
  #, fuzzy
  msgid "--css-include ended in comment"
  msgstr "%s:%d: --css-file se je konÄ�ala v komentarju"
  
! #: tp/Texinfo/Convert/HTML.pm:4892
  msgid "@import not finished in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4918
  #, perl-format
  msgid "CSS file %s not found"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4924
  #, fuzzy, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "%s: ni mogoÄ�e odpreti --css-file: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:4934
  #, fuzzy, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "napaka med konÄ�anjem datoteke vnosa `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:5801 tp/Texinfo/Convert/HTML.pm:5805
  #, fuzzy, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "Za `%s' ni najdenih nobenih vnosov kazal\n"
  
! #: tp/Texinfo/Convert/HTML.pm:6499
  #, fuzzy, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "napaka med konÄ�anjem datoteke vnosa `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:6523
  #, fuzzy, perl-format
  msgid "error on closing TOC frame file %s: %s"
  msgstr "napaka med konÄ�anjem datoteke vnosa `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:6638
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6839
  msgid "must specify a title with a title command or @top"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7048
  #, fuzzy, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr "napaka med konÄ�anjem datoteke vnosa `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:7073
  #, 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:7079
  #, fuzzy, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "nesklicevano vozliÅ¡Ä�e `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:7093
  #, perl-format
  msgid "target node (new name for `%s') not in document: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7125
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7163
  msgid "empty node name"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7165 tp/Texinfo/Parser.pm:3697
  #, perl-format
  msgid "syntax for an external node used for `%s'"
--- 2153,2273 ----
  msgstr "datoteka @image `%s' je neberljiva: %s"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5225
  #, fuzzy
  msgid "no argument specified for @U"
  msgstr "Za ukaz `%c%s' ni navedenega nobenega imena vozliÅ¡Ä�a"
  
! #: tp/Texinfo/Convert/HTML.pm:1715
  #, fuzzy, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
  msgstr "@image datoteka `%s' (za HTML) ni berljiva: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:2399
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4629
! #, fuzzy, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr "%s: ni mogoÄ�e odpreti --css-file: %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4657
! #, fuzzy
! msgid "missing type"
! msgstr "manjka ime dejanja"
! 
! #: tp/Texinfo/Convert/HTML.pm:4660
! #, fuzzy, perl-format
! msgid "unrecognized type: %s"
! msgstr "%s: neprepoznana moÅ¾nost `--%s'\n"
! 
! #: tp/Texinfo/Convert/HTML.pm:4677
! #, fuzzy, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr "napaka med konÄ�anjem datoteke vnosa `%s'"
! 
! #: tp/Texinfo/Convert/HTML.pm:4962
  msgid "string not closed in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4964
  #, fuzzy
  msgid "--css-include ended in comment"
  msgstr "%s:%d: --css-file se je konÄ�ala v komentarju"
  
! #: tp/Texinfo/Convert/HTML.pm:4966
  msgid "@import not finished in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4992
  #, perl-format
  msgid "CSS file %s not found"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4998
  #, fuzzy, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "%s: ni mogoÄ�e odpreti --css-file: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5008
  #, fuzzy, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "napaka med konÄ�anjem datoteke vnosa `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:5870 tp/Texinfo/Convert/HTML.pm:5874
  #, fuzzy, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "Za `%s' ni najdenih nobenih vnosov kazal\n"
  
! #: tp/Texinfo/Convert/HTML.pm:6568
  #, fuzzy, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "napaka med konÄ�anjem datoteke vnosa `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:6592
  #, fuzzy, perl-format
  msgid "error on closing TOC frame file %s: %s"
  msgstr "napaka med konÄ�anjem datoteke vnosa `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:6707
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6912
  msgid "must specify a title with a title command or @top"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7122
  #, fuzzy, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr "napaka med konÄ�anjem datoteke vnosa `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:7147
  #, 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:7153
  #, fuzzy, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "nesklicevano vozliÅ¡Ä�e `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:7167
  #, perl-format
  msgid "target node (new name for `%s') not in document: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7199
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7237
  msgid "empty node name"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7239 tp/Texinfo/Parser.pm:3542
  #, perl-format
  msgid "syntax for an external node used for `%s'"
***************
*** 2307,2336 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1334
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1381 tp/Texinfo/Parser.pm:2722
  #, fuzzy, perl-format
  msgid "entry for index `%s' outside of any node"
  msgstr "Vnos za kazalo `%s' je zunaj vseh vozliÅ¡Ä�"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1495
  #, fuzzy, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr "napaka med konÄ�anjem datoteke vnosa `%s'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1500
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "datoteka @image `%s' je neberljiva: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1523
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1931
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
--- 2303,2332 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1335
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1382 tp/Texinfo/Parser.pm:2568
  #, fuzzy, perl-format
  msgid "entry for index `%s' outside of any node"
  msgstr "Vnos za kazalo `%s' je zunaj vseh vozliÅ¡Ä�"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1496
  #, fuzzy, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr "napaka med konÄ�anjem datoteke vnosa `%s'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1501
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "datoteka @image `%s' je neberljiva: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1524
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1932
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
***************
*** 2340,2659 ****
  "za izognitev temu"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2161
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2193
  #, fuzzy, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "Brez vnosov %skazala, ki vsebuje `%s'."
  
! #: tp/Texinfo/Convert/Plaintext.pm:2226
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2272
  #, fuzzy, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "`.' ali `,' morata slediti @%s, ne `%c'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2275
  #, fuzzy
  msgid "`.' or `,' must follow @xref"
  msgstr "`.' ali `,' morata slediti @%s, ne `%c'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3118
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3129
  msgid "menu entry node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3145
  msgid "menu entry name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:910
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1160 tp/Texinfo/Structuring.pm:594
  #, perl-format
  msgid "multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1194
  #, perl-format
! msgid "bad syntax for @%s argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1210
  #, perl-format
! msgid "bad or empty @%s formal argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1219 tp/Texinfo/Parser.pm:4856
! #: tp/Texinfo/Parser.pm:4882 tp/Texinfo/Parser.pm:5671
! #: tp/Texinfo/Parser.pm:5687 tp/Texinfo/Parser.pm:5702
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s potrebuje ime"
  
! #: tp/Texinfo/Parser.pm:1223 tp/Texinfo/Parser.pm:4859
! #: tp/Texinfo/Parser.pm:4885 tp/Texinfo/Parser.pm:5674
! #: tp/Texinfo/Parser.pm:5690 tp/Texinfo/Parser.pm:5705
  #, fuzzy, perl-format
  msgid "bad name for @%s"
  msgstr "Slab argument k @%s"
  
! #: tp/Texinfo/Parser.pm:1341
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1345
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1350
! #, perl-format
! msgid "%c%s missing close brace"
  msgstr "%c%s manjka zaklepaj"
  
! #: tp/Texinfo/Parser.pm:1354
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1476
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1544
  msgid "@itemx must follow @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1712
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1743
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "`@end' priÄ�akovan `%s', toda viden je `%s'"
  
! #: tp/Texinfo/Parser.pm:1746
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1750
  #, fuzzy, perl-format
  msgid "no matching `%cend %s'"
  msgstr "Ni ujemajoÄ�ega `%cend %s'"
  
! #: tp/Texinfo/Parser.pm:1776 tp/Texinfo/Parser.pm:5204
! #: tp/Texinfo/Parser.pm:5470
  #, fuzzy, perl-format
  msgid "misplaced %c"
  msgstr "NapaÄ�no postavljen %c"
  
! #: tp/Texinfo/Parser.pm:1874 tp/Texinfo/Parser.pm:3312
  #, fuzzy, perl-format
  msgid "unmatched `%c%s'"
  msgstr "NeujemajoÄ� `%c%s'"
  
! #: tp/Texinfo/Parser.pm:2110
  #, fuzzy, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "Makro `%s' je klican v vrstici %d s preveÄ� argumenti"
  
! #: tp/Texinfo/Parser.pm:2132
  #, fuzzy, perl-format
! msgid "@%s missing close brace"
  msgstr "%c%s manjka zaklepaj"
  
! #: tp/Texinfo/Parser.pm:2140
  #, fuzzy, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr "Makro `%s' je klican v vrstici %d s preveÄ� argumenti"
  
! #: tp/Texinfo/Parser.pm:2175
  #, fuzzy, perl-format
  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/Parser.pm:2650
  #, fuzzy, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "makro `%s' je bil predhodno doloÄ�en"
  
! #: tp/Texinfo/Parser.pm:2655
  #, fuzzy, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "tukaj je predhodna doloÄ�itev `%s'"
  
! #: tp/Texinfo/Parser.pm:3016
  #, fuzzy, perl-format
  msgid "missing name for @%s"
  msgstr "manjka ime dejanja"
  
! #: tp/Texinfo/Parser.pm:3021
  #, perl-format
  msgid "missing category for @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3073
  #, fuzzy, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "Slab argument k @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3089
  #, fuzzy
  msgid "empty multitable"
  msgstr "%s: prazna datoteka"
  
! #: tp/Texinfo/Parser.pm:3145 tp/Texinfo/Parser.pm:5784
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s"
  msgstr "Slab argument k @%s"
  
! #: tp/Texinfo/Parser.pm:3151 tp/Texinfo/Parser.pm:5806
! #: tp/Texinfo/Parser.pm:5818
  #, fuzzy, perl-format
  msgid "bad argument to @%s"
  msgstr "Slab argument k @%s"
  
! #: tp/Texinfo/Parser.pm:3162
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s potrebuje argument: oblikovalnik za %citem"
  
! #: tp/Texinfo/Parser.pm:3167
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3202
  #, fuzzy, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "%s: moÅ¾nost `--%s' ne dovoljuje argumenta\n"
  
! #: tp/Texinfo/Parser.pm:3290 tp/Texinfo/Parser.pm:3429
! #: tp/Texinfo/Parser.pm:5777
  #, fuzzy, perl-format
  msgid "@%s missing argument"
  msgstr "%s: manjka argument datoteke.\n"
  
! #: tp/Texinfo/Parser.pm:3302
  #, fuzzy, perl-format
  msgid "unknown @end %s"
  msgstr "Neznano kazalo `%s'"
  
! #: tp/Texinfo/Parser.pm:3324 tp/Texinfo/Parser.pm:3943
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "Slab argument k @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3329 tp/Texinfo/Parser.pm:5861
! #: tp/Texinfo/Parser.pm:5906 tp/Texinfo/Parser.pm:5935
! #: tp/Texinfo/Parser.pm:5976 tp/Texinfo/Parser.pm:6055
  #, fuzzy, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "Slab argument k @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3348
  #, fuzzy, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "%s: ni mogoÄ�e odpreti --css-file: %s"
  
! #: tp/Texinfo/Parser.pm:3360
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3369
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "neprepoznano ime kodiranja `%s'"
  
! #: tp/Texinfo/Parser.pm:3516
  #, perl-format
  msgid "@%s after the first element"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3523
  #, fuzzy, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s ni smiselen zunaj okolja `@titlepage'"
  
! #: tp/Texinfo/Parser.pm:3563
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3575
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3677
  #, fuzzy, perl-format
  msgid "empty argument in @%s"
  msgstr "Slab argument k @%s"
  
! #: tp/Texinfo/Parser.pm:3681
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3724
  #, fuzzy, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "V vozliÅ¡Ä�u `%s' ni menijev."
  
! #: tp/Texinfo/Parser.pm:3732
  msgid "empty node name in menu entry"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3805
  #, fuzzy, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "%s: ni mogoÄ�e odpreti --css-file: %s"
  
! #: tp/Texinfo/Parser.pm:3937
! #, perl-format
! msgid "@end %s should only appear at a line beginning"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:3960
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "makro `%s' je bil predhodno doloÄ�en"
  
! #: tp/Texinfo/Parser.pm:3963
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "tukaj je predhodna doloÄ�itev `%s'"
  
! #: tp/Texinfo/Parser.pm:3968
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4017
  #, perl-format
  msgid "@%s without associated character"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4087
  #, perl-format
  msgid ""
--- 2336,2656 ----
  "za izognitev temu"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2162
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2194
  #, fuzzy, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "Brez vnosov %skazala, ki vsebuje `%s'."
  
! #: tp/Texinfo/Convert/Plaintext.pm:2227
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2273
  #, fuzzy, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "`.' ali `,' morata slediti @%s, ne `%c'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2276
  #, fuzzy
  msgid "`.' or `,' must follow @xref"
  msgstr "`.' ali `,' morata slediti @%s, ne `%c'"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3086
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3097
  msgid "menu entry node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3113
  msgid "menu entry name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:883
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1125 tp/Texinfo/Structuring.pm:595
  #, perl-format
  msgid "multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1166
  #, perl-format
! msgid "bad or empty @%s formal argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1176
  #, perl-format
! msgid "bad syntax for @%s argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1183 tp/Texinfo/Parser.pm:4707
! #: tp/Texinfo/Parser.pm:4733 tp/Texinfo/Parser.pm:5565
! #: tp/Texinfo/Parser.pm:5578 tp/Texinfo/Parser.pm:5592
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s potrebuje ime"
  
! #: tp/Texinfo/Parser.pm:1187 tp/Texinfo/Parser.pm:4710
! #: tp/Texinfo/Parser.pm:4736 tp/Texinfo/Parser.pm:5568
! #: tp/Texinfo/Parser.pm:5581 tp/Texinfo/Parser.pm:5595
  #, fuzzy, perl-format
  msgid "bad name for @%s"
  msgstr "Slab argument k @%s"
  
! #: tp/Texinfo/Parser.pm:1305
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1309
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1314
! #, fuzzy, perl-format
! msgid "%c%s missing closing brace"
  msgstr "%c%s manjka zaklepaj"
  
! #: tp/Texinfo/Parser.pm:1318
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1440
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1508
  msgid "@itemx must follow @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1676
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1707
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "`@end' priÄ�akovan `%s', toda viden je `%s'"
  
! #: tp/Texinfo/Parser.pm:1710
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1714
  #, fuzzy, perl-format
  msgid "no matching `%cend %s'"
  msgstr "Ni ujemajoÄ�ega `%cend %s'"
  
! #: tp/Texinfo/Parser.pm:1738 tp/Texinfo/Parser.pm:5070
! #: tp/Texinfo/Parser.pm:5308
  #, fuzzy, perl-format
  msgid "misplaced %c"
  msgstr "NapaÄ�no postavljen %c"
  
! #: tp/Texinfo/Parser.pm:1835 tp/Texinfo/Parser.pm:3148
  #, fuzzy, perl-format
  msgid "unmatched `%c%s'"
  msgstr "NeujemajoÄ� `%c%s'"
  
! #: tp/Texinfo/Parser.pm:2072
  #, fuzzy, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "Makro `%s' je klican v vrstici %d s preveÄ� argumenti"
  
! #: tp/Texinfo/Parser.pm:2094
  #, fuzzy, perl-format
! msgid "@%s missing closing brace"
  msgstr "%c%s manjka zaklepaj"
  
! #: tp/Texinfo/Parser.pm:2102
  #, fuzzy, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr "Makro `%s' je klican v vrstici %d s preveÄ� argumenti"
  
! #: tp/Texinfo/Parser.pm:2138
  #, fuzzy, perl-format
  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/Parser.pm:2501
  #, fuzzy, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "makro `%s' je bil predhodno doloÄ�en"
  
! #: tp/Texinfo/Parser.pm:2506
  #, fuzzy, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "tukaj je predhodna doloÄ�itev `%s'"
  
! #: tp/Texinfo/Parser.pm:2850
  #, fuzzy, perl-format
  msgid "missing name for @%s"
  msgstr "manjka ime dejanja"
  
! #: tp/Texinfo/Parser.pm:2855
  #, perl-format
  msgid "missing category for @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2890
  #, fuzzy, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "Slab argument k @%s: %s"
  
! #: tp/Texinfo/Parser.pm:2905
  #, fuzzy
  msgid "empty multitable"
  msgstr "%s: prazna datoteka"
  
! #: tp/Texinfo/Parser.pm:2959 tp/Texinfo/Parser.pm:5673
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s"
  msgstr "Slab argument k @%s"
  
! #: tp/Texinfo/Parser.pm:2965 tp/Texinfo/Parser.pm:5694
! #: tp/Texinfo/Parser.pm:5705
  #, fuzzy, perl-format
  msgid "bad argument to @%s"
  msgstr "Slab argument k @%s"
  
! #: tp/Texinfo/Parser.pm:2976
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s potrebuje argument: oblikovalnik za %citem"
  
! #: tp/Texinfo/Parser.pm:2981
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3016
  #, fuzzy, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "%s: moÅ¾nost `--%s' ne dovoljuje argumenta\n"
  
! #: tp/Texinfo/Parser.pm:3124 tp/Texinfo/Parser.pm:3277
! #: tp/Texinfo/Parser.pm:5666
  #, fuzzy, perl-format
  msgid "@%s missing argument"
  msgstr "%s: manjka argument datoteke.\n"
  
! #: tp/Texinfo/Parser.pm:3138
  #, fuzzy, perl-format
  msgid "unknown @end %s"
  msgstr "Neznano kazalo `%s'"
  
! #: tp/Texinfo/Parser.pm:3161 tp/Texinfo/Parser.pm:3788
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "Slab argument k @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3167 tp/Texinfo/Parser.pm:3245
! #: tp/Texinfo/Parser.pm:5755 tp/Texinfo/Parser.pm:5798
! #: tp/Texinfo/Parser.pm:5827 tp/Texinfo/Parser.pm:5868
! #: tp/Texinfo/Parser.pm:5946
  #, fuzzy, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "Slab argument k @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3188
  #, fuzzy, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "%s: ni mogoÄ�e odpreti --css-file: %s"
  
! #: tp/Texinfo/Parser.pm:3200
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3208
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "neprepoznano ime kodiranja `%s'"
  
! #: tp/Texinfo/Parser.pm:3364
  #, perl-format
  msgid "@%s after the first element"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3371
  #, fuzzy, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s ni smiselen zunaj okolja `@titlepage'"
  
! #: tp/Texinfo/Parser.pm:3408
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3420
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3522
  #, fuzzy, perl-format
  msgid "empty argument in @%s"
  msgstr "Slab argument k @%s"
  
! #: tp/Texinfo/Parser.pm:3526
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3569
  #, fuzzy, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "V vozliÅ¡Ä�u `%s' ni menijev."
  
! #: tp/Texinfo/Parser.pm:3577
  msgid "empty node name in menu entry"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3650
  #, fuzzy, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "%s: ni mogoÄ�e odpreti --css-file: %s"
  
! #: tp/Texinfo/Parser.pm:3782
! #, fuzzy, perl-format
! msgid "@end %s should only appear at the beginning of a line"
! msgstr "UniÄ�i do zaÄ�etka vrstice"
  
! #: tp/Texinfo/Parser.pm:3804
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "makro `%s' je bil predhodno doloÄ�en"
  
! #: tp/Texinfo/Parser.pm:3807
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "tukaj je predhodna doloÄ�itev `%s'"
  
! #: tp/Texinfo/Parser.pm:3812
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3879
  #, perl-format
  msgid "@%s without associated character"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3949
  #, perl-format
  msgid ""
***************
*** 2661,2665 ****
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4111
  #, perl-format
  msgid ""
--- 2658,2662 ----
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3974
  #, perl-format
  msgid ""
***************
*** 2668,2793 ****
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4120
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4176
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4182
  #, fuzzy, perl-format
  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/Parser.pm:4195 tp/Texinfo/Parser.pm:5325
  #, fuzzy, perl-format
  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/Parser.pm:4207
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4218
  #, fuzzy, perl-format
  msgid "@%s expected braces"
  msgstr "%c%s priÄ�akovani so oklepaji"
  
! #: tp/Texinfo/Parser.pm:4383
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "nedoloÄ�ena zastavica: %s"
  
! #: tp/Texinfo/Parser.pm:4386
  msgid "bad syntax for @value"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4393
  #, fuzzy, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s je zastarel"
  
! #: tp/Texinfo/Parser.pm:4396
  #, fuzzy, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s je zastarel"
  
! #: tp/Texinfo/Parser.pm:4405
! #, perl-format
! msgid "@%s should only appear at a line beginning"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:4496
  #, fuzzy, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s ni smiselno znotraj bloka `@%s'"
  
! #: tp/Texinfo/Parser.pm:4505
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4631 tp/Texinfo/Parser.pm:4648
! #: tp/Texinfo/Parser.pm:4698
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s ni smiselno znotraj bloka `@%s'"
  
! #: tp/Texinfo/Parser.pm:4658
  #, fuzzy, perl-format
  msgid "@%s in empty multitable"
  msgstr "%s: prazna datoteka"
  
! #: tp/Texinfo/Parser.pm:4664
  msgid "@tab before @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4667
  #, fuzzy, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "PreveÄ� stolpcev v predmetu veÄ�ih razpredelnic (najveÄ� %d)"
  
! #: tp/Texinfo/Parser.pm:4704
  msgid "ignoring @tab outside of multitable"
  msgstr "prezrtje @tab izven veÄ�ih razpredelnic"
  
! #: tp/Texinfo/Parser.pm:4708
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4745
  #, fuzzy, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "Mora biti v okolju `@%s' za uporabo `@%s'"
  
! #: tp/Texinfo/Parser.pm:4787
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "@%s ni smiselen zunaj okolij `@titlepage' in `@quotation'"
  
! #: tp/Texinfo/Parser.pm:4791
  msgid "@dircategory after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4979
  #, fuzzy, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "Sprotne opombe znotraj sprotnih opomb niso dovoljene"
  
! #: tp/Texinfo/Parser.pm:4997
  msgid "@direntry after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5005
  #, fuzzy, perl-format
  msgid "@%s seen before first @node"
  msgstr "@menu je bil viden pred prvim @node, ki je ustvarilo vozliÅ¡Ä�e `Top'"
  
! #: tp/Texinfo/Parser.pm:5008
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
--- 2665,2790 ----
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3983
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4038
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4044
  #, fuzzy, perl-format
  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/Parser.pm:4057 tp/Texinfo/Parser.pm:5189
  #, fuzzy, perl-format
  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/Parser.pm:4068
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4079
  #, fuzzy, perl-format
  msgid "@%s expected braces"
  msgstr "%c%s priÄ�akovani so oklepaji"
  
! #: tp/Texinfo/Parser.pm:4233
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "nedoloÄ�ena zastavica: %s"
  
! #: tp/Texinfo/Parser.pm:4236
  msgid "bad syntax for @value"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4243
  #, fuzzy, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s je zastarel"
  
! #: tp/Texinfo/Parser.pm:4246
  #, fuzzy, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s je zastarel"
  
! #: tp/Texinfo/Parser.pm:4255
! #, fuzzy, perl-format
! msgid "@%s should only appear at the beginning of a line"
! msgstr "UniÄ�i do zaÄ�etka vrstice"
  
! #: tp/Texinfo/Parser.pm:4346
  #, fuzzy, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s ni smiselno znotraj bloka `@%s'"
  
! #: tp/Texinfo/Parser.pm:4355
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4479 tp/Texinfo/Parser.pm:4496
! #: tp/Texinfo/Parser.pm:4546
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s ni smiselno znotraj bloka `@%s'"
  
! #: tp/Texinfo/Parser.pm:4506
  #, fuzzy, perl-format
  msgid "@%s in empty multitable"
  msgstr "%s: prazna datoteka"
  
! #: tp/Texinfo/Parser.pm:4512
  msgid "@tab before @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4515
  #, fuzzy, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "PreveÄ� stolpcev v predmetu veÄ�ih razpredelnic (najveÄ� %d)"
  
! #: tp/Texinfo/Parser.pm:4552
  msgid "ignoring @tab outside of multitable"
  msgstr "prezrtje @tab izven veÄ�ih razpredelnic"
  
! #: tp/Texinfo/Parser.pm:4556
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4596
  #, fuzzy, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "Mora biti v okolju `@%s' za uporabo `@%s'"
  
! #: tp/Texinfo/Parser.pm:4638
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "@%s ni smiselen zunaj okolij `@titlepage' in `@quotation'"
  
! #: tp/Texinfo/Parser.pm:4642
  msgid "@dircategory after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4847
  #, fuzzy, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "Sprotne opombe znotraj sprotnih opomb niso dovoljene"
  
! #: tp/Texinfo/Parser.pm:4864
  msgid "@direntry after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4872
  #, fuzzy, perl-format
  msgid "@%s seen before first @node"
  msgstr "@menu je bil viden pred prvim @node, ki je ustvarilo vozliÅ¡Ä�e `Top'"
  
! #: tp/Texinfo/Parser.pm:4875
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
***************
*** 2795,2962 ****
  "Morda bi vaÅ¡e vozliÅ¡Ä�e @top moralo biti ovito v @ifnottex namesto @ifinfo?"
  
! #: tp/Texinfo/Parser.pm:5070
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5078
  #, fuzzy, perl-format
  msgid "unknown command `%s'"
  msgstr "Neznan ukaz `%s'"
  
! #: tp/Texinfo/Parser.pm:5088
  #, fuzzy
  msgid "unexpected @"
  msgstr "PriÄ�akovan `%s'"
  
! #: tp/Texinfo/Parser.pm:5117
  #, fuzzy, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s ni smiselno zunaj okolja `@float'"
  
! #: tp/Texinfo/Parser.pm:5122
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5130
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5249
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5273
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5292
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5303
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5316
  msgid "@image missing filename argument"
  msgstr "@image manjka argument imena datoteke"
  
! #: tp/Texinfo/Parser.pm:5348
  #, fuzzy, perl-format
  msgid "@%s missing first argument"
  msgstr "%s: manjka argument datoteke.\n"
  
! #: tp/Texinfo/Parser.pm:5393
  #, fuzzy, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "Slab argument k @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5399
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5412
! #, perl-format
! msgid "argument for @U exceeds size of integer: %s"
! msgstr ""
! 
! #: tp/Texinfo/Parser.pm:5418
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5546
  msgid "superfluous arguments for node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5596
  #, fuzzy, perl-format
  msgid "expected @end %s"
  msgstr "PriÄ�akovan `%s'"
  
! #: tp/Texinfo/Parser.pm:5718
  #, fuzzy, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "ÄŒe Å¾elite dati ukaz kot argument v @%s, uporabite oklepaje"
  
! #: tp/Texinfo/Parser.pm:5728
  #, fuzzy, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "Slab argument k @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5801
  #, fuzzy, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "ÄŒe Å¾elite dati ukaz kot argument v @%s, uporabite oklepaje"
  
! #: tp/Texinfo/Parser.pm:5823
  #, perl-format
  msgid "empty @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5831
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5840
  #, fuzzy, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "%s: %s argument mora biti Å¡tevilski, ne `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5849
  #, perl-format
  msgid "reserved index name %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5868
  #, fuzzy, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "Neznano kazalo `%s'"
  
! #: tp/Texinfo/Parser.pm:5871
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5914
  #, fuzzy, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "Neznano kazalo `%s' v @printindex"
  
! #: tp/Texinfo/Parser.pm:5920
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5928
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5944
  #, fuzzy, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
  msgstr "%s: %s argument mora biti Å¡tevilski, ne `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5952
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr "Podprt je samo @%s 10 ali 11, ne `%s'"
  
! #: tp/Texinfo/Parser.pm:5960
  #, fuzzy, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
--- 2792,2954 ----
  "Morda bi vaÅ¡e vozliÅ¡Ä�e @top moralo biti ovito v @ifnottex namesto @ifinfo?"
  
! #: tp/Texinfo/Parser.pm:4937
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4945
  #, fuzzy, perl-format
  msgid "unknown command `%s'"
  msgstr "Neznan ukaz `%s'"
  
! #: tp/Texinfo/Parser.pm:4955
  #, fuzzy
  msgid "unexpected @"
  msgstr "PriÄ�akovan `%s'"
  
! #: tp/Texinfo/Parser.pm:4983
  #, fuzzy, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s ni smiselno zunaj okolja `@float'"
  
! #: tp/Texinfo/Parser.pm:4988
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4996
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5114
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5138
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5156
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5167
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5180
  msgid "@image missing filename argument"
  msgstr "@image manjka argument imena datoteke"
  
! #: tp/Texinfo/Parser.pm:5211
  #, fuzzy, perl-format
  msgid "@%s missing first argument"
  msgstr "%s: manjka argument datoteke.\n"
  
! #: tp/Texinfo/Parser.pm:5230
  #, fuzzy, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "Slab argument k @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5236
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5253
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5448
  msgid "superfluous arguments for node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5498
  #, fuzzy, perl-format
  msgid "expected @end %s"
  msgstr "PriÄ�akovan `%s'"
  
! #: tp/Texinfo/Parser.pm:5607
  #, fuzzy, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "ÄŒe Å¾elite dati ukaz kot argument v @%s, uporabite oklepaje"
  
! #: tp/Texinfo/Parser.pm:5617
  #, fuzzy, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "Slab argument k @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5689
  #, fuzzy, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "ÄŒe Å¾elite dati ukaz kot argument v @%s, uporabite oklepaje"
  
! #: tp/Texinfo/Parser.pm:5710
  #, perl-format
  msgid "empty @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5727
  #, fuzzy, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "%s: %s argument mora biti Å¡tevilski, ne `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5736
  #, perl-format
  msgid "reserved index name %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5762
  #, fuzzy, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "Neznano kazalo `%s'"
  
! #: tp/Texinfo/Parser.pm:5765
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5793
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5806
  #, fuzzy, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "Neznano kazalo `%s' v @printindex"
  
! #: tp/Texinfo/Parser.pm:5812
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5820
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5836
  #, fuzzy, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
  msgstr "%s: %s argument mora biti Å¡tevilski, ne `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5844
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr "Podprt je samo @%s 10 ali 11, ne `%s'"
  
! #: tp/Texinfo/Parser.pm:5852
  #, fuzzy, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
***************
*** 2964,2973 ****
  "%s: --footnote-style argument mora biti `separate' ali `end', ne `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5968
  #, fuzzy, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
  msgstr "%s: %s argument mora biti Å¡tevilski, ne `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5986 tp/Texinfo/Parser.pm:5991
  #, fuzzy, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
--- 2956,2965 ----
  "%s: --footnote-style argument mora biti `separate' ali `end', ne `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5860
  #, fuzzy, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
  msgstr "%s: %s argument mora biti Å¡tevilski, ne `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5878 tp/Texinfo/Parser.pm:5883
  #, fuzzy, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
***************
*** 2975,2979 ****
  "%s: --paragraph-indent argument mora biti Å¡tevilski/`none'/`asis', ne `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5999
  #, fuzzy, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
--- 2967,2971 ----
  "%s: --paragraph-indent argument mora biti Å¡tevilski/`none'/`asis', ne `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5891
  #, fuzzy, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
***************
*** 2981,2985 ****
  "%s: --paragraph-indent argument mora biti Å¡tevilski/`none'/`asis', ne `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:6009
  #, fuzzy, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
--- 2973,2977 ----
  "%s: --paragraph-indent argument mora biti Å¡tevilski/`none'/`asis', ne `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5901
  #, fuzzy, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
***************
*** 2987,3001 ****
  "%s: --paragraph-indent argument mora biti Å¡tevilski/`none'/`asis', ne `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:6021
  #, fuzzy, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "PriÄ�akuje se @%s on ali off, namesto \"%s\""
  
! #: tp/Texinfo/Parser.pm:6031
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:6039
  #, fuzzy, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
--- 2979,2993 ----
  "%s: --paragraph-indent argument mora biti Å¡tevilski/`none'/`asis', ne `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5913
  #, fuzzy, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "PriÄ�akuje se @%s on ali off, namesto \"%s\""
  
! #: tp/Texinfo/Parser.pm:5922
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5930
  #, fuzzy, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
***************
*** 3003,3007 ****
  "%s: --footnote-style argument mora biti `separate' ali `end', ne `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:6047
  #, fuzzy, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
--- 2995,2999 ----
  "%s: --footnote-style argument mora biti `separate' ali `end', ne `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5938
  #, fuzzy, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
***************
*** 3009,3038 ****
  "%s: --footnote-style argument mora biti `separate' ali `end', ne `%s'.\n"
  
! #: tp/Texinfo/Structuring.pm:213
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:245
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:250
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:339
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:488
  #, perl-format
  msgid "@%s not empty"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:544 tp/Texinfo/Structuring.pm:1326
  #, fuzzy, perl-format
  msgid "@%s reference to nonexistent node `%s'"
--- 3001,3030 ----
  "%s: --footnote-style argument mora biti `separate' ali `end', ne `%s'.\n"
  
! #: tp/Texinfo/Structuring.pm:216
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:248
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:253
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:342
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:491
  #, perl-format
  msgid "@%s not empty"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:547 tp/Texinfo/Structuring.pm:1325
  #, fuzzy, perl-format
  msgid "@%s reference to nonexistent node `%s'"
***************
*** 3041,3080 ****
  "odsekov?)"
  
! #: tp/Texinfo/Structuring.pm:557
  #, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:662
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "nesklicevano vozliÅ¡Ä�e `%s'"
  
! #: tp/Texinfo/Structuring.pm:708
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:715
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:733
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:787
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:814
  #, fuzzy, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "nesklicevano vozliÅ¡Ä�e `%s'"
  
! #: tp/Texinfo/Structuring.pm:834
  #, fuzzy, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
--- 3033,3072 ----
  "odsekov?)"
  
! #: tp/Texinfo/Structuring.pm:558
  #, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:663
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "nesklicevano vozliÅ¡Ä�e `%s'"
  
! #: tp/Texinfo/Structuring.pm:706
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:713
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:731
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:786
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:810
  #, fuzzy, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "nesklicevano vozliÅ¡Ä�e `%s'"
  
! #: tp/Texinfo/Structuring.pm:829
  #, fuzzy, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
***************
*** 3083,3087 ****
  "Zgornji cilj"
  
! #: tp/Texinfo/Structuring.pm:842
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
--- 3075,3079 ----
  "Zgornji cilj"
  
! #: tp/Texinfo/Structuring.pm:837
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
***************
*** 3093,3097 ****
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:2070
  #, perl-format
  msgid "empty index key in @%s"
--- 3085,3089 ----
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:2067
  #, perl-format
  msgid "empty index key in @%s"
***************
*** 3584,3602 ****
  msgstr "Za veÄ� podrobnosti poskusite `%s --help'.\n"
  
! #: tp/texi2any.pl:1232
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
  
! #: tp/texi2any.pl:1255
  #, fuzzy, perl-format
  msgid "error on closing macro expand file %s: %s\n"
  msgstr "napaka med konÄ�anjem datoteke vnosa `%s'"
  
! #: tp/texi2any.pl:1261
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "%s: ni mogoÄ�e odpreti --css-file: %s"
  
! #: tp/texi2any.pl:1286
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
--- 3576,3594 ----
  msgstr "Za veÄ� podrobnosti poskusite `%s --help'.\n"
  
! #: tp/texi2any.pl:1239
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
  
! #: tp/texi2any.pl:1262
  #, fuzzy, perl-format
  msgid "error on closing macro expand file %s: %s\n"
  msgstr "napaka med konÄ�anjem datoteke vnosa `%s'"
  
! #: tp/texi2any.pl:1268
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "%s: ni mogoÄ�e odpreti --css-file: %s"
  
! #: tp/texi2any.pl:1293
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
***************
*** 3604,3618 ****
  msgstr ""
  
! #: tp/texi2any.pl:1359 tp/texi2any.pl:1435
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1382 tp/texi2any.pl:1416
  #, fuzzy, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
  msgstr "%s: prezrtje drugega notranjega izhoda povezav `%s'.\n"
  
! #: tp/texi2any.pl:1388 tp/texi2any.pl:1422
  #, fuzzy, perl-format
  msgid "%s: could not open %s for writing: %s\n"
--- 3596,3610 ----
  msgstr ""
  
! #: tp/texi2any.pl:1366 tp/texi2any.pl:1442
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1389 tp/texi2any.pl:1423
  #, fuzzy, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
  msgstr "%s: prezrtje drugega notranjega izhoda povezav `%s'.\n"
  
! #: tp/texi2any.pl:1395 tp/texi2any.pl:1429
  #, fuzzy, perl-format
  msgid "%s: could not open %s for writing: %s\n"
***************
*** 3890,3893 ****
--- 3882,3891 ----
  #~ msgstr "--*** Zastarele oznake ***"
  
+ #~ msgid "-%s---Info: %s, %d lines --%s--"
+ #~ msgstr "-%s---Info: %s, %d vrstic --%s--"
+ 
+ #~ msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
+ #~ msgstr "-%s%s-Info: (%s)%s, %d vrstic --%s--"
+ 
  #~ msgid " Subfile: %s"
  #~ msgstr " Poddatoteka: %s"
Binary files texinfo-6.1/po/sv.gmo and texinfo-6.3/po/sv.gmo differ
diff -Nrc2 texinfo-6.1/po/sv.po texinfo-6.3/po/sv.po
*** texinfo-6.1/po/sv.po	2016-02-06 11:35:55.000000000 +0000
--- texinfo-6.3/po/sv.po	2016-09-10 12:45:56.000000000 +0100
***************
*** 7,11 ****
  "Project-Id-Version: texinfo 4.11.93\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
  "PO-Revision-Date: 2008-03-09 20:35+0100\n"
  "Last-Translator: Christian Rose <menthos@menthos.com>\n"
--- 7,11 ----
  "Project-Id-Version: texinfo 4.11.93\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:45+0100\n"
  "PO-Revision-Date: 2008-03-09 20:35+0100\n"
  "Last-Translator: Christian Rose <menthos@menthos.com>\n"
***************
*** 15,18 ****
--- 15,19 ----
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
+ "X-Bugs: Report translation errors to the Language-Team address.\n"
  
  #: gnulib/lib/error.c:191
***************
*** 113,119 ****
  
  #: gnulib/lib/regcomp.c:156
! #, fuzzy
! msgid "Unmatched [ or [^"
! msgstr "Ensam }"
  
  #: gnulib/lib/regcomp.c:159
--- 114,119 ----
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [, [^, [:, [., or [="
! msgstr ""
  
  #: gnulib/lib/regcomp.c:159
***************
*** 160,164 ****
  msgstr "Ensam }"
  
! #: gnulib/lib/regcomp.c:711
  #, fuzzy
  msgid "No previous regular expression"
--- 160,164 ----
  msgstr "Ensam }"
  
! #: gnulib/lib/regcomp.c:687
  #, fuzzy
  msgid "No previous regular expression"
***************
*** 317,321 ****
  msgstr "---------- Fotnoter -----------"
  
! #: info/indices.c:123 info/indices.c:812
  #, c-format
  msgid "Finding index entries..."
--- 317,321 ----
  msgstr "---------- Fotnoter -----------"
  
! #: info/indices.c:123 info/indices.c:822
  #, c-format
  msgid "Finding index entries..."
***************
*** 326,330 ****
  msgstr "SlÃ¥ upp en strÃ¤ng i indexet fÃ¶r denna fil"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:818
  #, c-format
  msgid "No indices found."
--- 326,330 ----
  msgstr "SlÃ¥ upp en strÃ¤ng i indexet fÃ¶r denna fil"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:828
  #, c-format
  msgid "No indices found."
***************
*** 374,392 ****
  # instead and an outer if statement.
  #
! #: info/indices.c:476 info/indices.c:880
  #, fuzzy, c-format
  msgid "No index entries containing '%s'."
  msgstr "Inga %sindexposter som innehÃ¥ller \"%s\"."
  
! #: info/indices.c:583
  #, fuzzy, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "GenomsÃ¶ker index av \"%s\"..."
  
! #: info/indices.c:636
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr "GrÃ¤v i alla kÃ¤nda infofilers index efter en strÃ¤ng och bygg en meny"
  
! #: info/indices.c:644 info/indices.c:646
  #, fuzzy
  msgid "Index apropos"
--- 374,392 ----
  # instead and an outer if statement.
  #
! #: info/indices.c:476 info/indices.c:890
  #, fuzzy, c-format
  msgid "No index entries containing '%s'."
  msgstr "Inga %sindexposter som innehÃ¥ller \"%s\"."
  
! #: info/indices.c:586
  #, fuzzy, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "GenomsÃ¶ker index av \"%s\"..."
  
! #: info/indices.c:646
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr "GrÃ¤v i alla kÃ¤nda infofilers index efter en strÃ¤ng och bygg en meny"
  
! #: info/indices.c:654 info/indices.c:656
  #, fuzzy
  msgid "Index apropos"
***************
*** 401,414 ****
  # instead and an outer if statement.
  #
! #: info/indices.c:688
  #, fuzzy, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Inga %sindexposter som innehÃ¥ller \"%s\"."
  
! #: info/indices.c:797
  msgid "List all matches of a string in the index"
  msgstr ""
  
! #: info/indices.c:824 info/indices.c:826
  #, fuzzy
  msgid "Index topic"
--- 401,414 ----
  # instead and an outer if statement.
  #
! #: info/indices.c:698
  #, fuzzy, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Inga %sindexposter som innehÃ¥ller \"%s\"."
  
! #: info/indices.c:807
  msgid "List all matches of a string in the index"
  msgstr ""
  
! #: info/indices.c:834 info/indices.c:836
  #, fuzzy
  msgid "Index topic"
***************
*** 420,474 ****
  msgstr "Inga tillgÃ¤ngliga infofiler har \"%s\" i deras index."
  
! #: info/info-utils.c:892
  #, c-format
  msgid "Error converting file character encoding."
  msgstr ""
  
! #: info/info.c:222 info/session.c:2789
  #, fuzzy, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "Ingen menypost \"%s\" i noden \"%s\"."
  
! #: info/info.c:315
! #, fuzzy, c-format
! msgid "No file given for node '%s'."
! msgstr "Ingen meny i noden \"%s\"."
! 
! #: info/info.c:364 info/info.c:1133
  #, fuzzy, c-format
  msgid "Cannot find node '%s'."
  msgstr "Kan inte hitta noden \"%s\"."
  
! #: info/info.c:386
  #, c-format
  msgid "No program name given."
  msgstr ""
  
! #: info/info.c:577
  #, c-format
  msgid "invalid number: %s\n"
  msgstr ""
  
! #: info/info.c:757
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr ""
  
! #: info/info.c:764 info/infokey.c:537
  #, c-format
  msgid "%s: no such variable"
  msgstr ""
  
! #: info/info.c:770 info/infokey.c:539
  #, fuzzy, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "StÃ¤ll in vÃ¤rdet pÃ¥ en Info-variabel"
  
! #: info/info.c:782
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "Prova --help fÃ¶r mer information.\n"
  
! #: info/info.c:804 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
--- 420,469 ----
  msgstr "Inga tillgÃ¤ngliga infofiler har \"%s\" i deras index."
  
! #: info/info-utils.c:879
  #, c-format
  msgid "Error converting file character encoding."
  msgstr ""
  
! #: info/info.c:279 info/session.c:2789
  #, fuzzy, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "Ingen menypost \"%s\" i noden \"%s\"."
  
! #: info/info.c:416 info/info.c:1148
  #, fuzzy, c-format
  msgid "Cannot find node '%s'."
  msgstr "Kan inte hitta noden \"%s\"."
  
! #: info/info.c:438
  #, c-format
  msgid "No program name given."
  msgstr ""
  
! #: info/info.c:636
  #, c-format
  msgid "invalid number: %s\n"
  msgstr ""
  
! #: info/info.c:816
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr ""
  
! #: info/info.c:823 info/infokey.c:540
  #, c-format
  msgid "%s: no such variable"
  msgstr ""
  
! #: info/info.c:829 info/infokey.c:542
  #, fuzzy, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "StÃ¤ll in vÃ¤rdet pÃ¥ en Info-variabel"
  
! #: info/info.c:841
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "Prova --help fÃ¶r mer information.\n"
  
! #: info/info.c:860 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
***************
*** 489,498 ****
  "medges av gÃ¤llande lag.\n"
  
! #: info/info.c:981
  #, fuzzy, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "inga indexposter fÃ¶r \"%s\" hittades\n"
  
! #: info/info.c:1034
  #, c-format
  msgid ""
--- 484,493 ----
  "medges av gÃ¤llande lag.\n"
  
! #: info/info.c:999
  #, fuzzy, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "inga indexposter fÃ¶r \"%s\" hittades\n"
  
! #: info/info.c:1049
  #, c-format
  msgid ""
***************
*** 505,509 ****
  "LÃ¤s dokumentation i Info-format.\n"
  
! #: info/info.c:1040
  #, fuzzy
  msgid ""
--- 500,504 ----
  "LÃ¤s dokumentation i Info-format.\n"
  
! #: info/info.c:1055
  #, fuzzy
  msgid ""
***************
*** 523,527 ****
  "  -f, --file=FILNAMN           ange den Info-fil som ska besÃ¶kas."
  
! #: info/info.c:1048
  #, fuzzy
  msgid ""
--- 518,522 ----
  "  -f, --file=FILNAMN           ange den Info-fil som ska besÃ¶kas."
  
! #: info/info.c:1063
  #, fuzzy
  msgid ""
***************
*** 537,541 ****
  "  -o, --output=FILNAMN         skriv ut valda noder till FILNAMN."
  
! #: info/info.c:1054
  #, fuzzy
  msgid ""
--- 532,536 ----
  "  -o, --output=FILNAMN         skriv ut valda noder till FILNAMN."
  
! #: info/info.c:1069
  #, fuzzy
  msgid ""
***************
*** 551,559 ****
  "  -O, --show-options, --usage  gÃ¥ till noden fÃ¶r kommandoradsflaggor."
  
! #: info/info.c:1061
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr "  -b, --speech-friendly        var vÃ¤nlig mot talsyntesprogram."
  
! #: info/info.c:1065
  #, fuzzy
  msgid ""
--- 546,554 ----
  "  -O, --show-options, --usage  gÃ¥ till noden fÃ¶r kommandoradsflaggor."
  
! #: info/info.c:1076
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr "  -b, --speech-friendly        var vÃ¤nlig mot talsyntesprogram."
  
! #: info/info.c:1080
  #, fuzzy
  msgid ""
***************
*** 573,577 ****
  "  -w, --where, --location      skriv ut den fysiska platsen fÃ¶r Info-filen."
  
! #: info/info.c:1074
  #, fuzzy
  msgid ""
--- 568,572 ----
  "  -w, --where, --location      skriv ut den fysiska platsen fÃ¶r Info-filen."
  
! #: info/info.c:1089
  #, fuzzy
  msgid ""
***************
*** 590,594 ****
  "den fÃ¶rst besÃ¶kta noden."
  
! #: info/info.c:1081
  msgid ""
  "\n"
--- 585,589 ----
  "den fÃ¶rst besÃ¶kta noden."
  
! #: info/info.c:1096
  msgid ""
  "\n"
***************
*** 596,600 ****
  msgstr ""
  
! #: info/info.c:1084
  #, fuzzy
  msgid ""
--- 591,595 ----
  msgstr ""
  
! #: info/info.c:1099
  #, fuzzy
  msgid ""
***************
*** 621,625 ****
  "  info -f ./foo.info         visa filen ./foo.info, sÃ¶k inte i katalogen"
  
! #: info/info.c:1099 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
--- 616,620 ----
  "  info -f ./foo.info         visa filen ./foo.info, sÃ¶k inte i katalogen"
  
! #: info/info.c:1114 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
***************
*** 632,696 ****
  "Hemsida fÃ¶r texinfo: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1134
  #, fuzzy, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Kan inte hitta noden \"(%s)%s\"."
  
! #: info/info.c:1135
  msgid "Cannot find a window!"
  msgstr "Kan inte hitta ett fÃ¶nster!"
  
! #: info/info.c:1136
  msgid "Point doesn't appear within this window's node!"
  msgstr "Punkten finns inte inom detta fÃ¶nsters nod!"
  
! #: info/info.c:1137
  msgid "Cannot delete the last window."
  msgstr "Kan inte ta bort det sista fÃ¶nstret."
  
! #: info/info.c:1138
  msgid "No menu in this node."
  msgstr "Ingen meny i denna nod."
  
! #: info/info.c:1139
  msgid "No footnotes in this node."
  msgstr "Inga fotnoter i denna nod."
  
! #: info/info.c:1140
  msgid "No cross references in this node."
  msgstr "Inga korsreferenser i denna nod."
  
! #: info/info.c:1141
  #, fuzzy, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Ingen \"%s\"-pekare fÃ¶r denna nod."
  
! #: info/info.c:1142
  #, fuzzy, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "OkÃ¤nt Info-kommando \"%c\". Prova \"?\" fÃ¶r hjÃ¤lp."
  
! #: info/info.c:1143
  #, fuzzy, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "Terminaltypen \"%s\" Ã¤r inte tillrÃ¤ckligt smart fÃ¶r att kÃ¶ra Info."
  
! #: info/info.c:1144
  msgid "You are already at the last page of this node."
  msgstr "Du Ã¤r redan pÃ¥ sista sidan fÃ¶r denna nod."
  
! #: info/info.c:1145
  msgid "You are already at the first page of this node."
  msgstr "Du Ã¤r redan pÃ¥ fÃ¶rsta sidan fÃ¶r denna nod."
  
! #: info/info.c:1146
  msgid "Only one window."
  msgstr "Endast ett fÃ¶nster."
  
! #: info/info.c:1147
  msgid "Resulting window would be too small."
  msgstr "Resulterande fÃ¶nstret skulle bli fÃ¶r litet."
  
! #: info/info.c:1148
  msgid "Not enough room for a help window, please delete a window."
  msgstr ""
--- 627,691 ----
  "Hemsida fÃ¶r texinfo: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1149
  #, fuzzy, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Kan inte hitta noden \"(%s)%s\"."
  
! #: info/info.c:1150
  msgid "Cannot find a window!"
  msgstr "Kan inte hitta ett fÃ¶nster!"
  
! #: info/info.c:1151
  msgid "Point doesn't appear within this window's node!"
  msgstr "Punkten finns inte inom detta fÃ¶nsters nod!"
  
! #: info/info.c:1152
  msgid "Cannot delete the last window."
  msgstr "Kan inte ta bort det sista fÃ¶nstret."
  
! #: info/info.c:1153
  msgid "No menu in this node."
  msgstr "Ingen meny i denna nod."
  
! #: info/info.c:1154
  msgid "No footnotes in this node."
  msgstr "Inga fotnoter i denna nod."
  
! #: info/info.c:1155
  msgid "No cross references in this node."
  msgstr "Inga korsreferenser i denna nod."
  
! #: info/info.c:1156
  #, fuzzy, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Ingen \"%s\"-pekare fÃ¶r denna nod."
  
! #: info/info.c:1157
  #, fuzzy, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "OkÃ¤nt Info-kommando \"%c\". Prova \"?\" fÃ¶r hjÃ¤lp."
  
! #: info/info.c:1158
  #, fuzzy, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "Terminaltypen \"%s\" Ã¤r inte tillrÃ¤ckligt smart fÃ¶r att kÃ¶ra Info."
  
! #: info/info.c:1159
  msgid "You are already at the last page of this node."
  msgstr "Du Ã¤r redan pÃ¥ sista sidan fÃ¶r denna nod."
  
! #: info/info.c:1160
  msgid "You are already at the first page of this node."
  msgstr "Du Ã¤r redan pÃ¥ fÃ¶rsta sidan fÃ¶r denna nod."
  
! #: info/info.c:1161
  msgid "Only one window."
  msgstr "Endast ett fÃ¶nster."
  
! #: info/info.c:1162
  msgid "Resulting window would be too small."
  msgstr "Resulterande fÃ¶nstret skulle bli fÃ¶r litet."
  
! #: info/info.c:1163
  msgid "Not enough room for a help window, please delete a window."
  msgstr ""
***************
*** 962,996 ****
  msgstr "okÃ¤nd Ã¥tgÃ¤rd \"%s\""
  
! #: info/infokey.c:482
  #, c-format
  msgid "action name too long"
  msgstr "Ã¥tgÃ¤rdsnamnet Ã¤r fÃ¶r lÃ¥ngt"
  
! #: info/infokey.c:495
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "extra tecken fÃ¶ljer pÃ¥ Ã¥tgÃ¤rden \"%s\""
  
! #: info/infokey.c:506
  #, c-format
  msgid "missing variable name"
  msgstr "variabelnamn saknas"
  
! #: info/infokey.c:515
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "\"=\" saknas direkt efter variabelnamnet"
  
! #: info/infokey.c:522
  #, c-format
  msgid "variable name too long"
  msgstr "variabelnamnet Ã¤r fÃ¶r lÃ¥ngt"
  
! #: info/infokey.c:546
  #, c-format
  msgid "value too long"
  msgstr "vÃ¤rdet Ã¤r fÃ¶r lÃ¥ngt"
  
! #: info/infokey.c:592
  #, c-format
  msgid "\"%s\", line %u: "
--- 957,991 ----
  msgstr "okÃ¤nd Ã¥tgÃ¤rd \"%s\""
  
! #: info/infokey.c:485
  #, c-format
  msgid "action name too long"
  msgstr "Ã¥tgÃ¤rdsnamnet Ã¤r fÃ¶r lÃ¥ngt"
  
! #: info/infokey.c:498
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "extra tecken fÃ¶ljer pÃ¥ Ã¥tgÃ¤rden \"%s\""
  
! #: info/infokey.c:509
  #, c-format
  msgid "missing variable name"
  msgstr "variabelnamn saknas"
  
! #: info/infokey.c:518
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "\"=\" saknas direkt efter variabelnamnet"
  
! #: info/infokey.c:525
  #, c-format
  msgid "variable name too long"
  msgstr "variabelnamnet Ã¤r fÃ¶r lÃ¥ngt"
  
! #: info/infokey.c:549
  #, c-format
  msgid "value too long"
  msgstr "vÃ¤rdet Ã¤r fÃ¶r lÃ¥ngt"
  
! #: info/infokey.c:595
  #, c-format
  msgid "\"%s\", line %u: "
***************
*** 1325,1505 ****
  msgstr "Kan inte hitta noden som refereras av \"%s\" i \"%s\"."
  
! #: info/session.c:2864
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "LÃ¤s en lista med menyer som bÃ¶rjar med katalog, och fÃ¶lj dem"
  
! #: info/session.c:2866
  msgid "Follow menus: "
  msgstr "FÃ¶lj menyer: "
  
! #: info/session.c:2971
  msgid "Select the Next node"
  msgstr "VÃ¤lj nÃ¤sta nod"
  
! #: info/session.c:2978
  msgid "Select the Prev node"
  msgstr "VÃ¤lj fÃ¶regÃ¥ende nod"
  
! #: info/session.c:2985
  msgid "Select the Up node"
  msgstr "VÃ¤lj uppnoden"
  
! #: info/session.c:2991
  msgid "Select the last node in this file"
  msgstr "VÃ¤lj den sista noden i denna fil"
  
! #: info/session.c:3018 info/session.c:3051
  msgid "This window has no additional nodes"
  msgstr "Detta fÃ¶nster har inga ytterligare noder"
  
! #: info/session.c:3024
  msgid "Select the first node in this file"
  msgstr "VÃ¤lj den fÃ¶rsta noden i denna fil"
  
! #: info/session.c:3158
  msgid "No more nodes within this document."
  msgstr "Inga fler noder i detta dokument."
  
! #: info/session.c:3203 info/session.c:3243
  #, fuzzy
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "Inget \"Prev\" eller \"Up\" fÃ¶r denna nod inom detta dokument."
  
! #: info/session.c:3256
  msgid "Move forwards or down through node structure"
  msgstr "GÃ¥ framÃ¥t eller nedÃ¥t i nodstrukturen"
  
! #: info/session.c:3273
  msgid "Move backwards or up through node structure"
  msgstr "GÃ¥ bakÃ¥t eller upp i nodstrukturen"
  
! #: info/session.c:3296
  msgid "Read a node name and select it"
  msgstr "LÃ¤s ett nodnamn och vÃ¤lj det"
  
! #: info/session.c:3350 info/session.c:3354
  msgid "Goto node: "
  msgstr "GÃ¥ till nod: "
  
! #: info/session.c:3533
  msgid "Find the node describing program invocation"
  msgstr "Hitta den nod som beskriver start av programmet"
  
! #: info/session.c:3535
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Hitta programstartnod fÃ¶r [%s]: "
  
! #: info/session.c:3580
  msgid "Read a manpage reference and select it"
  msgstr "LÃ¤s en referens till manualsida och vÃ¤lj den"
  
! #: info/session.c:3584
  msgid "Get Manpage: "
  msgstr "HÃ¤mta manualsida: "
  
! #: info/session.c:3605
  #, fuzzy
  msgid "Select the node 'Top' in this file"
  msgstr "VÃ¤lj noden \"Top\" i denna fil"
  
! #: info/session.c:3611
  #, fuzzy
  msgid "Select the node '(dir)'"
  msgstr "VÃ¤lj noden \"(dir)\""
  
! #: info/session.c:3617
  msgid "Show full file name of node being displayed"
  msgstr ""
  
! #: info/session.c:3634
  msgid "Select the most recently selected node"
  msgstr "VÃ¤lj den senast valda noden"
  
! #: info/session.c:3639
  #, c-format
  msgid "No earlier node in history"
  msgstr ""
  
! #: info/session.c:3643
  msgid "Read the name of a file and select it"
  msgstr "LÃ¤s namnet pÃ¥ en fil och vÃ¤lj den"
  
! #: info/session.c:3647
  msgid "Find file: "
  msgstr "SÃ¶k fil: "
  
! #: info/session.c:3664
  #, fuzzy, c-format
  msgid "Cannot find '%s'."
  msgstr "Kan inte hitta \"%s\"."
  
! #: info/session.c:3713
  #, fuzzy, c-format
  msgid "Could not create output file '%s'."
  msgstr "Kunde inte skapa utdatafilen \"%s\"."
  
! #: info/session.c:3727
  #, fuzzy, c-format
  msgid "error writing to %s: %s"
  msgstr "fel vid skrivning till \"%s\""
  
! #: info/session.c:3736
  #, fuzzy, c-format
  msgid "closing %s"
  msgstr "Tar bort %s\n"
  
! #: info/session.c:3785
  #, fuzzy, c-format
  msgid "writing node %s..."
  msgstr "Skriver noden %s..."
  
! #: info/session.c:3831
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "Skicka innehÃ¥llet i denna nod i rÃ¶r till INFO_PRINT_COMMAND"
  
! #: info/session.c:3859
  #, fuzzy, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Kan inte Ã¶ppna rÃ¶r till \"%s\"."
  
! #: info/session.c:3864
  #, fuzzy, c-format
  msgid "printing node %s..."
  msgstr "Skriver ut noden %s..."
  
! #: info/session.c:3872
  #, fuzzy, c-format
  msgid "finished printing node %s"
  msgstr "Skriver ut noden %s..."
  
! #: info/session.c:3904
  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."
  
! #: info/session.c:4169
  msgid "Search continued from the end of the document."
  msgstr "SÃ¶kningen fortsatte frÃ¥n slutet av dokumentet."
  
! #: info/session.c:4174
  msgid "Search continued from the beginning of the document."
  msgstr "SÃ¶kningen fortsatte frÃ¥n bÃ¶rjan av dokumentet."
  
! #: info/session.c:4194
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "SÃ¶ker i underfilen %s..."
  
! #: info/session.c:4231
  msgid "Search failed."
  msgstr "SÃ¶kningen misslyckades."
--- 1320,1500 ----
  msgstr "Kan inte hitta noden som refereras av \"%s\" i \"%s\"."
  
! #: info/session.c:2870
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "LÃ¤s en lista med menyer som bÃ¶rjar med katalog, och fÃ¶lj dem"
  
! #: info/session.c:2872
  msgid "Follow menus: "
  msgstr "FÃ¶lj menyer: "
  
! #: info/session.c:2977
  msgid "Select the Next node"
  msgstr "VÃ¤lj nÃ¤sta nod"
  
! #: info/session.c:2984
  msgid "Select the Prev node"
  msgstr "VÃ¤lj fÃ¶regÃ¥ende nod"
  
! #: info/session.c:2991
  msgid "Select the Up node"
  msgstr "VÃ¤lj uppnoden"
  
! #: info/session.c:2997
  msgid "Select the last node in this file"
  msgstr "VÃ¤lj den sista noden i denna fil"
  
! #: info/session.c:3024 info/session.c:3057
  msgid "This window has no additional nodes"
  msgstr "Detta fÃ¶nster har inga ytterligare noder"
  
! #: info/session.c:3030
  msgid "Select the first node in this file"
  msgstr "VÃ¤lj den fÃ¶rsta noden i denna fil"
  
! #: info/session.c:3164
  msgid "No more nodes within this document."
  msgstr "Inga fler noder i detta dokument."
  
! #: info/session.c:3209 info/session.c:3249
  #, fuzzy
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "Inget \"Prev\" eller \"Up\" fÃ¶r denna nod inom detta dokument."
  
! #: info/session.c:3262
  msgid "Move forwards or down through node structure"
  msgstr "GÃ¥ framÃ¥t eller nedÃ¥t i nodstrukturen"
  
! #: info/session.c:3279
  msgid "Move backwards or up through node structure"
  msgstr "GÃ¥ bakÃ¥t eller upp i nodstrukturen"
  
! #: info/session.c:3302
  msgid "Read a node name and select it"
  msgstr "LÃ¤s ett nodnamn och vÃ¤lj det"
  
! #: info/session.c:3356 info/session.c:3360
  msgid "Goto node: "
  msgstr "GÃ¥ till nod: "
  
! #: info/session.c:3539
  msgid "Find the node describing program invocation"
  msgstr "Hitta den nod som beskriver start av programmet"
  
! #: info/session.c:3541
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Hitta programstartnod fÃ¶r [%s]: "
  
! #: info/session.c:3586
  msgid "Read a manpage reference and select it"
  msgstr "LÃ¤s en referens till manualsida och vÃ¤lj den"
  
! #: info/session.c:3590
  msgid "Get Manpage: "
  msgstr "HÃ¤mta manualsida: "
  
! #: info/session.c:3611
  #, fuzzy
  msgid "Select the node 'Top' in this file"
  msgstr "VÃ¤lj noden \"Top\" i denna fil"
  
! #: info/session.c:3617
  #, fuzzy
  msgid "Select the node '(dir)'"
  msgstr "VÃ¤lj noden \"(dir)\""
  
! #: info/session.c:3623
  msgid "Show full file name of node being displayed"
  msgstr ""
  
! #: info/session.c:3640
  msgid "Select the most recently selected node"
  msgstr "VÃ¤lj den senast valda noden"
  
! #: info/session.c:3645
  #, c-format
  msgid "No earlier node in history"
  msgstr ""
  
! #: info/session.c:3649
  msgid "Read the name of a file and select it"
  msgstr "LÃ¤s namnet pÃ¥ en fil och vÃ¤lj den"
  
! #: info/session.c:3653
  msgid "Find file: "
  msgstr "SÃ¶k fil: "
  
! #: info/session.c:3670
  #, fuzzy, c-format
  msgid "Cannot find '%s'."
  msgstr "Kan inte hitta \"%s\"."
  
! #: info/session.c:3719
  #, fuzzy, c-format
  msgid "Could not create output file '%s'."
  msgstr "Kunde inte skapa utdatafilen \"%s\"."
  
! #: info/session.c:3733
  #, fuzzy, c-format
  msgid "error writing to %s: %s"
  msgstr "fel vid skrivning till \"%s\""
  
! #: info/session.c:3742
  #, fuzzy, c-format
  msgid "closing %s"
  msgstr "Tar bort %s\n"
  
! #: info/session.c:3791
  #, fuzzy, c-format
  msgid "writing node %s..."
  msgstr "Skriver noden %s..."
  
! #: info/session.c:3837
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "Skicka innehÃ¥llet i denna nod i rÃ¶r till INFO_PRINT_COMMAND"
  
! #: info/session.c:3865
  #, fuzzy, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Kan inte Ã¶ppna rÃ¶r till \"%s\"."
  
! #: info/session.c:3870
  #, fuzzy, c-format
  msgid "printing node %s..."
  msgstr "Skriver ut noden %s..."
  
! #: info/session.c:3878
  #, fuzzy, c-format
  msgid "finished printing node %s"
  msgstr "Skriver ut noden %s..."
  
! #: info/session.c:3910
  msgid "Toggle the usage of regular expressions in searches"
  msgstr "VÃ¤xla anvÃ¤ndningen av reguljÃ¤ra uttryck i sÃ¶kningar"
  
! #: info/session.c:3914
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr "AnvÃ¤nder reguljÃ¤ra uttryck i sÃ¶kningar."
  
! #: info/session.c:3915
  #, c-format
  msgid "Using literal strings for searches."
  msgstr "AnvÃ¤nder ordagranna strÃ¤ngar i sÃ¶kningar."
  
! #: info/session.c:4175
  msgid "Search continued from the end of the document."
  msgstr "SÃ¶kningen fortsatte frÃ¥n slutet av dokumentet."
  
! #: info/session.c:4180
  msgid "Search continued from the beginning of the document."
  msgstr "SÃ¶kningen fortsatte frÃ¥n bÃ¶rjan av dokumentet."
  
! #: info/session.c:4200
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "SÃ¶ker i underfilen %s..."
  
! #: info/session.c:4237
  msgid "Search failed."
  msgstr "SÃ¶kningen misslyckades."
***************
*** 1524,1545 ****
  # those will be translatable, while the current design isn't.
  #
! #: info/session.c:4248
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Regexp search"
  msgstr "SÃ¶kning med reguljÃ¤ra uttryck"
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Search"
  msgstr "SÃ¶k"
  
! #: info/session.c:4250 info/session.c:4256
  msgid " case-sensitively"
  msgstr " skiljandes pÃ¥ VERSALER/gemener"
  
! #: info/session.c:4251 info/session.c:4257
  msgid " backward"
  msgstr " baklÃ¤nges"
--- 1519,1540 ----
  # those will be translatable, while the current design isn't.
  #
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Regexp search"
  msgstr "SÃ¶kning med reguljÃ¤ra uttryck"
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Search"
  msgstr "SÃ¶k"
  
! #: info/session.c:4256 info/session.c:4262
  msgid " case-sensitively"
  msgstr " skiljandes pÃ¥ VERSALER/gemener"
  
! #: info/session.c:4257 info/session.c:4263
  msgid " backward"
  msgstr " baklÃ¤nges"
***************
*** 1564,1705 ****
  # those will be translatable, while the current design isn't.
  #
! #: info/session.c:4254
  #, fuzzy, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4274
  msgid "Search string too short"
  msgstr ""
  
! #: info/session.c:4467
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4491 info/session.c:4601
  #, c-format
  msgid "No more matches."
  msgstr ""
  
! #: info/session.c:4628
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4649
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4653 info/session.c:4665
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4661
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4674
  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:4679
  msgid "Read a string and search for it"
  msgstr "LÃ¤s en strÃ¤ng och sÃ¶k efter den"
  
! #: info/session.c:4685
  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:4693
  msgid "Repeat last search in the same direction"
  msgstr "Upprepa den senaste sÃ¶kningen i samma riktning"
  
! #: info/session.c:4701 info/session.c:4746
  msgid "No previous search string"
  msgstr "Ingen tidigare sÃ¶kstrÃ¤ng"
  
! #: info/session.c:4738
  msgid "Repeat last search in the reverse direction"
  msgstr "Upprepa den senaste sÃ¶kningen i omvÃ¤nd riktning"
  
! #: info/session.c:4785
  msgid "Clear displayed search matches"
  msgstr ""
  
! #: info/session.c:4802 info/session.c:4808
  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:4928
  msgid "Regexp I-search backward: "
  msgstr "I-sÃ¶k med reguljÃ¤rt uttryck baklÃ¤nges: "
  
! #: info/session.c:4929
  msgid "I-search backward: "
  msgstr "I-sÃ¶k baklÃ¤nges: "
  
! #: info/session.c:4931
  msgid "Regexp I-search: "
  msgstr "I-sÃ¶k med reguljÃ¤rt uttryck: "
  
! #: info/session.c:4932
  msgid "I-search: "
  msgstr "I-sÃ¶k: "
  
! #: info/session.c:4957 info/session.c:4960
  msgid "Failing "
  msgstr "Misslyckas "
  
! #: info/session.c:5326
  msgid "Cancel current operation"
  msgstr "Avbryt pÃ¥gÃ¥ende Ã¥tgÃ¤rd"
  
! #: info/session.c:5333
  msgid "Quit"
  msgstr "Avsluta"
  
! #: info/session.c:5338
  #, fuzzy
  msgid "Display version of Info being run"
  msgstr "visa versionsinformation och avsluta"
  
! #: info/session.c:5340
  #, c-format
  msgid "GNU Info version %s"
  msgstr ""
  
! #: info/session.c:5345
  msgid "Redraw the display"
  msgstr "Rita om displayen"
  
! #: info/session.c:5382
  msgid "Quit using Info"
  msgstr "Avsluta anvÃ¤ndandet av Info"
  
! #: info/session.c:5398
  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:5409
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "OkÃ¤nt kommando (%s)."
  
! #: info/session.c:5412
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\" Ã¤r ogiltigt"
  
! #: info/session.c:5413
  #, fuzzy, c-format
  msgid "'%s' is invalid"
  msgstr "\"%s\" Ã¤r ogiltigt"
  
! #: info/session.c:5731
  msgid "Add this digit to the current numeric argument"
  msgstr "LÃ¤gg till denna siffra till det aktuella numeriska argumentet"
  
! #: info/session.c:5738
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "BÃ¶rja (eller multiplicera med 4) det numeriska argumentet"
--- 1559,1700 ----
  # those will be translatable, while the current design isn't.
  #
! #: info/session.c:4260
  #, fuzzy, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4280
  msgid "Search string too short"
  msgstr ""
  
! #: info/session.c:4473
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4497 info/session.c:4607
  #, c-format
  msgid "No more matches."
  msgstr ""
  
! #: info/session.c:4634
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4655
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4659 info/session.c:4671
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4667
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4680
  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:4685
  msgid "Read a string and search for it"
  msgstr "LÃ¤s en strÃ¤ng och sÃ¶k efter den"
  
! #: info/session.c:4691
  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:4699
  msgid "Repeat last search in the same direction"
  msgstr "Upprepa den senaste sÃ¶kningen i samma riktning"
  
! #: info/session.c:4707 info/session.c:4752
  msgid "No previous search string"
  msgstr "Ingen tidigare sÃ¶kstrÃ¤ng"
  
! #: info/session.c:4744
  msgid "Repeat last search in the reverse direction"
  msgstr "Upprepa den senaste sÃ¶kningen i omvÃ¤nd riktning"
  
! #: info/session.c:4791
  msgid "Clear displayed search matches"
  msgstr ""
  
! #: info/session.c:4808 info/session.c:4814
  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:4934
  msgid "Regexp I-search backward: "
  msgstr "I-sÃ¶k med reguljÃ¤rt uttryck baklÃ¤nges: "
  
! #: info/session.c:4935
  msgid "I-search backward: "
  msgstr "I-sÃ¶k baklÃ¤nges: "
  
! #: info/session.c:4937
  msgid "Regexp I-search: "
  msgstr "I-sÃ¶k med reguljÃ¤rt uttryck: "
  
! #: info/session.c:4938
  msgid "I-search: "
  msgstr "I-sÃ¶k: "
  
! #: info/session.c:4963 info/session.c:4966
  msgid "Failing "
  msgstr "Misslyckas "
  
! #: info/session.c:5332
  msgid "Cancel current operation"
  msgstr "Avbryt pÃ¥gÃ¥ende Ã¥tgÃ¤rd"
  
! #: info/session.c:5339
  msgid "Quit"
  msgstr "Avsluta"
  
! #: info/session.c:5344
  #, fuzzy
  msgid "Display version of Info being run"
  msgstr "visa versionsinformation och avsluta"
  
! #: info/session.c:5346
  #, c-format
  msgid "GNU Info version %s"
  msgstr ""
  
! #: info/session.c:5351
  msgid "Redraw the display"
  msgstr "Rita om displayen"
  
! #: info/session.c:5388
  msgid "Quit using Info"
  msgstr "Avsluta anvÃ¤ndandet av Info"
  
! #: info/session.c:5404
  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:5415
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "OkÃ¤nt kommando (%s)."
  
! #: info/session.c:5418
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\" Ã¤r ogiltigt"
  
! #: info/session.c:5419
  #, fuzzy, c-format
  msgid "'%s' is invalid"
  msgstr "\"%s\" Ã¤r ogiltigt"
  
! #: info/session.c:5737
  msgid "Add this digit to the current numeric argument"
  msgstr "LÃ¤gg till denna siffra till det aktuella numeriska argumentet"
  
! #: info/session.c:5744
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "BÃ¶rja (eller multiplicera med 4) det numeriska argumentet"
***************
*** 1840,1857 ****
  msgstr "StÃ¤ll in %s till vÃ¤rdet (%s): "
  
! #: info/window.c:959
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), rader ----, "
  
- #: info/window.c:966
- #, fuzzy, c-format
- msgid "-%s---Info: %s, %ld lines --%s--"
- msgstr "-%s---Info: %s, %d rader --%s--"
- 
- #: info/window.c:970
- #, fuzzy, c-format
- msgid "-%s---Info: (%s)%s, %ld lines --%s--"
- msgstr "-%s%s-Info: (%s)%s, %d rader --%s--"
- 
  #: install-info/install-info.c:292
  #, c-format
--- 1835,1842 ----
  msgstr "StÃ¤ll in %s till vÃ¤rdet (%s): "
  
! #: info/window.c:909
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), rader ----, "
  
  #: install-info/install-info.c:292
  #, c-format
***************
*** 2046,2050 ****
  "\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"
--- 2031,2035 ----
  "\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"
***************
*** 2136,2254 ****
  msgstr "inga poster hittades fÃ¶r \"%s\"; ingenting togs bort"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:855
! #: tp/Texinfo/Convert/Converter.pm:893 tp/Texinfo/Convert/Converter.pm:1204
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6504
! #: tp/Texinfo/Convert/HTML.pm:6528 tp/Texinfo/Convert/HTML.pm:6905
! #: tp/Texinfo/Convert/HTML.pm:6963 tp/Texinfo/Convert/HTML.pm:7041
! #: tp/Texinfo/Convert/HTML.pm:7118 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:546
! #: tp/Texinfo/Convert/TexinfoXML.pm:457
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "%s: kunde inte Ã¶ppna --css-fil: %s"
  
! #: tp/Texinfo/Common.pm:881
  msgid "recursion is always allowed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:882
  #, fuzzy
  msgid "arguments are quoted by default"
  msgstr "@quote-arg Ã¤r fÃ¶rÃ¥ldrat; argument Ã¤r citerade som standard"
  
! #: tp/Texinfo/Common.pm:1105
  #, fuzzy, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s Ã¤r inte en giltig landskod enligt ISO 639"
  
! #: tp/Texinfo/Common.pm:1110
  #, fuzzy, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s Ã¤r inte en giltig landskod enligt ISO 639"
  
! #: tp/Texinfo/Common.pm:1128
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1151
  #, fuzzy, perl-format
  msgid "could not read %s: %s"
  msgstr "%s: kunde inte Ã¶ppna --css-fil: %s"
  
! #: tp/Texinfo/Common.pm:1170
  #, fuzzy, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "fel vid stÃ¤ngning av utdatafilen \"%s\""
  
! #: tp/Texinfo/Common.pm:1176 tp/Texinfo/Parser.pm:3353
  #, fuzzy, perl-format
  msgid "@%s: could not find %s"
  msgstr "%s: kunde inte Ã¶ppna --css-fil: %s"
  
! #: tp/Texinfo/Common.pm:1520
! #, fuzzy, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr "%s: kunde inte Ã¶ppna --css-fil: %s"
! 
! #: tp/Texinfo/Common.pm:1548
! #, fuzzy
! msgid "missing type"
! msgstr "Ã¥tgÃ¤rdsnamn saknas"
! 
! #: tp/Texinfo/Common.pm:1551
! #, fuzzy, perl-format
! msgid "unrecognized type: %s"
! msgstr "%s: okÃ¤nd flagga \"--%s\"\n"
! 
! #: tp/Texinfo/Common.pm:1568
! #, fuzzy, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr "fel vid stÃ¤ngning av utdatafilen \"%s\""
! 
! #: tp/Texinfo/Common.pm:1603
  msgid "no node to be renamed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1614
  msgid "nodes without a new name at the end of file"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1624 tp/Texinfo/Parser.pm:926
  #, fuzzy, perl-format
  msgid "could not open %s: %s"
  msgstr "%s: kunde inte Ã¶ppna --css-fil: %s"
  
! #: tp/Texinfo/Common.pm:2144
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:395 tp/Texinfo/Convert/Converter.pm:414
  #, fuzzy, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "StÃ¤ll in variabel: "
  
! #: tp/Texinfo/Convert/Converter.pm:794
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:876 tp/Texinfo/Convert/Converter.pm:909
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:6931
! #: tp/Texinfo/Convert/HTML.pm:6989 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:476 tp/Texinfo/Parser.pm:2035
  #, fuzzy, perl-format
  msgid "error on closing %s: %s"
  msgstr "fel vid stÃ¤ngning av utdatafilen \"%s\""
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, fuzzy, perl-format
  msgid "could not create directories `%s' or `%s': %s"
  msgstr "Kan inte skapa katalogen \"%s\": %s"
  
! #: tp/Texinfo/Convert/Converter.pm:995
  #, fuzzy, perl-format
  msgid "could not create directory `%s': %s"
--- 2121,2230 ----
  msgstr "inga poster hittades fÃ¶r \"%s\"; ingenting togs bort"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:847
! #: tp/Texinfo/Convert/Converter.pm:885 tp/Texinfo/Convert/Converter.pm:1196
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6573
! #: tp/Texinfo/Convert/HTML.pm:6597 tp/Texinfo/Convert/HTML.pm:6978
! #: tp/Texinfo/Convert/HTML.pm:7037 tp/Texinfo/Convert/HTML.pm:7115
! #: tp/Texinfo/Convert/HTML.pm:7192 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:547
! #: tp/Texinfo/Convert/TexinfoXML.pm:458
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "%s: kunde inte Ã¶ppna --css-fil: %s"
  
! #: tp/Texinfo/Common.pm:862
  msgid "recursion is always allowed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:863
  #, fuzzy
  msgid "arguments are quoted by default"
  msgstr "@quote-arg Ã¤r fÃ¶rÃ¥ldrat; argument Ã¤r citerade som standard"
  
! #: tp/Texinfo/Common.pm:866
! msgid ""
! "move your @contents command if you want the contents after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:869
! msgid ""
! "move your @shortcontents and @contents commands if you want the contents "
! "after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:1093
  #, fuzzy, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s Ã¤r inte en giltig landskod enligt ISO 639"
  
! #: tp/Texinfo/Common.pm:1098
  #, fuzzy, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s Ã¤r inte en giltig landskod enligt ISO 639"
  
! #: tp/Texinfo/Common.pm:1116
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1139
  #, fuzzy, perl-format
  msgid "could not read %s: %s"
  msgstr "%s: kunde inte Ã¶ppna --css-fil: %s"
  
! #: tp/Texinfo/Common.pm:1158
  #, fuzzy, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "fel vid stÃ¤ngning av utdatafilen \"%s\""
  
! #: tp/Texinfo/Common.pm:1164 tp/Texinfo/Parser.pm:3193
  #, fuzzy, perl-format
  msgid "@%s: could not find %s"
  msgstr "%s: kunde inte Ã¶ppna --css-fil: %s"
  
! #: tp/Texinfo/Common.pm:1637
  msgid "no node to be renamed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1648
  msgid "nodes without a new name at the end of file"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1658 tp/Texinfo/Parser.pm:899
  #, fuzzy, perl-format
  msgid "could not open %s: %s"
  msgstr "%s: kunde inte Ã¶ppna --css-fil: %s"
  
! #: tp/Texinfo/Common.pm:2178
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:387 tp/Texinfo/Convert/Converter.pm:406
  #, fuzzy, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "StÃ¤ll in variabel: "
  
! #: tp/Texinfo/Convert/Converter.pm:786
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:868 tp/Texinfo/Convert/Converter.pm:901
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:7004
! #: tp/Texinfo/Convert/HTML.pm:7063 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:477 tp/Texinfo/Parser.pm:1996
  #, fuzzy, perl-format
  msgid "error on closing %s: %s"
  msgstr "fel vid stÃ¤ngning av utdatafilen \"%s\""
  
! #: tp/Texinfo/Convert/Converter.pm:979
  #, fuzzy, perl-format
  msgid "could not create directories `%s' or `%s': %s"
  msgstr "Kan inte skapa katalogen \"%s\": %s"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, fuzzy, perl-format
  msgid "could not create directory `%s': %s"
***************
*** 2260,2360 ****
  msgstr "@image-filen \"%s\" Ã¤r olÃ¤slig: %s"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5388
  #, fuzzy
  msgid "no argument specified for @U"
  msgstr "Inget nodnamn angivet fÃ¶r kommandot \"%c%s\""
  
! #: tp/Texinfo/Convert/HTML.pm:1683
  #, fuzzy, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
  msgstr "@image-filen \"%s\" (fÃ¶r HTML) Ã¤r olÃ¤slig: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:2371
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4888
  msgid "string not closed in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4890
  #, fuzzy
  msgid "--css-include ended in comment"
  msgstr "%s:%d: --css-fil slutade med kommentar"
  
! #: tp/Texinfo/Convert/HTML.pm:4892
  msgid "@import not finished in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4918
  #, perl-format
  msgid "CSS file %s not found"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4924
  #, fuzzy, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "%s: kunde inte Ã¶ppna --css-fil: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:4934
  #, fuzzy, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "fel vid stÃ¤ngning av utdatafilen \"%s\""
  
! #: tp/Texinfo/Convert/HTML.pm:5801 tp/Texinfo/Convert/HTML.pm:5805
  #, fuzzy, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "inga indexposter fÃ¶r \"%s\" hittades\n"
  
! #: tp/Texinfo/Convert/HTML.pm:6499
  #, fuzzy, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "fel vid stÃ¤ngning av utdatafilen \"%s\""
  
! #: tp/Texinfo/Convert/HTML.pm:6523
  #, fuzzy, perl-format
  msgid "error on closing TOC frame file %s: %s"
  msgstr "fel vid stÃ¤ngning av utdatafilen \"%s\""
  
! #: tp/Texinfo/Convert/HTML.pm:6638
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6839
  msgid "must specify a title with a title command or @top"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7048
  #, fuzzy, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr "fel vid stÃ¤ngning av utdatafilen \"%s\""
  
! #: tp/Texinfo/Convert/HTML.pm:7073
  #, fuzzy, perl-format
  msgid "old name for `%s' is a node of the document"
  msgstr "Inget \"Prev\" eller \"Up\" fÃ¶r denna nod inom detta dokument."
  
! #: tp/Texinfo/Convert/HTML.pm:7079
  #, fuzzy, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "orefererad nod \"%s\""
  
! #: tp/Texinfo/Convert/HTML.pm:7093
  #, perl-format
  msgid "target node (new name for `%s') not in document: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7125
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7163
  msgid "empty node name"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7165 tp/Texinfo/Parser.pm:3697
  #, perl-format
  msgid "syntax for an external node used for `%s'"
--- 2236,2356 ----
  msgstr "@image-filen \"%s\" Ã¤r olÃ¤slig: %s"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5225
  #, fuzzy
  msgid "no argument specified for @U"
  msgstr "Inget nodnamn angivet fÃ¶r kommandot \"%c%s\""
  
! #: tp/Texinfo/Convert/HTML.pm:1715
  #, fuzzy, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
  msgstr "@image-filen \"%s\" (fÃ¶r HTML) Ã¤r olÃ¤slig: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:2399
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4629
! #, fuzzy, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr "%s: kunde inte Ã¶ppna --css-fil: %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4657
! #, fuzzy
! msgid "missing type"
! msgstr "Ã¥tgÃ¤rdsnamn saknas"
! 
! #: tp/Texinfo/Convert/HTML.pm:4660
! #, fuzzy, perl-format
! msgid "unrecognized type: %s"
! msgstr "%s: okÃ¤nd flagga \"--%s\"\n"
! 
! #: tp/Texinfo/Convert/HTML.pm:4677
! #, fuzzy, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr "fel vid stÃ¤ngning av utdatafilen \"%s\""
! 
! #: tp/Texinfo/Convert/HTML.pm:4962
  msgid "string not closed in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4964
  #, fuzzy
  msgid "--css-include ended in comment"
  msgstr "%s:%d: --css-fil slutade med kommentar"
  
! #: tp/Texinfo/Convert/HTML.pm:4966
  msgid "@import not finished in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4992
  #, perl-format
  msgid "CSS file %s not found"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4998
  #, fuzzy, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "%s: kunde inte Ã¶ppna --css-fil: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5008
  #, fuzzy, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "fel vid stÃ¤ngning av utdatafilen \"%s\""
  
! #: tp/Texinfo/Convert/HTML.pm:5870 tp/Texinfo/Convert/HTML.pm:5874
  #, fuzzy, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "inga indexposter fÃ¶r \"%s\" hittades\n"
  
! #: tp/Texinfo/Convert/HTML.pm:6568
  #, fuzzy, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "fel vid stÃ¤ngning av utdatafilen \"%s\""
  
! #: tp/Texinfo/Convert/HTML.pm:6592
  #, fuzzy, perl-format
  msgid "error on closing TOC frame file %s: %s"
  msgstr "fel vid stÃ¤ngning av utdatafilen \"%s\""
  
! #: tp/Texinfo/Convert/HTML.pm:6707
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6912
  msgid "must specify a title with a title command or @top"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7122
  #, fuzzy, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr "fel vid stÃ¤ngning av utdatafilen \"%s\""
  
! #: tp/Texinfo/Convert/HTML.pm:7147
  #, fuzzy, perl-format
  msgid "old name for `%s' is a node of the document"
  msgstr "Inget \"Prev\" eller \"Up\" fÃ¶r denna nod inom detta dokument."
  
! #: tp/Texinfo/Convert/HTML.pm:7153
  #, fuzzy, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "orefererad nod \"%s\""
  
! #: tp/Texinfo/Convert/HTML.pm:7167
  #, perl-format
  msgid "target node (new name for `%s') not in document: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7199
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7237
  msgid "empty node name"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7239 tp/Texinfo/Parser.pm:3542
  #, perl-format
  msgid "syntax for an external node used for `%s'"
***************
*** 2390,2414 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1334
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1381 tp/Texinfo/Parser.pm:2722
  #, fuzzy, perl-format
  msgid "entry for index `%s' outside of any node"
  msgstr "Posten fÃ¶r index \"%s\" Ã¤r utanfÃ¶r alla noder"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1495
  #, fuzzy, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr "fel vid stÃ¤ngning av utdatafilen \"%s\""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1500
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "@image-filen \"%s\" Ã¤r olÃ¤slig: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1523
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
--- 2386,2410 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1335
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1382 tp/Texinfo/Parser.pm:2568
  #, fuzzy, perl-format
  msgid "entry for index `%s' outside of any node"
  msgstr "Posten fÃ¶r index \"%s\" Ã¤r utanfÃ¶r alla noder"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1496
  #, fuzzy, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr "fel vid stÃ¤ngning av utdatafilen \"%s\""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1501
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "@image-filen \"%s\" Ã¤r olÃ¤slig: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1524
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
***************
*** 2417,2421 ****
  # Ã„r det kombinationen "@strong{Note:.." eller bara @strong{} rent allmÃ¤nt som
  # orsakar problem?
! #: tp/Texinfo/Convert/Plaintext.pm:1931
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
--- 2413,2417 ----
  # Ã„r det kombinationen "@strong{Note:.." eller bara @strong{} rent allmÃ¤nt som
  # orsakar problem?
! #: tp/Texinfo/Convert/Plaintext.pm:1932
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
***************
*** 2425,2429 ****
  "undvika detta"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2161
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
--- 2421,2425 ----
  "undvika detta"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2162
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
***************
*** 2438,2752 ****
  # instead and an outer if statement.
  #
! #: tp/Texinfo/Convert/Plaintext.pm:2193
  #, fuzzy, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "Inga %sindexposter som innehÃ¥ller \"%s\"."
  
! #: tp/Texinfo/Convert/Plaintext.pm:2226
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2272
  #, fuzzy, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "\".\" eller \",\" mÃ¥ste fÃ¶lja pÃ¥ @%s, inte \"%c\""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2275
  #, fuzzy
  msgid "`.' or `,' must follow @xref"
  msgstr "\".\" eller \",\" mÃ¥ste fÃ¶lja pÃ¥ @%s, inte \"%c\""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3118
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3129
  msgid "menu entry node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3145
  msgid "menu entry name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:910
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1160 tp/Texinfo/Structuring.pm:594
  #, perl-format
  msgid "multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1194
  #, perl-format
! msgid "bad syntax for @%s argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1210
  #, perl-format
! msgid "bad or empty @%s formal argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1219 tp/Texinfo/Parser.pm:4856
! #: tp/Texinfo/Parser.pm:4882 tp/Texinfo/Parser.pm:5671
! #: tp/Texinfo/Parser.pm:5687 tp/Texinfo/Parser.pm:5702
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s krÃ¤ver ett namn"
  
! #: tp/Texinfo/Parser.pm:1223 tp/Texinfo/Parser.pm:4859
! #: tp/Texinfo/Parser.pm:4885 tp/Texinfo/Parser.pm:5674
! #: tp/Texinfo/Parser.pm:5690 tp/Texinfo/Parser.pm:5705
  #, fuzzy, perl-format
  msgid "bad name for @%s"
  msgstr "Felaktigt argument till @%s"
  
! #: tp/Texinfo/Parser.pm:1341
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1345
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1350
! #, perl-format
! msgid "%c%s missing close brace"
  msgstr "%c%s saknar avslutande klammer"
  
! #: tp/Texinfo/Parser.pm:1354
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1476
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1544
  msgid "@itemx must follow @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1712
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1743
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "\"@end\" fÃ¶rvÃ¤ntade \"%s\", men sÃ¥g \"%s\""
  
! #: tp/Texinfo/Parser.pm:1746
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1750
  #, fuzzy, perl-format
  msgid "no matching `%cend %s'"
  msgstr "Inget matchande \"%cend %s\""
  
! #: tp/Texinfo/Parser.pm:1776 tp/Texinfo/Parser.pm:5204
! #: tp/Texinfo/Parser.pm:5470
  #, fuzzy, perl-format
  msgid "misplaced %c"
  msgstr "Felplacerat %c"
  
! #: tp/Texinfo/Parser.pm:1874 tp/Texinfo/Parser.pm:3312
  #, fuzzy, perl-format
  msgid "unmatched `%c%s'"
  msgstr "Ensamt \"%c%s\""
  
! #: tp/Texinfo/Parser.pm:2110
  #, fuzzy, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "Makrot \"%s\" anropades pÃ¥ rad %d med fÃ¶r mÃ¥nga argument"
  
! #: tp/Texinfo/Parser.pm:2132
  #, fuzzy, perl-format
! msgid "@%s missing close brace"
  msgstr "%c%s saknar avslutande klammer"
  
! #: tp/Texinfo/Parser.pm:2140
  #, fuzzy, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr "Makrot \"%s\" anropades pÃ¥ rad %d med fÃ¶r mÃ¥nga argument"
  
! #: tp/Texinfo/Parser.pm:2175
  #, fuzzy, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
  msgstr "\\ i makroutÃ¶kning fÃ¶ljdes av \"%s\" istÃ¤llet fÃ¶r parameternamn"
  
! #: tp/Texinfo/Parser.pm:2650
  #, fuzzy, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "makrot \"%s\" Ã¤r redan definierat"
  
! #: tp/Texinfo/Parser.pm:2655
  #, fuzzy, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "hÃ¤r Ã¤r den tidigare definitionen av \"%s\""
  
! #: tp/Texinfo/Parser.pm:3016
  #, fuzzy, perl-format
  msgid "missing name for @%s"
  msgstr "Ã¥tgÃ¤rdsnamn saknas"
  
! #: tp/Texinfo/Parser.pm:3021
  #, perl-format
  msgid "missing category for @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3073
  #, fuzzy, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "Felaktigt argument till @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3089
  #, fuzzy
  msgid "empty multitable"
  msgstr "%s: tom fil"
  
! #: tp/Texinfo/Parser.pm:3145 tp/Texinfo/Parser.pm:5784
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s"
  msgstr "Felaktigt argument till @%s"
  
! #: tp/Texinfo/Parser.pm:3151 tp/Texinfo/Parser.pm:5806
! #: tp/Texinfo/Parser.pm:5818
  #, fuzzy, perl-format
  msgid "bad argument to @%s"
  msgstr "Felaktigt argument till @%s"
  
! #: tp/Texinfo/Parser.pm:3162
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s krÃ¤ver ett argument: formateraren fÃ¶r %citem"
  
! #: tp/Texinfo/Parser.pm:3167
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3202
  #, fuzzy, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "%s: flaggan \"--%s\" tillÃ¥ter inget argument\n"
  
! #: tp/Texinfo/Parser.pm:3290 tp/Texinfo/Parser.pm:3429
! #: tp/Texinfo/Parser.pm:5777
  #, fuzzy, perl-format
  msgid "@%s missing argument"
  msgstr "%s: filargument saknas.\n"
  
! #: tp/Texinfo/Parser.pm:3302
  #, fuzzy, perl-format
  msgid "unknown @end %s"
  msgstr "OkÃ¤nt index \"%s\""
  
! #: tp/Texinfo/Parser.pm:3324 tp/Texinfo/Parser.pm:3943
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "Felaktigt argument till @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3329 tp/Texinfo/Parser.pm:5861
! #: tp/Texinfo/Parser.pm:5906 tp/Texinfo/Parser.pm:5935
! #: tp/Texinfo/Parser.pm:5976 tp/Texinfo/Parser.pm:6055
  #, fuzzy, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "Felaktigt argument till @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3348
  #, fuzzy, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "%s: kunde inte Ã¶ppna --css-fil: %s"
  
! #: tp/Texinfo/Parser.pm:3360
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3369
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "okÃ¤nt kodningsnamn \"%s\""
  
! #: tp/Texinfo/Parser.pm:3516
  #, perl-format
  msgid "@%s after the first element"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3523
  #, fuzzy, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s Ã¤r inte meningsfullt utanfÃ¶r \"@titlepage\"-omgivning"
  
! #: tp/Texinfo/Parser.pm:3563
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3575
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3677
  #, fuzzy, perl-format
  msgid "empty argument in @%s"
  msgstr "Felaktigt argument till @%s"
  
! #: tp/Texinfo/Parser.pm:3681
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3724
  #, fuzzy, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "Ingen meny i noden \"%s\"."
  
! #: tp/Texinfo/Parser.pm:3732
  msgid "empty node name in menu entry"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3805
  #, fuzzy, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "%s: kunde inte Ã¶ppna --css-fil: %s"
  
! #: tp/Texinfo/Parser.pm:3937
! #, perl-format
! msgid "@end %s should only appear at a line beginning"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:3960
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "makrot \"%s\" Ã¤r redan definierat"
  
! #: tp/Texinfo/Parser.pm:3963
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "hÃ¤r Ã¤r den tidigare definitionen av \"%s\""
  
! #: tp/Texinfo/Parser.pm:3968
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4017
  #, perl-format
  msgid "@%s without associated character"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4087
  #, perl-format
  msgid ""
--- 2434,2749 ----
  # instead and an outer if statement.
  #
! #: tp/Texinfo/Convert/Plaintext.pm:2194
  #, fuzzy, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "Inga %sindexposter som innehÃ¥ller \"%s\"."
  
! #: tp/Texinfo/Convert/Plaintext.pm:2227
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2273
  #, fuzzy, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "\".\" eller \",\" mÃ¥ste fÃ¶lja pÃ¥ @%s, inte \"%c\""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2276
  #, fuzzy
  msgid "`.' or `,' must follow @xref"
  msgstr "\".\" eller \",\" mÃ¥ste fÃ¶lja pÃ¥ @%s, inte \"%c\""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3086
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3097
  msgid "menu entry node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3113
  msgid "menu entry name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:883
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1125 tp/Texinfo/Structuring.pm:595
  #, perl-format
  msgid "multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1166
  #, perl-format
! msgid "bad or empty @%s formal argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1176
  #, perl-format
! msgid "bad syntax for @%s argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1183 tp/Texinfo/Parser.pm:4707
! #: tp/Texinfo/Parser.pm:4733 tp/Texinfo/Parser.pm:5565
! #: tp/Texinfo/Parser.pm:5578 tp/Texinfo/Parser.pm:5592
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s krÃ¤ver ett namn"
  
! #: tp/Texinfo/Parser.pm:1187 tp/Texinfo/Parser.pm:4710
! #: tp/Texinfo/Parser.pm:4736 tp/Texinfo/Parser.pm:5568
! #: tp/Texinfo/Parser.pm:5581 tp/Texinfo/Parser.pm:5595
  #, fuzzy, perl-format
  msgid "bad name for @%s"
  msgstr "Felaktigt argument till @%s"
  
! #: tp/Texinfo/Parser.pm:1305
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1309
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1314
! #, fuzzy, perl-format
! msgid "%c%s missing closing brace"
  msgstr "%c%s saknar avslutande klammer"
  
! #: tp/Texinfo/Parser.pm:1318
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1440
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1508
  msgid "@itemx must follow @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1676
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1707
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "\"@end\" fÃ¶rvÃ¤ntade \"%s\", men sÃ¥g \"%s\""
  
! #: tp/Texinfo/Parser.pm:1710
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1714
  #, fuzzy, perl-format
  msgid "no matching `%cend %s'"
  msgstr "Inget matchande \"%cend %s\""
  
! #: tp/Texinfo/Parser.pm:1738 tp/Texinfo/Parser.pm:5070
! #: tp/Texinfo/Parser.pm:5308
  #, fuzzy, perl-format
  msgid "misplaced %c"
  msgstr "Felplacerat %c"
  
! #: tp/Texinfo/Parser.pm:1835 tp/Texinfo/Parser.pm:3148
  #, fuzzy, perl-format
  msgid "unmatched `%c%s'"
  msgstr "Ensamt \"%c%s\""
  
! #: tp/Texinfo/Parser.pm:2072
  #, fuzzy, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "Makrot \"%s\" anropades pÃ¥ rad %d med fÃ¶r mÃ¥nga argument"
  
! #: tp/Texinfo/Parser.pm:2094
  #, fuzzy, perl-format
! msgid "@%s missing closing brace"
  msgstr "%c%s saknar avslutande klammer"
  
! #: tp/Texinfo/Parser.pm:2102
  #, fuzzy, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr "Makrot \"%s\" anropades pÃ¥ rad %d med fÃ¶r mÃ¥nga argument"
  
! #: tp/Texinfo/Parser.pm:2138
  #, fuzzy, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
  msgstr "\\ i makroutÃ¶kning fÃ¶ljdes av \"%s\" istÃ¤llet fÃ¶r parameternamn"
  
! #: tp/Texinfo/Parser.pm:2501
  #, fuzzy, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "makrot \"%s\" Ã¤r redan definierat"
  
! #: tp/Texinfo/Parser.pm:2506
  #, fuzzy, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "hÃ¤r Ã¤r den tidigare definitionen av \"%s\""
  
! #: tp/Texinfo/Parser.pm:2850
  #, fuzzy, perl-format
  msgid "missing name for @%s"
  msgstr "Ã¥tgÃ¤rdsnamn saknas"
  
! #: tp/Texinfo/Parser.pm:2855
  #, perl-format
  msgid "missing category for @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2890
  #, fuzzy, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "Felaktigt argument till @%s: %s"
  
! #: tp/Texinfo/Parser.pm:2905
  #, fuzzy
  msgid "empty multitable"
  msgstr "%s: tom fil"
  
! #: tp/Texinfo/Parser.pm:2959 tp/Texinfo/Parser.pm:5673
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s"
  msgstr "Felaktigt argument till @%s"
  
! #: tp/Texinfo/Parser.pm:2965 tp/Texinfo/Parser.pm:5694
! #: tp/Texinfo/Parser.pm:5705
  #, fuzzy, perl-format
  msgid "bad argument to @%s"
  msgstr "Felaktigt argument till @%s"
  
! #: tp/Texinfo/Parser.pm:2976
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s krÃ¤ver ett argument: formateraren fÃ¶r %citem"
  
! #: tp/Texinfo/Parser.pm:2981
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3016
  #, fuzzy, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "%s: flaggan \"--%s\" tillÃ¥ter inget argument\n"
  
! #: tp/Texinfo/Parser.pm:3124 tp/Texinfo/Parser.pm:3277
! #: tp/Texinfo/Parser.pm:5666
  #, fuzzy, perl-format
  msgid "@%s missing argument"
  msgstr "%s: filargument saknas.\n"
  
! #: tp/Texinfo/Parser.pm:3138
  #, fuzzy, perl-format
  msgid "unknown @end %s"
  msgstr "OkÃ¤nt index \"%s\""
  
! #: tp/Texinfo/Parser.pm:3161 tp/Texinfo/Parser.pm:3788
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "Felaktigt argument till @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3167 tp/Texinfo/Parser.pm:3245
! #: tp/Texinfo/Parser.pm:5755 tp/Texinfo/Parser.pm:5798
! #: tp/Texinfo/Parser.pm:5827 tp/Texinfo/Parser.pm:5868
! #: tp/Texinfo/Parser.pm:5946
  #, fuzzy, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "Felaktigt argument till @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3188
  #, fuzzy, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "%s: kunde inte Ã¶ppna --css-fil: %s"
  
! #: tp/Texinfo/Parser.pm:3200
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3208
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "okÃ¤nt kodningsnamn \"%s\""
  
! #: tp/Texinfo/Parser.pm:3364
  #, perl-format
  msgid "@%s after the first element"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3371
  #, fuzzy, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s Ã¤r inte meningsfullt utanfÃ¶r \"@titlepage\"-omgivning"
  
! #: tp/Texinfo/Parser.pm:3408
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3420
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3522
  #, fuzzy, perl-format
  msgid "empty argument in @%s"
  msgstr "Felaktigt argument till @%s"
  
! #: tp/Texinfo/Parser.pm:3526
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3569
  #, fuzzy, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "Ingen meny i noden \"%s\"."
  
! #: tp/Texinfo/Parser.pm:3577
  msgid "empty node name in menu entry"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3650
  #, fuzzy, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "%s: kunde inte Ã¶ppna --css-fil: %s"
  
! #: tp/Texinfo/Parser.pm:3782
! #, fuzzy, perl-format
! msgid "@end %s should only appear at the beginning of a line"
! msgstr "DÃ¶da till bÃ¶rjan pÃ¥ raden"
  
! #: tp/Texinfo/Parser.pm:3804
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "makrot \"%s\" Ã¤r redan definierat"
  
! #: tp/Texinfo/Parser.pm:3807
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "hÃ¤r Ã¤r den tidigare definitionen av \"%s\""
  
! #: tp/Texinfo/Parser.pm:3812
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3879
  #, perl-format
  msgid "@%s without associated character"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3949
  #, perl-format
  msgid ""
***************
*** 2754,2758 ****
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4111
  #, perl-format
  msgid ""
--- 2751,2755 ----
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3974
  #, perl-format
  msgid ""
***************
*** 2761,2863 ****
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4120
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4176
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4182
  #, fuzzy, perl-format
  msgid "use braces to give a command as an argument to @%s"
  msgstr "AnvÃ¤nd klamrar fÃ¶r att ge ett komamndo som ett argument till @%s"
  
! #: tp/Texinfo/Parser.pm:4195 tp/Texinfo/Parser.pm:5325
  #, fuzzy, 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 \"%c\""
  
! #: tp/Texinfo/Parser.pm:4207
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4218
  #, fuzzy, perl-format
  msgid "@%s expected braces"
  msgstr "%c%s fÃ¶rvÃ¤ntade klamrar"
  
! #: tp/Texinfo/Parser.pm:4383
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "odefinierad flagga: %s"
  
! #: tp/Texinfo/Parser.pm:4386
  msgid "bad syntax for @value"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4393
  #, fuzzy, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s Ã¤r fÃ¶rÃ¥ldrat"
  
! #: tp/Texinfo/Parser.pm:4396
  #, fuzzy, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s Ã¤r fÃ¶rÃ¥ldrat"
  
! #: tp/Texinfo/Parser.pm:4405
! #, perl-format
! msgid "@%s should only appear at a line beginning"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:4496
  #, fuzzy, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s Ã¤r inte meningsfullt inuti \"@%s\"-block"
  
! #: tp/Texinfo/Parser.pm:4505
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4631 tp/Texinfo/Parser.pm:4648
! #: tp/Texinfo/Parser.pm:4698
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s Ã¤r inte meningsfullt inuti \"@%s\"-block"
  
! #: tp/Texinfo/Parser.pm:4658
  #, fuzzy, perl-format
  msgid "@%s in empty multitable"
  msgstr "%s: tom fil"
  
! #: tp/Texinfo/Parser.pm:4664
  msgid "@tab before @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4667
  #, fuzzy, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "FÃ¶r mÃ¥nga kolumner i multitabellsobjekt (max %d)"
  
! #: tp/Texinfo/Parser.pm:4704
  msgid "ignoring @tab outside of multitable"
  msgstr "ignorerar @tab utanfÃ¶r multitabell"
  
! #: tp/Texinfo/Parser.pm:4708
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4745
  #, fuzzy, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "MÃ¥ste vara i \"@%s\"-omgivning fÃ¶r att anvÃ¤nda \"@%s\""
  
! #: tp/Texinfo/Parser.pm:4787
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
--- 2758,2860 ----
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3983
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4038
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4044
  #, fuzzy, perl-format
  msgid "use braces to give a command as an argument to @%s"
  msgstr "AnvÃ¤nd klamrar fÃ¶r att ge ett komamndo som ett argument till @%s"
  
! #: tp/Texinfo/Parser.pm:4057 tp/Texinfo/Parser.pm:5189
  #, fuzzy, 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 \"%c\""
  
! #: tp/Texinfo/Parser.pm:4068
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4079
  #, fuzzy, perl-format
  msgid "@%s expected braces"
  msgstr "%c%s fÃ¶rvÃ¤ntade klamrar"
  
! #: tp/Texinfo/Parser.pm:4233
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "odefinierad flagga: %s"
  
! #: tp/Texinfo/Parser.pm:4236
  msgid "bad syntax for @value"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4243
  #, fuzzy, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s Ã¤r fÃ¶rÃ¥ldrat"
  
! #: tp/Texinfo/Parser.pm:4246
  #, fuzzy, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s Ã¤r fÃ¶rÃ¥ldrat"
  
! #: tp/Texinfo/Parser.pm:4255
! #, fuzzy, perl-format
! msgid "@%s should only appear at the beginning of a line"
! msgstr "DÃ¶da till bÃ¶rjan pÃ¥ raden"
  
! #: tp/Texinfo/Parser.pm:4346
  #, fuzzy, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s Ã¤r inte meningsfullt inuti \"@%s\"-block"
  
! #: tp/Texinfo/Parser.pm:4355
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4479 tp/Texinfo/Parser.pm:4496
! #: tp/Texinfo/Parser.pm:4546
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s Ã¤r inte meningsfullt inuti \"@%s\"-block"
  
! #: tp/Texinfo/Parser.pm:4506
  #, fuzzy, perl-format
  msgid "@%s in empty multitable"
  msgstr "%s: tom fil"
  
! #: tp/Texinfo/Parser.pm:4512
  msgid "@tab before @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4515
  #, fuzzy, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "FÃ¶r mÃ¥nga kolumner i multitabellsobjekt (max %d)"
  
! #: tp/Texinfo/Parser.pm:4552
  msgid "ignoring @tab outside of multitable"
  msgstr "ignorerar @tab utanfÃ¶r multitabell"
  
! #: tp/Texinfo/Parser.pm:4556
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4596
  #, fuzzy, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "MÃ¥ste vara i \"@%s\"-omgivning fÃ¶r att anvÃ¤nda \"@%s\""
  
! #: tp/Texinfo/Parser.pm:4638
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
***************
*** 2865,3055 ****
  "@%s Ã¤r inte meningsfullt utanfÃ¶r \"@titlepage\"- och \"@quotation\"-omgivning"
  
! #: tp/Texinfo/Parser.pm:4791
  msgid "@dircategory after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4979
  #, fuzzy, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "Fotnoter inuti fotnoter Ã¤r inte tillÃ¥tet"
  
! #: tp/Texinfo/Parser.pm:4997
  msgid "@direntry after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5005
  #, fuzzy, perl-format
  msgid "@%s seen before first @node"
  msgstr "@menu sÃ¥gs innan fÃ¶rsta @node, skapar \"Top\"-nod"
  
! #: tp/Texinfo/Parser.pm:5008
  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/Parser.pm:5070
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5078
  #, fuzzy, perl-format
  msgid "unknown command `%s'"
  msgstr "OkÃ¤nt kommando \"%s\""
  
! #: tp/Texinfo/Parser.pm:5088
  #, fuzzy
  msgid "unexpected @"
  msgstr "\"%s\" fÃ¶rvÃ¤ntades"
  
! #: tp/Texinfo/Parser.pm:5117
  #, fuzzy, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s Ã¤r inte meningsfullt utanfÃ¶r \"@float\"-omgivning"
  
! #: tp/Texinfo/Parser.pm:5122
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5130
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5249
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5273
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5292
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5303
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5316
  msgid "@image missing filename argument"
  msgstr "@image saknar filnamnsargument"
  
! #: tp/Texinfo/Parser.pm:5348
  #, fuzzy, perl-format
  msgid "@%s missing first argument"
  msgstr "%s: filargument saknas.\n"
  
! #: tp/Texinfo/Parser.pm:5393
  #, fuzzy, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "Felaktigt argument till @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5399
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5412
! #, perl-format
! msgid "argument for @U exceeds size of integer: %s"
! msgstr ""
! 
! #: tp/Texinfo/Parser.pm:5418
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5546
  msgid "superfluous arguments for node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5596
  #, fuzzy, perl-format
  msgid "expected @end %s"
  msgstr "\"%s\" fÃ¶rvÃ¤ntades"
  
! #: tp/Texinfo/Parser.pm:5718
  #, fuzzy, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "AnvÃ¤nd klamrar fÃ¶r att ge ett komamndo som ett argument till @%s"
  
! #: tp/Texinfo/Parser.pm:5728
  #, fuzzy, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "Felaktigt argument till @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5801
  #, fuzzy, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "AnvÃ¤nd klamrar fÃ¶r att ge ett komamndo som ett argument till @%s"
  
! #: tp/Texinfo/Parser.pm:5823
  #, perl-format
  msgid "empty @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5831
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5840
  #, fuzzy, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "%s: argumentet %s mÃ¥ste vara numeriskt, inte \"%s\".\n"
  
! #: tp/Texinfo/Parser.pm:5849
  #, perl-format
  msgid "reserved index name %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5868
  #, fuzzy, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "OkÃ¤nt index \"%s\""
  
! #: tp/Texinfo/Parser.pm:5871
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5914
  #, fuzzy, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "OkÃ¤nt index \"%s\" i @printindex"
  
! #: tp/Texinfo/Parser.pm:5920
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5928
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5944
  #, fuzzy, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
  msgstr "%s: argumentet %s mÃ¥ste vara numeriskt, inte \"%s\".\n"
  
! #: tp/Texinfo/Parser.pm:5952
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr "Endast @%s 10 eller 11 stÃ¶ds, inte \"%s\""
  
! #: tp/Texinfo/Parser.pm:5960
  #, fuzzy, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
--- 2862,3047 ----
  "@%s Ã¤r inte meningsfullt utanfÃ¶r \"@titlepage\"- och \"@quotation\"-omgivning"
  
! #: tp/Texinfo/Parser.pm:4642
  msgid "@dircategory after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4847
  #, fuzzy, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "Fotnoter inuti fotnoter Ã¤r inte tillÃ¥tet"
  
! #: tp/Texinfo/Parser.pm:4864
  msgid "@direntry after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4872
  #, fuzzy, perl-format
  msgid "@%s seen before first @node"
  msgstr "@menu sÃ¥gs innan fÃ¶rsta @node, skapar \"Top\"-nod"
  
! #: tp/Texinfo/Parser.pm:4875
  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/Parser.pm:4937
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4945
  #, fuzzy, perl-format
  msgid "unknown command `%s'"
  msgstr "OkÃ¤nt kommando \"%s\""
  
! #: tp/Texinfo/Parser.pm:4955
  #, fuzzy
  msgid "unexpected @"
  msgstr "\"%s\" fÃ¶rvÃ¤ntades"
  
! #: tp/Texinfo/Parser.pm:4983
  #, fuzzy, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s Ã¤r inte meningsfullt utanfÃ¶r \"@float\"-omgivning"
  
! #: tp/Texinfo/Parser.pm:4988
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4996
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5114
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5138
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5156
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5167
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5180
  msgid "@image missing filename argument"
  msgstr "@image saknar filnamnsargument"
  
! #: tp/Texinfo/Parser.pm:5211
  #, fuzzy, perl-format
  msgid "@%s missing first argument"
  msgstr "%s: filargument saknas.\n"
  
! #: tp/Texinfo/Parser.pm:5230
  #, fuzzy, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "Felaktigt argument till @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5236
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5253
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5448
  msgid "superfluous arguments for node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5498
  #, fuzzy, perl-format
  msgid "expected @end %s"
  msgstr "\"%s\" fÃ¶rvÃ¤ntades"
  
! #: tp/Texinfo/Parser.pm:5607
  #, fuzzy, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "AnvÃ¤nd klamrar fÃ¶r att ge ett komamndo som ett argument till @%s"
  
! #: tp/Texinfo/Parser.pm:5617
  #, fuzzy, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "Felaktigt argument till @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5689
  #, fuzzy, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "AnvÃ¤nd klamrar fÃ¶r att ge ett komamndo som ett argument till @%s"
  
! #: tp/Texinfo/Parser.pm:5710
  #, perl-format
  msgid "empty @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5727
  #, fuzzy, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "%s: argumentet %s mÃ¥ste vara numeriskt, inte \"%s\".\n"
  
! #: tp/Texinfo/Parser.pm:5736
  #, perl-format
  msgid "reserved index name %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5762
  #, fuzzy, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "OkÃ¤nt index \"%s\""
  
! #: tp/Texinfo/Parser.pm:5765
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5793
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5806
  #, fuzzy, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "OkÃ¤nt index \"%s\" i @printindex"
  
! #: tp/Texinfo/Parser.pm:5812
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5820
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5836
  #, fuzzy, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
  msgstr "%s: argumentet %s mÃ¥ste vara numeriskt, inte \"%s\".\n"
  
! #: tp/Texinfo/Parser.pm:5844
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr "Endast @%s 10 eller 11 stÃ¶ds, inte \"%s\""
  
! #: tp/Texinfo/Parser.pm:5852
  #, fuzzy, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
***************
*** 3058,3067 ****
  "\"%s\".\n"
  
! #: tp/Texinfo/Parser.pm:5968
  #, fuzzy, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
  msgstr "%s: argumentet %s mÃ¥ste vara numeriskt, inte \"%s\".\n"
  
! #: tp/Texinfo/Parser.pm:5986 tp/Texinfo/Parser.pm:5991
  #, fuzzy, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
--- 3050,3059 ----
  "\"%s\".\n"
  
! #: tp/Texinfo/Parser.pm:5860
  #, fuzzy, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
  msgstr "%s: argumentet %s mÃ¥ste vara numeriskt, inte \"%s\".\n"
  
! #: tp/Texinfo/Parser.pm:5878 tp/Texinfo/Parser.pm:5883
  #, fuzzy, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
***************
*** 3070,3074 ****
  "inte \"%s\".\n"
  
! #: tp/Texinfo/Parser.pm:5999
  #, fuzzy, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
--- 3062,3066 ----
  "inte \"%s\".\n"
  
! #: tp/Texinfo/Parser.pm:5891
  #, fuzzy, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
***************
*** 3077,3081 ****
  "inte \"%s\".\n"
  
! #: tp/Texinfo/Parser.pm:6009
  #, fuzzy, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
--- 3069,3073 ----
  "inte \"%s\".\n"
  
! #: tp/Texinfo/Parser.pm:5901
  #, fuzzy, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
***************
*** 3084,3098 ****
  "inte \"%s\".\n"
  
! #: tp/Texinfo/Parser.pm:6021
  #, fuzzy, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "FÃ¶rvÃ¤ntade @%s on eller off, inte \"%s\""
  
! #: tp/Texinfo/Parser.pm:6031
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:6039
  #, fuzzy, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
--- 3076,3090 ----
  "inte \"%s\".\n"
  
! #: tp/Texinfo/Parser.pm:5913
  #, fuzzy, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "FÃ¶rvÃ¤ntade @%s on eller off, inte \"%s\""
  
! #: tp/Texinfo/Parser.pm:5922
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5930
  #, fuzzy, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
***************
*** 3101,3105 ****
  "\"%s\".\n"
  
! #: tp/Texinfo/Parser.pm:6047
  #, fuzzy, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
--- 3093,3097 ----
  "\"%s\".\n"
  
! #: tp/Texinfo/Parser.pm:5938
  #, fuzzy, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
***************
*** 3108,3137 ****
  "\"%s\".\n"
  
! #: tp/Texinfo/Structuring.pm:213
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:245
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:250
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:339
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:488
  #, perl-format
  msgid "@%s not empty"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:544 tp/Texinfo/Structuring.pm:1326
  #, fuzzy, perl-format
  msgid "@%s reference to nonexistent node `%s'"
--- 3100,3129 ----
  "\"%s\".\n"
  
! #: tp/Texinfo/Structuring.pm:216
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:248
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:253
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:342
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:491
  #, perl-format
  msgid "@%s not empty"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:547 tp/Texinfo/Structuring.pm:1325
  #, fuzzy, perl-format
  msgid "@%s reference to nonexistent node `%s'"
***************
*** 3140,3184 ****
  "avsnittsindelning?)"
  
! #: tp/Texinfo/Structuring.pm:557
  #, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:662
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "orefererad nod \"%s\""
  
! #: tp/Texinfo/Structuring.pm:708
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:715
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:733
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:787
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:814
  #, fuzzy, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "orefererad nod \"%s\""
  
! #: tp/Texinfo/Structuring.pm:834
  #, fuzzy, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
  msgstr "Noden \"%s\" saknar menypost fÃ¶r \"%s\" trots att den Ã¤r dess Upp-mÃ¥l"
  
! #: tp/Texinfo/Structuring.pm:842
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
--- 3132,3176 ----
  "avsnittsindelning?)"
  
! #: tp/Texinfo/Structuring.pm:558
  #, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:663
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "orefererad nod \"%s\""
  
! #: tp/Texinfo/Structuring.pm:706
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:713
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:731
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:786
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:810
  #, fuzzy, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "orefererad nod \"%s\""
  
! #: tp/Texinfo/Structuring.pm:829
  #, fuzzy, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
  msgstr "Noden \"%s\" saknar menypost fÃ¶r \"%s\" trots att den Ã¤r dess Upp-mÃ¥l"
  
! #: tp/Texinfo/Structuring.pm:837
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
***************
*** 3190,3194 ****
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:2070
  #, perl-format
  msgid "empty index key in @%s"
--- 3182,3186 ----
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:2067
  #, perl-format
  msgid "empty index key in @%s"
***************
*** 3684,3702 ****
  msgstr "Prova \"%s --help\" fÃ¶r mer information.\n"
  
! #: tp/texi2any.pl:1232
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
  
! #: tp/texi2any.pl:1255
  #, fuzzy, perl-format
  msgid "error on closing macro expand file %s: %s\n"
  msgstr "fel vid stÃ¤ngning av utdatafilen \"%s\""
  
! #: tp/texi2any.pl:1261
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "%s: kunde inte Ã¶ppna --css-fil: %s"
  
! #: tp/texi2any.pl:1286
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
--- 3676,3694 ----
  msgstr "Prova \"%s --help\" fÃ¶r mer information.\n"
  
! #: tp/texi2any.pl:1239
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
  
! #: tp/texi2any.pl:1262
  #, fuzzy, perl-format
  msgid "error on closing macro expand file %s: %s\n"
  msgstr "fel vid stÃ¤ngning av utdatafilen \"%s\""
  
! #: tp/texi2any.pl:1268
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "%s: kunde inte Ã¶ppna --css-fil: %s"
  
! #: tp/texi2any.pl:1293
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
***************
*** 3704,3718 ****
  msgstr ""
  
! #: tp/texi2any.pl:1359 tp/texi2any.pl:1435
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1382 tp/texi2any.pl:1416
  #, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1388 tp/texi2any.pl:1422
  #, fuzzy, perl-format
  msgid "%s: could not open %s for writing: %s\n"
--- 3696,3710 ----
  msgstr ""
  
! #: tp/texi2any.pl:1366 tp/texi2any.pl:1442
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1389 tp/texi2any.pl:1423
  #, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1395 tp/texi2any.pl:1429
  #, fuzzy, perl-format
  msgid "%s: could not open %s for writing: %s\n"
***************
*** 3989,3992 ****
--- 3981,3990 ----
  #~ msgstr "--*** FÃ¶r gamla taggar ***"
  
+ #~ msgid "-%s---Info: %s, %d lines --%s--"
+ #~ msgstr "-%s---Info: %s, %d rader --%s--"
+ 
+ #~ msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
+ #~ msgstr "-%s%s-Info: (%s)%s, %d rader --%s--"
+ 
  #~ msgid " Subfile: %s"
  #~ msgstr " Underfil: %s"
diff -Nrc2 texinfo-6.1/po/texinfo.pot texinfo-6.3/po/texinfo.pot
*** texinfo-6.1/po/texinfo.pot	2016-02-06 11:35:48.000000000 +0000
--- texinfo-6.3/po/texinfo.pot	2016-09-10 12:45:49.000000000 +0100
***************
*** 7,13 ****
  msgid ""
  msgstr ""
! "Project-Id-Version: GNU texinfo 6.1\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--- 7,13 ----
  msgid ""
  msgstr ""
! "Project-Id-Version: GNU texinfo 6.2\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:45+0100\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
***************
*** 113,117 ****
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [ or [^"
  msgstr ""
  
--- 113,117 ----
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [, [^, [:, [., or [="
  msgstr ""
  
***************
*** 152,156 ****
  msgstr ""
  
! #: gnulib/lib/regcomp.c:711
  msgid "No previous regular expression"
  msgstr ""
--- 152,156 ----
  msgstr ""
  
! #: gnulib/lib/regcomp.c:687
  msgid "No previous regular expression"
  msgstr ""
***************
*** 304,308 ****
  msgstr ""
  
! #: info/indices.c:123 info/indices.c:812
  #, c-format
  msgid "Finding index entries..."
--- 304,308 ----
  msgstr ""
  
! #: info/indices.c:123 info/indices.c:822
  #, c-format
  msgid "Finding index entries..."
***************
*** 313,317 ****
  msgstr ""
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:818
  #, c-format
  msgid "No indices found."
--- 313,317 ----
  msgstr ""
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:828
  #, c-format
  msgid "No indices found."
***************
*** 342,373 ****
  msgstr ""
  
! #: info/indices.c:476 info/indices.c:880
  #, c-format
  msgid "No index entries containing '%s'."
  msgstr ""
  
! #: info/indices.c:583
  #, c-format
  msgid "Scanning indices of '%s'..."
  msgstr ""
  
! #: info/indices.c:636
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
  
! #: info/indices.c:644 info/indices.c:646
  msgid "Index apropos"
  msgstr ""
  
! #: info/indices.c:688
  #, c-format
  msgid "Index entries containing '%s':\n"
  msgstr ""
  
! #: info/indices.c:797
  msgid "List all matches of a string in the index"
  msgstr ""
  
! #: info/indices.c:824 info/indices.c:826
  msgid "Index topic"
  msgstr ""
--- 342,373 ----
  msgstr ""
  
! #: info/indices.c:476 info/indices.c:890
  #, 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:807
  msgid "List all matches of a string in the index"
  msgstr ""
  
! #: info/indices.c:834 info/indices.c:836
  msgid "Index topic"
  msgstr ""
***************
*** 378,432 ****
  msgstr ""
  
! #: info/info-utils.c:892
  #, c-format
  msgid "Error converting file character encoding."
  msgstr ""
  
! #: info/info.c:222 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr ""
  
! #: info/info.c:315
! #, c-format
! msgid "No file given for node '%s'."
! msgstr ""
! 
! #: info/info.c:364 info/info.c:1133
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr ""
  
! #: info/info.c:386
  #, c-format
  msgid "No program name given."
  msgstr ""
  
! #: info/info.c:577
  #, c-format
  msgid "invalid number: %s\n"
  msgstr ""
  
! #: info/info.c:757
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr ""
  
! #: info/info.c:764 info/infokey.c:537
  #, c-format
  msgid "%s: no such variable"
  msgstr ""
  
! #: info/info.c:770 info/infokey.c:539
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr ""
  
! #: info/info.c:782
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr ""
  
! #: info/info.c:804 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
--- 378,427 ----
  msgstr ""
  
! #: info/info-utils.c:879
  #, c-format
  msgid "Error converting file character encoding."
  msgstr ""
  
! #: info/info.c:279 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr ""
  
! #: info/info.c:416 info/info.c:1148
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr ""
  
! #: info/info.c:438
  #, c-format
  msgid "No program name given."
  msgstr ""
  
! #: info/info.c:636
  #, c-format
  msgid "invalid number: %s\n"
  msgstr ""
  
! #: info/info.c:816
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr ""
  
! #: info/info.c:823 info/infokey.c:540
  #, c-format
  msgid "%s: no such variable"
  msgstr ""
  
! #: info/info.c:829 info/infokey.c:542
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr ""
  
! #: info/info.c:841
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr ""
  
! #: info/info.c:860 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
***************
*** 438,447 ****
  msgstr ""
  
! #: info/info.c:981
  #, c-format
  msgid "no index entries found for '%s'\n"
  msgstr ""
  
! #: info/info.c:1034
  #, c-format
  msgid ""
--- 433,442 ----
  msgstr ""
  
! #: info/info.c:999
  #, c-format
  msgid "no index entries found for '%s'\n"
  msgstr ""
  
! #: info/info.c:1049
  #, c-format
  msgid ""
***************
*** 451,455 ****
  msgstr ""
  
! #: info/info.c:1040
  msgid ""
  "Options:\n"
--- 446,450 ----
  msgstr ""
  
! #: info/info.c:1055
  msgid ""
  "Options:\n"
***************
*** 462,466 ****
  msgstr ""
  
! #: info/info.c:1048
  msgid ""
  "  -h, --help                   display this help and exit.\n"
--- 457,461 ----
  msgstr ""
  
! #: info/info.c:1063
  msgid ""
  "  -h, --help                   display this help and exit.\n"
***************
*** 470,474 ****
  msgstr ""
  
! #: info/info.c:1054
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
--- 465,469 ----
  msgstr ""
  
! #: info/info.c:1069
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
***************
*** 478,486 ****
  msgstr ""
  
! #: info/info.c:1061
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr ""
  
! #: info/info.c:1065
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
--- 473,481 ----
  msgstr ""
  
! #: info/info.c:1076
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr ""
  
! #: info/info.c:1080
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
***************
*** 494,498 ****
  msgstr ""
  
! #: info/info.c:1074
  msgid ""
  "\n"
--- 489,493 ----
  msgstr ""
  
! #: info/info.c:1089
  msgid ""
  "\n"
***************
*** 504,508 ****
  msgstr ""
  
! #: info/info.c:1081
  msgid ""
  "\n"
--- 499,503 ----
  msgstr ""
  
! #: info/info.c:1096
  msgid ""
  "\n"
***************
*** 510,514 ****
  msgstr ""
  
! #: info/info.c:1084
  msgid ""
  "\n"
--- 505,509 ----
  msgstr ""
  
! #: info/info.c:1099
  msgid ""
  "\n"
***************
*** 526,530 ****
  msgstr ""
  
! #: info/info.c:1099 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
--- 521,525 ----
  msgstr ""
  
! #: info/info.c:1114 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
***************
*** 533,597 ****
  msgstr ""
  
! #: info/info.c:1134
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr ""
  
! #: info/info.c:1135
  msgid "Cannot find a window!"
  msgstr ""
  
! #: info/info.c:1136
  msgid "Point doesn't appear within this window's node!"
  msgstr ""
  
! #: info/info.c:1137
  msgid "Cannot delete the last window."
  msgstr ""
  
! #: info/info.c:1138
  msgid "No menu in this node."
  msgstr ""
  
! #: info/info.c:1139
  msgid "No footnotes in this node."
  msgstr ""
  
! #: info/info.c:1140
  msgid "No cross references in this node."
  msgstr ""
  
! #: info/info.c:1141
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr ""
  
! #: info/info.c:1142
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr ""
  
! #: info/info.c:1143
  #, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr ""
  
! #: info/info.c:1144
  msgid "You are already at the last page of this node."
  msgstr ""
  
! #: info/info.c:1145
  msgid "You are already at the first page of this node."
  msgstr ""
  
! #: info/info.c:1146
  msgid "Only one window."
  msgstr ""
  
! #: info/info.c:1147
  msgid "Resulting window would be too small."
  msgstr ""
  
! #: info/info.c:1148
  msgid "Not enough room for a help window, please delete a window."
  msgstr ""
--- 528,592 ----
  msgstr ""
  
! #: info/info.c:1149
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr ""
  
! #: info/info.c:1150
  msgid "Cannot find a window!"
  msgstr ""
  
! #: info/info.c:1151
  msgid "Point doesn't appear within this window's node!"
  msgstr ""
  
! #: info/info.c:1152
  msgid "Cannot delete the last window."
  msgstr ""
  
! #: info/info.c:1153
  msgid "No menu in this node."
  msgstr ""
  
! #: info/info.c:1154
  msgid "No footnotes in this node."
  msgstr ""
  
! #: info/info.c:1155
  msgid "No cross references in this node."
  msgstr ""
  
! #: info/info.c:1156
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr ""
  
! #: info/info.c:1157
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr ""
  
! #: info/info.c:1158
  #, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr ""
  
! #: info/info.c:1159
  msgid "You are already at the last page of this node."
  msgstr ""
  
! #: info/info.c:1160
  msgid "You are already at the first page of this node."
  msgstr ""
  
! #: info/info.c:1161
  msgid "Only one window."
  msgstr ""
  
! #: info/info.c:1162
  msgid "Resulting window would be too small."
  msgstr ""
  
! #: info/info.c:1163
  msgid "Not enough room for a help window, please delete a window."
  msgstr ""
***************
*** 849,883 ****
  msgstr ""
  
! #: info/infokey.c:482
  #, c-format
  msgid "action name too long"
  msgstr ""
  
! #: info/infokey.c:495
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr ""
  
! #: info/infokey.c:506
  #, c-format
  msgid "missing variable name"
  msgstr ""
  
! #: info/infokey.c:515
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr ""
  
! #: info/infokey.c:522
  #, c-format
  msgid "variable name too long"
  msgstr ""
  
! #: info/infokey.c:546
  #, c-format
  msgid "value too long"
  msgstr ""
  
! #: info/infokey.c:592
  #, c-format
  msgid "\"%s\", line %u: "
--- 844,878 ----
  msgstr ""
  
! #: info/infokey.c:485
  #, c-format
  msgid "action name too long"
  msgstr ""
  
! #: info/infokey.c:498
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr ""
  
! #: info/infokey.c:509
  #, c-format
  msgid "missing variable name"
  msgstr ""
  
! #: info/infokey.c:518
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr ""
  
! #: info/infokey.c:525
  #, c-format
  msgid "variable name too long"
  msgstr ""
  
! #: info/infokey.c:549
  #, c-format
  msgid "value too long"
  msgstr ""
  
! #: info/infokey.c:595
  #, c-format
  msgid "\"%s\", line %u: "
***************
*** 1194,1532 ****
  msgstr ""
  
! #: info/session.c:2864
  msgid "Read a list of menus starting from dir and follow them"
  msgstr ""
  
! #: info/session.c:2866
  msgid "Follow menus: "
  msgstr ""
  
! #: info/session.c:2971
  msgid "Select the Next node"
  msgstr ""
  
! #: info/session.c:2978
  msgid "Select the Prev node"
  msgstr ""
  
! #: info/session.c:2985
  msgid "Select the Up node"
  msgstr ""
  
! #: info/session.c:2991
  msgid "Select the last node in this file"
  msgstr ""
  
! #: info/session.c:3018 info/session.c:3051
  msgid "This window has no additional nodes"
  msgstr ""
  
! #: info/session.c:3024
  msgid "Select the first node in this file"
  msgstr ""
  
! #: info/session.c:3158
  msgid "No more nodes within this document."
  msgstr ""
  
! #: info/session.c:3203 info/session.c:3243
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr ""
  
! #: info/session.c:3256
  msgid "Move forwards or down through node structure"
  msgstr ""
  
! #: info/session.c:3273
  msgid "Move backwards or up through node structure"
  msgstr ""
  
! #: info/session.c:3296
  msgid "Read a node name and select it"
  msgstr ""
  
! #: info/session.c:3350 info/session.c:3354
  msgid "Goto node: "
  msgstr ""
  
! #: info/session.c:3533
  msgid "Find the node describing program invocation"
  msgstr ""
  
! #: info/session.c:3535
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr ""
  
! #: info/session.c:3580
  msgid "Read a manpage reference and select it"
  msgstr ""
  
! #: info/session.c:3584
  msgid "Get Manpage: "
  msgstr ""
  
! #: info/session.c:3605
  msgid "Select the node 'Top' in this file"
  msgstr ""
  
! #: info/session.c:3611
  msgid "Select the node '(dir)'"
  msgstr ""
  
! #: info/session.c:3617
  msgid "Show full file name of node being displayed"
  msgstr ""
  
! #: info/session.c:3634
  msgid "Select the most recently selected node"
  msgstr ""
  
! #: info/session.c:3639
  #, c-format
  msgid "No earlier node in history"
  msgstr ""
  
! #: info/session.c:3643
  msgid "Read the name of a file and select it"
  msgstr ""
  
! #: info/session.c:3647
  msgid "Find file: "
  msgstr ""
  
! #: info/session.c:3664
  #, 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:4169
  msgid "Search continued from the end of the document."
  msgstr ""
  
! #: info/session.c:4174
  msgid "Search continued from the beginning of the document."
  msgstr ""
  
! #: info/session.c:4194
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr ""
  
! #: info/session.c:4231
  msgid "Search failed."
  msgstr ""
  
! #: info/session.c:4248
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr ""
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Regexp search"
  msgstr ""
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Search"
  msgstr ""
  
! #: info/session.c:4250 info/session.c:4256
  msgid " case-sensitively"
  msgstr ""
  
! #: info/session.c:4251 info/session.c:4257
  msgid " backward"
  msgstr ""
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s: "
  msgstr ""
  
! #: info/session.c:4274
  msgid "Search string too short"
  msgstr ""
  
! #: info/session.c:4467
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4491 info/session.c:4601
  #, c-format
  msgid "No more matches."
  msgstr ""
  
! #: info/session.c:4628
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4649
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4653 info/session.c:4665
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4661
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4674
  msgid "Read a string and search for it case-sensitively"
  msgstr ""
  
! #: info/session.c:4679
  msgid "Read a string and search for it"
  msgstr ""
  
! #: info/session.c:4685
  msgid "Read a string and search backward for it"
  msgstr ""
  
! #: info/session.c:4693
  msgid "Repeat last search in the same direction"
  msgstr ""
  
! #: info/session.c:4701 info/session.c:4746
  msgid "No previous search string"
  msgstr ""
  
! #: info/session.c:4738
  msgid "Repeat last search in the reverse direction"
  msgstr ""
  
! #: info/session.c:4785
  msgid "Clear displayed search matches"
  msgstr ""
  
! #: info/session.c:4802 info/session.c:4808
  msgid "Search interactively for a string as you type it"
  msgstr ""
  
! #: info/session.c:4928
  msgid "Regexp I-search backward: "
  msgstr ""
  
! #: info/session.c:4929
  msgid "I-search backward: "
  msgstr ""
  
! #: info/session.c:4931
  msgid "Regexp I-search: "
  msgstr ""
  
! #: info/session.c:4932
  msgid "I-search: "
  msgstr ""
  
! #: info/session.c:4957 info/session.c:4960
  msgid "Failing "
  msgstr ""
  
! #: info/session.c:5326
  msgid "Cancel current operation"
  msgstr ""
  
! #: info/session.c:5333
  msgid "Quit"
  msgstr ""
  
! #: info/session.c:5338
  msgid "Display version of Info being run"
  msgstr ""
  
! #: info/session.c:5340
  #, c-format
  msgid "GNU Info version %s"
  msgstr ""
  
! #: info/session.c:5345
  msgid "Redraw the display"
  msgstr ""
  
! #: info/session.c:5382
  msgid "Quit using Info"
  msgstr ""
  
! #: info/session.c:5398
  msgid "Run command bound to this key's lowercase variant"
  msgstr ""
  
! #: info/session.c:5409
  #, c-format
  msgid "Unknown command (%s)."
  msgstr ""
  
! #: info/session.c:5412
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr ""
  
! #: info/session.c:5413
  #, c-format
  msgid "'%s' is invalid"
  msgstr ""
  
! #: info/session.c:5731
  msgid "Add this digit to the current numeric argument"
  msgstr ""
  
! #: info/session.c:5738
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr ""
--- 1189,1527 ----
  msgstr ""
  
! #: info/session.c:2870
  msgid "Read a list of menus starting from dir and follow them"
  msgstr ""
  
! #: info/session.c:2872
  msgid "Follow menus: "
  msgstr ""
  
! #: info/session.c:2977
  msgid "Select the Next node"
  msgstr ""
  
! #: info/session.c:2984
  msgid "Select the Prev node"
  msgstr ""
  
! #: info/session.c:2991
  msgid "Select the Up node"
  msgstr ""
  
! #: info/session.c:2997
  msgid "Select the last node in this file"
  msgstr ""
  
! #: info/session.c:3024 info/session.c:3057
  msgid "This window has no additional nodes"
  msgstr ""
  
! #: info/session.c:3030
  msgid "Select the first node in this file"
  msgstr ""
  
! #: info/session.c:3164
  msgid "No more nodes within this document."
  msgstr ""
  
! #: info/session.c:3209 info/session.c:3249
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr ""
  
! #: info/session.c:3262
  msgid "Move forwards or down through node structure"
  msgstr ""
  
! #: info/session.c:3279
  msgid "Move backwards or up through node structure"
  msgstr ""
  
! #: info/session.c:3302
  msgid "Read a node name and select it"
  msgstr ""
  
! #: info/session.c:3356 info/session.c:3360
  msgid "Goto node: "
  msgstr ""
  
! #: info/session.c:3539
  msgid "Find the node describing program invocation"
  msgstr ""
  
! #: info/session.c:3541
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr ""
  
! #: info/session.c:3586
  msgid "Read a manpage reference and select it"
  msgstr ""
  
! #: info/session.c:3590
  msgid "Get Manpage: "
  msgstr ""
  
! #: info/session.c:3611
  msgid "Select the node 'Top' in this file"
  msgstr ""
  
! #: info/session.c:3617
  msgid "Select the node '(dir)'"
  msgstr ""
  
! #: info/session.c:3623
  msgid "Show full file name of node being displayed"
  msgstr ""
  
! #: info/session.c:3640
  msgid "Select the most recently selected node"
  msgstr ""
  
! #: info/session.c:3645
  #, c-format
  msgid "No earlier node in history"
  msgstr ""
  
! #: info/session.c:3649
  msgid "Read the name of a file and select it"
  msgstr ""
  
! #: info/session.c:3653
  msgid "Find file: "
  msgstr ""
  
! #: info/session.c:3670
  #, c-format
  msgid "Cannot find '%s'."
  msgstr ""
  
! #: info/session.c:3719
  #, c-format
  msgid "Could not create output file '%s'."
  msgstr ""
  
! #: info/session.c:3733
  #, c-format
  msgid "error writing to %s: %s"
  msgstr ""
  
! #: info/session.c:3742
  #, c-format
  msgid "closing %s"
  msgstr ""
  
! #: info/session.c:3791
  #, c-format
  msgid "writing node %s..."
  msgstr ""
  
! #: info/session.c:3837
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr ""
  
! #: info/session.c:3865
  #, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr ""
  
! #: info/session.c:3870
  #, c-format
  msgid "printing node %s..."
  msgstr ""
  
! #: info/session.c:3878
  #, c-format
  msgid "finished printing node %s"
  msgstr ""
  
! #: info/session.c:3910
  msgid "Toggle the usage of regular expressions in searches"
  msgstr ""
  
! #: info/session.c:3914
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr ""
  
! #: info/session.c:3915
  #, c-format
  msgid "Using literal strings for searches."
  msgstr ""
  
! #: info/session.c:4175
  msgid "Search continued from the end of the document."
  msgstr ""
  
! #: info/session.c:4180
  msgid "Search continued from the beginning of the document."
  msgstr ""
  
! #: info/session.c:4200
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr ""
  
! #: info/session.c:4237
  msgid "Search failed."
  msgstr ""
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr ""
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Regexp search"
  msgstr ""
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Search"
  msgstr ""
  
! #: info/session.c:4256 info/session.c:4262
  msgid " case-sensitively"
  msgstr ""
  
! #: info/session.c:4257 info/session.c:4263
  msgid " backward"
  msgstr ""
  
! #: info/session.c:4260
  #, c-format
  msgid "%s%s%s: "
  msgstr ""
  
! #: info/session.c:4280
  msgid "Search string too short"
  msgstr ""
  
! #: info/session.c:4473
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4497 info/session.c:4607
  #, c-format
  msgid "No more matches."
  msgstr ""
  
! #: info/session.c:4634
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4655
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4659 info/session.c:4671
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4667
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4680
  msgid "Read a string and search for it case-sensitively"
  msgstr ""
  
! #: info/session.c:4685
  msgid "Read a string and search for it"
  msgstr ""
  
! #: info/session.c:4691
  msgid "Read a string and search backward for it"
  msgstr ""
  
! #: info/session.c:4699
  msgid "Repeat last search in the same direction"
  msgstr ""
  
! #: info/session.c:4707 info/session.c:4752
  msgid "No previous search string"
  msgstr ""
  
! #: info/session.c:4744
  msgid "Repeat last search in the reverse direction"
  msgstr ""
  
! #: info/session.c:4791
  msgid "Clear displayed search matches"
  msgstr ""
  
! #: info/session.c:4808 info/session.c:4814
  msgid "Search interactively for a string as you type it"
  msgstr ""
  
! #: info/session.c:4934
  msgid "Regexp I-search backward: "
  msgstr ""
  
! #: info/session.c:4935
  msgid "I-search backward: "
  msgstr ""
  
! #: info/session.c:4937
  msgid "Regexp I-search: "
  msgstr ""
  
! #: info/session.c:4938
  msgid "I-search: "
  msgstr ""
  
! #: info/session.c:4963 info/session.c:4966
  msgid "Failing "
  msgstr ""
  
! #: info/session.c:5332
  msgid "Cancel current operation"
  msgstr ""
  
! #: info/session.c:5339
  msgid "Quit"
  msgstr ""
  
! #: info/session.c:5344
  msgid "Display version of Info being run"
  msgstr ""
  
! #: info/session.c:5346
  #, c-format
  msgid "GNU Info version %s"
  msgstr ""
  
! #: info/session.c:5351
  msgid "Redraw the display"
  msgstr ""
  
! #: info/session.c:5388
  msgid "Quit using Info"
  msgstr ""
  
! #: info/session.c:5404
  msgid "Run command bound to this key's lowercase variant"
  msgstr ""
  
! #: info/session.c:5415
  #, c-format
  msgid "Unknown command (%s)."
  msgstr ""
  
! #: info/session.c:5418
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr ""
  
! #: info/session.c:5419
  #, c-format
  msgid "'%s' is invalid"
  msgstr ""
  
! #: info/session.c:5737
  msgid "Add this digit to the current numeric argument"
  msgstr ""
  
! #: info/session.c:5744
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr ""
***************
*** 1662,1679 ****
  msgstr ""
  
! #: info/window.c:959
  msgid "-----Info: (), lines ----, "
  msgstr ""
  
- #: info/window.c:966
- #, c-format
- msgid "-%s---Info: %s, %ld lines --%s--"
- msgstr ""
- 
- #: info/window.c:970
- #, c-format
- msgid "-%s---Info: (%s)%s, %ld lines --%s--"
- msgstr ""
- 
  #: install-info/install-info.c:292
  #, c-format
--- 1657,1664 ----
  msgstr ""
  
! #: info/window.c:909
  msgid "-----Info: (), lines ----, "
  msgstr ""
  
  #: install-info/install-info.c:292
  #, c-format
***************
*** 1799,1803 ****
  "\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"
--- 1784,1788 ----
  "\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"
***************
*** 1874,1990 ****
  msgstr ""
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:855
! #: tp/Texinfo/Convert/Converter.pm:893 tp/Texinfo/Convert/Converter.pm:1204
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6504
! #: tp/Texinfo/Convert/HTML.pm:6528 tp/Texinfo/Convert/HTML.pm:6905
! #: tp/Texinfo/Convert/HTML.pm:6963 tp/Texinfo/Convert/HTML.pm:7041
! #: tp/Texinfo/Convert/HTML.pm:7118 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:546
! #: tp/Texinfo/Convert/TexinfoXML.pm:457
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:881
  msgid "recursion is always allowed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:882
  msgid "arguments are quoted by default"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1105
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1110
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1128
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1151
  #, perl-format
  msgid "could not read %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1170
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1176 tp/Texinfo/Parser.pm:3353
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1520
! #, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:1548
! msgid "missing type"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:1551
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:1568
! #, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:1603
  msgid "no node to be renamed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1614
  msgid "nodes without a new name at the end of file"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1624 tp/Texinfo/Parser.pm:926
  #, perl-format
  msgid "could not open %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:2144
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:395 tp/Texinfo/Convert/Converter.pm:414
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:794
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:876 tp/Texinfo/Convert/Converter.pm:909
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:6931
! #: tp/Texinfo/Convert/HTML.pm:6989 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:476 tp/Texinfo/Parser.pm:2035
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, perl-format
  msgid "could not create directories `%s' or `%s': %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:995
  #, perl-format
  msgid "could not create directory `%s': %s"
--- 1859,1967 ----
  msgstr ""
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:847
! #: tp/Texinfo/Convert/Converter.pm:885 tp/Texinfo/Convert/Converter.pm:1196
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6573
! #: tp/Texinfo/Convert/HTML.pm:6597 tp/Texinfo/Convert/HTML.pm:6978
! #: tp/Texinfo/Convert/HTML.pm:7037 tp/Texinfo/Convert/HTML.pm:7115
! #: tp/Texinfo/Convert/HTML.pm:7192 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:547
! #: tp/Texinfo/Convert/TexinfoXML.pm:458
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:862
  msgid "recursion is always allowed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:863
  msgid "arguments are quoted by default"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:866
! msgid ""
! "move your @contents command if you want the contents after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:869
! msgid ""
! "move your @shortcontents and @contents commands if you want the contents "
! "after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:1093
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1098
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1116
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1139
  #, perl-format
  msgid "could not read %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1158
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1164 tp/Texinfo/Parser.pm:3193
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1637
  msgid "no node to be renamed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1648
  msgid "nodes without a new name at the end of file"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1658 tp/Texinfo/Parser.pm:899
  #, perl-format
  msgid "could not open %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:2178
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:387 tp/Texinfo/Convert/Converter.pm:406
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:786
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:868 tp/Texinfo/Convert/Converter.pm:901
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:7004
! #: tp/Texinfo/Convert/HTML.pm:7063 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:477 tp/Texinfo/Parser.pm:1996
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:979
  #, perl-format
  msgid "could not create directories `%s' or `%s': %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, perl-format
  msgid "could not create directory `%s': %s"
***************
*** 1996,2094 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5388
  msgid "no argument specified for @U"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:1683
  #, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:2371
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4888
  msgid "string not closed in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4890
  msgid "--css-include ended in comment"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4892
  msgid "@import not finished in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4918
  #, perl-format
  msgid "CSS file %s not found"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4924
  #, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4934
  #, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:5801 tp/Texinfo/Convert/HTML.pm:5805
  #, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6499
  #, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6523
  #, perl-format
  msgid "error on closing TOC frame file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6638
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6839
  msgid "must specify a title with a title command or @top"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7048
  #, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7073
  #, perl-format
  msgid "old name for `%s' is a node of the document"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7079
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7093
  #, perl-format
  msgid "target node (new name for `%s') not in document: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7125
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7163
  msgid "empty node name"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7165 tp/Texinfo/Parser.pm:3697
  #, perl-format
  msgid "syntax for an external node used for `%s'"
--- 1973,2090 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5225
  msgid "no argument specified for @U"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:1715
  #, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:2399
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4629
! #, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr ""
! 
! #: tp/Texinfo/Convert/HTML.pm:4657
! msgid "missing type"
! msgstr ""
! 
! #: tp/Texinfo/Convert/HTML.pm:4660
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr ""
! 
! #: tp/Texinfo/Convert/HTML.pm:4677
! #, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr ""
! 
! #: tp/Texinfo/Convert/HTML.pm:4962
  msgid "string not closed in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4964
  msgid "--css-include ended in comment"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4966
  msgid "@import not finished in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4992
  #, perl-format
  msgid "CSS file %s not found"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4998
  #, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:5008
  #, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:5870 tp/Texinfo/Convert/HTML.pm:5874
  #, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6568
  #, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6592
  #, perl-format
  msgid "error on closing TOC frame file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6707
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6912
  msgid "must specify a title with a title command or @top"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7122
  #, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7147
  #, perl-format
  msgid "old name for `%s' is a node of the document"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7153
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7167
  #, perl-format
  msgid "target node (new name for `%s') not in document: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7199
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7237
  msgid "empty node name"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7239 tp/Texinfo/Parser.pm:3542
  #, perl-format
  msgid "syntax for an external node used for `%s'"
***************
*** 2123,2152 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1334
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1381 tp/Texinfo/Parser.pm:2722
  #, perl-format
  msgid "entry for index `%s' outside of any node"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1495
  #, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1500
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1523
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1931
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
--- 2119,2148 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1335
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1382 tp/Texinfo/Parser.pm:2568
  #, perl-format
  msgid "entry for index `%s' outside of any node"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1496
  #, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1501
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1524
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1932
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
***************
*** 2154,2471 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2161
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2193
  #, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2226
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2272
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2275
  msgid "`.' or `,' must follow @xref"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3118
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3129
  msgid "menu entry node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3145
  msgid "menu entry name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:910
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1160 tp/Texinfo/Structuring.pm:594
  #, perl-format
  msgid "multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1194
  #, perl-format
! msgid "bad syntax for @%s argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1210
  #, perl-format
! msgid "bad or empty @%s formal argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1219 tp/Texinfo/Parser.pm:4856
! #: tp/Texinfo/Parser.pm:4882 tp/Texinfo/Parser.pm:5671
! #: tp/Texinfo/Parser.pm:5687 tp/Texinfo/Parser.pm:5702
  #, perl-format
  msgid "%c%s requires a name"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1223 tp/Texinfo/Parser.pm:4859
! #: tp/Texinfo/Parser.pm:4885 tp/Texinfo/Parser.pm:5674
! #: tp/Texinfo/Parser.pm:5690 tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad name for @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1341
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1345
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1350
  #, perl-format
! msgid "%c%s missing close brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1354
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1476
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1544
  msgid "@itemx must follow @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1712
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1743
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1746
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1750
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1776 tp/Texinfo/Parser.pm:5204
! #: tp/Texinfo/Parser.pm:5470
  #, perl-format
  msgid "misplaced %c"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1874 tp/Texinfo/Parser.pm:3312
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2110
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2132
  #, perl-format
! msgid "@%s missing close brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2140
  #, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2175
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2650
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2655
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3016
  #, perl-format
  msgid "missing name for @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3021
  #, perl-format
  msgid "missing category for @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3073
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3089
  msgid "empty multitable"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3145 tp/Texinfo/Parser.pm:5784
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3151 tp/Texinfo/Parser.pm:5806
! #: tp/Texinfo/Parser.pm:5818
  #, perl-format
  msgid "bad argument to @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3162
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3167
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3202
  #, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3290 tp/Texinfo/Parser.pm:3429
! #: tp/Texinfo/Parser.pm:5777
  #, perl-format
  msgid "@%s missing argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3302
  #, perl-format
  msgid "unknown @end %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3324 tp/Texinfo/Parser.pm:3943
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3329 tp/Texinfo/Parser.pm:5861
! #: tp/Texinfo/Parser.pm:5906 tp/Texinfo/Parser.pm:5935
! #: tp/Texinfo/Parser.pm:5976 tp/Texinfo/Parser.pm:6055
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3348
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3360
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3369
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3516
  #, perl-format
  msgid "@%s after the first element"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3523
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3563
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3575
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3677
  #, perl-format
  msgid "empty argument in @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3681
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3724
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3732
  msgid "empty node name in menu entry"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3805
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3937
  #, perl-format
! msgid "@end %s should only appear at a line beginning"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3960
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3963
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3968
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4017
  #, perl-format
  msgid "@%s without associated character"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4087
  #, perl-format
  msgid ""
--- 2150,2468 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2162
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2194
  #, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2227
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2273
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2276
  msgid "`.' or `,' must follow @xref"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3086
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3097
  msgid "menu entry node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3113
  msgid "menu entry name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:883
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1125 tp/Texinfo/Structuring.pm:595
  #, perl-format
  msgid "multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1166
  #, perl-format
! msgid "bad or empty @%s formal argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1176
  #, perl-format
! msgid "bad syntax for @%s argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1183 tp/Texinfo/Parser.pm:4707
! #: tp/Texinfo/Parser.pm:4733 tp/Texinfo/Parser.pm:5565
! #: tp/Texinfo/Parser.pm:5578 tp/Texinfo/Parser.pm:5592
  #, perl-format
  msgid "%c%s requires a name"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1187 tp/Texinfo/Parser.pm:4710
! #: tp/Texinfo/Parser.pm:4736 tp/Texinfo/Parser.pm:5568
! #: tp/Texinfo/Parser.pm:5581 tp/Texinfo/Parser.pm:5595
  #, perl-format
  msgid "bad name for @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1305
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1309
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1314
  #, perl-format
! msgid "%c%s missing closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1318
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1440
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1508
  msgid "@itemx must follow @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1676
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1707
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1710
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1714
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1738 tp/Texinfo/Parser.pm:5070
! #: tp/Texinfo/Parser.pm:5308
  #, perl-format
  msgid "misplaced %c"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1835 tp/Texinfo/Parser.pm:3148
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2072
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2094
  #, perl-format
! msgid "@%s missing closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2102
  #, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2138
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2501
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2506
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2850
  #, perl-format
  msgid "missing name for @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2855
  #, perl-format
  msgid "missing category for @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2890
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2905
  msgid "empty multitable"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2959 tp/Texinfo/Parser.pm:5673
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2965 tp/Texinfo/Parser.pm:5694
! #: tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad argument to @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2976
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2981
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3016
  #, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3124 tp/Texinfo/Parser.pm:3277
! #: tp/Texinfo/Parser.pm:5666
  #, perl-format
  msgid "@%s missing argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3138
  #, perl-format
  msgid "unknown @end %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3161 tp/Texinfo/Parser.pm:3788
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3167 tp/Texinfo/Parser.pm:3245
! #: tp/Texinfo/Parser.pm:5755 tp/Texinfo/Parser.pm:5798
! #: tp/Texinfo/Parser.pm:5827 tp/Texinfo/Parser.pm:5868
! #: tp/Texinfo/Parser.pm:5946
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3188
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3200
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3208
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3364
  #, perl-format
  msgid "@%s after the first element"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3371
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3408
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3420
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3522
  #, perl-format
  msgid "empty argument in @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3526
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3569
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3577
  msgid "empty node name in menu entry"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3650
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3782
  #, perl-format
! msgid "@end %s should only appear at the beginning of a line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3804
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3807
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3812
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3879
  #, perl-format
  msgid "@%s without associated character"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3949
  #, perl-format
  msgid ""
***************
*** 2473,2477 ****
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4111
  #, perl-format
  msgid ""
--- 2470,2474 ----
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3974
  #, perl-format
  msgid ""
***************
*** 2480,2887 ****
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4120
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4176
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4182
  #, perl-format
  msgid "use braces to give a command as an argument to @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4195 tp/Texinfo/Parser.pm:5325
  #, perl-format
  msgid "%c%s expects `i' or `j' as argument, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4207
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4218
  #, perl-format
  msgid "@%s expected braces"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4383
  #, perl-format
  msgid "undefined flag: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4386
  msgid "bad syntax for @value"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4393
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4396
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4405
  #, perl-format
! msgid "@%s should only appear at a line beginning"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4496
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4505
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4631 tp/Texinfo/Parser.pm:4648
! #: tp/Texinfo/Parser.pm:4698
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4658
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4664
  msgid "@tab before @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4667
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4704
  msgid "ignoring @tab outside of multitable"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4708
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4745
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4787
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4791
  msgid "@dircategory after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4979
  #, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4997
  msgid "@direntry after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5005
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5008
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5070
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5078
  #, perl-format
  msgid "unknown command `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5088
  msgid "unexpected @"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5117
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5122
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5130
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5249
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5273
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5292
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5303
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5316
  msgid "@image missing filename argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5348
  #, perl-format
  msgid "@%s missing first argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5393
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5399
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5412
! #, perl-format
! msgid "argument for @U exceeds size of integer: %s"
! msgstr ""
! 
! #: tp/Texinfo/Parser.pm:5418
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5546
  msgid "superfluous arguments for node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5596
  #, perl-format
  msgid "expected @end %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5728
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5801
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5823
  #, perl-format
  msgid "empty @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5831
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5840
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5849
  #, perl-format
  msgid "reserved index name %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5868
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5871
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5914
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5920
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5928
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5944
  #, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5952
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5960
  #, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5968
  #, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5986 tp/Texinfo/Parser.pm:5991
  #, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5999
  #, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:6009
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:6021
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:6031
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:6039
  #, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:6047
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:213
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:245
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:250
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:339
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:488
  #, perl-format
  msgid "@%s not empty"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:544 tp/Texinfo/Structuring.pm:1326
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:557
  #, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:662
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:708
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:715
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:733
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:787
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:814
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:834
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:842
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
--- 2477,2879 ----
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3983
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4038
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4044
  #, perl-format
  msgid "use braces to give a command as an argument to @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4057 tp/Texinfo/Parser.pm:5189
  #, perl-format
  msgid "%c%s expects `i' or `j' as argument, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4068
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4079
  #, perl-format
  msgid "@%s expected braces"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4233
  #, perl-format
  msgid "undefined flag: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4236
  msgid "bad syntax for @value"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4243
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4246
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4255
  #, perl-format
! msgid "@%s should only appear at the beginning of a line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4346
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4355
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4479 tp/Texinfo/Parser.pm:4496
! #: tp/Texinfo/Parser.pm:4546
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4506
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4512
  msgid "@tab before @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4515
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4552
  msgid "ignoring @tab outside of multitable"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4556
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4596
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4638
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4642
  msgid "@dircategory after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4847
  #, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4864
  msgid "@direntry after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4872
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4875
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4937
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4945
  #, perl-format
  msgid "unknown command `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4955
  msgid "unexpected @"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4983
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4988
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4996
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5114
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5138
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5156
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5167
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5180
  msgid "@image missing filename argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5211
  #, perl-format
  msgid "@%s missing first argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5230
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5236
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5253
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5448
  msgid "superfluous arguments for node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5498
  #, perl-format
  msgid "expected @end %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5607
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5617
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5689
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5710
  #, perl-format
  msgid "empty @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5727
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5736
  #, perl-format
  msgid "reserved index name %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5762
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5765
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5793
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5806
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5812
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5820
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5836
  #, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5844
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5852
  #, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5860
  #, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5878 tp/Texinfo/Parser.pm:5883
  #, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5891
  #, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5913
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5922
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5930
  #, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5938
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:216
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:248
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:253
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:342
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:491
  #, perl-format
  msgid "@%s not empty"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:547 tp/Texinfo/Structuring.pm:1325
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:558
  #, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:663
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:706
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:713
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:731
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:786
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:810
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:829
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:837
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
***************
*** 2893,2897 ****
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:2070
  #, perl-format
  msgid "empty index key in @%s"
--- 2885,2889 ----
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:2067
  #, perl-format
  msgid "empty index key in @%s"
***************
*** 3275,3293 ****
  msgstr ""
  
! #: tp/texi2any.pl:1232
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
  
! #: tp/texi2any.pl:1255
  #, perl-format
  msgid "error on closing macro expand file %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1261
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1286
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
--- 3267,3285 ----
  msgstr ""
  
! #: tp/texi2any.pl:1239
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
  
! #: tp/texi2any.pl:1262
  #, perl-format
  msgid "error on closing macro expand file %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1268
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1293
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
***************
*** 3295,3309 ****
  msgstr ""
  
! #: tp/texi2any.pl:1359 tp/texi2any.pl:1435
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1382 tp/texi2any.pl:1416
  #, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1388 tp/texi2any.pl:1422
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
--- 3287,3301 ----
  msgstr ""
  
! #: tp/texi2any.pl:1366 tp/texi2any.pl:1442
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1389 tp/texi2any.pl:1423
  #, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1395 tp/texi2any.pl:1429
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
Binary files texinfo-6.1/po/tr.gmo and texinfo-6.3/po/tr.gmo differ
diff -Nrc2 texinfo-6.1/po/tr.po texinfo-6.3/po/tr.po
*** texinfo-6.1/po/tr.po	2016-02-06 11:35:55.000000000 +0000
--- texinfo-6.3/po/tr.po	2016-09-10 12:45:57.000000000 +0100
***************
*** 8,12 ****
  "Project-Id-Version: texinfo 5.9.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
  "PO-Revision-Date: 2015-03-13 09:29-0500\n"
  "Last-Translator: EyÃ¼p Hakan Duran <hakan_duran@hotmail.com>\n"
--- 8,12 ----
  "Project-Id-Version: texinfo 5.9.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:45+0100\n"
  "PO-Revision-Date: 2015-03-13 09:29-0500\n"
  "Last-Translator: EyÃ¼p Hakan Duran <hakan_duran@hotmail.com>\n"
***************
*** 16,19 ****
--- 16,20 ----
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
+ "X-Bugs: Report translation errors to the Language-Team address.\n"
  "X-Generator: Lokalize 1.5\n"
  "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
***************
*** 114,118 ****
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [ or [^"
  msgstr "EÅŸleÅŸmemiÅŸ [ ya da [^"
  
--- 115,120 ----
  
  #: gnulib/lib/regcomp.c:156
! #, fuzzy
! msgid "Unmatched [, [^, [:, [., or [="
  msgstr "EÅŸleÅŸmemiÅŸ [ ya da [^"
  
***************
*** 153,157 ****
  msgstr "EÅŸleÅŸmemiÅŸ ) ya da \\)"
  
! #: gnulib/lib/regcomp.c:711
  msgid "No previous regular expression"
  msgstr "Ã–ncesinde dÃ¼zenli ifade yok"
--- 155,159 ----
  msgstr "EÅŸleÅŸmemiÅŸ ) ya da \\)"
  
! #: gnulib/lib/regcomp.c:687
  msgid "No previous regular expression"
  msgstr "Ã–ncesinde dÃ¼zenli ifade yok"
***************
*** 306,310 ****
  msgstr "----------- Dipnotlar ---------"
  
! #: info/indices.c:123 info/indices.c:812
  #, c-format
  msgid "Finding index entries..."
--- 308,312 ----
  msgstr "----------- Dipnotlar ---------"
  
! #: info/indices.c:123 info/indices.c:822
  #, c-format
  msgid "Finding index entries..."
***************
*** 315,319 ****
  msgstr "Bu dosyada indeks iÃ§inde bir dizgeyi arar"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:818
  #, c-format
  msgid "No indices found."
--- 317,321 ----
  msgstr "Bu dosyada indeks iÃ§inde bir dizgeyi arar"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:828
  #, c-format
  msgid "No indices found."
***************
*** 347,361 ****
  msgstr "'%s' iÃ§eren daha baÅŸka indeks girdisi yok."
  
! #: info/indices.c:476 info/indices.c:880
  #, c-format
  msgid "No index entries containing '%s'."
  msgstr "'%s' iÃ§eren indeks girdisi yok."
  
! #: info/indices.c:583
  #, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "'%s' indislerini tarÄ±yor..."
  
! #: info/indices.c:636
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
--- 349,363 ----
  msgstr "'%s' iÃ§eren daha baÅŸka indeks girdisi yok."
  
! #: info/indices.c:476 info/indices.c:890
  #, c-format
  msgid "No index entries containing '%s'."
  msgstr "'%s' iÃ§eren indeks girdisi yok."
  
! #: info/indices.c:586
  #, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "'%s' indislerini tarÄ±yor..."
  
! #: info/indices.c:646
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
***************
*** 363,380 ****
  "menu oluÅŸturur"
  
! #: info/indices.c:644 info/indices.c:646
  msgid "Index apropos"
  msgstr "Ä°ndeks hakkÄ±nda"
  
! #: info/indices.c:688
  #, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "'%s' iÃ§eren indeks girdileri:\n"
  
! #: info/indices.c:797
  msgid "List all matches of a string in the index"
  msgstr "Ä°ndekste dizgeyle eÅŸleÅŸenleri listele"
  
! #: info/indices.c:824 info/indices.c:826
  msgid "Index topic"
  msgstr "Ä°ndeks konusu"
--- 365,382 ----
  "menu oluÅŸturur"
  
! #: info/indices.c:654 info/indices.c:656
  msgid "Index apropos"
  msgstr "Ä°ndeks hakkÄ±nda"
  
! #: info/indices.c:698
  #, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "'%s' iÃ§eren indeks girdileri:\n"
  
! #: info/indices.c:807
  msgid "List all matches of a string in the index"
  msgstr "Ä°ndekste dizgeyle eÅŸleÅŸenleri listele"
  
! #: info/indices.c:834 info/indices.c:836
  msgid "Index topic"
  msgstr "Ä°ndeks konusu"
***************
*** 385,439 ****
  msgstr "Mevcut bilgi dosyalarÄ±ndan hiÃ§birisinin indisinde '%s' yok."
  
! #: info/info-utils.c:892
  #, c-format
  msgid "Error converting file character encoding."
  msgstr "Dosya karakter kodlamasÄ±nÄ± dÃ¶nÃ¼ÅŸtÃ¼rmede hata."
  
! #: info/info.c:222 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "'%2$s' dÃ¼ÄŸÃ¼mÃ¼nde '%1$s' menÃ¼ Ã¶ÄŸesi yok."
  
! #: info/info.c:315
! #, c-format
! msgid "No file given for node '%s'."
! msgstr "DÃ¼ÄŸÃ¼m '%s' iÃ§in dosya yok."
! 
! #: info/info.c:364 info/info.c:1133
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr "'%s' dÃ¼ÄŸÃ¼mÃ¼ bulunamadÄ±."
  
! #: info/info.c:386
  #, c-format
  msgid "No program name given."
  msgstr "Program adÄ± verilmedi."
  
! #: info/info.c:577
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "GeÃ§ersiz numara: %s\n"
  
! #: info/info.c:757
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "kusurlu deÄŸiÅŸken atamasÄ±: %s"
  
! #: info/info.c:764 info/infokey.c:537
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: bÃ¶yle bir deÄŸiÅŸken yok"
  
! #: info/info.c:770 info/infokey.c:539
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "%1$s deÄŸeri %2$s deÄŸiÅŸkeni iÃ§in geÃ§erli deÄŸil"
  
! #: info/info.c:782
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "Daha fazla bilgi iÃ§in --help seÃ§eneÄŸini kullanÄ±n.\n"
  
! #: info/info.c:804 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
--- 387,436 ----
  msgstr "Mevcut bilgi dosyalarÄ±ndan hiÃ§birisinin indisinde '%s' yok."
  
! #: info/info-utils.c:879
  #, c-format
  msgid "Error converting file character encoding."
  msgstr "Dosya karakter kodlamasÄ±nÄ± dÃ¶nÃ¼ÅŸtÃ¼rmede hata."
  
! #: info/info.c:279 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "'%2$s' dÃ¼ÄŸÃ¼mÃ¼nde '%1$s' menÃ¼ Ã¶ÄŸesi yok."
  
! #: info/info.c:416 info/info.c:1148
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr "'%s' dÃ¼ÄŸÃ¼mÃ¼ bulunamadÄ±."
  
! #: info/info.c:438
  #, c-format
  msgid "No program name given."
  msgstr "Program adÄ± verilmedi."
  
! #: info/info.c:636
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "GeÃ§ersiz numara: %s\n"
  
! #: info/info.c:816
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "kusurlu deÄŸiÅŸken atamasÄ±: %s"
  
! #: info/info.c:823 info/infokey.c:540
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: bÃ¶yle bir deÄŸiÅŸken yok"
  
! #: info/info.c:829 info/infokey.c:542
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "%1$s deÄŸeri %2$s deÄŸiÅŸkeni iÃ§in geÃ§erli deÄŸil"
  
! #: info/info.c:841
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "Daha fazla bilgi iÃ§in --help seÃ§eneÄŸini kullanÄ±n.\n"
  
! #: info/info.c:860 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
***************
*** 450,459 ****
  "YasalarÄ±n elverdiÄŸi Ã¶lÃ§Ã¼de HÄ°Ã‡BÄ°R GARANTÄ° yoktur.\n"
  
! #: info/info.c:981
  #, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "'%s' iÃ§in indeks girdisi yok.\n"
  
! #: info/info.c:1034
  #, c-format
  msgid ""
--- 447,456 ----
  "YasalarÄ±n elverdiÄŸi Ã¶lÃ§Ã¼de HÄ°Ã‡BÄ°R GARANTÄ° yoktur.\n"
  
! #: info/info.c:999
  #, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "'%s' iÃ§in indeks girdisi yok.\n"
  
! #: info/info.c:1049
  #, c-format
  msgid ""
***************
*** 466,470 ****
  "Info biÃ§emindeki belgeleri okuyun.\n"
  
! #: info/info.c:1040
  msgid ""
  "Options:\n"
--- 463,467 ----
  "Info biÃ§emindeki belgeleri okuyun.\n"
  
! #: info/info.c:1055
  msgid ""
  "Options:\n"
***************
*** 485,489 ****
  "  -f, --file=DOSYAADI          ziyaret edilecek Info dosyasÄ±nÄ± belirler."
  
! #: info/info.c:1048
  msgid ""
  "  -h, --help                   display this help and exit.\n"
--- 482,486 ----
  "  -f, --file=DOSYAADI          ziyaret edilecek Info dosyasÄ±nÄ± belirler."
  
! #: info/info.c:1063
  msgid ""
  "  -h, --help                   display this help and exit.\n"
***************
*** 499,503 ****
  "  -o, --output=DOSYAADI        SeÃ§ili dÃ¼ÄŸÃ¼mlerden DOSYAADI'na Ã§Ä±ktÄ± alÄ±r."
  
! #: info/info.c:1054
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
--- 496,500 ----
  "  -o, --output=DOSYAADI        SeÃ§ili dÃ¼ÄŸÃ¼mlerden DOSYAADI'na Ã§Ä±ktÄ± alÄ±r."
  
! #: info/info.c:1069
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
***************
*** 512,520 ****
  "  -Q, --show-options, --usage  komut satÄ±rÄ± seÃ§enekler dÃ¼ÄŸÃ¼mÃ¼ne gider."
  
! #: info/info.c:1061
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr "  -b, --speech-friendly       konuÅŸma sentezcilerine dostÃ§a davranÄ±r."
  
! #: info/info.c:1065
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
--- 509,517 ----
  "  -Q, --show-options, --usage  komut satÄ±rÄ± seÃ§enekler dÃ¼ÄŸÃ¼mÃ¼ne gider."
  
! #: info/info.c:1076
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr "  -b, --speech-friendly       konuÅŸma sentezcilerine dostÃ§a davranÄ±r."
  
! #: info/info.c:1080
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
***************
*** 537,541 ****
  "  -x, --debug=NUMARA        hata ayÄ±klama dÃ¼zeyini belirler (tÃ¼mÃ¼ iÃ§in -1).\n"
  
! #: info/info.c:1074
  msgid ""
  "\n"
--- 534,538 ----
  "  -x, --debug=NUMARA        hata ayÄ±klama dÃ¼zeyini belirler (tÃ¼mÃ¼ iÃ§in -1).\n"
  
! #: info/info.c:1089
  msgid ""
  "\n"
***************
*** 553,557 ****
  "Ã¶gesi isimleri olarak iÅŸlem gÃ¶rÃ¼r."
  
! #: info/info.c:1081
  msgid ""
  "\n"
--- 550,554 ----
  "Ã¶gesi isimleri olarak iÅŸlem gÃ¶rÃ¼r."
  
! #: info/info.c:1096
  msgid ""
  "\n"
***************
*** 561,565 ****
  "TuÅŸ baÄŸlantÄ±larÄ±nÄ±n bir Ã¶zeti iÃ§in Info iÃ§inden H tuÅŸlayÄ±n."
  
! #: info/info.c:1084
  msgid ""
  "\n"
--- 558,562 ----
  "TuÅŸ baÄŸlantÄ±larÄ±nÄ±n bir Ã¶zeti iÃ§in Info iÃ§inden H tuÅŸlayÄ±n."
  
! #: info/info.c:1099
  msgid ""
  "\n"
***************
*** 594,598 ****
  "  info -f ./foo.info         dir aramadan ./foo.info dosyasÄ±nÄ± gÃ¶sterir"
  
! #: info/info.c:1099 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
--- 591,595 ----
  "  info -f ./foo.info         dir aramadan ./foo.info dosyasÄ±nÄ± gÃ¶sterir"
  
! #: info/info.c:1114 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
***************
*** 604,668 ****
  "Texinfo anasayfasÄ±: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1134
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "'(%s)%s' dÃ¼ÄŸÃ¼mÃ¼ bulunamadÄ±."
  
! #: info/info.c:1135
  msgid "Cannot find a window!"
  msgstr "Bir pencere bulunamadÄ±!"
  
! #: info/info.c:1136
  msgid "Point doesn't appear within this window's node!"
  msgstr "OrasÄ± bu pencerenin dÃ¼ÄŸÃ¼mÃ¼ gibi gÃ¶rÃ¼nmÃ¼yor!"
  
! #: info/info.c:1137
  msgid "Cannot delete the last window."
  msgstr "Son pencere silinemez."
  
! #: info/info.c:1138
  msgid "No menu in this node."
  msgstr "Bu dÃ¼ÄŸÃ¼mde menÃ¼ yok."
  
! #: info/info.c:1139
  msgid "No footnotes in this node."
  msgstr "Bu dÃ¼ÄŸÃ¼mde dipnot yok."
  
! #: info/info.c:1140
  msgid "No cross references in this node."
  msgstr "Bu dÃ¼ÄŸÃ¼mde Ã§apraz baÅŸvuru yok."
  
! #: info/info.c:1141
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Bu dÃ¼ÄŸÃ¼m iÃ§in '%s' yer gÃ¶sterici yok."
  
! #: info/info.c:1142
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "Info komutu '%c' bilinmiyor; yardÄ±m almak iÃ§in '?' deneyin."
  
! #: info/info.c:1143
  #, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "'%s' terminal tÃ¼rÃ¼ Info Ã§alÄ±ÅŸtÄ±rmak iÃ§in yeterince akÄ±llÄ± deÄŸil."
  
! #: info/info.c:1144
  msgid "You are already at the last page of this node."
  msgstr "Zaten bu dÃ¼ÄŸÃ¼mÃ¼n son sayfasÄ±ndasÄ±nÄ±z."
  
! #: info/info.c:1145
  msgid "You are already at the first page of this node."
  msgstr "Zaten bu dÃ¼ÄŸÃ¼mÃ¼n ilk sayfasÄ±ndasÄ±nÄ±z."
  
! #: info/info.c:1146
  msgid "Only one window."
  msgstr "Sadece bir pencere."
  
! #: info/info.c:1147
  msgid "Resulting window would be too small."
  msgstr "Pencere Ã§ok kÃ¼Ã§Ã¼k olacaktÄ±."
  
! #: info/info.c:1148
  msgid "Not enough room for a help window, please delete a window."
  msgstr "Bir yardÄ±m penceresi iÃ§in yer yok, lÃ¼tfen bir pencere silin."
--- 601,665 ----
  "Texinfo anasayfasÄ±: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1149
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "'(%s)%s' dÃ¼ÄŸÃ¼mÃ¼ bulunamadÄ±."
  
! #: info/info.c:1150
  msgid "Cannot find a window!"
  msgstr "Bir pencere bulunamadÄ±!"
  
! #: info/info.c:1151
  msgid "Point doesn't appear within this window's node!"
  msgstr "OrasÄ± bu pencerenin dÃ¼ÄŸÃ¼mÃ¼ gibi gÃ¶rÃ¼nmÃ¼yor!"
  
! #: info/info.c:1152
  msgid "Cannot delete the last window."
  msgstr "Son pencere silinemez."
  
! #: info/info.c:1153
  msgid "No menu in this node."
  msgstr "Bu dÃ¼ÄŸÃ¼mde menÃ¼ yok."
  
! #: info/info.c:1154
  msgid "No footnotes in this node."
  msgstr "Bu dÃ¼ÄŸÃ¼mde dipnot yok."
  
! #: info/info.c:1155
  msgid "No cross references in this node."
  msgstr "Bu dÃ¼ÄŸÃ¼mde Ã§apraz baÅŸvuru yok."
  
! #: info/info.c:1156
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Bu dÃ¼ÄŸÃ¼m iÃ§in '%s' yer gÃ¶sterici yok."
  
! #: info/info.c:1157
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "Info komutu '%c' bilinmiyor; yardÄ±m almak iÃ§in '?' deneyin."
  
! #: info/info.c:1158
  #, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "'%s' terminal tÃ¼rÃ¼ Info Ã§alÄ±ÅŸtÄ±rmak iÃ§in yeterince akÄ±llÄ± deÄŸil."
  
! #: info/info.c:1159
  msgid "You are already at the last page of this node."
  msgstr "Zaten bu dÃ¼ÄŸÃ¼mÃ¼n son sayfasÄ±ndasÄ±nÄ±z."
  
! #: info/info.c:1160
  msgid "You are already at the first page of this node."
  msgstr "Zaten bu dÃ¼ÄŸÃ¼mÃ¼n ilk sayfasÄ±ndasÄ±nÄ±z."
  
! #: info/info.c:1161
  msgid "Only one window."
  msgstr "Sadece bir pencere."
  
! #: info/info.c:1162
  msgid "Resulting window would be too small."
  msgstr "Pencere Ã§ok kÃ¼Ã§Ã¼k olacaktÄ±."
  
! #: info/info.c:1163
  msgid "Not enough room for a help window, please delete a window."
  msgstr "Bir yardÄ±m penceresi iÃ§in yer yok, lÃ¼tfen bir pencere silin."
***************
*** 931,965 ****
  msgstr "bilinmeyen eylem `%s'"
  
! #: info/infokey.c:482
  #, c-format
  msgid "action name too long"
  msgstr "eylem adÄ± Ã§ok uzun"
  
! #: info/infokey.c:495
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "`%s' eylemini izleyen fazladan karakterler"
  
! #: info/infokey.c:506
  #, c-format
  msgid "missing variable name"
  msgstr "kayÄ±p deÄŸiÅŸken adÄ±"
  
! #: info/infokey.c:515
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "deÄŸiÅŸken adÄ±ndan hemen sonra kayÄ±p `=' "
  
! #: info/infokey.c:522
  #, c-format
  msgid "variable name too long"
  msgstr "deÄŸiÅŸken adÄ± Ã§ok uzun"
  
! #: info/infokey.c:546
  #, c-format
  msgid "value too long"
  msgstr "deÄŸer Ã§ok uzun"
  
! #: info/infokey.c:592
  #, c-format
  msgid "\"%s\", line %u: "
--- 928,962 ----
  msgstr "bilinmeyen eylem `%s'"
  
! #: info/infokey.c:485
  #, c-format
  msgid "action name too long"
  msgstr "eylem adÄ± Ã§ok uzun"
  
! #: info/infokey.c:498
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "`%s' eylemini izleyen fazladan karakterler"
  
! #: info/infokey.c:509
  #, c-format
  msgid "missing variable name"
  msgstr "kayÄ±p deÄŸiÅŸken adÄ±"
  
! #: info/infokey.c:518
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "deÄŸiÅŸken adÄ±ndan hemen sonra kayÄ±p `=' "
  
! #: info/infokey.c:525
  #, c-format
  msgid "variable name too long"
  msgstr "deÄŸiÅŸken adÄ± Ã§ok uzun"
  
! #: info/infokey.c:549
  #, c-format
  msgid "value too long"
  msgstr "deÄŸer Ã§ok uzun"
  
! #: info/infokey.c:595
  #, c-format
  msgid "\"%s\", line %u: "
***************
*** 1295,1633 ****
  msgstr "'%2$s''de '%1$s' tarafÄ±ndan baÅŸvurulan dÃ¼ÄŸÃ¼m bulunamadÄ±."
  
! #: info/session.c:2864
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "Dizinden baÅŸlayarak bir menÃ¼ listesini oku ve izle"
  
! #: info/session.c:2866
  msgid "Follow menus: "
  msgstr "MenÃ¼leri izle: "
  
! #: info/session.c:2971
  msgid "Select the Next node"
  msgstr "Sonraki dÃ¼ÄŸÃ¼mÃ¼ seÃ§er"
  
! #: info/session.c:2978
  msgid "Select the Prev node"
  msgstr "Ã–nceki dÃ¼ÄŸÃ¼mÃ¼ seÃ§er"
  
! #: info/session.c:2985
  msgid "Select the Up node"
  msgstr "Ãœstteki dÃ¼ÄŸÃ¼mÃ¼ seÃ§er"
  
! #: info/session.c:2991
  msgid "Select the last node in this file"
  msgstr "Bu dosyadaki son dÃ¼ÄŸÃ¼mÃ¼ seÃ§er"
  
! #: info/session.c:3018 info/session.c:3051
  msgid "This window has no additional nodes"
  msgstr "Bu pencerenin baÅŸka dÃ¼ÄŸÃ¼mÃ¼ yok"
  
! #: info/session.c:3024
  msgid "Select the first node in this file"
  msgstr "Bu dosyadaki ilk dÃ¼ÄŸÃ¼mÃ¼ seÃ§er"
  
! #: info/session.c:3158
  msgid "No more nodes within this document."
  msgstr "Bu belge iÃ§inde baÅŸka dÃ¼ÄŸÃ¼m yok."
  
! #: info/session.c:3203 info/session.c:3243
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "Bu belge iÃ§inde, bu dÃ¼ÄŸÃ¼m iÃ§in `Ã–nceki' ya da `YukarÄ±' yok."
  
! #: info/session.c:3256
  msgid "Move forwards or down through node structure"
  msgstr "DÃ¼ÄŸÃ¼m yapÄ±sÄ± iÃ§inde ileriye ya da aÅŸaÄŸÄ±ya gider"
  
! #: info/session.c:3273
  msgid "Move backwards or up through node structure"
  msgstr "DÃ¼ÄŸÃ¼m yapÄ±sÄ± iÃ§inde geriye ya da yukarÄ±ya gider"
  
! #: info/session.c:3296
  msgid "Read a node name and select it"
  msgstr "Bir dÃ¼ÄŸÃ¼m adÄ± okur ve seÃ§er"
  
! #: info/session.c:3350 info/session.c:3354
  msgid "Goto node: "
  msgstr "DÃ¼ÄŸÃ¼me gider: "
  
! #: info/session.c:3533
  msgid "Find the node describing program invocation"
  msgstr "Program Ã§aÄŸÄ±rmayÄ± aÃ§Ä±klayan dÃ¼ÄŸÃ¼mÃ¼ bulur"
  
! #: info/session.c:3535
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "[%s]'in Ã§aÄŸÄ±rma dÃ¼ÄŸÃ¼mÃ¼nÃ¼ bulur: "
  
! #: info/session.c:3580
  msgid "Read a manpage reference and select it"
  msgstr "Bir klavuz sayfasÄ± baÅŸvurusunu okur ve seÃ§er"
  
! #: info/session.c:3584
  msgid "Get Manpage: "
  msgstr "AlÄ±nacak klavuz sayfasÄ±: "
  
! #: info/session.c:3605
  msgid "Select the node 'Top' in this file"
  msgstr "Bu dosyadaki `En Ãœst' dÃ¼ÄŸÃ¼mÃ¼ seÃ§"
  
! #: info/session.c:3611
  msgid "Select the node '(dir)'"
  msgstr "'(dizin)' dÃ¼ÄŸÃ¼mÃ¼nÃ¼ seÃ§"
  
! #: info/session.c:3617
  msgid "Show full file name of node being displayed"
  msgstr "GÃ¶rÃ¼ntÃ¼lenen dÃ¼ÄŸÃ¼mÃ¼n tam dosya adÄ±nÄ± gÃ¶ster"
  
! #: info/session.c:3634
  msgid "Select the most recently selected node"
  msgstr "En son seÃ§ilen dÃ¼ÄŸÃ¼mÃ¼ seÃ§er"
  
! #: info/session.c:3639
  #, c-format
  msgid "No earlier node in history"
  msgstr "GeÃ§miÅŸte daha Ã¶nceki bir dÃ¼ÄŸÃ¼m yok"
  
! #: info/session.c:3643
  msgid "Read the name of a file and select it"
  msgstr "Bir dosyanÄ±n adÄ±nÄ± okur ve seÃ§er"
  
! #: info/session.c:3647
  msgid "Find file: "
  msgstr "DosyayÄ± bul: "
  
! #: info/session.c:3664
  #, c-format
  msgid "Cannot find '%s'."
  msgstr "'%s' bulunamÄ±yor."
  
! #: info/session.c:3713
  #, c-format
  msgid "Could not create output file '%s'."
  msgstr "Ã‡Ä±ktÄ± dosyasÄ± '%s' oluÅŸturulamÄ±yor."
  
! #: info/session.c:3727
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "%s'e yazma hatasÄ±:%s"
  
! #: info/session.c:3736
  #, c-format
  msgid "closing %s"
  msgstr "%s kapatÄ±lÄ±yor"
  
! #: info/session.c:3785
  #, c-format
  msgid "writing node %s..."
  msgstr "%s dÃ¼ÄŸÃ¼mÃ¼ yazÄ±lÄ±yor..."
  
! #: info/session.c:3831
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "Bu dÃ¼ÄŸÃ¼mÃ¼n iÃ§eriÄŸini INFO_PRINT_COMMAND Ã¼zerinden veri yolla"
  
! #: info/session.c:3859
  #, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Veri yolu '%s''e aÃ§Ä±lamÄ±yor."
  
! #: info/session.c:3864
  #, c-format
  msgid "printing node %s..."
  msgstr "%s dÃ¼ÄŸÃ¼mÃ¼ yazdÄ±rÄ±lÄ±yor..."
  
! #: info/session.c:3872
  #, c-format
  msgid "finished printing node %s"
  msgstr "%s dÃ¼ÄŸÃ¼mÃ¼nÃ¼n yazdÄ±rÄ±lmasÄ± tamamlandÄ±..."
  
! #: info/session.c:3904
  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."
  
! #: info/session.c:4169
  msgid "Search continued from the end of the document."
  msgstr "Arama, belgenin sonundan sÃ¼rdÃ¼rÃ¼lÃ¼yor."
  
! #: info/session.c:4174
  msgid "Search continued from the beginning of the document."
  msgstr "Arama, belgenin baÅŸÄ±ndan sÃ¼rdÃ¼rÃ¼lÃ¼yor."
  
! #: info/session.c:4194
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "%s altdosyasÄ± aranÄ±yor ..."
  
! #: info/session.c:4231
  msgid "Search failed."
  msgstr "Arama baÅŸarÄ±sÄ±z"
  
! #: info/session.c:4248
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Regexp search"
  msgstr "DÃ¼zenli ifade arama"
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Search"
  msgstr "Ara"
  
! #: info/session.c:4250 info/session.c:4256
  msgid " case-sensitively"
  msgstr " bÃ¼yÃ¼k/kÃ¼Ã§Ã¼k harf duyarlÄ± ÅŸekilde "
  
! #: info/session.c:4251 info/session.c:4257
  msgid " backward"
  msgstr " geriye doÄŸru"
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s: "
  
! #: info/session.c:4274
  msgid "Search string too short"
  msgstr "Arama dizgesi Ã§ok kÄ±sa"
  
! #: info/session.c:4467
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4491 info/session.c:4601
  #, fuzzy, c-format
  msgid "No more matches."
  msgstr "EÅŸleÅŸme yok"
  
! #: info/session.c:4628
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4649
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4653 info/session.c:4665
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4661
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4674
  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:4679
  msgid "Read a string and search for it"
  msgstr "Bir dizge okur ve (onu) arar"
  
! #: info/session.c:4685
  msgid "Read a string and search backward for it"
  msgstr "Bir dizge okur ve (onu) geriye doÄŸru arar"
  
! #: info/session.c:4693
  msgid "Repeat last search in the same direction"
  msgstr "Son aramayÄ± aynÄ± yÃ¶nde yineler"
  
! #: info/session.c:4701 info/session.c:4746
  msgid "No previous search string"
  msgstr "Daha Ã¶nceden arama dizgesi yok"
  
! #: info/session.c:4738
  msgid "Repeat last search in the reverse direction"
  msgstr "Son aramayÄ± ters yÃ¶nde yineler"
  
! #: info/session.c:4785
  msgid "Clear displayed search matches"
  msgstr "GÃ¶rÃ¼ntÃ¼lenen eÅŸleÅŸmiÅŸ aramalarÄ± sil"
  
! #: info/session.c:4802 info/session.c:4808
  msgid "Search interactively for a string as you type it"
  msgstr "Bir dizgeyi siz yazarken etkileÅŸimli ÅŸekilde arar"
  
! #: info/session.c:4928
  msgid "Regexp I-search backward: "
  msgstr "DÃ¼zenli ifade I-arama, geriye doÄŸru: "
  
! #: info/session.c:4929
  msgid "I-search backward: "
  msgstr "I-arama, geriye doÄŸru: "
  
! #: info/session.c:4931
  msgid "Regexp I-search: "
  msgstr "DÃ¼zenli ifade I-arama: "
  
! #: info/session.c:4932
  msgid "I-search: "
  msgstr "I-arama: "
  
! #: info/session.c:4957 info/session.c:4960
  msgid "Failing "
  msgstr "BaÅŸarÄ±lamÄ±yor "
  
! #: info/session.c:5326
  msgid "Cancel current operation"
  msgstr "Mevcut iÅŸlemi iptal eder"
  
! #: info/session.c:5333
  msgid "Quit"
  msgstr "Ã‡Ä±k"
  
! #: info/session.c:5338
  msgid "Display version of Info being run"
  msgstr "Ã‡alÄ±ÅŸan Ino'nun sÃ¼rÃ¼m bilgisini gÃ¶rÃ¼ntÃ¼ler"
  
! #: info/session.c:5340
  #, c-format
  msgid "GNU Info version %s"
  msgstr "GNU Info sÃ¼rÃ¼m %s"
  
! #: info/session.c:5345
  msgid "Redraw the display"
  msgstr "GÃ¶rÃ¼ntÃ¼yÃ¼ yeniden Ã§izer"
  
! #: info/session.c:5382
  msgid "Quit using Info"
  msgstr "Info'dan Ã§Ä±kar"
  
! #: info/session.c:5398
  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:5409
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Bilinmeyen komut (%s)."
  
! #: info/session.c:5412
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\" geÃ§ersiz"
  
! #: info/session.c:5413
  #, c-format
  msgid "'%s' is invalid"
  msgstr "'%s' geÃ§ersiz"
  
! #: info/session.c:5731
  msgid "Add this digit to the current numeric argument"
  msgstr "Mevcut sayÄ±sal argÃ¼mana bu sayÄ±yÄ± ekle"
  
! #: info/session.c:5738
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "Mevcut sayÄ±sal argÃ¼manÄ± baÅŸlat (ya da 4'le Ã§arp)"
--- 1292,1630 ----
  msgstr "'%2$s''de '%1$s' tarafÄ±ndan baÅŸvurulan dÃ¼ÄŸÃ¼m bulunamadÄ±."
  
! #: info/session.c:2870
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "Dizinden baÅŸlayarak bir menÃ¼ listesini oku ve izle"
  
! #: info/session.c:2872
  msgid "Follow menus: "
  msgstr "MenÃ¼leri izle: "
  
! #: info/session.c:2977
  msgid "Select the Next node"
  msgstr "Sonraki dÃ¼ÄŸÃ¼mÃ¼ seÃ§er"
  
! #: info/session.c:2984
  msgid "Select the Prev node"
  msgstr "Ã–nceki dÃ¼ÄŸÃ¼mÃ¼ seÃ§er"
  
! #: info/session.c:2991
  msgid "Select the Up node"
  msgstr "Ãœstteki dÃ¼ÄŸÃ¼mÃ¼ seÃ§er"
  
! #: info/session.c:2997
  msgid "Select the last node in this file"
  msgstr "Bu dosyadaki son dÃ¼ÄŸÃ¼mÃ¼ seÃ§er"
  
! #: info/session.c:3024 info/session.c:3057
  msgid "This window has no additional nodes"
  msgstr "Bu pencerenin baÅŸka dÃ¼ÄŸÃ¼mÃ¼ yok"
  
! #: info/session.c:3030
  msgid "Select the first node in this file"
  msgstr "Bu dosyadaki ilk dÃ¼ÄŸÃ¼mÃ¼ seÃ§er"
  
! #: info/session.c:3164
  msgid "No more nodes within this document."
  msgstr "Bu belge iÃ§inde baÅŸka dÃ¼ÄŸÃ¼m yok."
  
! #: info/session.c:3209 info/session.c:3249
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "Bu belge iÃ§inde, bu dÃ¼ÄŸÃ¼m iÃ§in `Ã–nceki' ya da `YukarÄ±' yok."
  
! #: info/session.c:3262
  msgid "Move forwards or down through node structure"
  msgstr "DÃ¼ÄŸÃ¼m yapÄ±sÄ± iÃ§inde ileriye ya da aÅŸaÄŸÄ±ya gider"
  
! #: info/session.c:3279
  msgid "Move backwards or up through node structure"
  msgstr "DÃ¼ÄŸÃ¼m yapÄ±sÄ± iÃ§inde geriye ya da yukarÄ±ya gider"
  
! #: info/session.c:3302
  msgid "Read a node name and select it"
  msgstr "Bir dÃ¼ÄŸÃ¼m adÄ± okur ve seÃ§er"
  
! #: info/session.c:3356 info/session.c:3360
  msgid "Goto node: "
  msgstr "DÃ¼ÄŸÃ¼me gider: "
  
! #: info/session.c:3539
  msgid "Find the node describing program invocation"
  msgstr "Program Ã§aÄŸÄ±rmayÄ± aÃ§Ä±klayan dÃ¼ÄŸÃ¼mÃ¼ bulur"
  
! #: info/session.c:3541
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "[%s]'in Ã§aÄŸÄ±rma dÃ¼ÄŸÃ¼mÃ¼nÃ¼ bulur: "
  
! #: info/session.c:3586
  msgid "Read a manpage reference and select it"
  msgstr "Bir klavuz sayfasÄ± baÅŸvurusunu okur ve seÃ§er"
  
! #: info/session.c:3590
  msgid "Get Manpage: "
  msgstr "AlÄ±nacak klavuz sayfasÄ±: "
  
! #: info/session.c:3611
  msgid "Select the node 'Top' in this file"
  msgstr "Bu dosyadaki `En Ãœst' dÃ¼ÄŸÃ¼mÃ¼ seÃ§"
  
! #: info/session.c:3617
  msgid "Select the node '(dir)'"
  msgstr "'(dizin)' dÃ¼ÄŸÃ¼mÃ¼nÃ¼ seÃ§"
  
! #: info/session.c:3623
  msgid "Show full file name of node being displayed"
  msgstr "GÃ¶rÃ¼ntÃ¼lenen dÃ¼ÄŸÃ¼mÃ¼n tam dosya adÄ±nÄ± gÃ¶ster"
  
! #: info/session.c:3640
  msgid "Select the most recently selected node"
  msgstr "En son seÃ§ilen dÃ¼ÄŸÃ¼mÃ¼ seÃ§er"
  
! #: info/session.c:3645
  #, c-format
  msgid "No earlier node in history"
  msgstr "GeÃ§miÅŸte daha Ã¶nceki bir dÃ¼ÄŸÃ¼m yok"
  
! #: info/session.c:3649
  msgid "Read the name of a file and select it"
  msgstr "Bir dosyanÄ±n adÄ±nÄ± okur ve seÃ§er"
  
! #: info/session.c:3653
  msgid "Find file: "
  msgstr "DosyayÄ± bul: "
  
! #: info/session.c:3670
  #, c-format
  msgid "Cannot find '%s'."
  msgstr "'%s' bulunamÄ±yor."
  
! #: info/session.c:3719
  #, c-format
  msgid "Could not create output file '%s'."
  msgstr "Ã‡Ä±ktÄ± dosyasÄ± '%s' oluÅŸturulamÄ±yor."
  
! #: info/session.c:3733
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "%s'e yazma hatasÄ±:%s"
  
! #: info/session.c:3742
  #, c-format
  msgid "closing %s"
  msgstr "%s kapatÄ±lÄ±yor"
  
! #: info/session.c:3791
  #, c-format
  msgid "writing node %s..."
  msgstr "%s dÃ¼ÄŸÃ¼mÃ¼ yazÄ±lÄ±yor..."
  
! #: info/session.c:3837
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "Bu dÃ¼ÄŸÃ¼mÃ¼n iÃ§eriÄŸini INFO_PRINT_COMMAND Ã¼zerinden veri yolla"
  
! #: info/session.c:3865
  #, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Veri yolu '%s''e aÃ§Ä±lamÄ±yor."
  
! #: info/session.c:3870
  #, c-format
  msgid "printing node %s..."
  msgstr "%s dÃ¼ÄŸÃ¼mÃ¼ yazdÄ±rÄ±lÄ±yor..."
  
! #: info/session.c:3878
  #, c-format
  msgid "finished printing node %s"
  msgstr "%s dÃ¼ÄŸÃ¼mÃ¼nÃ¼n yazdÄ±rÄ±lmasÄ± tamamlandÄ±..."
  
! #: info/session.c:3910
  msgid "Toggle the usage of regular expressions in searches"
  msgstr "Aramalarda dÃ¼zenli ifade kullanÄ±mÄ±na geÃ§"
  
! #: info/session.c:3914
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr "Aramalarda dÃ¼zenli ifade kullanÄ±lÄ±yor."
  
! #: info/session.c:3915
  #, c-format
  msgid "Using literal strings for searches."
  msgstr "Aramalarda yazÄ±lÄ± dizge kullanÄ±lÄ±yor."
  
! #: info/session.c:4175
  msgid "Search continued from the end of the document."
  msgstr "Arama, belgenin sonundan sÃ¼rdÃ¼rÃ¼lÃ¼yor."
  
! #: info/session.c:4180
  msgid "Search continued from the beginning of the document."
  msgstr "Arama, belgenin baÅŸÄ±ndan sÃ¼rdÃ¼rÃ¼lÃ¼yor."
  
! #: info/session.c:4200
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "%s altdosyasÄ± aranÄ±yor ..."
  
! #: info/session.c:4237
  msgid "Search failed."
  msgstr "Arama baÅŸarÄ±sÄ±z"
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Regexp search"
  msgstr "DÃ¼zenli ifade arama"
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Search"
  msgstr "Ara"
  
! #: info/session.c:4256 info/session.c:4262
  msgid " case-sensitively"
  msgstr " bÃ¼yÃ¼k/kÃ¼Ã§Ã¼k harf duyarlÄ± ÅŸekilde "
  
! #: info/session.c:4257 info/session.c:4263
  msgid " backward"
  msgstr " geriye doÄŸru"
  
! #: info/session.c:4260
  #, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s: "
  
! #: info/session.c:4280
  msgid "Search string too short"
  msgstr "Arama dizgesi Ã§ok kÄ±sa"
  
! #: info/session.c:4473
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4497 info/session.c:4607
  #, fuzzy, c-format
  msgid "No more matches."
  msgstr "EÅŸleÅŸme yok"
  
! #: info/session.c:4634
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4655
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4659 info/session.c:4671
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4667
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4680
  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:4685
  msgid "Read a string and search for it"
  msgstr "Bir dizge okur ve (onu) arar"
  
! #: info/session.c:4691
  msgid "Read a string and search backward for it"
  msgstr "Bir dizge okur ve (onu) geriye doÄŸru arar"
  
! #: info/session.c:4699
  msgid "Repeat last search in the same direction"
  msgstr "Son aramayÄ± aynÄ± yÃ¶nde yineler"
  
! #: info/session.c:4707 info/session.c:4752
  msgid "No previous search string"
  msgstr "Daha Ã¶nceden arama dizgesi yok"
  
! #: info/session.c:4744
  msgid "Repeat last search in the reverse direction"
  msgstr "Son aramayÄ± ters yÃ¶nde yineler"
  
! #: info/session.c:4791
  msgid "Clear displayed search matches"
  msgstr "GÃ¶rÃ¼ntÃ¼lenen eÅŸleÅŸmiÅŸ aramalarÄ± sil"
  
! #: info/session.c:4808 info/session.c:4814
  msgid "Search interactively for a string as you type it"
  msgstr "Bir dizgeyi siz yazarken etkileÅŸimli ÅŸekilde arar"
  
! #: info/session.c:4934
  msgid "Regexp I-search backward: "
  msgstr "DÃ¼zenli ifade I-arama, geriye doÄŸru: "
  
! #: info/session.c:4935
  msgid "I-search backward: "
  msgstr "I-arama, geriye doÄŸru: "
  
! #: info/session.c:4937
  msgid "Regexp I-search: "
  msgstr "DÃ¼zenli ifade I-arama: "
  
! #: info/session.c:4938
  msgid "I-search: "
  msgstr "I-arama: "
  
! #: info/session.c:4963 info/session.c:4966
  msgid "Failing "
  msgstr "BaÅŸarÄ±lamÄ±yor "
  
! #: info/session.c:5332
  msgid "Cancel current operation"
  msgstr "Mevcut iÅŸlemi iptal eder"
  
! #: info/session.c:5339
  msgid "Quit"
  msgstr "Ã‡Ä±k"
  
! #: info/session.c:5344
  msgid "Display version of Info being run"
  msgstr "Ã‡alÄ±ÅŸan Ino'nun sÃ¼rÃ¼m bilgisini gÃ¶rÃ¼ntÃ¼ler"
  
! #: info/session.c:5346
  #, c-format
  msgid "GNU Info version %s"
  msgstr "GNU Info sÃ¼rÃ¼m %s"
  
! #: info/session.c:5351
  msgid "Redraw the display"
  msgstr "GÃ¶rÃ¼ntÃ¼yÃ¼ yeniden Ã§izer"
  
! #: info/session.c:5388
  msgid "Quit using Info"
  msgstr "Info'dan Ã§Ä±kar"
  
! #: info/session.c:5404
  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:5415
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Bilinmeyen komut (%s)."
  
! #: info/session.c:5418
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\" geÃ§ersiz"
  
! #: info/session.c:5419
  #, c-format
  msgid "'%s' is invalid"
  msgstr "'%s' geÃ§ersiz"
  
! #: info/session.c:5737
  msgid "Add this digit to the current numeric argument"
  msgstr "Mevcut sayÄ±sal argÃ¼mana bu sayÄ±yÄ± ekle"
  
! #: info/session.c:5744
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "Mevcut sayÄ±sal argÃ¼manÄ± baÅŸlat (ya da 4'le Ã§arp)"
***************
*** 1774,1791 ****
  msgstr "%s'e atanacak deÄŸer (%s): "
  
! #: info/window.c:959
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), satÄ±r ----, "
  
- #: info/window.c:966
- #, c-format
- msgid "-%s---Info: %s, %ld lines --%s--"
- msgstr "-%s---Info: %s, %ld satÄ±r --%s--"
- 
- #: info/window.c:970
- #, fuzzy, c-format
- msgid "-%s---Info: (%s)%s, %ld lines --%s--"
- msgstr "-%s%s-Info: (%s)%s, %ld satÄ±r --%s--"
- 
  #: install-info/install-info.c:292
  #, c-format
--- 1771,1778 ----
  msgstr "%s'e atanacak deÄŸer (%s): "
  
! #: info/window.c:909
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), satÄ±r ----, "
  
  #: install-info/install-info.c:292
  #, c-format
***************
*** 1960,1964 ****
  
  #: install-info/install-info.c:642
! #, c-format
  msgid ""
  "This is the file .../info/dir, which contains the\n"
--- 1947,1951 ----
  
  #: install-info/install-info.c:642
! #, fuzzy, c-format
  msgid ""
  "This is the file .../info/dir, which contains the\n"
***************
*** 1969,1973 ****
  "\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"
--- 1956,1960 ----
  "\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"
***************
*** 2060,2176 ****
  msgstr "`%s' iÃ§in girdi bulunamadÄ±; hiÃ§bir ÅŸey silinmedi"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:855
! #: tp/Texinfo/Convert/Converter.pm:893 tp/Texinfo/Convert/Converter.pm:1204
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6504
! #: tp/Texinfo/Convert/HTML.pm:6528 tp/Texinfo/Convert/HTML.pm:6905
! #: tp/Texinfo/Convert/HTML.pm:6963 tp/Texinfo/Convert/HTML.pm:7041
! #: tp/Texinfo/Convert/HTML.pm:7118 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:546
! #: tp/Texinfo/Convert/TexinfoXML.pm:457
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "%1$s yazmak iÃ§in aÃ§Ä±lamÄ±yor: %2$s"
  
! #: tp/Texinfo/Common.pm:881
  msgid "recursion is always allowed"
  msgstr "yinelemeye her zaman izin verilir"
  
! #: tp/Texinfo/Common.pm:882
  msgid "arguments are quoted by default"
  msgstr "argÃ¼manlar Ã¶ntanÄ±mlÄ± olarak tÄ±rnak iÃ§ine alÄ±nÄ±yor"
  
! #: tp/Texinfo/Common.pm:1105
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s geÃ§erli bir dil kodu deÄŸildir"
  
! #: tp/Texinfo/Common.pm:1110
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s geÃ§erli bir bÃ¶lge kodu deÄŸildir"
  
! #: tp/Texinfo/Common.pm:1128
  #, 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:1151
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "%1$s okunamÄ±yor: %2$s"
  
! #: tp/Texinfo/Common.pm:1170
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "%1$s @verbatiminclude dosyasÄ±nÄ± kapatmada hata: %2$s"
  
! #: tp/Texinfo/Common.pm:1176 tp/Texinfo/Parser.pm:3353
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%1$s: %2$s bulunamÄ±yor"
  
! #: tp/Texinfo/Common.pm:1520
! #, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr "%1$s html baÅŸvuru ayar dosyasÄ± aÃ§Ä±lamÄ±yor: %2$s"
! 
! #: tp/Texinfo/Common.pm:1548
! msgid "missing type"
! msgstr "KayÄ±p tÃ¼r"
! 
! #: tp/Texinfo/Common.pm:1551
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "Bilinmeyen tÃ¼r: %s"
! 
! #: tp/Texinfo/Common.pm:1568
! #, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr "%1$s html baÅŸvuru ayar dosyasÄ±nÄ± kapatmada hata: %2$s"
! 
! #: tp/Texinfo/Common.pm:1603
  msgid "no node to be renamed"
  msgstr "yeniden adlandÄ±rÄ±lacak dÃ¼ÄŸÃ¼m yok"
  
! #: tp/Texinfo/Common.pm:1614
  msgid "nodes without a new name at the end of file"
  msgstr "dosya sonunda yeni adÄ± olmayan dÃ¼ÄŸÃ¼mler"
  
! #: tp/Texinfo/Common.pm:1624 tp/Texinfo/Parser.pm:926
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "%1$s aÃ§Ä±lamÄ±yor: %2$s"
  
! #: tp/Texinfo/Common.pm:2144
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr "@%s iÃ§indeki sayÄ± karakteri korunamÄ±yor"
  
! #: tp/Texinfo/Convert/Converter.pm:395 tp/Texinfo/Convert/Converter.pm:414
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "KullanÄ±m dÄ±ÅŸÄ± deÄŸiÅŸken %s\n"
  
! #: tp/Texinfo/Convert/Converter.pm:794
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr "%s: Ã§Ä±ktÄ± bÃ¶lmeyle uyumsuz"
  
! #: tp/Texinfo/Convert/Converter.pm:876 tp/Texinfo/Convert/Converter.pm:909
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:6931
! #: tp/Texinfo/Convert/HTML.pm:6989 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:476 tp/Texinfo/Parser.pm:2035
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "%1$s'i kapatmada hata: %2$s"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, perl-format
  msgid "could not create directories `%s' or `%s': %s"
  msgstr "`%1$s' ya da `%2$s' dizinleri oluÅŸturulamÄ±yor: %3$s"
  
! #: tp/Texinfo/Convert/Converter.pm:995
  #, perl-format
  msgid "could not create directory `%s': %s"
--- 2047,2155 ----
  msgstr "`%s' iÃ§in girdi bulunamadÄ±; hiÃ§bir ÅŸey silinmedi"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:847
! #: tp/Texinfo/Convert/Converter.pm:885 tp/Texinfo/Convert/Converter.pm:1196
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6573
! #: tp/Texinfo/Convert/HTML.pm:6597 tp/Texinfo/Convert/HTML.pm:6978
! #: tp/Texinfo/Convert/HTML.pm:7037 tp/Texinfo/Convert/HTML.pm:7115
! #: tp/Texinfo/Convert/HTML.pm:7192 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:547
! #: tp/Texinfo/Convert/TexinfoXML.pm:458
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "%1$s yazmak iÃ§in aÃ§Ä±lamÄ±yor: %2$s"
  
! #: tp/Texinfo/Common.pm:862
  msgid "recursion is always allowed"
  msgstr "yinelemeye her zaman izin verilir"
  
! #: tp/Texinfo/Common.pm:863
  msgid "arguments are quoted by default"
  msgstr "argÃ¼manlar Ã¶ntanÄ±mlÄ± olarak tÄ±rnak iÃ§ine alÄ±nÄ±yor"
  
! #: tp/Texinfo/Common.pm:866
! msgid ""
! "move your @contents command if you want the contents after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:869
! msgid ""
! "move your @shortcontents and @contents commands if you want the contents "
! "after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:1093
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s geÃ§erli bir dil kodu deÄŸildir"
  
! #: tp/Texinfo/Common.pm:1098
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s geÃ§erli bir bÃ¶lge kodu deÄŸildir"
  
! #: tp/Texinfo/Common.pm:1116
  #, 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:1139
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "%1$s okunamÄ±yor: %2$s"
  
! #: tp/Texinfo/Common.pm:1158
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "%1$s @verbatiminclude dosyasÄ±nÄ± kapatmada hata: %2$s"
  
! #: tp/Texinfo/Common.pm:1164 tp/Texinfo/Parser.pm:3193
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%1$s: %2$s bulunamÄ±yor"
  
! #: tp/Texinfo/Common.pm:1637
  msgid "no node to be renamed"
  msgstr "yeniden adlandÄ±rÄ±lacak dÃ¼ÄŸÃ¼m yok"
  
! #: tp/Texinfo/Common.pm:1648
  msgid "nodes without a new name at the end of file"
  msgstr "dosya sonunda yeni adÄ± olmayan dÃ¼ÄŸÃ¼mler"
  
! #: tp/Texinfo/Common.pm:1658 tp/Texinfo/Parser.pm:899
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "%1$s aÃ§Ä±lamÄ±yor: %2$s"
  
! #: tp/Texinfo/Common.pm:2178
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr "@%s iÃ§indeki sayÄ± karakteri korunamÄ±yor"
  
! #: tp/Texinfo/Convert/Converter.pm:387 tp/Texinfo/Convert/Converter.pm:406
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "KullanÄ±m dÄ±ÅŸÄ± deÄŸiÅŸken %s\n"
  
! #: tp/Texinfo/Convert/Converter.pm:786
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr "%s: Ã§Ä±ktÄ± bÃ¶lmeyle uyumsuz"
  
! #: tp/Texinfo/Convert/Converter.pm:868 tp/Texinfo/Convert/Converter.pm:901
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:7004
! #: tp/Texinfo/Convert/HTML.pm:7063 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:477 tp/Texinfo/Parser.pm:1996
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "%1$s'i kapatmada hata: %2$s"
  
! #: tp/Texinfo/Convert/Converter.pm:979
  #, perl-format
  msgid "could not create directories `%s' or `%s': %s"
  msgstr "`%1$s' ya da `%2$s' dizinleri oluÅŸturulamÄ±yor: %3$s"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, perl-format
  msgid "could not create directory `%s': %s"
***************
*** 2182,2271 ****
  msgstr "@image dosyasÄ± `%1$s' bulunamÄ±yor, `%2$s' kullanÄ±lacak"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5388
  msgid "no argument specified for @U"
  msgstr "@U iÃ§in argÃ¼man belirtlimedi"
  
! #: tp/Texinfo/Convert/HTML.pm:1683
  #, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
  msgstr "@image dosyasÄ± `%1$s' (HTML iÃ§in) bulunamadÄ±, `%2$s' kullanÄ±lacak"
  
! #: tp/Texinfo/Convert/HTML.pm:2371
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "ham biÃ§em %s dÃ¶nÃ¼ÅŸtÃ¼rÃ¼lmedi"
  
! #: tp/Texinfo/Convert/HTML.pm:4888
  msgid "string not closed in css file"
  msgstr "css dosyasÄ±nda dizge kapatÄ±lmadÄ±"
  
! #: tp/Texinfo/Convert/HTML.pm:4890
  msgid "--css-include ended in comment"
  msgstr "--css-include yorum iÃ§inde sonlandÄ±"
  
! #: tp/Texinfo/Convert/HTML.pm:4892
  msgid "@import not finished in css file"
  msgstr "css dosyasÄ±nda @import bitmedi"
  
! #: tp/Texinfo/Convert/HTML.pm:4918
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "CSS dosyasÄ± %s bulunamadÄ±"
  
! #: tp/Texinfo/Convert/HTML.pm:4924
  #, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "--include-file %1$s aÃ§Ä±lamadÄ±: %2$s"
  
! #: tp/Texinfo/Convert/HTML.pm:4934
  #, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "CSS dosyasÄ± %1$s'i kapatmada hata: %2$s"
  
! #: tp/Texinfo/Convert/HTML.pm:5801 tp/Texinfo/Convert/HTML.pm:5805
  #, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "`%s' iÃ§in htmlxref.cnf girdisi bulunamadÄ±"
  
! #: tp/Texinfo/Convert/HTML.pm:6499
  #, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "Ã§erÃ§eve dosyasÄ± %1$s'i kapatmada hata: %2$s"
  
! #: tp/Texinfo/Convert/HTML.pm:6523
  #, perl-format
  msgid "error on closing TOC frame file %s: %s"
  msgstr "TOC Ã§erÃ§eve dosyasÄ± %1$s'i kapatmada hata: %2$s"
  
! #: tp/Texinfo/Convert/HTML.pm:6638
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr "evre %2$s Ã¶ncelik %3$s'in kotarÄ±cÄ±sÄ± %1$s baÅŸarÄ±sÄ±z"
  
! #: tp/Texinfo/Convert/HTML.pm:6839
  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:7048
  #, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr "yeniden yÃ¶nlendirme dÃ¼ÄŸÃ¼m dosyasÄ± %1$s'i kapatmada hata: %2$s"
  
! #: tp/Texinfo/Convert/HTML.pm:7073
  #, 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:7079
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "yeniden adlandÄ±rÄ±lmÄ±ÅŸ `%s' dÃ¼ÄŸÃ¼m dosyasÄ± boÅŸ"
  
! #: tp/Texinfo/Convert/HTML.pm:7093
  #, 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:7125
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
--- 2161,2269 ----
  msgstr "@image dosyasÄ± `%1$s' bulunamÄ±yor, `%2$s' kullanÄ±lacak"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5225
  msgid "no argument specified for @U"
  msgstr "@U iÃ§in argÃ¼man belirtlimedi"
  
! #: tp/Texinfo/Convert/HTML.pm:1715
  #, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
  msgstr "@image dosyasÄ± `%1$s' (HTML iÃ§in) bulunamadÄ±, `%2$s' kullanÄ±lacak"
  
! #: tp/Texinfo/Convert/HTML.pm:2399
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "ham biÃ§em %s dÃ¶nÃ¼ÅŸtÃ¼rÃ¼lmedi"
  
! #: tp/Texinfo/Convert/HTML.pm:4629
! #, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr "%1$s html baÅŸvuru ayar dosyasÄ± aÃ§Ä±lamÄ±yor: %2$s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4657
! msgid "missing type"
! msgstr "KayÄ±p tÃ¼r"
! 
! #: tp/Texinfo/Convert/HTML.pm:4660
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "Bilinmeyen tÃ¼r: %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4677
! #, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr "%1$s html baÅŸvuru ayar dosyasÄ±nÄ± kapatmada hata: %2$s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4962
  msgid "string not closed in css file"
  msgstr "css dosyasÄ±nda dizge kapatÄ±lmadÄ±"
  
! #: tp/Texinfo/Convert/HTML.pm:4964
  msgid "--css-include ended in comment"
  msgstr "--css-include yorum iÃ§inde sonlandÄ±"
  
! #: tp/Texinfo/Convert/HTML.pm:4966
  msgid "@import not finished in css file"
  msgstr "css dosyasÄ±nda @import bitmedi"
  
! #: tp/Texinfo/Convert/HTML.pm:4992
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "CSS dosyasÄ± %s bulunamadÄ±"
  
! #: tp/Texinfo/Convert/HTML.pm:4998
  #, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "--include-file %1$s aÃ§Ä±lamadÄ±: %2$s"
  
! #: tp/Texinfo/Convert/HTML.pm:5008
  #, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "CSS dosyasÄ± %1$s'i kapatmada hata: %2$s"
  
! #: tp/Texinfo/Convert/HTML.pm:5870 tp/Texinfo/Convert/HTML.pm:5874
  #, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "`%s' iÃ§in htmlxref.cnf girdisi bulunamadÄ±"
  
! #: tp/Texinfo/Convert/HTML.pm:6568
  #, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "Ã§erÃ§eve dosyasÄ± %1$s'i kapatmada hata: %2$s"
  
! #: tp/Texinfo/Convert/HTML.pm:6592
  #, perl-format
  msgid "error on closing TOC frame file %s: %s"
  msgstr "TOC Ã§erÃ§eve dosyasÄ± %1$s'i kapatmada hata: %2$s"
  
! #: tp/Texinfo/Convert/HTML.pm:6707
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr "evre %2$s Ã¶ncelik %3$s'in kotarÄ±cÄ±sÄ± %1$s baÅŸarÄ±sÄ±z"
  
! #: tp/Texinfo/Convert/HTML.pm:6912
  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:7122
  #, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr "yeniden yÃ¶nlendirme dÃ¼ÄŸÃ¼m dosyasÄ± %1$s'i kapatmada hata: %2$s"
  
! #: tp/Texinfo/Convert/HTML.pm:7147
  #, 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:7153
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "yeniden adlandÄ±rÄ±lmÄ±ÅŸ `%s' dÃ¼ÄŸÃ¼m dosyasÄ± boÅŸ"
  
! #: tp/Texinfo/Convert/HTML.pm:7167
  #, 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:7199
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
***************
*** 2274,2282 ****
  "%s"
  
! #: tp/Texinfo/Convert/HTML.pm:7163
  msgid "empty node name"
  msgstr "boÅŸ dÃ¼ÄŸÃ¼m adÄ±"
  
! #: tp/Texinfo/Convert/HTML.pm:7165 tp/Texinfo/Parser.pm:3697
  #, perl-format
  msgid "syntax for an external node used for `%s'"
--- 2272,2280 ----
  "%s"
  
! #: tp/Texinfo/Convert/HTML.pm:7237
  msgid "empty node name"
  msgstr "boÅŸ dÃ¼ÄŸÃ¼m adÄ±"
  
! #: tp/Texinfo/Convert/HTML.pm:7239 tp/Texinfo/Parser.pm:3542
  #, perl-format
  msgid "syntax for an external node used for `%s'"
***************
*** 2311,2340 ****
  msgstr "@node adÄ± `,' iÃ§ermemeli: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1334
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr "@%s 'deki : iÃ§eren dizin girdisi geÃ§ersiz Info Ã¼retiyor: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1381 tp/Texinfo/Parser.pm:2722
  #, 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:1495
  #, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr "Ä°mge metin dosyasÄ± %1$s'i kapatmada hata: %2$s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1500
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "@image dosyasÄ± `%1$s' okunamÄ±yor: %2$s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1523
  #, 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:1931
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
--- 2309,2338 ----
  msgstr "@node adÄ± `,' iÃ§ermemeli: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1335
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr "@%s 'deki : iÃ§eren dizin girdisi geÃ§ersiz Info Ã¼retiyor: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1382 tp/Texinfo/Parser.pm:2568
  #, 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:1496
  #, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr "Ä°mge metin dosyasÄ± %1$s'i kapatmada hata: %2$s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1501
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "@image dosyasÄ± `%1$s' okunamÄ±yor: %2$s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1524
  #, 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:1932
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
***************
*** 2344,2544 ****
  "iÃ§in yazÄ±mÄ± deÄŸiÅŸtirin"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2161
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr "@%s Ã§apraz baÅŸvuru adÄ± `:' iÃ§ermemeli"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2193
  #, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "@%s dÃ¼ÄŸÃ¼m adÄ± `%s' iÃ§ermemeli"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2226
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr "@%s dÃ¼ÄŸÃ¼m adÄ± `:' iÃ§ermemeli"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2272
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "`.' ya da `,' @xref'i izlemelidir, `%s'i deÄŸil"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2275
  msgid "`.' or `,' must follow @xref"
  msgstr "`.' ya da `,' @xref'i izlemelidir"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3118
  #, 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:3129
  msgid "menu entry node name should not contain `:'"
  msgstr "menÃ¼ girdisi dÃ¼ÄŸÃ¼m adÄ± `:' iÃ§ermemeli"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3145
  msgid "menu entry name should not contain `:'"
  msgstr "menÃ¼ girdi adÄ± `:' iÃ§ermemeli"
  
! #: tp/Texinfo/Parser.pm:910
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr "@%s yalnÄ±zca belgenin baÅŸÄ±nda ya da sonunda gÃ¶rÃ¼nmelidir"
  
! #: tp/Texinfo/Parser.pm:1160 tp/Texinfo/Structuring.pm:594
  #, perl-format
  msgid "multiple @%s"
  msgstr "Ã§ok sayÄ±da @%s"
  
! #: tp/Texinfo/Parser.pm:1194
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "@%s argÃ¼manÄ± iÃ§in hatalÄ± sÃ¶zdizimi: %s"
! 
! #: tp/Texinfo/Parser.pm:1210
  #, perl-format
  msgid "bad or empty @%s formal argument: %s"
  msgstr "hatalÄ± ya da boÅŸ @%s resmi argÃ¼manÄ±: %s"
  
! #: tp/Texinfo/Parser.pm:1219 tp/Texinfo/Parser.pm:4856
! #: tp/Texinfo/Parser.pm:4882 tp/Texinfo/Parser.pm:5671
! #: tp/Texinfo/Parser.pm:5687 tp/Texinfo/Parser.pm:5702
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s bir isim gerektirir"
  
! #: tp/Texinfo/Parser.pm:1223 tp/Texinfo/Parser.pm:4859
! #: tp/Texinfo/Parser.pm:4885 tp/Texinfo/Parser.pm:5674
! #: tp/Texinfo/Parser.pm:5690 tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad name for @%s"
  msgstr "@%s iÃ§in kÃ¶tÃ¼ isim"
  
! #: tp/Texinfo/Parser.pm:1341
  #, 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/Parser.pm:1345
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "@%s, @%s'in kapama kÃ¼me parantezinden Ã¶nce gÃ¶rÃ¼ldÃ¼"
  
! #: tp/Texinfo/Parser.pm:1350
! #, perl-format
! msgid "%c%s missing close brace"
  msgstr "%c%s eksik kapama }"
  
! #: tp/Texinfo/Parser.pm:1354
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "@%s kayÄ±p kapanÄ±ÅŸ sÄ±nÄ±r belirteci sÄ±ralÄ± Ã¶geleri: %s}"
  
! #: tp/Texinfo/Parser.pm:1476
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "@itemx baÅŸlamamalÄ± @%s"
  
! #: tp/Texinfo/Parser.pm:1544
  msgid "@itemx must follow @item"
  msgstr "@itemx, @item'dan sonra gelmeli"
  
! #: tp/Texinfo/Parser.pm:1712
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr "@%s'in metni var fakat @item'Ä± yok"
  
! #: tp/Texinfo/Parser.pm:1743
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "`@end'  `%1$s' beklerdi, `%2$s' gÃ¶rdÃ¼"
  
! #: tp/Texinfo/Parser.pm:1746
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@%s, @end'den Ã¶nce gÃ¶rÃ¼ldÃ¼ %s"
  
! #: tp/Texinfo/Parser.pm:1750
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "eÅŸleÅŸen `%cend %s' yok"
  
! #: tp/Texinfo/Parser.pm:1776 tp/Texinfo/Parser.pm:5204
! #: tp/Texinfo/Parser.pm:5470
  #, perl-format
  msgid "misplaced %c"
  msgstr "yanlÄ±ÅŸ yerleÅŸtirilmiÅŸ %c"
  
! #: tp/Texinfo/Parser.pm:1874 tp/Texinfo/Parser.pm:3312
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "eÅŸleÅŸmeyen `%c%s'"
  
! #: tp/Texinfo/Parser.pm:2110
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "makro `%s' Ã§ok sayÄ±da arg.la Ã§aÄŸrÄ±ldÄ±"
  
! #: tp/Texinfo/Parser.pm:2132
! #, perl-format
! msgid "@%s missing close brace"
  msgstr "@%s kayÄ±p kÃ¼me parantezi"
  
! #: tp/Texinfo/Parser.pm:2140
  #, 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/Parser.pm:2175
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
  msgstr "@%s aÃ§Ä±lÄ±mÄ±ndaki \\ paramatre adÄ± ya da \\ yerine `%s'i izliyor"
  
! #: tp/Texinfo/Parser.pm:2650
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s `%s' daha Ã¶nce tanÄ±mlanmÄ±ÅŸ"
  
! #: tp/Texinfo/Parser.pm:2655
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "iÅŸte @%s olarak Ã¶nceki tanÄ±m"
  
! #: tp/Texinfo/Parser.pm:3016
  #, perl-format
  msgid "missing name for @%s"
  msgstr "@%s iÃ§in kayÄ±p isim"
  
! #: tp/Texinfo/Parser.pm:3021
  #, perl-format
  msgid "missing category for @%s"
  msgstr "@%s iÃ§in kayÄ±p kategori"
  
! #: tp/Texinfo/Parser.pm:3073
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "@%s satÄ±rÄ±nda beklenmedik argÃ¼man: %s"
  
! #: tp/Texinfo/Parser.pm:3089
  msgid "empty multitable"
  msgstr "boÅŸ Ã§oklutablo"
  
! #: tp/Texinfo/Parser.pm:3145 tp/Texinfo/Parser.pm:5784
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "@%s'e fazladan argÃ¼man"
  
! #: tp/Texinfo/Parser.pm:3151 tp/Texinfo/Parser.pm:5806
! #: tp/Texinfo/Parser.pm:5818
  #, perl-format
  msgid "bad argument to @%s"
  msgstr "@%s'ye hatalÄ± argÃ¼man"
  
! #: tp/Texinfo/Parser.pm:3162
  #, 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/Parser.pm:3167
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
--- 2342,2542 ----
  "iÃ§in yazÄ±mÄ± deÄŸiÅŸtirin"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2162
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr "@%s Ã§apraz baÅŸvuru adÄ± `:' iÃ§ermemeli"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2194
  #, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "@%s dÃ¼ÄŸÃ¼m adÄ± `%s' iÃ§ermemeli"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2227
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr "@%s dÃ¼ÄŸÃ¼m adÄ± `:' iÃ§ermemeli"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2273
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "`.' ya da `,' @xref'i izlemelidir, `%s'i deÄŸil"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2276
  msgid "`.' or `,' must follow @xref"
  msgstr "`.' ya da `,' @xref'i izlemelidir"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3086
  #, 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:3097
  msgid "menu entry node name should not contain `:'"
  msgstr "menÃ¼ girdisi dÃ¼ÄŸÃ¼m adÄ± `:' iÃ§ermemeli"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3113
  msgid "menu entry name should not contain `:'"
  msgstr "menÃ¼ girdi adÄ± `:' iÃ§ermemeli"
  
! #: tp/Texinfo/Parser.pm:883
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr "@%s yalnÄ±zca belgenin baÅŸÄ±nda ya da sonunda gÃ¶rÃ¼nmelidir"
  
! #: tp/Texinfo/Parser.pm:1125 tp/Texinfo/Structuring.pm:595
  #, perl-format
  msgid "multiple @%s"
  msgstr "Ã§ok sayÄ±da @%s"
  
! #: tp/Texinfo/Parser.pm:1166
  #, perl-format
  msgid "bad or empty @%s formal argument: %s"
  msgstr "hatalÄ± ya da boÅŸ @%s resmi argÃ¼manÄ±: %s"
  
! #: tp/Texinfo/Parser.pm:1176
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "@%s argÃ¼manÄ± iÃ§in hatalÄ± sÃ¶zdizimi: %s"
! 
! #: tp/Texinfo/Parser.pm:1183 tp/Texinfo/Parser.pm:4707
! #: tp/Texinfo/Parser.pm:4733 tp/Texinfo/Parser.pm:5565
! #: tp/Texinfo/Parser.pm:5578 tp/Texinfo/Parser.pm:5592
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s bir isim gerektirir"
  
! #: tp/Texinfo/Parser.pm:1187 tp/Texinfo/Parser.pm:4710
! #: tp/Texinfo/Parser.pm:4736 tp/Texinfo/Parser.pm:5568
! #: tp/Texinfo/Parser.pm:5581 tp/Texinfo/Parser.pm:5595
  #, perl-format
  msgid "bad name for @%s"
  msgstr "@%s iÃ§in kÃ¶tÃ¼ isim"
  
! #: tp/Texinfo/Parser.pm:1305
  #, 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/Parser.pm:1309
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "@%s, @%s'in kapama kÃ¼me parantezinden Ã¶nce gÃ¶rÃ¼ldÃ¼"
  
! #: tp/Texinfo/Parser.pm:1314
! #, fuzzy, perl-format
! msgid "%c%s missing closing brace"
  msgstr "%c%s eksik kapama }"
  
! #: tp/Texinfo/Parser.pm:1318
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "@%s kayÄ±p kapanÄ±ÅŸ sÄ±nÄ±r belirteci sÄ±ralÄ± Ã¶geleri: %s}"
  
! #: tp/Texinfo/Parser.pm:1440
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "@itemx baÅŸlamamalÄ± @%s"
  
! #: tp/Texinfo/Parser.pm:1508
  msgid "@itemx must follow @item"
  msgstr "@itemx, @item'dan sonra gelmeli"
  
! #: tp/Texinfo/Parser.pm:1676
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr "@%s'in metni var fakat @item'Ä± yok"
  
! #: tp/Texinfo/Parser.pm:1707
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "`@end'  `%1$s' beklerdi, `%2$s' gÃ¶rdÃ¼"
  
! #: tp/Texinfo/Parser.pm:1710
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@%s, @end'den Ã¶nce gÃ¶rÃ¼ldÃ¼ %s"
  
! #: tp/Texinfo/Parser.pm:1714
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "eÅŸleÅŸen `%cend %s' yok"
  
! #: tp/Texinfo/Parser.pm:1738 tp/Texinfo/Parser.pm:5070
! #: tp/Texinfo/Parser.pm:5308
  #, perl-format
  msgid "misplaced %c"
  msgstr "yanlÄ±ÅŸ yerleÅŸtirilmiÅŸ %c"
  
! #: tp/Texinfo/Parser.pm:1835 tp/Texinfo/Parser.pm:3148
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "eÅŸleÅŸmeyen `%c%s'"
  
! #: tp/Texinfo/Parser.pm:2072
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "makro `%s' Ã§ok sayÄ±da arg.la Ã§aÄŸrÄ±ldÄ±"
  
! #: tp/Texinfo/Parser.pm:2094
! #, fuzzy, perl-format
! msgid "@%s missing closing brace"
  msgstr "@%s kayÄ±p kÃ¼me parantezi"
  
! #: tp/Texinfo/Parser.pm:2102
  #, 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/Parser.pm:2138
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
  msgstr "@%s aÃ§Ä±lÄ±mÄ±ndaki \\ paramatre adÄ± ya da \\ yerine `%s'i izliyor"
  
! #: tp/Texinfo/Parser.pm:2501
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s `%s' daha Ã¶nce tanÄ±mlanmÄ±ÅŸ"
  
! #: tp/Texinfo/Parser.pm:2506
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "iÅŸte @%s olarak Ã¶nceki tanÄ±m"
  
! #: tp/Texinfo/Parser.pm:2850
  #, perl-format
  msgid "missing name for @%s"
  msgstr "@%s iÃ§in kayÄ±p isim"
  
! #: tp/Texinfo/Parser.pm:2855
  #, perl-format
  msgid "missing category for @%s"
  msgstr "@%s iÃ§in kayÄ±p kategori"
  
! #: tp/Texinfo/Parser.pm:2890
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "@%s satÄ±rÄ±nda beklenmedik argÃ¼man: %s"
  
! #: tp/Texinfo/Parser.pm:2905
  msgid "empty multitable"
  msgstr "boÅŸ Ã§oklutablo"
  
! #: tp/Texinfo/Parser.pm:2959 tp/Texinfo/Parser.pm:5673
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "@%s'e fazladan argÃ¼man"
  
! #: tp/Texinfo/Parser.pm:2965 tp/Texinfo/Parser.pm:5694
! #: tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad argument to @%s"
  msgstr "@%s'ye hatalÄ± argÃ¼man"
  
! #: tp/Texinfo/Parser.pm:2976
  #, 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/Parser.pm:2981
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
***************
*** 2546,2608 ****
  "@%s komutu kÃ¼me parantezi iÃ§inde argÃ¼man kabul etmiyor @%s satÄ±rÄ±nda olmamalÄ±"
  
! #: tp/Texinfo/Parser.pm:3202
  #, 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/Parser.pm:3290 tp/Texinfo/Parser.pm:3429
! #: tp/Texinfo/Parser.pm:5777
  #, perl-format
  msgid "@%s missing argument"
  msgstr "@%s kayÄ±p argÃ¼man"
  
! #: tp/Texinfo/Parser.pm:3302
  #, perl-format
  msgid "unknown @end %s"
  msgstr "bilinmeyen @end %s"
  
! #: tp/Texinfo/Parser.pm:3324 tp/Texinfo/Parser.pm:3943
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "@%s %s'e fazladan argÃ¼man: %s"
  
! #: tp/Texinfo/Parser.pm:3329 tp/Texinfo/Parser.pm:5861
! #: tp/Texinfo/Parser.pm:5906 tp/Texinfo/Parser.pm:5935
! #: tp/Texinfo/Parser.pm:5976 tp/Texinfo/Parser.pm:6055
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "@%s'e hatalÄ± argÃ¼man: %s"
  
! #: tp/Texinfo/Parser.pm:3348
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%s: %s aÃ§Ä±lamÄ±yor: %s"
  
! #: tp/Texinfo/Parser.pm:3360
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr "`%s' kodlamasÄ± kanonik bir texinfo kodlamasÄ± deÄŸil"
  
! #: tp/Texinfo/Parser.pm:3369
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "tanÄ±nmayan kodlama adÄ± `%s'"
  
! #: tp/Texinfo/Parser.pm:3516
  #, perl-format
  msgid "@%s after the first element"
  msgstr "ilk unsurdan sonra @%s"
  
! #: tp/Texinfo/Parser.pm:3523
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s yalnÄ±zca bir @multitable satÄ±rÄ±nda anlamlÄ±dÄ±r"
  
! #: tp/Texinfo/Parser.pm:3563
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "@%s @top ile ilintili olmamalÄ±"
  
! #: tp/Texinfo/Parser.pm:3575
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
--- 2544,2607 ----
  "@%s komutu kÃ¼me parantezi iÃ§inde argÃ¼man kabul etmiyor @%s satÄ±rÄ±nda olmamalÄ±"
  
! #: tp/Texinfo/Parser.pm:3016
  #, 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/Parser.pm:3124 tp/Texinfo/Parser.pm:3277
! #: tp/Texinfo/Parser.pm:5666
  #, perl-format
  msgid "@%s missing argument"
  msgstr "@%s kayÄ±p argÃ¼man"
  
! #: tp/Texinfo/Parser.pm:3138
  #, perl-format
  msgid "unknown @end %s"
  msgstr "bilinmeyen @end %s"
  
! #: tp/Texinfo/Parser.pm:3161 tp/Texinfo/Parser.pm:3788
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "@%s %s'e fazladan argÃ¼man: %s"
  
! #: tp/Texinfo/Parser.pm:3167 tp/Texinfo/Parser.pm:3245
! #: tp/Texinfo/Parser.pm:5755 tp/Texinfo/Parser.pm:5798
! #: tp/Texinfo/Parser.pm:5827 tp/Texinfo/Parser.pm:5868
! #: tp/Texinfo/Parser.pm:5946
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "@%s'e hatalÄ± argÃ¼man: %s"
  
! #: tp/Texinfo/Parser.pm:3188
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%s: %s aÃ§Ä±lamÄ±yor: %s"
  
! #: tp/Texinfo/Parser.pm:3200
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr "`%s' kodlamasÄ± kanonik bir texinfo kodlamasÄ± deÄŸil"
  
! #: tp/Texinfo/Parser.pm:3208
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "tanÄ±nmayan kodlama adÄ± `%s'"
  
! #: tp/Texinfo/Parser.pm:3364
  #, perl-format
  msgid "@%s after the first element"
  msgstr "ilk unsurdan sonra @%s"
  
! #: tp/Texinfo/Parser.pm:3371
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s yalnÄ±zca bir @multitable satÄ±rÄ±nda anlamlÄ±dÄ±r"
  
! #: tp/Texinfo/Parser.pm:3408
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "@%s @top ile ilintili olmamalÄ±"
  
! #: tp/Texinfo/Parser.pm:3420
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
***************
*** 2610,2663 ****
  "@node @%s'den Ã¶nce geliyor, fakat parÃ§alarÄ± dÃ¼ÄŸÃ¼mlerle iliÅŸkili olmayabilir"
  
! #: tp/Texinfo/Parser.pm:3677
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "@%s'de boÅŸ argÃ¼man"
  
! #: tp/Texinfo/Parser.pm:3681
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "`%s' aÃ§Ä±lÄ±mÄ±ndan sonra boÅŸ dÃ¼ÄŸÃ¼m adÄ±"
  
! #: tp/Texinfo/Parser.pm:3724
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "`%s' de boÅŸ menÃ¼ girdi adÄ±"
  
! #: tp/Texinfo/Parser.pm:3732
  msgid "empty node name in menu entry"
  msgstr "menÃ¼ girdisinde boÅŸ dÃ¼ÄŸÃ¼m adÄ±"
  
! #: tp/Texinfo/Parser.pm:3805
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "@%s @%s'de gÃ¶rÃ¼lmemeli"
  
! #: tp/Texinfo/Parser.pm:3937
! #, perl-format
! msgid "@end %s should only appear at a line beginning"
  msgstr "@end %s yalnÄ±zca bir satÄ±r baÅŸÄ±nda gÃ¶rÃ¼lmeli"
  
! #: tp/Texinfo/Parser.pm:3960
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "makro `%s' daha Ã¶nce tanÄ±mlanmÄ±ÅŸ"
  
! #: tp/Texinfo/Parser.pm:3963
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "iÅŸte `%s''nin Ã¶nceki tanÄ±mÄ±"
  
! #: tp/Texinfo/Parser.pm:3968
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "Texinfo dil komutu yeniden tanÄ±mlanÄ±yor: @%s"
  
! #: tp/Texinfo/Parser.pm:4017
  #, perl-format
  msgid "@%s without associated character"
  msgstr "iliÅŸkili karakteri olmayan @%s"
  
! #: tp/Texinfo/Parser.pm:4087
  #, perl-format
  msgid ""
--- 2609,2662 ----
  "@node @%s'den Ã¶nce geliyor, fakat parÃ§alarÄ± dÃ¼ÄŸÃ¼mlerle iliÅŸkili olmayabilir"
  
! #: tp/Texinfo/Parser.pm:3522
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "@%s'de boÅŸ argÃ¼man"
  
! #: tp/Texinfo/Parser.pm:3526
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "`%s' aÃ§Ä±lÄ±mÄ±ndan sonra boÅŸ dÃ¼ÄŸÃ¼m adÄ±"
  
! #: tp/Texinfo/Parser.pm:3569
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "`%s' de boÅŸ menÃ¼ girdi adÄ±"
  
! #: tp/Texinfo/Parser.pm:3577
  msgid "empty node name in menu entry"
  msgstr "menÃ¼ girdisinde boÅŸ dÃ¼ÄŸÃ¼m adÄ±"
  
! #: tp/Texinfo/Parser.pm:3650
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "@%s @%s'de gÃ¶rÃ¼lmemeli"
  
! #: tp/Texinfo/Parser.pm:3782
! #, fuzzy, perl-format
! msgid "@end %s should only appear at the beginning of a line"
  msgstr "@end %s yalnÄ±zca bir satÄ±r baÅŸÄ±nda gÃ¶rÃ¼lmeli"
  
! #: tp/Texinfo/Parser.pm:3804
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "makro `%s' daha Ã¶nce tanÄ±mlanmÄ±ÅŸ"
  
! #: tp/Texinfo/Parser.pm:3807
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "iÅŸte `%s''nin Ã¶nceki tanÄ±mÄ±"
  
! #: tp/Texinfo/Parser.pm:3812
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "Texinfo dil komutu yeniden tanÄ±mlanÄ±yor: @%s"
  
! #: tp/Texinfo/Parser.pm:3879
  #, perl-format
  msgid "@%s without associated character"
  msgstr "iliÅŸkili karakteri olmayan @%s"
  
! #: tp/Texinfo/Parser.pm:3949
  #, perl-format
  msgid ""
***************
*** 2665,2669 ****
  msgstr "sÄ±fÄ±rla tanÄ±mlanmÄ±ÅŸ @%s ya da birden Ã§ok argÃ¼man {} ile Ã§aÄŸrÄ±lmalÄ±"
  
! #: tp/Texinfo/Parser.pm:4111
  #, perl-format
  msgid ""
--- 2664,2668 ----
  msgstr "sÄ±fÄ±rla tanÄ±mlanmÄ±ÅŸ @%s ya da birden Ã§ok argÃ¼man {} ile Ã§aÄŸrÄ±lmalÄ±"
  
! #: tp/Texinfo/Parser.pm:3974
  #, perl-format
  msgid ""
***************
*** 2674,2678 ****
  "mevcut deÄŸer %d)"
  
! #: tp/Texinfo/Parser.pm:4120
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
--- 2673,2677 ----
  "mevcut deÄŸer %d)"
  
! #: tp/Texinfo/Parser.pm:3983
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
***************
*** 2680,2800 ****
  "%s makrosunun Ã¶zyineli Ã§aÄŸrÄ±sÄ±na izin verilmiyor; gerekirse @rmacro kullanÄ±n"
  
! #: tp/Texinfo/Parser.pm:4176
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr "`@%s' aksan komutundan sonra beyaz boÅŸluk gelmemeli"
  
! #: tp/Texinfo/Parser.pm:4182
  #, 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/Parser.pm:4195 tp/Texinfo/Parser.pm:5325
  #, 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/Parser.pm:4207
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr "`@%s' aksan komutundan sonra yeni satÄ±r gelmemelidir"
  
! #: tp/Texinfo/Parser.pm:4218
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s kÃ¼me parantezi bekledi"
  
! #: tp/Texinfo/Parser.pm:4383
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "tanÄ±mlanmamÄ±ÅŸ bayrak: %s"
  
! #: tp/Texinfo/Parser.pm:4386
  msgid "bad syntax for @value"
  msgstr "@value iÃ§in bozuk sÃ¶zdizimi"
  
! #: tp/Texinfo/Parser.pm:4393
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s kullanÄ±mdan kalkmÄ±ÅŸ"
  
! #: tp/Texinfo/Parser.pm:4396
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s kullanÄ±mdan kalkmÄ±ÅŸ; %s"
  
! #: tp/Texinfo/Parser.pm:4405
! #, perl-format
! msgid "@%s should only appear at a line beginning"
  msgstr "@%s yalnÄ±zca bir satÄ±r baÅŸÄ±nda gÃ¶rÃ¼lmeli"
  
! #: tp/Texinfo/Parser.pm:4496
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "`@%s' bloÄŸu iÃ§inde @%s'e izin verilmez"
  
! #: tp/Texinfo/Parser.pm:4505
  #, 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/Parser.pm:4631 tp/Texinfo/Parser.pm:4648
! #: tp/Texinfo/Parser.pm:4698
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "`@%s' bloÄŸu iÃ§inde @%s anlamlÄ± deÄŸil"
  
! #: tp/Texinfo/Parser.pm:4658
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "boÅŸ @multitable'de @%s"
  
! #: tp/Texinfo/Parser.pm:4664
  msgid "@tab before @item"
  msgstr "@item'den Ã¶nce @tab"
  
! #: tp/Texinfo/Parser.pm:4667
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "Ã§ok-tablolu Ã¶gede, Ã§ok fazla sÃ¼tun (maks %d)"
  
! #: tp/Texinfo/Parser.pm:4704
  msgid "ignoring @tab outside of multitable"
  msgstr "Ã§ok-tablolunun dÄ±ÅŸÄ±ndaki @tab yoksayÄ±lÄ±yor"
  
! #: tp/Texinfo/Parser.pm:4708
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "tablo ya da liste dÄ±ÅŸÄ±nda @%s"
  
! #: tp/Texinfo/Parser.pm:4745
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "`@%2$s' kullanmak iÃ§in `@%1$s' den sonra ol(un)malÄ±dÄ±r"
  
! #: tp/Texinfo/Parser.pm:4787
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "`@titlepage' ve `@quotation' Ã§evreleri dÄ±ÅŸÄ±nda @%s anlamlÄ± deÄŸil"
  
! #: tp/Texinfo/Parser.pm:4791
  msgid "@dircategory after first node"
  msgstr "ilk dÃ¼ÄŸÃ¼mden sonra @dircategory"
  
! #: tp/Texinfo/Parser.pm:4979
  #, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "%2$s bÃ¶lgesi iÃ§inde %1$s bÃ¶lgesine izin verilmez"
  
! #: tp/Texinfo/Parser.pm:4997
  msgid "@direntry after first node"
  msgstr "ilk dÃ¼ÄŸÃ¼mden sonra @direntry"
  
! #: tp/Texinfo/Parser.pm:5005
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "ilk @node Ã¶ncesinde @%s gÃ¶rÃ¼ldÃ¼"
  
! #: tp/Texinfo/Parser.pm:5008
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
--- 2679,2799 ----
  "%s makrosunun Ã¶zyineli Ã§aÄŸrÄ±sÄ±na izin verilmiyor; gerekirse @rmacro kullanÄ±n"
  
! #: tp/Texinfo/Parser.pm:4038
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr "`@%s' aksan komutundan sonra beyaz boÅŸluk gelmemeli"
  
! #: tp/Texinfo/Parser.pm:4044
  #, 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/Parser.pm:4057 tp/Texinfo/Parser.pm:5189
  #, 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/Parser.pm:4068
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr "`@%s' aksan komutundan sonra yeni satÄ±r gelmemelidir"
  
! #: tp/Texinfo/Parser.pm:4079
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s kÃ¼me parantezi bekledi"
  
! #: tp/Texinfo/Parser.pm:4233
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "tanÄ±mlanmamÄ±ÅŸ bayrak: %s"
  
! #: tp/Texinfo/Parser.pm:4236
  msgid "bad syntax for @value"
  msgstr "@value iÃ§in bozuk sÃ¶zdizimi"
  
! #: tp/Texinfo/Parser.pm:4243
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s kullanÄ±mdan kalkmÄ±ÅŸ"
  
! #: tp/Texinfo/Parser.pm:4246
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s kullanÄ±mdan kalkmÄ±ÅŸ; %s"
  
! #: tp/Texinfo/Parser.pm:4255
! #, fuzzy, perl-format
! msgid "@%s should only appear at the beginning of a line"
  msgstr "@%s yalnÄ±zca bir satÄ±r baÅŸÄ±nda gÃ¶rÃ¼lmeli"
  
! #: tp/Texinfo/Parser.pm:4346
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "`@%s' bloÄŸu iÃ§inde @%s'e izin verilmez"
  
! #: tp/Texinfo/Parser.pm:4355
  #, 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/Parser.pm:4479 tp/Texinfo/Parser.pm:4496
! #: tp/Texinfo/Parser.pm:4546
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "`@%s' bloÄŸu iÃ§inde @%s anlamlÄ± deÄŸil"
  
! #: tp/Texinfo/Parser.pm:4506
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "boÅŸ @multitable'de @%s"
  
! #: tp/Texinfo/Parser.pm:4512
  msgid "@tab before @item"
  msgstr "@item'den Ã¶nce @tab"
  
! #: tp/Texinfo/Parser.pm:4515
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "Ã§ok-tablolu Ã¶gede, Ã§ok fazla sÃ¼tun (maks %d)"
  
! #: tp/Texinfo/Parser.pm:4552
  msgid "ignoring @tab outside of multitable"
  msgstr "Ã§ok-tablolunun dÄ±ÅŸÄ±ndaki @tab yoksayÄ±lÄ±yor"
  
! #: tp/Texinfo/Parser.pm:4556
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "tablo ya da liste dÄ±ÅŸÄ±nda @%s"
  
! #: tp/Texinfo/Parser.pm:4596
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "`@%2$s' kullanmak iÃ§in `@%1$s' den sonra ol(un)malÄ±dÄ±r"
  
! #: tp/Texinfo/Parser.pm:4638
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "`@titlepage' ve `@quotation' Ã§evreleri dÄ±ÅŸÄ±nda @%s anlamlÄ± deÄŸil"
  
! #: tp/Texinfo/Parser.pm:4642
  msgid "@dircategory after first node"
  msgstr "ilk dÃ¼ÄŸÃ¼mden sonra @dircategory"
  
! #: tp/Texinfo/Parser.pm:4847
  #, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "%2$s bÃ¶lgesi iÃ§inde %1$s bÃ¶lgesine izin verilmez"
  
! #: tp/Texinfo/Parser.pm:4864
  msgid "@direntry after first node"
  msgstr "ilk dÃ¼ÄŸÃ¼mden sonra @direntry"
  
! #: tp/Texinfo/Parser.pm:4872
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "ilk @node Ã¶ncesinde @%s gÃ¶rÃ¼ldÃ¼"
  
! #: tp/Texinfo/Parser.pm:4875
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
***************
*** 2803,3024 ****
  "sarÄ±lmalÄ±dÄ±r?"
  
! #: tp/Texinfo/Parser.pm:5070
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr "@%s yalnÄ±zca matematik baÄŸlamÄ±nda gÃ¶rÃ¼nmelidir"
  
! #: tp/Texinfo/Parser.pm:5078
  #, perl-format
  msgid "unknown command `%s'"
  msgstr "bilinmeyen komut `%s'"
  
! #: tp/Texinfo/Parser.pm:5088
  msgid "unexpected @"
  msgstr "beklenmedik @"
  
! #: tp/Texinfo/Parser.pm:5117
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "`@float' Ã§evresi dÄ±ÅŸÄ±nda @%s anlamlÄ± deÄŸil"
  
! #: tp/Texinfo/Parser.pm:5122
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr "@%s, `@float'Ä±n hemen altÄ±nda olmalÄ±dÄ±r"
  
! #: tp/Texinfo/Parser.pm:5130
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "Ã§ok sayÄ±da @%s yok sayÄ±lÄ±yor"
  
! #: tp/Texinfo/Parser.pm:5249
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "@%s komutu argÃ¼man kabul etmez"
  
! #: tp/Texinfo/Parser.pm:5273
  #, 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/Parser.pm:5292
  #, 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/Parser.pm:5303
  #, 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/Parser.pm:5316
  msgid "@image missing filename argument"
  msgstr "@image eksik dosyaadÄ± argÃ¼manÄ±"
  
! #: tp/Texinfo/Parser.pm:5348
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "@%s'de eksik ilk argÃ¼man"
  
! #: tp/Texinfo/Parser.pm:5393
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "@U iÃ§in olan argÃ¼manda hex olmayan rakamlar: %s"
  
! #: tp/Texinfo/Parser.pm:5399
  #, 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/Parser.pm:5412
! #, perl-format
! msgid "argument for @U exceeds size of integer: %s"
! msgstr "@U iÃ§in olan argÃ¼man tam sayÄ± boyutunu aÅŸÄ±yor: %s"
! 
! #: tp/Texinfo/Parser.pm:5418
  #, 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/Parser.pm:5546
  msgid "superfluous arguments for node"
  msgstr "dÃ¼ÄŸÃ¼m iÃ§in Ã§ok fazla argÃ¼man"
  
! #: tp/Texinfo/Parser.pm:5596
  #, perl-format
  msgid "expected @end %s"
  msgstr "@end beklenirdi %s"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "@%s argÃ¼man olarak yalnÄ±zca bir @-komut kabul etmelidir, `%s' deÄŸil"
  
! #: tp/Texinfo/Parser.pm:5728
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "@%s satÄ±rÄ±nda kalan argÃ¼man: %s"
  
! #: tp/Texinfo/Parser.pm:5801
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "@%s'e argÃ¼man olarak Ã§evre komutu %s"
  
! #: tp/Texinfo/Parser.pm:5823
  #, perl-format
  msgid "empty @%s"
  msgstr "boÅŸ @%s"
  
! #: tp/Texinfo/Parser.pm:5831
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "sÃ¼tun kesiri numara deÄŸil: %s"
  
! #: tp/Texinfo/Parser.pm:5840
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "@sp arg sayÄ±sal olmalÄ±dÄ±r `%s' deÄŸil"
  
! #: tp/Texinfo/Parser.pm:5849
  #, perl-format
  msgid "reserved index name %s"
  msgstr "ayrÄ±lmÄ±ÅŸ dizin adÄ± %s"
  
! #: tp/Texinfo/Parser.pm:5868
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "@%s'de bilinmeyen kaynak dizini: %s"
  
! #: tp/Texinfo/Parser.pm:5871
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "@%s'de bilinmeyen hedef dizini: %s"
  
! #: tp/Texinfo/Parser.pm:5901
  #, 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/Parser.pm:5914
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "@printindex iÃ§inde bilinmeyen indeks `%s'"
  
! #: tp/Texinfo/Parser.pm:5920
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr "`%2$s' iÃ§ine kaynaÅŸtÄ±rÄ±lmÄ±ÅŸ bir `%1$s' dizini yazdÄ±rÄ±lÄ±yor"
  
! #: tp/Texinfo/Parser.pm:5928
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "Belge baÅŸlangÄ±cÄ±ndan Ã¶nce printindex: @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5944
  #, 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/Parser.pm:5952
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr "YalnÄ±zca @%1$s 10 ya da 11 destekleniyor, `%2$s' deÄŸil"
  
! #: tp/Texinfo/Parser.pm:5960
  #, 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/Parser.pm:5968
  #, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
  msgstr "'%s arg `on', `off' ya da `odd' olmalÄ±dÄ±r, `%s' deÄŸil"
  
! #: tp/Texinfo/Parser.pm:5986 tp/Texinfo/Parser.pm:5991
  #, 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/Parser.pm:5999
  #, 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/Parser.pm:6009
  #, 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/Parser.pm:6021
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "@%s aÃ§Ä±k ya da kapalÄ± bekleniyordu, `%s' deÄŸil"
  
! #: tp/Texinfo/Parser.pm:6031
  #, 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/Parser.pm:6039
  #, 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/Parser.pm:6047
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
  msgstr "@urefbreakstyle arg `after'/`before'/`none' olmalÄ±dÄ±r, `%s' deÄŸil"
  
! #: tp/Texinfo/Structuring.pm:213
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr "@%s'in Ã§ok dÃ¼ÅŸÃ¼k olan bÃ¶lÃ¼m dÃ¼zeyi yÃ¼kseltiliyor"
  
! #: tp/Texinfo/Structuring.pm:245
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "@%s'den Ã¶nce kÄ±sÄ±m dÃ¼zeyi komutu yok"
  
! #: tp/Texinfo/Structuring.pm:250
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
--- 2802,3018 ----
  "sarÄ±lmalÄ±dÄ±r?"
  
! #: tp/Texinfo/Parser.pm:4937
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr "@%s yalnÄ±zca matematik baÄŸlamÄ±nda gÃ¶rÃ¼nmelidir"
  
! #: tp/Texinfo/Parser.pm:4945
  #, perl-format
  msgid "unknown command `%s'"
  msgstr "bilinmeyen komut `%s'"
  
! #: tp/Texinfo/Parser.pm:4955
  msgid "unexpected @"
  msgstr "beklenmedik @"
  
! #: tp/Texinfo/Parser.pm:4983
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "`@float' Ã§evresi dÄ±ÅŸÄ±nda @%s anlamlÄ± deÄŸil"
  
! #: tp/Texinfo/Parser.pm:4988
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr "@%s, `@float'Ä±n hemen altÄ±nda olmalÄ±dÄ±r"
  
! #: tp/Texinfo/Parser.pm:4996
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "Ã§ok sayÄ±da @%s yok sayÄ±lÄ±yor"
  
! #: tp/Texinfo/Parser.pm:5114
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "@%s komutu argÃ¼man kabul etmez"
  
! #: tp/Texinfo/Parser.pm:5138
  #, 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/Parser.pm:5156
  #, 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/Parser.pm:5167
  #, 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/Parser.pm:5180
  msgid "@image missing filename argument"
  msgstr "@image eksik dosyaadÄ± argÃ¼manÄ±"
  
! #: tp/Texinfo/Parser.pm:5211
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "@%s'de eksik ilk argÃ¼man"
  
! #: tp/Texinfo/Parser.pm:5230
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "@U iÃ§in olan argÃ¼manda hex olmayan rakamlar: %s"
  
! #: tp/Texinfo/Parser.pm:5236
  #, 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/Parser.pm:5253
  #, 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/Parser.pm:5448
  msgid "superfluous arguments for node"
  msgstr "dÃ¼ÄŸÃ¼m iÃ§in Ã§ok fazla argÃ¼man"
  
! #: tp/Texinfo/Parser.pm:5498
  #, perl-format
  msgid "expected @end %s"
  msgstr "@end beklenirdi %s"
  
! #: tp/Texinfo/Parser.pm:5607
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "@%s argÃ¼man olarak yalnÄ±zca bir @-komut kabul etmelidir, `%s' deÄŸil"
  
! #: tp/Texinfo/Parser.pm:5617
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "@%s satÄ±rÄ±nda kalan argÃ¼man: %s"
  
! #: tp/Texinfo/Parser.pm:5689
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "@%s'e argÃ¼man olarak Ã§evre komutu %s"
  
! #: tp/Texinfo/Parser.pm:5710
  #, perl-format
  msgid "empty @%s"
  msgstr "boÅŸ @%s"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "sÃ¼tun kesiri numara deÄŸil: %s"
  
! #: tp/Texinfo/Parser.pm:5727
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "@sp arg sayÄ±sal olmalÄ±dÄ±r `%s' deÄŸil"
  
! #: tp/Texinfo/Parser.pm:5736
  #, perl-format
  msgid "reserved index name %s"
  msgstr "ayrÄ±lmÄ±ÅŸ dizin adÄ± %s"
  
! #: tp/Texinfo/Parser.pm:5762
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "@%s'de bilinmeyen kaynak dizini: %s"
  
! #: tp/Texinfo/Parser.pm:5765
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "@%s'de bilinmeyen hedef dizini: %s"
  
! #: tp/Texinfo/Parser.pm:5793
  #, 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/Parser.pm:5806
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "@printindex iÃ§inde bilinmeyen indeks `%s'"
  
! #: tp/Texinfo/Parser.pm:5812
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr "`%2$s' iÃ§ine kaynaÅŸtÄ±rÄ±lmÄ±ÅŸ bir `%1$s' dizini yazdÄ±rÄ±lÄ±yor"
  
! #: tp/Texinfo/Parser.pm:5820
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "Belge baÅŸlangÄ±cÄ±ndan Ã¶nce printindex: @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5836
  #, 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/Parser.pm:5844
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr "YalnÄ±zca @%1$s 10 ya da 11 destekleniyor, `%2$s' deÄŸil"
  
! #: tp/Texinfo/Parser.pm:5852
  #, 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/Parser.pm:5860
  #, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
  msgstr "'%s arg `on', `off' ya da `odd' olmalÄ±dÄ±r, `%s' deÄŸil"
  
! #: tp/Texinfo/Parser.pm:5878 tp/Texinfo/Parser.pm:5883
  #, 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/Parser.pm:5891
  #, 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/Parser.pm:5901
  #, 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/Parser.pm:5913
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "@%s aÃ§Ä±k ya da kapalÄ± bekleniyordu, `%s' deÄŸil"
  
! #: tp/Texinfo/Parser.pm:5922
  #, 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/Parser.pm:5930
  #, 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/Parser.pm:5938
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
  msgstr "@urefbreakstyle arg `after'/`before'/`none' olmalÄ±dÄ±r, `%s' deÄŸil"
  
! #: tp/Texinfo/Structuring.pm:216
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr "@%s'in Ã§ok dÃ¼ÅŸÃ¼k olan bÃ¶lÃ¼m dÃ¼zeyi yÃ¼kseltiliyor"
  
! #: tp/Texinfo/Structuring.pm:248
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "@%s'den Ã¶nce kÄ±sÄ±m dÃ¼zeyi komutu yok"
  
! #: tp/Texinfo/Structuring.pm:253
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
***************
*** 3026,3080 ****
  "daha dÃ¼ÅŸÃ¼k dÃ¼zeyde bir unsurdan sonra gÃ¶rÃ¼len @%s'in bÃ¶lÃ¼m dÃ¼zeyi dÃ¼ÅŸÃ¼rÃ¼lÃ¼yor"
  
! #: tp/Texinfo/Structuring.pm:339
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "@%s ile ilintili bir bÃ¶lÃ¼mleme komutu yok"
  
! #: tp/Texinfo/Structuring.pm:488
  #, perl-format
  msgid "@%s not empty"
  msgstr "@%s boÅŸ deÄŸil"
  
! #: tp/Texinfo/Structuring.pm:544 tp/Texinfo/Structuring.pm:1326
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "varolmayan dÃ¼ÄŸÃ¼m `%s'e @%s referansÄ±"
  
! #: tp/Texinfo/Structuring.pm:557
  #, perl-format
  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:662
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "baÅŸvurulmamÄ±ÅŸ dÃ¼ÄŸÃ¼m `%s'"
  
! #: tp/Texinfo/Structuring.pm:708
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr "dÃ¼ÄŸÃ¼m `1$%s' `%3$s' iÃ§in bÃ¶lÃ¼mlemede %2$s fakat menÃ¼de deÄŸil"
  
! #: tp/Texinfo/Structuring.pm:715
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
  msgstr "dÃ¼ÄŸÃ¼m %1$s `%3$s' menÃ¼sÃ¼ndeki `%2$s' ve bÃ¶lÃ¼mlemedeki `%4$s' farklÄ±"
  
! #: tp/Texinfo/Structuring.pm:733
  #, 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:787
  #, 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:814
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "varolmayan dÃ¼ÄŸÃ¼m `%s' e %s referansÄ±"
  
! #: tp/Texinfo/Structuring.pm:834
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
--- 3020,3074 ----
  "daha dÃ¼ÅŸÃ¼k dÃ¼zeyde bir unsurdan sonra gÃ¶rÃ¼len @%s'in bÃ¶lÃ¼m dÃ¼zeyi dÃ¼ÅŸÃ¼rÃ¼lÃ¼yor"
  
! #: tp/Texinfo/Structuring.pm:342
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "@%s ile ilintili bir bÃ¶lÃ¼mleme komutu yok"
  
! #: tp/Texinfo/Structuring.pm:491
  #, perl-format
  msgid "@%s not empty"
  msgstr "@%s boÅŸ deÄŸil"
  
! #: tp/Texinfo/Structuring.pm:547 tp/Texinfo/Structuring.pm:1325
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "varolmayan dÃ¼ÄŸÃ¼m `%s'e @%s referansÄ±"
  
! #: tp/Texinfo/Structuring.pm:558
  #, perl-format
  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:663
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "baÅŸvurulmamÄ±ÅŸ dÃ¼ÄŸÃ¼m `%s'"
  
! #: tp/Texinfo/Structuring.pm:706
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr "dÃ¼ÄŸÃ¼m `1$%s' `%3$s' iÃ§in bÃ¶lÃ¼mlemede %2$s fakat menÃ¼de deÄŸil"
  
! #: tp/Texinfo/Structuring.pm:713
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
  msgstr "dÃ¼ÄŸÃ¼m %1$s `%3$s' menÃ¼sÃ¼ndeki `%2$s' ve bÃ¶lÃ¼mlemedeki `%4$s' farklÄ±"
  
! #: tp/Texinfo/Structuring.pm:731
  #, 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:786
  #, 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:810
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "varolmayan dÃ¼ÄŸÃ¼m `%s' e %s referansÄ±"
  
! #: tp/Texinfo/Structuring.pm:829
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
***************
*** 3083,3087 ****
  "iÃ§eriyor"
  
! #: tp/Texinfo/Structuring.pm:842
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
--- 3077,3081 ----
  "iÃ§eriyor"
  
! #: tp/Texinfo/Structuring.pm:837
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
***************
*** 3093,3097 ****
  msgstr "`%s'e @%s, `%s' %s adÄ±ndan farklÄ±"
  
! #: tp/Texinfo/Structuring.pm:2070
  #, perl-format
  msgid "empty index key in @%s"
--- 3087,3091 ----
  msgstr "`%s'e @%s, `%s' %s adÄ±ndan farklÄ±"
  
! #: tp/Texinfo/Structuring.pm:2067
  #, perl-format
  msgid "empty index key in @%s"
***************
*** 3621,3639 ****
  msgstr "Daha fazla bilgi iÃ§in `%s --help' yazÄ±n.\n"
  
! #: tp/texi2any.pl:1232
  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:1255
  #, 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:1261
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "%s yazmak iÃ§in aÃ§Ä±lamÄ±yorÄ±: %s\n"
  
! #: tp/texi2any.pl:1286
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
--- 3615,3633 ----
  msgstr "Daha fazla bilgi iÃ§in `%s --help' yazÄ±n.\n"
  
! #: tp/texi2any.pl:1239
  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:1262
  #, 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:1268
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "%s yazmak iÃ§in aÃ§Ä±lamÄ±yorÄ±: %s\n"
  
! #: tp/texi2any.pl:1293
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
***************
*** 3643,3661 ****
  "yok mu?"
  
! #: tp/texi2any.pl:1359 tp/texi2any.pl:1435
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%s: %s'i kapatmada hata: %s\n"
  
! #: tp/texi2any.pl:1382 tp/texi2any.pl:1416
  #, 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:1388 tp/texi2any.pl:1422
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
  msgstr "%s: %s yazmak iÃ§in aÃ§Ä±lamÄ±yorÄ±: %s\n"
  
  #~ msgid ""
  #~ "\n"
--- 3637,3658 ----
  "yok mu?"
  
! #: tp/texi2any.pl:1366 tp/texi2any.pl:1442
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%s: %s'i kapatmada hata: %s\n"
  
! #: tp/texi2any.pl:1389 tp/texi2any.pl:1423
  #, 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:1395 tp/texi2any.pl:1429
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
  msgstr "%s: %s yazmak iÃ§in aÃ§Ä±lamÄ±yorÄ±: %s\n"
  
+ #~ msgid "No file given for node '%s'."
+ #~ msgstr "DÃ¼ÄŸÃ¼m '%s' iÃ§in dosya yok."
+ 
  #~ msgid ""
  #~ "\n"
***************
*** 3672,3678 ****
--- 3669,3684 ----
  #~ msgstr "..*** EskimiÅŸ Etiketler ***"
  
+ #~ msgid "-%s---Info: %s, %ld lines --%s--"
+ #~ msgstr "-%s---Info: %s, %ld satÄ±r --%s--"
+ 
+ #~ msgid "-%s%s-Info: (%s)%s, %ld lines --%s--"
+ #~ msgstr "-%s%s-Info: (%s)%s, %ld satÄ±r --%s--"
+ 
  #~ msgid " Subfile: %s"
  #~ msgstr " Altdosya: %s"
  
+ #~ msgid "argument for @U exceeds size of integer: %s"
+ #~ msgstr "@U iÃ§in olan argÃ¼man tam sayÄ± boyutunu aÅŸÄ±yor: %s"
+ 
  #~ msgid "Insert this character"
  #~ msgstr "Bu karakteri yerleÅŸtirir"
Binary files texinfo-6.1/po/uk.gmo and texinfo-6.3/po/uk.gmo differ
diff -Nrc2 texinfo-6.1/po/uk.po texinfo-6.3/po/uk.po
*** texinfo-6.1/po/uk.po	2016-02-06 11:35:55.000000000 +0000
--- texinfo-6.3/po/uk.po	2016-09-10 12:45:57.000000000 +0100
***************
*** 5,15 ****
  # Myhailo Danylenko <isbear@ukrpost.net>, 2009.
  # Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2010.
! # Yuri Chornoivan <yurchor@ukr.net>, 2013, 2015.
  msgid ""
  msgstr ""
! "Project-Id-Version: texinfo 6.0.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
! "PO-Revision-Date: 2015-12-22 19:59+0200\n"
  "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
  "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
--- 5,15 ----
  # Myhailo Danylenko <isbear@ukrpost.net>, 2009.
  # Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2010.
! # Yuri Chornoivan <yurchor@ukr.net>, 2013, 2015, 2016.
  msgid ""
  msgstr ""
! "Project-Id-Version: texinfo 6.1.92\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:45+0100\n"
! "PO-Revision-Date: 2016-09-09 10:22+0300\n"
  "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
  "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
***************
*** 18,21 ****
--- 18,22 ----
  "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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
  "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
***************
*** 116,121 ****
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [ or [^"
! msgstr "Ð�ÐµÐ²Ñ€Ñ–Ð²Ð½Ð¾Ð²Ð°Ð¶ÐµÐ½Ð° Ð¿Ð¾Ñ�Ð»Ñ–Ð´Ð¾Ð²Ð½Ñ–Ñ�Ñ‚ÑŒ [ Ð°Ð±Ð¾ [^"
  
  #: gnulib/lib/regcomp.c:159
--- 117,122 ----
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [, [^, [:, [., or [="
! msgstr "Ð�ÐµÐ²Ñ€Ñ–Ð²Ð½Ð¾Ð²Ð°Ð¶ÐµÐ½Ð° Ð¿Ð¾Ñ�Ð»Ñ–Ð´Ð¾Ð²Ð½Ñ–Ñ�Ñ‚ÑŒ [, [^, [:, [. Ð°Ð±Ð¾ [="
  
  #: gnulib/lib/regcomp.c:159
***************
*** 155,159 ****
  msgstr "Ð�ÐµÐ²Ñ€Ñ–Ð²Ð½Ð¾Ð²Ð°Ð¶ÐµÐ½Ð° Ð¿Ð¾Ñ�Ð»Ñ–Ð´Ð¾Ð²Ð½Ñ–Ñ�Ñ‚ÑŒ ) Ð°Ð±Ð¾ \\)"
  
! #: gnulib/lib/regcomp.c:711
  msgid "No previous regular expression"
  msgstr "Ð�Ðµ Ð²Ð¸Ñ�Ð²Ð»ÐµÐ½Ð¾ Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð½ÑŒÐ¾Ð³Ð¾ Ñ„Ð¾Ñ€Ð¼Ð°Ð»ÑŒÐ½Ð¾Ð³Ð¾ Ð²Ð¸Ñ€Ð°Ð·Ñƒ"
--- 156,160 ----
  msgstr "Ð�ÐµÐ²Ñ€Ñ–Ð²Ð½Ð¾Ð²Ð°Ð¶ÐµÐ½Ð° Ð¿Ð¾Ñ�Ð»Ñ–Ð´Ð¾Ð²Ð½Ñ–Ñ�Ñ‚ÑŒ ) Ð°Ð±Ð¾ \\)"
  
! #: gnulib/lib/regcomp.c:687
  msgid "No previous regular expression"
  msgstr "Ð�Ðµ Ð²Ð¸Ñ�Ð²Ð»ÐµÐ½Ð¾ Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð½ÑŒÐ¾Ð³Ð¾ Ñ„Ð¾Ñ€Ð¼Ð°Ð»ÑŒÐ½Ð¾Ð³Ð¾ Ð²Ð¸Ñ€Ð°Ð·Ñƒ"
***************
*** 308,312 ****
  msgstr "---------- Ð’Ð¸Ð½Ð¾Ñ�ÐºÐ¸ ----------"
  
! #: info/indices.c:123 info/indices.c:812
  #, c-format
  msgid "Finding index entries..."
--- 309,313 ----
  msgstr "---------- Ð’Ð¸Ð½Ð¾Ñ�ÐºÐ¸ ----------"
  
! #: info/indices.c:123 info/indices.c:822
  #, c-format
  msgid "Finding index entries..."
***************
*** 317,321 ****
  msgstr "Ð—Ð½Ð°Ð¹Ñ‚Ð¸ Ñ€Ñ�Ð´Ð¾Ðº Ñƒ Ð¿Ð¾ÐºÐ°Ð¶Ñ‡Ð¸ÐºÑƒ Ñ†ÑŒÐ¾Ð³Ð¾ Ñ„Ð°Ð¹Ð»Ð°"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:818
  #, c-format
  msgid "No indices found."
--- 318,322 ----
  msgstr "Ð—Ð½Ð°Ð¹Ñ‚Ð¸ Ñ€Ñ�Ð´Ð¾Ðº Ñƒ Ð¿Ð¾ÐºÐ°Ð¶Ñ‡Ð¸ÐºÑƒ Ñ†ÑŒÐ¾Ð³Ð¾ Ñ„Ð°Ð¹Ð»Ð°"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:828
  #, c-format
  msgid "No indices found."
***************
*** 349,381 ****
  msgstr "Ð‘Ñ–Ð»ÑŒÑˆÐµ Ð½ÐµÐ¼Ð°Ñ” Ð¿ÑƒÐ½ÐºÑ‚Ñ–Ð² Ð¿Ð¾ÐºÐ°Ð¶Ñ‡Ð¸ÐºÐ°, Ñ�ÐºÑ– Ð± Ð¼Ñ–Ñ�Ñ‚Ð¸Ð»Ð¸ Â«%sÂ»."
  
! #: info/indices.c:476 info/indices.c:880
  #, c-format
  msgid "No index entries containing '%s'."
  msgstr "Ð�ÐµÐ¼Ð°Ñ” Ð¿ÑƒÐ½ÐºÑ‚Ñ–Ð² Ð¿Ð¾ÐºÐ°Ð¶Ñ‡Ð¸ÐºÐ°, Ñ�ÐºÑ– Ð± Ð¼Ñ–Ñ�Ñ‚Ð¸Ð»Ð¸ Â«%sÂ»."
  
! #: info/indices.c:583
  #, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "ÐŸÐµÑ€ÐµÐ³Ð»Ñ�Ð´ Ð¿Ð¾ÐºÐ°Ð¶Ñ‡Ð¸ÐºÑ–Ð² Â«%sÂ»..."
  
! #: info/indices.c:636
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
  "Ð’Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ Ð¿Ð¾ÑˆÑƒÐº Ñ€Ñ�Ð´ÐºÐ° Ñƒ Ð²Ñ�Ñ–Ñ… Ð²Ñ–Ð´Ð¾Ð¼Ð¸Ñ… Ð¿Ð¾ÐºÐ°Ð¶Ñ‡Ð¸ÐºÐ°Ñ… Ñ„Ð°Ð¹Ð»Ñ–Ð² Ñ– Ð¿Ð¾Ð±ÑƒÐ´ÑƒÐ²Ð°Ñ‚Ð¸ Ð¼ÐµÐ½ÑŽ"
  
! #: info/indices.c:644 info/indices.c:646
  msgid "Index apropos"
  msgstr "ÐŸÐ¾ÑˆÑƒÐº Ð·Ð° Ð¿Ð¾ÐºÐ°Ð¶Ñ‡Ð¸ÐºÐ¾Ð¼"
  
! #: info/indices.c:688
  #, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "Ð—Ð°Ð¿Ð¸Ñ�Ð¸ Ð¿Ð¾ÐºÐ°Ð¶Ñ‡Ð¸ÐºÐ°, Ñ‰Ð¾ Ð¼Ñ–Ñ�Ñ‚Ñ�Ñ‚ÑŒ Â«%sÂ»:\n"
  
! #: info/indices.c:797
  msgid "List all matches of a string in the index"
  msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ñ�Ð¿Ð¸Ñ�Ð¾Ðº ÑƒÑ�Ñ–Ñ… Ð²Ñ…Ð¾Ð´Ð¶ÐµÐ½ÑŒ Ñ€Ñ�Ð´ÐºÐ° Ð´Ð¾ Ð¿Ð¾ÐºÐ°Ð¶Ñ‡Ð¸ÐºÐ°"
  
! #: info/indices.c:824 info/indices.c:826
  msgid "Index topic"
  msgstr "Ð¢ÐµÐ¼Ð° Ð¿Ð¾ÐºÐ°Ð¶Ñ‡Ð¸ÐºÐ°"
--- 350,382 ----
  msgstr "Ð‘Ñ–Ð»ÑŒÑˆÐµ Ð½ÐµÐ¼Ð°Ñ” Ð¿ÑƒÐ½ÐºÑ‚Ñ–Ð² Ð¿Ð¾ÐºÐ°Ð¶Ñ‡Ð¸ÐºÐ°, Ñ�ÐºÑ– Ð± Ð¼Ñ–Ñ�Ñ‚Ð¸Ð»Ð¸ Â«%sÂ»."
  
! #: info/indices.c:476 info/indices.c:890
  #, c-format
  msgid "No index entries containing '%s'."
  msgstr "Ð�ÐµÐ¼Ð°Ñ” Ð¿ÑƒÐ½ÐºÑ‚Ñ–Ð² Ð¿Ð¾ÐºÐ°Ð¶Ñ‡Ð¸ÐºÐ°, Ñ�ÐºÑ– Ð± Ð¼Ñ–Ñ�Ñ‚Ð¸Ð»Ð¸ Â«%sÂ»."
  
! #: info/indices.c:586
  #, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "ÐŸÐµÑ€ÐµÐ³Ð»Ñ�Ð´ Ð¿Ð¾ÐºÐ°Ð¶Ñ‡Ð¸ÐºÑ–Ð² Â«%sÂ»..."
  
! #: 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 "Ð—Ð°Ð¿Ð¸Ñ�Ð¸ Ð¿Ð¾ÐºÐ°Ð¶Ñ‡Ð¸ÐºÐ°, Ñ‰Ð¾ Ð¼Ñ–Ñ�Ñ‚Ñ�Ñ‚ÑŒ Â«%sÂ»:\n"
  
! #: info/indices.c:807
  msgid "List all matches of a string in the index"
  msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ñ�Ð¿Ð¸Ñ�Ð¾Ðº ÑƒÑ�Ñ–Ñ… Ð²Ñ…Ð¾Ð´Ð¶ÐµÐ½ÑŒ Ñ€Ñ�Ð´ÐºÐ° Ð´Ð¾ Ð¿Ð¾ÐºÐ°Ð¶Ñ‡Ð¸ÐºÐ°"
  
! #: info/indices.c:834 info/indices.c:836
  msgid "Index topic"
  msgstr "Ð¢ÐµÐ¼Ð° Ð¿Ð¾ÐºÐ°Ð¶Ñ‡Ð¸ÐºÐ°"
***************
*** 386,440 ****
  msgstr "Ð–Ð¾Ð´ÐµÐ½ Ð´Ð¾Ñ�Ñ‚ÑƒÐ¿Ð½Ð¸Ð¹ Ñ„Ð°Ð¹Ð» info Ð½Ðµ Ð¼Ñ–Ñ�Ñ‚Ð¸Ñ‚ÑŒ Â«%sÂ» Ñƒ Ð¿Ð¾ÐºÐ°Ð¶Ñ‡Ð¸ÐºÑƒ."
  
! #: info/info-utils.c:892
  #, c-format
  msgid "Error converting file character encoding."
  msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ� Ñ�Ð¿Ñ€Ð¾Ð±Ð¸ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ� Ñ�Ð¸Ð¼Ð²Ð¾Ð»Ñ–Ð² Ñƒ Ñ„Ð°Ð¹Ð»Ñ–."
  
! #: info/info.c:222 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "ÐœÐµÐ½ÑŽ Ð²ÑƒÐ·Ð»Ð° Â«%2$sÂ» Ð½Ðµ Ð¼Ñ–Ñ�Ñ‚Ð¸Ñ‚ÑŒ Ð¿ÑƒÐ½ÐºÑ‚Ñƒ Â«%1$sÂ»."
  
! #: info/info.c:315
! #, c-format
! msgid "No file given for node '%s'."
! msgstr "Ð”Ð»Ñ� Ð²ÑƒÐ·Ð»Ð° Â«%sÂ» Ð½Ðµ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾ Ñ„Ð°Ð¹Ð»Ð°."
! 
! #: info/info.c:364 info/info.c:1133
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr "Ð�Ðµ Ð²Ð´Ð°Ð»Ð¾Ñ�Ñ� Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ð²ÑƒÐ·Ð¾Ð» Â«%sÂ»."
  
! #: info/info.c:386
  #, c-format
  msgid "No program name given."
  msgstr "Ð�Ðµ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾ Ð½Ð°Ð·Ð²Ð¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸."
  
! #: info/info.c:577
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "Ð½ÐµÐºÐ¾Ñ€ÐµÐºÑ‚Ð½Ð¸Ð¹ Ð½Ð¾Ð¼ÐµÑ€: %s\n"
  
! #: info/info.c:757
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¾Ð²Ðµ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ� Ñƒ Ð²Ð¸Ñ€Ð°Ð·Ñ– Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ� Ð·Ð¼Ñ–Ð½Ð½Ð¾Ñ—: %s"
  
! #: info/info.c:764 info/infokey.c:537
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: Ð½ÐµÐ¼Ð°Ñ” Ñ‚Ð°ÐºÐ¾Ñ— Ð·Ð¼Ñ–Ð½Ð½Ð¾Ñ—"
  
! #: info/info.c:770 info/infokey.c:539
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ� %s Ñ” Ð½ÐµÐºÐ¾Ñ€ÐµÐºÑ‚Ð½Ð¸Ð¼ Ð´Ð»Ñ� Ð·Ð¼Ñ–Ð½Ð½Ð¾Ñ— %s"
  
! #: info/info.c:782
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "Ð¡Ð¿Ñ€Ð¾Ð±ÑƒÐ¹Ñ‚Ðµ --help, Ñ‰Ð¾Ð± Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ Ð±Ñ–Ð»ÑŒÑˆÐµ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ—.\n"
  
! #: info/info.c:804 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
--- 387,436 ----
  msgstr "Ð–Ð¾Ð´ÐµÐ½ Ð´Ð¾Ñ�Ñ‚ÑƒÐ¿Ð½Ð¸Ð¹ Ñ„Ð°Ð¹Ð» info Ð½Ðµ Ð¼Ñ–Ñ�Ñ‚Ð¸Ñ‚ÑŒ Â«%sÂ» Ñƒ Ð¿Ð¾ÐºÐ°Ð¶Ñ‡Ð¸ÐºÑƒ."
  
! #: info/info-utils.c:879
  #, c-format
  msgid "Error converting file character encoding."
  msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ� Ñ�Ð¿Ñ€Ð¾Ð±Ð¸ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ� Ñ�Ð¸Ð¼Ð²Ð¾Ð»Ñ–Ð² Ñƒ Ñ„Ð°Ð¹Ð»Ñ–."
  
! #: info/info.c:279 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "ÐœÐµÐ½ÑŽ Ð²ÑƒÐ·Ð»Ð° Â«%2$sÂ» Ð½Ðµ Ð¼Ñ–Ñ�Ñ‚Ð¸Ñ‚ÑŒ Ð¿ÑƒÐ½ÐºÑ‚Ñƒ Â«%1$sÂ»."
  
! #: info/info.c:416 info/info.c:1148
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr "Ð�Ðµ Ð²Ð´Ð°Ð»Ð¾Ñ�Ñ� Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ð²ÑƒÐ·Ð¾Ð» Â«%sÂ»."
  
! #: info/info.c:438
  #, c-format
  msgid "No program name given."
  msgstr "Ð�Ðµ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾ Ð½Ð°Ð·Ð²Ð¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸."
  
! #: info/info.c:636
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "Ð½ÐµÐºÐ¾Ñ€ÐµÐºÑ‚Ð½Ð¸Ð¹ Ð½Ð¾Ð¼ÐµÑ€: %s\n"
  
! #: info/info.c:816
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¾Ð²Ðµ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ� Ñƒ Ð²Ð¸Ñ€Ð°Ð·Ñ– Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ� Ð·Ð¼Ñ–Ð½Ð½Ð¾Ñ—: %s"
  
! #: info/info.c:823 info/infokey.c:540
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: Ð½ÐµÐ¼Ð°Ñ” Ñ‚Ð°ÐºÐ¾Ñ— Ð·Ð¼Ñ–Ð½Ð½Ð¾Ñ—"
  
! #: info/info.c:829 info/infokey.c:542
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ� %s Ñ” Ð½ÐµÐºÐ¾Ñ€ÐµÐºÑ‚Ð½Ð¸Ð¼ Ð´Ð»Ñ� Ð·Ð¼Ñ–Ð½Ð½Ð¾Ñ— %s"
  
! #: info/info.c:841
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "Ð¡Ð¿Ñ€Ð¾Ð±ÑƒÐ¹Ñ‚Ðµ --help, Ñ‰Ð¾Ð± Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ Ð±Ñ–Ð»ÑŒÑˆÐµ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ—.\n"
  
! #: info/info.c:860 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
***************
*** 452,461 ****
  "Ð�Ðµ Ð½Ð°Ð´Ð°Ñ”Ñ‚ÑŒÑ�Ñ� Ð�Ð†Ð¯ÐšÐ˜Ð¥ Ð“Ð�Ð Ð�Ð�Ð¢Ð†Ð™ Ñƒ Ñ€Ð°Ð¼ÐºÐ°Ñ…, Ð¿ÐµÑ€ÐµÐ´Ð±Ð°Ñ‡ÐµÐ½Ð¸Ñ… Ð·Ð°ÐºÐ¾Ð½Ð¾Ð¼.\n"
  
! #: info/info.c:981
  #, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ð¿ÑƒÐ½ÐºÑ‚Ñ–Ð² Ð¿Ð¾ÐºÐ°Ð¶Ñ‡Ð¸ÐºÐ° Ð´Ð»Ñ� Â«%sÂ»\n"
  
! #: info/info.c:1034
  #, c-format
  msgid ""
--- 448,457 ----
  "Ð�Ðµ Ð½Ð°Ð´Ð°Ñ”Ñ‚ÑŒÑ�Ñ� Ð�Ð†Ð¯ÐšÐ˜Ð¥ Ð“Ð�Ð Ð�Ð�Ð¢Ð†Ð™ Ñƒ Ñ€Ð°Ð¼ÐºÐ°Ñ…, Ð¿ÐµÑ€ÐµÐ´Ð±Ð°Ñ‡ÐµÐ½Ð¸Ñ… Ð·Ð°ÐºÐ¾Ð½Ð¾Ð¼.\n"
  
! #: info/info.c:999
  #, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ð¿ÑƒÐ½ÐºÑ‚Ñ–Ð² Ð¿Ð¾ÐºÐ°Ð¶Ñ‡Ð¸ÐºÐ° Ð´Ð»Ñ� Â«%sÂ»\n"
  
! #: info/info.c:1049
  #, c-format
  msgid ""
***************
*** 468,472 ****
  "ÐŸÐµÑ€ÐµÐ³Ð»Ñ�Ð´ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ñ–Ñ— Ñƒ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ñ– Info.\n"
  
! #: info/info.c:1040
  msgid ""
  "Options:\n"
--- 464,468 ----
  "ÐŸÐµÑ€ÐµÐ³Ð»Ñ�Ð´ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ñ–Ñ— Ñƒ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ñ– Info.\n"
  
! #: info/info.c:1055
  msgid ""
  "Options:\n"
***************
*** 486,490 ****
  "  -f, --file=Ð¤Ð�Ð™Ð›              Ð²ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» Info Ð´Ð»Ñ� Ð¿ÐµÑ€ÐµÐ³Ð»Ñ�Ð´Ñƒ."
  
! #: info/info.c:1048
  msgid ""
  "  -h, --help                   display this help and exit.\n"
--- 482,486 ----
  "  -f, --file=Ð¤Ð�Ð™Ð›              Ð²ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» Info Ð´Ð»Ñ� Ð¿ÐµÑ€ÐµÐ³Ð»Ñ�Ð´Ñƒ."
  
! #: info/info.c:1063
  msgid ""
  "  -h, --help                   display this help and exit.\n"
***************
*** 500,504 ****
  "  -o, --output=Ð¤Ð�Ð™Ð›            Ð·Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ Ð¾Ð±Ñ€Ð°Ð½Ñ– Ð²ÑƒÐ·Ð»Ð¸ Ð´Ð¾ Ð¤Ð�Ð™Ð›Ð�."
  
! #: info/info.c:1054
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
--- 496,500 ----
  "  -o, --output=Ð¤Ð�Ð™Ð›            Ð·Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ Ð¾Ð±Ñ€Ð°Ð½Ñ– Ð²ÑƒÐ·Ð»Ð¸ Ð´Ð¾ Ð¤Ð�Ð™Ð›Ð�."
  
! #: info/info.c:1069
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
***************
*** 513,521 ****
  "  -O, --show-options, --usage  Ð¿ÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð´Ð¾ Ð²ÑƒÐ·Ð»Ð° Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ–Ð² ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð³Ð¾ Ñ€Ñ�Ð´ÐºÑƒ."
  
! #: info/info.c:1061
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr " -b, --speech-friendly        Ð·Ñ€ÑƒÑ‡Ð½Ð¸Ð¹ Ð´Ð»Ñ� Ñ�Ð¸Ð½Ñ‚ÐµÐ·Ð°Ñ‚Ð¾Ñ€Ñ–Ð² Ð¼Ð¾Ð²Ð»ÐµÐ½Ð½Ñ� Ð²Ð¸Ð²Ñ–Ð´."
  
! #: info/info.c:1065
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
--- 509,517 ----
  "  -O, --show-options, --usage  Ð¿ÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð´Ð¾ Ð²ÑƒÐ·Ð»Ð° Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ–Ð² ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð³Ð¾ Ñ€Ñ�Ð´ÐºÑƒ."
  
! #: info/info.c:1076
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr " -b, --speech-friendly        Ð·Ñ€ÑƒÑ‡Ð½Ð¸Ð¹ Ð´Ð»Ñ� Ñ�Ð¸Ð½Ñ‚ÐµÐ·Ð°Ñ‚Ð¾Ñ€Ñ–Ð² Ð¼Ð¾Ð²Ð»ÐµÐ½Ð½Ñ� Ð²Ð¸Ð²Ñ–Ð´."
  
! #: info/info.c:1080
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
***************
*** 539,543 ****
  "Ñ€Ñ–Ð²Ð½Ñ–).\n"
  
! #: info/info.c:1074
  msgid ""
  "\n"
--- 535,539 ----
  "Ñ€Ñ–Ð²Ð½Ñ–).\n"
  
! #: info/info.c:1089
  msgid ""
  "\n"
***************
*** 556,560 ****
  "Ð¼ÐµÐ½ÑŽ, Ð²Ñ–Ð´Ð½Ð¾Ñ�Ð½Ð¸Ð¼Ð¸ Ñ‰Ð¾Ð´Ð¾ Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÐ¾Ð²Ð¾Ð³Ð¾ Ð²ÑƒÐ·Ð»Ð°."
  
! #: info/info.c:1081
  msgid ""
  "\n"
--- 552,556 ----
  "Ð¼ÐµÐ½ÑŽ, Ð²Ñ–Ð´Ð½Ð¾Ñ�Ð½Ð¸Ð¼Ð¸ Ñ‰Ð¾Ð´Ð¾ Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÐ¾Ð²Ð¾Ð³Ð¾ Ð²ÑƒÐ·Ð»Ð°."
  
! #: info/info.c:1096
  msgid ""
  "\n"
***************
*** 565,569 ****
  "ÑƒÑ�ÐµÑ€ÐµÐ´Ð¸Ð½Ñ– Info."
  
! #: info/info.c:1084
  msgid ""
  "\n"
--- 561,565 ----
  "ÑƒÑ�ÐµÑ€ÐµÐ´Ð¸Ð½Ñ– Info."
  
! #: info/info.c:1099
  msgid ""
  "\n"
***************
*** 597,601 ****
  "dir"
  
! #: info/info.c:1099 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
--- 593,597 ----
  "dir"
  
! #: info/info.c:1114 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
***************
*** 607,671 ****
  "Ð”Ð¾Ð¼Ð°ÑˆÐ½Ñ� Ñ�Ñ‚Ð¾Ñ€Ñ–Ð½ÐºÐ° texinfo: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1134
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Ð�Ðµ Ð²Ð´Ð°Ñ”Ñ‚ÑŒÑ�Ñ� Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ð²ÑƒÐ·Ð¾Ð» Â«(%s)%sÂ»."
  
! #: info/info.c:1135
  msgid "Cannot find a window!"
  msgstr "Ð�Ðµ Ð²Ð´Ð°Ñ”Ñ‚ÑŒÑ�Ñ� Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ð²Ñ–ÐºÐ½Ð¾!"
  
! #: info/info.c:1136
  msgid "Point doesn't appear within this window's node!"
  msgstr "ÐŸÑƒÐ½ÐºÑ‚ Ð½Ðµ Ð¿ÐµÑ€ÐµÐ±ÑƒÐ²Ð°Ñ” Ñƒ Ð²ÑƒÐ·Ð»Ñ– Ñ†ÑŒÐ¾Ð³Ð¾ Ð²Ñ–ÐºÐ½Ð°!"
  
! #: info/info.c:1137
  msgid "Cannot delete the last window."
  msgstr "Ð�ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²Ð¸Ð»ÑƒÑ‡Ð¸Ñ‚Ð¸ Ñ”Ð´Ð¸Ð½Ðµ Ð²Ñ–ÐºÐ½Ð¾."
  
! #: info/info.c:1138
  msgid "No menu in this node."
  msgstr "Ð¦ÐµÐ¹ Ð²ÑƒÐ·Ð¾Ð» Ð½Ðµ Ð¼Ð°Ñ” Ð¼ÐµÐ½ÑŽ."
  
! #: info/info.c:1139
  msgid "No footnotes in this node."
  msgstr "Ð¦ÐµÐ¹ Ð²ÑƒÐ·Ð¾Ð» Ð½Ðµ Ð¼Ð°Ñ” Ð²Ð¸Ð½Ð¾Ñ�Ð¾Ðº."
  
! #: info/info.c:1140
  msgid "No cross references in this node."
  msgstr "Ð¦ÐµÐ¹ Ð²ÑƒÐ·Ð¾Ð» Ð½Ðµ Ð¼Ñ–Ñ�Ñ‚Ð¸Ñ‚ÑŒ Ð¿ÐµÑ€ÐµÑ…Ñ€ÐµÑ�Ð½Ð¸Ñ… Ð¿Ð¾Ñ�Ð¸Ð»Ð°Ð½ÑŒ."
  
! #: info/info.c:1141
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Ð�ÐµÐ¼Ð°Ñ” Ð²ÐºÐ°Ð·Ñ–Ð²Ð½Ð¸ÐºÐ° Â«%sÂ» Ð´Ð»Ñ� Ñ†ÑŒÐ¾Ð³Ð¾ Ð²ÑƒÐ·Ð»Ð°."
  
! #: info/info.c:1142
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "Ð�ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Â«%cÂ»; Ñ�Ð¿Ñ€Ð¾Ð±ÑƒÐ¹Ñ‚Ðµ Â«?Â», Ñ‰Ð¾Ð± Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ Ð´Ð¾Ð²Ñ–Ð´ÐºÑƒ."
  
! #: info/info.c:1143
  #, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "Ð¢ÐµÑ€Ð¼Ñ–Ð½Ð°Ð» Â«%sÂ» Ð½ÐµÐ´Ð¾Ñ�Ñ‚Ð°Ñ‚Ð½ÑŒÐ¾ Ð¿Ð¾Ñ‚ÑƒÐ¶Ð½Ð¸Ð¹ Ð´Ð»Ñ� Ñ€Ð¾Ð±Ð¾Ñ‚Ð¸ Info."
  
! #: info/info.c:1144
  msgid "You are already at the last page of this node."
  msgstr "Ð’Ð¸ Ð²Ð¶Ðµ Ð½Ð° Ð¾Ñ�Ñ‚Ð°Ð½Ð½Ñ–Ð¹ Ñ�Ñ‚Ð¾Ñ€Ñ–Ð½Ñ†Ñ– Ñ†ÑŒÐ¾Ð³Ð¾ Ð²ÑƒÐ·Ð»Ð°."
  
! #: info/info.c:1145
  msgid "You are already at the first page of this node."
  msgstr "Ð’Ð¸ Ð²Ð¶Ðµ Ð½Ð° Ð¿ÐµÑ€ÑˆÑ–Ð¹ Ñ�Ñ‚Ð¾Ñ€Ñ–Ð½Ñ†Ñ– Ñ†ÑŒÐ¾Ð³Ð¾ Ð²ÑƒÐ·Ð»Ð°."
  
! #: info/info.c:1146
  msgid "Only one window."
  msgstr "Ð„ Ð»Ð¸ÑˆÐµ Ð¾Ð´Ð½Ðµ Ð²Ñ–ÐºÐ½Ð¾."
  
! #: info/info.c:1147
  msgid "Resulting window would be too small."
  msgstr "ÐžÑ‚Ñ€Ð¸Ð¼Ð°Ð½Ðµ Ð²Ñ–ÐºÐ½Ð¾ Ð±ÑƒÐ´Ðµ Ð·Ð°Ð½Ð°Ð´Ñ‚Ð¾ Ð¼Ð°Ð»Ð¸Ð¼."
  
! #: info/info.c:1148
  msgid "Not enough room for a help window, please delete a window."
  msgstr ""
--- 603,667 ----
  "Ð”Ð¾Ð¼Ð°ÑˆÐ½Ñ� Ñ�Ñ‚Ð¾Ñ€Ñ–Ð½ÐºÐ° texinfo: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1149
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "Ð�Ðµ Ð²Ð´Ð°Ñ”Ñ‚ÑŒÑ�Ñ� Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ð²ÑƒÐ·Ð¾Ð» Â«(%s)%sÂ»."
  
! #: info/info.c:1150
  msgid "Cannot find a window!"
  msgstr "Ð�Ðµ Ð²Ð´Ð°Ñ”Ñ‚ÑŒÑ�Ñ� Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ð²Ñ–ÐºÐ½Ð¾!"
  
! #: info/info.c:1151
  msgid "Point doesn't appear within this window's node!"
  msgstr "ÐŸÑƒÐ½ÐºÑ‚ Ð½Ðµ Ð¿ÐµÑ€ÐµÐ±ÑƒÐ²Ð°Ñ” Ñƒ Ð²ÑƒÐ·Ð»Ñ– Ñ†ÑŒÐ¾Ð³Ð¾ Ð²Ñ–ÐºÐ½Ð°!"
  
! #: info/info.c:1152
  msgid "Cannot delete the last window."
  msgstr "Ð�ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²Ð¸Ð»ÑƒÑ‡Ð¸Ñ‚Ð¸ Ñ”Ð´Ð¸Ð½Ðµ Ð²Ñ–ÐºÐ½Ð¾."
  
! #: info/info.c:1153
  msgid "No menu in this node."
  msgstr "Ð¦ÐµÐ¹ Ð²ÑƒÐ·Ð¾Ð» Ð½Ðµ Ð¼Ð°Ñ” Ð¼ÐµÐ½ÑŽ."
  
! #: info/info.c:1154
  msgid "No footnotes in this node."
  msgstr "Ð¦ÐµÐ¹ Ð²ÑƒÐ·Ð¾Ð» Ð½Ðµ Ð¼Ð°Ñ” Ð²Ð¸Ð½Ð¾Ñ�Ð¾Ðº."
  
! #: info/info.c:1155
  msgid "No cross references in this node."
  msgstr "Ð¦ÐµÐ¹ Ð²ÑƒÐ·Ð¾Ð» Ð½Ðµ Ð¼Ñ–Ñ�Ñ‚Ð¸Ñ‚ÑŒ Ð¿ÐµÑ€ÐµÑ…Ñ€ÐµÑ�Ð½Ð¸Ñ… Ð¿Ð¾Ñ�Ð¸Ð»Ð°Ð½ÑŒ."
  
! #: info/info.c:1156
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr "Ð�ÐµÐ¼Ð°Ñ” Ð²ÐºÐ°Ð·Ñ–Ð²Ð½Ð¸ÐºÐ° Â«%sÂ» Ð´Ð»Ñ� Ñ†ÑŒÐ¾Ð³Ð¾ Ð²ÑƒÐ·Ð»Ð°."
  
! #: info/info.c:1157
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "Ð�ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Â«%cÂ»; Ñ�Ð¿Ñ€Ð¾Ð±ÑƒÐ¹Ñ‚Ðµ Â«?Â», Ñ‰Ð¾Ð± Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ Ð´Ð¾Ð²Ñ–Ð´ÐºÑƒ."
  
! #: info/info.c:1158
  #, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "Ð¢ÐµÑ€Ð¼Ñ–Ð½Ð°Ð» Â«%sÂ» Ð½ÐµÐ´Ð¾Ñ�Ñ‚Ð°Ñ‚Ð½ÑŒÐ¾ Ð¿Ð¾Ñ‚ÑƒÐ¶Ð½Ð¸Ð¹ Ð´Ð»Ñ� Ñ€Ð¾Ð±Ð¾Ñ‚Ð¸ Info."
  
! #: info/info.c:1159
  msgid "You are already at the last page of this node."
  msgstr "Ð’Ð¸ Ð²Ð¶Ðµ Ð½Ð° Ð¾Ñ�Ñ‚Ð°Ð½Ð½Ñ–Ð¹ Ñ�Ñ‚Ð¾Ñ€Ñ–Ð½Ñ†Ñ– Ñ†ÑŒÐ¾Ð³Ð¾ Ð²ÑƒÐ·Ð»Ð°."
  
! #: info/info.c:1160
  msgid "You are already at the first page of this node."
  msgstr "Ð’Ð¸ Ð²Ð¶Ðµ Ð½Ð° Ð¿ÐµÑ€ÑˆÑ–Ð¹ Ñ�Ñ‚Ð¾Ñ€Ñ–Ð½Ñ†Ñ– Ñ†ÑŒÐ¾Ð³Ð¾ Ð²ÑƒÐ·Ð»Ð°."
  
! #: info/info.c:1161
  msgid "Only one window."
  msgstr "Ð„ Ð»Ð¸ÑˆÐµ Ð¾Ð´Ð½Ðµ Ð²Ñ–ÐºÐ½Ð¾."
  
! #: info/info.c:1162
  msgid "Resulting window would be too small."
  msgstr "ÐžÑ‚Ñ€Ð¸Ð¼Ð°Ð½Ðµ Ð²Ñ–ÐºÐ½Ð¾ Ð±ÑƒÐ´Ðµ Ð·Ð°Ð½Ð°Ð´Ñ‚Ð¾ Ð¼Ð°Ð»Ð¸Ð¼."
  
! #: info/info.c:1163
  msgid "Not enough room for a help window, please delete a window."
  msgstr ""
***************
*** 942,976 ****
  msgstr "Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð° Ð´Ñ–Ñ� `%s'"
  
! #: info/infokey.c:482
  #, c-format
  msgid "action name too long"
  msgstr "Ð½Ð°Ð·Ð²Ð° Ð´Ñ–Ñ— Ð·Ð°Ð½Ð°Ð´Ñ‚Ð¾ Ð´Ð¾Ð²Ð³Ð°"
  
! #: info/infokey.c:495
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "Ð·Ð°Ð¹Ð²Ñ– Ñ�Ð¸Ð¼Ð²Ð¾Ð»Ð¸ Ð¿Ñ–Ñ�Ð»Ñ� Ð´Ñ–Ñ— `%s'"
  
! #: info/infokey.c:506
  #, c-format
  msgid "missing variable name"
  msgstr "Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½Ð¾ Ð½Ð°Ð·Ð²Ñƒ Ð·Ð¼Ñ–Ð½Ð½Ð¾Ñ—"
  
! #: info/infokey.c:515
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½Ð¾ Ð·Ð½Ð°Ðº `=' Ð¾Ð´Ñ€Ð°Ð·Ñƒ Ð¿Ñ–Ñ�Ð»Ñ� Ð½Ð°Ð·Ð²Ð¸ Ð·Ð¼Ñ–Ð½Ð½Ð¾Ñ—"
  
! #: info/infokey.c:522
  #, c-format
  msgid "variable name too long"
  msgstr "Ð½Ð°Ð·Ð²Ð° Ð·Ð¼Ñ–Ð½Ð½Ð¾Ñ— Ð·Ð°Ð½Ð°Ð´Ñ‚Ð¾ Ð´Ð¾Ð²Ð³Ð°"
  
! #: info/infokey.c:546
  #, c-format
  msgid "value too long"
  msgstr "Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ� Ð·Ð°Ð½Ð°Ð´Ñ‚Ð¾ Ð´Ð¾Ð²Ð³Ðµ"
  
! #: info/infokey.c:592
  #, c-format
  msgid "\"%s\", line %u: "
--- 938,972 ----
  msgstr "Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð° Ð´Ñ–Ñ� `%s'"
  
! #: info/infokey.c:485
  #, c-format
  msgid "action name too long"
  msgstr "Ð½Ð°Ð·Ð²Ð° Ð´Ñ–Ñ— Ð·Ð°Ð½Ð°Ð´Ñ‚Ð¾ Ð´Ð¾Ð²Ð³Ð°"
  
! #: info/infokey.c:498
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "Ð·Ð°Ð¹Ð²Ñ– Ñ�Ð¸Ð¼Ð²Ð¾Ð»Ð¸ Ð¿Ñ–Ñ�Ð»Ñ� Ð´Ñ–Ñ— `%s'"
  
! #: info/infokey.c:509
  #, c-format
  msgid "missing variable name"
  msgstr "Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½Ð¾ Ð½Ð°Ð·Ð²Ñƒ Ð·Ð¼Ñ–Ð½Ð½Ð¾Ñ—"
  
! #: info/infokey.c:518
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½Ð¾ Ð·Ð½Ð°Ðº `=' Ð¾Ð´Ñ€Ð°Ð·Ñƒ Ð¿Ñ–Ñ�Ð»Ñ� Ð½Ð°Ð·Ð²Ð¸ Ð·Ð¼Ñ–Ð½Ð½Ð¾Ñ—"
  
! #: info/infokey.c:525
  #, c-format
  msgid "variable name too long"
  msgstr "Ð½Ð°Ð·Ð²Ð° Ð·Ð¼Ñ–Ð½Ð½Ð¾Ñ— Ð·Ð°Ð½Ð°Ð´Ñ‚Ð¾ Ð´Ð¾Ð²Ð³Ð°"
  
! #: info/infokey.c:549
  #, c-format
  msgid "value too long"
  msgstr "Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ� Ð·Ð°Ð½Ð°Ð´Ñ‚Ð¾ Ð´Ð¾Ð²Ð³Ðµ"
  
! #: info/infokey.c:595
  #, c-format
  msgid "\"%s\", line %u: "
***************
*** 1305,1644 ****
  msgstr "Ð�Ðµ Ð²Ð´Ð°Ñ”Ñ‚ÑŒÑ�Ñ� Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ð²ÑƒÐ·Ð¾Ð», Ð½Ð° Ñ�ÐºÐ¸Ð¹ Ð¿Ð¾Ñ�Ð¸Ð»Ð°Ñ”Ñ‚ÑŒÑ�Ñ� Â«%sÂ» Ñƒ Â«%sÂ»."
  
! #: info/session.c:2864
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "ÐŸÑ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ Ñ�Ð¿Ð¸Ñ�Ð¾Ðº Ð¿ÑƒÐ½ÐºÑ‚Ñ–Ð² Ð¼ÐµÐ½ÑŽ, Ð¿Ð¾Ñ‡Ð¸Ð½Ð°ÑŽÑ‡Ð¸ Ð²Ñ–Ð´ dir Ñ‚Ð° Ð¿ÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð·Ð° Ð½Ð¸Ð¼Ð¸"
  
! #: info/session.c:2866
  msgid "Follow menus: "
  msgstr "Ð™Ñ‚Ð¸ Ð·Ð° Ð¼ÐµÐ½ÑŽ: "
  
! #: info/session.c:2971
  msgid "Select the Next node"
  msgstr "ÐžÐ±Ñ€Ð°Ñ‚Ð¸ Ð½Ð°Ñ�Ñ‚ÑƒÐ¿Ð½Ð¸Ð¹ Ð²ÑƒÐ·Ð¾Ð»"
  
! #: info/session.c:2978
  msgid "Select the Prev node"
  msgstr "ÐžÐ±Ñ€Ð°Ñ‚Ð¸ Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ–Ð¹ Ð²ÑƒÐ·Ð¾Ð»"
  
! #: info/session.c:2985
  msgid "Select the Up node"
  msgstr "ÐžÐ±Ñ€Ð°Ñ‚Ð¸ Ð³Ð¾Ñ€Ñ–ÑˆÐ½Ñ–Ð¹ Ð²ÑƒÐ·Ð¾Ð»"
  
! #: info/session.c:2991
  msgid "Select the last node in this file"
  msgstr "ÐžÐ±Ñ€Ð°Ñ‚Ð¸ Ð¾Ñ�Ñ‚Ð°Ð½Ð½Ñ–Ð¹ Ð²ÑƒÐ·Ð¾Ð» Ñ†ÑŒÐ¾Ð³Ð¾ Ñ„Ð°Ð¹Ð»Ñƒ"
  
! #: info/session.c:3018 info/session.c:3051
  msgid "This window has no additional nodes"
  msgstr "Ð¦Ðµ Ð²Ñ–ÐºÐ½Ð¾ Ð½Ðµ Ð¼Ð°Ñ” Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¸Ñ… Ð²ÑƒÐ·Ð»Ñ–Ð²"
  
! #: info/session.c:3024
  msgid "Select the first node in this file"
  msgstr "ÐžÐ±Ñ€Ð°Ñ‚Ð¸ Ð¿ÐµÑ€ÑˆÐ¸Ð¹ Ð²ÑƒÐ·Ð¾Ð» Ñ†ÑŒÐ¾Ð³Ð¾ Ñ„Ð°Ð¹Ð»Ñƒ"
  
! #: info/session.c:3158
  msgid "No more nodes within this document."
  msgstr "Ð¦Ðµ Ð¾Ñ�Ñ‚Ð°Ð½Ð½Ñ–Ð¹ Ð²ÑƒÐ·Ð¾Ð» Ñ†ÑŒÐ¾Ð³Ð¾ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ñƒ."
  
! #: info/session.c:3203 info/session.c:3243
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr ""
  "Ð£ Ñ†ÑŒÐ¾Ð³Ð¾ Ð²ÑƒÐ·Ð»Ð° Ð½ÐµÐ¼Ð°Ñ” Â«ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð½ÑŒÐ¾Ð³Ð¾Â» Ñ‡Ð¸ Â«Ð“Ð¾Ñ€Ñ–ÑˆÐ½ÑŒÐ¾Ð³Ð¾Â» Ð²ÑƒÐ·Ð»Ð° Ñƒ Ñ†ÑŒÐ¾Ð¼Ñƒ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ñ–."
  
! #: info/session.c:3256
  msgid "Move forwards or down through node structure"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð²Ð¿ÐµÑ€ÐµÐ´ Ñ‡Ð¸ Ð²Ð½Ð¸Ð· Ð¿Ð¾ Ñ�Ñ‚Ñ€ÑƒÐºÑ‚ÑƒÑ€Ñ– Ð²ÑƒÐ·Ð»Ñ–Ð²"
  
! #: info/session.c:3273
  msgid "Move backwards or up through node structure"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð½Ð°Ð·Ð°Ð´ Ñ‡Ð¸ Ð²Ð²ÐµÑ€Ñ… Ð¿Ð¾ Ñ�Ñ‚Ñ€ÑƒÐºÑ‚ÑƒÑ€Ñ– Ð²ÑƒÐ·Ð»Ñ–Ð²"
  
! #: info/session.c:3296
  msgid "Read a node name and select it"
  msgstr "ÐŸÑ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ Ð½Ð°Ð·Ð²Ñƒ Ð²ÑƒÐ·Ð»Ð° Ð¹ Ð¾Ð±Ñ€Ð°Ñ‚Ð¸ Ð¹Ð¾Ð³Ð¾"
  
! #: info/session.c:3350 info/session.c:3354
  msgid "Goto node: "
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð´Ð¾ Ð²ÑƒÐ·Ð»Ð°: "
  
! #: info/session.c:3533
  msgid "Find the node describing program invocation"
  msgstr "Ð—Ð½Ð°Ð¹Ñ‚Ð¸ Ð²ÑƒÐ·Ð¾Ð», Ñ‰Ð¾ Ð¾Ð¿Ð¸Ñ�ÑƒÑ” Ð·Ð°Ð¿ÑƒÑ�Ðº Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸"
  
! #: info/session.c:3535
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Ð—Ð½Ð°Ð¹Ñ‚Ð¸ Ð²ÑƒÐ·Ð¾Ð» Ð·Ð°Ð¿ÑƒÑ�ÐºÑƒ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸ [%s]: "
  
! #: info/session.c:3580
  msgid "Read a manpage reference and select it"
  msgstr "ÐŸÑ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ Ð¿Ð¾Ñ�Ð¸Ð»Ð°Ð½Ð½Ñ� Ð½Ð° Ñ�Ñ‚Ð¾Ñ€Ñ–Ð½ÐºÑƒ man Ñ‚Ð° Ð¾Ð±Ñ€Ð°Ñ‚Ð¸ Ñ—Ñ—"
  
! #: info/session.c:3584
  msgid "Get Manpage: "
  msgstr "ÐžÑ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ man-Ñ�Ñ‚Ð¾Ñ€Ñ–Ð½ÐºÑƒ: "
  
! #: info/session.c:3605
  msgid "Select the node 'Top' in this file"
  msgstr "ÐžÐ±Ñ€Ð°Ñ‚Ð¸ Â«Ð’ÐµÑ€Ñ…Ð½Ñ–Ð¹Â» Ð²ÑƒÐ·Ð¾Ð» Ñ†ÑŒÐ¾Ð³Ð¾ Ñ„Ð°Ð¹Ð»Ñƒ"
  
! #: info/session.c:3611
  msgid "Select the node '(dir)'"
  msgstr "ÐžÐ±Ñ€Ð°Ñ‚Ð¸ Ð²ÑƒÐ·Ð¾Ð» Â«(dir)Â»"
  
! #: info/session.c:3617
  msgid "Show full file name of node being displayed"
  msgstr "ÐŸÐ¾ÐºÐ°Ð·ÑƒÐ²Ð°Ñ‚Ð¸ Ð¿Ð¾Ð²Ð½Ñƒ Ð½Ð°Ð·Ð²Ñƒ Ñ„Ð°Ð¹Ð»Ð° Ð´Ð»Ñ� Ð¿Ð¾ÐºÐ°Ð·Ð°Ð½Ð¾Ð³Ð¾ Ð²ÑƒÐ·Ð»Ð°"
  
! #: info/session.c:3634
  msgid "Select the most recently selected node"
  msgstr "ÐŸÐ¾Ð·Ð½Ð°Ñ‡Ð¸Ñ‚Ð¸ Ð¾Ñ�Ñ‚Ð°Ð½Ð½Ñ–Ð¹ Ð· Ð¿Ð¾Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ… Ð²ÑƒÐ·Ð»Ñ–Ð²"
  
! #: info/session.c:3639
  #, c-format
  msgid "No earlier node in history"
  msgstr "Ð£ Ð¶ÑƒÑ€Ð½Ð°Ð»Ñ– Ð½ÐµÐ¼Ð°Ñ” Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð½ÑŒÐ¾Ð³Ð¾ Ð²ÑƒÐ·Ð»Ð°"
  
! #: info/session.c:3643
  msgid "Read the name of a file and select it"
  msgstr "ÐŸÑ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ Ð½Ð°Ð·Ð²Ñƒ Ñ„Ð°Ð¹Ð»Ñƒ Ð¹ Ð¾Ð±Ñ€Ð°Ñ‚Ð¸ Ð¹Ð¾Ð³Ð¾"
  
! #: info/session.c:3647
  msgid "Find file: "
  msgstr "Ð—Ð½Ð°Ð¹Ñ‚Ð¸ Ñ„Ð°Ð¹Ð»: "
  
! #: info/session.c:3664
  #, c-format
  msgid "Cannot find '%s'."
  msgstr "Ð�Ðµ Ð²Ð´Ð°Ð»Ð¾Ñ�Ñ� Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Â«%sÂ»."
  
! #: info/session.c:3713
  #, c-format
  msgid "Could not create output file '%s'."
  msgstr "Ð�Ðµ Ð²Ð´Ð°Ñ”Ñ‚ÑŒÑ�Ñ� Ñ�Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» Ð²Ð¸Ð²Ð¾Ð´Ñƒ Â«%sÂ»."
  
! #: info/session.c:3727
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ� Ð·Ð°Ð¿Ð¸Ñ�Ñƒ Ð´Ð¾ %s: %s"
  
! #: info/session.c:3736
  #, c-format
  msgid "closing %s"
  msgstr "Ð·Ð°ÐºÑ€Ð¸Ñ‚Ñ‚Ñ� %s"
  
! #: info/session.c:3785
  #, c-format
  msgid "writing node %s..."
  msgstr "Ð·Ð°Ð¿Ð¸Ñ�ÑƒÑ”Ð¼Ð¾ Ð²ÑƒÐ·Ð¾Ð» %sâ€¦"
  
! #: info/session.c:3831
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "ÐŸÐµÑ€ÐµÐ´Ð°Ñ‚Ð¸ Ð²Ð¼Ñ–Ñ�Ñ‚ Ñ†ÑŒÐ¾Ð³Ð¾ Ð²ÑƒÐ·Ð»Ð° Ñ‡ÐµÑ€ÐµÐ· ÐºÐ°Ð½Ð°Ð» Ð´Ð¾ INFO_PRINT_COMMAND"
  
! #: info/session.c:3859
  #, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Ð�Ðµ Ð²Ð´Ð°Ñ”Ñ‚ÑŒÑ�Ñ� Ñ�Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ ÐºÐ°Ð½Ð°Ð» Ð´Ð¾ Â«%sÂ»."
  
! #: info/session.c:3864
  #, c-format
  msgid "printing node %s..."
  msgstr "Ð´Ñ€ÑƒÐºÑƒÑ”Ð¼Ð¾ Ð²ÑƒÐ·Ð¾Ð» %sâ€¦"
  
! #: info/session.c:3872
  #, c-format
  msgid "finished printing node %s"
  msgstr "Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¾ Ð´Ñ€ÑƒÐº Ð²ÑƒÐ·Ð»Ð° %s"
  
! #: 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:4169
  msgid "Search continued from the end of the document."
  msgstr "ÐŸÐ¾ÑˆÑƒÐº Ð¿Ñ€Ð¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð¾ Ð· ÐºÑ–Ð½Ñ†Ñ� Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°."
  
! #: info/session.c:4174
  msgid "Search continued from the beginning of the document."
  msgstr "ÐŸÐ¾ÑˆÑƒÐº Ð¿Ñ€Ð¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð¾ Ð· Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÑƒ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°."
  
! #: info/session.c:4194
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "ÐŸÐ¾ÑˆÑƒÐº Ð¿Ñ–Ð´Ñ„Ð°Ð¹Ð»Ñƒ %s ..."
  
! #: info/session.c:4231
  msgid "Search failed."
  msgstr "ÐŸÐ¾ÑˆÑƒÐº Ð½Ðµ Ð²Ð´Ð°Ð²Ñ�Ñ�."
  
! #: info/session.c:4248
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Regexp search"
  msgstr "ÐŸÐ¾ÑˆÑƒÐº Ð·Ð° Ñ€ÐµÐ³ÑƒÐ»Ñ�Ñ€Ð½Ð¸Ð¼ Ð²Ð¸Ñ€Ð°Ð·Ð¾Ð¼"
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Search"
  msgstr "ÐŸÐ¾ÑˆÑƒÐº"
  
! #: info/session.c:4250 info/session.c:4256
  msgid " case-sensitively"
  msgstr " Ð· Ð²Ñ€Ð°Ñ…ÑƒÐ²Ð°Ð½Ð½Ñ�Ð¼ Ñ€ÐµÐ³Ñ–Ñ�Ñ‚Ñ€Ñƒ"
  
! #: info/session.c:4251 info/session.c:4257
  msgid " backward"
  msgstr " Ð½Ð°Ð·Ð°Ð´"
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s: "
  
! #: info/session.c:4274
  msgid "Search string too short"
  msgstr "Ð Ñ�Ð´Ð¾Ðº Ð¿Ð¾ÑˆÑƒÐºÑƒ Ñ” Ð½Ð°Ð´Ñ‚Ð¾ ÐºÐ¾Ñ€Ð¾Ñ‚ÐºÐ¸Ð¼"
  
! #: info/session.c:4467
  #, c-format
  msgid "Going back to last match from %s"
  msgstr "ÐŸÐ¾Ð²ÐµÑ€Ñ‚Ð°Ñ”Ð¼Ð¾Ñ�Ñ� Ð´Ð¾ Ð¾Ñ�Ñ‚Ð°Ð½Ð½ÑŒÐ¾Ð³Ð¾ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð½Ð¸ÐºÐ° Ð²Ñ–Ð´ %s"
  
! #: info/session.c:4491 info/session.c:4601
  #, c-format
  msgid "No more matches."
  msgstr "Ð¦Ðµ Ð±ÑƒÐ² Ð¾Ñ�Ñ‚Ð°Ð½Ð½Ñ–Ð¹ Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚."
  
! #: info/session.c:4628
  msgid "Search this node and subnodes for a string."
  msgstr "Ð¨ÑƒÐºÐ°Ñ‚Ð¸ Ñ€Ñ�Ð´Ð¾Ðº Ñƒ Ñ†ÑŒÐ¾Ð¼Ñƒ Ð²ÑƒÐ·Ð»Ñ– Ñ– ÑƒÑ�Ñ–Ñ… Ð¿Ñ–Ð´Ð»ÐµÐ³Ð»Ð¸Ñ… Ð²ÑƒÐ·Ð»Ð°Ñ…."
  
! #: info/session.c:4649
  msgid "Go to next match in Info sub-tree"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð´Ð¾ Ð½Ð°Ñ�Ñ‚ÑƒÐ¿Ð½Ð¾Ð³Ð¾ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð½Ð¸ÐºÐ° Ñƒ Ð¿Ñ–Ð´Ð´ÐµÑ€ÐµÐ²Ñ– Info"
  
! #: info/session.c:4653 info/session.c:4665
  #, c-format
  msgid "No active search"
  msgstr "Ð�ÐµÐ¼Ð°Ñ” Ð°ÐºÑ‚Ð¸Ð²Ð½Ð¾Ð³Ð¾ Ð¿Ð¾ÑˆÑƒÐºÑƒ"
  
! #: info/session.c:4661
  msgid "Go to previous match in Info sub-tree"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð´Ð¾ Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð½ÑŒÐ¾Ð³Ð¾ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð½Ð¸ÐºÐ° Ñƒ Ð¿Ñ–Ð´Ð´ÐµÑ€ÐµÐ²Ñ– Info"
  
! #: info/session.c:4674
  msgid "Read a string and search for it case-sensitively"
  msgstr "ÐŸÑ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ Ñ€Ñ�Ð´Ð¾Ðº Ñ‚Ð° Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ð¹Ð¾Ð³Ð¾, Ð²Ñ€Ð°Ñ…Ð¾Ð²ÑƒÑŽÑ‡Ð¸ Ñ€ÐµÐ³Ñ–Ñ�Ñ‚Ñ€"
  
! #: info/session.c:4679
  msgid "Read a string and search for it"
  msgstr "ÐŸÑ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ Ñ€Ñ�Ð´Ð¾Ðº Ñ‚Ð° Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ð¹Ð¾Ð³Ð¾"
  
! #: info/session.c:4685
  msgid "Read a string and search backward for it"
  msgstr "ÐŸÑ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ Ñ€Ñ�Ð´Ð¾Ðº Ñ‚Ð° Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ð¹Ð¾Ð³Ð¾ Ñƒ Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð½ÑŒÐ¾Ð¼Ñƒ Ñ‚ÐµÐºÑ�Ñ‚Ñ–"
  
! #: info/session.c:4693
  msgid "Repeat last search in the same direction"
  msgstr "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚Ð¸ Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ–Ð¹ Ð¿Ð¾ÑˆÑƒÐº Ñƒ Ñ‚Ð¾Ð¼Ñƒ Ð¶ Ð½Ð°Ð¿Ñ€Ñ�Ð¼Ñ–"
  
! #: info/session.c:4701 info/session.c:4746
  msgid "No previous search string"
  msgstr "Ð�ÐµÐ¼Ð° Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð½ÑŒÐ¾Ð³Ð¾ Ñ€Ñ�Ð´ÐºÑƒ Ð¿Ð¾ÑˆÑƒÐºÑƒ"
  
! #: info/session.c:4738
  msgid "Repeat last search in the reverse direction"
  msgstr "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚Ð¸ Ð¿Ð¾ÑˆÑƒÐº Ñƒ Ð·Ð²Ð¾Ñ€Ð¾Ñ‚Ð½ÑŒÐ¾Ð¼Ñƒ Ð½Ð°Ð¿Ñ€Ñ�Ð¼Ñ–"
  
! #: info/session.c:4785
  msgid "Clear displayed search matches"
  msgstr "Ð¯Ð²Ð½Ð¾ Ð¿Ð¾ÐºÐ°Ð·Ð°Ð½Ñ– Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ð¸ Ð¿Ð¾ÑˆÑƒÐºÑƒ"
  
! #: info/session.c:4802 info/session.c:4808
  msgid "Search interactively for a string as you type it"
  msgstr "Ð¨ÑƒÐºÐ°Ñ‚Ð¸ Ñ€Ñ�Ð´Ð¾Ðº Ñ–Ð½Ñ‚ÐµÑ€Ð°ÐºÑ‚Ð¸Ð²Ð½Ð¾, Ð¿Ð¾ÐºÐ¸ Ð²Ð¸ Ð¹Ð¾Ð³Ð¾ Ð½Ð°Ð±Ð¸Ñ€Ð°Ñ”Ñ‚Ðµ"
  
! #: info/session.c:4928
  msgid "Regexp I-search backward: "
  msgstr "I-Ð¿Ð¾ÑˆÑƒÐº Ð½Ð°Ð·Ð°Ð´ Ð·Ð° Ñ„Ð¾Ñ€Ð¼Ð°Ð»ÑŒÐ½Ð¸Ð¼ Ð²Ð¸Ñ€Ð°Ð·Ð¾Ð¼: "
  
! #: info/session.c:4929
  msgid "I-search backward: "
  msgstr "I-Ð¿Ð¾ÑˆÑƒÐº Ð½Ð°Ð·Ð°Ð´: "
  
! #: info/session.c:4931
  msgid "Regexp I-search: "
  msgstr "I-Ð¿Ð¾ÑˆÑƒÐº Ð·Ð° Ñ„Ð¾Ñ€Ð¼Ð°Ð»ÑŒÐ½Ð¸Ð¼ Ð²Ð¸Ñ€Ð°Ð·Ð¾Ð¼: "
  
! #: info/session.c:4932
  msgid "I-search: "
  msgstr "I-Ð¿Ð¾ÑˆÑƒÐº: "
  
! #: info/session.c:4957 info/session.c:4960
  msgid "Failing "
  msgstr "Ð�ÐµÐ²Ð´Ð°Ð»Ð¸Ð¹ "
  
! #: info/session.c:5326
  msgid "Cancel current operation"
  msgstr "Ð¡ÐºÐ°Ñ�ÑƒÐ²Ð°Ñ‚Ð¸ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ñƒ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ñ–ÑŽ"
  
! #: info/session.c:5333
  msgid "Quit"
  msgstr "Ð—Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¾"
  
! #: info/session.c:5338
  msgid "Display version of Info being run"
  msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ð²ÐµÑ€Ñ�Ñ–ÑŽ Ð·Ð°Ð¿ÑƒÑ‰ÐµÐ½Ð¾Ð³Ð¾ ÐµÐºÐ·ÐµÐ¼Ð¿Ð»Ñ�Ñ€Ð° Info"
  
! #: info/session.c:5340
  #, c-format
  msgid "GNU Info version %s"
  msgstr "GNU Info Ð²ÐµÑ€Ñ�Ñ–Ñ— %s"
  
! #: info/session.c:5345
  msgid "Redraw the display"
  msgstr "ÐžÐ½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ�"
  
! #: info/session.c:5382
  msgid "Quit using Info"
  msgstr "Ð’Ð¸Ð¹Ñ‚Ð¸ Ð· Info"
  
! #: info/session.c:5398
  msgid "Run command bound to this key's lowercase variant"
  msgstr "Ð—Ð°Ð¿ÑƒÑ�Ñ‚Ð¸Ñ‚Ð¸ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ, Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ñƒ Ñ†Ñ–Ð¹ ÐºÐ»Ð°Ð²Ñ–ÑˆÑ– Ñƒ Ð½Ð¸Ð¶Ð½ÑŒÐ¾Ð¼Ñƒ Ñ€ÐµÐ³Ñ–Ñ�Ñ‚Ñ€Ñ–"
  
! #: info/session.c:5409
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Ð�ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° (%s)."
  
! #: info/session.c:5412
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "Ð½ÐµÐ²Ñ–Ñ€Ð½Ð° Ð¿Ð¾Ñ�Ð»Ñ–Ð´Ð¾Ð²Ð½Ñ–Ñ�Ñ‚ÑŒ \"%s\""
  
! #: info/session.c:5413
  #, c-format
  msgid "'%s' is invalid"
  msgstr "Â«%sÂ» Ñ” Ð½ÐµÐºÐ¾Ñ€ÐµÐºÑ‚Ð½Ð¸Ð¼"
  
! #: info/session.c:5731
  msgid "Add this digit to the current numeric argument"
  msgstr "Ð”Ð¾Ð´Ð°Ñ‚Ð¸ Ñ†ÑŽ Ñ†Ð¸Ñ„Ñ€Ñƒ Ð´Ð¾ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ Ñ‡Ð¸Ñ�Ð»Ð¾Ð²Ð¾Ð³Ð¾ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñƒ"
  
! #: info/session.c:5738
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "Ð†Ð½Ñ–Ñ†Ñ–ÑŽÐ²Ð°Ñ‚Ð¸ (Ñ‡Ð¸ Ð¿Ð¾Ð¼Ð½Ð¾Ð¶Ð¸Ñ‚Ð¸ Ð½Ð° 4) Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¸Ð¹ Ñ‡Ð¸Ñ�Ð»Ð¾Ð²Ð¸Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚"
--- 1301,1640 ----
  msgstr "Ð�Ðµ Ð²Ð´Ð°Ñ”Ñ‚ÑŒÑ�Ñ� Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ð²ÑƒÐ·Ð¾Ð», Ð½Ð° Ñ�ÐºÐ¸Ð¹ Ð¿Ð¾Ñ�Ð¸Ð»Ð°Ñ”Ñ‚ÑŒÑ�Ñ� Â«%sÂ» Ñƒ Â«%sÂ»."
  
! #: info/session.c:2870
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "ÐŸÑ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ Ñ�Ð¿Ð¸Ñ�Ð¾Ðº Ð¿ÑƒÐ½ÐºÑ‚Ñ–Ð² Ð¼ÐµÐ½ÑŽ, Ð¿Ð¾Ñ‡Ð¸Ð½Ð°ÑŽÑ‡Ð¸ Ð²Ñ–Ð´ dir Ñ‚Ð° Ð¿ÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð·Ð° Ð½Ð¸Ð¼Ð¸"
  
! #: info/session.c:2872
  msgid "Follow menus: "
  msgstr "Ð™Ñ‚Ð¸ Ð·Ð° Ð¼ÐµÐ½ÑŽ: "
  
! #: info/session.c:2977
  msgid "Select the Next node"
  msgstr "ÐžÐ±Ñ€Ð°Ñ‚Ð¸ Ð½Ð°Ñ�Ñ‚ÑƒÐ¿Ð½Ð¸Ð¹ Ð²ÑƒÐ·Ð¾Ð»"
  
! #: info/session.c:2984
  msgid "Select the Prev node"
  msgstr "ÐžÐ±Ñ€Ð°Ñ‚Ð¸ Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ–Ð¹ Ð²ÑƒÐ·Ð¾Ð»"
  
! #: info/session.c:2991
  msgid "Select the Up node"
  msgstr "ÐžÐ±Ñ€Ð°Ñ‚Ð¸ Ð³Ð¾Ñ€Ñ–ÑˆÐ½Ñ–Ð¹ Ð²ÑƒÐ·Ð¾Ð»"
  
! #: info/session.c:2997
  msgid "Select the last node in this file"
  msgstr "ÐžÐ±Ñ€Ð°Ñ‚Ð¸ Ð¾Ñ�Ñ‚Ð°Ð½Ð½Ñ–Ð¹ Ð²ÑƒÐ·Ð¾Ð» Ñ†ÑŒÐ¾Ð³Ð¾ Ñ„Ð°Ð¹Ð»Ñƒ"
  
! #: info/session.c:3024 info/session.c:3057
  msgid "This window has no additional nodes"
  msgstr "Ð¦Ðµ Ð²Ñ–ÐºÐ½Ð¾ Ð½Ðµ Ð¼Ð°Ñ” Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¸Ñ… Ð²ÑƒÐ·Ð»Ñ–Ð²"
  
! #: info/session.c:3030
  msgid "Select the first node in this file"
  msgstr "ÐžÐ±Ñ€Ð°Ñ‚Ð¸ Ð¿ÐµÑ€ÑˆÐ¸Ð¹ Ð²ÑƒÐ·Ð¾Ð» Ñ†ÑŒÐ¾Ð³Ð¾ Ñ„Ð°Ð¹Ð»Ñƒ"
  
! #: info/session.c:3164
  msgid "No more nodes within this document."
  msgstr "Ð¦Ðµ Ð¾Ñ�Ñ‚Ð°Ð½Ð½Ñ–Ð¹ Ð²ÑƒÐ·Ð¾Ð» Ñ†ÑŒÐ¾Ð³Ð¾ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ñƒ."
  
! #: info/session.c:3209 info/session.c:3249
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr ""
  "Ð£ Ñ†ÑŒÐ¾Ð³Ð¾ Ð²ÑƒÐ·Ð»Ð° Ð½ÐµÐ¼Ð°Ñ” Â«ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð½ÑŒÐ¾Ð³Ð¾Â» Ñ‡Ð¸ Â«Ð“Ð¾Ñ€Ñ–ÑˆÐ½ÑŒÐ¾Ð³Ð¾Â» Ð²ÑƒÐ·Ð»Ð° Ñƒ Ñ†ÑŒÐ¾Ð¼Ñƒ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ñ–."
  
! #: info/session.c:3262
  msgid "Move forwards or down through node structure"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð²Ð¿ÐµÑ€ÐµÐ´ Ñ‡Ð¸ Ð²Ð½Ð¸Ð· Ð¿Ð¾ Ñ�Ñ‚Ñ€ÑƒÐºÑ‚ÑƒÑ€Ñ– Ð²ÑƒÐ·Ð»Ñ–Ð²"
  
! #: info/session.c:3279
  msgid "Move backwards or up through node structure"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð½Ð°Ð·Ð°Ð´ Ñ‡Ð¸ Ð²Ð²ÐµÑ€Ñ… Ð¿Ð¾ Ñ�Ñ‚Ñ€ÑƒÐºÑ‚ÑƒÑ€Ñ– Ð²ÑƒÐ·Ð»Ñ–Ð²"
  
! #: info/session.c:3302
  msgid "Read a node name and select it"
  msgstr "ÐŸÑ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ Ð½Ð°Ð·Ð²Ñƒ Ð²ÑƒÐ·Ð»Ð° Ð¹ Ð¾Ð±Ñ€Ð°Ñ‚Ð¸ Ð¹Ð¾Ð³Ð¾"
  
! #: info/session.c:3356 info/session.c:3360
  msgid "Goto node: "
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð´Ð¾ Ð²ÑƒÐ·Ð»Ð°: "
  
! #: info/session.c:3539
  msgid "Find the node describing program invocation"
  msgstr "Ð—Ð½Ð°Ð¹Ñ‚Ð¸ Ð²ÑƒÐ·Ð¾Ð», Ñ‰Ð¾ Ð¾Ð¿Ð¸Ñ�ÑƒÑ” Ð·Ð°Ð¿ÑƒÑ�Ðº Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸"
  
! #: info/session.c:3541
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "Ð—Ð½Ð°Ð¹Ñ‚Ð¸ Ð²ÑƒÐ·Ð¾Ð» Ð·Ð°Ð¿ÑƒÑ�ÐºÑƒ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸ [%s]: "
  
! #: info/session.c:3586
  msgid "Read a manpage reference and select it"
  msgstr "ÐŸÑ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ Ð¿Ð¾Ñ�Ð¸Ð»Ð°Ð½Ð½Ñ� Ð½Ð° Ñ�Ñ‚Ð¾Ñ€Ñ–Ð½ÐºÑƒ man Ñ‚Ð° Ð¾Ð±Ñ€Ð°Ñ‚Ð¸ Ñ—Ñ—"
  
! #: info/session.c:3590
  msgid "Get Manpage: "
  msgstr "ÐžÑ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ man-Ñ�Ñ‚Ð¾Ñ€Ñ–Ð½ÐºÑƒ: "
  
! #: info/session.c:3611
  msgid "Select the node 'Top' in this file"
  msgstr "ÐžÐ±Ñ€Ð°Ñ‚Ð¸ Â«Ð’ÐµÑ€Ñ…Ð½Ñ–Ð¹Â» Ð²ÑƒÐ·Ð¾Ð» Ñ†ÑŒÐ¾Ð³Ð¾ Ñ„Ð°Ð¹Ð»Ñƒ"
  
! #: info/session.c:3617
  msgid "Select the node '(dir)'"
  msgstr "ÐžÐ±Ñ€Ð°Ñ‚Ð¸ Ð²ÑƒÐ·Ð¾Ð» Â«(dir)Â»"
  
! #: info/session.c:3623
  msgid "Show full file name of node being displayed"
  msgstr "ÐŸÐ¾ÐºÐ°Ð·ÑƒÐ²Ð°Ñ‚Ð¸ Ð¿Ð¾Ð²Ð½Ñƒ Ð½Ð°Ð·Ð²Ñƒ Ñ„Ð°Ð¹Ð»Ð° Ð´Ð»Ñ� Ð¿Ð¾ÐºÐ°Ð·Ð°Ð½Ð¾Ð³Ð¾ Ð²ÑƒÐ·Ð»Ð°"
  
! #: info/session.c:3640
  msgid "Select the most recently selected node"
  msgstr "ÐŸÐ¾Ð·Ð½Ð°Ñ‡Ð¸Ñ‚Ð¸ Ð¾Ñ�Ñ‚Ð°Ð½Ð½Ñ–Ð¹ Ð· Ð¿Ð¾Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ… Ð²ÑƒÐ·Ð»Ñ–Ð²"
  
! #: info/session.c:3645
  #, c-format
  msgid "No earlier node in history"
  msgstr "Ð£ Ð¶ÑƒÑ€Ð½Ð°Ð»Ñ– Ð½ÐµÐ¼Ð°Ñ” Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð½ÑŒÐ¾Ð³Ð¾ Ð²ÑƒÐ·Ð»Ð°"
  
! #: info/session.c:3649
  msgid "Read the name of a file and select it"
  msgstr "ÐŸÑ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ Ð½Ð°Ð·Ð²Ñƒ Ñ„Ð°Ð¹Ð»Ñƒ Ð¹ Ð¾Ð±Ñ€Ð°Ñ‚Ð¸ Ð¹Ð¾Ð³Ð¾"
  
! #: info/session.c:3653
  msgid "Find file: "
  msgstr "Ð—Ð½Ð°Ð¹Ñ‚Ð¸ Ñ„Ð°Ð¹Ð»: "
  
! #: info/session.c:3670
  #, c-format
  msgid "Cannot find '%s'."
  msgstr "Ð�Ðµ Ð²Ð´Ð°Ð»Ð¾Ñ�Ñ� Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Â«%sÂ»."
  
! #: info/session.c:3719
  #, c-format
  msgid "Could not create output file '%s'."
  msgstr "Ð�Ðµ Ð²Ð´Ð°Ñ”Ñ‚ÑŒÑ�Ñ� Ñ�Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» Ð²Ð¸Ð²Ð¾Ð´Ñƒ Â«%sÂ»."
  
! #: info/session.c:3733
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ� Ð·Ð°Ð¿Ð¸Ñ�Ñƒ Ð´Ð¾ %s: %s"
  
! #: info/session.c:3742
  #, c-format
  msgid "closing %s"
  msgstr "Ð·Ð°ÐºÑ€Ð¸Ñ‚Ñ‚Ñ� %s"
  
! #: info/session.c:3791
  #, c-format
  msgid "writing node %s..."
  msgstr "Ð·Ð°Ð¿Ð¸Ñ�ÑƒÑ”Ð¼Ð¾ Ð²ÑƒÐ·Ð¾Ð» %sâ€¦"
  
! #: info/session.c:3837
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "ÐŸÐµÑ€ÐµÐ´Ð°Ñ‚Ð¸ Ð²Ð¼Ñ–Ñ�Ñ‚ Ñ†ÑŒÐ¾Ð³Ð¾ Ð²ÑƒÐ·Ð»Ð° Ñ‡ÐµÑ€ÐµÐ· ÐºÐ°Ð½Ð°Ð» Ð´Ð¾ INFO_PRINT_COMMAND"
  
! #: info/session.c:3865
  #, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "Ð�Ðµ Ð²Ð´Ð°Ñ”Ñ‚ÑŒÑ�Ñ� Ñ�Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ ÐºÐ°Ð½Ð°Ð» Ð´Ð¾ Â«%sÂ»."
  
! #: info/session.c:3870
  #, c-format
  msgid "printing node %s..."
  msgstr "Ð´Ñ€ÑƒÐºÑƒÑ”Ð¼Ð¾ Ð²ÑƒÐ·Ð¾Ð» %sâ€¦"
  
! #: info/session.c:3878
  #, c-format
  msgid "finished printing node %s"
  msgstr "Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¾ Ð´Ñ€ÑƒÐº Ð²ÑƒÐ·Ð»Ð° %s"
  
! #: info/session.c:3910
  msgid "Toggle the usage of regular expressions in searches"
  msgstr "ÐŸÐµÑ€ÐµÐ¼Ð¸ÐºÐ½ÑƒÑ‚Ð¸ Ð²Ð¸ÐºÐ¾Ñ€Ð¸Ñ�Ñ‚Ð°Ð½Ð½Ñ� Ñ€ÐµÐ³ÑƒÐ»Ñ�Ñ€Ð½Ð¸Ñ… Ð²Ð¸Ñ€Ð°Ð·Ñ–Ð² Ð¿Ñ–Ð´ Ñ‡Ð°Ñ� Ð¿Ð¾ÑˆÑƒÐºÑƒ"
  
! #: info/session.c:3914
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr "ÐŸÑ–Ð´ Ñ‡Ð°Ñ� Ð¿Ð¾ÑˆÑƒÐºÑƒ Ð²Ð¸ÐºÐ¾Ñ€Ð¸Ñ�Ñ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸Ð¼ÑƒÑ‚ÑŒÑ�Ñ� Ñ€ÐµÐ³ÑƒÐ»Ñ�Ñ€Ð½Ñ– Ð²Ð¸Ñ€Ð°Ð·Ð¸."
  
! #: info/session.c:3915
  #, c-format
  msgid "Using literal strings for searches."
  msgstr "ÐŸÑ–Ð´ Ñ‡Ð°Ñ� Ð¿Ð¾ÑˆÑƒÐºÑƒ Ð²Ð¸ÐºÐ¾Ñ€Ð¸Ñ�Ñ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸Ð¼ÑƒÑ‚ÑŒÑ�Ñ� Ð·Ð²Ð¸Ñ‡Ð°Ð¹Ð½Ñ– Ñ€Ñ�Ð´ÐºÐ¸."
  
! #: info/session.c:4175
  msgid "Search continued from the end of the document."
  msgstr "ÐŸÐ¾ÑˆÑƒÐº Ð¿Ñ€Ð¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð¾ Ð· ÐºÑ–Ð½Ñ†Ñ� Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°."
  
! #: info/session.c:4180
  msgid "Search continued from the beginning of the document."
  msgstr "ÐŸÐ¾ÑˆÑƒÐº Ð¿Ñ€Ð¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð¾ Ð· Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÑƒ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°."
  
! #: info/session.c:4200
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "ÐŸÐ¾ÑˆÑƒÐº Ð¿Ñ–Ð´Ñ„Ð°Ð¹Ð»Ñƒ %s ..."
  
! #: info/session.c:4237
  msgid "Search failed."
  msgstr "ÐŸÐ¾ÑˆÑƒÐº Ð½Ðµ Ð²Ð´Ð°Ð²Ñ�Ñ�."
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Regexp search"
  msgstr "ÐŸÐ¾ÑˆÑƒÐº Ð·Ð° Ñ€ÐµÐ³ÑƒÐ»Ñ�Ñ€Ð½Ð¸Ð¼ Ð²Ð¸Ñ€Ð°Ð·Ð¾Ð¼"
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Search"
  msgstr "ÐŸÐ¾ÑˆÑƒÐº"
  
! #: info/session.c:4256 info/session.c:4262
  msgid " case-sensitively"
  msgstr " Ð· Ð²Ñ€Ð°Ñ…ÑƒÐ²Ð°Ð½Ð½Ñ�Ð¼ Ñ€ÐµÐ³Ñ–Ñ�Ñ‚Ñ€Ñƒ"
  
! #: info/session.c:4257 info/session.c:4263
  msgid " backward"
  msgstr " Ð½Ð°Ð·Ð°Ð´"
  
! #: info/session.c:4260
  #, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s: "
  
! #: info/session.c:4280
  msgid "Search string too short"
  msgstr "Ð Ñ�Ð´Ð¾Ðº Ð¿Ð¾ÑˆÑƒÐºÑƒ Ñ” Ð½Ð°Ð´Ñ‚Ð¾ ÐºÐ¾Ñ€Ð¾Ñ‚ÐºÐ¸Ð¼"
  
! #: info/session.c:4473
  #, c-format
  msgid "Going back to last match from %s"
  msgstr "ÐŸÐ¾Ð²ÐµÑ€Ñ‚Ð°Ñ”Ð¼Ð¾Ñ�Ñ� Ð´Ð¾ Ð¾Ñ�Ñ‚Ð°Ð½Ð½ÑŒÐ¾Ð³Ð¾ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð½Ð¸ÐºÐ° Ð²Ñ–Ð´ %s"
  
! #: info/session.c:4497 info/session.c:4607
  #, c-format
  msgid "No more matches."
  msgstr "Ð¦Ðµ Ð±ÑƒÐ² Ð¾Ñ�Ñ‚Ð°Ð½Ð½Ñ–Ð¹ Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚."
  
! #: info/session.c:4634
  msgid "Search this node and subnodes for a string."
  msgstr "Ð¨ÑƒÐºÐ°Ñ‚Ð¸ Ñ€Ñ�Ð´Ð¾Ðº Ñƒ Ñ†ÑŒÐ¾Ð¼Ñƒ Ð²ÑƒÐ·Ð»Ñ– Ñ– ÑƒÑ�Ñ–Ñ… Ð¿Ñ–Ð´Ð»ÐµÐ³Ð»Ð¸Ñ… Ð²ÑƒÐ·Ð»Ð°Ñ…."
  
! #: info/session.c:4655
  msgid "Go to next match in Info sub-tree"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð´Ð¾ Ð½Ð°Ñ�Ñ‚ÑƒÐ¿Ð½Ð¾Ð³Ð¾ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð½Ð¸ÐºÐ° Ñƒ Ð¿Ñ–Ð´Ð´ÐµÑ€ÐµÐ²Ñ– Info"
  
! #: info/session.c:4659 info/session.c:4671
  #, c-format
  msgid "No active search"
  msgstr "Ð�ÐµÐ¼Ð°Ñ” Ð°ÐºÑ‚Ð¸Ð²Ð½Ð¾Ð³Ð¾ Ð¿Ð¾ÑˆÑƒÐºÑƒ"
  
! #: info/session.c:4667
  msgid "Go to previous match in Info sub-tree"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð´Ð¾ Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð½ÑŒÐ¾Ð³Ð¾ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð½Ð¸ÐºÐ° Ñƒ Ð¿Ñ–Ð´Ð´ÐµÑ€ÐµÐ²Ñ– Info"
  
! #: info/session.c:4680
  msgid "Read a string and search for it case-sensitively"
  msgstr "ÐŸÑ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ Ñ€Ñ�Ð´Ð¾Ðº Ñ‚Ð° Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ð¹Ð¾Ð³Ð¾, Ð²Ñ€Ð°Ñ…Ð¾Ð²ÑƒÑŽÑ‡Ð¸ Ñ€ÐµÐ³Ñ–Ñ�Ñ‚Ñ€"
  
! #: info/session.c:4685
  msgid "Read a string and search for it"
  msgstr "ÐŸÑ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ Ñ€Ñ�Ð´Ð¾Ðº Ñ‚Ð° Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ð¹Ð¾Ð³Ð¾"
  
! #: info/session.c:4691
  msgid "Read a string and search backward for it"
  msgstr "ÐŸÑ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ Ñ€Ñ�Ð´Ð¾Ðº Ñ‚Ð° Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ð¹Ð¾Ð³Ð¾ Ñƒ Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð½ÑŒÐ¾Ð¼Ñƒ Ñ‚ÐµÐºÑ�Ñ‚Ñ–"
  
! #: info/session.c:4699
  msgid "Repeat last search in the same direction"
  msgstr "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚Ð¸ Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ–Ð¹ Ð¿Ð¾ÑˆÑƒÐº Ñƒ Ñ‚Ð¾Ð¼Ñƒ Ð¶ Ð½Ð°Ð¿Ñ€Ñ�Ð¼Ñ–"
  
! #: info/session.c:4707 info/session.c:4752
  msgid "No previous search string"
  msgstr "Ð�ÐµÐ¼Ð° Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð½ÑŒÐ¾Ð³Ð¾ Ñ€Ñ�Ð´ÐºÑƒ Ð¿Ð¾ÑˆÑƒÐºÑƒ"
  
! #: info/session.c:4744
  msgid "Repeat last search in the reverse direction"
  msgstr "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚Ð¸ Ð¿Ð¾ÑˆÑƒÐº Ñƒ Ð·Ð²Ð¾Ñ€Ð¾Ñ‚Ð½ÑŒÐ¾Ð¼Ñƒ Ð½Ð°Ð¿Ñ€Ñ�Ð¼Ñ–"
  
! #: info/session.c:4791
  msgid "Clear displayed search matches"
  msgstr "Ð¯Ð²Ð½Ð¾ Ð¿Ð¾ÐºÐ°Ð·Ð°Ð½Ñ– Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ð¸ Ð¿Ð¾ÑˆÑƒÐºÑƒ"
  
! #: info/session.c:4808 info/session.c:4814
  msgid "Search interactively for a string as you type it"
  msgstr "Ð¨ÑƒÐºÐ°Ñ‚Ð¸ Ñ€Ñ�Ð´Ð¾Ðº Ñ–Ð½Ñ‚ÐµÑ€Ð°ÐºÑ‚Ð¸Ð²Ð½Ð¾, Ð¿Ð¾ÐºÐ¸ Ð²Ð¸ Ð¹Ð¾Ð³Ð¾ Ð½Ð°Ð±Ð¸Ñ€Ð°Ñ”Ñ‚Ðµ"
  
! #: info/session.c:4934
  msgid "Regexp I-search backward: "
  msgstr "I-Ð¿Ð¾ÑˆÑƒÐº Ð½Ð°Ð·Ð°Ð´ Ð·Ð° Ñ„Ð¾Ñ€Ð¼Ð°Ð»ÑŒÐ½Ð¸Ð¼ Ð²Ð¸Ñ€Ð°Ð·Ð¾Ð¼: "
  
! #: info/session.c:4935
  msgid "I-search backward: "
  msgstr "I-Ð¿Ð¾ÑˆÑƒÐº Ð½Ð°Ð·Ð°Ð´: "
  
! #: info/session.c:4937
  msgid "Regexp I-search: "
  msgstr "I-Ð¿Ð¾ÑˆÑƒÐº Ð·Ð° Ñ„Ð¾Ñ€Ð¼Ð°Ð»ÑŒÐ½Ð¸Ð¼ Ð²Ð¸Ñ€Ð°Ð·Ð¾Ð¼: "
  
! #: info/session.c:4938
  msgid "I-search: "
  msgstr "I-Ð¿Ð¾ÑˆÑƒÐº: "
  
! #: info/session.c:4963 info/session.c:4966
  msgid "Failing "
  msgstr "Ð�ÐµÐ²Ð´Ð°Ð»Ð¸Ð¹ "
  
! #: info/session.c:5332
  msgid "Cancel current operation"
  msgstr "Ð¡ÐºÐ°Ñ�ÑƒÐ²Ð°Ñ‚Ð¸ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ñƒ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ñ–ÑŽ"
  
! #: info/session.c:5339
  msgid "Quit"
  msgstr "Ð—Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¾"
  
! #: info/session.c:5344
  msgid "Display version of Info being run"
  msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ð²ÐµÑ€Ñ�Ñ–ÑŽ Ð·Ð°Ð¿ÑƒÑ‰ÐµÐ½Ð¾Ð³Ð¾ ÐµÐºÐ·ÐµÐ¼Ð¿Ð»Ñ�Ñ€Ð° Info"
  
! #: info/session.c:5346
  #, c-format
  msgid "GNU Info version %s"
  msgstr "GNU Info Ð²ÐµÑ€Ñ�Ñ–Ñ— %s"
  
! #: info/session.c:5351
  msgid "Redraw the display"
  msgstr "ÐžÐ½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ�"
  
! #: info/session.c:5388
  msgid "Quit using Info"
  msgstr "Ð’Ð¸Ð¹Ñ‚Ð¸ Ð· Info"
  
! #: info/session.c:5404
  msgid "Run command bound to this key's lowercase variant"
  msgstr "Ð—Ð°Ð¿ÑƒÑ�Ñ‚Ð¸Ñ‚Ð¸ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ, Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ñƒ Ñ†Ñ–Ð¹ ÐºÐ»Ð°Ð²Ñ–ÑˆÑ– Ñƒ Ð½Ð¸Ð¶Ð½ÑŒÐ¾Ð¼Ñƒ Ñ€ÐµÐ³Ñ–Ñ�Ñ‚Ñ€Ñ–"
  
! #: info/session.c:5415
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Ð�ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° (%s)."
  
! #: info/session.c:5418
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "Ð½ÐµÐ²Ñ–Ñ€Ð½Ð° Ð¿Ð¾Ñ�Ð»Ñ–Ð´Ð¾Ð²Ð½Ñ–Ñ�Ñ‚ÑŒ \"%s\""
  
! #: info/session.c:5419
  #, c-format
  msgid "'%s' is invalid"
  msgstr "Â«%sÂ» Ñ” Ð½ÐµÐºÐ¾Ñ€ÐµÐºÑ‚Ð½Ð¸Ð¼"
  
! #: info/session.c:5737
  msgid "Add this digit to the current numeric argument"
  msgstr "Ð”Ð¾Ð´Ð°Ñ‚Ð¸ Ñ†ÑŽ Ñ†Ð¸Ñ„Ñ€Ñƒ Ð´Ð¾ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ Ñ‡Ð¸Ñ�Ð»Ð¾Ð²Ð¾Ð³Ð¾ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñƒ"
  
! #: info/session.c:5744
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "Ð†Ð½Ñ–Ñ†Ñ–ÑŽÐ²Ð°Ñ‚Ð¸ (Ñ‡Ð¸ Ð¿Ð¾Ð¼Ð½Ð¾Ð¶Ð¸Ñ‚Ð¸ Ð½Ð° 4) Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¸Ð¹ Ñ‡Ð¸Ñ�Ð»Ð¾Ð²Ð¸Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚"
***************
*** 1777,1794 ****
  msgstr "Ð’Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð´Ð»Ñ� %s Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ� (%s): "
  
! #: info/window.c:959
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), Ñ€Ñ�Ð´ÐºÑ–Ð² ----, "
  
- #: info/window.c:966
- #, c-format
- msgid "-%s---Info: %s, %ld lines --%s--"
- msgstr "-%s---Info: %s, %ld Ñ€Ñ�Ð´ÐºÑ–Ð² --%s--"
- 
- #: info/window.c:970
- #, c-format
- msgid "-%s---Info: (%s)%s, %ld lines --%s--"
- msgstr "-%s---Info: (%s)%s, %ld Ñ€Ñ�Ð´ÐºÑ–Ð² --%s--"
- 
  #: install-info/install-info.c:292
  #, c-format
--- 1773,1780 ----
  msgstr "Ð’Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð´Ð»Ñ� %s Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ� (%s): "
  
! #: info/window.c:909
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), Ñ€Ñ�Ð´ÐºÑ–Ð² ----, "
  
  #: install-info/install-info.c:292
  #, c-format
***************
*** 1978,1982 ****
  "\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"
--- 1964,1968 ----
  "\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"
***************
*** 1994,1998 ****
  "\n"
  "  Ð¦ÐµÐ¹ Ð²ÑƒÐ·Ð¾Ð» (Ð²ÑƒÐ·Ð¾Ð» ÐšÐ°Ñ‚Ð°Ð»Ð¾Ð³Ñƒ) Ð½Ð°Ð´Ð°Ñ” Ð¼ÐµÐ½ÑŽ Ð¾Ñ�Ð½Ð¾Ð²Ð½Ð¸Ñ… Ñ‚ÐµÐ¼.\n"
! "  Ð�Ð°Ð±Ñ€Ð°Ð²ÑˆÐ¸ \"q\" Ð¼Ð¾Ð¶Ð½Ð° Ð²Ð¸Ð¹Ñ‚Ð¸, \"?\" - Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ Ñ�Ð¿Ð¸Ñ�Ð¾Ðº ÐºÐ¾Ð¼Ð°Ð½Ð´ Info, \"d\" "
  "Ð¿Ð¾Ð²ÐµÑ€Ð½Ðµ Ð²Ð°Ñ� Ñ�ÑŽÐ´Ð¸,\n"
  "  \"h\" Ð½Ð°Ð´Ð°Ñ�Ñ‚ÑŒ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–ÑŽ Ð´Ð»Ñ� Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÑ–Ð²Ñ†Ñ–Ð²,\n"
--- 1980,1984 ----
  "\n"
  "  Ð¦ÐµÐ¹ Ð²ÑƒÐ·Ð¾Ð» (Ð²ÑƒÐ·Ð¾Ð» ÐšÐ°Ñ‚Ð°Ð»Ð¾Ð³Ñƒ) Ð½Ð°Ð´Ð°Ñ” Ð¼ÐµÐ½ÑŽ Ð¾Ñ�Ð½Ð¾Ð²Ð½Ð¸Ñ… Ñ‚ÐµÐ¼.\n"
! "  Ð�Ð°Ð±Ñ€Ð°Ð²ÑˆÐ¸ \"q\" Ð¼Ð¾Ð¶Ð½Ð° Ð²Ð¸Ð¹Ñ‚Ð¸, \"H\" - Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ Ñ�Ð¿Ð¸Ñ�Ð¾Ðº ÐºÐ¾Ð¼Ð°Ð½Ð´ Info, \"d\" "
  "Ð¿Ð¾Ð²ÐµÑ€Ð½Ðµ Ð²Ð°Ñ� Ñ�ÑŽÐ´Ð¸,\n"
  "  \"h\" Ð½Ð°Ð´Ð°Ñ�Ñ‚ÑŒ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–ÑŽ Ð´Ð»Ñ� Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÑ–Ð²Ñ†Ñ–Ð²,\n"
***************
*** 2072,2188 ****
  msgstr "Ñƒ `%s' Ð·Ð°Ð¿Ð¸Ñ�Ñ–Ð² Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾; Ð½Ñ–Ñ‡Ð¾Ð³Ð¾ Ð½Ðµ Ð²Ð¸Ð»ÑƒÑ‡ÐµÐ½Ð¾"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:855
! #: tp/Texinfo/Convert/Converter.pm:893 tp/Texinfo/Convert/Converter.pm:1204
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6504
! #: tp/Texinfo/Convert/HTML.pm:6528 tp/Texinfo/Convert/HTML.pm:6905
! #: tp/Texinfo/Convert/HTML.pm:6963 tp/Texinfo/Convert/HTML.pm:7041
! #: tp/Texinfo/Convert/HTML.pm:7118 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:546
! #: tp/Texinfo/Convert/TexinfoXML.pm:457
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾Ñ�Ñ� Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s Ð´Ð»Ñ� Ð·Ð°Ð¿Ð¸Ñ�Ñƒ: %s"
  
! #: tp/Texinfo/Common.pm:881
  msgid "recursion is always allowed"
  msgstr "Ñ€ÐµÐºÑƒÑ€Ñ�Ñ–ÑŽ Ð´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¾ Ð·Ð°Ð²Ð¶Ð´Ð¸"
  
! #: tp/Texinfo/Common.pm:882
  msgid "arguments are quoted by default"
  msgstr "Ñ‚Ð¸Ð¿Ð¾Ð²Ð¾, Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¸ Ð¿Ð¾Ð´Ð°ÑŽÑ‚ÑŒÑ�Ñ� Ñƒ Ð»Ð°Ð¿ÐºÐ°Ñ…"
  
! #: tp/Texinfo/Common.pm:1105
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s Ð½Ðµ Ñ” ÐºÐ¾Ñ€ÐµÐºÑ‚Ð½Ð¸Ð¼ ÐºÐ¾Ð´Ð¾Ð¼ Ð¼Ð¾Ð²Ð¸"
  
! #: tp/Texinfo/Common.pm:1110
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s Ð½Ðµ Ñ” ÐºÐ¾Ñ€ÐµÐºÑ‚Ð½Ð¸Ð¼ ÐºÐ¾Ð´Ð¾Ð¼ Ñ€ÐµÐ³Ñ–Ð¾Ð½Ñƒ"
  
! #: tp/Texinfo/Common.pm:1128
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%s Ð½Ðµ Ñ” ÐºÐ¾Ñ€ÐµÐºÑ‚Ð½Ð¾ÑŽ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ñ–Ñ�Ñ‚ÑŽ Ð¿Ð¾Ð´Ñ–Ð»Ñƒ"
  
! #: tp/Texinfo/Common.pm:1151
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾Ñ�Ñ� Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ %s: %s"
  
! #: tp/Texinfo/Common.pm:1170
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ� Ð·Ð°ÐºÑ€Ð¸Ñ‚Ñ‚Ñ� Ñ„Ð°Ð¹Ð»Ð° @verbatiminclude %s: %s"
  
! #: tp/Texinfo/Common.pm:1176 tp/Texinfo/Parser.pm:3353
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%s: Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾Ñ�Ñ� Ð·Ð½Ð°Ð¹Ñ‚Ð¸ %s"
  
! #: tp/Texinfo/Common.pm:1520
! #, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr "Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾Ñ�Ñ� Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½ÑŒ Ð¿Ð¾Ñ�Ð¸Ð»Ð°Ð½ÑŒ html %s: %s"
! 
! #: tp/Texinfo/Common.pm:1548
! msgid "missing type"
! msgstr "Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½Ð¾ Ñ‚Ð¸Ð¿"
! 
! #: tp/Texinfo/Common.pm:1551
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "Ð½ÐµÑ€Ð¾Ð·Ð¿Ñ–Ð·Ð½Ð°Ð½Ð¸Ð¹ Ñ‚Ð¸Ð¿: %s"
! 
! #: tp/Texinfo/Common.pm:1568
! #, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ� Ð·Ð°ÐºÑ€Ð¸Ñ‚Ñ‚Ñ� Ñ„Ð°Ð¹Ð»Ð° Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½ÑŒ Ð¿Ð¾Ñ�Ð¸Ð»Ð°Ð½ÑŒ html %s: %s"
! 
! #: tp/Texinfo/Common.pm:1603
  msgid "no node to be renamed"
  msgstr "Ð½ÐµÐ¼Ð°Ñ” Ð²ÑƒÐ·Ð»Ð° Ð´Ð»Ñ� Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ð½Ñ�"
  
! #: tp/Texinfo/Common.pm:1614
  msgid "nodes without a new name at the end of file"
  msgstr "Ð²ÑƒÐ·Ð»Ð¸ Ð±ÐµÐ· Ð½Ð¾Ð²Ð¾Ñ— Ð½Ð°Ð·Ð²Ð¸ Ð½Ð°Ð¿Ñ€Ð¸ÐºÑ–Ð½Ñ†Ñ– Ñ„Ð°Ð¹Ð»Ð°"
  
! #: tp/Texinfo/Common.pm:1624 tp/Texinfo/Parser.pm:926
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾Ñ�Ñ� Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s: %s"
  
! #: tp/Texinfo/Common.pm:2144
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr "Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾Ñ�Ñ� ÐµÐºÑ€Ð°Ð½ÑƒÐ²Ð°Ñ‚Ð¸ Ñ�Ð¸Ð¼Ð²Ð¾Ð» Ñ€ÐµÑˆÑ–Ñ‚ÐºÐ¸ Ñƒ @%s"
  
! #: tp/Texinfo/Convert/Converter.pm:395 tp/Texinfo/Convert/Converter.pm:414
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Ð—Ð°Ñ�Ñ‚Ð°Ñ€Ñ–Ð»Ð° Ð·Ð¼Ñ–Ð½Ð½Ð° %s\n"
  
! #: tp/Texinfo/Convert/Converter.pm:794
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr "%s: Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ñ– Ð´Ð°Ð½Ñ– Ð½ÐµÑ�ÑƒÐ¼Ñ–Ñ�Ð½Ñ– Ñ–Ð· Ð¿Ð¾Ð´Ñ–Ð»Ð¾Ð¼"
  
! #: tp/Texinfo/Convert/Converter.pm:876 tp/Texinfo/Convert/Converter.pm:909
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:6931
! #: tp/Texinfo/Convert/HTML.pm:6989 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:476 tp/Texinfo/Parser.pm:2035
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ� Ñ�Ð¿Ñ€Ð¾Ð±Ð¸ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸ %s: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, perl-format
  msgid "could not create directories `%s' or `%s': %s"
  msgstr "Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾Ñ�Ñ� Ñ�Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ðº Â«%sÂ» Ð°Ð±Ð¾ Â«%sÂ»: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:995
  #, perl-format
  msgid "could not create directory `%s': %s"
--- 2058,2169 ----
  msgstr "Ñƒ `%s' Ð·Ð°Ð¿Ð¸Ñ�Ñ–Ð² Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾; Ð½Ñ–Ñ‡Ð¾Ð³Ð¾ Ð½Ðµ Ð²Ð¸Ð»ÑƒÑ‡ÐµÐ½Ð¾"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:847
! #: tp/Texinfo/Convert/Converter.pm:885 tp/Texinfo/Convert/Converter.pm:1196
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6573
! #: tp/Texinfo/Convert/HTML.pm:6597 tp/Texinfo/Convert/HTML.pm:6978
! #: tp/Texinfo/Convert/HTML.pm:7037 tp/Texinfo/Convert/HTML.pm:7115
! #: tp/Texinfo/Convert/HTML.pm:7192 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:547
! #: tp/Texinfo/Convert/TexinfoXML.pm:458
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾Ñ�Ñ� Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s Ð´Ð»Ñ� Ð·Ð°Ð¿Ð¸Ñ�Ñƒ: %s"
  
! #: tp/Texinfo/Common.pm:862
  msgid "recursion is always allowed"
  msgstr "Ñ€ÐµÐºÑƒÑ€Ñ�Ñ–ÑŽ Ð´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¾ Ð·Ð°Ð²Ð¶Ð´Ð¸"
  
! #: tp/Texinfo/Common.pm:863
  msgid "arguments are quoted by default"
  msgstr "Ñ‚Ð¸Ð¿Ð¾Ð²Ð¾, Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¸ Ð¿Ð¾Ð´Ð°ÑŽÑ‚ÑŒÑ�Ñ� Ñƒ Ð»Ð°Ð¿ÐºÐ°Ñ…"
  
! #: tp/Texinfo/Common.pm:866
! msgid ""
! "move your @contents command if you want the contents after the title page"
! msgstr ""
! "Ð¿ÐµÑ€ÐµÑ�ÑƒÐ½ÑŒÑ‚Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ @contents, Ñ�ÐºÑ‰Ð¾ Ð¿Ñ–Ñ�Ð»Ñ� Ñ‚Ð¸Ñ‚ÑƒÐ»ÑŒÐ½Ð¾Ñ— Ñ�Ñ‚Ð¾Ñ€Ñ–Ð½ÐºÐ¸ Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Ñ‚ÐµÐºÑ�Ñ‚"
! 
! #: tp/Texinfo/Common.pm:869
! msgid ""
! "move your @shortcontents and @contents commands if you want the contents "
! "after the title page"
! msgstr ""
! "Ð¿ÐµÑ€ÐµÑ�ÑƒÐ½ÑŒÑ‚Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ @shortcontents Ñ– @contents, Ñ�ÐºÑ‰Ð¾ Ð¿Ñ–Ñ�Ð»Ñ� Ñ‚Ð¸Ñ‚ÑƒÐ»ÑŒÐ½Ð¾Ñ— Ñ�Ñ‚Ð¾Ñ€Ñ–Ð½ÐºÐ¸ "
! "Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Ñ‚ÐµÐºÑ�Ñ‚"
! 
! #: tp/Texinfo/Common.pm:1093
  #, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s Ð½Ðµ Ñ” ÐºÐ¾Ñ€ÐµÐºÑ‚Ð½Ð¸Ð¼ ÐºÐ¾Ð´Ð¾Ð¼ Ð¼Ð¾Ð²Ð¸"
  
! #: tp/Texinfo/Common.pm:1098
  #, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s Ð½Ðµ Ñ” ÐºÐ¾Ñ€ÐµÐºÑ‚Ð½Ð¸Ð¼ ÐºÐ¾Ð´Ð¾Ð¼ Ñ€ÐµÐ³Ñ–Ð¾Ð½Ñƒ"
  
! #: tp/Texinfo/Common.pm:1116
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr "%s Ð½Ðµ Ñ” ÐºÐ¾Ñ€ÐµÐºÑ‚Ð½Ð¾ÑŽ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ñ–Ñ�Ñ‚ÑŽ Ð¿Ð¾Ð´Ñ–Ð»Ñƒ"
  
! #: tp/Texinfo/Common.pm:1139
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾Ñ�Ñ� Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ %s: %s"
  
! #: tp/Texinfo/Common.pm:1158
  #, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ� Ð·Ð°ÐºÑ€Ð¸Ñ‚Ñ‚Ñ� Ñ„Ð°Ð¹Ð»Ð° @verbatiminclude %s: %s"
  
! #: tp/Texinfo/Common.pm:1164 tp/Texinfo/Parser.pm:3193
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%s: Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾Ñ�Ñ� Ð·Ð½Ð°Ð¹Ñ‚Ð¸ %s"
  
! #: tp/Texinfo/Common.pm:1637
  msgid "no node to be renamed"
  msgstr "Ð½ÐµÐ¼Ð°Ñ” Ð²ÑƒÐ·Ð»Ð° Ð´Ð»Ñ� Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ð½Ñ�"
  
! #: tp/Texinfo/Common.pm:1648
  msgid "nodes without a new name at the end of file"
  msgstr "Ð²ÑƒÐ·Ð»Ð¸ Ð±ÐµÐ· Ð½Ð¾Ð²Ð¾Ñ— Ð½Ð°Ð·Ð²Ð¸ Ð½Ð°Ð¿Ñ€Ð¸ÐºÑ–Ð½Ñ†Ñ– Ñ„Ð°Ð¹Ð»Ð°"
  
! #: tp/Texinfo/Common.pm:1658 tp/Texinfo/Parser.pm:899
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾Ñ�Ñ� Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s: %s"
  
! #: tp/Texinfo/Common.pm:2178
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr "Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾Ñ�Ñ� ÐµÐºÑ€Ð°Ð½ÑƒÐ²Ð°Ñ‚Ð¸ Ñ�Ð¸Ð¼Ð²Ð¾Ð» Ñ€ÐµÑˆÑ–Ñ‚ÐºÐ¸ Ñƒ @%s"
  
! #: tp/Texinfo/Convert/Converter.pm:387 tp/Texinfo/Convert/Converter.pm:406
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Ð—Ð°Ñ�Ñ‚Ð°Ñ€Ñ–Ð»Ð° Ð·Ð¼Ñ–Ð½Ð½Ð° %s\n"
  
! #: tp/Texinfo/Convert/Converter.pm:786
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr "%s: Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ñ– Ð´Ð°Ð½Ñ– Ð½ÐµÑ�ÑƒÐ¼Ñ–Ñ�Ð½Ñ– Ñ–Ð· Ð¿Ð¾Ð´Ñ–Ð»Ð¾Ð¼"
  
! #: tp/Texinfo/Convert/Converter.pm:868 tp/Texinfo/Convert/Converter.pm:901
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:7004
! #: tp/Texinfo/Convert/HTML.pm:7063 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:477 tp/Texinfo/Parser.pm:1996
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ� Ñ�Ð¿Ñ€Ð¾Ð±Ð¸ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸ %s: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:979
  #, perl-format
  msgid "could not create directories `%s' or `%s': %s"
  msgstr "Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾Ñ�Ñ� Ñ�Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ðº Â«%sÂ» Ð°Ð±Ð¾ Â«%sÂ»: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, perl-format
  msgid "could not create directory `%s': %s"
***************
*** 2194,2278 ****
  msgstr "Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ñ„Ð°Ð¹Ð» @image Â«%sÂ», Ð²Ð¸ÐºÐ¾Ñ€Ð¸Ñ�Ñ‚Ð¾Ð²ÑƒÑ”Ð¼Ð¾ Â«%sÂ»"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5388
  msgid "no argument specified for @U"
  msgstr "Ð½Ðµ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñƒ @U"
  
! #: tp/Texinfo/Convert/HTML.pm:1683
  #, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
  msgstr "Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ñ„Ð°Ð¹Ð» @image Â«%sÂ» (Ð´Ð»Ñ� HTML), Ð²Ð¸ÐºÐ¾Ñ€Ð¸Ñ�Ñ‚Ð¾Ð²ÑƒÑ”Ð¼Ð¾ Â«%sÂ»"
  
! #: tp/Texinfo/Convert/HTML.pm:2371
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ Ð½ÐµÐ¾Ð±Ñ€Ð¾Ð±Ð»ÐµÐ½Ð¸Ñ… Ð´Ð°Ð½Ð¸Ñ… %s Ð½Ðµ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð¾"
  
! #: tp/Texinfo/Convert/HTML.pm:4888
  msgid "string not closed in css file"
  msgstr "Ð½ÐµÐ·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ð¹ Ñ€Ñ�Ð´Ð¾Ðº Ñƒ Ñ„Ð°Ð¹Ð»Ñ– css"
  
! #: tp/Texinfo/Convert/HTML.pm:4890
  msgid "--css-include ended in comment"
  msgstr "--css-include Ð·Ð°Ð²ÐµÑ€ÑˆÑƒÑ”Ñ‚ÑŒÑ�Ñ� ÐºÐ¾Ð¼ÐµÐ½Ñ‚Ð°Ñ€ÐµÐ¼"
  
! #: tp/Texinfo/Convert/HTML.pm:4892
  msgid "@import not finished in css file"
  msgstr "Ð½ÐµÐ·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ð¹ Ð·Ð°Ð¿Ð¸Ñ� @import Ñƒ Ñ„Ð°Ð¹Ð»Ñ– css"
  
! #: tp/Texinfo/Convert/HTML.pm:4918
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "Ð¤Ð°Ð¹Ð» CSS %s Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾"
  
! #: tp/Texinfo/Convert/HTML.pm:4924
  #, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾Ñ�Ñ� Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ --include-Ñ„Ð°Ð¹Ð» %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:4934
  #, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ� Ñ�Ð¿Ñ€Ð¾Ð±Ð¸ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» CSS %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5801 tp/Texinfo/Convert/HTML.pm:5805
  #, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ð·Ð°Ð¿Ð¸Ñ�Ñƒ htmlxref.cnf Ð´Ð»Ñ� Â«%sÂ»"
  
! #: tp/Texinfo/Convert/HTML.pm:6499
  #, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ� Ñ�Ð¿Ñ€Ð¾Ð±Ð¸ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» Ñ„Ñ€ÐµÐ¹Ð¼Ð° %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6523
  #, perl-format
  msgid "error on closing TOC frame file %s: %s"
  msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ� Ñ�Ð¿Ñ€Ð¾Ð±Ð¸ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» Ñ„Ñ€ÐµÐ¹Ð¼Ð° Ð·Ð¼Ñ–Ñ�Ñ‚Ñƒ %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6638
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¾Ð±Ñ€Ð¾Ð±Ð½Ð¸ÐºÐ° %s Ð½Ð° ÐµÑ‚Ð°Ð¿Ñ– %s, Ð¿Ñ€Ñ–Ð¾Ñ€Ð¸Ñ‚ÐµÑ‚Ð½Ñ–Ñ�Ñ‚ÑŒ %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6839
  msgid "must specify a title with a title command or @top"
  msgstr "Ñ�Ð»Ñ–Ð´ Ð²ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð·Ð° Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¾ÑŽ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ title Ð°Ð±Ð¾ @top"
  
! #: tp/Texinfo/Convert/HTML.pm:7048
  #, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ� Ñ�Ð¿Ñ€Ð¾Ð±Ð¸ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» Ð¿ÐµÑ€ÐµÑ�Ð¿Ñ€Ñ�Ð¼Ð¾Ð²ÑƒÐ²Ð°Ð½Ð½Ñ� Ð²ÑƒÐ·Ð»Ð° %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7073
  #, perl-format
  msgid "old name for `%s' is a node of the document"
  msgstr "Ñ�Ñ‚Ð°Ñ€Ð¾ÑŽ Ð½Ð°Ð·Ð²Ð¾ÑŽ Ð´Ð»Ñ� Â«%sÂ» Ñ” Ð²ÑƒÐ·Ð¾Ð» Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°"
  
! #: tp/Texinfo/Convert/HTML.pm:7079
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "Ñ„Ð°Ð¹Ð» Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¾Ð³Ð¾ Ð²ÑƒÐ·Ð»Ð° Â«%sÂ» Ñ” Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ–Ð¼"
  
! #: tp/Texinfo/Convert/HTML.pm:7093
  #, perl-format
  msgid "target node (new name for `%s') not in document: %s"
--- 2175,2278 ----
  msgstr "Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ñ„Ð°Ð¹Ð» @image Â«%sÂ», Ð²Ð¸ÐºÐ¾Ñ€Ð¸Ñ�Ñ‚Ð¾Ð²ÑƒÑ”Ð¼Ð¾ Â«%sÂ»"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5225
  msgid "no argument specified for @U"
  msgstr "Ð½Ðµ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñƒ @U"
  
! #: tp/Texinfo/Convert/HTML.pm:1715
  #, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
  msgstr "Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ñ„Ð°Ð¹Ð» @image Â«%sÂ» (Ð´Ð»Ñ� HTML), Ð²Ð¸ÐºÐ¾Ñ€Ð¸Ñ�Ñ‚Ð¾Ð²ÑƒÑ”Ð¼Ð¾ Â«%sÂ»"
  
! #: tp/Texinfo/Convert/HTML.pm:2399
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr "Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ Ð½ÐµÐ¾Ð±Ñ€Ð¾Ð±Ð»ÐµÐ½Ð¸Ñ… Ð´Ð°Ð½Ð¸Ñ… %s Ð½Ðµ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð¾"
  
! #: tp/Texinfo/Convert/HTML.pm:4629
! #, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr "Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾Ñ�Ñ� Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½ÑŒ Ð¿Ð¾Ñ�Ð¸Ð»Ð°Ð½ÑŒ html %s: %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4657
! msgid "missing type"
! msgstr "Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½Ð¾ Ñ‚Ð¸Ð¿"
! 
! #: tp/Texinfo/Convert/HTML.pm:4660
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "Ð½ÐµÑ€Ð¾Ð·Ð¿Ñ–Ð·Ð½Ð°Ð½Ð¸Ð¹ Ñ‚Ð¸Ð¿: %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4677
! #, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ� Ð·Ð°ÐºÑ€Ð¸Ñ‚Ñ‚Ñ� Ñ„Ð°Ð¹Ð»Ð° Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½ÑŒ Ð¿Ð¾Ñ�Ð¸Ð»Ð°Ð½ÑŒ html %s: %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4962
  msgid "string not closed in css file"
  msgstr "Ð½ÐµÐ·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ð¹ Ñ€Ñ�Ð´Ð¾Ðº Ñƒ Ñ„Ð°Ð¹Ð»Ñ– css"
  
! #: tp/Texinfo/Convert/HTML.pm:4964
  msgid "--css-include ended in comment"
  msgstr "--css-include Ð·Ð°Ð²ÐµÑ€ÑˆÑƒÑ”Ñ‚ÑŒÑ�Ñ� ÐºÐ¾Ð¼ÐµÐ½Ñ‚Ð°Ñ€ÐµÐ¼"
  
! #: tp/Texinfo/Convert/HTML.pm:4966
  msgid "@import not finished in css file"
  msgstr "Ð½ÐµÐ·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ð¹ Ð·Ð°Ð¿Ð¸Ñ� @import Ñƒ Ñ„Ð°Ð¹Ð»Ñ– css"
  
! #: tp/Texinfo/Convert/HTML.pm:4992
  #, perl-format
  msgid "CSS file %s not found"
  msgstr "Ð¤Ð°Ð¹Ð» CSS %s Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾"
  
! #: tp/Texinfo/Convert/HTML.pm:4998
  #, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾Ñ�Ñ� Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ --include-Ñ„Ð°Ð¹Ð» %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5008
  #, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ� Ñ�Ð¿Ñ€Ð¾Ð±Ð¸ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» CSS %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5870 tp/Texinfo/Convert/HTML.pm:5874
  #, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ð·Ð°Ð¿Ð¸Ñ�Ñƒ htmlxref.cnf Ð´Ð»Ñ� Â«%sÂ»"
  
! #: tp/Texinfo/Convert/HTML.pm:6568
  #, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ� Ñ�Ð¿Ñ€Ð¾Ð±Ð¸ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» Ñ„Ñ€ÐµÐ¹Ð¼Ð° %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6592
  #, perl-format
  msgid "error on closing TOC frame file %s: %s"
  msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ� Ñ�Ð¿Ñ€Ð¾Ð±Ð¸ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» Ñ„Ñ€ÐµÐ¹Ð¼Ð° Ð·Ð¼Ñ–Ñ�Ñ‚Ñƒ %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6707
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¾Ð±Ñ€Ð¾Ð±Ð½Ð¸ÐºÐ° %s Ð½Ð° ÐµÑ‚Ð°Ð¿Ñ– %s, Ð¿Ñ€Ñ–Ð¾Ñ€Ð¸Ñ‚ÐµÑ‚Ð½Ñ–Ñ�Ñ‚ÑŒ %s"
  
! #: tp/Texinfo/Convert/HTML.pm:6912
  msgid "must specify a title with a title command or @top"
  msgstr "Ñ�Ð»Ñ–Ð´ Ð²ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð·Ð° Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¾ÑŽ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ title Ð°Ð±Ð¾ @top"
  
! #: tp/Texinfo/Convert/HTML.pm:7122
  #, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ� Ñ�Ð¿Ñ€Ð¾Ð±Ð¸ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» Ð¿ÐµÑ€ÐµÑ�Ð¿Ñ€Ñ�Ð¼Ð¾Ð²ÑƒÐ²Ð°Ð½Ð½Ñ� Ð²ÑƒÐ·Ð»Ð° %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7147
  #, perl-format
  msgid "old name for `%s' is a node of the document"
  msgstr "Ñ�Ñ‚Ð°Ñ€Ð¾ÑŽ Ð½Ð°Ð·Ð²Ð¾ÑŽ Ð´Ð»Ñ� Â«%sÂ» Ñ” Ð²ÑƒÐ·Ð¾Ð» Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°"
  
! #: tp/Texinfo/Convert/HTML.pm:7153
  #, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "Ñ„Ð°Ð¹Ð» Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¾Ð³Ð¾ Ð²ÑƒÐ·Ð»Ð° Â«%sÂ» Ñ” Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ–Ð¼"
  
! #: tp/Texinfo/Convert/HTML.pm:7167
  #, perl-format
  msgid "target node (new name for `%s') not in document: %s"
***************
*** 2280,2284 ****
  "Ð²ÑƒÐ·Ð¾Ð» Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ� (Ð½Ð¾Ð²Ð° Ð½Ð°Ð·Ð²Ð° Ð´Ð»Ñ� Â«%sÂ») Ð¿ÐµÑ€ÐµÐ±ÑƒÐ²Ð°Ñ” Ð·Ð° Ð¼ÐµÐ¶Ð°Ð¼Ð¸ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7125
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
--- 2280,2284 ----
  "Ð²ÑƒÐ·Ð¾Ð» Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ� (Ð½Ð¾Ð²Ð° Ð½Ð°Ð·Ð²Ð° Ð´Ð»Ñ� Â«%sÂ») Ð¿ÐµÑ€ÐµÐ±ÑƒÐ²Ð°Ñ” Ð·Ð° Ð¼ÐµÐ¶Ð°Ð¼Ð¸ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7199
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
***************
*** 2287,2295 ****
  "%s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7163
  msgid "empty node name"
  msgstr "Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ� Ð½Ð°Ð·Ð²Ð° Ð²ÑƒÐ·Ð»Ð°"
  
! #: tp/Texinfo/Convert/HTML.pm:7165 tp/Texinfo/Parser.pm:3697
  #, perl-format
  msgid "syntax for an external node used for `%s'"
--- 2287,2295 ----
  "%s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:7237
  msgid "empty node name"
  msgstr "Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ� Ð½Ð°Ð·Ð²Ð° Ð²ÑƒÐ·Ð»Ð°"
  
! #: tp/Texinfo/Convert/HTML.pm:7239 tp/Texinfo/Parser.pm:3542
  #, perl-format
  msgid "syntax for an external node used for `%s'"
***************
*** 2324,2353 ****
  msgstr "Ð½Ð°Ð·Ð²Ð° @node Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð° Ð¼Ñ–Ñ�Ñ‚Ð¸Ñ‚Ð¸ Â«,Â»: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1334
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr "Ð—Ð°Ð¿Ð¸Ñ� Ð¿Ð¾ÐºÐ°Ð¶Ñ‡Ð¸ÐºÐ° Ñƒ @%s Ð· : Ð¿Ñ€Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ‚ÑŒ Ð´Ð¾ Ð½ÐµÐºÐ¾Ñ€ÐµÐºÑ‚Ð½Ð¾Ð³Ð¾ Info: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1381 tp/Texinfo/Parser.pm:2722
  #, perl-format
  msgid "entry for index `%s' outside of any node"
  msgstr "Ð¿ÑƒÐ½ÐºÑ‚ Ð¿Ð¾ÐºÐ°Ð¶Ñ‡Ð¸ÐºÐ° Â«%sÂ» Ð·Ð·Ð¾Ð²Ð½Ñ– Ð±ÑƒÐ´ÑŒ-Ñ�ÐºÐ¾Ð³Ð¾ Ð²ÑƒÐ·Ð»Ð°"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1495
  #, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ� Ñ�Ð¿Ñ€Ð¾Ð±Ð¸ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» Ñ‚ÐµÐºÑ�Ñ‚Ñƒ Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ� %s: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1500
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "Ð�ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» @image `%s': %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1523
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
  msgstr "Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾Ñ�Ñ� Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» @image Â«%s.txtÂ» Ð°Ð±Ð¾ Ñ‚ÐµÐºÑ�Ñ‚-Ð·Ð°Ð¼Ñ–Ð½Ð½Ð¸Ðº"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1931
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
--- 2324,2353 ----
  msgstr "Ð½Ð°Ð·Ð²Ð° @node Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð° Ð¼Ñ–Ñ�Ñ‚Ð¸Ñ‚Ð¸ Â«,Â»: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1335
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr "Ð—Ð°Ð¿Ð¸Ñ� Ð¿Ð¾ÐºÐ°Ð¶Ñ‡Ð¸ÐºÐ° Ñƒ @%s Ð· : Ð¿Ñ€Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ‚ÑŒ Ð´Ð¾ Ð½ÐµÐºÐ¾Ñ€ÐµÐºÑ‚Ð½Ð¾Ð³Ð¾ Info: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1382 tp/Texinfo/Parser.pm:2568
  #, perl-format
  msgid "entry for index `%s' outside of any node"
  msgstr "Ð¿ÑƒÐ½ÐºÑ‚ Ð¿Ð¾ÐºÐ°Ð¶Ñ‡Ð¸ÐºÐ° Â«%sÂ» Ð·Ð·Ð¾Ð²Ð½Ñ– Ð±ÑƒÐ´ÑŒ-Ñ�ÐºÐ¾Ð³Ð¾ Ð²ÑƒÐ·Ð»Ð°"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1496
  #, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ� Ñ�Ð¿Ñ€Ð¾Ð±Ð¸ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» Ñ‚ÐµÐºÑ�Ñ‚Ñƒ Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ� %s: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1501
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "Ð�ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» @image `%s': %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1524
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
  msgstr "Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾Ñ�Ñ� Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» @image Â«%s.txtÂ» Ð°Ð±Ð¾ Ñ‚ÐµÐºÑ�Ñ‚-Ð·Ð°Ð¼Ñ–Ð½Ð½Ð¸Ðº"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1932
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
***************
*** 2357,2502 ****
  "ÑƒÐ½Ð¸ÐºÐ°ÑŽÑ‡Ð¸ Ñ†ÑŒÐ¾Ð³Ð¾"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2161
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr "Ñƒ Ð½Ð°Ð·Ð²Ñ– Ð¿ÐµÑ€ÐµÑ…Ñ€ÐµÑ�Ð½Ð¾Ð³Ð¾ Ð¿Ð¾Ñ�Ð¸Ð»Ð°Ð½Ð½Ñ� @%s Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð¾ Ð¼Ñ–Ñ�Ñ‚Ð¸Ñ‚Ð¸Ñ�Ñ� Â«:Â»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2193
  #, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "Ð£ Ð½Ð°Ð·Ð²Ñ– Ð²ÑƒÐ·Ð»Ð° @%s Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð¾ Ð¼Ñ–Ñ�Ñ‚Ð¸Ñ‚Ð¸Ñ�Ñ� Â«%sÂ»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2226
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr "Ñƒ Ð½Ð°Ð·Ð²Ñ– Ð²ÑƒÐ·Ð»Ð° @%s Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð¾ Ð¼Ñ–Ñ�Ñ‚Ð¸Ñ‚Ð¸Ñ�Ñ� Â«:Â»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2272
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "Ð¿Ñ–Ñ�Ð»Ñ� @xref Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Â«.Â» Ð°Ð±Ð¾ Â«,Â», Ð°Ð»Ðµ Ð½Ðµ %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2275
  msgid "`.' or `,' must follow @xref"
  msgstr "Ð¿Ñ–Ñ�Ð»Ñ� @xref Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Â«.Â» Ð°Ð±Ð¾ Â«,Â»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3118
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr "Ñƒ Ð½Ð°Ð·Ð²Ñ– Ð²ÑƒÐ·Ð»Ð° Ð¿ÑƒÐ½ÐºÑ‚Ñƒ Ð¼ÐµÐ½ÑŽ Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð¾ Ð±ÑƒÑ‚Ð¸ Â«%sÂ»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3129
  msgid "menu entry node name should not contain `:'"
  msgstr "Ñƒ Ð½Ð°Ð·Ð²Ñ– Ð²ÑƒÐ·Ð»Ð° Ð¿ÑƒÐ½ÐºÑ‚Ñƒ Ð¼ÐµÐ½ÑŽ Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð¾ Ð±ÑƒÑ‚Ð¸ Â«:Â»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3145
  msgid "menu entry name should not contain `:'"
  msgstr "Ñƒ Ð½Ð°Ð·Ð²Ñ– Ð¿ÑƒÐ½ÐºÑ‚Ñƒ Ð¼ÐµÐ½ÑŽ Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð¾ Ð±ÑƒÑ‚Ð¸ Â«:Â»"
  
! #: tp/Texinfo/Parser.pm:910
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr "@%s Ñ�Ð»Ñ–Ð´ Ñ€Ð¾Ð·Ñ‚Ð°ÑˆÐ¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ð»Ð¸ÑˆÐµ Ð½Ð° Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÑƒ Ð°Ð±Ð¾ Ð½Ð°Ð¿Ñ€Ð¸ÐºÑ–Ð½Ñ†Ñ– Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°"
  
! #: tp/Texinfo/Parser.pm:1160 tp/Texinfo/Structuring.pm:594
  #, perl-format
  msgid "multiple @%s"
  msgstr "Ð´ÐµÐºÑ–Ð»ÑŒÐºÐ° @%s"
  
! #: tp/Texinfo/Parser.pm:1194
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¾Ð²Ð¸Ð¹ Ñ�Ð¸Ð½Ñ‚Ð°ÐºÑ�Ð¸Ñ� Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñƒ @%s: %s"
! 
! #: tp/Texinfo/Parser.pm:1210
  #, perl-format
  msgid "bad or empty @%s formal argument: %s"
  msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¾Ð²Ð¸Ð¹ Ð°Ð±Ð¾ Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ–Ð¹ Ñ„Ð¾Ñ€Ð¼Ð°Ð»ÑŒÐ½Ð¸Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ @%s: %s"
  
! #: tp/Texinfo/Parser.pm:1219 tp/Texinfo/Parser.pm:4856
! #: tp/Texinfo/Parser.pm:4882 tp/Texinfo/Parser.pm:5671
! #: tp/Texinfo/Parser.pm:5687 tp/Texinfo/Parser.pm:5702
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s Ð²Ð¸Ð¼Ð°Ð³Ð°Ñ” Ð²ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ð½Ð°Ð·Ð²Ñƒ"
  
! #: tp/Texinfo/Parser.pm:1223 tp/Texinfo/Parser.pm:4859
! #: tp/Texinfo/Parser.pm:4885 tp/Texinfo/Parser.pm:5674
! #: tp/Texinfo/Parser.pm:5690 tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad name for @%s"
  msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¾Ð²Ð° Ð½Ð°Ð·Ð²Ð° @%s"
  
! #: tp/Texinfo/Parser.pm:1341
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr "@end %s Ñ€Ð¾Ð·Ñ‚Ð°ÑˆÐ¾Ð²Ð°Ð½Ð¾ Ð´Ð¾ ÐºÑ–Ð½Ñ†ÐµÐ²Ð¾Ñ— Ð´ÑƒÐ¶ÐºÐ¸ @%s"
  
! #: tp/Texinfo/Parser.pm:1345
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "@%s Ñ€Ð¾Ð·Ñ‚Ð°ÑˆÐ¾Ð²Ð°Ð½Ð¾ Ð´Ð¾ ÐºÑ–Ð½Ñ†ÐµÐ²Ð¾Ñ— Ð´ÑƒÐ¶ÐºÐ¸ @%s"
  
! #: tp/Texinfo/Parser.pm:1350
  #, perl-format
! msgid "%c%s missing close brace"
! msgstr "%c%s Ð½Ðµ Ð¼Ð°Ñ” Ð·Ð°ÐºÐ»ÑŽÑ‡Ð½Ð¾Ñ— Ð´ÑƒÐ¶ÐºÐ¸"
  
! #: tp/Texinfo/Parser.pm:1354
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "Ñƒ @%s Ð½Ðµ Ð²Ð¸Ñ�Ñ‚Ð°Ñ‡Ð°Ñ” ÐºÑ–Ð½Ñ†ÐµÐ²Ð¾Ñ— Ð¿Ð¾Ñ�Ð»Ñ–Ð´Ð¾Ð²Ð½Ð¾Ñ�Ñ‚Ñ–-Ñ€Ð¾Ð·Ð´Ñ–Ð»ÑŒÐ½Ð¸ÐºÐ°: %s}"
  
! #: tp/Texinfo/Parser.pm:1476
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "@itemx Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð¿Ð¾Ñ‡Ð¸Ð½Ð°Ñ‚Ð¸Ñ�Ñ� Ð· @%s"
  
! #: tp/Texinfo/Parser.pm:1544
  msgid "@itemx must follow @item"
  msgstr "@itemx Ñ�Ð»Ñ–Ð´ Ð²Ð¸ÐºÐ¾Ñ€Ð¸Ñ�Ñ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ð¿Ñ–Ñ�Ð»Ñ� @item"
  
! #: tp/Texinfo/Parser.pm:1712
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr "@%s Ð¼Ñ–Ñ�Ñ‚Ð¸Ñ‚ÑŒ Ñ‚ÐµÐºÑ�Ñ‚ Ð±ÐµÐ· @item"
  
! #: tp/Texinfo/Parser.pm:1743
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "`@end' Ð¾Ñ‡Ñ–ÐºÑƒÑ” `%s', Ð½Ð°Ñ‚Ð¾Ð¼Ñ–Ñ�Ñ‚ÑŒ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð¾ `%s'"
  
! #: tp/Texinfo/Parser.pm:1746
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@%s Ñ€Ð¾Ð·Ñ‚Ð°ÑˆÐ¾Ð²Ð°Ð½Ð¾ Ð´Ð¾ @end %s"
  
! #: tp/Texinfo/Parser.pm:1750
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð½Ð¾Ð³Ð¾ `%cend %s'"
  
! #: tp/Texinfo/Parser.pm:1776 tp/Texinfo/Parser.pm:5204
! #: tp/Texinfo/Parser.pm:5470
  #, perl-format
  msgid "misplaced %c"
  msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾ Ñ€Ð¾Ð·Ñ‚Ð°ÑˆÐ¾Ð²Ð°Ð½Ðµ %c"
  
! #: tp/Texinfo/Parser.pm:1874 tp/Texinfo/Parser.pm:3312
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "Â«%c%sÂ» Ð±ÐµÐ· Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð½Ð¸ÐºÐ°"
  
! #: tp/Texinfo/Parser.pm:2110
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "Ð¼Ð°ÐºÑ€Ð¾Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ� Â«%sÂ» Ð²Ð¸ÐºÐ»Ð¸ÐºÐ°Ð½Ð¾ Ð· Ð½Ð°Ð´Ð¼Ñ–Ñ€Ð½Ð¾ÑŽ ÐºÑ–Ð»ÑŒÐºÑ–Ñ�Ñ‚ÑŽ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñ–Ð²"
  
! #: tp/Texinfo/Parser.pm:2132
  #, perl-format
! msgid "@%s missing close brace"
! msgstr "Ñƒ @%s Ð½Ðµ Ð²Ð¸Ñ�Ñ‚Ð°Ñ‡Ð°Ñ” ÐºÑ–Ð½Ñ†ÐµÐ²Ð¾Ñ— Ð´ÑƒÐ¶ÐºÐ¸"
  
! #: tp/Texinfo/Parser.pm:2140
  #, perl-format
  msgid "macro `%s' declared without argument called with an argument"
--- 2357,2502 ----
  "ÑƒÐ½Ð¸ÐºÐ°ÑŽÑ‡Ð¸ Ñ†ÑŒÐ¾Ð³Ð¾"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2162
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr "Ñƒ Ð½Ð°Ð·Ð²Ñ– Ð¿ÐµÑ€ÐµÑ…Ñ€ÐµÑ�Ð½Ð¾Ð³Ð¾ Ð¿Ð¾Ñ�Ð¸Ð»Ð°Ð½Ð½Ñ� @%s Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð¾ Ð¼Ñ–Ñ�Ñ‚Ð¸Ñ‚Ð¸Ñ�Ñ� Â«:Â»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2194
  #, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "Ð£ Ð½Ð°Ð·Ð²Ñ– Ð²ÑƒÐ·Ð»Ð° @%s Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð¾ Ð¼Ñ–Ñ�Ñ‚Ð¸Ñ‚Ð¸Ñ�Ñ� Â«%sÂ»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2227
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr "Ñƒ Ð½Ð°Ð·Ð²Ñ– Ð²ÑƒÐ·Ð»Ð° @%s Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð¾ Ð¼Ñ–Ñ�Ñ‚Ð¸Ñ‚Ð¸Ñ�Ñ� Â«:Â»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2273
  #, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "Ð¿Ñ–Ñ�Ð»Ñ� @xref Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Â«.Â» Ð°Ð±Ð¾ Â«,Â», Ð°Ð»Ðµ Ð½Ðµ %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2276
  msgid "`.' or `,' must follow @xref"
  msgstr "Ð¿Ñ–Ñ�Ð»Ñ� @xref Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Â«.Â» Ð°Ð±Ð¾ Â«,Â»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3086
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr "Ñƒ Ð½Ð°Ð·Ð²Ñ– Ð²ÑƒÐ·Ð»Ð° Ð¿ÑƒÐ½ÐºÑ‚Ñƒ Ð¼ÐµÐ½ÑŽ Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð¾ Ð±ÑƒÑ‚Ð¸ Â«%sÂ»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3097
  msgid "menu entry node name should not contain `:'"
  msgstr "Ñƒ Ð½Ð°Ð·Ð²Ñ– Ð²ÑƒÐ·Ð»Ð° Ð¿ÑƒÐ½ÐºÑ‚Ñƒ Ð¼ÐµÐ½ÑŽ Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð¾ Ð±ÑƒÑ‚Ð¸ Â«:Â»"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3113
  msgid "menu entry name should not contain `:'"
  msgstr "Ñƒ Ð½Ð°Ð·Ð²Ñ– Ð¿ÑƒÐ½ÐºÑ‚Ñƒ Ð¼ÐµÐ½ÑŽ Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð¾ Ð±ÑƒÑ‚Ð¸ Â«:Â»"
  
! #: tp/Texinfo/Parser.pm:883
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr "@%s Ñ�Ð»Ñ–Ð´ Ñ€Ð¾Ð·Ñ‚Ð°ÑˆÐ¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ð»Ð¸ÑˆÐµ Ð½Ð° Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÑƒ Ð°Ð±Ð¾ Ð½Ð°Ð¿Ñ€Ð¸ÐºÑ–Ð½Ñ†Ñ– Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°"
  
! #: tp/Texinfo/Parser.pm:1125 tp/Texinfo/Structuring.pm:595
  #, perl-format
  msgid "multiple @%s"
  msgstr "Ð´ÐµÐºÑ–Ð»ÑŒÐºÐ° @%s"
  
! #: tp/Texinfo/Parser.pm:1166
  #, perl-format
  msgid "bad or empty @%s formal argument: %s"
  msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¾Ð²Ð¸Ð¹ Ð°Ð±Ð¾ Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ–Ð¹ Ñ„Ð¾Ñ€Ð¼Ð°Ð»ÑŒÐ½Ð¸Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ @%s: %s"
  
! #: tp/Texinfo/Parser.pm:1176
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¾Ð²Ð¸Ð¹ Ñ�Ð¸Ð½Ñ‚Ð°ÐºÑ�Ð¸Ñ� Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñƒ @%s: %s"
! 
! #: tp/Texinfo/Parser.pm:1183 tp/Texinfo/Parser.pm:4707
! #: tp/Texinfo/Parser.pm:4733 tp/Texinfo/Parser.pm:5565
! #: tp/Texinfo/Parser.pm:5578 tp/Texinfo/Parser.pm:5592
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s Ð²Ð¸Ð¼Ð°Ð³Ð°Ñ” Ð²ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ð½Ð°Ð·Ð²Ñƒ"
  
! #: tp/Texinfo/Parser.pm:1187 tp/Texinfo/Parser.pm:4710
! #: tp/Texinfo/Parser.pm:4736 tp/Texinfo/Parser.pm:5568
! #: tp/Texinfo/Parser.pm:5581 tp/Texinfo/Parser.pm:5595
  #, perl-format
  msgid "bad name for @%s"
  msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¾Ð²Ð° Ð½Ð°Ð·Ð²Ð° @%s"
  
! #: tp/Texinfo/Parser.pm:1305
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr "@end %s Ñ€Ð¾Ð·Ñ‚Ð°ÑˆÐ¾Ð²Ð°Ð½Ð¾ Ð´Ð¾ ÐºÑ–Ð½Ñ†ÐµÐ²Ð¾Ñ— Ð´ÑƒÐ¶ÐºÐ¸ @%s"
  
! #: tp/Texinfo/Parser.pm:1309
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "@%s Ñ€Ð¾Ð·Ñ‚Ð°ÑˆÐ¾Ð²Ð°Ð½Ð¾ Ð´Ð¾ ÐºÑ–Ð½Ñ†ÐµÐ²Ð¾Ñ— Ð´ÑƒÐ¶ÐºÐ¸ @%s"
  
! #: tp/Texinfo/Parser.pm:1314
  #, perl-format
! msgid "%c%s missing closing brace"
! msgstr "%c%s Ð½Ðµ Ð¼Ð°Ñ” Ð·Ð°Ð²ÐµÑ€ÑˆÐ°Ð»ÑŒÐ½Ð¾Ñ— Ñ„Ñ–Ð³ÑƒÑ€Ð½Ð¾Ñ— Ð´ÑƒÐ¶ÐºÐ¸"
  
! #: tp/Texinfo/Parser.pm:1318
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "Ñƒ @%s Ð½Ðµ Ð²Ð¸Ñ�Ñ‚Ð°Ñ‡Ð°Ñ” ÐºÑ–Ð½Ñ†ÐµÐ²Ð¾Ñ— Ð¿Ð¾Ñ�Ð»Ñ–Ð´Ð¾Ð²Ð½Ð¾Ñ�Ñ‚Ñ–-Ñ€Ð¾Ð·Ð´Ñ–Ð»ÑŒÐ½Ð¸ÐºÐ°: %s}"
  
! #: tp/Texinfo/Parser.pm:1440
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "@itemx Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð¿Ð¾Ñ‡Ð¸Ð½Ð°Ñ‚Ð¸Ñ�Ñ� Ð· @%s"
  
! #: tp/Texinfo/Parser.pm:1508
  msgid "@itemx must follow @item"
  msgstr "@itemx Ñ�Ð»Ñ–Ð´ Ð²Ð¸ÐºÐ¾Ñ€Ð¸Ñ�Ñ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ð¿Ñ–Ñ�Ð»Ñ� @item"
  
! #: tp/Texinfo/Parser.pm:1676
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr "@%s Ð¼Ñ–Ñ�Ñ‚Ð¸Ñ‚ÑŒ Ñ‚ÐµÐºÑ�Ñ‚ Ð±ÐµÐ· @item"
  
! #: tp/Texinfo/Parser.pm:1707
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "`@end' Ð¾Ñ‡Ñ–ÐºÑƒÑ” `%s', Ð½Ð°Ñ‚Ð¾Ð¼Ñ–Ñ�Ñ‚ÑŒ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð¾ `%s'"
  
! #: tp/Texinfo/Parser.pm:1710
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@%s Ñ€Ð¾Ð·Ñ‚Ð°ÑˆÐ¾Ð²Ð°Ð½Ð¾ Ð´Ð¾ @end %s"
  
! #: tp/Texinfo/Parser.pm:1714
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð½Ð¾Ð³Ð¾ `%cend %s'"
  
! #: tp/Texinfo/Parser.pm:1738 tp/Texinfo/Parser.pm:5070
! #: tp/Texinfo/Parser.pm:5308
  #, perl-format
  msgid "misplaced %c"
  msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾ Ñ€Ð¾Ð·Ñ‚Ð°ÑˆÐ¾Ð²Ð°Ð½Ðµ %c"
  
! #: tp/Texinfo/Parser.pm:1835 tp/Texinfo/Parser.pm:3148
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "Â«%c%sÂ» Ð±ÐµÐ· Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð½Ð¸ÐºÐ°"
  
! #: tp/Texinfo/Parser.pm:2072
  #, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "Ð¼Ð°ÐºÑ€Ð¾Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ� Â«%sÂ» Ð²Ð¸ÐºÐ»Ð¸ÐºÐ°Ð½Ð¾ Ð· Ð½Ð°Ð´Ð¼Ñ–Ñ€Ð½Ð¾ÑŽ ÐºÑ–Ð»ÑŒÐºÑ–Ñ�Ñ‚ÑŽ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñ–Ð²"
  
! #: tp/Texinfo/Parser.pm:2094
  #, perl-format
! msgid "@%s missing closing brace"
! msgstr "@%s Ð½Ðµ Ð¼Ð°Ñ” Ð·Ð°Ð²ÐµÑ€ÑˆÐ°Ð»ÑŒÐ½Ð¾Ñ— Ñ„Ñ–Ð³ÑƒÑ€Ð½Ð¾Ñ— Ð´ÑƒÐ¶ÐºÐ¸"
  
! #: tp/Texinfo/Parser.pm:2102
  #, perl-format
  msgid "macro `%s' declared without argument called with an argument"
***************
*** 2504,2558 ****
  "Ð¼Ð°ÐºÑ€Ð¾Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ� Â«%sÂ» Ð¾Ð³Ð¾Ð»Ð¾ÑˆÐµÐ½Ð¾ Ð±ÐµÐ· Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñƒ, Ð· Ñ�ÐºÐ¸Ð¼ Ð¹Ð¾Ð³Ð¾ Ñ�Ð»Ñ–Ð´ Ð²Ð¸ÐºÐ»Ð¸ÐºÐ°Ñ‚Ð¸"
  
! #: tp/Texinfo/Parser.pm:2175
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
  msgstr "Ð·Ð° \\ Ñƒ Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ– @%s Ñ�Ð»Ñ–Ð´ÑƒÑ” Â«%sÂ» Ð·Ð°Ð¼Ñ–Ñ�Ñ‚ÑŒ Ð½Ð°Ð·Ð²Ð¸ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° Ð°Ð±Ð¾ \\"
  
! #: tp/Texinfo/Parser.pm:2650
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s Â«%sÂ» Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¾ Ñ€Ð°Ð½Ñ–ÑˆÐµ"
  
! #: tp/Texinfo/Parser.pm:2655
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ” Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ� Ñ�Ðº @%s"
  
! #: tp/Texinfo/Parser.pm:3016
  #, perl-format
  msgid "missing name for @%s"
  msgstr "Ð½Ðµ Ð²Ð¸Ñ�Ñ‚Ð°Ñ‡Ð°Ñ” Ð½Ð°Ð·Ð²Ð¸ @%s"
  
! #: tp/Texinfo/Parser.pm:3021
  #, perl-format
  msgid "missing category for @%s"
  msgstr "Ð½Ðµ Ð²Ð¸Ñ�Ñ‚Ð°Ñ‡Ð°Ñ” ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ñ–Ñ— Ð´Ð»Ñ� @%s"
  
! #: tp/Texinfo/Parser.pm:3073
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "Ð½ÐµÐ¾Ñ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð¸Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ñƒ Ñ€Ñ�Ð´ÐºÑƒ @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3089
  msgid "empty multitable"
  msgstr "Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ” Ñ�ÐµÑ€ÐµÐ´Ð¾Ð²Ð¸Ñ‰Ðµ multitable"
  
! #: tp/Texinfo/Parser.pm:3145 tp/Texinfo/Parser.pm:5784
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "Ð·Ð°Ð¹Ð²Ð¸Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ @%s"
  
! #: tp/Texinfo/Parser.pm:3151 tp/Texinfo/Parser.pm:5806
! #: tp/Texinfo/Parser.pm:5818
  #, perl-format
  msgid "bad argument to @%s"
  msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¾Ð²Ð¸Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð¾ @%s"
  
! #: tp/Texinfo/Parser.pm:3162
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s Ð¿Ð¾Ñ‚Ñ€ÐµÐ±ÑƒÑ” Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñƒ: Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ÐµÑ€ Ð´Ð»Ñ� %citem"
  
! #: tp/Texinfo/Parser.pm:3167
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
--- 2504,2558 ----
  "Ð¼Ð°ÐºÑ€Ð¾Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ� Â«%sÂ» Ð¾Ð³Ð¾Ð»Ð¾ÑˆÐµÐ½Ð¾ Ð±ÐµÐ· Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñƒ, Ð· Ñ�ÐºÐ¸Ð¼ Ð¹Ð¾Ð³Ð¾ Ñ�Ð»Ñ–Ð´ Ð²Ð¸ÐºÐ»Ð¸ÐºÐ°Ñ‚Ð¸"
  
! #: tp/Texinfo/Parser.pm:2138
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
  msgstr "Ð·Ð° \\ Ñƒ Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ– @%s Ñ�Ð»Ñ–Ð´ÑƒÑ” Â«%sÂ» Ð·Ð°Ð¼Ñ–Ñ�Ñ‚ÑŒ Ð½Ð°Ð·Ð²Ð¸ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° Ð°Ð±Ð¾ \\"
  
! #: tp/Texinfo/Parser.pm:2501
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s Â«%sÂ» Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¾ Ñ€Ð°Ð½Ñ–ÑˆÐµ"
  
! #: tp/Texinfo/Parser.pm:2506
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ” Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ� Ñ�Ðº @%s"
  
! #: tp/Texinfo/Parser.pm:2850
  #, perl-format
  msgid "missing name for @%s"
  msgstr "Ð½Ðµ Ð²Ð¸Ñ�Ñ‚Ð°Ñ‡Ð°Ñ” Ð½Ð°Ð·Ð²Ð¸ @%s"
  
! #: tp/Texinfo/Parser.pm:2855
  #, perl-format
  msgid "missing category for @%s"
  msgstr "Ð½Ðµ Ð²Ð¸Ñ�Ñ‚Ð°Ñ‡Ð°Ñ” ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ñ–Ñ— Ð´Ð»Ñ� @%s"
  
! #: tp/Texinfo/Parser.pm:2890
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "Ð½ÐµÐ¾Ñ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð¸Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ñƒ Ñ€Ñ�Ð´ÐºÑƒ @%s: %s"
  
! #: tp/Texinfo/Parser.pm:2905
  msgid "empty multitable"
  msgstr "Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ” Ñ�ÐµÑ€ÐµÐ´Ð¾Ð²Ð¸Ñ‰Ðµ multitable"
  
! #: tp/Texinfo/Parser.pm:2959 tp/Texinfo/Parser.pm:5673
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "Ð·Ð°Ð¹Ð²Ð¸Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ @%s"
  
! #: tp/Texinfo/Parser.pm:2965 tp/Texinfo/Parser.pm:5694
! #: tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad argument to @%s"
  msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¾Ð²Ð¸Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð¾ @%s"
  
! #: tp/Texinfo/Parser.pm:2976
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s Ð¿Ð¾Ñ‚Ñ€ÐµÐ±ÑƒÑ” Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñƒ: Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ÐµÑ€ Ð´Ð»Ñ� %citem"
  
! #: tp/Texinfo/Parser.pm:2981
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
***************
*** 2561,2677 ****
  "Ñ€Ñ�Ð´ÐºÑƒ @%s"
  
! #: tp/Texinfo/Parser.pm:3202
  #, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ Ð°ÐºÑ†ÐµÐ½Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ�, Â«@%sÂ», Ð½Ðµ Ð¼Ð¾Ð¶Ð½Ð° Ð²Ð¸ÐºÐ¾Ñ€Ð¸Ñ�Ñ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ñƒ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñ– @%s"
  
! #: tp/Texinfo/Parser.pm:3290 tp/Texinfo/Parser.pm:3429
! #: tp/Texinfo/Parser.pm:5777
  #, perl-format
  msgid "@%s missing argument"
  msgstr "Ð½Ðµ Ð²Ð¸Ñ�Ñ‚Ð°Ñ‡Ð°Ñ” Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñƒ @%s"
  
! #: tp/Texinfo/Parser.pm:3302
  #, perl-format
  msgid "unknown @end %s"
  msgstr "Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° @end %s"
  
! #: tp/Texinfo/Parser.pm:3324 tp/Texinfo/Parser.pm:3943
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "Ð·Ð°Ð¹Ð²Ð¸Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ @%s, %s: %s"
  
! #: tp/Texinfo/Parser.pm:3329 tp/Texinfo/Parser.pm:5861
! #: tp/Texinfo/Parser.pm:5906 tp/Texinfo/Parser.pm:5935
! #: tp/Texinfo/Parser.pm:5976 tp/Texinfo/Parser.pm:6055
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¾Ð²Ð¸Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3348
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%s: Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾Ñ�Ñ� Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s: %s"
  
! #: tp/Texinfo/Parser.pm:3360
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr "ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ� Â«%sÂ» Ð½Ðµ Ñ” ÐºÐ°Ð½Ð¾Ð½Ñ–Ñ‡Ð½Ð¸Ð¼ ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ�Ð¼ texinfo"
  
! #: tp/Texinfo/Parser.pm:3369
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð° Ð½Ð°Ð·Ð²Ð° ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ� `%s'"
  
! #: tp/Texinfo/Parser.pm:3516
  #, perl-format
  msgid "@%s after the first element"
  msgstr "@%s Ð¿Ñ–Ñ�Ð»Ñ� Ð¿ÐµÑ€ÑˆÐ¾Ð³Ð¾ ÐµÐ»ÐµÐ¼ÐµÐ½Ñ‚Ð°"
  
! #: tp/Texinfo/Parser.pm:3523
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s Ð¼Ð°Ñ” Ñ�ÐµÐ½Ñ� Ð»Ð¸ÑˆÐµ Ñƒ Ñ€Ñ�Ð´ÐºÑƒ @multitable"
  
! #: tp/Texinfo/Parser.pm:3563
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "@%s Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð¾ Ð±ÑƒÑ‚Ð¸ Ð¿Ð¾Ð²â€™Ñ�Ð·Ð°Ð½Ð¾ Ð· @top"
  
! #: tp/Texinfo/Parser.pm:3575
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
  msgstr "@node Ð¿ÐµÑ€ÐµÐ´ÑƒÑ” @%s, Ð°Ð»Ðµ Ñ‡Ð°Ñ�Ñ‚Ð¸Ð½Ð¸ Ð½Ðµ Ð¼Ð¾Ð¶Ð½Ð° Ð¿Ð¾Ð²â€™Ñ�Ð·ÑƒÐ²Ð°Ñ‚Ð¸ Ð· Ð²ÑƒÐ·Ð»Ð°Ð¼Ð¸"
  
! #: tp/Texinfo/Parser.pm:3677
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ–Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ñƒ @%s"
  
! #: tp/Texinfo/Parser.pm:3681
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ� Ð½Ð°Ð·Ð²Ð° Ð²ÑƒÐ·Ð»Ð° Ð¿Ñ–Ñ�Ð»Ñ� Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ� Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:3724
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ� Ð½Ð°Ð·Ð²Ð° Ð¿ÑƒÐ½ÐºÑ‚Ñƒ Ð¼ÐµÐ½ÑŽ Ñƒ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:3732
  msgid "empty node name in menu entry"
  msgstr "Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ� Ð½Ð°Ð·Ð²Ð° Ð²ÑƒÐ·Ð»Ð° Ñƒ Ð¿ÑƒÐ½ÐºÑ‚Ñ– Ð¼ÐµÐ½ÑŽ"
  
! #: tp/Texinfo/Parser.pm:3805
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "@%s Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð¾ Ð±ÑƒÑ‚Ð¸ Ñƒ @%s"
  
! #: tp/Texinfo/Parser.pm:3937
  #, perl-format
! msgid "@end %s should only appear at a line beginning"
  msgstr "@end %s Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð¾ Ð±ÑƒÑ‚Ð¸ Ð½Ð° Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÑƒ Ñ€Ñ�Ð´ÐºÐ°"
  
! #: tp/Texinfo/Parser.pm:3960
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "Ð¼Ð°ÐºÑ€Ð¾Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ� `%s' Ð²Ð¶Ðµ Ð±ÑƒÐ»Ð¾ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ðµ"
  
! #: tp/Texinfo/Parser.pm:3963
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ” Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ� `%s' Ñ‚ÑƒÑ‚"
  
! #: tp/Texinfo/Parser.pm:3968
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "Ð¿ÐµÑ€ÐµÐ²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ� ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ Ð¼Ð¾Ð²Ð¸ Texinfo: @%s"
  
! #: tp/Texinfo/Parser.pm:4017
  #, perl-format
  msgid "@%s without associated character"
  msgstr "@%s Ð±ÐµÐ· Ð¿Ð¾Ð²â€™Ñ�Ð·Ð°Ð½Ð¾Ð³Ð¾ Ñ�Ð¸Ð¼Ð²Ð¾Ð»Ñƒ"
  
! #: tp/Texinfo/Parser.pm:4087
  #, perl-format
  msgid ""
--- 2561,2678 ----
  "Ñ€Ñ�Ð´ÐºÑƒ @%s"
  
! #: tp/Texinfo/Parser.pm:3016
  #, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ Ð°ÐºÑ†ÐµÐ½Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ�, Â«@%sÂ», Ð½Ðµ Ð¼Ð¾Ð¶Ð½Ð° Ð²Ð¸ÐºÐ¾Ñ€Ð¸Ñ�Ñ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ñƒ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñ– @%s"
  
! #: tp/Texinfo/Parser.pm:3124 tp/Texinfo/Parser.pm:3277
! #: tp/Texinfo/Parser.pm:5666
  #, perl-format
  msgid "@%s missing argument"
  msgstr "Ð½Ðµ Ð²Ð¸Ñ�Ñ‚Ð°Ñ‡Ð°Ñ” Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñƒ @%s"
  
! #: tp/Texinfo/Parser.pm:3138
  #, perl-format
  msgid "unknown @end %s"
  msgstr "Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° @end %s"
  
! #: tp/Texinfo/Parser.pm:3161 tp/Texinfo/Parser.pm:3788
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "Ð·Ð°Ð¹Ð²Ð¸Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ @%s, %s: %s"
  
! #: tp/Texinfo/Parser.pm:3167 tp/Texinfo/Parser.pm:3245
! #: tp/Texinfo/Parser.pm:5755 tp/Texinfo/Parser.pm:5798
! #: tp/Texinfo/Parser.pm:5827 tp/Texinfo/Parser.pm:5868
! #: tp/Texinfo/Parser.pm:5946
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¾Ð²Ð¸Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3188
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%s: Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾Ñ�Ñ� Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s: %s"
  
! #: tp/Texinfo/Parser.pm:3200
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr "ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ� Â«%sÂ» Ð½Ðµ Ñ” ÐºÐ°Ð½Ð¾Ð½Ñ–Ñ‡Ð½Ð¸Ð¼ ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ�Ð¼ texinfo"
  
! #: tp/Texinfo/Parser.pm:3208
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð° Ð½Ð°Ð·Ð²Ð° ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ� `%s'"
  
! #: tp/Texinfo/Parser.pm:3364
  #, perl-format
  msgid "@%s after the first element"
  msgstr "@%s Ð¿Ñ–Ñ�Ð»Ñ� Ð¿ÐµÑ€ÑˆÐ¾Ð³Ð¾ ÐµÐ»ÐµÐ¼ÐµÐ½Ñ‚Ð°"
  
! #: tp/Texinfo/Parser.pm:3371
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s Ð¼Ð°Ñ” Ñ�ÐµÐ½Ñ� Ð»Ð¸ÑˆÐµ Ñƒ Ñ€Ñ�Ð´ÐºÑƒ @multitable"
  
! #: tp/Texinfo/Parser.pm:3408
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "@%s Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð¾ Ð±ÑƒÑ‚Ð¸ Ð¿Ð¾Ð²â€™Ñ�Ð·Ð°Ð½Ð¾ Ð· @top"
  
! #: tp/Texinfo/Parser.pm:3420
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
  msgstr "@node Ð¿ÐµÑ€ÐµÐ´ÑƒÑ” @%s, Ð°Ð»Ðµ Ñ‡Ð°Ñ�Ñ‚Ð¸Ð½Ð¸ Ð½Ðµ Ð¼Ð¾Ð¶Ð½Ð° Ð¿Ð¾Ð²â€™Ñ�Ð·ÑƒÐ²Ð°Ñ‚Ð¸ Ð· Ð²ÑƒÐ·Ð»Ð°Ð¼Ð¸"
  
! #: tp/Texinfo/Parser.pm:3522
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ–Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ñƒ @%s"
  
! #: tp/Texinfo/Parser.pm:3526
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr "Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ� Ð½Ð°Ð·Ð²Ð° Ð²ÑƒÐ·Ð»Ð° Ð¿Ñ–Ñ�Ð»Ñ� Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ� Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:3569
  #, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ� Ð½Ð°Ð·Ð²Ð° Ð¿ÑƒÐ½ÐºÑ‚Ñƒ Ð¼ÐµÐ½ÑŽ Ñƒ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:3577
  msgid "empty node name in menu entry"
  msgstr "Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ� Ð½Ð°Ð·Ð²Ð° Ð²ÑƒÐ·Ð»Ð° Ñƒ Ð¿ÑƒÐ½ÐºÑ‚Ñ– Ð¼ÐµÐ½ÑŽ"
  
! #: tp/Texinfo/Parser.pm:3650
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "@%s Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð¾ Ð±ÑƒÑ‚Ð¸ Ñƒ @%s"
  
! #: tp/Texinfo/Parser.pm:3782
  #, perl-format
! msgid "@end %s should only appear at the beginning of a line"
  msgstr "@end %s Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð¾ Ð±ÑƒÑ‚Ð¸ Ð½Ð° Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÑƒ Ñ€Ñ�Ð´ÐºÐ°"
  
! #: tp/Texinfo/Parser.pm:3804
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "Ð¼Ð°ÐºÑ€Ð¾Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ� `%s' Ð²Ð¶Ðµ Ð±ÑƒÐ»Ð¾ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ðµ"
  
! #: tp/Texinfo/Parser.pm:3807
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ” Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ� `%s' Ñ‚ÑƒÑ‚"
  
! #: tp/Texinfo/Parser.pm:3812
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "Ð¿ÐµÑ€ÐµÐ²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ� ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ Ð¼Ð¾Ð²Ð¸ Texinfo: @%s"
  
! #: tp/Texinfo/Parser.pm:3879
  #, perl-format
  msgid "@%s without associated character"
  msgstr "@%s Ð±ÐµÐ· Ð¿Ð¾Ð²â€™Ñ�Ð·Ð°Ð½Ð¾Ð³Ð¾ Ñ�Ð¸Ð¼Ð²Ð¾Ð»Ñƒ"
  
! #: tp/Texinfo/Parser.pm:3949
  #, perl-format
  msgid ""
***************
*** 2681,2685 ****
  "Ð²Ð¸ÐºÐ»Ð¸ÐºÐ°Ñ‚Ð¸ Ð· Ð´ÑƒÐ¶ÐºÐ°Ð¼Ð¸, {}"
  
! #: tp/Texinfo/Parser.pm:4111
  #, perl-format
  msgid ""
--- 2682,2686 ----
  "Ð²Ð¸ÐºÐ»Ð¸ÐºÐ°Ñ‚Ð¸ Ð· Ð´ÑƒÐ¶ÐºÐ°Ð¼Ð¸, {}"
  
! #: tp/Texinfo/Parser.pm:3974
  #, perl-format
  msgid ""
***************
*** 2690,2694 ****
  "MAX_NESTED_MACROS; Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ðµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ� â€” %d)"
  
! #: tp/Texinfo/Parser.pm:4120
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
--- 2691,2695 ----
  "MAX_NESTED_MACROS; Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ðµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ� â€” %d)"
  
! #: tp/Texinfo/Parser.pm:3983
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
***************
*** 2697,2817 ****
  "Ñ�ÐºÐ¾Ñ€Ð¸Ñ�Ñ‚Ð°Ð¹Ñ‚ÐµÑ�Ñ� @rmacro"
  
! #: tp/Texinfo/Parser.pm:4176
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr "Ð¿Ñ–Ñ�Ð»Ñ� ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ Ð°ÐºÑ†ÐµÐ½Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ� Â«@%sÂ» Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Ñ�Ð¸Ð¼Ð²Ð¾Ð» Ð¿Ñ€Ð¾Ð±Ñ–Ð»Ñƒ"
  
! #: tp/Texinfo/Parser.pm:4182
  #, perl-format
  msgid "use braces to give a command as an argument to @%s"
  msgstr "Ð²Ð¸ÐºÐ¾Ñ€Ð¸Ñ�Ñ‚Ð¾Ð²ÑƒÐ¹Ñ‚Ðµ Ð´ÑƒÐ¶ÐºÐ¸, Ñ‰Ð¾Ð± Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‚Ð¸ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ Ñ�Ðº Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð¾ @%s"
  
! #: tp/Texinfo/Parser.pm:4195 tp/Texinfo/Parser.pm:5325
  #, perl-format
  msgid "%c%s expects `i' or `j' as argument, not `%s'"
  msgstr "%c%s Ð¿Ð¾Ñ‚Ñ€Ñ–Ð±ÐµÐ½ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Â«iÂ» Ð°Ð±Ð¾ Â«jÂ», Ð°Ð»Ðµ Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:4207
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr "Ð¿Ñ–Ñ�Ð»Ñ� ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ Ð°ÐºÑ†ÐµÐ½Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ� Â«@%sÂ» Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Ñ�Ð¸Ð¼Ð²Ð¾Ð» Ñ€Ð¾Ð·Ñ€Ð¸Ð²Ñƒ Ñ€Ñ�Ð´ÐºÐ°"
  
! #: tp/Texinfo/Parser.pm:4218
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s Ð¿Ð¾Ñ‚Ñ€Ñ–Ð±Ð½Ñ– Ð´ÑƒÐ¶ÐºÐ¸"
  
! #: tp/Texinfo/Parser.pm:4383
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð¸Ð¹ Ð¿Ñ€Ð°Ð¿Ð¾Ñ€ÐµÑ†ÑŒ: %s"
  
! #: tp/Texinfo/Parser.pm:4386
  msgid "bad syntax for @value"
  msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¾Ð²Ð¸Ð¹ Ñ�Ð¸Ð½Ñ‚Ð°ÐºÑ�Ð¸Ñ� Ð´Ð»Ñ� @value"
  
! #: tp/Texinfo/Parser.pm:4393
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s Ñ” Ð·Ð°Ñ�Ñ‚Ð°Ñ€Ñ–Ð»Ð¸Ð¼."
  
! #: tp/Texinfo/Parser.pm:4396
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s Ñ” Ð·Ð°Ñ�Ñ‚Ð°Ñ€Ñ–Ð»Ð¸Ð¼; %s"
  
! #: tp/Texinfo/Parser.pm:4405
  #, perl-format
! msgid "@%s should only appear at a line beginning"
! msgstr "@%s Ñ�Ð»Ñ–Ð´ Ñ€Ð¾Ð·Ñ‚Ð°ÑˆÐ¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ð»Ð¸ÑˆÐµ Ð½Ð° Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÑƒ Ñ€Ñ�Ð´ÐºÐ°"
  
! #: tp/Texinfo/Parser.pm:4496
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s Ð½Ðµ Ð¼Ð¾Ð¶Ð½Ð° Ð²Ð¸ÐºÐ¾Ñ€Ð¸Ñ�Ñ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ð²Ñ�ÐµÑ€ÐµÐ´Ð¸Ð½Ñ– Ð±Ð»Ð¾ÐºÑƒ Â«@%sÂ»"
  
! #: tp/Texinfo/Parser.pm:4505
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr "@%s Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Ñ€Ð¾Ð·Ñ‚Ð°ÑˆÐ¾Ð²Ð°Ð½Ð¾ Ð»Ð¸ÑˆÐµ Ñƒ Ð²ÐµÑ€Ñ…Ð½ÑŒÐ¾Ð¼Ñƒ Ð°Ð±Ð¾ Ð½Ð¸Ð¶Ð½ÑŒÐ¾Ð¼Ñƒ ÐºÐ¾Ð»Ð¾Ð½Ñ‚Ð¸Ñ‚ÑƒÐ»Ñ–"
  
! #: tp/Texinfo/Parser.pm:4631 tp/Texinfo/Parser.pm:4648
! #: tp/Texinfo/Parser.pm:4698
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s Ð½Ðµ Ð¼Ð°Ñ” Ñ�ÐµÐ½Ñ�Ñƒ ÑƒÑ�ÐµÑ€ÐµÐ´Ð¸Ð½Ñ– Ð±Ð»Ð¾ÐºÑƒ `%s'"
  
! #: tp/Texinfo/Parser.pm:4658
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "@%s Ñƒ Ð¿Ð¾Ñ€Ð¾Ð¶Ð½ÑŒÐ¾Ð¼Ñƒ multitable"
  
! #: tp/Texinfo/Parser.pm:4664
  msgid "@tab before @item"
  msgstr "@tab Ð¿ÐµÑ€ÐµÐ´ @item"
  
! #: tp/Texinfo/Parser.pm:4667
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "Ð·Ð°Ð½Ð°Ð´Ñ‚Ð¾ Ð±Ð°Ð³Ð°Ñ‚Ð¾ Ñ�Ñ‚Ð¾Ð²Ð¿Ñ‡Ð¸ÐºÑ–Ð² Ñƒ Ð¾Ð±â€™Ñ”ÐºÑ‚Ñ– multitable (Ð¼Ð°ÐºÑ�Ð¸Ð¼ÑƒÐ¼ %d)"
  
! #: tp/Texinfo/Parser.pm:4704
  msgid "ignoring @tab outside of multitable"
  msgstr "Ð¿Ñ€Ð¾Ð¿ÑƒÑ�ÐºÐ°Ñ”Ñ‚ÑŒÑ�Ñ� @tab Ð·Ð¾Ð²Ð½Ñ– multitable"
  
! #: tp/Texinfo/Parser.pm:4708
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "@%s Ð¿Ð¾Ð·Ð° Ð¼ÐµÐ¶Ð°Ð¼Ð¸ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ– Ð°Ð±Ð¾ Ñ�Ð¿Ð¸Ñ�ÐºÑƒ"
  
! #: tp/Texinfo/Parser.pm:4745
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Ñ€Ð¾Ð·Ñ‚Ð°ÑˆÐ¾Ð²Ð°Ð½Ð¾ Ð¿Ñ–Ñ�Ð»Ñ� Â«@%sÂ», Ñ‰Ð¾Ð± Ð¼Ð¾Ð¶Ð½Ð° Ð±ÑƒÐ»Ð¾ ÐºÐ¾Ñ€Ð¸Ñ�Ñ‚ÑƒÐ²Ð°Ñ‚Ð¸Ñ�Ñ� Â«@%sÂ»"
  
! #: tp/Texinfo/Parser.pm:4787
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "@%s Ð½Ðµ Ð¼Ð°Ñ” Ñ�ÐµÐ½Ñ�Ñƒ Ð·Ð·Ð¾Ð²Ð½Ñ– Ð¾Ñ‚Ð¾Ñ‡ÐµÐ½ÑŒ `@titlepage' Ñ‚Ð° `@quotation'"
  
! #: tp/Texinfo/Parser.pm:4791
  msgid "@dircategory after first node"
  msgstr "@dircategory Ð¿Ñ–Ñ�Ð»Ñ� Ð¿ÐµÑ€ÑˆÐ¾Ð³Ð¾ Ð²ÑƒÐ·Ð»Ð°"
  
! #: tp/Texinfo/Parser.pm:4979
  #, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "Ð½Ðµ Ð¼Ð¾Ð¶Ð½Ð° Ð²Ð¸ÐºÐ¾Ñ€Ð¸Ñ�Ñ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ñ€ÐµÐ³Ñ–Ð¾Ð½ %s Ð²Ñ�ÐµÑ€ÐµÐ´Ð¸Ð½Ñ– Ñ€ÐµÐ³Ñ–Ð¾Ð½Ñƒ %s"
  
! #: tp/Texinfo/Parser.pm:4997
  msgid "@direntry after first node"
  msgstr "@direntry Ð¿Ñ–Ñ�Ð»Ñ� Ð¿ÐµÑ€ÑˆÐ¾Ð³Ð¾ Ð²ÑƒÐ·Ð»Ð°"
  
! #: tp/Texinfo/Parser.pm:5005
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "@%s Ñ€Ð¾Ð·Ñ‚Ð°ÑˆÐ¾Ð²Ð°Ð½Ð¾ Ð¿ÐµÑ€ÐµÐ´ Ð¿ÐµÑ€ÑˆÐ¸Ð¼ @node"
  
! #: tp/Texinfo/Parser.pm:5008
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
--- 2698,2818 ----
  "Ñ�ÐºÐ¾Ñ€Ð¸Ñ�Ñ‚Ð°Ð¹Ñ‚ÐµÑ�Ñ� @rmacro"
  
! #: tp/Texinfo/Parser.pm:4038
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr "Ð¿Ñ–Ñ�Ð»Ñ� ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ Ð°ÐºÑ†ÐµÐ½Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ� Â«@%sÂ» Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Ñ�Ð¸Ð¼Ð²Ð¾Ð» Ð¿Ñ€Ð¾Ð±Ñ–Ð»Ñƒ"
  
! #: tp/Texinfo/Parser.pm:4044
  #, perl-format
  msgid "use braces to give a command as an argument to @%s"
  msgstr "Ð²Ð¸ÐºÐ¾Ñ€Ð¸Ñ�Ñ‚Ð¾Ð²ÑƒÐ¹Ñ‚Ðµ Ð´ÑƒÐ¶ÐºÐ¸, Ñ‰Ð¾Ð± Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‚Ð¸ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ Ñ�Ðº Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð´Ð¾ @%s"
  
! #: tp/Texinfo/Parser.pm:4057 tp/Texinfo/Parser.pm:5189
  #, perl-format
  msgid "%c%s expects `i' or `j' as argument, not `%s'"
  msgstr "%c%s Ð¿Ð¾Ñ‚Ñ€Ñ–Ð±ÐµÐ½ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Â«iÂ» Ð°Ð±Ð¾ Â«jÂ», Ð°Ð»Ðµ Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:4068
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr "Ð¿Ñ–Ñ�Ð»Ñ� ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ Ð°ÐºÑ†ÐµÐ½Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ� Â«@%sÂ» Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Ñ�Ð¸Ð¼Ð²Ð¾Ð» Ñ€Ð¾Ð·Ñ€Ð¸Ð²Ñƒ Ñ€Ñ�Ð´ÐºÐ°"
  
! #: tp/Texinfo/Parser.pm:4079
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s Ð¿Ð¾Ñ‚Ñ€Ñ–Ð±Ð½Ñ– Ð´ÑƒÐ¶ÐºÐ¸"
  
! #: tp/Texinfo/Parser.pm:4233
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð¸Ð¹ Ð¿Ñ€Ð°Ð¿Ð¾Ñ€ÐµÑ†ÑŒ: %s"
  
! #: tp/Texinfo/Parser.pm:4236
  msgid "bad syntax for @value"
  msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¾Ð²Ð¸Ð¹ Ñ�Ð¸Ð½Ñ‚Ð°ÐºÑ�Ð¸Ñ� Ð´Ð»Ñ� @value"
  
! #: tp/Texinfo/Parser.pm:4243
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s Ñ” Ð·Ð°Ñ�Ñ‚Ð°Ñ€Ñ–Ð»Ð¸Ð¼."
  
! #: tp/Texinfo/Parser.pm:4246
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s Ñ” Ð·Ð°Ñ�Ñ‚Ð°Ñ€Ñ–Ð»Ð¸Ð¼; %s"
  
! #: tp/Texinfo/Parser.pm:4255
  #, perl-format
! msgid "@%s should only appear at the beginning of a line"
! msgstr "@%s Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð¾ Ð±ÑƒÑ‚Ð¸ Ð½Ð° Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÑƒ Ñ€Ñ�Ð´ÐºÐ°"
  
! #: tp/Texinfo/Parser.pm:4346
  #, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s Ð½Ðµ Ð¼Ð¾Ð¶Ð½Ð° Ð²Ð¸ÐºÐ¾Ñ€Ð¸Ñ�Ñ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ð²Ñ�ÐµÑ€ÐµÐ´Ð¸Ð½Ñ– Ð±Ð»Ð¾ÐºÑƒ Â«@%sÂ»"
  
! #: tp/Texinfo/Parser.pm:4355
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr "@%s Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Ñ€Ð¾Ð·Ñ‚Ð°ÑˆÐ¾Ð²Ð°Ð½Ð¾ Ð»Ð¸ÑˆÐµ Ñƒ Ð²ÐµÑ€Ñ…Ð½ÑŒÐ¾Ð¼Ñƒ Ð°Ð±Ð¾ Ð½Ð¸Ð¶Ð½ÑŒÐ¾Ð¼Ñƒ ÐºÐ¾Ð»Ð¾Ð½Ñ‚Ð¸Ñ‚ÑƒÐ»Ñ–"
  
! #: tp/Texinfo/Parser.pm:4479 tp/Texinfo/Parser.pm:4496
! #: tp/Texinfo/Parser.pm:4546
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s Ð½Ðµ Ð¼Ð°Ñ” Ñ�ÐµÐ½Ñ�Ñƒ ÑƒÑ�ÐµÑ€ÐµÐ´Ð¸Ð½Ñ– Ð±Ð»Ð¾ÐºÑƒ `%s'"
  
! #: tp/Texinfo/Parser.pm:4506
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "@%s Ñƒ Ð¿Ð¾Ñ€Ð¾Ð¶Ð½ÑŒÐ¾Ð¼Ñƒ multitable"
  
! #: tp/Texinfo/Parser.pm:4512
  msgid "@tab before @item"
  msgstr "@tab Ð¿ÐµÑ€ÐµÐ´ @item"
  
! #: tp/Texinfo/Parser.pm:4515
  #, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "Ð·Ð°Ð½Ð°Ð´Ñ‚Ð¾ Ð±Ð°Ð³Ð°Ñ‚Ð¾ Ñ�Ñ‚Ð¾Ð²Ð¿Ñ‡Ð¸ÐºÑ–Ð² Ñƒ Ð¾Ð±â€™Ñ”ÐºÑ‚Ñ– multitable (Ð¼Ð°ÐºÑ�Ð¸Ð¼ÑƒÐ¼ %d)"
  
! #: tp/Texinfo/Parser.pm:4552
  msgid "ignoring @tab outside of multitable"
  msgstr "Ð¿Ñ€Ð¾Ð¿ÑƒÑ�ÐºÐ°Ñ”Ñ‚ÑŒÑ�Ñ� @tab Ð·Ð¾Ð²Ð½Ñ– multitable"
  
! #: tp/Texinfo/Parser.pm:4556
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "@%s Ð¿Ð¾Ð·Ð° Ð¼ÐµÐ¶Ð°Ð¼Ð¸ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ– Ð°Ð±Ð¾ Ñ�Ð¿Ð¸Ñ�ÐºÑƒ"
  
! #: tp/Texinfo/Parser.pm:4596
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Ñ€Ð¾Ð·Ñ‚Ð°ÑˆÐ¾Ð²Ð°Ð½Ð¾ Ð¿Ñ–Ñ�Ð»Ñ� Â«@%sÂ», Ñ‰Ð¾Ð± Ð¼Ð¾Ð¶Ð½Ð° Ð±ÑƒÐ»Ð¾ ÐºÐ¾Ñ€Ð¸Ñ�Ñ‚ÑƒÐ²Ð°Ñ‚Ð¸Ñ�Ñ� Â«@%sÂ»"
  
! #: tp/Texinfo/Parser.pm:4638
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "@%s Ð½Ðµ Ð¼Ð°Ñ” Ñ�ÐµÐ½Ñ�Ñƒ Ð·Ð·Ð¾Ð²Ð½Ñ– Ð¾Ñ‚Ð¾Ñ‡ÐµÐ½ÑŒ `@titlepage' Ñ‚Ð° `@quotation'"
  
! #: tp/Texinfo/Parser.pm:4642
  msgid "@dircategory after first node"
  msgstr "@dircategory Ð¿Ñ–Ñ�Ð»Ñ� Ð¿ÐµÑ€ÑˆÐ¾Ð³Ð¾ Ð²ÑƒÐ·Ð»Ð°"
  
! #: tp/Texinfo/Parser.pm:4847
  #, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "Ð½Ðµ Ð¼Ð¾Ð¶Ð½Ð° Ð²Ð¸ÐºÐ¾Ñ€Ð¸Ñ�Ñ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ñ€ÐµÐ³Ñ–Ð¾Ð½ %s Ð²Ñ�ÐµÑ€ÐµÐ´Ð¸Ð½Ñ– Ñ€ÐµÐ³Ñ–Ð¾Ð½Ñƒ %s"
  
! #: tp/Texinfo/Parser.pm:4864
  msgid "@direntry after first node"
  msgstr "@direntry Ð¿Ñ–Ñ�Ð»Ñ� Ð¿ÐµÑ€ÑˆÐ¾Ð³Ð¾ Ð²ÑƒÐ·Ð»Ð°"
  
! #: tp/Texinfo/Parser.pm:4872
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "@%s Ñ€Ð¾Ð·Ñ‚Ð°ÑˆÐ¾Ð²Ð°Ð½Ð¾ Ð¿ÐµÑ€ÐµÐ´ Ð¿ÐµÑ€ÑˆÐ¸Ð¼ @node"
  
! #: tp/Texinfo/Parser.pm:4875
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
***************
*** 2819,2862 ****
  "Ð¼Ð°Ð±ÑƒÑ‚ÑŒ, Ð²Ð°Ñˆ Ð²ÑƒÐ·Ð¾Ð» @top Ð¿Ð¾Ð²Ð¸Ð½ÐµÐ½ Ð±ÑƒÑ‚Ð¸ Ð¾Ð±Ð³Ð¾Ñ€Ð½ÑƒÑ‚Ð¸Ð¹ Ñƒ @ifnottex Ð·Ð°Ð¼Ñ–Ñ�Ñ‚ÑŒ @ifinfo?"
  
! #: tp/Texinfo/Parser.pm:5070
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr "@%s Ð¼Ð°Ñ” Ð²Ð¸ÐºÐ¾Ñ€Ð¸Ñ�Ñ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸Ñ�Ñ� Ð»Ð¸ÑˆÐµ Ñƒ ÐºÐ¾Ð½Ñ‚ÐµÐºÑ�Ñ‚Ñ– Ñ„Ð¾Ñ€Ð¼ÑƒÐ»"
  
! #: tp/Texinfo/Parser.pm:5078
  #, perl-format
  msgid "unknown command `%s'"
  msgstr "Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5088
  msgid "unexpected @"
  msgstr "Ð½ÐµÐ¾Ñ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ðµ @"
  
! #: tp/Texinfo/Parser.pm:5117
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s Ð½Ðµ Ð¼Ð°Ñ” Ñ�ÐµÐ½Ñ�Ñƒ Ð·Ð·Ð¾Ð²Ð½Ñ– Ñ�ÐµÑ€ÐµÐ´Ð¾Ð²Ð¸Ñ‰Ð° Â«@floatÂ»"
  
! #: tp/Texinfo/Parser.pm:5122
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr "@%s Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Ñ€Ð¾Ð·Ñ‚Ð°ÑˆÐ¾Ð²Ð°Ð½Ð¾ Ð¾Ð´Ñ€Ð°Ð·Ñƒ Ð¿Ñ–Ð´ Â«@floatÂ»"
  
! #: tp/Texinfo/Parser.pm:5130
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "Ñ–Ð³Ð½Ð¾Ñ€ÑƒÑ”Ð¼Ð¾ Ð·Ð°Ð¹Ð²Ñ– @%s"
  
! #: tp/Texinfo/Parser.pm:5249
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ– @%s Ð½Ðµ Ð¿ÐµÑ€ÐµÐ´Ð°ÑŽÑ‚ÑŒÑ�Ñ� Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¸"
  
! #: tp/Texinfo/Parser.pm:5273
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr "Ñƒ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ– @%s Ð½Ðµ Ð²Ð¸Ñ�Ñ‚Ð°Ñ‡Ð°Ñ” Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñƒ Ð²ÑƒÐ·Ð»Ð° Ð°Ð±Ð¾ Ð·Ð¾Ð²Ð½Ñ–ÑˆÐ½ÑŒÐ¾Ð³Ð¾ Ð¿Ñ–Ð´Ñ€ÑƒÑ‡Ð½Ð¸ÐºÐ°"
  
! #: tp/Texinfo/Parser.pm:5292
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
--- 2820,2863 ----
  "Ð¼Ð°Ð±ÑƒÑ‚ÑŒ, Ð²Ð°Ñˆ Ð²ÑƒÐ·Ð¾Ð» @top Ð¿Ð¾Ð²Ð¸Ð½ÐµÐ½ Ð±ÑƒÑ‚Ð¸ Ð¾Ð±Ð³Ð¾Ñ€Ð½ÑƒÑ‚Ð¸Ð¹ Ñƒ @ifnottex Ð·Ð°Ð¼Ñ–Ñ�Ñ‚ÑŒ @ifinfo?"
  
! #: tp/Texinfo/Parser.pm:4937
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr "@%s Ð¼Ð°Ñ” Ð²Ð¸ÐºÐ¾Ñ€Ð¸Ñ�Ñ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸Ñ�Ñ� Ð»Ð¸ÑˆÐµ Ñƒ ÐºÐ¾Ð½Ñ‚ÐµÐºÑ�Ñ‚Ñ– Ñ„Ð¾Ñ€Ð¼ÑƒÐ»"
  
! #: tp/Texinfo/Parser.pm:4945
  #, perl-format
  msgid "unknown command `%s'"
  msgstr "Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:4955
  msgid "unexpected @"
  msgstr "Ð½ÐµÐ¾Ñ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ðµ @"
  
! #: tp/Texinfo/Parser.pm:4983
  #, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s Ð½Ðµ Ð¼Ð°Ñ” Ñ�ÐµÐ½Ñ�Ñƒ Ð·Ð·Ð¾Ð²Ð½Ñ– Ñ�ÐµÑ€ÐµÐ´Ð¾Ð²Ð¸Ñ‰Ð° Â«@floatÂ»"
  
! #: tp/Texinfo/Parser.pm:4988
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr "@%s Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Ñ€Ð¾Ð·Ñ‚Ð°ÑˆÐ¾Ð²Ð°Ð½Ð¾ Ð¾Ð´Ñ€Ð°Ð·Ñƒ Ð¿Ñ–Ð´ Â«@floatÂ»"
  
! #: tp/Texinfo/Parser.pm:4996
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "Ñ–Ð³Ð½Ð¾Ñ€ÑƒÑ”Ð¼Ð¾ Ð·Ð°Ð¹Ð²Ñ– @%s"
  
! #: tp/Texinfo/Parser.pm:5114
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ– @%s Ð½Ðµ Ð¿ÐµÑ€ÐµÐ´Ð°ÑŽÑ‚ÑŒÑ�Ñ� Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¸"
  
! #: tp/Texinfo/Parser.pm:5138
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr "Ñƒ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ– @%s Ð½Ðµ Ð²Ð¸Ñ�Ñ‚Ð°Ñ‡Ð°Ñ” Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñƒ Ð²ÑƒÐ·Ð»Ð° Ð°Ð±Ð¾ Ð·Ð¾Ð²Ð½Ñ–ÑˆÐ½ÑŒÐ¾Ð³Ð¾ Ð¿Ñ–Ð´Ñ€ÑƒÑ‡Ð½Ð¸ÐºÐ°"
  
! #: tp/Texinfo/Parser.pm:5156
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
***************
*** 2864,2868 ****
  "Ñƒ @%s Ð²Ð¸Ñ�Ð²Ð»ÐµÐ½Ð¾ Ð¿Ð¾Ñ€Ð¾Ð¶Ð½ÑŽ Ð½Ð°Ð·Ð²Ñƒ Ð¿ÐµÑ€ÐµÑ…Ñ€ÐµÑ�Ð½Ð¾Ð³Ð¾ Ð¿Ð¾Ñ�Ð¸Ð»Ð°Ð½Ð½Ñ� Ð¿Ñ–Ñ�Ð»Ñ� Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ� Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5303
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
--- 2865,2869 ----
  "Ñƒ @%s Ð²Ð¸Ñ�Ð²Ð»ÐµÐ½Ð¾ Ð¿Ð¾Ñ€Ð¾Ð¶Ð½ÑŽ Ð½Ð°Ð·Ð²Ñƒ Ð¿ÐµÑ€ÐµÑ…Ñ€ÐµÑ�Ð½Ð¾Ð³Ð¾ Ð¿Ð¾Ñ�Ð¸Ð»Ð°Ð½Ð½Ñ� Ð¿Ñ–Ñ�Ð»Ñ� Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ� Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5167
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
***************
*** 2871,2899 ****
  "Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5316
  msgid "@image missing filename argument"
  msgstr "Ð½Ðµ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð½Ð°Ð·Ð²Ð¸ Ñ„Ð°Ð¹Ð»Ñƒ Ð´Ð»Ñ� @image"
  
! #: tp/Texinfo/Parser.pm:5348
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "Ñƒ @%s Ð½Ðµ Ð²Ð¸Ñ�Ñ‚Ð°Ñ‡Ð°Ñ” Ð¿ÐµÑ€ÑˆÐ¾Ð³Ð¾ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñƒ"
  
! #: tp/Texinfo/Parser.pm:5393
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "Ð½ÐµÑˆÑ–Ñ�Ñ‚Ð½Ð°Ð´Ñ†Ñ�Ñ‚ÐºÐ¾Ð²Ñ– Ñ†Ð¸Ñ„Ñ€Ð¸ Ñƒ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñ– @U: %s"
  
! #: tp/Texinfo/Parser.pm:5399
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr "Ð¼ÐµÐ½ÑˆÐµ Ð·Ð° 4 ÑˆÑ–Ñ�Ñ‚Ð½Ð°Ð´Ñ†Ñ�Ñ‚ÐºÐ¾Ð²Ñ– Ñ†Ð¸Ñ„Ñ€Ð¸ Ñƒ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñ– @U: %s"
  
! #: tp/Texinfo/Parser.pm:5412
! #, perl-format
! msgid "argument for @U exceeds size of integer: %s"
! msgstr "Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ @U Ð¿ÐµÑ€ÐµÐ²Ð¸Ñ‰ÑƒÑ” Ð·Ð° Ñ€Ð¾Ð·Ð¼Ñ–Ñ€Ð¾Ð¼ Ñ€Ð¾Ð·Ð¼Ñ–Ñ€ Ñ†Ñ–Ð»Ð¾Ð³Ð¾ Ñ‡Ð¸Ñ�Ð»Ð°: %s"
! 
! #: tp/Texinfo/Parser.pm:5418
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
--- 2872,2895 ----
  "Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5180
  msgid "@image missing filename argument"
  msgstr "Ð½Ðµ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð½Ð°Ð·Ð²Ð¸ Ñ„Ð°Ð¹Ð»Ñƒ Ð´Ð»Ñ� @image"
  
! #: tp/Texinfo/Parser.pm:5211
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "Ñƒ @%s Ð½Ðµ Ð²Ð¸Ñ�Ñ‚Ð°Ñ‡Ð°Ñ” Ð¿ÐµÑ€ÑˆÐ¾Ð³Ð¾ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñƒ"
  
! #: tp/Texinfo/Parser.pm:5230
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "Ð½ÐµÑˆÑ–Ñ�Ñ‚Ð½Ð°Ð´Ñ†Ñ�Ñ‚ÐºÐ¾Ð²Ñ– Ñ†Ð¸Ñ„Ñ€Ð¸ Ñƒ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñ– @U: %s"
  
! #: tp/Texinfo/Parser.pm:5236
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr "Ð¼ÐµÐ½ÑˆÐµ Ð·Ð° 4 ÑˆÑ–Ñ�Ñ‚Ð½Ð°Ð´Ñ†Ñ�Ñ‚ÐºÐ¾Ð²Ñ– Ñ†Ð¸Ñ„Ñ€Ð¸ Ñƒ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñ– @U: %s"
  
! #: tp/Texinfo/Parser.pm:5253
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
***************
*** 2902,3000 ****
  "%s"
  
! #: tp/Texinfo/Parser.pm:5546
  msgid "superfluous arguments for node"
  msgstr "Ð·Ð°Ð¹Ð²Ñ– Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¸ Ð´Ð»Ñ� Ð²ÑƒÐ·Ð»Ð°"
  
! #: tp/Texinfo/Parser.pm:5596
  #, perl-format
  msgid "expected @end %s"
  msgstr "Ð¼Ð°Ð»Ð¾ Ð±ÑƒÑ‚Ð¸ @end %s"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "@%s Ð¿Ñ€Ð¸Ð¹Ð¼Ð°Ñ” Ñ�Ðº Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð»Ð¸ÑˆÐµ @-ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸, Ð°Ð»Ðµ Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5728
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "Ð·Ð°Ð»Ð¸ÑˆÐºÐ¾Ð²Ð¸Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ñƒ Ñ€Ñ�Ð´ÐºÑƒ @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5801
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Ñ�ÐµÑ€ÐµÐ´Ð¾Ð²Ð¸Ñ‰Ð° %s Ñ�Ðº Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ @%s"
  
! #: tp/Texinfo/Parser.pm:5823
  #, perl-format
  msgid "empty @%s"
  msgstr "Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ–Ð¹ Ð·Ð°Ð¿Ð¸Ñ� @%s"
  
! #: tp/Texinfo/Parser.pm:5831
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "Ñ‡Ð°Ñ�Ñ‚ÐºÐ° Ñ�Ñ‚Ð¾Ð²Ð¿Ñ‡Ð¸ÐºÐ° Ð½Ðµ Ñ” Ñ‡Ð¸Ñ�Ð»Ð¾Ð¼: %s"
  
! #: tp/Texinfo/Parser.pm:5840
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð¼ @sp Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Ñ‡Ð¸Ñ�Ð»Ð¾, Ð° Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5849
  #, perl-format
  msgid "reserved index name %s"
  msgstr "Ð·Ð°Ñ€ÐµÐ·ÐµÑ€Ð²Ð¾Ð²Ð°Ð½Ð° Ð½Ð°Ð·Ð²Ð° Ñ–Ð½Ð´ÐµÐºÑ�Ñƒ %s"
  
! #: tp/Texinfo/Parser.pm:5868
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð¸Ð¹ Ñ–Ð½Ð´ÐµÐºÑ� Ð´Ð¶ÐµÑ€ÐµÐ»Ð° Ñƒ @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5871
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð¸Ð¹ Ñ–Ð½Ð´ÐµÐºÑ� Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ� Ñƒ @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr "@%s Ð¿Ñ€Ð¸Ð·Ð²ÐµÐ´Ðµ Ð´Ð¾ Ð¾Ð±â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ� %s Ð· Ñ�Ð°Ð¼Ð¸Ð¼ Ñ�Ð¾Ð±Ð¾ÑŽ, Ñ–Ð³Ð½Ð¾Ñ€ÑƒÑ”Ð¼Ð¾"
  
! #: tp/Texinfo/Parser.pm:5914
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð¸Ð¹ Ñ–Ð½Ð´ÐµÐºÑ� Â«%sÂ» Ñƒ @printindex"
  
! #: tp/Texinfo/Parser.pm:5920
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr "Ð´Ñ€ÑƒÐºÑƒÑ”Ð¼Ð¾ Ð¿Ð¾ÐºÐ°Ð¶Ñ‡Ð¸Ðº Â«%sÂ» Ð¾Ð±â€™Ñ”Ð´Ð½Ð°Ð½Ð¸Ð¹ Ð· Ñ–Ð½ÑˆÐ¸Ð¼, Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5928
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "printindex Ð´Ð¾ Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÑƒ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°: @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5944
  #, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
  msgstr "Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð¼ @%s Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Â«topÂ» Ð°Ð±Ð¾ Â«bottomÂ», Ð°Ð»Ðµ Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5952
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr "ÐŸÑ–Ð´Ñ‚Ñ€Ð¸Ð¼ÑƒÑŽÑ‚ÑŒÑ�Ñ� Ð»Ð¸ÑˆÐµ @%s 10 Ñ‡Ð¸ 11, Ð° Ð½Ðµ `%s'"
  
! #: tp/Texinfo/Parser.pm:5960
  #, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
  msgstr "Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð¼ @%s Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Â«separateÂ» Ð°Ð±Ð¾ Â«endÂ», Ð°Ð»Ðµ Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5968
  #, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
  msgstr "Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð¼ @%s Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Â«onÂ», Â«offÂ» Ð°Ð±Ð¾ Â«oddÂ», Ð°Ð»Ðµ Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5986 tp/Texinfo/Parser.pm:5991
  #, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
--- 2898,2996 ----
  "%s"
  
! #: tp/Texinfo/Parser.pm:5448
  msgid "superfluous arguments for node"
  msgstr "Ð·Ð°Ð¹Ð²Ñ– Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¸ Ð´Ð»Ñ� Ð²ÑƒÐ·Ð»Ð°"
  
! #: tp/Texinfo/Parser.pm:5498
  #, perl-format
  msgid "expected @end %s"
  msgstr "Ð¼Ð°Ð»Ð¾ Ð±ÑƒÑ‚Ð¸ @end %s"
  
! #: tp/Texinfo/Parser.pm:5607
  #, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "@%s Ð¿Ñ€Ð¸Ð¹Ð¼Ð°Ñ” Ñ�Ðº Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð»Ð¸ÑˆÐµ @-ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸, Ð°Ð»Ðµ Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5617
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "Ð·Ð°Ð»Ð¸ÑˆÐºÐ¾Ð²Ð¸Ð¹ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ñƒ Ñ€Ñ�Ð´ÐºÑƒ @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5689
  #, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Ñ�ÐµÑ€ÐµÐ´Ð¾Ð²Ð¸Ñ‰Ð° %s Ñ�Ðº Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ @%s"
  
! #: tp/Texinfo/Parser.pm:5710
  #, perl-format
  msgid "empty @%s"
  msgstr "Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ–Ð¹ Ð·Ð°Ð¿Ð¸Ñ� @%s"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr "Ñ‡Ð°Ñ�Ñ‚ÐºÐ° Ñ�Ñ‚Ð¾Ð²Ð¿Ñ‡Ð¸ÐºÐ° Ð½Ðµ Ñ” Ñ‡Ð¸Ñ�Ð»Ð¾Ð¼: %s"
  
! #: tp/Texinfo/Parser.pm:5727
  #, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð¼ @sp Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Ñ‡Ð¸Ñ�Ð»Ð¾, Ð° Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5736
  #, perl-format
  msgid "reserved index name %s"
  msgstr "Ð·Ð°Ñ€ÐµÐ·ÐµÑ€Ð²Ð¾Ð²Ð°Ð½Ð° Ð½Ð°Ð·Ð²Ð° Ñ–Ð½Ð´ÐµÐºÑ�Ñƒ %s"
  
! #: tp/Texinfo/Parser.pm:5762
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð¸Ð¹ Ñ–Ð½Ð´ÐµÐºÑ� Ð´Ð¶ÐµÑ€ÐµÐ»Ð° Ñƒ @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5765
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð¸Ð¹ Ñ–Ð½Ð´ÐµÐºÑ� Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ� Ñƒ @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5793
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr "@%s Ð¿Ñ€Ð¸Ð·Ð²ÐµÐ´Ðµ Ð´Ð¾ Ð¾Ð±â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ� %s Ð· Ñ�Ð°Ð¼Ð¸Ð¼ Ñ�Ð¾Ð±Ð¾ÑŽ, Ñ–Ð³Ð½Ð¾Ñ€ÑƒÑ”Ð¼Ð¾"
  
! #: tp/Texinfo/Parser.pm:5806
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð¸Ð¹ Ñ–Ð½Ð´ÐµÐºÑ� Â«%sÂ» Ñƒ @printindex"
  
! #: tp/Texinfo/Parser.pm:5812
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr "Ð´Ñ€ÑƒÐºÑƒÑ”Ð¼Ð¾ Ð¿Ð¾ÐºÐ°Ð¶Ñ‡Ð¸Ðº Â«%sÂ» Ð¾Ð±â€™Ñ”Ð´Ð½Ð°Ð½Ð¸Ð¹ Ð· Ñ–Ð½ÑˆÐ¸Ð¼, Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5820
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr "printindex Ð´Ð¾ Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÑƒ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°: @printindex %s"
  
! #: tp/Texinfo/Parser.pm:5836
  #, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
  msgstr "Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð¼ @%s Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Â«topÂ» Ð°Ð±Ð¾ Â«bottomÂ», Ð°Ð»Ðµ Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5844
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr "ÐŸÑ–Ð´Ñ‚Ñ€Ð¸Ð¼ÑƒÑŽÑ‚ÑŒÑ�Ñ� Ð»Ð¸ÑˆÐµ @%s 10 Ñ‡Ð¸ 11, Ð° Ð½Ðµ `%s'"
  
! #: tp/Texinfo/Parser.pm:5852
  #, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
  msgstr "Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð¼ @%s Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Â«separateÂ» Ð°Ð±Ð¾ Â«endÂ», Ð°Ð»Ðµ Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5860
  #, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
  msgstr "Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð¼ @%s Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Â«onÂ», Â«offÂ» Ð°Ð±Ð¾ Â«oddÂ», Ð°Ð»Ðµ Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5878 tp/Texinfo/Parser.pm:5883
  #, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
***************
*** 3002,3006 ****
  "Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð¼ @paragraphindent Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Ñ‡Ð¸Ñ�Ð»Ð¾, Â«noneÂ» Ð°Ð±Ð¾ Â«asisÂ», Ð°Ð»Ðµ Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5999
  #, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
--- 2998,3002 ----
  "Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð¼ @paragraphindent Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Ñ‡Ð¸Ñ�Ð»Ð¾, Â«noneÂ» Ð°Ð±Ð¾ Â«asisÂ», Ð°Ð»Ðµ Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5891
  #, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
***************
*** 3008,3022 ****
  "Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð¼ @firstparagraphindent Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Â«noneÂ» Ð°Ð±Ð¾ Â«insertÂ», Ð°Ð»Ðµ Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:6009
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
  msgstr "Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð¼ @exampleindent Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Ñ‡Ð¸Ñ�Ð»Ð¾ Ð°Ð±Ð¾ Â«asisÂ», Ð°Ð»Ðµ Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:6021
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "@%s Ð¼Ð°Ð»Ð¾ Ð±ÑƒÑ‚Ð¸ on Ð°Ð±Ð¾ off, Ð°Ð»Ðµ Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:6031
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
--- 3004,3018 ----
  "Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð¼ @firstparagraphindent Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Â«noneÂ» Ð°Ð±Ð¾ Â«insertÂ», Ð°Ð»Ðµ Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
  msgstr "Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð¼ @exampleindent Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Ñ‡Ð¸Ñ�Ð»Ð¾ Ð°Ð±Ð¾ Â«asisÂ», Ð°Ð»Ðµ Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5913
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "@%s Ð¼Ð°Ð»Ð¾ Ð±ÑƒÑ‚Ð¸ on Ð°Ð±Ð¾ off, Ð°Ð»Ðµ Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5922
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
***************
*** 3024,3033 ****
  "Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð¼ @kbdinputstyle Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Â«codeÂ»/Â«exampleÂ»/Â«distinctÂ», Ð°Ð»Ðµ Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:6039
  #, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
  msgstr "Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð¼ @allowcodebreaks Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Â«trueÂ» Ð°Ð±Ð¾ Â«falseÂ», Ð°Ð»Ðµ Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:6047
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
--- 3020,3029 ----
  "Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð¼ @kbdinputstyle Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Â«codeÂ»/Â«exampleÂ»/Â«distinctÂ», Ð°Ð»Ðµ Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5930
  #, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
  msgstr "Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð¼ @allowcodebreaks Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Â«trueÂ» Ð°Ð±Ð¾ Â«falseÂ», Ð°Ð»Ðµ Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Parser.pm:5938
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
***************
*** 3035,3084 ****
  "Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð¼ @urefbreakstyle Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Â«afterÂ»/Â«beforeÂ»/Â«noneÂ», Ð°Ð»Ðµ Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:213
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr "Ð¿Ñ–Ð´Ð½Ñ–Ð¼Ð°Ñ”Ð¼Ð¾ Ñ€Ñ–Ð²ÐµÐ½ÑŒ Ñ€Ð¾Ð·Ð´Ñ–Ð»Ñƒ @%s; Ð·Ð°Ñ€Ð°Ð· Ñ€Ñ–Ð²ÐµÐ½ÑŒ Ñ” Ð½Ð°Ð´Ñ‚Ð¾ Ð½Ð¸Ð·ÑŒÐºÐ¸Ð¼"
  
! #: tp/Texinfo/Structuring.pm:245
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "Ð½ÐµÐ¼Ð°Ñ” ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ Ñ€Ñ–Ð²Ð½Ñ� Ð³Ð»Ð°Ð²Ð¸ Ð¿ÐµÑ€ÐµÐ´ @%s"
  
! #: tp/Texinfo/Structuring.pm:250
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr "Ð·Ð½Ð¸Ð¶ÑƒÑ”Ð¼Ð¾ Ñ€Ñ–Ð²ÐµÐ½ÑŒ Ñ€Ð¾Ð·Ð´Ñ–Ð»Ñƒ @%s, Ñ�ÐºÐ¸Ð¹ Ð²ÐºÐ»Ð°Ð´ÐµÐ½Ð¾ Ñƒ Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð½Ð¸Ð¶Ñ‡Ð¾Ð³Ð¾ Ñ€Ñ–Ð²Ð½Ñ�"
  
! #: tp/Texinfo/Structuring.pm:339
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "Ð· @%s Ð½Ðµ Ð¿Ð¾Ð²â€™Ñ�Ð·Ð°Ð½Ð¾ Ð¶Ð¾Ð´Ð½Ð¾Ñ— ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ Ñ�Ñ‚Ñ€ÑƒÐºÑ‚ÑƒÑ€ÑƒÐ²Ð°Ð½Ð½Ñ� Ñ€Ð¾Ð·Ð´Ñ–Ð»Ñ–Ð²"
  
! #: tp/Texinfo/Structuring.pm:488
  #, perl-format
  msgid "@%s not empty"
  msgstr "@%s Ð½Ðµ Ñ” Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ–Ð¼"
  
! #: tp/Texinfo/Structuring.pm:544 tp/Texinfo/Structuring.pm:1326
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "@%s Ð¿Ð¾Ñ�Ð¸Ð»Ð°Ñ”Ñ‚ÑŒÑ�Ñ� Ð½Ð° Ð²Ñ–Ð´Ñ�ÑƒÑ‚Ð½Ñ–Ð¹ Ð²ÑƒÐ·Ð¾Ð» Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:557
  #, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
  msgstr "Ð½Ð°Ð·Ð²Ð° Ð²ÑƒÐ·Ð»Ð° Ð·Ð°Ð¿Ð¸Ñ�Ñƒ @%s, Â«%sÂ», Ð²Ñ–Ð´Ñ€Ñ–Ð·Ð½Ñ�Ñ”Ñ‚ÑŒÑ�Ñ� Ð²Ñ–Ð´ Ð½Ð°Ð·Ð²Ð¸ %s, Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:662
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "Ð²ÑƒÐ·Ð¾Ð», Ð½Ð° Ñ�ÐºÐ¸Ð¹ Ð½ÐµÐ¼Ð° Ð¿Ð¾Ñ�Ð¸Ð»Ð°Ð½ÑŒ `%s'"
  
! #: tp/Texinfo/Structuring.pm:708
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr "Ð²ÑƒÐ·Ð¾Ð» Â«%sÂ» Ñ” Ð²ÑƒÐ·Ð»Ð¾Ð¼ %s Ð´Ð»Ñ� Â«%sÂ» Ñƒ Ñ�Ñ‚Ñ€ÑƒÐºÑ‚ÑƒÑ€Ñ– Ñ€Ð¾Ð·Ð´Ñ–Ð»Ñ–Ð², Ð°Ð»Ðµ Ð½Ðµ Ñƒ Ð¼ÐµÐ½ÑŽ"
  
! #: tp/Texinfo/Structuring.pm:715
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
--- 3031,3080 ----
  "Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð¼ @urefbreakstyle Ð¼Ð°Ñ” Ð±ÑƒÑ‚Ð¸ Â«afterÂ»/Â«beforeÂ»/Â«noneÂ», Ð°Ð»Ðµ Ð½Ðµ Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:216
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr "Ð¿Ñ–Ð´Ð½Ñ–Ð¼Ð°Ñ”Ð¼Ð¾ Ñ€Ñ–Ð²ÐµÐ½ÑŒ Ñ€Ð¾Ð·Ð´Ñ–Ð»Ñƒ @%s; Ð·Ð°Ñ€Ð°Ð· Ñ€Ñ–Ð²ÐµÐ½ÑŒ Ñ” Ð½Ð°Ð´Ñ‚Ð¾ Ð½Ð¸Ð·ÑŒÐºÐ¸Ð¼"
  
! #: tp/Texinfo/Structuring.pm:248
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "Ð½ÐµÐ¼Ð°Ñ” ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ Ñ€Ñ–Ð²Ð½Ñ� Ð³Ð»Ð°Ð²Ð¸ Ð¿ÐµÑ€ÐµÐ´ @%s"
  
! #: tp/Texinfo/Structuring.pm:253
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr "Ð·Ð½Ð¸Ð¶ÑƒÑ”Ð¼Ð¾ Ñ€Ñ–Ð²ÐµÐ½ÑŒ Ñ€Ð¾Ð·Ð´Ñ–Ð»Ñƒ @%s, Ñ�ÐºÐ¸Ð¹ Ð²ÐºÐ»Ð°Ð´ÐµÐ½Ð¾ Ñƒ Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð½Ð¸Ð¶Ñ‡Ð¾Ð³Ð¾ Ñ€Ñ–Ð²Ð½Ñ�"
  
! #: tp/Texinfo/Structuring.pm:342
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "Ð· @%s Ð½Ðµ Ð¿Ð¾Ð²â€™Ñ�Ð·Ð°Ð½Ð¾ Ð¶Ð¾Ð´Ð½Ð¾Ñ— ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ Ñ�Ñ‚Ñ€ÑƒÐºÑ‚ÑƒÑ€ÑƒÐ²Ð°Ð½Ð½Ñ� Ñ€Ð¾Ð·Ð´Ñ–Ð»Ñ–Ð²"
  
! #: tp/Texinfo/Structuring.pm:491
  #, perl-format
  msgid "@%s not empty"
  msgstr "@%s Ð½Ðµ Ñ” Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ–Ð¼"
  
! #: tp/Texinfo/Structuring.pm:547 tp/Texinfo/Structuring.pm:1325
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "@%s Ð¿Ð¾Ñ�Ð¸Ð»Ð°Ñ”Ñ‚ÑŒÑ�Ñ� Ð½Ð° Ð²Ñ–Ð´Ñ�ÑƒÑ‚Ð½Ñ–Ð¹ Ð²ÑƒÐ·Ð¾Ð» Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:558
  #, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
  msgstr "Ð½Ð°Ð·Ð²Ð° Ð²ÑƒÐ·Ð»Ð° Ð·Ð°Ð¿Ð¸Ñ�Ñƒ @%s, Â«%sÂ», Ð²Ñ–Ð´Ñ€Ñ–Ð·Ð½Ñ�Ñ”Ñ‚ÑŒÑ�Ñ� Ð²Ñ–Ð´ Ð½Ð°Ð·Ð²Ð¸ %s, Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:663
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "Ð²ÑƒÐ·Ð¾Ð», Ð½Ð° Ñ�ÐºÐ¸Ð¹ Ð½ÐµÐ¼Ð° Ð¿Ð¾Ñ�Ð¸Ð»Ð°Ð½ÑŒ `%s'"
  
! #: tp/Texinfo/Structuring.pm:706
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr "Ð²ÑƒÐ·Ð¾Ð» Â«%sÂ» Ñ” Ð²ÑƒÐ·Ð»Ð¾Ð¼ %s Ð´Ð»Ñ� Â«%sÂ» Ñƒ Ñ�Ñ‚Ñ€ÑƒÐºÑ‚ÑƒÑ€Ñ– Ñ€Ð¾Ð·Ð´Ñ–Ð»Ñ–Ð², Ð°Ð»Ðµ Ð½Ðµ Ñƒ Ð¼ÐµÐ½ÑŽ"
  
! #: tp/Texinfo/Structuring.pm:713
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
***************
*** 3087,3111 ****
  "Ñ€Ð¾Ð·Ð´Ñ–Ð»Ñ–Ð² Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:733
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
  msgstr "Ð²ÑƒÐ·Ð¾Ð» Â«%sÂ» Ñ” Ð²ÑƒÐ·Ð»Ð¾Ð¼ %s Ð´Ð»Ñ� Â«%sÂ» Ñƒ Ð¼ÐµÐ½ÑŽ, Ð°Ð»Ðµ Ð½Ðµ Ñƒ Ñ�Ñ‚Ñ€ÑƒÐºÑ‚ÑƒÑ€Ñ– Ñ€Ð¾Ð·Ð´Ñ–Ð»Ñ–Ð²"
  
! #: tp/Texinfo/Structuring.pm:787
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
  msgstr "Ð²ÐºÐ°Ð·Ñ–Ð²Ð½Ð¸Ðº %s, Â«%sÂ», (Ð´Ð»Ñ� Ð²ÑƒÐ·Ð»Ð° Â«%sÂ») Ð²Ñ–Ð´Ñ€Ñ–Ð·Ð½Ñ�Ñ”Ñ‚ÑŒÑ�Ñ� Ð²Ñ–Ð´ Ð½Ð°Ð·Ð²Ð¸ %s, Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:814
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%s Ð¿Ð¾Ñ�Ð¸Ð»Ð°Ñ”Ñ‚ÑŒÑ�Ñ� Ð½Ð° Ð²Ñ–Ð´Ñ�ÑƒÑ‚Ð½Ñ–Ð¹ Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:834
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
  msgstr "Ð²ÑƒÐ·Ð¾Ð» `%s' Ð½Ðµ Ð¼Ð°Ñ” Ð¿ÑƒÐ½ÐºÑ‚Ñƒ Ð¼ÐµÐ½ÑŽ Ð´Ð»Ñ� `%s', Ñ…Ð¾Ñ‡Ð° Ð¹ Ñ” Ð¹Ð¾Ð³Ð¾ Ð³Ð¾Ñ€Ñ–ÑˆÐ½Ñ–Ð¼ Ð²ÑƒÐ·Ð»Ð¾Ð¼"
  
! #: tp/Texinfo/Structuring.pm:842
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
--- 3083,3107 ----
  "Ñ€Ð¾Ð·Ð´Ñ–Ð»Ñ–Ð² Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:731
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
  msgstr "Ð²ÑƒÐ·Ð¾Ð» Â«%sÂ» Ñ” Ð²ÑƒÐ·Ð»Ð¾Ð¼ %s Ð´Ð»Ñ� Â«%sÂ» Ñƒ Ð¼ÐµÐ½ÑŽ, Ð°Ð»Ðµ Ð½Ðµ Ñƒ Ñ�Ñ‚Ñ€ÑƒÐºÑ‚ÑƒÑ€Ñ– Ñ€Ð¾Ð·Ð´Ñ–Ð»Ñ–Ð²"
  
! #: tp/Texinfo/Structuring.pm:786
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
  msgstr "Ð²ÐºÐ°Ð·Ñ–Ð²Ð½Ð¸Ðº %s, Â«%sÂ», (Ð´Ð»Ñ� Ð²ÑƒÐ·Ð»Ð° Â«%sÂ») Ð²Ñ–Ð´Ñ€Ñ–Ð·Ð½Ñ�Ñ”Ñ‚ÑŒÑ�Ñ� Ð²Ñ–Ð´ Ð½Ð°Ð·Ð²Ð¸ %s, Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:810
  #, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%s Ð¿Ð¾Ñ�Ð¸Ð»Ð°Ñ”Ñ‚ÑŒÑ�Ñ� Ð½Ð° Ð²Ñ–Ð´Ñ�ÑƒÑ‚Ð½Ñ–Ð¹ Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:829
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
  msgstr "Ð²ÑƒÐ·Ð¾Ð» `%s' Ð½Ðµ Ð¼Ð°Ñ” Ð¿ÑƒÐ½ÐºÑ‚Ñƒ Ð¼ÐµÐ½ÑŽ Ð´Ð»Ñ� `%s', Ñ…Ð¾Ñ‡Ð° Ð¹ Ñ” Ð¹Ð¾Ð³Ð¾ Ð³Ð¾Ñ€Ñ–ÑˆÐ½Ñ–Ð¼ Ð²ÑƒÐ·Ð»Ð¾Ð¼"
  
! #: tp/Texinfo/Structuring.pm:837
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
***************
*** 3117,3121 ****
  msgstr "@%s Ð´Ð¾ Â«%sÂ», Ð²Ñ–Ð´Ñ€Ñ–Ð·Ð½Ñ�Ñ”Ñ‚ÑŒÑ�Ñ� Ð²Ñ–Ð´ Ð½Ð°Ð·Ð²Ð¸ %s, Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:2070
  #, perl-format
  msgid "empty index key in @%s"
--- 3113,3117 ----
  msgstr "@%s Ð´Ð¾ Â«%sÂ», Ð²Ñ–Ð´Ñ€Ñ–Ð·Ð½Ñ�Ñ”Ñ‚ÑŒÑ�Ñ� Ð²Ñ–Ð´ Ð½Ð°Ð·Ð²Ð¸ %s, Â«%sÂ»"
  
! #: tp/Texinfo/Structuring.pm:2067
  #, perl-format
  msgid "empty index key in @%s"
***************
*** 3665,3669 ****
  msgstr "Ð¡Ð¿Ñ€Ð¾Ð±ÑƒÐ¹Ñ‚Ðµ `%s --help', Ñ‰Ð¾Ð± Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ Ð±Ñ–Ð»ÑŒÑˆÐµ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ—.\n"
  
! #: tp/texi2any.pl:1232
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
--- 3661,3665 ----
  msgstr "Ð¡Ð¿Ñ€Ð¾Ð±ÑƒÐ¹Ñ‚Ðµ `%s --help', Ñ‰Ð¾Ð± Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ Ð±Ñ–Ð»ÑŒÑˆÐµ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ—.\n"
  
! #: tp/texi2any.pl:1239
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
***************
*** 3671,3675 ****
  "Ñ€Ð¾Ð·Ð´Ñ–Ð»Ñƒ?"
  
! #: tp/texi2any.pl:1255
  #, perl-format
  msgid "error on closing macro expand file %s: %s\n"
--- 3667,3671 ----
  "Ñ€Ð¾Ð·Ð´Ñ–Ð»Ñƒ?"
  
! #: tp/texi2any.pl:1262
  #, perl-format
  msgid "error on closing macro expand file %s: %s\n"
***************
*** 3677,3686 ****
  "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ� Ñ�Ð¿Ñ€Ð¾Ð±Ð¸ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ� Ð¼Ð°ÐºÑ€Ð¾Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½ÑŒ %s: %s\n"
  
! #: tp/texi2any.pl:1261
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾Ñ�Ñ� Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s Ð´Ð»Ñ� Ð·Ð°Ð¿Ð¸Ñ�Ñƒ: %s\n"
  
! #: tp/texi2any.pl:1286
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
--- 3673,3682 ----
  "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ� Ñ�Ð¿Ñ€Ð¾Ð±Ð¸ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ� Ð¼Ð°ÐºÑ€Ð¾Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½ÑŒ %s: %s\n"
  
! #: tp/texi2any.pl:1268
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾Ñ�Ñ� Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s Ð´Ð»Ñ� Ð·Ð°Ð¿Ð¸Ñ�Ñƒ: %s\n"
  
! #: tp/texi2any.pl:1293
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
***************
*** 3690,3708 ****
  "Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ñ–Ð². Ð�ÐµÐ¼Ð°Ñ” Ñ€Ð¾Ð·Ð´Ñ–Ð»Ñƒ?"
  
! #: tp/texi2any.pl:1359 tp/texi2any.pl:1435
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%s: Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ� Ñ�Ð¿Ñ€Ð¾Ð±Ð¸ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸ %s: %s\n"
  
! #: tp/texi2any.pl:1382 tp/texi2any.pl:1416
  #, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
  msgstr "%s: Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ� Ñ�Ð¿Ñ€Ð¾Ð±Ð¸ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» Ð²Ð½ÑƒÑ‚Ñ€Ñ–ÑˆÐ½Ñ–Ñ… Ð¿Ð¾Ñ�Ð¸Ð»Ð°Ð½ÑŒ %s: %s\n"
  
! #: tp/texi2any.pl:1388 tp/texi2any.pl:1422
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
  msgstr "%s: Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾Ñ�Ñ� Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s Ð´Ð»Ñ� Ð·Ð°Ð¿Ð¸Ñ�Ñƒ Ð´Ð°Ð½Ð¸Ñ…: %s\n"
  
  #~ msgid "--*** Tags out of Date ***"
  #~ msgstr "--*** Ð¢ÐµÒ‘Ð¸ Ð·Ð°Ñ�Ñ‚Ð°Ñ€Ñ–Ð»Ð¸ ***"
--- 3686,3716 ----
  "Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ñ–Ð². Ð�ÐµÐ¼Ð°Ñ” Ñ€Ð¾Ð·Ð´Ñ–Ð»Ñƒ?"
  
! #: tp/texi2any.pl:1366 tp/texi2any.pl:1442
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%s: Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ� Ñ�Ð¿Ñ€Ð¾Ð±Ð¸ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸ %s: %s\n"
  
! #: tp/texi2any.pl:1389 tp/texi2any.pl:1423
  #, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
  msgstr "%s: Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ� Ñ�Ð¿Ñ€Ð¾Ð±Ð¸ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» Ð²Ð½ÑƒÑ‚Ñ€Ñ–ÑˆÐ½Ñ–Ñ… Ð¿Ð¾Ñ�Ð¸Ð»Ð°Ð½ÑŒ %s: %s\n"
  
! #: tp/texi2any.pl:1395 tp/texi2any.pl:1429
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
  msgstr "%s: Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾Ñ�Ñ� Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s Ð´Ð»Ñ� Ð·Ð°Ð¿Ð¸Ñ�Ñƒ Ð´Ð°Ð½Ð¸Ñ…: %s\n"
  
+ #~ msgid "-%s---Info: %s, %ld lines --%s--"
+ #~ msgstr "-%s---Info: %s, %ld Ñ€Ñ�Ð´ÐºÑ–Ð² --%s--"
+ 
+ #~ msgid "-%s---Info: (%s)%s, %ld lines --%s--"
+ #~ msgstr "-%s---Info: (%s)%s, %ld Ñ€Ñ�Ð´ÐºÑ–Ð² --%s--"
+ 
+ #~ msgid "No file given for node '%s'."
+ #~ msgstr "Ð”Ð»Ñ� Ð²ÑƒÐ·Ð»Ð° Â«%sÂ» Ð½Ðµ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾ Ñ„Ð°Ð¹Ð»Ð°."
+ 
+ #~ msgid "argument for @U exceeds size of integer: %s"
+ #~ msgstr "Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ @U Ð¿ÐµÑ€ÐµÐ²Ð¸Ñ‰ÑƒÑ” Ð·Ð° Ñ€Ð¾Ð·Ð¼Ñ–Ñ€Ð¾Ð¼ Ñ€Ð¾Ð·Ð¼Ñ–Ñ€ Ñ†Ñ–Ð»Ð¾Ð³Ð¾ Ñ‡Ð¸Ñ�Ð»Ð°: %s"
+ 
  #~ msgid "--*** Tags out of Date ***"
  #~ msgstr "--*** Ð¢ÐµÒ‘Ð¸ Ð·Ð°Ñ�Ñ‚Ð°Ñ€Ñ–Ð»Ð¸ ***"
Binary files texinfo-6.1/po/vi.gmo and texinfo-6.3/po/vi.gmo differ
diff -Nrc2 texinfo-6.1/po/vi.po texinfo-6.3/po/vi.po
*** texinfo-6.1/po/vi.po	2016-02-06 11:35:56.000000000 +0000
--- texinfo-6.3/po/vi.po	2016-09-10 12:45:57.000000000 +0100
***************
*** 1,15 ****
  # Vietnamese translation for TexInfo.
  # Báº£n dá»‹ch tiáº¿ng Viá»‡t dÃ nh cho TexInfo.
! # Copyright Â© 2015 Free Software Foundation, Inc.
  # This file is distributed under the same license as the texinfo package.
  # Clytie Siddall <clytie@riverland.net.au>, 2006-2009.
! # Tráº§n Ngá»�c QuÃ¢n <vnwildman@gmail.com>, 2012-2013, 2015.
  #
  msgid ""
  msgstr ""
! "Project-Id-Version: texinfo 6.0.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
! "PO-Revision-Date: 2015-12-23 07:25+0700\n"
  "Last-Translator: Tráº§n Ngá»�c QuÃ¢n <vnwildman@gmail.com>\n"
  "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
--- 1,15 ----
  # Vietnamese translation for TexInfo.
  # Báº£n dá»‹ch tiáº¿ng Viá»‡t dÃ nh cho TexInfo.
! # Copyright Â© 2016 Free Software Foundation, Inc.
  # This file is distributed under the same license as the texinfo package.
  # Clytie Siddall <clytie@riverland.net.au>, 2006-2009.
! # Tráº§n Ngá»�c QuÃ¢n <vnwildman@gmail.com>, 2012-2013, 2015, 2016.
  #
  msgid ""
  msgstr ""
! "Project-Id-Version: texinfo 6.1.92\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:45+0100\n"
! "PO-Revision-Date: 2016-09-09 14:23+0700\n"
  "Last-Translator: Tráº§n Ngá»�c QuÃ¢n <vnwildman@gmail.com>\n"
  "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
***************
*** 18,21 ****
--- 18,22 ----
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
+ "X-Bugs: Report translation errors to the Language-Team address.\n"
  "Language-Team-Website: <http://translationproject.org/team/vi.html>\n"
  "Plural-Forms: nplurals=1; plural=0;\n"
***************
*** 116,121 ****
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [ or [^"
! msgstr "CÃ³ má»™t kÃ½ tá»± â€œ[â€� hay â€œ[^â€� láº» Ä‘Ã´i"
  
  #: gnulib/lib/regcomp.c:159
--- 117,122 ----
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [, [^, [:, [., or [="
! msgstr "CÃ³ má»™t kÃ½ tá»± [, [^, [:, [., hay [= láº» Ä‘Ã´i"
  
  #: gnulib/lib/regcomp.c:159
***************
*** 155,159 ****
  msgstr "CÃ³ má»™t kÃ½ tá»± â€œ)â€� hay â€œ\\)â€� láº» Ä‘Ã´i"
  
! #: gnulib/lib/regcomp.c:711
  msgid "No previous regular expression"
  msgstr "KhÃ´ng cÃ³ biá»ƒu thá»©c chÃ­nh quy Ä‘i trÆ°á»›c"
--- 156,160 ----
  msgstr "CÃ³ má»™t kÃ½ tá»± â€œ)â€� hay â€œ\\)â€� láº» Ä‘Ã´i"
  
! #: gnulib/lib/regcomp.c:687
  msgid "No previous regular expression"
  msgstr "KhÃ´ng cÃ³ biá»ƒu thá»©c chÃ­nh quy Ä‘i trÆ°á»›c"
***************
*** 307,311 ****
  msgstr "---------- CÆ°á»›c chÃº -----------"
  
! #: info/indices.c:123 info/indices.c:812
  #, c-format
  msgid "Finding index entries..."
--- 308,312 ----
  msgstr "---------- CÆ°á»›c chÃº -----------"
  
! #: info/indices.c:123 info/indices.c:822
  #, c-format
  msgid "Finding index entries..."
***************
*** 316,320 ****
  msgstr "Tra tÃ¬m chuá»—i trong chá»‰ má»¥c cho táº­p tin nÃ y"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:818
  #, c-format
  msgid "No indices found."
--- 317,321 ----
  msgstr "Tra tÃ¬m chuá»—i trong chá»‰ má»¥c cho táº­p tin nÃ y"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:828
  #, c-format
  msgid "No indices found."
***************
*** 347,351 ****
  msgstr "KhÃ´ng cÃ³ thÃªm má»¥c nÃ o trong má»¥c lá»¥c cÃ³ chá»©a â€œ%sâ€�."
  
! #: info/indices.c:476 info/indices.c:880
  #, c-format
  msgid "No index entries containing '%s'."
--- 348,352 ----
  msgstr "KhÃ´ng cÃ³ thÃªm má»¥c nÃ o trong má»¥c lá»¥c cÃ³ chá»©a â€œ%sâ€�."
  
! #: info/indices.c:476 info/indices.c:890
  #, c-format
  msgid "No index entries containing '%s'."
***************
*** 354,363 ****
  # Type: text
  # Description
! #: info/indices.c:583
  #, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "Ä�ang quÃ©t cÃ¡c chá»‰ má»¥c cá»§a â€œ%sâ€�â€¦"
  
! #: info/indices.c:636
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
--- 355,364 ----
  # Type: text
  # Description
! #: info/indices.c:586
  #, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "Ä�ang quÃ©t cÃ¡c chá»‰ má»¥c cá»§a â€œ%sâ€�â€¦"
  
! #: info/indices.c:646
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr ""
***************
*** 365,382 ****
  "Ä‘Æ¡n"
  
! #: info/indices.c:644 info/indices.c:646
  msgid "Index apropos"
  msgstr "Chá»‰ má»¥c apropos"
  
! #: info/indices.c:688
  #, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "CÃ¡c má»¥c cÃ³ chá»©a â€œ%sâ€�:\n"
  
! #: info/indices.c:797
  msgid "List all matches of a string in the index"
  msgstr "Liá»‡t kÃª táº¥t cáº£ cÃ¡c chuá»—i khá»›p trong báº£ng má»¥c lá»¥c"
  
! #: info/indices.c:824 info/indices.c:826
  msgid "Index topic"
  msgstr "Má»¥c lá»¥c theo chá»§ Ä‘á»�"
--- 366,383 ----
  "Ä‘Æ¡n"
  
! #: info/indices.c:654 info/indices.c:656
  msgid "Index apropos"
  msgstr "Chá»‰ má»¥c apropos"
  
! #: info/indices.c:698
  #, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "CÃ¡c má»¥c cÃ³ chá»©a â€œ%sâ€�:\n"
  
! #: info/indices.c:807
  msgid "List all matches of a string in the index"
  msgstr "Liá»‡t kÃª táº¥t cáº£ cÃ¡c chuá»—i khá»›p trong báº£ng má»¥c lá»¥c"
  
! #: info/indices.c:834 info/indices.c:836
  msgid "Index topic"
  msgstr "Má»¥c lá»¥c theo chá»§ Ä‘á»�"
***************
*** 387,441 ****
  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:892
  #, c-format
  msgid "Error converting file character encoding."
  msgstr "Gáº·p lá»—i khi chuyá»ƒn Ä‘á»•i bá»™ mÃ£ kÃ½ tá»± táº­p tin."
  
! #: info/info.c:222 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "KhÃ´ng cÃ³ má»¥c trÃ¬nh Ä‘Æ¡n â€œ%sâ€� trong nÃºt â€œ%sâ€�."
  
! #: info/info.c:315
! #, c-format
! msgid "No file given for node '%s'."
! msgstr "ChÆ°a chá»‰ ra táº­p tin cho nÃºt â€œ%sâ€�"
! 
! #: info/info.c:364 info/info.c:1133
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr "KhÃ´ng thá»ƒ tÃ¬m tháº¥y nÃºt thÃ´ng tin â€œ%sâ€�."
  
! #: info/info.c:386
  #, c-format
  msgid "No program name given."
  msgstr "ChÆ°a Ä‘Æ°a ra tÃªn chÆ°Æ¡ng trÃ¬nh."
  
! #: info/info.c:577
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "con sá»‘ khÃ´ng há»£p lá»‡: %s\n"
  
! #: info/info.c:757
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "gÃ¡n biáº¿n sai dáº¡ng: %s"
  
! #: info/info.c:764 info/infokey.c:537
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: khÃ´ng cÃ³ biáº¿n nhÆ° tháº¿"
  
! #: info/info.c:770 info/infokey.c:539
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "giÃ¡ trá»‹ %s lÃ  khÃ´ng há»£p lá»‡ vá»›i biáº¿n %s"
  
! #: info/info.c:782
  #, c-format
  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:804 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
--- 388,437 ----
  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:879
  #, c-format
  msgid "Error converting file character encoding."
  msgstr "Gáº·p lá»—i khi chuyá»ƒn Ä‘á»•i bá»™ mÃ£ kÃ½ tá»± táº­p tin."
  
! #: info/info.c:279 info/session.c:2789
  #, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "KhÃ´ng cÃ³ má»¥c trÃ¬nh Ä‘Æ¡n â€œ%sâ€� trong nÃºt â€œ%sâ€�."
  
! #: info/info.c:416 info/info.c:1148
  #, c-format
  msgid "Cannot find node '%s'."
  msgstr "KhÃ´ng thá»ƒ tÃ¬m tháº¥y nÃºt thÃ´ng tin â€œ%sâ€�."
  
! #: info/info.c:438
  #, c-format
  msgid "No program name given."
  msgstr "ChÆ°a Ä‘Æ°a ra tÃªn chÆ°Æ¡ng trÃ¬nh."
  
! #: info/info.c:636
  #, c-format
  msgid "invalid number: %s\n"
  msgstr "con sá»‘ khÃ´ng há»£p lá»‡: %s\n"
  
! #: info/info.c:816
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr "gÃ¡n biáº¿n sai dáº¡ng: %s"
  
! #: info/info.c:823 info/infokey.c:540
  #, c-format
  msgid "%s: no such variable"
  msgstr "%s: khÃ´ng cÃ³ biáº¿n nhÆ° tháº¿"
  
! #: info/info.c:829 info/infokey.c:542
  #, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "giÃ¡ trá»‹ %s lÃ  khÃ´ng há»£p lá»‡ vá»›i biáº¿n %s"
  
! #: info/info.c:841
  #, c-format
  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:860 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
***************
*** 452,461 ****
  "KHÃ”NG CÃ“ Báº¢O HÃ€NH GÃŒ Cáº¢, vá»›i Ä‘iá»�u kiá»‡n Ä‘Æ°á»£c phÃ¡p luáº­t cho phÃ©p.\n"
  
! #: info/info.c:981
  #, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "khÃ´ng tÃ¬m tháº¥y chá»‰ má»¥c cho â€œ%sâ€�\n"
  
! #: info/info.c:1034
  #, c-format
  msgid ""
--- 448,457 ----
  "KHÃ”NG CÃ“ Báº¢O HÃ€NH GÃŒ Cáº¢, vá»›i Ä‘iá»�u kiá»‡n Ä‘Æ°á»£c phÃ¡p luáº­t cho phÃ©p.\n"
  
! #: info/info.c:999
  #, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "khÃ´ng tÃ¬m tháº¥y chá»‰ má»¥c cho â€œ%sâ€�\n"
  
! #: info/info.c:1049
  #, c-format
  msgid ""
***************
*** 468,472 ****
  "Ä�á»�c tÃ i liá»‡u hÆ°á»›ng dáº«n theo Ä‘á»‹nh dáº¡ng Info.\n"
  
! #: info/info.c:1040
  msgid ""
  "Options:\n"
--- 464,468 ----
  "Ä�á»�c tÃ i liá»‡u hÆ°á»›ng dáº«n theo Ä‘á»‹nh dáº¡ng Info.\n"
  
! #: info/info.c:1055
  msgid ""
  "Options:\n"
***************
*** 485,489 ****
  "  -f, --file=Táº¬P_TIN           chá»‰ Ä‘á»‹nh pháº§n hÆ°á»›ng dáº«n Info muá»‘n xem."
  
! #: info/info.c:1048
  msgid ""
  "  -h, --help                   display this help and exit.\n"
--- 481,485 ----
  "  -f, --file=Táº¬P_TIN           chá»‰ Ä‘á»‹nh pháº§n hÆ°á»›ng dáº«n Info muá»‘n xem."
  
! #: info/info.c:1063
  msgid ""
  "  -h, --help                   display this help and exit.\n"
***************
*** 498,502 ****
  "  -o, --output=Táº¬P_TIN         xuáº¥t cÃ¡c nÃºt Ä‘Ã£ chá»�n vÃ o táº­p tin nÃ y."
  
! #: info/info.c:1054
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
--- 494,498 ----
  "  -o, --output=Táº¬P_TIN         xuáº¥t cÃ¡c nÃºt Ä‘Ã£ chá»�n vÃ o táº­p tin nÃ y."
  
! #: info/info.c:1069
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
***************
*** 510,519 ****
  "  -O, --show-options, --usage  Ä‘i tá»›i nÃºt chá»©a cÃ¡c tÃ¹y chá»�n dÃ²ng lá»‡nh."
  
! #: info/info.c:1061
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr ""
  "  -b, --speech-friendly        thÃ¢n thiá»‡n vá»›i thiáº¿t bá»‹ tá»•ng há»£p tiáº¿ng nÃ³i."
  
! #: info/info.c:1065
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
--- 506,515 ----
  "  -O, --show-options, --usage  Ä‘i tá»›i nÃºt chá»©a cÃ¡c tÃ¹y chá»�n dÃ²ng lá»‡nh."
  
! #: info/info.c:1076
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr ""
  "  -b, --speech-friendly        thÃ¢n thiá»‡n vá»›i thiáº¿t bá»‹ tá»•ng há»£p tiáº¿ng nÃ³i."
  
! #: info/info.c:1080
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
***************
*** 535,539 ****
  "  -x, --debug=Sá»�               Ä‘áº·t má»©c gá»¡ lá»—i (-1 lÃ  táº¥t cáº£).\n"
  
! #: info/info.c:1074
  msgid ""
  "\n"
--- 531,535 ----
  "  -x, --debug=Sá»�               Ä‘áº·t má»©c gá»¡ lá»—i (-1 lÃ  táº¥t cáº£).\n"
  
! #: info/info.c:1089
  msgid ""
  "\n"
***************
*** 546,550 ****
  "\n"
  "Ä�á»‘i sá»‘ Ä‘áº§u tiÃªn khÃ´ng pháº£i tÃ¹y chá»�n, náº¿u cÃ³, lÃ  má»¥c trÃ¬nh Ä‘Æ¡n tá»« Ä‘Ã³ cáº§n báº¯t "
! "Ä‘áº§u ;\n"
  "NÃ³ Ä‘Æ°á»£c tÃ¬m kiáº¿m trong má»�i táº­p tin â€œdirâ€� (thÆ° má»¥c) trÃªn Ä‘Æ°á»�ng dáº«n INFOPATH.\n"
  "KhÃ´ng cÃ³ thÃ¬ Info trá»™n táº¥t cáº£ cÃ¡c táº­p tin â€œdirâ€� rá»“i hiá»ƒn thá»‹ káº¿t quáº£.\n"
--- 542,546 ----
  "\n"
  "Ä�á»‘i sá»‘ Ä‘áº§u tiÃªn khÃ´ng pháº£i tÃ¹y chá»�n, náº¿u cÃ³, lÃ  má»¥c trÃ¬nh Ä‘Æ¡n tá»« Ä‘Ã³ cáº§n báº¯t "
! "Ä‘áº§u;\n"
  "NÃ³ Ä‘Æ°á»£c tÃ¬m kiáº¿m trong má»�i táº­p tin â€œdirâ€� (thÆ° má»¥c) trÃªn Ä‘Æ°á»�ng dáº«n INFOPATH.\n"
  "KhÃ´ng cÃ³ thÃ¬ Info trá»™n táº¥t cáº£ cÃ¡c táº­p tin â€œdirâ€� rá»“i hiá»ƒn thá»‹ káº¿t quáº£.\n"
***************
*** 552,556 ****
  "tÆ°Æ¡ng Ä‘á»‘i vá»›i nÃºt Ä‘áº§u tiÃªn Ä‘Æ°á»£c thÄƒm."
  
! #: info/info.c:1081
  msgid ""
  "\n"
--- 548,552 ----
  "tÆ°Æ¡ng Ä‘á»‘i vá»›i nÃºt Ä‘áº§u tiÃªn Ä‘Æ°á»£c thÄƒm."
  
! #: info/info.c:1096
  msgid ""
  "\n"
***************
*** 560,564 ****
  "Ä�á»ƒ xem báº£n tÃ³m táº¯t cÃ¡c tá»• há»£p phÃ­m, hÃ£y gÃµ â€œHâ€� bÃªn trong Info."
  
! #: info/info.c:1084
  msgid ""
  "\n"
--- 556,560 ----
  "Ä�á»ƒ xem báº£n tÃ³m táº¯t cÃ¡c tá»• há»£p phÃ­m, hÃ£y gÃµ â€œHâ€� bÃªn trong Info."
  
! #: info/info.c:1099
  msgid ""
  "\n"
***************
*** 576,580 ****
  msgstr ""
  "\n"
! "VÃ­ dá»¥ :\n"
  "  info                       hiá»ƒn thá»‹ trÃ¬nh Ä‘Æ¡n thÆ° má»¥c cáº¥p cao nháº¥t (Ä‘á»‰nh)\n"
  "  info info                  hiá»ƒn thá»‹ sá»• tay chung cho trÃ¬nh Ä‘á»�c Info\n"
--- 572,576 ----
  msgstr ""
  "\n"
! "VÃ­ dá»¥:\n"
  "  info                       hiá»ƒn thá»‹ trÃ¬nh Ä‘Æ¡n thÆ° má»¥c cáº¥p cao nháº¥t (Ä‘á»‰nh)\n"
  "  info info                  hiá»ƒn thá»‹ sá»• tay chung cho trÃ¬nh Ä‘á»�c Info\n"
***************
*** 584,595 ****
  "  info emacs -n Files        báº¯t Ä‘áº§u táº¡i nÃºt Files náº±m bÃªn trong sá»• tay "
  "hÆ°á»›ng dáº«n emacs\n"
! "  info â€œ(emacs)Filesâ€�        cÃ¡ch thay tháº¿ Ä‘á»ƒ báº¯t Ä‘áº§u táº¡i nÃºt  Files\n"
  "  info --show-options emacs  báº¯t Ä‘áº§u á»Ÿ nÃºt chá»©a cÃ¡c tÃ¹y chá»�n dÃ²ng lá»‡nh cá»§a "
  "emacs\n"
! "  info --subnodes -o out.txt emacs  Ä‘á»• toÃ n bá»™ sá»• tay vÃ o táº­p tin â€œout.txtâ€�\n"
  "  info -f ./foo.info         hiá»ƒn thá»‹ táº­p tin â€œ./foo.infoâ€�, khÃ´ng tÃ¬m kiáº¿m "
  "thÆ° má»¥c"
  
! #: info/info.c:1099 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
--- 580,591 ----
  "  info emacs -n Files        báº¯t Ä‘áº§u táº¡i nÃºt Files náº±m bÃªn trong sá»• tay "
  "hÆ°á»›ng dáº«n emacs\n"
! "  info '(emacs)Files'        cÃ¡ch thay tháº¿ Ä‘á»ƒ báº¯t Ä‘áº§u táº¡i nÃºt Files\n"
  "  info --show-options emacs  báº¯t Ä‘áº§u á»Ÿ nÃºt chá»©a cÃ¡c tÃ¹y chá»�n dÃ²ng lá»‡nh cá»§a "
  "emacs\n"
! "  info --subnodes -o out.txt emacs Ä‘á»• toÃ n bá»™ sá»• tay vÃ o táº­p tin â€œout.txtâ€�\n"
  "  info -f ./foo.info         hiá»ƒn thá»‹ táº­p tin â€œ./foo.infoâ€�, khÃ´ng tÃ¬m kiáº¿m "
  "thÆ° má»¥c"
  
! #: info/info.c:1114 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
***************
*** 602,666 ****
  "Trang chá»§ texinfo: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1134
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "KhÃ´ng thá»ƒ tÃ¬m tháº¥y nÃºt thÃ´ng tin â€œ(%s)%sâ€�."
  
! #: info/info.c:1135
  msgid "Cannot find a window!"
  msgstr "KhÃ´ng tÃ¬m tháº¥y cá»­a sá»•!"
  
! #: info/info.c:1136
  msgid "Point doesn't appear within this window's node!"
  msgstr "Ä�iá»ƒm khÃ´ng xuáº¥t hiá»‡n bÃªn trong cÃ¡i nÃºt thÃ´ng tin cá»§a cá»­a sá»• nÃ y."
  
! #: info/info.c:1137
  msgid "Cannot delete the last window."
  msgstr "KhÃ´ng thá»ƒ xÃ³a cá»­a sá»• cuá»‘i cÃ¹ng."
  
! #: info/info.c:1138
  msgid "No menu in this node."
  msgstr "KhÃ´ng cÃ³ trÃ¬nh Ä‘Æ¡n trong nÃºt thÃ´ng tin nÃ y."
  
! #: info/info.c:1139
  msgid "No footnotes in this node."
  msgstr "KhÃ´ng cÃ³ cÆ°á»›c chÃº trong nÃºt thÃ´ng tin nÃ y."
  
! #: info/info.c:1140
  msgid "No cross references in this node."
  msgstr "KhÃ´ng cÃ³ tham chiáº¿u chÃ©o trong nÃºt thÃ´ng tin nÃ y."
  
! #: info/info.c:1141
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr "KhÃ´ng cÃ³ con trá»� â€œ%sâ€� cho nÃºt nÃ y."
  
! #: info/info.c:1142
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "KhÃ´ng nháº­n ra lá»‡nh Info â€œ%câ€�; hÃ£y thá»­ lá»‡nh â€œ?â€� Ä‘á»ƒ xem trá»£ giÃºp."
  
! #: info/info.c:1143
  #, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "Thiáº¿t bá»‹ cuá»‘i kiá»ƒu â€œ%sâ€� khÃ´ng Ä‘á»§ khÃ©o Ä‘á»ƒ cháº¡y Info."
  
! #: info/info.c:1144
  msgid "You are already at the last page of this node."
  msgstr "Báº¡n á»Ÿ trang cuá»‘i cÃ¹ng cá»§a nÃºt thÃ´ng tin nÃ y."
  
! #: info/info.c:1145
  msgid "You are already at the first page of this node."
  msgstr "Báº¡n á»Ÿ trang Ä‘áº§u tiÃªn cá»§a nÃºt thÃ´ng tin nÃ y."
  
! #: info/info.c:1146
  msgid "Only one window."
  msgstr "Chá»‰ má»™t cá»­a sá»•."
  
! #: info/info.c:1147
  msgid "Resulting window would be too small."
  msgstr "Cá»­a sá»• káº¿t quáº£ quÃ¡ nhá»�."
  
! #: info/info.c:1148
  msgid "Not enough room for a help window, please delete a window."
  msgstr "KhÃ´ng Ä‘á»§ chá»— cho cá»­a sá»• trá»£ giÃºp: hÃ£y xÃ³a má»™t cá»­a sá»•."
--- 598,662 ----
  "Trang chá»§ texinfo: http://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1149
  #, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "KhÃ´ng thá»ƒ tÃ¬m tháº¥y nÃºt thÃ´ng tin â€œ(%s)%sâ€�."
  
! #: info/info.c:1150
  msgid "Cannot find a window!"
  msgstr "KhÃ´ng tÃ¬m tháº¥y cá»­a sá»•!"
  
! #: info/info.c:1151
  msgid "Point doesn't appear within this window's node!"
  msgstr "Ä�iá»ƒm khÃ´ng xuáº¥t hiá»‡n bÃªn trong cÃ¡i nÃºt thÃ´ng tin cá»§a cá»­a sá»• nÃ y."
  
! #: info/info.c:1152
  msgid "Cannot delete the last window."
  msgstr "KhÃ´ng thá»ƒ xÃ³a cá»­a sá»• cuá»‘i cÃ¹ng."
  
! #: info/info.c:1153
  msgid "No menu in this node."
  msgstr "KhÃ´ng cÃ³ trÃ¬nh Ä‘Æ¡n trong nÃºt thÃ´ng tin nÃ y."
  
! #: info/info.c:1154
  msgid "No footnotes in this node."
  msgstr "KhÃ´ng cÃ³ cÆ°á»›c chÃº trong nÃºt thÃ´ng tin nÃ y."
  
! #: info/info.c:1155
  msgid "No cross references in this node."
  msgstr "KhÃ´ng cÃ³ tham chiáº¿u chÃ©o trong nÃºt thÃ´ng tin nÃ y."
  
! #: info/info.c:1156
  #, c-format
  msgid "No '%s' pointer for this node."
  msgstr "KhÃ´ng cÃ³ con trá»� â€œ%sâ€� cho nÃºt nÃ y."
  
! #: info/info.c:1157
  #, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "KhÃ´ng nháº­n ra lá»‡nh Info â€œ%câ€�; hÃ£y thá»­ lá»‡nh â€œ?â€� Ä‘á»ƒ xem trá»£ giÃºp."
  
! #: info/info.c:1158
  #, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "Thiáº¿t bá»‹ cuá»‘i kiá»ƒu â€œ%sâ€� khÃ´ng Ä‘á»§ khÃ©o Ä‘á»ƒ cháº¡y Info."
  
! #: info/info.c:1159
  msgid "You are already at the last page of this node."
  msgstr "Báº¡n á»Ÿ trang cuá»‘i cÃ¹ng cá»§a nÃºt thÃ´ng tin nÃ y."
  
! #: info/info.c:1160
  msgid "You are already at the first page of this node."
  msgstr "Báº¡n á»Ÿ trang Ä‘áº§u tiÃªn cá»§a nÃºt thÃ´ng tin nÃ y."
  
! #: info/info.c:1161
  msgid "Only one window."
  msgstr "Chá»‰ má»™t cá»­a sá»•."
  
! #: info/info.c:1162
  msgid "Resulting window would be too small."
  msgstr "Cá»­a sá»• káº¿t quáº£ quÃ¡ nhá»�."
  
! #: info/info.c:1163
  msgid "Not enough room for a help window, please delete a window."
  msgstr "KhÃ´ng Ä‘á»§ chá»— cho cá»­a sá»• trá»£ giÃºp: hÃ£y xÃ³a má»™t cá»­a sá»•."
***************
*** 933,967 ****
  msgstr "hÃ nh Ä‘á»™ng láº¡ â€œ%sâ€�"
  
! #: info/infokey.c:482
  #, c-format
  msgid "action name too long"
  msgstr "tÃªn hÃ nh Ä‘á»™ng quÃ¡ dÃ i"
  
! #: info/infokey.c:495
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "cÃ³ kÃ½ tá»± thÃªm náº±m sau hÃ nh Ä‘á»™ng â€œ%sâ€�"
  
! #: info/infokey.c:506
  #, c-format
  msgid "missing variable name"
  msgstr "thiáº¿u tÃªn biáº¿n"
  
! #: info/infokey.c:515
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "thiáº¿u kÃ½ tá»± báº±ng â€œ=â€� ngay sau tÃªn biáº¿n"
  
! #: info/infokey.c:522
  #, c-format
  msgid "variable name too long"
  msgstr "tÃªn biáº¿n quÃ¡ dÃ i"
  
! #: info/infokey.c:546
  #, c-format
  msgid "value too long"
  msgstr "giÃ¡ trá»‹ quÃ¡ dÃ i"
  
! #: info/infokey.c:592
  #, c-format
  msgid "\"%s\", line %u: "
--- 929,963 ----
  msgstr "hÃ nh Ä‘á»™ng láº¡ â€œ%sâ€�"
  
! #: info/infokey.c:485
  #, c-format
  msgid "action name too long"
  msgstr "tÃªn hÃ nh Ä‘á»™ng quÃ¡ dÃ i"
  
! #: info/infokey.c:498
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "cÃ³ kÃ½ tá»± thÃªm náº±m sau hÃ nh Ä‘á»™ng â€œ%sâ€�"
  
! #: info/infokey.c:509
  #, c-format
  msgid "missing variable name"
  msgstr "thiáº¿u tÃªn biáº¿n"
  
! #: info/infokey.c:518
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "thiáº¿u kÃ½ tá»± báº±ng â€œ=â€� ngay sau tÃªn biáº¿n"
  
! #: info/infokey.c:525
  #, c-format
  msgid "variable name too long"
  msgstr "tÃªn biáº¿n quÃ¡ dÃ i"
  
! #: info/infokey.c:549
  #, c-format
  msgid "value too long"
  msgstr "giÃ¡ trá»‹ quÃ¡ dÃ i"
  
! #: info/infokey.c:595
  #, c-format
  msgid "\"%s\", line %u: "
***************
*** 1292,1423 ****
  msgstr "KhÃ´ng tÃ¬m tháº¥y nÃºt Ä‘Æ°á»£c tham chiáº¿u bá»Ÿi â€œ%sâ€� trong â€œ%sâ€�."
  
! #: info/session.c:2864
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "Ä�á»�c danh sÃ¡ch cÃ¡c trÃ¬nh Ä‘Æ¡n báº¯t Ä‘áº§u tá»« â€œthÆ° má»¥câ€� vÃ  theo chÃºng"
  
! #: info/session.c:2866
  msgid "Follow menus: "
  msgstr "Theo trÃ¬nh Ä‘Æ¡n: "
  
! #: info/session.c:2971
  msgid "Select the Next node"
  msgstr "Chá»�n nÃºt Káº¿"
  
! #: info/session.c:2978
  msgid "Select the Prev node"
  msgstr "Chá»�n nÃºt LÃ¹i"
  
! #: info/session.c:2985
  msgid "Select the Up node"
  msgstr "Chá»�n nÃºt LÃªn"
  
! #: info/session.c:2991
  msgid "Select the last node in this file"
  msgstr "Chá»�n nÃºt cuá»‘i trong táº­p tin nÃ y"
  
! #: info/session.c:3018 info/session.c:3051
  msgid "This window has no additional nodes"
  msgstr "Cá»­a sá»• nÃ y khÃ´ng cÃ³ nÃºt thÃªm"
  
! #: info/session.c:3024
  msgid "Select the first node in this file"
  msgstr "Chá»�n nÃºt Ä‘áº§u trong táº­p tin nÃ y"
  
! #: info/session.c:3158
  msgid "No more nodes within this document."
  msgstr "KhÃ´ng cÃ³ nÃºt ná»¯a trong tÃ i liá»‡u nÃ y."
  
! #: info/session.c:3203 info/session.c:3243
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "KhÃ´ng cÃ³ â€œLÃ¹iâ€� hay â€œLÃªnâ€� cho nÃºt nÃ y trong tÃ i liá»‡u nÃ y."
  
! #: info/session.c:3256
  msgid "Move forwards or down through node structure"
  msgstr "Chuyá»ƒn tá»›i hay xuá»‘ng qua cáº¥u trÃºc nÃºt"
  
! #: info/session.c:3273
  msgid "Move backwards or up through node structure"
  msgstr "Chuyá»ƒn lÃ¹i hay lÃªn qua cáº¥u trÃºc nÃºt"
  
! #: info/session.c:3296
  msgid "Read a node name and select it"
  msgstr "Ä�á»�c tÃªn nÃºt vÃ  chá»�n nÃ³"
  
! #: info/session.c:3350 info/session.c:3354
  msgid "Goto node: "
  msgstr "Tá»›i nÃºt: "
  
! #: info/session.c:3533
  msgid "Find the node describing program invocation"
  msgstr "TÃ¬m nÃºt diá»…n táº£ cuá»™c gá»�i chÆ°Æ¡ng trÃ¬nh"
  
! #: info/session.c:3535
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "TÃ¬m nÃºt gá»�i cá»§a [%s]: "
  
! #: info/session.c:3580
  msgid "Read a manpage reference and select it"
  msgstr "Ä�á»�c tham chiáº¿u trang hÆ°á»›ng dáº«n (man) vÃ  chá»�n nÃ³"
  
! #: info/session.c:3584
  msgid "Get Manpage: "
  msgstr "Láº¥y trang hÆ°á»›ng dáº«n: "
  
! #: info/session.c:3605
  msgid "Select the node 'Top' in this file"
  msgstr "Chá»�n nÃºt â€œÄ�á»‰nhâ€� trong táº­p tin nÃ y"
  
! #: info/session.c:3611
  msgid "Select the node '(dir)'"
  msgstr "Chá»�n nÃºt â€œ(dir)â€�"
  
! #: info/session.c:3617
  msgid "Show full file name of node being displayed"
  msgstr "Hiá»ƒn thá»‹ tÃªn táº­p tin dáº¡ng Ä‘áº§y Ä‘á»§ cá»§a nÃºt Ä‘ang Ä‘Æ°á»£c hiá»ƒn thá»‹"
  
! #: info/session.c:3634
  msgid "Select the most recently selected node"
  msgstr "Chá»�n nÃºt má»›i chá»�n"
  
! #: info/session.c:3639
  #, c-format
  msgid "No earlier node in history"
  msgstr "KhÃ´ng cÃ³ nÃºt má»›i hÆ¡n trong lá»‹ch sá»­"
  
! #: info/session.c:3643
  msgid "Read the name of a file and select it"
  msgstr "Ä�á»�c tÃªn táº­p tin vÃ  chá»�n nÃ³"
  
! #: info/session.c:3647
  msgid "Find file: "
  msgstr "TÃ¬m táº­p tin: "
  
! #: info/session.c:3664
  #, c-format
  msgid "Cannot find '%s'."
  msgstr "KhÃ´ng tÃ¬m tháº¥y â€œ%sâ€�."
  
! #: info/session.c:3713
  #, c-format
  msgid "Could not create output file '%s'."
  msgstr "KhÃ´ng thá»ƒ táº¡o táº­p tin xuáº¥t â€œ%sâ€�."
  
! #: info/session.c:3727
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "gáº·p lá»—i khi ghi vÃ o â€œ%sâ€�: %s"
  
! #: info/session.c:3736
  #, c-format
  msgid "closing %s"
  msgstr "Ä‘ang Ä‘Ã³ng %s"
  
! #: info/session.c:3785
  #, c-format
  msgid "writing node %s..."
  msgstr "Ä‘ang ghi nÃºt %sâ€¦"
  
! #: info/session.c:3831
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr ""
--- 1288,1419 ----
  msgstr "KhÃ´ng tÃ¬m tháº¥y nÃºt Ä‘Æ°á»£c tham chiáº¿u bá»Ÿi â€œ%sâ€� trong â€œ%sâ€�."
  
! #: info/session.c:2870
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "Ä�á»�c danh sÃ¡ch cÃ¡c trÃ¬nh Ä‘Æ¡n báº¯t Ä‘áº§u tá»« â€œthÆ° má»¥câ€� vÃ  theo chÃºng"
  
! #: info/session.c:2872
  msgid "Follow menus: "
  msgstr "Theo trÃ¬nh Ä‘Æ¡n: "
  
! #: info/session.c:2977
  msgid "Select the Next node"
  msgstr "Chá»�n nÃºt Káº¿"
  
! #: info/session.c:2984
  msgid "Select the Prev node"
  msgstr "Chá»�n nÃºt LÃ¹i"
  
! #: info/session.c:2991
  msgid "Select the Up node"
  msgstr "Chá»�n nÃºt LÃªn"
  
! #: info/session.c:2997
  msgid "Select the last node in this file"
  msgstr "Chá»�n nÃºt cuá»‘i trong táº­p tin nÃ y"
  
! #: info/session.c:3024 info/session.c:3057
  msgid "This window has no additional nodes"
  msgstr "Cá»­a sá»• nÃ y khÃ´ng cÃ³ nÃºt thÃªm"
  
! #: info/session.c:3030
  msgid "Select the first node in this file"
  msgstr "Chá»�n nÃºt Ä‘áº§u trong táº­p tin nÃ y"
  
! #: info/session.c:3164
  msgid "No more nodes within this document."
  msgstr "KhÃ´ng cÃ³ nÃºt ná»¯a trong tÃ i liá»‡u nÃ y."
  
! #: info/session.c:3209 info/session.c:3249
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "KhÃ´ng cÃ³ â€œLÃ¹iâ€� hay â€œLÃªnâ€� cho nÃºt nÃ y trong tÃ i liá»‡u nÃ y."
  
! #: info/session.c:3262
  msgid "Move forwards or down through node structure"
  msgstr "Chuyá»ƒn tá»›i hay xuá»‘ng qua cáº¥u trÃºc nÃºt"
  
! #: info/session.c:3279
  msgid "Move backwards or up through node structure"
  msgstr "Chuyá»ƒn lÃ¹i hay lÃªn qua cáº¥u trÃºc nÃºt"
  
! #: info/session.c:3302
  msgid "Read a node name and select it"
  msgstr "Ä�á»�c tÃªn nÃºt vÃ  chá»�n nÃ³"
  
! #: info/session.c:3356 info/session.c:3360
  msgid "Goto node: "
  msgstr "Tá»›i nÃºt: "
  
! #: info/session.c:3539
  msgid "Find the node describing program invocation"
  msgstr "TÃ¬m nÃºt diá»…n táº£ cuá»™c gá»�i chÆ°Æ¡ng trÃ¬nh"
  
! #: info/session.c:3541
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "TÃ¬m nÃºt gá»�i cá»§a [%s]: "
  
! #: info/session.c:3586
  msgid "Read a manpage reference and select it"
  msgstr "Ä�á»�c tham chiáº¿u trang hÆ°á»›ng dáº«n (man) vÃ  chá»�n nÃ³"
  
! #: info/session.c:3590
  msgid "Get Manpage: "
  msgstr "Láº¥y trang hÆ°á»›ng dáº«n: "
  
! #: info/session.c:3611
  msgid "Select the node 'Top' in this file"
  msgstr "Chá»�n nÃºt â€œÄ�á»‰nhâ€� trong táº­p tin nÃ y"
  
! #: info/session.c:3617
  msgid "Select the node '(dir)'"
  msgstr "Chá»�n nÃºt â€œ(dir)â€�"
  
! #: info/session.c:3623
  msgid "Show full file name of node being displayed"
  msgstr "Hiá»ƒn thá»‹ tÃªn táº­p tin dáº¡ng Ä‘áº§y Ä‘á»§ cá»§a nÃºt Ä‘ang Ä‘Æ°á»£c hiá»ƒn thá»‹"
  
! #: info/session.c:3640
  msgid "Select the most recently selected node"
  msgstr "Chá»�n nÃºt má»›i chá»�n"
  
! #: info/session.c:3645
  #, c-format
  msgid "No earlier node in history"
  msgstr "KhÃ´ng cÃ³ nÃºt má»›i hÆ¡n trong lá»‹ch sá»­"
  
! #: info/session.c:3649
  msgid "Read the name of a file and select it"
  msgstr "Ä�á»�c tÃªn táº­p tin vÃ  chá»�n nÃ³"
  
! #: info/session.c:3653
  msgid "Find file: "
  msgstr "TÃ¬m táº­p tin: "
  
! #: info/session.c:3670
  #, c-format
  msgid "Cannot find '%s'."
  msgstr "KhÃ´ng tÃ¬m tháº¥y â€œ%sâ€�."
  
! #: info/session.c:3719
  #, c-format
  msgid "Could not create output file '%s'."
  msgstr "KhÃ´ng thá»ƒ táº¡o táº­p tin xuáº¥t â€œ%sâ€�."
  
! #: info/session.c:3733
  #, c-format
  msgid "error writing to %s: %s"
  msgstr "gáº·p lá»—i khi ghi vÃ o â€œ%sâ€�: %s"
  
! #: info/session.c:3742
  #, c-format
  msgid "closing %s"
  msgstr "Ä‘ang Ä‘Ã³ng %s"
  
! #: info/session.c:3791
  #, c-format
  msgid "writing node %s..."
  msgstr "Ä‘ang ghi nÃºt %sâ€¦"
  
! #: info/session.c:3837
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr ""
***************
*** 1425,1632 ****
  "lá»‡nh)"
  
! #: info/session.c:3859
  #, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "KhÃ´ng thá»ƒ má»Ÿ á»‘ng dáº«n Ä‘áº¿n â€œ%sâ€�."
  
! #: info/session.c:3864
  #, c-format
  msgid "printing node %s..."
  msgstr "Ä‘ang in nÃºt %sâ€¦"
  
! #: info/session.c:3872
  #, c-format
  msgid "finished printing node %s"
  msgstr "Ä‘Ã£ hoÃ n táº¥t viá»‡c in nÃºt %s"
  
! #: info/session.c:3904
  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."
  
! #: info/session.c:4169
  msgid "Search continued from the end of the document."
  msgstr "Tiáº¿n trÃ¬nh tÃ¬m kiáº¿m Ä‘Ã£ tiáº¿p tá»¥c tá»« cuá»‘i cá»§a tÃ i liá»‡u."
  
! #: info/session.c:4174
  msgid "Search continued from the beginning of the document."
  msgstr "Tiáº¿n trÃ¬nh tÃ¬m kiáº¿m Ä‘Ã£ tiáº¿p tá»¥c tá»« Ä‘áº§u cá»§a tÃ i liá»‡u."
  
! #: info/session.c:4194
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "Ä�ang tÃ¬m kiáº¿m táº­p tin phá»¥ %sâ€¦"
  
! #: info/session.c:4231
  msgid "Search failed."
  msgstr "Gáº·p lá»—i khi tÃ¬m kiáº¿m."
  
! #: info/session.c:4248
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Regexp search"
  msgstr "TÃ¬m kiáº¿m dÃ¹ng biá»ƒu thá»©c chÃ­nh quy"
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Search"
  msgstr "TÃ¬m kiáº¿m"
  
! #: info/session.c:4250 info/session.c:4256
  msgid " case-sensitively"
  msgstr " phÃ¢n biáº¿t chá»¯ hoa/thÆ°á»�ng "
  
! #: info/session.c:4251 info/session.c:4257
  msgid " backward"
  msgstr " ngÆ°á»£c"
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s: "
  
! #: info/session.c:4274
  msgid "Search string too short"
  msgstr "Chuá»—i tÃ¬m kiáº¿m quÃ¡ ngáº¯n"
  
! #: info/session.c:4467
  #, 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:4491 info/session.c:4601
  #, c-format
  msgid "No more matches."
  msgstr "KhÃ´ng tÃ¬m tháº¥y thÃªm ná»¯a."
  
! #: info/session.c:4628
  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."
  
! #: info/session.c:4649
  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:4653 info/session.c:4665
  #, c-format
  msgid "No active search"
  msgstr "KhÃ´ng cÃ³ tÃ¬m kiáº¿m nÃ o hiá»‡n Ä‘ang hoáº¡t Ä‘á»™ng"
  
! #: info/session.c:4661
  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:4674
  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:4679
  msgid "Read a string and search for it"
  msgstr "Ä�á»�c chuá»—i vÃ  tÃ¬m kiáº¿m nÃ³"
  
! #: info/session.c:4685
  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:4693
  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:4701 info/session.c:4746
  msgid "No previous search string"
  msgstr "KhÃ´ng cÃ³ chuá»—i tÃ¬m kiáº¿m trÆ°á»›c"
  
! #: info/session.c:4738
  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:4785
  msgid "Clear displayed search matches"
  msgstr "XÃ³a trÃ¬nh bÃ y khá»›p máº«u"
  
! #: info/session.c:4802 info/session.c:4808
  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:4928
  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:4929
  msgid "I-search backward: "
  msgstr "TÃ¬m kiáº¿m ngÆ°á»£c I: "
  
! #: info/session.c:4931
  msgid "Regexp I-search: "
  msgstr "TÃ¬m kiáº¿m I dÃ¹ng biá»ƒu thá»©c chÃ­nh quy: "
  
! #: info/session.c:4932
  msgid "I-search: "
  msgstr "TÃ¬m kiáº¿m I: "
  
! #: info/session.c:4957 info/session.c:4960
  msgid "Failing "
  msgstr "Ä�ang tháº¥t báº¡i "
  
! #: info/session.c:5326
  msgid "Cancel current operation"
  msgstr "Há»§y thao tÃ¡c Ä‘ang cháº¡y"
  
! #: info/session.c:5333
  msgid "Quit"
  msgstr "ThoÃ¡t"
  
! #: info/session.c:5338
  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:5340
  #, c-format
  msgid "GNU Info version %s"
  msgstr "GNU Info phiÃªn báº£n %s"
  
! #: info/session.c:5345
  msgid "Redraw the display"
  msgstr "Váº½ láº¡i mÃ n hÃ¬nh"
  
! #: info/session.c:5382
  msgid "Quit using Info"
  msgstr "ThoÃ¡t khá»�i Info"
  
! #: info/session.c:5398
  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:5409
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Lá»‡nh láº¡ (%s)."
  
! #: info/session.c:5412
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "â€œ%sâ€� khÃ´ng há»£p lá»‡"
  
! #: info/session.c:5413
  #, c-format
  msgid "'%s' is invalid"
  msgstr "â€œ%sâ€� khÃ´ng há»£p lá»‡"
  
! #: info/session.c:5731
  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:5738
  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)"
--- 1421,1628 ----
  "lá»‡nh)"
  
! #: info/session.c:3865
  #, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "KhÃ´ng thá»ƒ má»Ÿ á»‘ng dáº«n Ä‘áº¿n â€œ%sâ€�."
  
! #: info/session.c:3870
  #, c-format
  msgid "printing node %s..."
  msgstr "Ä‘ang in nÃºt %sâ€¦"
  
! #: info/session.c:3878
  #, c-format
  msgid "finished printing node %s"
  msgstr "Ä‘Ã£ hoÃ n táº¥t viá»‡c in nÃºt %s"
  
! #: info/session.c:3910
  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:3914
  #, 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:3915
  #, c-format
  msgid "Using literal strings for searches."
  msgstr "DÃ¹ng chuá»—i nghÄ©a chá»¯ khi tÃ¬m kiáº¿m."
  
! #: info/session.c:4175
  msgid "Search continued from the end of the document."
  msgstr "Tiáº¿n trÃ¬nh tÃ¬m kiáº¿m Ä‘Ã£ tiáº¿p tá»¥c tá»« cuá»‘i cá»§a tÃ i liá»‡u."
  
! #: info/session.c:4180
  msgid "Search continued from the beginning of the document."
  msgstr "Tiáº¿n trÃ¬nh tÃ¬m kiáº¿m Ä‘Ã£ tiáº¿p tá»¥c tá»« Ä‘áº§u cá»§a tÃ i liá»‡u."
  
! #: info/session.c:4200
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "Ä�ang tÃ¬m kiáº¿m táº­p tin phá»¥ %sâ€¦"
  
! #: info/session.c:4237
  msgid "Search failed."
  msgstr "Gáº·p lá»—i khi tÃ¬m kiáº¿m."
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Regexp search"
  msgstr "TÃ¬m kiáº¿m dÃ¹ng biá»ƒu thá»©c chÃ­nh quy"
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Search"
  msgstr "TÃ¬m kiáº¿m"
  
! #: info/session.c:4256 info/session.c:4262
  msgid " case-sensitively"
  msgstr " phÃ¢n biáº¿t chá»¯ hoa/thÆ°á»�ng "
  
! #: info/session.c:4257 info/session.c:4263
  msgid " backward"
  msgstr " ngÆ°á»£c"
  
! #: info/session.c:4260
  #, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s: "
  
! #: info/session.c:4280
  msgid "Search string too short"
  msgstr "Chuá»—i tÃ¬m kiáº¿m quÃ¡ ngáº¯n"
  
! #: info/session.c:4473
  #, 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:4497 info/session.c:4607
  #, c-format
  msgid "No more matches."
  msgstr "KhÃ´ng tÃ¬m tháº¥y thÃªm ná»¯a."
  
! #: info/session.c:4634
  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."
  
! #: info/session.c:4655
  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:4659 info/session.c:4671
  #, c-format
  msgid "No active search"
  msgstr "KhÃ´ng cÃ³ tÃ¬m kiáº¿m nÃ o hiá»‡n Ä‘ang hoáº¡t Ä‘á»™ng"
  
! #: info/session.c:4667
  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:4680
  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:4685
  msgid "Read a string and search for it"
  msgstr "Ä�á»�c chuá»—i vÃ  tÃ¬m kiáº¿m nÃ³"
  
! #: info/session.c:4691
  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:4699
  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:4707 info/session.c:4752
  msgid "No previous search string"
  msgstr "KhÃ´ng cÃ³ chuá»—i tÃ¬m kiáº¿m trÆ°á»›c"
  
! #: info/session.c:4744
  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:4791
  msgid "Clear displayed search matches"
  msgstr "XÃ³a trÃ¬nh bÃ y khá»›p máº«u"
  
! #: info/session.c:4808 info/session.c:4814
  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:4934
  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:4935
  msgid "I-search backward: "
  msgstr "TÃ¬m kiáº¿m ngÆ°á»£c I: "
  
! #: info/session.c:4937
  msgid "Regexp I-search: "
  msgstr "TÃ¬m kiáº¿m I dÃ¹ng biá»ƒu thá»©c chÃ­nh quy: "
  
! #: info/session.c:4938
  msgid "I-search: "
  msgstr "TÃ¬m kiáº¿m I: "
  
! #: info/session.c:4963 info/session.c:4966
  msgid "Failing "
  msgstr "Ä�ang tháº¥t báº¡i "
  
! #: info/session.c:5332
  msgid "Cancel current operation"
  msgstr "Há»§y thao tÃ¡c Ä‘ang cháº¡y"
  
! #: info/session.c:5339
  msgid "Quit"
  msgstr "ThoÃ¡t"
  
! #: info/session.c:5344
  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:5346
  #, c-format
  msgid "GNU Info version %s"
  msgstr "GNU Info phiÃªn báº£n %s"
  
! #: info/session.c:5351
  msgid "Redraw the display"
  msgstr "Váº½ láº¡i mÃ n hÃ¬nh"
  
! #: info/session.c:5388
  msgid "Quit using Info"
  msgstr "ThoÃ¡t khá»�i Info"
  
! #: info/session.c:5404
  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:5415
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "Lá»‡nh láº¡ (%s)."
  
! #: info/session.c:5418
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "â€œ%sâ€� khÃ´ng há»£p lá»‡"
  
! #: info/session.c:5419
  #, c-format
  msgid "'%s' is invalid"
  msgstr "â€œ%sâ€� khÃ´ng há»£p lá»‡"
  
! #: info/session.c:5737
  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:5744
  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)"
***************
*** 1764,1781 ****
  msgstr "Ä�áº·t %s thÃ nh giÃ¡ trá»‹ (%s): "
  
! #: info/window.c:959
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), dÃ²ng  ----, "
  
- #: info/window.c:966
- #, c-format
- msgid "-%s---Info: %s, %ld lines --%s--"
- msgstr "-%s---Info: %s, %ld dÃ²ng  --%s--"
- 
- #: info/window.c:970
- #, c-format
- msgid "-%s---Info: (%s)%s, %ld lines --%s--"
- msgstr "-%s---Info: (%s)%s, %ld dÃ²ng --%s--"
- 
  #: install-info/install-info.c:292
  #, c-format
--- 1760,1767 ----
  msgstr "Ä�áº·t %s thÃ nh giÃ¡ trá»‹ (%s): "
  
! #: info/window.c:909
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), dÃ²ng  ----, "
  
  #: install-info/install-info.c:292
  #, c-format
***************
*** 1959,1963 ****
  "\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"
--- 1945,1949 ----
  "\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"
***************
*** 1977,1985 ****
  "  PhÃ­m táº¯t:\n"
  "   * q        thoÃ¡t\n"
! "   * ?        liá»‡t kÃª cÃ¡c lá»‡nh Info\n"
  "   * d        trá»Ÿ vá»� Ä‘Ã¢y\n"
  "   * h        hiá»‡n trá»£ giÃºp cho ngÆ°á»�i má»›i dÃ¹ng Info\n"
  "   * mEmacs<Enter>  xem sá»• tay Emacs, v.v..\n"
! "v.v.\n"
  "  Trong Emacs, báº¡n cÃ³ thá»ƒ nháº¥n nÃºt chuá»™t 2 vÃ o má»¥c trÃ¬nh Ä‘Æ¡n\n"
  "  hay vÃ o tham chiáº¿u chÃ©o, Ä‘á»ƒ chá»�n nÃ³.\n"
--- 1963,1971 ----
  "  PhÃ­m táº¯t:\n"
  "   * q        thoÃ¡t\n"
! "   * H        liá»‡t kÃª cÃ¡c lá»‡nh Info\n"
  "   * d        trá»Ÿ vá»� Ä‘Ã¢y\n"
  "   * h        hiá»‡n trá»£ giÃºp cho ngÆ°á»�i má»›i dÃ¹ng Info\n"
  "   * mEmacs<Enter>  xem sá»• tay Emacs, v.v..\n"
! "\n"
  "  Trong Emacs, báº¡n cÃ³ thá»ƒ nháº¥n nÃºt chuá»™t 2 vÃ o má»¥c trÃ¬nh Ä‘Æ¡n\n"
  "  hay vÃ o tham chiáº¿u chÃ©o, Ä‘á»ƒ chá»�n nÃ³.\n"
***************
*** 2060,2176 ****
  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:855
! #: tp/Texinfo/Convert/Converter.pm:893 tp/Texinfo/Convert/Converter.pm:1204
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6504
! #: tp/Texinfo/Convert/HTML.pm:6528 tp/Texinfo/Convert/HTML.pm:6905
! #: tp/Texinfo/Convert/HTML.pm:6963 tp/Texinfo/Convert/HTML.pm:7041
! #: tp/Texinfo/Convert/HTML.pm:7118 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:546
! #: tp/Texinfo/Convert/TexinfoXML.pm:457
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "khÃ´ng thá»ƒ má»Ÿ â€œ%sâ€� Ä‘á»ƒ ghi: %s"
  
! #: tp/Texinfo/Common.pm:881
  msgid "recursion is always allowed"
  msgstr "luÃ´n cho phÃ©p Ä‘á»‡ qui"
  
! #: tp/Texinfo/Common.pm:882
  msgid "arguments are quoted by default"
  msgstr "cÃ¡c Ä‘á»‘i sá»‘ Ä‘Æ°á»£c trÃ­ch dáº«n theo máº·c Ä‘á»‹nh"
  
! #: tp/Texinfo/Common.pm:1105
  #, 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:1110
  #, 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:1128
  #, 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:1151
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "khÃ´ng thá»ƒ Ä‘á»�c %s: %s"
  
! #: tp/Texinfo/Common.pm:1170
  #, 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:1176 tp/Texinfo/Parser.pm:3353
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%s: khÃ´ng tÃ¬m tháº¥y %s"
  
! #: tp/Texinfo/Common.pm:1520
! #, 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/Common.pm:1548
! msgid "missing type"
! msgstr "thiáº¿u kiá»ƒu"
! 
! #: tp/Texinfo/Common.pm:1551
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "khÃ´ng nháº­n ra kiá»ƒu: %s"
! 
! #: tp/Texinfo/Common.pm:1568
! #, 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/Common.pm:1603
  msgid "no node to be renamed"
  msgstr "khÃ´ng cÃ³ nÃºt nÃ o Ä‘Æ°á»£c Ä‘á»•i tÃªn"
  
! #: tp/Texinfo/Common.pm:1614
  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:1624 tp/Texinfo/Parser.pm:926
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "khÃ´ng thá»ƒ má»Ÿ %s: %s"
  
! #: tp/Texinfo/Common.pm:2144
  #, 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/Convert/Converter.pm:395 tp/Texinfo/Convert/Converter.pm:414
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Biáº¿n %s Ä‘Ã£ láº¡c háº­u\n"
  
! #: tp/Texinfo/Convert/Converter.pm:794
  #, 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:876 tp/Texinfo/Convert/Converter.pm:909
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:6931
! #: tp/Texinfo/Convert/HTML.pm:6989 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:476 tp/Texinfo/Parser.pm:2035
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "gáº·p lá»—i khi Ä‘Ã³ng %s: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, 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:995
  #, perl-format
  msgid "could not create directory `%s': %s"
--- 2046,2157 ----
  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:847
! #: tp/Texinfo/Convert/Converter.pm:885 tp/Texinfo/Convert/Converter.pm:1196
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6573
! #: tp/Texinfo/Convert/HTML.pm:6597 tp/Texinfo/Convert/HTML.pm:6978
! #: tp/Texinfo/Convert/HTML.pm:7037 tp/Texinfo/Convert/HTML.pm:7115
! #: tp/Texinfo/Convert/HTML.pm:7192 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:547
! #: tp/Texinfo/Convert/TexinfoXML.pm:458
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "khÃ´ng thá»ƒ má»Ÿ â€œ%sâ€� Ä‘á»ƒ ghi: %s"
  
! #: tp/Texinfo/Common.pm:862
  msgid "recursion is always allowed"
  msgstr "luÃ´n cho phÃ©p Ä‘á»‡ qui"
  
! #: tp/Texinfo/Common.pm:863
  msgid "arguments are quoted by default"
  msgstr "cÃ¡c Ä‘á»‘i sá»‘ Ä‘Æ°á»£c trÃ­ch dáº«n theo máº·c Ä‘á»‹nh"
  
! #: tp/Texinfo/Common.pm:866
! 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:869
! msgid ""
! "move your @shortcontents and @contents commands if you want the contents "
! "after the title page"
! 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:1093
  #, 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:1098
  #, 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:1116
  #, 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:1139
  #, perl-format
  msgid "could not read %s: %s"
  msgstr "khÃ´ng thá»ƒ Ä‘á»�c %s: %s"
  
! #: tp/Texinfo/Common.pm:1158
  #, 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:1164 tp/Texinfo/Parser.pm:3193
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr "@%s: khÃ´ng tÃ¬m tháº¥y %s"
  
! #: tp/Texinfo/Common.pm:1637
  msgid "no node to be renamed"
  msgstr "khÃ´ng cÃ³ nÃºt nÃ o Ä‘Æ°á»£c Ä‘á»•i tÃªn"
  
! #: tp/Texinfo/Common.pm:1648
  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:1658 tp/Texinfo/Parser.pm:899
  #, perl-format
  msgid "could not open %s: %s"
  msgstr "khÃ´ng thá»ƒ má»Ÿ %s: %s"
  
! #: tp/Texinfo/Common.pm:2178
  #, 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/Convert/Converter.pm:387 tp/Texinfo/Convert/Converter.pm:406
  #, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "Biáº¿n %s Ä‘Ã£ láº¡c háº­u\n"
  
! #: tp/Texinfo/Convert/Converter.pm:786
  #, 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:868 tp/Texinfo/Convert/Converter.pm:901
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:7004
! #: tp/Texinfo/Convert/HTML.pm:7063 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:477 tp/Texinfo/Parser.pm:1996
  #, perl-format
  msgid "error on closing %s: %s"
  msgstr "gáº·p lá»—i khi Ä‘Ã³ng %s: %s"
  
! #: tp/Texinfo/Convert/Converter.pm:979
  #, 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:987
  #, perl-format
  msgid "could not create directory `%s': %s"
***************
*** 2182,2280 ****
  msgstr "khÃ´ng tÃ¬m tháº¥y táº­p tin @image â€œ%sâ€�, Ä‘ang dÃ¹ng â€œ%sâ€�"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5388
  msgid "no argument specified for @U"
  msgstr "chÆ°a chá»‰ Ä‘á»‹nh Ä‘á»‘i sá»‘ cho @U"
  
! #: tp/Texinfo/Convert/HTML.pm:1683
  #, 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:2371
  #, 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:4888
  msgid "string not closed in css file"
  msgstr "chuá»—i chÆ°a Ä‘Æ°á»£c Ä‘Ã³ng trong táº­p tin css"
  
! #: tp/Texinfo/Convert/HTML.pm:4890
  msgid "--css-include ended in comment"
  msgstr "â€œ--css-includeâ€� káº¿t thÃºc táº¡i pháº§n ghi chÃº"
  
! #: tp/Texinfo/Convert/HTML.pm:4892
  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:4918
  #, 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:4924
  #, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "khÃ´ng thá»ƒ má»Ÿ --include-file %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:4934
  #, 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:5801 tp/Texinfo/Convert/HTML.pm:5805
  #, 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:6499
  #, 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:6523
  #, 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:6638
  #, 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:6839
  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:7048
  #, 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:7073
  #, 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:7079
  #, 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:7093
  #, 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:7125
  #, 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:7163
  msgid "empty node name"
  msgstr "tÃªn nÃºt rá»—ng"
  
! #: tp/Texinfo/Convert/HTML.pm:7165 tp/Texinfo/Parser.pm:3697
  #, perl-format
  msgid "syntax for an external node used for `%s'"
--- 2163,2280 ----
  msgstr "khÃ´ng tÃ¬m tháº¥y táº­p tin @image â€œ%sâ€�, Ä‘ang dÃ¹ng â€œ%sâ€�"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5225
  msgid "no argument specified for @U"
  msgstr "chÆ°a chá»‰ Ä‘á»‹nh Ä‘á»‘i sá»‘ cho @U"
  
! #: tp/Texinfo/Convert/HTML.pm:1715
  #, 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:2399
  #, 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:4629
! #, 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:4657
! msgid "missing type"
! msgstr "thiáº¿u kiá»ƒu"
! 
! #: tp/Texinfo/Convert/HTML.pm:4660
! #, perl-format
! msgid "unrecognized type: %s"
! msgstr "khÃ´ng nháº­n ra kiá»ƒu: %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4677
! #, 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:4962
  msgid "string not closed in css file"
  msgstr "chuá»—i chÆ°a Ä‘Æ°á»£c Ä‘Ã³ng trong táº­p tin css"
  
! #: tp/Texinfo/Convert/HTML.pm:4964
  msgid "--css-include ended in comment"
  msgstr "â€œ--css-includeâ€� káº¿t thÃºc táº¡i pháº§n ghi chÃº"
  
! #: tp/Texinfo/Convert/HTML.pm:4966
  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:4992
  #, 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:4998
  #, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "khÃ´ng thá»ƒ má»Ÿ --include-file %s: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5008
  #, 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:5870 tp/Texinfo/Convert/HTML.pm:5874
  #, 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:6568
  #, 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:6592
  #, 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:6707
  #, 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:6912
  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:7122
  #, 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:7147
  #, 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:7153
  #, 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:7167
  #, 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:7199
  #, 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:7237
  msgid "empty node name"
  msgstr "tÃªn nÃºt rá»—ng"
  
! #: tp/Texinfo/Convert/HTML.pm:7239 tp/Texinfo/Parser.pm:3542
  #, perl-format
  msgid "syntax for an external node used for `%s'"
***************
*** 2309,2333 ****
  msgstr "tÃªn @node khÃ´ng Ä‘Æ°á»£c chá»©a â€œ,â€�: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1334
  #, 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:1381 tp/Texinfo/Parser.pm:2722
  #, 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:1495
  #, 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:1500
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "KhÃ´ng thá»ƒ Ä‘á»�c táº­p tin @image â€œ%sâ€�: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1523
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
--- 2309,2333 ----
  msgstr "tÃªn @node khÃ´ng Ä‘Æ°á»£c chá»©a â€œ,â€�: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1335
  #, 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:1382 tp/Texinfo/Parser.pm:2568
  #, 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:1496
  #, 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:1501
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "KhÃ´ng thá»ƒ Ä‘á»�c táº­p tin @image â€œ%sâ€�: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1524
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
***************
*** 2335,2339 ****
  "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:1931
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
--- 2335,2339 ----
  "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:1932
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
***************
*** 2343,2488 ****
  "trÃ¡nh nÃ³"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2161
  #, 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:2193
  #, 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:2226
  #, 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:2272
  #, 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:2275
  msgid "`.' or `,' must follow @xref"
  msgstr "â€œ.â€� hay â€œ,â€� pháº£i theo sau @xref"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3118
  #, 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:3129
  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:3145
  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/Parser.pm:910
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr "@%s chá»‰ Ä‘Æ°á»£c phÃ©p xuáº¥t hiá»‡n á»Ÿ Ä‘áº§u hoáº·c cuá»‘i cá»§a tÃ i liá»‡u"
  
! #: tp/Texinfo/Parser.pm:1160 tp/Texinfo/Structuring.pm:594
  #, perl-format
  msgid "multiple @%s"
  msgstr "nhiá»�u @%s"
  
! #: tp/Texinfo/Parser.pm:1194
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "cÃº phÃ¡p sai cho Ä‘á»‘i sá»‘ @%s: %s"
! 
! #: tp/Texinfo/Parser.pm:1210
  #, 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/Parser.pm:1219 tp/Texinfo/Parser.pm:4856
! #: tp/Texinfo/Parser.pm:4882 tp/Texinfo/Parser.pm:5671
! #: tp/Texinfo/Parser.pm:5687 tp/Texinfo/Parser.pm:5702
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s cáº§n Ä‘áº¿n tÃªn"
  
! #: tp/Texinfo/Parser.pm:1223 tp/Texinfo/Parser.pm:4859
! #: tp/Texinfo/Parser.pm:4885 tp/Texinfo/Parser.pm:5674
! #: tp/Texinfo/Parser.pm:5690 tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad name for @%s"
  msgstr "tÃªn sai cho @%s"
  
! #: tp/Texinfo/Parser.pm:1341
  #, 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/Parser.pm:1345
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "@%s cÃ³ váº» trÆ°á»›c dáº¥u ngoáº·c Ã´m Ä‘Ã³ng @%s"
  
! #: tp/Texinfo/Parser.pm:1350
  #, perl-format
! msgid "%c%s missing close brace"
! msgstr "%c%s: thiáº¿u dáº¥u ngoáº·c mÃ³c Ä‘Ã³ng â€œ}â€�"
  
! #: tp/Texinfo/Parser.pm:1354
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "@%s thiáº¿u dÃ£y giá»›i háº¡n Ä‘Ã³ng: %s}"
  
! #: tp/Texinfo/Parser.pm:1476
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "@itemx khÃ´ng Ä‘Æ°á»£c báº¯t Ä‘áº§u báº±ng @%s"
  
! #: tp/Texinfo/Parser.pm:1544
  msgid "@itemx must follow @item"
  msgstr "@itemx pháº£i theo sau @item"
  
! #: tp/Texinfo/Parser.pm:1712
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr "@%s cÃ³ ná»™i dung nhÆ°ng khÃ´ng cÃ³ @item"
  
! #: tp/Texinfo/Parser.pm:1743
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "â€œ@endâ€� cáº§n â€œ%sâ€�, nhÆ°ng láº¡i nháº­n Ä‘Æ°á»£c â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:1746
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@%s cÃ³ váº» trÆ°á»›c @end %s"
  
! #: tp/Texinfo/Parser.pm:1750
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "â€œ%cend %sâ€� khÃ´ng Ä‘á»§ cáº·p"
  
! #: tp/Texinfo/Parser.pm:1776 tp/Texinfo/Parser.pm:5204
! #: tp/Texinfo/Parser.pm:5470
  #, perl-format
  msgid "misplaced %c"
  msgstr "%c khÃ´ng Ä‘Ãºng chá»—"
  
! #: tp/Texinfo/Parser.pm:1874 tp/Texinfo/Parser.pm:3312
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "â€œ%c%sâ€� chÆ°a khá»›p cáº·p"
  
! #: tp/Texinfo/Parser.pm:2110
  #, 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/Parser.pm:2132
  #, perl-format
! msgid "@%s missing close brace"
! msgstr "@%s thiáº¿u dáº¥u ngoáº·c mÃ³c Ä‘Ã³ng â€œ}â€�"
  
! #: tp/Texinfo/Parser.pm:2140
  #, perl-format
  msgid "macro `%s' declared without argument called with an argument"
--- 2343,2488 ----
  "trÃ¡nh nÃ³"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2162
  #, 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:2194
  #, 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:2227
  #, 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:2273
  #, 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:2276
  msgid "`.' or `,' must follow @xref"
  msgstr "â€œ.â€� hay â€œ,â€� pháº£i theo sau @xref"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3086
  #, 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:3097
  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:3113
  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/Parser.pm:883
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr "@%s chá»‰ Ä‘Æ°á»£c phÃ©p xuáº¥t hiá»‡n á»Ÿ Ä‘áº§u hoáº·c cuá»‘i cá»§a tÃ i liá»‡u"
  
! #: tp/Texinfo/Parser.pm:1125 tp/Texinfo/Structuring.pm:595
  #, perl-format
  msgid "multiple @%s"
  msgstr "nhiá»�u @%s"
  
! #: tp/Texinfo/Parser.pm:1166
  #, 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/Parser.pm:1176
! #, perl-format
! msgid "bad syntax for @%s argument: %s"
! msgstr "cÃº phÃ¡p sai cho Ä‘á»‘i sá»‘ @%s: %s"
! 
! #: tp/Texinfo/Parser.pm:1183 tp/Texinfo/Parser.pm:4707
! #: tp/Texinfo/Parser.pm:4733 tp/Texinfo/Parser.pm:5565
! #: tp/Texinfo/Parser.pm:5578 tp/Texinfo/Parser.pm:5592
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s cáº§n Ä‘áº¿n tÃªn"
  
! #: tp/Texinfo/Parser.pm:1187 tp/Texinfo/Parser.pm:4710
! #: tp/Texinfo/Parser.pm:4736 tp/Texinfo/Parser.pm:5568
! #: tp/Texinfo/Parser.pm:5581 tp/Texinfo/Parser.pm:5595
  #, perl-format
  msgid "bad name for @%s"
  msgstr "tÃªn sai cho @%s"
  
! #: tp/Texinfo/Parser.pm:1305
  #, 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/Parser.pm:1309
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr "@%s cÃ³ váº» trÆ°á»›c dáº¥u ngoáº·c Ã´m Ä‘Ã³ng @%s"
  
! #: tp/Texinfo/Parser.pm:1314
  #, perl-format
! msgid "%c%s missing closing brace"
! msgstr "%c%s: thiáº¿u dáº¥u ngoáº·c mÃ³c Ä‘Ã³ng"
  
! #: tp/Texinfo/Parser.pm:1318
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr "@%s thiáº¿u dÃ£y giá»›i háº¡n Ä‘Ã³ng: %s}"
  
! #: tp/Texinfo/Parser.pm:1440
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr "@itemx khÃ´ng Ä‘Æ°á»£c báº¯t Ä‘áº§u báº±ng @%s"
  
! #: tp/Texinfo/Parser.pm:1508
  msgid "@itemx must follow @item"
  msgstr "@itemx pháº£i theo sau @item"
  
! #: tp/Texinfo/Parser.pm:1676
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr "@%s cÃ³ ná»™i dung nhÆ°ng khÃ´ng cÃ³ @item"
  
! #: tp/Texinfo/Parser.pm:1707
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "â€œ@endâ€� cáº§n â€œ%sâ€�, nhÆ°ng láº¡i nháº­n Ä‘Æ°á»£c â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:1710
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr "@%s cÃ³ váº» trÆ°á»›c @end %s"
  
! #: tp/Texinfo/Parser.pm:1714
  #, perl-format
  msgid "no matching `%cend %s'"
  msgstr "â€œ%cend %sâ€� khÃ´ng Ä‘á»§ cáº·p"
  
! #: tp/Texinfo/Parser.pm:1738 tp/Texinfo/Parser.pm:5070
! #: tp/Texinfo/Parser.pm:5308
  #, perl-format
  msgid "misplaced %c"
  msgstr "%c khÃ´ng Ä‘Ãºng chá»—"
  
! #: tp/Texinfo/Parser.pm:1835 tp/Texinfo/Parser.pm:3148
  #, perl-format
  msgid "unmatched `%c%s'"
  msgstr "â€œ%c%sâ€� chÆ°a khá»›p cáº·p"
  
! #: tp/Texinfo/Parser.pm:2072
  #, 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/Parser.pm:2094
  #, perl-format
! msgid "@%s missing closing brace"
! msgstr "@%s thiáº¿u dáº¥u ngoáº·c mÃ³c Ä‘Ã³ng"
  
! #: tp/Texinfo/Parser.pm:2102
  #, perl-format
  msgid "macro `%s' declared without argument called with an argument"
***************
*** 2490,2544 ****
  "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/Parser.pm:2175
  #, 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/Parser.pm:2650
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s â€œ%sâ€� Ä‘Ã£ Ä‘á»‹nh nghÄ©a tá»« trÆ°á»›c"
  
! #: tp/Texinfo/Parser.pm:2655
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "á»Ÿ Ä‘Ã¢y cÃ³ Ä‘á»‹nh nghÄ©a trÆ°á»›c nhÆ° lÃ  @%s"
  
! #: tp/Texinfo/Parser.pm:3016
  #, perl-format
  msgid "missing name for @%s"
  msgstr "thiáº¿u tÃªn cho @%s"
  
! #: tp/Texinfo/Parser.pm:3021
  #, perl-format
  msgid "missing category for @%s"
  msgstr "thiáº¿u category cho @%s"
  
! #: tp/Texinfo/Parser.pm:3073
  #, 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/Parser.pm:3089
  msgid "empty multitable"
  msgstr "Ä‘a-báº£ng rá»—ng"
  
! #: tp/Texinfo/Parser.pm:3145 tp/Texinfo/Parser.pm:5784
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "Ä‘á»‘i sá»‘ khÃ´ng cáº§n thiáº¿t cho @%s"
  
! #: tp/Texinfo/Parser.pm:3151 tp/Texinfo/Parser.pm:5806
! #: tp/Texinfo/Parser.pm:5818
  #, perl-format
  msgid "bad argument to @%s"
  msgstr "Ä‘á»‘i sá»‘ sai cho @%s"
  
! #: tp/Texinfo/Parser.pm:3162
  #, 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/Parser.pm:3167
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
--- 2490,2544 ----
  "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/Parser.pm:2138
  #, 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/Parser.pm:2501
  #, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "@%s â€œ%sâ€� Ä‘Ã£ Ä‘á»‹nh nghÄ©a tá»« trÆ°á»›c"
  
! #: tp/Texinfo/Parser.pm:2506
  #, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "á»Ÿ Ä‘Ã¢y cÃ³ Ä‘á»‹nh nghÄ©a trÆ°á»›c nhÆ° lÃ  @%s"
  
! #: tp/Texinfo/Parser.pm:2850
  #, perl-format
  msgid "missing name for @%s"
  msgstr "thiáº¿u tÃªn cho @%s"
  
! #: tp/Texinfo/Parser.pm:2855
  #, perl-format
  msgid "missing category for @%s"
  msgstr "thiáº¿u category cho @%s"
  
! #: tp/Texinfo/Parser.pm:2890
  #, 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/Parser.pm:2905
  msgid "empty multitable"
  msgstr "Ä‘a-báº£ng rá»—ng"
  
! #: tp/Texinfo/Parser.pm:2959 tp/Texinfo/Parser.pm:5673
  #, perl-format
  msgid "superfluous argument to @%s"
  msgstr "Ä‘á»‘i sá»‘ khÃ´ng cáº§n thiáº¿t cho @%s"
  
! #: tp/Texinfo/Parser.pm:2965 tp/Texinfo/Parser.pm:5694
! #: tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad argument to @%s"
  msgstr "Ä‘á»‘i sá»‘ sai cho @%s"
  
! #: tp/Texinfo/Parser.pm:2976
  #, 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/Parser.pm:2981
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
***************
*** 2546,2608 ****
  "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/Parser.pm:3202
  #, 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/Parser.pm:3290 tp/Texinfo/Parser.pm:3429
! #: tp/Texinfo/Parser.pm:5777
  #, perl-format
  msgid "@%s missing argument"
  msgstr "@%s thiáº¿u Ä‘á»‘i sá»‘"
  
! #: tp/Texinfo/Parser.pm:3302
  #, perl-format
  msgid "unknown @end %s"
  msgstr "khÃ´ng hiá»ƒu @end %s"
  
! #: tp/Texinfo/Parser.pm:3324 tp/Texinfo/Parser.pm:3943
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "Ä‘á»‘i sá»‘ khÃ´ng cáº§n thiáº¿t cho @%s %s: %s"
  
! #: tp/Texinfo/Parser.pm:3329 tp/Texinfo/Parser.pm:5861
! #: tp/Texinfo/Parser.pm:5906 tp/Texinfo/Parser.pm:5935
! #: tp/Texinfo/Parser.pm:5976 tp/Texinfo/Parser.pm:6055
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "Ä‘á»‘i sá»‘ sai cho @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3348
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%s: khÃ´ng thá»ƒ má»Ÿ %s: %s"
  
! #: tp/Texinfo/Parser.pm:3360
  #, 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/Parser.pm:3369
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "khÃ´ng nháº­n ra tÃªn báº£ng mÃ£ â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:3516
  #, perl-format
  msgid "@%s after the first element"
  msgstr "@%s sau pháº§n tá»­ thá»© nháº¥t"
  
! #: tp/Texinfo/Parser.pm:3523
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s chá»‰ cÃ³ nghÄ©a khi á»Ÿ dÃ²ng @multitable"
  
! #: tp/Texinfo/Parser.pm:3563
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "@%s khÃ´ng Ä‘Æ°á»£c tá»• há»£p cÃ¹ng vá»›i @top"
  
! #: tp/Texinfo/Parser.pm:3575
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
--- 2546,2609 ----
  "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/Parser.pm:3016
  #, 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/Parser.pm:3124 tp/Texinfo/Parser.pm:3277
! #: tp/Texinfo/Parser.pm:5666
  #, perl-format
  msgid "@%s missing argument"
  msgstr "@%s thiáº¿u Ä‘á»‘i sá»‘"
  
! #: tp/Texinfo/Parser.pm:3138
  #, perl-format
  msgid "unknown @end %s"
  msgstr "khÃ´ng hiá»ƒu @end %s"
  
! #: tp/Texinfo/Parser.pm:3161 tp/Texinfo/Parser.pm:3788
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "Ä‘á»‘i sá»‘ khÃ´ng cáº§n thiáº¿t cho @%s %s: %s"
  
! #: tp/Texinfo/Parser.pm:3167 tp/Texinfo/Parser.pm:3245
! #: tp/Texinfo/Parser.pm:5755 tp/Texinfo/Parser.pm:5798
! #: tp/Texinfo/Parser.pm:5827 tp/Texinfo/Parser.pm:5868
! #: tp/Texinfo/Parser.pm:5946
  #, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "Ä‘á»‘i sá»‘ sai cho @%s: %s"
  
! #: tp/Texinfo/Parser.pm:3188
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "@%s: khÃ´ng thá»ƒ má»Ÿ %s: %s"
  
! #: tp/Texinfo/Parser.pm:3200
  #, 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/Parser.pm:3208
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "khÃ´ng nháº­n ra tÃªn báº£ng mÃ£ â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:3364
  #, perl-format
  msgid "@%s after the first element"
  msgstr "@%s sau pháº§n tá»­ thá»© nháº¥t"
  
! #: tp/Texinfo/Parser.pm:3371
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "@%s chá»‰ cÃ³ nghÄ©a khi á»Ÿ dÃ²ng @multitable"
  
! #: tp/Texinfo/Parser.pm:3408
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr "@%s khÃ´ng Ä‘Æ°á»£c tá»• há»£p cÃ¹ng vá»›i @top"
  
! #: tp/Texinfo/Parser.pm:3420
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
***************
*** 2610,2663 ****
  "@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/Parser.pm:3677
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "Ä‘á»‘i sá»‘ trá»‘ng rá»—ng trong @%s"
  
! #: tp/Texinfo/Parser.pm:3681
  #, 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/Parser.pm:3724
  #, 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/Parser.pm:3732
  msgid "empty node name in menu entry"
  msgstr "tÃªn nÃºt trá»‘ng trong má»¥c trÃ¬nh Ä‘Æ¡n"
  
! #: tp/Texinfo/Parser.pm:3805
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "@%s khÃ´ng Ä‘Æ°á»£c xuáº¥t hiá»‡n trong @%s"
  
! #: tp/Texinfo/Parser.pm:3937
  #, perl-format
! msgid "@end %s should only appear at a line beginning"
! msgstr "@end %s chá»‰ Ä‘Æ°á»£c phÃ©p xuáº¥t hiá»‡n á»Ÿ Ä‘áº§u má»™t dÃ²ng"
  
! #: tp/Texinfo/Parser.pm:3960
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "vÄ© lá»‡nh â€œ%sâ€� Ä‘Æ°á»£c Ä‘á»‹nh nghÄ©a trÆ°á»›c"
  
! #: tp/Texinfo/Parser.pm:3963
  #, 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/Parser.pm:3968
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "Ä‘á»‹nh nghÄ©a láº¡i lá»‡nh ngÃ´n ngá»¯ Texinfo: @%s"
  
! #: tp/Texinfo/Parser.pm:4017
  #, perl-format
  msgid "@%s without associated character"
  msgstr "@%s mÃ  khÃ´ng tá»• há»£p cÃ¹ng kÃ½ tá»±"
  
! #: tp/Texinfo/Parser.pm:4087
  #, perl-format
  msgid ""
--- 2611,2664 ----
  "@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/Parser.pm:3522
  #, perl-format
  msgid "empty argument in @%s"
  msgstr "Ä‘á»‘i sá»‘ trá»‘ng rá»—ng trong @%s"
  
! #: tp/Texinfo/Parser.pm:3526
  #, 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/Parser.pm:3569
  #, 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/Parser.pm:3577
  msgid "empty node name in menu entry"
  msgstr "tÃªn nÃºt trá»‘ng trong má»¥c trÃ¬nh Ä‘Æ¡n"
  
! #: tp/Texinfo/Parser.pm:3650
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "@%s khÃ´ng Ä‘Æ°á»£c xuáº¥t hiá»‡n trong @%s"
  
! #: tp/Texinfo/Parser.pm:3782
  #, 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/Parser.pm:3804
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "vÄ© lá»‡nh â€œ%sâ€� Ä‘Æ°á»£c Ä‘á»‹nh nghÄ©a trÆ°á»›c"
  
! #: tp/Texinfo/Parser.pm:3807
  #, 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/Parser.pm:3812
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr "Ä‘á»‹nh nghÄ©a láº¡i lá»‡nh ngÃ´n ngá»¯ Texinfo: @%s"
  
! #: tp/Texinfo/Parser.pm:3879
  #, perl-format
  msgid "@%s without associated character"
  msgstr "@%s mÃ  khÃ´ng tá»• há»£p cÃ¹ng kÃ½ tá»±"
  
! #: tp/Texinfo/Parser.pm:3949
  #, perl-format
  msgid ""
***************
*** 2666,2670 ****
  "@%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/Parser.pm:4111
  #, perl-format
  msgid ""
--- 2667,2671 ----
  "@%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/Parser.pm:3974
  #, perl-format
  msgid ""
***************
*** 2675,2800 ****
  "giÃ¡ trá»‹ hiá»‡n táº¡i %d)"
  
! #: tp/Texinfo/Parser.pm:4120
  #, 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/Parser.pm:4176
  #, 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/Parser.pm:4182
  #, 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/Parser.pm:4195 tp/Texinfo/Parser.pm:5325
  #, 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/Parser.pm:4207
  #, 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/Parser.pm:4218
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s cáº§n dáº¥u ngoáº·c mÃ³c {}"
  
! #: tp/Texinfo/Parser.pm:4383
  #, perl-format
  msgid "undefined flag: %s"
! msgstr "chÆ°a Ä‘á»‹nh nghÄ©a cá»� : %s"
  
! #: tp/Texinfo/Parser.pm:4386
  msgid "bad syntax for @value"
  msgstr "cÃº phÃ¡p sai Ä‘á»‘i vá»›i @value"
  
! #: tp/Texinfo/Parser.pm:4393
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s quÃ¡ cÅ©."
  
! #: tp/Texinfo/Parser.pm:4396
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s quÃ¡ cÅ©; %s"
  
! #: tp/Texinfo/Parser.pm:4405
  #, perl-format
! msgid "@%s should only appear at a line beginning"
! msgstr "@%s chá»‰ Ä‘Æ°á»£c phÃ©p xuáº¥t hiá»‡n Ä‘áº§u táº¡i Ä‘áº§u dÃ²ng"
  
! #: tp/Texinfo/Parser.pm:4496
  #, 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/Parser.pm:4505
  #, 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/Parser.pm:4631 tp/Texinfo/Parser.pm:4648
! #: tp/Texinfo/Parser.pm:4698
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s khÃ´ng cÃ³ nghÄ©a bÃªn trong khá»‘i â€œ@%sâ€�"
  
! #: tp/Texinfo/Parser.pm:4658
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "@%s trong multitable trá»‘ng rá»—ng"
  
! #: tp/Texinfo/Parser.pm:4664
  msgid "@tab before @item"
  msgstr "@tab trÆ°á»›c @item"
  
! #: tp/Texinfo/Parser.pm:4667
  #, 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/Parser.pm:4704
  msgid "ignoring @tab outside of multitable"
  msgstr "Ä‘ang bá»� qua @tab bÃªn ngoÃ i Ä‘a báº£ng"
  
! #: tp/Texinfo/Parser.pm:4708
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "@%s náº±m ngoÃ i báº£ng hay danh sÃ¡ch"
  
! #: tp/Texinfo/Parser.pm:4745
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "pháº£i sau â€œ@%sâ€� Ä‘á»ƒ dÃ¹ng â€œ@%sâ€�"
  
! #: tp/Texinfo/Parser.pm:4787
  #, 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/Parser.pm:4791
  msgid "@dircategory after first node"
  msgstr "@dircategory sau nÃºt Ä‘áº§u tiÃªn"
  
! #: tp/Texinfo/Parser.pm:4979
  #, 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/Parser.pm:4997
  msgid "@direntry after first node"
  msgstr "@direntry sau nÃºt Ä‘áº§u tiÃªn"
  
! #: tp/Texinfo/Parser.pm:5005
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "@%s cÃ³ váº» trÆ°á»›c @node"
  
! #: tp/Texinfo/Parser.pm:5008
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
--- 2676,2801 ----
  "giÃ¡ trá»‹ hiá»‡n táº¡i %d)"
  
! #: tp/Texinfo/Parser.pm:3983
  #, 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/Parser.pm:4038
  #, 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/Parser.pm:4044
  #, 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/Parser.pm:4057 tp/Texinfo/Parser.pm:5189
  #, 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/Parser.pm:4068
  #, 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/Parser.pm:4079
  #, perl-format
  msgid "@%s expected braces"
  msgstr "@%s cáº§n dáº¥u ngoáº·c mÃ³c {}"
  
! #: tp/Texinfo/Parser.pm:4233
  #, perl-format
  msgid "undefined flag: %s"
! msgstr "chÆ°a Ä‘á»‹nh nghÄ©a cá»�: %s"
  
! #: tp/Texinfo/Parser.pm:4236
  msgid "bad syntax for @value"
  msgstr "cÃº phÃ¡p sai Ä‘á»‘i vá»›i @value"
  
! #: tp/Texinfo/Parser.pm:4243
  #, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s quÃ¡ cÅ©."
  
! #: tp/Texinfo/Parser.pm:4246
  #, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s quÃ¡ cÅ©; %s"
  
! #: tp/Texinfo/Parser.pm:4255
  #, 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/Parser.pm:4346
  #, 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/Parser.pm:4355
  #, 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/Parser.pm:4479 tp/Texinfo/Parser.pm:4496
! #: tp/Texinfo/Parser.pm:4546
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s khÃ´ng cÃ³ nghÄ©a bÃªn trong khá»‘i â€œ@%sâ€�"
  
! #: tp/Texinfo/Parser.pm:4506
  #, perl-format
  msgid "@%s in empty multitable"
  msgstr "@%s trong multitable trá»‘ng rá»—ng"
  
! #: tp/Texinfo/Parser.pm:4512
  msgid "@tab before @item"
  msgstr "@tab trÆ°á»›c @item"
  
! #: tp/Texinfo/Parser.pm:4515
  #, 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/Parser.pm:4552
  msgid "ignoring @tab outside of multitable"
  msgstr "Ä‘ang bá»� qua @tab bÃªn ngoÃ i Ä‘a báº£ng"
  
! #: tp/Texinfo/Parser.pm:4556
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr "@%s náº±m ngoÃ i báº£ng hay danh sÃ¡ch"
  
! #: tp/Texinfo/Parser.pm:4596
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "pháº£i sau â€œ@%sâ€� Ä‘á»ƒ dÃ¹ng â€œ@%sâ€�"
  
! #: tp/Texinfo/Parser.pm:4638
  #, 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/Parser.pm:4642
  msgid "@dircategory after first node"
  msgstr "@dircategory sau nÃºt Ä‘áº§u tiÃªn"
  
! #: tp/Texinfo/Parser.pm:4847
  #, 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/Parser.pm:4864
  msgid "@direntry after first node"
  msgstr "@direntry sau nÃºt Ä‘áº§u tiÃªn"
  
! #: tp/Texinfo/Parser.pm:4872
  #, perl-format
  msgid "@%s seen before first @node"
  msgstr "@%s cÃ³ váº» trÆ°á»›c @node"
  
! #: tp/Texinfo/Parser.pm:4875
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
***************
*** 2803,2939 ****
  "@ifinfo?"
  
! #: tp/Texinfo/Parser.pm:5070
  #, 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/Parser.pm:5078
  #, perl-format
  msgid "unknown command `%s'"
  msgstr "khÃ´ng hiá»ƒu lá»‡nh â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5088
  msgid "unexpected @"
  msgstr "gáº·p @ báº¥t thÆ°á»�ng"
  
! #: tp/Texinfo/Parser.pm:5117
  #, 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/Parser.pm:5122
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr "@%s pháº£i dÆ°á»›i â€œ@floatâ€�"
  
! #: tp/Texinfo/Parser.pm:5130
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "bá»� qua nhiá»�u @%s"
  
! #: tp/Texinfo/Parser.pm:5249
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "lá»‡nh @%s khÃ´ng cháº¥p nháº­n Ä‘á»‘i sá»‘"
  
! #: tp/Texinfo/Parser.pm:5273
  #, 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/Parser.pm:5292
  #, 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/Parser.pm:5303
  #, 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/Parser.pm:5316
  msgid "@image missing filename argument"
  msgstr "@image thiáº¿u Ä‘á»‘i sá»‘ tÃªn táº­p tin"
  
! #: tp/Texinfo/Parser.pm:5348
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "@%s thiáº¿u Ä‘á»‘i sá»‘ Ä‘áº§u tiÃªn"
  
! #: tp/Texinfo/Parser.pm:5393
  #, 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/Parser.pm:5399
  #, 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/Parser.pm:5412
! #, perl-format
! msgid "argument for @U exceeds size of integer: %s"
! msgstr "Ä‘á»‘i sá»‘ cho @U vÆ°á»£t quÃ¡ cá»¡ cá»§a kiá»ƒu sá»‘ nguyÃªn: %s"
! 
! #: tp/Texinfo/Parser.pm:5418
  #, 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/Parser.pm:5546
  msgid "superfluous arguments for node"
  msgstr "cÃ¡c Ä‘á»‘i sá»‘ thá»«a cho nÃºt"
  
! #: tp/Texinfo/Parser.pm:5596
  #, perl-format
  msgid "expected @end %s"
  msgstr "cáº§n @end %s"
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "@%s should only accept a @-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/Parser.pm:5728
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "Ä‘á»‘i sá»‘ cÃ²n láº¡i trÃªn dÃ²ng @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5801
  #, 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/Parser.pm:5823
  #, perl-format
  msgid "empty @%s"
  msgstr "@%s rá»—ng"
  
! #: tp/Texinfo/Parser.pm:5831
  #, 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/Parser.pm:5840
  #, 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/Parser.pm:5849
  #, perl-format
  msgid "reserved index name %s"
  msgstr "Ä‘Ã£ Ä‘áº£o ngÆ°á»£c tÃªn chá»‰ má»¥c %s"
  
! #: tp/Texinfo/Parser.pm:5868
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "khÃ´ng hiá»ƒu chá»‰ má»¥c nguá»“n trong @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5871
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "khÃ´ng hiá»ƒu chá»‰ má»¥c Ä‘Ã­ch trong @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
--- 2804,2935 ----
  "@ifinfo?"
  
! #: tp/Texinfo/Parser.pm:4937
  #, 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/Parser.pm:4945
  #, perl-format
  msgid "unknown command `%s'"
  msgstr "khÃ´ng hiá»ƒu lá»‡nh â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:4955
  msgid "unexpected @"
  msgstr "gáº·p @ báº¥t thÆ°á»�ng"
  
! #: tp/Texinfo/Parser.pm:4983
  #, 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/Parser.pm:4988
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr "@%s pháº£i dÆ°á»›i â€œ@floatâ€�"
  
! #: tp/Texinfo/Parser.pm:4996
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr "bá»� qua nhiá»�u @%s"
  
! #: tp/Texinfo/Parser.pm:5114
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr "lá»‡nh @%s khÃ´ng cháº¥p nháº­n Ä‘á»‘i sá»‘"
  
! #: tp/Texinfo/Parser.pm:5138
  #, 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/Parser.pm:5156
  #, 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/Parser.pm:5167
  #, 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/Parser.pm:5180
  msgid "@image missing filename argument"
  msgstr "@image thiáº¿u Ä‘á»‘i sá»‘ tÃªn táº­p tin"
  
! #: tp/Texinfo/Parser.pm:5211
  #, perl-format
  msgid "@%s missing first argument"
  msgstr "@%s thiáº¿u Ä‘á»‘i sá»‘ Ä‘áº§u tiÃªn"
  
! #: tp/Texinfo/Parser.pm:5230
  #, 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/Parser.pm:5236
  #, 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/Parser.pm:5253
  #, 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/Parser.pm:5448
  msgid "superfluous arguments for node"
  msgstr "cÃ¡c Ä‘á»‘i sá»‘ thá»«a cho nÃºt"
  
! #: tp/Texinfo/Parser.pm:5498
  #, perl-format
  msgid "expected @end %s"
  msgstr "cáº§n @end %s"
  
! #: tp/Texinfo/Parser.pm:5607
  #, perl-format
  msgid "@%s should only accept a @-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/Parser.pm:5617
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "Ä‘á»‘i sá»‘ cÃ²n láº¡i trÃªn dÃ²ng @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5689
  #, 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/Parser.pm:5710
  #, perl-format
  msgid "empty @%s"
  msgstr "@%s rá»—ng"
  
! #: tp/Texinfo/Parser.pm:5718
  #, 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/Parser.pm:5727
  #, 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/Parser.pm:5736
  #, perl-format
  msgid "reserved index name %s"
  msgstr "Ä‘Ã£ Ä‘áº£o ngÆ°á»£c tÃªn chá»‰ má»¥c %s"
  
! #: tp/Texinfo/Parser.pm:5762
  #, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "khÃ´ng hiá»ƒu chá»‰ má»¥c nguá»“n trong @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5765
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr "khÃ´ng hiá»ƒu chá»‰ má»¥c Ä‘Ã­ch trong @%s: %s"
  
! #: tp/Texinfo/Parser.pm:5793
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
***************
*** 2941,2960 ****
  "@%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/Parser.pm:5914
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "khÃ´ng hiá»ƒu chá»‰ má»¥c â€œ%sâ€� trong @printindex"
  
! #: tp/Texinfo/Parser.pm:5920
  #, 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/Parser.pm:5928
  #, 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/Parser.pm:5944
  #, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
--- 2937,2956 ----
  "@%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/Parser.pm:5806
  #, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "khÃ´ng hiá»ƒu chá»‰ má»¥c â€œ%sâ€� trong @printindex"
  
! #: tp/Texinfo/Parser.pm:5812
  #, 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/Parser.pm:5820
  #, 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/Parser.pm:5836
  #, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
***************
*** 2965,2974 ****
  "chá»© khÃ´ng pháº£i â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5952
  #, 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/Parser.pm:5960
  #, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
--- 2961,2970 ----
  "chá»© khÃ´ng pháº£i â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5844
  #, 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/Parser.pm:5852
  #, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
***************
*** 2979,2988 ****
  "khÃ´ng pháº£i â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5968
  #, 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/Parser.pm:5986 tp/Texinfo/Parser.pm:5991
  #, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
--- 2975,2984 ----
  "khÃ´ng pháº£i â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5860
  #, 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/Parser.pm:5878 tp/Texinfo/Parser.pm:5883
  #, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
***************
*** 2994,2998 ****
  "chá»© khÃ´ng pháº£i â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5999
  #, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
--- 2990,2994 ----
  "chá»© khÃ´ng pháº£i â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5891
  #, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
***************
*** 3003,3007 ****
  "chá»© khÃ´ng pháº£i â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:6009
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
--- 2999,3003 ----
  "chá»© khÃ´ng pháº£i â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
***************
*** 3013,3022 ****
  "chá»© khÃ´ng pháº£i â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:6021
  #, 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/Parser.pm:6031
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
--- 3009,3018 ----
  "chá»© khÃ´ng pháº£i â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5913
  #, 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/Parser.pm:5922
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
***************
*** 3024,3028 ****
  "Ä‘.sá»‘ @kbdinputstyle pháº£i lÃ  â€œcodeâ€�/â€œexampleâ€�/â€œdistinctâ€�, khÃ´ng pháº£i â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:6039
  #, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
--- 3020,3024 ----
  "Ä‘.sá»‘ @kbdinputstyle pháº£i lÃ  â€œcodeâ€�/â€œexampleâ€�/â€œdistinctâ€�, khÃ´ng pháº£i â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5930
  #, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
***************
*** 3033,3037 ****
  "chá»© khÃ´ng pháº£i â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:6047
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
--- 3029,3033 ----
  "chá»© khÃ´ng pháº£i â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5938
  #, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
***************
*** 3043,3087 ****
  "chá»© khÃ´ng pháº£i â€œ%sâ€�"
  
! #: tp/Texinfo/Structuring.pm:213
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr "nÃ¢ng má»©c chÆ°Æ¡ng cá»§a @%s lÃ  quÃ¡ tháº¥p"
  
! #: tp/Texinfo/Structuring.pm:245
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "khÃ´ng cÃ³ lá»‡nh chapter-level trÆ°á»›c @%s"
  
! #: tp/Texinfo/Structuring.pm:250
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr "Ä‘ang háº¡ tháº¥p má»©c chÆ°Æ¡ng cá»§a @%s xuáº¥t hiá»‡n sau má»™t pháº§n tá»­ á»Ÿ tháº¥p hÆ¡n"
  
! #: tp/Texinfo/Structuring.pm:339
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "khÃ´ng cÃ³ lá»‡nh chÆ°Æ¡ng nÃ o tá»• há»£p cÃ¹ng vá»›i @%s"
  
! #: tp/Texinfo/Structuring.pm:488
  #, perl-format
  msgid "@%s not empty"
  msgstr "@%s khÃ´ng trá»‘ng rá»—ng"
  
! #: tp/Texinfo/Structuring.pm:544 tp/Texinfo/Structuring.pm:1326
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "@%s tham chiáº¿u Ä‘áº¿n nÃºt chÆ°a tá»“n táº¡i â€œ%sâ€�"
  
! #: tp/Texinfo/Structuring.pm:557
  #, perl-format
  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:662
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "nÃºt chÆ°a Ä‘Æ°á»£c tham chiáº¿u â€œ%sâ€�"
  
! #: tp/Texinfo/Structuring.pm:708
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
--- 3039,3083 ----
  "chá»© khÃ´ng pháº£i â€œ%sâ€�"
  
! #: tp/Texinfo/Structuring.pm:216
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr "nÃ¢ng má»©c chÆ°Æ¡ng cá»§a @%s lÃ  quÃ¡ tháº¥p"
  
! #: tp/Texinfo/Structuring.pm:248
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr "khÃ´ng cÃ³ lá»‡nh chapter-level trÆ°á»›c @%s"
  
! #: tp/Texinfo/Structuring.pm:253
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr "Ä‘ang háº¡ tháº¥p má»©c chÆ°Æ¡ng cá»§a @%s xuáº¥t hiá»‡n sau má»™t pháº§n tá»­ á»Ÿ tháº¥p hÆ¡n"
  
! #: tp/Texinfo/Structuring.pm:342
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr "khÃ´ng cÃ³ lá»‡nh chÆ°Æ¡ng nÃ o tá»• há»£p cÃ¹ng vá»›i @%s"
  
! #: tp/Texinfo/Structuring.pm:491
  #, perl-format
  msgid "@%s not empty"
  msgstr "@%s khÃ´ng trá»‘ng rá»—ng"
  
! #: tp/Texinfo/Structuring.pm:547 tp/Texinfo/Structuring.pm:1325
  #, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "@%s tham chiáº¿u Ä‘áº¿n nÃºt chÆ°a tá»“n táº¡i â€œ%sâ€�"
  
! #: tp/Texinfo/Structuring.pm:558
  #, perl-format
  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:663
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "nÃºt chÆ°a Ä‘Æ°á»£c tham chiáº¿u â€œ%sâ€�"
  
! #: tp/Texinfo/Structuring.pm:706
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
***************
*** 3089,3113 ****
  "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:715
  #, 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:733
  #, 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:787
  #, 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:814
  #, 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:834
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
--- 3085,3109 ----
  "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:713
  #, 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:731
  #, 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:786
  #, 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:810
  #, 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:829
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
***************
*** 3115,3119 ****
  "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:842
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
--- 3111,3115 ----
  "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:837
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
***************
*** 3125,3129 ****
  msgstr "@%s thÃ nh â€œ%sâ€�, khÃ¡c vá»›i %s tÃªn â€œ%sâ€�"
  
! #: tp/Texinfo/Structuring.pm:2070
  #, perl-format
  msgid "empty index key in @%s"
--- 3121,3125 ----
  msgstr "@%s thÃ nh â€œ%sâ€�, khÃ¡c vá»›i %s tÃªn â€œ%sâ€�"
  
! #: tp/Texinfo/Structuring.pm:2067
  #, perl-format
  msgid "empty index key in @%s"
***************
*** 3317,3321 ****
  "GNU Ä‘á»™c nháº¥t.\n"
  "\n"
! "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"
  
--- 3313,3317 ----
  "GNU Ä‘á»™c nháº¥t.\n"
  "\n"
! "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"
  
***************
*** 3354,3361 ****
  "      --conf-dir=T.Má»¤C        cÅ©ng tÃ¬m cáº£ cÃ¡c táº­p tin khá»Ÿi táº¡o trong T.Má»¤C.\n"
  "      --init-file=Táº¬P-TIN     táº£i Táº¬P-TIN Ä‘á»ƒ thay Ä‘á»•i hÃ nh Ä‘á»™ng máº·c Ä‘á»‹nh.\n"
! "  -c, --set-customization-variable BIáº¾N=GIÃ�-TRá»Š  Ä‘áº·t biáº¿n BIáº¾N tÃ¹y chá»‰nh\n"
! "                               thÃ nh GIÃ�-TRá»Š.\n"
! "  -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:755
--- 3350,3357 ----
  "      --conf-dir=T.Má»¤C        cÅ©ng tÃ¬m cáº£ cÃ¡c táº­p tin khá»Ÿi táº¡o trong T.Má»¤C.\n"
  "      --init-file=Táº¬P-TIN     táº£i Táº¬P-TIN Ä‘á»ƒ thay Ä‘á»•i hÃ nh Ä‘á»™ng máº·c Ä‘á»‹nh.\n"
! "  -c, --set-customization-variable BIáº¾N=GIÃ�-TRá»Š Ä‘áº·t biáº¿n BIáº¾N tÃ¹y chá»‰nh\n"
! "                                thÃ nh GIÃ�-TRá»Š.\n"
! "  -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:755
***************
*** 3448,3471 ****
  "      --split-size=NUM        split Info files at size NUM (default %d).\n"
  msgstr ""
! "TÃ¹y chá»�n Ä‘á»‘i vá»›i Info vÃ  nháº­p thÃ´ :\n"
  "      --disable-encoding      Ä‘á»«ng xuáº¥t cÃ¡c kÃ½ tá»± cÃ³ dáº¥u phá»¥ vÃ  cÃ¡c kÃ½ tá»±\n"
! "\t\tÄ‘áº·c biá»‡t trong káº¿t xuáº¥t Info dá»±a vÃ o báº£ng mÃ£ tÃ i liá»‡u "
! "@documentencoding.\n"
  "      --enable-encoding       xuáº¥t cÃ¡c kÃ½ tá»± cÃ³ dáº¥u phá»¥ vÃ  kÃ½ tá»± Ä‘áº·c biá»‡t\n"
! "\t\ttrong káº¿t xuáº¥t Info dá»±a vÃ o @documentencoding.\n"
! "\t\t(_báº­t báº£ng mÃ£_)\n"
! "      --fill-column=Sá»�       ngáº¯t cÃ¡c dÃ²ng Info á»Ÿ sá»‘ kÃ½ tá»± nÃ y (máº·c Ä‘á»‹nh lÃ  "
  "%d).\n"
! "\t\t(_tÃ´ Ä‘áº§y cá»™t_)\n"
! "      --footnote-style=KIá»‚U_DÃ�NG\txuáº¥t cÃ¡c cÆ°á»›c chÃº trong Info\n"
! "\t\ttÃ¹y theo kiá»ƒu dÃ¡ng nÃ y:\n"
! "\t\t\tâ€œseparateâ€� (riÃªng) Ä‘á»ƒ Ä‘áº·t cÆ°á»›c chÃº trong cÃ¹ng nÃºt;\n"
! "\t\t\tâ€œendâ€� (cuá»‘i) Ä‘á»ƒ Ä‘áº·t cÆ°á»›c chÃº á»Ÿ cuá»‘i nÃºt trong Ä‘Ã³\n"
! "\t\t\tnÃ³ Ä‘Æ°á»£c Ä‘á»‹nh nghÄ©a (Ä‘Ã¢y lÃ  máº·c Ä‘á»‹nh) (_kiá»ƒu dÃ¡ng cÆ°á»›c chÃº_)\n"
! "      --paragraph-indent=GIÃ�_TRá»Š\t\tthá»¥t lá»� cÃ¡c Ä‘oáº¡n vÄƒn Info\n"
! "\t\ttheo sá»‘ dáº¥u cÃ¡ch nÃ y (máº·c Ä‘á»‹nh lÃ  %d).\n"
! "\t\t\tGIÃ� TRá»Š lÃ  â€œnoneâ€� (khÃ´ng cÃ³) thÃ¬ Ä‘á»«ng thá»¥t lá»�;\n"
! "\t\t\tGIÃ� TRá»Š lÃ  â€œasisâ€� (nhÆ° tháº¿) thÃ¬ báº£o tá»“n sá»± thá»¥t lá»� Ä‘Ã£ cÃ³.\t\t(_Ä‘oáº¡n "
! "vÄƒn thá»¥t lá»�_)\n"
  "      --split-size=Sá»�        chia tÃ¡ch cÃ¡c táº­p tin Info á»Ÿ kÃ­ch cá»¡ Sá»� (máº·c "
  "Ä‘á»‹nh lÃ  %d).\n"
--- 3444,3470 ----
  "      --split-size=NUM        split Info files at size NUM (default %d).\n"
  msgstr ""
! "TÃ¹y chá»�n Ä‘á»‘i vá»›i Info vÃ  nháº­p thÃ´:\n"
  "      --disable-encoding      Ä‘á»«ng xuáº¥t cÃ¡c kÃ½ tá»± cÃ³ dáº¥u phá»¥ vÃ  cÃ¡c kÃ½ tá»±\n"
! "                                Ä‘áº·c biá»‡t trong káº¿t xuáº¥t Info dá»±a vÃ o báº£ng "
! "mÃ£\n"
! "                                tÃ i liá»‡u @documentencoding.\n"
  "      --enable-encoding       xuáº¥t cÃ¡c kÃ½ tá»± cÃ³ dáº¥u phá»¥ vÃ  kÃ½ tá»± Ä‘áº·c biá»‡t\n"
! "                                trong káº¿t xuáº¥t Info dá»±a vÃ o "
! "@documentencoding.\n"
! "      --fill-column=Sá»�        ngáº¯t cÃ¡c dÃ²ng Info á»Ÿ sá»‘ kÃ½ tá»± nÃ y (máº·c Ä‘á»‹nh lÃ  "
  "%d).\n"
! "      --footnote-style=KIá»‚U_DÃ�NG  xuáº¥t cÃ¡c cÆ°á»›c chÃº trong Info\n"
! "                              tÃ¹y theo kiá»ƒu dÃ¡ng nÃ y:\n"
! "                               â€œseparateâ€� (riÃªng) Ä‘á»ƒ Ä‘áº·t cÆ°á»›c chÃº trong cÃ¹ng "
! "nÃºt;\n"
! "                               â€œendâ€� (cuá»‘i) Ä‘á»ƒ Ä‘áº·t cÆ°á»›c chÃº á»Ÿ cuá»‘i nÃºt trong "
! "Ä‘Ã³\n"
! "                              nÃ³ Ä‘Æ°á»£c Ä‘á»‹nh nghÄ©a (Ä‘Ã¢y lÃ  máº·c Ä‘á»‹nh)\n"
! "      --paragraph-indent=GTRá»Š  thá»¥t lá»� cÃ¡c Ä‘oáº¡n vÄƒn Info\n"
! "                              theo sá»‘ dáº¥u cÃ¡ch nÃ y (máº·c Ä‘á»‹nh lÃ  %d). GIÃ� TRá»Š "
! "lÃ :\n"
! "                                 * â€œnoneâ€� (khÃ´ng cÃ³) thÃ¬ Ä‘á»«ng thá»¥t lá»�;\n"
! "                                 * â€œasisâ€� (nhÆ° tháº¿) thÃ¬ báº£o tá»“n sá»± thá»¥t lá»� "
! "Ä‘Ã£ cÃ³.\n"
  "      --split-size=Sá»�        chia tÃ¡ch cÃ¡c táº­p tin Info á»Ÿ kÃ­ch cá»¡ Sá»� (máº·c "
  "Ä‘á»‹nh lÃ  %d).\n"
***************
*** 3491,3500 ****
  "      --internal-links=Táº¬P_TIN táº¡o danh sÃ¡ch cÃ¡c liÃªn káº¿t ná»™i bá»™\n"
  "                                trong táº­p tin nÃ y\n"
! "      --split=SPLIT           chia cáº¯t táº¡i SPLIT, vá»›i SPLIT cÃ³ thá»ƒ "
! "lÃ                                 â€œchapterâ€�, â€œsectionâ€� hoáº·c â€œnodeâ€�.\n"
  "      --transliterate-file-names  táº¡o cÃ¡c tÃªn táº­p tin Ä‘Ã£ chuyá»ƒn chá»¯ ASCII.\n"
! "      --node-files            táº¡o ra cÃ¡c táº­p tin chuyá»ƒn hÆ°á»›ng cho cÃ¡c "
! "nÃºt                               vÃ  Ä‘iá»ƒm neo; máº·c Ä‘á»‹nh chá»‰ Ä‘Æ°á»£c Ä‘áº·t náº¿u "
! "tÃ¡ch.\n"
  
  #: tp/texi2any.pl:811
--- 3490,3498 ----
  "      --internal-links=Táº¬P_TIN táº¡o danh sÃ¡ch cÃ¡c liÃªn káº¿t ná»™i bá»™\n"
  "                                trong táº­p tin nÃ y\n"
! "      --split=SPLIT           chia cáº¯t táº¡i SPLIT, vá»›i SPLIT cÃ³ thá»ƒ lÃ \n"
! "                                â€œchapterâ€�, â€œsectionâ€� hoáº·c â€œnodeâ€�.\n"
  "      --transliterate-file-names  táº¡o cÃ¡c tÃªn táº­p tin Ä‘Ã£ chuyá»ƒn chá»¯ ASCII.\n"
! "      --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:811
***************
*** 3512,3516 ****
  msgstr ""
  "TÃ¹y chá»�n cho DVI/PS/PDF:\n"
! "      --Xopt=OPT              chuyá»ƒn OPT cho texi2dvi; cÃ³ thá»ƒ láº·p láº¡i.\n"
  
  #: tp/texi2any.pl:817
--- 3510,3514 ----
  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:817
***************
*** 3524,3530 ****
  "  -U VAR                        undefine the variable VAR, as with @clear.\n"
  msgstr ""
! "TÃ¹y chá»�n táº­p tin Ä‘áº§u vÃ o :\n"
! "      --commands-in-node-names  khÃ´ng lÃ m gÃ¬ cáº£, vá»›i má»¥c Ä‘Ã­ch tÆ°Æ¡ng thÃ­ch.\n"
! "\t\t(táº¡m dá»‹ch: _cÃ¡c lá»‡nh trong tÃªn nÃºt_)\n"
  "  -D BIáº¾N                       Ä‘á»‹nh nghÄ©a biáº¿n nÃ y, giá»‘ng nhÆ° @set.\n"
  "  -D â€œBIáº¾N GIÃ�-TRá»Šâ€�             Ä‘á»‹nh nghÄ©a BIáº¾N cÃ³ GIÃ�-TRá»Š (má»™t Ä‘á»‘i sá»‘ há»‡ "
--- 3522,3528 ----
  "  -U VAR                        undefine the variable VAR, as with @clear.\n"
  msgstr ""
! "TÃ¹y chá»�n táº­p tin Ä‘áº§u vÃ o:\n"
! "       --commands-in-node-names  khÃ´ng lÃ m gÃ¬ cáº£, vá»›i má»¥c Ä‘Ã­ch tÆ°Æ¡ng thÃ­ch.\n"
! "      (táº¡m dá»‹ch: _cÃ¡c lá»‡nh trong tÃªn nÃºt_)\n"
  "  -D BIáº¾N                       Ä‘á»‹nh nghÄ©a biáº¿n nÃ y, giá»‘ng nhÆ° @set.\n"
  "  -D â€œBIáº¾N GIÃ�-TRá»Šâ€�             Ä‘á»‹nh nghÄ©a BIáº¾N cÃ³ GIÃ�-TRá»Š (má»™t Ä‘á»‘i sá»‘ há»‡ "
***************
*** 3606,3610 ****
  "  makeinfo --no-split foo.texi           write one Info file however big\n"
  msgstr ""
! "VÃ­ dá»¥ :\n"
  "  makeinfo foo.texi                      ghi Info vÃ o @setfilename cá»§a foo\n"
  "  makeinfo --html foo.texi               ghi HTML vÃ o @setfilename\n"
--- 3604,3608 ----
  "  makeinfo --no-split foo.texi           write one Info file however big\n"
  msgstr ""
! "VÃ­ dá»¥:\n"
  "  makeinfo foo.texi                      ghi Info vÃ o @setfilename cá»§a foo\n"
  "  makeinfo --html foo.texi               ghi HTML vÃ o @setfilename\n"
***************
*** 3671,3675 ****
  msgstr "HÃ£y thá»­ lá»‡nh trá»£ giÃºp â€œ%s --helpâ€� Ä‘á»ƒ xem thÃ´ng tin thÃªm.\n"
  
! #: tp/texi2any.pl:1232
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
--- 3669,3673 ----
  msgstr "HÃ£y thá»­ lá»‡nh trá»£ giÃºp â€œ%s --helpâ€� Ä‘á»ƒ xem thÃ´ng tin thÃªm.\n"
  
! #: tp/texi2any.pl:1239
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
***************
*** 3677,3691 ****
  "chÆ°Æ¡ng nÃ o Ã ?"
  
! #: tp/texi2any.pl:1255
  #, 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:1261
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "khÃ´ng thá»ƒ má»Ÿ â€œ%sâ€� Ä‘á»ƒ ghi: %s\n"
  
! #: tp/texi2any.pl:1286
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
--- 3675,3689 ----
  "chÆ°Æ¡ng nÃ o Ã ?"
  
! #: tp/texi2any.pl:1262
  #, 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:1268
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "khÃ´ng thá»ƒ má»Ÿ â€œ%sâ€� Ä‘á»ƒ ghi: %s\n"
  
! #: tp/texi2any.pl:1293
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
***************
*** 3695,3713 ****
  "cÃ³ chÆ°Æ¡ng nÃ o Ã ?"
  
! #: tp/texi2any.pl:1359 tp/texi2any.pl:1435
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%s: lá»—i Ä‘Ã³ng táº­p tin %s: %s\n"
  
! #: tp/texi2any.pl:1382 tp/texi2any.pl:1416
  #, 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:1388 tp/texi2any.pl:1422
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
  msgstr "%s: khÃ´ng thá»ƒ má»Ÿ â€œ%sâ€� Ä‘á»ƒ ghi: %s\n"
  
  #~ msgid "--*** Tags out of Date ***"
  #~ msgstr "--*** Tháº» quÃ¡ cÅ© ***"
--- 3693,3723 ----
  "cÃ³ chÆ°Æ¡ng nÃ o Ã ?"
  
! #: tp/texi2any.pl:1366 tp/texi2any.pl:1442
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr "%s: lá»—i Ä‘Ã³ng táº­p tin %s: %s\n"
  
! #: tp/texi2any.pl:1389 tp/texi2any.pl:1423
  #, 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:1395 tp/texi2any.pl:1429
  #, perl-format
  msgid "%s: could not open %s for writing: %s\n"
  msgstr "%s: khÃ´ng thá»ƒ má»Ÿ â€œ%sâ€� Ä‘á»ƒ ghi: %s\n"
  
+ #~ msgid "-%s---Info: %s, %ld lines --%s--"
+ #~ msgstr "-%s---Info: %s, %ld dÃ²ng  --%s--"
+ 
+ #~ msgid "-%s---Info: (%s)%s, %ld lines --%s--"
+ #~ msgstr "-%s---Info: (%s)%s, %ld dÃ²ng --%s--"
+ 
+ #~ msgid "No file given for node '%s'."
+ #~ msgstr "ChÆ°a chá»‰ ra táº­p tin cho nÃºt â€œ%sâ€�"
+ 
+ #~ msgid "argument for @U exceeds size of integer: %s"
+ #~ msgstr "Ä‘á»‘i sá»‘ cho @U vÆ°á»£t quÃ¡ cá»¡ cá»§a kiá»ƒu sá»‘ nguyÃªn: %s"
+ 
  #~ msgid "--*** Tags out of Date ***"
  #~ msgstr "--*** Tháº» quÃ¡ cÅ© ***"
Binary files texinfo-6.1/po/zh_CN.gmo and texinfo-6.3/po/zh_CN.gmo differ
diff -Nrc2 texinfo-6.1/po/zh_CN.po texinfo-6.3/po/zh_CN.po
*** texinfo-6.1/po/zh_CN.po	2016-02-06 11:35:56.000000000 +0000
--- texinfo-6.3/po/zh_CN.po	2016-09-10 12:45:57.000000000 +0100
***************
*** 8,12 ****
  "Project-Id-Version: texinfo 4.13\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
  "PO-Revision-Date: 2009-05-21 15:08ä¸­å›½æ ‡å‡†æ—¶é—´\n"
  "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
--- 8,12 ----
  "Project-Id-Version: texinfo 4.13\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:45+0100\n"
  "PO-Revision-Date: 2009-05-21 15:08ä¸­å›½æ ‡å‡†æ—¶é—´\n"
  "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
***************
*** 16,19 ****
--- 16,20 ----
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
+ "X-Bugs: Report translation errors to the Language-Team address.\n"
  
  #: gnulib/lib/error.c:191
***************
*** 114,120 ****
  
  #: gnulib/lib/regcomp.c:156
! #, fuzzy
! msgid "Unmatched [ or [^"
! msgstr "ä¸�åŒ¹é…�çš„ }"
  
  #: gnulib/lib/regcomp.c:159
--- 115,120 ----
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [, [^, [:, [., or [="
! msgstr ""
  
  #: gnulib/lib/regcomp.c:159
***************
*** 161,165 ****
  msgstr "ä¸�åŒ¹é…�çš„ }"
  
! #: gnulib/lib/regcomp.c:711
  #, fuzzy
  msgid "No previous regular expression"
--- 161,165 ----
  msgstr "ä¸�åŒ¹é…�çš„ }"
  
! #: gnulib/lib/regcomp.c:687
  #, fuzzy
  msgid "No previous regular expression"
***************
*** 314,318 ****
  msgstr "---------- è„šæ³¨ ----------"
  
! #: info/indices.c:123 info/indices.c:812
  #, c-format
  msgid "Finding index entries..."
--- 314,318 ----
  msgstr "---------- è„šæ³¨ ----------"
  
! #: info/indices.c:123 info/indices.c:822
  #, c-format
  msgid "Finding index entries..."
***************
*** 323,327 ****
  msgstr "åœ¨æœ¬æ–‡ä»¶çš„ç´¢å¼•ä¸­æ�œç´¢å­—ç¬¦ä¸²"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:818
  #, c-format
  msgid "No indices found."
--- 323,327 ----
  msgstr "åœ¨æœ¬æ–‡ä»¶çš„ç´¢å¼•ä¸­æ�œç´¢å­—ç¬¦ä¸²"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:828
  #, c-format
  msgid "No indices found."
***************
*** 353,385 ****
  msgstr "æ²¡æœ‰ %sç´¢å¼•æ�¡ç›®å�«æœ‰â€œ%sâ€�ã€‚"
  
! #: info/indices.c:476 info/indices.c:880
  #, fuzzy, c-format
  msgid "No index entries containing '%s'."
  msgstr "æ²¡æœ‰ %sç´¢å¼•æ�¡ç›®å�«æœ‰â€œ%sâ€�ã€‚"
  
! #: info/indices.c:583
  #, fuzzy, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "æ­£åœ¨æ�œç´¢â€œ%sâ€�çš„ç´¢å¼•..."
  
! #: info/indices.c:636
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr "æ•´ç�†æ‰€æœ‰å·²çŸ¥ info æ–‡ä»¶å�«æœ‰è¢«æŸ¥è¯¢å­—ç¬¦ä¸²çš„ç´¢å¼•å¹¶å»ºç«‹ä¸€ä¸ªè�œå�•"
  
! #: info/indices.c:644 info/indices.c:646
  #, fuzzy
  msgid "Index apropos"
  msgstr "ç´¢å¼•å�«æœ‰ï¼š"
  
! #: info/indices.c:688
  #, fuzzy, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "æ²¡æœ‰ %sç´¢å¼•æ�¡ç›®å�«æœ‰â€œ%sâ€�ã€‚"
  
! #: info/indices.c:797
  msgid "List all matches of a string in the index"
  msgstr ""
  
! #: info/indices.c:824 info/indices.c:826
  #, fuzzy
  msgid "Index topic"
--- 353,385 ----
  msgstr "æ²¡æœ‰ %sç´¢å¼•æ�¡ç›®å�«æœ‰â€œ%sâ€�ã€‚"
  
! #: info/indices.c:476 info/indices.c:890
  #, fuzzy, c-format
  msgid "No index entries containing '%s'."
  msgstr "æ²¡æœ‰ %sç´¢å¼•æ�¡ç›®å�«æœ‰â€œ%sâ€�ã€‚"
  
! #: info/indices.c:586
  #, fuzzy, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "æ­£åœ¨æ�œç´¢â€œ%sâ€�çš„ç´¢å¼•..."
  
! #: info/indices.c:646
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr "æ•´ç�†æ‰€æœ‰å·²çŸ¥ info æ–‡ä»¶å�«æœ‰è¢«æŸ¥è¯¢å­—ç¬¦ä¸²çš„ç´¢å¼•å¹¶å»ºç«‹ä¸€ä¸ªè�œå�•"
  
! #: info/indices.c:654 info/indices.c:656
  #, fuzzy
  msgid "Index apropos"
  msgstr "ç´¢å¼•å�«æœ‰ï¼š"
  
! #: info/indices.c:698
  #, fuzzy, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "æ²¡æœ‰ %sç´¢å¼•æ�¡ç›®å�«æœ‰â€œ%sâ€�ã€‚"
  
! #: info/indices.c:807
  msgid "List all matches of a string in the index"
  msgstr ""
  
! #: info/indices.c:834 info/indices.c:836
  #, fuzzy
  msgid "Index topic"
***************
*** 391,445 ****
  msgstr "åœ¨å�¯ç”¨çš„ info æ–‡ä»¶çš„ç´¢å¼•ä¸­å�‡ä¸�å�«æœ‰â€œ%sâ€�ã€‚"
  
! #: info/info-utils.c:892
  #, c-format
  msgid "Error converting file character encoding."
  msgstr ""
  
! #: info/info.c:222 info/session.c:2789
  #, fuzzy, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "èŠ‚ç‚¹â€œ%2$sâ€�ä¸­æ²¡æœ‰è�œå�•é¡¹â€œ%1$sâ€�ã€‚"
  
! #: info/info.c:315
! #, fuzzy, c-format
! msgid "No file given for node '%s'."
! msgstr "èŠ‚ç‚¹â€œ%sâ€�ä¸­æ²¡æœ‰è�œå�•ã€‚"
! 
! #: info/info.c:364 info/info.c:1133
  #, fuzzy, c-format
  msgid "Cannot find node '%s'."
  msgstr "æ— æ³•æ‰¾åˆ°èŠ‚ç‚¹â€œ%sâ€�ã€‚"
  
! #: info/info.c:386
  #, c-format
  msgid "No program name given."
  msgstr ""
  
! #: info/info.c:577
  #, c-format
  msgid "invalid number: %s\n"
  msgstr ""
  
! #: info/info.c:757
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr ""
  
! #: info/info.c:764 info/infokey.c:537
  #, c-format
  msgid "%s: no such variable"
  msgstr ""
  
! #: info/info.c:770 info/infokey.c:539
  #, fuzzy, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "è®¾å®š Info å�˜é‡�çš„å€¼"
  
! #: info/info.c:782
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "å°�è¯• --æ›´å¤šçš„æ±‚åŠ©ä¿¡æ�¯ã€‚\n"
  
! #: info/info.c:804 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
--- 391,440 ----
  msgstr "åœ¨å�¯ç”¨çš„ info æ–‡ä»¶çš„ç´¢å¼•ä¸­å�‡ä¸�å�«æœ‰â€œ%sâ€�ã€‚"
  
! #: info/info-utils.c:879
  #, c-format
  msgid "Error converting file character encoding."
  msgstr ""
  
! #: info/info.c:279 info/session.c:2789
  #, fuzzy, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "èŠ‚ç‚¹â€œ%2$sâ€�ä¸­æ²¡æœ‰è�œå�•é¡¹â€œ%1$sâ€�ã€‚"
  
! #: info/info.c:416 info/info.c:1148
  #, fuzzy, c-format
  msgid "Cannot find node '%s'."
  msgstr "æ— æ³•æ‰¾åˆ°èŠ‚ç‚¹â€œ%sâ€�ã€‚"
  
! #: info/info.c:438
  #, c-format
  msgid "No program name given."
  msgstr ""
  
! #: info/info.c:636
  #, c-format
  msgid "invalid number: %s\n"
  msgstr ""
  
! #: info/info.c:816
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr ""
  
! #: info/info.c:823 info/infokey.c:540
  #, c-format
  msgid "%s: no such variable"
  msgstr ""
  
! #: info/info.c:829 info/infokey.c:542
  #, fuzzy, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "è®¾å®š Info å�˜é‡�çš„å€¼"
  
! #: info/info.c:841
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "å°�è¯• --æ›´å¤šçš„æ±‚åŠ©ä¿¡æ�¯ã€‚\n"
  
! #: info/info.c:860 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
***************
*** 456,465 ****
  "There is NO WARRANTY, to the extent permitted by law.\n"
  
! #: info/info.c:981
  #, fuzzy, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "æ‰¾ä¸�åˆ°å�«æœ‰â€œ%sâ€�çš„ç´¢å¼•\n"
  
! #: info/info.c:1034
  #, c-format
  msgid ""
--- 451,460 ----
  "There is NO WARRANTY, to the extent permitted by law.\n"
  
! #: info/info.c:999
  #, fuzzy, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "æ‰¾ä¸�åˆ°å�«æœ‰â€œ%sâ€�çš„ç´¢å¼•\n"
  
! #: info/info.c:1049
  #, c-format
  msgid ""
***************
*** 472,476 ****
  "ä»¥ Info æ ¼å¼�é˜…è¯»æ–‡æ¡£ã€‚\n"
  
! #: info/info.c:1040
  #, fuzzy
  msgid ""
--- 467,471 ----
  "ä»¥ Info æ ¼å¼�é˜…è¯»æ–‡æ¡£ã€‚\n"
  
! #: info/info.c:1055
  #, fuzzy
  msgid ""
***************
*** 489,493 ****
  "  -f, --file=FILENAME          æŒ‡å®šæƒ³æµ�è§ˆçš„ Info æ–‡ä»¶ã€‚"
  
! #: info/info.c:1048
  #, fuzzy
  msgid ""
--- 484,488 ----
  "  -f, --file=FILENAME          æŒ‡å®šæƒ³æµ�è§ˆçš„ Info æ–‡ä»¶ã€‚"
  
! #: info/info.c:1063
  #, fuzzy
  msgid ""
***************
*** 502,506 ****
  "  -o, --output=FILENAME        å°†é€‰ä¸­çš„èŠ‚ç‚¹å…¨è¾“å‡ºè‡³ FILENAMEã€‚"
  
! #: info/info.c:1054
  #, fuzzy
  msgid ""
--- 497,501 ----
  "  -o, --output=FILENAME        å°†é€‰ä¸­çš„èŠ‚ç‚¹å…¨è¾“å‡ºè‡³ FILENAMEã€‚"
  
! #: info/info.c:1069
  #, fuzzy
  msgid ""
***************
*** 515,524 ****
  "  -O, --show-options, --usage  è·³è½¬è‡³å‘½ä»¤è¡Œé€‰é¡¹èŠ‚ç‚¹ã€‚"
  
! #: info/info.c:1061
  #, fuzzy
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr "  -b, --speech-friendly        å¯¹å�‘éŸ³å™¨å…¼å®¹ã€‚"
  
! #: info/info.c:1065
  #, fuzzy
  msgid ""
--- 510,519 ----
  "  -O, --show-options, --usage  è·³è½¬è‡³å‘½ä»¤è¡Œé€‰é¡¹èŠ‚ç‚¹ã€‚"
  
! #: info/info.c:1076
  #, fuzzy
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr "  -b, --speech-friendly        å¯¹å�‘éŸ³å™¨å…¼å®¹ã€‚"
  
! #: info/info.c:1080
  #, fuzzy
  msgid ""
***************
*** 537,541 ****
  "  -w, --where, --location      æ‰“å�° Info æ–‡ä»¶åœ¨ç³»ç»Ÿä¸­çš„ä½�ç½®ã€‚"
  
! #: info/info.c:1074
  #, fuzzy
  msgid ""
--- 532,536 ----
  "  -w, --where, --location      æ‰“å�° Info æ–‡ä»¶åœ¨ç³»ç»Ÿä¸­çš„ä½�ç½®ã€‚"
  
! #: info/info.c:1089
  #, fuzzy
  msgid ""
***************
*** 554,558 ****
  "èŠ‚ç‚¹æœ‰å…³çš„è�œå�•é¡¹å��ç§°ã€‚"
  
! #: info/info.c:1081
  #, fuzzy
  msgid ""
--- 549,553 ----
  "èŠ‚ç‚¹æœ‰å…³çš„è�œå�•é¡¹å��ç§°ã€‚"
  
! #: info/info.c:1096
  #, fuzzy
  msgid ""
***************
*** 563,567 ****
  "åœ¨å¸®åŠ©ä¿¡æ�¯ä¸­æŒ‰ h èŽ·å�–æœ‰å…³æŒ‰é”®ç»‘å®šçš„å†…å®¹ã€‚"
  
! #: info/info.c:1084
  #, fuzzy
  msgid ""
--- 558,562 ----
  "åœ¨å¸®åŠ©ä¿¡æ�¯ä¸­æŒ‰ h èŽ·å�–æœ‰å…³æŒ‰é”®ç»‘å®šçš„å†…å®¹ã€‚"
  
! #: info/info.c:1099
  #, fuzzy
  msgid ""
***************
*** 590,594 ****
  "  info -f ./foo.info         æ˜¾ç¤ºæ–‡ä»¶ ./foo.infoï¼Œè€Œä¸�æ˜¯æŸ¥æ‰¾ç›®å½•"
  
! #: info/info.c:1099 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
--- 585,589 ----
  "  info -f ./foo.info         æ˜¾ç¤ºæ–‡ä»¶ ./foo.infoï¼Œè€Œä¸�æ˜¯æŸ¥æ‰¾ç›®å½•"
  
! #: info/info.c:1114 install-info/install-info.c:616 tp/texi2any.pl:861
  msgid ""
  "Email bug reports to bug-texinfo@gnu.org,\n"
***************
*** 600,664 ****
  "Texinfo ä¸»é¡µï¼šhttp://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1134
  #, fuzzy, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "æ— æ³•æ‰¾åˆ°èŠ‚ç‚¹â€œ(%s)%sâ€�ã€‚"
  
! #: info/info.c:1135
  msgid "Cannot find a window!"
  msgstr "æ— æ³•æ‰¾åˆ°ä¸€ä¸ªçª—å�£ï¼�"
  
! #: info/info.c:1136
  msgid "Point doesn't appear within this window's node!"
  msgstr "å…‰æ ‡æ²¡æœ‰å‡ºçŽ°åœ¨è¯¥çª—å�£çš„èŠ‚ç‚¹ä¹‹ä¸­ï¼�"
  
! #: info/info.c:1137
  msgid "Cannot delete the last window."
  msgstr "æ— æ³•åˆ é™¤æœ€å�Žçš„çª—å�£ã€‚"
  
! #: info/info.c:1138
  msgid "No menu in this node."
  msgstr "è¯¥èŠ‚ç‚¹ä¸­æ²¡æœ‰è�œå�•ã€‚"
  
! #: info/info.c:1139
  msgid "No footnotes in this node."
  msgstr "è¯¥èŠ‚ç‚¹ä¸­æ²¡æœ‰è„šæ³¨ã€‚"
  
! #: info/info.c:1140
  msgid "No cross references in this node."
  msgstr "è¯¥èŠ‚ç‚¹ä¸­æ²¡æœ‰äº¤å�‰å¼•ç”¨ã€‚"
  
! #: info/info.c:1141
  #, fuzzy, c-format
  msgid "No '%s' pointer for this node."
  msgstr "è¯¥èŠ‚ç‚¹ä¸­æ²¡æœ‰â€œ%sâ€�æŒ‡é’ˆ"
  
! #: info/info.c:1142
  #, fuzzy, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "æœªçŸ¥çš„ Info å‘½ä»¤â€œ%câ€�ï¼›è¯·ä»¥â€œ?â€�èŽ·å¾—å¸®åŠ©ã€‚"
  
! #: info/info.c:1143
  #, fuzzy, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "ç»ˆç«¯ç±»åž‹â€œ%sâ€�çš„èƒ½åŠ›ä¸�è¶³ä»¥æ”¯æŒ� Info çš„è¿�è¡Œã€‚"
  
! #: info/info.c:1144
  msgid "You are already at the last page of this node."
  msgstr "æ‚¨å·²ç»�åœ¨è¯¥èŠ‚ç‚¹çš„æœ€å�Žä¸€ä¸ªé¡µé�¢ä¸­äº†ã€‚"
  
! #: info/info.c:1145
  msgid "You are already at the first page of this node."
  msgstr "æ‚¨å·²ç»�åœ¨è¯¥èŠ‚ç‚¹çš„ç¬¬ä¸€é¡µä¸­äº†ã€‚"
  
! #: info/info.c:1146
  msgid "Only one window."
  msgstr "å�ªæœ‰ä¸€ä¸ªçª—å�£ã€‚"
  
! #: info/info.c:1147
  msgid "Resulting window would be too small."
  msgstr "ç»“æžœçª—å�£å°†ä¼šå¤ªå°�ã€‚"
  
! #: info/info.c:1148
  msgid "Not enough room for a help window, please delete a window."
  msgstr "æ²¡æœ‰è¶³å¤Ÿçš„ç©ºé—´ç”¨äºŽæ±‚åŠ©çª—å�£ï¼Œè¯·åˆ é™¤ä¸€ä¸ªçª—å�£ã€‚"
--- 595,659 ----
  "Texinfo ä¸»é¡µï¼šhttp://www.gnu.org/software/texinfo/"
  
! #: info/info.c:1149
  #, fuzzy, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "æ— æ³•æ‰¾åˆ°èŠ‚ç‚¹â€œ(%s)%sâ€�ã€‚"
  
! #: info/info.c:1150
  msgid "Cannot find a window!"
  msgstr "æ— æ³•æ‰¾åˆ°ä¸€ä¸ªçª—å�£ï¼�"
  
! #: info/info.c:1151
  msgid "Point doesn't appear within this window's node!"
  msgstr "å…‰æ ‡æ²¡æœ‰å‡ºçŽ°åœ¨è¯¥çª—å�£çš„èŠ‚ç‚¹ä¹‹ä¸­ï¼�"
  
! #: info/info.c:1152
  msgid "Cannot delete the last window."
  msgstr "æ— æ³•åˆ é™¤æœ€å�Žçš„çª—å�£ã€‚"
  
! #: info/info.c:1153
  msgid "No menu in this node."
  msgstr "è¯¥èŠ‚ç‚¹ä¸­æ²¡æœ‰è�œå�•ã€‚"
  
! #: info/info.c:1154
  msgid "No footnotes in this node."
  msgstr "è¯¥èŠ‚ç‚¹ä¸­æ²¡æœ‰è„šæ³¨ã€‚"
  
! #: info/info.c:1155
  msgid "No cross references in this node."
  msgstr "è¯¥èŠ‚ç‚¹ä¸­æ²¡æœ‰äº¤å�‰å¼•ç”¨ã€‚"
  
! #: info/info.c:1156
  #, fuzzy, c-format
  msgid "No '%s' pointer for this node."
  msgstr "è¯¥èŠ‚ç‚¹ä¸­æ²¡æœ‰â€œ%sâ€�æŒ‡é’ˆ"
  
! #: info/info.c:1157
  #, fuzzy, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "æœªçŸ¥çš„ Info å‘½ä»¤â€œ%câ€�ï¼›è¯·ä»¥â€œ?â€�èŽ·å¾—å¸®åŠ©ã€‚"
  
! #: info/info.c:1158
  #, fuzzy, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "ç»ˆç«¯ç±»åž‹â€œ%sâ€�çš„èƒ½åŠ›ä¸�è¶³ä»¥æ”¯æŒ� Info çš„è¿�è¡Œã€‚"
  
! #: info/info.c:1159
  msgid "You are already at the last page of this node."
  msgstr "æ‚¨å·²ç»�åœ¨è¯¥èŠ‚ç‚¹çš„æœ€å�Žä¸€ä¸ªé¡µé�¢ä¸­äº†ã€‚"
  
! #: info/info.c:1160
  msgid "You are already at the first page of this node."
  msgstr "æ‚¨å·²ç»�åœ¨è¯¥èŠ‚ç‚¹çš„ç¬¬ä¸€é¡µä¸­äº†ã€‚"
  
! #: info/info.c:1161
  msgid "Only one window."
  msgstr "å�ªæœ‰ä¸€ä¸ªçª—å�£ã€‚"
  
! #: info/info.c:1162
  msgid "Resulting window would be too small."
  msgstr "ç»“æžœçª—å�£å°†ä¼šå¤ªå°�ã€‚"
  
! #: info/info.c:1163
  msgid "Not enough room for a help window, please delete a window."
  msgstr "æ²¡æœ‰è¶³å¤Ÿçš„ç©ºé—´ç”¨äºŽæ±‚åŠ©çª—å�£ï¼Œè¯·åˆ é™¤ä¸€ä¸ªçª—å�£ã€‚"
***************
*** 929,963 ****
  msgstr "æœªçŸ¥çš„åŠ¨ä½œâ€œ%sâ€�"
  
! #: info/infokey.c:482
  #, c-format
  msgid "action name too long"
  msgstr "åŠ¨ä½œå��è¿‡é•¿"
  
! #: info/infokey.c:495
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "åŠ¨ä½œâ€œ%sâ€�ä¹‹å�Žå‡ºçŽ°é¢�å¤–çš„å­—ç¬¦"
  
! #: info/infokey.c:506
  #, c-format
  msgid "missing variable name"
  msgstr "é�—æ¼�å�˜é‡�å��"
  
! #: info/infokey.c:515
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "å�˜é‡�å��ä¹‹å�Žé�—æ¼�äº†â€œ=â€�"
  
! #: info/infokey.c:522
  #, c-format
  msgid "variable name too long"
  msgstr "å�˜é‡�å��è¿‡é•¿"
  
! #: info/infokey.c:546
  #, c-format
  msgid "value too long"
  msgstr "å€¼è¿‡é•¿"
  
! #: info/infokey.c:592
  #, c-format
  msgid "\"%s\", line %u: "
--- 924,958 ----
  msgstr "æœªçŸ¥çš„åŠ¨ä½œâ€œ%sâ€�"
  
! #: info/infokey.c:485
  #, c-format
  msgid "action name too long"
  msgstr "åŠ¨ä½œå��è¿‡é•¿"
  
! #: info/infokey.c:498
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr "åŠ¨ä½œâ€œ%sâ€�ä¹‹å�Žå‡ºçŽ°é¢�å¤–çš„å­—ç¬¦"
  
! #: info/infokey.c:509
  #, c-format
  msgid "missing variable name"
  msgstr "é�—æ¼�å�˜é‡�å��"
  
! #: info/infokey.c:518
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr "å�˜é‡�å��ä¹‹å�Žé�—æ¼�äº†â€œ=â€�"
  
! #: info/infokey.c:525
  #, c-format
  msgid "variable name too long"
  msgstr "å�˜é‡�å��è¿‡é•¿"
  
! #: info/infokey.c:549
  #, c-format
  msgid "value too long"
  msgstr "å€¼è¿‡é•¿"
  
! #: info/infokey.c:595
  #, c-format
  msgid "\"%s\", line %u: "
***************
*** 1286,1628 ****
  msgstr "æ— æ³•åœ¨â€œ%2$sâ€�ä¸­æ‰¾åˆ°ç”±â€œ%1$sâ€�å¼•ç”¨çš„èŠ‚ç‚¹ã€‚"
  
! #: info/session.c:2864
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "è¯»å�–è‡ª dir å¼€å§‹çš„è�œå�•çš„åˆ—è¡¨å¹¶è·Ÿéš�å®ƒä»¬"
  
! #: info/session.c:2866
  msgid "Follow menus: "
  msgstr "è·Ÿéš�è�œå�•ï¼š"
  
! #: info/session.c:2971
  msgid "Select the Next node"
  msgstr "é€‰æ‹©ä¸‹ä¸€ä¸ªèŠ‚ç‚¹"
  
! #: info/session.c:2978
  msgid "Select the Prev node"
  msgstr "é€‰æ‹©ä¸Šä¸€ä¸ªèŠ‚ç‚¹"
  
! #: info/session.c:2985
  msgid "Select the Up node"
  msgstr "é€‰æ‹©ä¸Šå±‚èŠ‚ç‚¹"
  
! #: info/session.c:2991
  msgid "Select the last node in this file"
  msgstr "é€‰æ‹©æœ¬æ–‡ä»¶çš„æœ€å�Žä¸€ä¸ªèŠ‚ç‚¹"
  
! #: info/session.c:3018 info/session.c:3051
  msgid "This window has no additional nodes"
  msgstr "è¯¥çª—å�£æ²¡æœ‰é™„åŠ èŠ‚ç‚¹"
  
! #: info/session.c:3024
  msgid "Select the first node in this file"
  msgstr "é€‰æ‹©æœ¬æ–‡ä»¶çš„ç¬¬ä¸€ä¸ªèŠ‚ç‚¹"
  
! #: info/session.c:3158
  msgid "No more nodes within this document."
  msgstr "æœ¬æ–‡æ¡£ä¸­æ²¡æœ‰æ›´å¤šçš„èŠ‚ç‚¹ã€‚"
  
! #: info/session.c:3203 info/session.c:3243
  #, fuzzy
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "åœ¨æœ¬æ–‡æ¡£ä¸­æ²¡æœ‰æœ¬èŠ‚ç‚¹çš„â€œä¸Šä¸€ä¸ªâ€�æˆ–â€œä¸Šå±‚â€�èŠ‚ç‚¹ã€‚"
  
! #: info/session.c:3256
  msgid "Move forwards or down through node structure"
  msgstr "åœ¨èŠ‚ç‚¹ç»“æž„ä¸­å�‘å‰�æˆ–å�‘ä¸‹å±‚ç§»åŠ¨"
  
! #: info/session.c:3273
  msgid "Move backwards or up through node structure"
  msgstr "åœ¨èŠ‚ç‚¹ç»“æž„ä¸­å�‘å�Žæˆ–å�‘ä¸Šå±‚ç§»åŠ¨"
  
! #: info/session.c:3296
  msgid "Read a node name and select it"
  msgstr "è¯»å�–èŠ‚ç‚¹å��å¹¶é€‰æ‹©å®ƒ"
  
! #: info/session.c:3350 info/session.c:3354
  msgid "Goto node: "
  msgstr "è½¬åˆ°èŠ‚ç‚¹ï¼š"
  
! #: info/session.c:3533
  msgid "Find the node describing program invocation"
  msgstr "å¯»æ‰¾è¯´æ˜Žç¨‹åº�è°ƒç”¨çš„èŠ‚ç‚¹"
  
! #: info/session.c:3535
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "å¯»æ‰¾ [%s] çš„è°ƒç”¨èŠ‚ç‚¹ï¼š"
  
! #: info/session.c:3580
  msgid "Read a manpage reference and select it"
  msgstr "è¯»å�–ä¸€ä¸ª man æ‰‹å†Œçš„å¼•ç”¨å¹¶é€‰æ‹©å®ƒ"
  
! #: info/session.c:3584
  msgid "Get Manpage: "
  msgstr "èŽ·å�– man æ‰‹å†Œï¼š"
  
! #: info/session.c:3605
  #, fuzzy
  msgid "Select the node 'Top' in this file"
  msgstr "é€‰æ‹©æœ¬æ–‡ä»¶ä¸­çš„â€œé¡¶â€�èŠ‚ç‚¹"
  
! #: info/session.c:3611
  #, fuzzy
  msgid "Select the node '(dir)'"
  msgstr "é€‰æ‹©èŠ‚ç‚¹â€œ(dir)â€�"
  
! #: info/session.c:3617
  msgid "Show full file name of node being displayed"
  msgstr ""
  
! #: info/session.c:3634
  msgid "Select the most recently selected node"
  msgstr "é€‰æ‹©æœ€è¿‘é€‰æ‹©çš„èŠ‚ç‚¹"
  
! #: info/session.c:3639
  #, c-format
  msgid "No earlier node in history"
  msgstr ""
  
! #: info/session.c:3643
  msgid "Read the name of a file and select it"
  msgstr "è¯»å�–æ–‡ä»¶å��å¹¶é€‰æ‹©å®ƒ"
  
! #: info/session.c:3647
  msgid "Find file: "
  msgstr "å¯»æ‰¾æ–‡ä»¶ï¼š"
  
! #: info/session.c:3664
  #, fuzzy, c-format
  msgid "Cannot find '%s'."
  msgstr "æ— æ³•å¯»æ‰¾â€œ%sâ€�ã€‚"
  
! #: info/session.c:3713
  #, fuzzy, c-format
  msgid "Could not create output file '%s'."
  msgstr "æ— æ³•åˆ›å»ºè¾“å‡ºæ–‡ä»¶â€œ%sâ€�ã€‚"
  
! #: info/session.c:3727
  #, fuzzy, c-format
  msgid "error writing to %s: %s"
  msgstr "å†™å…¥â€œ%sâ€�æ—¶å‡ºé”™"
  
! #: info/session.c:3736
  #, fuzzy, c-format
  msgid "closing %s"
  msgstr "åˆ é™¤ %s\n"
  
! #: info/session.c:3785
  #, fuzzy, c-format
  msgid "writing node %s..."
  msgstr "æ­£åœ¨å†™å…¥èŠ‚ç‚¹ %s..."
  
! #: info/session.c:3831
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "é€šè¿‡ç®¡é�“å°†æœ¬èŠ‚ç‚¹çš„å†…å®¹è¾“å‡ºåˆ° INFO_PRINT_COMMAND"
  
! #: info/session.c:3859
  #, fuzzy, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "æ— æ³•æ‰“å¼€åˆ°â€œ%sâ€�çš„ç®¡é�“ã€‚"
  
! #: info/session.c:3864
  #, fuzzy, c-format
  msgid "printing node %s..."
  msgstr "æ­£åœ¨æ‰“å�°èŠ‚ç‚¹ %s..."
  
! #: info/session.c:3872
  #, fuzzy, c-format
  msgid "finished printing node %s"
  msgstr "æ­£åœ¨æ‰“å�°èŠ‚ç‚¹ %s..."
  
! #: 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:4169
  msgid "Search continued from the end of the document."
  msgstr "ä»Žæ–‡æ¡£åº•éƒ¨ç»§ç»­æŸ¥å¯»ã€‚"
  
! #: info/session.c:4174
  msgid "Search continued from the beginning of the document."
  msgstr "ä»Žæ­¤æ–‡æ¡£çš„å¼€å¤´ç»§ç»­æŸ¥æ‰¾ã€‚"
  
! #: info/session.c:4194
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "æ­£åœ¨æ�œç´¢å­�æ–‡ä»¶ %s ..."
  
! #: info/session.c:4231
  msgid "Search failed."
  msgstr "æ�œç´¢å¤±è´¥ã€‚"
  
! #: info/session.c:4248
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Regexp search"
  msgstr "æ­£åˆ™è¡¨è¾¾å¼�æŸ¥æ‰¾"
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Search"
  msgstr "æ�œç´¢"
  
! #: info/session.c:4250 info/session.c:4256
  msgid " case-sensitively"
  msgstr "å¤§å°�å†™æ•�æ„Ÿ"
  
! #: info/session.c:4251 info/session.c:4257
  msgid " backward"
  msgstr "å�‘å�Žæ�œç´¢"
  
! #: info/session.c:4254
  #, fuzzy, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4274
  msgid "Search string too short"
  msgstr ""
  
! #: info/session.c:4467
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4491 info/session.c:4601
  #, c-format
  msgid "No more matches."
  msgstr ""
  
! #: info/session.c:4628
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4649
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4653 info/session.c:4665
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4661
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4674
  msgid "Read a string and search for it case-sensitively"
  msgstr "è¯»å�–ä¸€ä¸ªå­—ç¬¦ä¸²å¹¶ä»¥å¤§å°�å†™æ•�æ„Ÿçš„æ–¹å¼�æ�œç´¢å®ƒ"
  
! #: info/session.c:4679
  msgid "Read a string and search for it"
  msgstr "è¯»å�–ä¸€ä¸ªå­—ç¬¦ä¸²å¹¶æ�œç´¢å®ƒ"
  
! #: info/session.c:4685
  msgid "Read a string and search backward for it"
  msgstr "è¯»å�–ä¸€ä¸ªå­—ç¬¦ä¸²å¹¶å�‘å�Žæ�œç´¢å®ƒ"
  
! #: info/session.c:4693
  msgid "Repeat last search in the same direction"
  msgstr "ä»¥ç›¸å�Œçš„æ–¹å�‘é‡�å¤�æœ€å�Žçš„æ�œç´¢"
  
! #: info/session.c:4701 info/session.c:4746
  msgid "No previous search string"
  msgstr "æ²¡æœ‰ä¸Šæ¬¡æ�œç´¢å­—ç¬¦ä¸²"
  
! #: info/session.c:4738
  msgid "Repeat last search in the reverse direction"
  msgstr "ä»¥ç›¸å��çš„æ–¹å�‘é‡�å¤�æœ€å�Žçš„æ�œç´¢"
  
! #: info/session.c:4785
  msgid "Clear displayed search matches"
  msgstr ""
  
! #: info/session.c:4802 info/session.c:4808
  msgid "Search interactively for a string as you type it"
  msgstr "åœ¨ä½ è¾“å…¥çš„å�Œæ—¶äº¤äº’å¼�åœ°æ�œç´¢å­—ç¬¦ä¸²"
  
! #: info/session.c:4928
  msgid "Regexp I-search backward: "
  msgstr "å�‘å�Žå¢žé‡�æ�œç´¢æ­£åˆ™è¡¨è¾¾å¼�: "
  
! #: info/session.c:4929
  msgid "I-search backward: "
  msgstr "å�‘å�Žå¢žé‡�æ�œç´¢ï¼š"
  
! #: info/session.c:4931
  msgid "Regexp I-search: "
  msgstr "å¢žé‡�æ�œç´¢æ­£åˆ™è¡¨è¾¾å¼�: "
  
! #: info/session.c:4932
  msgid "I-search: "
  msgstr "å¢žé‡�æ�œç´¢ï¼š"
  
! #: info/session.c:4957 info/session.c:4960
  msgid "Failing "
  msgstr "å¤±è´¥ "
  
! #: info/session.c:5326
  msgid "Cancel current operation"
  msgstr "å�–æ¶ˆå½“å‰�æ“�ä½œ"
  
! #: info/session.c:5333
  msgid "Quit"
  msgstr "é€€å‡º"
  
! #: info/session.c:5338
  #, fuzzy
  msgid "Display version of Info being run"
  msgstr "æ˜¾ç¤ºç‰ˆæœ¬ä¿¡æ�¯å¹¶é€€å‡º"
  
! #: info/session.c:5340
  #, c-format
  msgid "GNU Info version %s"
  msgstr ""
  
! #: info/session.c:5345
  msgid "Redraw the display"
  msgstr "é‡�ç”»æ˜¾ç¤º"
  
! #: info/session.c:5382
  msgid "Quit using Info"
  msgstr "é€€å‡º Info"
  
! #: info/session.c:5398
  msgid "Run command bound to this key's lowercase variant"
  msgstr "è¿�è¡Œåˆ°ç»‘å®šåˆ°æœ¬æŒ‰é”®çš„å°�å†™ç‰ˆæœ¬çš„å‘½ä»¤"
  
! #: info/session.c:5409
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "æœªçŸ¥çš„å‘½ä»¤ (%s)ã€‚"
  
! #: info/session.c:5412
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "â€œ%sâ€�ä¸ºé�žæ³•"
  
! #: info/session.c:5413
  #, fuzzy, c-format
  msgid "'%s' is invalid"
  msgstr "â€œ%sâ€�æ˜¯æ— æ•ˆçš„"
  
! #: info/session.c:5731
  msgid "Add this digit to the current numeric argument"
  msgstr "å°†æœ¬æ•°å­—æ·»åŠ åˆ°å½“å‰�æ•°å€¼å�‚æ•°ä¸­"
  
! #: info/session.c:5738
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "å¼€å�¯(æˆ–ä¹˜ä»¥ 4)å½“å‰�æ•°å€¼å�‚æ•°"
--- 1281,1623 ----
  msgstr "æ— æ³•åœ¨â€œ%2$sâ€�ä¸­æ‰¾åˆ°ç”±â€œ%1$sâ€�å¼•ç”¨çš„èŠ‚ç‚¹ã€‚"
  
! #: info/session.c:2870
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "è¯»å�–è‡ª dir å¼€å§‹çš„è�œå�•çš„åˆ—è¡¨å¹¶è·Ÿéš�å®ƒä»¬"
  
! #: info/session.c:2872
  msgid "Follow menus: "
  msgstr "è·Ÿéš�è�œå�•ï¼š"
  
! #: info/session.c:2977
  msgid "Select the Next node"
  msgstr "é€‰æ‹©ä¸‹ä¸€ä¸ªèŠ‚ç‚¹"
  
! #: info/session.c:2984
  msgid "Select the Prev node"
  msgstr "é€‰æ‹©ä¸Šä¸€ä¸ªèŠ‚ç‚¹"
  
! #: info/session.c:2991
  msgid "Select the Up node"
  msgstr "é€‰æ‹©ä¸Šå±‚èŠ‚ç‚¹"
  
! #: info/session.c:2997
  msgid "Select the last node in this file"
  msgstr "é€‰æ‹©æœ¬æ–‡ä»¶çš„æœ€å�Žä¸€ä¸ªèŠ‚ç‚¹"
  
! #: info/session.c:3024 info/session.c:3057
  msgid "This window has no additional nodes"
  msgstr "è¯¥çª—å�£æ²¡æœ‰é™„åŠ èŠ‚ç‚¹"
  
! #: info/session.c:3030
  msgid "Select the first node in this file"
  msgstr "é€‰æ‹©æœ¬æ–‡ä»¶çš„ç¬¬ä¸€ä¸ªèŠ‚ç‚¹"
  
! #: info/session.c:3164
  msgid "No more nodes within this document."
  msgstr "æœ¬æ–‡æ¡£ä¸­æ²¡æœ‰æ›´å¤šçš„èŠ‚ç‚¹ã€‚"
  
! #: info/session.c:3209 info/session.c:3249
  #, fuzzy
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "åœ¨æœ¬æ–‡æ¡£ä¸­æ²¡æœ‰æœ¬èŠ‚ç‚¹çš„â€œä¸Šä¸€ä¸ªâ€�æˆ–â€œä¸Šå±‚â€�èŠ‚ç‚¹ã€‚"
  
! #: info/session.c:3262
  msgid "Move forwards or down through node structure"
  msgstr "åœ¨èŠ‚ç‚¹ç»“æž„ä¸­å�‘å‰�æˆ–å�‘ä¸‹å±‚ç§»åŠ¨"
  
! #: info/session.c:3279
  msgid "Move backwards or up through node structure"
  msgstr "åœ¨èŠ‚ç‚¹ç»“æž„ä¸­å�‘å�Žæˆ–å�‘ä¸Šå±‚ç§»åŠ¨"
  
! #: info/session.c:3302
  msgid "Read a node name and select it"
  msgstr "è¯»å�–èŠ‚ç‚¹å��å¹¶é€‰æ‹©å®ƒ"
  
! #: info/session.c:3356 info/session.c:3360
  msgid "Goto node: "
  msgstr "è½¬åˆ°èŠ‚ç‚¹ï¼š"
  
! #: info/session.c:3539
  msgid "Find the node describing program invocation"
  msgstr "å¯»æ‰¾è¯´æ˜Žç¨‹åº�è°ƒç”¨çš„èŠ‚ç‚¹"
  
! #: info/session.c:3541
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "å¯»æ‰¾ [%s] çš„è°ƒç”¨èŠ‚ç‚¹ï¼š"
  
! #: info/session.c:3586
  msgid "Read a manpage reference and select it"
  msgstr "è¯»å�–ä¸€ä¸ª man æ‰‹å†Œçš„å¼•ç”¨å¹¶é€‰æ‹©å®ƒ"
  
! #: info/session.c:3590
  msgid "Get Manpage: "
  msgstr "èŽ·å�– man æ‰‹å†Œï¼š"
  
! #: info/session.c:3611
  #, fuzzy
  msgid "Select the node 'Top' in this file"
  msgstr "é€‰æ‹©æœ¬æ–‡ä»¶ä¸­çš„â€œé¡¶â€�èŠ‚ç‚¹"
  
! #: info/session.c:3617
  #, fuzzy
  msgid "Select the node '(dir)'"
  msgstr "é€‰æ‹©èŠ‚ç‚¹â€œ(dir)â€�"
  
! #: info/session.c:3623
  msgid "Show full file name of node being displayed"
  msgstr ""
  
! #: info/session.c:3640
  msgid "Select the most recently selected node"
  msgstr "é€‰æ‹©æœ€è¿‘é€‰æ‹©çš„èŠ‚ç‚¹"
  
! #: info/session.c:3645
  #, c-format
  msgid "No earlier node in history"
  msgstr ""
  
! #: info/session.c:3649
  msgid "Read the name of a file and select it"
  msgstr "è¯»å�–æ–‡ä»¶å��å¹¶é€‰æ‹©å®ƒ"
  
! #: info/session.c:3653
  msgid "Find file: "
  msgstr "å¯»æ‰¾æ–‡ä»¶ï¼š"
  
! #: info/session.c:3670
  #, fuzzy, c-format
  msgid "Cannot find '%s'."
  msgstr "æ— æ³•å¯»æ‰¾â€œ%sâ€�ã€‚"
  
! #: info/session.c:3719
  #, fuzzy, c-format
  msgid "Could not create output file '%s'."
  msgstr "æ— æ³•åˆ›å»ºè¾“å‡ºæ–‡ä»¶â€œ%sâ€�ã€‚"
  
! #: info/session.c:3733
  #, fuzzy, c-format
  msgid "error writing to %s: %s"
  msgstr "å†™å…¥â€œ%sâ€�æ—¶å‡ºé”™"
  
! #: info/session.c:3742
  #, fuzzy, c-format
  msgid "closing %s"
  msgstr "åˆ é™¤ %s\n"
  
! #: info/session.c:3791
  #, fuzzy, c-format
  msgid "writing node %s..."
  msgstr "æ­£åœ¨å†™å…¥èŠ‚ç‚¹ %s..."
  
! #: info/session.c:3837
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "é€šè¿‡ç®¡é�“å°†æœ¬èŠ‚ç‚¹çš„å†…å®¹è¾“å‡ºåˆ° INFO_PRINT_COMMAND"
  
! #: info/session.c:3865
  #, fuzzy, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "æ— æ³•æ‰“å¼€åˆ°â€œ%sâ€�çš„ç®¡é�“ã€‚"
  
! #: info/session.c:3870
  #, fuzzy, c-format
  msgid "printing node %s..."
  msgstr "æ­£åœ¨æ‰“å�°èŠ‚ç‚¹ %s..."
  
! #: info/session.c:3878
  #, fuzzy, c-format
  msgid "finished printing node %s"
  msgstr "æ­£åœ¨æ‰“å�°èŠ‚ç‚¹ %s..."
  
! #: info/session.c:3910
  msgid "Toggle the usage of regular expressions in searches"
  msgstr "åˆ‡æ�¢æŸ¥å¯»æ—¶æ­£åˆ™è¡¨è¾¾å¼�çš„ç”¨æ³•"
  
! #: info/session.c:3914
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr "ä½¿ç”¨æ­£åˆ™è¡¨è¾¾å¼�æ�¥æŸ¥å¯»"
  
! #: info/session.c:3915
  #, c-format
  msgid "Using literal strings for searches."
  msgstr "ä½¿ç”¨æ™®é€šå­—ç¬¦ä¸²æ�¥æŸ¥å¯»"
  
! #: info/session.c:4175
  msgid "Search continued from the end of the document."
  msgstr "ä»Žæ–‡æ¡£åº•éƒ¨ç»§ç»­æŸ¥å¯»ã€‚"
  
! #: info/session.c:4180
  msgid "Search continued from the beginning of the document."
  msgstr "ä»Žæ­¤æ–‡æ¡£çš„å¼€å¤´ç»§ç»­æŸ¥æ‰¾ã€‚"
  
! #: info/session.c:4200
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "æ­£åœ¨æ�œç´¢å­�æ–‡ä»¶ %s ..."
  
! #: info/session.c:4237
  msgid "Search failed."
  msgstr "æ�œç´¢å¤±è´¥ã€‚"
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Regexp search"
  msgstr "æ­£åˆ™è¡¨è¾¾å¼�æŸ¥æ‰¾"
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Search"
  msgstr "æ�œç´¢"
  
! #: info/session.c:4256 info/session.c:4262
  msgid " case-sensitively"
  msgstr "å¤§å°�å†™æ•�æ„Ÿ"
  
! #: info/session.c:4257 info/session.c:4263
  msgid " backward"
  msgstr "å�‘å�Žæ�œç´¢"
  
! #: info/session.c:4260
  #, fuzzy, c-format
  msgid "%s%s%s: "
  msgstr "%s%s%s [%s]: "
  
! #: info/session.c:4280
  msgid "Search string too short"
  msgstr ""
  
! #: info/session.c:4473
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4497 info/session.c:4607
  #, c-format
  msgid "No more matches."
  msgstr ""
  
! #: info/session.c:4634
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4655
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4659 info/session.c:4671
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4667
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4680
  msgid "Read a string and search for it case-sensitively"
  msgstr "è¯»å�–ä¸€ä¸ªå­—ç¬¦ä¸²å¹¶ä»¥å¤§å°�å†™æ•�æ„Ÿçš„æ–¹å¼�æ�œç´¢å®ƒ"
  
! #: info/session.c:4685
  msgid "Read a string and search for it"
  msgstr "è¯»å�–ä¸€ä¸ªå­—ç¬¦ä¸²å¹¶æ�œç´¢å®ƒ"
  
! #: info/session.c:4691
  msgid "Read a string and search backward for it"
  msgstr "è¯»å�–ä¸€ä¸ªå­—ç¬¦ä¸²å¹¶å�‘å�Žæ�œç´¢å®ƒ"
  
! #: info/session.c:4699
  msgid "Repeat last search in the same direction"
  msgstr "ä»¥ç›¸å�Œçš„æ–¹å�‘é‡�å¤�æœ€å�Žçš„æ�œç´¢"
  
! #: info/session.c:4707 info/session.c:4752
  msgid "No previous search string"
  msgstr "æ²¡æœ‰ä¸Šæ¬¡æ�œç´¢å­—ç¬¦ä¸²"
  
! #: info/session.c:4744
  msgid "Repeat last search in the reverse direction"
  msgstr "ä»¥ç›¸å��çš„æ–¹å�‘é‡�å¤�æœ€å�Žçš„æ�œç´¢"
  
! #: info/session.c:4791
  msgid "Clear displayed search matches"
  msgstr ""
  
! #: info/session.c:4808 info/session.c:4814
  msgid "Search interactively for a string as you type it"
  msgstr "åœ¨ä½ è¾“å…¥çš„å�Œæ—¶äº¤äº’å¼�åœ°æ�œç´¢å­—ç¬¦ä¸²"
  
! #: info/session.c:4934
  msgid "Regexp I-search backward: "
  msgstr "å�‘å�Žå¢žé‡�æ�œç´¢æ­£åˆ™è¡¨è¾¾å¼�: "
  
! #: info/session.c:4935
  msgid "I-search backward: "
  msgstr "å�‘å�Žå¢žé‡�æ�œç´¢ï¼š"
  
! #: info/session.c:4937
  msgid "Regexp I-search: "
  msgstr "å¢žé‡�æ�œç´¢æ­£åˆ™è¡¨è¾¾å¼�: "
  
! #: info/session.c:4938
  msgid "I-search: "
  msgstr "å¢žé‡�æ�œç´¢ï¼š"
  
! #: info/session.c:4963 info/session.c:4966
  msgid "Failing "
  msgstr "å¤±è´¥ "
  
! #: info/session.c:5332
  msgid "Cancel current operation"
  msgstr "å�–æ¶ˆå½“å‰�æ“�ä½œ"
  
! #: info/session.c:5339
  msgid "Quit"
  msgstr "é€€å‡º"
  
! #: info/session.c:5344
  #, fuzzy
  msgid "Display version of Info being run"
  msgstr "æ˜¾ç¤ºç‰ˆæœ¬ä¿¡æ�¯å¹¶é€€å‡º"
  
! #: info/session.c:5346
  #, c-format
  msgid "GNU Info version %s"
  msgstr ""
  
! #: info/session.c:5351
  msgid "Redraw the display"
  msgstr "é‡�ç”»æ˜¾ç¤º"
  
! #: info/session.c:5388
  msgid "Quit using Info"
  msgstr "é€€å‡º Info"
  
! #: info/session.c:5404
  msgid "Run command bound to this key's lowercase variant"
  msgstr "è¿�è¡Œåˆ°ç»‘å®šåˆ°æœ¬æŒ‰é”®çš„å°�å†™ç‰ˆæœ¬çš„å‘½ä»¤"
  
! #: info/session.c:5415
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "æœªçŸ¥çš„å‘½ä»¤ (%s)ã€‚"
  
! #: info/session.c:5418
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "â€œ%sâ€�ä¸ºé�žæ³•"
  
! #: info/session.c:5419
  #, fuzzy, c-format
  msgid "'%s' is invalid"
  msgstr "â€œ%sâ€�æ˜¯æ— æ•ˆçš„"
  
! #: info/session.c:5737
  msgid "Add this digit to the current numeric argument"
  msgstr "å°†æœ¬æ•°å­—æ·»åŠ åˆ°å½“å‰�æ•°å€¼å�‚æ•°ä¸­"
  
! #: info/session.c:5744
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "å¼€å�¯(æˆ–ä¹˜ä»¥ 4)å½“å‰�æ•°å€¼å�‚æ•°"
***************
*** 1759,1776 ****
  msgstr "å°† %s è®¾å®šä¸ºå€¼ (%s)ï¼š"
  
! #: info/window.c:959
  msgid "-----Info: (), lines ----, "
  msgstr "-----Infoï¼š()ï¼Œè¡Œ ----ï¼Œ"
  
- #: info/window.c:966
- #, fuzzy, c-format
- msgid "-%s---Info: %s, %ld lines --%s--"
- msgstr "-%s---Infoï¼š%sï¼Œ%d è¡Œ --%s--"
- 
- #: info/window.c:970
- #, fuzzy, c-format
- msgid "-%s---Info: (%s)%s, %ld lines --%s--"
- msgstr "-%s%s-Infoï¼š(%s)%sï¼Œ%d è¡Œ --%s--"
- 
  #: install-info/install-info.c:292
  #, c-format
--- 1754,1761 ----
  msgstr "å°† %s è®¾å®šä¸ºå€¼ (%s)ï¼š"
  
! #: info/window.c:909
  msgid "-----Info: (), lines ----, "
  msgstr "-----Infoï¼š()ï¼Œè¡Œ ----ï¼Œ"
  
  #: install-info/install-info.c:292
  #, c-format
***************
*** 1957,1961 ****
  "\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"
--- 1942,1946 ----
  "\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"
***************
*** 2047,2165 ****
  msgstr "æ‰¾ä¸�åˆ°å…³äºŽâ€œ%sâ€�çš„æ�¡ç›®ï¼›æœªåˆ é™¤"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:855
! #: tp/Texinfo/Convert/Converter.pm:893 tp/Texinfo/Convert/Converter.pm:1204
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6504
! #: tp/Texinfo/Convert/HTML.pm:6528 tp/Texinfo/Convert/HTML.pm:6905
! #: tp/Texinfo/Convert/HTML.pm:6963 tp/Texinfo/Convert/HTML.pm:7041
! #: tp/Texinfo/Convert/HTML.pm:7118 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:546
! #: tp/Texinfo/Convert/TexinfoXML.pm:457
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "%s: æ— æ³•æ‰“å¼€ --css-file: %s"
  
! #: tp/Texinfo/Common.pm:881
  msgid "recursion is always allowed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:882
  #, fuzzy
  msgid "arguments are quoted by default"
  msgstr "ä¸�èµžæˆ�ä½¿ç”¨ @quote-argï¼›å�‚æ•°æ˜¯é»˜è®¤å¼•ç”¨çš„"
  
! #: tp/Texinfo/Common.pm:1105
  #, fuzzy, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s åœ¨ ISO 639 è¯­è¨€ç¼–ç �ä¸­æ˜¯æ— æ•ˆçš„"
  
! #: tp/Texinfo/Common.pm:1110
  #, fuzzy, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s åœ¨ ISO 639 è¯­è¨€ç¼–ç �ä¸­æ˜¯æ— æ•ˆçš„"
  
! #: tp/Texinfo/Common.pm:1128
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1151
  #, fuzzy, perl-format
  msgid "could not read %s: %s"
  msgstr "%s: æ— æ³•æ‰“å¼€ --css-file: %s"
  
! #: tp/Texinfo/Common.pm:1170
  #, fuzzy, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "å…³é—­è¾“å‡ºæ–‡ä»¶â€œ%sâ€�æ—¶å‡ºé”™"
  
! #: tp/Texinfo/Common.pm:1176 tp/Texinfo/Parser.pm:3353
  #, fuzzy, perl-format
  msgid "@%s: could not find %s"
  msgstr "%s: æ— æ³•æ‰“å¼€ --css-file: %s"
  
! #: tp/Texinfo/Common.pm:1520
! #, fuzzy, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr "%s: æ— æ³•æ‰“å¼€ --css-file: %s"
! 
! #: tp/Texinfo/Common.pm:1548
! #, fuzzy
! msgid "missing type"
! msgstr "é�—æ¼�åŠ¨ä½œå��ç§°"
! 
! #: tp/Texinfo/Common.pm:1551
! #, fuzzy, perl-format
! msgid "unrecognized type: %s"
! msgstr "%sï¼šä¸�èƒ½è¯†åˆ«çš„é€‰é¡¹â€œ--%sâ€�\n"
! 
! #: tp/Texinfo/Common.pm:1568
! #, fuzzy, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr "å…³é—­è¾“å‡ºæ–‡ä»¶â€œ%sâ€�æ—¶å‡ºé”™"
! 
! #: tp/Texinfo/Common.pm:1603
  msgid "no node to be renamed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1614
  msgid "nodes without a new name at the end of file"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1624 tp/Texinfo/Parser.pm:926
  #, fuzzy, perl-format
  msgid "could not open %s: %s"
  msgstr "%s: æ— æ³•æ‰“å¼€ --css-file: %s"
  
! #: tp/Texinfo/Common.pm:2144
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:395 tp/Texinfo/Convert/Converter.pm:414
  #, fuzzy, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "è®¾å®šå�˜é‡�ï¼š"
  
! #: tp/Texinfo/Convert/Converter.pm:794
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:876 tp/Texinfo/Convert/Converter.pm:909
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:6931
! #: tp/Texinfo/Convert/HTML.pm:6989 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:476 tp/Texinfo/Parser.pm:2035
  #, fuzzy, perl-format
  msgid "error on closing %s: %s"
  msgstr "å…³é—­è¾“å‡ºæ–‡ä»¶â€œ%sâ€�æ—¶å‡ºé”™"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, fuzzy, perl-format
  msgid "could not create directories `%s' or `%s': %s"
  msgstr "æ— æ³•åˆ›å»ºç›®å½•â€œ%sâ€�ï¼š%s"
  
! #: tp/Texinfo/Convert/Converter.pm:995
  #, fuzzy, perl-format
  msgid "could not create directory `%s': %s"
--- 2032,2141 ----
  msgstr "æ‰¾ä¸�åˆ°å…³äºŽâ€œ%sâ€�çš„æ�¡ç›®ï¼›æœªåˆ é™¤"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:847
! #: tp/Texinfo/Convert/Converter.pm:885 tp/Texinfo/Convert/Converter.pm:1196
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6573
! #: tp/Texinfo/Convert/HTML.pm:6597 tp/Texinfo/Convert/HTML.pm:6978
! #: tp/Texinfo/Convert/HTML.pm:7037 tp/Texinfo/Convert/HTML.pm:7115
! #: tp/Texinfo/Convert/HTML.pm:7192 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:547
! #: tp/Texinfo/Convert/TexinfoXML.pm:458
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s"
  msgstr "%s: æ— æ³•æ‰“å¼€ --css-file: %s"
  
! #: tp/Texinfo/Common.pm:862
  msgid "recursion is always allowed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:863
  #, fuzzy
  msgid "arguments are quoted by default"
  msgstr "ä¸�èµžæˆ�ä½¿ç”¨ @quote-argï¼›å�‚æ•°æ˜¯é»˜è®¤å¼•ç”¨çš„"
  
! #: tp/Texinfo/Common.pm:866
! msgid ""
! "move your @contents command if you want the contents after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:869
! msgid ""
! "move your @shortcontents and @contents commands if you want the contents "
! "after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:1093
  #, fuzzy, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s åœ¨ ISO 639 è¯­è¨€ç¼–ç �ä¸­æ˜¯æ— æ•ˆçš„"
  
! #: tp/Texinfo/Common.pm:1098
  #, fuzzy, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s åœ¨ ISO 639 è¯­è¨€ç¼–ç �ä¸­æ˜¯æ— æ•ˆçš„"
  
! #: tp/Texinfo/Common.pm:1116
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1139
  #, fuzzy, perl-format
  msgid "could not read %s: %s"
  msgstr "%s: æ— æ³•æ‰“å¼€ --css-file: %s"
  
! #: tp/Texinfo/Common.pm:1158
  #, fuzzy, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "å…³é—­è¾“å‡ºæ–‡ä»¶â€œ%sâ€�æ—¶å‡ºé”™"
  
! #: tp/Texinfo/Common.pm:1164 tp/Texinfo/Parser.pm:3193
  #, fuzzy, perl-format
  msgid "@%s: could not find %s"
  msgstr "%s: æ— æ³•æ‰“å¼€ --css-file: %s"
  
! #: tp/Texinfo/Common.pm:1637
  msgid "no node to be renamed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1648
  msgid "nodes without a new name at the end of file"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1658 tp/Texinfo/Parser.pm:899
  #, fuzzy, perl-format
  msgid "could not open %s: %s"
  msgstr "%s: æ— æ³•æ‰“å¼€ --css-file: %s"
  
! #: tp/Texinfo/Common.pm:2178
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:387 tp/Texinfo/Convert/Converter.pm:406
  #, fuzzy, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "è®¾å®šå�˜é‡�ï¼š"
  
! #: tp/Texinfo/Convert/Converter.pm:786
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:868 tp/Texinfo/Convert/Converter.pm:901
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:7004
! #: tp/Texinfo/Convert/HTML.pm:7063 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:477 tp/Texinfo/Parser.pm:1996
  #, fuzzy, perl-format
  msgid "error on closing %s: %s"
  msgstr "å…³é—­è¾“å‡ºæ–‡ä»¶â€œ%sâ€�æ—¶å‡ºé”™"
  
! #: tp/Texinfo/Convert/Converter.pm:979
  #, fuzzy, perl-format
  msgid "could not create directories `%s' or `%s': %s"
  msgstr "æ— æ³•åˆ›å»ºç›®å½•â€œ%sâ€�ï¼š%s"
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, fuzzy, perl-format
  msgid "could not create directory `%s': %s"
***************
*** 2171,2271 ****
  msgstr "@image æ–‡ä»¶â€œ%sâ€�ä¸�å�¯è¯»ï¼š%s"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5388
  #, fuzzy
  msgid "no argument specified for @U"
  msgstr "æ²¡æœ‰ä¸ºâ€œ%c%sâ€�å‘½ä»¤æŒ‡å®šèŠ‚å��ç§°"
  
! #: tp/Texinfo/Convert/HTML.pm:1683
  #, fuzzy, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
  msgstr "@image æ–‡ä»¶â€œ%sâ€�(å¯¹ HTML)ä¸�å�¯è¯»ï¼š%s"
  
! #: tp/Texinfo/Convert/HTML.pm:2371
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4888
  msgid "string not closed in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4890
  #, fuzzy
  msgid "--css-include ended in comment"
  msgstr "%s:%d: --css-file ä»¥æ³¨é‡Šç»“å°¾"
  
! #: tp/Texinfo/Convert/HTML.pm:4892
  msgid "@import not finished in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4918
  #, perl-format
  msgid "CSS file %s not found"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4924
  #, fuzzy, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "%s: æ— æ³•æ‰“å¼€ --css-file: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:4934
  #, fuzzy, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "å…³é—­è¾“å‡ºæ–‡ä»¶â€œ%sâ€�æ—¶å‡ºé”™"
  
! #: tp/Texinfo/Convert/HTML.pm:5801 tp/Texinfo/Convert/HTML.pm:5805
  #, fuzzy, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "æ‰¾ä¸�åˆ°å�«æœ‰â€œ%sâ€�çš„ç´¢å¼•\n"
  
! #: tp/Texinfo/Convert/HTML.pm:6499
  #, fuzzy, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "å…³é—­è¾“å‡ºæ–‡ä»¶â€œ%sâ€�æ—¶å‡ºé”™"
  
! #: tp/Texinfo/Convert/HTML.pm:6523
  #, fuzzy, perl-format
  msgid "error on closing TOC frame file %s: %s"
  msgstr "å…³é—­è¾“å‡ºæ–‡ä»¶â€œ%sâ€�æ—¶å‡ºé”™"
  
! #: tp/Texinfo/Convert/HTML.pm:6638
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6839
  msgid "must specify a title with a title command or @top"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7048
  #, fuzzy, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr "å…³é—­è¾“å‡ºæ–‡ä»¶â€œ%sâ€�æ—¶å‡ºé”™"
  
! #: tp/Texinfo/Convert/HTML.pm:7073
  #, fuzzy, perl-format
  msgid "old name for `%s' is a node of the document"
  msgstr "åœ¨æœ¬æ–‡æ¡£ä¸­æ²¡æœ‰æœ¬èŠ‚ç‚¹çš„â€œä¸Šä¸€ä¸ªâ€�æˆ–â€œä¸Šå±‚â€�èŠ‚ç‚¹ã€‚"
  
! #: tp/Texinfo/Convert/HTML.pm:7079
  #, fuzzy, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "æœªå¼•ç”¨çš„èŠ‚ç‚¹â€œ%sâ€�"
  
! #: tp/Texinfo/Convert/HTML.pm:7093
  #, perl-format
  msgid "target node (new name for `%s') not in document: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7125
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7163
  msgid "empty node name"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7165 tp/Texinfo/Parser.pm:3697
  #, perl-format
  msgid "syntax for an external node used for `%s'"
--- 2147,2267 ----
  msgstr "@image æ–‡ä»¶â€œ%sâ€�ä¸�å�¯è¯»ï¼š%s"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5225
  #, fuzzy
  msgid "no argument specified for @U"
  msgstr "æ²¡æœ‰ä¸ºâ€œ%c%sâ€�å‘½ä»¤æŒ‡å®šèŠ‚å��ç§°"
  
! #: tp/Texinfo/Convert/HTML.pm:1715
  #, fuzzy, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
  msgstr "@image æ–‡ä»¶â€œ%sâ€�(å¯¹ HTML)ä¸�å�¯è¯»ï¼š%s"
  
! #: tp/Texinfo/Convert/HTML.pm:2399
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4629
! #, fuzzy, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr "%s: æ— æ³•æ‰“å¼€ --css-file: %s"
! 
! #: tp/Texinfo/Convert/HTML.pm:4657
! #, fuzzy
! msgid "missing type"
! msgstr "é�—æ¼�åŠ¨ä½œå��ç§°"
! 
! #: tp/Texinfo/Convert/HTML.pm:4660
! #, fuzzy, perl-format
! msgid "unrecognized type: %s"
! msgstr "%sï¼šä¸�èƒ½è¯†åˆ«çš„é€‰é¡¹â€œ--%sâ€�\n"
! 
! #: tp/Texinfo/Convert/HTML.pm:4677
! #, fuzzy, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr "å…³é—­è¾“å‡ºæ–‡ä»¶â€œ%sâ€�æ—¶å‡ºé”™"
! 
! #: tp/Texinfo/Convert/HTML.pm:4962
  msgid "string not closed in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4964
  #, fuzzy
  msgid "--css-include ended in comment"
  msgstr "%s:%d: --css-file ä»¥æ³¨é‡Šç»“å°¾"
  
! #: tp/Texinfo/Convert/HTML.pm:4966
  msgid "@import not finished in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4992
  #, perl-format
  msgid "CSS file %s not found"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4998
  #, fuzzy, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "%s: æ— æ³•æ‰“å¼€ --css-file: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:5008
  #, fuzzy, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "å…³é—­è¾“å‡ºæ–‡ä»¶â€œ%sâ€�æ—¶å‡ºé”™"
  
! #: tp/Texinfo/Convert/HTML.pm:5870 tp/Texinfo/Convert/HTML.pm:5874
  #, fuzzy, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "æ‰¾ä¸�åˆ°å�«æœ‰â€œ%sâ€�çš„ç´¢å¼•\n"
  
! #: tp/Texinfo/Convert/HTML.pm:6568
  #, fuzzy, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "å…³é—­è¾“å‡ºæ–‡ä»¶â€œ%sâ€�æ—¶å‡ºé”™"
  
! #: tp/Texinfo/Convert/HTML.pm:6592
  #, fuzzy, perl-format
  msgid "error on closing TOC frame file %s: %s"
  msgstr "å…³é—­è¾“å‡ºæ–‡ä»¶â€œ%sâ€�æ—¶å‡ºé”™"
  
! #: tp/Texinfo/Convert/HTML.pm:6707
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6912
  msgid "must specify a title with a title command or @top"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7122
  #, fuzzy, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr "å…³é—­è¾“å‡ºæ–‡ä»¶â€œ%sâ€�æ—¶å‡ºé”™"
  
! #: tp/Texinfo/Convert/HTML.pm:7147
  #, fuzzy, perl-format
  msgid "old name for `%s' is a node of the document"
  msgstr "åœ¨æœ¬æ–‡æ¡£ä¸­æ²¡æœ‰æœ¬èŠ‚ç‚¹çš„â€œä¸Šä¸€ä¸ªâ€�æˆ–â€œä¸Šå±‚â€�èŠ‚ç‚¹ã€‚"
  
! #: tp/Texinfo/Convert/HTML.pm:7153
  #, fuzzy, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "æœªå¼•ç”¨çš„èŠ‚ç‚¹â€œ%sâ€�"
  
! #: tp/Texinfo/Convert/HTML.pm:7167
  #, perl-format
  msgid "target node (new name for `%s') not in document: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7199
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7237
  msgid "empty node name"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7239 tp/Texinfo/Parser.pm:3542
  #, perl-format
  msgid "syntax for an external node used for `%s'"
***************
*** 2301,2330 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1334
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1381 tp/Texinfo/Parser.pm:2722
  #, fuzzy, perl-format
  msgid "entry for index `%s' outside of any node"
  msgstr "å…³äºŽç´¢å¼•â€œ%sâ€�çš„æ�¡ç›®è¶…å‡ºäº†æ‰€æœ‰èŠ‚ç‚¹"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1495
  #, fuzzy, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr "å…³é—­è¾“å‡ºæ–‡ä»¶â€œ%sâ€�æ—¶å‡ºé”™"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1500
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "@image æ–‡ä»¶â€œ%sâ€�ä¸�å�¯è¯»ï¼š%s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1523
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1931
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
--- 2297,2326 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1335
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1382 tp/Texinfo/Parser.pm:2568
  #, fuzzy, perl-format
  msgid "entry for index `%s' outside of any node"
  msgstr "å…³äºŽç´¢å¼•â€œ%sâ€�çš„æ�¡ç›®è¶…å‡ºäº†æ‰€æœ‰èŠ‚ç‚¹"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1496
  #, fuzzy, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr "å…³é—­è¾“å‡ºæ–‡ä»¶â€œ%sâ€�æ—¶å‡ºé”™"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1501
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "@image æ–‡ä»¶â€œ%sâ€�ä¸�å�¯è¯»ï¼š%s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1524
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1932
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
***************
*** 2332,2651 ****
  msgstr "@strong{Note...} åœ¨ Info ä¸­å½¢æˆ�äº†ä¸€ä¸ªå�‡çš„äº¤å�‰å¼•ç”¨ï¼›å�¯é€šè¿‡é‡�å†™é�¿å…�æ­¤äº‹"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2161
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2193
  #, fuzzy, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "æ²¡æœ‰ %sç´¢å¼•æ�¡ç›®å�«æœ‰â€œ%sâ€�ã€‚"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2226
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2272
  #, fuzzy, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "â€œ.â€�æˆ–â€œ,â€�ä¹‹å�Žå¿…é¡»ä¸º @%sï¼Œè€Œä¸�æ˜¯â€œ%câ€�"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2275
  #, fuzzy
  msgid "`.' or `,' must follow @xref"
  msgstr "â€œ.â€�æˆ–â€œ,â€�ä¹‹å�Žå¿…é¡»ä¸º @%sï¼Œè€Œä¸�æ˜¯â€œ%câ€�"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3118
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3129
  msgid "menu entry node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3145
  msgid "menu entry name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:910
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1160 tp/Texinfo/Structuring.pm:594
  #, perl-format
  msgid "multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1194
  #, perl-format
! msgid "bad syntax for @%s argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1210
  #, perl-format
! msgid "bad or empty @%s formal argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1219 tp/Texinfo/Parser.pm:4856
! #: tp/Texinfo/Parser.pm:4882 tp/Texinfo/Parser.pm:5671
! #: tp/Texinfo/Parser.pm:5687 tp/Texinfo/Parser.pm:5702
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s éœ€è¦�ä¸€ä¸ªå��å­—"
  
! #: tp/Texinfo/Parser.pm:1223 tp/Texinfo/Parser.pm:4859
! #: tp/Texinfo/Parser.pm:4885 tp/Texinfo/Parser.pm:5674
! #: tp/Texinfo/Parser.pm:5690 tp/Texinfo/Parser.pm:5705
  #, fuzzy, perl-format
  msgid "bad name for @%s"
  msgstr "@%s çš„å�‚æ•°é”™è¯¯"
  
! #: tp/Texinfo/Parser.pm:1341
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1345
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1350
! #, perl-format
! msgid "%c%s missing close brace"
  msgstr "%c%s é�—æ¼�é—­å�ˆèŠ±æ‹¬å�·"
  
! #: tp/Texinfo/Parser.pm:1354
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1476
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1544
  msgid "@itemx must follow @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1712
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1743
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "â€œ@endâ€�éœ€è¦�â€œ%sâ€�ï¼Œä½†çœ‹åˆ°â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:1746
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1750
  #, fuzzy, perl-format
  msgid "no matching `%cend %s'"
  msgstr "æ²¡æœ‰åŒ¹é…�çš„â€œ%cend %sâ€�"
  
! #: tp/Texinfo/Parser.pm:1776 tp/Texinfo/Parser.pm:5204
! #: tp/Texinfo/Parser.pm:5470
  #, fuzzy, perl-format
  msgid "misplaced %c"
  msgstr "é”™è¯¯æ”¾ç½®çš„ %c"
  
! #: tp/Texinfo/Parser.pm:1874 tp/Texinfo/Parser.pm:3312
  #, fuzzy, perl-format
  msgid "unmatched `%c%s'"
  msgstr "æœªåŒ¹é…�çš„â€œ%c%sâ€�"
  
! #: tp/Texinfo/Parser.pm:2110
  #, fuzzy, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "åœ¨ç¬¬ %2$d è¡Œä¸­ä»¥è¿‡å¤šçš„å�‚æ•°è°ƒç”¨å®�â€œ%1$sâ€�"
  
! #: tp/Texinfo/Parser.pm:2132
  #, fuzzy, perl-format
! msgid "@%s missing close brace"
  msgstr "%c%s é�—æ¼�é—­å�ˆèŠ±æ‹¬å�·"
  
! #: tp/Texinfo/Parser.pm:2140
  #, fuzzy, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr "åœ¨ç¬¬ %2$d è¡Œä¸­ä»¥è¿‡å¤šçš„å�‚æ•°è°ƒç”¨å®�â€œ%1$sâ€�"
  
! #: tp/Texinfo/Parser.pm:2175
  #, fuzzy, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
  msgstr "\\ ä»¥å¸¦æœ‰â€œ%sâ€�çš„å®�å±•å¼€å¼�ä»£æ›¿å�‚æ•°å��ç§°"
  
! #: tp/Texinfo/Parser.pm:2650
  #, fuzzy, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "å®�â€œ%sâ€�å·²åœ¨å‰�é�¢å®šä¹‰"
  
! #: tp/Texinfo/Parser.pm:2655
  #, fuzzy, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "è¿™é‡Œæ˜¯â€œ%sâ€�å‰�é�¢çš„å®šä¹‰"
  
! #: tp/Texinfo/Parser.pm:3016
  #, fuzzy, perl-format
  msgid "missing name for @%s"
  msgstr "é�—æ¼�åŠ¨ä½œå��ç§°"
  
! #: tp/Texinfo/Parser.pm:3021
  #, perl-format
  msgid "missing category for @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3073
  #, fuzzy, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "@%s çš„é”™è¯¯å�‚æ•°: %s"
  
! #: tp/Texinfo/Parser.pm:3089
  #, fuzzy
  msgid "empty multitable"
  msgstr "%sï¼šç©ºæ–‡ä»¶"
  
! #: tp/Texinfo/Parser.pm:3145 tp/Texinfo/Parser.pm:5784
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s"
  msgstr "@%s çš„å�‚æ•°é”™è¯¯"
  
! #: tp/Texinfo/Parser.pm:3151 tp/Texinfo/Parser.pm:5806
! #: tp/Texinfo/Parser.pm:5818
  #, fuzzy, perl-format
  msgid "bad argument to @%s"
  msgstr "@%s çš„å�‚æ•°é”™è¯¯"
  
! #: tp/Texinfo/Parser.pm:3162
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s éœ€è¦�ä¸€ä¸ªå�‚æ•°: %citem çš„æ ¼å¼�åŒ–å�‚æ•°"
  
! #: tp/Texinfo/Parser.pm:3167
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3202
  #, fuzzy, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "%sï¼šé€‰é¡¹â€œ--%sâ€�ä¸�æŽ¥å�—å�‚æ•°\n"
  
! #: tp/Texinfo/Parser.pm:3290 tp/Texinfo/Parser.pm:3429
! #: tp/Texinfo/Parser.pm:5777
  #, fuzzy, perl-format
  msgid "@%s missing argument"
  msgstr "%sï¼šé�—æ¼�æ–‡ä»¶å�‚æ•°ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:3302
  #, fuzzy, perl-format
  msgid "unknown @end %s"
  msgstr "æœªçŸ¥çš„ç´¢å¼•â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:3324 tp/Texinfo/Parser.pm:3943
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "@%s çš„é”™è¯¯å�‚æ•°: %s"
  
! #: tp/Texinfo/Parser.pm:3329 tp/Texinfo/Parser.pm:5861
! #: tp/Texinfo/Parser.pm:5906 tp/Texinfo/Parser.pm:5935
! #: tp/Texinfo/Parser.pm:5976 tp/Texinfo/Parser.pm:6055
  #, fuzzy, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "@%s çš„é”™è¯¯å�‚æ•°: %s"
  
! #: tp/Texinfo/Parser.pm:3348
  #, fuzzy, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "%s: æ— æ³•æ‰“å¼€ --css-file: %s"
  
! #: tp/Texinfo/Parser.pm:3360
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3369
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "ä¸�èƒ½è¯†åˆ«çš„ç¼–ç �å��ç§°â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:3516
  #, perl-format
  msgid "@%s after the first element"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3523
  #, fuzzy, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "â€œ@titlepageâ€�çŽ¯å¢ƒå�˜é‡�å¤–çš„ @%s æ˜¯æ²¡æœ‰æ„�ä¹‰çš„"
  
! #: tp/Texinfo/Parser.pm:3563
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3575
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3677
  #, fuzzy, perl-format
  msgid "empty argument in @%s"
  msgstr "@%s çš„å�‚æ•°é”™è¯¯"
  
! #: tp/Texinfo/Parser.pm:3681
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3724
  #, fuzzy, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "èŠ‚ç‚¹â€œ%sâ€�ä¸­æ²¡æœ‰è�œå�•ã€‚"
  
! #: tp/Texinfo/Parser.pm:3732
  msgid "empty node name in menu entry"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3805
  #, fuzzy, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "%s: æ— æ³•æ‰“å¼€ --css-file: %s"
  
! #: tp/Texinfo/Parser.pm:3937
! #, perl-format
! msgid "@end %s should only appear at a line beginning"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:3960
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "å®�â€œ%sâ€�å·²åœ¨å‰�é�¢å®šä¹‰"
  
! #: tp/Texinfo/Parser.pm:3963
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "è¿™é‡Œæ˜¯â€œ%sâ€�å‰�é�¢çš„å®šä¹‰"
  
! #: tp/Texinfo/Parser.pm:3968
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4017
  #, perl-format
  msgid "@%s without associated character"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4087
  #, perl-format
  msgid ""
--- 2328,2648 ----
  msgstr "@strong{Note...} åœ¨ Info ä¸­å½¢æˆ�äº†ä¸€ä¸ªå�‡çš„äº¤å�‰å¼•ç”¨ï¼›å�¯é€šè¿‡é‡�å†™é�¿å…�æ­¤äº‹"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2162
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2194
  #, fuzzy, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr "æ²¡æœ‰ %sç´¢å¼•æ�¡ç›®å�«æœ‰â€œ%sâ€�ã€‚"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2227
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2273
  #, fuzzy, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "â€œ.â€�æˆ–â€œ,â€�ä¹‹å�Žå¿…é¡»ä¸º @%sï¼Œè€Œä¸�æ˜¯â€œ%câ€�"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2276
  #, fuzzy
  msgid "`.' or `,' must follow @xref"
  msgstr "â€œ.â€�æˆ–â€œ,â€�ä¹‹å�Žå¿…é¡»ä¸º @%sï¼Œè€Œä¸�æ˜¯â€œ%câ€�"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3086
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3097
  msgid "menu entry node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3113
  msgid "menu entry name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:883
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1125 tp/Texinfo/Structuring.pm:595
  #, perl-format
  msgid "multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1166
  #, perl-format
! msgid "bad or empty @%s formal argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1176
  #, perl-format
! msgid "bad syntax for @%s argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1183 tp/Texinfo/Parser.pm:4707
! #: tp/Texinfo/Parser.pm:4733 tp/Texinfo/Parser.pm:5565
! #: tp/Texinfo/Parser.pm:5578 tp/Texinfo/Parser.pm:5592
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s éœ€è¦�ä¸€ä¸ªå��å­—"
  
! #: tp/Texinfo/Parser.pm:1187 tp/Texinfo/Parser.pm:4710
! #: tp/Texinfo/Parser.pm:4736 tp/Texinfo/Parser.pm:5568
! #: tp/Texinfo/Parser.pm:5581 tp/Texinfo/Parser.pm:5595
  #, fuzzy, perl-format
  msgid "bad name for @%s"
  msgstr "@%s çš„å�‚æ•°é”™è¯¯"
  
! #: tp/Texinfo/Parser.pm:1305
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1309
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1314
! #, fuzzy, perl-format
! msgid "%c%s missing closing brace"
  msgstr "%c%s é�—æ¼�é—­å�ˆèŠ±æ‹¬å�·"
  
! #: tp/Texinfo/Parser.pm:1318
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1440
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1508
  msgid "@itemx must follow @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1676
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1707
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr "â€œ@endâ€�éœ€è¦�â€œ%sâ€�ï¼Œä½†çœ‹åˆ°â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:1710
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1714
  #, fuzzy, perl-format
  msgid "no matching `%cend %s'"
  msgstr "æ²¡æœ‰åŒ¹é…�çš„â€œ%cend %sâ€�"
  
! #: tp/Texinfo/Parser.pm:1738 tp/Texinfo/Parser.pm:5070
! #: tp/Texinfo/Parser.pm:5308
  #, fuzzy, perl-format
  msgid "misplaced %c"
  msgstr "é”™è¯¯æ”¾ç½®çš„ %c"
  
! #: tp/Texinfo/Parser.pm:1835 tp/Texinfo/Parser.pm:3148
  #, fuzzy, perl-format
  msgid "unmatched `%c%s'"
  msgstr "æœªåŒ¹é…�çš„â€œ%c%sâ€�"
  
! #: tp/Texinfo/Parser.pm:2072
  #, fuzzy, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "åœ¨ç¬¬ %2$d è¡Œä¸­ä»¥è¿‡å¤šçš„å�‚æ•°è°ƒç”¨å®�â€œ%1$sâ€�"
  
! #: tp/Texinfo/Parser.pm:2094
  #, fuzzy, perl-format
! msgid "@%s missing closing brace"
  msgstr "%c%s é�—æ¼�é—­å�ˆèŠ±æ‹¬å�·"
  
! #: tp/Texinfo/Parser.pm:2102
  #, fuzzy, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr "åœ¨ç¬¬ %2$d è¡Œä¸­ä»¥è¿‡å¤šçš„å�‚æ•°è°ƒç”¨å®�â€œ%1$sâ€�"
  
! #: tp/Texinfo/Parser.pm:2138
  #, fuzzy, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
  msgstr "\\ ä»¥å¸¦æœ‰â€œ%sâ€�çš„å®�å±•å¼€å¼�ä»£æ›¿å�‚æ•°å��ç§°"
  
! #: tp/Texinfo/Parser.pm:2501
  #, fuzzy, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "å®�â€œ%sâ€�å·²åœ¨å‰�é�¢å®šä¹‰"
  
! #: tp/Texinfo/Parser.pm:2506
  #, fuzzy, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "è¿™é‡Œæ˜¯â€œ%sâ€�å‰�é�¢çš„å®šä¹‰"
  
! #: tp/Texinfo/Parser.pm:2850
  #, fuzzy, perl-format
  msgid "missing name for @%s"
  msgstr "é�—æ¼�åŠ¨ä½œå��ç§°"
  
! #: tp/Texinfo/Parser.pm:2855
  #, perl-format
  msgid "missing category for @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2890
  #, fuzzy, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr "@%s çš„é”™è¯¯å�‚æ•°: %s"
  
! #: tp/Texinfo/Parser.pm:2905
  #, fuzzy
  msgid "empty multitable"
  msgstr "%sï¼šç©ºæ–‡ä»¶"
  
! #: tp/Texinfo/Parser.pm:2959 tp/Texinfo/Parser.pm:5673
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s"
  msgstr "@%s çš„å�‚æ•°é”™è¯¯"
  
! #: tp/Texinfo/Parser.pm:2965 tp/Texinfo/Parser.pm:5694
! #: tp/Texinfo/Parser.pm:5705
  #, fuzzy, perl-format
  msgid "bad argument to @%s"
  msgstr "@%s çš„å�‚æ•°é”™è¯¯"
  
! #: tp/Texinfo/Parser.pm:2976
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr "%s éœ€è¦�ä¸€ä¸ªå�‚æ•°: %citem çš„æ ¼å¼�åŒ–å�‚æ•°"
  
! #: tp/Texinfo/Parser.pm:2981
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3016
  #, fuzzy, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "%sï¼šé€‰é¡¹â€œ--%sâ€�ä¸�æŽ¥å�—å�‚æ•°\n"
  
! #: tp/Texinfo/Parser.pm:3124 tp/Texinfo/Parser.pm:3277
! #: tp/Texinfo/Parser.pm:5666
  #, fuzzy, perl-format
  msgid "@%s missing argument"
  msgstr "%sï¼šé�—æ¼�æ–‡ä»¶å�‚æ•°ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:3138
  #, fuzzy, perl-format
  msgid "unknown @end %s"
  msgstr "æœªçŸ¥çš„ç´¢å¼•â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:3161 tp/Texinfo/Parser.pm:3788
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr "@%s çš„é”™è¯¯å�‚æ•°: %s"
  
! #: tp/Texinfo/Parser.pm:3167 tp/Texinfo/Parser.pm:3245
! #: tp/Texinfo/Parser.pm:5755 tp/Texinfo/Parser.pm:5798
! #: tp/Texinfo/Parser.pm:5827 tp/Texinfo/Parser.pm:5868
! #: tp/Texinfo/Parser.pm:5946
  #, fuzzy, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "@%s çš„é”™è¯¯å�‚æ•°: %s"
  
! #: tp/Texinfo/Parser.pm:3188
  #, fuzzy, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr "%s: æ— æ³•æ‰“å¼€ --css-file: %s"
  
! #: tp/Texinfo/Parser.pm:3200
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3208
  #, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "ä¸�èƒ½è¯†åˆ«çš„ç¼–ç �å��ç§°â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:3364
  #, perl-format
  msgid "@%s after the first element"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3371
  #, fuzzy, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr "â€œ@titlepageâ€�çŽ¯å¢ƒå�˜é‡�å¤–çš„ @%s æ˜¯æ²¡æœ‰æ„�ä¹‰çš„"
  
! #: tp/Texinfo/Parser.pm:3408
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3420
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3522
  #, fuzzy, perl-format
  msgid "empty argument in @%s"
  msgstr "@%s çš„å�‚æ•°é”™è¯¯"
  
! #: tp/Texinfo/Parser.pm:3526
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3569
  #, fuzzy, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "èŠ‚ç‚¹â€œ%sâ€�ä¸­æ²¡æœ‰è�œå�•ã€‚"
  
! #: tp/Texinfo/Parser.pm:3577
  msgid "empty node name in menu entry"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3650
  #, fuzzy, perl-format
  msgid "@%s should not appear in @%s"
  msgstr "%s: æ— æ³•æ‰“å¼€ --css-file: %s"
  
! #: tp/Texinfo/Parser.pm:3782
! #, fuzzy, perl-format
! msgid "@end %s should only appear at the beginning of a line"
! msgstr "å‰ªåˆ‡è‡³æœ¬è¡Œå¼€å¤´"
  
! #: tp/Texinfo/Parser.pm:3804
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "å®�â€œ%sâ€�å·²åœ¨å‰�é�¢å®šä¹‰"
  
! #: tp/Texinfo/Parser.pm:3807
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "è¿™é‡Œæ˜¯â€œ%sâ€�å‰�é�¢çš„å®šä¹‰"
  
! #: tp/Texinfo/Parser.pm:3812
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3879
  #, perl-format
  msgid "@%s without associated character"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3949
  #, perl-format
  msgid ""
***************
*** 2653,2657 ****
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4111
  #, perl-format
  msgid ""
--- 2650,2654 ----
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3974
  #, perl-format
  msgid ""
***************
*** 2660,3068 ****
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4120
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4176
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4182
  #, fuzzy, perl-format
  msgid "use braces to give a command as an argument to @%s"
  msgstr "ä½¿ç”¨èŠ±æ‹¬å�·å°†ä¸€ä¸ªå‘½ä»¤ç”¨ä½œ @%s çš„å�‚æ•°"
  
! #: tp/Texinfo/Parser.pm:4195 tp/Texinfo/Parser.pm:5325
  #, fuzzy, perl-format
  msgid "%c%s expects `i' or `j' as argument, not `%s'"
  msgstr "%c%s çš„å�‚æ•°åº”ä¸ºâ€œiâ€�æˆ–â€œjâ€�ï¼Œè€Œä¸�æ˜¯â€œ%câ€�"
  
! #: tp/Texinfo/Parser.pm:4207
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4218
  #, fuzzy, perl-format
  msgid "@%s expected braces"
  msgstr "%c%s éœ€è¦�èŠ±æ‹¬å�·"
  
! #: tp/Texinfo/Parser.pm:4383
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "æœªå®šä¹‰çš„æ ‡è¯†: %s"
  
! #: tp/Texinfo/Parser.pm:4386
  msgid "bad syntax for @value"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4393
  #, fuzzy, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s å·²è¿‡æ—¶"
  
! #: tp/Texinfo/Parser.pm:4396
  #, fuzzy, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s å·²è¿‡æ—¶"
  
! #: tp/Texinfo/Parser.pm:4405
! #, perl-format
! msgid "@%s should only appear at a line beginning"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:4496
  #, fuzzy, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "åœ¨â€œ@%2$sâ€�å�—ä¸­â€œ@%1$sâ€�æ˜¯æ²¡æœ‰æ„�ä¹‰çš„"
  
! #: tp/Texinfo/Parser.pm:4505
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4631 tp/Texinfo/Parser.pm:4648
! #: tp/Texinfo/Parser.pm:4698
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "åœ¨â€œ@%2$sâ€�å�—ä¸­â€œ@%1$sâ€�æ˜¯æ²¡æœ‰æ„�ä¹‰çš„"
  
! #: tp/Texinfo/Parser.pm:4658
  #, fuzzy, perl-format
  msgid "@%s in empty multitable"
  msgstr "%sï¼šç©ºæ–‡ä»¶"
  
! #: tp/Texinfo/Parser.pm:4664
  msgid "@tab before @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4667
  #, fuzzy, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "åœ¨å¤šåˆ—è¡¨æ ¼é¡¹ç›®ä¸­å�«æœ‰å¤ªå¤šçš„åˆ— (æœ€å¤§ä¸º %d)"
  
! #: tp/Texinfo/Parser.pm:4704
  msgid "ignoring @tab outside of multitable"
  msgstr "å¿½ç•¥å¤šåˆ—è¡¨æ ¼å¤–çš„ @tab"
  
! #: tp/Texinfo/Parser.pm:4708
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4745
  #, fuzzy, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "å¿…é¡»åœ¨â€œ@%sâ€�çŽ¯å¢ƒå�˜é‡�ä¸­ä½¿ç”¨â€œ@%sâ€�"
  
! #: tp/Texinfo/Parser.pm:4787
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "åœ¨â€œ@titlepageâ€�å’Œâ€œ@quotationâ€�çŽ¯å¢ƒå�˜é‡�å¤– @%s æ— æ„�ä¹‰"
  
! #: tp/Texinfo/Parser.pm:4791
  msgid "@dircategory after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4979
  #, fuzzy, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "è„šæ³¨å†…çš„è„šæ³¨æ˜¯ä¸�å…�è®¸çš„"
  
! #: tp/Texinfo/Parser.pm:4997
  msgid "@direntry after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5005
  #, fuzzy, perl-format
  msgid "@%s seen before first @node"
  msgstr "åœ¨ç¬¬ä¸€ä¸ªèŠ‚ç‚¹ä¹‹å‰�é�‡åˆ° @menuï¼Œæ­£åœ¨åˆ›å»ºâ€œé¡¶â€�èŠ‚ç‚¹"
  
! #: tp/Texinfo/Parser.pm:5008
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
  msgstr "æ‚¨çš„ @top èŠ‚ç‚¹å�¯èƒ½åº”è¯¥åŒ…å�«åœ¨ @ifnottex è€Œä¸�æ˜¯ @ifinfo ä¸­ï¼Ÿ"
  
! #: tp/Texinfo/Parser.pm:5070
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5078
  #, fuzzy, perl-format
  msgid "unknown command `%s'"
  msgstr "æœªçŸ¥çš„å‘½ä»¤â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5088
  #, fuzzy
  msgid "unexpected @"
  msgstr "åº”ä¸ºâ€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5117
  #, fuzzy, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "â€œ@floatâ€�çŽ¯å¢ƒå�˜é‡�å¤–çš„ @%s æ˜¯æ²¡æœ‰æ„�ä¹‰çš„"
  
! #: tp/Texinfo/Parser.pm:5122
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5130
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5249
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5273
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5292
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5303
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5316
  msgid "@image missing filename argument"
  msgstr "@image é�—æ¼�æ–‡ä»¶å��å�‚æ•°"
  
! #: tp/Texinfo/Parser.pm:5348
  #, fuzzy, perl-format
  msgid "@%s missing first argument"
  msgstr "%sï¼šé�—æ¼�æ–‡ä»¶å�‚æ•°ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:5393
  #, fuzzy, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "@%s çš„é”™è¯¯å�‚æ•°: %s"
  
! #: tp/Texinfo/Parser.pm:5399
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5412
! #, perl-format
! msgid "argument for @U exceeds size of integer: %s"
! msgstr ""
! 
! #: tp/Texinfo/Parser.pm:5418
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5546
  msgid "superfluous arguments for node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5596
  #, fuzzy, perl-format
  msgid "expected @end %s"
  msgstr "åº”ä¸ºâ€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5718
  #, fuzzy, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "ä½¿ç”¨èŠ±æ‹¬å�·å°†ä¸€ä¸ªå‘½ä»¤ç”¨ä½œ @%s çš„å�‚æ•°"
  
! #: tp/Texinfo/Parser.pm:5728
  #, fuzzy, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "@%s çš„é”™è¯¯å�‚æ•°: %s"
  
! #: tp/Texinfo/Parser.pm:5801
  #, fuzzy, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "ä½¿ç”¨èŠ±æ‹¬å�·å°†ä¸€ä¸ªå‘½ä»¤ç”¨ä½œ @%s çš„å�‚æ•°"
  
! #: tp/Texinfo/Parser.pm:5823
  #, perl-format
  msgid "empty @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5831
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5840
  #, fuzzy, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "%sï¼š%s å�‚æ•°å¿…é¡»ä¸ºæ•°å€¼ï¼Œè€Œä¸�æ˜¯â€œ%sâ€�ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:5849
  #, perl-format
  msgid "reserved index name %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5868
  #, fuzzy, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "æœªçŸ¥çš„ç´¢å¼•â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5871
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5914
  #, fuzzy, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "@printindex ä¸­çš„æœªçŸ¥ç´¢å¼•â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5920
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5928
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5944
  #, fuzzy, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
  msgstr "%sï¼š%s å�‚æ•°å¿…é¡»ä¸ºæ•°å€¼ï¼Œè€Œä¸�æ˜¯â€œ%sâ€�ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:5952
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr "ä»…æ”¯æŒ� @%s 10 æˆ– 11ï¼Œè€Œä¸�æ˜¯â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5960
  #, fuzzy, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
  msgstr "%sï¼š--footnote-style çš„å�‚æ•°å¿…é¡»ä¸ºâ€œseparateâ€�æˆ–â€œendâ€�ï¼Œè€Œä¸�æ˜¯â€œ%sâ€�ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:5968
  #, fuzzy, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
  msgstr "%sï¼š%s å�‚æ•°å¿…é¡»ä¸ºæ•°å€¼ï¼Œè€Œä¸�æ˜¯â€œ%sâ€�ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:5986 tp/Texinfo/Parser.pm:5991
  #, fuzzy, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
  msgstr "%sï¼š--paragraph-indent çš„å�‚æ•°å¿…é¡»ä¸ºæ•°å€¼/â€œnoneâ€�/â€œasisâ€�ï¼Œè€Œä¸�æ˜¯â€œ%sâ€�ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:5999
  #, fuzzy, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
  msgstr "%sï¼š--paragraph-indent çš„å�‚æ•°å¿…é¡»ä¸ºæ•°å€¼/â€œnoneâ€�/â€œasisâ€�ï¼Œè€Œä¸�æ˜¯â€œ%sâ€�ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:6009
  #, fuzzy, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
  msgstr "%sï¼š--paragraph-indent çš„å�‚æ•°å¿…é¡»ä¸ºæ•°å€¼/â€œnoneâ€�/â€œasisâ€�ï¼Œè€Œä¸�æ˜¯â€œ%sâ€�ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:6021
  #, fuzzy, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "åº”å½“ @%s å¼€å�¯æˆ–å…³é—­ï¼Œè€Œä¸�æ˜¯â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:6031
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:6039
  #, fuzzy, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
  msgstr "%sï¼š--footnote-style çš„å�‚æ•°å¿…é¡»ä¸ºâ€œseparateâ€�æˆ–â€œendâ€�ï¼Œè€Œä¸�æ˜¯â€œ%sâ€�ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:6047
  #, fuzzy, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
  msgstr "%sï¼š--footnote-style çš„å�‚æ•°å¿…é¡»ä¸ºâ€œseparateâ€�æˆ–â€œendâ€�ï¼Œè€Œä¸�æ˜¯â€œ%sâ€�ã€‚\n"
  
! #: tp/Texinfo/Structuring.pm:213
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:245
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:250
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:339
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:488
  #, perl-format
  msgid "@%s not empty"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:544 tp/Texinfo/Structuring.pm:1326
  #, fuzzy, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "%s å¼•ç”¨åˆ°ä¸�å­˜åœ¨çš„èŠ‚ç‚¹â€œ%sâ€�(ä¹Ÿè®¸å­—æ®µä¸�æ­£ç¡®ï¼Ÿ)"
  
! #: tp/Texinfo/Structuring.pm:557
  #, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:662
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "æœªå¼•ç”¨çš„èŠ‚ç‚¹â€œ%sâ€�"
  
! #: tp/Texinfo/Structuring.pm:708
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:715
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:733
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:787
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:814
  #, fuzzy, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "æœªå¼•ç”¨çš„èŠ‚ç‚¹â€œ%sâ€�"
  
! #: tp/Texinfo/Structuring.pm:834
  #, fuzzy, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
  msgstr "å°½ç®¡èŠ‚ç‚¹â€œ%sâ€�æ˜¯â€œ%sâ€�çš„ä¸Šå±‚èŠ‚ç‚¹ï¼Œä½†ç¼ºå°‘ç›¸å…³çš„è�œå�•é¡¹"
  
! #: tp/Texinfo/Structuring.pm:842
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
--- 2657,3060 ----
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3983
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4038
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4044
  #, fuzzy, perl-format
  msgid "use braces to give a command as an argument to @%s"
  msgstr "ä½¿ç”¨èŠ±æ‹¬å�·å°†ä¸€ä¸ªå‘½ä»¤ç”¨ä½œ @%s çš„å�‚æ•°"
  
! #: tp/Texinfo/Parser.pm:4057 tp/Texinfo/Parser.pm:5189
  #, fuzzy, perl-format
  msgid "%c%s expects `i' or `j' as argument, not `%s'"
  msgstr "%c%s çš„å�‚æ•°åº”ä¸ºâ€œiâ€�æˆ–â€œjâ€�ï¼Œè€Œä¸�æ˜¯â€œ%câ€�"
  
! #: tp/Texinfo/Parser.pm:4068
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4079
  #, fuzzy, perl-format
  msgid "@%s expected braces"
  msgstr "%c%s éœ€è¦�èŠ±æ‹¬å�·"
  
! #: tp/Texinfo/Parser.pm:4233
  #, perl-format
  msgid "undefined flag: %s"
  msgstr "æœªå®šä¹‰çš„æ ‡è¯†: %s"
  
! #: tp/Texinfo/Parser.pm:4236
  msgid "bad syntax for @value"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4243
  #, fuzzy, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s å·²è¿‡æ—¶"
  
! #: tp/Texinfo/Parser.pm:4246
  #, fuzzy, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s å·²è¿‡æ—¶"
  
! #: tp/Texinfo/Parser.pm:4255
! #, fuzzy, perl-format
! msgid "@%s should only appear at the beginning of a line"
! msgstr "å‰ªåˆ‡è‡³æœ¬è¡Œå¼€å¤´"
  
! #: tp/Texinfo/Parser.pm:4346
  #, fuzzy, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "åœ¨â€œ@%2$sâ€�å�—ä¸­â€œ@%1$sâ€�æ˜¯æ²¡æœ‰æ„�ä¹‰çš„"
  
! #: tp/Texinfo/Parser.pm:4355
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4479 tp/Texinfo/Parser.pm:4496
! #: tp/Texinfo/Parser.pm:4546
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "åœ¨â€œ@%2$sâ€�å�—ä¸­â€œ@%1$sâ€�æ˜¯æ²¡æœ‰æ„�ä¹‰çš„"
  
! #: tp/Texinfo/Parser.pm:4506
  #, fuzzy, perl-format
  msgid "@%s in empty multitable"
  msgstr "%sï¼šç©ºæ–‡ä»¶"
  
! #: tp/Texinfo/Parser.pm:4512
  msgid "@tab before @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4515
  #, fuzzy, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "åœ¨å¤šåˆ—è¡¨æ ¼é¡¹ç›®ä¸­å�«æœ‰å¤ªå¤šçš„åˆ— (æœ€å¤§ä¸º %d)"
  
! #: tp/Texinfo/Parser.pm:4552
  msgid "ignoring @tab outside of multitable"
  msgstr "å¿½ç•¥å¤šåˆ—è¡¨æ ¼å¤–çš„ @tab"
  
! #: tp/Texinfo/Parser.pm:4556
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4596
  #, fuzzy, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr "å¿…é¡»åœ¨â€œ@%sâ€�çŽ¯å¢ƒå�˜é‡�ä¸­ä½¿ç”¨â€œ@%sâ€�"
  
! #: tp/Texinfo/Parser.pm:4638
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr "åœ¨â€œ@titlepageâ€�å’Œâ€œ@quotationâ€�çŽ¯å¢ƒå�˜é‡�å¤– @%s æ— æ„�ä¹‰"
  
! #: tp/Texinfo/Parser.pm:4642
  msgid "@dircategory after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4847
  #, fuzzy, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "è„šæ³¨å†…çš„è„šæ³¨æ˜¯ä¸�å…�è®¸çš„"
  
! #: tp/Texinfo/Parser.pm:4864
  msgid "@direntry after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4872
  #, fuzzy, perl-format
  msgid "@%s seen before first @node"
  msgstr "åœ¨ç¬¬ä¸€ä¸ªèŠ‚ç‚¹ä¹‹å‰�é�‡åˆ° @menuï¼Œæ­£åœ¨åˆ›å»ºâ€œé¡¶â€�èŠ‚ç‚¹"
  
! #: tp/Texinfo/Parser.pm:4875
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
  msgstr "æ‚¨çš„ @top èŠ‚ç‚¹å�¯èƒ½åº”è¯¥åŒ…å�«åœ¨ @ifnottex è€Œä¸�æ˜¯ @ifinfo ä¸­ï¼Ÿ"
  
! #: tp/Texinfo/Parser.pm:4937
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4945
  #, fuzzy, perl-format
  msgid "unknown command `%s'"
  msgstr "æœªçŸ¥çš„å‘½ä»¤â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:4955
  #, fuzzy
  msgid "unexpected @"
  msgstr "åº”ä¸ºâ€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:4983
  #, fuzzy, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "â€œ@floatâ€�çŽ¯å¢ƒå�˜é‡�å¤–çš„ @%s æ˜¯æ²¡æœ‰æ„�ä¹‰çš„"
  
! #: tp/Texinfo/Parser.pm:4988
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4996
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5114
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5138
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5156
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5167
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5180
  msgid "@image missing filename argument"
  msgstr "@image é�—æ¼�æ–‡ä»¶å��å�‚æ•°"
  
! #: tp/Texinfo/Parser.pm:5211
  #, fuzzy, perl-format
  msgid "@%s missing first argument"
  msgstr "%sï¼šé�—æ¼�æ–‡ä»¶å�‚æ•°ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:5230
  #, fuzzy, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr "@%s çš„é”™è¯¯å�‚æ•°: %s"
  
! #: tp/Texinfo/Parser.pm:5236
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5253
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5448
  msgid "superfluous arguments for node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5498
  #, fuzzy, perl-format
  msgid "expected @end %s"
  msgstr "åº”ä¸ºâ€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5607
  #, fuzzy, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "ä½¿ç”¨èŠ±æ‹¬å�·å°†ä¸€ä¸ªå‘½ä»¤ç”¨ä½œ @%s çš„å�‚æ•°"
  
! #: tp/Texinfo/Parser.pm:5617
  #, fuzzy, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr "@%s çš„é”™è¯¯å�‚æ•°: %s"
  
! #: tp/Texinfo/Parser.pm:5689
  #, fuzzy, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "ä½¿ç”¨èŠ±æ‹¬å�·å°†ä¸€ä¸ªå‘½ä»¤ç”¨ä½œ @%s çš„å�‚æ•°"
  
! #: tp/Texinfo/Parser.pm:5710
  #, perl-format
  msgid "empty @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5727
  #, fuzzy, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "%sï¼š%s å�‚æ•°å¿…é¡»ä¸ºæ•°å€¼ï¼Œè€Œä¸�æ˜¯â€œ%sâ€�ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:5736
  #, perl-format
  msgid "reserved index name %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5762
  #, fuzzy, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "æœªçŸ¥çš„ç´¢å¼•â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5765
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5793
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5806
  #, fuzzy, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "@printindex ä¸­çš„æœªçŸ¥ç´¢å¼•â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5812
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5820
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5836
  #, fuzzy, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
  msgstr "%sï¼š%s å�‚æ•°å¿…é¡»ä¸ºæ•°å€¼ï¼Œè€Œä¸�æ˜¯â€œ%sâ€�ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:5844
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr "ä»…æ”¯æŒ� @%s 10 æˆ– 11ï¼Œè€Œä¸�æ˜¯â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5852
  #, fuzzy, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
  msgstr "%sï¼š--footnote-style çš„å�‚æ•°å¿…é¡»ä¸ºâ€œseparateâ€�æˆ–â€œendâ€�ï¼Œè€Œä¸�æ˜¯â€œ%sâ€�ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:5860
  #, fuzzy, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
  msgstr "%sï¼š%s å�‚æ•°å¿…é¡»ä¸ºæ•°å€¼ï¼Œè€Œä¸�æ˜¯â€œ%sâ€�ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:5878 tp/Texinfo/Parser.pm:5883
  #, fuzzy, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
  msgstr "%sï¼š--paragraph-indent çš„å�‚æ•°å¿…é¡»ä¸ºæ•°å€¼/â€œnoneâ€�/â€œasisâ€�ï¼Œè€Œä¸�æ˜¯â€œ%sâ€�ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:5891
  #, fuzzy, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
  msgstr "%sï¼š--paragraph-indent çš„å�‚æ•°å¿…é¡»ä¸ºæ•°å€¼/â€œnoneâ€�/â€œasisâ€�ï¼Œè€Œä¸�æ˜¯â€œ%sâ€�ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:5901
  #, fuzzy, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
  msgstr "%sï¼š--paragraph-indent çš„å�‚æ•°å¿…é¡»ä¸ºæ•°å€¼/â€œnoneâ€�/â€œasisâ€�ï¼Œè€Œä¸�æ˜¯â€œ%sâ€�ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:5913
  #, fuzzy, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr "åº”å½“ @%s å¼€å�¯æˆ–å…³é—­ï¼Œè€Œä¸�æ˜¯â€œ%sâ€�"
  
! #: tp/Texinfo/Parser.pm:5922
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5930
  #, fuzzy, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
  msgstr "%sï¼š--footnote-style çš„å�‚æ•°å¿…é¡»ä¸ºâ€œseparateâ€�æˆ–â€œendâ€�ï¼Œè€Œä¸�æ˜¯â€œ%sâ€�ã€‚\n"
  
! #: tp/Texinfo/Parser.pm:5938
  #, fuzzy, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
  msgstr "%sï¼š--footnote-style çš„å�‚æ•°å¿…é¡»ä¸ºâ€œseparateâ€�æˆ–â€œendâ€�ï¼Œè€Œä¸�æ˜¯â€œ%sâ€�ã€‚\n"
  
! #: tp/Texinfo/Structuring.pm:216
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:248
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:253
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:342
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:491
  #, perl-format
  msgid "@%s not empty"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:547 tp/Texinfo/Structuring.pm:1325
  #, fuzzy, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "%s å¼•ç”¨åˆ°ä¸�å­˜åœ¨çš„èŠ‚ç‚¹â€œ%sâ€�(ä¹Ÿè®¸å­—æ®µä¸�æ­£ç¡®ï¼Ÿ)"
  
! #: tp/Texinfo/Structuring.pm:558
  #, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:663
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "æœªå¼•ç”¨çš„èŠ‚ç‚¹â€œ%sâ€�"
  
! #: tp/Texinfo/Structuring.pm:706
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:713
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:731
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:786
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:810
  #, fuzzy, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "æœªå¼•ç”¨çš„èŠ‚ç‚¹â€œ%sâ€�"
  
! #: tp/Texinfo/Structuring.pm:829
  #, fuzzy, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
  msgstr "å°½ç®¡èŠ‚ç‚¹â€œ%sâ€�æ˜¯â€œ%sâ€�çš„ä¸Šå±‚èŠ‚ç‚¹ï¼Œä½†ç¼ºå°‘ç›¸å…³çš„è�œå�•é¡¹"
  
! #: tp/Texinfo/Structuring.pm:837
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
***************
*** 3074,3078 ****
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:2070
  #, perl-format
  msgid "empty index key in @%s"
--- 3066,3070 ----
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:2067
  #, perl-format
  msgid "empty index key in @%s"
***************
*** 3543,3561 ****
  msgstr "è¯•ç”¨â€œ%s --helpâ€�ä»¥èŽ·å�–æ›´å¤šä¿¡æ�¯ã€‚\n"
  
! #: tp/texi2any.pl:1232
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
  
! #: tp/texi2any.pl:1255
  #, fuzzy, perl-format
  msgid "error on closing macro expand file %s: %s\n"
  msgstr "å…³é—­è¾“å‡ºæ–‡ä»¶â€œ%sâ€�æ—¶å‡ºé”™"
  
! #: tp/texi2any.pl:1261
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "%s: æ— æ³•æ‰“å¼€ --css-file: %s"
  
! #: tp/texi2any.pl:1286
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
--- 3535,3553 ----
  msgstr "è¯•ç”¨â€œ%s --helpâ€�ä»¥èŽ·å�–æ›´å¤šä¿¡æ�¯ã€‚\n"
  
! #: tp/texi2any.pl:1239
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
  
! #: tp/texi2any.pl:1262
  #, fuzzy, perl-format
  msgid "error on closing macro expand file %s: %s\n"
  msgstr "å…³é—­è¾“å‡ºæ–‡ä»¶â€œ%sâ€�æ—¶å‡ºé”™"
  
! #: tp/texi2any.pl:1268
  #, fuzzy, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr "%s: æ— æ³•æ‰“å¼€ --css-file: %s"
  
! #: tp/texi2any.pl:1293
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
***************
*** 3563,3577 ****
  msgstr ""
  
! #: tp/texi2any.pl:1359 tp/texi2any.pl:1435
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1382 tp/texi2any.pl:1416
  #, fuzzy, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
  msgstr "%s: å¿½ç•¥äºŒæ¬¡å†…éƒ¨è¿žæŽ¥è¾“å‡ºâ€œ%sâ€�ã€‚\n"
  
! #: tp/texi2any.pl:1388 tp/texi2any.pl:1422
  #, fuzzy, perl-format
  msgid "%s: could not open %s for writing: %s\n"
--- 3555,3569 ----
  msgstr ""
  
! #: tp/texi2any.pl:1366 tp/texi2any.pl:1442
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1389 tp/texi2any.pl:1423
  #, fuzzy, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
  msgstr "%s: å¿½ç•¥äºŒæ¬¡å†…éƒ¨è¿žæŽ¥è¾“å‡ºâ€œ%sâ€�ã€‚\n"
  
! #: tp/texi2any.pl:1395 tp/texi2any.pl:1429
  #, fuzzy, perl-format
  msgid "%s: could not open %s for writing: %s\n"
***************
*** 3834,3837 ****
--- 3826,3835 ----
  #~ msgstr "--*** æ ‡è®°è¿‡æœŸ ***"
  
+ #~ msgid "-%s---Info: %s, %d lines --%s--"
+ #~ msgstr "-%s---Infoï¼š%sï¼Œ%d è¡Œ --%s--"
+ 
+ #~ msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
+ #~ msgstr "-%s%s-Infoï¼š(%s)%sï¼Œ%d è¡Œ --%s--"
+ 
  #~ msgid " Subfile: %s"
  #~ msgstr " å­�æ–‡ä»¶ï¼š%s"
Binary files texinfo-6.1/po/zh_TW.gmo and texinfo-6.3/po/zh_TW.gmo differ
diff -Nrc2 texinfo-6.1/po/zh_TW.po texinfo-6.3/po/zh_TW.po
*** texinfo-6.1/po/zh_TW.po	2016-02-06 11:35:57.000000000 +0000
--- texinfo-6.3/po/zh_TW.po	2016-09-10 12:45:58.000000000 +0100
***************
*** 7,11 ****
  "Project-Id-Version: texinfo 4.1\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
  "PO-Revision-Date: 2002-03-08 04:56+0800\n"
  "Last-Translator: Abel Cheung <maddog@linux.org.hk>\n"
--- 7,11 ----
  "Project-Id-Version: texinfo 4.1\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:45+0100\n"
  "PO-Revision-Date: 2002-03-08 04:56+0800\n"
  "Last-Translator: Abel Cheung <maddog@linux.org.hk>\n"
***************
*** 15,18 ****
--- 15,19 ----
  "Content-Type: text/plain; charset=Big5\n"
  "Content-Transfer-Encoding: 8bit\n"
+ "X-Bugs: Report translation errors to the Language-Team address.\n"
  
  #: gnulib/lib/error.c:191
***************
*** 111,117 ****
  
  #: gnulib/lib/regcomp.c:156
! #, fuzzy
! msgid "Unmatched [ or [^"
! msgstr "¥¼°t¹ïªº }"
  
  #: gnulib/lib/regcomp.c:159
--- 112,117 ----
  
  #: gnulib/lib/regcomp.c:156
! msgid "Unmatched [, [^, [:, [., or [="
! msgstr ""
  
  #: gnulib/lib/regcomp.c:159
***************
*** 155,159 ****
  msgstr "¥¼°t¹ïªº }"
  
! #: gnulib/lib/regcomp.c:711
  #, fuzzy
  msgid "No previous regular expression"
--- 155,159 ----
  msgstr "¥¼°t¹ïªº }"
  
! #: gnulib/lib/regcomp.c:687
  #, fuzzy
  msgid "No previous regular expression"
***************
*** 310,314 ****
  msgstr "---------------------\n"
  
! #: info/indices.c:123 info/indices.c:812
  #, c-format
  msgid "Finding index entries..."
--- 310,314 ----
  msgstr "---------------------\n"
  
! #: info/indices.c:123 info/indices.c:822
  #, c-format
  msgid "Finding index entries..."
***************
*** 319,323 ****
  msgstr "¦b¥»ÀÉ®×ªº¯Á¤Þ¤º¬d¸ß¦r¦ê"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:818
  #, c-format
  msgid "No indices found."
--- 319,323 ----
  msgstr "¦b¥»ÀÉ®×ªº¯Á¤Þ¤º¬d¸ß¦r¦ê"
  
! #: info/indices.c:215 info/indices.c:321 info/indices.c:828
  #, c-format
  msgid "No indices found."
***************
*** 349,380 ****
  msgstr "¨S¦³ %s¯Á¤Þ¶µ¥Ø¥]§t \"%s\"."
  
! #: info/indices.c:476 info/indices.c:880
  #, fuzzy, c-format
  msgid "No index entries containing '%s'."
  msgstr "¨S¦³ %s¯Á¤Þ¶µ¥Ø¥]§t \"%s\"."
  
! #: info/indices.c:583
  #, fuzzy, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "±½ºË \"%s\" ªº¯Á¤Þ¤¤..."
  
! #: info/indices.c:636
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr "¾ã²z©Ò¦³¤wª¾ info ÀÉ¤¤¥]§t¬d¸ß¦r¦êªº¯Á¤Þ, ¨Ã«Ø¥ß¤@­Ó¿ï³æ"
  
! #: info/indices.c:644 info/indices.c:646
  msgid "Index apropos"
  msgstr ""
  
! #: info/indices.c:688
  #, fuzzy, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "¨S¦³ %s¯Á¤Þ¶µ¥Ø¥]§t \"%s\"."
  
! #: info/indices.c:797
  msgid "List all matches of a string in the index"
  msgstr ""
  
! #: info/indices.c:824 info/indices.c:826
  msgid "Index topic"
  msgstr ""
--- 349,380 ----
  msgstr "¨S¦³ %s¯Á¤Þ¶µ¥Ø¥]§t \"%s\"."
  
! #: info/indices.c:476 info/indices.c:890
  #, fuzzy, c-format
  msgid "No index entries containing '%s'."
  msgstr "¨S¦³ %s¯Á¤Þ¶µ¥Ø¥]§t \"%s\"."
  
! #: info/indices.c:586
  #, fuzzy, c-format
  msgid "Scanning indices of '%s'..."
  msgstr "±½ºË \"%s\" ªº¯Á¤Þ¤¤..."
  
! #: info/indices.c:646
  msgid "Grovel all known info file's indices for a string and build a menu"
  msgstr "¾ã²z©Ò¦³¤wª¾ info ÀÉ¤¤¥]§t¬d¸ß¦r¦êªº¯Á¤Þ, ¨Ã«Ø¥ß¤@­Ó¿ï³æ"
  
! #: info/indices.c:654 info/indices.c:656
  msgid "Index apropos"
  msgstr ""
  
! #: info/indices.c:698
  #, fuzzy, c-format
  msgid "Index entries containing '%s':\n"
  msgstr "¨S¦³ %s¯Á¤Þ¶µ¥Ø¥]§t \"%s\"."
  
! #: info/indices.c:807
  msgid "List all matches of a string in the index"
  msgstr ""
  
! #: info/indices.c:834 info/indices.c:836
  msgid "Index topic"
  msgstr ""
***************
*** 385,439 ****
  msgstr ""
  
! #: info/info-utils.c:892
  #, c-format
  msgid "Error converting file character encoding."
  msgstr ""
  
! #: info/info.c:222 info/session.c:2789
  #, fuzzy, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "¿ï³æ¶µ¥Ø `%s' ¤£¦b¸`ÂI `%s' ¤¤."
  
! #: info/info.c:315
! #, fuzzy, c-format
! msgid "No file given for node '%s'."
! msgstr "¸`ÂI `%s' ¤¤¨S¦³¿ï³æ."
! 
! #: info/info.c:364 info/info.c:1133
  #, fuzzy, c-format
  msgid "Cannot find node '%s'."
  msgstr "§ä¤£¨ì `%s' ¸`ÂI."
  
! #: info/info.c:386
  #, c-format
  msgid "No program name given."
  msgstr ""
  
! #: info/info.c:577
  #, c-format
  msgid "invalid number: %s\n"
  msgstr ""
  
! #: info/info.c:757
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr ""
  
! #: info/info.c:764 info/infokey.c:537
  #, c-format
  msgid "%s: no such variable"
  msgstr ""
  
! #: info/info.c:770 info/infokey.c:539
  #, fuzzy, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "³]©w Info ÅÜ¼Æªº¼Æ­È"
  
! #: info/info.c:782
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "¸Õ¸Õ --help ¥H¨ú±o§ó¦hªº¸ê°T.\n"
  
! #: info/info.c:804 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
--- 385,434 ----
  msgstr ""
  
! #: info/info-utils.c:879
  #, c-format
  msgid "Error converting file character encoding."
  msgstr ""
  
! #: info/info.c:279 info/session.c:2789
  #, fuzzy, c-format
  msgid "No menu item '%s' in node '%s'."
  msgstr "¿ï³æ¶µ¥Ø `%s' ¤£¦b¸`ÂI `%s' ¤¤."
  
! #: info/info.c:416 info/info.c:1148
  #, fuzzy, c-format
  msgid "Cannot find node '%s'."
  msgstr "§ä¤£¨ì `%s' ¸`ÂI."
  
! #: info/info.c:438
  #, c-format
  msgid "No program name given."
  msgstr ""
  
! #: info/info.c:636
  #, c-format
  msgid "invalid number: %s\n"
  msgstr ""
  
! #: info/info.c:816
  #, c-format
  msgid "malformed variable assignment: %s"
  msgstr ""
  
! #: info/info.c:823 info/infokey.c:540
  #, c-format
  msgid "%s: no such variable"
  msgstr ""
  
! #: info/info.c:829 info/infokey.c:542
  #, fuzzy, c-format
  msgid "value %s is not valid for variable %s"
  msgstr "³]©w Info ÅÜ¼Æªº¼Æ­È"
  
! #: info/info.c:841
  #, c-format
  msgid "Try --help for more information.\n"
  msgstr "¸Õ¸Õ --help ¥H¨ú±o§ó¦hªº¸ê°T.\n"
  
! #: info/info.c:860 install-info/install-info.c:2239 tp/texi2any.pl:873
  #, c-format, perl-format
  msgid ""
***************
*** 445,454 ****
  msgstr ""
  
! #: info/info.c:981
  #, fuzzy, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "§ä¤£¨ì¥]§t `%s' ªº¯Á¤Þ¶µ¥Ø\n"
  
! #: info/info.c:1034
  #, c-format
  msgid ""
--- 440,449 ----
  msgstr ""
  
! #: info/info.c:999
  #, fuzzy, c-format
  msgid "no index entries found for '%s'\n"
  msgstr "§ä¤£¨ì¥]§t `%s' ªº¯Á¤Þ¶µ¥Ø\n"
  
! #: info/info.c:1049
  #, c-format
  msgid ""
***************
*** 458,462 ****
  msgstr ""
  
! #: info/info.c:1040
  msgid ""
  "Options:\n"
--- 453,457 ----
  msgstr ""
  
! #: info/info.c:1055
  msgid ""
  "Options:\n"
***************
*** 469,473 ****
  msgstr ""
  
! #: info/info.c:1048
  msgid ""
  "  -h, --help                   display this help and exit.\n"
--- 464,468 ----
  msgstr ""
  
! #: info/info.c:1063
  msgid ""
  "  -h, --help                   display this help and exit.\n"
***************
*** 477,481 ****
  msgstr ""
  
! #: info/info.c:1054
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
--- 472,476 ----
  msgstr ""
  
! #: info/info.c:1069
  msgid ""
  "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
***************
*** 485,493 ****
  msgstr ""
  
! #: info/info.c:1061
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr ""
  
! #: info/info.c:1065
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
--- 480,488 ----
  msgstr ""
  
! #: info/info.c:1076
  msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
  msgstr ""
  
! #: info/info.c:1080
  msgid ""
  "      --strict-node-location   (for debugging) use Info file pointers as-"
***************
*** 501,505 ****
  msgstr ""
  
! #: info/info.c:1074
  msgid ""
  "\n"
--- 496,500 ----
  msgstr ""
  
! #: info/info.c:1089
  msgid ""
  "\n"
***************
*** 511,515 ****
  msgstr ""
  
! #: info/info.c:1081
  msgid ""
  "\n"
--- 506,510 ----
  msgstr ""
  
! #: info/info.c:1096
  msgid ""
  "\n"
***************
*** 517,521 ****
  msgstr ""
  
! #: info/info.c:1084
  msgid ""
  "\n"
--- 512,516 ----
  msgstr ""
  
! #: info/info.c:1099
  msgid ""
  "\n"
***************
*** 533,537 ****
  msgstr ""
  
! #: info/info.c:1099 install-info/install-info.c:616 tp/texi2any.pl:861
  #, fuzzy
  msgid ""
--- 528,532 ----
  msgstr ""
  
! #: info/info.c:1114 install-info/install-info.c:616 tp/texi2any.pl:861
  #, fuzzy
  msgid ""
***************
*** 544,608 ****
  "¤@¯ë°ÝÃD»P°Q½×, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ±H¨ì help-texinfo@gnu.org.\n"
  
! #: info/info.c:1134
  #, fuzzy, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "§ä¤£¨ì `(%s)%s' ¸`ÂI."
  
! #: info/info.c:1135
  msgid "Cannot find a window!"
  msgstr "§ä¤£¨ì¤À¹jµøµ¡!"
  
! #: info/info.c:1136
  msgid "Point doesn't appear within this window's node!"
  msgstr "´å¼Ð¦ì¸m¤£¦b¥»¤À¹jµøµ¡ªº¸`ÂI¤º!"
  
! #: info/info.c:1137
  msgid "Cannot delete the last window."
  msgstr "µLªk§R°£¤W¤@­Ó¤À¹jµøµ¡."
  
! #: info/info.c:1138
  msgid "No menu in this node."
  msgstr "¥»¸`ÂI¨S¦³¿ï³æ."
  
! #: info/info.c:1139
  msgid "No footnotes in this node."
  msgstr "¥»¸`ÂI¨S¦³µù¸}."
  
! #: info/info.c:1140
  msgid "No cross references in this node."
  msgstr "¥»¸`ÂI¨S¦³¥æ¤¬°Ñ·Ó."
  
! #: info/info.c:1141
  #, fuzzy, c-format
  msgid "No '%s' pointer for this node."
  msgstr "¥»¸`ÂI¨S¦³ `%s' pointer."
  
! #: info/info.c:1142
  #, fuzzy, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "¥¼ª¾ªº Info ©R¥O `%c'; ¸Õ¸Õ `?' ¥H¨ú±o¨D§U¸ê°T."
  
! #: info/info.c:1143
  #, fuzzy, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "²×ºÝ¾÷Ãþ«¬ `%s' µLªk¤ä´©°õ¦æ Info ©Ò»Ýªº»Ý¨D."
  
! #: info/info.c:1144
  msgid "You are already at the last page of this node."
  msgstr "±z¤w¦b¥»¸`ÂIªº³Ì«á¤@­¶."
  
! #: info/info.c:1145
  msgid "You are already at the first page of this node."
  msgstr "±z¤w¦b¥»¸`ÂIªº²Ä¤@­¶."
  
! #: info/info.c:1146
  msgid "Only one window."
  msgstr "¥u¦³¤@­Ó¤À¹jµøµ¡."
  
! #: info/info.c:1147
  msgid "Resulting window would be too small."
  msgstr "²£¥Íªº¤À¹jµøµ¡·|¤Ó¤p."
  
! #: info/info.c:1148
  msgid "Not enough room for a help window, please delete a window."
  msgstr "³Ñ¤UªºªÅ¶¡¤Ó¤p, µLªk®e¯Ç¨D§U¤À¹jµøµ¡, ½Ð§R°£¤@­Ó¤À¹jµøµ¡."
--- 539,603 ----
  "¤@¯ë°ÝÃD»P°Q½×, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ±H¨ì help-texinfo@gnu.org.\n"
  
! #: info/info.c:1149
  #, fuzzy, c-format
  msgid "Cannot find node '(%s)%s'."
  msgstr "§ä¤£¨ì `(%s)%s' ¸`ÂI."
  
! #: info/info.c:1150
  msgid "Cannot find a window!"
  msgstr "§ä¤£¨ì¤À¹jµøµ¡!"
  
! #: info/info.c:1151
  msgid "Point doesn't appear within this window's node!"
  msgstr "´å¼Ð¦ì¸m¤£¦b¥»¤À¹jµøµ¡ªº¸`ÂI¤º!"
  
! #: info/info.c:1152
  msgid "Cannot delete the last window."
  msgstr "µLªk§R°£¤W¤@­Ó¤À¹jµøµ¡."
  
! #: info/info.c:1153
  msgid "No menu in this node."
  msgstr "¥»¸`ÂI¨S¦³¿ï³æ."
  
! #: info/info.c:1154
  msgid "No footnotes in this node."
  msgstr "¥»¸`ÂI¨S¦³µù¸}."
  
! #: info/info.c:1155
  msgid "No cross references in this node."
  msgstr "¥»¸`ÂI¨S¦³¥æ¤¬°Ñ·Ó."
  
! #: info/info.c:1156
  #, fuzzy, c-format
  msgid "No '%s' pointer for this node."
  msgstr "¥»¸`ÂI¨S¦³ `%s' pointer."
  
! #: info/info.c:1157
  #, fuzzy, c-format
  msgid "Unknown Info command '%c'; try '?' for help."
  msgstr "¥¼ª¾ªº Info ©R¥O `%c'; ¸Õ¸Õ `?' ¥H¨ú±o¨D§U¸ê°T."
  
! #: info/info.c:1158
  #, fuzzy, c-format
  msgid "Terminal type '%s' is not smart enough to run Info."
  msgstr "²×ºÝ¾÷Ãþ«¬ `%s' µLªk¤ä´©°õ¦æ Info ©Ò»Ýªº»Ý¨D."
  
! #: info/info.c:1159
  msgid "You are already at the last page of this node."
  msgstr "±z¤w¦b¥»¸`ÂIªº³Ì«á¤@­¶."
  
! #: info/info.c:1160
  msgid "You are already at the first page of this node."
  msgstr "±z¤w¦b¥»¸`ÂIªº²Ä¤@­¶."
  
! #: info/info.c:1161
  msgid "Only one window."
  msgstr "¥u¦³¤@­Ó¤À¹jµøµ¡."
  
! #: info/info.c:1162
  msgid "Resulting window would be too small."
  msgstr "²£¥Íªº¤À¹jµøµ¡·|¤Ó¤p."
  
! #: info/info.c:1163
  msgid "Not enough room for a help window, please delete a window."
  msgstr "³Ñ¤UªºªÅ¶¡¤Ó¤p, µLªk®e¯Ç¨D§U¤À¹jµøµ¡, ½Ð§R°£¤@­Ó¤À¹jµøµ¡."
***************
*** 897,931 ****
  msgstr "¥¼ª¾ªº©R¥O `%s'"
  
! #: info/infokey.c:482
  #, c-format
  msgid "action name too long"
  msgstr ""
  
! #: info/infokey.c:495
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr ""
  
! #: info/infokey.c:506
  #, fuzzy, c-format
  msgid "missing variable name"
  msgstr "%s: ¿òº|ÀÉ®×¤Þ¼Æ.\n"
  
! #: info/infokey.c:515
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr ""
  
! #: info/infokey.c:522
  #, c-format
  msgid "variable name too long"
  msgstr ""
  
! #: info/infokey.c:546
  #, c-format
  msgid "value too long"
  msgstr ""
  
! #: info/infokey.c:592
  #, c-format
  msgid "\"%s\", line %u: "
--- 892,926 ----
  msgstr "¥¼ª¾ªº©R¥O `%s'"
  
! #: info/infokey.c:485
  #, c-format
  msgid "action name too long"
  msgstr ""
  
! #: info/infokey.c:498
  #, c-format
  msgid "extra characters following action `%s'"
  msgstr ""
  
! #: info/infokey.c:509
  #, fuzzy, c-format
  msgid "missing variable name"
  msgstr "%s: ¿òº|ÀÉ®×¤Þ¼Æ.\n"
  
! #: info/infokey.c:518
  #, c-format
  msgid "missing `=' immediately after variable name"
  msgstr ""
  
! #: info/infokey.c:525
  #, c-format
  msgid "variable name too long"
  msgstr ""
  
! #: info/infokey.c:549
  #, c-format
  msgid "value too long"
  msgstr ""
  
! #: info/infokey.c:595
  #, c-format
  msgid "\"%s\", line %u: "
***************
*** 1256,1603 ****
  msgstr "³Q°Ñ·Óªº¸`ÂI `%s' ¦b `%s' ¤¤§ä¤£¨ì."
  
! #: info/session.c:2864
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "Åª¨ú¦Û dir ¶}©lªº¸`ÂI±ø¦C, ¨Ã¥B¸òÀH¥¦­Ì"
  
! #: info/session.c:2866
  msgid "Follow menus: "
  msgstr "¸òÀH¿ï³æ: "
  
! #: info/session.c:2971
  msgid "Select the Next node"
  msgstr "¿ï¨ú ¤U¤@­Ó ¸`ÂI"
  
! #: info/session.c:2978
  msgid "Select the Prev node"
  msgstr "¿ï¨ú «e¤@­Ó ¸`ÂI"
  
! #: info/session.c:2985
  msgid "Select the Up node"
  msgstr "¿ï¨ú ¤W¤@¼h ¸`ÂI"
  
! #: info/session.c:2991
  msgid "Select the last node in this file"
  msgstr "¿ï¨ú¥»ÀÉ®×ªº³Ì«á¤@­Ó¸`ÂI"
  
! #: info/session.c:3018 info/session.c:3051
  msgid "This window has no additional nodes"
  msgstr "¥»¤À¹jµøµ¡¨S¦³ÃB¥~ªº¸`ÂI"
  
! #: info/session.c:3024
  msgid "Select the first node in this file"
  msgstr "¿ï¨ú¥»ÀÉ®×ªº²Ä¤@­Ó¸`ÂI"
  
! #: info/session.c:3158
  msgid "No more nodes within this document."
  msgstr "¥»¤å¥ó¤¤¨S¦³§ó¦hªº¸`ÂI¤F."
  
! #: info/session.c:3203 info/session.c:3243
  #, fuzzy
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "¦b¥»¤å¥ó¤¤, ¥»¸`ÂI¨S¦³ `¤W¤@­Ó (Prev)' ¸`ÂI©Î `¤W¤@¼h (Up)' ¸`ÂI."
  
! #: info/session.c:3256
  msgid "Move forwards or down through node structure"
  msgstr "¦b¸`ÂIµ²ºc¤¤, ©¹«e©Î©¹¤U²¾°Ê"
  
! #: info/session.c:3273
  msgid "Move backwards or up through node structure"
  msgstr "¦b¸`ÂIµ²ºc¤¤, ©¹«á©Î©¹¤U²¾°Ê"
  
! #: info/session.c:3296
  msgid "Read a node name and select it"
  msgstr "Åª¨ú¸`ÂI¦WºÙ, ¨Ã¥B¿ï¾Ü¥¦"
  
! #: info/session.c:3350 info/session.c:3354
  msgid "Goto node: "
  msgstr "¸õ¦Ü¸`ÂI: "
  
! #: info/session.c:3533
  msgid "Find the node describing program invocation"
  msgstr "§ä´M´y­zµ{¦¡°õ¦æ¤èªkªº¸`ÂI"
  
! #: info/session.c:3535
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "§ä´M [%s] ªº°õ¦æ¤èªk¸`ÂI: "
  
! #: info/session.c:3580
  msgid "Read a manpage reference and select it"
  msgstr "Åª¨ú½u¤W¤â¥U (manpage) ªº°Ñ·Ó, ¨Ã¥B¿ï¾Ü¥¦"
  
! #: info/session.c:3584
  msgid "Get Manpage: "
  msgstr "¨ú±o½u¤W¤â¥U (Manpage): "
  
! #: info/session.c:3605
  #, fuzzy
  msgid "Select the node 'Top' in this file"
  msgstr "¿ï¨ú¥»ÀÉ®×¤¤ªº `Top' ¸`ÂI"
  
! #: info/session.c:3611
  #, fuzzy
  msgid "Select the node '(dir)'"
  msgstr "¿ï¨ú¸`ÂI `(dir)'"
  
! #: info/session.c:3617
  msgid "Show full file name of node being displayed"
  msgstr ""
  
! #: info/session.c:3634
  msgid "Select the most recently selected node"
  msgstr "¿ï¾Ü³Ìªñ¤@¦¸³Q¿ï¾Üªº¸`ÂI"
  
! #: info/session.c:3639
  #, c-format
  msgid "No earlier node in history"
  msgstr ""
  
! #: info/session.c:3643
  msgid "Read the name of a file and select it"
  msgstr "Åª¨úÀÉ®×¦WºÙ, µM«á¿ï¨ú¥¦"
  
! #: info/session.c:3647
  msgid "Find file: "
  msgstr "§ä´MÀÉ®×: "
  
! #: info/session.c:3664
  #, fuzzy, c-format
  msgid "Cannot find '%s'."
  msgstr "µLªk§ä¨ì `%s'."
  
! #: info/session.c:3713
  #, fuzzy, c-format
  msgid "Could not create output file '%s'."
  msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
  
! #: 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
  #, fuzzy, c-format
  msgid "writing node %s..."
  msgstr "¼g¤J¸`ÂI %s ¤¤..."
  
! #: info/session.c:3831
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "±N¥»¸`ÂIªº¤º®e, ¸g¥ÑºÞ¹D (pipe) °e¦Ü INFO_PRINT_COMMAND"
  
! #: info/session.c:3859
  #, fuzzy, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "µLªk¶}±Ò¦Ü `%s' ªººÞ¹D."
  
! #: info/session.c:3864
  #, fuzzy, c-format
  msgid "printing node %s..."
  msgstr "¦C¦L¸`ÂI %s ¤¤..."
  
! #: info/session.c:3872
  #, fuzzy, c-format
  msgid "finished printing node %s"
  msgstr "¦C¦L¸`ÂI %s ¤¤..."
  
! #: 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:4169
  msgid "Search continued from the end of the document."
  msgstr ""
  
! #: info/session.c:4174
  #, fuzzy
  msgid "Search continued from the beginning of the document."
  msgstr "§R°£¦Ü¥»¦æ¶}ÀY, ¨Ã¸m¤J°Å¶KÃ¯"
  
! #: info/session.c:4194
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "·j´M¤lÀÉ®× %s ..."
  
! #: info/session.c:4231
  msgid "Search failed."
  msgstr "·j´M¥¢±Ñ."
  
! #: info/session.c:4248
  #, fuzzy, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s [%s]: "
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Regexp search"
  msgstr ""
  
! #: info/session.c:4249 info/session.c:4255
  msgid "Search"
  msgstr "·j´M¦r¦ê"
  
! #: info/session.c:4250 info/session.c:4256
  #, fuzzy
  msgid " case-sensitively"
  msgstr ", ¥H°Ï¤À¤j¤p¼gªº¤è¦¡"
  
! #: info/session.c:4251 info/session.c:4257
  #, fuzzy
  msgid " backward"
  msgstr "¦V«á·j´M¦r¦ê"
  
! #: info/session.c:4254
  #, c-format
  msgid "%s%s%s: "
  msgstr ""
  
! #: info/session.c:4274
  msgid "Search string too short"
  msgstr ""
  
! #: info/session.c:4467
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4491 info/session.c:4601
  #, c-format
  msgid "No more matches."
  msgstr ""
  
! #: info/session.c:4628
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4649
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4653 info/session.c:4665
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4661
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4674
  msgid "Read a string and search for it case-sensitively"
  msgstr "Åª¨ú¤@­Ó¦r¦ê, µM«á¥H°Ï¤À¤j¤p¼g¤è¦¡·j´M"
  
! #: info/session.c:4679
  msgid "Read a string and search for it"
  msgstr "Åª¨ú¤@­Ó¦r¦ê, µM«á·j´M"
  
! #: info/session.c:4685
  msgid "Read a string and search backward for it"
  msgstr "Åª¨ú¤@­Ó¦r¦ê, µM«á¦V«á·j´M"
  
! #: info/session.c:4693
  msgid "Repeat last search in the same direction"
  msgstr "¥H¦P¼Ëªº·j´M¤è¦V­«ÂÐ¤W¦¸ªº·j´M"
  
! #: info/session.c:4701 info/session.c:4746
  msgid "No previous search string"
  msgstr "¨S¦³«e¤@¦¸ªº·j´M¦r¦ê"
  
! #: info/session.c:4738
  msgid "Repeat last search in the reverse direction"
  msgstr "¥H¬Û¤Ïªº·j´M¤è¦V­«ÂÐ¤W¦¸ªº·j´M"
  
! #: info/session.c:4785
  msgid "Clear displayed search matches"
  msgstr ""
  
! #: info/session.c:4802 info/session.c:4808
  msgid "Search interactively for a string as you type it"
  msgstr "¥H¤¬°Ê¤è¦¡, Ãä¿é¤J¦r¦êÃä·j´M"
  
! #: info/session.c:4928
  #, fuzzy
  msgid "Regexp I-search backward: "
  msgstr "¤Ï¦V¤¬°Ê·j´M: "
  
! #: info/session.c:4929
  msgid "I-search backward: "
  msgstr "¤Ï¦V¤¬°Ê·j´M: "
  
! #: info/session.c:4931
  #, fuzzy
  msgid "Regexp I-search: "
  msgstr "¤¬°Ê·j´M: "
  
! #: info/session.c:4932
  msgid "I-search: "
  msgstr "¤¬°Ê·j´M: "
  
! #: info/session.c:4957 info/session.c:4960
  msgid "Failing "
  msgstr "¥¢±Ñ "
  
! #: info/session.c:5326
  msgid "Cancel current operation"
  msgstr "¨ú®ø¥Ø«eªº§@·~"
  
! #: info/session.c:5333
  msgid "Quit"
  msgstr "µ²§ô"
  
! #: info/session.c:5338
  #, fuzzy
  msgid "Display version of Info being run"
  msgstr "Åã¥Üª©¥»¸ê°T, µM«áÂ÷¶}"
  
! #: info/session.c:5340
  #, c-format
  msgid "GNU Info version %s"
  msgstr ""
  
! #: info/session.c:5345
  msgid "Redraw the display"
  msgstr "­«Ã¸µe­±"
  
! #: info/session.c:5382
  msgid "Quit using Info"
  msgstr "µ²§ô¨Ï¥Î Info"
  
! #: info/session.c:5398
  msgid "Run command bound to this key's lowercase variant"
  msgstr ""
  
! #: info/session.c:5409
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "¥¼ª¾ªº©R¥O (%s)."
  
! #: info/session.c:5412
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\" ¤£¦Xªk"
  
! #: info/session.c:5413
  #, fuzzy, c-format
  msgid "'%s' is invalid"
  msgstr "\"%s\" ¤£¦Xªk"
  
! #: info/session.c:5731
  msgid "Add this digit to the current numeric argument"
  msgstr "±N¥»¼Æ¦r¥[¦Ü¥Ø«eªº¼Æ­È¤Þ¼Æ"
  
! #: info/session.c:5738
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "¶}©l¥Ø«eªº¼Æ­È¤Þ¼Æ (©Î¬O­¼¥H 4)"
--- 1251,1598 ----
  msgstr "³Q°Ñ·Óªº¸`ÂI `%s' ¦b `%s' ¤¤§ä¤£¨ì."
  
! #: info/session.c:2870
  msgid "Read a list of menus starting from dir and follow them"
  msgstr "Åª¨ú¦Û dir ¶}©lªº¸`ÂI±ø¦C, ¨Ã¥B¸òÀH¥¦­Ì"
  
! #: info/session.c:2872
  msgid "Follow menus: "
  msgstr "¸òÀH¿ï³æ: "
  
! #: info/session.c:2977
  msgid "Select the Next node"
  msgstr "¿ï¨ú ¤U¤@­Ó ¸`ÂI"
  
! #: info/session.c:2984
  msgid "Select the Prev node"
  msgstr "¿ï¨ú «e¤@­Ó ¸`ÂI"
  
! #: info/session.c:2991
  msgid "Select the Up node"
  msgstr "¿ï¨ú ¤W¤@¼h ¸`ÂI"
  
! #: info/session.c:2997
  msgid "Select the last node in this file"
  msgstr "¿ï¨ú¥»ÀÉ®×ªº³Ì«á¤@­Ó¸`ÂI"
  
! #: info/session.c:3024 info/session.c:3057
  msgid "This window has no additional nodes"
  msgstr "¥»¤À¹jµøµ¡¨S¦³ÃB¥~ªº¸`ÂI"
  
! #: info/session.c:3030
  msgid "Select the first node in this file"
  msgstr "¿ï¨ú¥»ÀÉ®×ªº²Ä¤@­Ó¸`ÂI"
  
! #: info/session.c:3164
  msgid "No more nodes within this document."
  msgstr "¥»¤å¥ó¤¤¨S¦³§ó¦hªº¸`ÂI¤F."
  
! #: info/session.c:3209 info/session.c:3249
  #, fuzzy
  msgid "No 'Prev' or 'Up' for this node within this document."
  msgstr "¦b¥»¤å¥ó¤¤, ¥»¸`ÂI¨S¦³ `¤W¤@­Ó (Prev)' ¸`ÂI©Î `¤W¤@¼h (Up)' ¸`ÂI."
  
! #: info/session.c:3262
  msgid "Move forwards or down through node structure"
  msgstr "¦b¸`ÂIµ²ºc¤¤, ©¹«e©Î©¹¤U²¾°Ê"
  
! #: info/session.c:3279
  msgid "Move backwards or up through node structure"
  msgstr "¦b¸`ÂIµ²ºc¤¤, ©¹«á©Î©¹¤U²¾°Ê"
  
! #: info/session.c:3302
  msgid "Read a node name and select it"
  msgstr "Åª¨ú¸`ÂI¦WºÙ, ¨Ã¥B¿ï¾Ü¥¦"
  
! #: info/session.c:3356 info/session.c:3360
  msgid "Goto node: "
  msgstr "¸õ¦Ü¸`ÂI: "
  
! #: info/session.c:3539
  msgid "Find the node describing program invocation"
  msgstr "§ä´M´y­zµ{¦¡°õ¦æ¤èªkªº¸`ÂI"
  
! #: info/session.c:3541
  #, c-format
  msgid "Find Invocation node of [%s]: "
  msgstr "§ä´M [%s] ªº°õ¦æ¤èªk¸`ÂI: "
  
! #: info/session.c:3586
  msgid "Read a manpage reference and select it"
  msgstr "Åª¨ú½u¤W¤â¥U (manpage) ªº°Ñ·Ó, ¨Ã¥B¿ï¾Ü¥¦"
  
! #: info/session.c:3590
  msgid "Get Manpage: "
  msgstr "¨ú±o½u¤W¤â¥U (Manpage): "
  
! #: info/session.c:3611
  #, fuzzy
  msgid "Select the node 'Top' in this file"
  msgstr "¿ï¨ú¥»ÀÉ®×¤¤ªº `Top' ¸`ÂI"
  
! #: info/session.c:3617
  #, fuzzy
  msgid "Select the node '(dir)'"
  msgstr "¿ï¨ú¸`ÂI `(dir)'"
  
! #: info/session.c:3623
  msgid "Show full file name of node being displayed"
  msgstr ""
  
! #: info/session.c:3640
  msgid "Select the most recently selected node"
  msgstr "¿ï¾Ü³Ìªñ¤@¦¸³Q¿ï¾Üªº¸`ÂI"
  
! #: info/session.c:3645
  #, c-format
  msgid "No earlier node in history"
  msgstr ""
  
! #: info/session.c:3649
  msgid "Read the name of a file and select it"
  msgstr "Åª¨úÀÉ®×¦WºÙ, µM«á¿ï¨ú¥¦"
  
! #: info/session.c:3653
  msgid "Find file: "
  msgstr "§ä´MÀÉ®×: "
  
! #: info/session.c:3670
  #, fuzzy, c-format
  msgid "Cannot find '%s'."
  msgstr "µLªk§ä¨ì `%s'."
  
! #: info/session.c:3719
  #, fuzzy, c-format
  msgid "Could not create output file '%s'."
  msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
  
! #: info/session.c:3733
  #, c-format
  msgid "error writing to %s: %s"
  msgstr ""
  
! #: info/session.c:3742
  #, c-format
  msgid "closing %s"
  msgstr ""
  
! #: info/session.c:3791
  #, fuzzy, c-format
  msgid "writing node %s..."
  msgstr "¼g¤J¸`ÂI %s ¤¤..."
  
! #: info/session.c:3837
  msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
  msgstr "±N¥»¸`ÂIªº¤º®e, ¸g¥ÑºÞ¹D (pipe) °e¦Ü INFO_PRINT_COMMAND"
  
! #: info/session.c:3865
  #, fuzzy, c-format
  msgid "Cannot open pipe to '%s'."
  msgstr "µLªk¶}±Ò¦Ü `%s' ªººÞ¹D."
  
! #: info/session.c:3870
  #, fuzzy, c-format
  msgid "printing node %s..."
  msgstr "¦C¦L¸`ÂI %s ¤¤..."
  
! #: info/session.c:3878
  #, fuzzy, c-format
  msgid "finished printing node %s"
  msgstr "¦C¦L¸`ÂI %s ¤¤..."
  
! #: info/session.c:3910
  msgid "Toggle the usage of regular expressions in searches"
  msgstr ""
  
! #: info/session.c:3914
  #, c-format
  msgid "Using regular expressions for searches."
  msgstr ""
  
! #: info/session.c:3915
  #, c-format
  msgid "Using literal strings for searches."
  msgstr ""
  
! #: info/session.c:4175
  msgid "Search continued from the end of the document."
  msgstr ""
  
! #: info/session.c:4180
  #, fuzzy
  msgid "Search continued from the beginning of the document."
  msgstr "§R°£¦Ü¥»¦æ¶}ÀY, ¨Ã¸m¤J°Å¶KÃ¯"
  
! #: info/session.c:4200
  #, c-format
  msgid "Searching subfile %s ..."
  msgstr "·j´M¤lÀÉ®× %s ..."
  
! #: info/session.c:4237
  msgid "Search failed."
  msgstr "·j´M¥¢±Ñ."
  
! #: info/session.c:4254
  #, fuzzy, c-format
  msgid "%s%s%s [%s]: "
  msgstr "%s%s [%s]: "
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Regexp search"
  msgstr ""
  
! #: info/session.c:4255 info/session.c:4261
  msgid "Search"
  msgstr "·j´M¦r¦ê"
  
! #: info/session.c:4256 info/session.c:4262
  #, fuzzy
  msgid " case-sensitively"
  msgstr ", ¥H°Ï¤À¤j¤p¼gªº¤è¦¡"
  
! #: info/session.c:4257 info/session.c:4263
  #, fuzzy
  msgid " backward"
  msgstr "¦V«á·j´M¦r¦ê"
  
! #: info/session.c:4260
  #, c-format
  msgid "%s%s%s: "
  msgstr ""
  
! #: info/session.c:4280
  msgid "Search string too short"
  msgstr ""
  
! #: info/session.c:4473
  #, c-format
  msgid "Going back to last match from %s"
  msgstr ""
  
! #: info/session.c:4497 info/session.c:4607
  #, c-format
  msgid "No more matches."
  msgstr ""
  
! #: info/session.c:4634
  msgid "Search this node and subnodes for a string."
  msgstr ""
  
! #: info/session.c:4655
  msgid "Go to next match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4659 info/session.c:4671
  #, c-format
  msgid "No active search"
  msgstr ""
  
! #: info/session.c:4667
  msgid "Go to previous match in Info sub-tree"
  msgstr ""
  
! #: info/session.c:4680
  msgid "Read a string and search for it case-sensitively"
  msgstr "Åª¨ú¤@­Ó¦r¦ê, µM«á¥H°Ï¤À¤j¤p¼g¤è¦¡·j´M"
  
! #: info/session.c:4685
  msgid "Read a string and search for it"
  msgstr "Åª¨ú¤@­Ó¦r¦ê, µM«á·j´M"
  
! #: info/session.c:4691
  msgid "Read a string and search backward for it"
  msgstr "Åª¨ú¤@­Ó¦r¦ê, µM«á¦V«á·j´M"
  
! #: info/session.c:4699
  msgid "Repeat last search in the same direction"
  msgstr "¥H¦P¼Ëªº·j´M¤è¦V­«ÂÐ¤W¦¸ªº·j´M"
  
! #: info/session.c:4707 info/session.c:4752
  msgid "No previous search string"
  msgstr "¨S¦³«e¤@¦¸ªº·j´M¦r¦ê"
  
! #: info/session.c:4744
  msgid "Repeat last search in the reverse direction"
  msgstr "¥H¬Û¤Ïªº·j´M¤è¦V­«ÂÐ¤W¦¸ªº·j´M"
  
! #: info/session.c:4791
  msgid "Clear displayed search matches"
  msgstr ""
  
! #: info/session.c:4808 info/session.c:4814
  msgid "Search interactively for a string as you type it"
  msgstr "¥H¤¬°Ê¤è¦¡, Ãä¿é¤J¦r¦êÃä·j´M"
  
! #: info/session.c:4934
  #, fuzzy
  msgid "Regexp I-search backward: "
  msgstr "¤Ï¦V¤¬°Ê·j´M: "
  
! #: info/session.c:4935
  msgid "I-search backward: "
  msgstr "¤Ï¦V¤¬°Ê·j´M: "
  
! #: info/session.c:4937
  #, fuzzy
  msgid "Regexp I-search: "
  msgstr "¤¬°Ê·j´M: "
  
! #: info/session.c:4938
  msgid "I-search: "
  msgstr "¤¬°Ê·j´M: "
  
! #: info/session.c:4963 info/session.c:4966
  msgid "Failing "
  msgstr "¥¢±Ñ "
  
! #: info/session.c:5332
  msgid "Cancel current operation"
  msgstr "¨ú®ø¥Ø«eªº§@·~"
  
! #: info/session.c:5339
  msgid "Quit"
  msgstr "µ²§ô"
  
! #: info/session.c:5344
  #, fuzzy
  msgid "Display version of Info being run"
  msgstr "Åã¥Üª©¥»¸ê°T, µM«áÂ÷¶}"
  
! #: info/session.c:5346
  #, c-format
  msgid "GNU Info version %s"
  msgstr ""
  
! #: info/session.c:5351
  msgid "Redraw the display"
  msgstr "­«Ã¸µe­±"
  
! #: info/session.c:5388
  msgid "Quit using Info"
  msgstr "µ²§ô¨Ï¥Î Info"
  
! #: info/session.c:5404
  msgid "Run command bound to this key's lowercase variant"
  msgstr ""
  
! #: info/session.c:5415
  #, c-format
  msgid "Unknown command (%s)."
  msgstr "¥¼ª¾ªº©R¥O (%s)."
  
! #: info/session.c:5418
  #, c-format
  msgid "\"%s\" is invalid"
  msgstr "\"%s\" ¤£¦Xªk"
  
! #: info/session.c:5419
  #, fuzzy, c-format
  msgid "'%s' is invalid"
  msgstr "\"%s\" ¤£¦Xªk"
  
! #: info/session.c:5737
  msgid "Add this digit to the current numeric argument"
  msgstr "±N¥»¼Æ¦r¥[¦Ü¥Ø«eªº¼Æ­È¤Þ¼Æ"
  
! #: info/session.c:5744
  msgid "Start (or multiply by 4) the current numeric argument"
  msgstr "¶}©l¥Ø«eªº¼Æ­È¤Þ¼Æ (©Î¬O­¼¥H 4)"
***************
*** 1735,1752 ****
  msgstr "³]©w %s ªº¼Æ­È (%s): "
  
! #: info/window.c:959
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), ¦æ¼Æ  ----, "
  
- #: info/window.c:966
- #, fuzzy, c-format
- msgid "-%s---Info: %s, %ld lines --%s--"
- msgstr "-%s---Info: %s, ¦@ %d ¦æ --%s--"
- 
- #: info/window.c:970
- #, fuzzy, c-format
- msgid "-%s---Info: (%s)%s, %ld lines --%s--"
- msgstr "-%s%s-Info: (%s)%s, ¦@ %d ¦æ --%s--"
- 
  #: install-info/install-info.c:292
  #, c-format
--- 1730,1737 ----
  msgstr "³]©w %s ªº¼Æ­È (%s): "
  
! #: info/window.c:909
  msgid "-----Info: (), lines ----, "
  msgstr "-----Info: (), ¦æ¼Æ  ----, "
  
  #: install-info/install-info.c:292
  #, c-format
***************
*** 1872,1876 ****
  "\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"
--- 1857,1861 ----
  "\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"
***************
*** 1962,2079 ****
  msgstr "§ä¤£¨ì `%s' ªº¶µ¥Ø; ¥¼§R°£¥ô¦ó¶µ¥Ø"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:855
! #: tp/Texinfo/Convert/Converter.pm:893 tp/Texinfo/Convert/Converter.pm:1204
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6504
! #: tp/Texinfo/Convert/HTML.pm:6528 tp/Texinfo/Convert/HTML.pm:6905
! #: tp/Texinfo/Convert/HTML.pm:6963 tp/Texinfo/Convert/HTML.pm:7041
! #: tp/Texinfo/Convert/HTML.pm:7118 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:546
! #: tp/Texinfo/Convert/TexinfoXML.pm:457
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:881
  msgid "recursion is always allowed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:882
  msgid "arguments are quoted by default"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1105
  #, fuzzy, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s ¤£¬O¤@­Ó¦Xªkªº ISO 639 »y¨¥½X"
  
! #: tp/Texinfo/Common.pm:1110
  #, fuzzy, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s ¤£¬O¤@­Ó¦Xªkªº ISO 639 »y¨¥½X"
  
! #: tp/Texinfo/Common.pm:1128
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1151
  #, perl-format
  msgid "could not read %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1170
  #, fuzzy, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
  
! #: tp/Texinfo/Common.pm:1176 tp/Texinfo/Parser.pm:3353
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1520
! #, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:1548
! #, fuzzy
! msgid "missing type"
! msgstr "%c%s ¿òº|¥k¤j¬A¸¹"
! 
! #: tp/Texinfo/Common.pm:1551
! #, fuzzy, perl-format
! msgid "unrecognized type: %s"
! msgstr "%s: ¥¼ª¾ªº¿ï¶µ `--%s'\n"
! 
! #: tp/Texinfo/Common.pm:1568
! #, fuzzy, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
! 
! #: tp/Texinfo/Common.pm:1603
  msgid "no node to be renamed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1614
  msgid "nodes without a new name at the end of file"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1624 tp/Texinfo/Parser.pm:926
  #, perl-format
  msgid "could not open %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:2144
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:395 tp/Texinfo/Convert/Converter.pm:414
  #, fuzzy, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "³]©wÅÜ¼Æ: "
  
! #: tp/Texinfo/Convert/Converter.pm:794
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:876 tp/Texinfo/Convert/Converter.pm:909
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:6931
! #: tp/Texinfo/Convert/HTML.pm:6989 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:476 tp/Texinfo/Parser.pm:2035
  #, fuzzy, perl-format
  msgid "error on closing %s: %s"
  msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, fuzzy, perl-format
  msgid "could not create directories `%s' or `%s': %s"
  msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
  
! #: tp/Texinfo/Convert/Converter.pm:995
  #, fuzzy, perl-format
  msgid "could not create directory `%s': %s"
--- 1947,2055 ----
  msgstr "§ä¤£¨ì `%s' ªº¶µ¥Ø; ¥¼§R°£¥ô¦ó¶µ¥Ø"
  
! #: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:847
! #: tp/Texinfo/Convert/Converter.pm:885 tp/Texinfo/Convert/Converter.pm:1196
! #: tp/Texinfo/Convert/DocBook.pm:327 tp/Texinfo/Convert/HTML.pm:6573
! #: tp/Texinfo/Convert/HTML.pm:6597 tp/Texinfo/Convert/HTML.pm:6978
! #: tp/Texinfo/Convert/HTML.pm:7037 tp/Texinfo/Convert/HTML.pm:7115
! #: tp/Texinfo/Convert/HTML.pm:7192 tp/Texinfo/Convert/IXIN.pm:293
! #: tp/Texinfo/Convert/Info.pm:295 tp/Texinfo/Convert/Plaintext.pm:547
! #: tp/Texinfo/Convert/TexinfoXML.pm:458
  #, perl-format
  msgid "could not open %s for writing: %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:862
  msgid "recursion is always allowed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:863
  msgid "arguments are quoted by default"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:866
! msgid ""
! "move your @contents command if you want the contents after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:869
! msgid ""
! "move your @shortcontents and @contents commands if you want the contents "
! "after the title page"
! msgstr ""
! 
! #: tp/Texinfo/Common.pm:1093
  #, fuzzy, perl-format
  msgid "%s is not a valid language code"
  msgstr "%s ¤£¬O¤@­Ó¦Xªkªº ISO 639 »y¨¥½X"
  
! #: tp/Texinfo/Common.pm:1098
  #, fuzzy, perl-format
  msgid "%s is not a valid region code"
  msgstr "%s ¤£¬O¤@­Ó¦Xªkªº ISO 639 »y¨¥½X"
  
! #: tp/Texinfo/Common.pm:1116
  #, perl-format
  msgid "%s is not a valid split possibility"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1139
  #, perl-format
  msgid "could not read %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1158
  #, fuzzy, perl-format
  msgid "error on closing @verbatiminclude file %s: %s"
  msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
  
! #: tp/Texinfo/Common.pm:1164 tp/Texinfo/Parser.pm:3193
  #, perl-format
  msgid "@%s: could not find %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1637
  msgid "no node to be renamed"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1648
  msgid "nodes without a new name at the end of file"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1658 tp/Texinfo/Parser.pm:899
  #, perl-format
  msgid "could not open %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:2178
  #, perl-format
  msgid "could not protect hash character in @%s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:387 tp/Texinfo/Convert/Converter.pm:406
  #, fuzzy, perl-format
  msgid "Obsolete variable %s\n"
  msgstr "³]©wÅÜ¼Æ: "
  
! #: tp/Texinfo/Convert/Converter.pm:786
  #, perl-format
  msgid "%s: output incompatible with split"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:868 tp/Texinfo/Convert/Converter.pm:901
! #: tp/Texinfo/Convert/DocBook.pm:363 tp/Texinfo/Convert/HTML.pm:7004
! #: tp/Texinfo/Convert/HTML.pm:7063 tp/Texinfo/Convert/IXIN.pm:915
  #: tp/Texinfo/Convert/Info.pm:161 tp/Texinfo/Convert/Info.pm:187
  #: tp/Texinfo/Convert/Info.pm:215 tp/Texinfo/Convert/Info.pm:275
! #: tp/Texinfo/Convert/TexinfoXML.pm:477 tp/Texinfo/Parser.pm:1996
  #, fuzzy, perl-format
  msgid "error on closing %s: %s"
  msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
  
! #: tp/Texinfo/Convert/Converter.pm:979
  #, fuzzy, perl-format
  msgid "could not create directories `%s' or `%s': %s"
  msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
  
! #: tp/Texinfo/Convert/Converter.pm:987
  #, fuzzy, perl-format
  msgid "could not create directory `%s': %s"
***************
*** 2085,2184 ****
  msgstr "@image ÀÉ®× `%s' µLªkÅª¨ú: %s"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5388
  #, fuzzy
  msgid "no argument specified for @U"
  msgstr "`%c%s' ©R¥O¤¤¥¼«ü©w¸`ÂI¦WºÙ"
  
! #: tp/Texinfo/Convert/HTML.pm:1683
  #, fuzzy, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
  msgstr "@image ÀÉ®× `%s' µLªkÅª¨ú: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:2371
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4888
  msgid "string not closed in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4890
  msgid "--css-include ended in comment"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4892
  msgid "@import not finished in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4918
  #, perl-format
  msgid "CSS file %s not found"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4924
  #, fuzzy, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "µLªk¶}±Ò¦Ü `%s' ªººÞ¹D."
  
! #: tp/Texinfo/Convert/HTML.pm:4934
  #, fuzzy, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
  
! #: tp/Texinfo/Convert/HTML.pm:5801 tp/Texinfo/Convert/HTML.pm:5805
  #, fuzzy, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "§ä¤£¨ì¥]§t `%s' ªº¯Á¤Þ¶µ¥Ø\n"
  
! #: tp/Texinfo/Convert/HTML.pm:6499
  #, fuzzy, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
  
! #: tp/Texinfo/Convert/HTML.pm:6523
  #, fuzzy, perl-format
  msgid "error on closing TOC frame file %s: %s"
  msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
  
! #: tp/Texinfo/Convert/HTML.pm:6638
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6839
  msgid "must specify a title with a title command or @top"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7048
  #, fuzzy, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
  
! #: tp/Texinfo/Convert/HTML.pm:7073
  #, 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:7079
  #, fuzzy, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "¥¼³Q°Ñ·Óªº¸`ÂI `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:7093
  #, perl-format
  msgid "target node (new name for `%s') not in document: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7125
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7163
  msgid "empty node name"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7165 tp/Texinfo/Parser.pm:3697
  #, perl-format
  msgid "syntax for an external node used for `%s'"
--- 2061,2180 ----
  msgstr "@image ÀÉ®× `%s' µLªkÅª¨ú: %s"
  
! #: tp/Texinfo/Convert/DocBook.pm:1084 tp/Texinfo/Parser.pm:5225
  #, fuzzy
  msgid "no argument specified for @U"
  msgstr "`%c%s' ©R¥O¤¤¥¼«ü©w¸`ÂI¦WºÙ"
  
! #: tp/Texinfo/Convert/HTML.pm:1715
  #, fuzzy, perl-format
  msgid "@image file `%s' (for HTML) not found, using `%s'"
  msgstr "@image ÀÉ®× `%s' µLªkÅª¨ú: %s"
  
! #: tp/Texinfo/Convert/HTML.pm:2399
  #, perl-format
  msgid "raw format %s is not converted"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4629
! #, perl-format
! msgid "could not open html refs config file %s: %s"
! msgstr ""
! 
! #: tp/Texinfo/Convert/HTML.pm:4657
! #, fuzzy
! msgid "missing type"
! msgstr "%c%s ¿òº|¥k¤j¬A¸¹"
! 
! #: tp/Texinfo/Convert/HTML.pm:4660
! #, fuzzy, perl-format
! msgid "unrecognized type: %s"
! msgstr "%s: ¥¼ª¾ªº¿ï¶µ `--%s'\n"
! 
! #: tp/Texinfo/Convert/HTML.pm:4677
! #, fuzzy, perl-format
! msgid "error on closing html refs config file %s: %s"
! msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
! 
! #: tp/Texinfo/Convert/HTML.pm:4962
  msgid "string not closed in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4964
  msgid "--css-include ended in comment"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4966
  msgid "@import not finished in css file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4992
  #, perl-format
  msgid "CSS file %s not found"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4998
  #, fuzzy, perl-format
  msgid "could not open --include-file %s: %s"
  msgstr "µLªk¶}±Ò¦Ü `%s' ªººÞ¹D."
  
! #: tp/Texinfo/Convert/HTML.pm:5008
  #, fuzzy, perl-format
  msgid "error on closing CSS file %s: %s"
  msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
  
! #: tp/Texinfo/Convert/HTML.pm:5870 tp/Texinfo/Convert/HTML.pm:5874
  #, fuzzy, perl-format
  msgid "no htmlxref.cnf entry found for `%s'"
  msgstr "§ä¤£¨ì¥]§t `%s' ªº¯Á¤Þ¶µ¥Ø\n"
  
! #: tp/Texinfo/Convert/HTML.pm:6568
  #, fuzzy, perl-format
  msgid "error on closing frame file %s: %s"
  msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
  
! #: tp/Texinfo/Convert/HTML.pm:6592
  #, fuzzy, perl-format
  msgid "error on closing TOC frame file %s: %s"
  msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
  
! #: tp/Texinfo/Convert/HTML.pm:6707
  #, perl-format
  msgid "handler %s of stage %s priority %s failed"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6912
  msgid "must specify a title with a title command or @top"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7122
  #, fuzzy, perl-format
  msgid "error on closing redirection node file %s: %s"
  msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
  
! #: tp/Texinfo/Convert/HTML.pm:7147
  #, 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:7153
  #, fuzzy, perl-format
  msgid "file empty for renamed node `%s'"
  msgstr "¥¼³Q°Ñ·Óªº¸`ÂI `%s'"
  
! #: tp/Texinfo/Convert/HTML.pm:7167
  #, perl-format
  msgid "target node (new name for `%s') not in document: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7199
  #, perl-format
  msgid "error on closing renamed node redirection file %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7237
  msgid "empty node name"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:7239 tp/Texinfo/Parser.pm:3542
  #, perl-format
  msgid "syntax for an external node used for `%s'"
***************
*** 2214,2243 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1334
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1381 tp/Texinfo/Parser.pm:2722
  #, fuzzy, perl-format
  msgid "entry for index `%s' outside of any node"
  msgstr "¯Á¤Þ `%s' ªº¶µ¥Ø¤£¦b¥ô¦óªº¸`ÂI¤º"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1495
  #, fuzzy, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
  
! #: tp/Texinfo/Convert/Plaintext.pm:1500
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "@image ÀÉ®× `%s' µLªkÅª¨ú: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1523
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1931
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
--- 2210,2239 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1335
  #, perl-format
  msgid "Index entry in @%s with : produces invalid Info: %s"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1382 tp/Texinfo/Parser.pm:2568
  #, fuzzy, perl-format
  msgid "entry for index `%s' outside of any node"
  msgstr "¯Á¤Þ `%s' ªº¶µ¥Ø¤£¦b¥ô¦óªº¸`ÂI¤º"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1496
  #, fuzzy, perl-format
  msgid "error on closing image text file %s: %s"
  msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
  
! #: tp/Texinfo/Convert/Plaintext.pm:1501
  #, perl-format
  msgid "@image file `%s' unreadable: %s"
  msgstr "@image ÀÉ®× `%s' µLªkÅª¨ú: %s"
  
! #: tp/Texinfo/Convert/Plaintext.pm:1524
  #, perl-format
  msgid "could not find @image file `%s.txt' nor alternate text"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1932
  msgid ""
  "@strong{Note...} produces a spurious cross-reference in Info; reword to "
***************
*** 2245,2564 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2161
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2193
  #, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2226
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2272
  #, fuzzy, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "`.' ©Î `,' ¥²¶·¸òµÛ¥æ¤¬°Ñ·Ó, ¦Ó¤£¬O %c"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2275
  #, fuzzy
  msgid "`.' or `,' must follow @xref"
  msgstr "`.' ©Î `,' ¥²¶·¸òµÛ¥æ¤¬°Ñ·Ó, ¦Ó¤£¬O %c"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3118
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3129
  msgid "menu entry node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3145
  msgid "menu entry name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:910
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1160 tp/Texinfo/Structuring.pm:594
  #, perl-format
  msgid "multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1194
  #, perl-format
! msgid "bad syntax for @%s argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1210
  #, perl-format
! msgid "bad or empty @%s formal argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1219 tp/Texinfo/Parser.pm:4856
! #: tp/Texinfo/Parser.pm:4882 tp/Texinfo/Parser.pm:5671
! #: tp/Texinfo/Parser.pm:5687 tp/Texinfo/Parser.pm:5702
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s ¥²¶·­n¦³¦WºÙ"
  
! #: tp/Texinfo/Parser.pm:1223 tp/Texinfo/Parser.pm:4859
! #: tp/Texinfo/Parser.pm:4885 tp/Texinfo/Parser.pm:5674
! #: tp/Texinfo/Parser.pm:5690 tp/Texinfo/Parser.pm:5705
  #, perl-format
  msgid "bad name for @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1341
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1345
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1350
! #, perl-format
! msgid "%c%s missing close brace"
  msgstr "%c%s ¿òº|¥k¤j¬A¸¹"
  
! #: tp/Texinfo/Parser.pm:1354
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1476
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1544
  msgid "@itemx must follow @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1712
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1743
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1746
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1750
  #, fuzzy, perl-format
  msgid "no matching `%cend %s'"
  msgstr "No matching `%cend %s'"
  
! #: tp/Texinfo/Parser.pm:1776 tp/Texinfo/Parser.pm:5204
! #: tp/Texinfo/Parser.pm:5470
  #, fuzzy, perl-format
  msgid "misplaced %c"
  msgstr "»~¸mªº %c"
  
! #: tp/Texinfo/Parser.pm:1874 tp/Texinfo/Parser.pm:3312
  #, fuzzy, perl-format
  msgid "unmatched `%c%s'"
  msgstr "¥¼°t¹ïªº `%c%s'"
  
! #: tp/Texinfo/Parser.pm:2110
  #, fuzzy, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "¥¨¶° `%s' ¦b²Ä %d ¦æ³Q©I¥s, ¦ý¬O¤Þ¼Æ¹L¦h"
  
! #: tp/Texinfo/Parser.pm:2132
  #, fuzzy, perl-format
! msgid "@%s missing close brace"
  msgstr "%c%s ¿òº|¥k¤j¬A¸¹"
  
! #: tp/Texinfo/Parser.pm:2140
  #, fuzzy, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr "¥¨¶° `%s' ¦b²Ä %d ¦æ³Q©I¥s, ¦ý¬O¤Þ¼Æ¹L¦h"
  
! #: tp/Texinfo/Parser.pm:2175
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2650
  #, fuzzy, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "¥¨¶° `%s' ¤w©w¸q¹L"
  
! #: tp/Texinfo/Parser.pm:2655
  #, fuzzy, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "³o¸Ì¬O `%s' ¤§«eªº©w¸q"
  
! #: tp/Texinfo/Parser.pm:3016
  #, fuzzy, perl-format
  msgid "missing name for @%s"
  msgstr "%c%s ¿òº|¥k¤j¬A¸¹"
  
! #: tp/Texinfo/Parser.pm:3021
  #, perl-format
  msgid "missing category for @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3073
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3089
  #, fuzzy
  msgid "empty multitable"
  msgstr "%s: ªÅÀÉ®×"
  
! #: tp/Texinfo/Parser.pm:3145 tp/Texinfo/Parser.pm:5784
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s"
  msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
  
! #: tp/Texinfo/Parser.pm:3151 tp/Texinfo/Parser.pm:5806
! #: tp/Texinfo/Parser.pm:5818
  #, fuzzy, perl-format
  msgid "bad argument to @%s"
  msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
  
! #: tp/Texinfo/Parser.pm:3162
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3167
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3202
  #, fuzzy, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "%s: ¿ï¶µ `--%s' ¤£¥i§t¦³¤Þ¼Æ\n"
  
! #: tp/Texinfo/Parser.pm:3290 tp/Texinfo/Parser.pm:3429
! #: tp/Texinfo/Parser.pm:5777
  #, fuzzy, perl-format
  msgid "@%s missing argument"
  msgstr "%s: ¿òº|ÀÉ®×¤Þ¼Æ.\n"
  
! #: tp/Texinfo/Parser.pm:3302
  #, fuzzy, perl-format
  msgid "unknown @end %s"
  msgstr "¥¼ª¾ªº¯Á¤Þ `%s'"
  
! #: tp/Texinfo/Parser.pm:3324 tp/Texinfo/Parser.pm:3943
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3329 tp/Texinfo/Parser.pm:5861
! #: tp/Texinfo/Parser.pm:5906 tp/Texinfo/Parser.pm:5935
! #: tp/Texinfo/Parser.pm:5976 tp/Texinfo/Parser.pm:6055
  #, fuzzy, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
  
! #: tp/Texinfo/Parser.pm:3348
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3360
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3369
  #, fuzzy, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "%s: ¥¼ª¾ªº¿ï¶µ `%c%s'\n"
  
! #: tp/Texinfo/Parser.pm:3516
  #, perl-format
  msgid "@%s after the first element"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3523
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3563
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3575
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3677
  #, fuzzy, perl-format
  msgid "empty argument in @%s"
  msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
  
! #: tp/Texinfo/Parser.pm:3681
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3724
  #, fuzzy, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "¸`ÂI `%s' ¤¤¨S¦³¿ï³æ."
  
! #: tp/Texinfo/Parser.pm:3732
  msgid "empty node name in menu entry"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3805
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3937
! #, perl-format
! msgid "@end %s should only appear at a line beginning"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:3960
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "¥¨¶° `%s' ¤w©w¸q¹L"
  
! #: tp/Texinfo/Parser.pm:3963
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "³o¸Ì¬O `%s' ¤§«eªº©w¸q"
  
! #: tp/Texinfo/Parser.pm:3968
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4017
  #, perl-format
  msgid "@%s without associated character"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4087
  #, perl-format
  msgid ""
--- 2241,2561 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2162
  #, perl-format
  msgid "@%s cross-reference name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2194
  #, perl-format
  msgid "@%s node name should not contain `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2227
  #, perl-format
  msgid "@%s node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2273
  #, fuzzy, perl-format
  msgid "`.' or `,' must follow @xref, not %s"
  msgstr "`.' ©Î `,' ¥²¶·¸òµÛ¥æ¤¬°Ñ·Ó, ¦Ó¤£¬O %c"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2276
  #, fuzzy
  msgid "`.' or `,' must follow @xref"
  msgstr "`.' ©Î `,' ¥²¶·¸òµÛ¥æ¤¬°Ñ·Ó, ¦Ó¤£¬O %c"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3086
  #, perl-format
  msgid "menu entry node name should not contain `%s'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3097
  msgid "menu entry node name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3113
  msgid "menu entry name should not contain `:'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:883
  #, perl-format
  msgid "@%s should only appear at beginning or end of document"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1125 tp/Texinfo/Structuring.pm:595
  #, perl-format
  msgid "multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1166
  #, perl-format
! msgid "bad or empty @%s formal argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1176
  #, perl-format
! msgid "bad syntax for @%s argument: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1183 tp/Texinfo/Parser.pm:4707
! #: tp/Texinfo/Parser.pm:4733 tp/Texinfo/Parser.pm:5565
! #: tp/Texinfo/Parser.pm:5578 tp/Texinfo/Parser.pm:5592
  #, perl-format
  msgid "%c%s requires a name"
  msgstr "%c%s ¥²¶·­n¦³¦WºÙ"
  
! #: tp/Texinfo/Parser.pm:1187 tp/Texinfo/Parser.pm:4710
! #: tp/Texinfo/Parser.pm:4736 tp/Texinfo/Parser.pm:5568
! #: tp/Texinfo/Parser.pm:5581 tp/Texinfo/Parser.pm:5595
  #, perl-format
  msgid "bad name for @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1305
  #, perl-format
  msgid "@end %s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1309
  #, perl-format
  msgid "@%s seen before @%s closing brace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1314
! #, fuzzy, perl-format
! msgid "%c%s missing closing brace"
  msgstr "%c%s ¿òº|¥k¤j¬A¸¹"
  
! #: tp/Texinfo/Parser.pm:1318
  #, perl-format
  msgid "@%s missing closing delimiter sequence: %s}"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1440
  #, perl-format
  msgid "@itemx should not begin @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1508
  msgid "@itemx must follow @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1676
  #, perl-format
  msgid "@%s has text but no @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1707
  #, perl-format
  msgid "`@end' expected `%s', but saw `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1710
  #, perl-format
  msgid "@%s seen before @end %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:1714
  #, fuzzy, perl-format
  msgid "no matching `%cend %s'"
  msgstr "No matching `%cend %s'"
  
! #: tp/Texinfo/Parser.pm:1738 tp/Texinfo/Parser.pm:5070
! #: tp/Texinfo/Parser.pm:5308
  #, fuzzy, perl-format
  msgid "misplaced %c"
  msgstr "»~¸mªº %c"
  
! #: tp/Texinfo/Parser.pm:1835 tp/Texinfo/Parser.pm:3148
  #, fuzzy, perl-format
  msgid "unmatched `%c%s'"
  msgstr "¥¼°t¹ïªº `%c%s'"
  
! #: tp/Texinfo/Parser.pm:2072
  #, fuzzy, perl-format
  msgid "macro `%s' called with too many args"
  msgstr "¥¨¶° `%s' ¦b²Ä %d ¦æ³Q©I¥s, ¦ý¬O¤Þ¼Æ¹L¦h"
  
! #: tp/Texinfo/Parser.pm:2094
  #, fuzzy, perl-format
! msgid "@%s missing closing brace"
  msgstr "%c%s ¿òº|¥k¤j¬A¸¹"
  
! #: tp/Texinfo/Parser.pm:2102
  #, fuzzy, perl-format
  msgid "macro `%s' declared without argument called with an argument"
  msgstr "¥¨¶° `%s' ¦b²Ä %d ¦æ³Q©I¥s, ¦ý¬O¤Þ¼Æ¹L¦h"
  
! #: tp/Texinfo/Parser.pm:2138
  #, perl-format
  msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2501
  #, fuzzy, perl-format
  msgid "@%s `%s' previously defined"
  msgstr "¥¨¶° `%s' ¤w©w¸q¹L"
  
! #: tp/Texinfo/Parser.pm:2506
  #, fuzzy, perl-format
  msgid "here is the previous definition as @%s"
  msgstr "³o¸Ì¬O `%s' ¤§«eªº©w¸q"
  
! #: tp/Texinfo/Parser.pm:2850
  #, fuzzy, perl-format
  msgid "missing name for @%s"
  msgstr "%c%s ¿òº|¥k¤j¬A¸¹"
  
! #: tp/Texinfo/Parser.pm:2855
  #, perl-format
  msgid "missing category for @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2890
  #, perl-format
  msgid "unexpected argument on @%s line: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2905
  #, fuzzy
  msgid "empty multitable"
  msgstr "%s: ªÅÀÉ®×"
  
! #: tp/Texinfo/Parser.pm:2959 tp/Texinfo/Parser.pm:5673
  #, fuzzy, perl-format
  msgid "superfluous argument to @%s"
  msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
  
! #: tp/Texinfo/Parser.pm:2965 tp/Texinfo/Parser.pm:5694
! #: tp/Texinfo/Parser.pm:5705
  #, fuzzy, perl-format
  msgid "bad argument to @%s"
  msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
  
! #: tp/Texinfo/Parser.pm:2976
  #, perl-format
  msgid "%s requires an argument: the formatter for %citem"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2981
  #, perl-format
  msgid "command @%s not accepting argument in brace should not be on @%s line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3016
  #, fuzzy, perl-format
  msgid "accent command `@%s' not allowed as @%s argument"
  msgstr "%s: ¿ï¶µ `--%s' ¤£¥i§t¦³¤Þ¼Æ\n"
  
! #: tp/Texinfo/Parser.pm:3124 tp/Texinfo/Parser.pm:3277
! #: tp/Texinfo/Parser.pm:5666
  #, fuzzy, perl-format
  msgid "@%s missing argument"
  msgstr "%s: ¿òº|ÀÉ®×¤Þ¼Æ.\n"
  
! #: tp/Texinfo/Parser.pm:3138
  #, fuzzy, perl-format
  msgid "unknown @end %s"
  msgstr "¥¼ª¾ªº¯Á¤Þ `%s'"
  
! #: tp/Texinfo/Parser.pm:3161 tp/Texinfo/Parser.pm:3788
  #, perl-format
  msgid "superfluous argument to @%s %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3167 tp/Texinfo/Parser.pm:3245
! #: tp/Texinfo/Parser.pm:5755 tp/Texinfo/Parser.pm:5798
! #: tp/Texinfo/Parser.pm:5827 tp/Texinfo/Parser.pm:5868
! #: tp/Texinfo/Parser.pm:5946
  #, fuzzy, perl-format
  msgid "bad argument to @%s: %s"
  msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
  
! #: tp/Texinfo/Parser.pm:3188
  #, perl-format
  msgid "@%s: could not open %s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3200
  #, perl-format
  msgid "encoding `%s' is not a canonical texinfo encoding"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3208
  #, fuzzy, perl-format
  msgid "unrecognized encoding name `%s'"
  msgstr "%s: ¥¼ª¾ªº¿ï¶µ `%c%s'\n"
  
! #: tp/Texinfo/Parser.pm:3364
  #, perl-format
  msgid "@%s after the first element"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3371
  #, perl-format
  msgid "@%s only meaningful on a @multitable line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3408
  #, perl-format
  msgid "@%s should not be associated with @top"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3420
  #, perl-format
  msgid "@node precedes @%s, but parts may not be associated with nodes"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3522
  #, fuzzy, perl-format
  msgid "empty argument in @%s"
  msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
  
! #: tp/Texinfo/Parser.pm:3526
  #, perl-format
  msgid "empty node name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3569
  #, fuzzy, perl-format
  msgid "empty menu entry name in `%s'"
  msgstr "¸`ÂI `%s' ¤¤¨S¦³¿ï³æ."
  
! #: tp/Texinfo/Parser.pm:3577
  msgid "empty node name in menu entry"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3650
  #, perl-format
  msgid "@%s should not appear in @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3782
! #, fuzzy, perl-format
! msgid "@end %s should only appear at the beginning of a line"
! msgstr "§R°£¦Ü¥»¦æ¶}ÀY, ¨Ã¸m¤J°Å¶KÃ¯"
  
! #: tp/Texinfo/Parser.pm:3804
  #, perl-format
  msgid "macro `%s' previously defined"
  msgstr "¥¨¶° `%s' ¤w©w¸q¹L"
  
! #: tp/Texinfo/Parser.pm:3807
  #, perl-format
  msgid "here is the previous definition of `%s'"
  msgstr "³o¸Ì¬O `%s' ¤§«eªº©w¸q"
  
! #: tp/Texinfo/Parser.pm:3812
  #, perl-format
  msgid "redefining Texinfo language command: @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3879
  #, perl-format
  msgid "@%s without associated character"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3949
  #, perl-format
  msgid ""
***************
*** 2566,2570 ****
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4111
  #, perl-format
  msgid ""
--- 2563,2567 ----
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3974
  #, perl-format
  msgid ""
***************
*** 2573,2981 ****
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4120
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4176
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4182
  #, fuzzy, perl-format
  msgid "use braces to give a command as an argument to @%s"
  msgstr "¨Ï¥Î¤j¬A¸¹±N©R¥O¥]°_¨Ó, ¥H§@¬° @%s ªº¤Þ¼Æ"
  
! #: tp/Texinfo/Parser.pm:4195 tp/Texinfo/Parser.pm:5325
  #, fuzzy, perl-format
  msgid "%c%s expects `i' or `j' as argument, not `%s'"
  msgstr "%c%s ´Á±æ¨Ï¥Î `i' ©Î `j' §@¬°¤Þ¼Æ, ¦Ó¤£¬O `%c'"
  
! #: tp/Texinfo/Parser.pm:4207
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4218
  #, fuzzy, perl-format
  msgid "@%s expected braces"
  msgstr "%c%s ¹w­p­n¦³ `{...}'"
  
! #: tp/Texinfo/Parser.pm:4383
  #, perl-format
  msgid "undefined flag: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4386
  msgid "bad syntax for @value"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4393
  #, fuzzy, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s ¤w¼o¤î¤£¥Î"
  
! #: tp/Texinfo/Parser.pm:4396
  #, fuzzy, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s ¤w¼o¤î¤£¥Î"
  
! #: tp/Texinfo/Parser.pm:4405
! #, perl-format
! msgid "@%s should only appear at a line beginning"
! msgstr ""
  
! #: tp/Texinfo/Parser.pm:4496
  #, fuzzy, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s ¦b `@%s' °Ï¶ô¤§¤º, ¨Ã¤£¨ã¦³·N¸q"
  
! #: tp/Texinfo/Parser.pm:4505
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4631 tp/Texinfo/Parser.pm:4648
! #: tp/Texinfo/Parser.pm:4698
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s ¦b `@%s' °Ï¶ô¤§¤º, ¨Ã¤£¨ã¦³·N¸q"
  
! #: tp/Texinfo/Parser.pm:4658
  #, fuzzy, perl-format
  msgid "@%s in empty multitable"
  msgstr "%s: ªÅÀÉ®×"
  
! #: tp/Texinfo/Parser.pm:4664
  msgid "@tab before @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4667
  #, fuzzy, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "multitable ¶µ¥Ø¤¤¦³¤Ó¦hªºÄæ¦ì (³Ì¤j­È¬° %d)"
  
! #: tp/Texinfo/Parser.pm:4704
  msgid "ignoring @tab outside of multitable"
  msgstr "©¿²¤ multitable ¥~ªº @tab"
  
! #: tp/Texinfo/Parser.pm:4708
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4745
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4787
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4791
  msgid "@dircategory after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4979
  #, fuzzy, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "©w¸qµù¸}, ¦ý¬O¨S¦³¤÷¸`ÂI"
  
! #: tp/Texinfo/Parser.pm:4997
  msgid "@direntry after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5005
  #, fuzzy, perl-format
  msgid "@%s seen before first @node"
  msgstr "@menu ¦b²Ä¤@­Ó @node ¤§«e¥X²{, ±N«Ø¥ß `Top' ¸`ÂI"
  
! #: tp/Texinfo/Parser.pm:5008
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
  msgstr "¤]³\±zÀ³¸Ó§â @top ¸`ÂI¥]§t¦b @ifnottex, ¦Ó¤£¬O @ifinfo?"
  
! #: tp/Texinfo/Parser.pm:5070
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5078
  #, fuzzy, perl-format
  msgid "unknown command `%s'"
  msgstr "¥¼ª¾ªº©R¥O `%s'"
  
! #: tp/Texinfo/Parser.pm:5088
  #, fuzzy
  msgid "unexpected @"
  msgstr "Expected `%s'"
  
! #: tp/Texinfo/Parser.pm:5117
  #, fuzzy, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s ¦b `@%s' °Ï¶ô¤§¤º, ¨Ã¤£¨ã¦³·N¸q"
  
! #: tp/Texinfo/Parser.pm:5122
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5130
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5249
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5273
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5292
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5303
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5316
  msgid "@image missing filename argument"
  msgstr "@image ¨S¦³ÀÉ¦W¤Þ¼Æ"
  
! #: tp/Texinfo/Parser.pm:5348
  #, fuzzy, perl-format
  msgid "@%s missing first argument"
  msgstr "%s: ¿òº|ÀÉ®×¤Þ¼Æ.\n"
  
! #: tp/Texinfo/Parser.pm:5393
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5399
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5412
! #, perl-format
! msgid "argument for @U exceeds size of integer: %s"
! msgstr ""
! 
! #: tp/Texinfo/Parser.pm:5418
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5546
  msgid "superfluous arguments for node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5596
  #, fuzzy, perl-format
  msgid "expected @end %s"
  msgstr "Expected `%s'"
  
! #: tp/Texinfo/Parser.pm:5718
  #, fuzzy, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "¨Ï¥Î¤j¬A¸¹±N©R¥O¥]°_¨Ó, ¥H§@¬° @%s ªº¤Þ¼Æ"
  
! #: tp/Texinfo/Parser.pm:5728
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5801
  #, fuzzy, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "¨Ï¥Î¤j¬A¸¹±N©R¥O¥]°_¨Ó, ¥H§@¬° @%s ªº¤Þ¼Æ"
  
! #: tp/Texinfo/Parser.pm:5823
  #, perl-format
  msgid "empty @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5831
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5840
  #, fuzzy, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "%s: %s ¤Þ¼Æ¥²¶·¬°¼Æ­È, ¦Ó¤£¬O `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5849
  #, perl-format
  msgid "reserved index name %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5868
  #, fuzzy, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "¥¼ª¾ªº¯Á¤Þ `%s'"
  
! #: tp/Texinfo/Parser.pm:5871
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5901
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5914
  #, fuzzy, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "@printindex ¤¤¦³¥¼ª¾ªº¯Á¤Þ `%s'"
  
! #: tp/Texinfo/Parser.pm:5920
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5928
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5944
  #, fuzzy, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
  msgstr "%s: %s ¤Þ¼Æ¥²¶·¬°¼Æ­È, ¦Ó¤£¬O `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5952
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5960
  #, fuzzy, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
  msgstr "%s: --footnote-style ªº¤Þ¼Æ¥²¶·¬° `separate' ©Î `end', ¦Ó¤£¬O `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5968
  #, fuzzy, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
  msgstr "%s: %s ¤Þ¼Æ¥²¶·¬°¼Æ­È, ¦Ó¤£¬O `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5986 tp/Texinfo/Parser.pm:5991
  #, fuzzy, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
  msgstr "%s: --paragraph-indent ªº¤Þ¼Æ¥²¶·¬° ¼Æ­È/`none'/`asis', ¦Ó¤£¬O `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5999
  #, fuzzy, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
  msgstr "%s: --paragraph-indent ªº¤Þ¼Æ¥²¶·¬° ¼Æ­È/`none'/`asis', ¦Ó¤£¬O `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:6009
  #, fuzzy, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
  msgstr "%s: --paragraph-indent ªº¤Þ¼Æ¥²¶·¬° ¼Æ­È/`none'/`asis', ¦Ó¤£¬O `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:6021
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:6031
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:6039
  #, fuzzy, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
  msgstr "%s: --footnote-style ªº¤Þ¼Æ¥²¶·¬° `separate' ©Î `end', ¦Ó¤£¬O `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:6047
  #, fuzzy, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
  msgstr "%s: --footnote-style ªº¤Þ¼Æ¥²¶·¬° `separate' ©Î `end', ¦Ó¤£¬O `%s'.\n"
  
! #: tp/Texinfo/Structuring.pm:213
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:245
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:250
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:339
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:488
  #, perl-format
  msgid "@%s not empty"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:544 tp/Texinfo/Structuring.pm:1326
  #, fuzzy, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "%s °Ñ·Ó¨ì¤£¦s¦bªº¸`ÂI: `%s'"
  
! #: tp/Texinfo/Structuring.pm:557
  #, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:662
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "¥¼³Q°Ñ·Óªº¸`ÂI `%s'"
  
! #: tp/Texinfo/Structuring.pm:708
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:715
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:733
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:787
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:814
  #, fuzzy, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%s °Ñ·Ó¨ì¤£¦s¦bªº¸`ÂI: `%s'"
  
! #: tp/Texinfo/Structuring.pm:834
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:842
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
--- 2570,2973 ----
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:3983
  #, perl-format
  msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4038
  #, perl-format
  msgid "accent command `@%s' must not be followed by whitespace"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4044
  #, fuzzy, perl-format
  msgid "use braces to give a command as an argument to @%s"
  msgstr "¨Ï¥Î¤j¬A¸¹±N©R¥O¥]°_¨Ó, ¥H§@¬° @%s ªº¤Þ¼Æ"
  
! #: tp/Texinfo/Parser.pm:4057 tp/Texinfo/Parser.pm:5189
  #, fuzzy, perl-format
  msgid "%c%s expects `i' or `j' as argument, not `%s'"
  msgstr "%c%s ´Á±æ¨Ï¥Î `i' ©Î `j' §@¬°¤Þ¼Æ, ¦Ó¤£¬O `%c'"
  
! #: tp/Texinfo/Parser.pm:4068
  #, perl-format
  msgid "accent command `@%s' must not be followed by new line"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4079
  #, fuzzy, perl-format
  msgid "@%s expected braces"
  msgstr "%c%s ¹w­p­n¦³ `{...}'"
  
! #: tp/Texinfo/Parser.pm:4233
  #, perl-format
  msgid "undefined flag: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4236
  msgid "bad syntax for @value"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4243
  #, fuzzy, perl-format
  msgid "%c%s is obsolete."
  msgstr "%c%s ¤w¼o¤î¤£¥Î"
  
! #: tp/Texinfo/Parser.pm:4246
  #, fuzzy, perl-format
  msgid "%c%s is obsolete; %s"
  msgstr "%c%s ¤w¼o¤î¤£¥Î"
  
! #: tp/Texinfo/Parser.pm:4255
! #, fuzzy, perl-format
! msgid "@%s should only appear at the beginning of a line"
! msgstr "§R°£¦Ü¥»¦æ¶}ÀY, ¨Ã¸m¤J°Å¶KÃ¯"
  
! #: tp/Texinfo/Parser.pm:4346
  #, fuzzy, perl-format
  msgid "@%s not allowed inside `@%s' block"
  msgstr "@%s ¦b `@%s' °Ï¶ô¤§¤º, ¨Ã¤£¨ã¦³·N¸q"
  
! #: tp/Texinfo/Parser.pm:4355
  #, perl-format
  msgid "@%s should only appear in heading or footing"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4479 tp/Texinfo/Parser.pm:4496
! #: tp/Texinfo/Parser.pm:4546
  #, perl-format
  msgid "@%s not meaningful inside `@%s' block"
  msgstr "@%s ¦b `@%s' °Ï¶ô¤§¤º, ¨Ã¤£¨ã¦³·N¸q"
  
! #: tp/Texinfo/Parser.pm:4506
  #, fuzzy, perl-format
  msgid "@%s in empty multitable"
  msgstr "%s: ªÅÀÉ®×"
  
! #: tp/Texinfo/Parser.pm:4512
  msgid "@tab before @item"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4515
  #, fuzzy, perl-format
  msgid "too many columns in multitable item (max %d)"
  msgstr "multitable ¶µ¥Ø¤¤¦³¤Ó¦hªºÄæ¦ì (³Ì¤j­È¬° %d)"
  
! #: tp/Texinfo/Parser.pm:4552
  msgid "ignoring @tab outside of multitable"
  msgstr "©¿²¤ multitable ¥~ªº @tab"
  
! #: tp/Texinfo/Parser.pm:4556
  #, perl-format
  msgid "@%s outside of table or list"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4596
  #, perl-format
  msgid "must be after `@%s' to use `@%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4638
  #, perl-format
  msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4642
  msgid "@dircategory after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4847
  #, fuzzy, perl-format
  msgid "region %s inside region %s is not allowed"
  msgstr "©w¸qµù¸}, ¦ý¬O¨S¦³¤÷¸`ÂI"
  
! #: tp/Texinfo/Parser.pm:4864
  msgid "@direntry after first node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4872
  #, fuzzy, perl-format
  msgid "@%s seen before first @node"
  msgstr "@menu ¦b²Ä¤@­Ó @node ¤§«e¥X²{, ±N«Ø¥ß `Top' ¸`ÂI"
  
! #: tp/Texinfo/Parser.pm:4875
  msgid ""
  "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
  msgstr "¤]³\±zÀ³¸Ó§â @top ¸`ÂI¥]§t¦b @ifnottex, ¦Ó¤£¬O @ifinfo?"
  
! #: tp/Texinfo/Parser.pm:4937
  #, perl-format
  msgid "@%s should only appear in math context"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4945
  #, fuzzy, perl-format
  msgid "unknown command `%s'"
  msgstr "¥¼ª¾ªº©R¥O `%s'"
  
! #: tp/Texinfo/Parser.pm:4955
  #, fuzzy
  msgid "unexpected @"
  msgstr "Expected `%s'"
  
! #: tp/Texinfo/Parser.pm:4983
  #, fuzzy, perl-format
  msgid "@%s is not meaningful outside `@float' environment"
  msgstr "@%s ¦b `@%s' °Ï¶ô¤§¤º, ¨Ã¤£¨ã¦³·N¸q"
  
! #: tp/Texinfo/Parser.pm:4988
  #, perl-format
  msgid "@%s should be right below `@float'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:4996
  #, perl-format
  msgid "ignoring multiple @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5114
  #, perl-format
  msgid "command @%s does not accept arguments"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5138
  #, perl-format
  msgid "command @%s missing a node or external manual argument"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5156
  #, perl-format
  msgid "in @%s empty cross reference name after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5167
  #, perl-format
  msgid "in @%s empty cross reference title after expansion `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5180
  msgid "@image missing filename argument"
  msgstr "@image ¨S¦³ÀÉ¦W¤Þ¼Æ"
  
! #: tp/Texinfo/Parser.pm:5211
  #, fuzzy, perl-format
  msgid "@%s missing first argument"
  msgstr "%s: ¿òº|ÀÉ®×¤Þ¼Æ.\n"
  
! #: tp/Texinfo/Parser.pm:5230
  #, perl-format
  msgid "non-hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5236
  #, perl-format
  msgid "fewer than four hex digits in argument for @U: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5253
  #, perl-format
  msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5448
  msgid "superfluous arguments for node"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5498
  #, fuzzy, perl-format
  msgid "expected @end %s"
  msgstr "Expected `%s'"
  
! #: tp/Texinfo/Parser.pm:5607
  #, fuzzy, perl-format
  msgid "@%s should only accept a @-command as argument, not `%s'"
  msgstr "¨Ï¥Î¤j¬A¸¹±N©R¥O¥]°_¨Ó, ¥H§@¬° @%s ªº¤Þ¼Æ"
  
! #: tp/Texinfo/Parser.pm:5617
  #, perl-format
  msgid "remaining argument on @%s line: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5689
  #, fuzzy, perl-format
  msgid "environment command %s as argument to @%s"
  msgstr "¨Ï¥Î¤j¬A¸¹±N©R¥O¥]°_¨Ó, ¥H§@¬° @%s ªº¤Þ¼Æ"
  
! #: tp/Texinfo/Parser.pm:5710
  #, perl-format
  msgid "empty @%s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5718
  #, perl-format
  msgid "column fraction not a number: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5727
  #, fuzzy, perl-format
  msgid "@sp arg must be numeric, not `%s'"
  msgstr "%s: %s ¤Þ¼Æ¥²¶·¬°¼Æ­È, ¦Ó¤£¬O `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5736
  #, perl-format
  msgid "reserved index name %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5762
  #, fuzzy, perl-format
  msgid "unknown source index in @%s: %s"
  msgstr "¥¼ª¾ªº¯Á¤Þ `%s'"
  
! #: tp/Texinfo/Parser.pm:5765
  #, perl-format
  msgid "unknown destination index in @%s: %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5793
  #, perl-format
  msgid "@%s leads to a merging of %s in itself, ignoring"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5806
  #, fuzzy, perl-format
  msgid "unknown index `%s' in @printindex"
  msgstr "@printindex ¤¤¦³¥¼ª¾ªº¯Á¤Þ `%s'"
  
! #: tp/Texinfo/Parser.pm:5812
  #, perl-format
  msgid "printing an index `%s' merged in another one `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5820
  #, perl-format
  msgid "printindex before document beginning: @printindex %s"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5836
  #, fuzzy, perl-format
  msgid "@%s arg must be `top' or `bottom', not `%s'"
  msgstr "%s: %s ¤Þ¼Æ¥²¶·¬°¼Æ­È, ¦Ó¤£¬O `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5844
  #, perl-format
  msgid "Only @%s 10 or 11 is supported, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5852
  #, fuzzy, perl-format
  msgid "@%s arg must be `separate' or `end', not `%s'"
  msgstr "%s: --footnote-style ªº¤Þ¼Æ¥²¶·¬° `separate' ©Î `end', ¦Ó¤£¬O `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5860
  #, fuzzy, perl-format
  msgid "@%s arg must be `on', `off' or `odd', not `%s'"
  msgstr "%s: %s ¤Þ¼Æ¥²¶·¬°¼Æ­È, ¦Ó¤£¬O `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5878 tp/Texinfo/Parser.pm:5883
  #, fuzzy, perl-format
  msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
  msgstr "%s: --paragraph-indent ªº¤Þ¼Æ¥²¶·¬° ¼Æ­È/`none'/`asis', ¦Ó¤£¬O `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5891
  #, fuzzy, perl-format
  msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
  msgstr "%s: --paragraph-indent ªº¤Þ¼Æ¥²¶·¬° ¼Æ­È/`none'/`asis', ¦Ó¤£¬O `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5901
  #, fuzzy, perl-format
  msgid "@exampleindent arg must be numeric/`asis', not `%s'"
  msgstr "%s: --paragraph-indent ªº¤Þ¼Æ¥²¶·¬° ¼Æ­È/`none'/`asis', ¦Ó¤£¬O `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5913
  #, perl-format
  msgid "expected @%s on or off, not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5922
  #, perl-format
  msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:5930
  #, fuzzy, perl-format
  msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
  msgstr "%s: --footnote-style ªº¤Þ¼Æ¥²¶·¬° `separate' ©Î `end', ¦Ó¤£¬O `%s'.\n"
  
! #: tp/Texinfo/Parser.pm:5938
  #, fuzzy, perl-format
  msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
  msgstr "%s: --footnote-style ªº¤Þ¼Æ¥²¶·¬° `separate' ©Î `end', ¦Ó¤£¬O `%s'.\n"
  
! #: tp/Texinfo/Structuring.pm:216
  #, perl-format
  msgid "raising the section level of @%s which is too low"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:248
  #, perl-format
  msgid "no chapter-level command before @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:253
  #, perl-format
  msgid "lowering the section level of @%s appearing after a lower element"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:342
  #, perl-format
  msgid "no sectioning command associated with @%s"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:491
  #, perl-format
  msgid "@%s not empty"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:547 tp/Texinfo/Structuring.pm:1325
  #, fuzzy, perl-format
  msgid "@%s reference to nonexistent node `%s'"
  msgstr "%s °Ñ·Ó¨ì¤£¦s¦bªº¸`ÂI: `%s'"
  
! #: tp/Texinfo/Structuring.pm:558
  #, perl-format
  msgid "@%s entry node name `%s' different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:663
  #, perl-format
  msgid "unreferenced node `%s'"
  msgstr "¥¼³Q°Ñ·Óªº¸`ÂI `%s'"
  
! #: tp/Texinfo/Structuring.pm:706
  #, perl-format
  msgid "node `%s' is %s for `%s' in sectioning but not in menu"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:713
  #, perl-format
  msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:731
  #, perl-format
  msgid "node `%s' is %s for `%s' in menu but not in sectioning"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:786
  #, perl-format
  msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:810
  #, fuzzy, perl-format
  msgid "%s reference to nonexistent `%s'"
  msgstr "%s °Ñ·Ó¨ì¤£¦s¦bªº¸`ÂI: `%s'"
  
! #: tp/Texinfo/Structuring.pm:829
  #, perl-format
  msgid "node `%s' lacks menu item for `%s' despite being its Up target"
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:837
  #, perl-format
  msgid "for `%s', up in menu `%s' and up `%s' don't match"
***************
*** 2987,2991 ****
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:2070
  #, perl-format
  msgid "empty index key in @%s"
--- 2979,2983 ----
  msgstr ""
  
! #: tp/Texinfo/Structuring.pm:2067
  #, perl-format
  msgid "empty index key in @%s"
***************
*** 3384,3402 ****
  msgstr "¸Õ¸Õ `%s --help' ¥H¨ú±o§ó¦hªº¸ê°T.\n"
  
! #: tp/texi2any.pl:1232
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
  
! #: tp/texi2any.pl:1255
  #, fuzzy, perl-format
  msgid "error on closing macro expand file %s: %s\n"
  msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
  
! #: tp/texi2any.pl:1261
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1286
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
--- 3376,3394 ----
  msgstr "¸Õ¸Õ `%s --help' ¥H¨ú±o§ó¦hªº¸ê°T.\n"
  
! #: tp/texi2any.pl:1239
  msgid "fill_gaps_in_sectioning transformation return no result. No section?"
  msgstr ""
  
! #: tp/texi2any.pl:1262
  #, fuzzy, perl-format
  msgid "error on closing macro expand file %s: %s\n"
  msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
  
! #: tp/texi2any.pl:1268
  #, perl-format
  msgid "could not open %s for writing: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1293
  msgid ""
  "insert_nodes_for_sectioning_commands transformation return no result. No "
***************
*** 3404,3418 ****
  msgstr ""
  
! #: tp/texi2any.pl:1359 tp/texi2any.pl:1435
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1382 tp/texi2any.pl:1416
  #, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1388 tp/texi2any.pl:1422
  #, fuzzy, perl-format
  msgid "%s: could not open %s for writing: %s\n"
--- 3396,3410 ----
  msgstr ""
  
! #: tp/texi2any.pl:1366 tp/texi2any.pl:1442
  #, perl-format
  msgid "%s: error on closing %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1389 tp/texi2any.pl:1423
  #, perl-format
  msgid "%s: error on closing internal links file %s: %s\n"
  msgstr ""
  
! #: tp/texi2any.pl:1395 tp/texi2any.pl:1429
  #, fuzzy, perl-format
  msgid "%s: could not open %s for writing: %s\n"
***************
*** 3747,3750 ****
--- 3739,3748 ----
  #~ msgstr "¦b¤º³¡³Q \\[universal-argument] ¨Ï¥Î"
  
+ #~ msgid "-%s---Info: %s, %d lines --%s--"
+ #~ msgstr "-%s---Info: %s, ¦@ %d ¦æ --%s--"
+ 
+ #~ msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
+ #~ msgstr "-%s%s-Info: (%s)%s, ¦@ %d ¦æ --%s--"
+ 
  #~ msgid " Subfile: %s"
  #~ msgstr " ¤lÀÉ®×: %s"
diff -Nrc2 texinfo-6.1/po_document/LINGUAS texinfo-6.3/po_document/LINGUAS
*** texinfo-6.1/po_document/LINGUAS	2015-12-26 10:12:03.000000000 +0000
--- texinfo-6.3/po_document/LINGUAS	2016-09-03 14:36:05.000000000 +0100
***************
*** 1,12 ****
--- 1,18 ----
+ ca
  ca.us-ascii
+ de
  de.us-ascii
+ el
  eo
  es
  fr
  hu
+ hr
  it
  nl
  no.us-ascii
  pl
+ pt
+ pt_BR
  pt_BR.us-ascii
  pt.us-ascii
diff -Nrc2 texinfo-6.1/po_document/Makevars texinfo-6.3/po_document/Makevars
*** texinfo-6.1/po_document/Makevars	2015-12-23 14:20:04.000000000 +0000
--- texinfo-6.3/po_document/Makevars	2016-02-27 16:33:41.000000000 +0000
***************
*** 76,78 ****
  # "no".  Set this to no if the POT file and PO files are maintained
  # externally.
! DIST_DEPENDS_ON_UPDATE_PO = yes
--- 76,78 ----
  # "no".  Set this to no if the POT file and PO files are maintained
  # externally.
! DIST_DEPENDS_ON_UPDATE_PO = no
Binary files texinfo-6.1/po_document/ca.gmo and texinfo-6.3/po_document/ca.gmo differ
diff -Nrc2 texinfo-6.1/po_document/ca.po texinfo-6.3/po_document/ca.po
*** texinfo-6.1/po_document/ca.po	1970-01-01 01:00:00.000000000 +0100
--- texinfo-6.3/po_document/ca.po	2016-09-10 12:46:00.000000000 +0100
***************
*** 0 ****
--- 1,903 ----
+ # Translation of Texinfo
+ # Copyright (C) 2015 Free Software Foundation, Inc.
+ # This file is distributed under the same license as the texinfo package.
+ # Walter Garcia-Fontes <walter.garcia@upf.edu>, 2015
+ #
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: texinfo_document 5.9.93\n"
+ "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
+ "POT-Creation-Date: 2016-09-10 12:46+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"
+ "Language: ca\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=us-ascii\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"
+ 
+ #: tp/Texinfo/Common.pm:697 tp/Texinfo/Common.pm:702
+ msgid "Function"
+ msgstr "Funci@'o"
+ 
+ #: tp/Texinfo/Common.pm:698
+ msgid "Macro"
+ msgstr "Macro"
+ 
+ #: tp/Texinfo/Common.pm:699
+ msgid "Special Form"
+ msgstr "Forma especial"
+ 
+ #: tp/Texinfo/Common.pm:700 tp/Texinfo/Common.pm:703
+ msgid "Variable"
+ msgstr "Variable"
+ 
+ #: tp/Texinfo/Common.pm:701
+ msgid "User Option"
+ msgstr "Opci@'o d'usuari"
+ 
+ #: tp/Texinfo/Common.pm:704 tp/Texinfo/Common.pm:705
+ msgid "Instance Variable"
+ msgstr "Variable d'inst@`ancia"
+ 
+ #: tp/Texinfo/Common.pm:706 tp/Texinfo/Common.pm:707
+ msgid "Method"
+ msgstr "M@'etode"
+ 
+ #: tp/Texinfo/Common.pm:1186
+ #, perl-brace-format
+ msgid "{category} on {class}"
+ msgstr "{category} sobre {class}"
+ 
+ #: tp/Texinfo/Common.pm:1193
+ #, perl-brace-format
+ msgid "{category} of {class}"
+ msgstr "{category} de {class}"
+ 
+ #: tp/Texinfo/Common.pm:1210
+ #, perl-brace-format
+ msgid "{month} {day}, {year}"
+ msgstr "{day} {month}, {year}"
+ 
+ #: tp/Texinfo/Common.pm:1241 tp/Texinfo/Convert/Plaintext.pm:1133
+ #: tp/Texinfo/Convert/HTML.pm:516
+ #, perl-brace-format
+ msgid "Appendix {number} {section_title}"
+ msgstr "Annex {number} {section_title}"
+ 
+ #: tp/Texinfo/Common.pm:1245 tp/Texinfo/Convert/Plaintext.pm:1138
+ #: tp/Texinfo/Convert/HTML.pm:522
+ #, perl-brace-format
+ msgid "{number} {section_title}"
+ msgstr "{number} {section_title}"
+ 
+ #: tp/Texinfo/Common.pm:1499
+ #, perl-brace-format
+ msgid "{float_type} {float_number}: "
+ msgstr "{float_type} {float_number}: "
+ 
+ #: tp/Texinfo/Common.pm:1503
+ #, perl-brace-format
+ msgid "{float_type}: "
+ msgstr "{float_type}: "
+ 
+ #: tp/Texinfo/Common.pm:1508
+ #, perl-brace-format
+ msgid "{float_type} {float_number}\n"
+ msgstr "{float_type} {float_number}\n"
+ 
+ #: tp/Texinfo/Common.pm:1512
+ #, perl-brace-format
+ msgid "{float_type}\n"
+ msgstr "{float_type}\n"
+ 
+ #: tp/Texinfo/Common.pm:1518
+ #, perl-brace-format
+ msgid "{float_number}: "
+ msgstr "{float_number}: "
+ 
+ #: tp/Texinfo/Common.pm:1521
+ #, perl-brace-format
+ msgid "{float_number}\n"
+ msgstr "{float_number}\n"
+ 
+ #: tp/Texinfo/Parser.pm:2816
+ #, perl-brace-format
+ msgid "{name} on {class}"
+ msgstr "{name} a {class}"
+ 
+ #: tp/Texinfo/Parser.pm:2825
+ #, perl-brace-format
+ msgid "{name} of {class}"
+ msgstr "{name} de {class}"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:110
+ msgid "error@arrow{}"
+ msgstr "error@arrow{}"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:948
+ msgid "January"
+ msgstr "Gener"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:949
+ msgid "February"
+ msgstr "Febrer"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:950
+ msgid "March"
+ msgstr "Mar@,{c}"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:951
+ msgid "April"
+ msgstr "Abril"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:952
+ msgid "May"
+ msgstr "Maig"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:953
+ msgid "June"
+ msgstr "Juny"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:954
+ msgid "July"
+ msgstr "Juliol"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:955
+ msgid "August"
+ msgstr "Agost"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:956
+ msgid "September"
+ msgstr "Setembre"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:957
+ msgid "October"
+ msgstr "Octubre"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:958
+ msgid "November"
+ msgstr "Novembre"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:959
+ msgid "December"
+ msgstr "Desembre"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:1010
+ #, perl-brace-format
+ msgid "{float_type} {float_number}"
+ msgstr "{float_type} {float_number}"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:1014
+ #, perl-brace-format
+ msgid "{float_type}"
+ msgstr "{float_type}"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:1018
+ #, perl-brace-format
+ msgid "{float_number}"
+ msgstr "{float_number}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:826
+ #, 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:831
+ #, perl-brace-format
+ msgid "See node @samp{{mynode}}"
+ msgstr "Vegeu node @samp{{mynode}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:835
+ #, perl-brace-format
+ msgid "See Info file @file{{myfile}}"
+ msgstr "Vegeu fitxer Info @file{{myfile}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:875
+ #, perl-brace-format
+ msgid "section ``{section_name}'' in @cite{{book}}"
+ msgstr "secci@'o ``{section_name}'' a @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:880
+ #, 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:885
+ #, 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:892 tp/Texinfo/Convert/HTML.pm:3317
+ #, perl-brace-format
+ msgid "@cite{{book}}"
+ msgstr "@cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3294
+ #, perl-brace-format
+ msgid "See @cite{{book}}"
+ msgstr "Vegeu @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3271
+ #, perl-brace-format
+ msgid "see @cite{{book}}"
+ msgstr "vegeu @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:915
+ #, perl-brace-format
+ msgid "{title_ref}"
+ msgstr "{title_ref}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:920
+ #, perl-brace-format
+ msgid "See {title_ref}"
+ msgstr "Vegeu {title_ref}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:925
+ #, perl-brace-format
+ msgid "see {title_ref}"
+ msgstr "vegeu {title_ref}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2311
+ #, perl-brace-format
+ msgid "{abbr_or_acronym} ({explanation})"
+ msgstr "{abbr_or_acronym} ({explanation})"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2497
+ #: tp/Texinfo/Convert/HTML.pm:3622
+ #, perl-brace-format
+ msgid "@b{{quotation_arg}:} "
+ msgstr "@b{{quotation_arg}:} "
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:1367
+ msgid "(outside of any node)"
+ msgstr "(fora de qualsevol node)"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2004
+ #, perl-brace-format
+ msgid "{name} @url{{email}}"
+ msgstr "{name} @url{{email}}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2007
+ #, perl-brace-format
+ msgid "@url{{email}}"
+ msgstr "@url{{email}}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2029
+ #, perl-brace-format
+ msgid "{text} ({url})"
+ msgstr "{text} ({url})"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2034
+ #, perl-brace-format
+ msgid "@t{<{url}>}"
+ msgstr "@t{<{url}>}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2422 tp/Texinfo/Convert/HTML.pm:1437
+ #, perl-brace-format
+ msgid "@{No value for `{value}'@}"
+ msgstr "@{No hi ha cap valor per a `{value}'@}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2913
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}: {name} {arguments}"
+ msgstr "@tie{ }-- {category}: {name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2918
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}: {name}"
+ msgstr "@tie{ }-- {category}: {name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2931
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
+ msgstr "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2934
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}: {type} {name} {arguments}"
+ msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2943
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}:@*{type}@*{name}"
+ msgstr "@tie{ }-- {category}:@*{type}@*{name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2946
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}: {type} {name}"
+ msgstr "@tie{ }-- {category}: {type} {name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2954
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
+ msgstr "@tie{ }-- {category} de {class}: {name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2960
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}: {name}"
+ msgstr "@tie{ }-- {category} de {class}: {name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2969
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
+ msgstr "@tie{ }-- {category} a {class}: {name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2975
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}: {name}"
+ msgstr "@tie{ }-- {category} a {class}: {name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2990
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
+ msgstr "@tie{ }-- {category} a {class}:@*{type}@*{name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2994
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
+ msgstr "@tie{ }-- {category} a {class}: {type} {name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3005
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
+ msgstr "@tie{ }-- {category} a {class}:@*{type}@*{name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3009
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}: {type} {name}"
+ msgstr "@tie{ }-- {category} a {class}: {type} {name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3023
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
+ msgstr "@tie{ }-- {category} de {class}:@*{type}@*{name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3027
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
+ msgstr "@tie{ }-- {category} de {class}: {type} {name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3038
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
+ msgstr "@tie{ }-- {category} de {class}:@*{type}@*{name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3042
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}: {type} {name}"
+ msgstr "@tie{ }-- {category} de {class}: {type} {name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3371 tp/Texinfo/Convert/HTML.pm:2877
+ #, perl-brace-format
+ msgid "@center --- @emph{{author}}\n"
+ msgstr "@center --- @emph{{author}}\n"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
+ msgid "Top"
+ msgstr "Amunt"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
+ msgid "Contents"
+ msgstr "Continguts"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:791
+ msgid "Overview"
+ msgstr "Panor@`amica"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:736 tp/Texinfo/Convert/HTML.pm:767
+ #: tp/Texinfo/Convert/HTML.pm:792
+ msgid "Index"
+ msgstr "@'Index"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:738
+ msgid "current"
+ msgstr "actual"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
+ msgid "Prev"
+ msgstr "Prev"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:742
+ msgid " Up "
+ msgstr " Amunt"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:747
+ #: tp/Texinfo/Convert/HTML.pm:799
+ msgid "Next"
+ msgstr "Seg@\"uent"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:745 tp/Texinfo/Convert/HTML.pm:798
+ msgid "Up"
+ msgstr "Amunt"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:749
+ msgid "Previous"
+ msgstr "Previ"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:750
+ msgid "Forward node"
+ msgstr "Node cap endavant"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:751
+ msgid "Back node"
+ msgstr "Node cap endarrere"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:757
+ msgid "Next file"
+ msgstr "Fitxer seg@\"uent"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:758
+ msgid "Previous file"
+ msgstr "Fitxer previ"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:764
+ msgid "Cover (top) of document"
+ msgstr "Portada (part superior) del document"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:765
+ msgid "Table of contents"
+ msgstr "Taula de continguts"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:766
+ msgid "Short table of contents"
+ msgstr "Taula breu de continguts"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:768
+ msgid "Current section"
+ msgstr "Secci@'o actual"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:769
+ msgid "Previous section in reading order"
+ msgstr "Secci@'o pr@`evia a l'ordre de lectura"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:770
+ msgid "Beginning of this chapter or previous chapter"
+ msgstr "Inici del cap@'@dotless{i}tol actual o previ"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:771
+ msgid "Previous section on same level"
+ msgstr "Secci@'o pr@`evia al mateix nivell"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:772
+ msgid "Up section"
+ msgstr "Secci@'o amunt"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:773
+ msgid "Next section on same level"
+ msgstr "Secci@'o seg@\"uent al mateix nivell"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:774
+ msgid "Up node"
+ msgstr "Node amunt"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:775
+ msgid "Next node"
+ msgstr "Node seg@\"uent"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:776
+ msgid "Previous node"
+ msgstr "Node previ"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:777
+ msgid "Next node in node reading order"
+ msgstr "Node seg@\"uent a l'ordre de lectura de nodes"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:778
+ msgid "Previous node in node reading order"
+ msgstr "Node previ a l'ordre de lectura de nodes"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:779
+ msgid "Next section in reading order"
+ msgstr "Secci@'o seg@\"uent a l'ordre de lectura"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:780
+ msgid "Next chapter"
+ msgstr "Cap@'@dotless{i}tol seg@\"uent"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:781
+ msgid "About (help)"
+ msgstr "Quant a (ajuda)"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:782
+ msgid "First section in reading order"
+ msgstr "Primera secci@'o a l'ordre de lectura"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:783
+ msgid "Last section in reading order"
+ msgstr "@\"Ultima secci@'o a l'ordre de lectura"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:784
+ msgid "Forward section in next file"
+ msgstr "Secci@'o cap endavant al fitxer seg@\"uent"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:785
+ msgid "Back section in previous file"
+ msgstr "Secci@'o cap endarrere al fitxer previ"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:794
+ msgid "This"
+ msgstr "Aquest"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:795
+ msgid "Back"
+ msgstr "En darrere"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:796
+ msgid "FastBack"
+ msgstr "CapEnDarrereR@`apid"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:800
+ msgid "NodeUp"
+ msgstr "NodeAmunt"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:801
+ msgid "NodeNext"
+ msgstr "NodeSeg@\"uent"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:802
+ msgid "NodePrev"
+ msgstr "NodePrevi"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:803
+ msgid "NodeForward"
+ msgstr "NodeEnDavant"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:804
+ msgid "NodeBack"
+ msgstr "NodeEnDarrere"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:805
+ msgid "Forward"
+ msgstr "Endavant"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:806
+ msgid "FastForward"
+ msgstr "EndavantR@`apid"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:807
+ msgid "About"
+ msgstr "Quant a"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:808
+ msgid "First"
+ msgstr "Primer"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:809
+ msgid "Last"
+ msgstr "@'Ultim"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:810
+ msgid "NextFile"
+ msgstr "FitxerSeg@\"uent"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:811
+ msgid "PrevFile"
+ msgstr "FitxerPrevi"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:815
+ msgid "About This Document"
+ msgstr "Quan a aquest document"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:816
+ msgid "Table of Contents"
+ msgstr "Taula de continguts"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:817
+ msgid "Short Table of Contents"
+ msgstr "Taula breu de continguts"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:818
+ msgid "Footnotes"
+ msgstr "Notes a peu de p@`agina"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:1534
+ #, perl-brace-format
+ msgid "{explained_string} ({explanation})"
+ msgstr "{explained_string} ({explanation})"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3182
+ #, perl-brace-format
+ msgid "see section {reference_name}"
+ msgstr "vegeu secci@'o {reference_name}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3185
+ #, perl-brace-format
+ msgid "see {reference_name}"
+ msgstr "vegeu {reference_name}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3190
+ #, perl-brace-format
+ msgid "See section {reference_name}"
+ msgstr "Vegeu secci@'o {reference_name}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3193
+ #, perl-brace-format
+ msgid "See {reference_name}"
+ msgstr "Vegeu {reference_name}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3197
+ #, perl-brace-format
+ msgid "{reference_name}"
+ msgstr "{reference_name}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3259
+ #, perl-brace-format
+ msgid "see {reference} in @cite{{book}}"
+ msgstr "vegeu {reference} a @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3263
+ #, perl-brace-format
+ msgid "see @cite{{book_reference}}"
+ msgstr "vegeu @cite{{book_reference}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3267
+ #, perl-brace-format
+ msgid "see `{section}' in @cite{{book}}"
+ msgstr "vegeu `{section}' a @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3274
+ #, perl-brace-format
+ msgid "see {reference}"
+ msgstr "vegeu {reference}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3277
+ #, perl-brace-format
+ msgid "see `{section}'"
+ msgstr "vegeu `{section}'"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3282
+ #, perl-brace-format
+ msgid "See {reference} in @cite{{book}}"
+ msgstr "Vegeu {reference} a @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3286
+ #, perl-brace-format
+ msgid "See @cite{{book_reference}}"
+ msgstr "Vegeu @cite{{book_reference}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3290
+ #, perl-brace-format
+ msgid "See `{section}' in @cite{{book}}"
+ msgstr "Vegeu `{section}' a @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3297
+ #, perl-brace-format
+ msgid "See {reference}"
+ msgstr "Vegeu {reference}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3300
+ #, perl-brace-format
+ msgid "See `{section}'"
+ msgstr "Vegeu `{section}'"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3305
+ #, perl-brace-format
+ msgid "{reference} in @cite{{book}}"
+ msgstr "{reference} a @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3309
+ #, perl-brace-format
+ msgid "@cite{{book_reference}}"
+ msgstr "@cite{{book_reference}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3313
+ #, perl-brace-format
+ msgid "`{section}' in @cite{{book}}"
+ msgstr "`{section}' a @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3320
+ #, perl-brace-format
+ msgid "{reference}"
+ msgstr "{reference}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3323
+ #, perl-brace-format
+ msgid "`{section}'"
+ msgstr "`{section}'"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3436
+ msgid "Jump to"
+ msgstr "Salta a"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3444
+ msgid "Index Entry"
+ msgstr "Entrada d'@'@dotless{i}ndex"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3446
+ msgid "Section"
+ msgstr "Secci@'o"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4065
+ #, perl-brace-format
+ msgid "{category}: @strong{{name}} @emph{{arguments}}"
+ msgstr "{category}: @strong{{name}} @emph{{arguments}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4070
+ #, perl-brace-format
+ msgid "{category}: @strong{{name}}"
+ msgstr "{category}: @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4087
+ #, perl-brace-format
+ msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+ msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4091
+ #, perl-brace-format
+ msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+ msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4100
+ #, perl-brace-format
+ msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
+ msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4103
+ #, perl-brace-format
+ msgid "{category}: @emph{{type}} @strong{{name}}"
+ msgstr "{category}: @emph{{type}} @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4111
+ #, perl-brace-format
+ msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
+ msgstr "{category} de {class}: @strong{{name}} @emph{{arguments}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4117
+ #, perl-brace-format
+ msgid "{category} of {class}: @strong{{name}}"
+ msgstr "{category} de {class}: @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4126
+ #, perl-brace-format
+ msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
+ msgstr "{category} a {class}: @strong{{name}} @emph{{arguments}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4132
+ #, perl-brace-format
+ msgid "{category} on {class}: @strong{{name}}"
+ msgstr "{category} a {class}: @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4147
+ #, 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:4151
+ #, 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:4162
+ #, perl-brace-format
+ msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
+ msgstr "{category} a {class}:@* @emph{{type}}@* @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4166
+ #, perl-brace-format
+ msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
+ msgstr "{category} a {class}: @emph{{type}} @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4180
+ #, 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:4184
+ #, 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:4195
+ #, perl-brace-format
+ msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
+ msgstr "{category} de {class}:@* @emph{{type}}@* @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4199
+ #, perl-brace-format
+ msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
+ msgstr "{category} de {class}: @emph{{type}} @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6170
+ #, perl-brace-format
+ msgid ""
+ "This document was generated on @emph{@today{}} using "
+ "@uref{{program_homepage}, @emph{{program}}}."
+ msgstr ""
+ "Aquest document va ser generat el @emph{@today{}} usant "
+ "@uref{{program_homepage}, @emph{{program}}}."
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6175
+ msgid "This document was generated on @emph{@today{}}."
+ msgstr "Aquest document va ser generat el @emph{@today{}}."
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6214
+ #, perl-brace-format
+ msgid "{title}: {element_text}"
+ msgstr "{title}: {element_text}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6358
+ #, 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:6427
+ 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:6433
+ msgid "Button"
+ msgstr "Bot@'o"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6434
+ msgid "Name"
+ msgstr "Nom"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6435
+ msgid "Go to"
+ msgstr "Ves a"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6436
+ msgid "From 1.2.3 go to"
+ msgstr "Des de 1.2.3 ves a"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6462
+ 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 ""
+ "  on el @strong{ Exemple } suposa que la posici@'o actual est@`a a "
+ "@strong{ Subsubsecci@'o U-Dos-Tres } d'un document de l'estructura seg@"
+ "\"uent:"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6472
+ msgid "Section One"
+ msgstr "Secci@'o U"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6474
+ msgid "Subsection One-One"
+ msgstr "Subsecci@'o U-U"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6481
+ msgid "Subsection One-Two"
+ msgstr "Subsecci@'o U-Dos"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6483
+ msgid "Subsubsection One-Two-One"
+ msgstr "Subsubsecci@'o U-Dos_U"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6484
+ msgid "Subsubsection One-Two-Two"
+ msgstr "Subsubsecci@'o U-Dos-Dos"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6485
+ msgid "Subsubsection One-Two-Three"
+ msgstr "Subsubsecci@'o U-Dos-Tres"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6487
+ msgid "Current Position"
+ msgstr "Posici@'o actual"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6488
+ msgid "Subsubsection One-Two-Four"
+ msgstr "Subsubsecci@'o U-Dos-Quatre"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6491
+ msgid "Subsection One-Three"
+ msgstr "Subsecci@'o U-Tres"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6498
+ msgid "Subsection One-Four"
+ msgstr "Subsecci@'o U-Quatre"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6906
+ msgid "Untitled Document"
+ msgstr "Document sense t@'@dotless{i}tol"
Binary files texinfo-6.1/po_document/ca.us-ascii.gmo and texinfo-6.3/po_document/ca.us-ascii.gmo differ
diff -Nrc2 texinfo-6.1/po_document/ca.us-ascii.po texinfo-6.3/po_document/ca.us-ascii.po
*** texinfo-6.1/po_document/ca.us-ascii.po	2016-02-06 11:35:58.000000000 +0000
--- texinfo-6.3/po_document/ca.us-ascii.po	2016-09-10 12:46:00.000000000 +0100
***************
*** 8,12 ****
  "Project-Id-Version: texinfo_document 5.9.93\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
  "PO-Revision-Date: 2015-06-08 17:08+0200\n"
  "Last-Translator: Walter Garcia-Fontes <walter.garcia@upf.edu>\n"
--- 8,12 ----
  "Project-Id-Version: texinfo_document 5.9.93\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:46+0100\n"
  "PO-Revision-Date: 2015-06-08 17:08+0200\n"
  "Last-Translator: Walter Garcia-Fontes <walter.garcia@upf.edu>\n"
***************
*** 18,112 ****
  "Plural-Forms: nplurals=2; plural=n != 1;\n"
  
! #: tp/Texinfo/Common.pm:717 tp/Texinfo/Common.pm:722
  msgid "Function"
  msgstr "Funci@'o"
  
! #: tp/Texinfo/Common.pm:718
  msgid "Macro"
  msgstr "Macro"
  
! #: tp/Texinfo/Common.pm:719
  msgid "Special Form"
  msgstr "Forma especial"
  
! #: tp/Texinfo/Common.pm:720 tp/Texinfo/Common.pm:723
  msgid "Variable"
  msgstr "Variable"
  
! #: tp/Texinfo/Common.pm:721
  msgid "User Option"
  msgstr "Opci@'o d'usuari"
  
! #: tp/Texinfo/Common.pm:724 tp/Texinfo/Common.pm:725
  msgid "Instance Variable"
  msgstr "Variable d'inst@`ancia"
  
! #: tp/Texinfo/Common.pm:726 tp/Texinfo/Common.pm:727
  msgid "Method"
  msgstr "M@'etode"
  
! #: tp/Texinfo/Common.pm:1199
  #, perl-brace-format
  msgid "{category} on {class}"
  msgstr "{category} sobre {class}"
  
! #: tp/Texinfo/Common.pm:1206
  #, perl-brace-format
  msgid "{category} of {class}"
  msgstr "{category} de {class}"
  
! #: tp/Texinfo/Common.pm:1223
  #, perl-brace-format
  msgid "{month} {day}, {year}"
  msgstr "{day} {month}, {year}"
  
! #: tp/Texinfo/Common.pm:1254 tp/Texinfo/Convert/Plaintext.pm:1132
! #: tp/Texinfo/Convert/HTML.pm:515
  #, perl-brace-format
  msgid "Appendix {number} {section_title}"
  msgstr "Annex {number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1258 tp/Texinfo/Convert/Plaintext.pm:1137
! #: tp/Texinfo/Convert/HTML.pm:521
  #, perl-brace-format
  msgid "{number} {section_title}"
  msgstr "{number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1393
  #, perl-brace-format
  msgid "{float_type} {float_number}: "
  msgstr "{float_type} {float_number}: "
  
! #: tp/Texinfo/Common.pm:1397
  #, perl-brace-format
  msgid "{float_type}: "
  msgstr "{float_type}: "
  
! #: tp/Texinfo/Common.pm:1402
  #, perl-brace-format
  msgid "{float_type} {float_number}\n"
  msgstr "{float_type} {float_number}\n"
  
! #: tp/Texinfo/Common.pm:1406
  #, perl-brace-format
  msgid "{float_type}\n"
  msgstr "{float_type}\n"
  
! #: tp/Texinfo/Common.pm:1412
  #, perl-brace-format
  msgid "{float_number}: "
  msgstr "{float_number}: "
  
! #: tp/Texinfo/Common.pm:1415
  #, perl-brace-format
  msgid "{float_number}\n"
  msgstr "{float_number}\n"
  
! #: tp/Texinfo/Parser.pm:2982
  #, perl-brace-format
  msgid "{name} on {class}"
  msgstr "{name} a {class}"
  
! #: tp/Texinfo/Parser.pm:2991
  #, perl-brace-format
  msgid "{name} of {class}"
--- 18,112 ----
  "Plural-Forms: nplurals=2; plural=n != 1;\n"
  
! #: tp/Texinfo/Common.pm:697 tp/Texinfo/Common.pm:702
  msgid "Function"
  msgstr "Funci@'o"
  
! #: tp/Texinfo/Common.pm:698
  msgid "Macro"
  msgstr "Macro"
  
! #: tp/Texinfo/Common.pm:699
  msgid "Special Form"
  msgstr "Forma especial"
  
! #: tp/Texinfo/Common.pm:700 tp/Texinfo/Common.pm:703
  msgid "Variable"
  msgstr "Variable"
  
! #: tp/Texinfo/Common.pm:701
  msgid "User Option"
  msgstr "Opci@'o d'usuari"
  
! #: tp/Texinfo/Common.pm:704 tp/Texinfo/Common.pm:705
  msgid "Instance Variable"
  msgstr "Variable d'inst@`ancia"
  
! #: tp/Texinfo/Common.pm:706 tp/Texinfo/Common.pm:707
  msgid "Method"
  msgstr "M@'etode"
  
! #: tp/Texinfo/Common.pm:1186
  #, perl-brace-format
  msgid "{category} on {class}"
  msgstr "{category} sobre {class}"
  
! #: tp/Texinfo/Common.pm:1193
  #, perl-brace-format
  msgid "{category} of {class}"
  msgstr "{category} de {class}"
  
! #: tp/Texinfo/Common.pm:1210
  #, perl-brace-format
  msgid "{month} {day}, {year}"
  msgstr "{day} {month}, {year}"
  
! #: tp/Texinfo/Common.pm:1241 tp/Texinfo/Convert/Plaintext.pm:1133
! #: tp/Texinfo/Convert/HTML.pm:516
  #, perl-brace-format
  msgid "Appendix {number} {section_title}"
  msgstr "Annex {number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1245 tp/Texinfo/Convert/Plaintext.pm:1138
! #: tp/Texinfo/Convert/HTML.pm:522
  #, perl-brace-format
  msgid "{number} {section_title}"
  msgstr "{number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1499
  #, perl-brace-format
  msgid "{float_type} {float_number}: "
  msgstr "{float_type} {float_number}: "
  
! #: tp/Texinfo/Common.pm:1503
  #, perl-brace-format
  msgid "{float_type}: "
  msgstr "{float_type}: "
  
! #: tp/Texinfo/Common.pm:1508
  #, perl-brace-format
  msgid "{float_type} {float_number}\n"
  msgstr "{float_type} {float_number}\n"
  
! #: tp/Texinfo/Common.pm:1512
  #, perl-brace-format
  msgid "{float_type}\n"
  msgstr "{float_type}\n"
  
! #: tp/Texinfo/Common.pm:1518
  #, perl-brace-format
  msgid "{float_number}: "
  msgstr "{float_number}: "
  
! #: tp/Texinfo/Common.pm:1521
  #, perl-brace-format
  msgid "{float_number}\n"
  msgstr "{float_number}\n"
  
! #: tp/Texinfo/Parser.pm:2816
  #, perl-brace-format
  msgid "{name} on {class}"
  msgstr "{name} a {class}"
  
! #: tp/Texinfo/Parser.pm:2825
  #, perl-brace-format
  msgid "{name} of {class}"
***************
*** 117,179 ****
  msgstr "error@arrow{}"
  
! #: tp/Texinfo/Convert/Converter.pm:956
  msgid "January"
  msgstr "Gener"
  
! #: tp/Texinfo/Convert/Converter.pm:957
  msgid "February"
  msgstr "Febrer"
  
! #: tp/Texinfo/Convert/Converter.pm:958
  msgid "March"
  msgstr "Mar@,{c}"
  
! #: tp/Texinfo/Convert/Converter.pm:959
  msgid "April"
  msgstr "Abril"
  
! #: tp/Texinfo/Convert/Converter.pm:960
  msgid "May"
  msgstr "Maig"
  
! #: tp/Texinfo/Convert/Converter.pm:961
  msgid "June"
  msgstr "Juny"
  
! #: tp/Texinfo/Convert/Converter.pm:962
  msgid "July"
  msgstr "Juliol"
  
! #: tp/Texinfo/Convert/Converter.pm:963
  msgid "August"
  msgstr "Agost"
  
! #: tp/Texinfo/Convert/Converter.pm:964
  msgid "September"
  msgstr "Setembre"
  
! #: tp/Texinfo/Convert/Converter.pm:965
  msgid "October"
  msgstr "Octubre"
  
! #: tp/Texinfo/Convert/Converter.pm:966
  msgid "November"
  msgstr "Novembre"
  
! #: tp/Texinfo/Convert/Converter.pm:967
  msgid "December"
  msgstr "Desembre"
  
! #: tp/Texinfo/Convert/Converter.pm:1018
  #, perl-brace-format
  msgid "{float_type} {float_number}"
  msgstr "{float_type} {float_number}"
  
! #: tp/Texinfo/Convert/Converter.pm:1022
  #, perl-brace-format
  msgid "{float_type}"
  msgstr "{float_type}"
  
! #: tp/Texinfo/Convert/Converter.pm:1026
  #, perl-brace-format
  msgid "{float_number}"
--- 117,179 ----
  msgstr "error@arrow{}"
  
! #: tp/Texinfo/Convert/Converter.pm:948
  msgid "January"
  msgstr "Gener"
  
! #: tp/Texinfo/Convert/Converter.pm:949
  msgid "February"
  msgstr "Febrer"
  
! #: tp/Texinfo/Convert/Converter.pm:950
  msgid "March"
  msgstr "Mar@,{c}"
  
! #: tp/Texinfo/Convert/Converter.pm:951
  msgid "April"
  msgstr "Abril"
  
! #: tp/Texinfo/Convert/Converter.pm:952
  msgid "May"
  msgstr "Maig"
  
! #: tp/Texinfo/Convert/Converter.pm:953
  msgid "June"
  msgstr "Juny"
  
! #: tp/Texinfo/Convert/Converter.pm:954
  msgid "July"
  msgstr "Juliol"
  
! #: tp/Texinfo/Convert/Converter.pm:955
  msgid "August"
  msgstr "Agost"
  
! #: tp/Texinfo/Convert/Converter.pm:956
  msgid "September"
  msgstr "Setembre"
  
! #: tp/Texinfo/Convert/Converter.pm:957
  msgid "October"
  msgstr "Octubre"
  
! #: tp/Texinfo/Convert/Converter.pm:958
  msgid "November"
  msgstr "Novembre"
  
! #: tp/Texinfo/Convert/Converter.pm:959
  msgid "December"
  msgstr "Desembre"
  
! #: tp/Texinfo/Convert/Converter.pm:1010
  #, perl-brace-format
  msgid "{float_type} {float_number}"
  msgstr "{float_type} {float_number}"
  
! #: tp/Texinfo/Convert/Converter.pm:1014
  #, perl-brace-format
  msgid "{float_type}"
  msgstr "{float_type}"
  
! #: tp/Texinfo/Convert/Converter.pm:1018
  #, perl-brace-format
  msgid "{float_number}"
***************
*** 210,224 ****
  msgstr "vegeu secci@'o ``{section_name}'' a @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3291
  #, perl-brace-format
  msgid "@cite{{book}}"
  msgstr "@cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3268
  #, perl-brace-format
  msgid "See @cite{{book}}"
  msgstr "Vegeu @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3245
  #, perl-brace-format
  msgid "see @cite{{book}}"
--- 210,224 ----
  msgstr "vegeu secci@'o ``{section_name}'' a @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3317
  #, perl-brace-format
  msgid "@cite{{book}}"
  msgstr "@cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3294
  #, perl-brace-format
  msgid "See @cite{{book}}"
  msgstr "Vegeu @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3271
  #, perl-brace-format
  msgid "see @cite{{book}}"
***************
*** 240,764 ****
  msgstr "vegeu {title_ref}"
  
! #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2310
  #, perl-brace-format
  msgid "{abbr_or_acronym} ({explanation})"
  msgstr "{abbr_or_acronym} ({explanation})"
  
! #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2496
! #: tp/Texinfo/Convert/HTML.pm:3597
  #, perl-brace-format
  msgid "@b{{quotation_arg}:} "
  msgstr "@b{{quotation_arg}:} "
  
! #: tp/Texinfo/Convert/Plaintext.pm:1366
  msgid "(outside of any node)"
  msgstr "(fora de qualsevol node)"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2003
  #, perl-brace-format
  msgid "{name} @url{{email}}"
  msgstr "{name} @url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2006
  #, perl-brace-format
  msgid "@url{{email}}"
  msgstr "@url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2028
  #, perl-brace-format
  msgid "{text} ({url})"
  msgstr "{text} ({url})"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2033
  #, perl-brace-format
  msgid "@t{<{url}>}"
  msgstr "@t{<{url}>}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2421 tp/Texinfo/Convert/HTML.pm:1438
  #, perl-brace-format
  msgid "@{No value for `{value}'@}"
  msgstr "@{No hi ha cap valor per a `{value}'@}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2945
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name} {arguments}"
  msgstr "@tie{ }-- {category}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2950
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name}"
  msgstr "@tie{ }-- {category}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2963
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2966
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2975
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2978
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name}"
  msgstr "@tie{ }-- {category}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2986
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} de {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2992
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name}"
  msgstr "@tie{ }-- {category} de {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3001
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} a {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3007
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name}"
  msgstr "@tie{ }-- {category} a {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3022
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} a {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3026
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} a {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3037
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} a {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3041
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name}"
  msgstr "@tie{ }-- {category} a {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3055
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} de {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3059
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} de {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3070
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} de {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3074
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name}"
  msgstr "@tie{ }-- {category} de {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3403 tp/Texinfo/Convert/HTML.pm:2851
  #, perl-brace-format
  msgid "@center --- @emph{{author}}\n"
  msgstr "@center --- @emph{{author}}\n"
  
! #: tp/Texinfo/Convert/HTML.pm:732 tp/Texinfo/Convert/HTML.pm:788
  msgid "Top"
  msgstr "Amunt"
  
! #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
  msgid "Contents"
  msgstr "Continguts"
  
! #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
  msgid "Overview"
  msgstr "Panor@`amica"
  
! #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:766
! #: tp/Texinfo/Convert/HTML.pm:791
  msgid "Index"
  msgstr "@'Index"
  
! #: tp/Texinfo/Convert/HTML.pm:737
  msgid "current"
  msgstr "actual"
  
! #: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
  msgid "Prev"
  msgstr "Prev"
  
! #: tp/Texinfo/Convert/HTML.pm:741
  msgid " Up "
  msgstr " Amunt"
  
! #: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:746
! #: tp/Texinfo/Convert/HTML.pm:798
  msgid "Next"
  msgstr "Seg@\"uent"
  
! #: tp/Texinfo/Convert/HTML.pm:744 tp/Texinfo/Convert/HTML.pm:797
  msgid "Up"
  msgstr "Amunt"
  
! #: tp/Texinfo/Convert/HTML.pm:748
  msgid "Previous"
  msgstr "Previ"
  
! #: tp/Texinfo/Convert/HTML.pm:749
  msgid "Forward node"
  msgstr "Node cap endavant"
  
! #: tp/Texinfo/Convert/HTML.pm:750
  msgid "Back node"
  msgstr "Node cap endarrere"
  
! #: tp/Texinfo/Convert/HTML.pm:756
  msgid "Next file"
  msgstr "Fitxer seg@\"uent"
  
! #: tp/Texinfo/Convert/HTML.pm:757
  msgid "Previous file"
  msgstr "Fitxer previ"
  
! #: tp/Texinfo/Convert/HTML.pm:763
  msgid "Cover (top) of document"
  msgstr "Portada (part superior) del document"
  
! #: tp/Texinfo/Convert/HTML.pm:764
  msgid "Table of contents"
  msgstr "Taula de continguts"
  
! #: tp/Texinfo/Convert/HTML.pm:765
  msgid "Short table of contents"
  msgstr "Taula breu de continguts"
  
! #: tp/Texinfo/Convert/HTML.pm:767
  msgid "Current section"
  msgstr "Secci@'o actual"
  
! #: tp/Texinfo/Convert/HTML.pm:768
  msgid "Previous section in reading order"
  msgstr "Secci@'o pr@`evia a l'ordre de lectura"
  
! #: tp/Texinfo/Convert/HTML.pm:769
  msgid "Beginning of this chapter or previous chapter"
  msgstr "Inici del cap@'@dotless{i}tol actual o previ"
  
! #: tp/Texinfo/Convert/HTML.pm:770
  msgid "Previous section on same level"
  msgstr "Secci@'o pr@`evia al mateix nivell"
  
! #: tp/Texinfo/Convert/HTML.pm:771
  msgid "Up section"
  msgstr "Secci@'o amunt"
  
! #: tp/Texinfo/Convert/HTML.pm:772
  msgid "Next section on same level"
  msgstr "Secci@'o seg@\"uent al mateix nivell"
  
! #: tp/Texinfo/Convert/HTML.pm:773
  msgid "Up node"
  msgstr "Node amunt"
  
! #: tp/Texinfo/Convert/HTML.pm:774
  msgid "Next node"
  msgstr "Node seg@\"uent"
  
! #: tp/Texinfo/Convert/HTML.pm:775
  msgid "Previous node"
  msgstr "Node previ"
  
! #: tp/Texinfo/Convert/HTML.pm:776
  msgid "Next node in node reading order"
  msgstr "Node seg@\"uent a l'ordre de lectura de nodes"
  
! #: tp/Texinfo/Convert/HTML.pm:777
  msgid "Previous node in node reading order"
  msgstr "Node previ a l'ordre de lectura de nodes"
  
! #: tp/Texinfo/Convert/HTML.pm:778
  msgid "Next section in reading order"
  msgstr "Secci@'o seg@\"uent a l'ordre de lectura"
  
! #: tp/Texinfo/Convert/HTML.pm:779
  msgid "Next chapter"
  msgstr "Cap@'@dotless{i}tol seg@\"uent"
  
! #: tp/Texinfo/Convert/HTML.pm:780
  msgid "About (help)"
  msgstr "Quant a (ajuda)"
  
! #: tp/Texinfo/Convert/HTML.pm:781
  msgid "First section in reading order"
  msgstr "Primera secci@'o a l'ordre de lectura"
  
! #: tp/Texinfo/Convert/HTML.pm:782
  msgid "Last section in reading order"
  msgstr "@\"Ultima secci@'o a l'ordre de lectura"
  
! #: tp/Texinfo/Convert/HTML.pm:783
  msgid "Forward section in next file"
  msgstr "Secci@'o cap endavant al fitxer seg@\"uent"
  
! #: tp/Texinfo/Convert/HTML.pm:784
  msgid "Back section in previous file"
  msgstr "Secci@'o cap endarrere al fitxer previ"
  
! #: tp/Texinfo/Convert/HTML.pm:793
  msgid "This"
  msgstr "Aquest"
  
! #: tp/Texinfo/Convert/HTML.pm:794
  msgid "Back"
  msgstr "En darrere"
  
! #: tp/Texinfo/Convert/HTML.pm:795
  msgid "FastBack"
  msgstr "CapEnDarrereR@`apid"
  
! #: tp/Texinfo/Convert/HTML.pm:799
  msgid "NodeUp"
  msgstr "NodeAmunt"
  
! #: tp/Texinfo/Convert/HTML.pm:800
  msgid "NodeNext"
  msgstr "NodeSeg@\"uent"
  
! #: tp/Texinfo/Convert/HTML.pm:801
  msgid "NodePrev"
  msgstr "NodePrevi"
  
! #: tp/Texinfo/Convert/HTML.pm:802
  msgid "NodeForward"
  msgstr "NodeEnDavant"
  
! #: tp/Texinfo/Convert/HTML.pm:803
  msgid "NodeBack"
  msgstr "NodeEnDarrere"
  
! #: tp/Texinfo/Convert/HTML.pm:804
  msgid "Forward"
  msgstr "Endavant"
  
! #: tp/Texinfo/Convert/HTML.pm:805
  msgid "FastForward"
  msgstr "EndavantR@`apid"
  
! #: tp/Texinfo/Convert/HTML.pm:806
  msgid "About"
  msgstr "Quant a"
  
! #: tp/Texinfo/Convert/HTML.pm:807
  msgid "First"
  msgstr "Primer"
  
! #: tp/Texinfo/Convert/HTML.pm:808
  msgid "Last"
  msgstr "@'Ultim"
  
! #: tp/Texinfo/Convert/HTML.pm:809
  msgid "NextFile"
  msgstr "FitxerSeg@\"uent"
  
! #: tp/Texinfo/Convert/HTML.pm:810
  msgid "PrevFile"
  msgstr "FitxerPrevi"
  
! #: tp/Texinfo/Convert/HTML.pm:814
  msgid "About This Document"
  msgstr "Quan a aquest document"
  
! #: tp/Texinfo/Convert/HTML.pm:815
  msgid "Table of Contents"
  msgstr "Taula de continguts"
  
! #: tp/Texinfo/Convert/HTML.pm:816
  msgid "Short Table of Contents"
  msgstr "Taula breu de continguts"
  
! #: tp/Texinfo/Convert/HTML.pm:817
  msgid "Footnotes"
  msgstr "Notes a peu de p@`agina"
  
! #: tp/Texinfo/Convert/HTML.pm:1504
  #, perl-brace-format
  msgid "{explained_string} ({explanation})"
  msgstr "{explained_string} ({explanation})"
  
! #: tp/Texinfo/Convert/HTML.pm:3156
  #, perl-brace-format
  msgid "see section {reference_name}"
  msgstr "vegeu secci@'o {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3159
  #, perl-brace-format
  msgid "see {reference_name}"
  msgstr "vegeu {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3164
  #, perl-brace-format
  msgid "See section {reference_name}"
  msgstr "Vegeu secci@'o {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3167
  #, perl-brace-format
  msgid "See {reference_name}"
  msgstr "Vegeu {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3171
  #, perl-brace-format
  msgid "{reference_name}"
  msgstr "{reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3233
  #, perl-brace-format
  msgid "see {reference} in @cite{{book}}"
  msgstr "vegeu {reference} a @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3237
  #, perl-brace-format
  msgid "see @cite{{book_reference}}"
  msgstr "vegeu @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3241
  #, perl-brace-format
  msgid "see `{section}' in @cite{{book}}"
  msgstr "vegeu `{section}' a @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3248
  #, perl-brace-format
  msgid "see {reference}"
  msgstr "vegeu {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3251
  #, perl-brace-format
  msgid "see `{section}'"
  msgstr "vegeu `{section}'"
  
! #: tp/Texinfo/Convert/HTML.pm:3256
  #, perl-brace-format
  msgid "See {reference} in @cite{{book}}"
  msgstr "Vegeu {reference} a @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3260
  #, perl-brace-format
  msgid "See @cite{{book_reference}}"
  msgstr "Vegeu @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3264
  #, perl-brace-format
  msgid "See `{section}' in @cite{{book}}"
  msgstr "Vegeu `{section}' a @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3271
  #, perl-brace-format
  msgid "See {reference}"
  msgstr "Vegeu {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3274
  #, perl-brace-format
  msgid "See `{section}'"
  msgstr "Vegeu `{section}'"
  
! #: tp/Texinfo/Convert/HTML.pm:3279
  #, perl-brace-format
  msgid "{reference} in @cite{{book}}"
  msgstr "{reference} a @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3283
  #, perl-brace-format
  msgid "@cite{{book_reference}}"
  msgstr "@cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3287
  #, perl-brace-format
  msgid "`{section}' in @cite{{book}}"
  msgstr "`{section}' a @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3294
  #, perl-brace-format
  msgid "{reference}"
  msgstr "{reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3297
  #, perl-brace-format
  msgid "`{section}'"
  msgstr "`{section}'"
  
! #: tp/Texinfo/Convert/HTML.pm:3410
  msgid "Jump to"
  msgstr "Salta a"
  
! #: tp/Texinfo/Convert/HTML.pm:3418
  msgid "Index Entry"
  msgstr "Entrada d'@'@dotless{i}ndex"
  
! #: tp/Texinfo/Convert/HTML.pm:3420
  msgid "Section"
  msgstr "Secci@'o"
  
! #: tp/Texinfo/Convert/HTML.pm:4040
  #, perl-brace-format
  msgid "{category}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4045
  #, perl-brace-format
  msgid "{category}: @strong{{name}}"
  msgstr "{category}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4062
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4066
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4075
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4078
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4086
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} de {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4092
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}}"
  msgstr "{category} de {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4101
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} a {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4107
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}}"
  msgstr "{category} a {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4122
  #, perl-brace-format
  msgid ""
--- 240,764 ----
  msgstr "vegeu {title_ref}"
  
! #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2311
  #, perl-brace-format
  msgid "{abbr_or_acronym} ({explanation})"
  msgstr "{abbr_or_acronym} ({explanation})"
  
! #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2497
! #: tp/Texinfo/Convert/HTML.pm:3622
  #, perl-brace-format
  msgid "@b{{quotation_arg}:} "
  msgstr "@b{{quotation_arg}:} "
  
! #: tp/Texinfo/Convert/Plaintext.pm:1367
  msgid "(outside of any node)"
  msgstr "(fora de qualsevol node)"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2004
  #, perl-brace-format
  msgid "{name} @url{{email}}"
  msgstr "{name} @url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2007
  #, perl-brace-format
  msgid "@url{{email}}"
  msgstr "@url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2029
  #, perl-brace-format
  msgid "{text} ({url})"
  msgstr "{text} ({url})"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2034
  #, perl-brace-format
  msgid "@t{<{url}>}"
  msgstr "@t{<{url}>}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2422 tp/Texinfo/Convert/HTML.pm:1437
  #, perl-brace-format
  msgid "@{No value for `{value}'@}"
  msgstr "@{No hi ha cap valor per a `{value}'@}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2913
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name} {arguments}"
  msgstr "@tie{ }-- {category}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2918
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name}"
  msgstr "@tie{ }-- {category}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2931
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2934
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2943
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2946
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name}"
  msgstr "@tie{ }-- {category}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2954
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} de {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2960
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name}"
  msgstr "@tie{ }-- {category} de {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2969
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} a {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2975
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name}"
  msgstr "@tie{ }-- {category} a {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2990
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} a {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2994
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} a {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3005
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} a {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3009
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name}"
  msgstr "@tie{ }-- {category} a {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3023
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} de {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3027
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} de {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3038
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} de {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3042
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name}"
  msgstr "@tie{ }-- {category} de {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3371 tp/Texinfo/Convert/HTML.pm:2877
  #, perl-brace-format
  msgid "@center --- @emph{{author}}\n"
  msgstr "@center --- @emph{{author}}\n"
  
! #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
  msgid "Top"
  msgstr "Amunt"
  
! #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
  msgid "Contents"
  msgstr "Continguts"
  
! #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:791
  msgid "Overview"
  msgstr "Panor@`amica"
  
! #: tp/Texinfo/Convert/HTML.pm:736 tp/Texinfo/Convert/HTML.pm:767
! #: tp/Texinfo/Convert/HTML.pm:792
  msgid "Index"
  msgstr "@'Index"
  
! #: tp/Texinfo/Convert/HTML.pm:738
  msgid "current"
  msgstr "actual"
  
! #: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
  msgid "Prev"
  msgstr "Prev"
  
! #: tp/Texinfo/Convert/HTML.pm:742
  msgid " Up "
  msgstr " Amunt"
  
! #: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:747
! #: tp/Texinfo/Convert/HTML.pm:799
  msgid "Next"
  msgstr "Seg@\"uent"
  
! #: tp/Texinfo/Convert/HTML.pm:745 tp/Texinfo/Convert/HTML.pm:798
  msgid "Up"
  msgstr "Amunt"
  
! #: tp/Texinfo/Convert/HTML.pm:749
  msgid "Previous"
  msgstr "Previ"
  
! #: tp/Texinfo/Convert/HTML.pm:750
  msgid "Forward node"
  msgstr "Node cap endavant"
  
! #: tp/Texinfo/Convert/HTML.pm:751
  msgid "Back node"
  msgstr "Node cap endarrere"
  
! #: tp/Texinfo/Convert/HTML.pm:757
  msgid "Next file"
  msgstr "Fitxer seg@\"uent"
  
! #: tp/Texinfo/Convert/HTML.pm:758
  msgid "Previous file"
  msgstr "Fitxer previ"
  
! #: tp/Texinfo/Convert/HTML.pm:764
  msgid "Cover (top) of document"
  msgstr "Portada (part superior) del document"
  
! #: tp/Texinfo/Convert/HTML.pm:765
  msgid "Table of contents"
  msgstr "Taula de continguts"
  
! #: tp/Texinfo/Convert/HTML.pm:766
  msgid "Short table of contents"
  msgstr "Taula breu de continguts"
  
! #: tp/Texinfo/Convert/HTML.pm:768
  msgid "Current section"
  msgstr "Secci@'o actual"
  
! #: tp/Texinfo/Convert/HTML.pm:769
  msgid "Previous section in reading order"
  msgstr "Secci@'o pr@`evia a l'ordre de lectura"
  
! #: tp/Texinfo/Convert/HTML.pm:770
  msgid "Beginning of this chapter or previous chapter"
  msgstr "Inici del cap@'@dotless{i}tol actual o previ"
  
! #: tp/Texinfo/Convert/HTML.pm:771
  msgid "Previous section on same level"
  msgstr "Secci@'o pr@`evia al mateix nivell"
  
! #: tp/Texinfo/Convert/HTML.pm:772
  msgid "Up section"
  msgstr "Secci@'o amunt"
  
! #: tp/Texinfo/Convert/HTML.pm:773
  msgid "Next section on same level"
  msgstr "Secci@'o seg@\"uent al mateix nivell"
  
! #: tp/Texinfo/Convert/HTML.pm:774
  msgid "Up node"
  msgstr "Node amunt"
  
! #: tp/Texinfo/Convert/HTML.pm:775
  msgid "Next node"
  msgstr "Node seg@\"uent"
  
! #: tp/Texinfo/Convert/HTML.pm:776
  msgid "Previous node"
  msgstr "Node previ"
  
! #: tp/Texinfo/Convert/HTML.pm:777
  msgid "Next node in node reading order"
  msgstr "Node seg@\"uent a l'ordre de lectura de nodes"
  
! #: tp/Texinfo/Convert/HTML.pm:778
  msgid "Previous node in node reading order"
  msgstr "Node previ a l'ordre de lectura de nodes"
  
! #: tp/Texinfo/Convert/HTML.pm:779
  msgid "Next section in reading order"
  msgstr "Secci@'o seg@\"uent a l'ordre de lectura"
  
! #: tp/Texinfo/Convert/HTML.pm:780
  msgid "Next chapter"
  msgstr "Cap@'@dotless{i}tol seg@\"uent"
  
! #: tp/Texinfo/Convert/HTML.pm:781
  msgid "About (help)"
  msgstr "Quant a (ajuda)"
  
! #: tp/Texinfo/Convert/HTML.pm:782
  msgid "First section in reading order"
  msgstr "Primera secci@'o a l'ordre de lectura"
  
! #: tp/Texinfo/Convert/HTML.pm:783
  msgid "Last section in reading order"
  msgstr "@\"Ultima secci@'o a l'ordre de lectura"
  
! #: tp/Texinfo/Convert/HTML.pm:784
  msgid "Forward section in next file"
  msgstr "Secci@'o cap endavant al fitxer seg@\"uent"
  
! #: tp/Texinfo/Convert/HTML.pm:785
  msgid "Back section in previous file"
  msgstr "Secci@'o cap endarrere al fitxer previ"
  
! #: tp/Texinfo/Convert/HTML.pm:794
  msgid "This"
  msgstr "Aquest"
  
! #: tp/Texinfo/Convert/HTML.pm:795
  msgid "Back"
  msgstr "En darrere"
  
! #: tp/Texinfo/Convert/HTML.pm:796
  msgid "FastBack"
  msgstr "CapEnDarrereR@`apid"
  
! #: tp/Texinfo/Convert/HTML.pm:800
  msgid "NodeUp"
  msgstr "NodeAmunt"
  
! #: tp/Texinfo/Convert/HTML.pm:801
  msgid "NodeNext"
  msgstr "NodeSeg@\"uent"
  
! #: tp/Texinfo/Convert/HTML.pm:802
  msgid "NodePrev"
  msgstr "NodePrevi"
  
! #: tp/Texinfo/Convert/HTML.pm:803
  msgid "NodeForward"
  msgstr "NodeEnDavant"
  
! #: tp/Texinfo/Convert/HTML.pm:804
  msgid "NodeBack"
  msgstr "NodeEnDarrere"
  
! #: tp/Texinfo/Convert/HTML.pm:805
  msgid "Forward"
  msgstr "Endavant"
  
! #: tp/Texinfo/Convert/HTML.pm:806
  msgid "FastForward"
  msgstr "EndavantR@`apid"
  
! #: tp/Texinfo/Convert/HTML.pm:807
  msgid "About"
  msgstr "Quant a"
  
! #: tp/Texinfo/Convert/HTML.pm:808
  msgid "First"
  msgstr "Primer"
  
! #: tp/Texinfo/Convert/HTML.pm:809
  msgid "Last"
  msgstr "@'Ultim"
  
! #: tp/Texinfo/Convert/HTML.pm:810
  msgid "NextFile"
  msgstr "FitxerSeg@\"uent"
  
! #: tp/Texinfo/Convert/HTML.pm:811
  msgid "PrevFile"
  msgstr "FitxerPrevi"
  
! #: tp/Texinfo/Convert/HTML.pm:815
  msgid "About This Document"
  msgstr "Quan a aquest document"
  
! #: tp/Texinfo/Convert/HTML.pm:816
  msgid "Table of Contents"
  msgstr "Taula de continguts"
  
! #: tp/Texinfo/Convert/HTML.pm:817
  msgid "Short Table of Contents"
  msgstr "Taula breu de continguts"
  
! #: tp/Texinfo/Convert/HTML.pm:818
  msgid "Footnotes"
  msgstr "Notes a peu de p@`agina"
  
! #: tp/Texinfo/Convert/HTML.pm:1534
  #, perl-brace-format
  msgid "{explained_string} ({explanation})"
  msgstr "{explained_string} ({explanation})"
  
! #: tp/Texinfo/Convert/HTML.pm:3182
  #, perl-brace-format
  msgid "see section {reference_name}"
  msgstr "vegeu secci@'o {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3185
  #, perl-brace-format
  msgid "see {reference_name}"
  msgstr "vegeu {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3190
  #, perl-brace-format
  msgid "See section {reference_name}"
  msgstr "Vegeu secci@'o {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3193
  #, perl-brace-format
  msgid "See {reference_name}"
  msgstr "Vegeu {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3197
  #, perl-brace-format
  msgid "{reference_name}"
  msgstr "{reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3259
  #, perl-brace-format
  msgid "see {reference} in @cite{{book}}"
  msgstr "vegeu {reference} a @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3263
  #, perl-brace-format
  msgid "see @cite{{book_reference}}"
  msgstr "vegeu @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3267
  #, perl-brace-format
  msgid "see `{section}' in @cite{{book}}"
  msgstr "vegeu `{section}' a @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3274
  #, perl-brace-format
  msgid "see {reference}"
  msgstr "vegeu {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3277
  #, perl-brace-format
  msgid "see `{section}'"
  msgstr "vegeu `{section}'"
  
! #: tp/Texinfo/Convert/HTML.pm:3282
  #, perl-brace-format
  msgid "See {reference} in @cite{{book}}"
  msgstr "Vegeu {reference} a @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3286
  #, perl-brace-format
  msgid "See @cite{{book_reference}}"
  msgstr "Vegeu @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3290
  #, perl-brace-format
  msgid "See `{section}' in @cite{{book}}"
  msgstr "Vegeu `{section}' a @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3297
  #, perl-brace-format
  msgid "See {reference}"
  msgstr "Vegeu {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3300
  #, perl-brace-format
  msgid "See `{section}'"
  msgstr "Vegeu `{section}'"
  
! #: tp/Texinfo/Convert/HTML.pm:3305
  #, perl-brace-format
  msgid "{reference} in @cite{{book}}"
  msgstr "{reference} a @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3309
  #, perl-brace-format
  msgid "@cite{{book_reference}}"
  msgstr "@cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3313
  #, perl-brace-format
  msgid "`{section}' in @cite{{book}}"
  msgstr "`{section}' a @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3320
  #, perl-brace-format
  msgid "{reference}"
  msgstr "{reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3323
  #, perl-brace-format
  msgid "`{section}'"
  msgstr "`{section}'"
  
! #: tp/Texinfo/Convert/HTML.pm:3436
  msgid "Jump to"
  msgstr "Salta a"
  
! #: tp/Texinfo/Convert/HTML.pm:3444
  msgid "Index Entry"
  msgstr "Entrada d'@'@dotless{i}ndex"
  
! #: tp/Texinfo/Convert/HTML.pm:3446
  msgid "Section"
  msgstr "Secci@'o"
  
! #: tp/Texinfo/Convert/HTML.pm:4065
  #, perl-brace-format
  msgid "{category}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4070
  #, perl-brace-format
  msgid "{category}: @strong{{name}}"
  msgstr "{category}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4087
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4091
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4100
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4103
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4111
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} de {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4117
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}}"
  msgstr "{category} de {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4126
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} a {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4132
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}}"
  msgstr "{category} a {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4147
  #, perl-brace-format
  msgid ""
***************
*** 767,786 ****
  "{category} a {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4126
  #, 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:4137
  #, perl-brace-format
  msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} a {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4141
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} a {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4155
  #, perl-brace-format
  msgid ""
--- 767,786 ----
  "{category} a {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4151
  #, 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:4162
  #, perl-brace-format
  msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} a {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4166
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} a {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4180
  #, perl-brace-format
  msgid ""
***************
*** 789,793 ****
  "{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4159
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
--- 789,793 ----
  "{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4184
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
***************
*** 795,809 ****
  "{category} de {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4170
  #, perl-brace-format
  msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} de {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4174
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} de {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:6101
  #, perl-brace-format
  msgid ""
--- 795,809 ----
  "{category} de {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4195
  #, perl-brace-format
  msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} de {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4199
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} de {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:6170
  #, perl-brace-format
  msgid ""
***************
*** 814,852 ****
  "@uref{{program_homepage}, @emph{{program}}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6106
  msgid "This document was generated on @emph{@today{}}."
  msgstr "Aquest document va ser generat el @emph{@today{}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6145
  #, perl-brace-format
  msgid "{title}: {element_text}"
  msgstr "{title}: {element_text}"
  
! #: tp/Texinfo/Convert/HTML.pm:6289
  #, 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:6358
  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:6364
  msgid "Button"
  msgstr "Bot@'o"
  
! #: tp/Texinfo/Convert/HTML.pm:6365
  msgid "Name"
  msgstr "Nom"
  
! #: tp/Texinfo/Convert/HTML.pm:6366
  msgid "Go to"
  msgstr "Ves a"
  
! #: tp/Texinfo/Convert/HTML.pm:6367
  msgid "From 1.2.3 go to"
  msgstr "Des de 1.2.3 ves a"
  
! #: tp/Texinfo/Convert/HTML.pm:6393
  msgid ""
  "  where the @strong{ Example } assumes that the current position is at "
--- 814,852 ----
  "@uref{{program_homepage}, @emph{{program}}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6175
  msgid "This document was generated on @emph{@today{}}."
  msgstr "Aquest document va ser generat el @emph{@today{}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6214
  #, perl-brace-format
  msgid "{title}: {element_text}"
  msgstr "{title}: {element_text}"
  
! #: tp/Texinfo/Convert/HTML.pm:6358
  #, 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:6427
  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:6433
  msgid "Button"
  msgstr "Bot@'o"
  
! #: tp/Texinfo/Convert/HTML.pm:6434
  msgid "Name"
  msgstr "Nom"
  
! #: tp/Texinfo/Convert/HTML.pm:6435
  msgid "Go to"
  msgstr "Ves a"
  
! #: tp/Texinfo/Convert/HTML.pm:6436
  msgid "From 1.2.3 go to"
  msgstr "Des de 1.2.3 ves a"
  
! #: tp/Texinfo/Convert/HTML.pm:6462
  msgid ""
  "  where the @strong{ Example } assumes that the current position is at "
***************
*** 858,902 ****
  "\"uent:"
  
! #: tp/Texinfo/Convert/HTML.pm:6403
  msgid "Section One"
  msgstr "Secci@'o U"
  
! #: tp/Texinfo/Convert/HTML.pm:6405
  msgid "Subsection One-One"
  msgstr "Subsecci@'o U-U"
  
! #: tp/Texinfo/Convert/HTML.pm:6412
  msgid "Subsection One-Two"
  msgstr "Subsecci@'o U-Dos"
  
! #: tp/Texinfo/Convert/HTML.pm:6414
  msgid "Subsubsection One-Two-One"
  msgstr "Subsubsecci@'o U-Dos_U"
  
! #: tp/Texinfo/Convert/HTML.pm:6415
  msgid "Subsubsection One-Two-Two"
  msgstr "Subsubsecci@'o U-Dos-Dos"
  
! #: tp/Texinfo/Convert/HTML.pm:6416
  msgid "Subsubsection One-Two-Three"
  msgstr "Subsubsecci@'o U-Dos-Tres"
  
! #: tp/Texinfo/Convert/HTML.pm:6418
  msgid "Current Position"
  msgstr "Posici@'o actual"
  
! #: tp/Texinfo/Convert/HTML.pm:6419
  msgid "Subsubsection One-Two-Four"
  msgstr "Subsubsecci@'o U-Dos-Quatre"
  
! #: tp/Texinfo/Convert/HTML.pm:6422
  msgid "Subsection One-Three"
  msgstr "Subsecci@'o U-Tres"
  
! #: tp/Texinfo/Convert/HTML.pm:6429
  msgid "Subsection One-Four"
  msgstr "Subsecci@'o U-Quatre"
  
! #: tp/Texinfo/Convert/HTML.pm:6833
  msgid "Untitled Document"
  msgstr "Document sense t@'@dotless{i}tol"
--- 858,902 ----
  "\"uent:"
  
! #: tp/Texinfo/Convert/HTML.pm:6472
  msgid "Section One"
  msgstr "Secci@'o U"
  
! #: tp/Texinfo/Convert/HTML.pm:6474
  msgid "Subsection One-One"
  msgstr "Subsecci@'o U-U"
  
! #: tp/Texinfo/Convert/HTML.pm:6481
  msgid "Subsection One-Two"
  msgstr "Subsecci@'o U-Dos"
  
! #: tp/Texinfo/Convert/HTML.pm:6483
  msgid "Subsubsection One-Two-One"
  msgstr "Subsubsecci@'o U-Dos_U"
  
! #: tp/Texinfo/Convert/HTML.pm:6484
  msgid "Subsubsection One-Two-Two"
  msgstr "Subsubsecci@'o U-Dos-Dos"
  
! #: tp/Texinfo/Convert/HTML.pm:6485
  msgid "Subsubsection One-Two-Three"
  msgstr "Subsubsecci@'o U-Dos-Tres"
  
! #: tp/Texinfo/Convert/HTML.pm:6487
  msgid "Current Position"
  msgstr "Posici@'o actual"
  
! #: tp/Texinfo/Convert/HTML.pm:6488
  msgid "Subsubsection One-Two-Four"
  msgstr "Subsubsecci@'o U-Dos-Quatre"
  
! #: tp/Texinfo/Convert/HTML.pm:6491
  msgid "Subsection One-Three"
  msgstr "Subsecci@'o U-Tres"
  
! #: tp/Texinfo/Convert/HTML.pm:6498
  msgid "Subsection One-Four"
  msgstr "Subsecci@'o U-Quatre"
  
! #: tp/Texinfo/Convert/HTML.pm:6906
  msgid "Untitled Document"
  msgstr "Document sense t@'@dotless{i}tol"
Binary files texinfo-6.1/po_document/de.gmo and texinfo-6.3/po_document/de.gmo differ
diff -Nrc2 texinfo-6.1/po_document/de.po texinfo-6.3/po_document/de.po
*** texinfo-6.1/po_document/de.po	1970-01-01 01:00:00.000000000 +0100
--- texinfo-6.3/po_document/de.po	2016-09-10 12:46:00.000000000 +0100
***************
*** 0 ****
--- 1,958 ----
+ # German translations of resulting document strings.
+ # Copyright (C) 2008 Free Software Foundation, Inc.
+ # This file is distributed under the same license as the texinfo package.
+ # Reinhold Kainhofer <reinhold@kainhofer.com>, 2008.
+ # Mario BlÃ¤ttermann <mario.blaettermann@gmail.com>, 2014.
+ #
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: texinfo_document 5.0\n"
+ "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
+ "POT-Creation-Date: 2016-09-10 12:46+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"
+ "Language: de\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 1.5.4\n"
+ 
+ #: tp/Texinfo/Common.pm:697 tp/Texinfo/Common.pm:702
+ msgid "Function"
+ msgstr "Funktion"
+ 
+ #: tp/Texinfo/Common.pm:698
+ msgid "Macro"
+ msgstr "Makro"
+ 
+ #: tp/Texinfo/Common.pm:699
+ msgid "Special Form"
+ msgstr "Spezielle Form"
+ 
+ #: tp/Texinfo/Common.pm:700 tp/Texinfo/Common.pm:703
+ msgid "Variable"
+ msgstr "Variable"
+ 
+ #: tp/Texinfo/Common.pm:701
+ msgid "User Option"
+ msgstr "Benutzeroption"
+ 
+ #: tp/Texinfo/Common.pm:704 tp/Texinfo/Common.pm:705
+ msgid "Instance Variable"
+ msgstr "Instanzvariable"
+ 
+ #: tp/Texinfo/Common.pm:706 tp/Texinfo/Common.pm:707
+ msgid "Method"
+ msgstr "Method"
+ 
+ #: tp/Texinfo/Common.pm:1186
+ #, perl-brace-format
+ msgid "{category} on {class}"
+ msgstr "{category} in {class}"
+ 
+ #: tp/Texinfo/Common.pm:1193
+ #, perl-brace-format
+ msgid "{category} of {class}"
+ msgstr "{category} von {class}"
+ 
+ #: tp/Texinfo/Common.pm:1210
+ #, perl-brace-format
+ msgid "{month} {day}, {year}"
+ msgstr "{day}. {month} {year}"
+ 
+ #: tp/Texinfo/Common.pm:1241 tp/Texinfo/Convert/Plaintext.pm:1133
+ #: tp/Texinfo/Convert/HTML.pm:516
+ #, perl-brace-format
+ msgid "Appendix {number} {section_title}"
+ msgstr "Anhang {number} {section_title}"
+ 
+ #: tp/Texinfo/Common.pm:1245 tp/Texinfo/Convert/Plaintext.pm:1138
+ #: tp/Texinfo/Convert/HTML.pm:522
+ #, perl-brace-format
+ msgid "{number} {section_title}"
+ msgstr "{number} {section_title}"
+ 
+ #: tp/Texinfo/Common.pm:1499
+ #, perl-brace-format
+ msgid "{float_type} {float_number}: "
+ msgstr "{float_type} {float_number}: "
+ 
+ #: tp/Texinfo/Common.pm:1503
+ #, perl-brace-format
+ msgid "{float_type}: "
+ msgstr "{float_type}: "
+ 
+ #: tp/Texinfo/Common.pm:1508
+ #, perl-brace-format
+ msgid "{float_type} {float_number}\n"
+ msgstr "{float_type} {float_number}\n"
+ 
+ #: tp/Texinfo/Common.pm:1512
+ #, perl-brace-format
+ msgid "{float_type}\n"
+ msgstr "{float_type}\n"
+ 
+ #: tp/Texinfo/Common.pm:1518
+ #, perl-brace-format
+ msgid "{float_number}: "
+ msgstr "{float_number}: "
+ 
+ #: tp/Texinfo/Common.pm:1521
+ #, perl-brace-format
+ msgid "{float_number}\n"
+ msgstr "{float_number}\n"
+ 
+ #: tp/Texinfo/Parser.pm:2816
+ #, perl-brace-format
+ msgid "{name} on {class}"
+ msgstr "{name} in {class}"
+ 
+ #: tp/Texinfo/Parser.pm:2825
+ #, perl-brace-format
+ msgid "{name} of {class}"
+ msgstr "{name} von {class}"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:110
+ msgid "error@arrow{}"
+ msgstr "error@arrow{}"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:948
+ msgid "January"
+ msgstr "Januar"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:949
+ msgid "February"
+ msgstr "Februar"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:950
+ msgid "March"
+ msgstr "MÃ¤rz"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:951
+ msgid "April"
+ msgstr "April"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:952
+ msgid "May"
+ msgstr "Mai"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:953
+ msgid "June"
+ msgstr "Juni"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:954
+ msgid "July"
+ msgstr "Juli"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:955
+ msgid "August"
+ msgstr "August"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:956
+ msgid "September"
+ msgstr "September"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:957
+ msgid "October"
+ msgstr "Oktober"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:958
+ msgid "November"
+ msgstr "November"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:959
+ msgid "December"
+ msgstr "Dezember"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:1010
+ #, perl-brace-format
+ msgid "{float_type} {float_number}"
+ msgstr "{float_type} {float_number}"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:1014
+ #, perl-brace-format
+ msgid "{float_type}"
+ msgstr "{float_type}"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:1018
+ #, perl-brace-format
+ msgid "{float_number}"
+ msgstr "{float_number}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:826
+ #, 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:831
+ #, perl-brace-format
+ msgid "See node @samp{{mynode}}"
+ msgstr "Siehe Absatz @samp{{mynode}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:835
+ #, perl-brace-format
+ msgid "See Info file @file{{myfile}}"
+ msgstr "Siehe Info-Datei @file{{myfile}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:875
+ #, perl-brace-format
+ msgid "section ``{section_name}'' in @cite{{book}}"
+ msgstr "Abschnitt Â»{section_name}Â« in @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:880
+ #, perl-brace-format
+ msgid "See section ``{section_name}'' in @cite{{book}}"
+ msgstr "Siehe Abschnitt Â»{section_name}Â« in @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:885
+ #, perl-brace-format
+ msgid "see section ``{section_name}'' in @cite{{book}}"
+ msgstr "siehe Abschnitt Â»{section_name}Â« in @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3317
+ #, perl-brace-format
+ msgid "@cite{{book}}"
+ msgstr "@cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3294
+ #, perl-brace-format
+ msgid "See @cite{{book}}"
+ msgstr "Siehe @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3271
+ #, perl-brace-format
+ msgid "see @cite{{book}}"
+ msgstr "siehe @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:915
+ #, perl-brace-format
+ msgid "{title_ref}"
+ msgstr "{title_ref}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:920
+ #, perl-brace-format
+ msgid "See {title_ref}"
+ msgstr "Siehe {title_ref}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:925
+ #, perl-brace-format
+ msgid "see {title_ref}"
+ msgstr "siehe {title_ref}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2311
+ #, perl-brace-format
+ msgid "{abbr_or_acronym} ({explanation})"
+ msgstr "{abbr_or_acronym} ({explanation})"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2497
+ #: tp/Texinfo/Convert/HTML.pm:3622
+ #, perl-brace-format
+ msgid "@b{{quotation_arg}:} "
+ msgstr "@b{{quotation_arg}:} "
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:1367
+ msgid "(outside of any node)"
+ msgstr "(auÃŸerhalb aller AbsÃ¤tze)"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2004
+ #, perl-brace-format
+ msgid "{name} @url{{email}}"
+ msgstr "{name} @url{{email}}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2007
+ #, perl-brace-format
+ msgid "@url{{email}}"
+ msgstr "@url{{email}}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2029
+ #, perl-brace-format
+ msgid "{text} ({url})"
+ msgstr "{text} ({url})"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2034
+ #, perl-brace-format
+ msgid "@t{<{url}>}"
+ msgstr "@t{<{url}>}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2422 tp/Texinfo/Convert/HTML.pm:1437
+ #, perl-brace-format
+ msgid "@{No value for `{value}'@}"
+ msgstr "@{kein Wert fÃ¼r Â»{value}Â«@}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2913
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}: {name} {arguments}"
+ msgstr "@tie{ }-- {category}: {name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2918
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}: {name}"
+ msgstr "@tie{ }-- {category}: {name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2931
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
+ msgstr "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2934
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}: {type} {name} {arguments}"
+ msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2943
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}:@*{type}@*{name}"
+ msgstr "@tie{ }-- {category}:@*{type}@*{name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2946
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}: {type} {name}"
+ msgstr "@tie{ }-- {category}: {type} {name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2954
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
+ msgstr "@tie{ }-- {category} von {class}: {name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2960
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}: {name}"
+ msgstr "@tie{ }-- {category} von {class}: {name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2969
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
+ msgstr "@tie{ }-- {category} in {class}: {name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2975
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}: {name}"
+ msgstr "@tie{ }-- {category} in {class}: {name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2990
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
+ msgstr "@tie{ }-- {category} in {class}:@*{type}@*{name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2994
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
+ msgstr "@tie{ }-- {category} in {class}: {type} {name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3005
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
+ msgstr "@tie{ }-- {category} in {class}:@*{type}@*{name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3009
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}: {type} {name}"
+ msgstr "@tie{ }-- {category} in {class}: {type} {name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3023
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
+ msgstr "@tie{ }-- {category} von {class}:@*{type}@*{name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3027
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
+ msgstr "@tie{ }-- {category} von {class}: {type} {name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3038
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
+ msgstr "@tie{ }-- {category} von {class}:@*{type}@*{name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3042
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}: {type} {name}"
+ msgstr "@tie{ }-- {category} von {class}: {type} {name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3371 tp/Texinfo/Convert/HTML.pm:2877
+ #, perl-brace-format
+ msgid "@center --- @emph{{author}}\n"
+ msgstr "@center --- @emph{{author}}\n"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
+ msgid "Top"
+ msgstr "Anfang"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
+ msgid "Contents"
+ msgstr "Inhalt"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:791
+ msgid "Overview"
+ msgstr "Ãœbersicht"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:736 tp/Texinfo/Convert/HTML.pm:767
+ #: tp/Texinfo/Convert/HTML.pm:792
+ msgid "Index"
+ msgstr "Index"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:738
+ msgid "current"
+ msgstr "aktuell"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
+ msgid "Prev"
+ msgstr "Vorh."
+ 
+ #: tp/Texinfo/Convert/HTML.pm:742
+ msgid " Up "
+ msgstr " Nach oben "
+ 
+ #: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:747
+ #: tp/Texinfo/Convert/HTML.pm:799
+ msgid "Next"
+ msgstr "NÃ¤chste"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:745 tp/Texinfo/Convert/HTML.pm:798
+ msgid "Up"
+ msgstr "Nach oben"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:749
+ msgid "Previous"
+ msgstr "Vorige"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:750
+ msgid "Forward node"
+ msgstr "Absatz vor"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:751
+ msgid "Back node"
+ msgstr "Absatz zurÃ¼ck"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:757
+ msgid "Next file"
+ msgstr "NÃ¤chste Datei"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:758
+ msgid "Previous file"
+ msgstr "Vorige Datei"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:764
+ msgid "Cover (top) of document"
+ msgstr "Titelseite des Dokuments"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:765
+ msgid "Table of contents"
+ msgstr "Inhaltsverzeichnis"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:766
+ msgid "Short table of contents"
+ msgstr "Kurzes Inhaltsverzeichnis"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:768
+ msgid "Current section"
+ msgstr "Aktueller Abschnitt"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:769
+ msgid "Previous section in reading order"
+ msgstr "Voriger Abschnitt in Lesereihenfolge"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:770
+ msgid "Beginning of this chapter or previous chapter"
+ msgstr "Anfang dieses oder des letzten Kapitels"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:771
+ msgid "Previous section on same level"
+ msgstr "Voriger Abschnitt derselben Ebene"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:772
+ msgid "Up section"
+ msgstr "Abschnitt nach oben"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:773
+ msgid "Next section on same level"
+ msgstr "NÃ¤chster Abschitt derselben Ebene"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:774
+ msgid "Up node"
+ msgstr "Absatz nach oben"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:775
+ msgid "Next node"
+ msgstr "NÃ¤chster Absatz"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:776
+ msgid "Previous node"
+ msgstr "Voriger Absatz"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:777
+ msgid "Next node in node reading order"
+ msgstr "NÃ¤chster Absatz in Lesereihenfolge"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:778
+ msgid "Previous node in node reading order"
+ msgstr "Voriger Absatz in Lesereihenfolge"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:779
+ msgid "Next section in reading order"
+ msgstr "NÃ¤chster Abschnitt in Lesereihenfolge"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:780
+ msgid "Next chapter"
+ msgstr "NÃ¤chstes Kapitel"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:781
+ msgid "About (help)"
+ msgstr "Info (Hilfe)"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:782
+ msgid "First section in reading order"
+ msgstr "Erster Abschnitt in Lesereihenfolge"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:783
+ msgid "Last section in reading order"
+ msgstr "Letzter Abschnitt in Lesereihenfolge"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:784
+ msgid "Forward section in next file"
+ msgstr "Abschnitt vor in nÃ¤chster Datei"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:785
+ msgid "Back section in previous file"
+ msgstr "Abschnitt zurÃ¼ck in nÃ¤chster Datei"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:794
+ msgid "This"
+ msgstr "Diese"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:795
+ msgid "Back"
+ msgstr "ZurÃ¼ck"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:796
+ msgid "FastBack"
+ msgstr "SchnellrÃ¼cklauf"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:800
+ msgid "NodeUp"
+ msgstr "Absatz nach oben"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:801
+ msgid "NodeNext"
+ msgstr "NÃ¤chster Absatz"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:802
+ msgid "NodePrev"
+ msgstr "Voriger Absatz"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:803
+ msgid "NodeForward"
+ msgstr "Absatz vor"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:804
+ msgid "NodeBack"
+ msgstr "Absatz zurÃ¼ck"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:805
+ msgid "Forward"
+ msgstr "Vor"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:806
+ msgid "FastForward"
+ msgstr "Schnellvorlauf"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:807
+ msgid "About"
+ msgstr "Info"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:808
+ msgid "First"
+ msgstr "Erste"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:809
+ msgid "Last"
+ msgstr "Letzte"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:810
+ msgid "NextFile"
+ msgstr "NÃ¤chste Datei"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:811
+ msgid "PrevFile"
+ msgstr "Vorige Datei"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:815
+ msgid "About This Document"
+ msgstr "Info zu diesem Dokument"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:816
+ msgid "Table of Contents"
+ msgstr "Inhaltsverzeichnis"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:817
+ msgid "Short Table of Contents"
+ msgstr "Kurzes Inhaltsverzeichnis"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:818
+ msgid "Footnotes"
+ msgstr "FuÃŸnoten"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:1534
+ #, perl-brace-format
+ msgid "{explained_string} ({explanation})"
+ msgstr "{explained_string} ({explanation})"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3182
+ #, perl-brace-format
+ msgid "see section {reference_name}"
+ msgstr "siehe Abschnitt {reference_name}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3185
+ #, perl-brace-format
+ msgid "see {reference_name}"
+ msgstr "siehe {reference_name}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3190
+ #, perl-brace-format
+ msgid "See section {reference_name}"
+ msgstr "Siehe Abschnitt {reference_name}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3193
+ #, perl-brace-format
+ msgid "See {reference_name}"
+ msgstr "Siehe {reference_name}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3197
+ #, perl-brace-format
+ msgid "{reference_name}"
+ msgstr "{reference_name}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3259
+ #, perl-brace-format
+ msgid "see {reference} in @cite{{book}}"
+ msgstr "siehe {reference} in @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3263
+ #, perl-brace-format
+ msgid "see @cite{{book_reference}}"
+ msgstr "siehe @cite{{book_reference}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3267
+ #, perl-brace-format
+ msgid "see `{section}' in @cite{{book}}"
+ msgstr "siehe Â»{section}Â« in @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3274
+ #, perl-brace-format
+ msgid "see {reference}"
+ msgstr "siehe {reference}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3277
+ #, perl-brace-format
+ msgid "see `{section}'"
+ msgstr "siehe Â»{section}Â«"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3282
+ #, perl-brace-format
+ msgid "See {reference} in @cite{{book}}"
+ msgstr "Siehe {reference} in @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3286
+ #, perl-brace-format
+ msgid "See @cite{{book_reference}}"
+ msgstr "Siehe @cite{{book_reference}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3290
+ #, perl-brace-format
+ msgid "See `{section}' in @cite{{book}}"
+ msgstr "Siehe Â»{section}Â« in @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3297
+ #, perl-brace-format
+ msgid "See {reference}"
+ msgstr "Siehe {reference}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3300
+ #, perl-brace-format
+ msgid "See `{section}'"
+ msgstr "Siehe Â»{section}Â«"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3305
+ #, perl-brace-format
+ msgid "{reference} in @cite{{book}}"
+ msgstr "{reference} in @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3309
+ #, perl-brace-format
+ msgid "@cite{{book_reference}}"
+ msgstr "@cite{{book_reference}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3313
+ #, perl-brace-format
+ msgid "`{section}' in @cite{{book}}"
+ msgstr "Â»{section}Â« in @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3320
+ #, perl-brace-format
+ msgid "{reference}"
+ msgstr "{reference}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3323
+ #, perl-brace-format
+ msgid "`{section}'"
+ msgstr "Â»{section}Â«"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3436
+ msgid "Jump to"
+ msgstr "Springe zu"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3444
+ msgid "Index Entry"
+ msgstr "Indexeintrag"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3446
+ msgid "Section"
+ msgstr "Abschnitt"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4065
+ #, perl-brace-format
+ msgid "{category}: @strong{{name}} @emph{{arguments}}"
+ msgstr "{category}: @strong{{name}} @emph{{arguments}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4070
+ #, perl-brace-format
+ msgid "{category}: @strong{{name}}"
+ msgstr "{category}: @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4087
+ #, perl-brace-format
+ msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+ msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4091
+ #, perl-brace-format
+ msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+ msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4100
+ #, perl-brace-format
+ msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
+ msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4103
+ #, perl-brace-format
+ msgid "{category}: @emph{{type}} @strong{{name}}"
+ msgstr "{category}: @emph{{type}} @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4111
+ #, perl-brace-format
+ msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
+ msgstr "{category} von {class}: @strong{{name}} @emph{{arguments}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4117
+ #, perl-brace-format
+ msgid "{category} of {class}: @strong{{name}}"
+ msgstr "{category} von {class}: @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4126
+ #, perl-brace-format
+ msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
+ msgstr "{category} in {class}: @strong{{name}} @emph{{arguments}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4132
+ #, perl-brace-format
+ msgid "{category} on {class}: @strong{{name}}"
+ msgstr "{category} in {class}: @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4147
+ #, 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:4151
+ #, 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:4162
+ #, perl-brace-format
+ msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
+ msgstr "{category} in {class}:@* @emph{{type}}@* @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4166
+ #, perl-brace-format
+ msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
+ msgstr "{category} in {class}: @emph{{type}} @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4180
+ #, 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:4184
+ #, 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:4195
+ #, perl-brace-format
+ msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
+ msgstr "{category} von {class}:@* @emph{{type}}@* @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4199
+ #, perl-brace-format
+ msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
+ msgstr "{category} von {class}: @emph{{type}} @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6170
+ #, perl-brace-format
+ msgid ""
+ "This document was generated on @emph{@today{}} using "
+ "@uref{{program_homepage}, @emph{{program}}}."
+ msgstr ""
+ "Dieses Dokument wurde am @emph{@today{}} mittels @uref{{program_homepage}, "
+ "@emph{{program}}} erstellt."
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6175
+ msgid "This document was generated on @emph{@today{}}."
+ msgstr ""
+ "Dieses Dokument wurde mittels @uref{{program_homepage}, @emph{{program}}} "
+ "erstellt."
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6214
+ #, perl-brace-format
+ msgid "{title}: {element_text}"
+ msgstr "{title}: {element_text}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6358
+ #, 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:6427
+ 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:6433
+ msgid "Button"
+ msgstr "Knopf"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6434
+ msgid "Name"
+ msgstr "Name"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6435
+ msgid "Go to"
+ msgstr "Gehe zu"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6436
+ msgid "From 1.2.3 go to"
+ msgstr "Von 1.2.3 gehe zu"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6462
+ 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 ""
+ " wobei das @strong{ Beispiel } annimmt, dass die aktuelle Position bei "
+ "@strong{ Unterabschnitt 1-2-3 } in einem Dokument mit folgender Struktur "
+ "liegt:"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6472
+ msgid "Section One"
+ msgstr "Abschnitt 1"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6474
+ msgid "Subsection One-One"
+ msgstr "Unterabschnitt 1-1"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6481
+ msgid "Subsection One-Two"
+ msgstr "Unterabschnitt 1-2"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6483
+ msgid "Subsubsection One-Two-One"
+ msgstr "Unterabschnitt 1-2-1"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6484
+ msgid "Subsubsection One-Two-Two"
+ msgstr "Unterabschnitt 1-2-2"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6485
+ msgid "Subsubsection One-Two-Three"
+ msgstr "Unterabschnitt 1-2-3"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6487
+ msgid "Current Position"
+ msgstr "Aktuelle Position"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6488
+ msgid "Subsubsection One-Two-Four"
+ msgstr "Unterabschnitt 1-2-4"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6491
+ msgid "Subsection One-Three"
+ msgstr "Unterabschnitt 1-3"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6498
+ msgid "Subsection One-Four"
+ msgstr "Unterabschnitt 1-4"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6906
+ msgid "Untitled Document"
+ msgstr "Unbenanntes Dokument"
+ 
+ #, fuzzy
+ #~ msgid ""
+ #~ "This document was generated on @emph{{date}} using "
+ #~ "@uref{{program_homepage}, @emph{{program}}}."
+ #~ msgstr ""
+ #~ "Dieses Dokument wurde erzeugt am @i{{date}} durch "
+ #~ "@uref{{program_homepage}, @i{{program}}}."
+ 
+ #~ msgid "{style} {number}"
+ #~ msgstr "{style} {number}"
+ 
+ #~ msgid "{style}: {caption_first_line}"
+ #~ msgstr "{style}: {caption_first_line}"
+ 
+ #~ msgid "{style}: {shortcaption_first_line}"
+ #~ msgstr "{style}: {shortcaption_first_line}"
+ 
+ #~ msgid "on @emph{{date}}"
+ #~ msgstr "am @emph{{date}}"
+ 
+ #~ msgid "{acronym_like} ({explanation})"
+ #~ msgstr "{acronym_like} ({explanation})"
+ 
+ #~ msgid "Node up"
+ #~ msgstr "Knoten nach oben"
+ 
+ #~ msgid "Menu:"
+ #~ msgstr "Auswahl:"
+ 
+ #~ msgid "Node following in node reading order"
+ #~ msgstr "N@\"achster Abschnitt in Lesereihenfolge"
+ 
+ #~ msgid "Following node"
+ #~ msgstr "N@\"achster Knoten"
+ 
+ #~ msgid "see {node_file_href} section `{section}' in @cite{{book}}"
+ #~ msgstr "siehe {node_file_href} im Abschnitt `{section}' in @cite{{book}}"
+ 
+ #~ msgid "see {node_file_href}"
+ #~ msgstr "siehe {node_file_href}"
+ 
+ #~ msgid "See {node_file_href} section `{section}' in @cite{{book}}"
+ #~ msgstr "Siehe {node_file_href} in Abschnitt `{section}' in @cite{{book}}"
+ 
+ #~ msgid "See {node_file_href}"
+ #~ msgstr "Siehe {node_file_href}"
+ 
+ #~ msgid "{node_file_href} section `{section}' in @cite{{book}}"
+ #~ msgstr "{node_file_href} in Abschnitt `{section}' in @cite{{book}}"
Binary files texinfo-6.1/po_document/de.us-ascii.gmo and texinfo-6.3/po_document/de.us-ascii.gmo differ
diff -Nrc2 texinfo-6.1/po_document/de.us-ascii.po texinfo-6.3/po_document/de.us-ascii.po
*** texinfo-6.1/po_document/de.us-ascii.po	2016-02-06 11:35:58.000000000 +0000
--- texinfo-6.3/po_document/de.us-ascii.po	2016-09-10 12:46:00.000000000 +0100
***************
*** 9,13 ****
  "Project-Id-Version: texinfo_document 5.0\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
  "PO-Revision-Date: 2014-04-11 22:11+0100\n"
  "Last-Translator: Mario BlÃ¤ttermann <mario.blaettermann@gmail.com>\n"
--- 9,13 ----
  "Project-Id-Version: texinfo_document 5.0\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:46+0100\n"
  "PO-Revision-Date: 2014-04-11 22:11+0100\n"
  "Last-Translator: Mario BlÃ¤ttermann <mario.blaettermann@gmail.com>\n"
***************
*** 20,114 ****
  "X-Generator: Poedit 1.5.4\n"
  
! #: tp/Texinfo/Common.pm:717 tp/Texinfo/Common.pm:722
  msgid "Function"
  msgstr "Funktion"
  
! #: tp/Texinfo/Common.pm:718
  msgid "Macro"
  msgstr "Makro"
  
! #: tp/Texinfo/Common.pm:719
  msgid "Special Form"
  msgstr "Spezielle Form"
  
! #: tp/Texinfo/Common.pm:720 tp/Texinfo/Common.pm:723
  msgid "Variable"
  msgstr "Variable"
  
! #: tp/Texinfo/Common.pm:721
  msgid "User Option"
  msgstr "Benutzeroption"
  
! #: tp/Texinfo/Common.pm:724 tp/Texinfo/Common.pm:725
  msgid "Instance Variable"
  msgstr "Instanzvariable"
  
! #: tp/Texinfo/Common.pm:726 tp/Texinfo/Common.pm:727
  msgid "Method"
  msgstr "Method"
  
! #: tp/Texinfo/Common.pm:1199
  #, perl-brace-format
  msgid "{category} on {class}"
  msgstr "{category} in {class}"
  
! #: tp/Texinfo/Common.pm:1206
  #, perl-brace-format
  msgid "{category} of {class}"
  msgstr "{category} von {class}"
  
! #: tp/Texinfo/Common.pm:1223
  #, perl-brace-format
  msgid "{month} {day}, {year}"
  msgstr "{day}. {month} {year}"
  
! #: tp/Texinfo/Common.pm:1254 tp/Texinfo/Convert/Plaintext.pm:1132
! #: tp/Texinfo/Convert/HTML.pm:515
  #, perl-brace-format
  msgid "Appendix {number} {section_title}"
  msgstr "Anhang {number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1258 tp/Texinfo/Convert/Plaintext.pm:1137
! #: tp/Texinfo/Convert/HTML.pm:521
  #, perl-brace-format
  msgid "{number} {section_title}"
  msgstr "{number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1393
  #, perl-brace-format
  msgid "{float_type} {float_number}: "
  msgstr "{float_type} {float_number}: "
  
! #: tp/Texinfo/Common.pm:1397
  #, perl-brace-format
  msgid "{float_type}: "
  msgstr "{float_type}: "
  
! #: tp/Texinfo/Common.pm:1402
  #, perl-brace-format
  msgid "{float_type} {float_number}\n"
  msgstr "{float_type} {float_number}\n"
  
! #: tp/Texinfo/Common.pm:1406
  #, perl-brace-format
  msgid "{float_type}\n"
  msgstr "{float_type}\n"
  
! #: tp/Texinfo/Common.pm:1412
  #, perl-brace-format
  msgid "{float_number}: "
  msgstr "{float_number}: "
  
! #: tp/Texinfo/Common.pm:1415
  #, perl-brace-format
  msgid "{float_number}\n"
  msgstr "{float_number}\n"
  
! #: tp/Texinfo/Parser.pm:2982
  #, perl-brace-format
  msgid "{name} on {class}"
  msgstr "{name} in {class}"
  
! #: tp/Texinfo/Parser.pm:2991
  #, perl-brace-format
  msgid "{name} of {class}"
--- 20,114 ----
  "X-Generator: Poedit 1.5.4\n"
  
! #: tp/Texinfo/Common.pm:697 tp/Texinfo/Common.pm:702
  msgid "Function"
  msgstr "Funktion"
  
! #: tp/Texinfo/Common.pm:698
  msgid "Macro"
  msgstr "Makro"
  
! #: tp/Texinfo/Common.pm:699
  msgid "Special Form"
  msgstr "Spezielle Form"
  
! #: tp/Texinfo/Common.pm:700 tp/Texinfo/Common.pm:703
  msgid "Variable"
  msgstr "Variable"
  
! #: tp/Texinfo/Common.pm:701
  msgid "User Option"
  msgstr "Benutzeroption"
  
! #: tp/Texinfo/Common.pm:704 tp/Texinfo/Common.pm:705
  msgid "Instance Variable"
  msgstr "Instanzvariable"
  
! #: tp/Texinfo/Common.pm:706 tp/Texinfo/Common.pm:707
  msgid "Method"
  msgstr "Method"
  
! #: tp/Texinfo/Common.pm:1186
  #, perl-brace-format
  msgid "{category} on {class}"
  msgstr "{category} in {class}"
  
! #: tp/Texinfo/Common.pm:1193
  #, perl-brace-format
  msgid "{category} of {class}"
  msgstr "{category} von {class}"
  
! #: tp/Texinfo/Common.pm:1210
  #, perl-brace-format
  msgid "{month} {day}, {year}"
  msgstr "{day}. {month} {year}"
  
! #: tp/Texinfo/Common.pm:1241 tp/Texinfo/Convert/Plaintext.pm:1133
! #: tp/Texinfo/Convert/HTML.pm:516
  #, perl-brace-format
  msgid "Appendix {number} {section_title}"
  msgstr "Anhang {number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1245 tp/Texinfo/Convert/Plaintext.pm:1138
! #: tp/Texinfo/Convert/HTML.pm:522
  #, perl-brace-format
  msgid "{number} {section_title}"
  msgstr "{number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1499
  #, perl-brace-format
  msgid "{float_type} {float_number}: "
  msgstr "{float_type} {float_number}: "
  
! #: tp/Texinfo/Common.pm:1503
  #, perl-brace-format
  msgid "{float_type}: "
  msgstr "{float_type}: "
  
! #: tp/Texinfo/Common.pm:1508
  #, perl-brace-format
  msgid "{float_type} {float_number}\n"
  msgstr "{float_type} {float_number}\n"
  
! #: tp/Texinfo/Common.pm:1512
  #, perl-brace-format
  msgid "{float_type}\n"
  msgstr "{float_type}\n"
  
! #: tp/Texinfo/Common.pm:1518
  #, perl-brace-format
  msgid "{float_number}: "
  msgstr "{float_number}: "
  
! #: tp/Texinfo/Common.pm:1521
  #, perl-brace-format
  msgid "{float_number}\n"
  msgstr "{float_number}\n"
  
! #: tp/Texinfo/Parser.pm:2816
  #, perl-brace-format
  msgid "{name} on {class}"
  msgstr "{name} in {class}"
  
! #: tp/Texinfo/Parser.pm:2825
  #, perl-brace-format
  msgid "{name} of {class}"
***************
*** 119,181 ****
  msgstr "error@arrow{}"
  
! #: tp/Texinfo/Convert/Converter.pm:956
  msgid "January"
  msgstr "Januar"
  
! #: tp/Texinfo/Convert/Converter.pm:957
  msgid "February"
  msgstr "Februar"
  
! #: tp/Texinfo/Convert/Converter.pm:958
  msgid "March"
  msgstr "MÃ¤rz"
  
! #: tp/Texinfo/Convert/Converter.pm:959
  msgid "April"
  msgstr "April"
  
! #: tp/Texinfo/Convert/Converter.pm:960
  msgid "May"
  msgstr "Mai"
  
! #: tp/Texinfo/Convert/Converter.pm:961
  msgid "June"
  msgstr "Juni"
  
! #: tp/Texinfo/Convert/Converter.pm:962
  msgid "July"
  msgstr "Juli"
  
! #: tp/Texinfo/Convert/Converter.pm:963
  msgid "August"
  msgstr "August"
  
! #: tp/Texinfo/Convert/Converter.pm:964
  msgid "September"
  msgstr "September"
  
! #: tp/Texinfo/Convert/Converter.pm:965
  msgid "October"
  msgstr "Oktober"
  
! #: tp/Texinfo/Convert/Converter.pm:966
  msgid "November"
  msgstr "November"
  
! #: tp/Texinfo/Convert/Converter.pm:967
  msgid "December"
  msgstr "Dezember"
  
! #: tp/Texinfo/Convert/Converter.pm:1018
  #, perl-brace-format
  msgid "{float_type} {float_number}"
  msgstr "{float_type} {float_number}"
  
! #: tp/Texinfo/Convert/Converter.pm:1022
  #, perl-brace-format
  msgid "{float_type}"
  msgstr "{float_type}"
  
! #: tp/Texinfo/Convert/Converter.pm:1026
  #, perl-brace-format
  msgid "{float_number}"
--- 119,181 ----
  msgstr "error@arrow{}"
  
! #: tp/Texinfo/Convert/Converter.pm:948
  msgid "January"
  msgstr "Januar"
  
! #: tp/Texinfo/Convert/Converter.pm:949
  msgid "February"
  msgstr "Februar"
  
! #: tp/Texinfo/Convert/Converter.pm:950
  msgid "March"
  msgstr "MÃ¤rz"
  
! #: tp/Texinfo/Convert/Converter.pm:951
  msgid "April"
  msgstr "April"
  
! #: tp/Texinfo/Convert/Converter.pm:952
  msgid "May"
  msgstr "Mai"
  
! #: tp/Texinfo/Convert/Converter.pm:953
  msgid "June"
  msgstr "Juni"
  
! #: tp/Texinfo/Convert/Converter.pm:954
  msgid "July"
  msgstr "Juli"
  
! #: tp/Texinfo/Convert/Converter.pm:955
  msgid "August"
  msgstr "August"
  
! #: tp/Texinfo/Convert/Converter.pm:956
  msgid "September"
  msgstr "September"
  
! #: tp/Texinfo/Convert/Converter.pm:957
  msgid "October"
  msgstr "Oktober"
  
! #: tp/Texinfo/Convert/Converter.pm:958
  msgid "November"
  msgstr "November"
  
! #: tp/Texinfo/Convert/Converter.pm:959
  msgid "December"
  msgstr "Dezember"
  
! #: tp/Texinfo/Convert/Converter.pm:1010
  #, perl-brace-format
  msgid "{float_type} {float_number}"
  msgstr "{float_type} {float_number}"
  
! #: tp/Texinfo/Convert/Converter.pm:1014
  #, perl-brace-format
  msgid "{float_type}"
  msgstr "{float_type}"
  
! #: tp/Texinfo/Convert/Converter.pm:1018
  #, perl-brace-format
  msgid "{float_number}"
***************
*** 212,226 ****
  msgstr "siehe Abschnitt Â»{section_name}Â« in @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3291
  #, perl-brace-format
  msgid "@cite{{book}}"
  msgstr "@cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3268
  #, perl-brace-format
  msgid "See @cite{{book}}"
  msgstr "Siehe @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3245
  #, perl-brace-format
  msgid "see @cite{{book}}"
--- 212,226 ----
  msgstr "siehe Abschnitt Â»{section_name}Â« in @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3317
  #, perl-brace-format
  msgid "@cite{{book}}"
  msgstr "@cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3294
  #, perl-brace-format
  msgid "See @cite{{book}}"
  msgstr "Siehe @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3271
  #, perl-brace-format
  msgid "see @cite{{book}}"
***************
*** 242,766 ****
  msgstr "siehe {title_ref}"
  
! #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2310
  #, perl-brace-format
  msgid "{abbr_or_acronym} ({explanation})"
  msgstr "{abbr_or_acronym} ({explanation})"
  
! #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2496
! #: tp/Texinfo/Convert/HTML.pm:3597
  #, perl-brace-format
  msgid "@b{{quotation_arg}:} "
  msgstr "@b{{quotation_arg}:} "
  
! #: tp/Texinfo/Convert/Plaintext.pm:1366
  msgid "(outside of any node)"
  msgstr "(auÃŸerhalb aller AbsÃ¤tze)"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2003
  #, perl-brace-format
  msgid "{name} @url{{email}}"
  msgstr "{name} @url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2006
  #, perl-brace-format
  msgid "@url{{email}}"
  msgstr "@url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2028
  #, perl-brace-format
  msgid "{text} ({url})"
  msgstr "{text} ({url})"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2033
  #, perl-brace-format
  msgid "@t{<{url}>}"
  msgstr "@t{<{url}>}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2421 tp/Texinfo/Convert/HTML.pm:1438
  #, perl-brace-format
  msgid "@{No value for `{value}'@}"
  msgstr "@{kein Wert fÃ¼r Â»{value}Â«@}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2945
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name} {arguments}"
  msgstr "@tie{ }-- {category}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2950
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name}"
  msgstr "@tie{ }-- {category}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2963
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2966
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2975
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2978
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name}"
  msgstr "@tie{ }-- {category}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2986
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} von {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2992
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name}"
  msgstr "@tie{ }-- {category} von {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3001
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} in {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3007
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name}"
  msgstr "@tie{ }-- {category} in {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3022
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} in {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3026
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} in {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3037
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} in {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3041
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name}"
  msgstr "@tie{ }-- {category} in {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3055
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} von {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3059
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} von {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3070
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} von {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3074
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name}"
  msgstr "@tie{ }-- {category} von {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3403 tp/Texinfo/Convert/HTML.pm:2851
  #, perl-brace-format
  msgid "@center --- @emph{{author}}\n"
  msgstr "@center --- @emph{{author}}\n"
  
! #: tp/Texinfo/Convert/HTML.pm:732 tp/Texinfo/Convert/HTML.pm:788
  msgid "Top"
  msgstr "Anfang"
  
! #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
  msgid "Contents"
  msgstr "Inhalt"
  
! #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
  msgid "Overview"
  msgstr "Ãœbersicht"
  
! #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:766
! #: tp/Texinfo/Convert/HTML.pm:791
  msgid "Index"
  msgstr "Index"
  
! #: tp/Texinfo/Convert/HTML.pm:737
  msgid "current"
  msgstr "aktuell"
  
! #: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
  msgid "Prev"
  msgstr "Vorh."
  
! #: tp/Texinfo/Convert/HTML.pm:741
  msgid " Up "
  msgstr " Nach oben "
  
! #: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:746
! #: tp/Texinfo/Convert/HTML.pm:798
  msgid "Next"
  msgstr "NÃ¤chste"
  
! #: tp/Texinfo/Convert/HTML.pm:744 tp/Texinfo/Convert/HTML.pm:797
  msgid "Up"
  msgstr "Nach oben"
  
! #: tp/Texinfo/Convert/HTML.pm:748
  msgid "Previous"
  msgstr "Vorige"
  
! #: tp/Texinfo/Convert/HTML.pm:749
  msgid "Forward node"
  msgstr "Absatz vor"
  
! #: tp/Texinfo/Convert/HTML.pm:750
  msgid "Back node"
  msgstr "Absatz zurÃ¼ck"
  
! #: tp/Texinfo/Convert/HTML.pm:756
  msgid "Next file"
  msgstr "NÃ¤chste Datei"
  
! #: tp/Texinfo/Convert/HTML.pm:757
  msgid "Previous file"
  msgstr "Vorige Datei"
  
! #: tp/Texinfo/Convert/HTML.pm:763
  msgid "Cover (top) of document"
  msgstr "Titelseite des Dokuments"
  
! #: tp/Texinfo/Convert/HTML.pm:764
  msgid "Table of contents"
  msgstr "Inhaltsverzeichnis"
  
! #: tp/Texinfo/Convert/HTML.pm:765
  msgid "Short table of contents"
  msgstr "Kurzes Inhaltsverzeichnis"
  
! #: tp/Texinfo/Convert/HTML.pm:767
  msgid "Current section"
  msgstr "Aktueller Abschnitt"
  
! #: tp/Texinfo/Convert/HTML.pm:768
  msgid "Previous section in reading order"
  msgstr "Voriger Abschnitt in Lesereihenfolge"
  
! #: tp/Texinfo/Convert/HTML.pm:769
  msgid "Beginning of this chapter or previous chapter"
  msgstr "Anfang dieses oder des letzten Kapitels"
  
! #: tp/Texinfo/Convert/HTML.pm:770
  msgid "Previous section on same level"
  msgstr "Voriger Abschnitt derselben Ebene"
  
! #: tp/Texinfo/Convert/HTML.pm:771
  msgid "Up section"
  msgstr "Abschnitt nach oben"
  
! #: tp/Texinfo/Convert/HTML.pm:772
  msgid "Next section on same level"
  msgstr "NÃ¤chster Abschitt derselben Ebene"
  
! #: tp/Texinfo/Convert/HTML.pm:773
  msgid "Up node"
  msgstr "Absatz nach oben"
  
! #: tp/Texinfo/Convert/HTML.pm:774
  msgid "Next node"
  msgstr "NÃ¤chster Absatz"
  
! #: tp/Texinfo/Convert/HTML.pm:775
  msgid "Previous node"
  msgstr "Voriger Absatz"
  
! #: tp/Texinfo/Convert/HTML.pm:776
  msgid "Next node in node reading order"
  msgstr "NÃ¤chster Absatz in Lesereihenfolge"
  
! #: tp/Texinfo/Convert/HTML.pm:777
  msgid "Previous node in node reading order"
  msgstr "Voriger Absatz in Lesereihenfolge"
  
! #: tp/Texinfo/Convert/HTML.pm:778
  msgid "Next section in reading order"
  msgstr "NÃ¤chster Abschnitt in Lesereihenfolge"
  
! #: tp/Texinfo/Convert/HTML.pm:779
  msgid "Next chapter"
  msgstr "NÃ¤chstes Kapitel"
  
! #: tp/Texinfo/Convert/HTML.pm:780
  msgid "About (help)"
  msgstr "Info (Hilfe)"
  
! #: tp/Texinfo/Convert/HTML.pm:781
  msgid "First section in reading order"
  msgstr "Erster Abschnitt in Lesereihenfolge"
  
! #: tp/Texinfo/Convert/HTML.pm:782
  msgid "Last section in reading order"
  msgstr "Letzter Abschnitt in Lesereihenfolge"
  
! #: tp/Texinfo/Convert/HTML.pm:783
  msgid "Forward section in next file"
  msgstr "Abschnitt vor in nÃ¤chster Datei"
  
! #: tp/Texinfo/Convert/HTML.pm:784
  msgid "Back section in previous file"
  msgstr "Abschnitt zurÃ¼ck in nÃ¤chster Datei"
  
! #: tp/Texinfo/Convert/HTML.pm:793
  msgid "This"
  msgstr "Diese"
  
! #: tp/Texinfo/Convert/HTML.pm:794
  msgid "Back"
  msgstr "ZurÃ¼ck"
  
! #: tp/Texinfo/Convert/HTML.pm:795
  msgid "FastBack"
  msgstr "SchnellrÃ¼cklauf"
  
! #: tp/Texinfo/Convert/HTML.pm:799
  msgid "NodeUp"
  msgstr "Absatz nach oben"
  
! #: tp/Texinfo/Convert/HTML.pm:800
  msgid "NodeNext"
  msgstr "NÃ¤chster Absatz"
  
! #: tp/Texinfo/Convert/HTML.pm:801
  msgid "NodePrev"
  msgstr "Voriger Absatz"
  
! #: tp/Texinfo/Convert/HTML.pm:802
  msgid "NodeForward"
  msgstr "Absatz vor"
  
! #: tp/Texinfo/Convert/HTML.pm:803
  msgid "NodeBack"
  msgstr "Absatz zurÃ¼ck"
  
! #: tp/Texinfo/Convert/HTML.pm:804
  msgid "Forward"
  msgstr "Vor"
  
! #: tp/Texinfo/Convert/HTML.pm:805
  msgid "FastForward"
  msgstr "Schnellvorlauf"
  
! #: tp/Texinfo/Convert/HTML.pm:806
  msgid "About"
  msgstr "Info"
  
! #: tp/Texinfo/Convert/HTML.pm:807
  msgid "First"
  msgstr "Erste"
  
! #: tp/Texinfo/Convert/HTML.pm:808
  msgid "Last"
  msgstr "Letzte"
  
! #: tp/Texinfo/Convert/HTML.pm:809
  msgid "NextFile"
  msgstr "NÃ¤chste Datei"
  
! #: tp/Texinfo/Convert/HTML.pm:810
  msgid "PrevFile"
  msgstr "Vorige Datei"
  
! #: tp/Texinfo/Convert/HTML.pm:814
  msgid "About This Document"
  msgstr "Info zu diesem Dokument"
  
! #: tp/Texinfo/Convert/HTML.pm:815
  msgid "Table of Contents"
  msgstr "Inhaltsverzeichnis"
  
! #: tp/Texinfo/Convert/HTML.pm:816
  msgid "Short Table of Contents"
  msgstr "Kurzes Inhaltsverzeichnis"
  
! #: tp/Texinfo/Convert/HTML.pm:817
  msgid "Footnotes"
  msgstr "FuÃŸnoten"
  
! #: tp/Texinfo/Convert/HTML.pm:1504
  #, perl-brace-format
  msgid "{explained_string} ({explanation})"
  msgstr "{explained_string} ({explanation})"
  
! #: tp/Texinfo/Convert/HTML.pm:3156
  #, perl-brace-format
  msgid "see section {reference_name}"
  msgstr "siehe Abschnitt {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3159
  #, perl-brace-format
  msgid "see {reference_name}"
  msgstr "siehe {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3164
  #, perl-brace-format
  msgid "See section {reference_name}"
  msgstr "Siehe Abschnitt {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3167
  #, perl-brace-format
  msgid "See {reference_name}"
  msgstr "Siehe {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3171
  #, perl-brace-format
  msgid "{reference_name}"
  msgstr "{reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3233
  #, perl-brace-format
  msgid "see {reference} in @cite{{book}}"
  msgstr "siehe {reference} in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3237
  #, perl-brace-format
  msgid "see @cite{{book_reference}}"
  msgstr "siehe @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3241
  #, perl-brace-format
  msgid "see `{section}' in @cite{{book}}"
  msgstr "siehe Â»{section}Â« in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3248
  #, perl-brace-format
  msgid "see {reference}"
  msgstr "siehe {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3251
  #, perl-brace-format
  msgid "see `{section}'"
  msgstr "siehe Â»{section}Â«"
  
! #: tp/Texinfo/Convert/HTML.pm:3256
  #, perl-brace-format
  msgid "See {reference} in @cite{{book}}"
  msgstr "Siehe {reference} in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3260
  #, perl-brace-format
  msgid "See @cite{{book_reference}}"
  msgstr "Siehe @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3264
  #, perl-brace-format
  msgid "See `{section}' in @cite{{book}}"
  msgstr "Siehe Â»{section}Â« in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3271
  #, perl-brace-format
  msgid "See {reference}"
  msgstr "Siehe {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3274
  #, perl-brace-format
  msgid "See `{section}'"
  msgstr "Siehe Â»{section}Â«"
  
! #: tp/Texinfo/Convert/HTML.pm:3279
  #, perl-brace-format
  msgid "{reference} in @cite{{book}}"
  msgstr "{reference} in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3283
  #, perl-brace-format
  msgid "@cite{{book_reference}}"
  msgstr "@cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3287
  #, perl-brace-format
  msgid "`{section}' in @cite{{book}}"
  msgstr "Â»{section}Â« in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3294
  #, perl-brace-format
  msgid "{reference}"
  msgstr "{reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3297
  #, perl-brace-format
  msgid "`{section}'"
  msgstr "Â»{section}Â«"
  
! #: tp/Texinfo/Convert/HTML.pm:3410
  msgid "Jump to"
  msgstr "Springe zu"
  
! #: tp/Texinfo/Convert/HTML.pm:3418
  msgid "Index Entry"
  msgstr "Indexeintrag"
  
! #: tp/Texinfo/Convert/HTML.pm:3420
  msgid "Section"
  msgstr "Abschnitt"
  
! #: tp/Texinfo/Convert/HTML.pm:4040
  #, perl-brace-format
  msgid "{category}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4045
  #, perl-brace-format
  msgid "{category}: @strong{{name}}"
  msgstr "{category}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4062
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4066
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4075
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4078
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4086
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} von {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4092
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}}"
  msgstr "{category} von {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4101
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} in {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4107
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}}"
  msgstr "{category} in {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4122
  #, perl-brace-format
  msgid ""
--- 242,766 ----
  msgstr "siehe {title_ref}"
  
! #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2311
  #, perl-brace-format
  msgid "{abbr_or_acronym} ({explanation})"
  msgstr "{abbr_or_acronym} ({explanation})"
  
! #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2497
! #: tp/Texinfo/Convert/HTML.pm:3622
  #, perl-brace-format
  msgid "@b{{quotation_arg}:} "
  msgstr "@b{{quotation_arg}:} "
  
! #: tp/Texinfo/Convert/Plaintext.pm:1367
  msgid "(outside of any node)"
  msgstr "(auÃŸerhalb aller AbsÃ¤tze)"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2004
  #, perl-brace-format
  msgid "{name} @url{{email}}"
  msgstr "{name} @url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2007
  #, perl-brace-format
  msgid "@url{{email}}"
  msgstr "@url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2029
  #, perl-brace-format
  msgid "{text} ({url})"
  msgstr "{text} ({url})"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2034
  #, perl-brace-format
  msgid "@t{<{url}>}"
  msgstr "@t{<{url}>}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2422 tp/Texinfo/Convert/HTML.pm:1437
  #, perl-brace-format
  msgid "@{No value for `{value}'@}"
  msgstr "@{kein Wert fÃ¼r Â»{value}Â«@}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2913
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name} {arguments}"
  msgstr "@tie{ }-- {category}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2918
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name}"
  msgstr "@tie{ }-- {category}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2931
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2934
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2943
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2946
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name}"
  msgstr "@tie{ }-- {category}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2954
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} von {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2960
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name}"
  msgstr "@tie{ }-- {category} von {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2969
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} in {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2975
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name}"
  msgstr "@tie{ }-- {category} in {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2990
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} in {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2994
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} in {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3005
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} in {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3009
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name}"
  msgstr "@tie{ }-- {category} in {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3023
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} von {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3027
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} von {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3038
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} von {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3042
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name}"
  msgstr "@tie{ }-- {category} von {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3371 tp/Texinfo/Convert/HTML.pm:2877
  #, perl-brace-format
  msgid "@center --- @emph{{author}}\n"
  msgstr "@center --- @emph{{author}}\n"
  
! #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
  msgid "Top"
  msgstr "Anfang"
  
! #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
  msgid "Contents"
  msgstr "Inhalt"
  
! #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:791
  msgid "Overview"
  msgstr "Ãœbersicht"
  
! #: tp/Texinfo/Convert/HTML.pm:736 tp/Texinfo/Convert/HTML.pm:767
! #: tp/Texinfo/Convert/HTML.pm:792
  msgid "Index"
  msgstr "Index"
  
! #: tp/Texinfo/Convert/HTML.pm:738
  msgid "current"
  msgstr "aktuell"
  
! #: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
  msgid "Prev"
  msgstr "Vorh."
  
! #: tp/Texinfo/Convert/HTML.pm:742
  msgid " Up "
  msgstr " Nach oben "
  
! #: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:747
! #: tp/Texinfo/Convert/HTML.pm:799
  msgid "Next"
  msgstr "NÃ¤chste"
  
! #: tp/Texinfo/Convert/HTML.pm:745 tp/Texinfo/Convert/HTML.pm:798
  msgid "Up"
  msgstr "Nach oben"
  
! #: tp/Texinfo/Convert/HTML.pm:749
  msgid "Previous"
  msgstr "Vorige"
  
! #: tp/Texinfo/Convert/HTML.pm:750
  msgid "Forward node"
  msgstr "Absatz vor"
  
! #: tp/Texinfo/Convert/HTML.pm:751
  msgid "Back node"
  msgstr "Absatz zurÃ¼ck"
  
! #: tp/Texinfo/Convert/HTML.pm:757
  msgid "Next file"
  msgstr "NÃ¤chste Datei"
  
! #: tp/Texinfo/Convert/HTML.pm:758
  msgid "Previous file"
  msgstr "Vorige Datei"
  
! #: tp/Texinfo/Convert/HTML.pm:764
  msgid "Cover (top) of document"
  msgstr "Titelseite des Dokuments"
  
! #: tp/Texinfo/Convert/HTML.pm:765
  msgid "Table of contents"
  msgstr "Inhaltsverzeichnis"
  
! #: tp/Texinfo/Convert/HTML.pm:766
  msgid "Short table of contents"
  msgstr "Kurzes Inhaltsverzeichnis"
  
! #: tp/Texinfo/Convert/HTML.pm:768
  msgid "Current section"
  msgstr "Aktueller Abschnitt"
  
! #: tp/Texinfo/Convert/HTML.pm:769
  msgid "Previous section in reading order"
  msgstr "Voriger Abschnitt in Lesereihenfolge"
  
! #: tp/Texinfo/Convert/HTML.pm:770
  msgid "Beginning of this chapter or previous chapter"
  msgstr "Anfang dieses oder des letzten Kapitels"
  
! #: tp/Texinfo/Convert/HTML.pm:771
  msgid "Previous section on same level"
  msgstr "Voriger Abschnitt derselben Ebene"
  
! #: tp/Texinfo/Convert/HTML.pm:772
  msgid "Up section"
  msgstr "Abschnitt nach oben"
  
! #: tp/Texinfo/Convert/HTML.pm:773
  msgid "Next section on same level"
  msgstr "NÃ¤chster Abschitt derselben Ebene"
  
! #: tp/Texinfo/Convert/HTML.pm:774
  msgid "Up node"
  msgstr "Absatz nach oben"
  
! #: tp/Texinfo/Convert/HTML.pm:775
  msgid "Next node"
  msgstr "NÃ¤chster Absatz"
  
! #: tp/Texinfo/Convert/HTML.pm:776
  msgid "Previous node"
  msgstr "Voriger Absatz"
  
! #: tp/Texinfo/Convert/HTML.pm:777
  msgid "Next node in node reading order"
  msgstr "NÃ¤chster Absatz in Lesereihenfolge"
  
! #: tp/Texinfo/Convert/HTML.pm:778
  msgid "Previous node in node reading order"
  msgstr "Voriger Absatz in Lesereihenfolge"
  
! #: tp/Texinfo/Convert/HTML.pm:779
  msgid "Next section in reading order"
  msgstr "NÃ¤chster Abschnitt in Lesereihenfolge"
  
! #: tp/Texinfo/Convert/HTML.pm:780
  msgid "Next chapter"
  msgstr "NÃ¤chstes Kapitel"
  
! #: tp/Texinfo/Convert/HTML.pm:781
  msgid "About (help)"
  msgstr "Info (Hilfe)"
  
! #: tp/Texinfo/Convert/HTML.pm:782
  msgid "First section in reading order"
  msgstr "Erster Abschnitt in Lesereihenfolge"
  
! #: tp/Texinfo/Convert/HTML.pm:783
  msgid "Last section in reading order"
  msgstr "Letzter Abschnitt in Lesereihenfolge"
  
! #: tp/Texinfo/Convert/HTML.pm:784
  msgid "Forward section in next file"
  msgstr "Abschnitt vor in nÃ¤chster Datei"
  
! #: tp/Texinfo/Convert/HTML.pm:785
  msgid "Back section in previous file"
  msgstr "Abschnitt zurÃ¼ck in nÃ¤chster Datei"
  
! #: tp/Texinfo/Convert/HTML.pm:794
  msgid "This"
  msgstr "Diese"
  
! #: tp/Texinfo/Convert/HTML.pm:795
  msgid "Back"
  msgstr "ZurÃ¼ck"
  
! #: tp/Texinfo/Convert/HTML.pm:796
  msgid "FastBack"
  msgstr "SchnellrÃ¼cklauf"
  
! #: tp/Texinfo/Convert/HTML.pm:800
  msgid "NodeUp"
  msgstr "Absatz nach oben"
  
! #: tp/Texinfo/Convert/HTML.pm:801
  msgid "NodeNext"
  msgstr "NÃ¤chster Absatz"
  
! #: tp/Texinfo/Convert/HTML.pm:802
  msgid "NodePrev"
  msgstr "Voriger Absatz"
  
! #: tp/Texinfo/Convert/HTML.pm:803
  msgid "NodeForward"
  msgstr "Absatz vor"
  
! #: tp/Texinfo/Convert/HTML.pm:804
  msgid "NodeBack"
  msgstr "Absatz zurÃ¼ck"
  
! #: tp/Texinfo/Convert/HTML.pm:805
  msgid "Forward"
  msgstr "Vor"
  
! #: tp/Texinfo/Convert/HTML.pm:806
  msgid "FastForward"
  msgstr "Schnellvorlauf"
  
! #: tp/Texinfo/Convert/HTML.pm:807
  msgid "About"
  msgstr "Info"
  
! #: tp/Texinfo/Convert/HTML.pm:808
  msgid "First"
  msgstr "Erste"
  
! #: tp/Texinfo/Convert/HTML.pm:809
  msgid "Last"
  msgstr "Letzte"
  
! #: tp/Texinfo/Convert/HTML.pm:810
  msgid "NextFile"
  msgstr "NÃ¤chste Datei"
  
! #: tp/Texinfo/Convert/HTML.pm:811
  msgid "PrevFile"
  msgstr "Vorige Datei"
  
! #: tp/Texinfo/Convert/HTML.pm:815
  msgid "About This Document"
  msgstr "Info zu diesem Dokument"
  
! #: tp/Texinfo/Convert/HTML.pm:816
  msgid "Table of Contents"
  msgstr "Inhaltsverzeichnis"
  
! #: tp/Texinfo/Convert/HTML.pm:817
  msgid "Short Table of Contents"
  msgstr "Kurzes Inhaltsverzeichnis"
  
! #: tp/Texinfo/Convert/HTML.pm:818
  msgid "Footnotes"
  msgstr "FuÃŸnoten"
  
! #: tp/Texinfo/Convert/HTML.pm:1534
  #, perl-brace-format
  msgid "{explained_string} ({explanation})"
  msgstr "{explained_string} ({explanation})"
  
! #: tp/Texinfo/Convert/HTML.pm:3182
  #, perl-brace-format
  msgid "see section {reference_name}"
  msgstr "siehe Abschnitt {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3185
  #, perl-brace-format
  msgid "see {reference_name}"
  msgstr "siehe {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3190
  #, perl-brace-format
  msgid "See section {reference_name}"
  msgstr "Siehe Abschnitt {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3193
  #, perl-brace-format
  msgid "See {reference_name}"
  msgstr "Siehe {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3197
  #, perl-brace-format
  msgid "{reference_name}"
  msgstr "{reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3259
  #, perl-brace-format
  msgid "see {reference} in @cite{{book}}"
  msgstr "siehe {reference} in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3263
  #, perl-brace-format
  msgid "see @cite{{book_reference}}"
  msgstr "siehe @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3267
  #, perl-brace-format
  msgid "see `{section}' in @cite{{book}}"
  msgstr "siehe Â»{section}Â« in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3274
  #, perl-brace-format
  msgid "see {reference}"
  msgstr "siehe {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3277
  #, perl-brace-format
  msgid "see `{section}'"
  msgstr "siehe Â»{section}Â«"
  
! #: tp/Texinfo/Convert/HTML.pm:3282
  #, perl-brace-format
  msgid "See {reference} in @cite{{book}}"
  msgstr "Siehe {reference} in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3286
  #, perl-brace-format
  msgid "See @cite{{book_reference}}"
  msgstr "Siehe @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3290
  #, perl-brace-format
  msgid "See `{section}' in @cite{{book}}"
  msgstr "Siehe Â»{section}Â« in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3297
  #, perl-brace-format
  msgid "See {reference}"
  msgstr "Siehe {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3300
  #, perl-brace-format
  msgid "See `{section}'"
  msgstr "Siehe Â»{section}Â«"
  
! #: tp/Texinfo/Convert/HTML.pm:3305
  #, perl-brace-format
  msgid "{reference} in @cite{{book}}"
  msgstr "{reference} in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3309
  #, perl-brace-format
  msgid "@cite{{book_reference}}"
  msgstr "@cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3313
  #, perl-brace-format
  msgid "`{section}' in @cite{{book}}"
  msgstr "Â»{section}Â« in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3320
  #, perl-brace-format
  msgid "{reference}"
  msgstr "{reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3323
  #, perl-brace-format
  msgid "`{section}'"
  msgstr "Â»{section}Â«"
  
! #: tp/Texinfo/Convert/HTML.pm:3436
  msgid "Jump to"
  msgstr "Springe zu"
  
! #: tp/Texinfo/Convert/HTML.pm:3444
  msgid "Index Entry"
  msgstr "Indexeintrag"
  
! #: tp/Texinfo/Convert/HTML.pm:3446
  msgid "Section"
  msgstr "Abschnitt"
  
! #: tp/Texinfo/Convert/HTML.pm:4065
  #, perl-brace-format
  msgid "{category}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4070
  #, perl-brace-format
  msgid "{category}: @strong{{name}}"
  msgstr "{category}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4087
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4091
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4100
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4103
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4111
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} von {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4117
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}}"
  msgstr "{category} von {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4126
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} in {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4132
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}}"
  msgstr "{category} in {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4147
  #, perl-brace-format
  msgid ""
***************
*** 769,773 ****
  "{category} in {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4126
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
--- 769,773 ----
  "{category} in {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4151
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
***************
*** 775,789 ****
  "{category} in {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4137
  #, perl-brace-format
  msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} in {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4141
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} in {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4155
  #, perl-brace-format
  msgid ""
--- 775,789 ----
  "{category} in {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4162
  #, perl-brace-format
  msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} in {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4166
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} in {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4180
  #, perl-brace-format
  msgid ""
***************
*** 792,796 ****
  "{category} von {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4159
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
--- 792,796 ----
  "{category} von {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4184
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
***************
*** 798,812 ****
  "{category} von {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4170
  #, perl-brace-format
  msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} von {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4174
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} von {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:6101
  #, perl-brace-format
  msgid ""
--- 798,812 ----
  "{category} von {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4195
  #, perl-brace-format
  msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} von {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4199
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} von {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:6170
  #, perl-brace-format
  msgid ""
***************
*** 817,821 ****
  "@emph{{program}}} erstellt."
  
! #: tp/Texinfo/Convert/HTML.pm:6106
  msgid "This document was generated on @emph{@today{}}."
  msgstr ""
--- 817,821 ----
  "@emph{{program}}} erstellt."
  
! #: tp/Texinfo/Convert/HTML.pm:6175
  msgid "This document was generated on @emph{@today{}}."
  msgstr ""
***************
*** 823,857 ****
  "erstellt."
  
! #: tp/Texinfo/Convert/HTML.pm:6145
  #, perl-brace-format
  msgid "{title}: {element_text}"
  msgstr "{title}: {element_text}"
  
! #: tp/Texinfo/Convert/HTML.pm:6289
  #, 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:6358
  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:6364
  msgid "Button"
  msgstr "Knopf"
  
! #: tp/Texinfo/Convert/HTML.pm:6365
  msgid "Name"
  msgstr "Name"
  
! #: tp/Texinfo/Convert/HTML.pm:6366
  msgid "Go to"
  msgstr "Gehe zu"
  
! #: tp/Texinfo/Convert/HTML.pm:6367
  msgid "From 1.2.3 go to"
  msgstr "Von 1.2.3 gehe zu"
  
! #: tp/Texinfo/Convert/HTML.pm:6393
  msgid ""
  "  where the @strong{ Example } assumes that the current position is at "
--- 823,857 ----
  "erstellt."
  
! #: tp/Texinfo/Convert/HTML.pm:6214
  #, perl-brace-format
  msgid "{title}: {element_text}"
  msgstr "{title}: {element_text}"
  
! #: tp/Texinfo/Convert/HTML.pm:6358
  #, 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:6427
  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:6433
  msgid "Button"
  msgstr "Knopf"
  
! #: tp/Texinfo/Convert/HTML.pm:6434
  msgid "Name"
  msgstr "Name"
  
! #: tp/Texinfo/Convert/HTML.pm:6435
  msgid "Go to"
  msgstr "Gehe zu"
  
! #: tp/Texinfo/Convert/HTML.pm:6436
  msgid "From 1.2.3 go to"
  msgstr "Von 1.2.3 gehe zu"
  
! #: tp/Texinfo/Convert/HTML.pm:6462
  msgid ""
  "  where the @strong{ Example } assumes that the current position is at "
***************
*** 863,907 ****
  "liegt:"
  
! #: tp/Texinfo/Convert/HTML.pm:6403
  msgid "Section One"
  msgstr "Abschnitt 1"
  
! #: tp/Texinfo/Convert/HTML.pm:6405
  msgid "Subsection One-One"
  msgstr "Unterabschnitt 1-1"
  
! #: tp/Texinfo/Convert/HTML.pm:6412
  msgid "Subsection One-Two"
  msgstr "Unterabschnitt 1-2"
  
! #: tp/Texinfo/Convert/HTML.pm:6414
  msgid "Subsubsection One-Two-One"
  msgstr "Unterabschnitt 1-2-1"
  
! #: tp/Texinfo/Convert/HTML.pm:6415
  msgid "Subsubsection One-Two-Two"
  msgstr "Unterabschnitt 1-2-2"
  
! #: tp/Texinfo/Convert/HTML.pm:6416
  msgid "Subsubsection One-Two-Three"
  msgstr "Unterabschnitt 1-2-3"
  
! #: tp/Texinfo/Convert/HTML.pm:6418
  msgid "Current Position"
  msgstr "Aktuelle Position"
  
! #: tp/Texinfo/Convert/HTML.pm:6419
  msgid "Subsubsection One-Two-Four"
  msgstr "Unterabschnitt 1-2-4"
  
! #: tp/Texinfo/Convert/HTML.pm:6422
  msgid "Subsection One-Three"
  msgstr "Unterabschnitt 1-3"
  
! #: tp/Texinfo/Convert/HTML.pm:6429
  msgid "Subsection One-Four"
  msgstr "Unterabschnitt 1-4"
  
! #: tp/Texinfo/Convert/HTML.pm:6833
  msgid "Untitled Document"
  msgstr "Unbenanntes Dokument"
--- 863,907 ----
  "liegt:"
  
! #: tp/Texinfo/Convert/HTML.pm:6472
  msgid "Section One"
  msgstr "Abschnitt 1"
  
! #: tp/Texinfo/Convert/HTML.pm:6474
  msgid "Subsection One-One"
  msgstr "Unterabschnitt 1-1"
  
! #: tp/Texinfo/Convert/HTML.pm:6481
  msgid "Subsection One-Two"
  msgstr "Unterabschnitt 1-2"
  
! #: tp/Texinfo/Convert/HTML.pm:6483
  msgid "Subsubsection One-Two-One"
  msgstr "Unterabschnitt 1-2-1"
  
! #: tp/Texinfo/Convert/HTML.pm:6484
  msgid "Subsubsection One-Two-Two"
  msgstr "Unterabschnitt 1-2-2"
  
! #: tp/Texinfo/Convert/HTML.pm:6485
  msgid "Subsubsection One-Two-Three"
  msgstr "Unterabschnitt 1-2-3"
  
! #: tp/Texinfo/Convert/HTML.pm:6487
  msgid "Current Position"
  msgstr "Aktuelle Position"
  
! #: tp/Texinfo/Convert/HTML.pm:6488
  msgid "Subsubsection One-Two-Four"
  msgstr "Unterabschnitt 1-2-4"
  
! #: tp/Texinfo/Convert/HTML.pm:6491
  msgid "Subsection One-Three"
  msgstr "Unterabschnitt 1-3"
  
! #: tp/Texinfo/Convert/HTML.pm:6498
  msgid "Subsection One-Four"
  msgstr "Unterabschnitt 1-4"
  
! #: tp/Texinfo/Convert/HTML.pm:6906
  msgid "Untitled Document"
  msgstr "Unbenanntes Dokument"
Binary files texinfo-6.1/po_document/el.gmo and texinfo-6.3/po_document/el.gmo differ
diff -Nrc2 texinfo-6.1/po_document/el.po texinfo-6.3/po_document/el.po
*** texinfo-6.1/po_document/el.po	1970-01-01 01:00:00.000000000 +0100
--- texinfo-6.3/po_document/el.po	2016-09-10 12:46:00.000000000 +0100
***************
*** 0 ****
--- 1,1113 ----
+ # 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: 2016-09-10 12:46+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"
+ "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:697 tp/Texinfo/Common.pm:702
+ msgid "Function"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:698
+ msgid "Macro"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:699
+ msgid "Special Form"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:700 tp/Texinfo/Common.pm:703
+ msgid "Variable"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:701
+ msgid "User Option"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:704 tp/Texinfo/Common.pm:705
+ msgid "Instance Variable"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:706 tp/Texinfo/Common.pm:707
+ msgid "Method"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:1186
+ #, perl-brace-format
+ msgid "{category} on {class}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:1193
+ #, perl-brace-format
+ msgid "{category} of {class}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:1210
+ #, perl-brace-format
+ msgid "{month} {day}, {year}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:1241 tp/Texinfo/Convert/Plaintext.pm:1133
+ #: tp/Texinfo/Convert/HTML.pm:516
+ #, perl-brace-format
+ msgid "Appendix {number} {section_title}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:1245 tp/Texinfo/Convert/Plaintext.pm:1138
+ #: tp/Texinfo/Convert/HTML.pm:522
+ #, perl-brace-format
+ msgid "{number} {section_title}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:1499
+ #, perl-brace-format
+ msgid "{float_type} {float_number}: "
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:1503
+ #, perl-brace-format
+ msgid "{float_type}: "
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:1508
+ #, perl-brace-format
+ msgid "{float_type} {float_number}\n"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:1512
+ #, perl-brace-format
+ msgid "{float_type}\n"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:1518
+ #, perl-brace-format
+ msgid "{float_number}: "
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:1521
+ #, perl-brace-format
+ msgid "{float_number}\n"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:2816
+ #, perl-brace-format
+ msgid "{name} on {class}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:2825
+ #, perl-brace-format
+ msgid "{name} of {class}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Converter.pm:110
+ msgid "error@arrow{}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Converter.pm:948
+ msgid "January"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Converter.pm:949
+ msgid "February"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Converter.pm:950
+ msgid "March"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Converter.pm:951
+ msgid "April"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Converter.pm:952
+ msgid "May"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Converter.pm:953
+ msgid "June"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Converter.pm:954
+ msgid "July"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Converter.pm:955
+ msgid "August"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Converter.pm:956
+ msgid "September"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Converter.pm:957
+ msgid "October"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Converter.pm:958
+ msgid "November"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Converter.pm:959
+ msgid "December"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Converter.pm:1010
+ #, perl-brace-format
+ msgid "{float_type} {float_number}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Converter.pm:1014
+ #, perl-brace-format
+ msgid "{float_type}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Converter.pm:1018
+ #, perl-brace-format
+ msgid "{float_number}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:826
+ #, perl-brace-format
+ msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:831
+ #, perl-brace-format
+ msgid "See node @samp{{mynode}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:835
+ #, perl-brace-format
+ msgid "See Info file @file{{myfile}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:875
+ #, perl-brace-format
+ msgid "section ``{section_name}'' in @cite{{book}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:880
+ #, perl-brace-format
+ msgid "See section ``{section_name}'' in @cite{{book}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:885
+ #, perl-brace-format
+ msgid "see section ``{section_name}'' in @cite{{book}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3317
+ #, perl-brace-format
+ msgid "@cite{{book}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3294
+ #, perl-brace-format
+ msgid "See @cite{{book}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3271
+ #, perl-brace-format
+ msgid "see @cite{{book}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:915
+ #, perl-brace-format
+ msgid "{title_ref}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:920
+ #, perl-brace-format
+ msgid "See {title_ref}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:925
+ #, perl-brace-format
+ msgid "see {title_ref}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2311
+ #, perl-brace-format
+ msgid "{abbr_or_acronym} ({explanation})"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2497
+ #: tp/Texinfo/Convert/HTML.pm:3622
+ #, perl-brace-format
+ msgid "@b{{quotation_arg}:} "
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:1367
+ msgid "(outside of any node)"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2004
+ #, perl-brace-format
+ msgid "{name} @url{{email}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2007
+ #, perl-brace-format
+ msgid "@url{{email}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2029
+ #, perl-brace-format
+ msgid "{text} ({url})"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2034
+ #, perl-brace-format
+ msgid "@t{<{url}>}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2422 tp/Texinfo/Convert/HTML.pm:1437
+ #, perl-brace-format
+ msgid "@{No value for `{value}'@}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2913
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}: {name} {arguments}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2918
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}: {name}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2931
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2934
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}: {type} {name} {arguments}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2943
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}:@*{type}@*{name}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2946
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}: {type} {name}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2954
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2960
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}: {name}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2969
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2975
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}: {name}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2990
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2994
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3005
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3009
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}: {type} {name}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3023
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3027
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3038
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3042
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}: {type} {name}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3371 tp/Texinfo/Convert/HTML.pm:2877
+ #, perl-brace-format
+ msgid "@center --- @emph{{author}}\n"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
+ msgid "Top"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
+ msgid "Contents"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:791
+ msgid "Overview"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:736 tp/Texinfo/Convert/HTML.pm:767
+ #: tp/Texinfo/Convert/HTML.pm:792
+ msgid "Index"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:738
+ msgid "current"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
+ msgid "Prev"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:742
+ msgid " Up "
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:747
+ #: tp/Texinfo/Convert/HTML.pm:799
+ msgid "Next"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:745 tp/Texinfo/Convert/HTML.pm:798
+ msgid "Up"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:749
+ msgid "Previous"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:750
+ msgid "Forward node"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:751
+ msgid "Back node"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:757
+ msgid "Next file"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:758
+ msgid "Previous file"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:764
+ msgid "Cover (top) of document"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:765
+ msgid "Table of contents"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:766
+ msgid "Short table of contents"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:768
+ msgid "Current section"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:769
+ msgid "Previous section in reading order"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:770
+ msgid "Beginning of this chapter or previous chapter"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:771
+ msgid "Previous section on same level"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:772
+ msgid "Up section"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:773
+ msgid "Next section on same level"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:774
+ msgid "Up node"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:775
+ msgid "Next node"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:776
+ msgid "Previous node"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:777
+ msgid "Next node in node reading order"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:778
+ msgid "Previous node in node reading order"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:779
+ msgid "Next section in reading order"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:780
+ msgid "Next chapter"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:781
+ msgid "About (help)"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:782
+ msgid "First section in reading order"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:783
+ msgid "Last section in reading order"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:784
+ msgid "Forward section in next file"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:785
+ msgid "Back section in previous file"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:794
+ msgid "This"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:795
+ msgid "Back"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:796
+ msgid "FastBack"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:800
+ msgid "NodeUp"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:801
+ msgid "NodeNext"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:802
+ msgid "NodePrev"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:803
+ msgid "NodeForward"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:804
+ msgid "NodeBack"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:805
+ msgid "Forward"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:806
+ msgid "FastForward"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:807
+ msgid "About"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:808
+ msgid "First"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:809
+ msgid "Last"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:810
+ msgid "NextFile"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:811
+ msgid "PrevFile"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:815
+ msgid "About This Document"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:816
+ msgid "Table of Contents"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:817
+ msgid "Short Table of Contents"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:818
+ msgid "Footnotes"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:1534
+ #, perl-brace-format
+ msgid "{explained_string} ({explanation})"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3182
+ #, perl-brace-format
+ msgid "see section {reference_name}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3185
+ #, perl-brace-format
+ msgid "see {reference_name}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3190
+ #, perl-brace-format
+ msgid "See section {reference_name}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3193
+ #, perl-brace-format
+ msgid "See {reference_name}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3197
+ #, perl-brace-format
+ msgid "{reference_name}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3259
+ #, perl-brace-format
+ msgid "see {reference} in @cite{{book}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3263
+ #, perl-brace-format
+ msgid "see @cite{{book_reference}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3267
+ #, perl-brace-format
+ msgid "see `{section}' in @cite{{book}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3274
+ #, perl-brace-format
+ msgid "see {reference}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3277
+ #, perl-brace-format
+ msgid "see `{section}'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3282
+ #, perl-brace-format
+ msgid "See {reference} in @cite{{book}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3286
+ #, perl-brace-format
+ msgid "See @cite{{book_reference}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3290
+ #, perl-brace-format
+ msgid "See `{section}' in @cite{{book}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3297
+ #, perl-brace-format
+ msgid "See {reference}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3300
+ #, perl-brace-format
+ msgid "See `{section}'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3305
+ #, perl-brace-format
+ msgid "{reference} in @cite{{book}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3309
+ #, perl-brace-format
+ msgid "@cite{{book_reference}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3313
+ #, perl-brace-format
+ msgid "`{section}' in @cite{{book}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3320
+ #, perl-brace-format
+ msgid "{reference}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3323
+ #, perl-brace-format
+ msgid "`{section}'"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3436
+ msgid "Jump to"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3444
+ msgid "Index Entry"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3446
+ msgid "Section"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4065
+ #, perl-brace-format
+ msgid "{category}: @strong{{name}} @emph{{arguments}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4070
+ #, perl-brace-format
+ msgid "{category}: @strong{{name}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4087
+ #, perl-brace-format
+ msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4091
+ #, perl-brace-format
+ msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4100
+ #, perl-brace-format
+ msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4103
+ #, perl-brace-format
+ msgid "{category}: @emph{{type}} @strong{{name}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4111
+ #, perl-brace-format
+ msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4117
+ #, perl-brace-format
+ msgid "{category} of {class}: @strong{{name}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4126
+ #, perl-brace-format
+ msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4132
+ #, perl-brace-format
+ msgid "{category} on {class}: @strong{{name}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4147
+ #, perl-brace-format
+ msgid ""
+ "{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4151
+ #, perl-brace-format
+ msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4162
+ #, perl-brace-format
+ msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4166
+ #, perl-brace-format
+ msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4180
+ #, perl-brace-format
+ msgid ""
+ "{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4184
+ #, perl-brace-format
+ msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4195
+ #, perl-brace-format
+ msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4199
+ #, perl-brace-format
+ msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6170
+ #, perl-brace-format
+ msgid ""
+ "This document was generated on @emph{@today{}} using "
+ "@uref{{program_homepage}, @emph{{program}}}."
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6175
+ msgid "This document was generated on @emph{@today{}}."
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6214
+ #, perl-brace-format
+ msgid "{title}: {element_text}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6358
+ #, perl-brace-format
+ msgid "The node you are looking for is at {href}."
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6427
+ msgid "  The buttons in the navigation panels have the following meaning:"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6433
+ msgid "Button"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6434
+ msgid "Name"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6435
+ msgid "Go to"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6436
+ msgid "From 1.2.3 go to"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6462
+ 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:6472
+ msgid "Section One"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6474
+ msgid "Subsection One-One"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6481
+ msgid "Subsection One-Two"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6483
+ msgid "Subsubsection One-Two-One"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6484
+ msgid "Subsubsection One-Two-Two"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6485
+ msgid "Subsubsection One-Two-Three"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6487
+ msgid "Current Position"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6488
+ msgid "Subsubsection One-Two-Four"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6491
+ msgid "Subsection One-Three"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6498
+ msgid "Subsection One-Four"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6906
+ 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 "Î”Îµ Î²Ï�Î­Î¸Î·ÎºÎµ"
Binary files texinfo-6.1/po_document/eo.gmo and texinfo-6.3/po_document/eo.gmo differ
diff -Nrc2 texinfo-6.1/po_document/eo.po texinfo-6.3/po_document/eo.po
*** texinfo-6.1/po_document/eo.po	2016-02-06 11:35:58.000000000 +0000
--- texinfo-6.3/po_document/eo.po	2016-09-10 12:46:00.000000000 +0100
***************
*** 8,12 ****
  "Project-Id-Version: texinfo_document 5.0\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
  "PO-Revision-Date: 2013-02-27 09:07-0300\n"
  "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
--- 8,12 ----
  "Project-Id-Version: texinfo_document 5.0\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:46+0100\n"
  "PO-Revision-Date: 2013-02-27 09:07-0300\n"
  "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
***************
*** 16,111 ****
  "Content-Type: text/plain; charset=utf-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
! #: tp/Texinfo/Common.pm:717 tp/Texinfo/Common.pm:722
  msgid "Function"
  msgstr "Funkcio"
  
! #: tp/Texinfo/Common.pm:718
  msgid "Macro"
  msgstr "Makroo"
  
! #: tp/Texinfo/Common.pm:719
  msgid "Special Form"
  msgstr "Speciala Formo"
  
! #: tp/Texinfo/Common.pm:720 tp/Texinfo/Common.pm:723
  msgid "Variable"
  msgstr "Variablo"
  
! #: tp/Texinfo/Common.pm:721
  msgid "User Option"
  msgstr "Opcio de Uzanto"
  
! #: tp/Texinfo/Common.pm:724 tp/Texinfo/Common.pm:725
  msgid "Instance Variable"
  msgstr "Ekzemplera Variablo"
  
! #: tp/Texinfo/Common.pm:726 tp/Texinfo/Common.pm:727
  msgid "Method"
  msgstr "Metodo"
  
! #: tp/Texinfo/Common.pm:1199
  #, perl-brace-format
  msgid "{category} on {class}"
  msgstr "{category} en {class}"
  
! #: tp/Texinfo/Common.pm:1206
  #, perl-brace-format
  msgid "{category} of {class}"
  msgstr "{category} de {class}"
  
! #: tp/Texinfo/Common.pm:1223
  #, perl-brace-format
  msgid "{month} {day}, {year}"
  msgstr "{year} {month} {day}"
  
! #: tp/Texinfo/Common.pm:1254 tp/Texinfo/Convert/Plaintext.pm:1132
! #: tp/Texinfo/Convert/HTML.pm:515
  #, perl-brace-format
  msgid "Appendix {number} {section_title}"
  msgstr "Aldono {number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1258 tp/Texinfo/Convert/Plaintext.pm:1137
! #: tp/Texinfo/Convert/HTML.pm:521
  #, perl-brace-format
  msgid "{number} {section_title}"
  msgstr "{number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1393
  #, perl-brace-format
  msgid "{float_type} {float_number}: "
  msgstr "{float_type} {float_number}: "
  
! #: tp/Texinfo/Common.pm:1397
  #, perl-brace-format
  msgid "{float_type}: "
  msgstr "{float_type}: "
  
! #: tp/Texinfo/Common.pm:1402
  #, perl-brace-format
  msgid "{float_type} {float_number}\n"
  msgstr "{float_type} {float_number}\n"
  
! #: tp/Texinfo/Common.pm:1406
  #, perl-brace-format
  msgid "{float_type}\n"
  msgstr "{float_type}\n"
  
! #: tp/Texinfo/Common.pm:1412
  #, perl-brace-format
  msgid "{float_number}: "
  msgstr "{float_number}: "
  
! #: tp/Texinfo/Common.pm:1415
  #, perl-brace-format
  msgid "{float_number}\n"
  msgstr "{float_number}\n"
  
! #: tp/Texinfo/Parser.pm:2982
  #, perl-brace-format
  msgid "{name} on {class}"
  msgstr "{name} en {class}"
  
! #: tp/Texinfo/Parser.pm:2991
  #, perl-brace-format
  msgid "{name} of {class}"
--- 16,112 ----
  "Content-Type: text/plain; charset=utf-8\n"
  "Content-Transfer-Encoding: 8bit\n"
+ "X-Bugs: Report translation errors to the Language-Team address.\n"
  
! #: tp/Texinfo/Common.pm:697 tp/Texinfo/Common.pm:702
  msgid "Function"
  msgstr "Funkcio"
  
! #: tp/Texinfo/Common.pm:698
  msgid "Macro"
  msgstr "Makroo"
  
! #: tp/Texinfo/Common.pm:699
  msgid "Special Form"
  msgstr "Speciala Formo"
  
! #: tp/Texinfo/Common.pm:700 tp/Texinfo/Common.pm:703
  msgid "Variable"
  msgstr "Variablo"
  
! #: tp/Texinfo/Common.pm:701
  msgid "User Option"
  msgstr "Opcio de Uzanto"
  
! #: tp/Texinfo/Common.pm:704 tp/Texinfo/Common.pm:705
  msgid "Instance Variable"
  msgstr "Ekzemplera Variablo"
  
! #: tp/Texinfo/Common.pm:706 tp/Texinfo/Common.pm:707
  msgid "Method"
  msgstr "Metodo"
  
! #: tp/Texinfo/Common.pm:1186
  #, perl-brace-format
  msgid "{category} on {class}"
  msgstr "{category} en {class}"
  
! #: tp/Texinfo/Common.pm:1193
  #, perl-brace-format
  msgid "{category} of {class}"
  msgstr "{category} de {class}"
  
! #: tp/Texinfo/Common.pm:1210
  #, perl-brace-format
  msgid "{month} {day}, {year}"
  msgstr "{year} {month} {day}"
  
! #: tp/Texinfo/Common.pm:1241 tp/Texinfo/Convert/Plaintext.pm:1133
! #: tp/Texinfo/Convert/HTML.pm:516
  #, perl-brace-format
  msgid "Appendix {number} {section_title}"
  msgstr "Aldono {number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1245 tp/Texinfo/Convert/Plaintext.pm:1138
! #: tp/Texinfo/Convert/HTML.pm:522
  #, perl-brace-format
  msgid "{number} {section_title}"
  msgstr "{number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1499
  #, perl-brace-format
  msgid "{float_type} {float_number}: "
  msgstr "{float_type} {float_number}: "
  
! #: tp/Texinfo/Common.pm:1503
  #, perl-brace-format
  msgid "{float_type}: "
  msgstr "{float_type}: "
  
! #: tp/Texinfo/Common.pm:1508
  #, perl-brace-format
  msgid "{float_type} {float_number}\n"
  msgstr "{float_type} {float_number}\n"
  
! #: tp/Texinfo/Common.pm:1512
  #, perl-brace-format
  msgid "{float_type}\n"
  msgstr "{float_type}\n"
  
! #: tp/Texinfo/Common.pm:1518
  #, perl-brace-format
  msgid "{float_number}: "
  msgstr "{float_number}: "
  
! #: tp/Texinfo/Common.pm:1521
  #, perl-brace-format
  msgid "{float_number}\n"
  msgstr "{float_number}\n"
  
! #: tp/Texinfo/Parser.pm:2816
  #, perl-brace-format
  msgid "{name} on {class}"
  msgstr "{name} en {class}"
  
! #: tp/Texinfo/Parser.pm:2825
  #, perl-brace-format
  msgid "{name} of {class}"
***************
*** 116,178 ****
  msgstr "error@arrow{}"
  
! #: tp/Texinfo/Convert/Converter.pm:956
  msgid "January"
  msgstr "januaro"
  
! #: tp/Texinfo/Convert/Converter.pm:957
  msgid "February"
  msgstr "februaro"
  
! #: tp/Texinfo/Convert/Converter.pm:958
  msgid "March"
  msgstr "marto"
  
! #: tp/Texinfo/Convert/Converter.pm:959
  msgid "April"
  msgstr "aprilo"
  
! #: tp/Texinfo/Convert/Converter.pm:960
  msgid "May"
  msgstr "majo"
  
! #: tp/Texinfo/Convert/Converter.pm:961
  msgid "June"
  msgstr "junio"
  
! #: tp/Texinfo/Convert/Converter.pm:962
  msgid "July"
  msgstr "julio"
  
! #: tp/Texinfo/Convert/Converter.pm:963
  msgid "August"
  msgstr "augusto"
  
! #: tp/Texinfo/Convert/Converter.pm:964
  msgid "September"
  msgstr "septembro"
  
! #: tp/Texinfo/Convert/Converter.pm:965
  msgid "October"
  msgstr "oktobro"
  
! #: tp/Texinfo/Convert/Converter.pm:966
  msgid "November"
  msgstr "novembro"
  
! #: tp/Texinfo/Convert/Converter.pm:967
  msgid "December"
  msgstr "decembro"
  
! #: tp/Texinfo/Convert/Converter.pm:1018
  #, perl-brace-format
  msgid "{float_type} {float_number}"
  msgstr "{float_type} {float_number}"
  
! #: tp/Texinfo/Convert/Converter.pm:1022
  #, perl-brace-format
  msgid "{float_type}"
  msgstr "{float_type}"
  
! #: tp/Texinfo/Convert/Converter.pm:1026
  #, perl-brace-format
  msgid "{float_number}"
--- 117,179 ----
  msgstr "error@arrow{}"
  
! #: tp/Texinfo/Convert/Converter.pm:948
  msgid "January"
  msgstr "januaro"
  
! #: tp/Texinfo/Convert/Converter.pm:949
  msgid "February"
  msgstr "februaro"
  
! #: tp/Texinfo/Convert/Converter.pm:950
  msgid "March"
  msgstr "marto"
  
! #: tp/Texinfo/Convert/Converter.pm:951
  msgid "April"
  msgstr "aprilo"
  
! #: tp/Texinfo/Convert/Converter.pm:952
  msgid "May"
  msgstr "majo"
  
! #: tp/Texinfo/Convert/Converter.pm:953
  msgid "June"
  msgstr "junio"
  
! #: tp/Texinfo/Convert/Converter.pm:954
  msgid "July"
  msgstr "julio"
  
! #: tp/Texinfo/Convert/Converter.pm:955
  msgid "August"
  msgstr "augusto"
  
! #: tp/Texinfo/Convert/Converter.pm:956
  msgid "September"
  msgstr "septembro"
  
! #: tp/Texinfo/Convert/Converter.pm:957
  msgid "October"
  msgstr "oktobro"
  
! #: tp/Texinfo/Convert/Converter.pm:958
  msgid "November"
  msgstr "novembro"
  
! #: tp/Texinfo/Convert/Converter.pm:959
  msgid "December"
  msgstr "decembro"
  
! #: tp/Texinfo/Convert/Converter.pm:1010
  #, perl-brace-format
  msgid "{float_type} {float_number}"
  msgstr "{float_type} {float_number}"
  
! #: tp/Texinfo/Convert/Converter.pm:1014
  #, perl-brace-format
  msgid "{float_type}"
  msgstr "{float_type}"
  
! #: tp/Texinfo/Convert/Converter.pm:1018
  #, perl-brace-format
  msgid "{float_number}"
***************
*** 209,223 ****
  msgstr "konsultu la sekcion ``{section_name}'' en @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3291
  #, perl-brace-format
  msgid "@cite{{book}}"
  msgstr "@cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3268
  #, perl-brace-format
  msgid "See @cite{{book}}"
  msgstr "Konsultu @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3245
  #, perl-brace-format
  msgid "see @cite{{book}}"
--- 210,224 ----
  msgstr "konsultu la sekcion ``{section_name}'' en @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3317
  #, perl-brace-format
  msgid "@cite{{book}}"
  msgstr "@cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3294
  #, perl-brace-format
  msgid "See @cite{{book}}"
  msgstr "Konsultu @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3271
  #, perl-brace-format
  msgid "see @cite{{book}}"
***************
*** 239,763 ****
  msgstr "konsultu {title_ref}"
  
! #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2310
  #, perl-brace-format
  msgid "{abbr_or_acronym} ({explanation})"
  msgstr "{abbr_or_acronym} ({explanation})"
  
! #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2496
! #: tp/Texinfo/Convert/HTML.pm:3597
  #, perl-brace-format
  msgid "@b{{quotation_arg}:} "
  msgstr "@b{{quotation_arg}:} "
  
! #: tp/Texinfo/Convert/Plaintext.pm:1366
  msgid "(outside of any node)"
  msgstr "(for de iu ajn nodo)"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2003
  #, perl-brace-format
  msgid "{name} @url{{email}}"
  msgstr "{name} @url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2006
  #, perl-brace-format
  msgid "@url{{email}}"
  msgstr "@url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2028
  #, perl-brace-format
  msgid "{text} ({url})"
  msgstr "{text} ({url})"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2033
  #, perl-brace-format
  msgid "@t{<{url}>}"
  msgstr "@t{<{url}>}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2421 tp/Texinfo/Convert/HTML.pm:1438
  #, perl-brace-format
  msgid "@{No value for `{value}'@}"
  msgstr "@{Neniu valoro por `{value}'@}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2945
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name} {arguments}"
  msgstr "@tie{ }-- {category}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2950
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name}"
  msgstr "@tie{ }-- {category}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2963
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2966
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2975
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2978
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name}"
  msgstr "@tie{ }-- {category}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2986
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} de {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2992
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name}"
  msgstr "@tie{ }-- {category} de {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3001
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} en {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3007
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name}"
  msgstr "@tie{ }-- {category} en {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3022
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} en {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3026
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} en {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3037
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} en {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3041
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name}"
  msgstr "@tie{ }-- {category} en {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3055
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} de {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3059
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} de {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3070
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} de {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3074
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name}"
  msgstr "@tie{ }-- {category} de {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3403 tp/Texinfo/Convert/HTML.pm:2851
  #, perl-brace-format
  msgid "@center --- @emph{{author}}\n"
  msgstr "@center --- @emph{{author}}\n"
  
! #: tp/Texinfo/Convert/HTML.pm:732 tp/Texinfo/Convert/HTML.pm:788
  msgid "Top"
  msgstr "Pinto"
  
! #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
  msgid "Contents"
  msgstr "Enhavo"
  
! #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
  msgid "Overview"
  msgstr "Superrigardo"
  
! #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:766
! #: tp/Texinfo/Convert/HTML.pm:791
  msgid "Index"
  msgstr "Indekso"
  
! #: tp/Texinfo/Convert/HTML.pm:737
  msgid "current"
  msgstr "nuna"
  
! #: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
  msgid "Prev"
  msgstr "Antaue"
  
! #: tp/Texinfo/Convert/HTML.pm:741
  msgid " Up "
  msgstr " Supre "
  
! #: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:746
! #: tp/Texinfo/Convert/HTML.pm:798
  msgid "Next"
  msgstr "Sekve"
  
! #: tp/Texinfo/Convert/HTML.pm:744 tp/Texinfo/Convert/HTML.pm:797
  msgid "Up"
  msgstr "Supre"
  
! #: tp/Texinfo/Convert/HTML.pm:748
  msgid "Previous"
  msgstr "Antaue"
  
! #: tp/Texinfo/Convert/HTML.pm:749
  msgid "Forward node"
  msgstr "Antauenira nodo"
  
! #: tp/Texinfo/Convert/HTML.pm:750
  msgid "Back node"
  msgstr "Retroira nodo"
  
! #: tp/Texinfo/Convert/HTML.pm:756
  msgid "Next file"
  msgstr "Sekva dosiero"
  
! #: tp/Texinfo/Convert/HTML.pm:757
  msgid "Previous file"
  msgstr "Antaua dosiero"
  
! #: tp/Texinfo/Convert/HTML.pm:763
  msgid "Cover (top) of document"
  msgstr "Kovro (pinto) de dokumento"
  
! #: tp/Texinfo/Convert/HTML.pm:764
  msgid "Table of contents"
  msgstr "Enhavtabelo"
  
! #: tp/Texinfo/Convert/HTML.pm:765
  msgid "Short table of contents"
  msgstr "Malgranda enhavtabelo"
  
! #: tp/Texinfo/Convert/HTML.pm:767
  msgid "Current section"
  msgstr "Nuna sekcio"
  
! #: tp/Texinfo/Convert/HTML.pm:768
  msgid "Previous section in reading order"
  msgstr "Antaua sekcio lau lega ordo"
  
! #: tp/Texinfo/Convert/HTML.pm:769
  msgid "Beginning of this chapter or previous chapter"
  msgstr "Komenco de tiu @^{c} @^{c}apitro au antaua @^{c}apitro"
  
! #: tp/Texinfo/Convert/HTML.pm:770
  msgid "Previous section on same level"
  msgstr "Antaua sekcio en la sama nivelo"
  
! #: tp/Texinfo/Convert/HTML.pm:771
  msgid "Up section"
  msgstr "Supra sekcio"
  
! #: tp/Texinfo/Convert/HTML.pm:772
  msgid "Next section on same level"
  msgstr "Sekva sekcio en la sama nivelo"
  
! #: tp/Texinfo/Convert/HTML.pm:773
  msgid "Up node"
  msgstr "Supra nodo"
  
! #: tp/Texinfo/Convert/HTML.pm:774
  msgid "Next node"
  msgstr "Sekva nodo"
  
! #: tp/Texinfo/Convert/HTML.pm:775
  msgid "Previous node"
  msgstr "Antaua nodo"
  
! #: tp/Texinfo/Convert/HTML.pm:776
  msgid "Next node in node reading order"
  msgstr "Sekva nodo lau nod-lega ordo"
  
! #: tp/Texinfo/Convert/HTML.pm:777
  msgid "Previous node in node reading order"
  msgstr "Antaua nodo lau nod-lega ordo"
  
! #: tp/Texinfo/Convert/HTML.pm:778
  msgid "Next section in reading order"
  msgstr "Sekva sekcio lau lega ordo"
  
! #: tp/Texinfo/Convert/HTML.pm:779
  msgid "Next chapter"
  msgstr "Venonta @^{c}apitro"
  
! #: tp/Texinfo/Convert/HTML.pm:780
  msgid "About (help)"
  msgstr "Pri (helpo)"
  
! #: tp/Texinfo/Convert/HTML.pm:781
  msgid "First section in reading order"
  msgstr "Unua sekcio lau lega ordo"
  
! #: tp/Texinfo/Convert/HTML.pm:782
  msgid "Last section in reading order"
  msgstr "Lasta sekcio lau lega ordo"
  
! #: tp/Texinfo/Convert/HTML.pm:783
  msgid "Forward section in next file"
  msgstr "Antaueniri sekcion en la sekva dosiero"
  
! #: tp/Texinfo/Convert/HTML.pm:784
  msgid "Back section in previous file"
  msgstr "Retroiri sekcion en la antaua dosiero"
  
! #: tp/Texinfo/Convert/HTML.pm:793
  msgid "This"
  msgstr "Tio @^{c}i"
  
! #: tp/Texinfo/Convert/HTML.pm:794
  msgid "Back"
  msgstr "Retroiro"
  
! #: tp/Texinfo/Convert/HTML.pm:795
  msgid "FastBack"
  msgstr "RapidRetroiro"
  
! #: tp/Texinfo/Convert/HTML.pm:799
  msgid "NodeUp"
  msgstr "NodSupren"
  
! #: tp/Texinfo/Convert/HTML.pm:800
  msgid "NodeNext"
  msgstr "SekvaNodo"
  
! #: tp/Texinfo/Convert/HTML.pm:801
  msgid "NodePrev"
  msgstr "AntauaNodo"
  
! #: tp/Texinfo/Convert/HTML.pm:802
  msgid "NodeForward"
  msgstr "NodAntaueniro"
  
! #: tp/Texinfo/Convert/HTML.pm:803
  msgid "NodeBack"
  msgstr "NodRetroiro"
  
! #: tp/Texinfo/Convert/HTML.pm:804
  msgid "Forward"
  msgstr "Antaueniro"
  
! #: tp/Texinfo/Convert/HTML.pm:805
  msgid "FastForward"
  msgstr "RapidAntaueniro"
  
! #: tp/Texinfo/Convert/HTML.pm:806
  msgid "About"
  msgstr "Pri"
  
! #: tp/Texinfo/Convert/HTML.pm:807
  msgid "First"
  msgstr "Unua"
  
! #: tp/Texinfo/Convert/HTML.pm:808
  msgid "Last"
  msgstr "Lasta"
  
! #: tp/Texinfo/Convert/HTML.pm:809
  msgid "NextFile"
  msgstr "SekvaDosiero"
  
! #: tp/Texinfo/Convert/HTML.pm:810
  msgid "PrevFile"
  msgstr "AntauaDosiero"
  
! #: tp/Texinfo/Convert/HTML.pm:814
  msgid "About This Document"
  msgstr "Pri tiu @^{c}i Dokumento"
  
! #: tp/Texinfo/Convert/HTML.pm:815
  msgid "Table of Contents"
  msgstr "Enhavtabelo"
  
! #: tp/Texinfo/Convert/HTML.pm:816
  msgid "Short Table of Contents"
  msgstr "Malgranda Enhavtabelo"
  
! #: tp/Texinfo/Convert/HTML.pm:817
  msgid "Footnotes"
  msgstr "Piednotoj"
  
! #: tp/Texinfo/Convert/HTML.pm:1504
  #, perl-brace-format
  msgid "{explained_string} ({explanation})"
  msgstr "{explained_string} ({explanation})"
  
! #: tp/Texinfo/Convert/HTML.pm:3156
  #, perl-brace-format
  msgid "see section {reference_name}"
  msgstr "konsultu la sekcion {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3159
  #, perl-brace-format
  msgid "see {reference_name}"
  msgstr "konsultu {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3164
  #, perl-brace-format
  msgid "See section {reference_name}"
  msgstr "Konsultu la sekcion {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3167
  #, perl-brace-format
  msgid "See {reference_name}"
  msgstr "Konsultu {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3171
  #, perl-brace-format
  msgid "{reference_name}"
  msgstr "{reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3233
  #, perl-brace-format
  msgid "see {reference} in @cite{{book}}"
  msgstr "konsultu {reference} en @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3237
  #, perl-brace-format
  msgid "see @cite{{book_reference}}"
  msgstr "konsultu @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3241
  #, perl-brace-format
  msgid "see `{section}' in @cite{{book}}"
  msgstr "konsultu `{section}' en @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3248
  #, perl-brace-format
  msgid "see {reference}"
  msgstr "konsultu {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3251
  #, perl-brace-format
  msgid "see `{section}'"
  msgstr "konsultu `{section}'"
  
! #: tp/Texinfo/Convert/HTML.pm:3256
  #, perl-brace-format
  msgid "See {reference} in @cite{{book}}"
  msgstr "Konsultu {reference} en @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3260
  #, perl-brace-format
  msgid "See @cite{{book_reference}}"
  msgstr "Konsultu @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3264
  #, perl-brace-format
  msgid "See `{section}' in @cite{{book}}"
  msgstr "Konsultu `{section}' en @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3271
  #, perl-brace-format
  msgid "See {reference}"
  msgstr "Konsultu {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3274
  #, perl-brace-format
  msgid "See `{section}'"
  msgstr "Konsultu `{section}'"
  
! #: tp/Texinfo/Convert/HTML.pm:3279
  #, perl-brace-format
  msgid "{reference} in @cite{{book}}"
  msgstr "{reference} en @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3283
  #, perl-brace-format
  msgid "@cite{{book_reference}}"
  msgstr "@cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3287
  #, perl-brace-format
  msgid "`{section}' in @cite{{book}}"
  msgstr "`{section}' en @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3294
  #, perl-brace-format
  msgid "{reference}"
  msgstr "{reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3297
  #, perl-brace-format
  msgid "`{section}'"
  msgstr "`{section}'"
  
! #: tp/Texinfo/Convert/HTML.pm:3410
  msgid "Jump to"
  msgstr "Salti al"
  
! #: tp/Texinfo/Convert/HTML.pm:3418
  msgid "Index Entry"
  msgstr "Indeksa Ero"
  
! #: tp/Texinfo/Convert/HTML.pm:3420
  msgid "Section"
  msgstr "Sekcio"
  
! #: tp/Texinfo/Convert/HTML.pm:4040
  #, perl-brace-format
  msgid "{category}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4045
  #, perl-brace-format
  msgid "{category}: @strong{{name}}"
  msgstr "{category}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4062
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4066
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4075
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4078
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4086
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} de {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4092
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}}"
  msgstr "{category} de {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4101
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} en {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4107
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}}"
  msgstr "{category} en {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4122
  #, perl-brace-format
  msgid ""
--- 240,764 ----
  msgstr "konsultu {title_ref}"
  
! #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2311
  #, perl-brace-format
  msgid "{abbr_or_acronym} ({explanation})"
  msgstr "{abbr_or_acronym} ({explanation})"
  
! #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2497
! #: tp/Texinfo/Convert/HTML.pm:3622
  #, perl-brace-format
  msgid "@b{{quotation_arg}:} "
  msgstr "@b{{quotation_arg}:} "
  
! #: tp/Texinfo/Convert/Plaintext.pm:1367
  msgid "(outside of any node)"
  msgstr "(for de iu ajn nodo)"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2004
  #, perl-brace-format
  msgid "{name} @url{{email}}"
  msgstr "{name} @url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2007
  #, perl-brace-format
  msgid "@url{{email}}"
  msgstr "@url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2029
  #, perl-brace-format
  msgid "{text} ({url})"
  msgstr "{text} ({url})"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2034
  #, perl-brace-format
  msgid "@t{<{url}>}"
  msgstr "@t{<{url}>}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2422 tp/Texinfo/Convert/HTML.pm:1437
  #, perl-brace-format
  msgid "@{No value for `{value}'@}"
  msgstr "@{Neniu valoro por `{value}'@}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2913
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name} {arguments}"
  msgstr "@tie{ }-- {category}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2918
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name}"
  msgstr "@tie{ }-- {category}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2931
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2934
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2943
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2946
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name}"
  msgstr "@tie{ }-- {category}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2954
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} de {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2960
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name}"
  msgstr "@tie{ }-- {category} de {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2969
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} en {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2975
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name}"
  msgstr "@tie{ }-- {category} en {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2990
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} en {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2994
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} en {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3005
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} en {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3009
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name}"
  msgstr "@tie{ }-- {category} en {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3023
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} de {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3027
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} de {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3038
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} de {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3042
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name}"
  msgstr "@tie{ }-- {category} de {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3371 tp/Texinfo/Convert/HTML.pm:2877
  #, perl-brace-format
  msgid "@center --- @emph{{author}}\n"
  msgstr "@center --- @emph{{author}}\n"
  
! #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
  msgid "Top"
  msgstr "Pinto"
  
! #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
  msgid "Contents"
  msgstr "Enhavo"
  
! #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:791
  msgid "Overview"
  msgstr "Superrigardo"
  
! #: tp/Texinfo/Convert/HTML.pm:736 tp/Texinfo/Convert/HTML.pm:767
! #: tp/Texinfo/Convert/HTML.pm:792
  msgid "Index"
  msgstr "Indekso"
  
! #: tp/Texinfo/Convert/HTML.pm:738
  msgid "current"
  msgstr "nuna"
  
! #: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
  msgid "Prev"
  msgstr "Antaue"
  
! #: tp/Texinfo/Convert/HTML.pm:742
  msgid " Up "
  msgstr " Supre "
  
! #: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:747
! #: tp/Texinfo/Convert/HTML.pm:799
  msgid "Next"
  msgstr "Sekve"
  
! #: tp/Texinfo/Convert/HTML.pm:745 tp/Texinfo/Convert/HTML.pm:798
  msgid "Up"
  msgstr "Supre"
  
! #: tp/Texinfo/Convert/HTML.pm:749
  msgid "Previous"
  msgstr "Antaue"
  
! #: tp/Texinfo/Convert/HTML.pm:750
  msgid "Forward node"
  msgstr "Antauenira nodo"
  
! #: tp/Texinfo/Convert/HTML.pm:751
  msgid "Back node"
  msgstr "Retroira nodo"
  
! #: tp/Texinfo/Convert/HTML.pm:757
  msgid "Next file"
  msgstr "Sekva dosiero"
  
! #: tp/Texinfo/Convert/HTML.pm:758
  msgid "Previous file"
  msgstr "Antaua dosiero"
  
! #: tp/Texinfo/Convert/HTML.pm:764
  msgid "Cover (top) of document"
  msgstr "Kovro (pinto) de dokumento"
  
! #: tp/Texinfo/Convert/HTML.pm:765
  msgid "Table of contents"
  msgstr "Enhavtabelo"
  
! #: tp/Texinfo/Convert/HTML.pm:766
  msgid "Short table of contents"
  msgstr "Malgranda enhavtabelo"
  
! #: tp/Texinfo/Convert/HTML.pm:768
  msgid "Current section"
  msgstr "Nuna sekcio"
  
! #: tp/Texinfo/Convert/HTML.pm:769
  msgid "Previous section in reading order"
  msgstr "Antaua sekcio lau lega ordo"
  
! #: tp/Texinfo/Convert/HTML.pm:770
  msgid "Beginning of this chapter or previous chapter"
  msgstr "Komenco de tiu @^{c} @^{c}apitro au antaua @^{c}apitro"
  
! #: tp/Texinfo/Convert/HTML.pm:771
  msgid "Previous section on same level"
  msgstr "Antaua sekcio en la sama nivelo"
  
! #: tp/Texinfo/Convert/HTML.pm:772
  msgid "Up section"
  msgstr "Supra sekcio"
  
! #: tp/Texinfo/Convert/HTML.pm:773
  msgid "Next section on same level"
  msgstr "Sekva sekcio en la sama nivelo"
  
! #: tp/Texinfo/Convert/HTML.pm:774
  msgid "Up node"
  msgstr "Supra nodo"
  
! #: tp/Texinfo/Convert/HTML.pm:775
  msgid "Next node"
  msgstr "Sekva nodo"
  
! #: tp/Texinfo/Convert/HTML.pm:776
  msgid "Previous node"
  msgstr "Antaua nodo"
  
! #: tp/Texinfo/Convert/HTML.pm:777
  msgid "Next node in node reading order"
  msgstr "Sekva nodo lau nod-lega ordo"
  
! #: tp/Texinfo/Convert/HTML.pm:778
  msgid "Previous node in node reading order"
  msgstr "Antaua nodo lau nod-lega ordo"
  
! #: tp/Texinfo/Convert/HTML.pm:779
  msgid "Next section in reading order"
  msgstr "Sekva sekcio lau lega ordo"
  
! #: tp/Texinfo/Convert/HTML.pm:780
  msgid "Next chapter"
  msgstr "Venonta @^{c}apitro"
  
! #: tp/Texinfo/Convert/HTML.pm:781
  msgid "About (help)"
  msgstr "Pri (helpo)"
  
! #: tp/Texinfo/Convert/HTML.pm:782
  msgid "First section in reading order"
  msgstr "Unua sekcio lau lega ordo"
  
! #: tp/Texinfo/Convert/HTML.pm:783
  msgid "Last section in reading order"
  msgstr "Lasta sekcio lau lega ordo"
  
! #: tp/Texinfo/Convert/HTML.pm:784
  msgid "Forward section in next file"
  msgstr "Antaueniri sekcion en la sekva dosiero"
  
! #: tp/Texinfo/Convert/HTML.pm:785
  msgid "Back section in previous file"
  msgstr "Retroiri sekcion en la antaua dosiero"
  
! #: tp/Texinfo/Convert/HTML.pm:794
  msgid "This"
  msgstr "Tio @^{c}i"
  
! #: tp/Texinfo/Convert/HTML.pm:795
  msgid "Back"
  msgstr "Retroiro"
  
! #: tp/Texinfo/Convert/HTML.pm:796
  msgid "FastBack"
  msgstr "RapidRetroiro"
  
! #: tp/Texinfo/Convert/HTML.pm:800
  msgid "NodeUp"
  msgstr "NodSupren"
  
! #: tp/Texinfo/Convert/HTML.pm:801
  msgid "NodeNext"
  msgstr "SekvaNodo"
  
! #: tp/Texinfo/Convert/HTML.pm:802
  msgid "NodePrev"
  msgstr "AntauaNodo"
  
! #: tp/Texinfo/Convert/HTML.pm:803
  msgid "NodeForward"
  msgstr "NodAntaueniro"
  
! #: tp/Texinfo/Convert/HTML.pm:804
  msgid "NodeBack"
  msgstr "NodRetroiro"
  
! #: tp/Texinfo/Convert/HTML.pm:805
  msgid "Forward"
  msgstr "Antaueniro"
  
! #: tp/Texinfo/Convert/HTML.pm:806
  msgid "FastForward"
  msgstr "RapidAntaueniro"
  
! #: tp/Texinfo/Convert/HTML.pm:807
  msgid "About"
  msgstr "Pri"
  
! #: tp/Texinfo/Convert/HTML.pm:808
  msgid "First"
  msgstr "Unua"
  
! #: tp/Texinfo/Convert/HTML.pm:809
  msgid "Last"
  msgstr "Lasta"
  
! #: tp/Texinfo/Convert/HTML.pm:810
  msgid "NextFile"
  msgstr "SekvaDosiero"
  
! #: tp/Texinfo/Convert/HTML.pm:811
  msgid "PrevFile"
  msgstr "AntauaDosiero"
  
! #: tp/Texinfo/Convert/HTML.pm:815
  msgid "About This Document"
  msgstr "Pri tiu @^{c}i Dokumento"
  
! #: tp/Texinfo/Convert/HTML.pm:816
  msgid "Table of Contents"
  msgstr "Enhavtabelo"
  
! #: tp/Texinfo/Convert/HTML.pm:817
  msgid "Short Table of Contents"
  msgstr "Malgranda Enhavtabelo"
  
! #: tp/Texinfo/Convert/HTML.pm:818
  msgid "Footnotes"
  msgstr "Piednotoj"
  
! #: tp/Texinfo/Convert/HTML.pm:1534
  #, perl-brace-format
  msgid "{explained_string} ({explanation})"
  msgstr "{explained_string} ({explanation})"
  
! #: tp/Texinfo/Convert/HTML.pm:3182
  #, perl-brace-format
  msgid "see section {reference_name}"
  msgstr "konsultu la sekcion {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3185
  #, perl-brace-format
  msgid "see {reference_name}"
  msgstr "konsultu {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3190
  #, perl-brace-format
  msgid "See section {reference_name}"
  msgstr "Konsultu la sekcion {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3193
  #, perl-brace-format
  msgid "See {reference_name}"
  msgstr "Konsultu {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3197
  #, perl-brace-format
  msgid "{reference_name}"
  msgstr "{reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3259
  #, perl-brace-format
  msgid "see {reference} in @cite{{book}}"
  msgstr "konsultu {reference} en @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3263
  #, perl-brace-format
  msgid "see @cite{{book_reference}}"
  msgstr "konsultu @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3267
  #, perl-brace-format
  msgid "see `{section}' in @cite{{book}}"
  msgstr "konsultu `{section}' en @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3274
  #, perl-brace-format
  msgid "see {reference}"
  msgstr "konsultu {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3277
  #, perl-brace-format
  msgid "see `{section}'"
  msgstr "konsultu `{section}'"
  
! #: tp/Texinfo/Convert/HTML.pm:3282
  #, perl-brace-format
  msgid "See {reference} in @cite{{book}}"
  msgstr "Konsultu {reference} en @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3286
  #, perl-brace-format
  msgid "See @cite{{book_reference}}"
  msgstr "Konsultu @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3290
  #, perl-brace-format
  msgid "See `{section}' in @cite{{book}}"
  msgstr "Konsultu `{section}' en @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3297
  #, perl-brace-format
  msgid "See {reference}"
  msgstr "Konsultu {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3300
  #, perl-brace-format
  msgid "See `{section}'"
  msgstr "Konsultu `{section}'"
  
! #: tp/Texinfo/Convert/HTML.pm:3305
  #, perl-brace-format
  msgid "{reference} in @cite{{book}}"
  msgstr "{reference} en @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3309
  #, perl-brace-format
  msgid "@cite{{book_reference}}"
  msgstr "@cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3313
  #, perl-brace-format
  msgid "`{section}' in @cite{{book}}"
  msgstr "`{section}' en @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3320
  #, perl-brace-format
  msgid "{reference}"
  msgstr "{reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3323
  #, perl-brace-format
  msgid "`{section}'"
  msgstr "`{section}'"
  
! #: tp/Texinfo/Convert/HTML.pm:3436
  msgid "Jump to"
  msgstr "Salti al"
  
! #: tp/Texinfo/Convert/HTML.pm:3444
  msgid "Index Entry"
  msgstr "Indeksa Ero"
  
! #: tp/Texinfo/Convert/HTML.pm:3446
  msgid "Section"
  msgstr "Sekcio"
  
! #: tp/Texinfo/Convert/HTML.pm:4065
  #, perl-brace-format
  msgid "{category}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4070
  #, perl-brace-format
  msgid "{category}: @strong{{name}}"
  msgstr "{category}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4087
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4091
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4100
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4103
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4111
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} de {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4117
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}}"
  msgstr "{category} de {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4126
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} en {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4132
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}}"
  msgstr "{category} en {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4147
  #, perl-brace-format
  msgid ""
***************
*** 766,770 ****
  "{category} en {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4126
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
--- 767,771 ----
  "{category} en {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4151
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
***************
*** 772,786 ****
  "{category} en {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4137
  #, perl-brace-format
  msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} en {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4141
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} en {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4155
  #, perl-brace-format
  msgid ""
--- 773,787 ----
  "{category} en {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4162
  #, perl-brace-format
  msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} en {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4166
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} en {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4180
  #, perl-brace-format
  msgid ""
***************
*** 789,793 ****
  "{category} de {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4159
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
--- 790,794 ----
  "{category} de {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4184
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
***************
*** 795,809 ****
  "{category} de {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4170
  #, perl-brace-format
  msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} de {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4174
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} de {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:6101
  #, perl-brace-format
  msgid ""
--- 796,810 ----
  "{category} de {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4195
  #, perl-brace-format
  msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} de {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4199
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} de {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:6170
  #, perl-brace-format
  msgid ""
***************
*** 814,852 ****
  "@uref{{program_homepage}, @emph{{program}}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6106
  msgid "This document was generated on @emph{@today{}}."
  msgstr "Tiu @^{c}i dokumento estis generata en @emph{@today{}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6145
  #, perl-brace-format
  msgid "{title}: {element_text}"
  msgstr "{title}: {element_text}"
  
! #: tp/Texinfo/Convert/HTML.pm:6289
  #, 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:6358
  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:6364
  msgid "Button"
  msgstr "Butono"
  
! #: tp/Texinfo/Convert/HTML.pm:6365
  msgid "Name"
  msgstr "Nomo"
  
! #: tp/Texinfo/Convert/HTML.pm:6366
  msgid "Go to"
  msgstr "Iri al"
  
! #: tp/Texinfo/Convert/HTML.pm:6367
  msgid "From 1.2.3 go to"
  msgstr "De 1.2.3 iru al"
  
! #: tp/Texinfo/Convert/HTML.pm:6393
  msgid ""
  "  where the @strong{ Example } assumes that the current position is at "
--- 815,853 ----
  "@uref{{program_homepage}, @emph{{program}}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6175
  msgid "This document was generated on @emph{@today{}}."
  msgstr "Tiu @^{c}i dokumento estis generata en @emph{@today{}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6214
  #, perl-brace-format
  msgid "{title}: {element_text}"
  msgstr "{title}: {element_text}"
  
! #: tp/Texinfo/Convert/HTML.pm:6358
  #, 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:6427
  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:6433
  msgid "Button"
  msgstr "Butono"
  
! #: tp/Texinfo/Convert/HTML.pm:6434
  msgid "Name"
  msgstr "Nomo"
  
! #: tp/Texinfo/Convert/HTML.pm:6435
  msgid "Go to"
  msgstr "Iri al"
  
! #: tp/Texinfo/Convert/HTML.pm:6436
  msgid "From 1.2.3 go to"
  msgstr "De 1.2.3 iru al"
  
! #: tp/Texinfo/Convert/HTML.pm:6462
  msgid ""
  "  where the @strong{ Example } assumes that the current position is at "
***************
*** 857,901 ****
  "@strong{ Subsubsekcio Unu-Du-Tri } de dokumento kun la jena strukturo:"
  
! #: tp/Texinfo/Convert/HTML.pm:6403
  msgid "Section One"
  msgstr "Sekcio Unu"
  
! #: tp/Texinfo/Convert/HTML.pm:6405
  msgid "Subsection One-One"
  msgstr "Subsekcio Unu-Unu"
  
! #: tp/Texinfo/Convert/HTML.pm:6412
  msgid "Subsection One-Two"
  msgstr "Subsekcio Unu-Du"
  
! #: tp/Texinfo/Convert/HTML.pm:6414
  msgid "Subsubsection One-Two-One"
  msgstr "Subsubsekcio Unu-Du-Unu"
  
! #: tp/Texinfo/Convert/HTML.pm:6415
  msgid "Subsubsection One-Two-Two"
  msgstr "Subsubsekcio Unu-Du-Du"
  
! #: tp/Texinfo/Convert/HTML.pm:6416
  msgid "Subsubsection One-Two-Three"
  msgstr "Subsubsekcio Unu-Du-Tri"
  
! #: tp/Texinfo/Convert/HTML.pm:6418
  msgid "Current Position"
  msgstr "Nuna Pozicio"
  
! #: tp/Texinfo/Convert/HTML.pm:6419
  msgid "Subsubsection One-Two-Four"
  msgstr "Subsubsekcio Unu-Du-Kvar"
  
! #: tp/Texinfo/Convert/HTML.pm:6422
  msgid "Subsection One-Three"
  msgstr "Subsekcio Unu-Tri"
  
! #: tp/Texinfo/Convert/HTML.pm:6429
  msgid "Subsection One-Four"
  msgstr "Subsekcio Unu-Kvar"
  
! #: tp/Texinfo/Convert/HTML.pm:6833
  msgid "Untitled Document"
  msgstr "Sentitola Dokumento"
--- 858,902 ----
  "@strong{ Subsubsekcio Unu-Du-Tri } de dokumento kun la jena strukturo:"
  
! #: tp/Texinfo/Convert/HTML.pm:6472
  msgid "Section One"
  msgstr "Sekcio Unu"
  
! #: tp/Texinfo/Convert/HTML.pm:6474
  msgid "Subsection One-One"
  msgstr "Subsekcio Unu-Unu"
  
! #: tp/Texinfo/Convert/HTML.pm:6481
  msgid "Subsection One-Two"
  msgstr "Subsekcio Unu-Du"
  
! #: tp/Texinfo/Convert/HTML.pm:6483
  msgid "Subsubsection One-Two-One"
  msgstr "Subsubsekcio Unu-Du-Unu"
  
! #: tp/Texinfo/Convert/HTML.pm:6484
  msgid "Subsubsection One-Two-Two"
  msgstr "Subsubsekcio Unu-Du-Du"
  
! #: tp/Texinfo/Convert/HTML.pm:6485
  msgid "Subsubsection One-Two-Three"
  msgstr "Subsubsekcio Unu-Du-Tri"
  
! #: tp/Texinfo/Convert/HTML.pm:6487
  msgid "Current Position"
  msgstr "Nuna Pozicio"
  
! #: tp/Texinfo/Convert/HTML.pm:6488
  msgid "Subsubsection One-Two-Four"
  msgstr "Subsubsekcio Unu-Du-Kvar"
  
! #: tp/Texinfo/Convert/HTML.pm:6491
  msgid "Subsection One-Three"
  msgstr "Subsekcio Unu-Tri"
  
! #: tp/Texinfo/Convert/HTML.pm:6498
  msgid "Subsection One-Four"
  msgstr "Subsekcio Unu-Kvar"
  
! #: tp/Texinfo/Convert/HTML.pm:6906
  msgid "Untitled Document"
  msgstr "Sentitola Dokumento"
Binary files texinfo-6.1/po_document/es.gmo and texinfo-6.3/po_document/es.gmo differ
diff -Nrc2 texinfo-6.1/po_document/es.po texinfo-6.3/po_document/es.po
*** texinfo-6.1/po_document/es.po	2016-02-06 11:35:58.000000000 +0000
--- texinfo-6.3/po_document/es.po	2016-09-10 12:46:00.000000000 +0100
***************
*** 9,13 ****
  "Project-Id-Version: texinfo_document-5.9.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
  "PO-Revision-Date: 2015-05-21 00:04+0200\n"
  "Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
--- 9,13 ----
  "Project-Id-Version: texinfo_document-5.9.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:46+0100\n"
  "PO-Revision-Date: 2015-05-21 00:04+0200\n"
  "Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
***************
*** 17,112 ****
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
! #: tp/Texinfo/Common.pm:717 tp/Texinfo/Common.pm:722
  msgid "Function"
  msgstr "FunciÃ³n"
  
! #: tp/Texinfo/Common.pm:718
  msgid "Macro"
  msgstr "Macro"
  
! #: tp/Texinfo/Common.pm:719
  msgid "Special Form"
  msgstr "Forma especial"
  
! #: tp/Texinfo/Common.pm:720 tp/Texinfo/Common.pm:723
  msgid "Variable"
  msgstr "Variable"
  
! #: tp/Texinfo/Common.pm:721
  msgid "User Option"
  msgstr "OpciÃ³n del usuario"
  
! #: tp/Texinfo/Common.pm:724 tp/Texinfo/Common.pm:725
  msgid "Instance Variable"
  msgstr "Variable de instancia"
  
! #: tp/Texinfo/Common.pm:726 tp/Texinfo/Common.pm:727
  msgid "Method"
  msgstr "MÃ©todo"
  
! #: tp/Texinfo/Common.pm:1199
  #, perl-brace-format
  msgid "{category} on {class}"
  msgstr "{category} en {class}"
  
! #: tp/Texinfo/Common.pm:1206
  #, perl-brace-format
  msgid "{category} of {class}"
  msgstr "{category} de {class}"
  
! #: tp/Texinfo/Common.pm:1223
  #, perl-brace-format
  msgid "{month} {day}, {year}"
  msgstr "el {day} {month} {year}"
  
! #: tp/Texinfo/Common.pm:1254 tp/Texinfo/Convert/Plaintext.pm:1132
! #: tp/Texinfo/Convert/HTML.pm:515
  #, perl-brace-format
  msgid "Appendix {number} {section_title}"
  msgstr "ApÃ©ndice {number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1258 tp/Texinfo/Convert/Plaintext.pm:1137
! #: tp/Texinfo/Convert/HTML.pm:521
  #, perl-brace-format
  msgid "{number} {section_title}"
  msgstr "{number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1393
  #, perl-brace-format
  msgid "{float_type} {float_number}: "
  msgstr "{float_type} {float_number}: "
  
! #: tp/Texinfo/Common.pm:1397
  #, perl-brace-format
  msgid "{float_type}: "
  msgstr "{float_type}: "
  
! #: tp/Texinfo/Common.pm:1402
  #, perl-brace-format
  msgid "{float_type} {float_number}\n"
  msgstr "{float_type} {float_number}\n"
  
! #: tp/Texinfo/Common.pm:1406
  #, perl-brace-format
  msgid "{float_type}\n"
  msgstr "{float_type}\n"
  
! #: tp/Texinfo/Common.pm:1412
  #, perl-brace-format
  msgid "{float_number}: "
  msgstr "{float_number}: "
  
! #: tp/Texinfo/Common.pm:1415
  #, perl-brace-format
  msgid "{float_number}\n"
  msgstr "{float_number}\n"
  
! #: tp/Texinfo/Parser.pm:2982
  #, perl-brace-format
  msgid "{name} on {class}"
  msgstr "{name} en {class}"
  
! #: tp/Texinfo/Parser.pm:2991
  #, perl-brace-format
  msgid "{name} of {class}"
--- 17,113 ----
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
+ "X-Bugs: Report translation errors to the Language-Team address.\n"
  
! #: tp/Texinfo/Common.pm:697 tp/Texinfo/Common.pm:702
  msgid "Function"
  msgstr "FunciÃ³n"
  
! #: tp/Texinfo/Common.pm:698
  msgid "Macro"
  msgstr "Macro"
  
! #: tp/Texinfo/Common.pm:699
  msgid "Special Form"
  msgstr "Forma especial"
  
! #: tp/Texinfo/Common.pm:700 tp/Texinfo/Common.pm:703
  msgid "Variable"
  msgstr "Variable"
  
! #: tp/Texinfo/Common.pm:701
  msgid "User Option"
  msgstr "OpciÃ³n del usuario"
  
! #: tp/Texinfo/Common.pm:704 tp/Texinfo/Common.pm:705
  msgid "Instance Variable"
  msgstr "Variable de instancia"
  
! #: tp/Texinfo/Common.pm:706 tp/Texinfo/Common.pm:707
  msgid "Method"
  msgstr "MÃ©todo"
  
! #: tp/Texinfo/Common.pm:1186
  #, perl-brace-format
  msgid "{category} on {class}"
  msgstr "{category} en {class}"
  
! #: tp/Texinfo/Common.pm:1193
  #, perl-brace-format
  msgid "{category} of {class}"
  msgstr "{category} de {class}"
  
! #: tp/Texinfo/Common.pm:1210
  #, perl-brace-format
  msgid "{month} {day}, {year}"
  msgstr "el {day} {month} {year}"
  
! #: tp/Texinfo/Common.pm:1241 tp/Texinfo/Convert/Plaintext.pm:1133
! #: tp/Texinfo/Convert/HTML.pm:516
  #, perl-brace-format
  msgid "Appendix {number} {section_title}"
  msgstr "ApÃ©ndice {number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1245 tp/Texinfo/Convert/Plaintext.pm:1138
! #: tp/Texinfo/Convert/HTML.pm:522
  #, perl-brace-format
  msgid "{number} {section_title}"
  msgstr "{number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1499
  #, perl-brace-format
  msgid "{float_type} {float_number}: "
  msgstr "{float_type} {float_number}: "
  
! #: tp/Texinfo/Common.pm:1503
  #, perl-brace-format
  msgid "{float_type}: "
  msgstr "{float_type}: "
  
! #: tp/Texinfo/Common.pm:1508
  #, perl-brace-format
  msgid "{float_type} {float_number}\n"
  msgstr "{float_type} {float_number}\n"
  
! #: tp/Texinfo/Common.pm:1512
  #, perl-brace-format
  msgid "{float_type}\n"
  msgstr "{float_type}\n"
  
! #: tp/Texinfo/Common.pm:1518
  #, perl-brace-format
  msgid "{float_number}: "
  msgstr "{float_number}: "
  
! #: tp/Texinfo/Common.pm:1521
  #, perl-brace-format
  msgid "{float_number}\n"
  msgstr "{float_number}\n"
  
! #: tp/Texinfo/Parser.pm:2816
  #, perl-brace-format
  msgid "{name} on {class}"
  msgstr "{name} en {class}"
  
! #: tp/Texinfo/Parser.pm:2825
  #, perl-brace-format
  msgid "{name} of {class}"
***************
*** 117,179 ****
  msgstr "error@arrow{}"
  
! #: tp/Texinfo/Convert/Converter.pm:956
  msgid "January"
  msgstr "enero"
  
! #: tp/Texinfo/Convert/Converter.pm:957
  msgid "February"
  msgstr "febrero"
  
! #: tp/Texinfo/Convert/Converter.pm:958
  msgid "March"
  msgstr "marzo"
  
! #: tp/Texinfo/Convert/Converter.pm:959
  msgid "April"
  msgstr "abril"
  
! #: tp/Texinfo/Convert/Converter.pm:960
  msgid "May"
  msgstr "mayo"
  
! #: tp/Texinfo/Convert/Converter.pm:961
  msgid "June"
  msgstr "junio"
  
! #: tp/Texinfo/Convert/Converter.pm:962
  msgid "July"
  msgstr "julio"
  
! #: tp/Texinfo/Convert/Converter.pm:963
  msgid "August"
  msgstr "agosto"
  
! #: tp/Texinfo/Convert/Converter.pm:964
  msgid "September"
  msgstr "septiembre"
  
! #: tp/Texinfo/Convert/Converter.pm:965
  msgid "October"
  msgstr "octubre"
  
! #: tp/Texinfo/Convert/Converter.pm:966
  msgid "November"
  msgstr "noviembre"
  
! #: tp/Texinfo/Convert/Converter.pm:967
  msgid "December"
  msgstr "diciembre"
  
! #: tp/Texinfo/Convert/Converter.pm:1018
  #, perl-brace-format
  msgid "{float_type} {float_number}"
  msgstr "{float_type} {float_number}"
  
! #: tp/Texinfo/Convert/Converter.pm:1022
  #, perl-brace-format
  msgid "{float_type}"
  msgstr "{float_type}"
  
! #: tp/Texinfo/Convert/Converter.pm:1026
  #, perl-brace-format
  msgid "{float_number}"
--- 118,180 ----
  msgstr "error@arrow{}"
  
! #: tp/Texinfo/Convert/Converter.pm:948
  msgid "January"
  msgstr "enero"
  
! #: tp/Texinfo/Convert/Converter.pm:949
  msgid "February"
  msgstr "febrero"
  
! #: tp/Texinfo/Convert/Converter.pm:950
  msgid "March"
  msgstr "marzo"
  
! #: tp/Texinfo/Convert/Converter.pm:951
  msgid "April"
  msgstr "abril"
  
! #: tp/Texinfo/Convert/Converter.pm:952
  msgid "May"
  msgstr "mayo"
  
! #: tp/Texinfo/Convert/Converter.pm:953
  msgid "June"
  msgstr "junio"
  
! #: tp/Texinfo/Convert/Converter.pm:954
  msgid "July"
  msgstr "julio"
  
! #: tp/Texinfo/Convert/Converter.pm:955
  msgid "August"
  msgstr "agosto"
  
! #: tp/Texinfo/Convert/Converter.pm:956
  msgid "September"
  msgstr "septiembre"
  
! #: tp/Texinfo/Convert/Converter.pm:957
  msgid "October"
  msgstr "octubre"
  
! #: tp/Texinfo/Convert/Converter.pm:958
  msgid "November"
  msgstr "noviembre"
  
! #: tp/Texinfo/Convert/Converter.pm:959
  msgid "December"
  msgstr "diciembre"
  
! #: tp/Texinfo/Convert/Converter.pm:1010
  #, perl-brace-format
  msgid "{float_type} {float_number}"
  msgstr "{float_type} {float_number}"
  
! #: tp/Texinfo/Convert/Converter.pm:1014
  #, perl-brace-format
  msgid "{float_type}"
  msgstr "{float_type}"
  
! #: tp/Texinfo/Convert/Converter.pm:1018
  #, perl-brace-format
  msgid "{float_number}"
***************
*** 210,224 ****
  msgstr "vÃ©ase la secciÃ³n ``{section_name}'' en @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3291
  #, perl-brace-format
  msgid "@cite{{book}}"
  msgstr "@cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3268
  #, perl-brace-format
  msgid "See @cite{{book}}"
  msgstr "VÃ©ase @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3245
  #, perl-brace-format
  msgid "see @cite{{book}}"
--- 211,225 ----
  msgstr "vÃ©ase la secciÃ³n ``{section_name}'' en @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3317
  #, perl-brace-format
  msgid "@cite{{book}}"
  msgstr "@cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3294
  #, perl-brace-format
  msgid "See @cite{{book}}"
  msgstr "VÃ©ase @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3271
  #, perl-brace-format
  msgid "see @cite{{book}}"
***************
*** 240,764 ****
  msgstr "vÃ©ase {title_ref}"
  
! #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2310
  #, perl-brace-format
  msgid "{abbr_or_acronym} ({explanation})"
  msgstr "{abbr_or_acronym} ({explanation})"
  
! #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2496
! #: tp/Texinfo/Convert/HTML.pm:3597
  #, perl-brace-format
  msgid "@b{{quotation_arg}:} "
  msgstr "@b{{quotation_arg}:} "
  
! #: tp/Texinfo/Convert/Plaintext.pm:1366
  msgid "(outside of any node)"
  msgstr "(fuera de todos los nodos)"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2003
  #, perl-brace-format
  msgid "{name} @url{{email}}"
  msgstr "{name} @url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2006
  #, perl-brace-format
  msgid "@url{{email}}"
  msgstr "@url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2028
  #, perl-brace-format
  msgid "{text} ({url})"
  msgstr "{text} ({url})"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2033
  #, perl-brace-format
  msgid "@t{<{url}>}"
  msgstr "@t{<{url}>}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2421 tp/Texinfo/Convert/HTML.pm:1438
  #, perl-brace-format
  msgid "@{No value for `{value}'@}"
  msgstr "@{No hay valor para `{value}'@}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2945
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name} {arguments}"
  msgstr "@tie{ }-- {category}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2950
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name}"
  msgstr "@tie{ }-- {category}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2963
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2966
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2975
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2978
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name}"
  msgstr "@tie{ }-- {category}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2986
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} de {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2992
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name}"
  msgstr "@tie{ }-- {category} de {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3001
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} en {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3007
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name}"
  msgstr "@tie{ }-- {category} en {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3022
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} en {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3026
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} en {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3037
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} en {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3041
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name}"
  msgstr "@tie{ }-- {category} en {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3055
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} de {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3059
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} de {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3070
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} de {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3074
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name}"
  msgstr "@tie{ }-- {category} de {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3403 tp/Texinfo/Convert/HTML.pm:2851
  #, perl-brace-format
  msgid "@center --- @emph{{author}}\n"
  msgstr "@center --- @emph{{author}}\n"
  
! #: tp/Texinfo/Convert/HTML.pm:732 tp/Texinfo/Convert/HTML.pm:788
  msgid "Top"
  msgstr "Arriba"
  
! #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
  msgid "Contents"
  msgstr "Ã�ndice general"
  
! #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
  msgid "Overview"
  msgstr "VisiÃ³n de conjunto"
  
! #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:766
! #: tp/Texinfo/Convert/HTML.pm:791
  msgid "Index"
  msgstr "Ã�ndice"
  
! #: tp/Texinfo/Convert/HTML.pm:737
  msgid "current"
  msgstr "actual"
  
! #: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
  msgid "Prev"
  msgstr "Ant"
  
! #: tp/Texinfo/Convert/HTML.pm:741
  msgid " Up "
  msgstr " Subir "
  
! #: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:746
! #: tp/Texinfo/Convert/HTML.pm:798
  msgid "Next"
  msgstr "Siguiente"
  
! #: tp/Texinfo/Convert/HTML.pm:744 tp/Texinfo/Convert/HTML.pm:797
  msgid "Up"
  msgstr "Subir"
  
! #: tp/Texinfo/Convert/HTML.pm:748
  msgid "Previous"
  msgstr "Anterior"
  
! #: tp/Texinfo/Convert/HTML.pm:749
  msgid "Forward node"
  msgstr "Avanzar nodo"
  
! #: tp/Texinfo/Convert/HTML.pm:750
  msgid "Back node"
  msgstr "Retroceder nodo"
  
! #: tp/Texinfo/Convert/HTML.pm:756
  msgid "Next file"
  msgstr "Archivo siguiente"
  
! #: tp/Texinfo/Convert/HTML.pm:757
  msgid "Previous file"
  msgstr "Archivo anterior"
  
! #: tp/Texinfo/Convert/HTML.pm:763
  msgid "Cover (top) of document"
  msgstr "Portada del documento"
  
! #: tp/Texinfo/Convert/HTML.pm:764
  msgid "Table of contents"
  msgstr "Ã�ndice general"
  
! #: tp/Texinfo/Convert/HTML.pm:765
  msgid "Short table of contents"
  msgstr "Resumen del contenido"
  
! #: tp/Texinfo/Convert/HTML.pm:767
  msgid "Current section"
  msgstr "SecciÃ³n actual"
  
! #: tp/Texinfo/Convert/HTML.pm:768
  msgid "Previous section in reading order"
  msgstr "SecciÃ³n anterior en orden de lectura"
  
! #: tp/Texinfo/Convert/HTML.pm:769
  msgid "Beginning of this chapter or previous chapter"
  msgstr "Inicio de este capÃ­tulo o capÃ­tulo anterior"
  
! #: tp/Texinfo/Convert/HTML.pm:770
  msgid "Previous section on same level"
  msgstr "SecciÃ³n anterior en el mismo nivel"
  
! #: tp/Texinfo/Convert/HTML.pm:771
  msgid "Up section"
  msgstr "Subir secciÃ³n"
  
! #: tp/Texinfo/Convert/HTML.pm:772
  msgid "Next section on same level"
  msgstr "SecciÃ³n siguiente en el mismo nivel"
  
! #: tp/Texinfo/Convert/HTML.pm:773
  msgid "Up node"
  msgstr "Subir nodo"
  
! #: tp/Texinfo/Convert/HTML.pm:774
  msgid "Next node"
  msgstr "Nodo siguiente"
  
! #: tp/Texinfo/Convert/HTML.pm:775
  msgid "Previous node"
  msgstr "Nodo anterior"
  
! #: tp/Texinfo/Convert/HTML.pm:776
  msgid "Next node in node reading order"
  msgstr "Nodo siguiente en orden de lectura de nodos"
  
! #: tp/Texinfo/Convert/HTML.pm:777
  msgid "Previous node in node reading order"
  msgstr "Nodo anterior en orden de lectura de nodos"
  
! #: tp/Texinfo/Convert/HTML.pm:778
  msgid "Next section in reading order"
  msgstr "SecciÃ³n siguiente en orden de lectura"
  
! #: tp/Texinfo/Convert/HTML.pm:779
  msgid "Next chapter"
  msgstr "CapÃ­tulo siguiente"
  
! #: tp/Texinfo/Convert/HTML.pm:780
  msgid "About (help)"
  msgstr "Acerca de (pÃ¡gina de ayuda)"
  
! #: tp/Texinfo/Convert/HTML.pm:781
  msgid "First section in reading order"
  msgstr "Primera secciÃ³n en orden de lectura"
  
! #: tp/Texinfo/Convert/HTML.pm:782
  msgid "Last section in reading order"
  msgstr "Ãšltima secciÃ³n en orden de lectura"
  
! #: tp/Texinfo/Convert/HTML.pm:783
  msgid "Forward section in next file"
  msgstr "Avanzar secciÃ³n en el siguiente archivo"
  
! #: tp/Texinfo/Convert/HTML.pm:784
  msgid "Back section in previous file"
  msgstr "Retroceder secciÃ³n en el archivo anterior"
  
! #: tp/Texinfo/Convert/HTML.pm:793
  msgid "This"
  msgstr "Este"
  
! #: tp/Texinfo/Convert/HTML.pm:794
  msgid "Back"
  msgstr "AtrÃ¡s"
  
! #: tp/Texinfo/Convert/HTML.pm:795
  msgid "FastBack"
  msgstr "RetrocesoRÃ¡pido"
  
! #: tp/Texinfo/Convert/HTML.pm:799
  msgid "NodeUp"
  msgstr "SubirNodo"
  
! #: tp/Texinfo/Convert/HTML.pm:800
  msgid "NodeNext"
  msgstr "NodoSiguiente"
  
! #: tp/Texinfo/Convert/HTML.pm:801
  msgid "NodePrev"
  msgstr "NodoAnterior"
  
! #: tp/Texinfo/Convert/HTML.pm:802
  msgid "NodeForward"
  msgstr "NodoAdelante"
  
! #: tp/Texinfo/Convert/HTML.pm:803
  msgid "NodeBack"
  msgstr "NodoAtrÃ¡s"
  
! #: tp/Texinfo/Convert/HTML.pm:804
  msgid "Forward"
  msgstr "Adelante"
  
! #: tp/Texinfo/Convert/HTML.pm:805
  msgid "FastForward"
  msgstr "AvanceRÃ¡pido"
  
! #: tp/Texinfo/Convert/HTML.pm:806
  msgid "About"
  msgstr "Acerca de"
  
! #: tp/Texinfo/Convert/HTML.pm:807
  msgid "First"
  msgstr "Primero"
  
! #: tp/Texinfo/Convert/HTML.pm:808
  msgid "Last"
  msgstr "Ãšltimo"
  
! #: tp/Texinfo/Convert/HTML.pm:809
  msgid "NextFile"
  msgstr "ArchivoSiguiente"
  
! #: tp/Texinfo/Convert/HTML.pm:810
  msgid "PrevFile"
  msgstr "ArchivoAnterior"
  
! #: tp/Texinfo/Convert/HTML.pm:814
  msgid "About This Document"
  msgstr "Acerca de este documento"
  
! #: tp/Texinfo/Convert/HTML.pm:815
  msgid "Table of Contents"
  msgstr "Ã�ndice general"
  
! #: tp/Texinfo/Convert/HTML.pm:816
  msgid "Short Table of Contents"
  msgstr "Resumen del contenido"
  
! #: tp/Texinfo/Convert/HTML.pm:817
  msgid "Footnotes"
  msgstr "Notas al pie"
  
! #: tp/Texinfo/Convert/HTML.pm:1504
  #, perl-brace-format
  msgid "{explained_string} ({explanation})"
  msgstr "{explained_string} ({explanation})"
  
! #: tp/Texinfo/Convert/HTML.pm:3156
  #, perl-brace-format
  msgid "see section {reference_name}"
  msgstr "vÃ©ase la secciÃ³n {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3159
  #, perl-brace-format
  msgid "see {reference_name}"
  msgstr "vÃ©ase {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3164
  #, perl-brace-format
  msgid "See section {reference_name}"
  msgstr "VÃ©ase la secciÃ³n {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3167
  #, perl-brace-format
  msgid "See {reference_name}"
  msgstr "VÃ©ase {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3171
  #, perl-brace-format
  msgid "{reference_name}"
  msgstr "{reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3233
  #, perl-brace-format
  msgid "see {reference} in @cite{{book}}"
  msgstr "vÃ©ase {reference} en @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3237
  #, perl-brace-format
  msgid "see @cite{{book_reference}}"
  msgstr "vÃ©ase @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3241
  #, perl-brace-format
  msgid "see `{section}' in @cite{{book}}"
  msgstr "vÃ©ase `{section}' en @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3248
  #, perl-brace-format
  msgid "see {reference}"
  msgstr "vÃ©ase {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3251
  #, perl-brace-format
  msgid "see `{section}'"
  msgstr "vÃ©ase `{section}'"
  
! #: tp/Texinfo/Convert/HTML.pm:3256
  #, perl-brace-format
  msgid "See {reference} in @cite{{book}}"
  msgstr "VÃ©ase {reference} en @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3260
  #, perl-brace-format
  msgid "See @cite{{book_reference}}"
  msgstr "VÃ©ase @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3264
  #, perl-brace-format
  msgid "See `{section}' in @cite{{book}}"
  msgstr "VÃ©ase `{section}' en @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3271
  #, perl-brace-format
  msgid "See {reference}"
  msgstr "VÃ©ase {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3274
  #, perl-brace-format
  msgid "See `{section}'"
  msgstr "VÃ©ase `{section}'"
  
! #: tp/Texinfo/Convert/HTML.pm:3279
  #, perl-brace-format
  msgid "{reference} in @cite{{book}}"
  msgstr "{reference} en @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3283
  #, perl-brace-format
  msgid "@cite{{book_reference}}"
  msgstr "@cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3287
  #, perl-brace-format
  msgid "`{section}' in @cite{{book}}"
  msgstr "`{section}' en @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3294
  #, perl-brace-format
  msgid "{reference}"
  msgstr "{reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3297
  #, perl-brace-format
  msgid "`{section}'"
  msgstr "`{section}'"
  
! #: tp/Texinfo/Convert/HTML.pm:3410
  msgid "Jump to"
  msgstr "Saltar a"
  
! #: tp/Texinfo/Convert/HTML.pm:3418
  msgid "Index Entry"
  msgstr "Entrada de Ã­ndice"
  
! #: tp/Texinfo/Convert/HTML.pm:3420
  msgid "Section"
  msgstr "SecciÃ³n"
  
! #: tp/Texinfo/Convert/HTML.pm:4040
  #, perl-brace-format
  msgid "{category}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4045
  #, perl-brace-format
  msgid "{category}: @strong{{name}}"
  msgstr "{category}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4062
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4066
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4075
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4078
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4086
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} de {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4092
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}}"
  msgstr "{category} de {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4101
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} en {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4107
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}}"
  msgstr "{category} en {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4122
  #, perl-brace-format
  msgid ""
--- 241,765 ----
  msgstr "vÃ©ase {title_ref}"
  
! #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2311
  #, perl-brace-format
  msgid "{abbr_or_acronym} ({explanation})"
  msgstr "{abbr_or_acronym} ({explanation})"
  
! #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2497
! #: tp/Texinfo/Convert/HTML.pm:3622
  #, perl-brace-format
  msgid "@b{{quotation_arg}:} "
  msgstr "@b{{quotation_arg}:} "
  
! #: tp/Texinfo/Convert/Plaintext.pm:1367
  msgid "(outside of any node)"
  msgstr "(fuera de todos los nodos)"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2004
  #, perl-brace-format
  msgid "{name} @url{{email}}"
  msgstr "{name} @url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2007
  #, perl-brace-format
  msgid "@url{{email}}"
  msgstr "@url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2029
  #, perl-brace-format
  msgid "{text} ({url})"
  msgstr "{text} ({url})"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2034
  #, perl-brace-format
  msgid "@t{<{url}>}"
  msgstr "@t{<{url}>}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2422 tp/Texinfo/Convert/HTML.pm:1437
  #, perl-brace-format
  msgid "@{No value for `{value}'@}"
  msgstr "@{No hay valor para `{value}'@}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2913
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name} {arguments}"
  msgstr "@tie{ }-- {category}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2918
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name}"
  msgstr "@tie{ }-- {category}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2931
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2934
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2943
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2946
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name}"
  msgstr "@tie{ }-- {category}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2954
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} de {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2960
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name}"
  msgstr "@tie{ }-- {category} de {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2969
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} en {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2975
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name}"
  msgstr "@tie{ }-- {category} en {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2990
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} en {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2994
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} en {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3005
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} en {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3009
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name}"
  msgstr "@tie{ }-- {category} en {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3023
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} de {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3027
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} de {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3038
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} de {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3042
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name}"
  msgstr "@tie{ }-- {category} de {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3371 tp/Texinfo/Convert/HTML.pm:2877
  #, perl-brace-format
  msgid "@center --- @emph{{author}}\n"
  msgstr "@center --- @emph{{author}}\n"
  
! #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
  msgid "Top"
  msgstr "Arriba"
  
! #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
  msgid "Contents"
  msgstr "Ã�ndice general"
  
! #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:791
  msgid "Overview"
  msgstr "VisiÃ³n de conjunto"
  
! #: tp/Texinfo/Convert/HTML.pm:736 tp/Texinfo/Convert/HTML.pm:767
! #: tp/Texinfo/Convert/HTML.pm:792
  msgid "Index"
  msgstr "Ã�ndice"
  
! #: tp/Texinfo/Convert/HTML.pm:738
  msgid "current"
  msgstr "actual"
  
! #: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
  msgid "Prev"
  msgstr "Ant"
  
! #: tp/Texinfo/Convert/HTML.pm:742
  msgid " Up "
  msgstr " Subir "
  
! #: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:747
! #: tp/Texinfo/Convert/HTML.pm:799
  msgid "Next"
  msgstr "Siguiente"
  
! #: tp/Texinfo/Convert/HTML.pm:745 tp/Texinfo/Convert/HTML.pm:798
  msgid "Up"
  msgstr "Subir"
  
! #: tp/Texinfo/Convert/HTML.pm:749
  msgid "Previous"
  msgstr "Anterior"
  
! #: tp/Texinfo/Convert/HTML.pm:750
  msgid "Forward node"
  msgstr "Avanzar nodo"
  
! #: tp/Texinfo/Convert/HTML.pm:751
  msgid "Back node"
  msgstr "Retroceder nodo"
  
! #: tp/Texinfo/Convert/HTML.pm:757
  msgid "Next file"
  msgstr "Archivo siguiente"
  
! #: tp/Texinfo/Convert/HTML.pm:758
  msgid "Previous file"
  msgstr "Archivo anterior"
  
! #: tp/Texinfo/Convert/HTML.pm:764
  msgid "Cover (top) of document"
  msgstr "Portada del documento"
  
! #: tp/Texinfo/Convert/HTML.pm:765
  msgid "Table of contents"
  msgstr "Ã�ndice general"
  
! #: tp/Texinfo/Convert/HTML.pm:766
  msgid "Short table of contents"
  msgstr "Resumen del contenido"
  
! #: tp/Texinfo/Convert/HTML.pm:768
  msgid "Current section"
  msgstr "SecciÃ³n actual"
  
! #: tp/Texinfo/Convert/HTML.pm:769
  msgid "Previous section in reading order"
  msgstr "SecciÃ³n anterior en orden de lectura"
  
! #: tp/Texinfo/Convert/HTML.pm:770
  msgid "Beginning of this chapter or previous chapter"
  msgstr "Inicio de este capÃ­tulo o capÃ­tulo anterior"
  
! #: tp/Texinfo/Convert/HTML.pm:771
  msgid "Previous section on same level"
  msgstr "SecciÃ³n anterior en el mismo nivel"
  
! #: tp/Texinfo/Convert/HTML.pm:772
  msgid "Up section"
  msgstr "Subir secciÃ³n"
  
! #: tp/Texinfo/Convert/HTML.pm:773
  msgid "Next section on same level"
  msgstr "SecciÃ³n siguiente en el mismo nivel"
  
! #: tp/Texinfo/Convert/HTML.pm:774
  msgid "Up node"
  msgstr "Subir nodo"
  
! #: tp/Texinfo/Convert/HTML.pm:775
  msgid "Next node"
  msgstr "Nodo siguiente"
  
! #: tp/Texinfo/Convert/HTML.pm:776
  msgid "Previous node"
  msgstr "Nodo anterior"
  
! #: tp/Texinfo/Convert/HTML.pm:777
  msgid "Next node in node reading order"
  msgstr "Nodo siguiente en orden de lectura de nodos"
  
! #: tp/Texinfo/Convert/HTML.pm:778
  msgid "Previous node in node reading order"
  msgstr "Nodo anterior en orden de lectura de nodos"
  
! #: tp/Texinfo/Convert/HTML.pm:779
  msgid "Next section in reading order"
  msgstr "SecciÃ³n siguiente en orden de lectura"
  
! #: tp/Texinfo/Convert/HTML.pm:780
  msgid "Next chapter"
  msgstr "CapÃ­tulo siguiente"
  
! #: tp/Texinfo/Convert/HTML.pm:781
  msgid "About (help)"
  msgstr "Acerca de (pÃ¡gina de ayuda)"
  
! #: tp/Texinfo/Convert/HTML.pm:782
  msgid "First section in reading order"
  msgstr "Primera secciÃ³n en orden de lectura"
  
! #: tp/Texinfo/Convert/HTML.pm:783
  msgid "Last section in reading order"
  msgstr "Ãšltima secciÃ³n en orden de lectura"
  
! #: tp/Texinfo/Convert/HTML.pm:784
  msgid "Forward section in next file"
  msgstr "Avanzar secciÃ³n en el siguiente archivo"
  
! #: tp/Texinfo/Convert/HTML.pm:785
  msgid "Back section in previous file"
  msgstr "Retroceder secciÃ³n en el archivo anterior"
  
! #: tp/Texinfo/Convert/HTML.pm:794
  msgid "This"
  msgstr "Este"
  
! #: tp/Texinfo/Convert/HTML.pm:795
  msgid "Back"
  msgstr "AtrÃ¡s"
  
! #: tp/Texinfo/Convert/HTML.pm:796
  msgid "FastBack"
  msgstr "RetrocesoRÃ¡pido"
  
! #: tp/Texinfo/Convert/HTML.pm:800
  msgid "NodeUp"
  msgstr "SubirNodo"
  
! #: tp/Texinfo/Convert/HTML.pm:801
  msgid "NodeNext"
  msgstr "NodoSiguiente"
  
! #: tp/Texinfo/Convert/HTML.pm:802
  msgid "NodePrev"
  msgstr "NodoAnterior"
  
! #: tp/Texinfo/Convert/HTML.pm:803
  msgid "NodeForward"
  msgstr "NodoAdelante"
  
! #: tp/Texinfo/Convert/HTML.pm:804
  msgid "NodeBack"
  msgstr "NodoAtrÃ¡s"
  
! #: tp/Texinfo/Convert/HTML.pm:805
  msgid "Forward"
  msgstr "Adelante"
  
! #: tp/Texinfo/Convert/HTML.pm:806
  msgid "FastForward"
  msgstr "AvanceRÃ¡pido"
  
! #: tp/Texinfo/Convert/HTML.pm:807
  msgid "About"
  msgstr "Acerca de"
  
! #: tp/Texinfo/Convert/HTML.pm:808
  msgid "First"
  msgstr "Primero"
  
! #: tp/Texinfo/Convert/HTML.pm:809
  msgid "Last"
  msgstr "Ãšltimo"
  
! #: tp/Texinfo/Convert/HTML.pm:810
  msgid "NextFile"
  msgstr "ArchivoSiguiente"
  
! #: tp/Texinfo/Convert/HTML.pm:811
  msgid "PrevFile"
  msgstr "ArchivoAnterior"
  
! #: tp/Texinfo/Convert/HTML.pm:815
  msgid "About This Document"
  msgstr "Acerca de este documento"
  
! #: tp/Texinfo/Convert/HTML.pm:816
  msgid "Table of Contents"
  msgstr "Ã�ndice general"
  
! #: tp/Texinfo/Convert/HTML.pm:817
  msgid "Short Table of Contents"
  msgstr "Resumen del contenido"
  
! #: tp/Texinfo/Convert/HTML.pm:818
  msgid "Footnotes"
  msgstr "Notas al pie"
  
! #: tp/Texinfo/Convert/HTML.pm:1534
  #, perl-brace-format
  msgid "{explained_string} ({explanation})"
  msgstr "{explained_string} ({explanation})"
  
! #: tp/Texinfo/Convert/HTML.pm:3182
  #, perl-brace-format
  msgid "see section {reference_name}"
  msgstr "vÃ©ase la secciÃ³n {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3185
  #, perl-brace-format
  msgid "see {reference_name}"
  msgstr "vÃ©ase {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3190
  #, perl-brace-format
  msgid "See section {reference_name}"
  msgstr "VÃ©ase la secciÃ³n {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3193
  #, perl-brace-format
  msgid "See {reference_name}"
  msgstr "VÃ©ase {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3197
  #, perl-brace-format
  msgid "{reference_name}"
  msgstr "{reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3259
  #, perl-brace-format
  msgid "see {reference} in @cite{{book}}"
  msgstr "vÃ©ase {reference} en @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3263
  #, perl-brace-format
  msgid "see @cite{{book_reference}}"
  msgstr "vÃ©ase @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3267
  #, perl-brace-format
  msgid "see `{section}' in @cite{{book}}"
  msgstr "vÃ©ase `{section}' en @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3274
  #, perl-brace-format
  msgid "see {reference}"
  msgstr "vÃ©ase {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3277
  #, perl-brace-format
  msgid "see `{section}'"
  msgstr "vÃ©ase `{section}'"
  
! #: tp/Texinfo/Convert/HTML.pm:3282
  #, perl-brace-format
  msgid "See {reference} in @cite{{book}}"
  msgstr "VÃ©ase {reference} en @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3286
  #, perl-brace-format
  msgid "See @cite{{book_reference}}"
  msgstr "VÃ©ase @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3290
  #, perl-brace-format
  msgid "See `{section}' in @cite{{book}}"
  msgstr "VÃ©ase `{section}' en @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3297
  #, perl-brace-format
  msgid "See {reference}"
  msgstr "VÃ©ase {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3300
  #, perl-brace-format
  msgid "See `{section}'"
  msgstr "VÃ©ase `{section}'"
  
! #: tp/Texinfo/Convert/HTML.pm:3305
  #, perl-brace-format
  msgid "{reference} in @cite{{book}}"
  msgstr "{reference} en @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3309
  #, perl-brace-format
  msgid "@cite{{book_reference}}"
  msgstr "@cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3313
  #, perl-brace-format
  msgid "`{section}' in @cite{{book}}"
  msgstr "`{section}' en @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3320
  #, perl-brace-format
  msgid "{reference}"
  msgstr "{reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3323
  #, perl-brace-format
  msgid "`{section}'"
  msgstr "`{section}'"
  
! #: tp/Texinfo/Convert/HTML.pm:3436
  msgid "Jump to"
  msgstr "Saltar a"
  
! #: tp/Texinfo/Convert/HTML.pm:3444
  msgid "Index Entry"
  msgstr "Entrada de Ã­ndice"
  
! #: tp/Texinfo/Convert/HTML.pm:3446
  msgid "Section"
  msgstr "SecciÃ³n"
  
! #: tp/Texinfo/Convert/HTML.pm:4065
  #, perl-brace-format
  msgid "{category}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4070
  #, perl-brace-format
  msgid "{category}: @strong{{name}}"
  msgstr "{category}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4087
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4091
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4100
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4103
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4111
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} de {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4117
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}}"
  msgstr "{category} de {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4126
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} en {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4132
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}}"
  msgstr "{category} en {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4147
  #, perl-brace-format
  msgid ""
***************
*** 767,771 ****
  "{category} en {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4126
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
--- 768,772 ----
  "{category} en {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4151
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
***************
*** 773,787 ****
  "{category} en {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4137
  #, perl-brace-format
  msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} en {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4141
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} en {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4155
  #, perl-brace-format
  msgid ""
--- 774,788 ----
  "{category} en {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4162
  #, perl-brace-format
  msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} en {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4166
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} en {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4180
  #, perl-brace-format
  msgid ""
***************
*** 790,794 ****
  "{category} de {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4159
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
--- 791,795 ----
  "{category} de {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4184
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
***************
*** 796,810 ****
  "{category} de {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4170
  #, perl-brace-format
  msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} de {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4174
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} de {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:6101
  #, perl-brace-format
  msgid ""
--- 797,811 ----
  "{category} de {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4195
  #, perl-brace-format
  msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} de {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4199
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} de {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:6170
  #, perl-brace-format
  msgid ""
***************
*** 815,854 ****
  "@uref{{program_homepage}, @emph{{program}}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6106
  msgid "This document was generated on @emph{@today{}}."
  msgstr "Este documento se generÃ³ el @emph{@today{}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6145
  #, perl-brace-format
  msgid "{title}: {element_text}"
  msgstr "{title}: {element_text}"
  
! #: tp/Texinfo/Convert/HTML.pm:6289
  #, 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:6358
  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:6364
  msgid "Button"
  msgstr "BotÃ³n"
  
! #: tp/Texinfo/Convert/HTML.pm:6365
  msgid "Name"
  msgstr "Nombre"
  
! #: tp/Texinfo/Convert/HTML.pm:6366
  msgid "Go to"
  msgstr "Ir a"
  
! #: tp/Texinfo/Convert/HTML.pm:6367
  msgid "From 1.2.3 go to"
  msgstr "Desde 1.2.3 ir a"
  
! #: tp/Texinfo/Convert/HTML.pm:6393
  msgid ""
  "  where the @strong{ Example } assumes that the current position is at "
--- 816,855 ----
  "@uref{{program_homepage}, @emph{{program}}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6175
  msgid "This document was generated on @emph{@today{}}."
  msgstr "Este documento se generÃ³ el @emph{@today{}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6214
  #, perl-brace-format
  msgid "{title}: {element_text}"
  msgstr "{title}: {element_text}"
  
! #: tp/Texinfo/Convert/HTML.pm:6358
  #, 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:6427
  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:6433
  msgid "Button"
  msgstr "BotÃ³n"
  
! #: tp/Texinfo/Convert/HTML.pm:6434
  msgid "Name"
  msgstr "Nombre"
  
! #: tp/Texinfo/Convert/HTML.pm:6435
  msgid "Go to"
  msgstr "Ir a"
  
! #: tp/Texinfo/Convert/HTML.pm:6436
  msgid "From 1.2.3 go to"
  msgstr "Desde 1.2.3 ir a"
  
! #: tp/Texinfo/Convert/HTML.pm:6462
  msgid ""
  "  where the @strong{ Example } assumes that the current position is at "
***************
*** 860,904 ****
  "siguiente:"
  
! #: tp/Texinfo/Convert/HTML.pm:6403
  msgid "Section One"
  msgstr "SecciÃ³n Uno"
  
! #: tp/Texinfo/Convert/HTML.pm:6405
  msgid "Subsection One-One"
  msgstr "SubsecciÃ³n uno-uno"
  
! #: tp/Texinfo/Convert/HTML.pm:6412
  msgid "Subsection One-Two"
  msgstr "SubsecciÃ³n uno-dos"
  
! #: tp/Texinfo/Convert/HTML.pm:6414
  msgid "Subsubsection One-Two-One"
  msgstr "Sub-subsecciÃ³n uno-dos-uno"
  
! #: tp/Texinfo/Convert/HTML.pm:6415
  msgid "Subsubsection One-Two-Two"
  msgstr "Sub-subsecciÃ³n uno-dos-dos"
  
! #: tp/Texinfo/Convert/HTML.pm:6416
  msgid "Subsubsection One-Two-Three"
  msgstr "Sub-subsecciÃ³n uno-dos-tres"
  
! #: tp/Texinfo/Convert/HTML.pm:6418
  msgid "Current Position"
  msgstr "PosiciÃ³n actual"
  
! #: tp/Texinfo/Convert/HTML.pm:6419
  msgid "Subsubsection One-Two-Four"
  msgstr "Sub-subsecciÃ³n uno-dos-cuatro"
  
! #: tp/Texinfo/Convert/HTML.pm:6422
  msgid "Subsection One-Three"
  msgstr "SubsecciÃ³n uno-tres"
  
! #: tp/Texinfo/Convert/HTML.pm:6429
  msgid "Subsection One-Four"
  msgstr "SubsecciÃ³n uno-cuatro"
  
! #: tp/Texinfo/Convert/HTML.pm:6833
  msgid "Untitled Document"
  msgstr "Documento sin tÃ­tulo"
--- 861,905 ----
  "siguiente:"
  
! #: tp/Texinfo/Convert/HTML.pm:6472
  msgid "Section One"
  msgstr "SecciÃ³n Uno"
  
! #: tp/Texinfo/Convert/HTML.pm:6474
  msgid "Subsection One-One"
  msgstr "SubsecciÃ³n uno-uno"
  
! #: tp/Texinfo/Convert/HTML.pm:6481
  msgid "Subsection One-Two"
  msgstr "SubsecciÃ³n uno-dos"
  
! #: tp/Texinfo/Convert/HTML.pm:6483
  msgid "Subsubsection One-Two-One"
  msgstr "Sub-subsecciÃ³n uno-dos-uno"
  
! #: tp/Texinfo/Convert/HTML.pm:6484
  msgid "Subsubsection One-Two-Two"
  msgstr "Sub-subsecciÃ³n uno-dos-dos"
  
! #: tp/Texinfo/Convert/HTML.pm:6485
  msgid "Subsubsection One-Two-Three"
  msgstr "Sub-subsecciÃ³n uno-dos-tres"
  
! #: tp/Texinfo/Convert/HTML.pm:6487
  msgid "Current Position"
  msgstr "PosiciÃ³n actual"
  
! #: tp/Texinfo/Convert/HTML.pm:6488
  msgid "Subsubsection One-Two-Four"
  msgstr "Sub-subsecciÃ³n uno-dos-cuatro"
  
! #: tp/Texinfo/Convert/HTML.pm:6491
  msgid "Subsection One-Three"
  msgstr "SubsecciÃ³n uno-tres"
  
! #: tp/Texinfo/Convert/HTML.pm:6498
  msgid "Subsection One-Four"
  msgstr "SubsecciÃ³n uno-cuatro"
  
! #: tp/Texinfo/Convert/HTML.pm:6906
  msgid "Untitled Document"
  msgstr "Documento sin tÃ­tulo"
Binary files texinfo-6.1/po_document/fr.gmo and texinfo-6.3/po_document/fr.gmo differ
diff -Nrc2 texinfo-6.1/po_document/fr.po texinfo-6.3/po_document/fr.po
*** texinfo-6.1/po_document/fr.po	2016-02-06 11:35:59.000000000 +0000
--- texinfo-6.3/po_document/fr.po	2016-09-10 12:46:00.000000000 +0100
***************
*** 7,14 ****
  msgid ""
  msgstr ""
! "Project-Id-Version: texinfo_document 6.0.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
! "PO-Revision-Date: 2015-12-23 14:42+0100\n"
  "Last-Translator: Jean-Charles Malahieude <lilyfan@orange.fr>\n"
  "Language-Team: French <traduc@traduc.org>\n"
--- 7,14 ----
  msgid ""
  msgstr ""
! "Project-Id-Version: texinfo_document 6.1.92\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:46+0100\n"
! "PO-Revision-Date: 2016-09-10 13:03+0200\n"
  "Last-Translator: Jean-Charles Malahieude <lilyfan@orange.fr>\n"
  "Language-Team: French <traduc@traduc.org>\n"
***************
*** 17,112 ****
  "Content-Type: text/plain; charset=us-ascii\n"
  "Content-Transfer-Encoding: 8bit\n"
  
! #: tp/Texinfo/Common.pm:717 tp/Texinfo/Common.pm:722
  msgid "Function"
  msgstr "Fonction"
  
! #: tp/Texinfo/Common.pm:718
  msgid "Macro"
  msgstr "Macro"
  
! #: tp/Texinfo/Common.pm:719
  msgid "Special Form"
  msgstr "Forme Sp@'eciale"
  
! #: tp/Texinfo/Common.pm:720 tp/Texinfo/Common.pm:723
  msgid "Variable"
  msgstr "Variable"
  
! #: tp/Texinfo/Common.pm:721
  msgid "User Option"
  msgstr "Option de l'utilisateur"
  
! #: tp/Texinfo/Common.pm:724 tp/Texinfo/Common.pm:725
  msgid "Instance Variable"
  msgstr "Variable d'instance"
  
! #: tp/Texinfo/Common.pm:726 tp/Texinfo/Common.pm:727
  msgid "Method"
  msgstr "M@'ethode"
  
! #: tp/Texinfo/Common.pm:1199
  #, perl-brace-format
  msgid "{category} on {class}"
  msgstr "{category} de {class}"
  
! #: tp/Texinfo/Common.pm:1206
  #, perl-brace-format
  msgid "{category} of {class}"
  msgstr "{category} de {class}"
  
! #: tp/Texinfo/Common.pm:1223
  #, perl-brace-format
  msgid "{month} {day}, {year}"
  msgstr "le {day} {month} {year}"
  
! #: tp/Texinfo/Common.pm:1254 tp/Texinfo/Convert/Plaintext.pm:1132
! #: tp/Texinfo/Convert/HTML.pm:515
  #, perl-brace-format
  msgid "Appendix {number} {section_title}"
! msgstr "Appendice {number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1258 tp/Texinfo/Convert/Plaintext.pm:1137
! #: tp/Texinfo/Convert/HTML.pm:521
  #, perl-brace-format
  msgid "{number} {section_title}"
  msgstr "{number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1393
  #, perl-brace-format
  msgid "{float_type} {float_number}: "
  msgstr "{float_type} {float_number}@ : "
  
! #: tp/Texinfo/Common.pm:1397
  #, perl-brace-format
  msgid "{float_type}: "
  msgstr "{float_type}@ : "
  
! #: tp/Texinfo/Common.pm:1402
  #, perl-brace-format
  msgid "{float_type} {float_number}\n"
  msgstr "{float_type} {float_number}\n"
  
! #: tp/Texinfo/Common.pm:1406
  #, perl-brace-format
  msgid "{float_type}\n"
  msgstr "{float_type}\n"
  
! #: tp/Texinfo/Common.pm:1412
  #, perl-brace-format
  msgid "{float_number}: "
  msgstr "{float_number}@ : "
  
! #: tp/Texinfo/Common.pm:1415
  #, perl-brace-format
  msgid "{float_number}\n"
  msgstr "{float_number}\n"
  
! #: tp/Texinfo/Parser.pm:2982
  #, perl-brace-format
  msgid "{name} on {class}"
  msgstr "{name} de {class}"
  
! #: tp/Texinfo/Parser.pm:2991
  #, perl-brace-format
  msgid "{name} of {class}"
--- 17,113 ----
  "Content-Type: text/plain; charset=us-ascii\n"
  "Content-Transfer-Encoding: 8bit\n"
+ "X-Bugs: Report translation errors to the Language-Team address.\n"
  
! #: tp/Texinfo/Common.pm:697 tp/Texinfo/Common.pm:702
  msgid "Function"
  msgstr "Fonction"
  
! #: tp/Texinfo/Common.pm:698
  msgid "Macro"
  msgstr "Macro"
  
! #: tp/Texinfo/Common.pm:699
  msgid "Special Form"
  msgstr "Forme Sp@'eciale"
  
! #: tp/Texinfo/Common.pm:700 tp/Texinfo/Common.pm:703
  msgid "Variable"
  msgstr "Variable"
  
! #: tp/Texinfo/Common.pm:701
  msgid "User Option"
  msgstr "Option de l'utilisateur"
  
! #: tp/Texinfo/Common.pm:704 tp/Texinfo/Common.pm:705
  msgid "Instance Variable"
  msgstr "Variable d'instance"
  
! #: tp/Texinfo/Common.pm:706 tp/Texinfo/Common.pm:707
  msgid "Method"
  msgstr "M@'ethode"
  
! #: tp/Texinfo/Common.pm:1186
  #, perl-brace-format
  msgid "{category} on {class}"
  msgstr "{category} de {class}"
  
! #: tp/Texinfo/Common.pm:1193
  #, perl-brace-format
  msgid "{category} of {class}"
  msgstr "{category} de {class}"
  
! #: tp/Texinfo/Common.pm:1210
  #, perl-brace-format
  msgid "{month} {day}, {year}"
  msgstr "le {day} {month} {year}"
  
! #: tp/Texinfo/Common.pm:1241 tp/Texinfo/Convert/Plaintext.pm:1133
! #: tp/Texinfo/Convert/HTML.pm:516
  #, perl-brace-format
  msgid "Appendix {number} {section_title}"
! msgstr "Annexe {number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1245 tp/Texinfo/Convert/Plaintext.pm:1138
! #: tp/Texinfo/Convert/HTML.pm:522
  #, perl-brace-format
  msgid "{number} {section_title}"
  msgstr "{number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1499
  #, perl-brace-format
  msgid "{float_type} {float_number}: "
  msgstr "{float_type} {float_number}@ : "
  
! #: tp/Texinfo/Common.pm:1503
  #, perl-brace-format
  msgid "{float_type}: "
  msgstr "{float_type}@ : "
  
! #: tp/Texinfo/Common.pm:1508
  #, perl-brace-format
  msgid "{float_type} {float_number}\n"
  msgstr "{float_type} {float_number}\n"
  
! #: tp/Texinfo/Common.pm:1512
  #, perl-brace-format
  msgid "{float_type}\n"
  msgstr "{float_type}\n"
  
! #: tp/Texinfo/Common.pm:1518
  #, perl-brace-format
  msgid "{float_number}: "
  msgstr "{float_number}@ : "
  
! #: tp/Texinfo/Common.pm:1521
  #, perl-brace-format
  msgid "{float_number}\n"
  msgstr "{float_number}\n"
  
! #: tp/Texinfo/Parser.pm:2816
  #, perl-brace-format
  msgid "{name} on {class}"
  msgstr "{name} de {class}"
  
! #: tp/Texinfo/Parser.pm:2825
  #, perl-brace-format
  msgid "{name} of {class}"
***************
*** 117,179 ****
  msgstr "erreur@arrow{}"
  
! #: tp/Texinfo/Convert/Converter.pm:956
  msgid "January"
  msgstr "janvier"
  
! #: tp/Texinfo/Convert/Converter.pm:957
  msgid "February"
  msgstr "f@'evrier"
  
! #: tp/Texinfo/Convert/Converter.pm:958
  msgid "March"
  msgstr "mars"
  
! #: tp/Texinfo/Convert/Converter.pm:959
  msgid "April"
  msgstr "avril"
  
! #: tp/Texinfo/Convert/Converter.pm:960
  msgid "May"
  msgstr "mai"
  
! #: tp/Texinfo/Convert/Converter.pm:961
  msgid "June"
  msgstr "juin"
  
! #: tp/Texinfo/Convert/Converter.pm:962
  msgid "July"
  msgstr "juillet"
  
! #: tp/Texinfo/Convert/Converter.pm:963
  msgid "August"
  msgstr "ao@^ut"
  
! #: tp/Texinfo/Convert/Converter.pm:964
  msgid "September"
  msgstr "septembre"
  
! #: tp/Texinfo/Convert/Converter.pm:965
  msgid "October"
  msgstr "octobre"
  
! #: tp/Texinfo/Convert/Converter.pm:966
  msgid "November"
  msgstr "novembre"
  
! #: tp/Texinfo/Convert/Converter.pm:967
  msgid "December"
  msgstr "d@'ecembre"
  
! #: tp/Texinfo/Convert/Converter.pm:1018
  #, perl-brace-format
  msgid "{float_type} {float_number}"
  msgstr "{float_type} {float_number}"
  
! #: tp/Texinfo/Convert/Converter.pm:1022
  #, perl-brace-format
  msgid "{float_type}"
  msgstr "{float_type}"
  
! #: tp/Texinfo/Convert/Converter.pm:1026
  #, perl-brace-format
  msgid "{float_number}"
--- 118,180 ----
  msgstr "erreur@arrow{}"
  
! #: tp/Texinfo/Convert/Converter.pm:948
  msgid "January"
  msgstr "janvier"
  
! #: tp/Texinfo/Convert/Converter.pm:949
  msgid "February"
  msgstr "f@'evrier"
  
! #: tp/Texinfo/Convert/Converter.pm:950
  msgid "March"
  msgstr "mars"
  
! #: tp/Texinfo/Convert/Converter.pm:951
  msgid "April"
  msgstr "avril"
  
! #: tp/Texinfo/Convert/Converter.pm:952
  msgid "May"
  msgstr "mai"
  
! #: tp/Texinfo/Convert/Converter.pm:953
  msgid "June"
  msgstr "juin"
  
! #: tp/Texinfo/Convert/Converter.pm:954
  msgid "July"
  msgstr "juillet"
  
! #: tp/Texinfo/Convert/Converter.pm:955
  msgid "August"
  msgstr "ao@^ut"
  
! #: tp/Texinfo/Convert/Converter.pm:956
  msgid "September"
  msgstr "septembre"
  
! #: tp/Texinfo/Convert/Converter.pm:957
  msgid "October"
  msgstr "octobre"
  
! #: tp/Texinfo/Convert/Converter.pm:958
  msgid "November"
  msgstr "novembre"
  
! #: tp/Texinfo/Convert/Converter.pm:959
  msgid "December"
  msgstr "d@'ecembre"
  
! #: tp/Texinfo/Convert/Converter.pm:1010
  #, perl-brace-format
  msgid "{float_type} {float_number}"
  msgstr "{float_type} {float_number}"
  
! #: tp/Texinfo/Convert/Converter.pm:1014
  #, perl-brace-format
  msgid "{float_type}"
  msgstr "{float_type}"
  
! #: tp/Texinfo/Convert/Converter.pm:1018
  #, perl-brace-format
  msgid "{float_number}"
***************
*** 210,224 ****
  msgstr "voir la section `{section_name}' dans @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3291
  #, perl-brace-format
  msgid "@cite{{book}}"
  msgstr "@cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3268
  #, perl-brace-format
  msgid "See @cite{{book}}"
  msgstr "Voir @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3245
  #, perl-brace-format
  msgid "see @cite{{book}}"
--- 211,225 ----
  msgstr "voir la section `{section_name}' dans @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3317
  #, perl-brace-format
  msgid "@cite{{book}}"
  msgstr "@cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3294
  #, perl-brace-format
  msgid "See @cite{{book}}"
  msgstr "Voir @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3271
  #, perl-brace-format
  msgid "see @cite{{book}}"
***************
*** 240,764 ****
  msgstr "voir {title_ref}"
  
! #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2310
  #, perl-brace-format
  msgid "{abbr_or_acronym} ({explanation})"
  msgstr "{abbr_or_acronym} ({explanation})"
  
! #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2496
! #: tp/Texinfo/Convert/HTML.pm:3597
  #, perl-brace-format
  msgid "@b{{quotation_arg}:} "
  msgstr "@b{{quotation_arg}@ :} "
  
! #: tp/Texinfo/Convert/Plaintext.pm:1366
  msgid "(outside of any node)"
  msgstr "(en dehors de tout n@oe{}ud)"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2003
  #, perl-brace-format
  msgid "{name} @url{{email}}"
  msgstr "{name} @url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2006
  #, perl-brace-format
  msgid "@url{{email}}"
  msgstr "@url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2028
  #, perl-brace-format
  msgid "{text} ({url})"
  msgstr "{text} ({url})"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2033
  #, perl-brace-format
  msgid "@t{<{url}>}"
  msgstr "@t{<{url}>}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2421 tp/Texinfo/Convert/HTML.pm:1438
  #, perl-brace-format
  msgid "@{No value for `{value}'@}"
  msgstr "@{Aucune valeur pour `{value}'@}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2945
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name} {arguments}"
  msgstr "@tie{ }-- {category}@ : {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2950
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name}"
  msgstr "@tie{ }-- {category}@ : {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2963
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category}@ :@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2966
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category}@ : {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2975
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category}@ :@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2978
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name}"
  msgstr "@tie{ }-- {category}@ : {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2986
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} de {class}@ : {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2992
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name}"
  msgstr "@tie{ }-- {category} de {class}@ : {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3001
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} de {class}@ : {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3007
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name}"
  msgstr "@tie{ }-- {category} de {class}@ : {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3022
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} de {class}@ :@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3026
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} de {class}@ : {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3037
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} de {class}@ :@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3041
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name}"
  msgstr "@tie{ }-- {category} de {class}@ : {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3055
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} de {class}@ :@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3059
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} de {class}@ : {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3070
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} de {class}@ :@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3074
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name}"
  msgstr "@tie{ }-- {category} de {class}@ : {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3403 tp/Texinfo/Convert/HTML.pm:2851
  #, perl-brace-format
  msgid "@center --- @emph{{author}}\n"
  msgstr "@center --- @emph{{author}}\n"
  
! #: tp/Texinfo/Convert/HTML.pm:732 tp/Texinfo/Convert/HTML.pm:788
  msgid "Top"
  msgstr "Racine"
  
! #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
  msgid "Contents"
  msgstr "Table des mati@`eres"
  
! #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
  msgid "Overview"
  msgstr "Vue d'ensemble"
  
! #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:766
! #: tp/Texinfo/Convert/HTML.pm:791
  msgid "Index"
  msgstr "Index"
  
! #: tp/Texinfo/Convert/HTML.pm:737
  msgid "current"
  msgstr "courante"
  
! #: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
  msgid "Prev"
  msgstr "Pr@'ec@'edent"
  
! #: tp/Texinfo/Convert/HTML.pm:741
  msgid " Up "
  msgstr "Plus haut"
  
! #: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:746
! #: tp/Texinfo/Convert/HTML.pm:798
  msgid "Next"
  msgstr "Suivant"
  
! #: tp/Texinfo/Convert/HTML.pm:744 tp/Texinfo/Convert/HTML.pm:797
  msgid "Up"
  msgstr "Monter"
  
! #: tp/Texinfo/Convert/HTML.pm:748
  msgid "Previous"
  msgstr "Pr@'ec@'edent"
  
! #: tp/Texinfo/Convert/HTML.pm:749
  msgid "Forward node"
  msgstr "Prochain n@oe{}ud"
  
! #: tp/Texinfo/Convert/HTML.pm:750
  msgid "Back node"
  msgstr "N@oe{}ud en arri@`ere"
  
! #: tp/Texinfo/Convert/HTML.pm:756
  msgid "Next file"
  msgstr "Fichier suivant"
  
! #: tp/Texinfo/Convert/HTML.pm:757
  msgid "Previous file"
  msgstr "Fichier pr@'ec@'edent"
  
! #: tp/Texinfo/Convert/HTML.pm:763
  msgid "Cover (top) of document"
  msgstr "Couverture (top) du document"
  
! #: tp/Texinfo/Convert/HTML.pm:764
  msgid "Table of contents"
  msgstr "Table des mati@`eres"
  
! #: tp/Texinfo/Convert/HTML.pm:765
  msgid "Short table of contents"
  msgstr "R@'esum@'e du contenu"
  
! #: tp/Texinfo/Convert/HTML.pm:767
  msgid "Current section"
  msgstr "Section actuelle"
  
! #: tp/Texinfo/Convert/HTML.pm:768
  msgid "Previous section in reading order"
  msgstr "Section pr@'ec@'edente dans l'ordre de lecture"
  
! #: tp/Texinfo/Convert/HTML.pm:769
  msgid "Beginning of this chapter or previous chapter"
  msgstr "D@'ebut de ce chapitre ou chapitre pr@'ec@'edent"
  
! #: tp/Texinfo/Convert/HTML.pm:770
  msgid "Previous section on same level"
  msgstr "Section pr@'ec@'edente au m@^eme niveau"
  
! #: tp/Texinfo/Convert/HTML.pm:771
  msgid "Up section"
  msgstr "Section sup@'erieure"
  
! #: tp/Texinfo/Convert/HTML.pm:772
  msgid "Next section on same level"
  msgstr "Section suivante au m@^eme niveau"
  
! #: tp/Texinfo/Convert/HTML.pm:773
  msgid "Up node"
  msgstr "N@oe{}ud au dessus"
  
! #: tp/Texinfo/Convert/HTML.pm:774
  msgid "Next node"
  msgstr "N@oe{}ud suivant"
  
! #: tp/Texinfo/Convert/HTML.pm:775
  msgid "Previous node"
  msgstr "N@oe{}ud pr@'ec@'edent"
  
! #: tp/Texinfo/Convert/HTML.pm:776
  msgid "Next node in node reading order"
! msgstr "N@oe{}ud suivante dans l'ordre de lecture"
  
! #: tp/Texinfo/Convert/HTML.pm:777
  msgid "Previous node in node reading order"
  msgstr "N@oe{}ud pr@'ec@'edent dans l'ordre de lecture"
  
! #: tp/Texinfo/Convert/HTML.pm:778
  msgid "Next section in reading order"
  msgstr "Section suivante dans l'ordre de lecture"
  
! #: tp/Texinfo/Convert/HTML.pm:779
  msgid "Next chapter"
  msgstr "Chapitre suivant"
  
! #: tp/Texinfo/Convert/HTML.pm:780
  msgid "About (help)"
  msgstr "A propos (page d'aide)"
  
! #: tp/Texinfo/Convert/HTML.pm:781
  msgid "First section in reading order"
  msgstr "Premi@`e section dans l'ordre de lecture"
  
! #: tp/Texinfo/Convert/HTML.pm:782
  msgid "Last section in reading order"
  msgstr "Derni@`ere section dans l'ordre de lecture"
  
! #: tp/Texinfo/Convert/HTML.pm:783
  msgid "Forward section in next file"
  msgstr "Section du fichier suivant"
  
! #: tp/Texinfo/Convert/HTML.pm:784
  msgid "Back section in previous file"
  msgstr "Section du fichier pr@'ec@'edent"
  
! #: tp/Texinfo/Convert/HTML.pm:793
  msgid "This"
  msgstr "Ici"
  
! #: tp/Texinfo/Convert/HTML.pm:794
  msgid "Back"
  msgstr "Arri@`ere"
  
! #: tp/Texinfo/Convert/HTML.pm:795
  msgid "FastBack"
  msgstr "RetourRapide"
  
! #: tp/Texinfo/Convert/HTML.pm:799
  msgid "NodeUp"
  msgstr "N@oe{}udMonter"
  
! #: tp/Texinfo/Convert/HTML.pm:800
  msgid "NodeNext"
  msgstr "N@oe{}udSuivant"
  
! #: tp/Texinfo/Convert/HTML.pm:801
  msgid "NodePrev"
  msgstr "N@oe{}udPr@'ec@'edent"
  
! #: tp/Texinfo/Convert/HTML.pm:802
  msgid "NodeForward"
  msgstr "ProchainN@oe{}ud"
  
! #: tp/Texinfo/Convert/HTML.pm:803
  msgid "NodeBack"
  msgstr "N@oe{}udArri@`ere"
  
! #: tp/Texinfo/Convert/HTML.pm:804
  msgid "Forward"
  msgstr "Avant"
  
! #: tp/Texinfo/Convert/HTML.pm:805
  msgid "FastForward"
  msgstr "AvanceRapide"
  
! #: tp/Texinfo/Convert/HTML.pm:806
  msgid "About"
  msgstr "A propos"
  
! #: tp/Texinfo/Convert/HTML.pm:807
  msgid "First"
  msgstr "Premier"
  
! #: tp/Texinfo/Convert/HTML.pm:808
  msgid "Last"
  msgstr "Dernier"
  
! #: tp/Texinfo/Convert/HTML.pm:809
  msgid "NextFile"
  msgstr "FichierSuivant"
  
! #: tp/Texinfo/Convert/HTML.pm:810
  msgid "PrevFile"
  msgstr "FichierPr@'ec@'edent"
  
! #: tp/Texinfo/Convert/HTML.pm:814
  msgid "About This Document"
  msgstr "A propos de ce document"
  
! #: tp/Texinfo/Convert/HTML.pm:815
  msgid "Table of Contents"
  msgstr "Table des mati@`eres"
  
! #: tp/Texinfo/Convert/HTML.pm:816
  msgid "Short Table of Contents"
  msgstr "R@'esum@'e du contenu"
  
! #: tp/Texinfo/Convert/HTML.pm:817
  msgid "Footnotes"
  msgstr "Notes de bas de page"
  
! #: tp/Texinfo/Convert/HTML.pm:1504
  #, perl-brace-format
  msgid "{explained_string} ({explanation})"
  msgstr "{explained_string} ({explanation})"
  
! #: tp/Texinfo/Convert/HTML.pm:3156
  #, perl-brace-format
  msgid "see section {reference_name}"
  msgstr "voir la section {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3159
  #, perl-brace-format
  msgid "see {reference_name}"
  msgstr "voir {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3164
  #, perl-brace-format
  msgid "See section {reference_name}"
  msgstr "Voir la section {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3167
  #, perl-brace-format
  msgid "See {reference_name}"
  msgstr "Voir {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3171
  #, perl-brace-format
  msgid "{reference_name}"
  msgstr "{reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3233
  #, perl-brace-format
  msgid "see {reference} in @cite{{book}}"
  msgstr "voir {reference} dans @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3237
  #, perl-brace-format
  msgid "see @cite{{book_reference}}"
  msgstr "voir @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3241
  #, perl-brace-format
  msgid "see `{section}' in @cite{{book}}"
  msgstr "voir `{section}' dans @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3248
  #, perl-brace-format
  msgid "see {reference}"
  msgstr "voir {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3251
  #, perl-brace-format
  msgid "see `{section}'"
  msgstr "voir `{section}'"
  
! #: tp/Texinfo/Convert/HTML.pm:3256
  #, perl-brace-format
  msgid "See {reference} in @cite{{book}}"
  msgstr "Voir {reference} dans @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3260
  #, perl-brace-format
  msgid "See @cite{{book_reference}}"
  msgstr "Voir @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3264
  #, perl-brace-format
  msgid "See `{section}' in @cite{{book}}"
  msgstr "Voir `{section}' dans @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3271
  #, perl-brace-format
  msgid "See {reference}"
  msgstr "Voir {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3274
  #, perl-brace-format
  msgid "See `{section}'"
  msgstr "Voir `{section}'"
  
! #: tp/Texinfo/Convert/HTML.pm:3279
  #, perl-brace-format
  msgid "{reference} in @cite{{book}}"
  msgstr "{reference} dans @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3283
  #, perl-brace-format
  msgid "@cite{{book_reference}}"
  msgstr "@cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3287
  #, perl-brace-format
  msgid "`{section}' in @cite{{book}}"
  msgstr "`{section}' dans @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3294
  #, perl-brace-format
  msgid "{reference}"
  msgstr "{reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3297
  #, perl-brace-format
  msgid "`{section}'"
  msgstr "`{section}'"
  
! #: tp/Texinfo/Convert/HTML.pm:3410
  msgid "Jump to"
  msgstr "Aller @`a"
  
! #: tp/Texinfo/Convert/HTML.pm:3418
  msgid "Index Entry"
  msgstr "Entr@'ee d'index"
  
! #: tp/Texinfo/Convert/HTML.pm:3420
  msgid "Section"
  msgstr "Section"
  
! #: tp/Texinfo/Convert/HTML.pm:4040
  #, perl-brace-format
  msgid "{category}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category}@ : @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4045
  #, perl-brace-format
  msgid "{category}: @strong{{name}}"
  msgstr "{category}@ : @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4062
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  msgstr "{category}@ :@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4066
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr "{category}@ : @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4075
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category}@ :@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4078
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}}"
  msgstr "{category}@ : @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4086
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} de {class}@ : @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4092
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}}"
  msgstr "{category} de {class}@ : @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4101
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} de {class}@ : @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4107
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}}"
  msgstr "{category} de {class}@ : @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4122
  #, perl-brace-format
  msgid ""
--- 241,765 ----
  msgstr "voir {title_ref}"
  
! #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2311
  #, perl-brace-format
  msgid "{abbr_or_acronym} ({explanation})"
  msgstr "{abbr_or_acronym} ({explanation})"
  
! #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2497
! #: tp/Texinfo/Convert/HTML.pm:3622
  #, perl-brace-format
  msgid "@b{{quotation_arg}:} "
  msgstr "@b{{quotation_arg}@ :} "
  
! #: tp/Texinfo/Convert/Plaintext.pm:1367
  msgid "(outside of any node)"
  msgstr "(en dehors de tout n@oe{}ud)"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2004
  #, perl-brace-format
  msgid "{name} @url{{email}}"
  msgstr "{name} @url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2007
  #, perl-brace-format
  msgid "@url{{email}}"
  msgstr "@url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2029
  #, perl-brace-format
  msgid "{text} ({url})"
  msgstr "{text} ({url})"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2034
  #, perl-brace-format
  msgid "@t{<{url}>}"
  msgstr "@t{<{url}>}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2422 tp/Texinfo/Convert/HTML.pm:1437
  #, perl-brace-format
  msgid "@{No value for `{value}'@}"
  msgstr "@{Aucune valeur pour `{value}'@}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2913
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name} {arguments}"
  msgstr "@tie{ }-- {category}@ : {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2918
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name}"
  msgstr "@tie{ }-- {category}@ : {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2931
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category}@ :@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2934
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category}@ : {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2943
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category}@ :@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2946
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name}"
  msgstr "@tie{ }-- {category}@ : {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2954
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} de {class}@ : {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2960
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name}"
  msgstr "@tie{ }-- {category} de {class}@ : {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2969
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} de {class}@ : {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2975
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name}"
  msgstr "@tie{ }-- {category} de {class}@ : {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2990
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} de {class}@ :@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2994
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} de {class}@ : {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3005
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} de {class}@ :@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3009
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name}"
  msgstr "@tie{ }-- {category} de {class}@ : {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3023
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} de {class}@ :@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3027
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} de {class}@ : {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3038
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} de {class}@ :@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3042
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name}"
  msgstr "@tie{ }-- {category} de {class}@ : {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3371 tp/Texinfo/Convert/HTML.pm:2877
  #, perl-brace-format
  msgid "@center --- @emph{{author}}\n"
  msgstr "@center --- @emph{{author}}\n"
  
! #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
  msgid "Top"
  msgstr "Racine"
  
! #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
  msgid "Contents"
  msgstr "Table des mati@`eres"
  
! #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:791
  msgid "Overview"
  msgstr "Vue d'ensemble"
  
! #: tp/Texinfo/Convert/HTML.pm:736 tp/Texinfo/Convert/HTML.pm:767
! #: tp/Texinfo/Convert/HTML.pm:792
  msgid "Index"
  msgstr "Index"
  
! #: tp/Texinfo/Convert/HTML.pm:738
  msgid "current"
  msgstr "courante"
  
! #: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
  msgid "Prev"
  msgstr "Pr@'ec@'edent"
  
! #: tp/Texinfo/Convert/HTML.pm:742
  msgid " Up "
  msgstr "Plus haut"
  
! #: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:747
! #: tp/Texinfo/Convert/HTML.pm:799
  msgid "Next"
  msgstr "Suivant"
  
! #: tp/Texinfo/Convert/HTML.pm:745 tp/Texinfo/Convert/HTML.pm:798
  msgid "Up"
  msgstr "Monter"
  
! #: tp/Texinfo/Convert/HTML.pm:749
  msgid "Previous"
  msgstr "Pr@'ec@'edent"
  
! #: tp/Texinfo/Convert/HTML.pm:750
  msgid "Forward node"
  msgstr "Prochain n@oe{}ud"
  
! #: tp/Texinfo/Convert/HTML.pm:751
  msgid "Back node"
  msgstr "N@oe{}ud en arri@`ere"
  
! #: tp/Texinfo/Convert/HTML.pm:757
  msgid "Next file"
  msgstr "Fichier suivant"
  
! #: tp/Texinfo/Convert/HTML.pm:758
  msgid "Previous file"
  msgstr "Fichier pr@'ec@'edent"
  
! #: tp/Texinfo/Convert/HTML.pm:764
  msgid "Cover (top) of document"
  msgstr "Couverture (top) du document"
  
! #: tp/Texinfo/Convert/HTML.pm:765
  msgid "Table of contents"
  msgstr "Table des mati@`eres"
  
! #: tp/Texinfo/Convert/HTML.pm:766
  msgid "Short table of contents"
  msgstr "R@'esum@'e du contenu"
  
! #: tp/Texinfo/Convert/HTML.pm:768
  msgid "Current section"
  msgstr "Section actuelle"
  
! #: tp/Texinfo/Convert/HTML.pm:769
  msgid "Previous section in reading order"
  msgstr "Section pr@'ec@'edente dans l'ordre de lecture"
  
! #: tp/Texinfo/Convert/HTML.pm:770
  msgid "Beginning of this chapter or previous chapter"
  msgstr "D@'ebut de ce chapitre ou chapitre pr@'ec@'edent"
  
! #: tp/Texinfo/Convert/HTML.pm:771
  msgid "Previous section on same level"
  msgstr "Section pr@'ec@'edente au m@^eme niveau"
  
! #: tp/Texinfo/Convert/HTML.pm:772
  msgid "Up section"
  msgstr "Section sup@'erieure"
  
! #: tp/Texinfo/Convert/HTML.pm:773
  msgid "Next section on same level"
  msgstr "Section suivante au m@^eme niveau"
  
! #: tp/Texinfo/Convert/HTML.pm:774
  msgid "Up node"
  msgstr "N@oe{}ud au dessus"
  
! #: tp/Texinfo/Convert/HTML.pm:775
  msgid "Next node"
  msgstr "N@oe{}ud suivant"
  
! #: tp/Texinfo/Convert/HTML.pm:776
  msgid "Previous node"
  msgstr "N@oe{}ud pr@'ec@'edent"
  
! #: tp/Texinfo/Convert/HTML.pm:777
  msgid "Next node in node reading order"
! msgstr "N@oe{}ud suivant dans l'ordre de lecture"
  
! #: tp/Texinfo/Convert/HTML.pm:778
  msgid "Previous node in node reading order"
  msgstr "N@oe{}ud pr@'ec@'edent dans l'ordre de lecture"
  
! #: tp/Texinfo/Convert/HTML.pm:779
  msgid "Next section in reading order"
  msgstr "Section suivante dans l'ordre de lecture"
  
! #: tp/Texinfo/Convert/HTML.pm:780
  msgid "Next chapter"
  msgstr "Chapitre suivant"
  
! #: tp/Texinfo/Convert/HTML.pm:781
  msgid "About (help)"
  msgstr "A propos (page d'aide)"
  
! #: tp/Texinfo/Convert/HTML.pm:782
  msgid "First section in reading order"
  msgstr "Premi@`e section dans l'ordre de lecture"
  
! #: tp/Texinfo/Convert/HTML.pm:783
  msgid "Last section in reading order"
  msgstr "Derni@`ere section dans l'ordre de lecture"
  
! #: tp/Texinfo/Convert/HTML.pm:784
  msgid "Forward section in next file"
  msgstr "Section du fichier suivant"
  
! #: tp/Texinfo/Convert/HTML.pm:785
  msgid "Back section in previous file"
  msgstr "Section du fichier pr@'ec@'edent"
  
! #: tp/Texinfo/Convert/HTML.pm:794
  msgid "This"
  msgstr "Ici"
  
! #: tp/Texinfo/Convert/HTML.pm:795
  msgid "Back"
  msgstr "Arri@`ere"
  
! #: tp/Texinfo/Convert/HTML.pm:796
  msgid "FastBack"
  msgstr "RetourRapide"
  
! #: tp/Texinfo/Convert/HTML.pm:800
  msgid "NodeUp"
  msgstr "N@oe{}udMonter"
  
! #: tp/Texinfo/Convert/HTML.pm:801
  msgid "NodeNext"
  msgstr "N@oe{}udSuivant"
  
! #: tp/Texinfo/Convert/HTML.pm:802
  msgid "NodePrev"
  msgstr "N@oe{}udPr@'ec@'edent"
  
! #: tp/Texinfo/Convert/HTML.pm:803
  msgid "NodeForward"
  msgstr "ProchainN@oe{}ud"
  
! #: tp/Texinfo/Convert/HTML.pm:804
  msgid "NodeBack"
  msgstr "N@oe{}udArri@`ere"
  
! #: tp/Texinfo/Convert/HTML.pm:805
  msgid "Forward"
  msgstr "Avant"
  
! #: tp/Texinfo/Convert/HTML.pm:806
  msgid "FastForward"
  msgstr "AvanceRapide"
  
! #: tp/Texinfo/Convert/HTML.pm:807
  msgid "About"
  msgstr "A propos"
  
! #: tp/Texinfo/Convert/HTML.pm:808
  msgid "First"
  msgstr "Premier"
  
! #: tp/Texinfo/Convert/HTML.pm:809
  msgid "Last"
  msgstr "Dernier"
  
! #: tp/Texinfo/Convert/HTML.pm:810
  msgid "NextFile"
  msgstr "FichierSuivant"
  
! #: tp/Texinfo/Convert/HTML.pm:811
  msgid "PrevFile"
  msgstr "FichierPr@'ec@'edent"
  
! #: tp/Texinfo/Convert/HTML.pm:815
  msgid "About This Document"
  msgstr "A propos de ce document"
  
! #: tp/Texinfo/Convert/HTML.pm:816
  msgid "Table of Contents"
  msgstr "Table des mati@`eres"
  
! #: tp/Texinfo/Convert/HTML.pm:817
  msgid "Short Table of Contents"
  msgstr "R@'esum@'e du contenu"
  
! #: tp/Texinfo/Convert/HTML.pm:818
  msgid "Footnotes"
  msgstr "Notes de bas de page"
  
! #: tp/Texinfo/Convert/HTML.pm:1534
  #, perl-brace-format
  msgid "{explained_string} ({explanation})"
  msgstr "{explained_string} ({explanation})"
  
! #: tp/Texinfo/Convert/HTML.pm:3182
  #, perl-brace-format
  msgid "see section {reference_name}"
  msgstr "voir la section {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3185
  #, perl-brace-format
  msgid "see {reference_name}"
  msgstr "voir {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3190
  #, perl-brace-format
  msgid "See section {reference_name}"
  msgstr "Voir la section {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3193
  #, perl-brace-format
  msgid "See {reference_name}"
  msgstr "Voir {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3197
  #, perl-brace-format
  msgid "{reference_name}"
  msgstr "{reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3259
  #, perl-brace-format
  msgid "see {reference} in @cite{{book}}"
  msgstr "voir {reference} dans @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3263
  #, perl-brace-format
  msgid "see @cite{{book_reference}}"
  msgstr "voir @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3267
  #, perl-brace-format
  msgid "see `{section}' in @cite{{book}}"
  msgstr "voir `{section}' dans @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3274
  #, perl-brace-format
  msgid "see {reference}"
  msgstr "voir {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3277
  #, perl-brace-format
  msgid "see `{section}'"
  msgstr "voir `{section}'"
  
! #: tp/Texinfo/Convert/HTML.pm:3282
  #, perl-brace-format
  msgid "See {reference} in @cite{{book}}"
  msgstr "Voir {reference} dans @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3286
  #, perl-brace-format
  msgid "See @cite{{book_reference}}"
  msgstr "Voir @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3290
  #, perl-brace-format
  msgid "See `{section}' in @cite{{book}}"
  msgstr "Voir `{section}' dans @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3297
  #, perl-brace-format
  msgid "See {reference}"
  msgstr "Voir {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3300
  #, perl-brace-format
  msgid "See `{section}'"
  msgstr "Voir `{section}'"
  
! #: tp/Texinfo/Convert/HTML.pm:3305
  #, perl-brace-format
  msgid "{reference} in @cite{{book}}"
  msgstr "{reference} dans @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3309
  #, perl-brace-format
  msgid "@cite{{book_reference}}"
  msgstr "@cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3313
  #, perl-brace-format
  msgid "`{section}' in @cite{{book}}"
  msgstr "`{section}' dans @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3320
  #, perl-brace-format
  msgid "{reference}"
  msgstr "{reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3323
  #, perl-brace-format
  msgid "`{section}'"
  msgstr "`{section}'"
  
! #: tp/Texinfo/Convert/HTML.pm:3436
  msgid "Jump to"
  msgstr "Aller @`a"
  
! #: tp/Texinfo/Convert/HTML.pm:3444
  msgid "Index Entry"
  msgstr "Entr@'ee d'index"
  
! #: tp/Texinfo/Convert/HTML.pm:3446
  msgid "Section"
  msgstr "Section"
  
! #: tp/Texinfo/Convert/HTML.pm:4065
  #, perl-brace-format
  msgid "{category}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category}@ : @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4070
  #, perl-brace-format
  msgid "{category}: @strong{{name}}"
  msgstr "{category}@ : @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4087
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  msgstr "{category}@ :@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4091
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr "{category}@ : @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4100
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category}@ :@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4103
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}}"
  msgstr "{category}@ : @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4111
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} de {class}@ : @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4117
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}}"
  msgstr "{category} de {class}@ : @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4126
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} de {class}@ : @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4132
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}}"
  msgstr "{category} de {class}@ : @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4147
  #, perl-brace-format
  msgid ""
***************
*** 767,771 ****
  "{category} de {class}@ :@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4126
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
--- 768,772 ----
  "{category} de {class}@ :@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4151
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
***************
*** 773,787 ****
  "{category} de {class}@ : @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4137
  #, perl-brace-format
  msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} de {class}@ :@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4141
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} de {class}@ : @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4155
  #, perl-brace-format
  msgid ""
--- 774,788 ----
  "{category} de {class}@ : @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4162
  #, perl-brace-format
  msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} de {class}@ :@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4166
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} de {class}@ : @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4180
  #, perl-brace-format
  msgid ""
***************
*** 790,794 ****
  "{category} de {class}@ :@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4159
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
--- 791,795 ----
  "{category} de {class}@ :@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4184
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
***************
*** 796,810 ****
  "{category} de {class}@ : @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4170
  #, perl-brace-format
  msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} de {class}@ :@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4174
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} de {class}@ : @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:6101
  #, perl-brace-format
  msgid ""
--- 797,811 ----
  "{category} de {class}@ : @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4195
  #, perl-brace-format
  msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} de {class}@ :@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4199
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} de {class}@ : @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:6170
  #, perl-brace-format
  msgid ""
***************
*** 813,854 ****
  msgstr ""
  "Ce document a @'et@'e g@'en@'er@'e @emph{@today{}} en utilisant "
! "@uref{{program_homepage}, @emph{{program}}}"
  
! #: tp/Texinfo/Convert/HTML.pm:6106
  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:6145
  #, perl-brace-format
  msgid "{title}: {element_text}"
  msgstr "{title}@ : {element_text}"
  
! #: tp/Texinfo/Convert/HTML.pm:6289
  #, 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:6358
  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:6364
  msgid "Button"
  msgstr "Bouton"
  
! #: tp/Texinfo/Convert/HTML.pm:6365
  msgid "Name"
  msgstr "Nom"
  
! #: tp/Texinfo/Convert/HTML.pm:6366
  msgid "Go to"
  msgstr "Aller @`a"
  
! #: tp/Texinfo/Convert/HTML.pm:6367
  msgid "From 1.2.3 go to"
  msgstr "Depuis 1.2.3 aller @`a"
  
! #: tp/Texinfo/Convert/HTML.pm:6393
  msgid ""
  "  where the @strong{ Example } assumes that the current position is at "
--- 814,855 ----
  msgstr ""
  "Ce document a @'et@'e g@'en@'er@'e @emph{@today{}} en utilisant "
! "@uref{{program_homepage}, @emph{{program}}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6175
  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:6214
  #, perl-brace-format
  msgid "{title}: {element_text}"
  msgstr "{title}@ : {element_text}"
  
! #: tp/Texinfo/Convert/HTML.pm:6358
  #, 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:6427
  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:6433
  msgid "Button"
  msgstr "Bouton"
  
! #: tp/Texinfo/Convert/HTML.pm:6434
  msgid "Name"
  msgstr "Nom"
  
! #: tp/Texinfo/Convert/HTML.pm:6435
  msgid "Go to"
  msgstr "Aller @`a"
  
! #: tp/Texinfo/Convert/HTML.pm:6436
  msgid "From 1.2.3 go to"
  msgstr "Depuis 1.2.3 aller @`a"
  
! #: tp/Texinfo/Convert/HTML.pm:6462
  msgid ""
  "  where the @strong{ Example } assumes that the current position is at "
***************
*** 859,903 ****
  "dans un document dont la structure est@ :"
  
! #: tp/Texinfo/Convert/HTML.pm:6403
  msgid "Section One"
  msgstr "Section un"
  
! #: tp/Texinfo/Convert/HTML.pm:6405
  msgid "Subsection One-One"
  msgstr "Sous-section un-un"
  
! #: tp/Texinfo/Convert/HTML.pm:6412
  msgid "Subsection One-Two"
  msgstr "Sous-section un-deux"
  
! #: tp/Texinfo/Convert/HTML.pm:6414
  msgid "Subsubsection One-Two-One"
  msgstr "Sous-sous-section un-deux-un"
  
! #: tp/Texinfo/Convert/HTML.pm:6415
  msgid "Subsubsection One-Two-Two"
  msgstr "Sous-sous-section un-deux-deux"
  
! #: tp/Texinfo/Convert/HTML.pm:6416
  msgid "Subsubsection One-Two-Three"
  msgstr "Sous-sous-section un-deux-trois"
  
! #: tp/Texinfo/Convert/HTML.pm:6418
  msgid "Current Position"
  msgstr "Position actuelle"
  
! #: tp/Texinfo/Convert/HTML.pm:6419
  msgid "Subsubsection One-Two-Four"
  msgstr "Sous-sous-section un-deux-quatre"
  
! #: tp/Texinfo/Convert/HTML.pm:6422
  msgid "Subsection One-Three"
  msgstr "Sous-section un-trois"
  
! #: tp/Texinfo/Convert/HTML.pm:6429
  msgid "Subsection One-Four"
  msgstr "Sous-section un-quatre"
  
! #: tp/Texinfo/Convert/HTML.pm:6833
  msgid "Untitled Document"
  msgstr "Document sans titre"
--- 860,904 ----
  "dans un document dont la structure est@ :"
  
! #: tp/Texinfo/Convert/HTML.pm:6472
  msgid "Section One"
  msgstr "Section un"
  
! #: tp/Texinfo/Convert/HTML.pm:6474
  msgid "Subsection One-One"
  msgstr "Sous-section un-un"
  
! #: tp/Texinfo/Convert/HTML.pm:6481
  msgid "Subsection One-Two"
  msgstr "Sous-section un-deux"
  
! #: tp/Texinfo/Convert/HTML.pm:6483
  msgid "Subsubsection One-Two-One"
  msgstr "Sous-sous-section un-deux-un"
  
! #: tp/Texinfo/Convert/HTML.pm:6484
  msgid "Subsubsection One-Two-Two"
  msgstr "Sous-sous-section un-deux-deux"
  
! #: tp/Texinfo/Convert/HTML.pm:6485
  msgid "Subsubsection One-Two-Three"
  msgstr "Sous-sous-section un-deux-trois"
  
! #: tp/Texinfo/Convert/HTML.pm:6487
  msgid "Current Position"
  msgstr "Position actuelle"
  
! #: tp/Texinfo/Convert/HTML.pm:6488
  msgid "Subsubsection One-Two-Four"
  msgstr "Sous-sous-section un-deux-quatre"
  
! #: tp/Texinfo/Convert/HTML.pm:6491
  msgid "Subsection One-Three"
  msgstr "Sous-section un-trois"
  
! #: tp/Texinfo/Convert/HTML.pm:6498
  msgid "Subsection One-Four"
  msgstr "Sous-section un-quatre"
  
! #: tp/Texinfo/Convert/HTML.pm:6906
  msgid "Untitled Document"
  msgstr "Document sans titre"
Binary files texinfo-6.1/po_document/hr.gmo and texinfo-6.3/po_document/hr.gmo differ
diff -Nrc2 texinfo-6.1/po_document/hr.po texinfo-6.3/po_document/hr.po
*** texinfo-6.1/po_document/hr.po	1970-01-01 01:00:00.000000000 +0100
--- texinfo-6.3/po_document/hr.po	2016-09-10 12:46:01.000000000 +0100
***************
*** 0 ****
--- 1,908 ----
+ # Croatian translation of texinfo_document
+ # Copyright (C) 2015 Free Software Foundation, Inc.
+ # This file is distributed under the same license as the texinfo package.
+ #
+ # BoÅ¾idar Putanec <bozidarp@yahoo.com>, 2016.
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: GNU texinfo_document 6.1.92\n"
+ "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
+ "POT-Creation-Date: 2016-09-10 12:46+0100\n"
+ "PO-Revision-Date: 2016-09-09 20:30+0200\n"
+ "Last-Translator: BoÅ¾idar Putanec <bozidarp@yahoo.com>\n"
+ "Language-Team: Croatian <lokalizacija@linux.hr>\n"
+ "Language: hr\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=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: Poedit 1.8.7.1\n"
+ "X-Poedit-SourceCharset: UTF-8\n"
+ 
+ #: tp/Texinfo/Common.pm:697 tp/Texinfo/Common.pm:702
+ msgid "Function"
+ msgstr "Funkcija"
+ 
+ #: tp/Texinfo/Common.pm:698
+ msgid "Macro"
+ msgstr "Makro"
+ 
+ #: tp/Texinfo/Common.pm:699
+ msgid "Special Form"
+ msgstr "Specijalna forma (oblik)"
+ 
+ #: tp/Texinfo/Common.pm:700 tp/Texinfo/Common.pm:703
+ msgid "Variable"
+ msgstr "Varijabla"
+ 
+ #: tp/Texinfo/Common.pm:701
+ msgid "User Option"
+ msgstr "KorisniÄ�ka opcija"
+ 
+ #: tp/Texinfo/Common.pm:704 tp/Texinfo/Common.pm:705
+ msgid "Instance Variable"
+ msgstr "Instanca (pojava ili primjer) varijable"
+ 
+ #: tp/Texinfo/Common.pm:706 tp/Texinfo/Common.pm:707
+ msgid "Method"
+ msgstr "Metoda"
+ 
+ #: tp/Texinfo/Common.pm:1186
+ #, perl-brace-format
+ msgid "{category} on {class}"
+ msgstr "{category} u {class}"
+ 
+ #: tp/Texinfo/Common.pm:1193
+ #, perl-brace-format
+ msgid "{category} of {class}"
+ msgstr "{category} od {class}"
+ 
+ #: tp/Texinfo/Common.pm:1210
+ #, perl-brace-format
+ msgid "{month} {day}, {year}"
+ msgstr "{day}. {month} {year}."
+ 
+ #: tp/Texinfo/Common.pm:1241 tp/Texinfo/Convert/Plaintext.pm:1133
+ #: tp/Texinfo/Convert/HTML.pm:516
+ #, perl-brace-format
+ msgid "Appendix {number} {section_title}"
+ msgstr "Privitak {number} {section_title}"
+ 
+ #: tp/Texinfo/Common.pm:1245 tp/Texinfo/Convert/Plaintext.pm:1138
+ #: tp/Texinfo/Convert/HTML.pm:522
+ #, perl-brace-format
+ msgid "{number} {section_title}"
+ msgstr "{number} {section_title}"
+ 
+ #: tp/Texinfo/Common.pm:1499
+ #, perl-brace-format
+ msgid "{float_type} {float_number}: "
+ msgstr "{float_type} {float_number}: "
+ 
+ #: tp/Texinfo/Common.pm:1503
+ #, perl-brace-format
+ msgid "{float_type}: "
+ msgstr "{float_type}: "
+ 
+ #: tp/Texinfo/Common.pm:1508
+ #, perl-brace-format
+ msgid "{float_type} {float_number}\n"
+ msgstr "{float_type} {float_number}\n"
+ 
+ #: tp/Texinfo/Common.pm:1512
+ #, perl-brace-format
+ msgid "{float_type}\n"
+ msgstr "{float_type}\n"
+ 
+ #: tp/Texinfo/Common.pm:1518
+ #, perl-brace-format
+ msgid "{float_number}: "
+ msgstr "{float_number}: "
+ 
+ #: tp/Texinfo/Common.pm:1521
+ #, perl-brace-format
+ msgid "{float_number}\n"
+ msgstr "{float_number}\n"
+ 
+ #: tp/Texinfo/Parser.pm:2816
+ #, perl-brace-format
+ msgid "{name} on {class}"
+ msgstr "{name} u {class}"
+ 
+ #: tp/Texinfo/Parser.pm:2825
+ #, perl-brace-format
+ msgid "{name} of {class}"
+ msgstr "{name} od {class}"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:110
+ msgid "error@arrow{}"
+ msgstr "error@arrow{}"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:948
+ msgid "January"
+ msgstr "sijeÄ�anj"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:949
+ msgid "February"
+ msgstr "veljaÄ�a"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:950
+ msgid "March"
+ msgstr "oÅ¾ujak"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:951
+ msgid "April"
+ msgstr "travanj"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:952
+ msgid "May"
+ msgstr "svibanj"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:953
+ msgid "June"
+ msgstr "lipanj"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:954
+ msgid "July"
+ msgstr "srpanj"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:955
+ msgid "August"
+ msgstr "kolovoz"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:956
+ msgid "September"
+ msgstr "rujan"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:957
+ msgid "October"
+ msgstr "listopad"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:958
+ msgid "November"
+ msgstr "studeni"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:959
+ msgid "December"
+ msgstr "prosinac"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:1010
+ #, perl-brace-format
+ msgid "{float_type} {float_number}"
+ msgstr "{float_type} {float_number}"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:1014
+ #, perl-brace-format
+ msgid "{float_type}"
+ msgstr "{float_type}"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:1018
+ #, perl-brace-format
+ msgid "{float_number}"
+ msgstr "{float_number}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:826
+ #, 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:831
+ #, perl-brace-format
+ msgid "See node @samp{{mynode}}"
+ msgstr "Pogledajte Ä�vor @samp{{mynode}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:835
+ #, perl-brace-format
+ msgid "See Info file @file{{myfile}}"
+ msgstr "Pogledajte Info datoteku @file{{myfile}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:875
+ #, perl-brace-format
+ msgid "section ``{section_name}'' in @cite{{book}}"
+ msgstr "odjeljak â€ž{section_name}â€œ u @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:880
+ #, perl-brace-format
+ msgid "See section ``{section_name}'' in @cite{{book}}"
+ msgstr "Pogledajte odjeljak â€ž{section_name}â€œ u @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:885
+ #, perl-brace-format
+ msgid "see section ``{section_name}'' in @cite{{book}}"
+ msgstr "pogledajte odjeljak â€ž{section_name}â€œ u @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3317
+ #, perl-brace-format
+ msgid "@cite{{book}}"
+ msgstr "@cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3294
+ #, perl-brace-format
+ msgid "See @cite{{book}}"
+ msgstr "Pogledajte @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3271
+ #, perl-brace-format
+ msgid "see @cite{{book}}"
+ msgstr "pogledajte @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:915
+ #, perl-brace-format
+ msgid "{title_ref}"
+ msgstr "{title_ref}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:920
+ #, perl-brace-format
+ msgid "See {title_ref}"
+ msgstr "Pogledajte {title_ref}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:925
+ #, perl-brace-format
+ msgid "see {title_ref}"
+ msgstr "pogledajte {title_ref}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2311
+ #, perl-brace-format
+ msgid "{abbr_or_acronym} ({explanation})"
+ msgstr "{abbr_or_acronym} ({explanation})"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2497
+ #: tp/Texinfo/Convert/HTML.pm:3622
+ #, perl-brace-format
+ msgid "@b{{quotation_arg}:} "
+ msgstr "@b{{quotation_arg}:} "
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:1367
+ msgid "(outside of any node)"
+ msgstr "(izvan svakog Ä�vora)"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2004
+ #, perl-brace-format
+ msgid "{name} @url{{email}}"
+ msgstr "{name} @url{{email}}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2007
+ #, perl-brace-format
+ msgid "@url{{email}}"
+ msgstr "@url{{email}}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2029
+ #, perl-brace-format
+ msgid "{text} ({url})"
+ msgstr "{text} ({url})"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2034
+ #, perl-brace-format
+ msgid "@t{<{url}>}"
+ msgstr "@t{<{url}>}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2422 tp/Texinfo/Convert/HTML.pm:1437
+ #, perl-brace-format
+ msgid "@{No value for `{value}'@}"
+ msgstr "@{nema vrijednost za â€ž{value}â€œ@}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2913
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}: {name} {arguments}"
+ msgstr "@tie{ }-- {category}: {name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2918
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}: {name}"
+ msgstr "@tie{ }-- {category}: {name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2931
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
+ msgstr "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2934
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}: {type} {name} {arguments}"
+ msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2943
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}:@*{type}@*{name}"
+ msgstr "@tie{ }-- {category}:@*{type}@*{name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2946
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}: {type} {name}"
+ msgstr "@tie{ }-- {category}: {type} {name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2954
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
+ msgstr "@tie{ }-- {category} klase {class}: {name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2960
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}: {name}"
+ msgstr "@tie{ }-- {category} klase {class}: {name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2969
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
+ msgstr "@tie{ }-- {category} na klasi {class}: {name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2975
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}: {name}"
+ msgstr "@tie{ }-- {category} na klasi {class}: {name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2990
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
+ msgstr "@tie{ }-- {category} na klasi {class}:@*{type}@*{name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2994
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
+ msgstr "@tie{ }-- {category} na klasi {class}: {type} {name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3005
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
+ msgstr "@tie{ }-- {category} na klasi {class}:@*{type}@*{name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3009
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}: {type} {name}"
+ msgstr "@tie{ }-- {category} na klasi {class}: {type} {name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3023
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
+ msgstr "@tie{ }-- {category} klase {class}:@*{type}@*{name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3027
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
+ msgstr "@tie{ }-- {category} klase {class}: {type} {name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3038
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
+ msgstr "@tie{ }-- {category} klase {class}:@*{type}@*{name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3042
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}: {type} {name}"
+ msgstr "@tie{ }-- {category} klase {class}: {type} {name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3371 tp/Texinfo/Convert/HTML.pm:2877
+ #, perl-brace-format
+ msgid "@center --- @emph{{author}}\n"
+ msgstr "@center --- @emph{{author}}\n"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
+ msgid "Top"
+ msgstr "Vrh"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
+ msgid "Contents"
+ msgstr "SadrÅ¾aj"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:791
+ msgid "Overview"
+ msgstr "Osvrt"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:736 tp/Texinfo/Convert/HTML.pm:767
+ #: tp/Texinfo/Convert/HTML.pm:792
+ msgid "Index"
+ msgstr "Indeks"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:738
+ msgid "current"
+ msgstr "trenutaÄ�no"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
+ msgid "Prev"
+ msgstr "Prethodno"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:742
+ msgid " Up "
+ msgstr " Gore "
+ 
+ #: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:747
+ #: tp/Texinfo/Convert/HTML.pm:799
+ msgid "Next"
+ msgstr "SljedeÄ‡e"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:745 tp/Texinfo/Convert/HTML.pm:798
+ msgid "Up"
+ msgstr "Gore"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:749
+ msgid "Previous"
+ msgstr "Prethodno"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:750
+ msgid "Forward node"
+ msgstr "ÄŒvor ispred"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:751
+ msgid "Back node"
+ msgstr "ÄŒvor iza"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:757
+ msgid "Next file"
+ msgstr "SljedeÄ‡a datoteka"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:758
+ msgid "Previous file"
+ msgstr "Prethodna datoteka"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:764
+ msgid "Cover (top) of document"
+ msgstr "Naslovna stranica (vrh) dokumenta"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:765
+ msgid "Table of contents"
+ msgstr "SadrÅ¾aj"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:766
+ msgid "Short table of contents"
+ msgstr "Kratki sadrÅ¾aj"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:768
+ msgid "Current section"
+ msgstr "Aktualni odjeljak"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:769
+ msgid "Previous section in reading order"
+ msgstr "Prethodni odjeljak u redoslijedu Ä�itanja"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:770
+ msgid "Beginning of this chapter or previous chapter"
+ msgstr "PoÄ�etak ovog ili prethodnog poglavlja"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:771
+ msgid "Previous section on same level"
+ msgstr "Prethodni odjeljak na istoj razini"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:772
+ msgid "Up section"
+ msgstr "Odjeljak gore"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:773
+ msgid "Next section on same level"
+ msgstr "SljedeÄ‡i odjeljak na istoj razini"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:774
+ msgid "Up node"
+ msgstr "ÄŒvor gore"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:775
+ msgid "Next node"
+ msgstr "SljedeÄ‡i Ä�vor"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:776
+ msgid "Previous node"
+ msgstr "Prethodni Ä�vor"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:777
+ msgid "Next node in node reading order"
+ msgstr "SljedeÄ‡i Ä�vor u redoslijedu Ä�itanja Ä�vorova"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:778
+ msgid "Previous node in node reading order"
+ msgstr "Prethodni Ä�vor u redoslijedu Ä�itanja Ä�vorova"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:779
+ msgid "Next section in reading order"
+ msgstr "SljedeÄ‡i odjeljak u redoslijedu Ä�itanja"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:780
+ msgid "Next chapter"
+ msgstr "SljedeÄ‡e poglavlje"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:781
+ msgid "About (help)"
+ msgstr "O programu (pomoÄ‡)"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:782
+ msgid "First section in reading order"
+ msgstr "Prvi odjeljak u redoslijedu Ä�itanja"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:783
+ msgid "Last section in reading order"
+ msgstr "Zadnji odjeljak u redoslijedu Ä�itanja"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:784
+ msgid "Forward section in next file"
+ msgstr "Prednji odjeljak u sljedeÄ‡oj datoteci"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:785
+ msgid "Back section in previous file"
+ msgstr "Zadnji odjeljak u prethodnoj datoteci"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:794
+ msgid "This"
+ msgstr "Ovaj"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:795
+ msgid "Back"
+ msgstr "Unatrag"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:796
+ msgid "FastBack"
+ msgstr "Brzo unatrag"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:800
+ msgid "NodeUp"
+ msgstr "ÄŒvor gore"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:801
+ msgid "NodeNext"
+ msgstr "SljedeÄ‡i Ä�vor"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:802
+ msgid "NodePrev"
+ msgstr "Prethodni Ä�vor"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:803
+ msgid "NodeForward"
+ msgstr "ÄŒvor unaprijed"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:804
+ msgid "NodeBack"
+ msgstr "ÄŒvor unatrag"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:805
+ msgid "Forward"
+ msgstr "Naprijed"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:806
+ msgid "FastForward"
+ msgstr "Brzo unaprijed"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:807
+ msgid "About"
+ msgstr "Obavijest"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:808
+ msgid "First"
+ msgstr "Prvo"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:809
+ msgid "Last"
+ msgstr "Zadnje"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:810
+ msgid "NextFile"
+ msgstr "SljedeÄ‡a datoteka"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:811
+ msgid "PrevFile"
+ msgstr "Prethodna datoteka"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:815
+ msgid "About This Document"
+ msgstr "O ovom dokumentu"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:816
+ msgid "Table of Contents"
+ msgstr "SadrÅ¾aj"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:817
+ msgid "Short Table of Contents"
+ msgstr "Kratki sadrÅ¾aj"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:818
+ msgid "Footnotes"
+ msgstr "Fusnote"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:1534
+ #, perl-brace-format
+ msgid "{explained_string} ({explanation})"
+ msgstr "{explained_string} ({explanation})"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3182
+ #, perl-brace-format
+ msgid "see section {reference_name}"
+ msgstr "pogledajte odjeljak {reference_name}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3185
+ #, perl-brace-format
+ msgid "see {reference_name}"
+ msgstr "pogledajte {reference_name}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3190
+ #, perl-brace-format
+ msgid "See section {reference_name}"
+ msgstr "Pogledajte odjeljak {reference_name}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3193
+ #, perl-brace-format
+ msgid "See {reference_name}"
+ msgstr "Pogledajte {reference_name}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3197
+ #, perl-brace-format
+ msgid "{reference_name}"
+ msgstr "{reference_name}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3259
+ #, perl-brace-format
+ msgid "see {reference} in @cite{{book}}"
+ msgstr "pogledajte {reference} u @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3263
+ #, perl-brace-format
+ msgid "see @cite{{book_reference}}"
+ msgstr "pogledajte @cite{{book_reference}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3267
+ #, perl-brace-format
+ msgid "see `{section}' in @cite{{book}}"
+ msgstr "pogledajte â€ž{section}â€œ u @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3274
+ #, perl-brace-format
+ msgid "see {reference}"
+ msgstr "pogledajte {reference}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3277
+ #, perl-brace-format
+ msgid "see `{section}'"
+ msgstr "pogledajte â€ž{section}â€œ"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3282
+ #, perl-brace-format
+ msgid "See {reference} in @cite{{book}}"
+ msgstr "Pogledajte {reference} u @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3286
+ #, perl-brace-format
+ msgid "See @cite{{book_reference}}"
+ msgstr "Pogledajte @cite{{book_reference}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3290
+ #, perl-brace-format
+ msgid "See `{section}' in @cite{{book}}"
+ msgstr "Pogledajte â€ž{section}â€œ u @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3297
+ #, perl-brace-format
+ msgid "See {reference}"
+ msgstr "Pogledajte {reference}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3300
+ #, perl-brace-format
+ msgid "See `{section}'"
+ msgstr "Pogledajte â€ž{section}â€œ"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3305
+ #, perl-brace-format
+ msgid "{reference} in @cite{{book}}"
+ msgstr "{reference} u @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3309
+ #, perl-brace-format
+ msgid "@cite{{book_reference}}"
+ msgstr "@cite{{book_reference}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3313
+ #, perl-brace-format
+ msgid "`{section}' in @cite{{book}}"
+ msgstr "â€ž{section}â€œ u @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3320
+ #, perl-brace-format
+ msgid "{reference}"
+ msgstr "{reference}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3323
+ #, perl-brace-format
+ msgid "`{section}'"
+ msgstr "â€ž{section}â€œ"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3436
+ msgid "Jump to"
+ msgstr "SkoÄ�i na"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3444
+ msgid "Index Entry"
+ msgstr "Stavka indeksa"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3446
+ msgid "Section"
+ msgstr "Odjeljak"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4065
+ #, perl-brace-format
+ msgid "{category}: @strong{{name}} @emph{{arguments}}"
+ msgstr "{category}: @strong{{name}} @emph{{arguments}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4070
+ #, perl-brace-format
+ msgid "{category}: @strong{{name}}"
+ msgstr "{category}: @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4087
+ #, perl-brace-format
+ msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+ msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4091
+ #, perl-brace-format
+ msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+ msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4100
+ #, perl-brace-format
+ msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
+ msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4103
+ #, perl-brace-format
+ msgid "{category}: @emph{{type}} @strong{{name}}"
+ msgstr "{category}: @emph{{type}} @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4111
+ #, perl-brace-format
+ msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
+ msgstr "{category} klase {class}: @strong{{name}} @emph{{arguments}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4117
+ #, perl-brace-format
+ msgid "{category} of {class}: @strong{{name}}"
+ msgstr "{category} klase {class}: @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4126
+ #, perl-brace-format
+ msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
+ msgstr "{category} na klasi {class}: @strong{{name}} @emph{{arguments}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4132
+ #, perl-brace-format
+ msgid "{category} on {class}: @strong{{name}}"
+ msgstr "{category} na klasi {class}: @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4147
+ #, perl-brace-format
+ msgid ""
+ "{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+ msgstr ""
+ "{category} na klasi {class}:@* @emph{{type}}@* @strong{{name}} "
+ "@emph{{arguments}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4151
+ #, perl-brace-format
+ msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+ msgstr ""
+ "{category} na klasi {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4162
+ #, perl-brace-format
+ msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
+ msgstr "{category} na klasi {class}:@* @emph{{type}}@* @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4166
+ #, perl-brace-format
+ msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
+ msgstr "{category} na klasi {class}: @emph{{type}} @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4180
+ #, perl-brace-format
+ msgid ""
+ "{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+ msgstr ""
+ "{category} klase {class}:@* @emph{{type}}@* @strong{{name}} "
+ "@emph{{arguments}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4184
+ #, perl-brace-format
+ msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+ msgstr ""
+ "{category} klase {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4195
+ #, perl-brace-format
+ msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
+ msgstr "{category} klase {class}:@* @emph{{type}}@* @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4199
+ #, perl-brace-format
+ msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
+ msgstr "{category} klase {class}: @emph{{type}} @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6170
+ #, perl-brace-format
+ msgid ""
+ "This document was generated on @emph{@today{}} using "
+ "@uref{{program_homepage}, @emph{{program}}}."
+ msgstr ""
+ "Ovaj dokument je napravljen na @emph{@today{}} rabeÄ‡i "
+ "@uref{{program_homepage}, @emph{{program}}}."
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6175
+ msgid "This document was generated on @emph{@today{}}."
+ msgstr "Ovaj dokument je napravljen na @emph{@today{}}."
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6214
+ #, perl-brace-format
+ msgid "{title}: {element_text}"
+ msgstr "{title}: {element_text}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6358
+ #, 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:6427
+ 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:6433
+ msgid "Button"
+ msgstr "Gumb"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6434
+ msgid "Name"
+ msgstr "Ime"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6435
+ msgid "Go to"
+ msgstr "Idi na/u"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6436
+ msgid "From 1.2.3 go to"
+ msgstr "Od 1.2.3 idi na/u"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6462
+ 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 ""
+ "  gdje @strong{ primjer } pretpostavlja da je trenutaÄ�na pozicija na/u "
+ "@strong{ Pododjeljak 1-2-3 } dokumenta sljedeÄ‡e strukture:"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6472
+ msgid "Section One"
+ msgstr "Odjeljak 1"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6474
+ msgid "Subsection One-One"
+ msgstr "Pododjeljak 1-1"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6481
+ msgid "Subsection One-Two"
+ msgstr "Pododjeljak 1-2"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6483
+ msgid "Subsubsection One-Two-One"
+ msgstr "Pododjeljak 1-2-1"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6484
+ msgid "Subsubsection One-Two-Two"
+ msgstr "Pododjeljak 1-2-2"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6485
+ msgid "Subsubsection One-Two-Three"
+ msgstr "Pododjeljak 1-2-3"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6487
+ msgid "Current Position"
+ msgstr "Aktualna pozicija"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6488
+ msgid "Subsubsection One-Two-Four"
+ msgstr "Pododjeljak 1-2-4"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6491
+ msgid "Subsection One-Three"
+ msgstr "Pododjeljak 1-3"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6498
+ msgid "Subsection One-Four"
+ msgstr "Pododjeljak 1-4"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6906
+ msgid "Untitled Document"
+ msgstr "Dokument bez naslova"
Binary files texinfo-6.1/po_document/hu.gmo and texinfo-6.3/po_document/hu.gmo differ
diff -Nrc2 texinfo-6.1/po_document/hu.po texinfo-6.3/po_document/hu.po
*** texinfo-6.1/po_document/hu.po	2016-02-06 11:35:59.000000000 +0000
--- texinfo-6.3/po_document/hu.po	2016-09-10 12:46:01.000000000 +0100
***************
*** 9,13 ****
  "Project-Id-Version: texinfo_document 5.9.93\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
  "PO-Revision-Date: 2015-06-14 20:39+0200\n"
  "Last-Translator: BalÃ¡zs Ãšr <urbalazs@gmail.com>\n"
--- 9,13 ----
  "Project-Id-Version: texinfo_document 5.9.93\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:46+0100\n"
  "PO-Revision-Date: 2015-06-14 20:39+0200\n"
  "Last-Translator: BalÃ¡zs Ãšr <urbalazs@gmail.com>\n"
***************
*** 17,114 ****
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  "X-Generator: Lokalize 1.2\n"
  "Plural-Forms: nplurals=2; plural=(n != 1);\n"
  
! #: tp/Texinfo/Common.pm:717 tp/Texinfo/Common.pm:722
  msgid "Function"
  msgstr "FÃ¼ggvÃ©ny"
  
! #: tp/Texinfo/Common.pm:718
  msgid "Macro"
  msgstr "MakrÃ³"
  
! #: tp/Texinfo/Common.pm:719
  msgid "Special Form"
  msgstr "SpeciÃ¡lis Å±rlap"
  
! #: tp/Texinfo/Common.pm:720 tp/Texinfo/Common.pm:723
  msgid "Variable"
  msgstr "VÃ¡ltozÃ³"
  
! #: tp/Texinfo/Common.pm:721
  msgid "User Option"
  msgstr "FelhasznÃ¡lÃ³i beÃ¡llÃ­tÃ¡s"
  
! #: tp/Texinfo/Common.pm:724 tp/Texinfo/Common.pm:725
  msgid "Instance Variable"
  msgstr "PÃ©ldÃ¡nyvÃ¡ltozÃ³"
  
! #: tp/Texinfo/Common.pm:726 tp/Texinfo/Common.pm:727
  msgid "Method"
  msgstr "MetÃ³dus"
  
! #: tp/Texinfo/Common.pm:1199
  #, perl-brace-format
  msgid "{category} on {class}"
  msgstr "{category} ezen: {class}"
  
! #: tp/Texinfo/Common.pm:1206
  #, perl-brace-format
  msgid "{category} of {class}"
  msgstr "{category} - {class}"
  
! #: tp/Texinfo/Common.pm:1223
  #, perl-brace-format
  msgid "{month} {day}, {year}"
  msgstr "{year}. {month} {day}."
  
! #: tp/Texinfo/Common.pm:1254 tp/Texinfo/Convert/Plaintext.pm:1132
! #: tp/Texinfo/Convert/HTML.pm:515
  #, perl-brace-format
  msgid "Appendix {number} {section_title}"
  msgstr "FÃ¼ggelÃ©k {number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1258 tp/Texinfo/Convert/Plaintext.pm:1137
! #: tp/Texinfo/Convert/HTML.pm:521
  #, perl-brace-format
  msgid "{number} {section_title}"
  msgstr "{number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1393
  #, perl-brace-format
  msgid "{float_type} {float_number}: "
  msgstr "{float_type} {float_number}: "
  
! #: tp/Texinfo/Common.pm:1397
  #, perl-brace-format
  msgid "{float_type}: "
  msgstr "{float_type}: "
  
! #: tp/Texinfo/Common.pm:1402
  #, perl-brace-format
  msgid "{float_type} {float_number}\n"
  msgstr "{float_type} {float_number}\n"
  
! #: tp/Texinfo/Common.pm:1406
  #, perl-brace-format
  msgid "{float_type}\n"
  msgstr "{float_type}\n"
  
! #: tp/Texinfo/Common.pm:1412
  #, perl-brace-format
  msgid "{float_number}: "
  msgstr "{float_number}: "
  
! #: tp/Texinfo/Common.pm:1415
  #, perl-brace-format
  msgid "{float_number}\n"
  msgstr "{float_number}\n"
  
! #: tp/Texinfo/Parser.pm:2982
  #, perl-brace-format
  msgid "{name} on {class}"
  msgstr "{name} ezen: {class}"
  
! #: tp/Texinfo/Parser.pm:2991
  #, perl-brace-format
  msgid "{name} of {class}"
--- 17,115 ----
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
+ "X-Bugs: Report translation errors to the Language-Team address.\n"
  "X-Generator: Lokalize 1.2\n"
  "Plural-Forms: nplurals=2; plural=(n != 1);\n"
  
! #: tp/Texinfo/Common.pm:697 tp/Texinfo/Common.pm:702
  msgid "Function"
  msgstr "FÃ¼ggvÃ©ny"
  
! #: tp/Texinfo/Common.pm:698
  msgid "Macro"
  msgstr "MakrÃ³"
  
! #: tp/Texinfo/Common.pm:699
  msgid "Special Form"
  msgstr "SpeciÃ¡lis Å±rlap"
  
! #: tp/Texinfo/Common.pm:700 tp/Texinfo/Common.pm:703
  msgid "Variable"
  msgstr "VÃ¡ltozÃ³"
  
! #: tp/Texinfo/Common.pm:701
  msgid "User Option"
  msgstr "FelhasznÃ¡lÃ³i beÃ¡llÃ­tÃ¡s"
  
! #: tp/Texinfo/Common.pm:704 tp/Texinfo/Common.pm:705
  msgid "Instance Variable"
  msgstr "PÃ©ldÃ¡nyvÃ¡ltozÃ³"
  
! #: tp/Texinfo/Common.pm:706 tp/Texinfo/Common.pm:707
  msgid "Method"
  msgstr "MetÃ³dus"
  
! #: tp/Texinfo/Common.pm:1186
  #, perl-brace-format
  msgid "{category} on {class}"
  msgstr "{category} ezen: {class}"
  
! #: tp/Texinfo/Common.pm:1193
  #, perl-brace-format
  msgid "{category} of {class}"
  msgstr "{category} - {class}"
  
! #: tp/Texinfo/Common.pm:1210
  #, perl-brace-format
  msgid "{month} {day}, {year}"
  msgstr "{year}. {month} {day}."
  
! #: tp/Texinfo/Common.pm:1241 tp/Texinfo/Convert/Plaintext.pm:1133
! #: tp/Texinfo/Convert/HTML.pm:516
  #, perl-brace-format
  msgid "Appendix {number} {section_title}"
  msgstr "FÃ¼ggelÃ©k {number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1245 tp/Texinfo/Convert/Plaintext.pm:1138
! #: tp/Texinfo/Convert/HTML.pm:522
  #, perl-brace-format
  msgid "{number} {section_title}"
  msgstr "{number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1499
  #, perl-brace-format
  msgid "{float_type} {float_number}: "
  msgstr "{float_type} {float_number}: "
  
! #: tp/Texinfo/Common.pm:1503
  #, perl-brace-format
  msgid "{float_type}: "
  msgstr "{float_type}: "
  
! #: tp/Texinfo/Common.pm:1508
  #, perl-brace-format
  msgid "{float_type} {float_number}\n"
  msgstr "{float_type} {float_number}\n"
  
! #: tp/Texinfo/Common.pm:1512
  #, perl-brace-format
  msgid "{float_type}\n"
  msgstr "{float_type}\n"
  
! #: tp/Texinfo/Common.pm:1518
  #, perl-brace-format
  msgid "{float_number}: "
  msgstr "{float_number}: "
  
! #: tp/Texinfo/Common.pm:1521
  #, perl-brace-format
  msgid "{float_number}\n"
  msgstr "{float_number}\n"
  
! #: tp/Texinfo/Parser.pm:2816
  #, perl-brace-format
  msgid "{name} on {class}"
  msgstr "{name} ezen: {class}"
  
! #: tp/Texinfo/Parser.pm:2825
  #, perl-brace-format
  msgid "{name} of {class}"
***************
*** 119,181 ****
  msgstr "error@arrow{}"
  
! #: tp/Texinfo/Convert/Converter.pm:956
  msgid "January"
  msgstr "januÃ¡r"
  
! #: tp/Texinfo/Convert/Converter.pm:957
  msgid "February"
  msgstr "februÃ¡r"
  
! #: tp/Texinfo/Convert/Converter.pm:958
  msgid "March"
  msgstr "mÃ¡rcius"
  
! #: tp/Texinfo/Convert/Converter.pm:959
  msgid "April"
  msgstr "Ã¡prilis"
  
! #: tp/Texinfo/Convert/Converter.pm:960
  msgid "May"
  msgstr "mÃ¡jus"
  
! #: tp/Texinfo/Convert/Converter.pm:961
  msgid "June"
  msgstr "jÃºnius"
  
! #: tp/Texinfo/Convert/Converter.pm:962
  msgid "July"
  msgstr "jÃºlius"
  
! #: tp/Texinfo/Convert/Converter.pm:963
  msgid "August"
  msgstr "augusztus"
  
! #: tp/Texinfo/Convert/Converter.pm:964
  msgid "September"
  msgstr "szeptember"
  
! #: tp/Texinfo/Convert/Converter.pm:965
  msgid "October"
  msgstr "oktÃ³ber"
  
! #: tp/Texinfo/Convert/Converter.pm:966
  msgid "November"
  msgstr "november"
  
! #: tp/Texinfo/Convert/Converter.pm:967
  msgid "December"
  msgstr "december"
  
! #: tp/Texinfo/Convert/Converter.pm:1018
  #, perl-brace-format
  msgid "{float_type} {float_number}"
  msgstr "{float_type} {float_number}"
  
! #: tp/Texinfo/Convert/Converter.pm:1022
  #, perl-brace-format
  msgid "{float_type}"
  msgstr "{float_type}"
  
! #: tp/Texinfo/Convert/Converter.pm:1026
  #, perl-brace-format
  msgid "{float_number}"
--- 120,182 ----
  msgstr "error@arrow{}"
  
! #: tp/Texinfo/Convert/Converter.pm:948
  msgid "January"
  msgstr "januÃ¡r"
  
! #: tp/Texinfo/Convert/Converter.pm:949
  msgid "February"
  msgstr "februÃ¡r"
  
! #: tp/Texinfo/Convert/Converter.pm:950
  msgid "March"
  msgstr "mÃ¡rcius"
  
! #: tp/Texinfo/Convert/Converter.pm:951
  msgid "April"
  msgstr "Ã¡prilis"
  
! #: tp/Texinfo/Convert/Converter.pm:952
  msgid "May"
  msgstr "mÃ¡jus"
  
! #: tp/Texinfo/Convert/Converter.pm:953
  msgid "June"
  msgstr "jÃºnius"
  
! #: tp/Texinfo/Convert/Converter.pm:954
  msgid "July"
  msgstr "jÃºlius"
  
! #: tp/Texinfo/Convert/Converter.pm:955
  msgid "August"
  msgstr "augusztus"
  
! #: tp/Texinfo/Convert/Converter.pm:956
  msgid "September"
  msgstr "szeptember"
  
! #: tp/Texinfo/Convert/Converter.pm:957
  msgid "October"
  msgstr "oktÃ³ber"
  
! #: tp/Texinfo/Convert/Converter.pm:958
  msgid "November"
  msgstr "november"
  
! #: tp/Texinfo/Convert/Converter.pm:959
  msgid "December"
  msgstr "december"
  
! #: tp/Texinfo/Convert/Converter.pm:1010
  #, perl-brace-format
  msgid "{float_type} {float_number}"
  msgstr "{float_type} {float_number}"
  
! #: tp/Texinfo/Convert/Converter.pm:1014
  #, perl-brace-format
  msgid "{float_type}"
  msgstr "{float_type}"
  
! #: tp/Texinfo/Convert/Converter.pm:1018
  #, perl-brace-format
  msgid "{float_number}"
***************
*** 212,226 ****
  msgstr "lÃ¡sd a(z) â€ž{section_name}â€� szakaszt ebben: @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3291
  #, perl-brace-format
  msgid "@cite{{book}}"
  msgstr "@cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3268
  #, perl-brace-format
  msgid "See @cite{{book}}"
  msgstr "LÃ¡sd: @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3245
  #, perl-brace-format
  msgid "see @cite{{book}}"
--- 213,227 ----
  msgstr "lÃ¡sd a(z) â€ž{section_name}â€� szakaszt ebben: @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3317
  #, perl-brace-format
  msgid "@cite{{book}}"
  msgstr "@cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3294
  #, perl-brace-format
  msgid "See @cite{{book}}"
  msgstr "LÃ¡sd: @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3271
  #, perl-brace-format
  msgid "see @cite{{book}}"
***************
*** 242,766 ****
  msgstr "lÃ¡sd: {title_ref}"
  
! #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2310
  #, perl-brace-format
  msgid "{abbr_or_acronym} ({explanation})"
  msgstr "{abbr_or_acronym} ({explanation})"
  
! #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2496
! #: tp/Texinfo/Convert/HTML.pm:3597
  #, perl-brace-format
  msgid "@b{{quotation_arg}:} "
  msgstr "@b{{quotation_arg}:} "
  
! #: tp/Texinfo/Convert/Plaintext.pm:1366
  msgid "(outside of any node)"
  msgstr "(bÃ¡rmelyik csomÃ³ponton kÃ­vÃ¼l)"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2003
  #, perl-brace-format
  msgid "{name} @url{{email}}"
  msgstr "{name} @url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2006
  #, perl-brace-format
  msgid "@url{{email}}"
  msgstr "@url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2028
  #, perl-brace-format
  msgid "{text} ({url})"
  msgstr "{text} ({url})"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2033
  #, perl-brace-format
  msgid "@t{<{url}>}"
  msgstr "@t{<{url}>}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2421 tp/Texinfo/Convert/HTML.pm:1438
  #, perl-brace-format
  msgid "@{No value for `{value}'@}"
  msgstr "@{Nincs Ã©rtÃ©k ehhez: â€ž{value}â€�@}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2945
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name} {arguments}"
  msgstr "@tie{ }-- {category}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2950
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name}"
  msgstr "@tie{ }-- {category}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2963
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2966
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2975
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2978
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name}"
  msgstr "@tie{ }-- {category}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2986
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} - {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2992
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name}"
  msgstr "@tie{ }-- {category} - {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3001
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} ezen: {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3007
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name}"
  msgstr "@tie{ }-- {category} ezen: {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3022
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} ezen: {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3026
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} ezen: {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3037
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} ezen: {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3041
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name}"
  msgstr "@tie{ }-- {category} ezen: {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3055
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} - {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3059
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} - {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3070
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} - {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3074
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name}"
  msgstr "@tie{ }-- {category} - {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3403 tp/Texinfo/Convert/HTML.pm:2851
  #, perl-brace-format
  msgid "@center --- @emph{{author}}\n"
  msgstr "@center --- @emph{{author}}\n"
  
! #: tp/Texinfo/Convert/HTML.pm:732 tp/Texinfo/Convert/HTML.pm:788
  msgid "Top"
  msgstr "CÃ­moldal"
  
! #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
  msgid "Contents"
  msgstr "Tartalom"
  
! #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
  msgid "Overview"
  msgstr "Ã�ttekintÃ©s"
  
! #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:766
! #: tp/Texinfo/Convert/HTML.pm:791
  msgid "Index"
  msgstr "TÃ¡rgymutatÃ³"
  
! #: tp/Texinfo/Convert/HTML.pm:737
  msgid "current"
  msgstr "jelenlegi"
  
! #: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
  msgid "Prev"
  msgstr "ElÅ‘zÅ‘"
  
! #: tp/Texinfo/Convert/HTML.pm:741
  msgid " Up "
  msgstr " Fel "
  
! #: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:746
! #: tp/Texinfo/Convert/HTML.pm:798
  msgid "Next"
  msgstr "KÃ¶vetkezÅ‘"
  
! #: tp/Texinfo/Convert/HTML.pm:744 tp/Texinfo/Convert/HTML.pm:797
  msgid "Up"
  msgstr "Fel"
  
! #: tp/Texinfo/Convert/HTML.pm:748
  msgid "Previous"
  msgstr "ElÅ‘zÅ‘"
  
! #: tp/Texinfo/Convert/HTML.pm:749
  msgid "Forward node"
  msgstr "ElÃ¼lsÅ‘ csomÃ³pont"
  
! #: tp/Texinfo/Convert/HTML.pm:750
  msgid "Back node"
  msgstr "HÃ¡tsÃ³ csomÃ³pont"
  
! #: tp/Texinfo/Convert/HTML.pm:756
  msgid "Next file"
  msgstr "KÃ¶vetkezÅ‘ fÃ¡jl"
  
! #: tp/Texinfo/Convert/HTML.pm:757
  msgid "Previous file"
  msgstr "ElÅ‘zÅ‘ fÃ¡jl"
  
! #: tp/Texinfo/Convert/HTML.pm:763
  msgid "Cover (top) of document"
  msgstr "Dokumentum borÃ­tÃ³ja (cÃ­moldala)"
  
! #: tp/Texinfo/Convert/HTML.pm:764
  msgid "Table of contents"
  msgstr "TartalomjegyzÃ©k"
  
! #: tp/Texinfo/Convert/HTML.pm:765
  msgid "Short table of contents"
  msgstr "RÃ¶vid tartalomjegyzÃ©k"
  
! #: tp/Texinfo/Convert/HTML.pm:767
  msgid "Current section"
  msgstr "Jelenlegi szakasz"
  
! #: tp/Texinfo/Convert/HTML.pm:768
  msgid "Previous section in reading order"
  msgstr "ElÅ‘zÅ‘ szakasz az olvasÃ¡si sorrendben"
  
! #: tp/Texinfo/Convert/HTML.pm:769
  msgid "Beginning of this chapter or previous chapter"
  msgstr "Ezen fejezet eleje vagy elÅ‘zÅ‘ fejezet"
  
! #: tp/Texinfo/Convert/HTML.pm:770
  msgid "Previous section on same level"
  msgstr "ElÅ‘zÅ‘ szakasz ugyanazon a szinten"
  
! #: tp/Texinfo/Convert/HTML.pm:771
  msgid "Up section"
  msgstr "SzÃ¼lÅ‘ szakasz"
  
! #: tp/Texinfo/Convert/HTML.pm:772
  msgid "Next section on same level"
  msgstr "KÃ¶vetkezÅ‘ szakasz ugyanazon a szinten"
  
! #: tp/Texinfo/Convert/HTML.pm:773
  msgid "Up node"
  msgstr "SzÃ¼lÅ‘ csomÃ³pont"
  
! #: tp/Texinfo/Convert/HTML.pm:774
  msgid "Next node"
  msgstr "KÃ¶vetkezÅ‘ csomÃ³pont"
  
! #: tp/Texinfo/Convert/HTML.pm:775
  msgid "Previous node"
  msgstr "ElÅ‘zÅ‘ csomÃ³pont"
  
! #: tp/Texinfo/Convert/HTML.pm:776
  msgid "Next node in node reading order"
  msgstr "KÃ¶vetkezÅ‘ csomÃ³pont a csomÃ³pont olvasÃ¡si sorrendben"
  
! #: tp/Texinfo/Convert/HTML.pm:777
  msgid "Previous node in node reading order"
  msgstr "ElÅ‘zÅ‘ csomÃ³pont a csomÃ³pont olvasÃ¡si sorrendben"
  
! #: tp/Texinfo/Convert/HTML.pm:778
  msgid "Next section in reading order"
  msgstr "KÃ¶vetkezÅ‘ szakasz az olvasÃ¡si sorrendben"
  
! #: tp/Texinfo/Convert/HTML.pm:779
  msgid "Next chapter"
  msgstr "KÃ¶vetkezÅ‘ fejezet"
  
! #: tp/Texinfo/Convert/HTML.pm:780
  msgid "About (help)"
  msgstr "NÃ©vjegy (sÃºgÃ³)"
  
! #: tp/Texinfo/Convert/HTML.pm:781
  msgid "First section in reading order"
  msgstr "ElsÅ‘ szakasz az olvasÃ¡si sorrendben"
  
! #: tp/Texinfo/Convert/HTML.pm:782
  msgid "Last section in reading order"
  msgstr "UtolsÃ³ szakasz az olvasÃ¡si sorrendben"
  
! #: tp/Texinfo/Convert/HTML.pm:783
  msgid "Forward section in next file"
  msgstr "ElÃ¼lsÅ‘ szakasz a kÃ¶vetkezÅ‘ fÃ¡jlban"
  
! #: tp/Texinfo/Convert/HTML.pm:784
  msgid "Back section in previous file"
  msgstr "HÃ¡tsÃ³ szakasz az elÅ‘zÅ‘ fÃ¡jlban"
  
! #: tp/Texinfo/Convert/HTML.pm:793
  msgid "This"
  msgstr "Ez a(z)"
  
! #: tp/Texinfo/Convert/HTML.pm:794
  msgid "Back"
  msgstr "Vissza"
  
! #: tp/Texinfo/Convert/HTML.pm:795
  msgid "FastBack"
  msgstr "VisszaugrÃ¡s"
  
! #: tp/Texinfo/Convert/HTML.pm:799
  msgid "NodeUp"
  msgstr "SzÃ¼lÅ‘CsomÃ³pont"
  
! #: tp/Texinfo/Convert/HTML.pm:800
  msgid "NodeNext"
  msgstr "KÃ¶vetkezÅ‘CsomÃ³pont"
  
! #: tp/Texinfo/Convert/HTML.pm:801
  msgid "NodePrev"
  msgstr "ElÅ‘zÅ‘CsomÃ³pont"
  
! #: tp/Texinfo/Convert/HTML.pm:802
  msgid "NodeForward"
  msgstr "ElÃ¼lsÅ‘CsomÃ³pont"
  
! #: tp/Texinfo/Convert/HTML.pm:803
  msgid "NodeBack"
  msgstr "HÃ¡tsÃ³CsomÃ³pont"
  
! #: tp/Texinfo/Convert/HTML.pm:804
  msgid "Forward"
  msgstr "ElÅ‘re"
  
! #: tp/Texinfo/Convert/HTML.pm:805
  msgid "FastForward"
  msgstr "ElÅ‘reugrÃ¡s"
  
! #: tp/Texinfo/Convert/HTML.pm:806
  msgid "About"
  msgstr "NÃ©vjegy"
  
! #: tp/Texinfo/Convert/HTML.pm:807
  msgid "First"
  msgstr "ElsÅ‘"
  
! #: tp/Texinfo/Convert/HTML.pm:808
  msgid "Last"
  msgstr "UtolsÃ³"
  
! #: tp/Texinfo/Convert/HTML.pm:809
  msgid "NextFile"
  msgstr "KÃ¶vetkezÅ‘FÃ¡jl"
  
! #: tp/Texinfo/Convert/HTML.pm:810
  msgid "PrevFile"
  msgstr "ElÅ‘zÅ‘FÃ¡jl"
  
! #: tp/Texinfo/Convert/HTML.pm:814
  msgid "About This Document"
  msgstr "Ezen dokumentum nÃ©vjegye"
  
! #: tp/Texinfo/Convert/HTML.pm:815
  msgid "Table of Contents"
  msgstr "TartalomjegyzÃ©k"
  
! #: tp/Texinfo/Convert/HTML.pm:816
  msgid "Short Table of Contents"
  msgstr "RÃ¶vid tartalomjegyzÃ©k"
  
! #: tp/Texinfo/Convert/HTML.pm:817
  msgid "Footnotes"
  msgstr "LÃ¡bjegyzet"
  
! #: tp/Texinfo/Convert/HTML.pm:1504
  #, perl-brace-format
  msgid "{explained_string} ({explanation})"
  msgstr "{explained_string} ({explanation})"
  
! #: tp/Texinfo/Convert/HTML.pm:3156
  #, perl-brace-format
  msgid "see section {reference_name}"
  msgstr "lÃ¡sd ezt a szakaszt: {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3159
  #, perl-brace-format
  msgid "see {reference_name}"
  msgstr "lÃ¡sd: {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3164
  #, perl-brace-format
  msgid "See section {reference_name}"
  msgstr "LÃ¡sd ezt a szakaszt: {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3167
  #, perl-brace-format
  msgid "See {reference_name}"
  msgstr "LÃ¡sd: {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3171
  #, perl-brace-format
  msgid "{reference_name}"
  msgstr "{reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3233
  #, perl-brace-format
  msgid "see {reference} in @cite{{book}}"
  msgstr "lÃ¡sd: {reference} ebben: @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3237
  #, perl-brace-format
  msgid "see @cite{{book_reference}}"
  msgstr "lÃ¡sd: @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3241
  #, perl-brace-format
  msgid "see `{section}' in @cite{{book}}"
  msgstr "lÃ¡sd ezt a szakaszt: â€ž{section}â€� ebben: @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3248
  #, perl-brace-format
  msgid "see {reference}"
  msgstr "lÃ¡sd: {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3251
  #, perl-brace-format
  msgid "see `{section}'"
  msgstr "lÃ¡sd: â€ž{section}â€�"
  
! #: tp/Texinfo/Convert/HTML.pm:3256
  #, perl-brace-format
  msgid "See {reference} in @cite{{book}}"
  msgstr "LÃ¡sd: {reference} ebben: @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3260
  #, perl-brace-format
  msgid "See @cite{{book_reference}}"
  msgstr "LÃ¡sd: @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3264
  #, perl-brace-format
  msgid "See `{section}' in @cite{{book}}"
  msgstr "LÃ¡sd ezt a szakaszt: â€ž{section}â€� ebben: @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3271
  #, perl-brace-format
  msgid "See {reference}"
  msgstr "LÃ¡sd: {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3274
  #, perl-brace-format
  msgid "See `{section}'"
  msgstr "LÃ¡sd: â€ž{section}â€�"
  
! #: tp/Texinfo/Convert/HTML.pm:3279
  #, perl-brace-format
  msgid "{reference} in @cite{{book}}"
  msgstr "{reference} ebben: @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3283
  #, perl-brace-format
  msgid "@cite{{book_reference}}"
  msgstr "@cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3287
  #, perl-brace-format
  msgid "`{section}' in @cite{{book}}"
  msgstr "â€ž{section}â€� szakasz ebben: @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3294
  #, perl-brace-format
  msgid "{reference}"
  msgstr "{reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3297
  #, perl-brace-format
  msgid "`{section}'"
  msgstr "â€ž{section}â€�"
  
! #: tp/Texinfo/Convert/HTML.pm:3410
  msgid "Jump to"
  msgstr "UgrÃ¡s ide"
  
! #: tp/Texinfo/Convert/HTML.pm:3418
  msgid "Index Entry"
  msgstr "TÃ¡rgymutatÃ³-bejegyzÃ©s"
  
! #: tp/Texinfo/Convert/HTML.pm:3420
  msgid "Section"
  msgstr "Szakasz"
  
! #: tp/Texinfo/Convert/HTML.pm:4040
  #, perl-brace-format
  msgid "{category}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4045
  #, perl-brace-format
  msgid "{category}: @strong{{name}}"
  msgstr "{category}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4062
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4066
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4075
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4078
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4086
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} - {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4092
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}}"
  msgstr "{category} - {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4101
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} ezen: {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4107
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}}"
  msgstr "{category} ezen: {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4122
  #, perl-brace-format
  msgid ""
--- 243,767 ----
  msgstr "lÃ¡sd: {title_ref}"
  
! #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2311
  #, perl-brace-format
  msgid "{abbr_or_acronym} ({explanation})"
  msgstr "{abbr_or_acronym} ({explanation})"
  
! #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2497
! #: tp/Texinfo/Convert/HTML.pm:3622
  #, perl-brace-format
  msgid "@b{{quotation_arg}:} "
  msgstr "@b{{quotation_arg}:} "
  
! #: tp/Texinfo/Convert/Plaintext.pm:1367
  msgid "(outside of any node)"
  msgstr "(bÃ¡rmelyik csomÃ³ponton kÃ­vÃ¼l)"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2004
  #, perl-brace-format
  msgid "{name} @url{{email}}"
  msgstr "{name} @url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2007
  #, perl-brace-format
  msgid "@url{{email}}"
  msgstr "@url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2029
  #, perl-brace-format
  msgid "{text} ({url})"
  msgstr "{text} ({url})"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2034
  #, perl-brace-format
  msgid "@t{<{url}>}"
  msgstr "@t{<{url}>}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2422 tp/Texinfo/Convert/HTML.pm:1437
  #, perl-brace-format
  msgid "@{No value for `{value}'@}"
  msgstr "@{Nincs Ã©rtÃ©k ehhez: â€ž{value}â€�@}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2913
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name} {arguments}"
  msgstr "@tie{ }-- {category}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2918
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name}"
  msgstr "@tie{ }-- {category}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2931
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2934
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2943
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2946
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name}"
  msgstr "@tie{ }-- {category}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2954
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} - {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2960
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name}"
  msgstr "@tie{ }-- {category} - {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2969
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} ezen: {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2975
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name}"
  msgstr "@tie{ }-- {category} ezen: {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2990
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} ezen: {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2994
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} ezen: {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3005
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} ezen: {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3009
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name}"
  msgstr "@tie{ }-- {category} ezen: {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3023
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} - {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3027
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} - {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3038
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} - {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3042
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name}"
  msgstr "@tie{ }-- {category} - {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3371 tp/Texinfo/Convert/HTML.pm:2877
  #, perl-brace-format
  msgid "@center --- @emph{{author}}\n"
  msgstr "@center --- @emph{{author}}\n"
  
! #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
  msgid "Top"
  msgstr "CÃ­moldal"
  
! #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
  msgid "Contents"
  msgstr "Tartalom"
  
! #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:791
  msgid "Overview"
  msgstr "Ã�ttekintÃ©s"
  
! #: tp/Texinfo/Convert/HTML.pm:736 tp/Texinfo/Convert/HTML.pm:767
! #: tp/Texinfo/Convert/HTML.pm:792
  msgid "Index"
  msgstr "TÃ¡rgymutatÃ³"
  
! #: tp/Texinfo/Convert/HTML.pm:738
  msgid "current"
  msgstr "jelenlegi"
  
! #: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
  msgid "Prev"
  msgstr "ElÅ‘zÅ‘"
  
! #: tp/Texinfo/Convert/HTML.pm:742
  msgid " Up "
  msgstr " Fel "
  
! #: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:747
! #: tp/Texinfo/Convert/HTML.pm:799
  msgid "Next"
  msgstr "KÃ¶vetkezÅ‘"
  
! #: tp/Texinfo/Convert/HTML.pm:745 tp/Texinfo/Convert/HTML.pm:798
  msgid "Up"
  msgstr "Fel"
  
! #: tp/Texinfo/Convert/HTML.pm:749
  msgid "Previous"
  msgstr "ElÅ‘zÅ‘"
  
! #: tp/Texinfo/Convert/HTML.pm:750
  msgid "Forward node"
  msgstr "ElÃ¼lsÅ‘ csomÃ³pont"
  
! #: tp/Texinfo/Convert/HTML.pm:751
  msgid "Back node"
  msgstr "HÃ¡tsÃ³ csomÃ³pont"
  
! #: tp/Texinfo/Convert/HTML.pm:757
  msgid "Next file"
  msgstr "KÃ¶vetkezÅ‘ fÃ¡jl"
  
! #: tp/Texinfo/Convert/HTML.pm:758
  msgid "Previous file"
  msgstr "ElÅ‘zÅ‘ fÃ¡jl"
  
! #: tp/Texinfo/Convert/HTML.pm:764
  msgid "Cover (top) of document"
  msgstr "Dokumentum borÃ­tÃ³ja (cÃ­moldala)"
  
! #: tp/Texinfo/Convert/HTML.pm:765
  msgid "Table of contents"
  msgstr "TartalomjegyzÃ©k"
  
! #: tp/Texinfo/Convert/HTML.pm:766
  msgid "Short table of contents"
  msgstr "RÃ¶vid tartalomjegyzÃ©k"
  
! #: tp/Texinfo/Convert/HTML.pm:768
  msgid "Current section"
  msgstr "Jelenlegi szakasz"
  
! #: tp/Texinfo/Convert/HTML.pm:769
  msgid "Previous section in reading order"
  msgstr "ElÅ‘zÅ‘ szakasz az olvasÃ¡si sorrendben"
  
! #: tp/Texinfo/Convert/HTML.pm:770
  msgid "Beginning of this chapter or previous chapter"
  msgstr "Ezen fejezet eleje vagy elÅ‘zÅ‘ fejezet"
  
! #: tp/Texinfo/Convert/HTML.pm:771
  msgid "Previous section on same level"
  msgstr "ElÅ‘zÅ‘ szakasz ugyanazon a szinten"
  
! #: tp/Texinfo/Convert/HTML.pm:772
  msgid "Up section"
  msgstr "SzÃ¼lÅ‘ szakasz"
  
! #: tp/Texinfo/Convert/HTML.pm:773
  msgid "Next section on same level"
  msgstr "KÃ¶vetkezÅ‘ szakasz ugyanazon a szinten"
  
! #: tp/Texinfo/Convert/HTML.pm:774
  msgid "Up node"
  msgstr "SzÃ¼lÅ‘ csomÃ³pont"
  
! #: tp/Texinfo/Convert/HTML.pm:775
  msgid "Next node"
  msgstr "KÃ¶vetkezÅ‘ csomÃ³pont"
  
! #: tp/Texinfo/Convert/HTML.pm:776
  msgid "Previous node"
  msgstr "ElÅ‘zÅ‘ csomÃ³pont"
  
! #: tp/Texinfo/Convert/HTML.pm:777
  msgid "Next node in node reading order"
  msgstr "KÃ¶vetkezÅ‘ csomÃ³pont a csomÃ³pont olvasÃ¡si sorrendben"
  
! #: tp/Texinfo/Convert/HTML.pm:778
  msgid "Previous node in node reading order"
  msgstr "ElÅ‘zÅ‘ csomÃ³pont a csomÃ³pont olvasÃ¡si sorrendben"
  
! #: tp/Texinfo/Convert/HTML.pm:779
  msgid "Next section in reading order"
  msgstr "KÃ¶vetkezÅ‘ szakasz az olvasÃ¡si sorrendben"
  
! #: tp/Texinfo/Convert/HTML.pm:780
  msgid "Next chapter"
  msgstr "KÃ¶vetkezÅ‘ fejezet"
  
! #: tp/Texinfo/Convert/HTML.pm:781
  msgid "About (help)"
  msgstr "NÃ©vjegy (sÃºgÃ³)"
  
! #: tp/Texinfo/Convert/HTML.pm:782
  msgid "First section in reading order"
  msgstr "ElsÅ‘ szakasz az olvasÃ¡si sorrendben"
  
! #: tp/Texinfo/Convert/HTML.pm:783
  msgid "Last section in reading order"
  msgstr "UtolsÃ³ szakasz az olvasÃ¡si sorrendben"
  
! #: tp/Texinfo/Convert/HTML.pm:784
  msgid "Forward section in next file"
  msgstr "ElÃ¼lsÅ‘ szakasz a kÃ¶vetkezÅ‘ fÃ¡jlban"
  
! #: tp/Texinfo/Convert/HTML.pm:785
  msgid "Back section in previous file"
  msgstr "HÃ¡tsÃ³ szakasz az elÅ‘zÅ‘ fÃ¡jlban"
  
! #: tp/Texinfo/Convert/HTML.pm:794
  msgid "This"
  msgstr "Ez a(z)"
  
! #: tp/Texinfo/Convert/HTML.pm:795
  msgid "Back"
  msgstr "Vissza"
  
! #: tp/Texinfo/Convert/HTML.pm:796
  msgid "FastBack"
  msgstr "VisszaugrÃ¡s"
  
! #: tp/Texinfo/Convert/HTML.pm:800
  msgid "NodeUp"
  msgstr "SzÃ¼lÅ‘CsomÃ³pont"
  
! #: tp/Texinfo/Convert/HTML.pm:801
  msgid "NodeNext"
  msgstr "KÃ¶vetkezÅ‘CsomÃ³pont"
  
! #: tp/Texinfo/Convert/HTML.pm:802
  msgid "NodePrev"
  msgstr "ElÅ‘zÅ‘CsomÃ³pont"
  
! #: tp/Texinfo/Convert/HTML.pm:803
  msgid "NodeForward"
  msgstr "ElÃ¼lsÅ‘CsomÃ³pont"
  
! #: tp/Texinfo/Convert/HTML.pm:804
  msgid "NodeBack"
  msgstr "HÃ¡tsÃ³CsomÃ³pont"
  
! #: tp/Texinfo/Convert/HTML.pm:805
  msgid "Forward"
  msgstr "ElÅ‘re"
  
! #: tp/Texinfo/Convert/HTML.pm:806
  msgid "FastForward"
  msgstr "ElÅ‘reugrÃ¡s"
  
! #: tp/Texinfo/Convert/HTML.pm:807
  msgid "About"
  msgstr "NÃ©vjegy"
  
! #: tp/Texinfo/Convert/HTML.pm:808
  msgid "First"
  msgstr "ElsÅ‘"
  
! #: tp/Texinfo/Convert/HTML.pm:809
  msgid "Last"
  msgstr "UtolsÃ³"
  
! #: tp/Texinfo/Convert/HTML.pm:810
  msgid "NextFile"
  msgstr "KÃ¶vetkezÅ‘FÃ¡jl"
  
! #: tp/Texinfo/Convert/HTML.pm:811
  msgid "PrevFile"
  msgstr "ElÅ‘zÅ‘FÃ¡jl"
  
! #: tp/Texinfo/Convert/HTML.pm:815
  msgid "About This Document"
  msgstr "Ezen dokumentum nÃ©vjegye"
  
! #: tp/Texinfo/Convert/HTML.pm:816
  msgid "Table of Contents"
  msgstr "TartalomjegyzÃ©k"
  
! #: tp/Texinfo/Convert/HTML.pm:817
  msgid "Short Table of Contents"
  msgstr "RÃ¶vid tartalomjegyzÃ©k"
  
! #: tp/Texinfo/Convert/HTML.pm:818
  msgid "Footnotes"
  msgstr "LÃ¡bjegyzet"
  
! #: tp/Texinfo/Convert/HTML.pm:1534
  #, perl-brace-format
  msgid "{explained_string} ({explanation})"
  msgstr "{explained_string} ({explanation})"
  
! #: tp/Texinfo/Convert/HTML.pm:3182
  #, perl-brace-format
  msgid "see section {reference_name}"
  msgstr "lÃ¡sd ezt a szakaszt: {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3185
  #, perl-brace-format
  msgid "see {reference_name}"
  msgstr "lÃ¡sd: {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3190
  #, perl-brace-format
  msgid "See section {reference_name}"
  msgstr "LÃ¡sd ezt a szakaszt: {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3193
  #, perl-brace-format
  msgid "See {reference_name}"
  msgstr "LÃ¡sd: {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3197
  #, perl-brace-format
  msgid "{reference_name}"
  msgstr "{reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3259
  #, perl-brace-format
  msgid "see {reference} in @cite{{book}}"
  msgstr "lÃ¡sd: {reference} ebben: @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3263
  #, perl-brace-format
  msgid "see @cite{{book_reference}}"
  msgstr "lÃ¡sd: @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3267
  #, perl-brace-format
  msgid "see `{section}' in @cite{{book}}"
  msgstr "lÃ¡sd ezt a szakaszt: â€ž{section}â€� ebben: @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3274
  #, perl-brace-format
  msgid "see {reference}"
  msgstr "lÃ¡sd: {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3277
  #, perl-brace-format
  msgid "see `{section}'"
  msgstr "lÃ¡sd: â€ž{section}â€�"
  
! #: tp/Texinfo/Convert/HTML.pm:3282
  #, perl-brace-format
  msgid "See {reference} in @cite{{book}}"
  msgstr "LÃ¡sd: {reference} ebben: @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3286
  #, perl-brace-format
  msgid "See @cite{{book_reference}}"
  msgstr "LÃ¡sd: @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3290
  #, perl-brace-format
  msgid "See `{section}' in @cite{{book}}"
  msgstr "LÃ¡sd ezt a szakaszt: â€ž{section}â€� ebben: @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3297
  #, perl-brace-format
  msgid "See {reference}"
  msgstr "LÃ¡sd: {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3300
  #, perl-brace-format
  msgid "See `{section}'"
  msgstr "LÃ¡sd: â€ž{section}â€�"
  
! #: tp/Texinfo/Convert/HTML.pm:3305
  #, perl-brace-format
  msgid "{reference} in @cite{{book}}"
  msgstr "{reference} ebben: @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3309
  #, perl-brace-format
  msgid "@cite{{book_reference}}"
  msgstr "@cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3313
  #, perl-brace-format
  msgid "`{section}' in @cite{{book}}"
  msgstr "â€ž{section}â€� szakasz ebben: @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3320
  #, perl-brace-format
  msgid "{reference}"
  msgstr "{reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3323
  #, perl-brace-format
  msgid "`{section}'"
  msgstr "â€ž{section}â€�"
  
! #: tp/Texinfo/Convert/HTML.pm:3436
  msgid "Jump to"
  msgstr "UgrÃ¡s ide"
  
! #: tp/Texinfo/Convert/HTML.pm:3444
  msgid "Index Entry"
  msgstr "TÃ¡rgymutatÃ³-bejegyzÃ©s"
  
! #: tp/Texinfo/Convert/HTML.pm:3446
  msgid "Section"
  msgstr "Szakasz"
  
! #: tp/Texinfo/Convert/HTML.pm:4065
  #, perl-brace-format
  msgid "{category}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4070
  #, perl-brace-format
  msgid "{category}: @strong{{name}}"
  msgstr "{category}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4087
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4091
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4100
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4103
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4111
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} - {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4117
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}}"
  msgstr "{category} - {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4126
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} ezen: {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4132
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}}"
  msgstr "{category} ezen: {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4147
  #, perl-brace-format
  msgid ""
***************
*** 770,774 ****
  "@emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4126
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
--- 771,775 ----
  "@emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4151
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
***************
*** 776,790 ****
  "{category} ezen: {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4137
  #, perl-brace-format
  msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} ezen: {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4141
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} ezen: {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4155
  #, perl-brace-format
  msgid ""
--- 777,791 ----
  "{category} ezen: {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4162
  #, perl-brace-format
  msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} ezen: {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4166
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} ezen: {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4180
  #, perl-brace-format
  msgid ""
***************
*** 793,812 ****
  "{category} - {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4159
  #, 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:4170
  #, perl-brace-format
  msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} - {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4174
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} - {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:6101
  #, perl-brace-format
  msgid ""
--- 794,813 ----
  "{category} - {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4184
  #, 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:4195
  #, perl-brace-format
  msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} - {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4199
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} - {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:6170
  #, perl-brace-format
  msgid ""
***************
*** 817,855 ****
  "@uref{{program_homepage}, @emph{{program}}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6106
  msgid "This document was generated on @emph{@today{}}."
  msgstr "Ezt a dokumentumot @emph{@today{}} napon Ã¡llÃ­tottÃ¡k elÅ‘."
  
! #: tp/Texinfo/Convert/HTML.pm:6145
  #, perl-brace-format
  msgid "{title}: {element_text}"
  msgstr "{title}: {element_text}"
  
! #: tp/Texinfo/Convert/HTML.pm:6289
  #, 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:6358
  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:6364
  msgid "Button"
  msgstr "Gomb"
  
! #: tp/Texinfo/Convert/HTML.pm:6365
  msgid "Name"
  msgstr "NÃ©v"
  
! #: tp/Texinfo/Convert/HTML.pm:6366
  msgid "Go to"
  msgstr "CÃ©l"
  
! #: tp/Texinfo/Convert/HTML.pm:6367
  msgid "From 1.2.3 go to"
  msgstr "1.2.3-bÃ³l ide jutunk"
  
! #: tp/Texinfo/Convert/HTML.pm:6393
  msgid ""
  "  where the @strong{ Example } assumes that the current position is at "
--- 818,856 ----
  "@uref{{program_homepage}, @emph{{program}}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6175
  msgid "This document was generated on @emph{@today{}}."
  msgstr "Ezt a dokumentumot @emph{@today{}} napon Ã¡llÃ­tottÃ¡k elÅ‘."
  
! #: tp/Texinfo/Convert/HTML.pm:6214
  #, perl-brace-format
  msgid "{title}: {element_text}"
  msgstr "{title}: {element_text}"
  
! #: tp/Texinfo/Convert/HTML.pm:6358
  #, 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:6427
  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:6433
  msgid "Button"
  msgstr "Gomb"
  
! #: tp/Texinfo/Convert/HTML.pm:6434
  msgid "Name"
  msgstr "NÃ©v"
  
! #: tp/Texinfo/Convert/HTML.pm:6435
  msgid "Go to"
  msgstr "CÃ©l"
  
! #: tp/Texinfo/Convert/HTML.pm:6436
  msgid "From 1.2.3 go to"
  msgstr "1.2.3-bÃ³l ide jutunk"
  
! #: tp/Texinfo/Convert/HTML.pm:6462
  msgid ""
  "  where the @strong{ Example } assumes that the current position is at "
***************
*** 860,904 ****
  "kÃ¶vetkezÅ‘ szerkezetÅ± dokumentum @strong{ 1.2.3. alalszakasza }:"
  
! #: tp/Texinfo/Convert/HTML.pm:6403
  msgid "Section One"
  msgstr "1. szakasz"
  
! #: tp/Texinfo/Convert/HTML.pm:6405
  msgid "Subsection One-One"
  msgstr "1.1 alszakasz"
  
! #: tp/Texinfo/Convert/HTML.pm:6412
  msgid "Subsection One-Two"
  msgstr "1.2. alszakasz"
  
! #: tp/Texinfo/Convert/HTML.pm:6414
  msgid "Subsubsection One-Two-One"
  msgstr "1.2.3. alalszakasz"
  
! #: tp/Texinfo/Convert/HTML.pm:6415
  msgid "Subsubsection One-Two-Two"
  msgstr "1.2.2. alalszakasz"
  
! #: tp/Texinfo/Convert/HTML.pm:6416
  msgid "Subsubsection One-Two-Three"
  msgstr "1.2.3. alalszakasz"
  
! #: tp/Texinfo/Convert/HTML.pm:6418
  msgid "Current Position"
  msgstr "Jelenlegi pozÃ­ciÃ³"
  
! #: tp/Texinfo/Convert/HTML.pm:6419
  msgid "Subsubsection One-Two-Four"
  msgstr "1.2.4. alalszakasz"
  
! #: tp/Texinfo/Convert/HTML.pm:6422
  msgid "Subsection One-Three"
  msgstr "1.3. alszakasz"
  
! #: tp/Texinfo/Convert/HTML.pm:6429
  msgid "Subsection One-Four"
  msgstr "1.4. alszakasz"
  
! #: tp/Texinfo/Convert/HTML.pm:6833
  msgid "Untitled Document"
  msgstr "NÃ©vtelen dokumentum"
--- 861,905 ----
  "kÃ¶vetkezÅ‘ szerkezetÅ± dokumentum @strong{ 1.2.3. alalszakasza }:"
  
! #: tp/Texinfo/Convert/HTML.pm:6472
  msgid "Section One"
  msgstr "1. szakasz"
  
! #: tp/Texinfo/Convert/HTML.pm:6474
  msgid "Subsection One-One"
  msgstr "1.1 alszakasz"
  
! #: tp/Texinfo/Convert/HTML.pm:6481
  msgid "Subsection One-Two"
  msgstr "1.2. alszakasz"
  
! #: tp/Texinfo/Convert/HTML.pm:6483
  msgid "Subsubsection One-Two-One"
  msgstr "1.2.3. alalszakasz"
  
! #: tp/Texinfo/Convert/HTML.pm:6484
  msgid "Subsubsection One-Two-Two"
  msgstr "1.2.2. alalszakasz"
  
! #: tp/Texinfo/Convert/HTML.pm:6485
  msgid "Subsubsection One-Two-Three"
  msgstr "1.2.3. alalszakasz"
  
! #: tp/Texinfo/Convert/HTML.pm:6487
  msgid "Current Position"
  msgstr "Jelenlegi pozÃ­ciÃ³"
  
! #: tp/Texinfo/Convert/HTML.pm:6488
  msgid "Subsubsection One-Two-Four"
  msgstr "1.2.4. alalszakasz"
  
! #: tp/Texinfo/Convert/HTML.pm:6491
  msgid "Subsection One-Three"
  msgstr "1.3. alszakasz"
  
! #: tp/Texinfo/Convert/HTML.pm:6498
  msgid "Subsection One-Four"
  msgstr "1.4. alszakasz"
  
! #: tp/Texinfo/Convert/HTML.pm:6906
  msgid "Untitled Document"
  msgstr "NÃ©vtelen dokumentum"
Binary files texinfo-6.1/po_document/it.gmo and texinfo-6.3/po_document/it.gmo differ
diff -Nrc2 texinfo-6.1/po_document/it.po texinfo-6.3/po_document/it.po
*** texinfo-6.1/po_document/it.po	2016-02-06 11:35:59.000000000 +0000
--- texinfo-6.3/po_document/it.po	2016-09-10 12:46:01.000000000 +0100
***************
*** 8,12 ****
  "Project-Id-Version: texinfo_document 5.9.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
  "PO-Revision-Date: 2015-02-24 21:36+0100\n"
  "Last-Translator: Federico Bruni <fedelogy@gmail.com>\n"
--- 8,12 ----
  "Project-Id-Version: texinfo_document 5.9.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:46+0100\n"
  "PO-Revision-Date: 2015-02-24 21:36+0100\n"
  "Last-Translator: Federico Bruni <fedelogy@gmail.com>\n"
***************
*** 16,113 ****
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  "Plural-Forms: nplurals=2; plural=(n != 1);\n"
  "X-Generator: Gtranslator 2.91.6\n"
  
! #: tp/Texinfo/Common.pm:717 tp/Texinfo/Common.pm:722
  msgid "Function"
  msgstr "Funzione"
  
! #: tp/Texinfo/Common.pm:718
  msgid "Macro"
  msgstr "Macro"
  
! #: tp/Texinfo/Common.pm:719
  msgid "Special Form"
  msgstr "Forma speciale"
  
! #: tp/Texinfo/Common.pm:720 tp/Texinfo/Common.pm:723
  msgid "Variable"
  msgstr "Variabile"
  
! #: tp/Texinfo/Common.pm:721
  msgid "User Option"
  msgstr "Opzione utente"
  
! #: tp/Texinfo/Common.pm:724 tp/Texinfo/Common.pm:725
  msgid "Instance Variable"
  msgstr "Variabile dell'istanza"
  
! #: tp/Texinfo/Common.pm:726 tp/Texinfo/Common.pm:727
  msgid "Method"
  msgstr "Metodo"
  
! #: tp/Texinfo/Common.pm:1199
  #, perl-brace-format
  msgid "{category} on {class}"
  msgstr "{category} su {class}"
  
! #: tp/Texinfo/Common.pm:1206
  #, perl-brace-format
  msgid "{category} of {class}"
  msgstr "{category} di {class}"
  
! #: tp/Texinfo/Common.pm:1223
  #, perl-brace-format
  msgid "{month} {day}, {year}"
  msgstr "{day} {month} {year}"
  
! #: tp/Texinfo/Common.pm:1254 tp/Texinfo/Convert/Plaintext.pm:1132
! #: tp/Texinfo/Convert/HTML.pm:515
  #, perl-brace-format
  msgid "Appendix {number} {section_title}"
  msgstr "Appendice {number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1258 tp/Texinfo/Convert/Plaintext.pm:1137
! #: tp/Texinfo/Convert/HTML.pm:521
  #, perl-brace-format
  msgid "{number} {section_title}"
  msgstr "{number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1393
  #, perl-brace-format
  msgid "{float_type} {float_number}: "
  msgstr "{float_type} {float_number}: "
  
! #: tp/Texinfo/Common.pm:1397
  #, perl-brace-format
  msgid "{float_type}: "
  msgstr "{float_type}: "
  
! #: tp/Texinfo/Common.pm:1402
  #, perl-brace-format
  msgid "{float_type} {float_number}\n"
  msgstr "{float_type} {float_number}\n"
  
! #: tp/Texinfo/Common.pm:1406
  #, perl-brace-format
  msgid "{float_type}\n"
  msgstr "{float_type}\n"
  
! #: tp/Texinfo/Common.pm:1412
  #, perl-brace-format
  msgid "{float_number}: "
  msgstr "{float_number}: "
  
! #: tp/Texinfo/Common.pm:1415
  #, perl-brace-format
  msgid "{float_number}\n"
  msgstr "{float_number}\n"
  
! #: tp/Texinfo/Parser.pm:2982
  #, perl-brace-format
  msgid "{name} on {class}"
  msgstr "{name} in {class}"
  
! #: tp/Texinfo/Parser.pm:2991
  #, perl-brace-format
  msgid "{name} of {class}"
--- 16,114 ----
  "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: Gtranslator 2.91.6\n"
  
! #: tp/Texinfo/Common.pm:697 tp/Texinfo/Common.pm:702
  msgid "Function"
  msgstr "Funzione"
  
! #: tp/Texinfo/Common.pm:698
  msgid "Macro"
  msgstr "Macro"
  
! #: tp/Texinfo/Common.pm:699
  msgid "Special Form"
  msgstr "Forma speciale"
  
! #: tp/Texinfo/Common.pm:700 tp/Texinfo/Common.pm:703
  msgid "Variable"
  msgstr "Variabile"
  
! #: tp/Texinfo/Common.pm:701
  msgid "User Option"
  msgstr "Opzione utente"
  
! #: tp/Texinfo/Common.pm:704 tp/Texinfo/Common.pm:705
  msgid "Instance Variable"
  msgstr "Variabile dell'istanza"
  
! #: tp/Texinfo/Common.pm:706 tp/Texinfo/Common.pm:707
  msgid "Method"
  msgstr "Metodo"
  
! #: tp/Texinfo/Common.pm:1186
  #, perl-brace-format
  msgid "{category} on {class}"
  msgstr "{category} su {class}"
  
! #: tp/Texinfo/Common.pm:1193
  #, perl-brace-format
  msgid "{category} of {class}"
  msgstr "{category} di {class}"
  
! #: tp/Texinfo/Common.pm:1210
  #, perl-brace-format
  msgid "{month} {day}, {year}"
  msgstr "{day} {month} {year}"
  
! #: tp/Texinfo/Common.pm:1241 tp/Texinfo/Convert/Plaintext.pm:1133
! #: tp/Texinfo/Convert/HTML.pm:516
  #, perl-brace-format
  msgid "Appendix {number} {section_title}"
  msgstr "Appendice {number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1245 tp/Texinfo/Convert/Plaintext.pm:1138
! #: tp/Texinfo/Convert/HTML.pm:522
  #, perl-brace-format
  msgid "{number} {section_title}"
  msgstr "{number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1499
  #, perl-brace-format
  msgid "{float_type} {float_number}: "
  msgstr "{float_type} {float_number}: "
  
! #: tp/Texinfo/Common.pm:1503
  #, perl-brace-format
  msgid "{float_type}: "
  msgstr "{float_type}: "
  
! #: tp/Texinfo/Common.pm:1508
  #, perl-brace-format
  msgid "{float_type} {float_number}\n"
  msgstr "{float_type} {float_number}\n"
  
! #: tp/Texinfo/Common.pm:1512
  #, perl-brace-format
  msgid "{float_type}\n"
  msgstr "{float_type}\n"
  
! #: tp/Texinfo/Common.pm:1518
  #, perl-brace-format
  msgid "{float_number}: "
  msgstr "{float_number}: "
  
! #: tp/Texinfo/Common.pm:1521
  #, perl-brace-format
  msgid "{float_number}\n"
  msgstr "{float_number}\n"
  
! #: tp/Texinfo/Parser.pm:2816
  #, perl-brace-format
  msgid "{name} on {class}"
  msgstr "{name} in {class}"
  
! #: tp/Texinfo/Parser.pm:2825
  #, perl-brace-format
  msgid "{name} of {class}"
***************
*** 118,180 ****
  msgstr "error@arrow{}"
  
! #: tp/Texinfo/Convert/Converter.pm:956
  msgid "January"
  msgstr "Gennaio"
  
! #: tp/Texinfo/Convert/Converter.pm:957
  msgid "February"
  msgstr "Febbraio"
  
! #: tp/Texinfo/Convert/Converter.pm:958
  msgid "March"
  msgstr "Marzo"
  
! #: tp/Texinfo/Convert/Converter.pm:959
  msgid "April"
  msgstr "Aprile"
  
! #: tp/Texinfo/Convert/Converter.pm:960
  msgid "May"
  msgstr "Maggio"
  
! #: tp/Texinfo/Convert/Converter.pm:961
  msgid "June"
  msgstr "Giugno"
  
! #: tp/Texinfo/Convert/Converter.pm:962
  msgid "July"
  msgstr "Luglio"
  
! #: tp/Texinfo/Convert/Converter.pm:963
  msgid "August"
  msgstr "Agosto"
  
! #: tp/Texinfo/Convert/Converter.pm:964
  msgid "September"
  msgstr "Settembre"
  
! #: tp/Texinfo/Convert/Converter.pm:965
  msgid "October"
  msgstr "Ottobre"
  
! #: tp/Texinfo/Convert/Converter.pm:966
  msgid "November"
  msgstr "Novembre"
  
! #: tp/Texinfo/Convert/Converter.pm:967
  msgid "December"
  msgstr "Dicembre"
  
! #: tp/Texinfo/Convert/Converter.pm:1018
  #, perl-brace-format
  msgid "{float_type} {float_number}"
  msgstr "{float_type} {float_number}"
  
! #: tp/Texinfo/Convert/Converter.pm:1022
  #, perl-brace-format
  msgid "{float_type}"
  msgstr "{float_type}"
  
! #: tp/Texinfo/Convert/Converter.pm:1026
  #, perl-brace-format
  msgid "{float_number}"
--- 119,181 ----
  msgstr "error@arrow{}"
  
! #: tp/Texinfo/Convert/Converter.pm:948
  msgid "January"
  msgstr "Gennaio"
  
! #: tp/Texinfo/Convert/Converter.pm:949
  msgid "February"
  msgstr "Febbraio"
  
! #: tp/Texinfo/Convert/Converter.pm:950
  msgid "March"
  msgstr "Marzo"
  
! #: tp/Texinfo/Convert/Converter.pm:951
  msgid "April"
  msgstr "Aprile"
  
! #: tp/Texinfo/Convert/Converter.pm:952
  msgid "May"
  msgstr "Maggio"
  
! #: tp/Texinfo/Convert/Converter.pm:953
  msgid "June"
  msgstr "Giugno"
  
! #: tp/Texinfo/Convert/Converter.pm:954
  msgid "July"
  msgstr "Luglio"
  
! #: tp/Texinfo/Convert/Converter.pm:955
  msgid "August"
  msgstr "Agosto"
  
! #: tp/Texinfo/Convert/Converter.pm:956
  msgid "September"
  msgstr "Settembre"
  
! #: tp/Texinfo/Convert/Converter.pm:957
  msgid "October"
  msgstr "Ottobre"
  
! #: tp/Texinfo/Convert/Converter.pm:958
  msgid "November"
  msgstr "Novembre"
  
! #: tp/Texinfo/Convert/Converter.pm:959
  msgid "December"
  msgstr "Dicembre"
  
! #: tp/Texinfo/Convert/Converter.pm:1010
  #, perl-brace-format
  msgid "{float_type} {float_number}"
  msgstr "{float_type} {float_number}"
  
! #: tp/Texinfo/Convert/Converter.pm:1014
  #, perl-brace-format
  msgid "{float_type}"
  msgstr "{float_type}"
  
! #: tp/Texinfo/Convert/Converter.pm:1018
  #, perl-brace-format
  msgid "{float_number}"
***************
*** 211,225 ****
  msgstr "vedi la sezione Â«{section_name}Â» in @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3291
  #, perl-brace-format
  msgid "@cite{{book}}"
  msgstr "@cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3268
  #, perl-brace-format
  msgid "See @cite{{book}}"
  msgstr "Vedi @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3245
  #, perl-brace-format
  msgid "see @cite{{book}}"
--- 212,226 ----
  msgstr "vedi la sezione Â«{section_name}Â» in @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3317
  #, perl-brace-format
  msgid "@cite{{book}}"
  msgstr "@cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3294
  #, perl-brace-format
  msgid "See @cite{{book}}"
  msgstr "Vedi @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3271
  #, perl-brace-format
  msgid "see @cite{{book}}"
***************
*** 241,765 ****
  msgstr "vedi {title_ref}"
  
! #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2310
  #, perl-brace-format
  msgid "{abbr_or_acronym} ({explanation})"
  msgstr "{abbr_or_acronym} ({explanation})"
  
! #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2496
! #: tp/Texinfo/Convert/HTML.pm:3597
  #, perl-brace-format
  msgid "@b{{quotation_arg}:} "
  msgstr "@b{{quotation_arg}:} "
  
! #: tp/Texinfo/Convert/Plaintext.pm:1366
  msgid "(outside of any node)"
  msgstr "(fuori da qualsiasi nodo)"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2003
  #, perl-brace-format
  msgid "{name} @url{{email}}"
  msgstr "{name} @url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2006
  #, perl-brace-format
  msgid "@url{{email}}"
  msgstr "@url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2028
  #, perl-brace-format
  msgid "{text} ({url})"
  msgstr "{text} ({url})"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2033
  #, perl-brace-format
  msgid "@t{<{url}>}"
  msgstr "@t{<{url}>}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2421 tp/Texinfo/Convert/HTML.pm:1438
  #, perl-brace-format
  msgid "@{No value for `{value}'@}"
  msgstr "@{Nessun valore per \\\"{value}\\\"@}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2945
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name} {arguments}"
  msgstr "@tie{ }-- {category}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2950
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name}"
  msgstr "@tie{ }-- {category}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2963
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2966
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2975
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2978
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name}"
  msgstr "@tie{ }-- {category}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2986
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} di {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2992
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name}"
  msgstr "@tie{ }-- {category} di {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3001
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} su {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3007
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name}"
  msgstr "@tie{ }-- {category} su {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3022
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} su {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3026
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} su {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3037
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} su {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3041
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name}"
  msgstr "@tie{ }-- {category} su {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3055
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} di {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3059
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} di {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3070
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} di {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3074
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name}"
  msgstr "@tie{ }-- {category} di {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3403 tp/Texinfo/Convert/HTML.pm:2851
  #, perl-brace-format
  msgid "@center --- @emph{{author}}\n"
  msgstr "@center --- @emph{{author}}\n"
  
! #: tp/Texinfo/Convert/HTML.pm:732 tp/Texinfo/Convert/HTML.pm:788
  msgid "Top"
  msgstr "Inizio"
  
! #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
  msgid "Contents"
  msgstr "Contenuti"
  
! #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
  msgid "Overview"
  msgstr "Panoramica"
  
! #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:766
! #: tp/Texinfo/Convert/HTML.pm:791
  msgid "Index"
  msgstr "Indice"
  
! #: tp/Texinfo/Convert/HTML.pm:737
  msgid "current"
  msgstr "attuale"
  
! #: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
  msgid "Prev"
  msgstr "Prec"
  
! #: tp/Texinfo/Convert/HTML.pm:741
  msgid " Up "
  msgstr " Su "
  
! #: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:746
! #: tp/Texinfo/Convert/HTML.pm:798
  msgid "Next"
  msgstr "Successivo"
  
! #: tp/Texinfo/Convert/HTML.pm:744 tp/Texinfo/Convert/HTML.pm:797
  msgid "Up"
  msgstr "Su"
  
! #: tp/Texinfo/Convert/HTML.pm:748
  msgid "Previous"
  msgstr "Precedente"
  
! #: tp/Texinfo/Convert/HTML.pm:749
  msgid "Forward node"
  msgstr "Nodo successivo"
  
! #: tp/Texinfo/Convert/HTML.pm:750
  msgid "Back node"
  msgstr "Nodo precedente"
  
! #: tp/Texinfo/Convert/HTML.pm:756
  msgid "Next file"
  msgstr "File successivo"
  
! #: tp/Texinfo/Convert/HTML.pm:757
  msgid "Previous file"
  msgstr "File precedente"
  
! #: tp/Texinfo/Convert/HTML.pm:763
  msgid "Cover (top) of document"
  msgstr "Copertina (inizio) del documento"
  
! #: tp/Texinfo/Convert/HTML.pm:764
  msgid "Table of contents"
  msgstr "Indice"
  
! #: tp/Texinfo/Convert/HTML.pm:765
  msgid "Short table of contents"
  msgstr "Indice breve"
  
! #: tp/Texinfo/Convert/HTML.pm:767
  msgid "Current section"
  msgstr "Sezione attuale"
  
! #: tp/Texinfo/Convert/HTML.pm:768
  msgid "Previous section in reading order"
  msgstr "Sezione precedente in ordine di lettura"
  
! #: tp/Texinfo/Convert/HTML.pm:769
  msgid "Beginning of this chapter or previous chapter"
  msgstr "Inizio di questo capitolo o capitolo precedente"
  
! #: tp/Texinfo/Convert/HTML.pm:770
  msgid "Previous section on same level"
  msgstr "Sezione precedente sullo stesso livello"
  
! #: tp/Texinfo/Convert/HTML.pm:771
  msgid "Up section"
  msgstr "Sezione superiore"
  
! #: tp/Texinfo/Convert/HTML.pm:772
  msgid "Next section on same level"
  msgstr "Sezione successiva sullo stesso livello"
  
! #: tp/Texinfo/Convert/HTML.pm:773
  msgid "Up node"
  msgstr "Nodo superiore"
  
! #: tp/Texinfo/Convert/HTML.pm:774
  msgid "Next node"
  msgstr "Nodo successivo"
  
! #: tp/Texinfo/Convert/HTML.pm:775
  msgid "Previous node"
  msgstr "Nodo precedente"
  
! #: tp/Texinfo/Convert/HTML.pm:776
  msgid "Next node in node reading order"
  msgstr "Nodo successivo in ordine di lettura"
  
! #: tp/Texinfo/Convert/HTML.pm:777
  msgid "Previous node in node reading order"
  msgstr "Nodo precedente in ordine di lettura"
  
! #: tp/Texinfo/Convert/HTML.pm:778
  msgid "Next section in reading order"
  msgstr "Sezione successiva in ordine di lettura"
  
! #: tp/Texinfo/Convert/HTML.pm:779
  msgid "Next chapter"
  msgstr "Capitolo successivo"
  
! #: tp/Texinfo/Convert/HTML.pm:780
  msgid "About (help)"
  msgstr "Informazioni (aiuto)"
  
! #: tp/Texinfo/Convert/HTML.pm:781
  msgid "First section in reading order"
  msgstr "Prima sezione in ordine di lettura"
  
! #: tp/Texinfo/Convert/HTML.pm:782
  msgid "Last section in reading order"
  msgstr "Ultima sezione in ordine di lettura"
  
! #: tp/Texinfo/Convert/HTML.pm:783
  msgid "Forward section in next file"
  msgstr "Sezione successiva nel prossimo file"
  
! #: tp/Texinfo/Convert/HTML.pm:784
  msgid "Back section in previous file"
  msgstr "Sezione precedente del file precedente"
  
! #: tp/Texinfo/Convert/HTML.pm:793
  msgid "This"
  msgstr "Questo"
  
! #: tp/Texinfo/Convert/HTML.pm:794
  msgid "Back"
  msgstr "Indietro"
  
! #: tp/Texinfo/Convert/HTML.pm:795
  msgid "FastBack"
  msgstr "Indietro veloce"
  
! #: tp/Texinfo/Convert/HTML.pm:799
  msgid "NodeUp"
  msgstr "Nodo superiore"
  
! #: tp/Texinfo/Convert/HTML.pm:800
  msgid "NodeNext"
  msgstr "Nodo successivo"
  
! #: tp/Texinfo/Convert/HTML.pm:801
  msgid "NodePrev"
  msgstr "Nodo precedente"
  
! #: tp/Texinfo/Convert/HTML.pm:802
  msgid "NodeForward"
  msgstr "Nodo successivo"
  
! #: tp/Texinfo/Convert/HTML.pm:803
  msgid "NodeBack"
  msgstr "Nodo precedente"
  
! #: tp/Texinfo/Convert/HTML.pm:804
  msgid "Forward"
  msgstr "Avanti"
  
! #: tp/Texinfo/Convert/HTML.pm:805
  msgid "FastForward"
  msgstr "Avanti veloce"
  
! #: tp/Texinfo/Convert/HTML.pm:806
  msgid "About"
  msgstr "Informazioni"
  
! #: tp/Texinfo/Convert/HTML.pm:807
  msgid "First"
  msgstr "Primo"
  
! #: tp/Texinfo/Convert/HTML.pm:808
  msgid "Last"
  msgstr "Ultimo"
  
! #: tp/Texinfo/Convert/HTML.pm:809
  msgid "NextFile"
  msgstr "File successivo"
  
! #: tp/Texinfo/Convert/HTML.pm:810
  msgid "PrevFile"
  msgstr "File precedente"
  
! #: tp/Texinfo/Convert/HTML.pm:814
  msgid "About This Document"
  msgstr "Informazioni su questo documento"
  
! #: tp/Texinfo/Convert/HTML.pm:815
  msgid "Table of Contents"
  msgstr "Indice"
  
! #: tp/Texinfo/Convert/HTML.pm:816
  msgid "Short Table of Contents"
  msgstr "Indice breve"
  
! #: tp/Texinfo/Convert/HTML.pm:817
  msgid "Footnotes"
  msgstr "Note a piÃ¨ di pagina"
  
! #: tp/Texinfo/Convert/HTML.pm:1504
  #, perl-brace-format
  msgid "{explained_string} ({explanation})"
  msgstr "{explained_string} ({explanation})"
  
! #: tp/Texinfo/Convert/HTML.pm:3156
  #, perl-brace-format
  msgid "see section {reference_name}"
  msgstr "vedi la sezione {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3159
  #, perl-brace-format
  msgid "see {reference_name}"
  msgstr "vedi {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3164
  #, perl-brace-format
  msgid "See section {reference_name}"
  msgstr "Vedi la sezione {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3167
  #, perl-brace-format
  msgid "See {reference_name}"
  msgstr "Vedi {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3171
  #, perl-brace-format
  msgid "{reference_name}"
  msgstr "{reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3233
  #, perl-brace-format
  msgid "see {reference} in @cite{{book}}"
  msgstr "vedi {reference} in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3237
  #, perl-brace-format
  msgid "see @cite{{book_reference}}"
  msgstr "vedi @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3241
  #, perl-brace-format
  msgid "see `{section}' in @cite{{book}}"
  msgstr "vedi \\\"{section}\\\" in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3248
  #, perl-brace-format
  msgid "see {reference}"
  msgstr "vedi {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3251
  #, perl-brace-format
  msgid "see `{section}'"
  msgstr "vedi \\\"{section}\\\""
  
! #: tp/Texinfo/Convert/HTML.pm:3256
  #, perl-brace-format
  msgid "See {reference} in @cite{{book}}"
  msgstr "Vedi {reference} in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3260
  #, perl-brace-format
  msgid "See @cite{{book_reference}}"
  msgstr "Vedi @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3264
  #, perl-brace-format
  msgid "See `{section}' in @cite{{book}}"
  msgstr "Vedi \\\"{section}\\\" in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3271
  #, perl-brace-format
  msgid "See {reference}"
  msgstr "Vedi {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3274
  #, perl-brace-format
  msgid "See `{section}'"
  msgstr "Vedi \\\"{section}\\\""
  
! #: tp/Texinfo/Convert/HTML.pm:3279
  #, perl-brace-format
  msgid "{reference} in @cite{{book}}"
  msgstr "{reference} in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3283
  #, perl-brace-format
  msgid "@cite{{book_reference}}"
  msgstr "@cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3287
  #, perl-brace-format
  msgid "`{section}' in @cite{{book}}"
  msgstr "\\\"{section}\\\" in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3294
  #, perl-brace-format
  msgid "{reference}"
  msgstr "{reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3297
  #, perl-brace-format
  msgid "`{section}'"
  msgstr "\\\"{section}\\\""
  
! #: tp/Texinfo/Convert/HTML.pm:3410
  msgid "Jump to"
  msgstr "Salta a"
  
! #: tp/Texinfo/Convert/HTML.pm:3418
  msgid "Index Entry"
  msgstr "Voce dell'indice"
  
! #: tp/Texinfo/Convert/HTML.pm:3420
  msgid "Section"
  msgstr "Sezione"
  
! #: tp/Texinfo/Convert/HTML.pm:4040
  #, perl-brace-format
  msgid "{category}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4045
  #, perl-brace-format
  msgid "{category}: @strong{{name}}"
  msgstr "{category}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4062
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4066
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4075
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4078
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4086
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} di {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4092
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}}"
  msgstr "{category} di {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4101
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} su {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4107
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}}"
  msgstr "{category} su {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4122
  #, perl-brace-format
  msgid ""
--- 242,766 ----
  msgstr "vedi {title_ref}"
  
! #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2311
  #, perl-brace-format
  msgid "{abbr_or_acronym} ({explanation})"
  msgstr "{abbr_or_acronym} ({explanation})"
  
! #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2497
! #: tp/Texinfo/Convert/HTML.pm:3622
  #, perl-brace-format
  msgid "@b{{quotation_arg}:} "
  msgstr "@b{{quotation_arg}:} "
  
! #: tp/Texinfo/Convert/Plaintext.pm:1367
  msgid "(outside of any node)"
  msgstr "(fuori da qualsiasi nodo)"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2004
  #, perl-brace-format
  msgid "{name} @url{{email}}"
  msgstr "{name} @url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2007
  #, perl-brace-format
  msgid "@url{{email}}"
  msgstr "@url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2029
  #, perl-brace-format
  msgid "{text} ({url})"
  msgstr "{text} ({url})"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2034
  #, perl-brace-format
  msgid "@t{<{url}>}"
  msgstr "@t{<{url}>}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2422 tp/Texinfo/Convert/HTML.pm:1437
  #, perl-brace-format
  msgid "@{No value for `{value}'@}"
  msgstr "@{Nessun valore per \\\"{value}\\\"@}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2913
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name} {arguments}"
  msgstr "@tie{ }-- {category}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2918
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name}"
  msgstr "@tie{ }-- {category}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2931
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2934
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2943
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2946
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name}"
  msgstr "@tie{ }-- {category}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2954
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} di {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2960
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name}"
  msgstr "@tie{ }-- {category} di {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2969
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} su {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2975
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name}"
  msgstr "@tie{ }-- {category} su {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2990
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} su {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2994
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} su {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3005
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} su {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3009
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name}"
  msgstr "@tie{ }-- {category} su {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3023
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} di {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3027
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} di {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3038
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} di {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3042
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name}"
  msgstr "@tie{ }-- {category} di {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3371 tp/Texinfo/Convert/HTML.pm:2877
  #, perl-brace-format
  msgid "@center --- @emph{{author}}\n"
  msgstr "@center --- @emph{{author}}\n"
  
! #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
  msgid "Top"
  msgstr "Inizio"
  
! #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
  msgid "Contents"
  msgstr "Contenuti"
  
! #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:791
  msgid "Overview"
  msgstr "Panoramica"
  
! #: tp/Texinfo/Convert/HTML.pm:736 tp/Texinfo/Convert/HTML.pm:767
! #: tp/Texinfo/Convert/HTML.pm:792
  msgid "Index"
  msgstr "Indice"
  
! #: tp/Texinfo/Convert/HTML.pm:738
  msgid "current"
  msgstr "attuale"
  
! #: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
  msgid "Prev"
  msgstr "Prec"
  
! #: tp/Texinfo/Convert/HTML.pm:742
  msgid " Up "
  msgstr " Su "
  
! #: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:747
! #: tp/Texinfo/Convert/HTML.pm:799
  msgid "Next"
  msgstr "Successivo"
  
! #: tp/Texinfo/Convert/HTML.pm:745 tp/Texinfo/Convert/HTML.pm:798
  msgid "Up"
  msgstr "Su"
  
! #: tp/Texinfo/Convert/HTML.pm:749
  msgid "Previous"
  msgstr "Precedente"
  
! #: tp/Texinfo/Convert/HTML.pm:750
  msgid "Forward node"
  msgstr "Nodo successivo"
  
! #: tp/Texinfo/Convert/HTML.pm:751
  msgid "Back node"
  msgstr "Nodo precedente"
  
! #: tp/Texinfo/Convert/HTML.pm:757
  msgid "Next file"
  msgstr "File successivo"
  
! #: tp/Texinfo/Convert/HTML.pm:758
  msgid "Previous file"
  msgstr "File precedente"
  
! #: tp/Texinfo/Convert/HTML.pm:764
  msgid "Cover (top) of document"
  msgstr "Copertina (inizio) del documento"
  
! #: tp/Texinfo/Convert/HTML.pm:765
  msgid "Table of contents"
  msgstr "Indice"
  
! #: tp/Texinfo/Convert/HTML.pm:766
  msgid "Short table of contents"
  msgstr "Indice breve"
  
! #: tp/Texinfo/Convert/HTML.pm:768
  msgid "Current section"
  msgstr "Sezione attuale"
  
! #: tp/Texinfo/Convert/HTML.pm:769
  msgid "Previous section in reading order"
  msgstr "Sezione precedente in ordine di lettura"
  
! #: tp/Texinfo/Convert/HTML.pm:770
  msgid "Beginning of this chapter or previous chapter"
  msgstr "Inizio di questo capitolo o capitolo precedente"
  
! #: tp/Texinfo/Convert/HTML.pm:771
  msgid "Previous section on same level"
  msgstr "Sezione precedente sullo stesso livello"
  
! #: tp/Texinfo/Convert/HTML.pm:772
  msgid "Up section"
  msgstr "Sezione superiore"
  
! #: tp/Texinfo/Convert/HTML.pm:773
  msgid "Next section on same level"
  msgstr "Sezione successiva sullo stesso livello"
  
! #: tp/Texinfo/Convert/HTML.pm:774
  msgid "Up node"
  msgstr "Nodo superiore"
  
! #: tp/Texinfo/Convert/HTML.pm:775
  msgid "Next node"
  msgstr "Nodo successivo"
  
! #: tp/Texinfo/Convert/HTML.pm:776
  msgid "Previous node"
  msgstr "Nodo precedente"
  
! #: tp/Texinfo/Convert/HTML.pm:777
  msgid "Next node in node reading order"
  msgstr "Nodo successivo in ordine di lettura"
  
! #: tp/Texinfo/Convert/HTML.pm:778
  msgid "Previous node in node reading order"
  msgstr "Nodo precedente in ordine di lettura"
  
! #: tp/Texinfo/Convert/HTML.pm:779
  msgid "Next section in reading order"
  msgstr "Sezione successiva in ordine di lettura"
  
! #: tp/Texinfo/Convert/HTML.pm:780
  msgid "Next chapter"
  msgstr "Capitolo successivo"
  
! #: tp/Texinfo/Convert/HTML.pm:781
  msgid "About (help)"
  msgstr "Informazioni (aiuto)"
  
! #: tp/Texinfo/Convert/HTML.pm:782
  msgid "First section in reading order"
  msgstr "Prima sezione in ordine di lettura"
  
! #: tp/Texinfo/Convert/HTML.pm:783
  msgid "Last section in reading order"
  msgstr "Ultima sezione in ordine di lettura"
  
! #: tp/Texinfo/Convert/HTML.pm:784
  msgid "Forward section in next file"
  msgstr "Sezione successiva nel prossimo file"
  
! #: tp/Texinfo/Convert/HTML.pm:785
  msgid "Back section in previous file"
  msgstr "Sezione precedente del file precedente"
  
! #: tp/Texinfo/Convert/HTML.pm:794
  msgid "This"
  msgstr "Questo"
  
! #: tp/Texinfo/Convert/HTML.pm:795
  msgid "Back"
  msgstr "Indietro"
  
! #: tp/Texinfo/Convert/HTML.pm:796
  msgid "FastBack"
  msgstr "Indietro veloce"
  
! #: tp/Texinfo/Convert/HTML.pm:800
  msgid "NodeUp"
  msgstr "Nodo superiore"
  
! #: tp/Texinfo/Convert/HTML.pm:801
  msgid "NodeNext"
  msgstr "Nodo successivo"
  
! #: tp/Texinfo/Convert/HTML.pm:802
  msgid "NodePrev"
  msgstr "Nodo precedente"
  
! #: tp/Texinfo/Convert/HTML.pm:803
  msgid "NodeForward"
  msgstr "Nodo successivo"
  
! #: tp/Texinfo/Convert/HTML.pm:804
  msgid "NodeBack"
  msgstr "Nodo precedente"
  
! #: tp/Texinfo/Convert/HTML.pm:805
  msgid "Forward"
  msgstr "Avanti"
  
! #: tp/Texinfo/Convert/HTML.pm:806
  msgid "FastForward"
  msgstr "Avanti veloce"
  
! #: tp/Texinfo/Convert/HTML.pm:807
  msgid "About"
  msgstr "Informazioni"
  
! #: tp/Texinfo/Convert/HTML.pm:808
  msgid "First"
  msgstr "Primo"
  
! #: tp/Texinfo/Convert/HTML.pm:809
  msgid "Last"
  msgstr "Ultimo"
  
! #: tp/Texinfo/Convert/HTML.pm:810
  msgid "NextFile"
  msgstr "File successivo"
  
! #: tp/Texinfo/Convert/HTML.pm:811
  msgid "PrevFile"
  msgstr "File precedente"
  
! #: tp/Texinfo/Convert/HTML.pm:815
  msgid "About This Document"
  msgstr "Informazioni su questo documento"
  
! #: tp/Texinfo/Convert/HTML.pm:816
  msgid "Table of Contents"
  msgstr "Indice"
  
! #: tp/Texinfo/Convert/HTML.pm:817
  msgid "Short Table of Contents"
  msgstr "Indice breve"
  
! #: tp/Texinfo/Convert/HTML.pm:818
  msgid "Footnotes"
  msgstr "Note a piÃ¨ di pagina"
  
! #: tp/Texinfo/Convert/HTML.pm:1534
  #, perl-brace-format
  msgid "{explained_string} ({explanation})"
  msgstr "{explained_string} ({explanation})"
  
! #: tp/Texinfo/Convert/HTML.pm:3182
  #, perl-brace-format
  msgid "see section {reference_name}"
  msgstr "vedi la sezione {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3185
  #, perl-brace-format
  msgid "see {reference_name}"
  msgstr "vedi {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3190
  #, perl-brace-format
  msgid "See section {reference_name}"
  msgstr "Vedi la sezione {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3193
  #, perl-brace-format
  msgid "See {reference_name}"
  msgstr "Vedi {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3197
  #, perl-brace-format
  msgid "{reference_name}"
  msgstr "{reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3259
  #, perl-brace-format
  msgid "see {reference} in @cite{{book}}"
  msgstr "vedi {reference} in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3263
  #, perl-brace-format
  msgid "see @cite{{book_reference}}"
  msgstr "vedi @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3267
  #, perl-brace-format
  msgid "see `{section}' in @cite{{book}}"
  msgstr "vedi \\\"{section}\\\" in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3274
  #, perl-brace-format
  msgid "see {reference}"
  msgstr "vedi {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3277
  #, perl-brace-format
  msgid "see `{section}'"
  msgstr "vedi \\\"{section}\\\""
  
! #: tp/Texinfo/Convert/HTML.pm:3282
  #, perl-brace-format
  msgid "See {reference} in @cite{{book}}"
  msgstr "Vedi {reference} in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3286
  #, perl-brace-format
  msgid "See @cite{{book_reference}}"
  msgstr "Vedi @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3290
  #, perl-brace-format
  msgid "See `{section}' in @cite{{book}}"
  msgstr "Vedi \\\"{section}\\\" in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3297
  #, perl-brace-format
  msgid "See {reference}"
  msgstr "Vedi {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3300
  #, perl-brace-format
  msgid "See `{section}'"
  msgstr "Vedi \\\"{section}\\\""
  
! #: tp/Texinfo/Convert/HTML.pm:3305
  #, perl-brace-format
  msgid "{reference} in @cite{{book}}"
  msgstr "{reference} in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3309
  #, perl-brace-format
  msgid "@cite{{book_reference}}"
  msgstr "@cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3313
  #, perl-brace-format
  msgid "`{section}' in @cite{{book}}"
  msgstr "\\\"{section}\\\" in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3320
  #, perl-brace-format
  msgid "{reference}"
  msgstr "{reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3323
  #, perl-brace-format
  msgid "`{section}'"
  msgstr "\\\"{section}\\\""
  
! #: tp/Texinfo/Convert/HTML.pm:3436
  msgid "Jump to"
  msgstr "Salta a"
  
! #: tp/Texinfo/Convert/HTML.pm:3444
  msgid "Index Entry"
  msgstr "Voce dell'indice"
  
! #: tp/Texinfo/Convert/HTML.pm:3446
  msgid "Section"
  msgstr "Sezione"
  
! #: tp/Texinfo/Convert/HTML.pm:4065
  #, perl-brace-format
  msgid "{category}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4070
  #, perl-brace-format
  msgid "{category}: @strong{{name}}"
  msgstr "{category}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4087
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4091
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4100
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4103
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4111
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} di {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4117
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}}"
  msgstr "{category} di {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4126
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} su {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4132
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}}"
  msgstr "{category} su {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4147
  #, perl-brace-format
  msgid ""
***************
*** 768,772 ****
  "{category} su {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4126
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
--- 769,773 ----
  "{category} su {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4151
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
***************
*** 774,788 ****
  "{category} su {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4137
  #, perl-brace-format
  msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} su {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4141
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} su {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4155
  #, perl-brace-format
  msgid ""
--- 775,789 ----
  "{category} su {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4162
  #, perl-brace-format
  msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} su {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4166
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} su {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4180
  #, perl-brace-format
  msgid ""
***************
*** 791,795 ****
  "{category} di {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4159
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
--- 792,796 ----
  "{category} di {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4184
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
***************
*** 797,811 ****
  "{category} di {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4170
  #, perl-brace-format
  msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} di {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4174
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} di {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:6101
  #, perl-brace-format
  msgid ""
--- 798,812 ----
  "{category} di {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4195
  #, perl-brace-format
  msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} di {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4199
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} di {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:6170
  #, perl-brace-format
  msgid ""
***************
*** 816,855 ****
  "@uref{{program_homepage}, @emph{{program}}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6106
  msgid "This document was generated on @emph{@today{}}."
  msgstr "Questo documento Ã¨ stato generato il @emph{@today{}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6145
  #, perl-brace-format
  msgid "{title}: {element_text}"
  msgstr "{title}: {element_text}"
  
! #: tp/Texinfo/Convert/HTML.pm:6289
  #, perl-brace-format
  msgid "The node you are looking for is at {href}."
  msgstr "Il nodo cercato Ã¨ {href}."
  
! #: tp/Texinfo/Convert/HTML.pm:6358
  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:6364
  msgid "Button"
  msgstr "Pulsante"
  
! #: tp/Texinfo/Convert/HTML.pm:6365
  msgid "Name"
  msgstr "Nome"
  
! #: tp/Texinfo/Convert/HTML.pm:6366
  msgid "Go to"
  msgstr "Vai a"
  
! #: tp/Texinfo/Convert/HTML.pm:6367
  msgid "From 1.2.3 go to"
  msgstr "Da 1.2.3 vai a"
  
! #: tp/Texinfo/Convert/HTML.pm:6393
  msgid ""
  "  where the @strong{ Example } assumes that the current position is at "
--- 817,856 ----
  "@uref{{program_homepage}, @emph{{program}}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6175
  msgid "This document was generated on @emph{@today{}}."
  msgstr "Questo documento Ã¨ stato generato il @emph{@today{}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6214
  #, perl-brace-format
  msgid "{title}: {element_text}"
  msgstr "{title}: {element_text}"
  
! #: tp/Texinfo/Convert/HTML.pm:6358
  #, perl-brace-format
  msgid "The node you are looking for is at {href}."
  msgstr "Il nodo cercato Ã¨ {href}."
  
! #: tp/Texinfo/Convert/HTML.pm:6427
  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:6433
  msgid "Button"
  msgstr "Pulsante"
  
! #: tp/Texinfo/Convert/HTML.pm:6434
  msgid "Name"
  msgstr "Nome"
  
! #: tp/Texinfo/Convert/HTML.pm:6435
  msgid "Go to"
  msgstr "Vai a"
  
! #: tp/Texinfo/Convert/HTML.pm:6436
  msgid "From 1.2.3 go to"
  msgstr "Da 1.2.3 vai a"
  
! #: tp/Texinfo/Convert/HTML.pm:6462
  msgid ""
  "  where the @strong{ Example } assumes that the current position is at "
***************
*** 861,905 ****
  "struttura:"
  
! #: tp/Texinfo/Convert/HTML.pm:6403
  msgid "Section One"
  msgstr "Sezione uno"
  
! #: tp/Texinfo/Convert/HTML.pm:6405
  msgid "Subsection One-One"
  msgstr "Sottosezione Uno-Uno"
  
! #: tp/Texinfo/Convert/HTML.pm:6412
  msgid "Subsection One-Two"
  msgstr "Sottosezione Uno-Due"
  
! #: tp/Texinfo/Convert/HTML.pm:6414
  msgid "Subsubsection One-Two-One"
  msgstr "Sottosottosezione Uno-Due-Uno"
  
! #: tp/Texinfo/Convert/HTML.pm:6415
  msgid "Subsubsection One-Two-Two"
  msgstr "Sottosottosezione Uno-Due-Due"
  
! #: tp/Texinfo/Convert/HTML.pm:6416
  msgid "Subsubsection One-Two-Three"
  msgstr "Sottosottosezione Uno-Due-Tre"
  
! #: tp/Texinfo/Convert/HTML.pm:6418
  msgid "Current Position"
  msgstr "Posizione Attuale"
  
! #: tp/Texinfo/Convert/HTML.pm:6419
  msgid "Subsubsection One-Two-Four"
  msgstr "Sottosottosezione Uno-Due-Quattro"
  
! #: tp/Texinfo/Convert/HTML.pm:6422
  msgid "Subsection One-Three"
  msgstr "Sottosezione Uno-Tre"
  
! #: tp/Texinfo/Convert/HTML.pm:6429
  msgid "Subsection One-Four"
  msgstr "Sottosezione Uno-Quattro"
  
! #: tp/Texinfo/Convert/HTML.pm:6833
  msgid "Untitled Document"
  msgstr "Documento senza titolo"
--- 862,906 ----
  "struttura:"
  
! #: tp/Texinfo/Convert/HTML.pm:6472
  msgid "Section One"
  msgstr "Sezione uno"
  
! #: tp/Texinfo/Convert/HTML.pm:6474
  msgid "Subsection One-One"
  msgstr "Sottosezione Uno-Uno"
  
! #: tp/Texinfo/Convert/HTML.pm:6481
  msgid "Subsection One-Two"
  msgstr "Sottosezione Uno-Due"
  
! #: tp/Texinfo/Convert/HTML.pm:6483
  msgid "Subsubsection One-Two-One"
  msgstr "Sottosottosezione Uno-Due-Uno"
  
! #: tp/Texinfo/Convert/HTML.pm:6484
  msgid "Subsubsection One-Two-Two"
  msgstr "Sottosottosezione Uno-Due-Due"
  
! #: tp/Texinfo/Convert/HTML.pm:6485
  msgid "Subsubsection One-Two-Three"
  msgstr "Sottosottosezione Uno-Due-Tre"
  
! #: tp/Texinfo/Convert/HTML.pm:6487
  msgid "Current Position"
  msgstr "Posizione Attuale"
  
! #: tp/Texinfo/Convert/HTML.pm:6488
  msgid "Subsubsection One-Two-Four"
  msgstr "Sottosottosezione Uno-Due-Quattro"
  
! #: tp/Texinfo/Convert/HTML.pm:6491
  msgid "Subsection One-Three"
  msgstr "Sottosezione Uno-Tre"
  
! #: tp/Texinfo/Convert/HTML.pm:6498
  msgid "Subsection One-Four"
  msgstr "Sottosezione Uno-Quattro"
  
! #: tp/Texinfo/Convert/HTML.pm:6906
  msgid "Untitled Document"
  msgstr "Documento senza titolo"
Binary files texinfo-6.1/po_document/nl.gmo and texinfo-6.3/po_document/nl.gmo differ
diff -Nrc2 texinfo-6.1/po_document/nl.po texinfo-6.3/po_document/nl.po
*** texinfo-6.1/po_document/nl.po	2016-02-06 11:35:59.000000000 +0000
--- texinfo-6.3/po_document/nl.po	2016-09-10 12:46:01.000000000 +0100
***************
*** 10,14 ****
  "Project-Id-Version: texinfo_document-5.0\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
  "PO-Revision-Date: 2013-02-27 20:31+0100\n"
  "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
--- 10,14 ----
  "Project-Id-Version: texinfo_document-5.0\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:46+0100\n"
  "PO-Revision-Date: 2013-02-27 20:31+0100\n"
  "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
***************
*** 18,115 ****
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  "Plural-Forms: nplurals=2; plural=(n != 1);\n"
  "X-Generator: Lokalize 1.0\n"
  
! #: tp/Texinfo/Common.pm:717 tp/Texinfo/Common.pm:722
  msgid "Function"
  msgstr "Functie"
  
! #: tp/Texinfo/Common.pm:718
  msgid "Macro"
  msgstr "Macro"
  
! #: tp/Texinfo/Common.pm:719
  msgid "Special Form"
  msgstr "Speciale vorm"
  
! #: tp/Texinfo/Common.pm:720 tp/Texinfo/Common.pm:723
  msgid "Variable"
  msgstr "Variabele"
  
! #: tp/Texinfo/Common.pm:721
  msgid "User Option"
  msgstr "Gebruikeroptie"
  
! #: tp/Texinfo/Common.pm:724 tp/Texinfo/Common.pm:725
  msgid "Instance Variable"
  msgstr "Instantiatievariabele"
  
! #: tp/Texinfo/Common.pm:726 tp/Texinfo/Common.pm:727
  msgid "Method"
  msgstr "Methode"
  
! #: tp/Texinfo/Common.pm:1199
  #, perl-brace-format
  msgid "{category} on {class}"
  msgstr "{category} over {class}"
  
! #: tp/Texinfo/Common.pm:1206
  #, perl-brace-format
  msgid "{category} of {class}"
  msgstr "{category} van {class}"
  
! #: tp/Texinfo/Common.pm:1223
  #, perl-brace-format
  msgid "{month} {day}, {year}"
  msgstr "{day} {month} {year}"
  
! #: tp/Texinfo/Common.pm:1254 tp/Texinfo/Convert/Plaintext.pm:1132
! #: tp/Texinfo/Convert/HTML.pm:515
  #, perl-brace-format
  msgid "Appendix {number} {section_title}"
  msgstr "Appendix {number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1258 tp/Texinfo/Convert/Plaintext.pm:1137
! #: tp/Texinfo/Convert/HTML.pm:521
  #, perl-brace-format
  msgid "{number} {section_title}"
  msgstr "{number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1393
  #, perl-brace-format
  msgid "{float_type} {float_number}: "
  msgstr "{float_type} {float_number}: "
  
! #: tp/Texinfo/Common.pm:1397
  #, perl-brace-format
  msgid "{float_type}: "
  msgstr "{float_type}: "
  
! #: tp/Texinfo/Common.pm:1402
  #, perl-brace-format
  msgid "{float_type} {float_number}\n"
  msgstr "{float_type} {float_number}\n"
  
! #: tp/Texinfo/Common.pm:1406
  #, perl-brace-format
  msgid "{float_type}\n"
  msgstr "{float_type}\n"
  
! #: tp/Texinfo/Common.pm:1412
  #, perl-brace-format
  msgid "{float_number}: "
  msgstr "{float_number}: "
  
! #: tp/Texinfo/Common.pm:1415
  #, perl-brace-format
  msgid "{float_number}\n"
  msgstr "{float_number}\n"
  
! #: tp/Texinfo/Parser.pm:2982
  #, perl-brace-format
  msgid "{name} on {class}"
  msgstr "{name} over {class}"
  
! #: tp/Texinfo/Parser.pm:2991
  #, perl-brace-format
  msgid "{name} of {class}"
--- 18,116 ----
  "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: Lokalize 1.0\n"
  
! #: tp/Texinfo/Common.pm:697 tp/Texinfo/Common.pm:702
  msgid "Function"
  msgstr "Functie"
  
! #: tp/Texinfo/Common.pm:698
  msgid "Macro"
  msgstr "Macro"
  
! #: tp/Texinfo/Common.pm:699
  msgid "Special Form"
  msgstr "Speciale vorm"
  
! #: tp/Texinfo/Common.pm:700 tp/Texinfo/Common.pm:703
  msgid "Variable"
  msgstr "Variabele"
  
! #: tp/Texinfo/Common.pm:701
  msgid "User Option"
  msgstr "Gebruikeroptie"
  
! #: tp/Texinfo/Common.pm:704 tp/Texinfo/Common.pm:705
  msgid "Instance Variable"
  msgstr "Instantiatievariabele"
  
! #: tp/Texinfo/Common.pm:706 tp/Texinfo/Common.pm:707
  msgid "Method"
  msgstr "Methode"
  
! #: tp/Texinfo/Common.pm:1186
  #, perl-brace-format
  msgid "{category} on {class}"
  msgstr "{category} over {class}"
  
! #: tp/Texinfo/Common.pm:1193
  #, perl-brace-format
  msgid "{category} of {class}"
  msgstr "{category} van {class}"
  
! #: tp/Texinfo/Common.pm:1210
  #, perl-brace-format
  msgid "{month} {day}, {year}"
  msgstr "{day} {month} {year}"
  
! #: tp/Texinfo/Common.pm:1241 tp/Texinfo/Convert/Plaintext.pm:1133
! #: tp/Texinfo/Convert/HTML.pm:516
  #, perl-brace-format
  msgid "Appendix {number} {section_title}"
  msgstr "Appendix {number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1245 tp/Texinfo/Convert/Plaintext.pm:1138
! #: tp/Texinfo/Convert/HTML.pm:522
  #, perl-brace-format
  msgid "{number} {section_title}"
  msgstr "{number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1499
  #, perl-brace-format
  msgid "{float_type} {float_number}: "
  msgstr "{float_type} {float_number}: "
  
! #: tp/Texinfo/Common.pm:1503
  #, perl-brace-format
  msgid "{float_type}: "
  msgstr "{float_type}: "
  
! #: tp/Texinfo/Common.pm:1508
  #, perl-brace-format
  msgid "{float_type} {float_number}\n"
  msgstr "{float_type} {float_number}\n"
  
! #: tp/Texinfo/Common.pm:1512
  #, perl-brace-format
  msgid "{float_type}\n"
  msgstr "{float_type}\n"
  
! #: tp/Texinfo/Common.pm:1518
  #, perl-brace-format
  msgid "{float_number}: "
  msgstr "{float_number}: "
  
! #: tp/Texinfo/Common.pm:1521
  #, perl-brace-format
  msgid "{float_number}\n"
  msgstr "{float_number}\n"
  
! #: tp/Texinfo/Parser.pm:2816
  #, perl-brace-format
  msgid "{name} on {class}"
  msgstr "{name} over {class}"
  
! #: tp/Texinfo/Parser.pm:2825
  #, perl-brace-format
  msgid "{name} of {class}"
***************
*** 120,182 ****
  msgstr "error@arrow{}"
  
! #: tp/Texinfo/Convert/Converter.pm:956
  msgid "January"
  msgstr "Januari"
  
! #: tp/Texinfo/Convert/Converter.pm:957
  msgid "February"
  msgstr "Februari"
  
! #: tp/Texinfo/Convert/Converter.pm:958
  msgid "March"
  msgstr "Maart"
  
! #: tp/Texinfo/Convert/Converter.pm:959
  msgid "April"
  msgstr "April"
  
! #: tp/Texinfo/Convert/Converter.pm:960
  msgid "May"
  msgstr "Mei"
  
! #: tp/Texinfo/Convert/Converter.pm:961
  msgid "June"
  msgstr "Juni"
  
! #: tp/Texinfo/Convert/Converter.pm:962
  msgid "July"
  msgstr "Juli"
  
! #: tp/Texinfo/Convert/Converter.pm:963
  msgid "August"
  msgstr "Augustus"
  
! #: tp/Texinfo/Convert/Converter.pm:964
  msgid "September"
  msgstr "September"
  
! #: tp/Texinfo/Convert/Converter.pm:965
  msgid "October"
  msgstr "Oktober"
  
! #: tp/Texinfo/Convert/Converter.pm:966
  msgid "November"
  msgstr "November"
  
! #: tp/Texinfo/Convert/Converter.pm:967
  msgid "December"
  msgstr "December"
  
! #: tp/Texinfo/Convert/Converter.pm:1018
  #, perl-brace-format
  msgid "{float_type} {float_number}"
  msgstr "{float_type} {float_number}"
  
! #: tp/Texinfo/Convert/Converter.pm:1022
  #, perl-brace-format
  msgid "{float_type}"
  msgstr "{float_type}"
  
! #: tp/Texinfo/Convert/Converter.pm:1026
  #, perl-brace-format
  msgid "{float_number}"
--- 121,183 ----
  msgstr "error@arrow{}"
  
! #: tp/Texinfo/Convert/Converter.pm:948
  msgid "January"
  msgstr "Januari"
  
! #: tp/Texinfo/Convert/Converter.pm:949
  msgid "February"
  msgstr "Februari"
  
! #: tp/Texinfo/Convert/Converter.pm:950
  msgid "March"
  msgstr "Maart"
  
! #: tp/Texinfo/Convert/Converter.pm:951
  msgid "April"
  msgstr "April"
  
! #: tp/Texinfo/Convert/Converter.pm:952
  msgid "May"
  msgstr "Mei"
  
! #: tp/Texinfo/Convert/Converter.pm:953
  msgid "June"
  msgstr "Juni"
  
! #: tp/Texinfo/Convert/Converter.pm:954
  msgid "July"
  msgstr "Juli"
  
! #: tp/Texinfo/Convert/Converter.pm:955
  msgid "August"
  msgstr "Augustus"
  
! #: tp/Texinfo/Convert/Converter.pm:956
  msgid "September"
  msgstr "September"
  
! #: tp/Texinfo/Convert/Converter.pm:957
  msgid "October"
  msgstr "Oktober"
  
! #: tp/Texinfo/Convert/Converter.pm:958
  msgid "November"
  msgstr "November"
  
! #: tp/Texinfo/Convert/Converter.pm:959
  msgid "December"
  msgstr "December"
  
! #: tp/Texinfo/Convert/Converter.pm:1010
  #, perl-brace-format
  msgid "{float_type} {float_number}"
  msgstr "{float_type} {float_number}"
  
! #: tp/Texinfo/Convert/Converter.pm:1014
  #, perl-brace-format
  msgid "{float_type}"
  msgstr "{float_type}"
  
! #: tp/Texinfo/Convert/Converter.pm:1018
  #, perl-brace-format
  msgid "{float_number}"
***************
*** 213,227 ****
  msgstr "zie sectie â€œ{section_name}â€� in @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3291
  #, perl-brace-format
  msgid "@cite{{book}}"
  msgstr "@cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3268
  #, perl-brace-format
  msgid "See @cite{{book}}"
  msgstr "Zie @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3245
  #, perl-brace-format
  msgid "see @cite{{book}}"
--- 214,228 ----
  msgstr "zie sectie â€œ{section_name}â€� in @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3317
  #, perl-brace-format
  msgid "@cite{{book}}"
  msgstr "@cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3294
  #, perl-brace-format
  msgid "See @cite{{book}}"
  msgstr "Zie @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3271
  #, perl-brace-format
  msgid "see @cite{{book}}"
***************
*** 243,768 ****
  msgstr "zie {title_ref}"
  
! #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2310
  #, perl-brace-format
  msgid "{abbr_or_acronym} ({explanation})"
  msgstr "{abbr_or_acronym} ({explanation})"
  
! #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2496
! #: tp/Texinfo/Convert/HTML.pm:3597
  #, perl-brace-format
  msgid "@b{{quotation_arg}:} "
  msgstr "@b{{quotation_arg}:} "
  
! #: tp/Texinfo/Convert/Plaintext.pm:1366
  msgid "(outside of any node)"
  msgstr "(buiten alle pagina's)"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2003
  #, perl-brace-format
  msgid "{name} @url{{email}}"
  msgstr "{name} @url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2006
  #, perl-brace-format
  msgid "@url{{email}}"
  msgstr "@url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2028
  #, perl-brace-format
  msgid "{text} ({url})"
  msgstr "{text} ({url})"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2033
  #, perl-brace-format
  msgid "@t{<{url}>}"
  msgstr "@t{<{url}>}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2421 tp/Texinfo/Convert/HTML.pm:1438
  #, perl-brace-format
  msgid "@{No value for `{value}'@}"
  msgstr "@{Geen waarde voor '{value}'@}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2945
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name} {arguments}"
  msgstr "@tie{ }-- {category}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2950
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name}"
  msgstr "@tie{ }-- {category}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2963
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2966
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2975
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2978
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name}"
  msgstr "@tie{ }-- {category}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2986
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} van {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2992
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name}"
  msgstr "@tie{ }-- {category} van {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3001
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} over {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3007
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name}"
  msgstr "@tie{ }-- {category} over {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3022
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} over {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3026
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} over {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3037
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} over {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3041
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name}"
  msgstr "@tie{ }-- {category} over {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3055
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} van {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3059
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} van {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3070
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} van {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3074
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name}"
  msgstr "@tie{ }-- {category} van{class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3403 tp/Texinfo/Convert/HTML.pm:2851
  #, perl-brace-format
  msgid "@center --- @emph{{author}}\n"
  msgstr "@center --- @emph{{author}}\n"
  
! #: tp/Texinfo/Convert/HTML.pm:732 tp/Texinfo/Convert/HTML.pm:788
  msgid "Top"
  msgstr "Top"
  
! #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
  msgid "Contents"
  msgstr "Inhoud"
  
! #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
  msgid "Overview"
  msgstr "Overzicht"
  
! #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:766
! #: tp/Texinfo/Convert/HTML.pm:791
  msgid "Index"
  msgstr "Index"
  
  # Met een hoofdletter want komt aan begin van zin, en voor "beleid" of "prioriteit".
! #: tp/Texinfo/Convert/HTML.pm:737
  msgid "current"
  msgstr "huidige"
  
! #: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
  msgid "Prev"
  msgstr "Vrg"
  
! #: tp/Texinfo/Convert/HTML.pm:741
  msgid " Up "
  msgstr " Op "
  
! #: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:746
! #: tp/Texinfo/Convert/HTML.pm:798
  msgid "Next"
  msgstr "Volgende"
  
! #: tp/Texinfo/Convert/HTML.pm:744 tp/Texinfo/Convert/HTML.pm:797
  msgid "Up"
  msgstr "Omhoog"
  
! #: tp/Texinfo/Convert/HTML.pm:748
  msgid "Previous"
  msgstr "Voorgaande"
  
! #: tp/Texinfo/Convert/HTML.pm:749
  msgid "Forward node"
  msgstr "Vooruit"
  
! #: tp/Texinfo/Convert/HTML.pm:750
  msgid "Back node"
  msgstr "Terug"
  
! #: tp/Texinfo/Convert/HTML.pm:756
  msgid "Next file"
  msgstr "Volgend bestand"
  
! #: tp/Texinfo/Convert/HTML.pm:757
  msgid "Previous file"
  msgstr "Voorgaand bestand"
  
! #: tp/Texinfo/Convert/HTML.pm:763
  msgid "Cover (top) of document"
  msgstr "Omslag van document (top)"
  
! #: tp/Texinfo/Convert/HTML.pm:764
  msgid "Table of contents"
  msgstr "Inhoudsopgave"
  
! #: tp/Texinfo/Convert/HTML.pm:765
  msgid "Short table of contents"
  msgstr "Korte inhoudsopgave"
  
! #: tp/Texinfo/Convert/HTML.pm:767
  msgid "Current section"
  msgstr "Huidige sectie"
  
! #: tp/Texinfo/Convert/HTML.pm:768
  msgid "Previous section in reading order"
  msgstr "Voorgaande sectie in leesvolgorde"
  
! #: tp/Texinfo/Convert/HTML.pm:769
  msgid "Beginning of this chapter or previous chapter"
  msgstr "Begin van dit (of voorgaand) hoofdstuk"
  
! #: tp/Texinfo/Convert/HTML.pm:770
  msgid "Previous section on same level"
  msgstr "Voorgaande sectie op zelfde niveau"
  
! #: tp/Texinfo/Convert/HTML.pm:771
  msgid "Up section"
  msgstr "Bovenliggende sectie"
  
! #: tp/Texinfo/Convert/HTML.pm:772
  msgid "Next section on same level"
  msgstr "Volgende sectie op zelfde niveau"
  
! #: tp/Texinfo/Convert/HTML.pm:773
  msgid "Up node"
  msgstr "Bovenliggende pagina"
  
! #: tp/Texinfo/Convert/HTML.pm:774
  msgid "Next node"
  msgstr "Volgende pagina"
  
! #: tp/Texinfo/Convert/HTML.pm:775
  msgid "Previous node"
  msgstr "Voorgaande pagina"
  
! #: tp/Texinfo/Convert/HTML.pm:776
  msgid "Next node in node reading order"
  msgstr "Volgende pagina in leesvolgorde"
  
! #: tp/Texinfo/Convert/HTML.pm:777
  msgid "Previous node in node reading order"
  msgstr "Voorgaande pagina in leesvolgorde"
  
! #: tp/Texinfo/Convert/HTML.pm:778
  msgid "Next section in reading order"
  msgstr "Volgende sectie in leesvolgorde"
  
! #: tp/Texinfo/Convert/HTML.pm:779
  msgid "Next chapter"
  msgstr "Volgende hoofdstuk"
  
! #: tp/Texinfo/Convert/HTML.pm:780
  msgid "About (help)"
  msgstr "Info (hulp)"
  
! #: tp/Texinfo/Convert/HTML.pm:781
  msgid "First section in reading order"
  msgstr "Eerste sectie in leesvolgorde"
  
! #: tp/Texinfo/Convert/HTML.pm:782
  msgid "Last section in reading order"
  msgstr "Laatste sectie in leesvolgorde"
  
! #: tp/Texinfo/Convert/HTML.pm:783
  msgid "Forward section in next file"
  msgstr "Sectie vooruit in volgend bestand"
  
! #: tp/Texinfo/Convert/HTML.pm:784
  msgid "Back section in previous file"
  msgstr "Sectie terug in voorgaand bestand"
  
! #: tp/Texinfo/Convert/HTML.pm:793
  msgid "This"
  msgstr "Deze"
  
! #: tp/Texinfo/Convert/HTML.pm:794
  msgid "Back"
  msgstr "Terug"
  
! #: tp/Texinfo/Convert/HTML.pm:795
  msgid "FastBack"
  msgstr "Snel-terug"
  
! #: tp/Texinfo/Convert/HTML.pm:799
  msgid "NodeUp"
  msgstr "Pagina-omhoog"
  
! #: tp/Texinfo/Convert/HTML.pm:800
  msgid "NodeNext"
  msgstr "Volgende-pagina"
  
! #: tp/Texinfo/Convert/HTML.pm:801
  msgid "NodePrev"
  msgstr "Voorgaande-pagina"
  
! #: tp/Texinfo/Convert/HTML.pm:802
  msgid "NodeForward"
  msgstr "Pagina-vooruit"
  
! #: tp/Texinfo/Convert/HTML.pm:803
  msgid "NodeBack"
  msgstr "Pagina-terug"
  
! #: tp/Texinfo/Convert/HTML.pm:804
  msgid "Forward"
  msgstr "Vooruit"
  
! #: tp/Texinfo/Convert/HTML.pm:805
  msgid "FastForward"
  msgstr "Snel-vooruit"
  
! #: tp/Texinfo/Convert/HTML.pm:806
  msgid "About"
  msgstr "Info"
  
! #: tp/Texinfo/Convert/HTML.pm:807
  msgid "First"
  msgstr "Eerste"
  
! #: tp/Texinfo/Convert/HTML.pm:808
  msgid "Last"
  msgstr "Laatste"
  
! #: tp/Texinfo/Convert/HTML.pm:809
  msgid "NextFile"
  msgstr "Volgend-bestand"
  
! #: tp/Texinfo/Convert/HTML.pm:810
  msgid "PrevFile"
  msgstr "Voorgaand-bestand"
  
! #: tp/Texinfo/Convert/HTML.pm:814
  msgid "About This Document"
  msgstr "Over dit document"
  
! #: tp/Texinfo/Convert/HTML.pm:815
  msgid "Table of Contents"
  msgstr "Inhoudsopgave"
  
! #: tp/Texinfo/Convert/HTML.pm:816
  msgid "Short Table of Contents"
  msgstr "Korte inhoudsopgave"
  
! #: tp/Texinfo/Convert/HTML.pm:817
  msgid "Footnotes"
  msgstr "Voetnoten"
  
! #: tp/Texinfo/Convert/HTML.pm:1504
  #, perl-brace-format
  msgid "{explained_string} ({explanation})"
  msgstr "{explained_string} ({explanation})"
  
! #: tp/Texinfo/Convert/HTML.pm:3156
  #, perl-brace-format
  msgid "see section {reference_name}"
  msgstr "zie sectie {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3159
  #, perl-brace-format
  msgid "see {reference_name}"
  msgstr "zie {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3164
  #, perl-brace-format
  msgid "See section {reference_name}"
  msgstr "Zie sectie {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3167
  #, perl-brace-format
  msgid "See {reference_name}"
  msgstr "Zie {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3171
  #, perl-brace-format
  msgid "{reference_name}"
  msgstr "{reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3233
  #, perl-brace-format
  msgid "see {reference} in @cite{{book}}"
  msgstr "zie {reference} in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3237
  #, perl-brace-format
  msgid "see @cite{{book_reference}}"
  msgstr "zie @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3241
  #, perl-brace-format
  msgid "see `{section}' in @cite{{book}}"
  msgstr "zie â€˜{section}â€™ in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3248
  #, perl-brace-format
  msgid "see {reference}"
  msgstr "zie {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3251
  #, perl-brace-format
  msgid "see `{section}'"
  msgstr "zie â€˜{section}â€™"
  
! #: tp/Texinfo/Convert/HTML.pm:3256
  #, perl-brace-format
  msgid "See {reference} in @cite{{book}}"
  msgstr "Zie {reference} in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3260
  #, perl-brace-format
  msgid "See @cite{{book_reference}}"
  msgstr "Zie @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3264
  #, perl-brace-format
  msgid "See `{section}' in @cite{{book}}"
  msgstr "Zie â€˜{section}â€™ in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3271
  #, perl-brace-format
  msgid "See {reference}"
  msgstr "Zie {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3274
  #, perl-brace-format
  msgid "See `{section}'"
  msgstr "Zie â€˜{section}â€™"
  
! #: tp/Texinfo/Convert/HTML.pm:3279
  #, perl-brace-format
  msgid "{reference} in @cite{{book}}"
  msgstr "{reference} in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3283
  #, perl-brace-format
  msgid "@cite{{book_reference}}"
  msgstr "@cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3287
  #, perl-brace-format
  msgid "`{section}' in @cite{{book}}"
  msgstr "â€˜{section}â€™ in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3294
  #, perl-brace-format
  msgid "{reference}"
  msgstr "{reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3297
  #, perl-brace-format
  msgid "`{section}'"
  msgstr "â€˜{section}â€™"
  
! #: tp/Texinfo/Convert/HTML.pm:3410
  msgid "Jump to"
  msgstr "Spring naar"
  
! #: tp/Texinfo/Convert/HTML.pm:3418
  msgid "Index Entry"
  msgstr "Index-item"
  
! #: tp/Texinfo/Convert/HTML.pm:3420
  msgid "Section"
  msgstr "Sectie"
  
! #: tp/Texinfo/Convert/HTML.pm:4040
  #, perl-brace-format
  msgid "{category}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4045
  #, perl-brace-format
  msgid "{category}: @strong{{name}}"
  msgstr "{category}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4062
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4066
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4075
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4078
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4086
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} van {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4092
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}}"
  msgstr "{category} van {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4101
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} over {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4107
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}}"
  msgstr "{category} over {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4122
  #, perl-brace-format
  msgid ""
--- 244,769 ----
  msgstr "zie {title_ref}"
  
! #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2311
  #, perl-brace-format
  msgid "{abbr_or_acronym} ({explanation})"
  msgstr "{abbr_or_acronym} ({explanation})"
  
! #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2497
! #: tp/Texinfo/Convert/HTML.pm:3622
  #, perl-brace-format
  msgid "@b{{quotation_arg}:} "
  msgstr "@b{{quotation_arg}:} "
  
! #: tp/Texinfo/Convert/Plaintext.pm:1367
  msgid "(outside of any node)"
  msgstr "(buiten alle pagina's)"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2004
  #, perl-brace-format
  msgid "{name} @url{{email}}"
  msgstr "{name} @url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2007
  #, perl-brace-format
  msgid "@url{{email}}"
  msgstr "@url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2029
  #, perl-brace-format
  msgid "{text} ({url})"
  msgstr "{text} ({url})"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2034
  #, perl-brace-format
  msgid "@t{<{url}>}"
  msgstr "@t{<{url}>}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2422 tp/Texinfo/Convert/HTML.pm:1437
  #, perl-brace-format
  msgid "@{No value for `{value}'@}"
  msgstr "@{Geen waarde voor '{value}'@}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2913
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name} {arguments}"
  msgstr "@tie{ }-- {category}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2918
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name}"
  msgstr "@tie{ }-- {category}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2931
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2934
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2943
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2946
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name}"
  msgstr "@tie{ }-- {category}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2954
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} van {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2960
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name}"
  msgstr "@tie{ }-- {category} van {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2969
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} over {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2975
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name}"
  msgstr "@tie{ }-- {category} over {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2990
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} over {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2994
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} over {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3005
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} over {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3009
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name}"
  msgstr "@tie{ }-- {category} over {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3023
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} van {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3027
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} van {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3038
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} van {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3042
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name}"
  msgstr "@tie{ }-- {category} van{class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3371 tp/Texinfo/Convert/HTML.pm:2877
  #, perl-brace-format
  msgid "@center --- @emph{{author}}\n"
  msgstr "@center --- @emph{{author}}\n"
  
! #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
  msgid "Top"
  msgstr "Top"
  
! #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
  msgid "Contents"
  msgstr "Inhoud"
  
! #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:791
  msgid "Overview"
  msgstr "Overzicht"
  
! #: tp/Texinfo/Convert/HTML.pm:736 tp/Texinfo/Convert/HTML.pm:767
! #: tp/Texinfo/Convert/HTML.pm:792
  msgid "Index"
  msgstr "Index"
  
  # Met een hoofdletter want komt aan begin van zin, en voor "beleid" of "prioriteit".
! #: tp/Texinfo/Convert/HTML.pm:738
  msgid "current"
  msgstr "huidige"
  
! #: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
  msgid "Prev"
  msgstr "Vrg"
  
! #: tp/Texinfo/Convert/HTML.pm:742
  msgid " Up "
  msgstr " Op "
  
! #: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:747
! #: tp/Texinfo/Convert/HTML.pm:799
  msgid "Next"
  msgstr "Volgende"
  
! #: tp/Texinfo/Convert/HTML.pm:745 tp/Texinfo/Convert/HTML.pm:798
  msgid "Up"
  msgstr "Omhoog"
  
! #: tp/Texinfo/Convert/HTML.pm:749
  msgid "Previous"
  msgstr "Voorgaande"
  
! #: tp/Texinfo/Convert/HTML.pm:750
  msgid "Forward node"
  msgstr "Vooruit"
  
! #: tp/Texinfo/Convert/HTML.pm:751
  msgid "Back node"
  msgstr "Terug"
  
! #: tp/Texinfo/Convert/HTML.pm:757
  msgid "Next file"
  msgstr "Volgend bestand"
  
! #: tp/Texinfo/Convert/HTML.pm:758
  msgid "Previous file"
  msgstr "Voorgaand bestand"
  
! #: tp/Texinfo/Convert/HTML.pm:764
  msgid "Cover (top) of document"
  msgstr "Omslag van document (top)"
  
! #: tp/Texinfo/Convert/HTML.pm:765
  msgid "Table of contents"
  msgstr "Inhoudsopgave"
  
! #: tp/Texinfo/Convert/HTML.pm:766
  msgid "Short table of contents"
  msgstr "Korte inhoudsopgave"
  
! #: tp/Texinfo/Convert/HTML.pm:768
  msgid "Current section"
  msgstr "Huidige sectie"
  
! #: tp/Texinfo/Convert/HTML.pm:769
  msgid "Previous section in reading order"
  msgstr "Voorgaande sectie in leesvolgorde"
  
! #: tp/Texinfo/Convert/HTML.pm:770
  msgid "Beginning of this chapter or previous chapter"
  msgstr "Begin van dit (of voorgaand) hoofdstuk"
  
! #: tp/Texinfo/Convert/HTML.pm:771
  msgid "Previous section on same level"
  msgstr "Voorgaande sectie op zelfde niveau"
  
! #: tp/Texinfo/Convert/HTML.pm:772
  msgid "Up section"
  msgstr "Bovenliggende sectie"
  
! #: tp/Texinfo/Convert/HTML.pm:773
  msgid "Next section on same level"
  msgstr "Volgende sectie op zelfde niveau"
  
! #: tp/Texinfo/Convert/HTML.pm:774
  msgid "Up node"
  msgstr "Bovenliggende pagina"
  
! #: tp/Texinfo/Convert/HTML.pm:775
  msgid "Next node"
  msgstr "Volgende pagina"
  
! #: tp/Texinfo/Convert/HTML.pm:776
  msgid "Previous node"
  msgstr "Voorgaande pagina"
  
! #: tp/Texinfo/Convert/HTML.pm:777
  msgid "Next node in node reading order"
  msgstr "Volgende pagina in leesvolgorde"
  
! #: tp/Texinfo/Convert/HTML.pm:778
  msgid "Previous node in node reading order"
  msgstr "Voorgaande pagina in leesvolgorde"
  
! #: tp/Texinfo/Convert/HTML.pm:779
  msgid "Next section in reading order"
  msgstr "Volgende sectie in leesvolgorde"
  
! #: tp/Texinfo/Convert/HTML.pm:780
  msgid "Next chapter"
  msgstr "Volgende hoofdstuk"
  
! #: tp/Texinfo/Convert/HTML.pm:781
  msgid "About (help)"
  msgstr "Info (hulp)"
  
! #: tp/Texinfo/Convert/HTML.pm:782
  msgid "First section in reading order"
  msgstr "Eerste sectie in leesvolgorde"
  
! #: tp/Texinfo/Convert/HTML.pm:783
  msgid "Last section in reading order"
  msgstr "Laatste sectie in leesvolgorde"
  
! #: tp/Texinfo/Convert/HTML.pm:784
  msgid "Forward section in next file"
  msgstr "Sectie vooruit in volgend bestand"
  
! #: tp/Texinfo/Convert/HTML.pm:785
  msgid "Back section in previous file"
  msgstr "Sectie terug in voorgaand bestand"
  
! #: tp/Texinfo/Convert/HTML.pm:794
  msgid "This"
  msgstr "Deze"
  
! #: tp/Texinfo/Convert/HTML.pm:795
  msgid "Back"
  msgstr "Terug"
  
! #: tp/Texinfo/Convert/HTML.pm:796
  msgid "FastBack"
  msgstr "Snel-terug"
  
! #: tp/Texinfo/Convert/HTML.pm:800
  msgid "NodeUp"
  msgstr "Pagina-omhoog"
  
! #: tp/Texinfo/Convert/HTML.pm:801
  msgid "NodeNext"
  msgstr "Volgende-pagina"
  
! #: tp/Texinfo/Convert/HTML.pm:802
  msgid "NodePrev"
  msgstr "Voorgaande-pagina"
  
! #: tp/Texinfo/Convert/HTML.pm:803
  msgid "NodeForward"
  msgstr "Pagina-vooruit"
  
! #: tp/Texinfo/Convert/HTML.pm:804
  msgid "NodeBack"
  msgstr "Pagina-terug"
  
! #: tp/Texinfo/Convert/HTML.pm:805
  msgid "Forward"
  msgstr "Vooruit"
  
! #: tp/Texinfo/Convert/HTML.pm:806
  msgid "FastForward"
  msgstr "Snel-vooruit"
  
! #: tp/Texinfo/Convert/HTML.pm:807
  msgid "About"
  msgstr "Info"
  
! #: tp/Texinfo/Convert/HTML.pm:808
  msgid "First"
  msgstr "Eerste"
  
! #: tp/Texinfo/Convert/HTML.pm:809
  msgid "Last"
  msgstr "Laatste"
  
! #: tp/Texinfo/Convert/HTML.pm:810
  msgid "NextFile"
  msgstr "Volgend-bestand"
  
! #: tp/Texinfo/Convert/HTML.pm:811
  msgid "PrevFile"
  msgstr "Voorgaand-bestand"
  
! #: tp/Texinfo/Convert/HTML.pm:815
  msgid "About This Document"
  msgstr "Over dit document"
  
! #: tp/Texinfo/Convert/HTML.pm:816
  msgid "Table of Contents"
  msgstr "Inhoudsopgave"
  
! #: tp/Texinfo/Convert/HTML.pm:817
  msgid "Short Table of Contents"
  msgstr "Korte inhoudsopgave"
  
! #: tp/Texinfo/Convert/HTML.pm:818
  msgid "Footnotes"
  msgstr "Voetnoten"
  
! #: tp/Texinfo/Convert/HTML.pm:1534
  #, perl-brace-format
  msgid "{explained_string} ({explanation})"
  msgstr "{explained_string} ({explanation})"
  
! #: tp/Texinfo/Convert/HTML.pm:3182
  #, perl-brace-format
  msgid "see section {reference_name}"
  msgstr "zie sectie {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3185
  #, perl-brace-format
  msgid "see {reference_name}"
  msgstr "zie {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3190
  #, perl-brace-format
  msgid "See section {reference_name}"
  msgstr "Zie sectie {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3193
  #, perl-brace-format
  msgid "See {reference_name}"
  msgstr "Zie {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3197
  #, perl-brace-format
  msgid "{reference_name}"
  msgstr "{reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3259
  #, perl-brace-format
  msgid "see {reference} in @cite{{book}}"
  msgstr "zie {reference} in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3263
  #, perl-brace-format
  msgid "see @cite{{book_reference}}"
  msgstr "zie @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3267
  #, perl-brace-format
  msgid "see `{section}' in @cite{{book}}"
  msgstr "zie â€˜{section}â€™ in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3274
  #, perl-brace-format
  msgid "see {reference}"
  msgstr "zie {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3277
  #, perl-brace-format
  msgid "see `{section}'"
  msgstr "zie â€˜{section}â€™"
  
! #: tp/Texinfo/Convert/HTML.pm:3282
  #, perl-brace-format
  msgid "See {reference} in @cite{{book}}"
  msgstr "Zie {reference} in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3286
  #, perl-brace-format
  msgid "See @cite{{book_reference}}"
  msgstr "Zie @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3290
  #, perl-brace-format
  msgid "See `{section}' in @cite{{book}}"
  msgstr "Zie â€˜{section}â€™ in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3297
  #, perl-brace-format
  msgid "See {reference}"
  msgstr "Zie {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3300
  #, perl-brace-format
  msgid "See `{section}'"
  msgstr "Zie â€˜{section}â€™"
  
! #: tp/Texinfo/Convert/HTML.pm:3305
  #, perl-brace-format
  msgid "{reference} in @cite{{book}}"
  msgstr "{reference} in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3309
  #, perl-brace-format
  msgid "@cite{{book_reference}}"
  msgstr "@cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3313
  #, perl-brace-format
  msgid "`{section}' in @cite{{book}}"
  msgstr "â€˜{section}â€™ in @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3320
  #, perl-brace-format
  msgid "{reference}"
  msgstr "{reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3323
  #, perl-brace-format
  msgid "`{section}'"
  msgstr "â€˜{section}â€™"
  
! #: tp/Texinfo/Convert/HTML.pm:3436
  msgid "Jump to"
  msgstr "Spring naar"
  
! #: tp/Texinfo/Convert/HTML.pm:3444
  msgid "Index Entry"
  msgstr "Index-item"
  
! #: tp/Texinfo/Convert/HTML.pm:3446
  msgid "Section"
  msgstr "Sectie"
  
! #: tp/Texinfo/Convert/HTML.pm:4065
  #, perl-brace-format
  msgid "{category}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4070
  #, perl-brace-format
  msgid "{category}: @strong{{name}}"
  msgstr "{category}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4087
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4091
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4100
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4103
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4111
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} van {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4117
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}}"
  msgstr "{category} van {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4126
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} over {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4132
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}}"
  msgstr "{category} over {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4147
  #, perl-brace-format
  msgid ""
***************
*** 771,775 ****
  "{category} over {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4126
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
--- 772,776 ----
  "{category} over {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4151
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
***************
*** 777,791 ****
  "{category} over {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4137
  #, perl-brace-format
  msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} over {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4141
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} over {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4155
  #, perl-brace-format
  msgid ""
--- 778,792 ----
  "{category} over {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4162
  #, perl-brace-format
  msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} over {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4166
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} over {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4180
  #, perl-brace-format
  msgid ""
***************
*** 794,798 ****
  "{category} van {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4159
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
--- 795,799 ----
  "{category} van {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4184
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
***************
*** 800,814 ****
  "{category} van {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4170
  #, perl-brace-format
  msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} van {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4174
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} van {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:6101
  #, perl-brace-format
  msgid ""
--- 801,815 ----
  "{category} van {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4195
  #, perl-brace-format
  msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} van {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4199
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} van {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:6170
  #, perl-brace-format
  msgid ""
***************
*** 819,857 ****
  "@uref{{program_homepage}, @emph{{program}}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6106
  msgid "This document was generated on @emph{@today{}}."
  msgstr "Dit document werd gegenereerd op @emph{@today{}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6145
  #, perl-brace-format
  msgid "{title}: {element_text}"
  msgstr "{title}: {element_text}"
  
! #: tp/Texinfo/Convert/HTML.pm:6289
  #, 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:6358
  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:6364
  msgid "Button"
  msgstr "Knop"
  
! #: tp/Texinfo/Convert/HTML.pm:6365
  msgid "Name"
  msgstr "Naam"
  
! #: tp/Texinfo/Convert/HTML.pm:6366
  msgid "Go to"
  msgstr "Gaat naar"
  
! #: tp/Texinfo/Convert/HTML.pm:6367
  msgid "From 1.2.3 go to"
  msgstr "Gaat van 1.2.3 naar"
  
! #: tp/Texinfo/Convert/HTML.pm:6393
  msgid ""
  "  where the @strong{ Example } assumes that the current position is at "
--- 820,858 ----
  "@uref{{program_homepage}, @emph{{program}}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6175
  msgid "This document was generated on @emph{@today{}}."
  msgstr "Dit document werd gegenereerd op @emph{@today{}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6214
  #, perl-brace-format
  msgid "{title}: {element_text}"
  msgstr "{title}: {element_text}"
  
! #: tp/Texinfo/Convert/HTML.pm:6358
  #, 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:6427
  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:6433
  msgid "Button"
  msgstr "Knop"
  
! #: tp/Texinfo/Convert/HTML.pm:6434
  msgid "Name"
  msgstr "Naam"
  
! #: tp/Texinfo/Convert/HTML.pm:6435
  msgid "Go to"
  msgstr "Gaat naar"
  
! #: tp/Texinfo/Convert/HTML.pm:6436
  msgid "From 1.2.3 go to"
  msgstr "Gaat van 1.2.3 naar"
  
! #: tp/Texinfo/Convert/HTML.pm:6462
  msgid ""
  "  where the @strong{ Example } assumes that the current position is at "
***************
*** 863,907 ****
  "structuur:"
  
! #: tp/Texinfo/Convert/HTML.pm:6403
  msgid "Section One"
  msgstr "Sectie Ã©Ã©n"
  
! #: tp/Texinfo/Convert/HTML.pm:6405
  msgid "Subsection One-One"
  msgstr "Subsectie Ã©Ã©n-Ã©Ã©n"
  
! #: tp/Texinfo/Convert/HTML.pm:6412
  msgid "Subsection One-Two"
  msgstr "Subsectie Ã©Ã©n-twee"
  
! #: tp/Texinfo/Convert/HTML.pm:6414
  msgid "Subsubsection One-Two-One"
  msgstr "Subsectie Ã©Ã©n-twee-Ã©Ã©n"
  
! #: tp/Texinfo/Convert/HTML.pm:6415
  msgid "Subsubsection One-Two-Two"
  msgstr "Subsectie Ã©Ã©n-twee-twee"
  
! #: tp/Texinfo/Convert/HTML.pm:6416
  msgid "Subsubsection One-Two-Three"
  msgstr "Subsectie Ã©Ã©n-twee-drie"
  
! #: tp/Texinfo/Convert/HTML.pm:6418
  msgid "Current Position"
  msgstr "Huidige positie"
  
! #: tp/Texinfo/Convert/HTML.pm:6419
  msgid "Subsubsection One-Two-Four"
  msgstr "Subsectie Ã©Ã©n-twee-vier"
  
! #: tp/Texinfo/Convert/HTML.pm:6422
  msgid "Subsection One-Three"
  msgstr "Subsectie Ã©Ã©n-drie"
  
! #: tp/Texinfo/Convert/HTML.pm:6429
  msgid "Subsection One-Four"
  msgstr "Subsectie Ã©Ã©n-vier"
  
! #: tp/Texinfo/Convert/HTML.pm:6833
  msgid "Untitled Document"
  msgstr "Naamloos document"
--- 864,908 ----
  "structuur:"
  
! #: tp/Texinfo/Convert/HTML.pm:6472
  msgid "Section One"
  msgstr "Sectie Ã©Ã©n"
  
! #: tp/Texinfo/Convert/HTML.pm:6474
  msgid "Subsection One-One"
  msgstr "Subsectie Ã©Ã©n-Ã©Ã©n"
  
! #: tp/Texinfo/Convert/HTML.pm:6481
  msgid "Subsection One-Two"
  msgstr "Subsectie Ã©Ã©n-twee"
  
! #: tp/Texinfo/Convert/HTML.pm:6483
  msgid "Subsubsection One-Two-One"
  msgstr "Subsectie Ã©Ã©n-twee-Ã©Ã©n"
  
! #: tp/Texinfo/Convert/HTML.pm:6484
  msgid "Subsubsection One-Two-Two"
  msgstr "Subsectie Ã©Ã©n-twee-twee"
  
! #: tp/Texinfo/Convert/HTML.pm:6485
  msgid "Subsubsection One-Two-Three"
  msgstr "Subsectie Ã©Ã©n-twee-drie"
  
! #: tp/Texinfo/Convert/HTML.pm:6487
  msgid "Current Position"
  msgstr "Huidige positie"
  
! #: tp/Texinfo/Convert/HTML.pm:6488
  msgid "Subsubsection One-Two-Four"
  msgstr "Subsectie Ã©Ã©n-twee-vier"
  
! #: tp/Texinfo/Convert/HTML.pm:6491
  msgid "Subsection One-Three"
  msgstr "Subsectie Ã©Ã©n-drie"
  
! #: tp/Texinfo/Convert/HTML.pm:6498
  msgid "Subsection One-Four"
  msgstr "Subsectie Ã©Ã©n-vier"
  
! #: tp/Texinfo/Convert/HTML.pm:6906
  msgid "Untitled Document"
  msgstr "Naamloos document"
Binary files texinfo-6.1/po_document/no.us-ascii.gmo and texinfo-6.3/po_document/no.us-ascii.gmo differ
diff -Nrc2 texinfo-6.1/po_document/no.us-ascii.po texinfo-6.3/po_document/no.us-ascii.po
*** texinfo-6.1/po_document/no.us-ascii.po	2016-02-06 11:35:59.000000000 +0000
--- texinfo-6.3/po_document/no.us-ascii.po	2016-09-10 12:46:01.000000000 +0100
***************
*** 8,12 ****
  "Project-Id-Version: texinfo 5.0\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
  "PO-Revision-Date: 2001-01-01\n"
  "Last-Translator: Unknown\n"
--- 8,12 ----
  "Project-Id-Version: texinfo 5.0\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:46+0100\n"
  "PO-Revision-Date: 2001-01-01\n"
  "Last-Translator: Unknown\n"
***************
*** 17,111 ****
  "Content-Transfer-Encoding: 8bit\n"
  
! #: tp/Texinfo/Common.pm:717 tp/Texinfo/Common.pm:722
  msgid "Function"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:718
  msgid "Macro"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:719
  msgid "Special Form"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:720 tp/Texinfo/Common.pm:723
  msgid "Variable"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:721
  msgid "User Option"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:724 tp/Texinfo/Common.pm:725
  msgid "Instance Variable"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:726 tp/Texinfo/Common.pm:727
  msgid "Method"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1199
  #, perl-brace-format
  msgid "{category} on {class}"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1206
  #, perl-brace-format
  msgid "{category} of {class}"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1223
  #, perl-brace-format
  msgid "{month} {day}, {year}"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1254 tp/Texinfo/Convert/Plaintext.pm:1132
! #: tp/Texinfo/Convert/HTML.pm:515
  #, perl-brace-format
  msgid "Appendix {number} {section_title}"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1258 tp/Texinfo/Convert/Plaintext.pm:1137
! #: tp/Texinfo/Convert/HTML.pm:521
  #, perl-brace-format
  msgid "{number} {section_title}"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1393
  #, perl-brace-format
  msgid "{float_type} {float_number}: "
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1397
  #, perl-brace-format
  msgid "{float_type}: "
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1402
  #, perl-brace-format
  msgid "{float_type} {float_number}\n"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1406
  #, perl-brace-format
  msgid "{float_type}\n"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1412
  #, perl-brace-format
  msgid "{float_number}: "
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1415
  #, perl-brace-format
  msgid "{float_number}\n"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2982
  #, perl-brace-format
  msgid "{name} on {class}"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2991
  #, perl-brace-format
  msgid "{name} of {class}"
--- 17,111 ----
  "Content-Transfer-Encoding: 8bit\n"
  
! #: tp/Texinfo/Common.pm:697 tp/Texinfo/Common.pm:702
  msgid "Function"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:698
  msgid "Macro"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:699
  msgid "Special Form"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:700 tp/Texinfo/Common.pm:703
  msgid "Variable"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:701
  msgid "User Option"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:704 tp/Texinfo/Common.pm:705
  msgid "Instance Variable"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:706 tp/Texinfo/Common.pm:707
  msgid "Method"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1186
  #, perl-brace-format
  msgid "{category} on {class}"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1193
  #, perl-brace-format
  msgid "{category} of {class}"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1210
  #, perl-brace-format
  msgid "{month} {day}, {year}"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1241 tp/Texinfo/Convert/Plaintext.pm:1133
! #: tp/Texinfo/Convert/HTML.pm:516
  #, perl-brace-format
  msgid "Appendix {number} {section_title}"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1245 tp/Texinfo/Convert/Plaintext.pm:1138
! #: tp/Texinfo/Convert/HTML.pm:522
  #, perl-brace-format
  msgid "{number} {section_title}"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1499
  #, perl-brace-format
  msgid "{float_type} {float_number}: "
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1503
  #, perl-brace-format
  msgid "{float_type}: "
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1508
  #, perl-brace-format
  msgid "{float_type} {float_number}\n"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1512
  #, perl-brace-format
  msgid "{float_type}\n"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1518
  #, perl-brace-format
  msgid "{float_number}: "
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1521
  #, perl-brace-format
  msgid "{float_number}\n"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2816
  #, perl-brace-format
  msgid "{name} on {class}"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2825
  #, perl-brace-format
  msgid "{name} of {class}"
***************
*** 116,178 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:956
  msgid "January"
  msgstr "januar"
  
! #: tp/Texinfo/Convert/Converter.pm:957
  msgid "February"
  msgstr "februar"
  
! #: tp/Texinfo/Convert/Converter.pm:958
  msgid "March"
  msgstr "mars"
  
! #: tp/Texinfo/Convert/Converter.pm:959
  msgid "April"
  msgstr "april"
  
! #: tp/Texinfo/Convert/Converter.pm:960
  msgid "May"
  msgstr "mai"
  
! #: tp/Texinfo/Convert/Converter.pm:961
  msgid "June"
  msgstr "juni"
  
! #: tp/Texinfo/Convert/Converter.pm:962
  msgid "July"
  msgstr "juli"
  
! #: tp/Texinfo/Convert/Converter.pm:963
  msgid "August"
  msgstr "august"
  
! #: tp/Texinfo/Convert/Converter.pm:964
  msgid "September"
  msgstr "september"
  
! #: tp/Texinfo/Convert/Converter.pm:965
  msgid "October"
  msgstr "oktober"
  
! #: tp/Texinfo/Convert/Converter.pm:966
  msgid "November"
  msgstr "november"
  
! #: tp/Texinfo/Convert/Converter.pm:967
  msgid "December"
  msgstr "desember"
  
! #: tp/Texinfo/Convert/Converter.pm:1018
  #, perl-brace-format
  msgid "{float_type} {float_number}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:1022
  #, perl-brace-format
  msgid "{float_type}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:1026
  #, perl-brace-format
  msgid "{float_number}"
--- 116,178 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:948
  msgid "January"
  msgstr "januar"
  
! #: tp/Texinfo/Convert/Converter.pm:949
  msgid "February"
  msgstr "februar"
  
! #: tp/Texinfo/Convert/Converter.pm:950
  msgid "March"
  msgstr "mars"
  
! #: tp/Texinfo/Convert/Converter.pm:951
  msgid "April"
  msgstr "april"
  
! #: tp/Texinfo/Convert/Converter.pm:952
  msgid "May"
  msgstr "mai"
  
! #: tp/Texinfo/Convert/Converter.pm:953
  msgid "June"
  msgstr "juni"
  
! #: tp/Texinfo/Convert/Converter.pm:954
  msgid "July"
  msgstr "juli"
  
! #: tp/Texinfo/Convert/Converter.pm:955
  msgid "August"
  msgstr "august"
  
! #: tp/Texinfo/Convert/Converter.pm:956
  msgid "September"
  msgstr "september"
  
! #: tp/Texinfo/Convert/Converter.pm:957
  msgid "October"
  msgstr "oktober"
  
! #: tp/Texinfo/Convert/Converter.pm:958
  msgid "November"
  msgstr "november"
  
! #: tp/Texinfo/Convert/Converter.pm:959
  msgid "December"
  msgstr "desember"
  
! #: tp/Texinfo/Convert/Converter.pm:1010
  #, perl-brace-format
  msgid "{float_type} {float_number}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:1014
  #, perl-brace-format
  msgid "{float_type}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:1018
  #, perl-brace-format
  msgid "{float_number}"
***************
*** 209,223 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3291
  #, perl-brace-format
  msgid "@cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3268
  #, perl-brace-format
  msgid "See @cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3245
  #, perl-brace-format
  msgid "see @cite{{book}}"
--- 209,223 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3317
  #, perl-brace-format
  msgid "@cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3294
  #, perl-brace-format
  msgid "See @cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3271
  #, perl-brace-format
  msgid "see @cite{{book}}"
***************
*** 239,763 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2310
  #, perl-brace-format
  msgid "{abbr_or_acronym} ({explanation})"
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2496
! #: tp/Texinfo/Convert/HTML.pm:3597
  #, perl-brace-format
  msgid "@b{{quotation_arg}:} "
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1366
  msgid "(outside of any node)"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2003
  #, perl-brace-format
  msgid "{name} @url{{email}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2006
  #, perl-brace-format
  msgid "@url{{email}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2028
  #, perl-brace-format
  msgid "{text} ({url})"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2033
  #, perl-brace-format
  msgid "@t{<{url}>}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2421 tp/Texinfo/Convert/HTML.pm:1438
  #, perl-brace-format
  msgid "@{No value for `{value}'@}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2945
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2950
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2963
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2966
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2975
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2978
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2986
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2992
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3001
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3007
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3022
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3026
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3037
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3041
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3055
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3059
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3070
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3074
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3403 tp/Texinfo/Convert/HTML.pm:2851
  #, perl-brace-format
  msgid "@center --- @emph{{author}}\n"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:732 tp/Texinfo/Convert/HTML.pm:788
  msgid "Top"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
  msgid "Contents"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
  msgid "Overview"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:766
! #: tp/Texinfo/Convert/HTML.pm:791
  msgid "Index"
  msgstr "Indeks"
  
! #: tp/Texinfo/Convert/HTML.pm:737
  msgid "current"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
  msgid "Prev"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:741
  msgid " Up "
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:746
! #: tp/Texinfo/Convert/HTML.pm:798
  msgid "Next"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:744 tp/Texinfo/Convert/HTML.pm:797
  msgid "Up"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:748
  msgid "Previous"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:749
  msgid "Forward node"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:750
  msgid "Back node"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:756
  msgid "Next file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:757
  msgid "Previous file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:763
  msgid "Cover (top) of document"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:764
  msgid "Table of contents"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:765
  msgid "Short table of contents"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:767
  msgid "Current section"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:768
  msgid "Previous section in reading order"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:769
  msgid "Beginning of this chapter or previous chapter"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:770
  msgid "Previous section on same level"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:771
  msgid "Up section"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:772
  msgid "Next section on same level"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:773
  msgid "Up node"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:774
  msgid "Next node"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:775
  msgid "Previous node"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:776
  msgid "Next node in node reading order"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:777
  msgid "Previous node in node reading order"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:778
  msgid "Next section in reading order"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:779
  msgid "Next chapter"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:780
  msgid "About (help)"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:781
  msgid "First section in reading order"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:782
  msgid "Last section in reading order"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:783
  msgid "Forward section in next file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:784
  msgid "Back section in previous file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:793
  msgid "This"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:794
  msgid "Back"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:795
  msgid "FastBack"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:799
  msgid "NodeUp"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:800
  msgid "NodeNext"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:801
  msgid "NodePrev"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:802
  msgid "NodeForward"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:803
  msgid "NodeBack"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:804
  msgid "Forward"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:805
  msgid "FastForward"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:806
  msgid "About"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:807
  msgid "First"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:808
  msgid "Last"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:809
  msgid "NextFile"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:810
  msgid "PrevFile"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:814
  msgid "About This Document"
  msgstr "No translation available!"
  
! #: tp/Texinfo/Convert/HTML.pm:815
  msgid "Table of Contents"
  msgstr "Innholdsfortegnelse"
  
! #: tp/Texinfo/Convert/HTML.pm:816
  msgid "Short Table of Contents"
  msgstr "Kort innholdsfortegnelse"
  
! #: tp/Texinfo/Convert/HTML.pm:817
  msgid "Footnotes"
  msgstr "No translation available!"
  
! #: tp/Texinfo/Convert/HTML.pm:1504
  #, perl-brace-format
  msgid "{explained_string} ({explanation})"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3156
  #, perl-brace-format
  msgid "see section {reference_name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3159
  #, perl-brace-format
  msgid "see {reference_name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3164
  #, perl-brace-format
  msgid "See section {reference_name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3167
  #, perl-brace-format
  msgid "See {reference_name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3171
  #, perl-brace-format
  msgid "{reference_name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3233
  #, perl-brace-format
  msgid "see {reference} in @cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3237
  #, perl-brace-format
  msgid "see @cite{{book_reference}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3241
  #, perl-brace-format
  msgid "see `{section}' in @cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3248
  #, perl-brace-format
  msgid "see {reference}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3251
  #, perl-brace-format
  msgid "see `{section}'"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3256
  #, perl-brace-format
  msgid "See {reference} in @cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3260
  #, perl-brace-format
  msgid "See @cite{{book_reference}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3264
  #, perl-brace-format
  msgid "See `{section}' in @cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3271
  #, perl-brace-format
  msgid "See {reference}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3274
  #, perl-brace-format
  msgid "See `{section}'"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3279
  #, perl-brace-format
  msgid "{reference} in @cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3283
  #, perl-brace-format
  msgid "@cite{{book_reference}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3287
  #, perl-brace-format
  msgid "`{section}' in @cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3294
  #, perl-brace-format
  msgid "{reference}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3297
  #, perl-brace-format
  msgid "`{section}'"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3410
  msgid "Jump to"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3418
  msgid "Index Entry"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3420
  msgid "Section"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4040
  #, perl-brace-format
  msgid "{category}: @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4045
  #, perl-brace-format
  msgid "{category}: @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4062
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4066
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4075
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4078
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4086
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4092
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4101
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4107
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4122
  #, perl-brace-format
  msgid ""
--- 239,763 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2311
  #, perl-brace-format
  msgid "{abbr_or_acronym} ({explanation})"
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2497
! #: tp/Texinfo/Convert/HTML.pm:3622
  #, perl-brace-format
  msgid "@b{{quotation_arg}:} "
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1367
  msgid "(outside of any node)"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2004
  #, perl-brace-format
  msgid "{name} @url{{email}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2007
  #, perl-brace-format
  msgid "@url{{email}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2029
  #, perl-brace-format
  msgid "{text} ({url})"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2034
  #, perl-brace-format
  msgid "@t{<{url}>}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2422 tp/Texinfo/Convert/HTML.pm:1437
  #, perl-brace-format
  msgid "@{No value for `{value}'@}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2913
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2918
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2931
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2934
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2943
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2946
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2954
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2960
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2969
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2975
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2990
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2994
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3005
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3009
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3023
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3027
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3038
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3042
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3371 tp/Texinfo/Convert/HTML.pm:2877
  #, perl-brace-format
  msgid "@center --- @emph{{author}}\n"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
  msgid "Top"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
  msgid "Contents"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:791
  msgid "Overview"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:736 tp/Texinfo/Convert/HTML.pm:767
! #: tp/Texinfo/Convert/HTML.pm:792
  msgid "Index"
  msgstr "Indeks"
  
! #: tp/Texinfo/Convert/HTML.pm:738
  msgid "current"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
  msgid "Prev"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:742
  msgid " Up "
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:747
! #: tp/Texinfo/Convert/HTML.pm:799
  msgid "Next"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:745 tp/Texinfo/Convert/HTML.pm:798
  msgid "Up"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:749
  msgid "Previous"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:750
  msgid "Forward node"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:751
  msgid "Back node"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:757
  msgid "Next file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:758
  msgid "Previous file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:764
  msgid "Cover (top) of document"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:765
  msgid "Table of contents"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:766
  msgid "Short table of contents"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:768
  msgid "Current section"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:769
  msgid "Previous section in reading order"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:770
  msgid "Beginning of this chapter or previous chapter"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:771
  msgid "Previous section on same level"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:772
  msgid "Up section"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:773
  msgid "Next section on same level"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:774
  msgid "Up node"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:775
  msgid "Next node"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:776
  msgid "Previous node"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:777
  msgid "Next node in node reading order"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:778
  msgid "Previous node in node reading order"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:779
  msgid "Next section in reading order"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:780
  msgid "Next chapter"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:781
  msgid "About (help)"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:782
  msgid "First section in reading order"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:783
  msgid "Last section in reading order"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:784
  msgid "Forward section in next file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:785
  msgid "Back section in previous file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:794
  msgid "This"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:795
  msgid "Back"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:796
  msgid "FastBack"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:800
  msgid "NodeUp"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:801
  msgid "NodeNext"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:802
  msgid "NodePrev"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:803
  msgid "NodeForward"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:804
  msgid "NodeBack"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:805
  msgid "Forward"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:806
  msgid "FastForward"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:807
  msgid "About"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:808
  msgid "First"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:809
  msgid "Last"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:810
  msgid "NextFile"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:811
  msgid "PrevFile"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:815
  msgid "About This Document"
  msgstr "No translation available!"
  
! #: tp/Texinfo/Convert/HTML.pm:816
  msgid "Table of Contents"
  msgstr "Innholdsfortegnelse"
  
! #: tp/Texinfo/Convert/HTML.pm:817
  msgid "Short Table of Contents"
  msgstr "Kort innholdsfortegnelse"
  
! #: tp/Texinfo/Convert/HTML.pm:818
  msgid "Footnotes"
  msgstr "No translation available!"
  
! #: tp/Texinfo/Convert/HTML.pm:1534
  #, perl-brace-format
  msgid "{explained_string} ({explanation})"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3182
  #, perl-brace-format
  msgid "see section {reference_name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3185
  #, perl-brace-format
  msgid "see {reference_name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3190
  #, perl-brace-format
  msgid "See section {reference_name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3193
  #, perl-brace-format
  msgid "See {reference_name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3197
  #, perl-brace-format
  msgid "{reference_name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3259
  #, perl-brace-format
  msgid "see {reference} in @cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3263
  #, perl-brace-format
  msgid "see @cite{{book_reference}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3267
  #, perl-brace-format
  msgid "see `{section}' in @cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3274
  #, perl-brace-format
  msgid "see {reference}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3277
  #, perl-brace-format
  msgid "see `{section}'"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3282
  #, perl-brace-format
  msgid "See {reference} in @cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3286
  #, perl-brace-format
  msgid "See @cite{{book_reference}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3290
  #, perl-brace-format
  msgid "See `{section}' in @cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3297
  #, perl-brace-format
  msgid "See {reference}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3300
  #, perl-brace-format
  msgid "See `{section}'"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3305
  #, perl-brace-format
  msgid "{reference} in @cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3309
  #, perl-brace-format
  msgid "@cite{{book_reference}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3313
  #, perl-brace-format
  msgid "`{section}' in @cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3320
  #, perl-brace-format
  msgid "{reference}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3323
  #, perl-brace-format
  msgid "`{section}'"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3436
  msgid "Jump to"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3444
  msgid "Index Entry"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3446
  msgid "Section"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4065
  #, perl-brace-format
  msgid "{category}: @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4070
  #, perl-brace-format
  msgid "{category}: @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4087
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4091
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4100
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4103
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4111
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4117
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4126
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4132
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4147
  #, perl-brace-format
  msgid ""
***************
*** 765,784 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4126
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4137
  #, perl-brace-format
  msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4141
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4155
  #, perl-brace-format
  msgid ""
--- 765,784 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4151
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4162
  #, perl-brace-format
  msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4166
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4180
  #, perl-brace-format
  msgid ""
***************
*** 786,805 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4159
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4170
  #, perl-brace-format
  msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4174
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6101
  #, perl-brace-format
  msgid ""
--- 786,805 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4184
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4195
  #, perl-brace-format
  msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4199
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6170
  #, perl-brace-format
  msgid ""
***************
*** 808,846 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6106
  msgid "This document was generated on @emph{@today{}}."
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6145
  #, perl-brace-format
  msgid "{title}: {element_text}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6289
  #, perl-brace-format
  msgid "The node you are looking for is at {href}."
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6358
  msgid "  The buttons in the navigation panels have the following meaning:"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6364
  msgid "Button"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6365
  msgid "Name"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6366
  msgid "Go to"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6367
  msgid "From 1.2.3 go to"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6393
  msgid ""
  "  where the @strong{ Example } assumes that the current position is at "
--- 808,846 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6175
  msgid "This document was generated on @emph{@today{}}."
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6214
  #, perl-brace-format
  msgid "{title}: {element_text}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6358
  #, perl-brace-format
  msgid "The node you are looking for is at {href}."
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6427
  msgid "  The buttons in the navigation panels have the following meaning:"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6433
  msgid "Button"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6434
  msgid "Name"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6435
  msgid "Go to"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6436
  msgid "From 1.2.3 go to"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6462
  msgid ""
  "  where the @strong{ Example } assumes that the current position is at "
***************
*** 849,893 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6403
  msgid "Section One"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6405
  msgid "Subsection One-One"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6412
  msgid "Subsection One-Two"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6414
  msgid "Subsubsection One-Two-One"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6415
  msgid "Subsubsection One-Two-Two"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6416
  msgid "Subsubsection One-Two-Three"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6418
  msgid "Current Position"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6419
  msgid "Subsubsection One-Two-Four"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6422
  msgid "Subsection One-Three"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6429
  msgid "Subsection One-Four"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6833
  msgid "Untitled Document"
  msgstr ""
--- 849,893 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6472
  msgid "Section One"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6474
  msgid "Subsection One-One"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6481
  msgid "Subsection One-Two"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6483
  msgid "Subsubsection One-Two-One"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6484
  msgid "Subsubsection One-Two-Two"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6485
  msgid "Subsubsection One-Two-Three"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6487
  msgid "Current Position"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6488
  msgid "Subsubsection One-Two-Four"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6491
  msgid "Subsection One-Three"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6498
  msgid "Subsection One-Four"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6906
  msgid "Untitled Document"
  msgstr ""
Binary files texinfo-6.1/po_document/pl.gmo and texinfo-6.3/po_document/pl.gmo differ
diff -Nrc2 texinfo-6.1/po_document/pl.po texinfo-6.3/po_document/pl.po
*** texinfo-6.1/po_document/pl.po	2016-02-06 11:35:59.000000000 +0000
--- texinfo-6.3/po_document/pl.po	2016-09-10 12:46:01.000000000 +0100
***************
*** 8,12 ****
  "Project-Id-Version: texinfo_document 5.0\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
  "PO-Revision-Date: 2013-02-28 21:35+0100\n"
  "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
--- 8,12 ----
  "Project-Id-Version: texinfo_document 5.0\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:46+0100\n"
  "PO-Revision-Date: 2013-02-28 21:35+0100\n"
  "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
***************
*** 16,111 ****
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
! #: tp/Texinfo/Common.pm:717 tp/Texinfo/Common.pm:722
  msgid "Function"
  msgstr "Funkcja"
  
! #: tp/Texinfo/Common.pm:718
  msgid "Macro"
  msgstr "Makro"
  
! #: tp/Texinfo/Common.pm:719
  msgid "Special Form"
  msgstr "PostaÄ‡ specjalna"
  
! #: tp/Texinfo/Common.pm:720 tp/Texinfo/Common.pm:723
  msgid "Variable"
  msgstr "Zmienna"
  
! #: tp/Texinfo/Common.pm:721
  msgid "User Option"
  msgstr "Opcja uÅ¼ytkownika"
  
! #: tp/Texinfo/Common.pm:724 tp/Texinfo/Common.pm:725
  msgid "Instance Variable"
  msgstr "PrzykÅ‚ad zmiennej"
  
! #: tp/Texinfo/Common.pm:726 tp/Texinfo/Common.pm:727
  msgid "Method"
  msgstr "Metoda"
  
! #: tp/Texinfo/Common.pm:1199
  #, perl-brace-format
  msgid "{category} on {class}"
  msgstr "{category} dla klasy {class}"
  
! #: tp/Texinfo/Common.pm:1206
  #, perl-brace-format
  msgid "{category} of {class}"
  msgstr "{category} klasy {class}"
  
! #: tp/Texinfo/Common.pm:1223
  #, perl-brace-format
  msgid "{month} {day}, {year}"
  msgstr "{day} {month} {year}"
  
! #: tp/Texinfo/Common.pm:1254 tp/Texinfo/Convert/Plaintext.pm:1132
! #: tp/Texinfo/Convert/HTML.pm:515
  #, perl-brace-format
  msgid "Appendix {number} {section_title}"
  msgstr "ZaÅ‚Ä…cznik {number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1258 tp/Texinfo/Convert/Plaintext.pm:1137
! #: tp/Texinfo/Convert/HTML.pm:521
  #, perl-brace-format
  msgid "{number} {section_title}"
  msgstr "{number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1393
  #, perl-brace-format
  msgid "{float_type} {float_number}: "
  msgstr "{float_type} {float_number}: "
  
! #: tp/Texinfo/Common.pm:1397
  #, perl-brace-format
  msgid "{float_type}: "
  msgstr "{float_type}: "
  
! #: tp/Texinfo/Common.pm:1402
  #, perl-brace-format
  msgid "{float_type} {float_number}\n"
  msgstr "{float_type} {float_number}\n"
  
! #: tp/Texinfo/Common.pm:1406
  #, perl-brace-format
  msgid "{float_type}\n"
  msgstr "{float_type}\n"
  
! #: tp/Texinfo/Common.pm:1412
  #, perl-brace-format
  msgid "{float_number}: "
  msgstr "{float_number}: "
  
! #: tp/Texinfo/Common.pm:1415
  #, perl-brace-format
  msgid "{float_number}\n"
  msgstr "{float_number}\n"
  
! #: tp/Texinfo/Parser.pm:2982
  #, perl-brace-format
  msgid "{name} on {class}"
  msgstr "{name} dla klasy {class}"
  
! #: tp/Texinfo/Parser.pm:2991
  #, perl-brace-format
  msgid "{name} of {class}"
--- 16,112 ----
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
+ "X-Bugs: Report translation errors to the Language-Team address.\n"
  
! #: tp/Texinfo/Common.pm:697 tp/Texinfo/Common.pm:702
  msgid "Function"
  msgstr "Funkcja"
  
! #: tp/Texinfo/Common.pm:698
  msgid "Macro"
  msgstr "Makro"
  
! #: tp/Texinfo/Common.pm:699
  msgid "Special Form"
  msgstr "PostaÄ‡ specjalna"
  
! #: tp/Texinfo/Common.pm:700 tp/Texinfo/Common.pm:703
  msgid "Variable"
  msgstr "Zmienna"
  
! #: tp/Texinfo/Common.pm:701
  msgid "User Option"
  msgstr "Opcja uÅ¼ytkownika"
  
! #: tp/Texinfo/Common.pm:704 tp/Texinfo/Common.pm:705
  msgid "Instance Variable"
  msgstr "PrzykÅ‚ad zmiennej"
  
! #: tp/Texinfo/Common.pm:706 tp/Texinfo/Common.pm:707
  msgid "Method"
  msgstr "Metoda"
  
! #: tp/Texinfo/Common.pm:1186
  #, perl-brace-format
  msgid "{category} on {class}"
  msgstr "{category} dla klasy {class}"
  
! #: tp/Texinfo/Common.pm:1193
  #, perl-brace-format
  msgid "{category} of {class}"
  msgstr "{category} klasy {class}"
  
! #: tp/Texinfo/Common.pm:1210
  #, perl-brace-format
  msgid "{month} {day}, {year}"
  msgstr "{day} {month} {year}"
  
! #: tp/Texinfo/Common.pm:1241 tp/Texinfo/Convert/Plaintext.pm:1133
! #: tp/Texinfo/Convert/HTML.pm:516
  #, perl-brace-format
  msgid "Appendix {number} {section_title}"
  msgstr "ZaÅ‚Ä…cznik {number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1245 tp/Texinfo/Convert/Plaintext.pm:1138
! #: tp/Texinfo/Convert/HTML.pm:522
  #, perl-brace-format
  msgid "{number} {section_title}"
  msgstr "{number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1499
  #, perl-brace-format
  msgid "{float_type} {float_number}: "
  msgstr "{float_type} {float_number}: "
  
! #: tp/Texinfo/Common.pm:1503
  #, perl-brace-format
  msgid "{float_type}: "
  msgstr "{float_type}: "
  
! #: tp/Texinfo/Common.pm:1508
  #, perl-brace-format
  msgid "{float_type} {float_number}\n"
  msgstr "{float_type} {float_number}\n"
  
! #: tp/Texinfo/Common.pm:1512
  #, perl-brace-format
  msgid "{float_type}\n"
  msgstr "{float_type}\n"
  
! #: tp/Texinfo/Common.pm:1518
  #, perl-brace-format
  msgid "{float_number}: "
  msgstr "{float_number}: "
  
! #: tp/Texinfo/Common.pm:1521
  #, perl-brace-format
  msgid "{float_number}\n"
  msgstr "{float_number}\n"
  
! #: tp/Texinfo/Parser.pm:2816
  #, perl-brace-format
  msgid "{name} on {class}"
  msgstr "{name} dla klasy {class}"
  
! #: tp/Texinfo/Parser.pm:2825
  #, perl-brace-format
  msgid "{name} of {class}"
***************
*** 116,178 ****
  msgstr "bÅ‚Ä…d@arrow{}"
  
! #: tp/Texinfo/Convert/Converter.pm:956
  msgid "January"
  msgstr "styczeÅ„"
  
! #: tp/Texinfo/Convert/Converter.pm:957
  msgid "February"
  msgstr "luty"
  
! #: tp/Texinfo/Convert/Converter.pm:958
  msgid "March"
  msgstr "marzec"
  
! #: tp/Texinfo/Convert/Converter.pm:959
  msgid "April"
  msgstr "kwiecieÅ„"
  
! #: tp/Texinfo/Convert/Converter.pm:960
  msgid "May"
  msgstr "maj"
  
! #: tp/Texinfo/Convert/Converter.pm:961
  msgid "June"
  msgstr "czerwiec"
  
! #: tp/Texinfo/Convert/Converter.pm:962
  msgid "July"
  msgstr "lipiec"
  
! #: tp/Texinfo/Convert/Converter.pm:963
  msgid "August"
  msgstr "sierpieÅ„"
  
! #: tp/Texinfo/Convert/Converter.pm:964
  msgid "September"
  msgstr "wrzesieÅ„"
  
! #: tp/Texinfo/Convert/Converter.pm:965
  msgid "October"
  msgstr "paÅºdziernik"
  
! #: tp/Texinfo/Convert/Converter.pm:966
  msgid "November"
  msgstr "listopad"
  
! #: tp/Texinfo/Convert/Converter.pm:967
  msgid "December"
  msgstr "grudzieÅ„"
  
! #: tp/Texinfo/Convert/Converter.pm:1018
  #, perl-brace-format
  msgid "{float_type} {float_number}"
  msgstr "{float_type} {float_number}"
  
! #: tp/Texinfo/Convert/Converter.pm:1022
  #, perl-brace-format
  msgid "{float_type}"
  msgstr "{float_type}"
  
! #: tp/Texinfo/Convert/Converter.pm:1026
  #, perl-brace-format
  msgid "{float_number}"
--- 117,179 ----
  msgstr "bÅ‚Ä…d@arrow{}"
  
! #: tp/Texinfo/Convert/Converter.pm:948
  msgid "January"
  msgstr "styczeÅ„"
  
! #: tp/Texinfo/Convert/Converter.pm:949
  msgid "February"
  msgstr "luty"
  
! #: tp/Texinfo/Convert/Converter.pm:950
  msgid "March"
  msgstr "marzec"
  
! #: tp/Texinfo/Convert/Converter.pm:951
  msgid "April"
  msgstr "kwiecieÅ„"
  
! #: tp/Texinfo/Convert/Converter.pm:952
  msgid "May"
  msgstr "maj"
  
! #: tp/Texinfo/Convert/Converter.pm:953
  msgid "June"
  msgstr "czerwiec"
  
! #: tp/Texinfo/Convert/Converter.pm:954
  msgid "July"
  msgstr "lipiec"
  
! #: tp/Texinfo/Convert/Converter.pm:955
  msgid "August"
  msgstr "sierpieÅ„"
  
! #: tp/Texinfo/Convert/Converter.pm:956
  msgid "September"
  msgstr "wrzesieÅ„"
  
! #: tp/Texinfo/Convert/Converter.pm:957
  msgid "October"
  msgstr "paÅºdziernik"
  
! #: tp/Texinfo/Convert/Converter.pm:958
  msgid "November"
  msgstr "listopad"
  
! #: tp/Texinfo/Convert/Converter.pm:959
  msgid "December"
  msgstr "grudzieÅ„"
  
! #: tp/Texinfo/Convert/Converter.pm:1010
  #, perl-brace-format
  msgid "{float_type} {float_number}"
  msgstr "{float_type} {float_number}"
  
! #: tp/Texinfo/Convert/Converter.pm:1014
  #, perl-brace-format
  msgid "{float_type}"
  msgstr "{float_type}"
  
! #: tp/Texinfo/Convert/Converter.pm:1018
  #, perl-brace-format
  msgid "{float_number}"
***************
*** 209,223 ****
  msgstr "p. sekcja ``{section_name}'' w @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3291
  #, perl-brace-format
  msgid "@cite{{book}}"
  msgstr "@cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3268
  #, perl-brace-format
  msgid "See @cite{{book}}"
  msgstr "P. @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3245
  #, perl-brace-format
  msgid "see @cite{{book}}"
--- 210,224 ----
  msgstr "p. sekcja ``{section_name}'' w @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3317
  #, perl-brace-format
  msgid "@cite{{book}}"
  msgstr "@cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3294
  #, perl-brace-format
  msgid "See @cite{{book}}"
  msgstr "P. @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3271
  #, perl-brace-format
  msgid "see @cite{{book}}"
***************
*** 239,763 ****
  msgstr "p. {title_ref}"
  
! #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2310
  #, perl-brace-format
  msgid "{abbr_or_acronym} ({explanation})"
  msgstr "{abbr_or_acronym} ({explanation})"
  
! #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2496
! #: tp/Texinfo/Convert/HTML.pm:3597
  #, perl-brace-format
  msgid "@b{{quotation_arg}:} "
  msgstr "@b{{quotation_arg}:} "
  
! #: tp/Texinfo/Convert/Plaintext.pm:1366
  msgid "(outside of any node)"
  msgstr "(poza wÄ™zÅ‚em)"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2003
  #, perl-brace-format
  msgid "{name} @url{{email}}"
  msgstr "{name} @url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2006
  #, perl-brace-format
  msgid "@url{{email}}"
  msgstr "@url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2028
  #, perl-brace-format
  msgid "{text} ({url})"
  msgstr "{text} ({url})"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2033
  #, perl-brace-format
  msgid "@t{<{url}>}"
  msgstr "@t{<{url}>}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2421 tp/Texinfo/Convert/HTML.pm:1438
  #, perl-brace-format
  msgid "@{No value for `{value}'@}"
  msgstr "@{Brak wartoÅ›ci dla `{value}'@}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2945
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name} {arguments}"
  msgstr "@tie{ }- {category}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2950
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name}"
  msgstr "@tie{ }- {category}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2963
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }- {category}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2966
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name} {arguments}"
  msgstr "@tie{ }- {category}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2975
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name}"
  msgstr "@tie{ }- {category}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2978
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name}"
  msgstr "@tie{ }- {category}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2986
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
  msgstr "@tie{ }- {category} klasy {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2992
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name}"
  msgstr "@tie{ }- {category} klasy {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3001
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
  msgstr "@tie{ }- {category} dla klasy {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3007
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name}"
  msgstr "@tie{ }- {category} dla klasy {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3022
  #, 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:3026
  #, 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:3037
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
  msgstr "@tie{ }- {category} dla klasy {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3041
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name}"
  msgstr "@tie{ }- {category} dla klasy {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3055
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }- {category} klasy {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3059
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
  msgstr "@tie{ }- {category} klasy {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3070
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
  msgstr "@tie{ }- {category} klasy {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3074
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name}"
  msgstr "@tie{ }- {category} klasy {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3403 tp/Texinfo/Convert/HTML.pm:2851
  #, perl-brace-format
  msgid "@center --- @emph{{author}}\n"
  msgstr "@center - @emph{{author}}\n"
  
! #: tp/Texinfo/Convert/HTML.pm:732 tp/Texinfo/Convert/HTML.pm:788
  msgid "Top"
  msgstr "Szczytowy"
  
! #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
  msgid "Contents"
  msgstr "TreÅ›Ä‡"
  
! #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
  msgid "Overview"
  msgstr "PrzeglÄ…d"
  
! #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:766
! #: tp/Texinfo/Convert/HTML.pm:791
  msgid "Index"
  msgstr "Indeks"
  
! #: tp/Texinfo/Convert/HTML.pm:737
  msgid "current"
  msgstr "bieÅ¼Ä…cy"
  
! #: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
  msgid "Prev"
  msgstr "Poprzedni"
  
! #: tp/Texinfo/Convert/HTML.pm:741
  msgid " Up "
  msgstr " W gÃ³rÄ™ "
  
! #: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:746
! #: tp/Texinfo/Convert/HTML.pm:798
  msgid "Next"
  msgstr "NastÄ™pny"
  
! #: tp/Texinfo/Convert/HTML.pm:744 tp/Texinfo/Convert/HTML.pm:797
  msgid "Up"
  msgstr "W gÃ³rÄ™"
  
! #: tp/Texinfo/Convert/HTML.pm:748
  msgid "Previous"
  msgstr "Poprzedni"
  
! #: tp/Texinfo/Convert/HTML.pm:749
  msgid "Forward node"
  msgstr "WÄ™zeÅ‚ w przÃ³d"
  
! #: tp/Texinfo/Convert/HTML.pm:750
  msgid "Back node"
  msgstr "WÄ™zeÅ‚ w tyÅ‚"
  
! #: tp/Texinfo/Convert/HTML.pm:756
  msgid "Next file"
  msgstr "NastÄ™pny plik"
  
! #: tp/Texinfo/Convert/HTML.pm:757
  msgid "Previous file"
  msgstr "Poprzedni plik"
  
! #: tp/Texinfo/Convert/HTML.pm:763
  msgid "Cover (top) of document"
  msgstr "OkÅ‚adka (szczyt) dokumentu"
  
! #: tp/Texinfo/Convert/HTML.pm:764
  msgid "Table of contents"
  msgstr "Spis treÅ›ci"
  
! #: tp/Texinfo/Convert/HTML.pm:765
  msgid "Short table of contents"
  msgstr "SkrÃ³cony spis treÅ›ci"
  
! #: tp/Texinfo/Convert/HTML.pm:767
  msgid "Current section"
  msgstr "Sekcja bieÅ¼Ä…ca"
  
! #: tp/Texinfo/Convert/HTML.pm:768
  msgid "Previous section in reading order"
  msgstr "Sekcja poprzednia w kolejnoÅ›ci czytania"
  
! #: tp/Texinfo/Convert/HTML.pm:769
  msgid "Beginning of this chapter or previous chapter"
  msgstr "PoczÄ…tek tego rozdziaÅ‚u lub rozdziaÅ‚ poprzedni"
  
! #: tp/Texinfo/Convert/HTML.pm:770
  msgid "Previous section on same level"
  msgstr "Sekcja poprzednia na tym samym poziomie"
  
! #: tp/Texinfo/Convert/HTML.pm:771
  msgid "Up section"
  msgstr "Sekcja w gÃ³rÄ™"
  
! #: tp/Texinfo/Convert/HTML.pm:772
  msgid "Next section on same level"
  msgstr "Sekcja nastÄ™pna na tym samym poziomie"
  
! #: tp/Texinfo/Convert/HTML.pm:773
  msgid "Up node"
  msgstr "WÄ™zÄ™Å‚ w gÃ³rÄ™"
  
! #: tp/Texinfo/Convert/HTML.pm:774
  msgid "Next node"
  msgstr "NastÄ™pny wÄ™zeÅ‚"
  
! #: tp/Texinfo/Convert/HTML.pm:775
  msgid "Previous node"
  msgstr "Poprzedni wÄ™zeÅ‚"
  
! #: tp/Texinfo/Convert/HTML.pm:776
  msgid "Next node in node reading order"
  msgstr "WÄ™zeÅ‚ nastÄ™pny w kolejnoÅ›ci czytania"
  
! #: tp/Texinfo/Convert/HTML.pm:777
  msgid "Previous node in node reading order"
  msgstr "WÄ™zeÅ‚ poprzedni w kolejnoÅ›ci czytania"
  
! #: tp/Texinfo/Convert/HTML.pm:778
  msgid "Next section in reading order"
  msgstr "Sekcja nastÄ™pna w kolejnoÅ›ci czytania"
  
! #: tp/Texinfo/Convert/HTML.pm:779
  msgid "Next chapter"
  msgstr "NastÄ™pny rozdziaÅ‚"
  
! #: tp/Texinfo/Convert/HTML.pm:780
  msgid "About (help)"
  msgstr "O dokumencie (pomoc)"
  
! #: tp/Texinfo/Convert/HTML.pm:781
  msgid "First section in reading order"
  msgstr "Sekcja pierwsza w kolejoÅ›ci czytania"
  
! #: tp/Texinfo/Convert/HTML.pm:782
  msgid "Last section in reading order"
  msgstr "Sekcja ostatnia w kolejoÅ›ci czytania"
  
! #: tp/Texinfo/Convert/HTML.pm:783
  msgid "Forward section in next file"
  msgstr "Sekcja w przÃ³d w nastÄ™pnym pliku"
  
! #: tp/Texinfo/Convert/HTML.pm:784
  msgid "Back section in previous file"
  msgstr "Sekcja wstecz w poprzednim pliku"
  
! #: tp/Texinfo/Convert/HTML.pm:793
  msgid "This"
  msgstr "Ten"
  
! #: tp/Texinfo/Convert/HTML.pm:794
  msgid "Back"
  msgstr "Wstecz"
  
! #: tp/Texinfo/Convert/HTML.pm:795
  msgid "FastBack"
  msgstr "SzybkoWstecz"
  
! #: tp/Texinfo/Convert/HTML.pm:799
  msgid "NodeUp"
  msgstr "WÄ™zeÅ‚WGÃ³rÄ™"
  
! #: tp/Texinfo/Convert/HTML.pm:800
  msgid "NodeNext"
  msgstr "WÄ™zeÅ‚NastÄ™pny"
  
! #: tp/Texinfo/Convert/HTML.pm:801
  msgid "NodePrev"
  msgstr "WÄ™zeÅ‚Poprzedni"
  
! #: tp/Texinfo/Convert/HTML.pm:802
  msgid "NodeForward"
  msgstr "WÄ™zeÅ‚WPrzÃ³d"
  
! #: tp/Texinfo/Convert/HTML.pm:803
  msgid "NodeBack"
  msgstr "WÄ™zeÅ‚Wstecz"
  
! #: tp/Texinfo/Convert/HTML.pm:804
  msgid "Forward"
  msgstr "WPrzÃ³d"
  
! #: tp/Texinfo/Convert/HTML.pm:805
  msgid "FastForward"
  msgstr "SzybkoWPrzÃ³d"
  
! #: tp/Texinfo/Convert/HTML.pm:806
  msgid "About"
  msgstr "O"
  
! #: tp/Texinfo/Convert/HTML.pm:807
  msgid "First"
  msgstr "Pierwszy"
  
! #: tp/Texinfo/Convert/HTML.pm:808
  msgid "Last"
  msgstr "Ostatni"
  
! #: tp/Texinfo/Convert/HTML.pm:809
  msgid "NextFile"
  msgstr "PlikNastÄ™pny"
  
! #: tp/Texinfo/Convert/HTML.pm:810
  msgid "PrevFile"
  msgstr "PlikPoprzedni"
  
! #: tp/Texinfo/Convert/HTML.pm:814
  msgid "About This Document"
  msgstr "O tym dokumencie"
  
! #: tp/Texinfo/Convert/HTML.pm:815
  msgid "Table of Contents"
  msgstr "Spis treÅ›ci"
  
! #: tp/Texinfo/Convert/HTML.pm:816
  msgid "Short Table of Contents"
  msgstr "SkrÃ³cony spis treÅ›ci"
  
! #: tp/Texinfo/Convert/HTML.pm:817
  msgid "Footnotes"
  msgstr "Przypisy"
  
! #: tp/Texinfo/Convert/HTML.pm:1504
  #, perl-brace-format
  msgid "{explained_string} ({explanation})"
  msgstr "{explained_string} ({explanation})"
  
! #: tp/Texinfo/Convert/HTML.pm:3156
  #, perl-brace-format
  msgid "see section {reference_name}"
  msgstr "p. sekcja {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3159
  #, perl-brace-format
  msgid "see {reference_name}"
  msgstr "p. {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3164
  #, perl-brace-format
  msgid "See section {reference_name}"
  msgstr "P. sekcja {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3167
  #, perl-brace-format
  msgid "See {reference_name}"
  msgstr "P. {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3171
  #, perl-brace-format
  msgid "{reference_name}"
  msgstr "{reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3233
  #, perl-brace-format
  msgid "see {reference} in @cite{{book}}"
  msgstr "p. {reference} w @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3237
  #, perl-brace-format
  msgid "see @cite{{book_reference}}"
  msgstr "p. @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3241
  #, perl-brace-format
  msgid "see `{section}' in @cite{{book}}"
  msgstr "p. `{section}' w @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3248
  #, perl-brace-format
  msgid "see {reference}"
  msgstr "p. {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3251
  #, perl-brace-format
  msgid "see `{section}'"
  msgstr "p. `{section}'"
  
! #: tp/Texinfo/Convert/HTML.pm:3256
  #, perl-brace-format
  msgid "See {reference} in @cite{{book}}"
  msgstr "P. {reference} w @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3260
  #, perl-brace-format
  msgid "See @cite{{book_reference}}"
  msgstr "P. @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3264
  #, perl-brace-format
  msgid "See `{section}' in @cite{{book}}"
  msgstr "P. `{section}' w @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3271
  #, perl-brace-format
  msgid "See {reference}"
  msgstr "P. {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3274
  #, perl-brace-format
  msgid "See `{section}'"
  msgstr "P. `{section}'"
  
! #: tp/Texinfo/Convert/HTML.pm:3279
  #, perl-brace-format
  msgid "{reference} in @cite{{book}}"
  msgstr "{reference} w @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3283
  #, perl-brace-format
  msgid "@cite{{book_reference}}"
  msgstr "@cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3287
  #, perl-brace-format
  msgid "`{section}' in @cite{{book}}"
  msgstr "`{section}' w @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3294
  #, perl-brace-format
  msgid "{reference}"
  msgstr "{reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3297
  #, perl-brace-format
  msgid "`{section}'"
  msgstr "`{section}'"
  
! #: tp/Texinfo/Convert/HTML.pm:3410
  msgid "Jump to"
  msgstr "Skok do"
  
! #: tp/Texinfo/Convert/HTML.pm:3418
  msgid "Index Entry"
  msgstr "Wpis indeksu"
  
! #: tp/Texinfo/Convert/HTML.pm:3420
  msgid "Section"
  msgstr "Sekcja"
  
! #: tp/Texinfo/Convert/HTML.pm:4040
  #, perl-brace-format
  msgid "{category}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4045
  #, perl-brace-format
  msgid "{category}: @strong{{name}}"
  msgstr "{category}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4062
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4066
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4075
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4078
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4086
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} klasy {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4092
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}}"
  msgstr "{category} klasy {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4101
  #, 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:4107
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}}"
  msgstr "{category} dla klasy {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4122
  #, perl-brace-format
  msgid ""
--- 240,764 ----
  msgstr "p. {title_ref}"
  
! #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2311
  #, perl-brace-format
  msgid "{abbr_or_acronym} ({explanation})"
  msgstr "{abbr_or_acronym} ({explanation})"
  
! #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2497
! #: tp/Texinfo/Convert/HTML.pm:3622
  #, perl-brace-format
  msgid "@b{{quotation_arg}:} "
  msgstr "@b{{quotation_arg}:} "
  
! #: tp/Texinfo/Convert/Plaintext.pm:1367
  msgid "(outside of any node)"
  msgstr "(poza wÄ™zÅ‚em)"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2004
  #, perl-brace-format
  msgid "{name} @url{{email}}"
  msgstr "{name} @url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2007
  #, perl-brace-format
  msgid "@url{{email}}"
  msgstr "@url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2029
  #, perl-brace-format
  msgid "{text} ({url})"
  msgstr "{text} ({url})"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2034
  #, perl-brace-format
  msgid "@t{<{url}>}"
  msgstr "@t{<{url}>}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2422 tp/Texinfo/Convert/HTML.pm:1437
  #, perl-brace-format
  msgid "@{No value for `{value}'@}"
  msgstr "@{Brak wartoÅ›ci dla `{value}'@}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2913
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name} {arguments}"
  msgstr "@tie{ }- {category}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2918
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name}"
  msgstr "@tie{ }- {category}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2931
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }- {category}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2934
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name} {arguments}"
  msgstr "@tie{ }- {category}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2943
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name}"
  msgstr "@tie{ }- {category}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2946
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name}"
  msgstr "@tie{ }- {category}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2954
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
  msgstr "@tie{ }- {category} klasy {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2960
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name}"
  msgstr "@tie{ }- {category} klasy {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2969
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
  msgstr "@tie{ }- {category} dla klasy {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2975
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name}"
  msgstr "@tie{ }- {category} dla klasy {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2990
  #, 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:2994
  #, 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:3005
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
  msgstr "@tie{ }- {category} dla klasy {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3009
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name}"
  msgstr "@tie{ }- {category} dla klasy {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3023
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }- {category} klasy {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3027
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
  msgstr "@tie{ }- {category} klasy {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3038
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
  msgstr "@tie{ }- {category} klasy {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3042
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name}"
  msgstr "@tie{ }- {category} klasy {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3371 tp/Texinfo/Convert/HTML.pm:2877
  #, perl-brace-format
  msgid "@center --- @emph{{author}}\n"
  msgstr "@center - @emph{{author}}\n"
  
! #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
  msgid "Top"
  msgstr "Szczytowy"
  
! #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
  msgid "Contents"
  msgstr "TreÅ›Ä‡"
  
! #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:791
  msgid "Overview"
  msgstr "PrzeglÄ…d"
  
! #: tp/Texinfo/Convert/HTML.pm:736 tp/Texinfo/Convert/HTML.pm:767
! #: tp/Texinfo/Convert/HTML.pm:792
  msgid "Index"
  msgstr "Indeks"
  
! #: tp/Texinfo/Convert/HTML.pm:738
  msgid "current"
  msgstr "bieÅ¼Ä…cy"
  
! #: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
  msgid "Prev"
  msgstr "Poprzedni"
  
! #: tp/Texinfo/Convert/HTML.pm:742
  msgid " Up "
  msgstr " W gÃ³rÄ™ "
  
! #: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:747
! #: tp/Texinfo/Convert/HTML.pm:799
  msgid "Next"
  msgstr "NastÄ™pny"
  
! #: tp/Texinfo/Convert/HTML.pm:745 tp/Texinfo/Convert/HTML.pm:798
  msgid "Up"
  msgstr "W gÃ³rÄ™"
  
! #: tp/Texinfo/Convert/HTML.pm:749
  msgid "Previous"
  msgstr "Poprzedni"
  
! #: tp/Texinfo/Convert/HTML.pm:750
  msgid "Forward node"
  msgstr "WÄ™zeÅ‚ w przÃ³d"
  
! #: tp/Texinfo/Convert/HTML.pm:751
  msgid "Back node"
  msgstr "WÄ™zeÅ‚ w tyÅ‚"
  
! #: tp/Texinfo/Convert/HTML.pm:757
  msgid "Next file"
  msgstr "NastÄ™pny plik"
  
! #: tp/Texinfo/Convert/HTML.pm:758
  msgid "Previous file"
  msgstr "Poprzedni plik"
  
! #: tp/Texinfo/Convert/HTML.pm:764
  msgid "Cover (top) of document"
  msgstr "OkÅ‚adka (szczyt) dokumentu"
  
! #: tp/Texinfo/Convert/HTML.pm:765
  msgid "Table of contents"
  msgstr "Spis treÅ›ci"
  
! #: tp/Texinfo/Convert/HTML.pm:766
  msgid "Short table of contents"
  msgstr "SkrÃ³cony spis treÅ›ci"
  
! #: tp/Texinfo/Convert/HTML.pm:768
  msgid "Current section"
  msgstr "Sekcja bieÅ¼Ä…ca"
  
! #: tp/Texinfo/Convert/HTML.pm:769
  msgid "Previous section in reading order"
  msgstr "Sekcja poprzednia w kolejnoÅ›ci czytania"
  
! #: tp/Texinfo/Convert/HTML.pm:770
  msgid "Beginning of this chapter or previous chapter"
  msgstr "PoczÄ…tek tego rozdziaÅ‚u lub rozdziaÅ‚ poprzedni"
  
! #: tp/Texinfo/Convert/HTML.pm:771
  msgid "Previous section on same level"
  msgstr "Sekcja poprzednia na tym samym poziomie"
  
! #: tp/Texinfo/Convert/HTML.pm:772
  msgid "Up section"
  msgstr "Sekcja w gÃ³rÄ™"
  
! #: tp/Texinfo/Convert/HTML.pm:773
  msgid "Next section on same level"
  msgstr "Sekcja nastÄ™pna na tym samym poziomie"
  
! #: tp/Texinfo/Convert/HTML.pm:774
  msgid "Up node"
  msgstr "WÄ™zÄ™Å‚ w gÃ³rÄ™"
  
! #: tp/Texinfo/Convert/HTML.pm:775
  msgid "Next node"
  msgstr "NastÄ™pny wÄ™zeÅ‚"
  
! #: tp/Texinfo/Convert/HTML.pm:776
  msgid "Previous node"
  msgstr "Poprzedni wÄ™zeÅ‚"
  
! #: tp/Texinfo/Convert/HTML.pm:777
  msgid "Next node in node reading order"
  msgstr "WÄ™zeÅ‚ nastÄ™pny w kolejnoÅ›ci czytania"
  
! #: tp/Texinfo/Convert/HTML.pm:778
  msgid "Previous node in node reading order"
  msgstr "WÄ™zeÅ‚ poprzedni w kolejnoÅ›ci czytania"
  
! #: tp/Texinfo/Convert/HTML.pm:779
  msgid "Next section in reading order"
  msgstr "Sekcja nastÄ™pna w kolejnoÅ›ci czytania"
  
! #: tp/Texinfo/Convert/HTML.pm:780
  msgid "Next chapter"
  msgstr "NastÄ™pny rozdziaÅ‚"
  
! #: tp/Texinfo/Convert/HTML.pm:781
  msgid "About (help)"
  msgstr "O dokumencie (pomoc)"
  
! #: tp/Texinfo/Convert/HTML.pm:782
  msgid "First section in reading order"
  msgstr "Sekcja pierwsza w kolejoÅ›ci czytania"
  
! #: tp/Texinfo/Convert/HTML.pm:783
  msgid "Last section in reading order"
  msgstr "Sekcja ostatnia w kolejoÅ›ci czytania"
  
! #: tp/Texinfo/Convert/HTML.pm:784
  msgid "Forward section in next file"
  msgstr "Sekcja w przÃ³d w nastÄ™pnym pliku"
  
! #: tp/Texinfo/Convert/HTML.pm:785
  msgid "Back section in previous file"
  msgstr "Sekcja wstecz w poprzednim pliku"
  
! #: tp/Texinfo/Convert/HTML.pm:794
  msgid "This"
  msgstr "Ten"
  
! #: tp/Texinfo/Convert/HTML.pm:795
  msgid "Back"
  msgstr "Wstecz"
  
! #: tp/Texinfo/Convert/HTML.pm:796
  msgid "FastBack"
  msgstr "SzybkoWstecz"
  
! #: tp/Texinfo/Convert/HTML.pm:800
  msgid "NodeUp"
  msgstr "WÄ™zeÅ‚WGÃ³rÄ™"
  
! #: tp/Texinfo/Convert/HTML.pm:801
  msgid "NodeNext"
  msgstr "WÄ™zeÅ‚NastÄ™pny"
  
! #: tp/Texinfo/Convert/HTML.pm:802
  msgid "NodePrev"
  msgstr "WÄ™zeÅ‚Poprzedni"
  
! #: tp/Texinfo/Convert/HTML.pm:803
  msgid "NodeForward"
  msgstr "WÄ™zeÅ‚WPrzÃ³d"
  
! #: tp/Texinfo/Convert/HTML.pm:804
  msgid "NodeBack"
  msgstr "WÄ™zeÅ‚Wstecz"
  
! #: tp/Texinfo/Convert/HTML.pm:805
  msgid "Forward"
  msgstr "WPrzÃ³d"
  
! #: tp/Texinfo/Convert/HTML.pm:806
  msgid "FastForward"
  msgstr "SzybkoWPrzÃ³d"
  
! #: tp/Texinfo/Convert/HTML.pm:807
  msgid "About"
  msgstr "O"
  
! #: tp/Texinfo/Convert/HTML.pm:808
  msgid "First"
  msgstr "Pierwszy"
  
! #: tp/Texinfo/Convert/HTML.pm:809
  msgid "Last"
  msgstr "Ostatni"
  
! #: tp/Texinfo/Convert/HTML.pm:810
  msgid "NextFile"
  msgstr "PlikNastÄ™pny"
  
! #: tp/Texinfo/Convert/HTML.pm:811
  msgid "PrevFile"
  msgstr "PlikPoprzedni"
  
! #: tp/Texinfo/Convert/HTML.pm:815
  msgid "About This Document"
  msgstr "O tym dokumencie"
  
! #: tp/Texinfo/Convert/HTML.pm:816
  msgid "Table of Contents"
  msgstr "Spis treÅ›ci"
  
! #: tp/Texinfo/Convert/HTML.pm:817
  msgid "Short Table of Contents"
  msgstr "SkrÃ³cony spis treÅ›ci"
  
! #: tp/Texinfo/Convert/HTML.pm:818
  msgid "Footnotes"
  msgstr "Przypisy"
  
! #: tp/Texinfo/Convert/HTML.pm:1534
  #, perl-brace-format
  msgid "{explained_string} ({explanation})"
  msgstr "{explained_string} ({explanation})"
  
! #: tp/Texinfo/Convert/HTML.pm:3182
  #, perl-brace-format
  msgid "see section {reference_name}"
  msgstr "p. sekcja {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3185
  #, perl-brace-format
  msgid "see {reference_name}"
  msgstr "p. {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3190
  #, perl-brace-format
  msgid "See section {reference_name}"
  msgstr "P. sekcja {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3193
  #, perl-brace-format
  msgid "See {reference_name}"
  msgstr "P. {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3197
  #, perl-brace-format
  msgid "{reference_name}"
  msgstr "{reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3259
  #, perl-brace-format
  msgid "see {reference} in @cite{{book}}"
  msgstr "p. {reference} w @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3263
  #, perl-brace-format
  msgid "see @cite{{book_reference}}"
  msgstr "p. @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3267
  #, perl-brace-format
  msgid "see `{section}' in @cite{{book}}"
  msgstr "p. `{section}' w @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3274
  #, perl-brace-format
  msgid "see {reference}"
  msgstr "p. {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3277
  #, perl-brace-format
  msgid "see `{section}'"
  msgstr "p. `{section}'"
  
! #: tp/Texinfo/Convert/HTML.pm:3282
  #, perl-brace-format
  msgid "See {reference} in @cite{{book}}"
  msgstr "P. {reference} w @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3286
  #, perl-brace-format
  msgid "See @cite{{book_reference}}"
  msgstr "P. @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3290
  #, perl-brace-format
  msgid "See `{section}' in @cite{{book}}"
  msgstr "P. `{section}' w @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3297
  #, perl-brace-format
  msgid "See {reference}"
  msgstr "P. {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3300
  #, perl-brace-format
  msgid "See `{section}'"
  msgstr "P. `{section}'"
  
! #: tp/Texinfo/Convert/HTML.pm:3305
  #, perl-brace-format
  msgid "{reference} in @cite{{book}}"
  msgstr "{reference} w @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3309
  #, perl-brace-format
  msgid "@cite{{book_reference}}"
  msgstr "@cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3313
  #, perl-brace-format
  msgid "`{section}' in @cite{{book}}"
  msgstr "`{section}' w @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3320
  #, perl-brace-format
  msgid "{reference}"
  msgstr "{reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3323
  #, perl-brace-format
  msgid "`{section}'"
  msgstr "`{section}'"
  
! #: tp/Texinfo/Convert/HTML.pm:3436
  msgid "Jump to"
  msgstr "Skok do"
  
! #: tp/Texinfo/Convert/HTML.pm:3444
  msgid "Index Entry"
  msgstr "Wpis indeksu"
  
! #: tp/Texinfo/Convert/HTML.pm:3446
  msgid "Section"
  msgstr "Sekcja"
  
! #: tp/Texinfo/Convert/HTML.pm:4065
  #, perl-brace-format
  msgid "{category}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4070
  #, perl-brace-format
  msgid "{category}: @strong{{name}}"
  msgstr "{category}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4087
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4091
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4100
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4103
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4111
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} klasy {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4117
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}}"
  msgstr "{category} klasy {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4126
  #, 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:4132
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}}"
  msgstr "{category} dla klasy {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4147
  #, perl-brace-format
  msgid ""
***************
*** 767,771 ****
  "@emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4126
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
--- 768,772 ----
  "@emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4151
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
***************
*** 774,788 ****
  "@emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4137
  #, 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:4141
  #, 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:4155
  #, perl-brace-format
  msgid ""
--- 775,789 ----
  "@emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4162
  #, 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:4166
  #, 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:4180
  #, perl-brace-format
  msgid ""
***************
*** 792,796 ****
  "@emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4159
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
--- 793,797 ----
  "@emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4184
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
***************
*** 798,812 ****
  "{category} klasy {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4170
  #, perl-brace-format
  msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} klasy {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4174
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} klasy {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:6101
  #, perl-brace-format
  msgid ""
--- 799,813 ----
  "{category} klasy {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4195
  #, perl-brace-format
  msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} klasy {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4199
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} klasy {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:6170
  #, perl-brace-format
  msgid ""
***************
*** 817,855 ****
  "@uref{{program_homepage}, @emph{{program}}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6106
  msgid "This document was generated on @emph{@today{}}."
  msgstr "Ten dokument zostaÅ‚ wygenerowany @emph{@today{}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6145
  #, perl-brace-format
  msgid "{title}: {element_text}"
  msgstr "{title}: {element_text}"
  
! #: tp/Texinfo/Convert/HTML.pm:6289
  #, 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:6358
  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:6364
  msgid "Button"
  msgstr "Przycisk"
  
! #: tp/Texinfo/Convert/HTML.pm:6365
  msgid "Name"
  msgstr "Nazwa"
  
! #: tp/Texinfo/Convert/HTML.pm:6366
  msgid "Go to"
  msgstr "Przechodzi do"
  
! #: tp/Texinfo/Convert/HTML.pm:6367
  msgid "From 1.2.3 go to"
  msgstr "Z 1.2.3 przechodzi do"
  
! #: tp/Texinfo/Convert/HTML.pm:6393
  msgid ""
  "  where the @strong{ Example } assumes that the current position is at "
--- 818,856 ----
  "@uref{{program_homepage}, @emph{{program}}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6175
  msgid "This document was generated on @emph{@today{}}."
  msgstr "Ten dokument zostaÅ‚ wygenerowany @emph{@today{}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6214
  #, perl-brace-format
  msgid "{title}: {element_text}"
  msgstr "{title}: {element_text}"
  
! #: tp/Texinfo/Convert/HTML.pm:6358
  #, 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:6427
  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:6433
  msgid "Button"
  msgstr "Przycisk"
  
! #: tp/Texinfo/Convert/HTML.pm:6434
  msgid "Name"
  msgstr "Nazwa"
  
! #: tp/Texinfo/Convert/HTML.pm:6435
  msgid "Go to"
  msgstr "Przechodzi do"
  
! #: tp/Texinfo/Convert/HTML.pm:6436
  msgid "From 1.2.3 go to"
  msgstr "Z 1.2.3 przechodzi do"
  
! #: tp/Texinfo/Convert/HTML.pm:6462
  msgid ""
  "  where the @strong{ Example } assumes that the current position is at "
***************
*** 861,905 ****
  "strukturze:"
  
! #: tp/Texinfo/Convert/HTML.pm:6403
  msgid "Section One"
  msgstr "Sekcja Jeden"
  
! #: tp/Texinfo/Convert/HTML.pm:6405
  msgid "Subsection One-One"
  msgstr "Podsekcja Jeden-Jeden"
  
! #: tp/Texinfo/Convert/HTML.pm:6412
  msgid "Subsection One-Two"
  msgstr "Podsekcja Jeden-Dwa"
  
! #: tp/Texinfo/Convert/HTML.pm:6414
  msgid "Subsubsection One-Two-One"
  msgstr "Podpodsekcja Jeden-Dwa-Jeden"
  
! #: tp/Texinfo/Convert/HTML.pm:6415
  msgid "Subsubsection One-Two-Two"
  msgstr "Podpodsekcja Jeden-Dwa-Dwa"
  
! #: tp/Texinfo/Convert/HTML.pm:6416
  msgid "Subsubsection One-Two-Three"
  msgstr "Podpodsekcja Jeden-Dwa-Trzy"
  
! #: tp/Texinfo/Convert/HTML.pm:6418
  msgid "Current Position"
  msgstr "BieÅ¼Ä…ca pozycja"
  
! #: tp/Texinfo/Convert/HTML.pm:6419
  msgid "Subsubsection One-Two-Four"
  msgstr "Podpodsekcja Jeden-Dwa-Cztery"
  
! #: tp/Texinfo/Convert/HTML.pm:6422
  msgid "Subsection One-Three"
  msgstr "Podsekcja Jeden-Trzy"
  
! #: tp/Texinfo/Convert/HTML.pm:6429
  msgid "Subsection One-Four"
  msgstr "Podsekcja Jeden-Cztery"
  
! #: tp/Texinfo/Convert/HTML.pm:6833
  msgid "Untitled Document"
  msgstr "Dokument bez tytuÅ‚u"
--- 862,906 ----
  "strukturze:"
  
! #: tp/Texinfo/Convert/HTML.pm:6472
  msgid "Section One"
  msgstr "Sekcja Jeden"
  
! #: tp/Texinfo/Convert/HTML.pm:6474
  msgid "Subsection One-One"
  msgstr "Podsekcja Jeden-Jeden"
  
! #: tp/Texinfo/Convert/HTML.pm:6481
  msgid "Subsection One-Two"
  msgstr "Podsekcja Jeden-Dwa"
  
! #: tp/Texinfo/Convert/HTML.pm:6483
  msgid "Subsubsection One-Two-One"
  msgstr "Podpodsekcja Jeden-Dwa-Jeden"
  
! #: tp/Texinfo/Convert/HTML.pm:6484
  msgid "Subsubsection One-Two-Two"
  msgstr "Podpodsekcja Jeden-Dwa-Dwa"
  
! #: tp/Texinfo/Convert/HTML.pm:6485
  msgid "Subsubsection One-Two-Three"
  msgstr "Podpodsekcja Jeden-Dwa-Trzy"
  
! #: tp/Texinfo/Convert/HTML.pm:6487
  msgid "Current Position"
  msgstr "BieÅ¼Ä…ca pozycja"
  
! #: tp/Texinfo/Convert/HTML.pm:6488
  msgid "Subsubsection One-Two-Four"
  msgstr "Podpodsekcja Jeden-Dwa-Cztery"
  
! #: tp/Texinfo/Convert/HTML.pm:6491
  msgid "Subsection One-Three"
  msgstr "Podsekcja Jeden-Trzy"
  
! #: tp/Texinfo/Convert/HTML.pm:6498
  msgid "Subsection One-Four"
  msgstr "Podsekcja Jeden-Cztery"
  
! #: tp/Texinfo/Convert/HTML.pm:6906
  msgid "Untitled Document"
  msgstr "Dokument bez tytuÅ‚u"
Binary files texinfo-6.1/po_document/pt.gmo and texinfo-6.3/po_document/pt.gmo differ
diff -Nrc2 texinfo-6.1/po_document/pt.po texinfo-6.3/po_document/pt.po
*** texinfo-6.1/po_document/pt.po	1970-01-01 01:00:00.000000000 +0100
--- texinfo-6.3/po_document/pt.po	2016-09-10 12:46:01.000000000 +0100
***************
*** 0 ****
--- 1,954 ----
+ # Portugese translations of resulting document strings.
+ # Copyright (C) 2005 Free Software Foundation, Inc.
+ # This file is distributed under the same license as the texinfo package.
+ # Jorge Barros de Abreu <ficmatin01@solar.com.br>, 2005.
+ #
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: texinfo 5.0\n"
+ "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
+ "POT-Creation-Date: 2016-09-10 12:46+0100\n"
+ "PO-Revision-Date: 2006-01-09\n"
+ "Last-Translator: Jorge Barros de Abreu <ficmatin01@solar.com.br>\n"
+ "Language-Team: Unknown\n"
+ "Language: pt\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=us-ascii\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ "X-Bugs: Report translation errors to the Language-Team address.\n"
+ 
+ #: tp/Texinfo/Common.pm:697 tp/Texinfo/Common.pm:702
+ #, fuzzy
+ msgid "Function"
+ msgstr "Se@,{c}@~ao"
+ 
+ #: tp/Texinfo/Common.pm:698
+ msgid "Macro"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:699
+ msgid "Special Form"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:700 tp/Texinfo/Common.pm:703
+ msgid "Variable"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:701
+ #, fuzzy
+ msgid "User Option"
+ msgstr "Se@,{c}@~ao acima"
+ 
+ #: tp/Texinfo/Common.pm:704 tp/Texinfo/Common.pm:705
+ msgid "Instance Variable"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:706 tp/Texinfo/Common.pm:707
+ msgid "Method"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:1186
+ #, perl-brace-format
+ msgid "{category} on {class}"
+ msgstr "{category} na {class}"
+ 
+ #: tp/Texinfo/Common.pm:1193
+ #, perl-brace-format
+ msgid "{category} of {class}"
+ msgstr "{category} da {class}"
+ 
+ #: tp/Texinfo/Common.pm:1210
+ #, perl-brace-format
+ msgid "{month} {day}, {year}"
+ msgstr "{day} de {month} de {year}"
+ 
+ #: tp/Texinfo/Common.pm:1241 tp/Texinfo/Convert/Plaintext.pm:1133
+ #: tp/Texinfo/Convert/HTML.pm:516
+ #, perl-brace-format
+ msgid "Appendix {number} {section_title}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:1245 tp/Texinfo/Convert/Plaintext.pm:1138
+ #: tp/Texinfo/Convert/HTML.pm:522
+ #, perl-brace-format
+ msgid "{number} {section_title}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:1499
+ #, perl-brace-format
+ msgid "{float_type} {float_number}: "
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:1503
+ #, perl-brace-format
+ msgid "{float_type}: "
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:1508
+ #, perl-brace-format
+ msgid "{float_type} {float_number}\n"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:1512
+ #, perl-brace-format
+ msgid "{float_type}\n"
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:1518
+ #, perl-brace-format
+ msgid "{float_number}: "
+ msgstr ""
+ 
+ #: tp/Texinfo/Common.pm:1521
+ #, perl-brace-format
+ msgid "{float_number}\n"
+ msgstr ""
+ 
+ #: tp/Texinfo/Parser.pm:2816
+ #, perl-brace-format
+ msgid "{name} on {class}"
+ msgstr "{name} na {class}"
+ 
+ #: tp/Texinfo/Parser.pm:2825
+ #, perl-brace-format
+ msgid "{name} of {class}"
+ msgstr "{name} da {class}"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:110
+ msgid "error@arrow{}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Converter.pm:948
+ msgid "January"
+ msgstr "Janeiro"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:949
+ msgid "February"
+ msgstr "Fevereiro"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:950
+ msgid "March"
+ msgstr "Mar@,{c}o"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:951
+ msgid "April"
+ msgstr "Abril"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:952
+ msgid "May"
+ msgstr "Maio"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:953
+ msgid "June"
+ msgstr "Junho"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:954
+ msgid "July"
+ msgstr "Julho"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:955
+ msgid "August"
+ msgstr "Agosto"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:956
+ msgid "September"
+ msgstr "Setembro"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:957
+ msgid "October"
+ msgstr "Outubro"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:958
+ msgid "November"
+ msgstr "Novembro"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:959
+ msgid "December"
+ msgstr "Dezembro"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:1010
+ #, perl-brace-format
+ msgid "{float_type} {float_number}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Converter.pm:1014
+ #, perl-brace-format
+ msgid "{float_type}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Converter.pm:1018
+ #, perl-brace-format
+ msgid "{float_number}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:826
+ #, perl-brace-format
+ msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:831
+ #, perl-brace-format
+ msgid "See node @samp{{mynode}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:835
+ #, perl-brace-format
+ msgid "See Info file @file{{myfile}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:875
+ #, 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:880
+ #, 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:885
+ #, 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:892 tp/Texinfo/Convert/HTML.pm:3317
+ #, perl-brace-format
+ msgid "@cite{{book}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3294
+ #, perl-brace-format
+ msgid "See @cite{{book}}"
+ msgstr "Veja @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3271
+ #, perl-brace-format
+ msgid "see @cite{{book}}"
+ msgstr "veja @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:915
+ #, perl-brace-format
+ msgid "{title_ref}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:920
+ #, perl-brace-format
+ msgid "See {title_ref}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:925
+ #, perl-brace-format
+ msgid "see {title_ref}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2311
+ #, perl-brace-format
+ msgid "{abbr_or_acronym} ({explanation})"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2497
+ #: tp/Texinfo/Convert/HTML.pm:3622
+ #, perl-brace-format
+ msgid "@b{{quotation_arg}:} "
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:1367
+ msgid "(outside of any node)"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2004
+ #, perl-brace-format
+ msgid "{name} @url{{email}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2007
+ #, perl-brace-format
+ msgid "@url{{email}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2029
+ #, perl-brace-format
+ msgid "{text} ({url})"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2034
+ #, perl-brace-format
+ msgid "@t{<{url}>}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2422 tp/Texinfo/Convert/HTML.pm:1437
+ #, perl-brace-format
+ msgid "@{No value for `{value}'@}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2913
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}: {name} {arguments}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2918
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}: {name}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2931
+ #, fuzzy, perl-brace-format
+ msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
+ msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2934
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}: {type} {name} {arguments}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2943
+ #, fuzzy, perl-brace-format
+ msgid "@tie{ }-- {category}:@*{type}@*{name}"
+ msgstr "@tie{ }-- {category} na {class}: {type} {name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2946
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}: {type} {name}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2954
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
+ msgstr "@tie{ }-- {category} da {class}: {name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2960
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}: {name}"
+ msgstr "@tie{ }-- {category} da {class}: {name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2969
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
+ msgstr "@tie{ }-- {category} na {class}: {name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2975
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}: {name}"
+ msgstr "@tie{ }-- {category} na {class}: {name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2990
+ #, fuzzy, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
+ msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2994
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
+ msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3005
+ #, fuzzy, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
+ msgstr "@tie{ }-- {category} na {class}: {type} {name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3009
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}: {type} {name}"
+ msgstr "@tie{ }-- {category} na {class}: {type} {name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3023
+ #, fuzzy, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
+ msgstr "@tie{ }-- {category} da {class}: {type} {name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3027
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
+ msgstr "@tie{ }-- {category} da {class}: {type} {name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3038
+ #, fuzzy, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
+ msgstr "@tie{ }-- {category} da {class}: {type} {name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3042
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}: {type} {name}"
+ msgstr "@tie{ }-- {category} da {class}: {type} {name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3371 tp/Texinfo/Convert/HTML.pm:2877
+ #, perl-brace-format
+ msgid "@center --- @emph{{author}}\n"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
+ msgid "Top"
+ msgstr "Topo"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
+ msgid "Contents"
+ msgstr "Conte@'udo"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:791
+ msgid "Overview"
+ msgstr "Vis@~ao geral"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:736 tp/Texinfo/Convert/HTML.pm:767
+ #: tp/Texinfo/Convert/HTML.pm:792
+ msgid "Index"
+ msgstr "@'Indice"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:738
+ msgid "current"
+ msgstr "atual"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
+ msgid "Prev"
+ msgstr "Pr@'evio"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:742
+ msgid " Up "
+ msgstr " Acima "
+ 
+ #: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:747
+ #: tp/Texinfo/Convert/HTML.pm:799
+ msgid "Next"
+ msgstr "Pr@'oximo"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:745 tp/Texinfo/Convert/HTML.pm:798
+ msgid "Up"
+ msgstr "Acima"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:749
+ msgid "Previous"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:750
+ #, fuzzy
+ msgid "Forward node"
+ msgstr "Avan@,{c}ar"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:751
+ #, fuzzy
+ msgid "Back node"
+ msgstr "Nodo acima"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:757
+ msgid "Next file"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:758
+ msgid "Previous file"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:764
+ msgid "Cover (top) of document"
+ msgstr "In@'icio (topo) do documento"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:765
+ msgid "Table of contents"
+ msgstr "Sum@'ario"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:766
+ msgid "Short table of contents"
+ msgstr "Breve sum@'ario"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:768
+ msgid "Current section"
+ msgstr "Se@,{c}@~ao atual"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:769
+ msgid "Previous section in reading order"
+ msgstr "Se@,{c}@~ao anterior na ordem de leitura"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:770
+ msgid "Beginning of this chapter or previous chapter"
+ msgstr "Come@,{c}o desse cap@'itulo ou cap@'itulo anterior"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:771
+ msgid "Previous section on same level"
+ msgstr "Se@,{c}@~ao anterior no mesmo n@'ivel"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:772
+ msgid "Up section"
+ msgstr "Se@,{c}@~ao acima"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:773
+ msgid "Next section on same level"
+ msgstr "Pr@'oxima se@,{c}@~ao no mesmo n@'ivel"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:774
+ msgid "Up node"
+ msgstr "Nodo acima"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:775
+ msgid "Next node"
+ msgstr "Pr@'oximo nodo"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:776
+ msgid "Previous node"
+ msgstr "Nodo anterior"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:777
+ #, fuzzy
+ msgid "Next node in node reading order"
+ msgstr "Pr@'oxima se@,{c}@~ao na ordem de leitura"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:778
+ #, fuzzy
+ msgid "Previous node in node reading order"
+ msgstr "Se@,{c}@~ao anterior na ordem de leitura"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:779
+ msgid "Next section in reading order"
+ msgstr "Pr@'oxima se@,{c}@~ao na ordem de leitura"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:780
+ msgid "Next chapter"
+ msgstr "Pr@'oximo cap@'itulo"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:781
+ msgid "About (help)"
+ msgstr "Sobre (ajuda)"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:782
+ msgid "First section in reading order"
+ msgstr "Primeira se@,{c}@~ao na ordem de leitura"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:783
+ msgid "Last section in reading order"
+ msgstr "@'Ultima se@,{c}@~ao na ordem de leitura"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:784
+ msgid "Forward section in next file"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:785
+ msgid "Back section in previous file"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:794
+ msgid "This"
+ msgstr "Esse"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:795
+ msgid "Back"
+ msgstr "Volta"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:796
+ msgid "FastBack"
+ msgstr "Voltar R@'apido"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:800
+ msgid "NodeUp"
+ msgstr "Nodo Acima"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:801
+ msgid "NodeNext"
+ msgstr "Pr@'oximo Nodo"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:802
+ msgid "NodePrev"
+ msgstr "Nodo Anterior"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:803
+ #, fuzzy
+ msgid "NodeForward"
+ msgstr "Avan@,{c}ar"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:804
+ #, fuzzy
+ msgid "NodeBack"
+ msgstr "Volta"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:805
+ msgid "Forward"
+ msgstr "Avan@,{c}ar"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:806
+ msgid "FastForward"
+ msgstr "Avan@,{c}ar R@'apido"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:807
+ msgid "About"
+ msgstr "Sobre"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:808
+ msgid "First"
+ msgstr "Primeiro"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:809
+ msgid "Last"
+ msgstr "@'Ultimo"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:810
+ msgid "NextFile"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:811
+ msgid "PrevFile"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:815
+ msgid "About This Document"
+ msgstr "Sobre Esse Documento"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:816
+ msgid "Table of Contents"
+ msgstr "Sum@'ario"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:817
+ msgid "Short Table of Contents"
+ msgstr "Breve Sum@'ario"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:818
+ msgid "Footnotes"
+ msgstr "Notas de Rodap@'e"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:1534
+ #, perl-brace-format
+ msgid "{explained_string} ({explanation})"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3182
+ #, perl-brace-format
+ msgid "see section {reference_name}"
+ msgstr "veja se@,{c}@~ao {reference_name}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3185
+ #, perl-brace-format
+ msgid "see {reference_name}"
+ msgstr "veja {reference_name}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3190
+ #, perl-brace-format
+ msgid "See section {reference_name}"
+ msgstr "Veja se@,{c}@~ao {reference_name}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3193
+ #, perl-brace-format
+ msgid "See {reference_name}"
+ msgstr "Veja {reference_name}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3197
+ #, perl-brace-format
+ msgid "{reference_name}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3259
+ #, fuzzy, perl-brace-format
+ msgid "see {reference} in @cite{{book}}"
+ msgstr "veja {node_file_href} @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3263
+ #, fuzzy, perl-brace-format
+ msgid "see @cite{{book_reference}}"
+ msgstr "veja @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3267
+ #, fuzzy, perl-brace-format
+ msgid "see `{section}' in @cite{{book}}"
+ msgstr "se@,{c}@~ao `{section}' em @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3274
+ #, fuzzy, perl-brace-format
+ msgid "see {reference}"
+ msgstr "veja {reference_name}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3277
+ #, fuzzy, perl-brace-format
+ msgid "see `{section}'"
+ msgstr "Se@,{c}@~ao acima"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3282
+ #, fuzzy, perl-brace-format
+ msgid "See {reference} in @cite{{book}}"
+ msgstr "Veja {node_file_href} @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3286
+ #, fuzzy, perl-brace-format
+ msgid "See @cite{{book_reference}}"
+ msgstr "Veja @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3290
+ #, fuzzy, perl-brace-format
+ msgid "See `{section}' in @cite{{book}}"
+ msgstr "Veja se@,{c}@~ao `{section}' em @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3297
+ #, fuzzy, perl-brace-format
+ msgid "See {reference}"
+ msgstr "Veja {reference_name}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3300
+ #, fuzzy, perl-brace-format
+ msgid "See `{section}'"
+ msgstr "Se@,{c}@~ao acima"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3305
+ #, fuzzy, perl-brace-format
+ msgid "{reference} in @cite{{book}}"
+ msgstr "veja @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3309
+ #, fuzzy, perl-brace-format
+ msgid "@cite{{book_reference}}"
+ msgstr "veja @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3313
+ #, fuzzy, perl-brace-format
+ msgid "`{section}' in @cite{{book}}"
+ msgstr "se@,{c}@~ao `{section}' em @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3320
+ #, fuzzy, perl-brace-format
+ msgid "{reference}"
+ msgstr "veja {reference_name}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3323
+ #, fuzzy, perl-brace-format
+ msgid "`{section}'"
+ msgstr "Se@,{c}@~ao acima"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3436
+ msgid "Jump to"
+ msgstr "Pular para"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3444
+ msgid "Index Entry"
+ msgstr "Entrada de @'Indice"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3446
+ msgid "Section"
+ msgstr "Se@,{c}@~ao"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4065
+ #, perl-brace-format
+ msgid "{category}: @strong{{name}} @emph{{arguments}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4070
+ #, perl-brace-format
+ msgid "{category}: @strong{{name}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4087
+ #, 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:4091
+ #, perl-brace-format
+ msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4100
+ #, fuzzy, perl-brace-format
+ msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
+ msgstr "{category} na {class}: @emph{{type}} @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4103
+ #, perl-brace-format
+ msgid "{category}: @emph{{type}} @strong{{name}}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4111
+ #, perl-brace-format
+ msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
+ msgstr "{category} da {class}: @strong{{name}} @emph{{arguments}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4117
+ #, perl-brace-format
+ msgid "{category} of {class}: @strong{{name}}"
+ msgstr "{category} da {class}: @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4126
+ #, perl-brace-format
+ msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
+ msgstr "{category} na {class}: @strong{{name}} @emph{{arguments}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4132
+ #, perl-brace-format
+ msgid "{category} on {class}: @strong{{name}}"
+ msgstr "{category} na {class}: @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4147
+ #, 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:4151
+ #, 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:4162
+ #, 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:4166
+ #, perl-brace-format
+ msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
+ msgstr "{category} na {class}: @emph{{type}} @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4180
+ #, 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:4184
+ #, 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:4195
+ #, 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:4199
+ #, perl-brace-format
+ msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
+ msgstr "{category} da {class}: @emph{{type}} @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6170
+ #, fuzzy, perl-brace-format
+ msgid ""
+ "This document was generated on @emph{@today{}} using "
+ "@uref{{program_homepage}, @emph{{program}}}."
+ msgstr ""
+ "Esse documento foi gerado em @i{{date}} usando @uref{{program_homepage}, "
+ "@i{{program}}}."
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6175
+ #, 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:6214
+ #, perl-brace-format
+ msgid "{title}: {element_text}"
+ msgstr ""
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6358
+ #, 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:6427
+ 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:6433
+ msgid "Button"
+ msgstr "Bot@~ao"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6434
+ msgid "Name"
+ msgstr "Nome"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6435
+ msgid "Go to"
+ msgstr "V@'a para"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6436
+ msgid "From 1.2.3 go to"
+ msgstr "De 1.2.3 v@'a para"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6462
+ 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 ""
+ "  onde o @strong{ Exemplo } assume que a posi@,{c}@~ao atual localiza-se em "
+ "@strong{ Subsub@,{c}@~ao Um-Dois-Tr@^es } de um documento com a seguinte "
+ "estrutura:"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6472
+ msgid "Section One"
+ msgstr "Se@,{c}@~ao Um"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6474
+ msgid "Subsection One-One"
+ msgstr "Subse@,{c}@~ao Um-Um"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6481
+ msgid "Subsection One-Two"
+ msgstr "Subse@,{c}@~ao Um-Dois"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6483
+ msgid "Subsubsection One-Two-One"
+ msgstr "Subse@,{c}@~ao Um-Dois-Um"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6484
+ msgid "Subsubsection One-Two-Two"
+ msgstr "Subse@,{c}@~ao Um-Dois-Dois"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6485
+ msgid "Subsubsection One-Two-Three"
+ msgstr "Subse@,{c}@~ao Um-Dois-Tr@^es"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6487
+ msgid "Current Position"
+ msgstr "Posi@,{c}@~ao Atual"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6488
+ msgid "Subsubsection One-Two-Four"
+ msgstr "Subse@,{c}@~ao Um-Dois-Quatro"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6491
+ msgid "Subsection One-Three"
+ msgstr "Subse@,{c}@~ao Um-Tr@^es"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6498
+ msgid "Subsection One-Four"
+ msgstr "Subse@,{c}@~ao Um-Quatro"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6906
+ msgid "Untitled Document"
+ msgstr "Documento Sem Nome"
+ 
+ #, fuzzy
+ #~ msgid ""
+ #~ "This document was generated on @emph{{date}} using "
+ #~ "@uref{{program_homepage}, @emph{{program}}}."
+ #~ msgstr ""
+ #~ "Esse documento foi gerado em @i{{date}} usando @uref{{program_homepage}, "
+ #~ "@i{{program}}}."
+ 
+ #~ msgid "on @emph{{date}}"
+ #~ msgstr "em @emph{{date}}"
+ 
+ #~ msgid "Node up"
+ #~ msgstr "Nodo acima"
+ 
+ #~ msgid "Following"
+ #~ msgstr "Seguinte"
+ 
+ #~ msgid "Node following in node reading order"
+ #~ msgstr "Nodo seguinte na ordem de leitura de nodos"
+ 
+ #~ msgid "Following node"
+ #~ msgstr "Nodo seguinte"
+ 
+ #~ msgid "see {node_file_href} section `{section}' in @cite{{book}}"
+ #~ msgstr "veja {node_file_href} se@,{c}@~ao `{section}' em @cite{{book}}"
+ 
+ #~ msgid "see {node_file_href}"
+ #~ msgstr "veja {node_file_href}"
+ 
+ #~ msgid "See {node_file_href} section `{section}' in @cite{{book}}"
+ #~ msgstr "Veja {node_file_href} se@,{c}@~ao `{section}' em @cite{{book}}"
+ 
+ #~ msgid "See {node_file_href}"
+ #~ msgstr "Veja {node_file_href}"
+ 
+ #~ msgid "{node_file_href} section `{section}' in @cite{{book}}"
+ #~ msgstr "{node_file_href} se@,{c}@~ao `{section}' em @cite{{book}}"
Binary files texinfo-6.1/po_document/pt.us-ascii.gmo and texinfo-6.3/po_document/pt.us-ascii.gmo differ
diff -Nrc2 texinfo-6.1/po_document/pt.us-ascii.po texinfo-6.3/po_document/pt.us-ascii.po
*** texinfo-6.1/po_document/pt.us-ascii.po	2016-02-06 11:35:59.000000000 +0000
--- texinfo-6.3/po_document/pt.us-ascii.po	2016-09-10 12:46:01.000000000 +0100
***************
*** 8,12 ****
  "Project-Id-Version: texinfo 5.0\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
  "PO-Revision-Date: 2006-01-09\n"
  "Last-Translator: Jorge Barros de Abreu <ficmatin01@solar.com.br>\n"
--- 8,12 ----
  "Project-Id-Version: texinfo 5.0\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:46+0100\n"
  "PO-Revision-Date: 2006-01-09\n"
  "Last-Translator: Jorge Barros de Abreu <ficmatin01@solar.com.br>\n"
***************
*** 17,113 ****
  "Content-Transfer-Encoding: 8bit\n"
  
! #: tp/Texinfo/Common.pm:717 tp/Texinfo/Common.pm:722
  #, fuzzy
  msgid "Function"
  msgstr "Se@,{c}@~ao"
  
! #: tp/Texinfo/Common.pm:718
  msgid "Macro"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:719
  msgid "Special Form"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:720 tp/Texinfo/Common.pm:723
  msgid "Variable"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:721
  #, fuzzy
  msgid "User Option"
  msgstr "Se@,{c}@~ao acima"
  
! #: tp/Texinfo/Common.pm:724 tp/Texinfo/Common.pm:725
  msgid "Instance Variable"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:726 tp/Texinfo/Common.pm:727
  msgid "Method"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1199
  #, perl-brace-format
  msgid "{category} on {class}"
  msgstr "{category} na {class}"
  
! #: tp/Texinfo/Common.pm:1206
  #, perl-brace-format
  msgid "{category} of {class}"
  msgstr "{category} da {class}"
  
! #: tp/Texinfo/Common.pm:1223
  #, perl-brace-format
  msgid "{month} {day}, {year}"
  msgstr "{day} de {month} de {year}"
  
! #: tp/Texinfo/Common.pm:1254 tp/Texinfo/Convert/Plaintext.pm:1132
! #: tp/Texinfo/Convert/HTML.pm:515
  #, perl-brace-format
  msgid "Appendix {number} {section_title}"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1258 tp/Texinfo/Convert/Plaintext.pm:1137
! #: tp/Texinfo/Convert/HTML.pm:521
  #, perl-brace-format
  msgid "{number} {section_title}"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1393
  #, perl-brace-format
  msgid "{float_type} {float_number}: "
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1397
  #, perl-brace-format
  msgid "{float_type}: "
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1402
  #, perl-brace-format
  msgid "{float_type} {float_number}\n"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1406
  #, perl-brace-format
  msgid "{float_type}\n"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1412
  #, perl-brace-format
  msgid "{float_number}: "
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1415
  #, perl-brace-format
  msgid "{float_number}\n"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2982
  #, perl-brace-format
  msgid "{name} on {class}"
  msgstr "{name} na {class}"
  
! #: tp/Texinfo/Parser.pm:2991
  #, perl-brace-format
  msgid "{name} of {class}"
--- 17,113 ----
  "Content-Transfer-Encoding: 8bit\n"
  
! #: tp/Texinfo/Common.pm:697 tp/Texinfo/Common.pm:702
  #, fuzzy
  msgid "Function"
  msgstr "Se@,{c}@~ao"
  
! #: tp/Texinfo/Common.pm:698
  msgid "Macro"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:699
  msgid "Special Form"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:700 tp/Texinfo/Common.pm:703
  msgid "Variable"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:701
  #, fuzzy
  msgid "User Option"
  msgstr "Se@,{c}@~ao acima"
  
! #: tp/Texinfo/Common.pm:704 tp/Texinfo/Common.pm:705
  msgid "Instance Variable"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:706 tp/Texinfo/Common.pm:707
  msgid "Method"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1186
  #, perl-brace-format
  msgid "{category} on {class}"
  msgstr "{category} na {class}"
  
! #: tp/Texinfo/Common.pm:1193
  #, perl-brace-format
  msgid "{category} of {class}"
  msgstr "{category} da {class}"
  
! #: tp/Texinfo/Common.pm:1210
  #, perl-brace-format
  msgid "{month} {day}, {year}"
  msgstr "{day} de {month} de {year}"
  
! #: tp/Texinfo/Common.pm:1241 tp/Texinfo/Convert/Plaintext.pm:1133
! #: tp/Texinfo/Convert/HTML.pm:516
  #, perl-brace-format
  msgid "Appendix {number} {section_title}"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1245 tp/Texinfo/Convert/Plaintext.pm:1138
! #: tp/Texinfo/Convert/HTML.pm:522
  #, perl-brace-format
  msgid "{number} {section_title}"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1499
  #, perl-brace-format
  msgid "{float_type} {float_number}: "
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1503
  #, perl-brace-format
  msgid "{float_type}: "
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1508
  #, perl-brace-format
  msgid "{float_type} {float_number}\n"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1512
  #, perl-brace-format
  msgid "{float_type}\n"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1518
  #, perl-brace-format
  msgid "{float_number}: "
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1521
  #, perl-brace-format
  msgid "{float_number}\n"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2816
  #, perl-brace-format
  msgid "{name} on {class}"
  msgstr "{name} na {class}"
  
! #: tp/Texinfo/Parser.pm:2825
  #, perl-brace-format
  msgid "{name} of {class}"
***************
*** 118,180 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:956
  msgid "January"
  msgstr "Janeiro"
  
! #: tp/Texinfo/Convert/Converter.pm:957
  msgid "February"
  msgstr "Fevereiro"
  
! #: tp/Texinfo/Convert/Converter.pm:958
  msgid "March"
  msgstr "Mar@,{c}o"
  
! #: tp/Texinfo/Convert/Converter.pm:959
  msgid "April"
  msgstr "Abril"
  
! #: tp/Texinfo/Convert/Converter.pm:960
  msgid "May"
  msgstr "Maio"
  
! #: tp/Texinfo/Convert/Converter.pm:961
  msgid "June"
  msgstr "Junho"
  
! #: tp/Texinfo/Convert/Converter.pm:962
  msgid "July"
  msgstr "Julho"
  
! #: tp/Texinfo/Convert/Converter.pm:963
  msgid "August"
  msgstr "Agosto"
  
! #: tp/Texinfo/Convert/Converter.pm:964
  msgid "September"
  msgstr "Setembro"
  
! #: tp/Texinfo/Convert/Converter.pm:965
  msgid "October"
  msgstr "Outubro"
  
! #: tp/Texinfo/Convert/Converter.pm:966
  msgid "November"
  msgstr "Novembro"
  
! #: tp/Texinfo/Convert/Converter.pm:967
  msgid "December"
  msgstr "Dezembro"
  
! #: tp/Texinfo/Convert/Converter.pm:1018
  #, perl-brace-format
  msgid "{float_type} {float_number}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:1022
  #, perl-brace-format
  msgid "{float_type}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:1026
  #, perl-brace-format
  msgid "{float_number}"
--- 118,180 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:948
  msgid "January"
  msgstr "Janeiro"
  
! #: tp/Texinfo/Convert/Converter.pm:949
  msgid "February"
  msgstr "Fevereiro"
  
! #: tp/Texinfo/Convert/Converter.pm:950
  msgid "March"
  msgstr "Mar@,{c}o"
  
! #: tp/Texinfo/Convert/Converter.pm:951
  msgid "April"
  msgstr "Abril"
  
! #: tp/Texinfo/Convert/Converter.pm:952
  msgid "May"
  msgstr "Maio"
  
! #: tp/Texinfo/Convert/Converter.pm:953
  msgid "June"
  msgstr "Junho"
  
! #: tp/Texinfo/Convert/Converter.pm:954
  msgid "July"
  msgstr "Julho"
  
! #: tp/Texinfo/Convert/Converter.pm:955
  msgid "August"
  msgstr "Agosto"
  
! #: tp/Texinfo/Convert/Converter.pm:956
  msgid "September"
  msgstr "Setembro"
  
! #: tp/Texinfo/Convert/Converter.pm:957
  msgid "October"
  msgstr "Outubro"
  
! #: tp/Texinfo/Convert/Converter.pm:958
  msgid "November"
  msgstr "Novembro"
  
! #: tp/Texinfo/Convert/Converter.pm:959
  msgid "December"
  msgstr "Dezembro"
  
! #: tp/Texinfo/Convert/Converter.pm:1010
  #, perl-brace-format
  msgid "{float_type} {float_number}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:1014
  #, perl-brace-format
  msgid "{float_type}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:1018
  #, perl-brace-format
  msgid "{float_number}"
***************
*** 211,225 ****
  msgstr "veja se@,{c}@~ao `{section}' em @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3291
  #, perl-brace-format
  msgid "@cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3268
  #, perl-brace-format
  msgid "See @cite{{book}}"
  msgstr "Veja @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3245
  #, perl-brace-format
  msgid "see @cite{{book}}"
--- 211,225 ----
  msgstr "veja se@,{c}@~ao `{section}' em @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3317
  #, perl-brace-format
  msgid "@cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3294
  #, perl-brace-format
  msgid "See @cite{{book}}"
  msgstr "Veja @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3271
  #, perl-brace-format
  msgid "see @cite{{book}}"
***************
*** 241,731 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2310
  #, perl-brace-format
  msgid "{abbr_or_acronym} ({explanation})"
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2496
! #: tp/Texinfo/Convert/HTML.pm:3597
  #, perl-brace-format
  msgid "@b{{quotation_arg}:} "
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1366
  msgid "(outside of any node)"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2003
  #, perl-brace-format
  msgid "{name} @url{{email}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2006
  #, perl-brace-format
  msgid "@url{{email}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2028
  #, perl-brace-format
  msgid "{text} ({url})"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2033
  #, perl-brace-format
  msgid "@t{<{url}>}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2421 tp/Texinfo/Convert/HTML.pm:1438
  #, perl-brace-format
  msgid "@{No value for `{value}'@}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2945
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2950
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2963
  #, fuzzy, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2966
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2975
  #, fuzzy, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} na {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2978
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2986
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} da {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2992
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name}"
  msgstr "@tie{ }-- {category} da {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3001
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} na {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3007
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name}"
  msgstr "@tie{ }-- {category} na {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3022
  #, fuzzy, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3026
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3037
  #, fuzzy, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} na {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3041
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name}"
  msgstr "@tie{ }-- {category} na {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3055
  #, fuzzy, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} da {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3059
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} da {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3070
  #, fuzzy, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} da {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3074
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name}"
  msgstr "@tie{ }-- {category} da {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3403 tp/Texinfo/Convert/HTML.pm:2851
  #, perl-brace-format
  msgid "@center --- @emph{{author}}\n"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:732 tp/Texinfo/Convert/HTML.pm:788
  msgid "Top"
  msgstr "Topo"
  
! #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
  msgid "Contents"
  msgstr "Conte@'udo"
  
! #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
  msgid "Overview"
  msgstr "Vis@~ao geral"
  
! #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:766
! #: tp/Texinfo/Convert/HTML.pm:791
  msgid "Index"
  msgstr "@'Indice"
  
! #: tp/Texinfo/Convert/HTML.pm:737
  msgid "current"
  msgstr "atual"
  
! #: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
  msgid "Prev"
  msgstr "Pr@'evio"
  
! #: tp/Texinfo/Convert/HTML.pm:741
  msgid " Up "
  msgstr " Acima "
  
! #: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:746
! #: tp/Texinfo/Convert/HTML.pm:798
  msgid "Next"
  msgstr "Pr@'oximo"
  
! #: tp/Texinfo/Convert/HTML.pm:744 tp/Texinfo/Convert/HTML.pm:797
  msgid "Up"
  msgstr "Acima"
  
! #: tp/Texinfo/Convert/HTML.pm:748
  msgid "Previous"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:749
  #, fuzzy
  msgid "Forward node"
  msgstr "Avan@,{c}ar"
  
! #: tp/Texinfo/Convert/HTML.pm:750
  #, fuzzy
  msgid "Back node"
  msgstr "Nodo acima"
  
! #: tp/Texinfo/Convert/HTML.pm:756
  msgid "Next file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:757
  msgid "Previous file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:763
  msgid "Cover (top) of document"
  msgstr "In@'icio (topo) do documento"
  
! #: tp/Texinfo/Convert/HTML.pm:764
  msgid "Table of contents"
  msgstr "Sum@'ario"
  
! #: tp/Texinfo/Convert/HTML.pm:765
  msgid "Short table of contents"
  msgstr "Breve sum@'ario"
  
! #: tp/Texinfo/Convert/HTML.pm:767
  msgid "Current section"
  msgstr "Se@,{c}@~ao atual"
  
! #: tp/Texinfo/Convert/HTML.pm:768
  msgid "Previous section in reading order"
  msgstr "Se@,{c}@~ao anterior na ordem de leitura"
  
! #: tp/Texinfo/Convert/HTML.pm:769
  msgid "Beginning of this chapter or previous chapter"
  msgstr "Come@,{c}o desse cap@'itulo ou cap@'itulo anterior"
  
! #: tp/Texinfo/Convert/HTML.pm:770
  msgid "Previous section on same level"
  msgstr "Se@,{c}@~ao anterior no mesmo n@'ivel"
  
! #: tp/Texinfo/Convert/HTML.pm:771
  msgid "Up section"
  msgstr "Se@,{c}@~ao acima"
  
! #: tp/Texinfo/Convert/HTML.pm:772
  msgid "Next section on same level"
  msgstr "Pr@'oxima se@,{c}@~ao no mesmo n@'ivel"
  
! #: tp/Texinfo/Convert/HTML.pm:773
  msgid "Up node"
  msgstr "Nodo acima"
  
! #: tp/Texinfo/Convert/HTML.pm:774
  msgid "Next node"
  msgstr "Pr@'oximo nodo"
  
! #: tp/Texinfo/Convert/HTML.pm:775
  msgid "Previous node"
  msgstr "Nodo anterior"
  
! #: tp/Texinfo/Convert/HTML.pm:776
  #, fuzzy
  msgid "Next node in node reading order"
  msgstr "Pr@'oxima se@,{c}@~ao na ordem de leitura"
  
! #: tp/Texinfo/Convert/HTML.pm:777
  #, fuzzy
  msgid "Previous node in node reading order"
  msgstr "Se@,{c}@~ao anterior na ordem de leitura"
  
! #: tp/Texinfo/Convert/HTML.pm:778
  msgid "Next section in reading order"
  msgstr "Pr@'oxima se@,{c}@~ao na ordem de leitura"
  
! #: tp/Texinfo/Convert/HTML.pm:779
  msgid "Next chapter"
  msgstr "Pr@'oximo cap@'itulo"
  
! #: tp/Texinfo/Convert/HTML.pm:780
  msgid "About (help)"
  msgstr "Sobre (ajuda)"
  
! #: tp/Texinfo/Convert/HTML.pm:781
  msgid "First section in reading order"
  msgstr "Primeira se@,{c}@~ao na ordem de leitura"
  
! #: tp/Texinfo/Convert/HTML.pm:782
  msgid "Last section in reading order"
  msgstr "@'Ultima se@,{c}@~ao na ordem de leitura"
  
! #: tp/Texinfo/Convert/HTML.pm:783
  msgid "Forward section in next file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:784
  msgid "Back section in previous file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:793
  msgid "This"
  msgstr "Esse"
  
! #: tp/Texinfo/Convert/HTML.pm:794
  msgid "Back"
  msgstr "Volta"
  
! #: tp/Texinfo/Convert/HTML.pm:795
  msgid "FastBack"
  msgstr "Voltar R@'apido"
  
! #: tp/Texinfo/Convert/HTML.pm:799
  msgid "NodeUp"
  msgstr "Nodo Acima"
  
! #: tp/Texinfo/Convert/HTML.pm:800
  msgid "NodeNext"
  msgstr "Pr@'oximo Nodo"
  
! #: tp/Texinfo/Convert/HTML.pm:801
  msgid "NodePrev"
  msgstr "Nodo Anterior"
  
! #: tp/Texinfo/Convert/HTML.pm:802
  #, fuzzy
  msgid "NodeForward"
  msgstr "Avan@,{c}ar"
  
! #: tp/Texinfo/Convert/HTML.pm:803
  #, fuzzy
  msgid "NodeBack"
  msgstr "Volta"
  
! #: tp/Texinfo/Convert/HTML.pm:804
  msgid "Forward"
  msgstr "Avan@,{c}ar"
  
! #: tp/Texinfo/Convert/HTML.pm:805
  msgid "FastForward"
  msgstr "Avan@,{c}ar R@'apido"
  
! #: tp/Texinfo/Convert/HTML.pm:806
  msgid "About"
  msgstr "Sobre"
  
! #: tp/Texinfo/Convert/HTML.pm:807
  msgid "First"
  msgstr "Primeiro"
  
! #: tp/Texinfo/Convert/HTML.pm:808
  msgid "Last"
  msgstr "@'Ultimo"
  
! #: tp/Texinfo/Convert/HTML.pm:809
  msgid "NextFile"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:810
  msgid "PrevFile"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:814
  msgid "About This Document"
  msgstr "Sobre Esse Documento"
  
! #: tp/Texinfo/Convert/HTML.pm:815
  msgid "Table of Contents"
  msgstr "Sum@'ario"
  
! #: tp/Texinfo/Convert/HTML.pm:816
  msgid "Short Table of Contents"
  msgstr "Breve Sum@'ario"
  
! #: tp/Texinfo/Convert/HTML.pm:817
  msgid "Footnotes"
  msgstr "Notas de Rodap@'e"
  
! #: tp/Texinfo/Convert/HTML.pm:1504
  #, perl-brace-format
  msgid "{explained_string} ({explanation})"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3156
  #, perl-brace-format
  msgid "see section {reference_name}"
  msgstr "veja se@,{c}@~ao {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3159
  #, perl-brace-format
  msgid "see {reference_name}"
  msgstr "veja {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3164
  #, perl-brace-format
  msgid "See section {reference_name}"
  msgstr "Veja se@,{c}@~ao {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3167
  #, perl-brace-format
  msgid "See {reference_name}"
  msgstr "Veja {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3171
  #, perl-brace-format
  msgid "{reference_name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3233
  #, fuzzy, perl-brace-format
  msgid "see {reference} in @cite{{book}}"
  msgstr "veja {node_file_href} @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3237
  #, fuzzy, perl-brace-format
  msgid "see @cite{{book_reference}}"
  msgstr "veja @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3241
  #, fuzzy, perl-brace-format
  msgid "see `{section}' in @cite{{book}}"
  msgstr "se@,{c}@~ao `{section}' em @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3248
  #, fuzzy, perl-brace-format
  msgid "see {reference}"
  msgstr "veja {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3251
  #, fuzzy, perl-brace-format
  msgid "see `{section}'"
  msgstr "Se@,{c}@~ao acima"
  
! #: tp/Texinfo/Convert/HTML.pm:3256
  #, fuzzy, perl-brace-format
  msgid "See {reference} in @cite{{book}}"
  msgstr "Veja {node_file_href} @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3260
  #, fuzzy, perl-brace-format
  msgid "See @cite{{book_reference}}"
  msgstr "Veja @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3264
  #, fuzzy, perl-brace-format
  msgid "See `{section}' in @cite{{book}}"
  msgstr "Veja se@,{c}@~ao `{section}' em @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3271
  #, fuzzy, perl-brace-format
  msgid "See {reference}"
  msgstr "Veja {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3274
  #, fuzzy, perl-brace-format
  msgid "See `{section}'"
  msgstr "Se@,{c}@~ao acima"
  
! #: tp/Texinfo/Convert/HTML.pm:3279
  #, fuzzy, perl-brace-format
  msgid "{reference} in @cite{{book}}"
  msgstr "veja @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3283
  #, fuzzy, perl-brace-format
  msgid "@cite{{book_reference}}"
  msgstr "veja @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3287
  #, fuzzy, perl-brace-format
  msgid "`{section}' in @cite{{book}}"
  msgstr "se@,{c}@~ao `{section}' em @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3294
  #, fuzzy, perl-brace-format
  msgid "{reference}"
  msgstr "veja {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3297
  #, fuzzy, perl-brace-format
  msgid "`{section}'"
  msgstr "Se@,{c}@~ao acima"
  
! #: tp/Texinfo/Convert/HTML.pm:3410
  msgid "Jump to"
  msgstr "Pular para"
  
! #: tp/Texinfo/Convert/HTML.pm:3418
  msgid "Index Entry"
  msgstr "Entrada de @'Indice"
  
! #: tp/Texinfo/Convert/HTML.pm:3420
  msgid "Section"
  msgstr "Se@,{c}@~ao"
  
! #: tp/Texinfo/Convert/HTML.pm:4040
  #, perl-brace-format
  msgid "{category}: @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4045
  #, perl-brace-format
  msgid "{category}: @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4062
  #, fuzzy, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
--- 241,731 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2311
  #, perl-brace-format
  msgid "{abbr_or_acronym} ({explanation})"
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2497
! #: tp/Texinfo/Convert/HTML.pm:3622
  #, perl-brace-format
  msgid "@b{{quotation_arg}:} "
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1367
  msgid "(outside of any node)"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2004
  #, perl-brace-format
  msgid "{name} @url{{email}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2007
  #, perl-brace-format
  msgid "@url{{email}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2029
  #, perl-brace-format
  msgid "{text} ({url})"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2034
  #, perl-brace-format
  msgid "@t{<{url}>}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2422 tp/Texinfo/Convert/HTML.pm:1437
  #, perl-brace-format
  msgid "@{No value for `{value}'@}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2913
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2918
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2931
  #, fuzzy, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2934
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2943
  #, fuzzy, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} na {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2946
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2954
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} da {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2960
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name}"
  msgstr "@tie{ }-- {category} da {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2969
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} na {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2975
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name}"
  msgstr "@tie{ }-- {category} na {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2990
  #, fuzzy, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2994
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3005
  #, fuzzy, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} na {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3009
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name}"
  msgstr "@tie{ }-- {category} na {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3023
  #, fuzzy, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} da {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3027
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} da {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3038
  #, fuzzy, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} da {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3042
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name}"
  msgstr "@tie{ }-- {category} da {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3371 tp/Texinfo/Convert/HTML.pm:2877
  #, perl-brace-format
  msgid "@center --- @emph{{author}}\n"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
  msgid "Top"
  msgstr "Topo"
  
! #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
  msgid "Contents"
  msgstr "Conte@'udo"
  
! #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:791
  msgid "Overview"
  msgstr "Vis@~ao geral"
  
! #: tp/Texinfo/Convert/HTML.pm:736 tp/Texinfo/Convert/HTML.pm:767
! #: tp/Texinfo/Convert/HTML.pm:792
  msgid "Index"
  msgstr "@'Indice"
  
! #: tp/Texinfo/Convert/HTML.pm:738
  msgid "current"
  msgstr "atual"
  
! #: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
  msgid "Prev"
  msgstr "Pr@'evio"
  
! #: tp/Texinfo/Convert/HTML.pm:742
  msgid " Up "
  msgstr " Acima "
  
! #: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:747
! #: tp/Texinfo/Convert/HTML.pm:799
  msgid "Next"
  msgstr "Pr@'oximo"
  
! #: tp/Texinfo/Convert/HTML.pm:745 tp/Texinfo/Convert/HTML.pm:798
  msgid "Up"
  msgstr "Acima"
  
! #: tp/Texinfo/Convert/HTML.pm:749
  msgid "Previous"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:750
  #, fuzzy
  msgid "Forward node"
  msgstr "Avan@,{c}ar"
  
! #: tp/Texinfo/Convert/HTML.pm:751
  #, fuzzy
  msgid "Back node"
  msgstr "Nodo acima"
  
! #: tp/Texinfo/Convert/HTML.pm:757
  msgid "Next file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:758
  msgid "Previous file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:764
  msgid "Cover (top) of document"
  msgstr "In@'icio (topo) do documento"
  
! #: tp/Texinfo/Convert/HTML.pm:765
  msgid "Table of contents"
  msgstr "Sum@'ario"
  
! #: tp/Texinfo/Convert/HTML.pm:766
  msgid "Short table of contents"
  msgstr "Breve sum@'ario"
  
! #: tp/Texinfo/Convert/HTML.pm:768
  msgid "Current section"
  msgstr "Se@,{c}@~ao atual"
  
! #: tp/Texinfo/Convert/HTML.pm:769
  msgid "Previous section in reading order"
  msgstr "Se@,{c}@~ao anterior na ordem de leitura"
  
! #: tp/Texinfo/Convert/HTML.pm:770
  msgid "Beginning of this chapter or previous chapter"
  msgstr "Come@,{c}o desse cap@'itulo ou cap@'itulo anterior"
  
! #: tp/Texinfo/Convert/HTML.pm:771
  msgid "Previous section on same level"
  msgstr "Se@,{c}@~ao anterior no mesmo n@'ivel"
  
! #: tp/Texinfo/Convert/HTML.pm:772
  msgid "Up section"
  msgstr "Se@,{c}@~ao acima"
  
! #: tp/Texinfo/Convert/HTML.pm:773
  msgid "Next section on same level"
  msgstr "Pr@'oxima se@,{c}@~ao no mesmo n@'ivel"
  
! #: tp/Texinfo/Convert/HTML.pm:774
  msgid "Up node"
  msgstr "Nodo acima"
  
! #: tp/Texinfo/Convert/HTML.pm:775
  msgid "Next node"
  msgstr "Pr@'oximo nodo"
  
! #: tp/Texinfo/Convert/HTML.pm:776
  msgid "Previous node"
  msgstr "Nodo anterior"
  
! #: tp/Texinfo/Convert/HTML.pm:777
  #, fuzzy
  msgid "Next node in node reading order"
  msgstr "Pr@'oxima se@,{c}@~ao na ordem de leitura"
  
! #: tp/Texinfo/Convert/HTML.pm:778
  #, fuzzy
  msgid "Previous node in node reading order"
  msgstr "Se@,{c}@~ao anterior na ordem de leitura"
  
! #: tp/Texinfo/Convert/HTML.pm:779
  msgid "Next section in reading order"
  msgstr "Pr@'oxima se@,{c}@~ao na ordem de leitura"
  
! #: tp/Texinfo/Convert/HTML.pm:780
  msgid "Next chapter"
  msgstr "Pr@'oximo cap@'itulo"
  
! #: tp/Texinfo/Convert/HTML.pm:781
  msgid "About (help)"
  msgstr "Sobre (ajuda)"
  
! #: tp/Texinfo/Convert/HTML.pm:782
  msgid "First section in reading order"
  msgstr "Primeira se@,{c}@~ao na ordem de leitura"
  
! #: tp/Texinfo/Convert/HTML.pm:783
  msgid "Last section in reading order"
  msgstr "@'Ultima se@,{c}@~ao na ordem de leitura"
  
! #: tp/Texinfo/Convert/HTML.pm:784
  msgid "Forward section in next file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:785
  msgid "Back section in previous file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:794
  msgid "This"
  msgstr "Esse"
  
! #: tp/Texinfo/Convert/HTML.pm:795
  msgid "Back"
  msgstr "Volta"
  
! #: tp/Texinfo/Convert/HTML.pm:796
  msgid "FastBack"
  msgstr "Voltar R@'apido"
  
! #: tp/Texinfo/Convert/HTML.pm:800
  msgid "NodeUp"
  msgstr "Nodo Acima"
  
! #: tp/Texinfo/Convert/HTML.pm:801
  msgid "NodeNext"
  msgstr "Pr@'oximo Nodo"
  
! #: tp/Texinfo/Convert/HTML.pm:802
  msgid "NodePrev"
  msgstr "Nodo Anterior"
  
! #: tp/Texinfo/Convert/HTML.pm:803
  #, fuzzy
  msgid "NodeForward"
  msgstr "Avan@,{c}ar"
  
! #: tp/Texinfo/Convert/HTML.pm:804
  #, fuzzy
  msgid "NodeBack"
  msgstr "Volta"
  
! #: tp/Texinfo/Convert/HTML.pm:805
  msgid "Forward"
  msgstr "Avan@,{c}ar"
  
! #: tp/Texinfo/Convert/HTML.pm:806
  msgid "FastForward"
  msgstr "Avan@,{c}ar R@'apido"
  
! #: tp/Texinfo/Convert/HTML.pm:807
  msgid "About"
  msgstr "Sobre"
  
! #: tp/Texinfo/Convert/HTML.pm:808
  msgid "First"
  msgstr "Primeiro"
  
! #: tp/Texinfo/Convert/HTML.pm:809
  msgid "Last"
  msgstr "@'Ultimo"
  
! #: tp/Texinfo/Convert/HTML.pm:810
  msgid "NextFile"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:811
  msgid "PrevFile"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:815
  msgid "About This Document"
  msgstr "Sobre Esse Documento"
  
! #: tp/Texinfo/Convert/HTML.pm:816
  msgid "Table of Contents"
  msgstr "Sum@'ario"
  
! #: tp/Texinfo/Convert/HTML.pm:817
  msgid "Short Table of Contents"
  msgstr "Breve Sum@'ario"
  
! #: tp/Texinfo/Convert/HTML.pm:818
  msgid "Footnotes"
  msgstr "Notas de Rodap@'e"
  
! #: tp/Texinfo/Convert/HTML.pm:1534
  #, perl-brace-format
  msgid "{explained_string} ({explanation})"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3182
  #, perl-brace-format
  msgid "see section {reference_name}"
  msgstr "veja se@,{c}@~ao {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3185
  #, perl-brace-format
  msgid "see {reference_name}"
  msgstr "veja {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3190
  #, perl-brace-format
  msgid "See section {reference_name}"
  msgstr "Veja se@,{c}@~ao {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3193
  #, perl-brace-format
  msgid "See {reference_name}"
  msgstr "Veja {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3197
  #, perl-brace-format
  msgid "{reference_name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3259
  #, fuzzy, perl-brace-format
  msgid "see {reference} in @cite{{book}}"
  msgstr "veja {node_file_href} @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3263
  #, fuzzy, perl-brace-format
  msgid "see @cite{{book_reference}}"
  msgstr "veja @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3267
  #, fuzzy, perl-brace-format
  msgid "see `{section}' in @cite{{book}}"
  msgstr "se@,{c}@~ao `{section}' em @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3274
  #, fuzzy, perl-brace-format
  msgid "see {reference}"
  msgstr "veja {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3277
  #, fuzzy, perl-brace-format
  msgid "see `{section}'"
  msgstr "Se@,{c}@~ao acima"
  
! #: tp/Texinfo/Convert/HTML.pm:3282
  #, fuzzy, perl-brace-format
  msgid "See {reference} in @cite{{book}}"
  msgstr "Veja {node_file_href} @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3286
  #, fuzzy, perl-brace-format
  msgid "See @cite{{book_reference}}"
  msgstr "Veja @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3290
  #, fuzzy, perl-brace-format
  msgid "See `{section}' in @cite{{book}}"
  msgstr "Veja se@,{c}@~ao `{section}' em @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3297
  #, fuzzy, perl-brace-format
  msgid "See {reference}"
  msgstr "Veja {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3300
  #, fuzzy, perl-brace-format
  msgid "See `{section}'"
  msgstr "Se@,{c}@~ao acima"
  
! #: tp/Texinfo/Convert/HTML.pm:3305
  #, fuzzy, perl-brace-format
  msgid "{reference} in @cite{{book}}"
  msgstr "veja @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3309
  #, fuzzy, perl-brace-format
  msgid "@cite{{book_reference}}"
  msgstr "veja @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3313
  #, fuzzy, perl-brace-format
  msgid "`{section}' in @cite{{book}}"
  msgstr "se@,{c}@~ao `{section}' em @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3320
  #, fuzzy, perl-brace-format
  msgid "{reference}"
  msgstr "veja {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3323
  #, fuzzy, perl-brace-format
  msgid "`{section}'"
  msgstr "Se@,{c}@~ao acima"
  
! #: tp/Texinfo/Convert/HTML.pm:3436
  msgid "Jump to"
  msgstr "Pular para"
  
! #: tp/Texinfo/Convert/HTML.pm:3444
  msgid "Index Entry"
  msgstr "Entrada de @'Indice"
  
! #: tp/Texinfo/Convert/HTML.pm:3446
  msgid "Section"
  msgstr "Se@,{c}@~ao"
  
! #: tp/Texinfo/Convert/HTML.pm:4065
  #, perl-brace-format
  msgid "{category}: @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4070
  #, perl-brace-format
  msgid "{category}: @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4087
  #, fuzzy, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
***************
*** 733,772 ****
  "{category} na {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4066
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4075
  #, fuzzy, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} na {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4078
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4086
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} da {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4092
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}}"
  msgstr "{category} da {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4101
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} na {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4107
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}}"
  msgstr "{category} na {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4122
  #, fuzzy, perl-brace-format
  msgid ""
--- 733,772 ----
  "{category} na {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4091
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4100
  #, fuzzy, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} na {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4103
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4111
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} da {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4117
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}}"
  msgstr "{category} da {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4126
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} na {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4132
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}}"
  msgstr "{category} na {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4147
  #, fuzzy, perl-brace-format
  msgid ""
***************
*** 775,779 ****
  "{category} na {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4126
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
--- 775,779 ----
  "{category} na {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4151
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
***************
*** 781,795 ****
  "{category} na {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4137
  #, 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:4141
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} na {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4155
  #, fuzzy, perl-brace-format
  msgid ""
--- 781,795 ----
  "{category} na {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4162
  #, 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:4166
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} na {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4180
  #, fuzzy, perl-brace-format
  msgid ""
***************
*** 798,802 ****
  "{category} da {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4159
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
--- 798,802 ----
  "{category} da {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4184
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
***************
*** 804,818 ****
  "{category} da {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4170
  #, 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:4174
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} da {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:6101
  #, fuzzy, perl-brace-format
  msgid ""
--- 804,818 ----
  "{category} da {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4195
  #, 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:4199
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} da {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:6170
  #, fuzzy, perl-brace-format
  msgid ""
***************
*** 823,827 ****
  "@i{{program}}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6106
  #, fuzzy
  msgid "This document was generated on @emph{@today{}}."
--- 823,827 ----
  "@i{{program}}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6175
  #, fuzzy
  msgid "This document was generated on @emph{@today{}}."
***************
*** 829,843 ****
  "Esse documento foi gerado usando @uref{{program_homepage}, @emph{{program}}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6145
  #, perl-brace-format
  msgid "{title}: {element_text}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6289
  #, 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:6358
  msgid "  The buttons in the navigation panels have the following meaning:"
  msgstr ""
--- 829,843 ----
  "Esse documento foi gerado usando @uref{{program_homepage}, @emph{{program}}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6214
  #, perl-brace-format
  msgid "{title}: {element_text}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6358
  #, 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:6427
  msgid "  The buttons in the navigation panels have the following meaning:"
  msgstr ""
***************
*** 845,865 ****
  "significados:"
  
! #: tp/Texinfo/Convert/HTML.pm:6364
  msgid "Button"
  msgstr "Bot@~ao"
  
! #: tp/Texinfo/Convert/HTML.pm:6365
  msgid "Name"
  msgstr "Nome"
  
! #: tp/Texinfo/Convert/HTML.pm:6366
  msgid "Go to"
  msgstr "V@'a para"
  
! #: tp/Texinfo/Convert/HTML.pm:6367
  msgid "From 1.2.3 go to"
  msgstr "De 1.2.3 v@'a para"
  
! #: tp/Texinfo/Convert/HTML.pm:6393
  msgid ""
  "  where the @strong{ Example } assumes that the current position is at "
--- 845,865 ----
  "significados:"
  
! #: tp/Texinfo/Convert/HTML.pm:6433
  msgid "Button"
  msgstr "Bot@~ao"
  
! #: tp/Texinfo/Convert/HTML.pm:6434
  msgid "Name"
  msgstr "Nome"
  
! #: tp/Texinfo/Convert/HTML.pm:6435
  msgid "Go to"
  msgstr "V@'a para"
  
! #: tp/Texinfo/Convert/HTML.pm:6436
  msgid "From 1.2.3 go to"
  msgstr "De 1.2.3 v@'a para"
  
! #: tp/Texinfo/Convert/HTML.pm:6462
  msgid ""
  "  where the @strong{ Example } assumes that the current position is at "
***************
*** 871,915 ****
  "estrutura:"
  
! #: tp/Texinfo/Convert/HTML.pm:6403
  msgid "Section One"
  msgstr "Se@,{c}@~ao Um"
  
! #: tp/Texinfo/Convert/HTML.pm:6405
  msgid "Subsection One-One"
  msgstr "Subse@,{c}@~ao Um-Um"
  
! #: tp/Texinfo/Convert/HTML.pm:6412
  msgid "Subsection One-Two"
  msgstr "Subse@,{c}@~ao Um-Dois"
  
! #: tp/Texinfo/Convert/HTML.pm:6414
  msgid "Subsubsection One-Two-One"
  msgstr "Subse@,{c}@~ao Um-Dois-Um"
  
! #: tp/Texinfo/Convert/HTML.pm:6415
  msgid "Subsubsection One-Two-Two"
  msgstr "Subse@,{c}@~ao Um-Dois-Dois"
  
! #: tp/Texinfo/Convert/HTML.pm:6416
  msgid "Subsubsection One-Two-Three"
  msgstr "Subse@,{c}@~ao Um-Dois-Tr@^es"
  
! #: tp/Texinfo/Convert/HTML.pm:6418
  msgid "Current Position"
  msgstr "Posi@,{c}@~ao Atual"
  
! #: tp/Texinfo/Convert/HTML.pm:6419
  msgid "Subsubsection One-Two-Four"
  msgstr "Subse@,{c}@~ao Um-Dois-Quatro"
  
! #: tp/Texinfo/Convert/HTML.pm:6422
  msgid "Subsection One-Three"
  msgstr "Subse@,{c}@~ao Um-Tr@^es"
  
! #: tp/Texinfo/Convert/HTML.pm:6429
  msgid "Subsection One-Four"
  msgstr "Subse@,{c}@~ao Um-Quatro"
  
! #: tp/Texinfo/Convert/HTML.pm:6833
  msgid "Untitled Document"
  msgstr "Documento Sem Nome"
--- 871,915 ----
  "estrutura:"
  
! #: tp/Texinfo/Convert/HTML.pm:6472
  msgid "Section One"
  msgstr "Se@,{c}@~ao Um"
  
! #: tp/Texinfo/Convert/HTML.pm:6474
  msgid "Subsection One-One"
  msgstr "Subse@,{c}@~ao Um-Um"
  
! #: tp/Texinfo/Convert/HTML.pm:6481
  msgid "Subsection One-Two"
  msgstr "Subse@,{c}@~ao Um-Dois"
  
! #: tp/Texinfo/Convert/HTML.pm:6483
  msgid "Subsubsection One-Two-One"
  msgstr "Subse@,{c}@~ao Um-Dois-Um"
  
! #: tp/Texinfo/Convert/HTML.pm:6484
  msgid "Subsubsection One-Two-Two"
  msgstr "Subse@,{c}@~ao Um-Dois-Dois"
  
! #: tp/Texinfo/Convert/HTML.pm:6485
  msgid "Subsubsection One-Two-Three"
  msgstr "Subse@,{c}@~ao Um-Dois-Tr@^es"
  
! #: tp/Texinfo/Convert/HTML.pm:6487
  msgid "Current Position"
  msgstr "Posi@,{c}@~ao Atual"
  
! #: tp/Texinfo/Convert/HTML.pm:6488
  msgid "Subsubsection One-Two-Four"
  msgstr "Subse@,{c}@~ao Um-Dois-Quatro"
  
! #: tp/Texinfo/Convert/HTML.pm:6491
  msgid "Subsection One-Three"
  msgstr "Subse@,{c}@~ao Um-Tr@^es"
  
! #: tp/Texinfo/Convert/HTML.pm:6498
  msgid "Subsection One-Four"
  msgstr "Subse@,{c}@~ao Um-Quatro"
  
! #: tp/Texinfo/Convert/HTML.pm:6906
  msgid "Untitled Document"
  msgstr "Documento Sem Nome"
Binary files texinfo-6.1/po_document/pt_BR.gmo and texinfo-6.3/po_document/pt_BR.gmo differ
diff -Nrc2 texinfo-6.1/po_document/pt_BR.po texinfo-6.3/po_document/pt_BR.po
*** texinfo-6.1/po_document/pt_BR.po	1970-01-01 01:00:00.000000000 +0100
--- texinfo-6.3/po_document/pt_BR.po	2016-09-10 12:46:01.000000000 +0100
***************
*** 0 ****
--- 1,912 ----
+ # Brazilian translations of resulting document strings.
+ # Copyright (C) 2005 Free Software Foundation, Inc.
+ # This file is distributed under the same license as the texinfo package.
+ # Jorge Barros de Abreu <ficmatin10@gmail.com>, 2015.
+ # Updated in Dec 23 2015 by Jorge Barros de Abreu
+ #
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: texinfo_document 6.0.90\n"
+ "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
+ "POT-Creation-Date: 2016-09-10 12:46+0100\n"
+ "PO-Revision-Date: 2015-12-24 06:00-0200\n"
+ "Last-Translator: Jorge Barros de Abreu <ficmatin10@gmail.com>\n"
+ "Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
+ "net>\n"
+ "Language: pt_BR\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=us-ascii\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ "X-Bugs: Report translation errors to the Language-Team address.\n"
+ "X-Generator: Poedit 1.6.10\n"
+ 
+ #: tp/Texinfo/Common.pm:697 tp/Texinfo/Common.pm:702
+ msgid "Function"
+ msgstr "Fun@,{c}@~ao"
+ 
+ #: tp/Texinfo/Common.pm:698
+ msgid "Macro"
+ msgstr "Macro"
+ 
+ #: tp/Texinfo/Common.pm:699
+ msgid "Special Form"
+ msgstr "Forma Especial"
+ 
+ #: tp/Texinfo/Common.pm:700 tp/Texinfo/Common.pm:703
+ msgid "Variable"
+ msgstr "Vari@'{a}vel"
+ 
+ #: tp/Texinfo/Common.pm:701
+ msgid "User Option"
+ msgstr "Op@,{c}@~ao de Usu@'ario"
+ 
+ #: tp/Texinfo/Common.pm:704 tp/Texinfo/Common.pm:705
+ msgid "Instance Variable"
+ msgstr "Vari@'{a}vel de inst@^{a}ncia"
+ 
+ #: tp/Texinfo/Common.pm:706 tp/Texinfo/Common.pm:707
+ msgid "Method"
+ msgstr "M@'{e}todo"
+ 
+ #: tp/Texinfo/Common.pm:1186
+ #, perl-brace-format
+ msgid "{category} on {class}"
+ msgstr "{category} na {class}"
+ 
+ #: tp/Texinfo/Common.pm:1193
+ #, perl-brace-format
+ msgid "{category} of {class}"
+ msgstr "{category} da {class}"
+ 
+ #: tp/Texinfo/Common.pm:1210
+ #, perl-brace-format
+ msgid "{month} {day}, {year}"
+ msgstr "{day} de {month} de {year}"
+ 
+ #: tp/Texinfo/Common.pm:1241 tp/Texinfo/Convert/Plaintext.pm:1133
+ #: tp/Texinfo/Convert/HTML.pm:516
+ #, perl-brace-format
+ msgid "Appendix {number} {section_title}"
+ msgstr "Ap@^{e}ndice {number} {section_title}"
+ 
+ #: tp/Texinfo/Common.pm:1245 tp/Texinfo/Convert/Plaintext.pm:1138
+ #: tp/Texinfo/Convert/HTML.pm:522
+ #, perl-brace-format
+ msgid "{number} {section_title}"
+ msgstr "{number} {section_title}"
+ 
+ #: tp/Texinfo/Common.pm:1499
+ #, perl-brace-format
+ msgid "{float_type} {float_number}: "
+ msgstr "{float_type} {float_number}: "
+ 
+ #: tp/Texinfo/Common.pm:1503
+ #, perl-brace-format
+ msgid "{float_type}: "
+ msgstr "{float_type}: "
+ 
+ #: tp/Texinfo/Common.pm:1508
+ #, perl-brace-format
+ msgid "{float_type} {float_number}\n"
+ msgstr "{float_type} {float_number}\n"
+ 
+ #: tp/Texinfo/Common.pm:1512
+ #, perl-brace-format
+ msgid "{float_type}\n"
+ msgstr "{float_type}\n"
+ 
+ #: tp/Texinfo/Common.pm:1518
+ #, perl-brace-format
+ msgid "{float_number}: "
+ msgstr "{float_number}: "
+ 
+ #: tp/Texinfo/Common.pm:1521
+ #, perl-brace-format
+ msgid "{float_number}\n"
+ msgstr "{float_number}\n"
+ 
+ #: tp/Texinfo/Parser.pm:2816
+ #, perl-brace-format
+ msgid "{name} on {class}"
+ msgstr "{name} na {class}"
+ 
+ #: tp/Texinfo/Parser.pm:2825
+ #, perl-brace-format
+ msgid "{name} of {class}"
+ msgstr "{name} da {class}"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:110
+ msgid "error@arrow{}"
+ msgstr "error@arrow{}"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:948
+ msgid "January"
+ msgstr "Janeiro"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:949
+ msgid "February"
+ msgstr "Fevereiro"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:950
+ msgid "March"
+ msgstr "Mar@,{c}o"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:951
+ msgid "April"
+ msgstr "Abril"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:952
+ msgid "May"
+ msgstr "Maio"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:953
+ msgid "June"
+ msgstr "Junho"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:954
+ msgid "July"
+ msgstr "Julho"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:955
+ msgid "August"
+ msgstr "Agosto"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:956
+ msgid "September"
+ msgstr "Setembro"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:957
+ msgid "October"
+ msgstr "Outubro"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:958
+ msgid "November"
+ msgstr "Novembro"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:959
+ msgid "December"
+ msgstr "Dezembro"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:1010
+ #, perl-brace-format
+ msgid "{float_type} {float_number}"
+ msgstr "{float_type} {float_number}"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:1014
+ #, perl-brace-format
+ msgid "{float_type}"
+ msgstr "{float_type}"
+ 
+ #: tp/Texinfo/Convert/Converter.pm:1018
+ #, perl-brace-format
+ msgid "{float_number}"
+ msgstr "{float_number}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:826
+ #, 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:831
+ #, perl-brace-format
+ msgid "See node @samp{{mynode}}"
+ msgstr "Veja nodo @samp{{mynode}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:835
+ #, perl-brace-format
+ msgid "See Info file @file{{myfile}}"
+ msgstr "Veja arquivo Info @file{{myfile}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:875
+ #, perl-brace-format
+ msgid "section ``{section_name}'' in @cite{{book}}"
+ msgstr "se@,{c}@~ao ``{section_name}'' em @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:880
+ #, perl-brace-format
+ msgid "See section ``{section_name}'' in @cite{{book}}"
+ msgstr "Veja se@,{c}@~ao ``{section_name}'' em @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:885
+ #, perl-brace-format
+ msgid "see section ``{section_name}'' in @cite{{book}}"
+ msgstr "veja se@,{c}@~ao ``{section_name}'' em @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3317
+ #, perl-brace-format
+ msgid "@cite{{book}}"
+ msgstr "@cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3294
+ #, perl-brace-format
+ msgid "See @cite{{book}}"
+ msgstr "Veja @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3271
+ #, perl-brace-format
+ msgid "see @cite{{book}}"
+ msgstr "veja @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:915
+ #, perl-brace-format
+ msgid "{title_ref}"
+ msgstr "{title_ref}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:920
+ #, perl-brace-format
+ msgid "See {title_ref}"
+ msgstr "Veja {title_ref}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:925
+ #, perl-brace-format
+ msgid "see {title_ref}"
+ msgstr "veja {title_ref}"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2311
+ #, perl-brace-format
+ msgid "{abbr_or_acronym} ({explanation})"
+ msgstr "{abbr_or_acronym} ({explanation})"
+ 
+ #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2497
+ #: tp/Texinfo/Convert/HTML.pm:3622
+ #, perl-brace-format
+ msgid "@b{{quotation_arg}:} "
+ msgstr "@b{{quotation_arg}:} "
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:1367
+ msgid "(outside of any node)"
+ msgstr "(fora de qualquer nodo)"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2004
+ #, perl-brace-format
+ msgid "{name} @url{{email}}"
+ msgstr "{name} @url{{email}}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2007
+ #, perl-brace-format
+ msgid "@url{{email}}"
+ msgstr "@url{{email}}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2029
+ #, perl-brace-format
+ msgid "{text} ({url})"
+ msgstr "{text} ({url})"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2034
+ #, perl-brace-format
+ msgid "@t{<{url}>}"
+ msgstr "@t{<{url}>}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2422 tp/Texinfo/Convert/HTML.pm:1437
+ #, perl-brace-format
+ msgid "@{No value for `{value}'@}"
+ msgstr "@{Nenhum valor para `{value}'@}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2913
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}: {name} {arguments}"
+ msgstr "@tie{ }-- {category}: {name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2918
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}: {name}"
+ msgstr "@tie{ }-- {category}: {name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2931
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
+ msgstr "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2934
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}: {type} {name} {arguments}"
+ msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2943
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}:@*{type}@*{name}"
+ msgstr "@tie{ }-- {category}:@*{type}@*{name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2946
+ #, perl-brace-format
+ msgid "@tie{ }-- {category}: {type} {name}"
+ msgstr "@tie{ }-- {category}: {type} {name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2954
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
+ msgstr "@tie{ }-- {category} da {class}: {name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2960
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}: {name}"
+ msgstr "@tie{ }-- {category} da {class}: {name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2969
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
+ msgstr "@tie{ }-- {category} na {class}: {name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2975
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}: {name}"
+ msgstr "@tie{ }-- {category} na {class}: {name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2990
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
+ msgstr "@tie{ }-- {category} em {class}:@*{type}@*{name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:2994
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
+ msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3005
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
+ msgstr "@tie{ }-- {category} em {class}:@*{type}@*{name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3009
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} on {class}: {type} {name}"
+ msgstr "@tie{ }-- {category} na {class}: {type} {name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3023
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
+ msgstr "@tie{ }-- {category} da {class}:@*{type}@*{name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3027
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
+ msgstr "@tie{ }-- {category} da {class}: {type} {name} {arguments}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3038
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
+ msgstr "@tie{ }-- {category} de {class}:@*{type}@*{name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3042
+ #, perl-brace-format
+ msgid "@tie{ }-- {category} of {class}: {type} {name}"
+ msgstr "@tie{ }-- {category} da {class}: {type} {name}"
+ 
+ #: tp/Texinfo/Convert/Plaintext.pm:3371 tp/Texinfo/Convert/HTML.pm:2877
+ #, perl-brace-format
+ msgid "@center --- @emph{{author}}\n"
+ msgstr "@center --- @emph{{author}}\n"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
+ msgid "Top"
+ msgstr "Topo"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
+ msgid "Contents"
+ msgstr "Conte@'udo"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:791
+ msgid "Overview"
+ msgstr "Vis@~ao geral"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:736 tp/Texinfo/Convert/HTML.pm:767
+ #: tp/Texinfo/Convert/HTML.pm:792
+ msgid "Index"
+ msgstr "@'Indice"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:738
+ msgid "current"
+ msgstr "atual"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
+ msgid "Prev"
+ msgstr "Pr@'evio"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:742
+ msgid " Up "
+ msgstr " Acima "
+ 
+ #: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:747
+ #: tp/Texinfo/Convert/HTML.pm:799
+ msgid "Next"
+ msgstr "Pr@'oximo"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:745 tp/Texinfo/Convert/HTML.pm:798
+ msgid "Up"
+ msgstr "Acima"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:749
+ msgid "Previous"
+ msgstr "Anterior"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:750
+ #, fuzzy
+ msgid "Forward node"
+ msgstr "Avan@,{c}ar"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:751
+ msgid "Back node"
+ msgstr "Voltar"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:757
+ msgid "Next file"
+ msgstr "Arquivo seguinte"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:758
+ msgid "Previous file"
+ msgstr "Arquivo anterior"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:764
+ msgid "Cover (top) of document"
+ msgstr "In@'icio (topo) do documento"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:765
+ msgid "Table of contents"
+ msgstr "Sum@'ario"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:766
+ msgid "Short table of contents"
+ msgstr "Breve sum@'ario"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:768
+ msgid "Current section"
+ msgstr "Se@,{c}@~ao atual"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:769
+ msgid "Previous section in reading order"
+ msgstr "Se@,{c}@~ao anterior na ordem de leitura"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:770
+ msgid "Beginning of this chapter or previous chapter"
+ msgstr "Come@,{c}o desse cap@'itulo ou cap@'itulo anterior"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:771
+ msgid "Previous section on same level"
+ msgstr "Se@,{c}@~ao anterior no mesmo n@'ivel"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:772
+ msgid "Up section"
+ msgstr "Se@,{c}@~ao acima"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:773
+ msgid "Next section on same level"
+ msgstr "Pr@'oxima se@,{c}@~ao no mesmo n@'ivel"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:774
+ msgid "Up node"
+ msgstr "Nodo acima"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:775
+ msgid "Next node"
+ msgstr "Pr@'oximo nodo"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:776
+ msgid "Previous node"
+ msgstr "Nodo anterior"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:777
+ #, fuzzy
+ msgid "Next node in node reading order"
+ msgstr "Pr@'oxima se@,{c}@~ao na ordem de leitura"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:778
+ #, fuzzy
+ msgid "Previous node in node reading order"
+ msgstr "Se@,{c}@~ao anterior na ordem de leitura"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:779
+ msgid "Next section in reading order"
+ msgstr "Pr@'oxima se@,{c}@~ao na ordem de leitura"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:780
+ msgid "Next chapter"
+ msgstr "Pr@'oximo cap@'itulo"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:781
+ msgid "About (help)"
+ msgstr "Sobre (ajuda)"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:782
+ msgid "First section in reading order"
+ msgstr "Primeira se@,{c}@~ao na ordem de leitura"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:783
+ msgid "Last section in reading order"
+ msgstr "@'Ultima se@,{c}@~ao na ordem de leitura"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:784
+ msgid "Forward section in next file"
+ msgstr "Avan@,{c}a se@,{c}@~ao no arquivo seguinte"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:785
+ msgid "Back section in previous file"
+ msgstr "Volta se@,{c}@~ao no arquivo anterior"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:794
+ msgid "This"
+ msgstr "Esse"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:795
+ msgid "Back"
+ msgstr "Volta"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:796
+ msgid "FastBack"
+ msgstr "Voltar R@'apido"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:800
+ msgid "NodeUp"
+ msgstr "Nodo Acima"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:801
+ msgid "NodeNext"
+ msgstr "Pr@'oximo Nodo"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:802
+ msgid "NodePrev"
+ msgstr "Nodo Anterior"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:803
+ #, fuzzy
+ msgid "NodeForward"
+ msgstr "Avan@,{c}ar"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:804
+ msgid "NodeBack"
+ msgstr "Voltar"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:805
+ msgid "Forward"
+ msgstr "Avan@,{c}ar"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:806
+ msgid "FastForward"
+ msgstr "Avan@,{c}ar R@'apido"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:807
+ msgid "About"
+ msgstr "Sobre"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:808
+ msgid "First"
+ msgstr "Primeiro"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:809
+ msgid "Last"
+ msgstr "@'Ultimo"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:810
+ msgid "NextFile"
+ msgstr "ProximoArquivo"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:811
+ msgid "PrevFile"
+ msgstr "ArquivoAnterior"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:815
+ msgid "About This Document"
+ msgstr "Sobre Esse Documento"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:816
+ msgid "Table of Contents"
+ msgstr "Sum@'ario"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:817
+ msgid "Short Table of Contents"
+ msgstr "Breve Sum@'ario"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:818
+ msgid "Footnotes"
+ msgstr "Notas de Rodap@'e"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:1534
+ #, perl-brace-format
+ msgid "{explained_string} ({explanation})"
+ msgstr "{explained_string} ({explanation})"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3182
+ #, perl-brace-format
+ msgid "see section {reference_name}"
+ msgstr "veja se@,{c}@~ao {reference_name}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3185
+ #, perl-brace-format
+ msgid "see {reference_name}"
+ msgstr "veja {reference_name}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3190
+ #, perl-brace-format
+ msgid "See section {reference_name}"
+ msgstr "Veja se@,{c}@~ao {reference_name}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3193
+ #, perl-brace-format
+ msgid "See {reference_name}"
+ msgstr "Veja {reference_name}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3197
+ #, perl-brace-format
+ msgid "{reference_name}"
+ msgstr "{reference_name}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3259
+ #, perl-brace-format
+ msgid "see {reference} in @cite{{book}}"
+ msgstr "veja {reference} em @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3263
+ #, perl-brace-format
+ msgid "see @cite{{book_reference}}"
+ msgstr "veja @cite{{book_reference}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3267
+ #, perl-brace-format
+ msgid "see `{section}' in @cite{{book}}"
+ msgstr "veja `{section}' em @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3274
+ #, perl-brace-format
+ msgid "see {reference}"
+ msgstr "veja {reference}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3277
+ #, perl-brace-format
+ msgid "see `{section}'"
+ msgstr "veja `{section}'"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3282
+ #, perl-brace-format
+ msgid "See {reference} in @cite{{book}}"
+ msgstr "Veja {reference} em @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3286
+ #, perl-brace-format
+ msgid "See @cite{{book_reference}}"
+ msgstr "Veja @cite{{book_reference}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3290
+ #, perl-brace-format
+ msgid "See `{section}' in @cite{{book}}"
+ msgstr "Veja `{section}' em @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3297
+ #, perl-brace-format
+ msgid "See {reference}"
+ msgstr "Veja {reference}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3300
+ #, perl-brace-format
+ msgid "See `{section}'"
+ msgstr "Veja `{section}'"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3305
+ #, perl-brace-format
+ msgid "{reference} in @cite{{book}}"
+ msgstr "{reference} em @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3309
+ #, perl-brace-format
+ msgid "@cite{{book_reference}}"
+ msgstr "@cite{{book_reference}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3313
+ #, perl-brace-format
+ msgid "`{section}' in @cite{{book}}"
+ msgstr "`{section}' em @cite{{book}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3320
+ #, perl-brace-format
+ msgid "{reference}"
+ msgstr "{reference}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3323
+ #, perl-brace-format
+ msgid "`{section}'"
+ msgstr "`{section}'"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3436
+ msgid "Jump to"
+ msgstr "Pular para"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3444
+ msgid "Index Entry"
+ msgstr "Entrada de @'Indice"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:3446
+ msgid "Section"
+ msgstr "Se@,{c}@~ao"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4065
+ #, perl-brace-format
+ msgid "{category}: @strong{{name}} @emph{{arguments}}"
+ msgstr "{category}: @strong{{name}} @emph{{arguments}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4070
+ #, perl-brace-format
+ msgid "{category}: @strong{{name}}"
+ msgstr "{category}: @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4087
+ #, perl-brace-format
+ msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+ msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4091
+ #, perl-brace-format
+ msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+ msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4100
+ #, perl-brace-format
+ msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
+ msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4103
+ #, perl-brace-format
+ msgid "{category}: @emph{{type}} @strong{{name}}"
+ msgstr "{category}: @emph{{type}} @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4111
+ #, perl-brace-format
+ msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
+ msgstr "{category} de {class}: @strong{{name}} @emph{{arguments}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4117
+ #, perl-brace-format
+ msgid "{category} of {class}: @strong{{name}}"
+ msgstr "{category} de {class}: @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4126
+ #, perl-brace-format
+ msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
+ msgstr "{category} em {class}: @strong{{name}} @emph{{arguments}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4132
+ #, perl-brace-format
+ msgid "{category} on {class}: @strong{{name}}"
+ msgstr "{category} em {class}: @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4147
+ #, 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:4151
+ #, 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:4162
+ #, perl-brace-format
+ msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
+ msgstr "{category} em {class}:@* @emph{{type}}@* @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4166
+ #, perl-brace-format
+ msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
+ msgstr "{category} em {class}: @emph{{type}} @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4180
+ #, 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:4184
+ #, 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:4195
+ #, perl-brace-format
+ msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
+ msgstr "{category} da {class}:@* @emph{{type}}@* @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:4199
+ #, perl-brace-format
+ msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
+ msgstr "{category} da {class}: @emph{{type}} @strong{{name}}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6170
+ #, perl-brace-format
+ msgid ""
+ "This document was generated on @emph{@today{}} using "
+ "@uref{{program_homepage}, @emph{{program}}}."
+ msgstr ""
+ "Esse documento foi gerado em @emph{@today{}} usando "
+ "@uref{{program_homepage}, @emph{{program}}}."
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6175
+ msgid "This document was generated on @emph{@today{}}."
+ msgstr "Esse documento foi gerado em @emph{@today{}}."
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6214
+ #, perl-brace-format
+ msgid "{title}: {element_text}"
+ msgstr "{title}: {element_text}"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6358
+ #, 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:6427
+ 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:6433
+ msgid "Button"
+ msgstr "Bot@~ao"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6434
+ msgid "Name"
+ msgstr "Nome"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6435
+ msgid "Go to"
+ msgstr "V@'a para"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6436
+ msgid "From 1.2.3 go to"
+ msgstr "De 1.2.3 v@'a para"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6462
+ 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 ""
+ "  onde o @strong{ Exemplo } assume que a posi@,{c}@~ao atual localiza-se em "
+ "@strong{ Subsub@,{c}@~ao Um-Dois-Tr@^es } de um documento com a seguinte "
+ "estrutura:"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6472
+ msgid "Section One"
+ msgstr "Se@,{c}@~ao Um"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6474
+ msgid "Subsection One-One"
+ msgstr "Subse@,{c}@~ao Um-Um"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6481
+ msgid "Subsection One-Two"
+ msgstr "Subse@,{c}@~ao Um-Dois"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6483
+ msgid "Subsubsection One-Two-One"
+ msgstr "Subse@,{c}@~ao Um-Dois-Um"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6484
+ msgid "Subsubsection One-Two-Two"
+ msgstr "Subse@,{c}@~ao Um-Dois-Dois"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6485
+ msgid "Subsubsection One-Two-Three"
+ msgstr "Subse@,{c}@~ao Um-Dois-Tr@^es"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6487
+ msgid "Current Position"
+ msgstr "Posi@,{c}@~ao Atual"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6488
+ msgid "Subsubsection One-Two-Four"
+ msgstr "Subse@,{c}@~ao Um-Dois-Quatro"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6491
+ msgid "Subsection One-Three"
+ msgstr "Subse@,{c}@~ao Um-Tr@^es"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6498
+ msgid "Subsection One-Four"
+ msgstr "Subse@,{c}@~ao Um-Quatro"
+ 
+ #: tp/Texinfo/Convert/HTML.pm:6906
+ msgid "Untitled Document"
+ msgstr "Documento Sem Nome"
Binary files texinfo-6.1/po_document/pt_BR.us-ascii.gmo and texinfo-6.3/po_document/pt_BR.us-ascii.gmo differ
diff -Nrc2 texinfo-6.1/po_document/pt_BR.us-ascii.po texinfo-6.3/po_document/pt_BR.us-ascii.po
*** texinfo-6.1/po_document/pt_BR.us-ascii.po	2016-02-06 11:35:59.000000000 +0000
--- texinfo-6.3/po_document/pt_BR.us-ascii.po	2016-09-10 12:46:01.000000000 +0100
***************
*** 9,13 ****
  "Project-Id-Version: texinfo_document 5.9.93\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
  "PO-Revision-Date: 2015-06-07 06:25-0300\n"
  "Last-Translator: Jorge Barros de Abreu <ficmatin10@gmail.com>\n"
--- 9,13 ----
  "Project-Id-Version: texinfo_document 5.9.93\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:46+0100\n"
  "PO-Revision-Date: 2015-06-07 06:25-0300\n"
  "Last-Translator: Jorge Barros de Abreu <ficmatin10@gmail.com>\n"
***************
*** 19,115 ****
  "Content-Transfer-Encoding: 8bit\n"
  
! #: tp/Texinfo/Common.pm:717 tp/Texinfo/Common.pm:722
  #, fuzzy
  msgid "Function"
  msgstr "Se@,{c}@~ao"
  
! #: tp/Texinfo/Common.pm:718
  msgid "Macro"
  msgstr "Macro"
  
! #: tp/Texinfo/Common.pm:719
  msgid "Special Form"
  msgstr "Forma Especial"
  
! #: tp/Texinfo/Common.pm:720 tp/Texinfo/Common.pm:723
  msgid "Variable"
  msgstr "Vari@'{a}vel"
  
! #: tp/Texinfo/Common.pm:721
  #, fuzzy
  msgid "User Option"
  msgstr "Se@,{c}@~ao acima"
  
! #: tp/Texinfo/Common.pm:724 tp/Texinfo/Common.pm:725
  msgid "Instance Variable"
  msgstr "Vari@'{a}vel de inst@^{a}ncia"
  
! #: tp/Texinfo/Common.pm:726 tp/Texinfo/Common.pm:727
  msgid "Method"
  msgstr "M@'{e}todo"
  
! #: tp/Texinfo/Common.pm:1199
  #, fuzzy, perl-brace-format
  msgid "{category} on {class}"
  msgstr "{name} na {class}"
  
! #: tp/Texinfo/Common.pm:1206
  #, fuzzy, perl-brace-format
  msgid "{category} of {class}"
  msgstr "{name} da {class}"
  
! #: tp/Texinfo/Common.pm:1223
  #, perl-brace-format
  msgid "{month} {day}, {year}"
  msgstr "{day} de {month} de {year}"
  
! #: tp/Texinfo/Common.pm:1254 tp/Texinfo/Convert/Plaintext.pm:1132
! #: tp/Texinfo/Convert/HTML.pm:515
  #, perl-brace-format
  msgid "Appendix {number} {section_title}"
  msgstr "Ap@^{e}ndice {number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1258 tp/Texinfo/Convert/Plaintext.pm:1137
! #: tp/Texinfo/Convert/HTML.pm:521
  #, fuzzy, perl-brace-format
  msgid "{number} {section_title}"
  msgstr "Ap@^{e}ndice {number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1393
  #, fuzzy, perl-brace-format
  msgid "{float_type} {float_number}: "
  msgstr "{float_number}: "
  
! #: tp/Texinfo/Common.pm:1397
  #, perl-brace-format
  msgid "{float_type}: "
  msgstr "{float_type}: "
  
! #: tp/Texinfo/Common.pm:1402
  #, fuzzy, perl-brace-format
  msgid "{float_type} {float_number}\n"
  msgstr "{float_number}\n"
  
! #: tp/Texinfo/Common.pm:1406
  #, perl-brace-format
  msgid "{float_type}\n"
  msgstr "{float_type}\n"
  
! #: tp/Texinfo/Common.pm:1412
  #, perl-brace-format
  msgid "{float_number}: "
  msgstr "{float_number}: "
  
! #: tp/Texinfo/Common.pm:1415
  #, perl-brace-format
  msgid "{float_number}\n"
  msgstr "{float_number}\n"
  
! #: tp/Texinfo/Parser.pm:2982
  #, perl-brace-format
  msgid "{name} on {class}"
  msgstr "{name} na {class}"
  
! #: tp/Texinfo/Parser.pm:2991
  #, perl-brace-format
  msgid "{name} of {class}"
--- 19,115 ----
  "Content-Transfer-Encoding: 8bit\n"
  
! #: tp/Texinfo/Common.pm:697 tp/Texinfo/Common.pm:702
  #, fuzzy
  msgid "Function"
  msgstr "Se@,{c}@~ao"
  
! #: tp/Texinfo/Common.pm:698
  msgid "Macro"
  msgstr "Macro"
  
! #: tp/Texinfo/Common.pm:699
  msgid "Special Form"
  msgstr "Forma Especial"
  
! #: tp/Texinfo/Common.pm:700 tp/Texinfo/Common.pm:703
  msgid "Variable"
  msgstr "Vari@'{a}vel"
  
! #: tp/Texinfo/Common.pm:701
  #, fuzzy
  msgid "User Option"
  msgstr "Se@,{c}@~ao acima"
  
! #: tp/Texinfo/Common.pm:704 tp/Texinfo/Common.pm:705
  msgid "Instance Variable"
  msgstr "Vari@'{a}vel de inst@^{a}ncia"
  
! #: tp/Texinfo/Common.pm:706 tp/Texinfo/Common.pm:707
  msgid "Method"
  msgstr "M@'{e}todo"
  
! #: tp/Texinfo/Common.pm:1186
  #, fuzzy, perl-brace-format
  msgid "{category} on {class}"
  msgstr "{name} na {class}"
  
! #: tp/Texinfo/Common.pm:1193
  #, fuzzy, perl-brace-format
  msgid "{category} of {class}"
  msgstr "{name} da {class}"
  
! #: tp/Texinfo/Common.pm:1210
  #, perl-brace-format
  msgid "{month} {day}, {year}"
  msgstr "{day} de {month} de {year}"
  
! #: tp/Texinfo/Common.pm:1241 tp/Texinfo/Convert/Plaintext.pm:1133
! #: tp/Texinfo/Convert/HTML.pm:516
  #, perl-brace-format
  msgid "Appendix {number} {section_title}"
  msgstr "Ap@^{e}ndice {number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1245 tp/Texinfo/Convert/Plaintext.pm:1138
! #: tp/Texinfo/Convert/HTML.pm:522
  #, fuzzy, perl-brace-format
  msgid "{number} {section_title}"
  msgstr "Ap@^{e}ndice {number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1499
  #, fuzzy, perl-brace-format
  msgid "{float_type} {float_number}: "
  msgstr "{float_number}: "
  
! #: tp/Texinfo/Common.pm:1503
  #, perl-brace-format
  msgid "{float_type}: "
  msgstr "{float_type}: "
  
! #: tp/Texinfo/Common.pm:1508
  #, fuzzy, perl-brace-format
  msgid "{float_type} {float_number}\n"
  msgstr "{float_number}\n"
  
! #: tp/Texinfo/Common.pm:1512
  #, perl-brace-format
  msgid "{float_type}\n"
  msgstr "{float_type}\n"
  
! #: tp/Texinfo/Common.pm:1518
  #, perl-brace-format
  msgid "{float_number}: "
  msgstr "{float_number}: "
  
! #: tp/Texinfo/Common.pm:1521
  #, perl-brace-format
  msgid "{float_number}\n"
  msgstr "{float_number}\n"
  
! #: tp/Texinfo/Parser.pm:2816
  #, perl-brace-format
  msgid "{name} on {class}"
  msgstr "{name} na {class}"
  
! #: tp/Texinfo/Parser.pm:2825
  #, perl-brace-format
  msgid "{name} of {class}"
***************
*** 120,182 ****
  msgstr "error@arrow{}"
  
! #: tp/Texinfo/Convert/Converter.pm:956
  msgid "January"
  msgstr "Janeiro"
  
! #: tp/Texinfo/Convert/Converter.pm:957
  msgid "February"
  msgstr "Fevereiro"
  
! #: tp/Texinfo/Convert/Converter.pm:958
  msgid "March"
  msgstr "Mar@,{c}o"
  
! #: tp/Texinfo/Convert/Converter.pm:959
  msgid "April"
  msgstr "Abril"
  
! #: tp/Texinfo/Convert/Converter.pm:960
  msgid "May"
  msgstr "Maio"
  
! #: tp/Texinfo/Convert/Converter.pm:961
  msgid "June"
  msgstr "Junho"
  
! #: tp/Texinfo/Convert/Converter.pm:962
  msgid "July"
  msgstr "Julho"
  
! #: tp/Texinfo/Convert/Converter.pm:963
  msgid "August"
  msgstr "Agosto"
  
! #: tp/Texinfo/Convert/Converter.pm:964
  msgid "September"
  msgstr "Setembro"
  
! #: tp/Texinfo/Convert/Converter.pm:965
  msgid "October"
  msgstr "Outubro"
  
! #: tp/Texinfo/Convert/Converter.pm:966
  msgid "November"
  msgstr "Novembro"
  
! #: tp/Texinfo/Convert/Converter.pm:967
  msgid "December"
  msgstr "Dezembro"
  
! #: tp/Texinfo/Convert/Converter.pm:1018
  #, fuzzy, perl-brace-format
  msgid "{float_type} {float_number}"
  msgstr "{float_number}\n"
  
! #: tp/Texinfo/Convert/Converter.pm:1022
  #, perl-brace-format
  msgid "{float_type}"
  msgstr "{float_type}"
  
! #: tp/Texinfo/Convert/Converter.pm:1026
  #, fuzzy, perl-brace-format
  msgid "{float_number}"
--- 120,182 ----
  msgstr "error@arrow{}"
  
! #: tp/Texinfo/Convert/Converter.pm:948
  msgid "January"
  msgstr "Janeiro"
  
! #: tp/Texinfo/Convert/Converter.pm:949
  msgid "February"
  msgstr "Fevereiro"
  
! #: tp/Texinfo/Convert/Converter.pm:950
  msgid "March"
  msgstr "Mar@,{c}o"
  
! #: tp/Texinfo/Convert/Converter.pm:951
  msgid "April"
  msgstr "Abril"
  
! #: tp/Texinfo/Convert/Converter.pm:952
  msgid "May"
  msgstr "Maio"
  
! #: tp/Texinfo/Convert/Converter.pm:953
  msgid "June"
  msgstr "Junho"
  
! #: tp/Texinfo/Convert/Converter.pm:954
  msgid "July"
  msgstr "Julho"
  
! #: tp/Texinfo/Convert/Converter.pm:955
  msgid "August"
  msgstr "Agosto"
  
! #: tp/Texinfo/Convert/Converter.pm:956
  msgid "September"
  msgstr "Setembro"
  
! #: tp/Texinfo/Convert/Converter.pm:957
  msgid "October"
  msgstr "Outubro"
  
! #: tp/Texinfo/Convert/Converter.pm:958
  msgid "November"
  msgstr "Novembro"
  
! #: tp/Texinfo/Convert/Converter.pm:959
  msgid "December"
  msgstr "Dezembro"
  
! #: tp/Texinfo/Convert/Converter.pm:1010
  #, fuzzy, perl-brace-format
  msgid "{float_type} {float_number}"
  msgstr "{float_number}\n"
  
! #: tp/Texinfo/Convert/Converter.pm:1014
  #, perl-brace-format
  msgid "{float_type}"
  msgstr "{float_type}"
  
! #: tp/Texinfo/Convert/Converter.pm:1018
  #, fuzzy, perl-brace-format
  msgid "{float_number}"
***************
*** 213,227 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3291
  #, perl-brace-format
  msgid "@cite{{book}}"
  msgstr "@cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3268
  #, perl-brace-format
  msgid "See @cite{{book}}"
  msgstr "Veja @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3245
  #, perl-brace-format
  msgid "see @cite{{book}}"
--- 213,227 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3317
  #, perl-brace-format
  msgid "@cite{{book}}"
  msgstr "@cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3294
  #, perl-brace-format
  msgid "See @cite{{book}}"
  msgstr "Veja @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3271
  #, perl-brace-format
  msgid "see @cite{{book}}"
***************
*** 243,773 ****
  msgstr "veja {title_ref}"
  
! #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2310
  #, perl-brace-format
  msgid "{abbr_or_acronym} ({explanation})"
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2496
! #: tp/Texinfo/Convert/HTML.pm:3597
  #, perl-brace-format
  msgid "@b{{quotation_arg}:} "
  msgstr "@b{{quotation_arg}:} "
  
! #: tp/Texinfo/Convert/Plaintext.pm:1366
  msgid "(outside of any node)"
  msgstr "(fora de qualquer nodo)"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2003
  #, perl-brace-format
  msgid "{name} @url{{email}}"
  msgstr "{name} @url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2006
  #, perl-brace-format
  msgid "@url{{email}}"
  msgstr "@url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2028
  #, perl-brace-format
  msgid "{text} ({url})"
  msgstr "{text} ({url})"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2033
  #, perl-brace-format
  msgid "@t{<{url}>}"
  msgstr "@t{<{url}>}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2421 tp/Texinfo/Convert/HTML.pm:1438
  #, perl-brace-format
  msgid "@{No value for `{value}'@}"
  msgstr "@{Nenhum valor para `{value}'@}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2945
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name} {arguments}"
  msgstr "@tie{ }-- {category}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2950
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name}"
  msgstr "@tie{ }-- {category}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2963
  #, fuzzy, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2966
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2975
  #, fuzzy, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2978
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name}"
  msgstr "@tie{ }-- {category}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2986
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} da {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2992
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name}"
  msgstr "@tie{ }-- {category} da {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3001
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} na {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3007
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name}"
  msgstr "@tie{ }-- {category} na {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3022
  #, fuzzy, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3026
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3037
  #, fuzzy, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} na {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3041
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name}"
  msgstr "@tie{ }-- {category} na {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3055
  #, fuzzy, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} da {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3059
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} da {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3070
  #, fuzzy, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} da {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3074
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name}"
  msgstr "@tie{ }-- {category} da {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3403 tp/Texinfo/Convert/HTML.pm:2851
  #, perl-brace-format
  msgid "@center --- @emph{{author}}\n"
  msgstr "@center --- @emph{{author}}\n"
  
! #: tp/Texinfo/Convert/HTML.pm:732 tp/Texinfo/Convert/HTML.pm:788
  msgid "Top"
  msgstr "Topo"
  
! #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
  msgid "Contents"
  msgstr "Conte@'udo"
  
! #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
  msgid "Overview"
  msgstr "Vis@~ao geral"
  
! #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:766
! #: tp/Texinfo/Convert/HTML.pm:791
  msgid "Index"
  msgstr "@'Indice"
  
! #: tp/Texinfo/Convert/HTML.pm:737
  msgid "current"
  msgstr "atual"
  
! #: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
  msgid "Prev"
  msgstr "Pr@'evio"
  
! #: tp/Texinfo/Convert/HTML.pm:741
  msgid " Up "
  msgstr " Acima "
  
! #: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:746
! #: tp/Texinfo/Convert/HTML.pm:798
  msgid "Next"
  msgstr "Pr@'oximo"
  
! #: tp/Texinfo/Convert/HTML.pm:744 tp/Texinfo/Convert/HTML.pm:797
  msgid "Up"
  msgstr "Acima"
  
! #: tp/Texinfo/Convert/HTML.pm:748
  msgid "Previous"
  msgstr "Anterior"
  
! #: tp/Texinfo/Convert/HTML.pm:749
  #, fuzzy
  msgid "Forward node"
  msgstr "Avan@,{c}ar"
  
! #: tp/Texinfo/Convert/HTML.pm:750
  #, fuzzy
  msgid "Back node"
  msgstr "Nodo acima"
  
! #: tp/Texinfo/Convert/HTML.pm:756
  msgid "Next file"
  msgstr "Arquivo seguinte"
  
! #: tp/Texinfo/Convert/HTML.pm:757
  msgid "Previous file"
  msgstr "Arquivo anterior"
  
! #: tp/Texinfo/Convert/HTML.pm:763
  msgid "Cover (top) of document"
  msgstr "In@'icio (topo) do documento"
  
! #: tp/Texinfo/Convert/HTML.pm:764
  msgid "Table of contents"
  msgstr "Sum@'ario"
  
! #: tp/Texinfo/Convert/HTML.pm:765
  msgid "Short table of contents"
  msgstr "Breve sum@'ario"
  
! #: tp/Texinfo/Convert/HTML.pm:767
  msgid "Current section"
  msgstr "Se@,{c}@~ao atual"
  
! #: tp/Texinfo/Convert/HTML.pm:768
  msgid "Previous section in reading order"
  msgstr "Se@,{c}@~ao anterior na ordem de leitura"
  
! #: tp/Texinfo/Convert/HTML.pm:769
  msgid "Beginning of this chapter or previous chapter"
  msgstr "Come@,{c}o desse cap@'itulo ou cap@'itulo anterior"
  
! #: tp/Texinfo/Convert/HTML.pm:770
  msgid "Previous section on same level"
  msgstr "Se@,{c}@~ao anterior no mesmo n@'ivel"
  
! #: tp/Texinfo/Convert/HTML.pm:771
  msgid "Up section"
  msgstr "Se@,{c}@~ao acima"
  
! #: tp/Texinfo/Convert/HTML.pm:772
  msgid "Next section on same level"
  msgstr "Pr@'oxima se@,{c}@~ao no mesmo n@'ivel"
  
! #: tp/Texinfo/Convert/HTML.pm:773
  msgid "Up node"
  msgstr "Nodo acima"
  
! #: tp/Texinfo/Convert/HTML.pm:774
  msgid "Next node"
  msgstr "Pr@'oximo nodo"
  
! #: tp/Texinfo/Convert/HTML.pm:775
  msgid "Previous node"
  msgstr "Nodo anterior"
  
! #: tp/Texinfo/Convert/HTML.pm:776
  #, fuzzy
  msgid "Next node in node reading order"
  msgstr "Pr@'oxima se@,{c}@~ao na ordem de leitura"
  
! #: tp/Texinfo/Convert/HTML.pm:777
  #, fuzzy
  msgid "Previous node in node reading order"
  msgstr "Se@,{c}@~ao anterior na ordem de leitura"
  
! #: tp/Texinfo/Convert/HTML.pm:778
  msgid "Next section in reading order"
  msgstr "Pr@'oxima se@,{c}@~ao na ordem de leitura"
  
! #: tp/Texinfo/Convert/HTML.pm:779
  msgid "Next chapter"
  msgstr "Pr@'oximo cap@'itulo"
  
! #: tp/Texinfo/Convert/HTML.pm:780
  msgid "About (help)"
  msgstr "Sobre (ajuda)"
  
! #: tp/Texinfo/Convert/HTML.pm:781
  msgid "First section in reading order"
  msgstr "Primeira se@,{c}@~ao na ordem de leitura"
  
! #: tp/Texinfo/Convert/HTML.pm:782
  msgid "Last section in reading order"
  msgstr "@'Ultima se@,{c}@~ao na ordem de leitura"
  
! #: tp/Texinfo/Convert/HTML.pm:783
  msgid "Forward section in next file"
  msgstr "Avan@,{c}a se@,{c}@~ao no arquivo seguinte"
  
! #: tp/Texinfo/Convert/HTML.pm:784
  msgid "Back section in previous file"
  msgstr "Volta se@,{c}@~ao no arquivo anterior"
  
! #: tp/Texinfo/Convert/HTML.pm:793
  msgid "This"
  msgstr "Esse"
  
! #: tp/Texinfo/Convert/HTML.pm:794
  msgid "Back"
  msgstr "Volta"
  
! #: tp/Texinfo/Convert/HTML.pm:795
  msgid "FastBack"
  msgstr "Voltar R@'apido"
  
! #: tp/Texinfo/Convert/HTML.pm:799
  msgid "NodeUp"
  msgstr "Nodo Acima"
  
! #: tp/Texinfo/Convert/HTML.pm:800
  msgid "NodeNext"
  msgstr "Pr@'oximo Nodo"
  
! #: tp/Texinfo/Convert/HTML.pm:801
  msgid "NodePrev"
  msgstr "Nodo Anterior"
  
! #: tp/Texinfo/Convert/HTML.pm:802
  #, fuzzy
  msgid "NodeForward"
  msgstr "Avan@,{c}ar"
  
! #: tp/Texinfo/Convert/HTML.pm:803
  #, fuzzy
  msgid "NodeBack"
  msgstr "Volta"
  
! #: tp/Texinfo/Convert/HTML.pm:804
  msgid "Forward"
  msgstr "Avan@,{c}ar"
  
! #: tp/Texinfo/Convert/HTML.pm:805
  msgid "FastForward"
  msgstr "Avan@,{c}ar R@'apido"
  
! #: tp/Texinfo/Convert/HTML.pm:806
  msgid "About"
  msgstr "Sobre"
  
! #: tp/Texinfo/Convert/HTML.pm:807
  msgid "First"
  msgstr "Primeiro"
  
! #: tp/Texinfo/Convert/HTML.pm:808
  msgid "Last"
  msgstr "@'Ultimo"
  
! #: tp/Texinfo/Convert/HTML.pm:809
  msgid "NextFile"
  msgstr "ProximoArquivo"
  
! #: tp/Texinfo/Convert/HTML.pm:810
  msgid "PrevFile"
  msgstr "ArquivoAnterior"
  
! #: tp/Texinfo/Convert/HTML.pm:814
  msgid "About This Document"
  msgstr "Sobre Esse Documento"
  
! #: tp/Texinfo/Convert/HTML.pm:815
  msgid "Table of Contents"
  msgstr "Sum@'ario"
  
! #: tp/Texinfo/Convert/HTML.pm:816
  msgid "Short Table of Contents"
  msgstr "Breve Sum@'ario"
  
! #: tp/Texinfo/Convert/HTML.pm:817
  msgid "Footnotes"
  msgstr "Notas de Rodap@'e"
  
! #: tp/Texinfo/Convert/HTML.pm:1504
  #, perl-brace-format
  msgid "{explained_string} ({explanation})"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3156
  #, perl-brace-format
  msgid "see section {reference_name}"
  msgstr "veja se@,{c}@~ao {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3159
  #, perl-brace-format
  msgid "see {reference_name}"
  msgstr "veja {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3164
  #, perl-brace-format
  msgid "See section {reference_name}"
  msgstr "Veja se@,{c}@~ao {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3167
  #, perl-brace-format
  msgid "See {reference_name}"
  msgstr "Veja {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3171
  #, perl-brace-format
  msgid "{reference_name}"
  msgstr "{reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3233
  #, fuzzy, perl-brace-format
  msgid "see {reference} in @cite{{book}}"
  msgstr "veja @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3237
  #, fuzzy, perl-brace-format
  msgid "see @cite{{book_reference}}"
  msgstr "veja @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3241
  #, fuzzy, perl-brace-format
  msgid "see `{section}' in @cite{{book}}"
  msgstr "veja @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3248
  #, fuzzy, perl-brace-format
  msgid "see {reference}"
  msgstr "veja {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3251
  #, fuzzy, perl-brace-format
  msgid "see `{section}'"
  msgstr "Se@,{c}@~ao acima"
  
! #: tp/Texinfo/Convert/HTML.pm:3256
  #, fuzzy, perl-brace-format
  msgid "See {reference} in @cite{{book}}"
  msgstr "Veja @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3260
  #, fuzzy, perl-brace-format
  msgid "See @cite{{book_reference}}"
  msgstr "Veja @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3264
  #, fuzzy, perl-brace-format
  msgid "See `{section}' in @cite{{book}}"
  msgstr "Veja @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3271
  #, fuzzy, perl-brace-format
  msgid "See {reference}"
  msgstr "Veja {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3274
  #, fuzzy, perl-brace-format
  msgid "See `{section}'"
  msgstr "Se@,{c}@~ao acima"
  
! #: tp/Texinfo/Convert/HTML.pm:3279
  #, fuzzy, perl-brace-format
  msgid "{reference} in @cite{{book}}"
  msgstr "Veja @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3283
  #, fuzzy, perl-brace-format
  msgid "@cite{{book_reference}}"
  msgstr "@cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3287
  #, fuzzy, perl-brace-format
  msgid "`{section}' in @cite{{book}}"
  msgstr "veja @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3294
  #, fuzzy, perl-brace-format
  msgid "{reference}"
  msgstr "{reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3297
  #, fuzzy, perl-brace-format
  msgid "`{section}'"
  msgstr "Se@,{c}@~ao acima"
  
! #: tp/Texinfo/Convert/HTML.pm:3410
  msgid "Jump to"
  msgstr "Pular para"
  
! #: tp/Texinfo/Convert/HTML.pm:3418
  msgid "Index Entry"
  msgstr "Entrada de @'Indice"
  
! #: tp/Texinfo/Convert/HTML.pm:3420
  msgid "Section"
  msgstr "Se@,{c}@~ao"
  
! #: tp/Texinfo/Convert/HTML.pm:4040
  #, fuzzy, perl-brace-format
  msgid "{category}: @strong{{name}} @emph{{arguments}}"
  msgstr "@tie{ }-- {category}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/HTML.pm:4045
  #, fuzzy, perl-brace-format
  msgid "{category}: @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4062
  #, fuzzy, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4066
  #, fuzzy, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4075
  #, fuzzy, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4078
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4086
  #, fuzzy, perl-brace-format
  msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "@tie{ }-- {category} da {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/HTML.pm:4092
  #, fuzzy, perl-brace-format
  msgid "{category} of {class}: @strong{{name}}"
  msgstr "@tie{ }-- {category} da {class}: {name}"
  
! #: tp/Texinfo/Convert/HTML.pm:4101
  #, fuzzy, perl-brace-format
  msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "@tie{ }-- {category} na {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/HTML.pm:4107
  #, fuzzy, perl-brace-format
  msgid "{category} on {class}: @strong{{name}}"
  msgstr "@tie{ }-- {category} na {class}: {name}"
  
! #: tp/Texinfo/Convert/HTML.pm:4122
  #, fuzzy, perl-brace-format
  msgid ""
--- 243,773 ----
  msgstr "veja {title_ref}"
  
! #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2311
  #, perl-brace-format
  msgid "{abbr_or_acronym} ({explanation})"
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2497
! #: tp/Texinfo/Convert/HTML.pm:3622
  #, perl-brace-format
  msgid "@b{{quotation_arg}:} "
  msgstr "@b{{quotation_arg}:} "
  
! #: tp/Texinfo/Convert/Plaintext.pm:1367
  msgid "(outside of any node)"
  msgstr "(fora de qualquer nodo)"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2004
  #, perl-brace-format
  msgid "{name} @url{{email}}"
  msgstr "{name} @url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2007
  #, perl-brace-format
  msgid "@url{{email}}"
  msgstr "@url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2029
  #, perl-brace-format
  msgid "{text} ({url})"
  msgstr "{text} ({url})"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2034
  #, perl-brace-format
  msgid "@t{<{url}>}"
  msgstr "@t{<{url}>}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2422 tp/Texinfo/Convert/HTML.pm:1437
  #, perl-brace-format
  msgid "@{No value for `{value}'@}"
  msgstr "@{Nenhum valor para `{value}'@}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2913
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name} {arguments}"
  msgstr "@tie{ }-- {category}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2918
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name}"
  msgstr "@tie{ }-- {category}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2931
  #, fuzzy, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2934
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2943
  #, fuzzy, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2946
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name}"
  msgstr "@tie{ }-- {category}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2954
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} da {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2960
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name}"
  msgstr "@tie{ }-- {category} da {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2969
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} na {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2975
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name}"
  msgstr "@tie{ }-- {category} na {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2990
  #, fuzzy, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2994
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3005
  #, fuzzy, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} na {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3009
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name}"
  msgstr "@tie{ }-- {category} na {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3023
  #, fuzzy, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} da {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3027
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} da {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3038
  #, fuzzy, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} da {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3042
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name}"
  msgstr "@tie{ }-- {category} da {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3371 tp/Texinfo/Convert/HTML.pm:2877
  #, perl-brace-format
  msgid "@center --- @emph{{author}}\n"
  msgstr "@center --- @emph{{author}}\n"
  
! #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
  msgid "Top"
  msgstr "Topo"
  
! #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
  msgid "Contents"
  msgstr "Conte@'udo"
  
! #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:791
  msgid "Overview"
  msgstr "Vis@~ao geral"
  
! #: tp/Texinfo/Convert/HTML.pm:736 tp/Texinfo/Convert/HTML.pm:767
! #: tp/Texinfo/Convert/HTML.pm:792
  msgid "Index"
  msgstr "@'Indice"
  
! #: tp/Texinfo/Convert/HTML.pm:738
  msgid "current"
  msgstr "atual"
  
! #: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
  msgid "Prev"
  msgstr "Pr@'evio"
  
! #: tp/Texinfo/Convert/HTML.pm:742
  msgid " Up "
  msgstr " Acima "
  
! #: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:747
! #: tp/Texinfo/Convert/HTML.pm:799
  msgid "Next"
  msgstr "Pr@'oximo"
  
! #: tp/Texinfo/Convert/HTML.pm:745 tp/Texinfo/Convert/HTML.pm:798
  msgid "Up"
  msgstr "Acima"
  
! #: tp/Texinfo/Convert/HTML.pm:749
  msgid "Previous"
  msgstr "Anterior"
  
! #: tp/Texinfo/Convert/HTML.pm:750
  #, fuzzy
  msgid "Forward node"
  msgstr "Avan@,{c}ar"
  
! #: tp/Texinfo/Convert/HTML.pm:751
  #, fuzzy
  msgid "Back node"
  msgstr "Nodo acima"
  
! #: tp/Texinfo/Convert/HTML.pm:757
  msgid "Next file"
  msgstr "Arquivo seguinte"
  
! #: tp/Texinfo/Convert/HTML.pm:758
  msgid "Previous file"
  msgstr "Arquivo anterior"
  
! #: tp/Texinfo/Convert/HTML.pm:764
  msgid "Cover (top) of document"
  msgstr "In@'icio (topo) do documento"
  
! #: tp/Texinfo/Convert/HTML.pm:765
  msgid "Table of contents"
  msgstr "Sum@'ario"
  
! #: tp/Texinfo/Convert/HTML.pm:766
  msgid "Short table of contents"
  msgstr "Breve sum@'ario"
  
! #: tp/Texinfo/Convert/HTML.pm:768
  msgid "Current section"
  msgstr "Se@,{c}@~ao atual"
  
! #: tp/Texinfo/Convert/HTML.pm:769
  msgid "Previous section in reading order"
  msgstr "Se@,{c}@~ao anterior na ordem de leitura"
  
! #: tp/Texinfo/Convert/HTML.pm:770
  msgid "Beginning of this chapter or previous chapter"
  msgstr "Come@,{c}o desse cap@'itulo ou cap@'itulo anterior"
  
! #: tp/Texinfo/Convert/HTML.pm:771
  msgid "Previous section on same level"
  msgstr "Se@,{c}@~ao anterior no mesmo n@'ivel"
  
! #: tp/Texinfo/Convert/HTML.pm:772
  msgid "Up section"
  msgstr "Se@,{c}@~ao acima"
  
! #: tp/Texinfo/Convert/HTML.pm:773
  msgid "Next section on same level"
  msgstr "Pr@'oxima se@,{c}@~ao no mesmo n@'ivel"
  
! #: tp/Texinfo/Convert/HTML.pm:774
  msgid "Up node"
  msgstr "Nodo acima"
  
! #: tp/Texinfo/Convert/HTML.pm:775
  msgid "Next node"
  msgstr "Pr@'oximo nodo"
  
! #: tp/Texinfo/Convert/HTML.pm:776
  msgid "Previous node"
  msgstr "Nodo anterior"
  
! #: tp/Texinfo/Convert/HTML.pm:777
  #, fuzzy
  msgid "Next node in node reading order"
  msgstr "Pr@'oxima se@,{c}@~ao na ordem de leitura"
  
! #: tp/Texinfo/Convert/HTML.pm:778
  #, fuzzy
  msgid "Previous node in node reading order"
  msgstr "Se@,{c}@~ao anterior na ordem de leitura"
  
! #: tp/Texinfo/Convert/HTML.pm:779
  msgid "Next section in reading order"
  msgstr "Pr@'oxima se@,{c}@~ao na ordem de leitura"
  
! #: tp/Texinfo/Convert/HTML.pm:780
  msgid "Next chapter"
  msgstr "Pr@'oximo cap@'itulo"
  
! #: tp/Texinfo/Convert/HTML.pm:781
  msgid "About (help)"
  msgstr "Sobre (ajuda)"
  
! #: tp/Texinfo/Convert/HTML.pm:782
  msgid "First section in reading order"
  msgstr "Primeira se@,{c}@~ao na ordem de leitura"
  
! #: tp/Texinfo/Convert/HTML.pm:783
  msgid "Last section in reading order"
  msgstr "@'Ultima se@,{c}@~ao na ordem de leitura"
  
! #: tp/Texinfo/Convert/HTML.pm:784
  msgid "Forward section in next file"
  msgstr "Avan@,{c}a se@,{c}@~ao no arquivo seguinte"
  
! #: tp/Texinfo/Convert/HTML.pm:785
  msgid "Back section in previous file"
  msgstr "Volta se@,{c}@~ao no arquivo anterior"
  
! #: tp/Texinfo/Convert/HTML.pm:794
  msgid "This"
  msgstr "Esse"
  
! #: tp/Texinfo/Convert/HTML.pm:795
  msgid "Back"
  msgstr "Volta"
  
! #: tp/Texinfo/Convert/HTML.pm:796
  msgid "FastBack"
  msgstr "Voltar R@'apido"
  
! #: tp/Texinfo/Convert/HTML.pm:800
  msgid "NodeUp"
  msgstr "Nodo Acima"
  
! #: tp/Texinfo/Convert/HTML.pm:801
  msgid "NodeNext"
  msgstr "Pr@'oximo Nodo"
  
! #: tp/Texinfo/Convert/HTML.pm:802
  msgid "NodePrev"
  msgstr "Nodo Anterior"
  
! #: tp/Texinfo/Convert/HTML.pm:803
  #, fuzzy
  msgid "NodeForward"
  msgstr "Avan@,{c}ar"
  
! #: tp/Texinfo/Convert/HTML.pm:804
  #, fuzzy
  msgid "NodeBack"
  msgstr "Volta"
  
! #: tp/Texinfo/Convert/HTML.pm:805
  msgid "Forward"
  msgstr "Avan@,{c}ar"
  
! #: tp/Texinfo/Convert/HTML.pm:806
  msgid "FastForward"
  msgstr "Avan@,{c}ar R@'apido"
  
! #: tp/Texinfo/Convert/HTML.pm:807
  msgid "About"
  msgstr "Sobre"
  
! #: tp/Texinfo/Convert/HTML.pm:808
  msgid "First"
  msgstr "Primeiro"
  
! #: tp/Texinfo/Convert/HTML.pm:809
  msgid "Last"
  msgstr "@'Ultimo"
  
! #: tp/Texinfo/Convert/HTML.pm:810
  msgid "NextFile"
  msgstr "ProximoArquivo"
  
! #: tp/Texinfo/Convert/HTML.pm:811
  msgid "PrevFile"
  msgstr "ArquivoAnterior"
  
! #: tp/Texinfo/Convert/HTML.pm:815
  msgid "About This Document"
  msgstr "Sobre Esse Documento"
  
! #: tp/Texinfo/Convert/HTML.pm:816
  msgid "Table of Contents"
  msgstr "Sum@'ario"
  
! #: tp/Texinfo/Convert/HTML.pm:817
  msgid "Short Table of Contents"
  msgstr "Breve Sum@'ario"
  
! #: tp/Texinfo/Convert/HTML.pm:818
  msgid "Footnotes"
  msgstr "Notas de Rodap@'e"
  
! #: tp/Texinfo/Convert/HTML.pm:1534
  #, perl-brace-format
  msgid "{explained_string} ({explanation})"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3182
  #, perl-brace-format
  msgid "see section {reference_name}"
  msgstr "veja se@,{c}@~ao {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3185
  #, perl-brace-format
  msgid "see {reference_name}"
  msgstr "veja {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3190
  #, perl-brace-format
  msgid "See section {reference_name}"
  msgstr "Veja se@,{c}@~ao {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3193
  #, perl-brace-format
  msgid "See {reference_name}"
  msgstr "Veja {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3197
  #, perl-brace-format
  msgid "{reference_name}"
  msgstr "{reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3259
  #, fuzzy, perl-brace-format
  msgid "see {reference} in @cite{{book}}"
  msgstr "veja @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3263
  #, fuzzy, perl-brace-format
  msgid "see @cite{{book_reference}}"
  msgstr "veja @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3267
  #, fuzzy, perl-brace-format
  msgid "see `{section}' in @cite{{book}}"
  msgstr "veja @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3274
  #, fuzzy, perl-brace-format
  msgid "see {reference}"
  msgstr "veja {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3277
  #, fuzzy, perl-brace-format
  msgid "see `{section}'"
  msgstr "Se@,{c}@~ao acima"
  
! #: tp/Texinfo/Convert/HTML.pm:3282
  #, fuzzy, perl-brace-format
  msgid "See {reference} in @cite{{book}}"
  msgstr "Veja @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3286
  #, fuzzy, perl-brace-format
  msgid "See @cite{{book_reference}}"
  msgstr "Veja @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3290
  #, fuzzy, perl-brace-format
  msgid "See `{section}' in @cite{{book}}"
  msgstr "Veja @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3297
  #, fuzzy, perl-brace-format
  msgid "See {reference}"
  msgstr "Veja {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3300
  #, fuzzy, perl-brace-format
  msgid "See `{section}'"
  msgstr "Se@,{c}@~ao acima"
  
! #: tp/Texinfo/Convert/HTML.pm:3305
  #, fuzzy, perl-brace-format
  msgid "{reference} in @cite{{book}}"
  msgstr "Veja @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3309
  #, fuzzy, perl-brace-format
  msgid "@cite{{book_reference}}"
  msgstr "@cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3313
  #, fuzzy, perl-brace-format
  msgid "`{section}' in @cite{{book}}"
  msgstr "veja @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3320
  #, fuzzy, perl-brace-format
  msgid "{reference}"
  msgstr "{reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3323
  #, fuzzy, perl-brace-format
  msgid "`{section}'"
  msgstr "Se@,{c}@~ao acima"
  
! #: tp/Texinfo/Convert/HTML.pm:3436
  msgid "Jump to"
  msgstr "Pular para"
  
! #: tp/Texinfo/Convert/HTML.pm:3444
  msgid "Index Entry"
  msgstr "Entrada de @'Indice"
  
! #: tp/Texinfo/Convert/HTML.pm:3446
  msgid "Section"
  msgstr "Se@,{c}@~ao"
  
! #: tp/Texinfo/Convert/HTML.pm:4065
  #, fuzzy, perl-brace-format
  msgid "{category}: @strong{{name}} @emph{{arguments}}"
  msgstr "@tie{ }-- {category}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/HTML.pm:4070
  #, fuzzy, perl-brace-format
  msgid "{category}: @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4087
  #, fuzzy, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4091
  #, fuzzy, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4100
  #, fuzzy, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4103
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4111
  #, fuzzy, perl-brace-format
  msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "@tie{ }-- {category} da {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/HTML.pm:4117
  #, fuzzy, perl-brace-format
  msgid "{category} of {class}: @strong{{name}}"
  msgstr "@tie{ }-- {category} da {class}: {name}"
  
! #: tp/Texinfo/Convert/HTML.pm:4126
  #, fuzzy, perl-brace-format
  msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "@tie{ }-- {category} na {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/HTML.pm:4132
  #, fuzzy, perl-brace-format
  msgid "{category} on {class}: @strong{{name}}"
  msgstr "@tie{ }-- {category} na {class}: {name}"
  
! #: tp/Texinfo/Convert/HTML.pm:4147
  #, fuzzy, perl-brace-format
  msgid ""
***************
*** 775,794 ****
  msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/HTML.pm:4126
  #, 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:4137
  #, fuzzy, perl-brace-format
  msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4141
  #, fuzzy, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4155
  #, fuzzy, perl-brace-format
  msgid ""
--- 775,794 ----
  msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/HTML.pm:4151
  #, 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:4162
  #, fuzzy, perl-brace-format
  msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4166
  #, fuzzy, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4180
  #, fuzzy, perl-brace-format
  msgid ""
***************
*** 796,815 ****
  msgstr "@tie{ }-- {category} da {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/HTML.pm:4159
  #, 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:4170
  #, fuzzy, perl-brace-format
  msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4174
  #, fuzzy, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:6101
  #, perl-brace-format
  msgid ""
--- 796,815 ----
  msgstr "@tie{ }-- {category} da {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/HTML.pm:4184
  #, 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:4195
  #, fuzzy, perl-brace-format
  msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4199
  #, fuzzy, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:6170
  #, perl-brace-format
  msgid ""
***************
*** 818,836 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6106
  msgid "This document was generated on @emph{@today{}}."
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6145
  #, perl-brace-format
  msgid "{title}: {element_text}"
  msgstr "{title}: {element_text}"
  
! #: tp/Texinfo/Convert/HTML.pm:6289
  #, 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:6358
  msgid "  The buttons in the navigation panels have the following meaning:"
  msgstr ""
--- 818,836 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6175
  msgid "This document was generated on @emph{@today{}}."
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6214
  #, perl-brace-format
  msgid "{title}: {element_text}"
  msgstr "{title}: {element_text}"
  
! #: tp/Texinfo/Convert/HTML.pm:6358
  #, 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:6427
  msgid "  The buttons in the navigation panels have the following meaning:"
  msgstr ""
***************
*** 838,858 ****
  "significados:"
  
! #: tp/Texinfo/Convert/HTML.pm:6364
  msgid "Button"
  msgstr "Bot@~ao"
  
! #: tp/Texinfo/Convert/HTML.pm:6365
  msgid "Name"
  msgstr "Nome"
  
! #: tp/Texinfo/Convert/HTML.pm:6366
  msgid "Go to"
  msgstr "V@'a para"
  
! #: tp/Texinfo/Convert/HTML.pm:6367
  msgid "From 1.2.3 go to"
  msgstr "De 1.2.3 v@'a para"
  
! #: tp/Texinfo/Convert/HTML.pm:6393
  msgid ""
  "  where the @strong{ Example } assumes that the current position is at "
--- 838,858 ----
  "significados:"
  
! #: tp/Texinfo/Convert/HTML.pm:6433
  msgid "Button"
  msgstr "Bot@~ao"
  
! #: tp/Texinfo/Convert/HTML.pm:6434
  msgid "Name"
  msgstr "Nome"
  
! #: tp/Texinfo/Convert/HTML.pm:6435
  msgid "Go to"
  msgstr "V@'a para"
  
! #: tp/Texinfo/Convert/HTML.pm:6436
  msgid "From 1.2.3 go to"
  msgstr "De 1.2.3 v@'a para"
  
! #: tp/Texinfo/Convert/HTML.pm:6462
  msgid ""
  "  where the @strong{ Example } assumes that the current position is at "
***************
*** 864,908 ****
  "estrutura:"
  
! #: tp/Texinfo/Convert/HTML.pm:6403
  msgid "Section One"
  msgstr "Se@,{c}@~ao Um"
  
! #: tp/Texinfo/Convert/HTML.pm:6405
  msgid "Subsection One-One"
  msgstr "Subse@,{c}@~ao Um-Um"
  
! #: tp/Texinfo/Convert/HTML.pm:6412
  msgid "Subsection One-Two"
  msgstr "Subse@,{c}@~ao Um-Dois"
  
! #: tp/Texinfo/Convert/HTML.pm:6414
  msgid "Subsubsection One-Two-One"
  msgstr "Subse@,{c}@~ao Um-Dois-Um"
  
! #: tp/Texinfo/Convert/HTML.pm:6415
  msgid "Subsubsection One-Two-Two"
  msgstr "Subse@,{c}@~ao Um-Dois-Dois"
  
! #: tp/Texinfo/Convert/HTML.pm:6416
  msgid "Subsubsection One-Two-Three"
  msgstr "Subse@,{c}@~ao Um-Dois-Tr@^es"
  
! #: tp/Texinfo/Convert/HTML.pm:6418
  msgid "Current Position"
  msgstr "Posi@,{c}@~ao Atual"
  
! #: tp/Texinfo/Convert/HTML.pm:6419
  msgid "Subsubsection One-Two-Four"
  msgstr "Subse@,{c}@~ao Um-Dois-Quatro"
  
! #: tp/Texinfo/Convert/HTML.pm:6422
  msgid "Subsection One-Three"
  msgstr "Subse@,{c}@~ao Um-Tr@^es"
  
! #: tp/Texinfo/Convert/HTML.pm:6429
  msgid "Subsection One-Four"
  msgstr "Subse@,{c}@~ao Um-Quatro"
  
! #: tp/Texinfo/Convert/HTML.pm:6833
  msgid "Untitled Document"
  msgstr "Documento Sem Nome"
--- 864,908 ----
  "estrutura:"
  
! #: tp/Texinfo/Convert/HTML.pm:6472
  msgid "Section One"
  msgstr "Se@,{c}@~ao Um"
  
! #: tp/Texinfo/Convert/HTML.pm:6474
  msgid "Subsection One-One"
  msgstr "Subse@,{c}@~ao Um-Um"
  
! #: tp/Texinfo/Convert/HTML.pm:6481
  msgid "Subsection One-Two"
  msgstr "Subse@,{c}@~ao Um-Dois"
  
! #: tp/Texinfo/Convert/HTML.pm:6483
  msgid "Subsubsection One-Two-One"
  msgstr "Subse@,{c}@~ao Um-Dois-Um"
  
! #: tp/Texinfo/Convert/HTML.pm:6484
  msgid "Subsubsection One-Two-Two"
  msgstr "Subse@,{c}@~ao Um-Dois-Dois"
  
! #: tp/Texinfo/Convert/HTML.pm:6485
  msgid "Subsubsection One-Two-Three"
  msgstr "Subse@,{c}@~ao Um-Dois-Tr@^es"
  
! #: tp/Texinfo/Convert/HTML.pm:6487
  msgid "Current Position"
  msgstr "Posi@,{c}@~ao Atual"
  
! #: tp/Texinfo/Convert/HTML.pm:6488
  msgid "Subsubsection One-Two-Four"
  msgstr "Subse@,{c}@~ao Um-Dois-Quatro"
  
! #: tp/Texinfo/Convert/HTML.pm:6491
  msgid "Subsection One-Three"
  msgstr "Subse@,{c}@~ao Um-Tr@^es"
  
! #: tp/Texinfo/Convert/HTML.pm:6498
  msgid "Subsection One-Four"
  msgstr "Subse@,{c}@~ao Um-Quatro"
  
! #: tp/Texinfo/Convert/HTML.pm:6906
  msgid "Untitled Document"
  msgstr "Documento Sem Nome"
diff -Nrc2 texinfo-6.1/po_document/texinfo_document.pot texinfo-6.3/po_document/texinfo_document.pot
*** texinfo-6.1/po_document/texinfo_document.pot	2016-02-06 11:35:58.000000000 +0000
--- texinfo-6.3/po_document/texinfo_document.pot	2016-09-10 12:46:00.000000000 +0100
***************
*** 7,13 ****
  msgid ""
  msgstr ""
! "Project-Id-Version: GNU texinfo 6.1\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--- 7,13 ----
  msgid ""
  msgstr ""
! "Project-Id-Version: GNU texinfo 6.2\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:46+0100\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
***************
*** 18,112 ****
  "Content-Transfer-Encoding: 8bit\n"
  
! #: tp/Texinfo/Common.pm:717 tp/Texinfo/Common.pm:722
  msgid "Function"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:718
  msgid "Macro"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:719
  msgid "Special Form"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:720 tp/Texinfo/Common.pm:723
  msgid "Variable"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:721
  msgid "User Option"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:724 tp/Texinfo/Common.pm:725
  msgid "Instance Variable"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:726 tp/Texinfo/Common.pm:727
  msgid "Method"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1199
  #, perl-brace-format
  msgid "{category} on {class}"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1206
  #, perl-brace-format
  msgid "{category} of {class}"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1223
  #, perl-brace-format
  msgid "{month} {day}, {year}"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1254 tp/Texinfo/Convert/Plaintext.pm:1132
! #: tp/Texinfo/Convert/HTML.pm:515
  #, perl-brace-format
  msgid "Appendix {number} {section_title}"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1258 tp/Texinfo/Convert/Plaintext.pm:1137
! #: tp/Texinfo/Convert/HTML.pm:521
  #, perl-brace-format
  msgid "{number} {section_title}"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1393
  #, perl-brace-format
  msgid "{float_type} {float_number}: "
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1397
  #, perl-brace-format
  msgid "{float_type}: "
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1402
  #, perl-brace-format
  msgid "{float_type} {float_number}\n"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1406
  #, perl-brace-format
  msgid "{float_type}\n"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1412
  #, perl-brace-format
  msgid "{float_number}: "
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1415
  #, perl-brace-format
  msgid "{float_number}\n"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2982
  #, perl-brace-format
  msgid "{name} on {class}"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2991
  #, perl-brace-format
  msgid "{name} of {class}"
--- 18,112 ----
  "Content-Transfer-Encoding: 8bit\n"
  
! #: tp/Texinfo/Common.pm:697 tp/Texinfo/Common.pm:702
  msgid "Function"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:698
  msgid "Macro"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:699
  msgid "Special Form"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:700 tp/Texinfo/Common.pm:703
  msgid "Variable"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:701
  msgid "User Option"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:704 tp/Texinfo/Common.pm:705
  msgid "Instance Variable"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:706 tp/Texinfo/Common.pm:707
  msgid "Method"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1186
  #, perl-brace-format
  msgid "{category} on {class}"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1193
  #, perl-brace-format
  msgid "{category} of {class}"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1210
  #, perl-brace-format
  msgid "{month} {day}, {year}"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1241 tp/Texinfo/Convert/Plaintext.pm:1133
! #: tp/Texinfo/Convert/HTML.pm:516
  #, perl-brace-format
  msgid "Appendix {number} {section_title}"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1245 tp/Texinfo/Convert/Plaintext.pm:1138
! #: tp/Texinfo/Convert/HTML.pm:522
  #, perl-brace-format
  msgid "{number} {section_title}"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1499
  #, perl-brace-format
  msgid "{float_type} {float_number}: "
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1503
  #, perl-brace-format
  msgid "{float_type}: "
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1508
  #, perl-brace-format
  msgid "{float_type} {float_number}\n"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1512
  #, perl-brace-format
  msgid "{float_type}\n"
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1518
  #, perl-brace-format
  msgid "{float_number}: "
  msgstr ""
  
! #: tp/Texinfo/Common.pm:1521
  #, perl-brace-format
  msgid "{float_number}\n"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2816
  #, perl-brace-format
  msgid "{name} on {class}"
  msgstr ""
  
! #: tp/Texinfo/Parser.pm:2825
  #, perl-brace-format
  msgid "{name} of {class}"
***************
*** 117,179 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:956
  msgid "January"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:957
  msgid "February"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:958
  msgid "March"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:959
  msgid "April"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:960
  msgid "May"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:961
  msgid "June"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:962
  msgid "July"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:963
  msgid "August"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:964
  msgid "September"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:965
  msgid "October"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:966
  msgid "November"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:967
  msgid "December"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:1018
  #, perl-brace-format
  msgid "{float_type} {float_number}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:1022
  #, perl-brace-format
  msgid "{float_type}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:1026
  #, perl-brace-format
  msgid "{float_number}"
--- 117,179 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:948
  msgid "January"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:949
  msgid "February"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:950
  msgid "March"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:951
  msgid "April"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:952
  msgid "May"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:953
  msgid "June"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:954
  msgid "July"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:955
  msgid "August"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:956
  msgid "September"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:957
  msgid "October"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:958
  msgid "November"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:959
  msgid "December"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:1010
  #, perl-brace-format
  msgid "{float_type} {float_number}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:1014
  #, perl-brace-format
  msgid "{float_type}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Converter.pm:1018
  #, perl-brace-format
  msgid "{float_number}"
***************
*** 210,224 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3291
  #, perl-brace-format
  msgid "@cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3268
  #, perl-brace-format
  msgid "See @cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3245
  #, perl-brace-format
  msgid "see @cite{{book}}"
--- 210,224 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3317
  #, perl-brace-format
  msgid "@cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3294
  #, perl-brace-format
  msgid "See @cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3271
  #, perl-brace-format
  msgid "see @cite{{book}}"
***************
*** 240,764 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2310
  #, perl-brace-format
  msgid "{abbr_or_acronym} ({explanation})"
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2496
! #: tp/Texinfo/Convert/HTML.pm:3597
  #, perl-brace-format
  msgid "@b{{quotation_arg}:} "
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1366
  msgid "(outside of any node)"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2003
  #, perl-brace-format
  msgid "{name} @url{{email}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2006
  #, perl-brace-format
  msgid "@url{{email}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2028
  #, perl-brace-format
  msgid "{text} ({url})"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2033
  #, perl-brace-format
  msgid "@t{<{url}>}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2421 tp/Texinfo/Convert/HTML.pm:1438
  #, perl-brace-format
  msgid "@{No value for `{value}'@}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2945
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2950
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2963
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2966
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2975
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2978
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2986
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2992
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3001
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3007
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3022
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3026
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3037
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3041
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3055
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3059
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3070
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3074
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3403 tp/Texinfo/Convert/HTML.pm:2851
  #, perl-brace-format
  msgid "@center --- @emph{{author}}\n"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:732 tp/Texinfo/Convert/HTML.pm:788
  msgid "Top"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
  msgid "Contents"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
  msgid "Overview"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:766
! #: tp/Texinfo/Convert/HTML.pm:791
  msgid "Index"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:737
  msgid "current"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
  msgid "Prev"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:741
  msgid " Up "
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:746
! #: tp/Texinfo/Convert/HTML.pm:798
  msgid "Next"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:744 tp/Texinfo/Convert/HTML.pm:797
  msgid "Up"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:748
  msgid "Previous"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:749
  msgid "Forward node"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:750
  msgid "Back node"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:756
  msgid "Next file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:757
  msgid "Previous file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:763
  msgid "Cover (top) of document"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:764
  msgid "Table of contents"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:765
  msgid "Short table of contents"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:767
  msgid "Current section"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:768
  msgid "Previous section in reading order"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:769
  msgid "Beginning of this chapter or previous chapter"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:770
  msgid "Previous section on same level"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:771
  msgid "Up section"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:772
  msgid "Next section on same level"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:773
  msgid "Up node"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:774
  msgid "Next node"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:775
  msgid "Previous node"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:776
  msgid "Next node in node reading order"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:777
  msgid "Previous node in node reading order"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:778
  msgid "Next section in reading order"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:779
  msgid "Next chapter"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:780
  msgid "About (help)"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:781
  msgid "First section in reading order"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:782
  msgid "Last section in reading order"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:783
  msgid "Forward section in next file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:784
  msgid "Back section in previous file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:793
  msgid "This"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:794
  msgid "Back"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:795
  msgid "FastBack"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:799
  msgid "NodeUp"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:800
  msgid "NodeNext"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:801
  msgid "NodePrev"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:802
  msgid "NodeForward"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:803
  msgid "NodeBack"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:804
  msgid "Forward"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:805
  msgid "FastForward"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:806
  msgid "About"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:807
  msgid "First"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:808
  msgid "Last"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:809
  msgid "NextFile"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:810
  msgid "PrevFile"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:814
  msgid "About This Document"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:815
  msgid "Table of Contents"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:816
  msgid "Short Table of Contents"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:817
  msgid "Footnotes"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:1504
  #, perl-brace-format
  msgid "{explained_string} ({explanation})"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3156
  #, perl-brace-format
  msgid "see section {reference_name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3159
  #, perl-brace-format
  msgid "see {reference_name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3164
  #, perl-brace-format
  msgid "See section {reference_name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3167
  #, perl-brace-format
  msgid "See {reference_name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3171
  #, perl-brace-format
  msgid "{reference_name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3233
  #, perl-brace-format
  msgid "see {reference} in @cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3237
  #, perl-brace-format
  msgid "see @cite{{book_reference}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3241
  #, perl-brace-format
  msgid "see `{section}' in @cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3248
  #, perl-brace-format
  msgid "see {reference}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3251
  #, perl-brace-format
  msgid "see `{section}'"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3256
  #, perl-brace-format
  msgid "See {reference} in @cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3260
  #, perl-brace-format
  msgid "See @cite{{book_reference}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3264
  #, perl-brace-format
  msgid "See `{section}' in @cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3271
  #, perl-brace-format
  msgid "See {reference}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3274
  #, perl-brace-format
  msgid "See `{section}'"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3279
  #, perl-brace-format
  msgid "{reference} in @cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3283
  #, perl-brace-format
  msgid "@cite{{book_reference}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3287
  #, perl-brace-format
  msgid "`{section}' in @cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3294
  #, perl-brace-format
  msgid "{reference}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3297
  #, perl-brace-format
  msgid "`{section}'"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3410
  msgid "Jump to"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3418
  msgid "Index Entry"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3420
  msgid "Section"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4040
  #, perl-brace-format
  msgid "{category}: @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4045
  #, perl-brace-format
  msgid "{category}: @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4062
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4066
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4075
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4078
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4086
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4092
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4101
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4107
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4122
  #, perl-brace-format
  msgid ""
--- 240,764 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2311
  #, perl-brace-format
  msgid "{abbr_or_acronym} ({explanation})"
  msgstr ""
  
! #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2497
! #: tp/Texinfo/Convert/HTML.pm:3622
  #, perl-brace-format
  msgid "@b{{quotation_arg}:} "
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:1367
  msgid "(outside of any node)"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2004
  #, perl-brace-format
  msgid "{name} @url{{email}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2007
  #, perl-brace-format
  msgid "@url{{email}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2029
  #, perl-brace-format
  msgid "{text} ({url})"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2034
  #, perl-brace-format
  msgid "@t{<{url}>}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2422 tp/Texinfo/Convert/HTML.pm:1437
  #, perl-brace-format
  msgid "@{No value for `{value}'@}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2913
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2918
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2931
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2934
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2943
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2946
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2954
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2960
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2969
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2975
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2990
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:2994
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3005
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3009
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3023
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3027
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3038
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3042
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/Plaintext.pm:3371 tp/Texinfo/Convert/HTML.pm:2877
  #, perl-brace-format
  msgid "@center --- @emph{{author}}\n"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
  msgid "Top"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
  msgid "Contents"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:791
  msgid "Overview"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:736 tp/Texinfo/Convert/HTML.pm:767
! #: tp/Texinfo/Convert/HTML.pm:792
  msgid "Index"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:738
  msgid "current"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
  msgid "Prev"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:742
  msgid " Up "
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:747
! #: tp/Texinfo/Convert/HTML.pm:799
  msgid "Next"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:745 tp/Texinfo/Convert/HTML.pm:798
  msgid "Up"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:749
  msgid "Previous"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:750
  msgid "Forward node"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:751
  msgid "Back node"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:757
  msgid "Next file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:758
  msgid "Previous file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:764
  msgid "Cover (top) of document"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:765
  msgid "Table of contents"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:766
  msgid "Short table of contents"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:768
  msgid "Current section"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:769
  msgid "Previous section in reading order"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:770
  msgid "Beginning of this chapter or previous chapter"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:771
  msgid "Previous section on same level"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:772
  msgid "Up section"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:773
  msgid "Next section on same level"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:774
  msgid "Up node"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:775
  msgid "Next node"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:776
  msgid "Previous node"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:777
  msgid "Next node in node reading order"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:778
  msgid "Previous node in node reading order"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:779
  msgid "Next section in reading order"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:780
  msgid "Next chapter"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:781
  msgid "About (help)"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:782
  msgid "First section in reading order"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:783
  msgid "Last section in reading order"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:784
  msgid "Forward section in next file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:785
  msgid "Back section in previous file"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:794
  msgid "This"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:795
  msgid "Back"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:796
  msgid "FastBack"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:800
  msgid "NodeUp"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:801
  msgid "NodeNext"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:802
  msgid "NodePrev"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:803
  msgid "NodeForward"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:804
  msgid "NodeBack"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:805
  msgid "Forward"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:806
  msgid "FastForward"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:807
  msgid "About"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:808
  msgid "First"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:809
  msgid "Last"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:810
  msgid "NextFile"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:811
  msgid "PrevFile"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:815
  msgid "About This Document"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:816
  msgid "Table of Contents"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:817
  msgid "Short Table of Contents"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:818
  msgid "Footnotes"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:1534
  #, perl-brace-format
  msgid "{explained_string} ({explanation})"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3182
  #, perl-brace-format
  msgid "see section {reference_name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3185
  #, perl-brace-format
  msgid "see {reference_name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3190
  #, perl-brace-format
  msgid "See section {reference_name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3193
  #, perl-brace-format
  msgid "See {reference_name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3197
  #, perl-brace-format
  msgid "{reference_name}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3259
  #, perl-brace-format
  msgid "see {reference} in @cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3263
  #, perl-brace-format
  msgid "see @cite{{book_reference}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3267
  #, perl-brace-format
  msgid "see `{section}' in @cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3274
  #, perl-brace-format
  msgid "see {reference}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3277
  #, perl-brace-format
  msgid "see `{section}'"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3282
  #, perl-brace-format
  msgid "See {reference} in @cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3286
  #, perl-brace-format
  msgid "See @cite{{book_reference}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3290
  #, perl-brace-format
  msgid "See `{section}' in @cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3297
  #, perl-brace-format
  msgid "See {reference}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3300
  #, perl-brace-format
  msgid "See `{section}'"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3305
  #, perl-brace-format
  msgid "{reference} in @cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3309
  #, perl-brace-format
  msgid "@cite{{book_reference}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3313
  #, perl-brace-format
  msgid "`{section}' in @cite{{book}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3320
  #, perl-brace-format
  msgid "{reference}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3323
  #, perl-brace-format
  msgid "`{section}'"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3436
  msgid "Jump to"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3444
  msgid "Index Entry"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:3446
  msgid "Section"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4065
  #, perl-brace-format
  msgid "{category}: @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4070
  #, perl-brace-format
  msgid "{category}: @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4087
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4091
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4100
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4103
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4111
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4117
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4126
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4132
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4147
  #, perl-brace-format
  msgid ""
***************
*** 766,785 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4126
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4137
  #, perl-brace-format
  msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4141
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4155
  #, perl-brace-format
  msgid ""
--- 766,785 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4151
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4162
  #, perl-brace-format
  msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4166
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4180
  #, perl-brace-format
  msgid ""
***************
*** 787,806 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4159
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4170
  #, perl-brace-format
  msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4174
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6101
  #, perl-brace-format
  msgid ""
--- 787,806 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4184
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4195
  #, perl-brace-format
  msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:4199
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6170
  #, perl-brace-format
  msgid ""
***************
*** 809,847 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6106
  msgid "This document was generated on @emph{@today{}}."
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6145
  #, perl-brace-format
  msgid "{title}: {element_text}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6289
  #, perl-brace-format
  msgid "The node you are looking for is at {href}."
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6358
  msgid "  The buttons in the navigation panels have the following meaning:"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6364
  msgid "Button"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6365
  msgid "Name"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6366
  msgid "Go to"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6367
  msgid "From 1.2.3 go to"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6393
  msgid ""
  "  where the @strong{ Example } assumes that the current position is at "
--- 809,847 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6175
  msgid "This document was generated on @emph{@today{}}."
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6214
  #, perl-brace-format
  msgid "{title}: {element_text}"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6358
  #, perl-brace-format
  msgid "The node you are looking for is at {href}."
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6427
  msgid "  The buttons in the navigation panels have the following meaning:"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6433
  msgid "Button"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6434
  msgid "Name"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6435
  msgid "Go to"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6436
  msgid "From 1.2.3 go to"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6462
  msgid ""
  "  where the @strong{ Example } assumes that the current position is at "
***************
*** 850,894 ****
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6403
  msgid "Section One"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6405
  msgid "Subsection One-One"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6412
  msgid "Subsection One-Two"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6414
  msgid "Subsubsection One-Two-One"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6415
  msgid "Subsubsection One-Two-Two"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6416
  msgid "Subsubsection One-Two-Three"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6418
  msgid "Current Position"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6419
  msgid "Subsubsection One-Two-Four"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6422
  msgid "Subsection One-Three"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6429
  msgid "Subsection One-Four"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6833
  msgid "Untitled Document"
  msgstr ""
--- 850,894 ----
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6472
  msgid "Section One"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6474
  msgid "Subsection One-One"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6481
  msgid "Subsection One-Two"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6483
  msgid "Subsubsection One-Two-One"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6484
  msgid "Subsubsection One-Two-Two"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6485
  msgid "Subsubsection One-Two-Three"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6487
  msgid "Current Position"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6488
  msgid "Subsubsection One-Two-Four"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6491
  msgid "Subsection One-Three"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6498
  msgid "Subsection One-Four"
  msgstr ""
  
! #: tp/Texinfo/Convert/HTML.pm:6906
  msgid "Untitled Document"
  msgstr ""
Binary files texinfo-6.1/po_document/uk.gmo and texinfo-6.3/po_document/uk.gmo differ
diff -Nrc2 texinfo-6.1/po_document/uk.po texinfo-6.3/po_document/uk.po
*** texinfo-6.1/po_document/uk.po	2016-02-06 11:35:59.000000000 +0000
--- texinfo-6.3/po_document/uk.po	2016-09-10 12:46:01.000000000 +0100
***************
*** 8,12 ****
  "Project-Id-Version: texinfo_document 5.9.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-02-06 11:35+0000\n"
  "PO-Revision-Date: 2015-02-28 11:24+0200\n"
  "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
--- 8,12 ----
  "Project-Id-Version: texinfo_document 5.9.90\n"
  "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
! "POT-Creation-Date: 2016-09-10 12:46+0100\n"
  "PO-Revision-Date: 2015-02-28 11:24+0200\n"
  "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
***************
*** 16,114 ****
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\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 1.5\n"
  
! #: tp/Texinfo/Common.pm:717 tp/Texinfo/Common.pm:722
  msgid "Function"
  msgstr "Ð¤ÑƒÐ½ÐºÑ†Ñ–Ñ�"
  
! #: tp/Texinfo/Common.pm:718
  msgid "Macro"
  msgstr "ÐœÐ°ÐºÑ€Ð¾Ñ�"
  
! #: tp/Texinfo/Common.pm:719
  msgid "Special Form"
  msgstr "Ð¡Ð¿ÐµÑ†Ñ–Ð°Ð»ÑŒÐ½Ð° Ñ„Ð¾Ñ€Ð¼Ð°"
  
! #: tp/Texinfo/Common.pm:720 tp/Texinfo/Common.pm:723
  msgid "Variable"
  msgstr "Ð—Ð¼Ñ–Ð½Ð½Ð°"
  
! #: tp/Texinfo/Common.pm:721
  msgid "User Option"
  msgstr "Ð’Ð¸Ð±Ñ–Ñ€ ÐºÐ¾Ñ€Ð¸Ñ�Ñ‚ÑƒÐ²Ð°Ñ‡Ð°"
  
! #: tp/Texinfo/Common.pm:724 tp/Texinfo/Common.pm:725
  msgid "Instance Variable"
  msgstr "Ð—Ð¼Ñ–Ð½Ð½Ð° ÐµÐºÐ·ÐµÐ¼Ð¿Ð»Ñ�Ñ€Ð°"
  
! #: tp/Texinfo/Common.pm:726 tp/Texinfo/Common.pm:727
  msgid "Method"
  msgstr "ÐœÐµÑ‚Ð¾Ð´"
  
! #: tp/Texinfo/Common.pm:1199
  #, perl-brace-format
  msgid "{category} on {class}"
  msgstr "{category} Ñ‰Ð¾Ð´Ð¾ {class}"
  
! #: tp/Texinfo/Common.pm:1206
  #, perl-brace-format
  msgid "{category} of {class}"
  msgstr "{category} {class}"
  
! #: tp/Texinfo/Common.pm:1223
  #, perl-brace-format
  msgid "{month} {day}, {year}"
  msgstr "{day} {month} {year}"
  
! #: tp/Texinfo/Common.pm:1254 tp/Texinfo/Convert/Plaintext.pm:1132
! #: tp/Texinfo/Convert/HTML.pm:515
  #, perl-brace-format
  msgid "Appendix {number} {section_title}"
  msgstr "Ð”Ð¾Ð´Ð°Ñ‚Ð¾Ðº {number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1258 tp/Texinfo/Convert/Plaintext.pm:1137
! #: tp/Texinfo/Convert/HTML.pm:521
  #, perl-brace-format
  msgid "{number} {section_title}"
  msgstr "{number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1393
  #, perl-brace-format
  msgid "{float_type} {float_number}: "
  msgstr "{float_type} {float_number}: "
  
! #: tp/Texinfo/Common.pm:1397
  #, perl-brace-format
  msgid "{float_type}: "
  msgstr "{float_type}: "
  
! #: tp/Texinfo/Common.pm:1402
  #, perl-brace-format
  msgid "{float_type} {float_number}\n"
  msgstr "{float_type} {float_number}\n"
  
! #: tp/Texinfo/Common.pm:1406
  #, perl-brace-format
  msgid "{float_type}\n"
  msgstr "{float_type}\n"
  
! #: tp/Texinfo/Common.pm:1412
  #, perl-brace-format
  msgid "{float_number}: "
  msgstr "{float_number}: "
  
! #: tp/Texinfo/Common.pm:1415
  #, perl-brace-format
  msgid "{float_number}\n"
  msgstr "{float_number}\n"
  
! #: tp/Texinfo/Parser.pm:2982
  #, perl-brace-format
  msgid "{name} on {class}"
  msgstr "{name} Ñ‰Ð¾Ð´Ð¾ {class}"
  
! #: tp/Texinfo/Parser.pm:2991
  #, perl-brace-format
  msgid "{name} of {class}"
--- 16,115 ----
  "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=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 1.5\n"
  
! #: tp/Texinfo/Common.pm:697 tp/Texinfo/Common.pm:702
  msgid "Function"
  msgstr "Ð¤ÑƒÐ½ÐºÑ†Ñ–Ñ�"
  
! #: tp/Texinfo/Common.pm:698
  msgid "Macro"
  msgstr "ÐœÐ°ÐºÑ€Ð¾Ñ�"
  
! #: tp/Texinfo/Common.pm:699
  msgid "Special Form"
  msgstr "Ð¡Ð¿ÐµÑ†Ñ–Ð°Ð»ÑŒÐ½Ð° Ñ„Ð¾Ñ€Ð¼Ð°"
  
! #: tp/Texinfo/Common.pm:700 tp/Texinfo/Common.pm:703
  msgid "Variable"
  msgstr "Ð—Ð¼Ñ–Ð½Ð½Ð°"
  
! #: tp/Texinfo/Common.pm:701
  msgid "User Option"
  msgstr "Ð’Ð¸Ð±Ñ–Ñ€ ÐºÐ¾Ñ€Ð¸Ñ�Ñ‚ÑƒÐ²Ð°Ñ‡Ð°"
  
! #: tp/Texinfo/Common.pm:704 tp/Texinfo/Common.pm:705
  msgid "Instance Variable"
  msgstr "Ð—Ð¼Ñ–Ð½Ð½Ð° ÐµÐºÐ·ÐµÐ¼Ð¿Ð»Ñ�Ñ€Ð°"
  
! #: tp/Texinfo/Common.pm:706 tp/Texinfo/Common.pm:707
  msgid "Method"
  msgstr "ÐœÐµÑ‚Ð¾Ð´"
  
! #: tp/Texinfo/Common.pm:1186
  #, perl-brace-format
  msgid "{category} on {class}"
  msgstr "{category} Ñ‰Ð¾Ð´Ð¾ {class}"
  
! #: tp/Texinfo/Common.pm:1193
  #, perl-brace-format
  msgid "{category} of {class}"
  msgstr "{category} {class}"
  
! #: tp/Texinfo/Common.pm:1210
  #, perl-brace-format
  msgid "{month} {day}, {year}"
  msgstr "{day} {month} {year}"
  
! #: tp/Texinfo/Common.pm:1241 tp/Texinfo/Convert/Plaintext.pm:1133
! #: tp/Texinfo/Convert/HTML.pm:516
  #, perl-brace-format
  msgid "Appendix {number} {section_title}"
  msgstr "Ð”Ð¾Ð´Ð°Ñ‚Ð¾Ðº {number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1245 tp/Texinfo/Convert/Plaintext.pm:1138
! #: tp/Texinfo/Convert/HTML.pm:522
  #, perl-brace-format
  msgid "{number} {section_title}"
  msgstr "{number} {section_title}"
  
! #: tp/Texinfo/Common.pm:1499
  #, perl-brace-format
  msgid "{float_type} {float_number}: "
  msgstr "{float_type} {float_number}: "
  
! #: tp/Texinfo/Common.pm:1503
  #, perl-brace-format
  msgid "{float_type}: "
  msgstr "{float_type}: "
  
! #: tp/Texinfo/Common.pm:1508
  #, perl-brace-format
  msgid "{float_type} {float_number}\n"
  msgstr "{float_type} {float_number}\n"
  
! #: tp/Texinfo/Common.pm:1512
  #, perl-brace-format
  msgid "{float_type}\n"
  msgstr "{float_type}\n"
  
! #: tp/Texinfo/Common.pm:1518
  #, perl-brace-format
  msgid "{float_number}: "
  msgstr "{float_number}: "
  
! #: tp/Texinfo/Common.pm:1521
  #, perl-brace-format
  msgid "{float_number}\n"
  msgstr "{float_number}\n"
  
! #: tp/Texinfo/Parser.pm:2816
  #, perl-brace-format
  msgid "{name} on {class}"
  msgstr "{name} Ñ‰Ð¾Ð´Ð¾ {class}"
  
! #: tp/Texinfo/Parser.pm:2825
  #, perl-brace-format
  msgid "{name} of {class}"
***************
*** 119,181 ****
  msgstr "error@arrow{}"
  
! #: tp/Texinfo/Convert/Converter.pm:956
  msgid "January"
  msgstr "Ñ�Ñ–Ñ‡Ð½Ñ�"
  
! #: tp/Texinfo/Convert/Converter.pm:957
  msgid "February"
  msgstr "Ð»ÑŽÑ‚Ð¾Ð³Ð¾"
  
! #: tp/Texinfo/Convert/Converter.pm:958
  msgid "March"
  msgstr "Ð±ÐµÑ€ÐµÐ·Ð½Ñ�"
  
! #: tp/Texinfo/Convert/Converter.pm:959
  msgid "April"
  msgstr "ÐºÐ²Ñ–Ñ‚Ð½Ñ�"
  
! #: tp/Texinfo/Convert/Converter.pm:960
  msgid "May"
  msgstr "Ñ‚Ñ€Ð°Ð²Ð½Ñ�"
  
! #: tp/Texinfo/Convert/Converter.pm:961
  msgid "June"
  msgstr "Ñ‡ÐµÑ€Ð²Ð½Ñ�"
  
! #: tp/Texinfo/Convert/Converter.pm:962
  msgid "July"
  msgstr "Ð»Ð¸Ð¿Ð½Ñ�"
  
! #: tp/Texinfo/Convert/Converter.pm:963
  msgid "August"
  msgstr "Ñ�ÐµÑ€Ð¿Ð½Ñ�"
  
! #: tp/Texinfo/Convert/Converter.pm:964
  msgid "September"
  msgstr "Ð²ÐµÑ€ÐµÑ�Ð½Ñ�"
  
! #: tp/Texinfo/Convert/Converter.pm:965
  msgid "October"
  msgstr "Ð¶Ð¾Ð²Ñ‚Ð½Ñ�"
  
! #: tp/Texinfo/Convert/Converter.pm:966
  msgid "November"
  msgstr "Ð»Ð¸Ñ�Ñ‚Ð¾Ð¿Ð°Ð´Ð°"
  
! #: tp/Texinfo/Convert/Converter.pm:967
  msgid "December"
  msgstr "Ð³Ñ€ÑƒÐ´Ð½Ñ�"
  
! #: tp/Texinfo/Convert/Converter.pm:1018
  #, perl-brace-format
  msgid "{float_type} {float_number}"
  msgstr "{float_type} {float_number}"
  
! #: tp/Texinfo/Convert/Converter.pm:1022
  #, perl-brace-format
  msgid "{float_type}"
  msgstr "{float_type}"
  
! #: tp/Texinfo/Convert/Converter.pm:1026
  #, perl-brace-format
  msgid "{float_number}"
--- 120,182 ----
  msgstr "error@arrow{}"
  
! #: tp/Texinfo/Convert/Converter.pm:948
  msgid "January"
  msgstr "Ñ�Ñ–Ñ‡Ð½Ñ�"
  
! #: tp/Texinfo/Convert/Converter.pm:949
  msgid "February"
  msgstr "Ð»ÑŽÑ‚Ð¾Ð³Ð¾"
  
! #: tp/Texinfo/Convert/Converter.pm:950
  msgid "March"
  msgstr "Ð±ÐµÑ€ÐµÐ·Ð½Ñ�"
  
! #: tp/Texinfo/Convert/Converter.pm:951
  msgid "April"
  msgstr "ÐºÐ²Ñ–Ñ‚Ð½Ñ�"
  
! #: tp/Texinfo/Convert/Converter.pm:952
  msgid "May"
  msgstr "Ñ‚Ñ€Ð°Ð²Ð½Ñ�"
  
! #: tp/Texinfo/Convert/Converter.pm:953
  msgid "June"
  msgstr "Ñ‡ÐµÑ€Ð²Ð½Ñ�"
  
! #: tp/Texinfo/Convert/Converter.pm:954
  msgid "July"
  msgstr "Ð»Ð¸Ð¿Ð½Ñ�"
  
! #: tp/Texinfo/Convert/Converter.pm:955
  msgid "August"
  msgstr "Ñ�ÐµÑ€Ð¿Ð½Ñ�"
  
! #: tp/Texinfo/Convert/Converter.pm:956
  msgid "September"
  msgstr "Ð²ÐµÑ€ÐµÑ�Ð½Ñ�"
  
! #: tp/Texinfo/Convert/Converter.pm:957
  msgid "October"
  msgstr "Ð¶Ð¾Ð²Ñ‚Ð½Ñ�"
  
! #: tp/Texinfo/Convert/Converter.pm:958
  msgid "November"
  msgstr "Ð»Ð¸Ñ�Ñ‚Ð¾Ð¿Ð°Ð´Ð°"
  
! #: tp/Texinfo/Convert/Converter.pm:959
  msgid "December"
  msgstr "Ð³Ñ€ÑƒÐ´Ð½Ñ�"
  
! #: tp/Texinfo/Convert/Converter.pm:1010
  #, perl-brace-format
  msgid "{float_type} {float_number}"
  msgstr "{float_type} {float_number}"
  
! #: tp/Texinfo/Convert/Converter.pm:1014
  #, perl-brace-format
  msgid "{float_type}"
  msgstr "{float_type}"
  
! #: tp/Texinfo/Convert/Converter.pm:1018
  #, perl-brace-format
  msgid "{float_number}"
***************
*** 212,226 ****
  msgstr "Ð´Ð¸Ð². Ñ€Ð¾Ð·Ð´Ñ–Ð» Â«{section_name}Â» Ñƒ @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3291
  #, perl-brace-format
  msgid "@cite{{book}}"
  msgstr "@cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3268
  #, perl-brace-format
  msgid "See @cite{{book}}"
  msgstr "Ð”Ð¸Ð². @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3245
  #, perl-brace-format
  msgid "see @cite{{book}}"
--- 213,227 ----
  msgstr "Ð´Ð¸Ð². Ñ€Ð¾Ð·Ð´Ñ–Ð» Â«{section_name}Â» Ñƒ @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:892 tp/Texinfo/Convert/HTML.pm:3317
  #, perl-brace-format
  msgid "@cite{{book}}"
  msgstr "@cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:896 tp/Texinfo/Convert/HTML.pm:3294
  #, perl-brace-format
  msgid "See @cite{{book}}"
  msgstr "Ð”Ð¸Ð². @cite{{book}}"
  
! #: tp/Texinfo/Convert/DocBook.pm:900 tp/Texinfo/Convert/HTML.pm:3271
  #, perl-brace-format
  msgid "see @cite{{book}}"
***************
*** 242,766 ****
  msgstr "Ð´Ð¸Ð². {title_ref}"
  
! #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2310
  #, perl-brace-format
  msgid "{abbr_or_acronym} ({explanation})"
  msgstr "{abbr_or_acronym} ({explanation})"
  
! #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2496
! #: tp/Texinfo/Convert/HTML.pm:3597
  #, perl-brace-format
  msgid "@b{{quotation_arg}:} "
  msgstr "@b{{quotation_arg}:} "
  
! #: tp/Texinfo/Convert/Plaintext.pm:1366
  msgid "(outside of any node)"
  msgstr "(Ð¿Ð¾Ð·Ð° Ð²ÑƒÐ·Ð»Ð°Ð¼Ð¸)"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2003
  #, perl-brace-format
  msgid "{name} @url{{email}}"
  msgstr "{name} @url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2006
  #, perl-brace-format
  msgid "@url{{email}}"
  msgstr "@url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2028
  #, perl-brace-format
  msgid "{text} ({url})"
  msgstr "{text} ({url})"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2033
  #, perl-brace-format
  msgid "@t{<{url}>}"
  msgstr "@t{<{url}>}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2421 tp/Texinfo/Convert/HTML.pm:1438
  #, perl-brace-format
  msgid "@{No value for `{value}'@}"
  msgstr "@{Ð�ÐµÐ¼Ð°Ñ” Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ� Ð´Ð»Ñ� `{value}'@}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2945
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name} {arguments}"
  msgstr "@tie{ }-- {category}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2950
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name}"
  msgstr "@tie{ }-- {category}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2963
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2966
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2975
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2978
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name}"
  msgstr "@tie{ }-- {category}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2986
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2992
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name}"
  msgstr "@tie{ }-- {category} {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3001
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} Ñ‰Ð¾Ð´Ð¾ {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3007
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name}"
  msgstr "@tie{ }-- {category} Ñ‰Ð¾Ð´Ð¾ {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3022
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} Ñ‰Ð¾Ð´Ð¾ {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3026
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} Ñ‰Ð¾Ð´Ð¾ {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3037
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} Ñ‰Ð¾Ð´Ð¾ {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3041
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name}"
  msgstr "@tie{ }-- {category} Ñ‰Ð¾Ð´Ð¾ {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3055
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3059
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3070
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3074
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name}"
  msgstr "@tie{ }-- {category} {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3403 tp/Texinfo/Convert/HTML.pm:2851
  #, perl-brace-format
  msgid "@center --- @emph{{author}}\n"
  msgstr "@center --- @emph{{author}}\n"
  
! #: tp/Texinfo/Convert/HTML.pm:732 tp/Texinfo/Convert/HTML.pm:788
  msgid "Top"
  msgstr "Ð�Ð°Ð³Ð¾Ñ€Ñƒ"
  
! #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
  msgid "Contents"
  msgstr "Ð—Ð¼Ñ–Ñ�Ñ‚"
  
! #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
  msgid "Overview"
  msgstr "ÐžÐ³Ð»Ñ�Ð´"
  
! #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:766
! #: tp/Texinfo/Convert/HTML.pm:791
  msgid "Index"
  msgstr "ÐŸÐ¾ÐºÐ°Ð¶Ñ‡Ð¸Ðº"
  
! #: tp/Texinfo/Convert/HTML.pm:737
  msgid "current"
  msgstr "Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¸Ð¹"
  
! #: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
  msgid "Prev"
  msgstr "Ð�Ð°Ð·Ð°Ð´"
  
! #: tp/Texinfo/Convert/HTML.pm:741
  msgid " Up "
  msgstr "Ð’Ð³Ð¾Ñ€Ñƒ"
  
! #: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:746
! #: tp/Texinfo/Convert/HTML.pm:798
  msgid "Next"
  msgstr "Ð”Ð°Ð»Ñ–"
  
! #: tp/Texinfo/Convert/HTML.pm:744 tp/Texinfo/Convert/HTML.pm:797
  msgid "Up"
  msgstr "Ð’Ð³Ð¾Ñ€Ñƒ"
  
! #: tp/Texinfo/Convert/HTML.pm:748
  msgid "Previous"
  msgstr "Ð�Ð°Ð·Ð°Ð´"
  
! #: tp/Texinfo/Convert/HTML.pm:749
  msgid "Forward node"
  msgstr "Ð’Ð¿ÐµÑ€ÐµÐ´ Ð½Ð° Ð²ÑƒÐ·Ð¾Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:750
  msgid "Back node"
  msgstr "Ð�Ð°Ð·Ð°Ð´ Ð½Ð° Ð²ÑƒÐ·Ð¾Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:756
  msgid "Next file"
  msgstr "Ð�Ð°Ñ�Ñ‚ÑƒÐ¿Ð½Ð¸Ð¹ Ñ„Ð°Ð¹Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:757
  msgid "Previous file"
  msgstr "ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ–Ð¹ Ñ„Ð°Ð¹Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:763
  msgid "Cover (top) of document"
  msgstr "ÐžÐ±ÐºÐ»Ð°Ð´Ð¸Ð½ÐºÐ° (Ð¿Ð¾Ñ‡Ð°Ñ‚Ð¾Ðº) Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°"
  
! #: tp/Texinfo/Convert/HTML.pm:764
  msgid "Table of contents"
  msgstr "Ð—Ð¼Ñ–Ñ�Ñ‚"
  
! #: tp/Texinfo/Convert/HTML.pm:765
  msgid "Short table of contents"
  msgstr "Ð¡ÐºÐ¾Ñ€Ð¾Ñ‡ÐµÐ½Ð¸Ð¹ Ð·Ð¼Ñ–Ñ�Ñ‚"
  
! #: tp/Texinfo/Convert/HTML.pm:767
  msgid "Current section"
  msgstr "ÐŸÐ¾Ñ‚Ð¾Ñ‡Ð½Ð¸Ð¹ Ñ€Ð¾Ð·Ð´Ñ–Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:768
  msgid "Previous section in reading order"
  msgstr "ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ–Ð¹ Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð·Ð° Ð¿Ð¾Ñ€Ñ�Ð´ÐºÐ¾Ð¼ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ�"
  
! #: tp/Texinfo/Convert/HTML.pm:769
  msgid "Beginning of this chapter or previous chapter"
  msgstr "ÐŸÐ¾Ñ‡Ð°Ñ‚Ð¾Ðº Ñ†Ñ–Ñ”Ñ— Ð³Ð»Ð°Ð²Ð¸ Ð°Ð±Ð¾ Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ� Ð³Ð»Ð°Ð²Ð°"
  
! #: tp/Texinfo/Convert/HTML.pm:770
  msgid "Previous section on same level"
  msgstr "ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ–Ð¹ Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð½Ð° Ñ‚Ð¾Ð¼Ñƒ Ñ�Ð°Ð¼Ð¾Ð¼Ñƒ Ñ€Ñ–Ð²Ð½Ñ–"
  
! #: tp/Texinfo/Convert/HTML.pm:771
  msgid "Up section"
  msgstr "Ð’Ð³Ð¾Ñ€Ñƒ Ð½Ð° Ñ€Ð¾Ð·Ð´Ñ–Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:772
  msgid "Next section on same level"
  msgstr "Ð�Ð°Ñ�Ñ‚ÑƒÐ¿Ð½Ð¸Ð¹ Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð½Ð° Ñ‚Ð¾Ð¼Ñƒ Ñ�Ð°Ð¼Ð¾Ð¼Ñƒ Ñ€Ñ–Ð²Ð½Ñ–"
  
! #: tp/Texinfo/Convert/HTML.pm:773
  msgid "Up node"
  msgstr "Ð’Ð³Ð¾Ñ€Ñƒ Ð½Ð° Ð²ÑƒÐ·Ð¾Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:774
  msgid "Next node"
  msgstr "Ð�Ð°Ñ�Ñ‚ÑƒÐ¿Ð½Ð¸Ð¹ Ð²ÑƒÐ·Ð¾Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:775
  msgid "Previous node"
  msgstr "ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ–Ð¹ Ð²ÑƒÐ·Ð¾Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:776
  msgid "Next node in node reading order"
  msgstr "Ð�Ð°Ñ�Ñ‚ÑƒÐ¿Ð½Ð¸Ð¹ Ð²ÑƒÐ·Ð¾Ð» Ð·Ð° Ð¿Ð¾Ñ€Ñ�Ð´ÐºÐ¾Ð¼ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ� Ð²ÑƒÐ·Ð»Ñ–Ð²"
  
! #: tp/Texinfo/Convert/HTML.pm:777
  msgid "Previous node in node reading order"
  msgstr "ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ–Ð¹ Ð²ÑƒÐ·Ð¾Ð» Ð·Ð° Ð¿Ð¾Ñ€Ñ�Ð´ÐºÐ¾Ð¼ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ� Ð²ÑƒÐ·Ð»Ñ–Ð²"
  
! #: tp/Texinfo/Convert/HTML.pm:778
  msgid "Next section in reading order"
  msgstr "Ð�Ð°Ñ�Ñ‚ÑƒÐ¿Ð½Ð¸Ð¹ Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð·Ð° Ð¿Ð¾Ñ€Ñ�Ð´ÐºÐ¾Ð¼ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ�"
  
! #: tp/Texinfo/Convert/HTML.pm:779
  msgid "Next chapter"
  msgstr "Ð�Ð°Ñ�Ñ‚ÑƒÐ¿Ð½Ð¸Ð¹ Ñ€Ð¾Ð·Ð´Ñ–Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:780
  msgid "About (help)"
  msgstr "Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ� (Ð´Ð¾Ð²Ñ–Ð´ÐºÐ°)"
  
! #: tp/Texinfo/Convert/HTML.pm:781
  msgid "First section in reading order"
  msgstr "ÐŸÐµÑ€ÐµÑˆÐ¸Ð¹ Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð·Ð° Ð¿Ð¾Ñ€Ñ�Ð´ÐºÐ¾Ð¼ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ�"
  
! #: tp/Texinfo/Convert/HTML.pm:782
  msgid "Last section in reading order"
  msgstr "ÐžÑ�Ñ‚Ð°Ð½Ð½Ñ–Ð¹ Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð·Ð° Ð¿Ð¾Ñ€Ñ�Ð´ÐºÐ¾Ð¼ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ�"
  
! #: tp/Texinfo/Convert/HTML.pm:783
  msgid "Forward section in next file"
  msgstr "Ð�Ð° Ñ€Ð¾Ð·Ð´Ñ–Ð» ÑƒÐ¿ÐµÑ€ÐµÐ´ Ñƒ Ð½Ð°Ñ�Ñ‚ÑƒÐ¿Ð½Ð¾Ð¼Ñƒ Ñ„Ð°Ð¹Ð»Ñ–"
  
! #: tp/Texinfo/Convert/HTML.pm:784
  msgid "Back section in previous file"
  msgstr "Ð�Ð° Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð½Ð°Ð·Ð°Ð´ Ñƒ Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð½ÑŒÐ¾Ð¼Ñƒ Ñ„Ð°Ð¹Ð»Ñ–"
  
! #: tp/Texinfo/Convert/HTML.pm:793
  msgid "This"
  msgstr "Ð¦ÐµÐ¹"
  
! #: tp/Texinfo/Convert/HTML.pm:794
  msgid "Back"
  msgstr "Ð�Ð°Ð·Ð°Ð´"
  
! #: tp/Texinfo/Convert/HTML.pm:795
  msgid "FastBack"
  msgstr "Ð¨Ð²Ð¸Ð´ÐºÐ�Ð°Ð·Ð°Ð´"
  
! #: tp/Texinfo/Convert/HTML.pm:799
  msgid "NodeUp"
  msgstr "Ð’ÑƒÐ·Ð¾Ð»Ð’Ð³Ð¾Ñ€Ñƒ"
  
! #: tp/Texinfo/Convert/HTML.pm:800
  msgid "NodeNext"
  msgstr "Ð�Ð°Ñ�Ñ‚Ð’ÑƒÐ·Ð¾Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:801
  msgid "NodePrev"
  msgstr "ÐŸÐ¾Ð¿Ð’ÑƒÐ·Ð¾Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:802
  msgid "NodeForward"
  msgstr "Ð’Ð¿ÐµÑ€Ð’ÑƒÐ·Ð¾Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:803
  msgid "NodeBack"
  msgstr "Ð�Ð°Ð·Ð’ÑƒÐ·Ð¾Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:804
  msgid "Forward"
  msgstr "Ð’Ð¿ÐµÑ€ÐµÐ´"
  
! #: tp/Texinfo/Convert/HTML.pm:805
  msgid "FastForward"
  msgstr "Ð¨Ð²Ð¸Ð´ÐºÐ’Ð¿ÐµÑ€ÐµÐ´"
  
! #: tp/Texinfo/Convert/HTML.pm:806
  msgid "About"
  msgstr "Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ�"
  
! #: tp/Texinfo/Convert/HTML.pm:807
  msgid "First"
  msgstr "ÐŸÐµÑ€ÑˆÐ¸Ð¹"
  
! #: tp/Texinfo/Convert/HTML.pm:808
  msgid "Last"
  msgstr "ÐžÑ�Ñ‚Ð°Ð½Ð½Ñ–Ð¹"
  
! #: tp/Texinfo/Convert/HTML.pm:809
  msgid "NextFile"
  msgstr "Ð�Ð°Ñ�Ñ‚Ð¤Ð°Ð¹Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:810
  msgid "PrevFile"
  msgstr "ÐŸÐ¾Ð¿Ð¤Ð°Ð¹Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:814
  msgid "About This Document"
  msgstr "ÐŸÑ€Ð¾ Ñ†ÐµÐ¹ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚"
  
! #: tp/Texinfo/Convert/HTML.pm:815
  msgid "Table of Contents"
  msgstr "Ð—Ð¼Ñ–Ñ�Ñ‚"
  
! #: tp/Texinfo/Convert/HTML.pm:816
  msgid "Short Table of Contents"
  msgstr "Ð¡ÐºÐ¾Ñ€Ð¾Ñ‡ÐµÐ½Ð¸Ð¹ Ð·Ð¼Ñ–Ñ�Ñ‚"
  
! #: tp/Texinfo/Convert/HTML.pm:817
  msgid "Footnotes"
  msgstr "Ð’Ð¸Ð½Ð¾Ñ�ÐºÐ¸"
  
! #: tp/Texinfo/Convert/HTML.pm:1504
  #, perl-brace-format
  msgid "{explained_string} ({explanation})"
  msgstr "{explained_string} ({explanation})"
  
! #: tp/Texinfo/Convert/HTML.pm:3156
  #, perl-brace-format
  msgid "see section {reference_name}"
  msgstr "Ð´Ð¸Ð². Ñ€Ð¾Ð·Ð´Ñ–Ð» {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3159
  #, perl-brace-format
  msgid "see {reference_name}"
  msgstr "Ð´Ð¸Ð². {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3164
  #, perl-brace-format
  msgid "See section {reference_name}"
  msgstr "Ð”Ð¸Ð². Ñ€Ð¾Ð·Ð´Ñ–Ð» {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3167
  #, perl-brace-format
  msgid "See {reference_name}"
  msgstr "Ð”Ð¸Ð². {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3171
  #, perl-brace-format
  msgid "{reference_name}"
  msgstr "{reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3233
  #, perl-brace-format
  msgid "see {reference} in @cite{{book}}"
  msgstr "Ð´Ð¸Ð². {reference} Ñƒ @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3237
  #, perl-brace-format
  msgid "see @cite{{book_reference}}"
  msgstr "Ð´Ð¸Ð². @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3241
  #, perl-brace-format
  msgid "see `{section}' in @cite{{book}}"
  msgstr "Ð´Ð¸Ð². Â«{section}Â» Ñƒ @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3248
  #, perl-brace-format
  msgid "see {reference}"
  msgstr "Ð´Ð¸Ð². {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3251
  #, perl-brace-format
  msgid "see `{section}'"
  msgstr "Ð´Ð¸Ð². Â«{section}Â»"
  
! #: tp/Texinfo/Convert/HTML.pm:3256
  #, perl-brace-format
  msgid "See {reference} in @cite{{book}}"
  msgstr "Ð”Ð¸Ð². {reference} Ñƒ @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3260
  #, perl-brace-format
  msgid "See @cite{{book_reference}}"
  msgstr "Ð”Ð¸Ð². @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3264
  #, perl-brace-format
  msgid "See `{section}' in @cite{{book}}"
  msgstr "Ð”Ð¸Ð². Â«{section}Â» Ñƒ @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3271
  #, perl-brace-format
  msgid "See {reference}"
  msgstr "Ð”Ð¸Ð². {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3274
  #, perl-brace-format
  msgid "See `{section}'"
  msgstr "Ð”Ð¸Ð². Â«{section}Â»"
  
! #: tp/Texinfo/Convert/HTML.pm:3279
  #, perl-brace-format
  msgid "{reference} in @cite{{book}}"
  msgstr "{reference} Ñƒ @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3283
  #, perl-brace-format
  msgid "@cite{{book_reference}}"
  msgstr "@cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3287
  #, perl-brace-format
  msgid "`{section}' in @cite{{book}}"
  msgstr "Â«{section}Â» Ñƒ @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3294
  #, perl-brace-format
  msgid "{reference}"
  msgstr "{reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3297
  #, perl-brace-format
  msgid "`{section}'"
  msgstr "Â«{section}Â»"
  
! #: tp/Texinfo/Convert/HTML.pm:3410
  msgid "Jump to"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð´Ð¾"
  
! #: tp/Texinfo/Convert/HTML.pm:3418
  msgid "Index Entry"
  msgstr "Ð—Ð°Ð¿Ð¸Ñ� Ð¿Ð¾ÐºÐ°Ð¶Ñ‡Ð¸ÐºÐ°"
  
! #: tp/Texinfo/Convert/HTML.pm:3420
  msgid "Section"
  msgstr "Ð Ð¾Ð·Ð´Ñ–Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:4040
  #, perl-brace-format
  msgid "{category}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4045
  #, perl-brace-format
  msgid "{category}: @strong{{name}}"
  msgstr "{category}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4062
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4066
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4075
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4078
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4086
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4092
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}}"
  msgstr "{category} {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4101
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} Ñ‰Ð¾Ð´Ð¾ {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4107
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}}"
  msgstr "{category} Ñ‰Ð¾Ð´Ð¾ {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4122
  #, perl-brace-format
  msgid ""
--- 243,767 ----
  msgstr "Ð´Ð¸Ð². {title_ref}"
  
! #: tp/Texinfo/Convert/DocBook.pm:1062 tp/Texinfo/Convert/Plaintext.pm:2311
  #, perl-brace-format
  msgid "{abbr_or_acronym} ({explanation})"
  msgstr "{abbr_or_acronym} ({explanation})"
  
! #: tp/Texinfo/Convert/DocBook.pm:1223 tp/Texinfo/Convert/Plaintext.pm:2497
! #: tp/Texinfo/Convert/HTML.pm:3622
  #, perl-brace-format
  msgid "@b{{quotation_arg}:} "
  msgstr "@b{{quotation_arg}:} "
  
! #: tp/Texinfo/Convert/Plaintext.pm:1367
  msgid "(outside of any node)"
  msgstr "(Ð¿Ð¾Ð·Ð° Ð²ÑƒÐ·Ð»Ð°Ð¼Ð¸)"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2004
  #, perl-brace-format
  msgid "{name} @url{{email}}"
  msgstr "{name} @url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2007
  #, perl-brace-format
  msgid "@url{{email}}"
  msgstr "@url{{email}}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2029
  #, perl-brace-format
  msgid "{text} ({url})"
  msgstr "{text} ({url})"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2034
  #, perl-brace-format
  msgid "@t{<{url}>}"
  msgstr "@t{<{url}>}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2422 tp/Texinfo/Convert/HTML.pm:1437
  #, perl-brace-format
  msgid "@{No value for `{value}'@}"
  msgstr "@{Ð�ÐµÐ¼Ð°Ñ” Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ� Ð´Ð»Ñ� `{value}'@}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2913
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name} {arguments}"
  msgstr "@tie{ }-- {category}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2918
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {name}"
  msgstr "@tie{ }-- {category}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2931
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2934
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2943
  #, perl-brace-format
  msgid "@tie{ }-- {category}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2946
  #, perl-brace-format
  msgid "@tie{ }-- {category}: {type} {name}"
  msgstr "@tie{ }-- {category}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2954
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2960
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {name}"
  msgstr "@tie{ }-- {category} {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2969
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
  msgstr "@tie{ }-- {category} Ñ‰Ð¾Ð´Ð¾ {class}: {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2975
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {name}"
  msgstr "@tie{ }-- {category} Ñ‰Ð¾Ð´Ð¾ {class}: {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2990
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} Ñ‰Ð¾Ð´Ð¾ {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:2994
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} Ñ‰Ð¾Ð´Ð¾ {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3005
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} Ñ‰Ð¾Ð´Ð¾ {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3009
  #, perl-brace-format
  msgid "@tie{ }-- {category} on {class}: {type} {name}"
  msgstr "@tie{ }-- {category} Ñ‰Ð¾Ð´Ð¾ {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3023
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
  msgstr "@tie{ }-- {category} {class}:@*{type}@*{name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3027
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
  msgstr "@tie{ }-- {category} {class}: {type} {name} {arguments}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3038
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
  msgstr "@tie{ }-- {category} {class}:@*{type}@*{name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3042
  #, perl-brace-format
  msgid "@tie{ }-- {category} of {class}: {type} {name}"
  msgstr "@tie{ }-- {category} {class}: {type} {name}"
  
! #: tp/Texinfo/Convert/Plaintext.pm:3371 tp/Texinfo/Convert/HTML.pm:2877
  #, perl-brace-format
  msgid "@center --- @emph{{author}}\n"
  msgstr "@center --- @emph{{author}}\n"
  
! #: tp/Texinfo/Convert/HTML.pm:733 tp/Texinfo/Convert/HTML.pm:789
  msgid "Top"
  msgstr "Ð�Ð°Ð³Ð¾Ñ€Ñƒ"
  
! #: tp/Texinfo/Convert/HTML.pm:734 tp/Texinfo/Convert/HTML.pm:790
  msgid "Contents"
  msgstr "Ð—Ð¼Ñ–Ñ�Ñ‚"
  
! #: tp/Texinfo/Convert/HTML.pm:735 tp/Texinfo/Convert/HTML.pm:791
  msgid "Overview"
  msgstr "ÐžÐ³Ð»Ñ�Ð´"
  
! #: tp/Texinfo/Convert/HTML.pm:736 tp/Texinfo/Convert/HTML.pm:767
! #: tp/Texinfo/Convert/HTML.pm:792
  msgid "Index"
  msgstr "ÐŸÐ¾ÐºÐ°Ð¶Ñ‡Ð¸Ðº"
  
! #: tp/Texinfo/Convert/HTML.pm:738
  msgid "current"
  msgstr "Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¸Ð¹"
  
! #: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
  msgid "Prev"
  msgstr "Ð�Ð°Ð·Ð°Ð´"
  
! #: tp/Texinfo/Convert/HTML.pm:742
  msgid " Up "
  msgstr "Ð’Ð³Ð¾Ñ€Ñƒ"
  
! #: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:747
! #: tp/Texinfo/Convert/HTML.pm:799
  msgid "Next"
  msgstr "Ð”Ð°Ð»Ñ–"
  
! #: tp/Texinfo/Convert/HTML.pm:745 tp/Texinfo/Convert/HTML.pm:798
  msgid "Up"
  msgstr "Ð’Ð³Ð¾Ñ€Ñƒ"
  
! #: tp/Texinfo/Convert/HTML.pm:749
  msgid "Previous"
  msgstr "Ð�Ð°Ð·Ð°Ð´"
  
! #: tp/Texinfo/Convert/HTML.pm:750
  msgid "Forward node"
  msgstr "Ð’Ð¿ÐµÑ€ÐµÐ´ Ð½Ð° Ð²ÑƒÐ·Ð¾Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:751
  msgid "Back node"
  msgstr "Ð�Ð°Ð·Ð°Ð´ Ð½Ð° Ð²ÑƒÐ·Ð¾Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:757
  msgid "Next file"
  msgstr "Ð�Ð°Ñ�Ñ‚ÑƒÐ¿Ð½Ð¸Ð¹ Ñ„Ð°Ð¹Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:758
  msgid "Previous file"
  msgstr "ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ–Ð¹ Ñ„Ð°Ð¹Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:764
  msgid "Cover (top) of document"
  msgstr "ÐžÐ±ÐºÐ»Ð°Ð´Ð¸Ð½ÐºÐ° (Ð¿Ð¾Ñ‡Ð°Ñ‚Ð¾Ðº) Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°"
  
! #: tp/Texinfo/Convert/HTML.pm:765
  msgid "Table of contents"
  msgstr "Ð—Ð¼Ñ–Ñ�Ñ‚"
  
! #: tp/Texinfo/Convert/HTML.pm:766
  msgid "Short table of contents"
  msgstr "Ð¡ÐºÐ¾Ñ€Ð¾Ñ‡ÐµÐ½Ð¸Ð¹ Ð·Ð¼Ñ–Ñ�Ñ‚"
  
! #: tp/Texinfo/Convert/HTML.pm:768
  msgid "Current section"
  msgstr "ÐŸÐ¾Ñ‚Ð¾Ñ‡Ð½Ð¸Ð¹ Ñ€Ð¾Ð·Ð´Ñ–Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:769
  msgid "Previous section in reading order"
  msgstr "ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ–Ð¹ Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð·Ð° Ð¿Ð¾Ñ€Ñ�Ð´ÐºÐ¾Ð¼ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ�"
  
! #: tp/Texinfo/Convert/HTML.pm:770
  msgid "Beginning of this chapter or previous chapter"
  msgstr "ÐŸÐ¾Ñ‡Ð°Ñ‚Ð¾Ðº Ñ†Ñ–Ñ”Ñ— Ð³Ð»Ð°Ð²Ð¸ Ð°Ð±Ð¾ Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ� Ð³Ð»Ð°Ð²Ð°"
  
! #: tp/Texinfo/Convert/HTML.pm:771
  msgid "Previous section on same level"
  msgstr "ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ–Ð¹ Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð½Ð° Ñ‚Ð¾Ð¼Ñƒ Ñ�Ð°Ð¼Ð¾Ð¼Ñƒ Ñ€Ñ–Ð²Ð½Ñ–"
  
! #: tp/Texinfo/Convert/HTML.pm:772
  msgid "Up section"
  msgstr "Ð’Ð³Ð¾Ñ€Ñƒ Ð½Ð° Ñ€Ð¾Ð·Ð´Ñ–Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:773
  msgid "Next section on same level"
  msgstr "Ð�Ð°Ñ�Ñ‚ÑƒÐ¿Ð½Ð¸Ð¹ Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð½Ð° Ñ‚Ð¾Ð¼Ñƒ Ñ�Ð°Ð¼Ð¾Ð¼Ñƒ Ñ€Ñ–Ð²Ð½Ñ–"
  
! #: tp/Texinfo/Convert/HTML.pm:774
  msgid "Up node"
  msgstr "Ð’Ð³Ð¾Ñ€Ñƒ Ð½Ð° Ð²ÑƒÐ·Ð¾Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:775
  msgid "Next node"
  msgstr "Ð�Ð°Ñ�Ñ‚ÑƒÐ¿Ð½Ð¸Ð¹ Ð²ÑƒÐ·Ð¾Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:776
  msgid "Previous node"
  msgstr "ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ–Ð¹ Ð²ÑƒÐ·Ð¾Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:777
  msgid "Next node in node reading order"
  msgstr "Ð�Ð°Ñ�Ñ‚ÑƒÐ¿Ð½Ð¸Ð¹ Ð²ÑƒÐ·Ð¾Ð» Ð·Ð° Ð¿Ð¾Ñ€Ñ�Ð´ÐºÐ¾Ð¼ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ� Ð²ÑƒÐ·Ð»Ñ–Ð²"
  
! #: tp/Texinfo/Convert/HTML.pm:778
  msgid "Previous node in node reading order"
  msgstr "ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ–Ð¹ Ð²ÑƒÐ·Ð¾Ð» Ð·Ð° Ð¿Ð¾Ñ€Ñ�Ð´ÐºÐ¾Ð¼ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ� Ð²ÑƒÐ·Ð»Ñ–Ð²"
  
! #: tp/Texinfo/Convert/HTML.pm:779
  msgid "Next section in reading order"
  msgstr "Ð�Ð°Ñ�Ñ‚ÑƒÐ¿Ð½Ð¸Ð¹ Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð·Ð° Ð¿Ð¾Ñ€Ñ�Ð´ÐºÐ¾Ð¼ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ�"
  
! #: tp/Texinfo/Convert/HTML.pm:780
  msgid "Next chapter"
  msgstr "Ð�Ð°Ñ�Ñ‚ÑƒÐ¿Ð½Ð¸Ð¹ Ñ€Ð¾Ð·Ð´Ñ–Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:781
  msgid "About (help)"
  msgstr "Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ� (Ð´Ð¾Ð²Ñ–Ð´ÐºÐ°)"
  
! #: tp/Texinfo/Convert/HTML.pm:782
  msgid "First section in reading order"
  msgstr "ÐŸÐµÑ€ÐµÑˆÐ¸Ð¹ Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð·Ð° Ð¿Ð¾Ñ€Ñ�Ð´ÐºÐ¾Ð¼ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ�"
  
! #: tp/Texinfo/Convert/HTML.pm:783
  msgid "Last section in reading order"
  msgstr "ÐžÑ�Ñ‚Ð°Ð½Ð½Ñ–Ð¹ Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð·Ð° Ð¿Ð¾Ñ€Ñ�Ð´ÐºÐ¾Ð¼ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ�"
  
! #: tp/Texinfo/Convert/HTML.pm:784
  msgid "Forward section in next file"
  msgstr "Ð�Ð° Ñ€Ð¾Ð·Ð´Ñ–Ð» ÑƒÐ¿ÐµÑ€ÐµÐ´ Ñƒ Ð½Ð°Ñ�Ñ‚ÑƒÐ¿Ð½Ð¾Ð¼Ñƒ Ñ„Ð°Ð¹Ð»Ñ–"
  
! #: tp/Texinfo/Convert/HTML.pm:785
  msgid "Back section in previous file"
  msgstr "Ð�Ð° Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð½Ð°Ð·Ð°Ð´ Ñƒ Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð½ÑŒÐ¾Ð¼Ñƒ Ñ„Ð°Ð¹Ð»Ñ–"
  
! #: tp/Texinfo/Convert/HTML.pm:794
  msgid "This"
  msgstr "Ð¦ÐµÐ¹"
  
! #: tp/Texinfo/Convert/HTML.pm:795
  msgid "Back"
  msgstr "Ð�Ð°Ð·Ð°Ð´"
  
! #: tp/Texinfo/Convert/HTML.pm:796
  msgid "FastBack"
  msgstr "Ð¨Ð²Ð¸Ð´ÐºÐ�Ð°Ð·Ð°Ð´"
  
! #: tp/Texinfo/Convert/HTML.pm:800
  msgid "NodeUp"
  msgstr "Ð’ÑƒÐ·Ð¾Ð»Ð’Ð³Ð¾Ñ€Ñƒ"
  
! #: tp/Texinfo/Convert/HTML.pm:801
  msgid "NodeNext"
  msgstr "Ð�Ð°Ñ�Ñ‚Ð’ÑƒÐ·Ð¾Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:802
  msgid "NodePrev"
  msgstr "ÐŸÐ¾Ð¿Ð’ÑƒÐ·Ð¾Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:803
  msgid "NodeForward"
  msgstr "Ð’Ð¿ÐµÑ€Ð’ÑƒÐ·Ð¾Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:804
  msgid "NodeBack"
  msgstr "Ð�Ð°Ð·Ð’ÑƒÐ·Ð¾Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:805
  msgid "Forward"
  msgstr "Ð’Ð¿ÐµÑ€ÐµÐ´"
  
! #: tp/Texinfo/Convert/HTML.pm:806
  msgid "FastForward"
  msgstr "Ð¨Ð²Ð¸Ð´ÐºÐ’Ð¿ÐµÑ€ÐµÐ´"
  
! #: tp/Texinfo/Convert/HTML.pm:807
  msgid "About"
  msgstr "Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ�"
  
! #: tp/Texinfo/Convert/HTML.pm:808
  msgid "First"
  msgstr "ÐŸÐµÑ€ÑˆÐ¸Ð¹"
  
! #: tp/Texinfo/Convert/HTML.pm:809
  msgid "Last"
  msgstr "ÐžÑ�Ñ‚Ð°Ð½Ð½Ñ–Ð¹"
  
! #: tp/Texinfo/Convert/HTML.pm:810
  msgid "NextFile"
  msgstr "Ð�Ð°Ñ�Ñ‚Ð¤Ð°Ð¹Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:811
  msgid "PrevFile"
  msgstr "ÐŸÐ¾Ð¿Ð¤Ð°Ð¹Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:815
  msgid "About This Document"
  msgstr "ÐŸÑ€Ð¾ Ñ†ÐµÐ¹ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚"
  
! #: tp/Texinfo/Convert/HTML.pm:816
  msgid "Table of Contents"
  msgstr "Ð—Ð¼Ñ–Ñ�Ñ‚"
  
! #: tp/Texinfo/Convert/HTML.pm:817
  msgid "Short Table of Contents"
  msgstr "Ð¡ÐºÐ¾Ñ€Ð¾Ñ‡ÐµÐ½Ð¸Ð¹ Ð·Ð¼Ñ–Ñ�Ñ‚"
  
! #: tp/Texinfo/Convert/HTML.pm:818
  msgid "Footnotes"
  msgstr "Ð’Ð¸Ð½Ð¾Ñ�ÐºÐ¸"
  
! #: tp/Texinfo/Convert/HTML.pm:1534
  #, perl-brace-format
  msgid "{explained_string} ({explanation})"
  msgstr "{explained_string} ({explanation})"
  
! #: tp/Texinfo/Convert/HTML.pm:3182
  #, perl-brace-format
  msgid "see section {reference_name}"
  msgstr "Ð´Ð¸Ð². Ñ€Ð¾Ð·Ð´Ñ–Ð» {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3185
  #, perl-brace-format
  msgid "see {reference_name}"
  msgstr "Ð´Ð¸Ð². {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3190
  #, perl-brace-format
  msgid "See section {reference_name}"
  msgstr "Ð”Ð¸Ð². Ñ€Ð¾Ð·Ð´Ñ–Ð» {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3193
  #, perl-brace-format
  msgid "See {reference_name}"
  msgstr "Ð”Ð¸Ð². {reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3197
  #, perl-brace-format
  msgid "{reference_name}"
  msgstr "{reference_name}"
  
! #: tp/Texinfo/Convert/HTML.pm:3259
  #, perl-brace-format
  msgid "see {reference} in @cite{{book}}"
  msgstr "Ð´Ð¸Ð². {reference} Ñƒ @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3263
  #, perl-brace-format
  msgid "see @cite{{book_reference}}"
  msgstr "Ð´Ð¸Ð². @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3267
  #, perl-brace-format
  msgid "see `{section}' in @cite{{book}}"
  msgstr "Ð´Ð¸Ð². Â«{section}Â» Ñƒ @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3274
  #, perl-brace-format
  msgid "see {reference}"
  msgstr "Ð´Ð¸Ð². {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3277
  #, perl-brace-format
  msgid "see `{section}'"
  msgstr "Ð´Ð¸Ð². Â«{section}Â»"
  
! #: tp/Texinfo/Convert/HTML.pm:3282
  #, perl-brace-format
  msgid "See {reference} in @cite{{book}}"
  msgstr "Ð”Ð¸Ð². {reference} Ñƒ @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3286
  #, perl-brace-format
  msgid "See @cite{{book_reference}}"
  msgstr "Ð”Ð¸Ð². @cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3290
  #, perl-brace-format
  msgid "See `{section}' in @cite{{book}}"
  msgstr "Ð”Ð¸Ð². Â«{section}Â» Ñƒ @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3297
  #, perl-brace-format
  msgid "See {reference}"
  msgstr "Ð”Ð¸Ð². {reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3300
  #, perl-brace-format
  msgid "See `{section}'"
  msgstr "Ð”Ð¸Ð². Â«{section}Â»"
  
! #: tp/Texinfo/Convert/HTML.pm:3305
  #, perl-brace-format
  msgid "{reference} in @cite{{book}}"
  msgstr "{reference} Ñƒ @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3309
  #, perl-brace-format
  msgid "@cite{{book_reference}}"
  msgstr "@cite{{book_reference}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3313
  #, perl-brace-format
  msgid "`{section}' in @cite{{book}}"
  msgstr "Â«{section}Â» Ñƒ @cite{{book}}"
  
! #: tp/Texinfo/Convert/HTML.pm:3320
  #, perl-brace-format
  msgid "{reference}"
  msgstr "{reference}"
  
! #: tp/Texinfo/Convert/HTML.pm:3323
  #, perl-brace-format
  msgid "`{section}'"
  msgstr "Â«{section}Â»"
  
! #: tp/Texinfo/Convert/HTML.pm:3436
  msgid "Jump to"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð´Ð¾"
  
! #: tp/Texinfo/Convert/HTML.pm:3444
  msgid "Index Entry"
  msgstr "Ð—Ð°Ð¿Ð¸Ñ� Ð¿Ð¾ÐºÐ°Ð¶Ñ‡Ð¸ÐºÐ°"
  
! #: tp/Texinfo/Convert/HTML.pm:3446
  msgid "Section"
  msgstr "Ð Ð¾Ð·Ð´Ñ–Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:4065
  #, perl-brace-format
  msgid "{category}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4070
  #, perl-brace-format
  msgid "{category}: @strong{{name}}"
  msgstr "{category}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4087
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4091
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4100
  #, perl-brace-format
  msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4103
  #, perl-brace-format
  msgid "{category}: @emph{{type}} @strong{{name}}"
  msgstr "{category}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4111
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4117
  #, perl-brace-format
  msgid "{category} of {class}: @strong{{name}}"
  msgstr "{category} {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4126
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
  msgstr "{category} Ñ‰Ð¾Ð´Ð¾ {class}: @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4132
  #, perl-brace-format
  msgid "{category} on {class}: @strong{{name}}"
  msgstr "{category} Ñ‰Ð¾Ð´Ð¾ {class}: @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4147
  #, perl-brace-format
  msgid ""
***************
*** 769,773 ****
  "{category} Ñ‰Ð¾Ð´Ð¾ {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4126
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
--- 770,774 ----
  "{category} Ñ‰Ð¾Ð´Ð¾ {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4151
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
***************
*** 775,789 ****
  "{category} Ñ‰Ð¾Ð´Ð¾ {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4137
  #, perl-brace-format
  msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} Ñ‰Ð¾Ð´Ð¾ {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4141
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} Ñ‰Ð¾Ð´Ð¾ {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4155
  #, perl-brace-format
  msgid ""
--- 776,790 ----
  "{category} Ñ‰Ð¾Ð´Ð¾ {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4162
  #, perl-brace-format
  msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} Ñ‰Ð¾Ð´Ð¾ {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4166
  #, perl-brace-format
  msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} Ñ‰Ð¾Ð´Ð¾ {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4180
  #, perl-brace-format
  msgid ""
***************
*** 792,811 ****
  "{category} {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4159
  #, 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:4170
  #, perl-brace-format
  msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4174
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:6101
  #, perl-brace-format
  msgid ""
--- 793,812 ----
  "{category} {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4184
  #, 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:4195
  #, perl-brace-format
  msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
  msgstr "{category} {class}:@* @emph{{type}}@* @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:4199
  #, perl-brace-format
  msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
  msgstr "{category} {class}: @emph{{type}} @strong{{name}}"
  
! #: tp/Texinfo/Convert/HTML.pm:6170
  #, perl-brace-format
  msgid ""
***************
*** 816,854 ****
  "@emph{{program}}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6106
  msgid "This document was generated on @emph{@today{}}."
  msgstr "Ð¦ÐµÐ¹ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚ Ñ�Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð¾ @emph{@today{}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6145
  #, perl-brace-format
  msgid "{title}: {element_text}"
  msgstr "{title}: {element_text}"
  
! #: tp/Texinfo/Convert/HTML.pm:6289
  #, perl-brace-format
  msgid "The node you are looking for is at {href}."
  msgstr "ÐŸÐ¾Ñ‚Ñ€Ñ–Ð±Ð½Ð¸Ð¹ Ð²Ð°Ð¼ Ð²ÑƒÐ·Ð¾Ð» Ñ‚ÑƒÑ‚: {href}."
  
! #: tp/Texinfo/Convert/HTML.pm:6358
  msgid "  The buttons in the navigation panels have the following meaning:"
  msgstr "  ÐšÐ½Ð¾Ð¿ÐºÐ¸ Ð½Ð° Ð¿Ð°Ð½ÐµÐ»Ñ�Ñ… Ð½Ð°Ð²Ñ–Ð³Ð°Ñ†Ñ–Ñ— Ð¼Ð°ÑŽÑ‚ÑŒ Ñ‚Ð°ÐºÐµ Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ�:"
  
! #: tp/Texinfo/Convert/HTML.pm:6364
  msgid "Button"
  msgstr "ÐšÐ½Ð¾Ð¿ÐºÐ°"
  
! #: tp/Texinfo/Convert/HTML.pm:6365
  msgid "Name"
  msgstr "Ð�Ð°Ð·Ð²Ð°"
  
! #: tp/Texinfo/Convert/HTML.pm:6366
  msgid "Go to"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð´Ð¾"
  
! #: tp/Texinfo/Convert/HTML.pm:6367
  msgid "From 1.2.3 go to"
  msgstr "Ð— 1.2.3 Ð¿ÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð´Ð¾"
  
! #: tp/Texinfo/Convert/HTML.pm:6393
  msgid ""
  "  where the @strong{ Example } assumes that the current position is at "
--- 817,855 ----
  "@emph{{program}}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6175
  msgid "This document was generated on @emph{@today{}}."
  msgstr "Ð¦ÐµÐ¹ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚ Ñ�Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð¾ @emph{@today{}}."
  
! #: tp/Texinfo/Convert/HTML.pm:6214
  #, perl-brace-format
  msgid "{title}: {element_text}"
  msgstr "{title}: {element_text}"
  
! #: tp/Texinfo/Convert/HTML.pm:6358
  #, perl-brace-format
  msgid "The node you are looking for is at {href}."
  msgstr "ÐŸÐ¾Ñ‚Ñ€Ñ–Ð±Ð½Ð¸Ð¹ Ð²Ð°Ð¼ Ð²ÑƒÐ·Ð¾Ð» Ñ‚ÑƒÑ‚: {href}."
  
! #: tp/Texinfo/Convert/HTML.pm:6427
  msgid "  The buttons in the navigation panels have the following meaning:"
  msgstr "  ÐšÐ½Ð¾Ð¿ÐºÐ¸ Ð½Ð° Ð¿Ð°Ð½ÐµÐ»Ñ�Ñ… Ð½Ð°Ð²Ñ–Ð³Ð°Ñ†Ñ–Ñ— Ð¼Ð°ÑŽÑ‚ÑŒ Ñ‚Ð°ÐºÐµ Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ�:"
  
! #: tp/Texinfo/Convert/HTML.pm:6433
  msgid "Button"
  msgstr "ÐšÐ½Ð¾Ð¿ÐºÐ°"
  
! #: tp/Texinfo/Convert/HTML.pm:6434
  msgid "Name"
  msgstr "Ð�Ð°Ð·Ð²Ð°"
  
! #: tp/Texinfo/Convert/HTML.pm:6435
  msgid "Go to"
  msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð´Ð¾"
  
! #: tp/Texinfo/Convert/HTML.pm:6436
  msgid "From 1.2.3 go to"
  msgstr "Ð— 1.2.3 Ð¿ÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð´Ð¾"
  
! #: tp/Texinfo/Convert/HTML.pm:6462
  msgid ""
  "  where the @strong{ Example } assumes that the current position is at "
***************
*** 859,903 ****
  "@strong{ Ð¿Ñ–Ð´Ñ€Ð¾Ð·Ð´Ñ–Ð»Ñ– Ð¾Ð´Ð¸Ð½-Ð´Ð²Ð°-Ñ‚Ñ€Ð¸ } Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð° Ñ–Ð· Ñ‚Ð°ÐºÐ¾ÑŽ Ñ�Ñ‚Ñ€ÑƒÐºÑ‚ÑƒÑ€Ð¾ÑŽ:"
  
! #: tp/Texinfo/Convert/HTML.pm:6403
  msgid "Section One"
  msgstr "ÐŸÐµÑ€ÑˆÐ¸Ð¹ Ñ€Ð¾Ð·Ð´Ñ–Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:6405
  msgid "Subsection One-One"
  msgstr "ÐŸÑ–Ð´Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð¾Ð´Ð¸Ð½-Ð¾Ð´Ð¸Ð½"
  
! #: tp/Texinfo/Convert/HTML.pm:6412
  msgid "Subsection One-Two"
  msgstr "ÐŸÑ–Ð´Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð¾Ð´Ð¸Ð½-Ð´Ð²Ð°"
  
! #: tp/Texinfo/Convert/HTML.pm:6414
  msgid "Subsubsection One-Two-One"
  msgstr "ÐŸÑ–Ð´Ð¿Ñ–Ð´Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð¾Ð´Ð¸Ð½-Ð´Ð²Ð°-Ð¾Ð´Ð¸Ð½"
  
! #: tp/Texinfo/Convert/HTML.pm:6415
  msgid "Subsubsection One-Two-Two"
  msgstr "ÐŸÑ–Ð´Ð¿Ñ–Ð´Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð¾Ð´Ð¸Ð½-Ð´Ð²Ð°-Ð´Ð²Ð°"
  
! #: tp/Texinfo/Convert/HTML.pm:6416
  msgid "Subsubsection One-Two-Three"
  msgstr "ÐŸÑ–Ð´Ð¿Ñ–Ð´Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð¾Ð´Ð¸Ð½-Ð´Ð²Ð°-Ñ‚Ñ€Ð¸"
  
! #: tp/Texinfo/Convert/HTML.pm:6418
  msgid "Current Position"
  msgstr "ÐŸÐ¾Ñ‚Ð¾Ñ‡Ð½Ð° Ð¿Ð¾Ð·Ð¸Ñ†Ñ–Ñ�"
  
! #: tp/Texinfo/Convert/HTML.pm:6419
  msgid "Subsubsection One-Two-Four"
  msgstr "ÐŸÑ–Ð´Ð¿Ñ–Ð´Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð¾Ð´Ð¸Ð½-Ð´Ð²Ð°-Ñ‡Ð¾Ñ‚Ð¸Ñ€Ð¸"
  
! #: tp/Texinfo/Convert/HTML.pm:6422
  msgid "Subsection One-Three"
  msgstr "ÐŸÑ–Ð´Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð¾Ð´Ð¸Ð½-Ñ‚Ñ€Ð¸"
  
! #: tp/Texinfo/Convert/HTML.pm:6429
  msgid "Subsection One-Four"
  msgstr "ÐŸÑ–Ð´Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð¾Ð´Ð¸Ð½-Ñ‡Ð¾Ñ‚Ð¸Ñ€Ð¸"
  
! #: tp/Texinfo/Convert/HTML.pm:6833
  msgid "Untitled Document"
  msgstr "Ð”Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚ Ð±ÐµÐ· Ð½Ð°Ð·Ð²Ð¸"
--- 860,904 ----
  "@strong{ Ð¿Ñ–Ð´Ñ€Ð¾Ð·Ð´Ñ–Ð»Ñ– Ð¾Ð´Ð¸Ð½-Ð´Ð²Ð°-Ñ‚Ñ€Ð¸ } Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð° Ñ–Ð· Ñ‚Ð°ÐºÐ¾ÑŽ Ñ�Ñ‚Ñ€ÑƒÐºÑ‚ÑƒÑ€Ð¾ÑŽ:"
  
! #: tp/Texinfo/Convert/HTML.pm:6472
  msgid "Section One"
  msgstr "ÐŸÐµÑ€ÑˆÐ¸Ð¹ Ñ€Ð¾Ð·Ð´Ñ–Ð»"
  
! #: tp/Texinfo/Convert/HTML.pm:6474
  msgid "Subsection One-One"
  msgstr "ÐŸÑ–Ð´Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð¾Ð´Ð¸Ð½-Ð¾Ð´Ð¸Ð½"
  
! #: tp/Texinfo/Convert/HTML.pm:6481
  msgid "Subsection One-Two"
  msgstr "ÐŸÑ–Ð´Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð¾Ð´Ð¸Ð½-Ð´Ð²Ð°"
  
! #: tp/Texinfo/Convert/HTML.pm:6483
  msgid "Subsubsection One-Two-One"
  msgstr "ÐŸÑ–Ð´Ð¿Ñ–Ð´Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð¾Ð´Ð¸Ð½-Ð´Ð²Ð°-Ð¾Ð´Ð¸Ð½"
  
! #: tp/Texinfo/Convert/HTML.pm:6484
  msgid "Subsubsection One-Two-Two"
  msgstr "ÐŸÑ–Ð´Ð¿Ñ–Ð´Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð¾Ð´Ð¸Ð½-Ð´Ð²Ð°-Ð´Ð²Ð°"
  
! #: tp/Texinfo/Convert/HTML.pm:6485
  msgid "Subsubsection One-Two-Three"
  msgstr "ÐŸÑ–Ð´Ð¿Ñ–Ð´Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð¾Ð´Ð¸Ð½-Ð´Ð²Ð°-Ñ‚Ñ€Ð¸"
  
! #: tp/Texinfo/Convert/HTML.pm:6487
  msgid "Current Position"
  msgstr "ÐŸÐ¾Ñ‚Ð¾Ñ‡Ð½Ð° Ð¿Ð¾Ð·Ð¸Ñ†Ñ–Ñ�"
  
! #: tp/Texinfo/Convert/HTML.pm:6488
  msgid "Subsubsection One-Two-Four"
  msgstr "ÐŸÑ–Ð´Ð¿Ñ–Ð´Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð¾Ð´Ð¸Ð½-Ð´Ð²Ð°-Ñ‡Ð¾Ñ‚Ð¸Ñ€Ð¸"
  
! #: tp/Texinfo/Convert/HTML.pm:6491
  msgid "Subsection One-Three"
  msgstr "ÐŸÑ–Ð´Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð¾Ð´Ð¸Ð½-Ñ‚Ñ€Ð¸"
  
! #: tp/Texinfo/Convert/HTML.pm:6498
  msgid "Subsection One-Four"
  msgstr "ÐŸÑ–Ð´Ñ€Ð¾Ð·Ð´Ñ–Ð» Ð¾Ð´Ð¸Ð½-Ñ‡Ð¾Ñ‚Ð¸Ñ€Ð¸"
  
! #: tp/Texinfo/Convert/HTML.pm:6906
  msgid "Untitled Document"
  msgstr "Ð”Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚ Ð±ÐµÐ· Ð½Ð°Ð·Ð²Ð¸"
diff -Nrc2 texinfo-6.1/texindex/Makefile.in texinfo-6.3/texindex/Makefile.in
*** texinfo-6.1/texindex/Makefile.in	2016-02-06 12:24:06.000000000 +0000
--- texinfo-6.3/texindex/Makefile.in	2016-09-10 20:29:57.000000000 +0100
***************
*** 129,132 ****
--- 129,133 ----
  	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
  	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+ 	$(top_srcdir)/gnulib/m4/hard-locale.m4 \
  	$(top_srcdir)/gnulib/m4/iconv.m4 \
  	$(top_srcdir)/gnulib/m4/include_next.m4 \
diff -Nrc2 texinfo-6.1/texindex/texindex.awk texinfo-6.3/texindex/texindex.awk
*** texinfo-6.1/texindex/texindex.awk	2016-02-06 12:24:35.000000000 +0000
--- texinfo-6.3/texindex/texindex.awk	2016-09-10 20:25:52.000000000 +0100
***************
*** 162,166 ****
    EXIT_FAILURE = 1
    
!   Texindex_version = "6.1"
    if (! Invocation_name) {
      # provide fallback in case it's not passed in.
--- 162,166 ----
    EXIT_FAILURE = 1
    
!   Texindex_version = "6.3"
    if (! Invocation_name) {
      # provide fallback in case it's not passed in.
diff -Nrc2 texinfo-6.1/tp/COPYING texinfo-6.3/tp/COPYING
*** texinfo-6.1/tp/COPYING	2014-04-22 02:56:36.000000000 +0100
--- texinfo-6.3/tp/COPYING	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,674 ****
-                     GNU GENERAL PUBLIC LICENSE
-                        Version 3, 29 June 2007
- 
-  Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
-  Everyone is permitted to copy and distribute verbatim copies
-  of this license document, but changing it is not allowed.
- 
-                             Preamble
- 
-   The GNU General Public License is a free, copyleft license for
- software and other kinds of works.
- 
-   The licenses for most software and other practical works are designed
- to take away your freedom to share and change the works.  By contrast,
- the GNU General Public License is intended to guarantee your freedom to
- share and change all versions of a program--to make sure it remains free
- software for all its users.  We, the Free Software Foundation, use the
- GNU General Public License for most of our software; it applies also to
- any other work released this way by its authors.  You can apply it to
- your programs, too.
- 
-   When we speak of free software, we are referring to freedom, not
- price.  Our General Public Licenses are designed to make sure that you
- have the freedom to distribute copies of free software (and charge for
- them if you wish), that you receive source code or can get it if you
- want it, that you can change the software or use pieces of it in new
- free programs, and that you know you can do these things.
- 
-   To protect your rights, we need to prevent others from denying you
- these rights or asking you to surrender the rights.  Therefore, you have
- certain responsibilities if you distribute copies of the software, or if
- you modify it: responsibilities to respect the freedom of others.
- 
-   For example, if you distribute copies of such a program, whether
- gratis or for a fee, you must pass on to the recipients the same
- freedoms that you received.  You must make sure that they, too, receive
- or can get the source code.  And you must show them these terms so they
- know their rights.
- 
-   Developers that use the GNU GPL protect your rights with two steps:
- (1) assert copyright on the software, and (2) offer you this License
- giving you legal permission to copy, distribute and/or modify it.
- 
-   For the developers' and authors' protection, the GPL clearly explains
- that there is no warranty for this free software.  For both users' and
- authors' sake, the GPL requires that modified versions be marked as
- changed, so that their problems will not be attributed erroneously to
- authors of previous versions.
- 
-   Some devices are designed to deny users access to install or run
- modified versions of the software inside them, although the manufacturer
- can do so.  This is fundamentally incompatible with the aim of
- protecting users' freedom to change the software.  The systematic
- pattern of such abuse occurs in the area of products for individuals to
- use, which is precisely where it is most unacceptable.  Therefore, we
- have designed this version of the GPL to prohibit the practice for those
- products.  If such problems arise substantially in other domains, we
- stand ready to extend this provision to those domains in future versions
- of the GPL, as needed to protect the freedom of users.
- 
-   Finally, every program is threatened constantly by software patents.
- States should not allow patents to restrict development and use of
- software on general-purpose computers, but in those that do, we wish to
- avoid the special danger that patents applied to a free program could
- make it effectively proprietary.  To prevent this, the GPL assures that
- patents cannot be used to render the program non-free.
- 
-   The precise terms and conditions for copying, distribution and
- modification follow.
- 
-                        TERMS AND CONDITIONS
- 
-   0. Definitions.
- 
-   "This License" refers to version 3 of the GNU General Public License.
- 
-   "Copyright" also means copyright-like laws that apply to other kinds of
- works, such as semiconductor masks.
- 
-   "The Program" refers to any copyrightable work licensed under this
- License.  Each licensee is addressed as "you".  "Licensees" and
- "recipients" may be individuals or organizations.
- 
-   To "modify" a work means to copy from or adapt all or part of the work
- in a fashion requiring copyright permission, other than the making of an
- exact copy.  The resulting work is called a "modified version" of the
- earlier work or a work "based on" the earlier work.
- 
-   A "covered work" means either the unmodified Program or a work based
- on the Program.
- 
-   To "propagate" a work means to do anything with it that, without
- permission, would make you directly or secondarily liable for
- infringement under applicable copyright law, except executing it on a
- computer or modifying a private copy.  Propagation includes copying,
- distribution (with or without modification), making available to the
- public, and in some countries other activities as well.
- 
-   To "convey" a work means any kind of propagation that enables other
- parties to make or receive copies.  Mere interaction with a user through
- a computer network, with no transfer of a copy, is not conveying.
- 
-   An interactive user interface displays "Appropriate Legal Notices"
- to the extent that it includes a convenient and prominently visible
- feature that (1) displays an appropriate copyright notice, and (2)
- tells the user that there is no warranty for the work (except to the
- extent that warranties are provided), that licensees may convey the
- work under this License, and how to view a copy of this License.  If
- the interface presents a list of user commands or options, such as a
- menu, a prominent item in the list meets this criterion.
- 
-   1. Source Code.
- 
-   The "source code" for a work means the preferred form of the work
- for making modifications to it.  "Object code" means any non-source
- form of a work.
- 
-   A "Standard Interface" means an interface that either is an official
- standard defined by a recognized standards body, or, in the case of
- interfaces specified for a particular programming language, one that
- is widely used among developers working in that language.
- 
-   The "System Libraries" of an executable work include anything, other
- than the work as a whole, that (a) is included in the normal form of
- packaging a Major Component, but which is not part of that Major
- Component, and (b) serves only to enable use of the work with that
- Major Component, or to implement a Standard Interface for which an
- implementation is available to the public in source code form.  A
- "Major Component", in this context, means a major essential component
- (kernel, window system, and so on) of the specific operating system
- (if any) on which the executable work runs, or a compiler used to
- produce the work, or an object code interpreter used to run it.
- 
-   The "Corresponding Source" for a work in object code form means all
- the source code needed to generate, install, and (for an executable
- work) run the object code and to modify the work, including scripts to
- control those activities.  However, it does not include the work's
- System Libraries, or general-purpose tools or generally available free
- programs which are used unmodified in performing those activities but
- which are not part of the work.  For example, Corresponding Source
- includes interface definition files associated with source files for
- the work, and the source code for shared libraries and dynamically
- linked subprograms that the work is specifically designed to require,
- such as by intimate data communication or control flow between those
- subprograms and other parts of the work.
- 
-   The Corresponding Source need not include anything that users
- can regenerate automatically from other parts of the Corresponding
- Source.
- 
-   The Corresponding Source for a work in source code form is that
- same work.
- 
-   2. Basic Permissions.
- 
-   All rights granted under this License are granted for the term of
- copyright on the Program, and are irrevocable provided the stated
- conditions are met.  This License explicitly affirms your unlimited
- permission to run the unmodified Program.  The output from running a
- covered work is covered by this License only if the output, given its
- content, constitutes a covered work.  This License acknowledges your
- rights of fair use or other equivalent, as provided by copyright law.
- 
-   You may make, run and propagate covered works that you do not
- convey, without conditions so long as your license otherwise remains
- in force.  You may convey covered works to others for the sole purpose
- of having them make modifications exclusively for you, or provide you
- with facilities for running those works, provided that you comply with
- the terms of this License in conveying all material for which you do
- not control copyright.  Those thus making or running the covered works
- for you must do so exclusively on your behalf, under your direction
- and control, on terms that prohibit them from making any copies of
- your copyrighted material outside their relationship with you.
- 
-   Conveying under any other circumstances is permitted solely under
- the conditions stated below.  Sublicensing is not allowed; section 10
- makes it unnecessary.
- 
-   3. Protecting Users' Legal Rights From Anti-Circumvention Law.
- 
-   No covered work shall be deemed part of an effective technological
- measure under any applicable law fulfilling obligations under article
- 11 of the WIPO copyright treaty adopted on 20 December 1996, or
- similar laws prohibiting or restricting circumvention of such
- measures.
- 
-   When you convey a covered work, you waive any legal power to forbid
- circumvention of technological measures to the extent such circumvention
- is effected by exercising rights under this License with respect to
- the covered work, and you disclaim any intention to limit operation or
- modification of the work as a means of enforcing, against the work's
- users, your or third parties' legal rights to forbid circumvention of
- technological measures.
- 
-   4. Conveying Verbatim Copies.
- 
-   You may convey verbatim copies of the Program's source code as you
- receive it, in any medium, provided that you conspicuously and
- appropriately publish on each copy an appropriate copyright notice;
- keep intact all notices stating that this License and any
- non-permissive terms added in accord with section 7 apply to the code;
- keep intact all notices of the absence of any warranty; and give all
- recipients a copy of this License along with the Program.
- 
-   You may charge any price or no price for each copy that you convey,
- and you may offer support or warranty protection for a fee.
- 
-   5. Conveying Modified Source Versions.
- 
-   You may convey a work based on the Program, or the modifications to
- produce it from the Program, in the form of source code under the
- terms of section 4, provided that you also meet all of these conditions:
- 
-     a) The work must carry prominent notices stating that you modified
-     it, and giving a relevant date.
- 
-     b) The work must carry prominent notices stating that it is
-     released under this License and any conditions added under section
-     7.  This requirement modifies the requirement in section 4 to
-     "keep intact all notices".
- 
-     c) You must license the entire work, as a whole, under this
-     License to anyone who comes into possession of a copy.  This
-     License will therefore apply, along with any applicable section 7
-     additional terms, to the whole of the work, and all its parts,
-     regardless of how they are packaged.  This License gives no
-     permission to license the work in any other way, but it does not
-     invalidate such permission if you have separately received it.
- 
-     d) If the work has interactive user interfaces, each must display
-     Appropriate Legal Notices; however, if the Program has interactive
-     interfaces that do not display Appropriate Legal Notices, your
-     work need not make them do so.
- 
-   A compilation of a covered work with other separate and independent
- works, which are not by their nature extensions of the covered work,
- and which are not combined with it such as to form a larger program,
- in or on a volume of a storage or distribution medium, is called an
- "aggregate" if the compilation and its resulting copyright are not
- used to limit the access or legal rights of the compilation's users
- beyond what the individual works permit.  Inclusion of a covered work
- in an aggregate does not cause this License to apply to the other
- parts of the aggregate.
- 
-   6. Conveying Non-Source Forms.
- 
-   You may convey a covered work in object code form under the terms
- of sections 4 and 5, provided that you also convey the
- machine-readable Corresponding Source under the terms of this License,
- in one of these ways:
- 
-     a) Convey the object code in, or embodied in, a physical product
-     (including a physical distribution medium), accompanied by the
-     Corresponding Source fixed on a durable physical medium
-     customarily used for software interchange.
- 
-     b) Convey the object code in, or embodied in, a physical product
-     (including a physical distribution medium), accompanied by a
-     written offer, valid for at least three years and valid for as
-     long as you offer spare parts or customer support for that product
-     model, to give anyone who possesses the object code either (1) a
-     copy of the Corresponding Source for all the software in the
-     product that is covered by this License, on a durable physical
-     medium customarily used for software interchange, for a price no
-     more than your reasonable cost of physically performing this
-     conveying of source, or (2) access to copy the
-     Corresponding Source from a network server at no charge.
- 
-     c) Convey individual copies of the object code with a copy of the
-     written offer to provide the Corresponding Source.  This
-     alternative is allowed only occasionally and noncommercially, and
-     only if you received the object code with such an offer, in accord
-     with subsection 6b.
- 
-     d) Convey the object code by offering access from a designated
-     place (gratis or for a charge), and offer equivalent access to the
-     Corresponding Source in the same way through the same place at no
-     further charge.  You need not require recipients to copy the
-     Corresponding Source along with the object code.  If the place to
-     copy the object code is a network server, the Corresponding Source
-     may be on a different server (operated by you or a third party)
-     that supports equivalent copying facilities, provided you maintain
-     clear directions next to the object code saying where to find the
-     Corresponding Source.  Regardless of what server hosts the
-     Corresponding Source, you remain obligated to ensure that it is
-     available for as long as needed to satisfy these requirements.
- 
-     e) Convey the object code using peer-to-peer transmission, provided
-     you inform other peers where the object code and Corresponding
-     Source of the work are being offered to the general public at no
-     charge under subsection 6d.
- 
-   A separable portion of the object code, whose source code is excluded
- from the Corresponding Source as a System Library, need not be
- included in conveying the object code work.
- 
-   A "User Product" is either (1) a "consumer product", which means any
- tangible personal property which is normally used for personal, family,
- or household purposes, or (2) anything designed or sold for incorporation
- into a dwelling.  In determining whether a product is a consumer product,
- doubtful cases shall be resolved in favor of coverage.  For a particular
- product received by a particular user, "normally used" refers to a
- typical or common use of that class of product, regardless of the status
- of the particular user or of the way in which the particular user
- actually uses, or expects or is expected to use, the product.  A product
- is a consumer product regardless of whether the product has substantial
- commercial, industrial or non-consumer uses, unless such uses represent
- the only significant mode of use of the product.
- 
-   "Installation Information" for a User Product means any methods,
- procedures, authorization keys, or other information required to install
- and execute modified versions of a covered work in that User Product from
- a modified version of its Corresponding Source.  The information must
- suffice to ensure that the continued functioning of the modified object
- code is in no case prevented or interfered with solely because
- modification has been made.
- 
-   If you convey an object code work under this section in, or with, or
- specifically for use in, a User Product, and the conveying occurs as
- part of a transaction in which the right of possession and use of the
- User Product is transferred to the recipient in perpetuity or for a
- fixed term (regardless of how the transaction is characterized), the
- Corresponding Source conveyed under this section must be accompanied
- by the Installation Information.  But this requirement does not apply
- if neither you nor any third party retains the ability to install
- modified object code on the User Product (for example, the work has
- been installed in ROM).
- 
-   The requirement to provide Installation Information does not include a
- requirement to continue to provide support service, warranty, or updates
- for a work that has been modified or installed by the recipient, or for
- the User Product in which it has been modified or installed.  Access to a
- network may be denied when the modification itself materially and
- adversely affects the operation of the network or violates the rules and
- protocols for communication across the network.
- 
-   Corresponding Source conveyed, and Installation Information provided,
- in accord with this section must be in a format that is publicly
- documented (and with an implementation available to the public in
- source code form), and must require no special password or key for
- unpacking, reading or copying.
- 
-   7. Additional Terms.
- 
-   "Additional permissions" are terms that supplement the terms of this
- License by making exceptions from one or more of its conditions.
- Additional permissions that are applicable to the entire Program shall
- be treated as though they were included in this License, to the extent
- that they are valid under applicable law.  If additional permissions
- apply only to part of the Program, that part may be used separately
- under those permissions, but the entire Program remains governed by
- this License without regard to the additional permissions.
- 
-   When you convey a copy of a covered work, you may at your option
- remove any additional permissions from that copy, or from any part of
- it.  (Additional permissions may be written to require their own
- removal in certain cases when you modify the work.)  You may place
- additional permissions on material, added by you to a covered work,
- for which you have or can give appropriate copyright permission.
- 
-   Notwithstanding any other provision of this License, for material you
- add to a covered work, you may (if authorized by the copyright holders of
- that material) supplement the terms of this License with terms:
- 
-     a) Disclaiming warranty or limiting liability differently from the
-     terms of sections 15 and 16 of this License; or
- 
-     b) Requiring preservation of specified reasonable legal notices or
-     author attributions in that material or in the Appropriate Legal
-     Notices displayed by works containing it; or
- 
-     c) Prohibiting misrepresentation of the origin of that material, or
-     requiring that modified versions of such material be marked in
-     reasonable ways as different from the original version; or
- 
-     d) Limiting the use for publicity purposes of names of licensors or
-     authors of the material; or
- 
-     e) Declining to grant rights under trademark law for use of some
-     trade names, trademarks, or service marks; or
- 
-     f) Requiring indemnification of licensors and authors of that
-     material by anyone who conveys the material (or modified versions of
-     it) with contractual assumptions of liability to the recipient, for
-     any liability that these contractual assumptions directly impose on
-     those licensors and authors.
- 
-   All other non-permissive additional terms are considered "further
- restrictions" within the meaning of section 10.  If the Program as you
- received it, or any part of it, contains a notice stating that it is
- governed by this License along with a term that is a further
- restriction, you may remove that term.  If a license document contains
- a further restriction but permits relicensing or conveying under this
- License, you may add to a covered work material governed by the terms
- of that license document, provided that the further restriction does
- not survive such relicensing or conveying.
- 
-   If you add terms to a covered work in accord with this section, you
- must place, in the relevant source files, a statement of the
- additional terms that apply to those files, or a notice indicating
- where to find the applicable terms.
- 
-   Additional terms, permissive or non-permissive, may be stated in the
- form of a separately written license, or stated as exceptions;
- the above requirements apply either way.
- 
-   8. Termination.
- 
-   You may not propagate or modify a covered work except as expressly
- provided under this License.  Any attempt otherwise to propagate or
- modify it is void, and will automatically terminate your rights under
- this License (including any patent licenses granted under the third
- paragraph of section 11).
- 
-   However, if you cease all violation of this License, then your
- license from a particular copyright holder is reinstated (a)
- provisionally, unless and until the copyright holder explicitly and
- finally terminates your license, and (b) permanently, if the copyright
- holder fails to notify you of the violation by some reasonable means
- prior to 60 days after the cessation.
- 
-   Moreover, your license from a particular copyright holder is
- reinstated permanently if the copyright holder notifies you of the
- violation by some reasonable means, this is the first time you have
- received notice of violation of this License (for any work) from that
- copyright holder, and you cure the violation prior to 30 days after
- your receipt of the notice.
- 
-   Termination of your rights under this section does not terminate the
- licenses of parties who have received copies or rights from you under
- this License.  If your rights have been terminated and not permanently
- reinstated, you do not qualify to receive new licenses for the same
- material under section 10.
- 
-   9. Acceptance Not Required for Having Copies.
- 
-   You are not required to accept this License in order to receive or
- run a copy of the Program.  Ancillary propagation of a covered work
- occurring solely as a consequence of using peer-to-peer transmission
- to receive a copy likewise does not require acceptance.  However,
- nothing other than this License grants you permission to propagate or
- modify any covered work.  These actions infringe copyright if you do
- not accept this License.  Therefore, by modifying or propagating a
- covered work, you indicate your acceptance of this License to do so.
- 
-   10. Automatic Licensing of Downstream Recipients.
- 
-   Each time you convey a covered work, the recipient automatically
- receives a license from the original licensors, to run, modify and
- propagate that work, subject to this License.  You are not responsible
- for enforcing compliance by third parties with this License.
- 
-   An "entity transaction" is a transaction transferring control of an
- organization, or substantially all assets of one, or subdividing an
- organization, or merging organizations.  If propagation of a covered
- work results from an entity transaction, each party to that
- transaction who receives a copy of the work also receives whatever
- licenses to the work the party's predecessor in interest had or could
- give under the previous paragraph, plus a right to possession of the
- Corresponding Source of the work from the predecessor in interest, if
- the predecessor has it or can get it with reasonable efforts.
- 
-   You may not impose any further restrictions on the exercise of the
- rights granted or affirmed under this License.  For example, you may
- not impose a license fee, royalty, or other charge for exercise of
- rights granted under this License, and you may not initiate litigation
- (including a cross-claim or counterclaim in a lawsuit) alleging that
- any patent claim is infringed by making, using, selling, offering for
- sale, or importing the Program or any portion of it.
- 
-   11. Patents.
- 
-   A "contributor" is a copyright holder who authorizes use under this
- License of the Program or a work on which the Program is based.  The
- work thus licensed is called the contributor's "contributor version".
- 
-   A contributor's "essential patent claims" are all patent claims
- owned or controlled by the contributor, whether already acquired or
- hereafter acquired, that would be infringed by some manner, permitted
- by this License, of making, using, or selling its contributor version,
- but do not include claims that would be infringed only as a
- consequence of further modification of the contributor version.  For
- purposes of this definition, "control" includes the right to grant
- patent sublicenses in a manner consistent with the requirements of
- this License.
- 
-   Each contributor grants you a non-exclusive, worldwide, royalty-free
- patent license under the contributor's essential patent claims, to
- make, use, sell, offer for sale, import and otherwise run, modify and
- propagate the contents of its contributor version.
- 
-   In the following three paragraphs, a "patent license" is any express
- agreement or commitment, however denominated, not to enforce a patent
- (such as an express permission to practice a patent or covenant not to
- sue for patent infringement).  To "grant" such a patent license to a
- party means to make such an agreement or commitment not to enforce a
- patent against the party.
- 
-   If you convey a covered work, knowingly relying on a patent license,
- and the Corresponding Source of the work is not available for anyone
- to copy, free of charge and under the terms of this License, through a
- publicly available network server or other readily accessible means,
- then you must either (1) cause the Corresponding Source to be so
- available, or (2) arrange to deprive yourself of the benefit of the
- patent license for this particular work, or (3) arrange, in a manner
- consistent with the requirements of this License, to extend the patent
- license to downstream recipients.  "Knowingly relying" means you have
- actual knowledge that, but for the patent license, your conveying the
- covered work in a country, or your recipient's use of the covered work
- in a country, would infringe one or more identifiable patents in that
- country that you have reason to believe are valid.
- 
-   If, pursuant to or in connection with a single transaction or
- arrangement, you convey, or propagate by procuring conveyance of, a
- covered work, and grant a patent license to some of the parties
- receiving the covered work authorizing them to use, propagate, modify
- or convey a specific copy of the covered work, then the patent license
- you grant is automatically extended to all recipients of the covered
- work and works based on it.
- 
-   A patent license is "discriminatory" if it does not include within
- the scope of its coverage, prohibits the exercise of, or is
- conditioned on the non-exercise of one or more of the rights that are
- specifically granted under this License.  You may not convey a covered
- work if you are a party to an arrangement with a third party that is
- in the business of distributing software, under which you make payment
- to the third party based on the extent of your activity of conveying
- the work, and under which the third party grants, to any of the
- parties who would receive the covered work from you, a discriminatory
- patent license (a) in connection with copies of the covered work
- conveyed by you (or copies made from those copies), or (b) primarily
- for and in connection with specific products or compilations that
- contain the covered work, unless you entered into that arrangement,
- or that patent license was granted, prior to 28 March 2007.
- 
-   Nothing in this License shall be construed as excluding or limiting
- any implied license or other defenses to infringement that may
- otherwise be available to you under applicable patent law.
- 
-   12. No Surrender of Others' Freedom.
- 
-   If conditions are imposed on you (whether by court order, agreement or
- otherwise) that contradict the conditions of this License, they do not
- excuse you from the conditions of this License.  If you cannot convey a
- covered work so as to satisfy simultaneously your obligations under this
- License and any other pertinent obligations, then as a consequence you may
- not convey it at all.  For example, if you agree to terms that obligate you
- to collect a royalty for further conveying from those to whom you convey
- the Program, the only way you could satisfy both those terms and this
- License would be to refrain entirely from conveying the Program.
- 
-   13. Use with the GNU Affero General Public License.
- 
-   Notwithstanding any other provision of this License, you have
- permission to link or combine any covered work with a work licensed
- under version 3 of the GNU Affero General Public License into a single
- combined work, and to convey the resulting work.  The terms of this
- License will continue to apply to the part which is the covered work,
- but the special requirements of the GNU Affero General Public License,
- section 13, concerning interaction through a network will apply to the
- combination as such.
- 
-   14. Revised Versions of this License.
- 
-   The Free Software Foundation may publish revised and/or new versions of
- the GNU General Public License from time to time.  Such new versions will
- be similar in spirit to the present version, but may differ in detail to
- address new problems or concerns.
- 
-   Each version is given a distinguishing version number.  If the
- Program specifies that a certain numbered version of the GNU General
- Public License "or any later version" applies to it, you have the
- option of following the terms and conditions either of that numbered
- version or of any later version published by the Free Software
- Foundation.  If the Program does not specify a version number of the
- GNU General Public License, you may choose any version ever published
- by the Free Software Foundation.
- 
-   If the Program specifies that a proxy can decide which future
- versions of the GNU General Public License can be used, that proxy's
- public statement of acceptance of a version permanently authorizes you
- to choose that version for the Program.
- 
-   Later license versions may give you additional or different
- permissions.  However, no additional obligations are imposed on any
- author or copyright holder as a result of your choosing to follow a
- later version.
- 
-   15. Disclaimer of Warranty.
- 
-   THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
- APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
- HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
- OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
- THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
- IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
- ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
- 
-   16. Limitation of Liability.
- 
-   IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
- WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
- THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
- GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
- USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
- DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
- PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
- EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGES.
- 
-   17. Interpretation of Sections 15 and 16.
- 
-   If the disclaimer of warranty and limitation of liability provided
- above cannot be given local legal effect according to their terms,
- reviewing courts shall apply local law that most closely approximates
- an absolute waiver of all civil liability in connection with the
- Program, unless a warranty or assumption of liability accompanies a
- copy of the Program in return for a fee.
- 
-                      END OF TERMS AND CONDITIONS
- 
-             How to Apply These Terms to Your New Programs
- 
-   If you develop a new program, and you want it to be of the greatest
- possible use to the public, the best way to achieve this is to make it
- free software which everyone can redistribute and change under these terms.
- 
-   To do so, attach the following notices to the program.  It is safest
- to attach them to the start of each source file to most effectively
- state the exclusion of warranty; and each file should have at least
- the "copyright" line and a pointer to where the full notice is found.
- 
-     <one line to give the program's name and a brief idea of what it does.>
-     Copyright (C) <year>  <name of author>
- 
-     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 <http://www.gnu.org/licenses/>.
- 
- Also add information on how to contact you by electronic and paper mail.
- 
-   If the program does terminal interaction, make it output a short
- notice like this when it starts in an interactive mode:
- 
-     <program>  Copyright (C) <year>  <name of author>
-     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-     This is free software, and you are welcome to redistribute it
-     under certain conditions; type `show c' for details.
- 
- The hypothetical commands `show w' and `show c' should show the appropriate
- parts of the General Public License.  Of course, your program's commands
- might be different; for a GUI interface, you would use an "about box".
- 
-   You should also get your employer (if you work as a programmer) or school,
- if any, to sign a "copyright disclaimer" for the program, if necessary.
- For more information on this, and how to apply and follow the GNU GPL, see
- <http://www.gnu.org/licenses/>.
- 
-   The GNU General Public License does not permit incorporating your program
- into proprietary programs.  If your program is a subroutine library, you
- may consider it more useful to permit linking proprietary applications with
- the library.  If this is what you want to do, use the GNU Lesser General
- Public License instead of this License.  But first, please read
- <http://www.gnu.org/philosophy/why-not-lgpl.html>.
--- 0 ----
diff -Nrc2 texinfo-6.1/tp/MANIFEST texinfo-6.3/tp/MANIFEST
*** texinfo-6.1/tp/MANIFEST	2016-01-30 18:04:32.000000000 +0000
--- texinfo-6.3/tp/MANIFEST	2016-07-31 16:20:13.000000000 +0100
***************
*** 1309,1315 ****
  t/results/sectioning/sections.pl
  t/results/sectioning/semi_auto.pl
- t/results/sectioning/setcontentsaftertitlepage.pl
  t/results/sectioning/setfilename_on_top_and_after_node.pl
- t/results/sectioning/setshortcontentsaftertitlepage.pl
  t/results/sectioning/shortcontents.pl
  t/results/sectioning/space_in_node.pl
--- 1309,1313 ----
diff -Nrc2 texinfo-6.1/tp/Makefile.docstr texinfo-6.3/tp/Makefile.docstr
*** texinfo-6.1/tp/Makefile.docstr	2016-01-23 11:30:27.000000000 +0000
--- texinfo-6.3/tp/Makefile.docstr	2016-09-03 15:16:07.000000000 +0100
***************
*** 12,15 ****
--- 12,24 ----
  
  
+ $(srcdir)/../po_document/ca.gmo: $(srcdir)/../po_document/ca.po
+ 	cd $(srcdir)/../po_document/ && $(MAKE) $(AM_MAKEFLAGS) ca.gmo
+ 
+ LocaleData/ca/LC_MESSAGES/$(document_domain).mo: $(srcdir)/../po_document/ca.gmo
+ 	$(MKDIR_P) `dirname $@`
+ 	$(INSTALL_DATA) $(srcdir)/../po_document/ca.gmo $@
+ 
+ 
+ 
  $(srcdir)/../po_document/ca.us-ascii.gmo: $(srcdir)/../po_document/ca.us-ascii.po
  	cd $(srcdir)/../po_document/ && $(MAKE) $(AM_MAKEFLAGS) ca.us-ascii.gmo
***************
*** 21,24 ****
--- 30,42 ----
  
  
+ $(srcdir)/../po_document/de.gmo: $(srcdir)/../po_document/de.po
+ 	cd $(srcdir)/../po_document/ && $(MAKE) $(AM_MAKEFLAGS) de.gmo
+ 
+ LocaleData/de/LC_MESSAGES/$(document_domain).mo: $(srcdir)/../po_document/de.gmo
+ 	$(MKDIR_P) `dirname $@`
+ 	$(INSTALL_DATA) $(srcdir)/../po_document/de.gmo $@
+ 
+ 
+ 
  $(srcdir)/../po_document/de.us-ascii.gmo: $(srcdir)/../po_document/de.us-ascii.po
  	cd $(srcdir)/../po_document/ && $(MAKE) $(AM_MAKEFLAGS) de.us-ascii.gmo
***************
*** 30,33 ****
--- 48,60 ----
  
  
+ $(srcdir)/../po_document/el.gmo: $(srcdir)/../po_document/el.po
+ 	cd $(srcdir)/../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 $(srcdir)/../po_document/ && $(MAKE) $(AM_MAKEFLAGS) eo.gmo
***************
*** 66,69 ****
--- 93,105 ----
  
  
+ $(srcdir)/../po_document/hr.gmo: $(srcdir)/../po_document/hr.po
+ 	cd $(srcdir)/../po_document/ && $(MAKE) $(AM_MAKEFLAGS) hr.gmo
+ 
+ LocaleData/hr/LC_MESSAGES/$(document_domain).mo: $(srcdir)/../po_document/hr.gmo
+ 	$(MKDIR_P) `dirname $@`
+ 	$(INSTALL_DATA) $(srcdir)/../po_document/hr.gmo $@
+ 
+ 
+ 
  $(srcdir)/../po_document/it.gmo: $(srcdir)/../po_document/it.po
  	cd $(srcdir)/../po_document/ && $(MAKE) $(AM_MAKEFLAGS) it.gmo
***************
*** 102,105 ****
--- 138,159 ----
  
  
+ $(srcdir)/../po_document/pt.gmo: $(srcdir)/../po_document/pt.po
+ 	cd $(srcdir)/../po_document/ && $(MAKE) $(AM_MAKEFLAGS) pt.gmo
+ 
+ LocaleData/pt/LC_MESSAGES/$(document_domain).mo: $(srcdir)/../po_document/pt.gmo
+ 	$(MKDIR_P) `dirname $@`
+ 	$(INSTALL_DATA) $(srcdir)/../po_document/pt.gmo $@
+ 
+ 
+ 
+ $(srcdir)/../po_document/pt_BR.gmo: $(srcdir)/../po_document/pt_BR.po
+ 	cd $(srcdir)/../po_document/ && $(MAKE) $(AM_MAKEFLAGS) pt_BR.gmo
+ 
+ LocaleData/pt_BR/LC_MESSAGES/$(document_domain).mo: $(srcdir)/../po_document/pt_BR.gmo
+ 	$(MKDIR_P) `dirname $@`
+ 	$(INSTALL_DATA) $(srcdir)/../po_document/pt_BR.gmo $@
+ 
+ 
+ 
  $(srcdir)/../po_document/pt_BR.us-ascii.gmo: $(srcdir)/../po_document/pt_BR.us-ascii.po
  	cd $(srcdir)/../po_document/ && $(MAKE) $(AM_MAKEFLAGS) pt_BR.us-ascii.gmo
***************
*** 128,130 ****
  
  
! document_strings_mo_files =  LocaleData/ca.us-ascii/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/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_BR.us-ascii/LC_MESSAGES/$(document_domain).mo LocaleData/pt.us-ascii/LC_MESSAGES/$(document_domain).mo LocaleData/uk/LC_MESSAGES/$(document_domain).mo
--- 182,184 ----
  
  
! document_strings_mo_files =  LocaleData/ca/LC_MESSAGES/$(document_domain).mo LocaleData/ca.us-ascii/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/hu/LC_MESSAGES/$(document_domain).mo LocaleData/hr/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_BR/LC_MESSAGES/$(document_domain).mo LocaleData/pt_BR.us-ascii/LC_MESSAGES/$(document_domain).mo LocaleData/pt.us-ascii/LC_MESSAGES/$(document_domain).mo LocaleData/uk/LC_MESSAGES/$(document_domain).mo
diff -Nrc2 texinfo-6.1/tp/Makefile.in texinfo-6.3/tp/Makefile.in
*** texinfo-6.1/tp/Makefile.in	2016-02-06 12:24:06.000000000 +0000
--- texinfo-6.3/tp/Makefile.in	2016-09-10 20:29:57.000000000 +0100
***************
*** 138,141 ****
--- 138,142 ----
  	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
  	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+ 	$(top_srcdir)/gnulib/m4/hard-locale.m4 \
  	$(top_srcdir)/gnulib/m4/iconv.m4 \
  	$(top_srcdir)/gnulib/m4/include_next.m4 \
***************
*** 486,490 ****
    esac
  am__DIST_COMMON = $(srcdir)/Makefile.docstr $(srcdir)/Makefile.in \
! 	$(srcdir)/Makefile.tres $(srcdir)/defs.in COPYING README TODO
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  am__relativize = \
--- 487,491 ----
    esac
  am__DIST_COMMON = $(srcdir)/Makefile.docstr $(srcdir)/Makefile.in \
! 	$(srcdir)/Makefile.tres $(srcdir)/defs.in README TODO
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  am__relativize = \
***************
*** 1795,1798 ****
--- 1796,1800 ----
    t/results/info_tests/center_flush.pl \
    t/results/info_tests/colon_in_index_entry.pl \
+   t/results/info_tests/colon_in_index_entry.pl \
    t/results/info_tests/contents_setcontentsaftertitlepage_before_node.pl \
    t/results/info_tests/def_in_copying.pl \
***************
*** 2367,2373 ****
    t/results/sectioning/sections.pl \
    t/results/sectioning/semi_auto.pl \
-   t/results/sectioning/setcontentsaftertitlepage.pl \
    t/results/sectioning/setfilename_on_top_and_after_node.pl \
-   t/results/sectioning/setshortcontentsaftertitlepage.pl \
    t/results/sectioning/shortcontents.pl \
    t/results/sectioning/space_in_node.pl \
--- 2369,2373 ----
***************
*** 2473,2477 ****
  
  test_copied_include_files = t/include_dir/f--ile.png t/include_dir/f--ile.txt t/include_dir/figure.txt t/include_dir/inc_file.texi t/include_dir/incl-incl.txi t/include_dir/macro_included.texi t/include_dir/section_file.texi
! document_strings_mo_files = LocaleData/ca.us-ascii/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/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_BR.us-ascii/LC_MESSAGES/$(document_domain).mo LocaleData/pt.us-ascii/LC_MESSAGES/$(document_domain).mo LocaleData/uk/LC_MESSAGES/$(document_domain).mo
  SUBDIRS = $(am__append_1) . tests
  DIST_SUBDIRS = Texinfo/Convert/XSParagraph tests
--- 2473,2477 ----
  
  test_copied_include_files = t/include_dir/f--ile.png t/include_dir/f--ile.txt t/include_dir/figure.txt t/include_dir/inc_file.texi t/include_dir/incl-incl.txi t/include_dir/macro_included.texi t/include_dir/section_file.texi
! document_strings_mo_files = LocaleData/ca/LC_MESSAGES/$(document_domain).mo LocaleData/ca.us-ascii/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/hu/LC_MESSAGES/$(document_domain).mo LocaleData/hr/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_BR/LC_MESSAGES/$(document_domain).mo LocaleData/pt_BR.us-ascii/LC_MESSAGES/$(document_domain).mo LocaleData/pt.us-ascii/LC_MESSAGES/$(document_domain).mo LocaleData/uk/LC_MESSAGES/$(document_domain).mo
  SUBDIRS = $(am__append_1) . tests
  DIST_SUBDIRS = Texinfo/Convert/XSParagraph tests
***************
*** 3308,3311 ****
--- 3308,3318 ----
  	$(INSTALL_DATA) $(srcdir)/t/include_reference/section_file.texi $@
  
+ $(srcdir)/../po_document/ca.gmo: $(srcdir)/../po_document/ca.po
+ 	cd $(srcdir)/../po_document/ && $(MAKE) $(AM_MAKEFLAGS) ca.gmo
+ 
+ LocaleData/ca/LC_MESSAGES/$(document_domain).mo: $(srcdir)/../po_document/ca.gmo
+ 	$(MKDIR_P) `dirname $@`
+ 	$(INSTALL_DATA) $(srcdir)/../po_document/ca.gmo $@
+ 
  $(srcdir)/../po_document/ca.us-ascii.gmo: $(srcdir)/../po_document/ca.us-ascii.po
  	cd $(srcdir)/../po_document/ && $(MAKE) $(AM_MAKEFLAGS) ca.us-ascii.gmo
***************
*** 3315,3318 ****
--- 3322,3332 ----
  	$(INSTALL_DATA) $(srcdir)/../po_document/ca.us-ascii.gmo $@
  
+ $(srcdir)/../po_document/de.gmo: $(srcdir)/../po_document/de.po
+ 	cd $(srcdir)/../po_document/ && $(MAKE) $(AM_MAKEFLAGS) de.gmo
+ 
+ LocaleData/de/LC_MESSAGES/$(document_domain).mo: $(srcdir)/../po_document/de.gmo
+ 	$(MKDIR_P) `dirname $@`
+ 	$(INSTALL_DATA) $(srcdir)/../po_document/de.gmo $@
+ 
  $(srcdir)/../po_document/de.us-ascii.gmo: $(srcdir)/../po_document/de.us-ascii.po
  	cd $(srcdir)/../po_document/ && $(MAKE) $(AM_MAKEFLAGS) de.us-ascii.gmo
***************
*** 3322,3325 ****
--- 3336,3346 ----
  	$(INSTALL_DATA) $(srcdir)/../po_document/de.us-ascii.gmo $@
  
+ $(srcdir)/../po_document/el.gmo: $(srcdir)/../po_document/el.po
+ 	cd $(srcdir)/../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 $(srcdir)/../po_document/ && $(MAKE) $(AM_MAKEFLAGS) eo.gmo
***************
*** 3350,3353 ****
--- 3371,3381 ----
  	$(INSTALL_DATA) $(srcdir)/../po_document/hu.gmo $@
  
+ $(srcdir)/../po_document/hr.gmo: $(srcdir)/../po_document/hr.po
+ 	cd $(srcdir)/../po_document/ && $(MAKE) $(AM_MAKEFLAGS) hr.gmo
+ 
+ LocaleData/hr/LC_MESSAGES/$(document_domain).mo: $(srcdir)/../po_document/hr.gmo
+ 	$(MKDIR_P) `dirname $@`
+ 	$(INSTALL_DATA) $(srcdir)/../po_document/hr.gmo $@
+ 
  $(srcdir)/../po_document/it.gmo: $(srcdir)/../po_document/it.po
  	cd $(srcdir)/../po_document/ && $(MAKE) $(AM_MAKEFLAGS) it.gmo
***************
*** 3378,3381 ****
--- 3406,3423 ----
  	$(INSTALL_DATA) $(srcdir)/../po_document/pl.gmo $@
  
+ $(srcdir)/../po_document/pt.gmo: $(srcdir)/../po_document/pt.po
+ 	cd $(srcdir)/../po_document/ && $(MAKE) $(AM_MAKEFLAGS) pt.gmo
+ 
+ LocaleData/pt/LC_MESSAGES/$(document_domain).mo: $(srcdir)/../po_document/pt.gmo
+ 	$(MKDIR_P) `dirname $@`
+ 	$(INSTALL_DATA) $(srcdir)/../po_document/pt.gmo $@
+ 
+ $(srcdir)/../po_document/pt_BR.gmo: $(srcdir)/../po_document/pt_BR.po
+ 	cd $(srcdir)/../po_document/ && $(MAKE) $(AM_MAKEFLAGS) pt_BR.gmo
+ 
+ LocaleData/pt_BR/LC_MESSAGES/$(document_domain).mo: $(srcdir)/../po_document/pt_BR.gmo
+ 	$(MKDIR_P) `dirname $@`
+ 	$(INSTALL_DATA) $(srcdir)/../po_document/pt_BR.gmo $@
+ 
  $(srcdir)/../po_document/pt_BR.us-ascii.gmo: $(srcdir)/../po_document/pt_BR.us-ascii.po
  	cd $(srcdir)/../po_document/ && $(MAKE) $(AM_MAKEFLAGS) pt_BR.us-ascii.gmo
diff -Nrc2 texinfo-6.1/tp/Makefile.tres texinfo-6.3/tp/Makefile.tres
*** texinfo-6.1/tp/Makefile.tres	2016-01-23 11:30:27.000000000 +0000
--- texinfo-6.3/tp/Makefile.tres	2016-02-21 18:17:46.000000000 +0000
***************
*** 531,534 ****
--- 531,535 ----
    t/results/info_tests/center_flush.pl \
    t/results/info_tests/colon_in_index_entry.pl \
+   t/results/info_tests/colon_in_index_entry.pl \
    t/results/info_tests/contents_setcontentsaftertitlepage_before_node.pl \
    t/results/info_tests/def_in_copying.pl \
***************
*** 1103,1109 ****
    t/results/sectioning/sections.pl \
    t/results/sectioning/semi_auto.pl \
-   t/results/sectioning/setcontentsaftertitlepage.pl \
    t/results/sectioning/setfilename_on_top_and_after_node.pl \
-   t/results/sectioning/setshortcontentsaftertitlepage.pl \
    t/results/sectioning/shortcontents.pl \
    t/results/sectioning/space_in_node.pl \
--- 1104,1108 ----
diff -Nrc2 texinfo-6.1/tp/Texinfo/Common.pm texinfo-6.3/tp/Texinfo/Common.pm
*** texinfo-6.1/tp/Texinfo/Common.pm	2016-02-06 12:21:52.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Common.pm	2016-09-10 20:27:56.000000000 +0100
***************
*** 1,3 ****
! # $Id: Common.pm 6991 2016-02-06 12:16:13Z gavin $
  # Common.pm: definition of commands. Common code of other Texinfo modules.
  #
--- 1,3 ----
! # $Id: Common.pm 7353 2016-09-10 13:03:54Z gavin $
  # Common.pm: definition of commands. Common code of other Texinfo modules.
  #
***************
*** 72,76 ****
  );
  
! $VERSION = '6.1';
  
  # i18n
--- 72,76 ----
  );
  
! $VERSION = '6.2';
  
  # i18n
***************
*** 127,131 ****
                                # as obtained by parsing the @macro
    'merged_indices' => {},     # the key is merged in the value
-   'novalidate' => 0,          # same as setting @novalidate.
    'validatemenus' => 0,       # same as setting @validatemenus.
    'sections_level' => 0,      # modified by raise/lowersections
--- 127,130 ----
***************
*** 133,146 ****
                                # the key is the name, the value the @set name 
                                # argument.  A Texinfo tree may also be used.
  );
  
- # command-line options
- #my @command_line_settable_at_commands = ('footnotestyle', 'novalidate',
- #  'documentlanguage', 'paragraphindent');
- 
- 
- # FIXME maybe this should better be set as texinfo passed to texi2any as
- # texi2dvi --command 
- 
  # customization options
  our %document_settable_at_commands = (
--- 132,140 ----
                                # the key is the name, the value the @set name 
                                # argument.  A Texinfo tree may also be used.
+   'info' => {
+     'novalidate' => 0,        # same as setting @novalidate.
+   }
  );
  
  # customization options
  our %document_settable_at_commands = (
***************
*** 183,189 ****
    'pagesizes' => undef,
    'setchapternewpage' => 'on',
-   'setcontentsaftertitlepage' => 0,
    'setfilename' => undef,
-   'setshortcontentsaftertitlepage' => 0,
    'everyheading'      => undef,
    'everyfooting'      => undef,
--- 177,181 ----
***************
*** 266,270 ****
    'TEXINFO_DTD_VERSION', 'TEXINFO_COLUMN_FOR_DESCRIPTION',
    'TEXINFO_OUTPUT_FORMAT', 'INFO_SPECIAL_CHARS_WARNING',
!   'INDEX_SPECIAL_CHARS_WARNING', 'INFO_SPECIAL_CHARS_QUOTE'
  );
  # Not strings. 
--- 258,263 ----
    'TEXINFO_DTD_VERSION', 'TEXINFO_COLUMN_FOR_DESCRIPTION',
    'TEXINFO_OUTPUT_FORMAT', 'INFO_SPECIAL_CHARS_WARNING',
!   'INDEX_SPECIAL_CHARS_WARNING', 'INFO_SPECIAL_CHARS_QUOTE',
!   'HTMLXREF'
  );
  # Not strings. 
***************
*** 427,432 ****
    'clickstyle'        => 'special', # arg should be an @-command
    # more relevant in preamble
-   'setcontentsaftertitlepage'      => 'skipline', # no arg
-   'setshortcontentsaftertitlepage' => 'skipline', # no arg
    'documentencoding'  => 'text', # or 1?
    'novalidate'        => 'skipline', # no arg
--- 420,423 ----
***************
*** 515,518 ****
--- 506,511 ----
    # obsolete @-commands.
    'refill'            => 'noarg',   # no arg (obsolete, to be ignored)
+   'setcontentsaftertitlepage'      => 'skipline', # no arg
+   'setshortcontentsaftertitlepage' => 'skipline', # no arg
    # Remove spaces and end of lines after the 
    # commands? If no, they can lead to empty lines
***************
*** 521,548 ****
  );
  
- # key is index name, keys of the reference value are the prefixes.
- # value associated with the prefix is 0 if the prefix is not a code-like
- # prefix, 1 if it is a code-like prefix (set by defcodeindex/syncodeindex).
- #our %index_names = (
- # 'cp' => {'cp' => 0, 'c' => 0},
- # 'fn' => {'fn' => 1, 'f' => 1},
- # 'vr' => {'vr' => 1, 'v' => 1},
- # 'ky' => {'ky' => 1, 'k' => 1},
- # 'pg' => {'pg' => 1, 'p' => 1},
- # 'tp' => {'tp' => 1, 't' => 1}
- #);
- 
  our %index_names = (
!  'cp' => {'prefix' => ['c'], 'in_code' => 0},
!  'fn' => {'prefix' => ['f'], 'in_code' => 1},
!  'vr' => {'prefix' => ['v'], 'in_code' => 1},
!  'ky' => {'prefix' => ['k'], 'in_code' => 1},
!  'pg' => {'prefix' => ['p'], 'in_code' => 1},
!  'tp' => {'prefix' => ['t'], 'in_code' => 1},
  );
  
  foreach my $index(keys(%index_names)) {
    $index_names{$index}->{'name'} = $index;
-   push @{$index_names{$index}->{'prefix'}}, $index;
  }
  
--- 514,528 ----
  );
  
  our %index_names = (
!  'cp' => {'in_code' => 0},
!  'fn' => {'in_code' => 1},
!  'vr' => {'in_code' => 1},
!  'ky' => {'in_code' => 1},
!  'pg' => {'in_code' => 1},
!  'tp' => {'in_code' => 1},
  );
  
  foreach my $index(keys(%index_names)) {
    $index_names{$index}->{'name'} = $index;
  }
  
***************
*** 550,555 ****
  # all the commands are readded dynamically in the Parser.
  foreach my $index_name (keys (%index_names)) {
!   foreach my $index_prefix (@{$index_names{$index_name}->{'prefix'}}) {
!     next if ($index_prefix eq $index_name);
      # only put the one letter versions in the hash.
      $misc_commands{$index_prefix.'index'} = 'line';
--- 530,535 ----
  # all the commands are readded dynamically in the Parser.
  foreach my $index_name (keys (%index_names)) {
!   if ($index_name =~ /^(.).$/) {
!     my $index_prefix = $1;
      # only put the one letter versions in the hash.
      $misc_commands{$index_prefix.'index'} = 'line';
***************
*** 728,746 ****
  );
  
! # the type of index, f: function, v: variable, t: type
  my %index_type_def = (
!  'f' => ['deffn', 'deftypefn', 'deftypeop', 'defop'],
!  'v' => ['defvr', 'deftypevr', 'defcv', 'deftypecv' ],
!  't' => ['deftp']
  );
  
! our %command_index_prefix;
  
! $command_index_prefix{'vtable'} = 'v';
! $command_index_prefix{'ftable'} = 'f';
  
  foreach my $index_type (keys %index_type_def) {
    foreach my $def (@{$index_type_def{$index_type}}) {
!     $command_index_prefix{$def} = $index_type;
    }
  }
--- 708,727 ----
  );
  
! # the type of index, fn: function, vr: variable, tp: type
  my %index_type_def = (
!  'fn' => ['deffn', 'deftypefn', 'deftypeop', 'defop'],
!  'vr' => ['defvr', 'deftypevr', 'defcv', 'deftypecv' ],
!  'tp' => ['deftp']
  );
  
! # Keys are commmands, values are names of indices.
! our %command_index;
  
! $command_index{'vtable'} = 'vr';
! $command_index{'ftable'} = 'fn';
  
  foreach my $index_type (keys %index_type_def) {
    foreach my $def (@{$index_type_def{$index_type}}) {
!     $command_index{$def} = $index_type;
    }
  }
***************
*** 751,755 ****
    if (ref($def_map{$def_command}) eq 'HASH') {
      my ($real_command) = keys (%{$def_map{$def_command}});
!     $command_index_prefix{$def_command} = $command_index_prefix{$real_command};
      $def_aliases{$def_command} = $real_command;
    }
--- 732,736 ----
    if (ref($def_map{$def_command}) eq 'HASH') {
      my ($real_command) = keys (%{$def_map{$def_command}});
!     $command_index{$def_command} = $command_index{$real_command};
      $def_aliases{$def_command} = $real_command;
    }
***************
*** 758,762 ****
    $def_commands{$def_command} = 1;
    $def_commands{$def_command.'x'} = 1;
!   $command_index_prefix{$def_command.'x'} = $command_index_prefix{$def_command};
  }
  
--- 739,743 ----
    $def_commands{$def_command} = 1;
    $def_commands{$def_command.'x'} = 1;
!   $command_index{$def_command.'x'} = $command_index{$def_command};
  }
  
***************
*** 881,884 ****
--- 862,872 ----
    'allow-recursion' => N__('recursion is always allowed'),
    'quote-arg' => N__('arguments are quoted by default'),
+ 
+   'setcontentsaftertitlepage' =>
+ N__('move your @contents command if you want the contents after the title page'),
+ 
+   'setshortcontentsaftertitlepage' =>
+ N__('move your @shortcontents and @contents commands if you want the contents after the title page'),
+ 
  );
  
***************
*** 1193,1199 ****
      if (!defined($arg_class));
    
!   my $style = 
!     $command_index_prefix{$current->{'extra'}->{'def_command'}};
!   if ($style eq 'f') {
      if ($self) {
        return $self->gdt('{category} on {class}', { 'category' => $arg_category,
--- 1181,1186 ----
      if (!defined($arg_class));
    
!   my $style = $command_index{$current->{'extra'}->{'def_command'}};
!   if ($style eq 'fn') {
      if ($self) {
        return $self->gdt('{category} on {class}', { 'category' => $arg_category,
***************
*** 1202,1206 ****
        return {'contents' => [$arg_category, {'text' => ' on '}, $arg_class]};
      }
!   } elsif ($style eq 'v') {
      if ($self) {
        return $self->gdt('{category} of {class}', { 'category' => $arg_category,
--- 1189,1193 ----
        return {'contents' => [$arg_category, {'text' => ' on '}, $arg_class]};
      }
!   } elsif ($style eq 'vr') {
      if ($self) {
        return $self->gdt('{category} of {class}', { 'category' => $arg_category,
***************
*** 1366,1369 ****
--- 1353,1475 ----
  }
  
+ sub _find_end_brace($$)
+ {
+   my $text = shift;
+   my $braces_count = shift;
+ 
+   my $before = '';
+   while ($braces_count > 0 and length($text)) {
+     if ($text =~ s/([^()]*)([()])//) {
+       $before .= $1.$2;
+       my $brace = $2;
+       if ($brace eq '(') {
+         $braces_count++;
+       } else {
+         $braces_count--;
+         if ($braces_count == 0) {
+           return ($before, $text, 0);
+         }
+       }
+     } else {
+       $before .= $text;
+       $text = '';
+     }
+   }
+   return ($before, undef, $braces_count);
+ }
+ 
+ # This only counts opening braces, and returns 0 once all the parentheses
+ # are closed
+ sub _count_opened_tree_braces($$);
+ sub _count_opened_tree_braces($$)
+ {
+   my $current = shift;
+   my $braces_count = shift;
+   if (defined($current->{'text'})) {
+     my ($before, $after);
+     ($before, $after, $braces_count) = _find_end_brace($current->{'text'},
+                                                           $braces_count);
+   }
+   if ($current->{'args'}) {
+     foreach my $arg (@{$current->{'args'}}) {
+       $braces_count = _count_opened_tree_braces($arg, $braces_count);
+       return $braces_count if ($braces_count == 0);
+     }
+   }
+   if ($current->{'contents'}) {
+     foreach my $content (@{$current->{'contents'}}) {
+       $braces_count = _count_opened_tree_braces($content, $braces_count);
+       return $braces_count if ($braces_count == 0);
+     }
+   }
+   return $braces_count;
+ }
+ 
+ # $NODE->{'contents'} is the Texinfo fo the specification of a node.
+ # Returned object is a hash with three fields:
+ #
+ #     manual_content - Texinfo tree for a manual name extracted from the
+ #                      node specification.
+ #     node_content - Texinfo tree for the node name on its own
+ #     normalized - a string with the node name after HTML node name
+ #                  normalization is applied
+ #
+ # retrieve a leading manual name in parentheses, if there is one.
+ sub parse_node_manual($)
+ {
+   my $node = shift;
+   my @contents = @{$node->{'contents'}};
+   trim_spaces_comment_from_content(\@contents);
+ 
+   my $manual;
+   my $result;
+ #print STDERR "RRR $contents[0] and $contents[0]->{'text'} \n";
+   if ($contents[0] and $contents[0]->{'text'} and $contents[0]->{'text'} =~ /^\(/) {
+     my $braces_count = 1;
+     if ($contents[0]->{'text'} !~ /^\($/) {
+       my $brace = shift @contents;
+       my $brace_text = $brace->{'text'};
+       $brace_text =~ s/^\(//;
+       unshift @contents, { 'text' => $brace_text, 'type' => $brace->{'type'},
+                            'parent' => $brace->{'parent'} } if $brace_text ne '';
+     } else {
+       shift @contents;
+     }
+     while(@contents) {
+       my $content = shift @contents;
+       if (!defined($content->{'text'}) or $content->{'text'} !~ /\)/) {
+         push @$manual, $content;
+         $braces_count = _count_opened_tree_braces($content, $braces_count);
+         # This is an error, braces were closed in a command
+         if ($braces_count == 0) {
+           last;
+         }
+       } else {
+         my ($before, $after);
+         ($before, $after, $braces_count) = _find_end_brace($content->{'text'},
+                                                               $braces_count);
+         if ($braces_count == 0) {
+           $before =~ s/\)$//;
+           push @$manual, { 'text' => $before, 'parent' => $content->{'parent'} }
+             if ($before ne '');
+           $after =~ s/^\s*//;
+           unshift @contents,  { 'text' => $after, 'parent' => $content->{'parent'} }
+             if ($after ne '');
+           last;
+         } else {
+           push @$manual, $content;
+         }
+       }
+     }
+     $result->{'manual_content'} = $manual if (defined($manual));
+   }
+   if (@contents) {
+     $result->{'node_content'} = \@contents;
+     $result->{'normalized'} =
+       Texinfo::Convert::NodeNameNormalization::normalize_node({'contents' => \@contents});
+   }
+   return $result;
+ }
+ 
  sub float_name_caption($$)
  {
***************
*** 1501,1576 ****
  }
  
- our %htmlxref_entries = (
-  'node' => [ 'node', 'section', 'chapter', 'mono' ],
-  'section' => [ 'section', 'chapter','node', 'mono' ],
-  'chapter' => [ 'chapter', 'section', 'node', 'mono' ],
-  'mono' => [ 'mono', 'chapter', 'section', 'node' ],
- );
- 
- sub parse_htmlxref_files($$)
- {
-   my $self = shift;
-   my $files = shift;
-   my $htmlxref;
- 
-   foreach my $file (@$files) {
-     print STDERR "html refs config file: $file\n" if ($self->get_conf('DEBUG'));
-     unless (open (HTMLXREF, $file)) {
-       $self->document_warn(
-         sprintf($self->__("could not open html refs config file %s: %s"),
-           $file, $!));
-       next;
-     }
-     my $line_nr = 0;
-     my %variables;
-     while (my $hline = <HTMLXREF>) {
-       my $line = $hline;
-       $line_nr++;
-       next if $hline =~ /^\s*#/;
-       #$hline =~ s/[#]\s.*//;
-       $hline =~ s/^\s*//;
-       next if $hline =~ /^\s*$/;
-       chomp ($hline);
-       if ($hline =~ s/^\s*(\w+)\s*=\s*//) {
-         # handle variables
-         my $var = $1;
-         my $re = join '|', map { quotemeta $_ } keys %variables;
-         $hline =~ s/\$\{($re)\}/defined $variables{$1} ? $variables{$1} 
-                                                        : "\${$1}"/ge;
-         $variables{$var} = $hline;
-         next;
-       }
-       my @htmlxref = split /\s+/, $hline;
-       my $manual = shift @htmlxref;
-       my $split_or_mono = shift @htmlxref;
-       #print STDERR "$split_or_mono $Texi2HTML::Config::htmlxref_entries{$split_or_mono} $line_nr\n";
-       if (!defined($split_or_mono)) {
-         $self->file_line_warn($self->__("missing type"), $file, $line_nr);
-         next;
-       } elsif (!defined($htmlxref_entries{$split_or_mono})) {
-         $self->file_line_warn(sprintf($self->__("unrecognized type: %s"), 
-                                $split_or_mono), $file, $line_nr);
-         next;
-       }
-       my $href = shift @htmlxref;
-       next if (exists($htmlxref->{$manual}->{$split_or_mono}));
- 
-       if (defined($href)) { # substitute 'variables'
-         my $re = join '|', map { quotemeta $_ } keys %variables;
-         $href =~ s/\$\{($re)\}/defined $variables{$1} ? $variables{$1} 
-                                                       : "\${$1}"/ge;
-         $href =~ s/\/*$// if ($split_or_mono ne 'mono');
-       }
-       $htmlxref->{$manual}->{$split_or_mono} = $href;
-     }
-     if (!close (HTMLXREF)) {
-       $self->document_warn(sprintf($self->__(
-                        "error on closing html refs config file %s: %s"),
-                              $file, $!));
-     }
-   }
-   return $htmlxref;
- }
- 
  sub parse_renamed_nodes_file($$;$$)
  {
--- 1607,1610 ----
***************
*** 2394,2397 ****
--- 2428,2449 ----
    warn "$str\n";
  }
+ 
+ use Data::Dumper;
+ 
+ my @kept_keys = ('contents', 'cmdname', 'type', 'text', 'args');
+ my %kept_keys;
+ foreach my $key (@kept_keys) {
+   $kept_keys{$key} = 1;
+ }
+ sub _filter_print_keys { [grep {$kept_keys{$_}} ( sort keys %{$_[0]} )] };
+ sub print_tree($)
+ {
+   my $tree = shift;
+   local $Data::Dumper::Sortkeys = \&_filter_print_keys;
+   local $Data::Dumper::Purity = 1;
+   local $Data::Dumper::Indent = 1;
+ 
+   return Data::Dumper->Dump([$tree]);
+ }
  1;
  
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/Converter.pm texinfo-6.3/tp/Texinfo/Convert/Converter.pm
*** texinfo-6.1/tp/Texinfo/Convert/Converter.pm	2016-02-06 12:21:52.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/Converter.pm	2016-09-10 20:27:56.000000000 +0100
***************
*** 1,3 ****
! # $Id: Converter.pm 6991 2016-02-06 12:16:13Z gavin $
  # Converter.pm: Common code for Converters.
  #
--- 1,3 ----
! # $Id: Converter.pm 7353 2016-09-10 13:03:54Z gavin $
  # Converter.pm: Common code for Converters.
  #
***************
*** 61,65 ****
  );
  
! $VERSION = '6.1';
  
  my %defaults = (
--- 61,65 ----
  );
  
! $VERSION = '6.2';
  
  my %defaults = (
***************
*** 246,259 ****
          }
        }
-       $converter->set_conf('setcontentsaftertitlepage', 1)
-          if ($converter->get_conf('contents')
-                and $converter->{'extra'}->{'setcontentsaftertitlepage'}
-                and $converter->{'structuring'}
-                and $converter->{'structuring'}->{'sectioning_root'});
-       $converter->set_conf('setshortcontentsaftertitlepage', 1)
-          if ($converter->get_conf('shortcontents') 
-                and $converter->{'extra'}->{'setshortcontentsaftertitlepage'}
-                and $converter->{'structuring'}
-                and $converter->{'structuring'}->{'sectioning_root'});
        $converter->{'gettext'} = $converter->{'parser'}->{'gettext'};
        $converter->{'pgettext'} = $converter->{'parser'}->{'pgettext'};
--- 246,249 ----
***************
*** 373,376 ****
--- 363,367 ----
  }
  
+ use Carp;
  sub get_conf($$)
  {
***************
*** 378,382 ****
    my $conf = shift;
    if (!Texinfo::Common::valid_option($conf)) {
!     warn "BUG: unknown option $conf\n";
      return undef;
    }
--- 369,374 ----
    my $conf = shift;
    if (!Texinfo::Common::valid_option($conf)) {
!     cluck "CBUG: unknown option $conf\n";
!     die;
      return undef;
    }
***************
*** 390,394 ****
    my $value = shift;
    if (!Texinfo::Common::valid_option($conf)) {
!     warn "BUG: unknown option $conf\n";
      return undef;
    } elsif (Texinfo::Common::obsolete_option($conf)) {
--- 382,386 ----
    my $value = shift;
    if (!Texinfo::Common::valid_option($conf)) {
!     die "BBUG: unknown option $conf\n";
      return undef;
    } elsif (Texinfo::Common::obsolete_option($conf)) {
***************
*** 409,413 ****
    my $value = shift;
    if (!Texinfo::Common::valid_option($conf)) {
!     warn "BUG: unknown option $conf\n";
      return undef;
    } elsif (Texinfo::Common::obsolete_option($conf)) {
--- 401,405 ----
    my $value = shift;
    if (!Texinfo::Common::valid_option($conf)) {
!     die "ABUG: unknown option $conf\n";
      return undef;
    } elsif (Texinfo::Common::obsolete_option($conf)) {
***************
*** 938,942 ****
      if ($current) {
        $current_element_message = "current: ". 
!         Texinfo::Parser::_print_current($current);
      }
    }
--- 930,934 ----
      if ($current) {
        $current_element_message = "current: ". 
!         Texinfo::Common::_print_current($current);
      }
    }
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/DocBook.pm texinfo-6.3/tp/Texinfo/Convert/DocBook.pm
*** texinfo-6.1/tp/Texinfo/Convert/DocBook.pm	2016-02-06 12:21:52.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/DocBook.pm	2016-09-10 20:27:56.000000000 +0100
***************
*** 1,3 ****
! # $Id: DocBook.pm 6991 2016-02-06 12:16:13Z gavin $
  # DocBook.pm: output tree as DocBook.
  #
--- 1,3 ----
! # $Id: DocBook.pm 7353 2016-09-10 13:03:54Z gavin $
  # DocBook.pm: output tree as DocBook.
  #
***************
*** 56,60 ****
  );
  
! $VERSION = '6.1';
  
  my $nbsp = '&#'.hex('00A0').';';
--- 56,60 ----
  );
  
! $VERSION = '6.2';
  
  my $nbsp = '&#'.hex('00A0').';';
***************
*** 588,592 ****
                      and $root->{'parent'}->{'type'} eq 'row') {
            warn "BUG: multitable cell command not in a row "
!             .Texinfo::Parser::_print_current($root);
          }
          
--- 588,592 ----
                      and $root->{'parent'}->{'type'} eq 'row') {
            warn "BUG: multitable cell command not in a row "
!             .Texinfo::Common::_print_current($root);
          }
          
***************
*** 1409,1413 ****
  
  __END__
! # $Id: DocBook.pm 6991 2016-02-06 12:16:13Z gavin $
  # Automatically generated from maintain/template.pod
  
--- 1409,1413 ----
  
  __END__
! # $Id: DocBook.pm 7353 2016-09-10 13:03:54Z gavin $
  # Automatically generated from maintain/template.pod
  
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/HTML.pm texinfo-6.3/tp/Texinfo/Convert/HTML.pm
*** texinfo-6.1/tp/Texinfo/Convert/HTML.pm	2016-02-06 12:21:52.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/HTML.pm	2016-09-10 20:27:56.000000000 +0100
***************
*** 1,6 ****
! # $Id: HTML.pm 6991 2016-02-06 12:16:13Z gavin $
  # HTML.pm: output tree as HTML.
  #
! # Copyright 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
  # 
  # This program is free software; you can redistribute it and/or modify
--- 1,7 ----
! # $Id: HTML.pm 7353 2016-09-10 13:03:54Z gavin $
  # HTML.pm: output tree as HTML.
  #
! # Copyright 2011, 2012, 2013, 2014, 2015,
! # 2016 Free Software Foundation, Inc.
  # 
  # This program is free software; you can redistribute it and/or modify
***************
*** 29,32 ****
--- 30,34 ----
  use Texinfo::Convert::Text;
  use Texinfo::Convert::Unicode;
+ use Texinfo::Convert::NodeNameNormalization;
  
  use Carp qw(cluck);
***************
*** 55,59 ****
  );
  
! $VERSION = '6.1';
  
  # misc commands that are of use for formatting.
--- 57,61 ----
  );
  
! $VERSION = '6.2';
  
  # misc commands that are of use for formatting.
***************
*** 301,305 ****
      }
    }
-   #print STDERR "No filename ".Texinfo::Parser::_print_command_args_texi($command);
    return undef;
  }
--- 303,306 ----
***************
*** 507,511 ****
          if (!$command->{'extra'}->{'misc_content'}) {
            cluck "No misc_content: "
!             .Texinfo::Parser::_print_current($command);
          }
          if (defined($command->{'number'})
--- 508,512 ----
          if (!$command->{'extra'}->{'misc_content'}) {
            cluck "No misc_content: "
!             .Texinfo::Common::_print_current($command);
          }
          if (defined($command->{'number'})
***************
*** 1137,1141 ****
    'summarycontents', 'allowcodebreaks', 'documentlanguage',
    'footnotestyle', 'documentencoding', 
-   'setcontentsaftertitlepage', 'setshortcontentsaftertitlepage',
    'xrefautomaticsectiontitle', 'deftypefnnewline');
  # taken from global
--- 1138,1141 ----
***************
*** 1376,1380 ****
      # happens with bogus @-commands without argument, like @strong something
      #cluck "text not defined in _convert_style_command";
-     #print STDERR Texinfo::Parser::_print_current($command);
      return '';
    }
--- 1376,1379 ----
***************
*** 1480,1494 ****
  
    my $with_explanation;
    my $explanation_string;
    if ($args->[1] and defined($args->[1]->{'string'}) 
                   and $args->[1]->{'string'} =~ /\S/) {
      $with_explanation = 1;
      $explanation_string = $args->[1]->{'string'};
!   }
!   if ($command->{'extra'}->{'explanation_contents'}) {
      $explanation_string = $self->convert_tree_new_formatting_context(
        {'type' => '_string', 
!        'contents' => $command->{'extra'}->{'explanation_contents'}},
!       $cmdname, $cmdname);
    }
    my $result = $args->[0]->{'normal'};
--- 1479,1524 ----
  
    my $with_explanation;
+   my $explanation_result;
    my $explanation_string;
+   my $normalized_type
+     = Texinfo::Convert::NodeNameNormalization::normalize_node(
+     {'contents' =>
+       $command->{'extra'}->{'brace_command_contents'}->[0]});
+ 
    if ($args->[1] and defined($args->[1]->{'string'}) 
                   and $args->[1]->{'string'} =~ /\S/) {
      $with_explanation = 1;
      $explanation_string = $args->[1]->{'string'};
! 
!     # Convert the expanation of the acronym.  Must do this before we save
!     # the explanation for the future, otherwise we get infinite recursion
!     # for recursively-defined acronyms.
!     $explanation_result = $self->convert_tree( $args->[1]->{'tree'} );
! 
!     $self->{'explained_commands'}->{$cmdname}->{$normalized_type} =
!        $command->{'extra'}->{'brace_command_contents'}->[1];
!   } elsif ($command->{'extra'}->{'explanation_contents'}) {
!     if (@{$command->{'extra'}->{'explanation_contents'}}) {
!       $explanation_string = $self->convert_tree_new_formatting_context(
!         {'type' => '_string', 
!          'contents' => $command->{'extra'}->{'explanation_contents'}},
!         $cmdname, $cmdname);
!     }
!   } elsif ($self->{'explained_commands'}->{$cmdname}->{$normalized_type}) {
      $explanation_string = $self->convert_tree_new_formatting_context(
        {'type' => '_string', 
!        'contents' => $self->{'explained_commands'}
!                        ->{$cmdname}->{$normalized_type}},
!     $cmdname, $cmdname);
! 
!     $command->{'extra'}->{'explanation_contents'} 
!        = $self->{'explained_commands'}->{$cmdname}->{$normalized_type};
!   } else {
!     # Avoid ever giving an explanation for this element.  This prevents
!     # infinite recursion for a recursively-defined acronym, when an
!     # @acronym within the explanation could end up referring to the
!     # containing @acronym.
! 
!     $command->{'extra'}->{'explanation_contents'} = [];
    }
    my $result = $args->[0]->{'normal'};
***************
*** 1505,1510 ****
            {'explained_string' => {'type' => '_converted',
                     'text' => $result},
!            'explanation' => $args->[1]->{'tree'} }));
    }
    return $result;
  }
--- 1535,1542 ----
            {'explained_string' => {'type' => '_converted',
                     'text' => $result},
!            'explanation' => {'type' => '_converted',
!                    'text' => $explanation_result}}));
    }
+ 
    return $result;
  }
***************
*** 1749,1753 ****
    if (!defined($text)) {
      # happens with bogus @-commands without argument, like @strong something
-     #print STDERR Texinfo::Parser::_print_current($command);
      return '';
    }
--- 1781,1784 ----
***************
*** 1782,1786 ****
    if (!defined($text)) {
      # happens with bogus @-commands without argument, like @strong something
-     #print STDERR Texinfo::Parser::_print_current($command);
      return '';
    }
--- 1813,1816 ----
***************
*** 1808,1812 ****
    if (!defined($text)) {
      # happens with bogus @-commands without argument, like @strong something
-     #print STDERR Texinfo::Parser::_print_current($command);
      return '';
    }
--- 1838,1841 ----
***************
*** 1826,1830 ****
    if (!defined($text)) {
      # happens with bogus @-commands without argument, like @strong something
-     #print STDERR Texinfo::Parser::_print_current($command);
      return '';
    }
--- 1855,1858 ----
***************
*** 2818,2823 ****
      $prepended_text = '';
    }
-   #print STDERR "Float $prepended_text: caption $caption ".
-   #  Texinfo::Parser::_print_current ($caption)."\n";
    
    if ($caption and $caption_text eq '') {
--- 2846,2849 ----
***************
*** 3543,3548 ****
        and $self->get_conf($cmdname)
        and $self->{'structuring'} and $self->{'structuring'}->{'sectioning_root'}
!       and scalar(@{$self->{'structuring'}->{'sections_list'}}) > 1
!       and ! $self->get_conf('set'.$cmdname.'aftertitlepage')) {
      return $self->_contents_inline_element($cmdname, $command);
    }
--- 3569,3573 ----
        and $self->get_conf($cmdname)
        and $self->{'structuring'} and $self->{'structuring'}->{'sectioning_root'}
!       and scalar(@{$self->{'structuring'}->{'sections_list'}}) > 1) {
      return $self->_contents_inline_element($cmdname, $command);
    }
***************
*** 3558,3561 ****
--- 3583,3589 ----
  }
  
+ # Keys are tree element types, values are function references to convert
+ # elements of that type.  Can be overridden with
+ # Texinfo::Config::texinfo_types_conversion.
  my %default_types_conversion;
  
***************
*** 3568,3573 ****
  
  # Ignored commands
- 
- #my %ignored_types;
  foreach my $type ('empty_line_after_command', 'preamble',
              'preamble_before_setfilename',
--- 3596,3599 ----
***************
*** 3576,3580 ****
              'empty_spaces_after_close_brace', 
              'empty_space_at_end_def_bracketed') {
-   #$ignored_types{$type} = 1;
    $default_types_conversion{$type} = undef;
  }
--- 3602,3605 ----
***************
*** 3665,3669 ****
    if (!defined($content)) {
      cluck "content undef in _convert_preformatted_type " 
!        .Texinfo::Parser::_print_current($command);
    }
  
--- 3690,3694 ----
    if (!defined($content)) {
      cluck "content undef in _convert_preformatted_type " 
!        .Texinfo::Common::_print_current($command);
    }
  
***************
*** 4306,4330 ****
  $default_types_conversion{'text_root'} = \&_convert_root_text_type;
  
- sub _contents_shortcontents_in_title($)
- {
-   my $self = shift;
- 
-   my $result = '';
- 
-   if ($self->{'structuring'} and $self->{'structuring'}->{'sectioning_root'}
-       and scalar(@{$self->{'structuring'}->{'sections_list'}}) > 1) {
-     foreach my $command ('contents', 'shortcontents') {
-       if ($self->get_conf($command)
-           and $self->get_conf('set'.$command.'aftertitlepage')) {
-         my $contents_text = $self->_contents_inline_element($command, undef);
-         if ($contents_text ne '') {
-           $result .= $contents_text . $self->get_conf('DEFAULT_RULE')."\n";
-         }
-       }
-     }
-   }
-   return $result;
- }
- 
  # Convert @titlepage.  Falls back to simpletitle.
  sub _default_titlepage($)
--- 4331,4334 ----
***************
*** 4346,4350 ****
    $result .= $titlepage_text.$self->get_conf('DEFAULT_RULE')."\n"
      if (defined($titlepage_text));
-   $result .= $self->_contents_shortcontents_in_title();
    return $result;
  }
--- 4350,4353 ----
***************
*** 4366,4370 ****
                       'contents' => $self->{'simpletitle_tree'}->{'contents'}});
        }
-       $result .= $self->_contents_shortcontents_in_title();
      }
    }
--- 4369,4372 ----
***************
*** 4372,4375 ****
--- 4374,4381 ----
  }
  
+ # Function for converting the top-level elements in the conversion: a section 
+ # or a node.  $ELEMENT was created in this module (in _prepare_elements), with 
+ # type 'element' (it's not a tree element created by the parser).  $CONTENT
+ # is the contents of the node/section, already converted.
  sub _convert_element_type($$$$)
  {
***************
*** 4379,4388 ****
    my $content = shift;
  
-   #print STDERR "GGGGGGGG $element $element->{'parent'} $element->{'parent'}->{'type'}\n";
-   #print STDERR "$element->{'extra'}->{'special_element'}\n"
-   #   if ($element->{'extra'}->{'special_element'});
-   #if (!defined($element->{'parent'})) {
-   #  print STDERR "NO PARENT ".Texinfo::Parser::_print_current($element)."\n";
-   #}
    if ($self->in_string()) {
      if (defined($content)) {
--- 4385,4388 ----
***************
*** 4419,4424 ****
                         $heading, $level)."\n";
  
!     my $special_element_body .= &{$self->{'format_special_element_body'}}($self, 
!                                                  $special_element, $element);
      # This may happen with footnotes in regions that are not expanded,
      # like @copying or @titlepage
--- 4419,4425 ----
                         $heading, $level)."\n";
  
!     my $special_element_body .= &{$self->{'format_special_element_body'}}
!                                     ($self, $special_element, $element);
! 
      # This may happen with footnotes in regions that are not expanded,
      # like @copying or @titlepage
***************
*** 4560,4563 ****
--- 4561,4565 ----
  }
  
+ # Functions accessed with e.g. 'format_heading_text' for 'heading_text'.
  my %default_formatting_references = (
       'heading_text' => \&_default_heading_text,
***************
*** 4608,4611 ****
--- 4610,4685 ----
  }
  
+ my %htmlxref_entries = (
+  'node' => [ 'node', 'section', 'chapter', 'mono' ],
+  'section' => [ 'section', 'chapter','node', 'mono' ],
+  'chapter' => [ 'chapter', 'section', 'node', 'mono' ],
+  'mono' => [ 'mono', 'chapter', 'section', 'node' ],
+ );
+ 
+ sub _parse_htmlxref_files($$)
+ {
+   my $self = shift;
+   my $files = shift;
+   my $htmlxref;
+ 
+   foreach my $file (@$files) {
+     print STDERR "html refs config file: $file\n" if ($self->get_conf('DEBUG'));
+     unless (open (HTMLXREF, $file)) {
+       $self->document_warn(
+         sprintf($self->__("could not open html refs config file %s: %s"),
+           $file, $!));
+       next;
+     }
+     my $line_nr = 0;
+     my %variables;
+     while (my $hline = <HTMLXREF>) {
+       my $line = $hline;
+       $line_nr++;
+       next if $hline =~ /^\s*#/;
+       #$hline =~ s/[#]\s.*//;
+       $hline =~ s/^\s*//;
+       next if $hline =~ /^\s*$/;
+       chomp ($hline);
+       if ($hline =~ s/^\s*(\w+)\s*=\s*//) {
+         # handle variables
+         my $var = $1;
+         my $re = join '|', map { quotemeta $_ } keys %variables;
+         $hline =~ s/\$\{($re)\}/defined $variables{$1} ? $variables{$1} 
+                                                        : "\${$1}"/ge;
+         $variables{$var} = $hline;
+         next;
+       }
+       my @htmlxref = split /\s+/, $hline;
+       my $manual = shift @htmlxref;
+       my $split_or_mono = shift @htmlxref;
+       #print STDERR "$split_or_mono $Texi2HTML::Config::htmlxref_entries{$split_or_mono} $line_nr\n";
+       if (!defined($split_or_mono)) {
+         $self->file_line_warn($self->__("missing type"), $file, $line_nr);
+         next;
+       } elsif (!defined($htmlxref_entries{$split_or_mono})) {
+         $self->file_line_warn(sprintf($self->__("unrecognized type: %s"), 
+                                $split_or_mono), $file, $line_nr);
+         next;
+       }
+       my $href = shift @htmlxref;
+       next if (exists($htmlxref->{$manual}->{$split_or_mono}));
+ 
+       if (defined($href)) { # substitute 'variables'
+         my $re = join '|', map { quotemeta $_ } keys %variables;
+         $href =~ s/\$\{($re)\}/defined $variables{$1} ? $variables{$1} 
+                                                       : "\${$1}"/ge;
+         $href =~ s/\/*$// if ($split_or_mono ne 'mono');
+       }
+       $htmlxref->{$manual}->{$split_or_mono} = $href;
+     }
+     if (!close (HTMLXREF)) {
+       $self->document_warn(sprintf($self->__(
+                        "error on closing html refs config file %s: %s"),
+                              $file, $!));
+     }
+   }
+   return $htmlxref;
+ }
+ 
  sub converter_initialize($)
  {
***************
*** 4624,4629 ****
    $self->{'htmlxref'} = {};
    if ($self->{'htmlxref_files'}) {
!     $self->{'htmlxref'} = Texinfo::Common::parse_htmlxref_files($self, 
!                                                   $self->{'htmlxref_files'});
    }
  
--- 4698,4703 ----
    $self->{'htmlxref'} = {};
    if ($self->{'htmlxref_files'}) {
!     $self->{'htmlxref'} = _parse_htmlxref_files($self,
!                                                 $self->{'htmlxref_files'});
    }
  
***************
*** 5358,5361 ****
--- 5432,5438 ----
  }
  
+ # $ROOT is a parsed Texinfo tree.  Return a list of the "elements" we need to
+ # output in the HTML file(s).  Each "element" is what can go in one HTML file,
+ # such as the content between @node lines in the Texinfo source.
  sub _prepare_elements($$)
  {
***************
*** 5415,5421 ****
        my $type = $contents_command_element_name{$cmdname};
        if ($self->get_conf($cmdname)) {
!         if ($self->get_conf('INLINE_CONTENTS') 
!            or ($self->get_conf('set'.$cmdname.'aftertitlepage'))) {
!         } else {
            $do_special{$type} = 1;
          }
--- 5492,5496 ----
        my $type = $contents_command_element_name{$cmdname};
        if ($self->get_conf($cmdname)) {
!         if (not $self->get_conf('INLINE_CONTENTS')) {
            $do_special{$type} = 1;
          }
***************
*** 5529,5537 ****
        if ($self->get_conf($cmdname)) {
          my $default_filename;
!         if ($self->get_conf('set'.$cmdname.'aftertitlepage')) {
!           if ($self->{'elements'}) {
!             $default_filename = $self->{'elements'}->[0]->{'filename'};
!           }
!         } elsif ($self->get_conf('INLINE_CONTENTS')) {
            if ($self->{'extra'} and $self->{'extra'}->{$cmdname}) {
              foreach my $command(@{$self->{'extra'}->{$cmdname}}) {
--- 5604,5608 ----
        if ($self->get_conf($cmdname)) {
          my $default_filename;
!         if ($self->get_conf('INLINE_CONTENTS')) {
            if ($self->{'extra'} and $self->{'extra'}->{$cmdname}) {
              foreach my $command(@{$self->{'extra'}->{$cmdname}}) {
***************
*** 5617,5621 ****
      my $element_top = $node_top->{'parent'};
      if (!$element_top) {
!       die "No parent for node_top: ".Texinfo::Parser::_print_current($node_top);
      }
      $self->{'global_target_elements'}->{'Top'} = $element_top;
--- 5688,5692 ----
      my $element_top = $node_top->{'parent'};
      if (!$element_top) {
!       die "No parent for node_top: ".Texinfo::Common::_print_current($node_top);
      }
      $self->{'global_target_elements'}->{'Top'} = $element_top;
***************
*** 5731,5736 ****
  }
  
- my %htmlxref_entries = %Texinfo::Common::htmlxref_entries;
- 
  sub _external_node_href($$$$)
  {
--- 5802,5805 ----
***************
*** 5909,5913 ****
      if (!$element_target->{'type'}) {
        die "No type for element_target $direction $element_target: "
!         . Texinfo::Parser::_print_current_keys($element_target)
          . "directions :". Texinfo::Structuring::_print_directions($element);
      }
--- 5978,5982 ----
      if (!$element_target->{'type'}) {
        die "No type for element_target $direction $element_target: "
!         . Texinfo::Common::_print_current_keys($element_target)
          . "directions :". Texinfo::Structuring::_print_directions($element);
      }
***************
*** 6696,6699 ****
--- 6765,6771 ----
  }
  
+ # Main function for outputting a manual in HTML.
+ # $SELF is the output converter object of class Texinfo::Convert::HTML (this 
+ # module), and $ROOT is the Texinfo tree from the parser.
  sub output($$)
  {
***************
*** 6738,6744 ****
                                               $self->{'renamed_nodes'});
  
    # This should return undef if called on a tree without node or sections.
!   my ($elements, $special_elements) 
!     = $self->_prepare_elements($root);
  
    Texinfo::Structuring::split_pages($elements, $self->get_conf('SPLIT'));
--- 6810,6817 ----
                                               $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);
  
    Texinfo::Structuring::split_pages($elements, $self->get_conf('SPLIT'));
***************
*** 6760,6764 ****
    Texinfo::Structuring::elements_file_directions($self, $elements);
  
!   # associate the special elements that have no page to the main page.
    # This may only happen if not split.
    if ($special_elements 
--- 6833,6837 ----
    Texinfo::Structuring::elements_file_directions($self, $elements);
  
!   # Associate the special elements that have no page with the main page.
    # This may only happen if not split.
    if ($special_elements 
***************
*** 6881,6888 ****
    # will necessarily appear later on -- even if it appears a the
    # beginning of the file.
!   #
!   # Now do the output
    my $fh;
    my $output = '';
    if (!$elements or !defined($elements->[0]->{'filename'})) {
      # no page
--- 6954,6961 ----
    # will necessarily appear later on -- even if it appears a the
    # beginning of the file.
! 
    my $fh;
    my $output = '';
+ 
    if (!$elements or !defined($elements->[0]->{'filename'})) {
      # no page
***************
*** 6940,6943 ****
--- 7013,7017 ----
      my %files;
      
+     # Now do the output, converting each member in @$elements in turn.
      $special_elements = [] if (!defined($special_elements));
      foreach my $element (@$elements, @$special_elements) {
***************
*** 7173,7176 ****
--- 7247,7251 ----
  }
  
+ # Convert the 'contents' of a tree element.
  sub _convert_contents($$$)
  {
***************
*** 7181,7185 ****
    if (ref($root->{'contents'}) ne 'ARRAY') {
      cluck "for $root contents not an array: $root->{'contents'}";
!     print STDERR Texinfo::Parser::_print_current($root);
    }
  
--- 7256,7260 ----
    if (ref($root->{'contents'}) ne 'ARRAY') {
      cluck "for $root contents not an array: $root->{'contents'}";
!     print STDERR Texinfo::Common::_print_current($root);
    }
  
***************
*** 7189,7194 ****
      if (!defined($new_content)) {
        cluck "content not defined for $command_type [$content_idx]\n";
!       print STDERR "root is: ".Texinfo::Parser::_print_current ($root);
!       print STDERR "content is: ".Texinfo::Parser::_print_current ($content);
      } else {
        $content_formatted .= $new_content;
--- 7264,7269 ----
      if (!defined($new_content)) {
        cluck "content not defined for $command_type [$content_idx]\n";
!       print STDERR "root is: ".Texinfo::Common::_print_current ($root);
!       print STDERR "content is: ".Texinfo::Common::_print_current ($content);
      } else {
        $content_formatted .= $new_content;
***************
*** 7233,7245 ****
      if ($open ne '') {
        $open .= '>';
!       # protect spaces in the html leading attribute in case we are in 'w'
        $open =~ s/ /\x{1F}/g;
!       # special span to avoid breaking at _-
        $text =~ s/(\S*[_-]\S*)/${open}$1<\/span>/g;
      }
      $text .= '&nbsp;' if (chomp($text));
!     # protect spaces within text
      $text =~ s/ /&nbsp;/g;
!     # revert protected spaces in leading html attribute
      $text =~ s/\x{1F}/ /g;
    }
--- 7308,7320 ----
      if ($open ne '') {
        $open .= '>';
!       # Protect spaces in the html leading attribute in case we are in 'w'
        $open =~ s/ /\x{1F}/g;
!       # Special span to avoid breaking at _-
        $text =~ s/(\S*[_-]\S*)/${open}$1<\/span>/g;
      }
      $text .= '&nbsp;' if (chomp($text));
!     # Protect spaces within text
      $text =~ s/ /&nbsp;/g;
!     # Revert protected spaces in leading html attribute
      $text =~ s/\x{1F}/ /g;
    }
***************
*** 7247,7250 ****
--- 7322,7326 ----
  }
  
+ # Convert tree element $ROOT, and return HTML text for the output files.
  sub _convert($$;$);
  
***************
*** 7276,7282 ****
      }
      print STDERR "\n";
-    
-     #print STDERR "  Special def_command: $root->{'extra'}->{'def_command'}\n"
-     #  if (defined($root->{'extra'}) and $root->{'extra'}->{'def_command'});
    }
  
--- 7352,7355 ----
***************
*** 7301,7305 ****
    }
  
!   # process text
    if (defined($root->{'text'})) {
      # already converted to html, keep it as is
--- 7374,7378 ----
    }
  
!   # Process text
    if (defined($root->{'text'})) {
      # already converted to html, keep it as is
***************
*** 7501,7504 ****
--- 7574,7578 ----
        $root->{'cmdname'}
          if ($root->{'cmdname'});
+ 
      if ($root->{'type'} eq 'paragraph') {
        $self->{'document_context'}->[-1]->{'formatting_context'}->[-1]->{'paragraph_number'}++;
***************
*** 7515,7518 ****
--- 7589,7593 ----
          $root->{'type'};
      }
+ 
      if ($self->{'code_types'}->{$root->{'type'}}) {
        #$self->{'document_context'}->[-1]->{'code'}++;
***************
*** 7522,7525 ****
--- 7597,7601 ----
        $self->{'document_context'}->[-1]->{'string'}++;
      }
+ 
      my $content_formatted;
      if ($root->{'type'} eq 'definfoenclose_command') {
***************
*** 7530,7533 ****
--- 7606,7610 ----
        $content_formatted = $self->_convert_contents($root, $command_type);
      }
+ 
      my $result = '';
      if (exists($self->{'types_conversion'}->{$root->{'type'}})) {
***************
*** 7642,7646 ****
  
  __END__
! # $Id: HTML.pm 6991 2016-02-06 12:16:13Z gavin $
  # Automatically generated from maintain/template.pod
  
--- 7719,7723 ----
  
  __END__
! # $Id: HTML.pm 7353 2016-09-10 13:03:54Z gavin $
  # Automatically generated from maintain/template.pod
  
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/IXIN.pm texinfo-6.3/tp/Texinfo/Convert/IXIN.pm
*** texinfo-6.1/tp/Texinfo/Convert/IXIN.pm	2016-02-06 11:31:29.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/IXIN.pm	2016-09-10 20:27:56.000000000 +0100
***************
*** 55,59 ****
  );
  
! $VERSION = '6.1';
  
  my $ixin_version = 1;
--- 55,59 ----
  );
  
! $VERSION = '6.2';
  
  my $ixin_version = 1;
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/IXINSXML.pm texinfo-6.3/tp/Texinfo/Convert/IXINSXML.pm
*** texinfo-6.1/tp/Texinfo/Convert/IXINSXML.pm	2016-02-06 11:31:29.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/IXINSXML.pm	2016-09-10 20:27:56.000000000 +0100
***************
*** 54,58 ****
  );
  
! $VERSION = '6.1';
  
  my %defaults = (
--- 54,58 ----
  );
  
! $VERSION = '6.2';
  
  my %defaults = (
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/Info.pm texinfo-6.3/tp/Texinfo/Convert/Info.pm
*** texinfo-6.1/tp/Texinfo/Convert/Info.pm	2016-02-06 11:31:29.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/Info.pm	2016-09-10 20:27:56.000000000 +0100
***************
*** 46,50 ****
  );
  
! $VERSION = '6.1';
  
  my $STDIN_DOCU_NAME = 'stdin';
--- 46,50 ----
  );
  
! $VERSION = '6.2';
  
  my $STDIN_DOCU_NAME = 'stdin';
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/NodeNameNormalization.pm texinfo-6.3/tp/Texinfo/Convert/NodeNameNormalization.pm
*** texinfo-6.1/tp/Texinfo/Convert/NodeNameNormalization.pm	2016-02-06 11:31:29.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/NodeNameNormalization.pm	2016-09-10 20:27:56.000000000 +0100
***************
*** 1,5 ****
  # NodeNameNormalization.pm: output tree as normalized node name.
  #
! # Copyright 2010, 2011, 2012 Free Software Foundation, Inc.
  # 
  # This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  # NodeNameNormalization.pm: output tree as normalized node name.
  #
! # Copyright 2010, 2011, 2012, 2016 Free Software Foundation, Inc.
  # 
  # This program is free software; you can redistribute it and/or modify
***************
*** 70,75 ****
  
  my %ignored_brace_commands;
! foreach my $ignored_brace_command (#'xref','ref', 'pxref', 'inforef', 
!    'anchor', 'footnote', 'shortcaption', 'caption', 'hyphenation') {
    $ignored_brace_commands{$ignored_brace_command} = 1;
  }
--- 70,75 ----
  
  my %ignored_brace_commands;
! foreach my $ignored_brace_command ('anchor', 'footnote', 'shortcaption',
!                                    'caption', 'hyphenation') {
    $ignored_brace_commands{$ignored_brace_command} = 1;
  }
***************
*** 203,215 ****
    my $in_sc = shift;
  
-   if (0) {
-     print STDERR "root\n";
-     print STDERR "  Command: $root->{'cmdname'}\n" if ($root->{'cmdname'});
-     print STDERR "  Type: $root->{'type'}\n" if ($root->{'type'});
-     print STDERR "  Text: $root->{'text'}\n" if (defined($root->{'text'}));
-     #print STDERR "  Special def_command: $root->{'extra'}->{'def_command'}\n"
-     #  if (defined($root->{'extra'}) and $root->{'extra'}->{'def_command'});
-   }
- 
    return '' if (($root->{'type'} and $ignored_types{$root->{'type'}})
            or ($root->{'cmdname'} 
--- 203,206 ----
***************
*** 274,286 ****
        }
        return '';
-     #} elsif ($root->{'cmdname'} eq 'email') {
-     #  my $mail = _convert($root->{'args'}->[0]);
-     #  return $mail if (defined($mail) and $mail ne '');
-     #  my $text;
-     #  $text = _convert($root->{'args'}->[1])
-     #     if (defined($root->{'args'}->[1]));
-     #  return $text if (defined($text) and ($text ne ''));
-     #  #return $mail;
-     #  return '';
      # Here all the commands with args are processed, if they have
      # more than one arg the first one is used.
--- 265,268 ----
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/Paragraph.pm texinfo-6.3/tp/Texinfo/Convert/Paragraph.pm
*** texinfo-6.1/tp/Texinfo/Convert/Paragraph.pm	2016-02-06 11:31:29.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/Paragraph.pm	2016-09-10 20:27:56.000000000 +0100
***************
*** 50,54 ****
  
  my $module = "Texinfo::Convert::XSParagraph::XSParagraph";
! our $VERSION = '6.1';
  # Module interface number, to be changed when the XS interface changes.  
  # The value used for the .xs file compilation is set in configure.ac.  
--- 50,54 ----
  
  my $module = "Texinfo::Convert::XSParagraph::XSParagraph";
! our $VERSION = '6.2';
  # Module interface number, to be changed when the XS interface changes.  
  # The value used for the .xs file compilation is set in configure.ac.  
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/Plaintext.pm texinfo-6.3/tp/Texinfo/Convert/Plaintext.pm
*** texinfo-6.1/tp/Texinfo/Convert/Plaintext.pm	2016-02-06 12:21:52.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/Plaintext.pm	2016-09-10 20:27:56.000000000 +0100
***************
*** 1,6 ****
! # $Id: Plaintext.pm 6991 2016-02-06 12:16:13Z gavin $
  # Plaintext.pm: output tree as text with filling.
  #
! # Copyright 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
  # 
  # This program is free software; you can redistribute it and/or modify
--- 1,7 ----
! # $Id: Plaintext.pm 7353 2016-09-10 13:03:54Z gavin $
  # Plaintext.pm: output tree as text with filling.
  #
! # Copyright 2010, 2011, 2012, 2013, 2014, 2015,
! # 2016 Free Software Foundation, Inc.
  # 
  # This program is free software; you can redistribute it and/or modify
***************
*** 31,34 ****
--- 32,36 ----
  use Texinfo::Convert::Line;
  use Texinfo::Convert::UnFilled;
+ use Texinfo::Convert::NodeNameNormalization;
  
  
***************
*** 56,60 ****
  );
  
! $VERSION = '6.1';
  
  # misc commands that are of use for formatting.
--- 58,62 ----
  );
  
! $VERSION = '6.2';
  
  # misc commands that are of use for formatting.
***************
*** 65,70 ****
  my @informative_global_commands = ('paragraphindent', 'firstparagraphindent',
  'frenchspacing', 'documentencoding', 'footnotestyle', 'documentlanguage',
! 'contents', 'shortcontents', 'summarycontents', 'setcontentsaftertitlepage',
! 'setshortcontentsaftertitlepage', 'deftypefnnewline');
  
  my %informative_commands;
--- 67,71 ----
  my @informative_global_commands = ('paragraphindent', 'firstparagraphindent',
  'frenchspacing', 'documentencoding', 'footnotestyle', 'documentlanguage',
! 'contents', 'shortcontents', 'summarycontents', 'deftypefnnewline');
  
  my %informative_commands;
***************
*** 2540,2574 ****
        $self->{'format_context'}->[-1]->{'paragraph_count'} = 0;
      } elsif ($sectioning_commands{$root->{'cmdname'}}) {
-       if ($self->get_conf('setcontentsaftertitlepage') 
-            and $root_commands{$root->{'cmdname'}}
-            and !$self->{'setcontentsaftertitlepage_done'}) {
-         my ($contents, $lines_count) 
-                 = $self->_contents($self->{'structuring'}->{'sectioning_root'}, 
-                                   'contents');
-         if ($contents ne '') {
-           $contents .= "\n";
-           $self->{'empty_lines_count'} = 1;
-           _add_text_count($self, $contents);
-           _add_lines_count($self, $lines_count+1);
-         }
-         $self->{'setcontentsaftertitlepage_done'} = 1;
-         $result .= $contents;
-       } 
-       if ($self->get_conf('setshortcontentsaftertitlepage')
-             and $root_commands{$root->{'cmdname'}}
-             and !$self->{'setshortcontentsaftertitlepage_done'}) {
-         my ($contents, $lines_count) 
-                 = $self->_contents($self->{'structuring'}->{'sectioning_root'}, 
-                               'shortcontents');
-         if ($contents ne '') {
-           $contents .= "\n";
-           $self->{'empty_lines_count'} = 1;
-           _add_text_count($self, $contents);
-           _add_lines_count($self, $lines_count+1);
-         }
- 
-         $self->{'setshortcontentsaftertitlepage_done'} = 1;
-         $result .= $contents;
-       }
        # use settitle for empty @top
        # ignore @part
--- 2541,2544 ----
***************
*** 2823,2829 ****
        return $result;
      } elsif ($root->{'cmdname'} eq 'contents') {
!       if (!defined($self->get_conf('setcontentsaftertitlepage'))
!            and $self->{'structuring'}
!            and $self->{'structuring'}->{'sectioning_root'}) {
          my $lines_count;
          ($result, $lines_count) 
--- 2793,2798 ----
        return $result;
      } elsif ($root->{'cmdname'} eq 'contents') {
!       if ($self->{'structuring'}
!             and $self->{'structuring'}->{'sectioning_root'}) {
          my $lines_count;
          ($result, $lines_count) 
***************
*** 2836,2841 ****
      } elsif ($root->{'cmdname'} eq 'shortcontents' 
                 or $root->{'cmdname'} eq 'summarycontents') {
!       if (!defined($self->get_conf('setshortcontentsaftertitlepage'))
!             and $self->{'structuring'}
              and $self->{'structuring'}->{'sectioning_root'}) {
          my $lines_count;
--- 2805,2809 ----
      } elsif ($root->{'cmdname'} eq 'shortcontents' 
                 or $root->{'cmdname'} eq 'summarycontents') {
!       if ($self->{'structuring'}
              and $self->{'structuring'}->{'sectioning_root'}) {
          my $lines_count;
***************
*** 3544,3548 ****
  
  __END__
! # $Id: Plaintext.pm 6991 2016-02-06 12:16:13Z gavin $
  # Automatically generated from maintain/template.pod
  
--- 3512,3516 ----
  
  __END__
! # $Id: Plaintext.pm 7353 2016-09-10 13:03:54Z gavin $
  # Automatically generated from maintain/template.pod
  
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/Texinfo.pm texinfo-6.3/tp/Texinfo/Convert/Texinfo.pm
*** texinfo-6.1/tp/Texinfo/Convert/Texinfo.pm	2016-02-06 11:31:29.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/Texinfo.pm	2016-09-10 20:27:56.000000000 +0100
***************
*** 1,5 ****
  # Texinfo.pm: output a Texinfo tree as Texinfo.
  #
! # Copyright 2010, 2011, 2012 Free Software Foundation, Inc.
  # 
  # This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  # Texinfo.pm: output a Texinfo tree as Texinfo.
  #
! # Copyright 2010, 2011, 2012, 2016 Free Software Foundation, Inc.
  # 
  # This program is free software; you can redistribute it and/or modify
***************
*** 40,43 ****
--- 40,44 ----
  %EXPORT_TAGS = ( 'all' => [ qw(
    convert
+   node_extra_to_texi
  ) ] );
  
***************
*** 47,51 ****
  );
  
! $VERSION = '6.1';
  
  my %misc_commands            = %Texinfo::Common::misc_commands;
--- 48,52 ----
  );
  
! $VERSION = '6.2';
  
  my %misc_commands            = %Texinfo::Common::misc_commands;
***************
*** 69,75 ****
       if (ref($root) ne 'HASH');
    my $result = '';
!   #print STDERR "$root ";
!   #print STDERR "$root->{'type'}" if (defined($root->{'type'}));
!   #print STDERR "\n";
    if (defined($root->{'text'})) {
      $result .= $root->{'text'};
--- 70,74 ----
       if (ref($root) ne 'HASH');
    my $result = '';
! 
    if (defined($root->{'text'})) {
      $result .= $root->{'text'};
***************
*** 82,90 ****
                                  or $root->{'type'} eq 'menu_entry'
                                  or $root->{'type'} eq 'menu_comment'))) {
-       #print STDERR "cmd: $root->{'cmdname'}\n";
        $result .= _expand_cmd_args_to_texi($root, $fix);
      }
      $result .= '{' if ($root->{'type'} and $root->{'type'} eq 'bracketed');
-     #print STDERR "$root->{'contents'} @{$root->{'contents'}}\n" if (defined($root->{'contents'}));
      if (defined($root->{'contents'})) {
        die "bad contents type(" . ref($root->{'contents'})
--- 81,87 ----
***************
*** 102,106 ****
      } 
    }
!   #print STDERR "convert result: $result\n";
    return $result;
  }
--- 99,118 ----
      } 
    }
!   return $result;
! }
! 
! # used to put a node name in error messages.
! sub node_extra_to_texi($)
! {
!   my $node = shift;
!   my $result = '';
!   if ($node->{'manual_content'}) {
!     $result = '('.Texinfo::Convert::Texinfo::convert({'contents'
!                                      => $node->{'manual_content'}}) .')';
!   }
!   if ($node->{'node_content'}) {
!     $result .= Texinfo::Convert::Texinfo::convert ({'contents'
!                                           => $node->{'node_content'}});
!   }
    return $result;
  }
***************
*** 115,119 ****
    my $result = '';
    $result = '@'.$cmdname if ($cmdname);
-   #print STDERR "Expand $result\n";
  
    # this is done here otherwise for some constructs, there are
--- 127,130 ----
***************
*** 154,158 ****
        $result .= $cmd->{'type'};
      }
-     #print STDERR "".Data::Dumper->Dump([$cmd]);
      my $arg_nr = 0;
      foreach my $arg (@{$cmd->{'args'}}) {
--- 165,168 ----
***************
*** 171,175 ****
    }
    $result .= '{'.$cmd->{'type'}.'}' if ($cmdname eq 'value');
-   #print STDERR "Result: $result\n";
    return $result;
  }
--- 181,184 ----
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/TexinfoSXML.pm texinfo-6.3/tp/Texinfo/Convert/TexinfoSXML.pm
*** texinfo-6.1/tp/Texinfo/Convert/TexinfoSXML.pm	2016-02-06 11:31:29.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/TexinfoSXML.pm	2016-09-10 20:27:56.000000000 +0100
***************
*** 51,55 ****
  );
  
! $VERSION = '6.1';
  
  # SXML specific
--- 51,55 ----
  );
  
! $VERSION = '6.2';
  
  # SXML specific
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/TexinfoXML.pm texinfo-6.3/tp/Texinfo/Convert/TexinfoXML.pm
*** texinfo-6.1/tp/Texinfo/Convert/TexinfoXML.pm	2016-02-06 11:31:29.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/TexinfoXML.pm	2016-09-10 20:27:56.000000000 +0100
***************
*** 1,5 ****
  # TexinfoXML.pm: output tree as Texinfo XML.
  #
! # Copyright 2011, 2012, 2013 Free Software Foundation, Inc.
  # 
  # This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  # TexinfoXML.pm: output tree as Texinfo XML.
  #
! # Copyright 2011, 2012, 2013, 2016 Free Software Foundation, Inc.
  # 
  # This program is free software; you can redistribute it and/or modify
***************
*** 53,57 ****
  );
  
! $VERSION = '6.1';
  
  # XML specific
--- 53,57 ----
  );
  
! $VERSION = '6.2';
  
  # XML specific
***************
*** 443,446 ****
--- 443,447 ----
  }
  
+ # Main output function for the XML file.
  sub output($$)
  {
***************
*** 860,864 ****
                      and $root->{'parent'}->{'type'} eq 'row') {
            print STDERR "BUG: multitable cell command not in a row "
!             .Texinfo::Parser::_print_current($root);
          }
          
--- 861,865 ----
                      and $root->{'parent'}->{'type'} eq 'row') {
            print STDERR "BUG: multitable cell command not in a row "
!             .Texinfo::Common::_print_current($root);
          }
          
***************
*** 1359,1364 ****
              # in that case the end of line is in the columnfractions line
              # or in the columnprototypes.  
!             if ($root->{'cmdname'} eq 'multitable' and $root->{'extra'}) {
!               if ($root->{'extra'}->{'prototypes_line'}) {
                  $result .= $self->open_element('columnprototypes');
                  my $first_proto = 1;
--- 1360,1404 ----
              # in that case the end of line is in the columnfractions line
              # or in the columnprototypes.  
! 
!             if ($root->{'cmdname'} eq 'multitable') {
!               if (not $root->{'extra'}->{'columnfractions'}) {
!                 # Like 'prototypes' extra value, but keeping spaces information
!                 my @prototype_line;
!                 if (defined $root->{'args'}[0]
!                     and defined $root->{'args'}[0]->{'type'}
!                     and $root->{'args'}[0]->{'type'} eq 'block_line_arg') {
!                   foreach my $content (@{$root->{'args'}[0]{'contents'}}) {
!                     if ($content->{'type'} and $content->{'type'} eq 'bracketed') {
!                       push @prototype_line, $content;
!                     } elsif ($content->{'text'}) {
!                       # The regexp breaks between characters, with a non space followed
!                       # by a space or a space followed by non space.  It is like \b, but
!                       # for \s \S, and not \w \W.
!                       foreach my $prototype_or_space (split /(?<=\S)(?=\s)|(?=\S)(?<=\s)/, 
!                         $content->{'text'}) {
!                         if ($prototype_or_space =~ /\S/) {
!                           push @prototype_line, {'text' => $prototype_or_space,
!                             'type' => 'row_prototype' };
!                         } elsif ($prototype_or_space =~ /\s/) {
!                           push @prototype_line, {'text' => $prototype_or_space,
!                             'type' => 'prototype_space' };
!                         }
!                       }
!                     } else {
!                       # FIXME could this happen?  Should be a debug message?
!                       if (!$content->{'cmdname'}) { 
!                       } elsif ($content->{'cmdname'} eq 'c' 
!                           or $content->{'cmdname'} eq 'comment') {
!                       } else {
!                         push @prototype_line, $content;
!                       }
!                     }
!                   }
!                   $root->{'extra'}->{'prototypes_line'} = \@prototype_line;
!                 }
!               }
! 
!               if ($root->{'extra'}
!                     and $root->{'extra'}->{'prototypes_line'}) {
                  $result .= $self->open_element('columnprototypes');
                  my $first_proto = 1;
***************
*** 1386,1390 ****
                  $contents_possible_comment 
                    = $root->{'args'}->[-1]->{'contents'};
!               } elsif ($root->{'extra'}->{'columnfractions'}) {
                  my $cmd;
                  foreach my $content (@{$root->{'args'}->[0]->{'contents'}}) {
--- 1426,1431 ----
                  $contents_possible_comment 
                    = $root->{'args'}->[-1]->{'contents'};
!               } elsif ($root->{'extra'}
!                          and $root->{'extra'}->{'columnfractions'}) {
                  my $cmd;
                  foreach my $content (@{$root->{'args'}->[0]->{'contents'}}) {
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/Text.pm texinfo-6.3/tp/Texinfo/Convert/Text.pm
*** texinfo-6.1/tp/Texinfo/Convert/Text.pm	2016-02-06 11:31:29.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/Text.pm	2016-09-10 20:27:56.000000000 +0100
***************
*** 53,57 ****
  );
  
! $VERSION = '6.1';
  
  # this is in fact not needed for 'footnote', 'shortcaption', 'caption'
--- 53,57 ----
  );
  
! $VERSION = '6.2';
  
  # this is in fact not needed for 'footnote', 'shortcaption', 'caption'
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/TextContent.pm texinfo-6.3/tp/Texinfo/Convert/TextContent.pm
*** texinfo-6.1/tp/Texinfo/Convert/TextContent.pm	2016-02-06 11:31:29.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/TextContent.pm	2016-09-10 20:27:56.000000000 +0100
***************
*** 1,5 ****
  # TextContent.pm: return the text contents stripped of commands
  #
! # Copyright 2012 Free Software Foundation, Inc.
  # 
  # This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  # TextContent.pm: return the text contents stripped of commands
  #
! # Copyright 2012, 2016 Free Software Foundation, Inc.
  # 
  # This program is free software; you can redistribute it and/or modify
***************
*** 96,113 ****
    my $root = shift;
  
-   if (0) {
-     print STDERR "root $root";
-     print STDERR " cmd: \@$root->{'cmdname'}," if ($root->{'cmdname'});
-     print STDERR " type: $root->{'type'}," if ($root->{'type'});
-     my $text = $root->{'text'};
-     if (defined($text)) {
-       $text =~ s/\n/\\n/;
-       print STDERR " text: `$text'";
-     }
-     print STDERR "\n";
-     #print STDERR "  Special def_command: $root->{'extra'}->{'def_command'}\n"
-     #  if (defined($root->{'extra'}) and $root->{'extra'}->{'def_command'});
-   }
- 
    return '' if (!($root->{'type'} and $root->{'type'} eq 'def_line')
       and (($root->{'type'} and $ignored_types{$root->{'type'}})
--- 96,99 ----
***************
*** 151,157 ****
        and (!$root->{'cmdname'} 
             or !$Texinfo::Common::block_item_commands{$root->{'cmdname'}})) {
-     #if ($root->{'type'} and ($root->{'type'} eq 'def_line'
-     #                         or $root->{'type'} eq 'menu_entry')) { 
-     #}
      my $args;
      if ($root->{'cmdname'} 
--- 137,140 ----
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/Makefile.in texinfo-6.3/tp/Texinfo/Convert/XSParagraph/Makefile.in
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/Makefile.in	2016-01-30 18:04:15.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/Makefile.in	2016-09-10 20:30:15.000000000 +0100
***************
*** 104,117 ****
  	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
  	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
! 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
! 	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mmap-anon.m4 \
! 	$(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/off_t.m4 \
! 	$(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/printf.m4 \
! 	$(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/size_max.m4 \
  	$(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stddef_h.m4 \
  	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \
! 	$(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \
! 	$(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/sys_types_h.m4 \
! 	$(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/vasnprintf.m4 \
  	$(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/warn-on-use.m4 \
  	$(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \
--- 104,115 ----
  	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
  	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
! 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/memchr.m4 \
! 	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/multiarch.m4 \
! 	$(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/onceonly.m4 \
! 	$(top_srcdir)/m4/printf.m4 $(top_srcdir)/m4/size_max.m4 \
  	$(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stddef_h.m4 \
  	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \
! 	$(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/string_h.m4 \
! 	$(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/vasnprintf.m4 \
  	$(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/warn-on-use.m4 \
  	$(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \
***************
*** 347,368 ****
  FGREP = @FGREP@
  FLOAT_H = @FLOAT_H@
- GNULIB_ATOLL = @GNULIB_ATOLL@
  GNULIB_BTOWC = @GNULIB_BTOWC@
- GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
- GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
- GNULIB_CHDIR = @GNULIB_CHDIR@
- GNULIB_CHOWN = @GNULIB_CHOWN@
- GNULIB_CLOSE = @GNULIB_CLOSE@
  GNULIB_DPRINTF = @GNULIB_DPRINTF@
- GNULIB_DUP = @GNULIB_DUP@
- GNULIB_DUP2 = @GNULIB_DUP2@
- GNULIB_DUP3 = @GNULIB_DUP3@
- GNULIB_ENVIRON = @GNULIB_ENVIRON@
- GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@
- GNULIB_FACCESSAT = @GNULIB_FACCESSAT@
- GNULIB_FCHDIR = @GNULIB_FCHDIR@
- GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
  GNULIB_FCLOSE = @GNULIB_FCLOSE@
- GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
  GNULIB_FDOPEN = @GNULIB_FDOPEN@
  GNULIB_FFLUSH = @GNULIB_FFLUSH@
--- 345,351 ----
***************
*** 382,413 ****
  GNULIB_FSEEK = @GNULIB_FSEEK@
  GNULIB_FSEEKO = @GNULIB_FSEEKO@
- GNULIB_FSYNC = @GNULIB_FSYNC@
  GNULIB_FTELL = @GNULIB_FTELL@
  GNULIB_FTELLO = @GNULIB_FTELLO@
- GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
  GNULIB_FWRITE = @GNULIB_FWRITE@
  GNULIB_GETC = @GNULIB_GETC@
  GNULIB_GETCHAR = @GNULIB_GETCHAR@
- GNULIB_GETCWD = @GNULIB_GETCWD@
  GNULIB_GETDELIM = @GNULIB_GETDELIM@
- GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
- GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@
- GNULIB_GETGROUPS = @GNULIB_GETGROUPS@
- GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@
  GNULIB_GETLINE = @GNULIB_GETLINE@
- GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@
- GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
- GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
- GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
- GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
- GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
- GNULIB_GRANTPT = @GNULIB_GRANTPT@
- GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
- GNULIB_ISATTY = @GNULIB_ISATTY@
- GNULIB_LCHOWN = @GNULIB_LCHOWN@
- GNULIB_LINK = @GNULIB_LINK@
- GNULIB_LINKAT = @GNULIB_LINKAT@
- GNULIB_LSEEK = @GNULIB_LSEEK@
- GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
  GNULIB_MBRLEN = @GNULIB_MBRLEN@
  GNULIB_MBRTOWC = @GNULIB_MBRTOWC@
--- 365,375 ----
***************
*** 429,479 ****
  GNULIB_MBSSTR = @GNULIB_MBSSTR@
  GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
- GNULIB_MBTOWC = @GNULIB_MBTOWC@
  GNULIB_MEMCHR = @GNULIB_MEMCHR@
  GNULIB_MEMMEM = @GNULIB_MEMMEM@
  GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
  GNULIB_MEMRCHR = @GNULIB_MEMRCHR@
- GNULIB_MKDTEMP = @GNULIB_MKDTEMP@
- GNULIB_MKOSTEMP = @GNULIB_MKOSTEMP@
- GNULIB_MKOSTEMPS = @GNULIB_MKOSTEMPS@
- GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
- GNULIB_MKSTEMPS = @GNULIB_MKSTEMPS@
  GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
  GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
  GNULIB_PCLOSE = @GNULIB_PCLOSE@
  GNULIB_PERROR = @GNULIB_PERROR@
- GNULIB_PIPE = @GNULIB_PIPE@
- GNULIB_PIPE2 = @GNULIB_PIPE2@
  GNULIB_POPEN = @GNULIB_POPEN@
- GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
- GNULIB_PREAD = @GNULIB_PREAD@
  GNULIB_PRINTF = @GNULIB_PRINTF@
  GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
- GNULIB_PTSNAME = @GNULIB_PTSNAME@
- GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
  GNULIB_PUTC = @GNULIB_PUTC@
  GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
- GNULIB_PUTENV = @GNULIB_PUTENV@
  GNULIB_PUTS = @GNULIB_PUTS@
- GNULIB_PWRITE = @GNULIB_PWRITE@
- GNULIB_QSORT_R = @GNULIB_QSORT_R@
- GNULIB_RANDOM = @GNULIB_RANDOM@
- GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
  GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
- GNULIB_READ = @GNULIB_READ@
- GNULIB_READLINK = @GNULIB_READLINK@
- GNULIB_READLINKAT = @GNULIB_READLINKAT@
- GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
- GNULIB_REALPATH = @GNULIB_REALPATH@
  GNULIB_REMOVE = @GNULIB_REMOVE@
  GNULIB_RENAME = @GNULIB_RENAME@
  GNULIB_RENAMEAT = @GNULIB_RENAMEAT@
- GNULIB_RMDIR = @GNULIB_RMDIR@
- GNULIB_RPMATCH = @GNULIB_RPMATCH@
  GNULIB_SCANF = @GNULIB_SCANF@
- GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
- GNULIB_SETENV = @GNULIB_SETENV@
- GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
- GNULIB_SLEEP = @GNULIB_SLEEP@
  GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
  GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
--- 391,413 ----
***************
*** 494,514 ****
  GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
  GNULIB_STRSTR = @GNULIB_STRSTR@
- GNULIB_STRTOD = @GNULIB_STRTOD@
  GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
- GNULIB_STRTOLL = @GNULIB_STRTOLL@
- GNULIB_STRTOULL = @GNULIB_STRTOULL@
  GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
- GNULIB_SYMLINK = @GNULIB_SYMLINK@
- GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
- GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
  GNULIB_TMPFILE = @GNULIB_TMPFILE@
- GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
- GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
- GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
- GNULIB_UNLINK = @GNULIB_UNLINK@
- GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
- GNULIB_UNLOCKPT = @GNULIB_UNLOCKPT@
- GNULIB_UNSETENV = @GNULIB_UNSETENV@
- GNULIB_USLEEP = @GNULIB_USLEEP@
  GNULIB_VASPRINTF = @GNULIB_VASPRINTF@
  GNULIB_VDPRINTF = @GNULIB_VDPRINTF@
--- 428,434 ----
***************
*** 548,552 ****
  GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
  GNULIB_WCTOB = @GNULIB_WCTOB@
- GNULIB_WCTOMB = @GNULIB_WCTOMB@
  GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
  GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
--- 468,471 ----
***************
*** 555,583 ****
  GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
  GNULIB_WMEMSET = @GNULIB_WMEMSET@
- GNULIB_WRITE = @GNULIB_WRITE@
- GNULIB__EXIT = @GNULIB__EXIT@
  GREP = @GREP@
- HAVE_ATOLL = @HAVE_ATOLL@
  HAVE_BTOWC = @HAVE_BTOWC@
- HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
- HAVE_CHOWN = @HAVE_CHOWN@
- HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
- HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
- HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
  HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
  HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
  HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
  HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
- HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
  HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
- HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
- HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
- HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
- HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
  HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
  HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
  HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
- HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
- HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
  HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
  HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
--- 474,487 ----
***************
*** 587,622 ****
  HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
  HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
- HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
- HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
  HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
  HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
  HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
  HAVE_DPRINTF = @HAVE_DPRINTF@
- HAVE_DUP2 = @HAVE_DUP2@
- HAVE_DUP3 = @HAVE_DUP3@
- HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
- HAVE_FACCESSAT = @HAVE_FACCESSAT@
- HAVE_FCHDIR = @HAVE_FCHDIR@
- HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
- HAVE_FDATASYNC = @HAVE_FDATASYNC@
  HAVE_FEATURES_H = @HAVE_FEATURES_H@
  HAVE_FFSL = @HAVE_FFSL@
  HAVE_FFSLL = @HAVE_FFSLL@
  HAVE_FSEEKO = @HAVE_FSEEKO@
- HAVE_FSYNC = @HAVE_FSYNC@
  HAVE_FTELLO = @HAVE_FTELLO@
- HAVE_FTRUNCATE = @HAVE_FTRUNCATE@
- HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
- HAVE_GETGROUPS = @HAVE_GETGROUPS@
- HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
- HAVE_GETLOGIN = @HAVE_GETLOGIN@
- HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
- HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
- HAVE_GRANTPT = @HAVE_GRANTPT@
- HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
  HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
- HAVE_LCHOWN = @HAVE_LCHOWN@
- HAVE_LINK = @HAVE_LINK@
- HAVE_LINKAT = @HAVE_LINKAT@
  HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
  HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@
--- 491,504 ----
***************
*** 629,663 ****
  HAVE_MEMCHR = @HAVE_MEMCHR@
  HAVE_MEMPCPY = @HAVE_MEMPCPY@
- HAVE_MKDTEMP = @HAVE_MKDTEMP@
- HAVE_MKOSTEMP = @HAVE_MKOSTEMP@
- HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@
- HAVE_MKSTEMP = @HAVE_MKSTEMP@
- HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
- HAVE_OS_H = @HAVE_OS_H@
  HAVE_PCLOSE = @HAVE_PCLOSE@
- HAVE_PIPE = @HAVE_PIPE@
- HAVE_PIPE2 = @HAVE_PIPE2@
  HAVE_POPEN = @HAVE_POPEN@
- HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
- HAVE_PREAD = @HAVE_PREAD@
- HAVE_PTSNAME = @HAVE_PTSNAME@
- HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
- HAVE_PWRITE = @HAVE_PWRITE@
- HAVE_RANDOM = @HAVE_RANDOM@
- HAVE_RANDOM_H = @HAVE_RANDOM_H@
- HAVE_RANDOM_R = @HAVE_RANDOM_R@
  HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
- HAVE_READLINK = @HAVE_READLINK@
- HAVE_READLINKAT = @HAVE_READLINKAT@
- HAVE_REALPATH = @HAVE_REALPATH@
  HAVE_RENAMEAT = @HAVE_RENAMEAT@
- HAVE_RPMATCH = @HAVE_RPMATCH@
- HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
- HAVE_SETENV = @HAVE_SETENV@
- HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
  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@
- HAVE_SLEEP = @HAVE_SLEEP@
  HAVE_STDINT_H = @HAVE_STDINT_H@
  HAVE_STPCPY = @HAVE_STPCPY@
--- 511,521 ----
***************
*** 667,687 ****
  HAVE_STRPBRK = @HAVE_STRPBRK@
  HAVE_STRSEP = @HAVE_STRSEP@
- HAVE_STRTOD = @HAVE_STRTOD@
- HAVE_STRTOLL = @HAVE_STRTOLL@
- HAVE_STRTOULL = @HAVE_STRTOULL@
- HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
  HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
- HAVE_SYMLINK = @HAVE_SYMLINK@
- HAVE_SYMLINKAT = @HAVE_SYMLINKAT@
  HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
  HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
- HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
- HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
  HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
- HAVE_UNISTD_H = @HAVE_UNISTD_H@
- HAVE_UNLINKAT = @HAVE_UNLINKAT@
- HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
  HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
- HAVE_USLEEP = @HAVE_USLEEP@
  HAVE_VASPRINTF = @HAVE_VASPRINTF@
  HAVE_VDPRINTF = @HAVE_VDPRINTF@
--- 525,533 ----
***************
*** 720,724 ****
  HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
  HAVE_WMEMSET = @HAVE_WMEMSET@
- HAVE__EXIT = @HAVE__EXIT@
  INCLUDE_NEXT = @INCLUDE_NEXT@
  INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
--- 566,569 ----
***************
*** 745,752 ****
  NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
  NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@
- NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
  NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@
  NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
- NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
  NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
  NEXT_ERRNO_H = @NEXT_ERRNO_H@
--- 590,595 ----
***************
*** 755,762 ****
  NEXT_STDINT_H = @NEXT_STDINT_H@
  NEXT_STDIO_H = @NEXT_STDIO_H@
- NEXT_STDLIB_H = @NEXT_STDLIB_H@
  NEXT_STRING_H = @NEXT_STRING_H@
  NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
- NEXT_UNISTD_H = @NEXT_UNISTD_H@
  NEXT_WCHAR_H = @NEXT_WCHAR_H@
  NM = @NM@
--- 598,603 ----
***************
*** 790,801 ****
  RANLIB = @RANLIB@
  REPLACE_BTOWC = @REPLACE_BTOWC@
- REPLACE_CALLOC = @REPLACE_CALLOC@
- REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
- REPLACE_CHOWN = @REPLACE_CHOWN@
- REPLACE_CLOSE = @REPLACE_CLOSE@
  REPLACE_DPRINTF = @REPLACE_DPRINTF@
- REPLACE_DUP = @REPLACE_DUP@
- REPLACE_DUP2 = @REPLACE_DUP2@
- REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
  REPLACE_FCLOSE = @REPLACE_FCLOSE@
  REPLACE_FDOPEN = @REPLACE_FDOPEN@
--- 631,635 ----
***************
*** 809,828 ****
  REPLACE_FTELL = @REPLACE_FTELL@
  REPLACE_FTELLO = @REPLACE_FTELLO@
- REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
- REPLACE_GETCWD = @REPLACE_GETCWD@
  REPLACE_GETDELIM = @REPLACE_GETDELIM@
- REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
- REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
- REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
  REPLACE_GETLINE = @REPLACE_GETLINE@
- REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
- REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
- REPLACE_ISATTY = @REPLACE_ISATTY@
  REPLACE_ITOLD = @REPLACE_ITOLD@
- REPLACE_LCHOWN = @REPLACE_LCHOWN@
- REPLACE_LINK = @REPLACE_LINK@
- REPLACE_LINKAT = @REPLACE_LINKAT@
- REPLACE_LSEEK = @REPLACE_LSEEK@
- REPLACE_MALLOC = @REPLACE_MALLOC@
  REPLACE_MBRLEN = @REPLACE_MBRLEN@
  REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
--- 643,649 ----
***************
*** 831,861 ****
  REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
  REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
- REPLACE_MBTOWC = @REPLACE_MBTOWC@
  REPLACE_MEMCHR = @REPLACE_MEMCHR@
  REPLACE_MEMMEM = @REPLACE_MEMMEM@
- REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
  REPLACE_NULL = @REPLACE_NULL@
  REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
  REPLACE_PERROR = @REPLACE_PERROR@
  REPLACE_POPEN = @REPLACE_POPEN@
- REPLACE_PREAD = @REPLACE_PREAD@
  REPLACE_PRINTF = @REPLACE_PRINTF@
- REPLACE_PTSNAME = @REPLACE_PTSNAME@
- REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
- REPLACE_PUTENV = @REPLACE_PUTENV@
- REPLACE_PWRITE = @REPLACE_PWRITE@
- REPLACE_QSORT_R = @REPLACE_QSORT_R@
- REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
- REPLACE_READ = @REPLACE_READ@
- REPLACE_READLINK = @REPLACE_READLINK@
- REPLACE_READLINKAT = @REPLACE_READLINKAT@
- REPLACE_REALLOC = @REPLACE_REALLOC@
- REPLACE_REALPATH = @REPLACE_REALPATH@
  REPLACE_REMOVE = @REPLACE_REMOVE@
  REPLACE_RENAME = @REPLACE_RENAME@
  REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
- REPLACE_RMDIR = @REPLACE_RMDIR@
- REPLACE_SETENV = @REPLACE_SETENV@
- REPLACE_SLEEP = @REPLACE_SLEEP@
  REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
  REPLACE_SPRINTF = @REPLACE_SPRINTF@
--- 652,665 ----
***************
*** 873,886 ****
  REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
  REPLACE_STRSTR = @REPLACE_STRSTR@
- REPLACE_STRTOD = @REPLACE_STRTOD@
  REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
- REPLACE_SYMLINK = @REPLACE_SYMLINK@
- REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
  REPLACE_TMPFILE = @REPLACE_TMPFILE@
- REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
- REPLACE_UNLINK = @REPLACE_UNLINK@
- REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
- REPLACE_UNSETENV = @REPLACE_UNSETENV@
- REPLACE_USLEEP = @REPLACE_USLEEP@
  REPLACE_VASPRINTF = @REPLACE_VASPRINTF@
  REPLACE_VDPRINTF = @REPLACE_VDPRINTF@
--- 677,682 ----
***************
*** 894,900 ****
  REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
  REPLACE_WCTOB = @REPLACE_WCTOB@
- REPLACE_WCTOMB = @REPLACE_WCTOMB@
  REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
  SED = @SED@
  SET_MAKE = @SET_MAKE@
--- 690,694 ----
***************
*** 906,911 ****
  STRIP = @STRIP@
  UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@
- UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
- UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
  VERSION = @VERSION@
  WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
--- 700,703 ----
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/TestXS.pm texinfo-6.3/tp/Texinfo/Convert/XSParagraph/TestXS.pm
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/TestXS.pm	2016-02-06 11:31:29.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/TestXS.pm	2016-09-10 20:27:56.000000000 +0100
***************
*** 139,143 ****
  
  my $module = "TestXS";
! our $module_version = '6.0';
  
  my $flags = 0;
--- 139,143 ----
  
  my $module = "TestXS";
! our $module_version = '6.3';
  
  my $flags = 0;
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/aclocal.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/aclocal.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/aclocal.m4	2016-01-30 18:04:13.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/aclocal.m4	2016-09-10 20:30:13.000000000 +0100
***************
*** 1232,1236 ****
  m4_include([m4/ltversion.m4])
  m4_include([m4/lt~obsolete.m4])
- m4_include([m4/malloc.m4])
  m4_include([m4/memchr.m4])
  m4_include([m4/mmap-anon.m4])
--- 1232,1235 ----
***************
*** 1239,1243 ****
  m4_include([m4/onceonly.m4])
  m4_include([m4/printf.m4])
- m4_include([m4/realloc.m4])
  m4_include([m4/size_max.m4])
  m4_include([m4/ssize_t.m4])
--- 1238,1241 ----
***************
*** 1246,1253 ****
  m4_include([m4/stdint_h.m4])
  m4_include([m4/stdio_h.m4])
- m4_include([m4/stdlib_h.m4])
  m4_include([m4/string_h.m4])
  m4_include([m4/sys_types_h.m4])
- m4_include([m4/unistd_h.m4])
  m4_include([m4/vasnprintf.m4])
  m4_include([m4/vasprintf.m4])
--- 1244,1249 ----
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/config.in texinfo-6.3/tp/Texinfo/Convert/XSParagraph/config.in
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/config.in	2016-01-30 18:04:22.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/config.in	2016-09-10 20:30:21.000000000 +0100
***************
*** 55,61 ****
  #undef GNULIB_TEST_MEMCHR
  
- /* Define to 1 when the gnulib module realloc-posix should be tested. */
- #undef GNULIB_TEST_REALLOC_POSIX
- 
  /* Define to 1 when the gnulib module vasprintf should be tested. */
  #undef GNULIB_TEST_VASPRINTF
--- 55,58 ----
***************
*** 129,181 ****
  #undef HAVE_MPROTECT
  
- /* Define to 1 if atoll is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_ATOLL
- 
  /* Define to 1 if btowc is declared even after undefining macros. */
  #undef HAVE_RAW_DECL_BTOWC
  
- /* Define to 1 if canonicalize_file_name is declared even after undefining
-    macros. */
- #undef HAVE_RAW_DECL_CANONICALIZE_FILE_NAME
- 
- /* Define to 1 if chdir is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_CHDIR
- 
- /* Define to 1 if chown is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_CHOWN
- 
  /* Define to 1 if dprintf is declared even after undefining macros. */
  #undef HAVE_RAW_DECL_DPRINTF
  
- /* Define to 1 if dup is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_DUP
- 
- /* Define to 1 if dup2 is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_DUP2
- 
- /* Define to 1 if dup3 is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_DUP3
- 
- /* Define to 1 if endusershell is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_ENDUSERSHELL
- 
- /* Define to 1 if environ is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_ENVIRON
- 
- /* Define to 1 if euidaccess is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_EUIDACCESS
- 
- /* Define to 1 if faccessat is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_FACCESSAT
- 
- /* Define to 1 if fchdir is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_FCHDIR
- 
- /* Define to 1 if fchownat is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_FCHOWNAT
- 
- /* Define to 1 if fdatasync is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_FDATASYNC
- 
  /* Define to 1 if ffsl is declared even after undefining macros. */
  #undef HAVE_RAW_DECL_FFSL
--- 126,135 ----
***************
*** 190,271 ****
  #undef HAVE_RAW_DECL_FSEEKO
  
- /* Define to 1 if fsync is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_FSYNC
- 
  /* Define to 1 if ftello is declared even after undefining macros. */
  #undef HAVE_RAW_DECL_FTELLO
  
- /* Define to 1 if ftruncate is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_FTRUNCATE
- 
- /* Define to 1 if getcwd is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_GETCWD
- 
  /* Define to 1 if getdelim is declared even after undefining macros. */
  #undef HAVE_RAW_DECL_GETDELIM
  
- /* Define to 1 if getdomainname is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_GETDOMAINNAME
- 
- /* Define to 1 if getdtablesize is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_GETDTABLESIZE
- 
- /* Define to 1 if getgroups is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_GETGROUPS
- 
- /* Define to 1 if gethostname is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_GETHOSTNAME
- 
  /* Define to 1 if getline is declared even after undefining macros. */
  #undef HAVE_RAW_DECL_GETLINE
  
- /* Define to 1 if getloadavg is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_GETLOADAVG
- 
- /* Define to 1 if getlogin is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_GETLOGIN
- 
- /* Define to 1 if getlogin_r is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_GETLOGIN_R
- 
- /* Define to 1 if getpagesize is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_GETPAGESIZE
- 
  /* Define to 1 if gets is declared even after undefining macros. */
  #undef HAVE_RAW_DECL_GETS
  
- /* Define to 1 if getsubopt is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_GETSUBOPT
- 
- /* Define to 1 if getusershell is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_GETUSERSHELL
- 
- /* Define to 1 if grantpt is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_GRANTPT
- 
- /* Define to 1 if group_member is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_GROUP_MEMBER
- 
- /* Define to 1 if initstate is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_INITSTATE
- 
- /* Define to 1 if initstate_r is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_INITSTATE_R
- 
- /* Define to 1 if isatty is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_ISATTY
- 
- /* Define to 1 if lchown is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_LCHOWN
- 
- /* Define to 1 if link is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_LINK
- 
- /* Define to 1 if linkat is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_LINKAT
- 
- /* Define to 1 if lseek is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_LSEEK
- 
  /* Define to 1 if mbrlen is declared even after undefining macros. */
  #undef HAVE_RAW_DECL_MBRLEN
--- 144,159 ----
***************
*** 292,394 ****
  #undef HAVE_RAW_DECL_MEMRCHR
  
- /* Define to 1 if mkdtemp is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_MKDTEMP
- 
- /* Define to 1 if mkostemp is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_MKOSTEMP
- 
- /* Define to 1 if mkostemps is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_MKOSTEMPS
- 
- /* Define to 1 if mkstemp is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_MKSTEMP
- 
- /* Define to 1 if mkstemps is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_MKSTEMPS
- 
  /* Define to 1 if pclose is declared even after undefining macros. */
  #undef HAVE_RAW_DECL_PCLOSE
  
- /* Define to 1 if pipe is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_PIPE
- 
- /* Define to 1 if pipe2 is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_PIPE2
- 
  /* Define to 1 if popen is declared even after undefining macros. */
  #undef HAVE_RAW_DECL_POPEN
  
- /* Define to 1 if posix_openpt is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_POSIX_OPENPT
- 
- /* Define to 1 if pread is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_PREAD
- 
- /* Define to 1 if ptsname is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_PTSNAME
- 
- /* Define to 1 if ptsname_r is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_PTSNAME_R
- 
- /* Define to 1 if pwrite is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_PWRITE
- 
- /* Define to 1 if random is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_RANDOM
- 
- /* Define to 1 if random_r is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_RANDOM_R
- 
  /* Define to 1 if rawmemchr is declared even after undefining macros. */
  #undef HAVE_RAW_DECL_RAWMEMCHR
  
- /* Define to 1 if readlink is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_READLINK
- 
- /* Define to 1 if readlinkat is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_READLINKAT
- 
- /* Define to 1 if realpath is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_REALPATH
- 
  /* Define to 1 if renameat is declared even after undefining macros. */
  #undef HAVE_RAW_DECL_RENAMEAT
  
- /* Define to 1 if rmdir is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_RMDIR
- 
- /* Define to 1 if rpmatch is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_RPMATCH
- 
- /* Define to 1 if secure_getenv is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_SECURE_GETENV
- 
- /* Define to 1 if setenv is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_SETENV
- 
- /* Define to 1 if sethostname is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_SETHOSTNAME
- 
- /* Define to 1 if setstate is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_SETSTATE
- 
- /* Define to 1 if setstate_r is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_SETSTATE_R
- 
- /* Define to 1 if setusershell is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_SETUSERSHELL
- 
- /* Define to 1 if sleep is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_SLEEP
- 
  /* Define to 1 if snprintf is declared even after undefining macros. */
  #undef HAVE_RAW_DECL_SNPRINTF
  
- /* Define to 1 if srandom is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_SRANDOM
- 
- /* Define to 1 if srandom_r is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_SRANDOM_R
- 
  /* Define to 1 if stpcpy is declared even after undefining macros. */
  #undef HAVE_RAW_DECL_STPCPY
--- 180,198 ----
***************
*** 427,472 ****
  #undef HAVE_RAW_DECL_STRSIGNAL
  
- /* Define to 1 if strtod is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_STRTOD
- 
  /* Define to 1 if strtok_r is declared even after undefining macros. */
  #undef HAVE_RAW_DECL_STRTOK_R
  
- /* Define to 1 if strtoll is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_STRTOLL
- 
- /* Define to 1 if strtoull is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_STRTOULL
- 
  /* Define to 1 if strverscmp is declared even after undefining macros. */
  #undef HAVE_RAW_DECL_STRVERSCMP
  
- /* Define to 1 if symlink is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_SYMLINK
- 
- /* Define to 1 if symlinkat is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_SYMLINKAT
- 
  /* Define to 1 if tmpfile is declared even after undefining macros. */
  #undef HAVE_RAW_DECL_TMPFILE
  
- /* Define to 1 if ttyname_r is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_TTYNAME_R
- 
- /* Define to 1 if unlink is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_UNLINK
- 
- /* Define to 1 if unlinkat is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_UNLINKAT
- 
- /* Define to 1 if unlockpt is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_UNLOCKPT
- 
- /* Define to 1 if unsetenv is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_UNSETENV
- 
- /* Define to 1 if usleep is declared even after undefining macros. */
- #undef HAVE_RAW_DECL_USLEEP
- 
  /* Define to 1 if vdprintf is declared even after undefining macros. */
  #undef HAVE_RAW_DECL_VDPRINTF
--- 231,243 ----
***************
*** 574,583 ****
  #undef HAVE_RAW_DECL_WMEMSET
  
- /* Define to 1 if _Exit is declared even after undefining macros. */
- #undef HAVE_RAW_DECL__EXIT
- 
- /* Define if the 'realloc' function is POSIX compliant. */
- #undef HAVE_REALLOC_POSIX
- 
  /* Define to 1 if 'sig_atomic_t' is a signed integer type. */
  #undef HAVE_SIGNED_SIG_ATOMIC_T
--- 345,348 ----
***************
*** 806,809 ****
--- 571,580 ----
  #undef _POSIX_SOURCE
  
+ /* Define to 1 if the system <stdint.h> predates C++11. */
+ #undef __STDC_CONSTANT_MACROS
+ 
+ /* Define to 1 if the system <stdint.h> predates C++11. */
+ #undef __STDC_LIMIT_MACROS
+ 
  /* Please see the Gnulib manual for how to use these macros.
  
***************
*** 852,855 ****
--- 623,627 ----
        : (199901L <= __STDC_VERSION__ \
           && !defined __HP_cc \
+          && !defined __PGI \
           && !(defined __SUNPRO_C && __STDC__))) \
       && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/configure texinfo-6.3/tp/Texinfo/Convert/XSParagraph/configure
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/configure	2016-01-30 18:04:16.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/configure	2016-09-10 20:30:16.000000000 +0100
***************
*** 1,5 ****
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.69 for texinfo 6.0.
  #
  #
--- 1,5 ----
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.69 for texinfo 6.3.
  #
  #
***************
*** 588,593 ****
  PACKAGE_NAME='texinfo'
  PACKAGE_TARNAME='texinfo'
! PACKAGE_VERSION='6.0'
! PACKAGE_STRING='texinfo 6.0'
  PACKAGE_BUGREPORT=''
  PACKAGE_URL=''
--- 588,593 ----
  PACKAGE_NAME='texinfo'
  PACKAGE_TARNAME='texinfo'
! PACKAGE_VERSION='6.3'
! PACKAGE_STRING='texinfo 6.3'
  PACKAGE_BUGREPORT=''
  PACKAGE_URL=''
***************
*** 762,891 ****
  GNULIB_BTOWC
  HAVE_FEATURES_H
- HAVE_UNISTD_H
- NEXT_AS_FIRST_DIRECTIVE_UNISTD_H
- NEXT_UNISTD_H
- UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS
- UNISTD_H_HAVE_WINSOCK2_H
- REPLACE_WRITE
- REPLACE_USLEEP
- REPLACE_UNLINKAT
- REPLACE_UNLINK
- REPLACE_TTYNAME_R
- REPLACE_SYMLINKAT
- REPLACE_SYMLINK
- REPLACE_SLEEP
- REPLACE_RMDIR
- REPLACE_READLINKAT
- REPLACE_READLINK
- REPLACE_READ
- REPLACE_PWRITE
- REPLACE_PREAD
- REPLACE_LSEEK
- REPLACE_LINKAT
- REPLACE_LINK
- REPLACE_LCHOWN
- REPLACE_ISATTY
- REPLACE_GETPAGESIZE
- REPLACE_GETGROUPS
- REPLACE_GETLOGIN_R
- REPLACE_GETDTABLESIZE
- REPLACE_GETDOMAINNAME
- REPLACE_GETCWD
- REPLACE_FTRUNCATE
- REPLACE_FCHOWNAT
- REPLACE_DUP2
- REPLACE_DUP
- REPLACE_CLOSE
- REPLACE_CHOWN
- HAVE_SYS_PARAM_H
- HAVE_OS_H
- HAVE_DECL_TTYNAME_R
- HAVE_DECL_SETHOSTNAME
- HAVE_DECL_GETUSERSHELL
- HAVE_DECL_GETPAGESIZE
- HAVE_DECL_GETLOGIN_R
- HAVE_DECL_GETDOMAINNAME
- HAVE_DECL_FDATASYNC
- HAVE_DECL_FCHDIR
- HAVE_DECL_ENVIRON
- HAVE_USLEEP
- HAVE_UNLINKAT
- HAVE_SYMLINKAT
- HAVE_SYMLINK
- HAVE_SLEEP
- HAVE_SETHOSTNAME
- HAVE_READLINKAT
- HAVE_READLINK
- HAVE_PWRITE
- HAVE_PREAD
- HAVE_PIPE2
- HAVE_PIPE
- HAVE_LINKAT
- HAVE_LINK
- HAVE_LCHOWN
- HAVE_GROUP_MEMBER
- HAVE_GETPAGESIZE
- HAVE_GETLOGIN
- HAVE_GETHOSTNAME
- HAVE_GETGROUPS
- HAVE_GETDTABLESIZE
- HAVE_FTRUNCATE
- HAVE_FSYNC
- HAVE_FDATASYNC
- HAVE_FCHOWNAT
- HAVE_FCHDIR
- HAVE_FACCESSAT
- HAVE_EUIDACCESS
- HAVE_DUP3
- HAVE_DUP2
- HAVE_CHOWN
- GNULIB_WRITE
- GNULIB_USLEEP
- GNULIB_UNLINKAT
- GNULIB_UNLINK
- GNULIB_UNISTD_H_SIGPIPE
- GNULIB_UNISTD_H_NONBLOCKING
- GNULIB_TTYNAME_R
- GNULIB_SYMLINKAT
- GNULIB_SYMLINK
- GNULIB_SLEEP
- GNULIB_SETHOSTNAME
- GNULIB_RMDIR
- GNULIB_READLINKAT
- GNULIB_READLINK
- GNULIB_READ
- GNULIB_PWRITE
- GNULIB_PREAD
- GNULIB_PIPE2
- GNULIB_PIPE
- GNULIB_LSEEK
- GNULIB_LINKAT
- GNULIB_LINK
- GNULIB_LCHOWN
- GNULIB_ISATTY
- GNULIB_GROUP_MEMBER
- GNULIB_GETUSERSHELL
- GNULIB_GETPAGESIZE
- GNULIB_GETLOGIN_R
- GNULIB_GETLOGIN
- GNULIB_GETHOSTNAME
- GNULIB_GETGROUPS
- GNULIB_GETDTABLESIZE
- GNULIB_GETDOMAINNAME
- GNULIB_GETCWD
- GNULIB_FTRUNCATE
- GNULIB_FSYNC
- GNULIB_FDATASYNC
- GNULIB_FCHOWNAT
- GNULIB_FCHDIR
- GNULIB_FACCESSAT
- GNULIB_EUIDACCESS
- GNULIB_ENVIRON
- GNULIB_DUP3
- GNULIB_DUP2
- GNULIB_DUP
- GNULIB_CLOSE
- GNULIB_CHOWN
- GNULIB_CHDIR
  WINDOWS_64_BIT_OFF_T
  NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H
--- 762,765 ----
***************
*** 893,898 ****
  NEXT_AS_FIRST_DIRECTIVE_STRING_H
  NEXT_STRING_H
- NEXT_AS_FIRST_DIRECTIVE_STDLIB_H
- NEXT_STDLIB_H
  NEXT_AS_FIRST_DIRECTIVE_STDIO_H
  NEXT_STDIO_H
--- 767,770 ----
***************
*** 931,1012 ****
  HAVE_MAX_ALIGN_T
  REPLACE_NULL
- REPLACE_WCTOMB
- REPLACE_UNSETENV
- REPLACE_STRTOD
- REPLACE_SETENV
- REPLACE_REALPATH
- REPLACE_REALLOC
- REPLACE_RANDOM_R
- REPLACE_QSORT_R
- REPLACE_PUTENV
- REPLACE_PTSNAME_R
- REPLACE_PTSNAME
- REPLACE_MKSTEMP
- REPLACE_MBTOWC
- REPLACE_MALLOC
- REPLACE_CANONICALIZE_FILE_NAME
- REPLACE_CALLOC
- HAVE_DECL_UNSETENV
- HAVE_UNLOCKPT
- HAVE_SYS_LOADAVG_H
- HAVE_STRUCT_RANDOM_DATA
- HAVE_STRTOULL
- HAVE_STRTOLL
- HAVE_STRTOD
- HAVE_DECL_SETENV
- HAVE_SETENV
- HAVE_SECURE_GETENV
- HAVE_RPMATCH
- HAVE_REALPATH
- HAVE_RANDOM_R
- HAVE_RANDOM_H
- HAVE_RANDOM
- HAVE_PTSNAME_R
- HAVE_PTSNAME
- HAVE_POSIX_OPENPT
- HAVE_MKSTEMPS
- HAVE_MKSTEMP
- HAVE_MKOSTEMPS
- HAVE_MKOSTEMP
- HAVE_MKDTEMP
- HAVE_GRANTPT
- HAVE_GETSUBOPT
- HAVE_DECL_GETLOADAVG
- HAVE_CANONICALIZE_FILE_NAME
- HAVE_ATOLL
- HAVE__EXIT
- GNULIB_WCTOMB
- GNULIB_UNSETENV
- GNULIB_UNLOCKPT
- GNULIB_SYSTEM_POSIX
- GNULIB_STRTOULL
- GNULIB_STRTOLL
- GNULIB_STRTOD
- GNULIB_SETENV
- GNULIB_SECURE_GETENV
- GNULIB_RPMATCH
- GNULIB_REALPATH
- GNULIB_REALLOC_POSIX
- GNULIB_RANDOM_R
- GNULIB_RANDOM
- GNULIB_QSORT_R
- GNULIB_PUTENV
- GNULIB_PTSNAME_R
- GNULIB_PTSNAME
- GNULIB_POSIX_OPENPT
- GNULIB_MKSTEMPS
- GNULIB_MKSTEMP
- GNULIB_MKOSTEMPS
- GNULIB_MKOSTEMP
- GNULIB_MKDTEMP
- GNULIB_MBTOWC
- GNULIB_MALLOC_POSIX
- GNULIB_GRANTPT
- GNULIB_GETSUBOPT
- GNULIB_GETLOADAVG
- GNULIB_CANONICALIZE_FILE_NAME
- GNULIB_CALLOC_POSIX
- GNULIB_ATOLL
- GNULIB__EXIT
  APPLE_UNIVERSAL_BUILD
  UNDEFINE_STRTOK_R
--- 803,806 ----
***************
*** 1880,1884 ****
    # This message is too long to be a string in the A/UX 3.1 sh.
    cat <<_ACEOF
! \`configure' configures texinfo 6.0 to adapt to many kinds of systems.
  
  Usage: $0 [OPTION]... [VAR=VALUE]...
--- 1674,1678 ----
    # This message is too long to be a string in the A/UX 3.1 sh.
    cat <<_ACEOF
! \`configure' configures texinfo 6.3 to adapt to many kinds of systems.
  
  Usage: $0 [OPTION]... [VAR=VALUE]...
***************
*** 1950,1954 ****
  if test -n "$ac_init_help"; then
    case $ac_init_help in
!      short | recursive ) echo "Configuration of texinfo 6.0:";;
     esac
    cat <<\_ACEOF
--- 1744,1748 ----
  if test -n "$ac_init_help"; then
    case $ac_init_help in
!      short | recursive ) echo "Configuration of texinfo 6.3:";;
     esac
    cat <<\_ACEOF
***************
*** 2069,2073 ****
  if $ac_init_version; then
    cat <<\_ACEOF
! texinfo configure 6.0
  generated by GNU Autoconf 2.69
  
--- 1863,1867 ----
  if $ac_init_version; then
    cat <<\_ACEOF
! texinfo configure 6.3
  generated by GNU Autoconf 2.69
  
***************
*** 2717,2721 ****
  running configure, to aid debugging if configure makes a mistake.
  
! It was created by texinfo $as_me 6.0, which was
  generated by GNU Autoconf 2.69.  Invocation command line was
  
--- 2511,2515 ----
  running configure, to aid debugging if configure makes a mistake.
  
! It was created by texinfo $as_me 6.3, which was
  generated by GNU Autoconf 2.69.  Invocation command line was
  
***************
*** 3002,3006 ****
  gl_header_list="$gl_header_list wchar.h"
  gl_header_list="$gl_header_list stdint.h"
- gl_header_list="$gl_header_list unistd.h"
  gl_func_list="$gl_func_list vasnprintf"
  gl_header_list="$gl_header_list features.h"
--- 2796,2799 ----
***************
*** 3589,3593 ****
  # Define the identity of the package.
   PACKAGE='texinfo'
!  VERSION='6.0'
  
  
--- 3382,3386 ----
  # Define the identity of the package.
   PACKAGE='texinfo'
!  VERSION='6.3'
  
  
***************
*** 3701,3706 ****
  
  
- 
- 
  # Check whether --enable-perl-xs was given.
  if test "${enable_perl_xs+set}" = set; then :
--- 3494,3497 ----
***************
*** 5763,5769 ****
    # Code from module memchr:
    # Code from module multiarch:
-   # Code from module realloc-posix:
    # Code from module size_max:
-   # Code from module snippet/_Noreturn:
    # Code from module snippet/arg-nonnull:
    # Code from module snippet/c++defs:
--- 5554,5558 ----
***************
*** 5773,5780 ****
    # Code from module stdint:
    # Code from module stdio:
-   # Code from module stdlib:
    # Code from module string:
    # Code from module sys_types:
-   # Code from module unistd:
    # Code from module vasnprintf:
    # Code from module vasprintf:
--- 5562,5567 ----
***************
*** 7063,7178 ****
  
  
-   GNULIB__EXIT=0;
-   GNULIB_ATOLL=0;
-   GNULIB_CALLOC_POSIX=0;
-   GNULIB_CANONICALIZE_FILE_NAME=0;
-   GNULIB_GETLOADAVG=0;
-   GNULIB_GETSUBOPT=0;
-   GNULIB_GRANTPT=0;
-   GNULIB_MALLOC_POSIX=0;
-   GNULIB_MBTOWC=0;
-   GNULIB_MKDTEMP=0;
-   GNULIB_MKOSTEMP=0;
-   GNULIB_MKOSTEMPS=0;
-   GNULIB_MKSTEMP=0;
-   GNULIB_MKSTEMPS=0;
-   GNULIB_POSIX_OPENPT=0;
-   GNULIB_PTSNAME=0;
-   GNULIB_PTSNAME_R=0;
-   GNULIB_PUTENV=0;
-   GNULIB_QSORT_R=0;
-   GNULIB_RANDOM=0;
-   GNULIB_RANDOM_R=0;
-   GNULIB_REALLOC_POSIX=0;
-   GNULIB_REALPATH=0;
-   GNULIB_RPMATCH=0;
-   GNULIB_SECURE_GETENV=0;
-   GNULIB_SETENV=0;
-   GNULIB_STRTOD=0;
-   GNULIB_STRTOLL=0;
-   GNULIB_STRTOULL=0;
-   GNULIB_SYSTEM_POSIX=0;
-   GNULIB_UNLOCKPT=0;
-   GNULIB_UNSETENV=0;
-   GNULIB_WCTOMB=0;
-     HAVE__EXIT=1;
-   HAVE_ATOLL=1;
-   HAVE_CANONICALIZE_FILE_NAME=1;
-   HAVE_DECL_GETLOADAVG=1;
-   HAVE_GETSUBOPT=1;
-   HAVE_GRANTPT=1;
-   HAVE_MKDTEMP=1;
-   HAVE_MKOSTEMP=1;
-   HAVE_MKOSTEMPS=1;
-   HAVE_MKSTEMP=1;
-   HAVE_MKSTEMPS=1;
-   HAVE_POSIX_OPENPT=1;
-   HAVE_PTSNAME=1;
-   HAVE_PTSNAME_R=1;
-   HAVE_RANDOM=1;
-   HAVE_RANDOM_H=1;
-   HAVE_RANDOM_R=1;
-   HAVE_REALPATH=1;
-   HAVE_RPMATCH=1;
-   HAVE_SECURE_GETENV=1;
-   HAVE_SETENV=1;
-   HAVE_DECL_SETENV=1;
-   HAVE_STRTOD=1;
-   HAVE_STRTOLL=1;
-   HAVE_STRTOULL=1;
-   HAVE_STRUCT_RANDOM_DATA=1;
-   HAVE_SYS_LOADAVG_H=0;
-   HAVE_UNLOCKPT=1;
-   HAVE_DECL_UNSETENV=1;
-   REPLACE_CALLOC=0;
-   REPLACE_CANONICALIZE_FILE_NAME=0;
-   REPLACE_MALLOC=0;
-   REPLACE_MBTOWC=0;
-   REPLACE_MKSTEMP=0;
-   REPLACE_PTSNAME=0;
-   REPLACE_PTSNAME_R=0;
-   REPLACE_PUTENV=0;
-   REPLACE_QSORT_R=0;
-   REPLACE_RANDOM_R=0;
-   REPLACE_REALLOC=0;
-   REPLACE_REALPATH=0;
-   REPLACE_SETENV=0;
-   REPLACE_STRTOD=0;
-   REPLACE_UNSETENV=0;
-   REPLACE_WCTOMB=0;
- 
- 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether malloc, realloc, calloc are POSIX compliant" >&5
- $as_echo_n "checking whether malloc, realloc, calloc are POSIX compliant... " >&6; }
- if ${gl_cv_func_malloc_posix+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-                         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
- main ()
- {
- #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-              choke me
-              #endif
- 
-   ;
-   return 0;
- }
- _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
-   gl_cv_func_malloc_posix=yes
- else
-   gl_cv_func_malloc_posix=no
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_malloc_posix" >&5
- $as_echo "$gl_cv_func_malloc_posix" >&6; }
- 
- 
      REPLACE_NULL=0;
    HAVE_MAX_ALIGN_T=1;
--- 6850,6853 ----
***************
*** 7487,7490 ****
--- 7162,7167 ----
  
  #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+ #define __STDC_CONSTANT_MACROS 1
+ #define __STDC_LIMIT_MACROS 1
  #include <stdint.h>
  /* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
***************
*** 7655,7658 ****
--- 7332,7337 ----
  
  #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+ #define __STDC_CONSTANT_MACROS 1
+ #define __STDC_LIMIT_MACROS 1
  #include <stdint.h>
  
***************
*** 7741,7744 ****
--- 7420,7475 ----
    fi
    if test "$gl_cv_header_working_stdint_h" = yes; then
+             { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h predates C++11" >&5
+ $as_echo_n "checking whether stdint.h predates C++11... " >&6; }
+ if ${gl_cv_header_stdint_predates_cxx11_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   gl_cv_header_stdint_predates_cxx11_h=yes
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ 
+ #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+ #include <stdint.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 <signal.h>
+   #if HAVE_WCHAR_H
+   # include <stdio.h>
+   # include <time.h>
+   # include <wchar.h>
+   #endif
+ 
+ 
+ intmax_t im = INTMAX_MAX;
+ int32_t i32 = INT32_C (0x7fffffff);
+ 
+ int
+ main ()
+ {
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_compile "$LINENO"; then :
+   gl_cv_header_stdint_predates_cxx11_h=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_predates_cxx11_h" >&5
+ $as_echo "$gl_cv_header_stdint_predates_cxx11_h" >&6; }
+ 
+     if test "$gl_cv_header_stdint_predates_cxx11_h" = yes; then
+ 
+ $as_echo "#define __STDC_CONSTANT_MACROS 1" >>confdefs.h
+ 
+ 
+ $as_echo "#define __STDC_LIMIT_MACROS 1" >>confdefs.h
+ 
+     fi
      STDINT_H=
    else
***************
*** 8355,8489 ****
  
  
-   GNULIB_CHDIR=0;
-   GNULIB_CHOWN=0;
-   GNULIB_CLOSE=0;
-   GNULIB_DUP=0;
-   GNULIB_DUP2=0;
-   GNULIB_DUP3=0;
-   GNULIB_ENVIRON=0;
-   GNULIB_EUIDACCESS=0;
-   GNULIB_FACCESSAT=0;
-   GNULIB_FCHDIR=0;
-   GNULIB_FCHOWNAT=0;
-   GNULIB_FDATASYNC=0;
-   GNULIB_FSYNC=0;
-   GNULIB_FTRUNCATE=0;
-   GNULIB_GETCWD=0;
-   GNULIB_GETDOMAINNAME=0;
-   GNULIB_GETDTABLESIZE=0;
-   GNULIB_GETGROUPS=0;
-   GNULIB_GETHOSTNAME=0;
-   GNULIB_GETLOGIN=0;
-   GNULIB_GETLOGIN_R=0;
-   GNULIB_GETPAGESIZE=0;
-   GNULIB_GETUSERSHELL=0;
-   GNULIB_GROUP_MEMBER=0;
-   GNULIB_ISATTY=0;
-   GNULIB_LCHOWN=0;
-   GNULIB_LINK=0;
-   GNULIB_LINKAT=0;
-   GNULIB_LSEEK=0;
-   GNULIB_PIPE=0;
-   GNULIB_PIPE2=0;
-   GNULIB_PREAD=0;
-   GNULIB_PWRITE=0;
-   GNULIB_READ=0;
-   GNULIB_READLINK=0;
-   GNULIB_READLINKAT=0;
-   GNULIB_RMDIR=0;
-   GNULIB_SETHOSTNAME=0;
-   GNULIB_SLEEP=0;
-   GNULIB_SYMLINK=0;
-   GNULIB_SYMLINKAT=0;
-   GNULIB_TTYNAME_R=0;
-   GNULIB_UNISTD_H_NONBLOCKING=0;
-   GNULIB_UNISTD_H_SIGPIPE=0;
-   GNULIB_UNLINK=0;
-   GNULIB_UNLINKAT=0;
-   GNULIB_USLEEP=0;
-   GNULIB_WRITE=0;
-     HAVE_CHOWN=1;
-   HAVE_DUP2=1;
-   HAVE_DUP3=1;
-   HAVE_EUIDACCESS=1;
-   HAVE_FACCESSAT=1;
-   HAVE_FCHDIR=1;
-   HAVE_FCHOWNAT=1;
-   HAVE_FDATASYNC=1;
-   HAVE_FSYNC=1;
-   HAVE_FTRUNCATE=1;
-   HAVE_GETDTABLESIZE=1;
-   HAVE_GETGROUPS=1;
-   HAVE_GETHOSTNAME=1;
-   HAVE_GETLOGIN=1;
-   HAVE_GETPAGESIZE=1;
-   HAVE_GROUP_MEMBER=1;
-   HAVE_LCHOWN=1;
-   HAVE_LINK=1;
-   HAVE_LINKAT=1;
-   HAVE_PIPE=1;
-   HAVE_PIPE2=1;
-   HAVE_PREAD=1;
-   HAVE_PWRITE=1;
-   HAVE_READLINK=1;
-   HAVE_READLINKAT=1;
-   HAVE_SETHOSTNAME=1;
-   HAVE_SLEEP=1;
-   HAVE_SYMLINK=1;
-   HAVE_SYMLINKAT=1;
-   HAVE_UNLINKAT=1;
-   HAVE_USLEEP=1;
-   HAVE_DECL_ENVIRON=1;
-   HAVE_DECL_FCHDIR=1;
-   HAVE_DECL_FDATASYNC=1;
-   HAVE_DECL_GETDOMAINNAME=1;
-   HAVE_DECL_GETLOGIN_R=1;
-   HAVE_DECL_GETPAGESIZE=1;
-   HAVE_DECL_GETUSERSHELL=1;
-   HAVE_DECL_SETHOSTNAME=1;
-   HAVE_DECL_TTYNAME_R=1;
-   HAVE_OS_H=0;
-   HAVE_SYS_PARAM_H=0;
-   REPLACE_CHOWN=0;
-   REPLACE_CLOSE=0;
-   REPLACE_DUP=0;
-   REPLACE_DUP2=0;
-   REPLACE_FCHOWNAT=0;
-   REPLACE_FTRUNCATE=0;
-   REPLACE_GETCWD=0;
-   REPLACE_GETDOMAINNAME=0;
-   REPLACE_GETDTABLESIZE=0;
-   REPLACE_GETLOGIN_R=0;
-   REPLACE_GETGROUPS=0;
-   REPLACE_GETPAGESIZE=0;
-   REPLACE_ISATTY=0;
-   REPLACE_LCHOWN=0;
-   REPLACE_LINK=0;
-   REPLACE_LINKAT=0;
-   REPLACE_LSEEK=0;
-   REPLACE_PREAD=0;
-   REPLACE_PWRITE=0;
-   REPLACE_READ=0;
-   REPLACE_READLINK=0;
-   REPLACE_READLINKAT=0;
-   REPLACE_RMDIR=0;
-   REPLACE_SLEEP=0;
-   REPLACE_SYMLINK=0;
-   REPLACE_SYMLINKAT=0;
-   REPLACE_TTYNAME_R=0;
-   REPLACE_UNLINK=0;
-   REPLACE_UNLINKAT=0;
-   REPLACE_USLEEP=0;
-   REPLACE_WRITE=0;
-   UNISTD_H_HAVE_WINSOCK2_H=0;
-   UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=0;
- 
- 
- 
- 
- 
- 
- 
- 
  
  
--- 8086,8089 ----
***************
*** 9278,9281 ****
--- 8878,8883 ----
  
  _ACEOF
+                               save_ac_compile="$ac_compile"
+      ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest1/`
       if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
    (eval $ac_compile) 2>&5
***************
*** 9283,9287 ****
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    test $ac_status = 0; }; then
-        mv conftest.$ac_objext conftest1.$ac_objext
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
--- 8885,8888 ----
***************
*** 9299,9302 ****
--- 8900,8904 ----
  
  _ACEOF
+               ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest2/`
         if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
    (eval $ac_compile) 2>&5
***************
*** 9304,9308 ****
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    test $ac_status = 0; }; then
-          mv conftest.$ac_objext conftest2.$ac_objext
           if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&5 2>&1; then
             :
--- 8906,8909 ----
***************
*** 9312,9315 ****
--- 8913,8917 ----
         fi
       fi
+      ac_compile="$save_ac_compile"
       rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext
  
***************
*** 9704,9708 ****
--- 9306,9312 ----
          if (getdelim (&line, &siz, '\n', in) == -1)
            return 3;
+         free (line);
        }
+       fclose (in);
        return 0;
      }
***************
*** 9855,9858 ****
--- 9459,9463 ----
          if (!(len == 4 && line && strcmp (line, "foo\n") == 0))
            return 2;
+         free (line);
        }
        {
***************
*** 9863,9867 ****
--- 9468,9474 ----
          if (getline (&line, &siz, in) == -1)
            return 3;
+         free (line);
        }
+       fclose (in);
        return 0;
      }
***************
*** 9966,10007 ****
  
  
- 
- 
-   if test $gl_cv_func_malloc_posix = yes; then
- 
- $as_echo "#define HAVE_REALLOC_POSIX 1" >>confdefs.h
- 
-   else
-     REPLACE_REALLOC=1
-   fi
- 
-   if test $REPLACE_REALLOC = 1; then
- 
- 
- 
- 
- 
- 
- 
- 
-   gl_LIBOBJS="$gl_LIBOBJS realloc.$ac_objext"
- 
-   fi
- 
- 
- 
- 
- 
-           GNULIB_REALLOC_POSIX=1
- 
- 
- 
- 
- 
- $as_echo "#define GNULIB_TEST_REALLOC_POSIX 1" >>confdefs.h
- 
- 
- 
- 
    for ac_header in stdint.h
  do :
--- 9573,9576 ----
***************
*** 10465,10740 ****
  
  
- 
- 
- 
-      if test $gl_cv_have_include_next = yes; then
-        gl_cv_next_stdlib_h='<'stdlib.h'>'
-      else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdlib.h>" >&5
- $as_echo_n "checking absolute name of <stdlib.h>... " >&6; }
- if ${gl_cv_next_stdlib_h+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
- 
- 
- 
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <stdlib.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 'stdlib.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_stdlib_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-   sed -n "$gl_absolute_header_sed"`
- 
-            gl_header=$gl_cv_absolute_stdlib_h
-            gl_cv_next_stdlib_h='"'$gl_header'"'
- 
- 
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdlib_h" >&5
- $as_echo "$gl_cv_next_stdlib_h" >&6; }
-      fi
-      NEXT_STDLIB_H=$gl_cv_next_stdlib_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='<'stdlib.h'>'
-      else
-        # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-        gl_next_as_first_directive=$gl_cv_next_stdlib_h
-      fi
-      NEXT_AS_FIRST_DIRECTIVE_STDLIB_H=$gl_next_as_first_directive
- 
- 
- 
- 
- 
- 
-     for gl_func in _Exit atoll canonicalize_file_name getloadavg getsubopt grantpt     initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps     posix_openpt ptsname ptsname_r random random_r realpath rpmatch     secure_getenv setenv setstate setstate_r srandom srandom_r     strtod strtoll strtoull unlockpt unsetenv; do
-     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
- $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
- if eval \${$as_gl_Symbol+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <stdlib.h>
- #if HAVE_SYS_LOADAVG_H
- # include <sys/loadavg.h>
- #endif
- #if HAVE_RANDOM_H
- # include <random.h>
- #endif
- 
- int
- main ()
- {
- #undef $gl_func
-   (void) $gl_func;
-   ;
-   return 0;
- }
- _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
-   eval "$as_gl_Symbol=yes"
- else
-   eval "$as_gl_Symbol=no"
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- eval ac_res=\$$as_gl_Symbol
- 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
-     if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
- _ACEOF
- 
-                      eval ac_cv_have_decl_$gl_func=yes
- fi
-       done
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-   :
- 
- 
- 
- 
- 
- 
- 
- 
-      if test $gl_cv_have_include_next = yes; then
-        gl_cv_next_unistd_h='<'unistd.h'>'
-      else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <unistd.h>" >&5
- $as_echo_n "checking absolute name of <unistd.h>... " >&6; }
- if ${gl_cv_next_unistd_h+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-              if test $ac_cv_header_unistd_h = yes; then
- 
- 
- 
- 
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <unistd.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 'unistd.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_unistd_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-   sed -n "$gl_absolute_header_sed"`
- 
-            gl_header=$gl_cv_absolute_unistd_h
-            gl_cv_next_unistd_h='"'$gl_header'"'
-           else
-                gl_cv_next_unistd_h='<'unistd.h'>'
-              fi
- 
- 
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_unistd_h" >&5
- $as_echo "$gl_cv_next_unistd_h" >&6; }
-      fi
-      NEXT_UNISTD_H=$gl_cv_next_unistd_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='<'unistd.h'>'
-      else
-        # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-        gl_next_as_first_directive=$gl_cv_next_unistd_h
-      fi
-      NEXT_AS_FIRST_DIRECTIVE_UNISTD_H=$gl_next_as_first_directive
- 
- 
- 
- 
-   if test $ac_cv_header_unistd_h = yes; then
-     HAVE_UNISTD_H=1
-   else
-     HAVE_UNISTD_H=0
-   fi
- 
- 
- 
- 
- 
- 
- 
-     for gl_func in chdir chown dup dup2 dup3 environ euidaccess faccessat fchdir fchownat     fdatasync fsync ftruncate getcwd getdomainname getdtablesize getgroups     gethostname getlogin getlogin_r getpagesize     getusershell setusershell endusershell     group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite     readlink readlinkat rmdir sethostname sleep symlink symlinkat ttyname_r     unlink unlinkat usleep; do
-     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
- $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
- if eval \${$as_gl_Symbol+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- #if HAVE_UNISTD_H
- # include <unistd.h>
- #endif
- /* Some systems declare various items in the wrong headers.  */
- #if !(defined __GLIBC__ && !defined __UCLIBC__)
- # include <fcntl.h>
- # include <stdio.h>
- # include <stdlib.h>
- # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
- #  include <io.h>
- # endif
- #endif
- 
- int
- main ()
- {
- #undef $gl_func
-   (void) $gl_func;
-   ;
-   return 0;
- }
- _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
-   eval "$as_gl_Symbol=yes"
- else
-   eval "$as_gl_Symbol=no"
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- eval ac_res=\$$as_gl_Symbol
- 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
-     if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
- _ACEOF
- 
-                      eval ac_cv_have_decl_$gl_func=yes
- fi
-       done
- 
- 
- 
- 
    :
  
--- 10034,10037 ----
***************
*** 18722,18748 ****
  
  if test x$disable_xs != xyes; then
! { $as_echo "$as_me:${as_lineno-$LINENO}: checking Perl flags for ccflags" >&5
! $as_echo_n "checking Perl flags for ccflags... " >&6; }
! 
            fetch_conf ccflags
- 
-           # Remove any flags that aren't -I or -D
-           conf_value=`echo $conf_value | sed -e 's/-[^ID][^ ]*//g'`
            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $conf_value" >&5
  $as_echo "$conf_value" >&6; }
- 
            PERL_CONF_ccflags=$conf_value
  
  
! { $as_echo "$as_me:${as_lineno-$LINENO}: checking Perl flags for cccdlflags" >&5
! $as_echo_n "checking Perl flags for cccdlflags... " >&6; }
! 
            fetch_conf cccdlflags
- 
-           # Remove any flags that aren't -I or -D
-           conf_value=`echo $conf_value | sed -e 's/-[^ID][^ ]*//g'`
            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $conf_value" >&5
  $as_echo "$conf_value" >&6; }
- 
            PERL_CONF_cccdlflags=$conf_value
  
--- 18019,18035 ----
  
  if test x$disable_xs != xyes; then
! { $as_echo "$as_me:${as_lineno-$LINENO}: checking Perl configuration value ccflags" >&5
! $as_echo_n "checking Perl configuration value ccflags... " >&6; }
            fetch_conf ccflags
            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $conf_value" >&5
  $as_echo "$conf_value" >&6; }
            PERL_CONF_ccflags=$conf_value
  
  
! { $as_echo "$as_me:${as_lineno-$LINENO}: checking Perl configuration value cccdlflags" >&5
! $as_echo_n "checking Perl configuration value cccdlflags... " >&6; }
            fetch_conf cccdlflags
            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $conf_value" >&5
  $as_echo "$conf_value" >&6; }
            PERL_CONF_cccdlflags=$conf_value
  
***************
*** 19388,19392 ****
  # values after options handling.
  ac_log="
! This file was extended by texinfo $as_me 6.0, which was
  generated by GNU Autoconf 2.69.  Invocation command line was
  
--- 18675,18679 ----
  # values after options handling.
  ac_log="
! This file was extended by texinfo $as_me 6.3, which was
  generated by GNU Autoconf 2.69.  Invocation command line was
  
***************
*** 19454,19458 ****
  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  ac_cs_version="\\
! texinfo config.status 6.0
  configured by $0, generated by GNU Autoconf 2.69,
    with options \\"\$ac_cs_config\\"
--- 18741,18745 ----
  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  ac_cs_version="\\
! texinfo config.status 6.3
  configured by $0, generated by GNU Autoconf 2.69,
    with options \\"\$ac_cs_config\\"
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/configure.ac texinfo-6.3/tp/Texinfo/Convert/XSParagraph/configure.ac
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/configure.ac	2016-01-24 20:07:41.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/configure.ac	2016-09-10 20:28:52.000000000 +0100
***************
*** 11,15 ****
  # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  #
! AC_INIT([texinfo], [6.0])
  AM_INIT_AUTOMAKE
  AC_CONFIG_MACRO_DIR([m4])
--- 11,15 ----
  # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  #
! AC_INIT([texinfo], [6.3])
  AM_INIT_AUTOMAKE
  AC_CONFIG_MACRO_DIR([m4])
***************
*** 37,52 ****
  ])
  
- AC_DEFUN([lookup_perl_flags],
-          [AC_MSG_CHECKING([Perl flags for $1])
- 
-           fetch_conf $1
- 
-           # Remove any flags that aren't -I or -D
-           conf_value=`echo $conf_value | sed -e 's/-@<:@^ID@:>@@<:@^ @:>@*//g'`
-           AC_MSG_RESULT([$conf_value])
- 
-           AC_SUBST([PERL_CONF_$1], [$conf_value])
-          ])
- 
  AC_ARG_ENABLE([perl-xs],
      AC_HELP_STRING([--enable-perl-xs],
--- 37,40 ----
***************
*** 110,115 ****
  
  if test x$disable_xs != xyes; then
! lookup_perl_flags([ccflags])
! lookup_perl_flags([cccdlflags])
  
  # flags for linking the extension, e.g. -rpath.
--- 98,103 ----
  
  if test x$disable_xs != xyes; then
! lookup_perl_conf([ccflags])
! lookup_perl_conf([cccdlflags])
  
  # flags for linking the extension, e.g. -rpath.
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/Makefile.am texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/Makefile.am
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/Makefile.am	2016-01-23 12:46:13.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/Makefile.am	2016-08-30 18:49:32.000000000 +0100
***************
*** 1,5 ****
  ## DO NOT EDIT! GENERATED AUTOMATICALLY!
  ## Process this file with automake to produce Makefile.in.
! # Copyright (C) 2002-2015 Free Software Foundation, Inc.
  #
  # This file is free software; you can redistribute it and/or modify
--- 1,5 ----
  ## DO NOT EDIT! GENERATED AUTOMATICALLY!
  ## Process this file with automake to produce Makefile.in.
! # Copyright (C) 2002-2016 Free Software Foundation, Inc.
  #
  # This file is free software; you can redistribute it and/or modify
***************
*** 175,187 ****
  ## end   gnulib module memchr
  
- ## begin gnulib module realloc-posix
- 
- 
- EXTRA_DIST += realloc.c
- 
- EXTRA_libgnu_la_SOURCES += realloc.c
- 
- ## end   gnulib module realloc-posix
- 
  ## begin gnulib module size_max
  
--- 175,178 ----
***************
*** 190,205 ****
  ## end   gnulib module size_max
  
- ## begin gnulib module snippet/_Noreturn
- 
- # Because this Makefile snippet defines a variable used by other
- # gnulib Makefile snippets, it must be present in all Makefile.am that
- # need it. This is ensured by the applicability 'all' defined above.
- 
- _NORETURN_H=$(top_srcdir)/./snippet/_Noreturn.h
- 
- EXTRA_DIST += $(top_srcdir)/./snippet/_Noreturn.h
- 
- ## end   gnulib module snippet/_Noreturn
- 
  ## begin gnulib module snippet/arg-nonnull
  
--- 181,184 ----
***************
*** 480,588 ****
  ## end   gnulib module stdio
  
- ## begin gnulib module stdlib
- 
- BUILT_SOURCES += stdlib.h
- 
- # We need the following in order to create <stdlib.h> when the system
- # doesn't have one that works with the given compiler.
- stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
-   $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
- 	$(AM_V_GEN)rm -f $@-t $@ && \
- 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
- 	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
- 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
- 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
- 	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
- 	      -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \
- 	      -e 's/@''GNULIB__EXIT''@/$(GNULIB__EXIT)/g' \
- 	      -e 's/@''GNULIB_ATOLL''@/$(GNULIB_ATOLL)/g' \
- 	      -e 's/@''GNULIB_CALLOC_POSIX''@/$(GNULIB_CALLOC_POSIX)/g' \
- 	      -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GNULIB_CANONICALIZE_FILE_NAME)/g' \
- 	      -e 's/@''GNULIB_GETLOADAVG''@/$(GNULIB_GETLOADAVG)/g' \
- 	      -e 's/@''GNULIB_GETSUBOPT''@/$(GNULIB_GETSUBOPT)/g' \
- 	      -e 's/@''GNULIB_GRANTPT''@/$(GNULIB_GRANTPT)/g' \
- 	      -e 's/@''GNULIB_MALLOC_POSIX''@/$(GNULIB_MALLOC_POSIX)/g' \
- 	      -e 's/@''GNULIB_MBTOWC''@/$(GNULIB_MBTOWC)/g' \
- 	      -e 's/@''GNULIB_MKDTEMP''@/$(GNULIB_MKDTEMP)/g' \
- 	      -e 's/@''GNULIB_MKOSTEMP''@/$(GNULIB_MKOSTEMP)/g' \
- 	      -e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \
- 	      -e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \
- 	      -e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \
- 	      -e 's/@''GNULIB_POSIX_OPENPT''@/$(GNULIB_POSIX_OPENPT)/g' \
- 	      -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \
- 	      -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \
- 	      -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \
- 	      -e 's/@''GNULIB_QSORT_R''@/$(GNULIB_QSORT_R)/g' \
- 	      -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \
- 	      -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \
- 	      -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \
- 	      -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \
- 	      -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \
- 	      -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_STRTOLL''@/$(GNULIB_STRTOLL)/g' \
- 	      -e 's/@''GNULIB_STRTOULL''@/$(GNULIB_STRTOULL)/g' \
- 	      -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GNULIB_SYSTEM_POSIX)/g' \
- 	      -e 's/@''GNULIB_UNLOCKPT''@/$(GNULIB_UNLOCKPT)/g' \
- 	      -e 's/@''GNULIB_UNSETENV''@/$(GNULIB_UNSETENV)/g' \
- 	      -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \
- 	      < $(srcdir)/stdlib.in.h | \
- 	  sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
- 	      -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \
- 	      -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \
- 	      -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_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \
- 	      -e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \
- 	      -e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \
- 	      -e 's|@''HAVE_MKSTEMP''@|$(HAVE_MKSTEMP)|g' \
- 	      -e 's|@''HAVE_MKSTEMPS''@|$(HAVE_MKSTEMPS)|g' \
- 	      -e 's|@''HAVE_POSIX_OPENPT''@|$(HAVE_POSIX_OPENPT)|g' \
- 	      -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \
- 	      -e 's|@''HAVE_PTSNAME_R''@|$(HAVE_PTSNAME_R)|g' \
- 	      -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \
- 	      -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \
- 	      -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \
- 	      -e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \
- 	      -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_STRTOD''@|$(HAVE_STRTOD)|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' \
- 	      -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \
- 	      -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \
- 	      -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_MALLOC''@|$(REPLACE_MALLOC)|g' \
- 	      -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \
- 	      -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
- 	      -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \
- 	      -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_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_STRTOD''@|$(REPLACE_STRTOD)|g' \
- 	      -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \
- 	      -e 's|@''REPLACE_WCTOMB''@|$(REPLACE_WCTOMB)|g' \
- 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
- 	      -e '/definition of _Noreturn/r $(_NORETURN_H)' \
- 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
- 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
- 	} > $@-t && \
- 	mv $@-t $@
- MOSTLYCLEANFILES += stdlib.h stdlib.h-t
- 
- EXTRA_DIST += stdlib.in.h
- 
- ## end   gnulib module stdlib
- 
  ## begin gnulib module string
  
--- 459,462 ----
***************
*** 710,867 ****
  ## end   gnulib module sys_types
  
- ## begin gnulib module unistd
- 
- BUILT_SOURCES += unistd.h
- libgnu_la_SOURCES += unistd.c
- 
- # We need the following in order to create an empty placeholder for
- # <unistd.h> when the system doesn't have one.
- unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
- 	$(AM_V_GEN)rm -f $@-t $@ && \
- 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- 	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
- 	      -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
- 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
- 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
- 	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
- 	      -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \
- 	      -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
- 	      -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \
- 	      -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \
- 	      -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \
- 	      -e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \
- 	      -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \
- 	      -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \
- 	      -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \
- 	      -e 's/@''GNULIB_EUIDACCESS''@/$(GNULIB_EUIDACCESS)/g' \
- 	      -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \
- 	      -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \
- 	      -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \
- 	      -e 's/@''GNULIB_FDATASYNC''@/$(GNULIB_FDATASYNC)/g' \
- 	      -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \
- 	      -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \
- 	      -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \
- 	      -e 's/@''GNULIB_GETDOMAINNAME''@/$(GNULIB_GETDOMAINNAME)/g' \
- 	      -e 's/@''GNULIB_GETDTABLESIZE''@/$(GNULIB_GETDTABLESIZE)/g' \
- 	      -e 's/@''GNULIB_GETGROUPS''@/$(GNULIB_GETGROUPS)/g' \
- 	      -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \
- 	      -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \
- 	      -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \
- 	      -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \
- 	      -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \
- 	      -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \
- 	      -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \
- 	      -e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \
- 	      -e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \
- 	      -e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \
- 	      -e 's/@''GNULIB_LSEEK''@/$(GNULIB_LSEEK)/g' \
- 	      -e 's/@''GNULIB_PIPE''@/$(GNULIB_PIPE)/g' \
- 	      -e 's/@''GNULIB_PIPE2''@/$(GNULIB_PIPE2)/g' \
- 	      -e 's/@''GNULIB_PREAD''@/$(GNULIB_PREAD)/g' \
- 	      -e 's/@''GNULIB_PWRITE''@/$(GNULIB_PWRITE)/g' \
- 	      -e 's/@''GNULIB_READ''@/$(GNULIB_READ)/g' \
- 	      -e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \
- 	      -e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \
- 	      -e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \
- 	      -e 's/@''GNULIB_SETHOSTNAME''@/$(GNULIB_SETHOSTNAME)/g' \
- 	      -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \
- 	      -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \
- 	      -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \
- 	      -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \
- 	      -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \
- 	      -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \
- 	      -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GNULIB_UNISTD_H_SIGPIPE)/g' \
- 	      -e 's/@''GNULIB_UNLINK''@/$(GNULIB_UNLINK)/g' \
- 	      -e 's/@''GNULIB_UNLINKAT''@/$(GNULIB_UNLINKAT)/g' \
- 	      -e 's/@''GNULIB_USLEEP''@/$(GNULIB_USLEEP)/g' \
- 	      -e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \
- 	      < $(srcdir)/unistd.in.h | \
- 	  sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \
- 	      -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \
- 	      -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \
- 	      -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \
- 	      -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \
- 	      -e 's|@''HAVE_FCHDIR''@|$(HAVE_FCHDIR)|g' \
- 	      -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \
- 	      -e 's|@''HAVE_FDATASYNC''@|$(HAVE_FDATASYNC)|g' \
- 	      -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \
- 	      -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \
- 	      -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \
- 	      -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \
- 	      -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \
- 	      -e 's|@''HAVE_GETLOGIN''@|$(HAVE_GETLOGIN)|g' \
- 	      -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \
- 	      -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \
- 	      -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \
- 	      -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \
- 	      -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \
- 	      -e 's|@''HAVE_PIPE''@|$(HAVE_PIPE)|g' \
- 	      -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \
- 	      -e 's|@''HAVE_PREAD''@|$(HAVE_PREAD)|g' \
- 	      -e 's|@''HAVE_PWRITE''@|$(HAVE_PWRITE)|g' \
- 	      -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \
- 	      -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \
- 	      -e 's|@''HAVE_SETHOSTNAME''@|$(HAVE_SETHOSTNAME)|g' \
- 	      -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
- 	      -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \
- 	      -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \
- 	      -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \
- 	      -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \
- 	      -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \
- 	      -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \
- 	      -e 's|@''HAVE_DECL_FDATASYNC''@|$(HAVE_DECL_FDATASYNC)|g' \
- 	      -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \
- 	      -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \
- 	      -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \
- 	      -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \
- 	      -e 's|@''HAVE_DECL_SETHOSTNAME''@|$(HAVE_DECL_SETHOSTNAME)|g' \
- 	      -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \
- 	      -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
- 	      -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \
- 	  | \
- 	  sed -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
- 	      -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \
- 	      -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \
- 	      -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \
- 	      -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \
- 	      -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \
- 	      -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \
- 	      -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \
- 	      -e 's|@''REPLACE_GETDTABLESIZE''@|$(REPLACE_GETDTABLESIZE)|g' \
- 	      -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \
- 	      -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \
- 	      -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
- 	      -e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \
- 	      -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \
- 	      -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \
- 	      -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \
- 	      -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \
- 	      -e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \
- 	      -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \
- 	      -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \
- 	      -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \
- 	      -e 's|@''REPLACE_READLINKAT''@|$(REPLACE_READLINKAT)|g' \
- 	      -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \
- 	      -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \
- 	      -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \
- 	      -e 's|@''REPLACE_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \
- 	      -e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \
- 	      -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \
- 	      -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \
- 	      -e 's|@''REPLACE_USLEEP''@|$(REPLACE_USLEEP)|g' \
- 	      -e 's|@''REPLACE_WRITE''@|$(REPLACE_WRITE)|g' \
- 	      -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \
- 	      -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \
- 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
- 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
- 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
- 	} > $@-t && \
- 	mv $@-t $@
- MOSTLYCLEANFILES += unistd.h unistd.h-t
- 
- EXTRA_DIST += unistd.in.h
- 
- ## end   gnulib module unistd
- 
  ## begin gnulib module vasnprintf
  
--- 584,587 ----
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/Makefile.in texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/Makefile.in
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/Makefile.in	2016-01-30 18:04:15.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/Makefile.in	2016-09-10 20:30:15.000000000 +0100
***************
*** 15,19 ****
  @SET_MAKE@
  
! # Copyright (C) 2002-2015 Free Software Foundation, Inc.
  #
  # This file is free software; you can redistribute it and/or modify
--- 15,19 ----
  @SET_MAKE@
  
! # Copyright (C) 2002-2016 Free Software Foundation, Inc.
  #
  # This file is free software; you can redistribute it and/or modify
***************
*** 128,141 ****
  	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
  	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
! 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
! 	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mmap-anon.m4 \
! 	$(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/off_t.m4 \
! 	$(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/printf.m4 \
! 	$(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/size_max.m4 \
  	$(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stddef_h.m4 \
  	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \
! 	$(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \
! 	$(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/sys_types_h.m4 \
! 	$(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/vasnprintf.m4 \
  	$(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/warn-on-use.m4 \
  	$(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \
--- 128,139 ----
  	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
  	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
! 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/memchr.m4 \
! 	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/multiarch.m4 \
! 	$(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/onceonly.m4 \
! 	$(top_srcdir)/m4/printf.m4 $(top_srcdir)/m4/size_max.m4 \
  	$(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stddef_h.m4 \
  	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \
! 	$(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/string_h.m4 \
! 	$(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/vasnprintf.m4 \
  	$(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/warn-on-use.m4 \
  	$(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \
***************
*** 153,157 ****
  LTLIBRARIES = $(noinst_LTLIBRARIES)
  am__DEPENDENCIES_1 =
! am_libgnu_la_OBJECTS = unistd.lo xsize.lo
  libgnu_la_OBJECTS = $(am_libgnu_la_OBJECTS)
  AM_V_lt = $(am__v_lt_@AM_V@)
--- 151,155 ----
  LTLIBRARIES = $(noinst_LTLIBRARIES)
  am__DEPENDENCIES_1 =
! am_libgnu_la_OBJECTS = xsize.lo
  libgnu_la_OBJECTS = $(am_libgnu_la_OBJECTS)
  AM_V_lt = $(am__v_lt_@AM_V@)
***************
*** 309,330 ****
  FGREP = @FGREP@
  FLOAT_H = @FLOAT_H@
- GNULIB_ATOLL = @GNULIB_ATOLL@
  GNULIB_BTOWC = @GNULIB_BTOWC@
- GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
- GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
- GNULIB_CHDIR = @GNULIB_CHDIR@
- GNULIB_CHOWN = @GNULIB_CHOWN@
- GNULIB_CLOSE = @GNULIB_CLOSE@
  GNULIB_DPRINTF = @GNULIB_DPRINTF@
- GNULIB_DUP = @GNULIB_DUP@
- GNULIB_DUP2 = @GNULIB_DUP2@
- GNULIB_DUP3 = @GNULIB_DUP3@
- GNULIB_ENVIRON = @GNULIB_ENVIRON@
- GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@
- GNULIB_FACCESSAT = @GNULIB_FACCESSAT@
- GNULIB_FCHDIR = @GNULIB_FCHDIR@
- GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
  GNULIB_FCLOSE = @GNULIB_FCLOSE@
- GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
  GNULIB_FDOPEN = @GNULIB_FDOPEN@
  GNULIB_FFLUSH = @GNULIB_FFLUSH@
--- 307,313 ----
***************
*** 344,375 ****
  GNULIB_FSEEK = @GNULIB_FSEEK@
  GNULIB_FSEEKO = @GNULIB_FSEEKO@
- GNULIB_FSYNC = @GNULIB_FSYNC@
  GNULIB_FTELL = @GNULIB_FTELL@
  GNULIB_FTELLO = @GNULIB_FTELLO@
- GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
  GNULIB_FWRITE = @GNULIB_FWRITE@
  GNULIB_GETC = @GNULIB_GETC@
  GNULIB_GETCHAR = @GNULIB_GETCHAR@
- GNULIB_GETCWD = @GNULIB_GETCWD@
  GNULIB_GETDELIM = @GNULIB_GETDELIM@
- GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
- GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@
- GNULIB_GETGROUPS = @GNULIB_GETGROUPS@
- GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@
  GNULIB_GETLINE = @GNULIB_GETLINE@
- GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@
- GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
- GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
- GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
- GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
- GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
- GNULIB_GRANTPT = @GNULIB_GRANTPT@
- GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
- GNULIB_ISATTY = @GNULIB_ISATTY@
- GNULIB_LCHOWN = @GNULIB_LCHOWN@
- GNULIB_LINK = @GNULIB_LINK@
- GNULIB_LINKAT = @GNULIB_LINKAT@
- GNULIB_LSEEK = @GNULIB_LSEEK@
- GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
  GNULIB_MBRLEN = @GNULIB_MBRLEN@
  GNULIB_MBRTOWC = @GNULIB_MBRTOWC@
--- 327,337 ----
***************
*** 391,441 ****
  GNULIB_MBSSTR = @GNULIB_MBSSTR@
  GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
- GNULIB_MBTOWC = @GNULIB_MBTOWC@
  GNULIB_MEMCHR = @GNULIB_MEMCHR@
  GNULIB_MEMMEM = @GNULIB_MEMMEM@
  GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
  GNULIB_MEMRCHR = @GNULIB_MEMRCHR@
- GNULIB_MKDTEMP = @GNULIB_MKDTEMP@
- GNULIB_MKOSTEMP = @GNULIB_MKOSTEMP@
- GNULIB_MKOSTEMPS = @GNULIB_MKOSTEMPS@
- GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
- GNULIB_MKSTEMPS = @GNULIB_MKSTEMPS@
  GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
  GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
  GNULIB_PCLOSE = @GNULIB_PCLOSE@
  GNULIB_PERROR = @GNULIB_PERROR@
- GNULIB_PIPE = @GNULIB_PIPE@
- GNULIB_PIPE2 = @GNULIB_PIPE2@
  GNULIB_POPEN = @GNULIB_POPEN@
- GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
- GNULIB_PREAD = @GNULIB_PREAD@
  GNULIB_PRINTF = @GNULIB_PRINTF@
  GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
- GNULIB_PTSNAME = @GNULIB_PTSNAME@
- GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
  GNULIB_PUTC = @GNULIB_PUTC@
  GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
- GNULIB_PUTENV = @GNULIB_PUTENV@
  GNULIB_PUTS = @GNULIB_PUTS@
- GNULIB_PWRITE = @GNULIB_PWRITE@
- GNULIB_QSORT_R = @GNULIB_QSORT_R@
- GNULIB_RANDOM = @GNULIB_RANDOM@
- GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
  GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
- GNULIB_READ = @GNULIB_READ@
- GNULIB_READLINK = @GNULIB_READLINK@
- GNULIB_READLINKAT = @GNULIB_READLINKAT@
- GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
- GNULIB_REALPATH = @GNULIB_REALPATH@
  GNULIB_REMOVE = @GNULIB_REMOVE@
  GNULIB_RENAME = @GNULIB_RENAME@
  GNULIB_RENAMEAT = @GNULIB_RENAMEAT@
- GNULIB_RMDIR = @GNULIB_RMDIR@
- GNULIB_RPMATCH = @GNULIB_RPMATCH@
  GNULIB_SCANF = @GNULIB_SCANF@
- GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
- GNULIB_SETENV = @GNULIB_SETENV@
- GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
- GNULIB_SLEEP = @GNULIB_SLEEP@
  GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
  GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
--- 353,375 ----
***************
*** 456,476 ****
  GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
  GNULIB_STRSTR = @GNULIB_STRSTR@
- GNULIB_STRTOD = @GNULIB_STRTOD@
  GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
- GNULIB_STRTOLL = @GNULIB_STRTOLL@
- GNULIB_STRTOULL = @GNULIB_STRTOULL@
  GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
- GNULIB_SYMLINK = @GNULIB_SYMLINK@
- GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
- GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
  GNULIB_TMPFILE = @GNULIB_TMPFILE@
- GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
- GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
- GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
- GNULIB_UNLINK = @GNULIB_UNLINK@
- GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
- GNULIB_UNLOCKPT = @GNULIB_UNLOCKPT@
- GNULIB_UNSETENV = @GNULIB_UNSETENV@
- GNULIB_USLEEP = @GNULIB_USLEEP@
  GNULIB_VASPRINTF = @GNULIB_VASPRINTF@
  GNULIB_VDPRINTF = @GNULIB_VDPRINTF@
--- 390,396 ----
***************
*** 510,514 ****
  GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
  GNULIB_WCTOB = @GNULIB_WCTOB@
- GNULIB_WCTOMB = @GNULIB_WCTOMB@
  GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
  GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
--- 430,433 ----
***************
*** 517,545 ****
  GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
  GNULIB_WMEMSET = @GNULIB_WMEMSET@
- GNULIB_WRITE = @GNULIB_WRITE@
- GNULIB__EXIT = @GNULIB__EXIT@
  GREP = @GREP@
- HAVE_ATOLL = @HAVE_ATOLL@
  HAVE_BTOWC = @HAVE_BTOWC@
- HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
- HAVE_CHOWN = @HAVE_CHOWN@
- HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
- HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
- HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
  HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
  HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
  HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
  HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
- HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
  HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
- HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
- HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
- HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
- HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
  HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
  HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
  HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
- HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
- HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
  HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
  HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
--- 436,449 ----
***************
*** 549,584 ****
  HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
  HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
- HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
- HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
  HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
  HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
  HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
  HAVE_DPRINTF = @HAVE_DPRINTF@
- HAVE_DUP2 = @HAVE_DUP2@
- HAVE_DUP3 = @HAVE_DUP3@
- HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
- HAVE_FACCESSAT = @HAVE_FACCESSAT@
- HAVE_FCHDIR = @HAVE_FCHDIR@
- HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
- HAVE_FDATASYNC = @HAVE_FDATASYNC@
  HAVE_FEATURES_H = @HAVE_FEATURES_H@
  HAVE_FFSL = @HAVE_FFSL@
  HAVE_FFSLL = @HAVE_FFSLL@
  HAVE_FSEEKO = @HAVE_FSEEKO@
- HAVE_FSYNC = @HAVE_FSYNC@
  HAVE_FTELLO = @HAVE_FTELLO@
- HAVE_FTRUNCATE = @HAVE_FTRUNCATE@
- HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
- HAVE_GETGROUPS = @HAVE_GETGROUPS@
- HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
- HAVE_GETLOGIN = @HAVE_GETLOGIN@
- HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
- HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
- HAVE_GRANTPT = @HAVE_GRANTPT@
- HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
  HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
- HAVE_LCHOWN = @HAVE_LCHOWN@
- HAVE_LINK = @HAVE_LINK@
- HAVE_LINKAT = @HAVE_LINKAT@
  HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
  HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@
--- 453,466 ----
***************
*** 591,625 ****
  HAVE_MEMCHR = @HAVE_MEMCHR@
  HAVE_MEMPCPY = @HAVE_MEMPCPY@
- HAVE_MKDTEMP = @HAVE_MKDTEMP@
- HAVE_MKOSTEMP = @HAVE_MKOSTEMP@
- HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@
- HAVE_MKSTEMP = @HAVE_MKSTEMP@
- HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
- HAVE_OS_H = @HAVE_OS_H@
  HAVE_PCLOSE = @HAVE_PCLOSE@
- HAVE_PIPE = @HAVE_PIPE@
- HAVE_PIPE2 = @HAVE_PIPE2@
  HAVE_POPEN = @HAVE_POPEN@
- HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
- HAVE_PREAD = @HAVE_PREAD@
- HAVE_PTSNAME = @HAVE_PTSNAME@
- HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
- HAVE_PWRITE = @HAVE_PWRITE@
- HAVE_RANDOM = @HAVE_RANDOM@
- HAVE_RANDOM_H = @HAVE_RANDOM_H@
- HAVE_RANDOM_R = @HAVE_RANDOM_R@
  HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
- HAVE_READLINK = @HAVE_READLINK@
- HAVE_READLINKAT = @HAVE_READLINKAT@
- HAVE_REALPATH = @HAVE_REALPATH@
  HAVE_RENAMEAT = @HAVE_RENAMEAT@
- HAVE_RPMATCH = @HAVE_RPMATCH@
- HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
- HAVE_SETENV = @HAVE_SETENV@
- HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
  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@
- HAVE_SLEEP = @HAVE_SLEEP@
  HAVE_STDINT_H = @HAVE_STDINT_H@
  HAVE_STPCPY = @HAVE_STPCPY@
--- 473,483 ----
***************
*** 629,649 ****
  HAVE_STRPBRK = @HAVE_STRPBRK@
  HAVE_STRSEP = @HAVE_STRSEP@
- HAVE_STRTOD = @HAVE_STRTOD@
- HAVE_STRTOLL = @HAVE_STRTOLL@
- HAVE_STRTOULL = @HAVE_STRTOULL@
- HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
  HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
- HAVE_SYMLINK = @HAVE_SYMLINK@
- HAVE_SYMLINKAT = @HAVE_SYMLINKAT@
  HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
  HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
- HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
- HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
  HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
- HAVE_UNISTD_H = @HAVE_UNISTD_H@
- HAVE_UNLINKAT = @HAVE_UNLINKAT@
- HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
  HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
- HAVE_USLEEP = @HAVE_USLEEP@
  HAVE_VASPRINTF = @HAVE_VASPRINTF@
  HAVE_VDPRINTF = @HAVE_VDPRINTF@
--- 487,495 ----
***************
*** 682,686 ****
  HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
  HAVE_WMEMSET = @HAVE_WMEMSET@
- HAVE__EXIT = @HAVE__EXIT@
  INCLUDE_NEXT = @INCLUDE_NEXT@
  INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
--- 528,531 ----
***************
*** 707,714 ****
  NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
  NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@
- NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
  NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@
  NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
- NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
  NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
  NEXT_ERRNO_H = @NEXT_ERRNO_H@
--- 552,557 ----
***************
*** 717,724 ****
  NEXT_STDINT_H = @NEXT_STDINT_H@
  NEXT_STDIO_H = @NEXT_STDIO_H@
- NEXT_STDLIB_H = @NEXT_STDLIB_H@
  NEXT_STRING_H = @NEXT_STRING_H@
  NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
- NEXT_UNISTD_H = @NEXT_UNISTD_H@
  NEXT_WCHAR_H = @NEXT_WCHAR_H@
  NM = @NM@
--- 560,565 ----
***************
*** 752,763 ****
  RANLIB = @RANLIB@
  REPLACE_BTOWC = @REPLACE_BTOWC@
- REPLACE_CALLOC = @REPLACE_CALLOC@
- REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
- REPLACE_CHOWN = @REPLACE_CHOWN@
- REPLACE_CLOSE = @REPLACE_CLOSE@
  REPLACE_DPRINTF = @REPLACE_DPRINTF@
- REPLACE_DUP = @REPLACE_DUP@
- REPLACE_DUP2 = @REPLACE_DUP2@
- REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
  REPLACE_FCLOSE = @REPLACE_FCLOSE@
  REPLACE_FDOPEN = @REPLACE_FDOPEN@
--- 593,597 ----
***************
*** 771,790 ****
  REPLACE_FTELL = @REPLACE_FTELL@
  REPLACE_FTELLO = @REPLACE_FTELLO@
- REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
- REPLACE_GETCWD = @REPLACE_GETCWD@
  REPLACE_GETDELIM = @REPLACE_GETDELIM@
- REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
- REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
- REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
  REPLACE_GETLINE = @REPLACE_GETLINE@
- REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
- REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
- REPLACE_ISATTY = @REPLACE_ISATTY@
  REPLACE_ITOLD = @REPLACE_ITOLD@
- REPLACE_LCHOWN = @REPLACE_LCHOWN@
- REPLACE_LINK = @REPLACE_LINK@
- REPLACE_LINKAT = @REPLACE_LINKAT@
- REPLACE_LSEEK = @REPLACE_LSEEK@
- REPLACE_MALLOC = @REPLACE_MALLOC@
  REPLACE_MBRLEN = @REPLACE_MBRLEN@
  REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
--- 605,611 ----
***************
*** 793,823 ****
  REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
  REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
- REPLACE_MBTOWC = @REPLACE_MBTOWC@
  REPLACE_MEMCHR = @REPLACE_MEMCHR@
  REPLACE_MEMMEM = @REPLACE_MEMMEM@
- REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
  REPLACE_NULL = @REPLACE_NULL@
  REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
  REPLACE_PERROR = @REPLACE_PERROR@
  REPLACE_POPEN = @REPLACE_POPEN@
- REPLACE_PREAD = @REPLACE_PREAD@
  REPLACE_PRINTF = @REPLACE_PRINTF@
- REPLACE_PTSNAME = @REPLACE_PTSNAME@
- REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
- REPLACE_PUTENV = @REPLACE_PUTENV@
- REPLACE_PWRITE = @REPLACE_PWRITE@
- REPLACE_QSORT_R = @REPLACE_QSORT_R@
- REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
- REPLACE_READ = @REPLACE_READ@
- REPLACE_READLINK = @REPLACE_READLINK@
- REPLACE_READLINKAT = @REPLACE_READLINKAT@
- REPLACE_REALLOC = @REPLACE_REALLOC@
- REPLACE_REALPATH = @REPLACE_REALPATH@
  REPLACE_REMOVE = @REPLACE_REMOVE@
  REPLACE_RENAME = @REPLACE_RENAME@
  REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
- REPLACE_RMDIR = @REPLACE_RMDIR@
- REPLACE_SETENV = @REPLACE_SETENV@
- REPLACE_SLEEP = @REPLACE_SLEEP@
  REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
  REPLACE_SPRINTF = @REPLACE_SPRINTF@
--- 614,627 ----
***************
*** 835,848 ****
  REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
  REPLACE_STRSTR = @REPLACE_STRSTR@
- REPLACE_STRTOD = @REPLACE_STRTOD@
  REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
- REPLACE_SYMLINK = @REPLACE_SYMLINK@
- REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
  REPLACE_TMPFILE = @REPLACE_TMPFILE@
- REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
- REPLACE_UNLINK = @REPLACE_UNLINK@
- REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
- REPLACE_UNSETENV = @REPLACE_UNSETENV@
- REPLACE_USLEEP = @REPLACE_USLEEP@
  REPLACE_VASPRINTF = @REPLACE_VASPRINTF@
  REPLACE_VDPRINTF = @REPLACE_VDPRINTF@
--- 639,644 ----
***************
*** 856,862 ****
  REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
  REPLACE_WCTOB = @REPLACE_WCTOB@
- REPLACE_WCTOMB = @REPLACE_WCTOMB@
  REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
  SED = @SED@
  SET_MAKE = @SET_MAKE@
--- 652,656 ----
***************
*** 868,873 ****
  STRIP = @STRIP@
  UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@
- UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
- UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
  VERSION = @VERSION@
  WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
--- 662,665 ----
***************
*** 939,951 ****
  noinst_LTLIBRARIES = libgnu.la
  EXTRA_DIST = alloca.in.h errno.in.h float.c float.in.h itold.c \
! 	getdelim.c getline.c memchr.c memchr.valgrind realloc.c \
! 	$(top_srcdir)/./snippet/_Noreturn.h \
  	$(top_srcdir)/./snippet/arg-nonnull.h \
  	$(top_srcdir)/./snippet/c++defs.h \
  	$(top_srcdir)/./snippet/warn-on-use.h stddef.in.h stdint.in.h \
! 	stdio.in.h stdlib.in.h string.in.h sys_types.in.h unistd.in.h \
! 	asnprintf.c 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
  
  # The BUILT_SOURCES created by this Makefile snippet are not used via #include
--- 731,742 ----
  noinst_LTLIBRARIES = libgnu.la
  EXTRA_DIST = alloca.in.h errno.in.h float.c float.in.h itold.c \
! 	getdelim.c getline.c memchr.c memchr.valgrind \
  	$(top_srcdir)/./snippet/arg-nonnull.h \
  	$(top_srcdir)/./snippet/c++defs.h \
  	$(top_srcdir)/./snippet/warn-on-use.h stddef.in.h stdint.in.h \
! 	stdio.in.h string.in.h sys_types.in.h asnprintf.c 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
  
  # The BUILT_SOURCES created by this Makefile snippet are not used via #include
***************
*** 960,971 ****
  BUILT_SOURCES = $(ALLOCA_H) $(ERRNO_H) $(FLOAT_H) arg-nonnull.h \
  	c++defs.h warn-on-use.h $(STDDEF_H) $(STDINT_H) stdio.h \
! 	stdlib.h string.h sys/types.h unistd.h wchar.h
  SUFFIXES = 
  MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t errno.h \
  	errno.h-t float.h float.h-t arg-nonnull.h arg-nonnull.h-t \
  	c++defs.h c++defs.h-t warn-on-use.h warn-on-use.h-t stddef.h \
! 	stddef.h-t stdint.h stdint.h-t stdio.h stdio.h-t stdlib.h \
! 	stdlib.h-t string.h string.h-t sys/types.h sys/types.h-t \
! 	unistd.h unistd.h-t wchar.h wchar.h-t
  MOSTLYCLEANDIRS = 
  CLEANFILES = 
--- 751,761 ----
  BUILT_SOURCES = $(ALLOCA_H) $(ERRNO_H) $(FLOAT_H) arg-nonnull.h \
  	c++defs.h warn-on-use.h $(STDDEF_H) $(STDINT_H) stdio.h \
! 	string.h sys/types.h wchar.h
  SUFFIXES = 
  MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t errno.h \
  	errno.h-t float.h float.h-t arg-nonnull.h arg-nonnull.h-t \
  	c++defs.h c++defs.h-t warn-on-use.h warn-on-use.h-t stddef.h \
! 	stddef.h-t stdint.h stdint.h-t stdio.h stdio.h-t string.h \
! 	string.h-t sys/types.h sys/types.h-t wchar.h wchar.h-t
  MOSTLYCLEANDIRS = 
  CLEANFILES = 
***************
*** 974,983 ****
  AM_CPPFLAGS = 
  AM_CFLAGS = 
! libgnu_la_SOURCES = size_max.h unistd.c xsize.h xsize.c
  libgnu_la_LIBADD = $(gl_LTLIBOBJS)
  libgnu_la_DEPENDENCIES = $(gl_LTLIBOBJS)
  EXTRA_libgnu_la_SOURCES = float.c itold.c getdelim.c getline.c \
! 	memchr.c realloc.c asnprintf.c printf-args.c printf-parse.c \
! 	vasnprintf.c asprintf.c vasprintf.c
  libgnu_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined
  
--- 764,773 ----
  AM_CPPFLAGS = 
  AM_CFLAGS = 
! libgnu_la_SOURCES = size_max.h xsize.h xsize.c
  libgnu_la_LIBADD = $(gl_LTLIBOBJS)
  libgnu_la_DEPENDENCIES = $(gl_LTLIBOBJS)
  EXTRA_libgnu_la_SOURCES = float.c itold.c getdelim.c getline.c \
! 	memchr.c asnprintf.c printf-args.c printf-parse.c vasnprintf.c \
! 	asprintf.c vasprintf.c
  libgnu_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined
  
***************
*** 986,994 ****
  # might appear in an installed header, which is used by some other compiler.
  HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER)
- 
- # Because this Makefile snippet defines a variable used by other
- # gnulib Makefile snippets, it must be present in all Makefile.am that
- # need it. This is ensured by the applicability 'all' defined above.
- _NORETURN_H = $(top_srcdir)/./snippet/_Noreturn.h
  ARG_NONNULL_H = arg-nonnull.h
  CXXDEFS_H = c++defs.h
--- 776,779 ----
***************
*** 1061,1066 ****
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printf-args.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printf-parse.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/realloc.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unistd.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vasnprintf.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vasprintf.Plo@am__quote@
--- 846,849 ----
***************
*** 1634,1733 ****
  	mv $@-t $@
  
- # We need the following in order to create <stdlib.h> when the system
- # doesn't have one that works with the given compiler.
- stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
-   $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
- 	$(AM_V_GEN)rm -f $@-t $@ && \
- 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
- 	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
- 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
- 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
- 	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
- 	      -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \
- 	      -e 's/@''GNULIB__EXIT''@/$(GNULIB__EXIT)/g' \
- 	      -e 's/@''GNULIB_ATOLL''@/$(GNULIB_ATOLL)/g' \
- 	      -e 's/@''GNULIB_CALLOC_POSIX''@/$(GNULIB_CALLOC_POSIX)/g' \
- 	      -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GNULIB_CANONICALIZE_FILE_NAME)/g' \
- 	      -e 's/@''GNULIB_GETLOADAVG''@/$(GNULIB_GETLOADAVG)/g' \
- 	      -e 's/@''GNULIB_GETSUBOPT''@/$(GNULIB_GETSUBOPT)/g' \
- 	      -e 's/@''GNULIB_GRANTPT''@/$(GNULIB_GRANTPT)/g' \
- 	      -e 's/@''GNULIB_MALLOC_POSIX''@/$(GNULIB_MALLOC_POSIX)/g' \
- 	      -e 's/@''GNULIB_MBTOWC''@/$(GNULIB_MBTOWC)/g' \
- 	      -e 's/@''GNULIB_MKDTEMP''@/$(GNULIB_MKDTEMP)/g' \
- 	      -e 's/@''GNULIB_MKOSTEMP''@/$(GNULIB_MKOSTEMP)/g' \
- 	      -e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \
- 	      -e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \
- 	      -e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \
- 	      -e 's/@''GNULIB_POSIX_OPENPT''@/$(GNULIB_POSIX_OPENPT)/g' \
- 	      -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \
- 	      -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \
- 	      -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \
- 	      -e 's/@''GNULIB_QSORT_R''@/$(GNULIB_QSORT_R)/g' \
- 	      -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \
- 	      -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \
- 	      -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \
- 	      -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \
- 	      -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \
- 	      -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_STRTOLL''@/$(GNULIB_STRTOLL)/g' \
- 	      -e 's/@''GNULIB_STRTOULL''@/$(GNULIB_STRTOULL)/g' \
- 	      -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GNULIB_SYSTEM_POSIX)/g' \
- 	      -e 's/@''GNULIB_UNLOCKPT''@/$(GNULIB_UNLOCKPT)/g' \
- 	      -e 's/@''GNULIB_UNSETENV''@/$(GNULIB_UNSETENV)/g' \
- 	      -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \
- 	      < $(srcdir)/stdlib.in.h | \
- 	  sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
- 	      -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \
- 	      -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \
- 	      -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_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \
- 	      -e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \
- 	      -e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \
- 	      -e 's|@''HAVE_MKSTEMP''@|$(HAVE_MKSTEMP)|g' \
- 	      -e 's|@''HAVE_MKSTEMPS''@|$(HAVE_MKSTEMPS)|g' \
- 	      -e 's|@''HAVE_POSIX_OPENPT''@|$(HAVE_POSIX_OPENPT)|g' \
- 	      -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \
- 	      -e 's|@''HAVE_PTSNAME_R''@|$(HAVE_PTSNAME_R)|g' \
- 	      -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \
- 	      -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \
- 	      -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \
- 	      -e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \
- 	      -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_STRTOD''@|$(HAVE_STRTOD)|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' \
- 	      -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \
- 	      -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \
- 	      -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_MALLOC''@|$(REPLACE_MALLOC)|g' \
- 	      -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \
- 	      -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
- 	      -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \
- 	      -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_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_STRTOD''@|$(REPLACE_STRTOD)|g' \
- 	      -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \
- 	      -e 's|@''REPLACE_WCTOMB''@|$(REPLACE_WCTOMB)|g' \
- 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
- 	      -e '/definition of _Noreturn/r $(_NORETURN_H)' \
- 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
- 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
- 	} > $@-t && \
- 	mv $@-t $@
- 
  # We need the following in order to create <string.h> when the system
  # doesn't have one that works with the given compiler.
--- 1417,1420 ----
***************
*** 1836,1983 ****
  	} > $@-t && \
  	mv $@-t $@
- 
- # We need the following in order to create an empty placeholder for
- # <unistd.h> when the system doesn't have one.
- unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
- 	$(AM_V_GEN)rm -f $@-t $@ && \
- 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- 	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
- 	      -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
- 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
- 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
- 	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
- 	      -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \
- 	      -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
- 	      -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \
- 	      -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \
- 	      -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \
- 	      -e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \
- 	      -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \
- 	      -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \
- 	      -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \
- 	      -e 's/@''GNULIB_EUIDACCESS''@/$(GNULIB_EUIDACCESS)/g' \
- 	      -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \
- 	      -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \
- 	      -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \
- 	      -e 's/@''GNULIB_FDATASYNC''@/$(GNULIB_FDATASYNC)/g' \
- 	      -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \
- 	      -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \
- 	      -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \
- 	      -e 's/@''GNULIB_GETDOMAINNAME''@/$(GNULIB_GETDOMAINNAME)/g' \
- 	      -e 's/@''GNULIB_GETDTABLESIZE''@/$(GNULIB_GETDTABLESIZE)/g' \
- 	      -e 's/@''GNULIB_GETGROUPS''@/$(GNULIB_GETGROUPS)/g' \
- 	      -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \
- 	      -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \
- 	      -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \
- 	      -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \
- 	      -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \
- 	      -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \
- 	      -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \
- 	      -e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \
- 	      -e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \
- 	      -e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \
- 	      -e 's/@''GNULIB_LSEEK''@/$(GNULIB_LSEEK)/g' \
- 	      -e 's/@''GNULIB_PIPE''@/$(GNULIB_PIPE)/g' \
- 	      -e 's/@''GNULIB_PIPE2''@/$(GNULIB_PIPE2)/g' \
- 	      -e 's/@''GNULIB_PREAD''@/$(GNULIB_PREAD)/g' \
- 	      -e 's/@''GNULIB_PWRITE''@/$(GNULIB_PWRITE)/g' \
- 	      -e 's/@''GNULIB_READ''@/$(GNULIB_READ)/g' \
- 	      -e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \
- 	      -e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \
- 	      -e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \
- 	      -e 's/@''GNULIB_SETHOSTNAME''@/$(GNULIB_SETHOSTNAME)/g' \
- 	      -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \
- 	      -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \
- 	      -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \
- 	      -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \
- 	      -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \
- 	      -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \
- 	      -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GNULIB_UNISTD_H_SIGPIPE)/g' \
- 	      -e 's/@''GNULIB_UNLINK''@/$(GNULIB_UNLINK)/g' \
- 	      -e 's/@''GNULIB_UNLINKAT''@/$(GNULIB_UNLINKAT)/g' \
- 	      -e 's/@''GNULIB_USLEEP''@/$(GNULIB_USLEEP)/g' \
- 	      -e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \
- 	      < $(srcdir)/unistd.in.h | \
- 	  sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \
- 	      -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \
- 	      -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \
- 	      -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \
- 	      -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \
- 	      -e 's|@''HAVE_FCHDIR''@|$(HAVE_FCHDIR)|g' \
- 	      -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \
- 	      -e 's|@''HAVE_FDATASYNC''@|$(HAVE_FDATASYNC)|g' \
- 	      -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \
- 	      -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \
- 	      -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \
- 	      -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \
- 	      -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \
- 	      -e 's|@''HAVE_GETLOGIN''@|$(HAVE_GETLOGIN)|g' \
- 	      -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \
- 	      -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \
- 	      -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \
- 	      -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \
- 	      -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \
- 	      -e 's|@''HAVE_PIPE''@|$(HAVE_PIPE)|g' \
- 	      -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \
- 	      -e 's|@''HAVE_PREAD''@|$(HAVE_PREAD)|g' \
- 	      -e 's|@''HAVE_PWRITE''@|$(HAVE_PWRITE)|g' \
- 	      -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \
- 	      -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \
- 	      -e 's|@''HAVE_SETHOSTNAME''@|$(HAVE_SETHOSTNAME)|g' \
- 	      -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
- 	      -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \
- 	      -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \
- 	      -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \
- 	      -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \
- 	      -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \
- 	      -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \
- 	      -e 's|@''HAVE_DECL_FDATASYNC''@|$(HAVE_DECL_FDATASYNC)|g' \
- 	      -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \
- 	      -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \
- 	      -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \
- 	      -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \
- 	      -e 's|@''HAVE_DECL_SETHOSTNAME''@|$(HAVE_DECL_SETHOSTNAME)|g' \
- 	      -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \
- 	      -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
- 	      -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \
- 	  | \
- 	  sed -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
- 	      -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \
- 	      -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \
- 	      -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \
- 	      -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \
- 	      -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \
- 	      -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \
- 	      -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \
- 	      -e 's|@''REPLACE_GETDTABLESIZE''@|$(REPLACE_GETDTABLESIZE)|g' \
- 	      -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \
- 	      -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \
- 	      -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
- 	      -e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \
- 	      -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \
- 	      -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \
- 	      -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \
- 	      -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \
- 	      -e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \
- 	      -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \
- 	      -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \
- 	      -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \
- 	      -e 's|@''REPLACE_READLINKAT''@|$(REPLACE_READLINKAT)|g' \
- 	      -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \
- 	      -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \
- 	      -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \
- 	      -e 's|@''REPLACE_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \
- 	      -e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \
- 	      -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \
- 	      -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \
- 	      -e 's|@''REPLACE_USLEEP''@|$(REPLACE_USLEEP)|g' \
- 	      -e 's|@''REPLACE_WRITE''@|$(REPLACE_WRITE)|g' \
- 	      -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \
- 	      -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \
- 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
- 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
- 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
- 	} > $@-t && \
- 	mv $@-t $@
  
  # We need the following in order to create <wchar.h> when the system
--- 1523,1526 ----
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/alloca.in.h texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/alloca.in.h
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/alloca.in.h	2015-07-12 12:49:16.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/alloca.in.h	2016-08-30 18:49:30.000000000 +0100
***************
*** 1,5 ****
  /* Memory allocation on the stack.
  
!    Copyright (C) 1995, 1999, 2001-2004, 2006-2015 Free Software Foundation,
     Inc.
  
--- 1,5 ----
  /* Memory allocation on the stack.
  
!    Copyright (C) 1995, 1999, 2001-2004, 2006-2016 Free Software Foundation,
     Inc.
  
***************
*** 52,55 ****
--- 52,57 ----
  #  pragma intrinsic (_alloca)
  #  define alloca _alloca
+ # elif defined __MVS__
+ #  include <stdlib.h>
  # else
  #  include <stddef.h>
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/asnprintf.c texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/asnprintf.c
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/asnprintf.c	2015-07-12 12:49:16.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/asnprintf.c	2016-08-13 14:16:12.000000000 +0100
***************
*** 1,4 ****
  /* Formatted output to strings.
!    Copyright (C) 1999, 2002, 2006, 2009-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,4 ----
  /* Formatted output to strings.
!    Copyright (C) 1999, 2002, 2006, 2009-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/asprintf.c texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/asprintf.c
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/asprintf.c	2015-07-12 12:49:16.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/asprintf.c	2016-08-13 14:16:12.000000000 +0100
***************
*** 1,4 ****
  /* Formatted output to strings.
!    Copyright (C) 1999, 2002, 2006-2007, 2009-2015 Free Software Foundation,
     Inc.
  
--- 1,4 ----
  /* Formatted output to strings.
!    Copyright (C) 1999, 2002, 2006-2007, 2009-2016 Free Software Foundation,
     Inc.
  
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/errno.in.h texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/errno.in.h
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/errno.in.h	2015-07-12 12:49:16.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/errno.in.h	2016-08-13 14:16:12.000000000 +0100
***************
*** 1,5 ****
  /* A POSIX-like <errno.h>.
  
!    Copyright (C) 2008-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  /* A POSIX-like <errno.h>.
  
!    Copyright (C) 2008-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/float+.h texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/float+.h
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/float+.h	2015-07-12 12:49:16.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/float+.h	2016-08-13 14:16:12.000000000 +0100
***************
*** 1,4 ****
  /* Supplemental information about the floating-point formats.
!    Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2007.
  
--- 1,4 ----
  /* Supplemental information about the floating-point formats.
!    Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2007.
  
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/float.c texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/float.c
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/float.c	2015-07-12 12:49:16.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/float.c	2016-08-13 14:16:12.000000000 +0100
***************
*** 1,4 ****
  /* Auxiliary definitions for <float.h>.
!    Copyright (C) 2011-2015 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2011.
  
--- 1,4 ----
  /* Auxiliary definitions for <float.h>.
!    Copyright (C) 2011-2016 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2011.
  
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/float.in.h texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/float.in.h
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/float.in.h	2015-07-12 12:49:16.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/float.in.h	2016-08-13 14:16:12.000000000 +0100
***************
*** 1,5 ****
  /* A correct <float.h>.
  
!    Copyright (C) 2007-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
--- 1,5 ----
  /* A correct <float.h>.
  
!    Copyright (C) 2007-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/getdelim.c texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/getdelim.c
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/getdelim.c	2016-01-23 12:46:09.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/getdelim.c	2016-08-30 18:49:30.000000000 +0100
***************
*** 1,4 ****
  /* getdelim.c --- Implementation of replacement getdelim function.
!    Copyright (C) 1994, 1996-1998, 2001, 2003, 2005-2015 Free Software
     Foundation, Inc.
  
--- 1,4 ----
  /* getdelim.c --- Implementation of replacement getdelim function.
!    Copyright (C) 1994, 1996-1998, 2001, 2003, 2005-2016 Free Software
     Foundation, Inc.
  
***************
*** 48,51 ****
--- 48,61 ----
  #endif
  
+ static void
+ alloc_failed (void)
+ {
+ #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+   /* Avoid errno problem without using the realloc module; see:
+      http://lists.gnu.org/archive/html/bug-gnulib/2016-08/msg00025.html  */
+   errno = ENOMEM;
+ #endif
+ }
+ 
  /* Read up to (and including) a DELIMITER from FP into *LINEPTR (and
     NUL-terminate it).  *LINEPTR is a pointer returned from malloc (or
***************
*** 75,78 ****
--- 85,89 ----
        if (new_lineptr == NULL)
          {
+           alloc_failed ();
            result = -1;
            goto unlock_return;
***************
*** 112,115 ****
--- 123,127 ----
            if (new_lineptr == NULL)
              {
+               alloc_failed ();
                result = -1;
                goto unlock_return;
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/getline.c texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/getline.c
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/getline.c	2016-01-23 12:46:09.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/getline.c	2016-08-13 14:16:12.000000000 +0100
***************
*** 1,4 ****
  /* getline.c --- Implementation of replacement getline function.
!    Copyright (C) 2005-2007, 2009-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or
--- 1,4 ----
  /* getline.c --- Implementation of replacement getline function.
!    Copyright (C) 2005-2007, 2009-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/itold.c texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/itold.c
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/itold.c	2015-07-12 12:49:16.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/itold.c	2016-08-13 14:16:12.000000000 +0100
***************
*** 1,4 ****
  /* Replacement for 'int' to 'long double' conversion routine.
!    Copyright (C) 2011-2015 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2011.
  
--- 1,4 ----
  /* Replacement for 'int' to 'long double' conversion routine.
!    Copyright (C) 2011-2016 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2011.
  
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/memchr.c texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/memchr.c
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/memchr.c	2015-07-12 12:49:16.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/memchr.c	2016-08-13 14:16:12.000000000 +0100
***************
*** 1,3 ****
! /* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2015
     Free Software Foundation, Inc.
  
--- 1,3 ----
! /* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2016
     Free Software Foundation, Inc.
  
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/printf-args.c texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/printf-args.c
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/printf-args.c	2015-07-12 12:49:16.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/printf-args.c	2016-08-13 14:16:12.000000000 +0100
***************
*** 1,4 ****
  /* Decomposed printf argument list.
!    Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2015 Free Software
     Foundation, Inc.
  
--- 1,4 ----
  /* Decomposed printf argument list.
!    Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2016 Free Software
     Foundation, Inc.
  
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/printf-args.h texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/printf-args.h
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/printf-args.h	2015-07-12 12:49:16.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/printf-args.h	2016-08-13 14:16:12.000000000 +0100
***************
*** 1,4 ****
  /* Decomposed printf argument list.
!    Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2015 Free Software
     Foundation, Inc.
  
--- 1,4 ----
  /* Decomposed printf argument list.
!    Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2016 Free Software
     Foundation, Inc.
  
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/printf-parse.c texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/printf-parse.c
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/printf-parse.c	2015-07-12 12:49:16.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/printf-parse.c	2016-08-13 14:16:12.000000000 +0100
***************
*** 1,4 ****
  /* Formatted output to strings.
!    Copyright (C) 1999-2000, 2002-2003, 2006-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,4 ----
  /* Formatted output to strings.
!    Copyright (C) 1999-2000, 2002-2003, 2006-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/printf-parse.h texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/printf-parse.h
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/printf-parse.h	2015-07-12 12:49:16.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/printf-parse.h	2016-08-13 14:16:12.000000000 +0100
***************
*** 1,4 ****
  /* Parse printf format string.
!    Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2015 Free Software
     Foundation, Inc.
  
--- 1,4 ----
  /* Parse printf format string.
!    Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2016 Free Software
     Foundation, Inc.
  
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/realloc.c texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/realloc.c
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/realloc.c	2016-01-23 12:46:09.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/realloc.c	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,79 ****
- /* realloc() function that is glibc compatible.
- 
-    Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2015 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 <http://www.gnu.org/licenses/>.  */
- 
- /* written by Jim Meyering and Bruno Haible */
- 
- #define _GL_USE_STDLIB_ALLOC 1
- #include <config.h>
- 
- /* Only the AC_FUNC_REALLOC macro defines 'realloc' already in config.h.  */
- #ifdef realloc
- # define NEED_REALLOC_GNU 1
- /* Whereas the gnulib module 'realloc-gnu' defines HAVE_REALLOC_GNU.  */
- #elif GNULIB_REALLOC_GNU && !HAVE_REALLOC_GNU
- # define NEED_REALLOC_GNU 1
- #endif
- 
- /* Infer the properties of the system's malloc function.
-    The gnulib module 'malloc-gnu' defines HAVE_MALLOC_GNU.  */
- #if GNULIB_MALLOC_GNU && HAVE_MALLOC_GNU
- # define SYSTEM_MALLOC_GLIBC_COMPATIBLE 1
- #endif
- 
- #include <stdlib.h>
- 
- #include <errno.h>
- 
- /* Change the size of an allocated block of memory P to N bytes,
-    with error checking.  If N is zero, change it to 1.  If P is NULL,
-    use malloc.  */
- 
- void *
- rpl_realloc (void *p, size_t n)
- {
-   void *result;
- 
- #if NEED_REALLOC_GNU
-   if (n == 0)
-     {
-       n = 1;
- 
-       /* In theory realloc might fail, so don't rely on it to free.  */
-       free (p);
-       p = NULL;
-     }
- #endif
- 
-   if (p == NULL)
-     {
- #if GNULIB_REALLOC_GNU && !NEED_REALLOC_GNU && !SYSTEM_MALLOC_GLIBC_COMPATIBLE
-       if (n == 0)
-         n = 1;
- #endif
-       result = malloc (n);
-     }
-   else
-     result = realloc (p, n);
- 
- #if !HAVE_REALLOC_POSIX
-   if (result == NULL)
-     errno = ENOMEM;
- #endif
- 
-   return result;
- }
--- 0 ----
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/size_max.h texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/size_max.h
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/size_max.h	2015-07-12 12:49:16.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/size_max.h	2016-08-13 14:16:12.000000000 +0100
***************
*** 1,4 ****
  /* size_max.h -- declare SIZE_MAX through system headers
!    Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc.
     Written by Simon Josefsson.
  
--- 1,4 ----
  /* size_max.h -- declare SIZE_MAX through system headers
!    Copyright (C) 2005-2006, 2009-2016 Free Software Foundation, Inc.
     Written by Simon Josefsson.
  
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/stddef.in.h texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/stddef.in.h
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/stddef.in.h	2015-07-12 12:49:16.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/stddef.in.h	2016-08-13 14:16:12.000000000 +0100
***************
*** 1,5 ****
  /* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues.
  
!    Copyright (C) 2009-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  /* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues.
  
!    Copyright (C) 2009-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
***************
*** 82,87 ****
  #endif
  
! /* Some platforms lack max_align_t.  */
! #if !@HAVE_MAX_ALIGN_T@
  /* On the x86, the maximum storage alignment of double, long, etc. is 4,
     but GCC's C11 ABI for x86 says that max_align_t has an alignment of 8,
--- 82,89 ----
  #endif
  
! /* Some platforms lack max_align_t.  The check for _GCC_MAX_ALIGN_T is
!    a hack in case the configure-time test was done with g++ even though
!    we are currently compiling with gcc.  */
! #if ! (@HAVE_MAX_ALIGN_T@ || defined _GCC_MAX_ALIGN_T)
  /* On the x86, the maximum storage alignment of double, long, etc. is 4,
     but GCC's C11 ABI for x86 says that max_align_t has an alignment of 8,
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/stdint.in.h texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/stdint.in.h
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/stdint.in.h	2015-07-12 12:49:16.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/stdint.in.h	2016-08-13 14:16:12.000000000 +0100
***************
*** 1,3 ****
! /* Copyright (C) 2001-2002, 2004-2015 Free Software Foundation, Inc.
     Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
     This file is part of gnulib.
--- 1,3 ----
! /* Copyright (C) 2001-2002, 2004-2016 Free Software Foundation, Inc.
     Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
     This file is part of gnulib.
***************
*** 119,131 ****
  
  #define _STDINT_MIN(signed, bits, zero) \
!   ((signed) ? (- ((zero) + 1) << ((bits) ? (bits) - 1 : 0)) : (zero))
  
  #define _STDINT_MAX(signed, bits, zero) \
!   ((signed) \
!    ? ~ _STDINT_MIN (signed, bits, zero) \
!    : /* The expression for the unsigned case.  The subtraction of (signed) \
!         is a nop in the unsigned case and avoids "signed integer overflow" \
!         warnings in the signed case.  */ \
!      ((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1)
  
  #if !GNULIB_defined_stdint_types
--- 119,126 ----
  
  #define _STDINT_MIN(signed, bits, zero) \
!   ((signed) ? ~ _STDINT_MAX (signed, bits, zero) : (zero))
  
  #define _STDINT_MAX(signed, bits, zero) \
!   (((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1)
  
  #if !GNULIB_defined_stdint_types
***************
*** 289,292 ****
--- 284,291 ----
  /* 7.18.1.4. Integer types capable of holding object pointers */
  
+ /* kLIBC's stdint.h defines _INTPTR_T_DECLARED and needs its own
+    definitions of intptr_t and uintptr_t (which use int and unsigned)
+    to avoid clashes with declarations of system functions like sbrk.  */
+ #ifndef _INTPTR_T_DECLARED
  #undef intptr_t
  #undef uintptr_t
***************
*** 295,298 ****
--- 294,298 ----
  #define intptr_t gl_intptr_t
  #define uintptr_t gl_uintptr_t
+ #endif
  
  /* 7.18.1.5. Greatest-width integer types */
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/stdio.in.h texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/stdio.in.h
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/stdio.in.h	2015-07-12 12:49:16.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/stdio.in.h	2016-08-13 14:16:12.000000000 +0100
***************
*** 1,5 ****
  /* A GNU-like <stdio.h>.
  
!    Copyright (C) 2004, 2007-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  /* A GNU-like <stdio.h>.
  
!    Copyright (C) 2004, 2007-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/stdlib.in.h texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/stdlib.in.h
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/stdlib.in.h	2016-01-23 12:46:10.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/stdlib.in.h	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,977 ****
- /* A GNU-like <stdlib.h>.
- 
-    Copyright (C) 1995, 2001-2004, 2006-2015 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 <http://www.gnu.org/licenses/>.  */
- 
- #if __GNUC__ >= 3
- @PRAGMA_SYSTEM_HEADER@
- #endif
- @PRAGMA_COLUMNS@
- 
- #if defined __need_system_stdlib_h || defined __need_malloc_and_calloc
- /* Special invocation conventions inside some gnulib header files,
-    and inside some glibc header files, respectively.  */
- 
- #@INCLUDE_NEXT@ @NEXT_STDLIB_H@
- 
- #else
- /* Normal invocation convention.  */
- 
- #ifndef _@GUARD_PREFIX@_STDLIB_H
- 
- /* The include_next requires a split double-inclusion guard.  */
- #@INCLUDE_NEXT@ @NEXT_STDLIB_H@
- 
- #ifndef _@GUARD_PREFIX@_STDLIB_H
- #define _@GUARD_PREFIX@_STDLIB_H
- 
- /* NetBSD 5.0 mis-defines NULL.  */
- #include <stddef.h>
- 
- /* MirBSD 10 defines WEXITSTATUS in <sys/wait.h>, not in <stdlib.h>.  */
- #if @GNULIB_SYSTEM_POSIX@ && !defined WEXITSTATUS
- # include <sys/wait.h>
- #endif
- 
- /* Solaris declares getloadavg() in <sys/loadavg.h>.  */
- #if (@GNULIB_GETLOADAVG@ || defined GNULIB_POSIXCHECK) && @HAVE_SYS_LOADAVG_H@
- # include <sys/loadavg.h>
- #endif
- 
- /* Native Windows platforms declare mktemp() in <io.h>.  */
- #if 0 && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
- # include <io.h>
- #endif
- 
- #if @GNULIB_RANDOM_R@
- 
- /* OSF/1 5.1 declares 'struct random_data' in <random.h>, which is included
-    from <stdlib.h> if _REENTRANT is defined.  Include it whenever we need
-    'struct random_data'.  */
- # if @HAVE_RANDOM_H@
- #  include <random.h>
- # endif
- 
- # if !@HAVE_STRUCT_RANDOM_DATA@ || @REPLACE_RANDOM_R@ || !@HAVE_RANDOM_R@
- #  include <stdint.h>
- # endif
- 
- # if !@HAVE_STRUCT_RANDOM_DATA@
- /* Define 'struct random_data'.
-    But allow multiple gnulib generated <stdlib.h> replacements to coexist.  */
- #  if !GNULIB_defined_struct_random_data
- struct random_data
- {
-   int32_t *fptr;                /* Front pointer.  */
-   int32_t *rptr;                /* Rear pointer.  */
-   int32_t *state;               /* Array of state values.  */
-   int rand_type;                /* Type of random number generator.  */
-   int rand_deg;                 /* Degree of random number generator.  */
-   int rand_sep;                 /* Distance between front and rear.  */
-   int32_t *end_ptr;             /* Pointer behind state table.  */
- };
- #   define GNULIB_defined_struct_random_data 1
- #  endif
- # endif
- #endif
- 
- #if (@GNULIB_MKSTEMP@ || @GNULIB_MKSTEMPS@ || @GNULIB_GETSUBOPT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__ && !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
- /* On Mac OS X 10.3, only <unistd.h> declares mkstemp.  */
- /* On Mac OS X 10.5, only <unistd.h> declares mkstemps.  */
- /* On Cygwin 1.7.1, only <unistd.h> declares getsubopt.  */
- /* But avoid namespace pollution on glibc systems and native Windows.  */
- # include <unistd.h>
- #endif
- 
- /* The __attribute__ feature is available in gcc versions 2.5 and later.
-    The attribute __pure__ was added in gcc 2.96.  */
- #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
- # define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
- #else
- # define _GL_ATTRIBUTE_PURE /* empty */
- #endif
- 
- /* The definition of _Noreturn is copied here.  */
- 
- /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
- 
- /* The definition of _GL_ARG_NONNULL is copied here.  */
- 
- /* The definition of _GL_WARN_ON_USE is copied here.  */
- 
- 
- /* Some systems do not define EXIT_*, despite otherwise supporting C89.  */
- #ifndef EXIT_SUCCESS
- # define EXIT_SUCCESS 0
- #endif
- /* Tandem/NSK and other platforms that define EXIT_FAILURE as -1 interfere
-    with proper operation of xargs.  */
- #ifndef EXIT_FAILURE
- # define EXIT_FAILURE 1
- #elif EXIT_FAILURE != 1
- # undef EXIT_FAILURE
- # define EXIT_FAILURE 1
- #endif
- 
- 
- #if @GNULIB__EXIT@
- /* Terminate the current process with the given return code, without running
-    the 'atexit' handlers.  */
- # if !@HAVE__EXIT@
- _GL_FUNCDECL_SYS (_Exit, _Noreturn void, (int status));
- # endif
- _GL_CXXALIAS_SYS (_Exit, void, (int status));
- _GL_CXXALIASWARN (_Exit);
- #elif defined GNULIB_POSIXCHECK
- # undef _Exit
- # if HAVE_RAW_DECL__EXIT
- _GL_WARN_ON_USE (_Exit, "_Exit is unportable - "
-                  "use gnulib module _Exit for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_ATOLL@
- /* Parse a signed decimal integer.
-    Returns the value of the integer.  Errors are not detected.  */
- # if !@HAVE_ATOLL@
- _GL_FUNCDECL_SYS (atoll, long long, (const char *string)
-                                     _GL_ATTRIBUTE_PURE
-                                     _GL_ARG_NONNULL ((1)));
- # endif
- _GL_CXXALIAS_SYS (atoll, long long, (const char *string));
- _GL_CXXALIASWARN (atoll);
- #elif defined GNULIB_POSIXCHECK
- # undef atoll
- # if HAVE_RAW_DECL_ATOLL
- _GL_WARN_ON_USE (atoll, "atoll is unportable - "
-                  "use gnulib module atoll for portability");
- # endif
- #endif
- 
- #if @GNULIB_CALLOC_POSIX@
- # if @REPLACE_CALLOC@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef calloc
- #   define calloc rpl_calloc
- #  endif
- _GL_FUNCDECL_RPL (calloc, void *, (size_t nmemb, size_t size));
- _GL_CXXALIAS_RPL (calloc, void *, (size_t nmemb, size_t size));
- # else
- _GL_CXXALIAS_SYS (calloc, void *, (size_t nmemb, size_t size));
- # endif
- _GL_CXXALIASWARN (calloc);
- #elif defined GNULIB_POSIXCHECK
- # undef calloc
- /* Assume calloc is always declared.  */
- _GL_WARN_ON_USE (calloc, "calloc is not POSIX compliant everywhere - "
-                  "use gnulib module calloc-posix for portability");
- #endif
- 
- #if @GNULIB_CANONICALIZE_FILE_NAME@
- # if @REPLACE_CANONICALIZE_FILE_NAME@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   define canonicalize_file_name rpl_canonicalize_file_name
- #  endif
- _GL_FUNCDECL_RPL (canonicalize_file_name, char *, (const char *name)
-                                                   _GL_ARG_NONNULL ((1)));
- _GL_CXXALIAS_RPL (canonicalize_file_name, char *, (const char *name));
- # else
- #  if !@HAVE_CANONICALIZE_FILE_NAME@
- _GL_FUNCDECL_SYS (canonicalize_file_name, char *, (const char *name)
-                                                   _GL_ARG_NONNULL ((1)));
- #  endif
- _GL_CXXALIAS_SYS (canonicalize_file_name, char *, (const char *name));
- # endif
- _GL_CXXALIASWARN (canonicalize_file_name);
- #elif defined GNULIB_POSIXCHECK
- # undef canonicalize_file_name
- # if HAVE_RAW_DECL_CANONICALIZE_FILE_NAME
- _GL_WARN_ON_USE (canonicalize_file_name,
-                  "canonicalize_file_name is unportable - "
-                  "use gnulib module canonicalize-lgpl for portability");
- # endif
- #endif
- 
- #if @GNULIB_GETLOADAVG@
- /* Store max(NELEM,3) load average numbers in LOADAVG[].
-    The three numbers are the load average of the last 1 minute, the last 5
-    minutes, and the last 15 minutes, respectively.
-    LOADAVG is an array of NELEM numbers.  */
- # if !@HAVE_DECL_GETLOADAVG@
- _GL_FUNCDECL_SYS (getloadavg, int, (double loadavg[], int nelem)
-                                    _GL_ARG_NONNULL ((1)));
- # endif
- _GL_CXXALIAS_SYS (getloadavg, int, (double loadavg[], int nelem));
- _GL_CXXALIASWARN (getloadavg);
- #elif defined GNULIB_POSIXCHECK
- # undef getloadavg
- # if HAVE_RAW_DECL_GETLOADAVG
- _GL_WARN_ON_USE (getloadavg, "getloadavg is not portable - "
-                  "use gnulib module getloadavg for portability");
- # endif
- #endif
- 
- #if @GNULIB_GETSUBOPT@
- /* Assuming *OPTIONP is a comma separated list of elements of the form
-    "token" or "token=value", getsubopt parses the first of these elements.
-    If the first element refers to a "token" that is member of the given
-    NULL-terminated array of tokens:
-      - It replaces the comma with a NUL byte, updates *OPTIONP to point past
-        the first option and the comma, sets *VALUEP to the value of the
-        element (or NULL if it doesn't contain an "=" sign),
-      - It returns the index of the "token" in the given array of tokens.
-    Otherwise it returns -1, and *OPTIONP and *VALUEP are undefined.
-    For more details see the POSIX:2001 specification.
-    http://www.opengroup.org/susv3xsh/getsubopt.html */
- # if !@HAVE_GETSUBOPT@
- _GL_FUNCDECL_SYS (getsubopt, int,
-                   (char **optionp, char *const *tokens, char **valuep)
-                   _GL_ARG_NONNULL ((1, 2, 3)));
- # endif
- _GL_CXXALIAS_SYS (getsubopt, int,
-                   (char **optionp, char *const *tokens, char **valuep));
- _GL_CXXALIASWARN (getsubopt);
- #elif defined GNULIB_POSIXCHECK
- # undef getsubopt
- # if HAVE_RAW_DECL_GETSUBOPT
- _GL_WARN_ON_USE (getsubopt, "getsubopt is unportable - "
-                  "use gnulib module getsubopt for portability");
- # endif
- #endif
- 
- #if @GNULIB_GRANTPT@
- /* Change the ownership and access permission of the slave side of the
-    pseudo-terminal whose master side is specified by FD.  */
- # if !@HAVE_GRANTPT@
- _GL_FUNCDECL_SYS (grantpt, int, (int fd));
- # endif
- _GL_CXXALIAS_SYS (grantpt, int, (int fd));
- _GL_CXXALIASWARN (grantpt);
- #elif defined GNULIB_POSIXCHECK
- # undef grantpt
- # if HAVE_RAW_DECL_GRANTPT
- _GL_WARN_ON_USE (grantpt, "grantpt is not portable - "
-                  "use gnulib module grantpt for portability");
- # endif
- #endif
- 
- /* If _GL_USE_STDLIB_ALLOC is nonzero, the including module does not
-    rely on GNU or POSIX semantics for malloc and realloc (for example,
-    by never specifying a zero size), so it does not need malloc or
-    realloc to be redefined.  */
- #if @GNULIB_MALLOC_POSIX@
- # if @REPLACE_MALLOC@
- #  if !((defined __cplusplus && defined GNULIB_NAMESPACE) \
-         || _GL_USE_STDLIB_ALLOC)
- #   undef malloc
- #   define malloc rpl_malloc
- #  endif
- _GL_FUNCDECL_RPL (malloc, void *, (size_t size));
- _GL_CXXALIAS_RPL (malloc, void *, (size_t size));
- # else
- _GL_CXXALIAS_SYS (malloc, void *, (size_t size));
- # endif
- _GL_CXXALIASWARN (malloc);
- #elif defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC
- # undef malloc
- /* Assume malloc is always declared.  */
- _GL_WARN_ON_USE (malloc, "malloc is not POSIX compliant everywhere - "
-                  "use gnulib module malloc-posix for portability");
- #endif
- 
- /* Convert a multibyte character to a wide character.  */
- #if @GNULIB_MBTOWC@
- # if @REPLACE_MBTOWC@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef mbtowc
- #   define mbtowc rpl_mbtowc
- #  endif
- _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
- _GL_CXXALIAS_SYS (mbtowc, int, (wchar_t *pwc, const char *s, size_t n));
- # endif
- _GL_CXXALIASWARN (mbtowc);
- #endif
- 
- #if @GNULIB_MKDTEMP@
- /* Create a unique temporary directory from TEMPLATE.
-    The last six characters of TEMPLATE must be "XXXXXX";
-    they are replaced with a string that makes the directory name unique.
-    Returns TEMPLATE, or a null pointer if it cannot get a unique name.
-    The directory is created mode 700.  */
- # if !@HAVE_MKDTEMP@
- _GL_FUNCDECL_SYS (mkdtemp, char *, (char * /*template*/) _GL_ARG_NONNULL ((1)));
- # endif
- _GL_CXXALIAS_SYS (mkdtemp, char *, (char * /*template*/));
- _GL_CXXALIASWARN (mkdtemp);
- #elif defined GNULIB_POSIXCHECK
- # undef mkdtemp
- # if HAVE_RAW_DECL_MKDTEMP
- _GL_WARN_ON_USE (mkdtemp, "mkdtemp is unportable - "
-                  "use gnulib module mkdtemp for portability");
- # endif
- #endif
- 
- #if @GNULIB_MKOSTEMP@
- /* Create a unique temporary file from TEMPLATE.
-    The last six characters of TEMPLATE must be "XXXXXX";
-    they are replaced with a string that makes the file name unique.
-    The flags are a bitmask, possibly including O_CLOEXEC (defined in <fcntl.h>)
-    and O_TEXT, O_BINARY (defined in "binary-io.h").
-    The file is then created, with the specified flags, ensuring it didn't exist
-    before.
-    The file is created read-write (mask at least 0600 & ~umask), but it may be
-    world-readable and world-writable (mask 0666 & ~umask), depending on the
-    implementation.
-    Returns the open file descriptor if successful, otherwise -1 and errno
-    set.  */
- # if !@HAVE_MKOSTEMP@
- _GL_FUNCDECL_SYS (mkostemp, int, (char * /*template*/, int /*flags*/)
-                                  _GL_ARG_NONNULL ((1)));
- # endif
- _GL_CXXALIAS_SYS (mkostemp, int, (char * /*template*/, int /*flags*/));
- _GL_CXXALIASWARN (mkostemp);
- #elif defined GNULIB_POSIXCHECK
- # undef mkostemp
- # if HAVE_RAW_DECL_MKOSTEMP
- _GL_WARN_ON_USE (mkostemp, "mkostemp is unportable - "
-                  "use gnulib module mkostemp for portability");
- # endif
- #endif
- 
- #if @GNULIB_MKOSTEMPS@
- /* Create a unique temporary file from TEMPLATE.
-    The last six characters of TEMPLATE before a suffix of length
-    SUFFIXLEN must be "XXXXXX";
-    they are replaced with a string that makes the file name unique.
-    The flags are a bitmask, possibly including O_CLOEXEC (defined in <fcntl.h>)
-    and O_TEXT, O_BINARY (defined in "binary-io.h").
-    The file is then created, with the specified flags, ensuring it didn't exist
-    before.
-    The file is created read-write (mask at least 0600 & ~umask), but it may be
-    world-readable and world-writable (mask 0666 & ~umask), depending on the
-    implementation.
-    Returns the open file descriptor if successful, otherwise -1 and errno
-    set.  */
- # if !@HAVE_MKOSTEMPS@
- _GL_FUNCDECL_SYS (mkostemps, int,
-                   (char * /*template*/, int /*suffixlen*/, int /*flags*/)
-                   _GL_ARG_NONNULL ((1)));
- # endif
- _GL_CXXALIAS_SYS (mkostemps, int,
-                   (char * /*template*/, int /*suffixlen*/, int /*flags*/));
- _GL_CXXALIASWARN (mkostemps);
- #elif defined GNULIB_POSIXCHECK
- # undef mkostemps
- # if HAVE_RAW_DECL_MKOSTEMPS
- _GL_WARN_ON_USE (mkostemps, "mkostemps is unportable - "
-                  "use gnulib module mkostemps for portability");
- # endif
- #endif
- 
- #if @GNULIB_MKSTEMP@
- /* Create a unique temporary file from TEMPLATE.
-    The last six characters of TEMPLATE must be "XXXXXX";
-    they are replaced with a string that makes the file name unique.
-    The file is then created, ensuring it didn't exist before.
-    The file is created read-write (mask at least 0600 & ~umask), but it may be
-    world-readable and world-writable (mask 0666 & ~umask), depending on the
-    implementation.
-    Returns the open file descriptor if successful, otherwise -1 and errno
-    set.  */
- # if @REPLACE_MKSTEMP@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   define mkstemp rpl_mkstemp
- #  endif
- _GL_FUNCDECL_RPL (mkstemp, int, (char * /*template*/) _GL_ARG_NONNULL ((1)));
- _GL_CXXALIAS_RPL (mkstemp, int, (char * /*template*/));
- # else
- #  if ! @HAVE_MKSTEMP@
- _GL_FUNCDECL_SYS (mkstemp, int, (char * /*template*/) _GL_ARG_NONNULL ((1)));
- #  endif
- _GL_CXXALIAS_SYS (mkstemp, int, (char * /*template*/));
- # endif
- _GL_CXXALIASWARN (mkstemp);
- #elif defined GNULIB_POSIXCHECK
- # undef mkstemp
- # if HAVE_RAW_DECL_MKSTEMP
- _GL_WARN_ON_USE (mkstemp, "mkstemp is unportable - "
-                  "use gnulib module mkstemp for portability");
- # endif
- #endif
- 
- #if @GNULIB_MKSTEMPS@
- /* Create a unique temporary file from TEMPLATE.
-    The last six characters of TEMPLATE prior to a suffix of length
-    SUFFIXLEN must be "XXXXXX";
-    they are replaced with a string that makes the file name unique.
-    The file is then created, ensuring it didn't exist before.
-    The file is created read-write (mask at least 0600 & ~umask), but it may be
-    world-readable and world-writable (mask 0666 & ~umask), depending on the
-    implementation.
-    Returns the open file descriptor if successful, otherwise -1 and errno
-    set.  */
- # if !@HAVE_MKSTEMPS@
- _GL_FUNCDECL_SYS (mkstemps, int, (char * /*template*/, int /*suffixlen*/)
-                                  _GL_ARG_NONNULL ((1)));
- # endif
- _GL_CXXALIAS_SYS (mkstemps, int, (char * /*template*/, int /*suffixlen*/));
- _GL_CXXALIASWARN (mkstemps);
- #elif defined GNULIB_POSIXCHECK
- # undef mkstemps
- # if HAVE_RAW_DECL_MKSTEMPS
- _GL_WARN_ON_USE (mkstemps, "mkstemps is unportable - "
-                  "use gnulib module mkstemps for portability");
- # endif
- #endif
- 
- #if @GNULIB_POSIX_OPENPT@
- /* Return an FD open to the master side of a pseudo-terminal.  Flags should
-    include O_RDWR, and may also include O_NOCTTY.  */
- # if !@HAVE_POSIX_OPENPT@
- _GL_FUNCDECL_SYS (posix_openpt, int, (int flags));
- # endif
- _GL_CXXALIAS_SYS (posix_openpt, int, (int flags));
- _GL_CXXALIASWARN (posix_openpt);
- #elif defined GNULIB_POSIXCHECK
- # undef posix_openpt
- # if HAVE_RAW_DECL_POSIX_OPENPT
- _GL_WARN_ON_USE (posix_openpt, "posix_openpt is not portable - "
-                  "use gnulib module posix_openpt for portability");
- # endif
- #endif
- 
- #if @GNULIB_PTSNAME@
- /* Return the pathname of the pseudo-terminal slave associated with
-    the master FD is open on, or NULL on errors.  */
- # if @REPLACE_PTSNAME@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef ptsname
- #   define ptsname rpl_ptsname
- #  endif
- _GL_FUNCDECL_RPL (ptsname, char *, (int fd));
- _GL_CXXALIAS_RPL (ptsname, char *, (int fd));
- # else
- #  if !@HAVE_PTSNAME@
- _GL_FUNCDECL_SYS (ptsname, char *, (int fd));
- #  endif
- _GL_CXXALIAS_SYS (ptsname, char *, (int fd));
- # endif
- _GL_CXXALIASWARN (ptsname);
- #elif defined GNULIB_POSIXCHECK
- # undef ptsname
- # if HAVE_RAW_DECL_PTSNAME
- _GL_WARN_ON_USE (ptsname, "ptsname is not portable - "
-                  "use gnulib module ptsname for portability");
- # endif
- #endif
- 
- #if @GNULIB_PTSNAME_R@
- /* Set the pathname of the pseudo-terminal slave associated with
-    the master FD is open on and return 0, or set errno and return
-    non-zero on errors.  */
- # if @REPLACE_PTSNAME_R@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef ptsname_r
- #   define ptsname_r rpl_ptsname_r
- #  endif
- _GL_FUNCDECL_RPL (ptsname_r, int, (int fd, char *buf, size_t len));
- _GL_CXXALIAS_RPL (ptsname_r, int, (int fd, char *buf, size_t len));
- # else
- #  if !@HAVE_PTSNAME_R@
- _GL_FUNCDECL_SYS (ptsname_r, int, (int fd, char *buf, size_t len));
- #  endif
- _GL_CXXALIAS_SYS (ptsname_r, int, (int fd, char *buf, size_t len));
- # endif
- _GL_CXXALIASWARN (ptsname_r);
- #elif defined GNULIB_POSIXCHECK
- # undef ptsname_r
- # if HAVE_RAW_DECL_PTSNAME_R
- _GL_WARN_ON_USE (ptsname_r, "ptsname_r is not portable - "
-                  "use gnulib module ptsname_r for portability");
- # endif
- #endif
- 
- #if @GNULIB_PUTENV@
- # if @REPLACE_PUTENV@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef putenv
- #   define putenv rpl_putenv
- #  endif
- _GL_FUNCDECL_RPL (putenv, int, (char *string) _GL_ARG_NONNULL ((1)));
- _GL_CXXALIAS_RPL (putenv, int, (char *string));
- # else
- _GL_CXXALIAS_SYS (putenv, int, (char *string));
- # endif
- _GL_CXXALIASWARN (putenv);
- #endif
- 
- #if @GNULIB_QSORT_R@
- # if @REPLACE_QSORT_R@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef qsort_r
- #   define qsort_r rpl_qsort_r
- #  endif
- _GL_FUNCDECL_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size,
-                                   int (*compare) (void const *, void const *,
-                                                   void *),
-                                   void *arg) _GL_ARG_NONNULL ((1, 4)));
- _GL_CXXALIAS_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size,
-                                   int (*compare) (void const *, void const *,
-                                                   void *),
-                                   void *arg));
- # else
- _GL_CXXALIAS_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size,
-                                   int (*compare) (void const *, void const *,
-                                                   void *),
-                                   void *arg));
- # endif
- _GL_CXXALIASWARN (qsort_r);
- #endif
- 
- 
- #if @GNULIB_RANDOM_R@
- # if !@HAVE_RANDOM_R@
- #  ifndef RAND_MAX
- #   define RAND_MAX 2147483647
- #  endif
- # endif
- #endif
- 
- 
- #if @GNULIB_RANDOM@
- # if !@HAVE_RANDOM@
- _GL_FUNCDECL_SYS (random, long, (void));
- # endif
- _GL_CXXALIAS_SYS (random, long, (void));
- _GL_CXXALIASWARN (random);
- #elif defined GNULIB_POSIXCHECK
- # undef random
- # if HAVE_RAW_DECL_RANDOM
- _GL_WARN_ON_USE (random, "random is unportable - "
-                  "use gnulib module random for portability");
- # endif
- #endif
- 
- #if @GNULIB_RANDOM@
- # if !@HAVE_RANDOM@
- _GL_FUNCDECL_SYS (srandom, void, (unsigned int seed));
- # endif
- _GL_CXXALIAS_SYS (srandom, void, (unsigned int seed));
- _GL_CXXALIASWARN (srandom);
- #elif defined GNULIB_POSIXCHECK
- # undef srandom
- # if HAVE_RAW_DECL_SRANDOM
- _GL_WARN_ON_USE (srandom, "srandom is unportable - "
-                  "use gnulib module random for portability");
- # endif
- #endif
- 
- #if @GNULIB_RANDOM@
- # if !@HAVE_RANDOM@
- _GL_FUNCDECL_SYS (initstate, char *,
-                   (unsigned int seed, char *buf, size_t buf_size)
-                   _GL_ARG_NONNULL ((2)));
- # endif
- _GL_CXXALIAS_SYS (initstate, char *,
-                   (unsigned int seed, char *buf, size_t buf_size));
- _GL_CXXALIASWARN (initstate);
- #elif defined GNULIB_POSIXCHECK
- # undef initstate
- # if HAVE_RAW_DECL_INITSTATE_R
- _GL_WARN_ON_USE (initstate, "initstate is unportable - "
-                  "use gnulib module random for portability");
- # endif
- #endif
- 
- #if @GNULIB_RANDOM@
- # if !@HAVE_RANDOM@
- _GL_FUNCDECL_SYS (setstate, char *, (char *arg_state) _GL_ARG_NONNULL ((1)));
- # endif
- _GL_CXXALIAS_SYS (setstate, char *, (char *arg_state));
- _GL_CXXALIASWARN (setstate);
- #elif defined GNULIB_POSIXCHECK
- # undef setstate
- # if HAVE_RAW_DECL_SETSTATE_R
- _GL_WARN_ON_USE (setstate, "setstate is unportable - "
-                  "use gnulib module random for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_RANDOM_R@
- # if @REPLACE_RANDOM_R@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef random_r
- #   define random_r rpl_random_r
- #  endif
- _GL_FUNCDECL_RPL (random_r, int, (struct random_data *buf, int32_t *result)
-                                  _GL_ARG_NONNULL ((1, 2)));
- _GL_CXXALIAS_RPL (random_r, int, (struct random_data *buf, int32_t *result));
- # else
- #  if !@HAVE_RANDOM_R@
- _GL_FUNCDECL_SYS (random_r, int, (struct random_data *buf, int32_t *result)
-                                  _GL_ARG_NONNULL ((1, 2)));
- #  endif
- _GL_CXXALIAS_SYS (random_r, int, (struct random_data *buf, int32_t *result));
- # endif
- _GL_CXXALIASWARN (random_r);
- #elif defined GNULIB_POSIXCHECK
- # undef random_r
- # if HAVE_RAW_DECL_RANDOM_R
- _GL_WARN_ON_USE (random_r, "random_r is unportable - "
-                  "use gnulib module random_r for portability");
- # endif
- #endif
- 
- #if @GNULIB_RANDOM_R@
- # if @REPLACE_RANDOM_R@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef srandom_r
- #   define srandom_r rpl_srandom_r
- #  endif
- _GL_FUNCDECL_RPL (srandom_r, int,
-                   (unsigned int seed, struct random_data *rand_state)
-                   _GL_ARG_NONNULL ((2)));
- _GL_CXXALIAS_RPL (srandom_r, int,
-                   (unsigned int seed, struct random_data *rand_state));
- # else
- #  if !@HAVE_RANDOM_R@
- _GL_FUNCDECL_SYS (srandom_r, int,
-                   (unsigned int seed, struct random_data *rand_state)
-                   _GL_ARG_NONNULL ((2)));
- #  endif
- _GL_CXXALIAS_SYS (srandom_r, int,
-                   (unsigned int seed, struct random_data *rand_state));
- # endif
- _GL_CXXALIASWARN (srandom_r);
- #elif defined GNULIB_POSIXCHECK
- # undef srandom_r
- # if HAVE_RAW_DECL_SRANDOM_R
- _GL_WARN_ON_USE (srandom_r, "srandom_r is unportable - "
-                  "use gnulib module random_r for portability");
- # endif
- #endif
- 
- #if @GNULIB_RANDOM_R@
- # if @REPLACE_RANDOM_R@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef initstate_r
- #   define initstate_r rpl_initstate_r
- #  endif
- _GL_FUNCDECL_RPL (initstate_r, int,
-                   (unsigned int seed, char *buf, size_t buf_size,
-                    struct random_data *rand_state)
-                   _GL_ARG_NONNULL ((2, 4)));
- _GL_CXXALIAS_RPL (initstate_r, int,
-                   (unsigned int seed, char *buf, size_t buf_size,
-                    struct random_data *rand_state));
- # else
- #  if !@HAVE_RANDOM_R@
- _GL_FUNCDECL_SYS (initstate_r, int,
-                   (unsigned int seed, char *buf, size_t buf_size,
-                    struct random_data *rand_state)
-                   _GL_ARG_NONNULL ((2, 4)));
- #  endif
- _GL_CXXALIAS_SYS (initstate_r, int,
-                   (unsigned int seed, char *buf, size_t buf_size,
-                    struct random_data *rand_state));
- # endif
- _GL_CXXALIASWARN (initstate_r);
- #elif defined GNULIB_POSIXCHECK
- # undef initstate_r
- # if HAVE_RAW_DECL_INITSTATE_R
- _GL_WARN_ON_USE (initstate_r, "initstate_r is unportable - "
-                  "use gnulib module random_r for portability");
- # endif
- #endif
- 
- #if @GNULIB_RANDOM_R@
- # if @REPLACE_RANDOM_R@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef setstate_r
- #   define setstate_r rpl_setstate_r
- #  endif
- _GL_FUNCDECL_RPL (setstate_r, int,
-                   (char *arg_state, struct random_data *rand_state)
-                   _GL_ARG_NONNULL ((1, 2)));
- _GL_CXXALIAS_RPL (setstate_r, int,
-                   (char *arg_state, struct random_data *rand_state));
- # else
- #  if !@HAVE_RANDOM_R@
- _GL_FUNCDECL_SYS (setstate_r, int,
-                   (char *arg_state, struct random_data *rand_state)
-                   _GL_ARG_NONNULL ((1, 2)));
- #  endif
- _GL_CXXALIAS_SYS (setstate_r, int,
-                   (char *arg_state, struct random_data *rand_state));
- # endif
- _GL_CXXALIASWARN (setstate_r);
- #elif defined GNULIB_POSIXCHECK
- # undef setstate_r
- # if HAVE_RAW_DECL_SETSTATE_R
- _GL_WARN_ON_USE (setstate_r, "setstate_r is unportable - "
-                  "use gnulib module random_r for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_REALLOC_POSIX@
- # if @REPLACE_REALLOC@
- #  if !((defined __cplusplus && defined GNULIB_NAMESPACE) \
-         || _GL_USE_STDLIB_ALLOC)
- #   undef realloc
- #   define realloc rpl_realloc
- #  endif
- _GL_FUNCDECL_RPL (realloc, void *, (void *ptr, size_t size));
- _GL_CXXALIAS_RPL (realloc, void *, (void *ptr, size_t size));
- # else
- _GL_CXXALIAS_SYS (realloc, void *, (void *ptr, size_t size));
- # endif
- _GL_CXXALIASWARN (realloc);
- #elif defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC
- # undef realloc
- /* Assume realloc is always declared.  */
- _GL_WARN_ON_USE (realloc, "realloc is not POSIX compliant everywhere - "
-                  "use gnulib module realloc-posix for portability");
- #endif
- 
- #if @GNULIB_REALPATH@
- # if @REPLACE_REALPATH@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   define realpath rpl_realpath
- #  endif
- _GL_FUNCDECL_RPL (realpath, char *, (const char *name, char *resolved)
-                                     _GL_ARG_NONNULL ((1)));
- _GL_CXXALIAS_RPL (realpath, char *, (const char *name, char *resolved));
- # else
- #  if !@HAVE_REALPATH@
- _GL_FUNCDECL_SYS (realpath, char *, (const char *name, char *resolved)
-                                     _GL_ARG_NONNULL ((1)));
- #  endif
- _GL_CXXALIAS_SYS (realpath, char *, (const char *name, char *resolved));
- # endif
- _GL_CXXALIASWARN (realpath);
- #elif defined GNULIB_POSIXCHECK
- # undef realpath
- # if HAVE_RAW_DECL_REALPATH
- _GL_WARN_ON_USE (realpath, "realpath is unportable - use gnulib module "
-                  "canonicalize or canonicalize-lgpl for portability");
- # endif
- #endif
- 
- #if @GNULIB_RPMATCH@
- /* Test a user response to a question.
-    Return 1 if it is affirmative, 0 if it is negative, or -1 if not clear.  */
- # if !@HAVE_RPMATCH@
- _GL_FUNCDECL_SYS (rpmatch, int, (const char *response) _GL_ARG_NONNULL ((1)));
- # endif
- _GL_CXXALIAS_SYS (rpmatch, int, (const char *response));
- _GL_CXXALIASWARN (rpmatch);
- #elif defined GNULIB_POSIXCHECK
- # undef rpmatch
- # if HAVE_RAW_DECL_RPMATCH
- _GL_WARN_ON_USE (rpmatch, "rpmatch is unportable - "
-                  "use gnulib module rpmatch for portability");
- # endif
- #endif
- 
- #if @GNULIB_SECURE_GETENV@
- /* Look up NAME in the environment, returning 0 in insecure situations.  */
- # if !@HAVE_SECURE_GETENV@
- _GL_FUNCDECL_SYS (secure_getenv, char *,
-                   (char const *name) _GL_ARG_NONNULL ((1)));
- # endif
- _GL_CXXALIAS_SYS (secure_getenv, char *, (char const *name));
- _GL_CXXALIASWARN (secure_getenv);
- #elif defined GNULIB_POSIXCHECK
- # undef secure_getenv
- # if HAVE_RAW_DECL_SECURE_GETENV
- _GL_WARN_ON_USE (secure_getenv, "secure_getenv is unportable - "
-                  "use gnulib module secure_getenv for portability");
- # endif
- #endif
- 
- #if @GNULIB_SETENV@
- /* Set NAME to VALUE in the environment.
-    If REPLACE is nonzero, overwrite an existing value.  */
- # if @REPLACE_SETENV@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef setenv
- #   define setenv rpl_setenv
- #  endif
- _GL_FUNCDECL_RPL (setenv, int,
-                   (const char *name, const char *value, int replace)
-                   _GL_ARG_NONNULL ((1)));
- _GL_CXXALIAS_RPL (setenv, int,
-                   (const char *name, const char *value, int replace));
- # else
- #  if !@HAVE_DECL_SETENV@
- _GL_FUNCDECL_SYS (setenv, int,
-                   (const char *name, const char *value, int replace)
-                   _GL_ARG_NONNULL ((1)));
- #  endif
- _GL_CXXALIAS_SYS (setenv, int,
-                   (const char *name, const char *value, int replace));
- # endif
- # if !(@REPLACE_SETENV@ && !@HAVE_DECL_SETENV@)
- _GL_CXXALIASWARN (setenv);
- # endif
- #elif defined GNULIB_POSIXCHECK
- # undef setenv
- # if HAVE_RAW_DECL_SETENV
- _GL_WARN_ON_USE (setenv, "setenv is unportable - "
-                  "use gnulib module setenv for portability");
- # endif
- #endif
- 
- #if @GNULIB_STRTOD@
-  /* Parse a double from STRING, updating ENDP if appropriate.  */
- # if @REPLACE_STRTOD@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   define strtod rpl_strtod
- #  endif
- _GL_FUNCDECL_RPL (strtod, double, (const char *str, char **endp)
-                                   _GL_ARG_NONNULL ((1)));
- _GL_CXXALIAS_RPL (strtod, double, (const char *str, char **endp));
- # else
- #  if !@HAVE_STRTOD@
- _GL_FUNCDECL_SYS (strtod, double, (const char *str, char **endp)
-                                   _GL_ARG_NONNULL ((1)));
- #  endif
- _GL_CXXALIAS_SYS (strtod, double, (const char *str, char **endp));
- # endif
- _GL_CXXALIASWARN (strtod);
- #elif defined GNULIB_POSIXCHECK
- # undef strtod
- # if HAVE_RAW_DECL_STRTOD
- _GL_WARN_ON_USE (strtod, "strtod is unportable - "
-                  "use gnulib module strtod 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,
-    it may be decimal or octal (with prefix "0") or hexadecimal (with prefix
-    "0x").
-    If ENDPTR is not NULL, the address of the first byte after the integer is
-    stored in *ENDPTR.
-    Upon overflow, the return value is LLONG_MAX or LLONG_MIN, and errno is set
-    to ERANGE.  */
- # if !@HAVE_STRTOLL@
- _GL_FUNCDECL_SYS (strtoll, long long,
-                   (const char *string, char **endptr, int base)
-                   _GL_ARG_NONNULL ((1)));
- # endif
- _GL_CXXALIAS_SYS (strtoll, long long,
-                   (const char *string, char **endptr, int base));
- _GL_CXXALIASWARN (strtoll);
- #elif defined GNULIB_POSIXCHECK
- # undef strtoll
- # if HAVE_RAW_DECL_STRTOLL
- _GL_WARN_ON_USE (strtoll, "strtoll is unportable - "
-                  "use gnulib module strtoll for portability");
- # endif
- #endif
- 
- #if @GNULIB_STRTOULL@
- /* Parse an unsigned integer whose textual representation starts at STRING.
-    The integer is expected to be in base BASE (2 <= BASE <= 36); if BASE == 0,
-    it may be decimal or octal (with prefix "0") or hexadecimal (with prefix
-    "0x").
-    If ENDPTR is not NULL, the address of the first byte after the integer is
-    stored in *ENDPTR.
-    Upon overflow, the return value is ULLONG_MAX, and errno is set to
-    ERANGE.  */
- # if !@HAVE_STRTOULL@
- _GL_FUNCDECL_SYS (strtoull, unsigned long long,
-                   (const char *string, char **endptr, int base)
-                   _GL_ARG_NONNULL ((1)));
- # endif
- _GL_CXXALIAS_SYS (strtoull, unsigned long long,
-                   (const char *string, char **endptr, int base));
- _GL_CXXALIASWARN (strtoull);
- #elif defined GNULIB_POSIXCHECK
- # undef strtoull
- # if HAVE_RAW_DECL_STRTOULL
- _GL_WARN_ON_USE (strtoull, "strtoull is unportable - "
-                  "use gnulib module strtoull for portability");
- # endif
- #endif
- 
- #if @GNULIB_UNLOCKPT@
- /* Unlock the slave side of the pseudo-terminal whose master side is specified
-    by FD, so that it can be opened.  */
- # if !@HAVE_UNLOCKPT@
- _GL_FUNCDECL_SYS (unlockpt, int, (int fd));
- # endif
- _GL_CXXALIAS_SYS (unlockpt, int, (int fd));
- _GL_CXXALIASWARN (unlockpt);
- #elif defined GNULIB_POSIXCHECK
- # undef unlockpt
- # if HAVE_RAW_DECL_UNLOCKPT
- _GL_WARN_ON_USE (unlockpt, "unlockpt is not portable - "
-                  "use gnulib module unlockpt for portability");
- # endif
- #endif
- 
- #if @GNULIB_UNSETENV@
- /* Remove the variable NAME from the environment.  */
- # if @REPLACE_UNSETENV@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef unsetenv
- #   define unsetenv rpl_unsetenv
- #  endif
- _GL_FUNCDECL_RPL (unsetenv, int, (const char *name) _GL_ARG_NONNULL ((1)));
- _GL_CXXALIAS_RPL (unsetenv, int, (const char *name));
- # else
- #  if !@HAVE_DECL_UNSETENV@
- _GL_FUNCDECL_SYS (unsetenv, int, (const char *name) _GL_ARG_NONNULL ((1)));
- #  endif
- _GL_CXXALIAS_SYS (unsetenv, int, (const char *name));
- # endif
- # if !(@REPLACE_UNSETENV@ && !@HAVE_DECL_UNSETENV@)
- _GL_CXXALIASWARN (unsetenv);
- # endif
- #elif defined GNULIB_POSIXCHECK
- # undef unsetenv
- # if HAVE_RAW_DECL_UNSETENV
- _GL_WARN_ON_USE (unsetenv, "unsetenv is unportable - "
-                  "use gnulib module unsetenv for portability");
- # endif
- #endif
- 
- /* Convert a wide character to a multibyte character.  */
- #if @GNULIB_WCTOMB@
- # if @REPLACE_WCTOMB@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef wctomb
- #   define wctomb rpl_wctomb
- #  endif
- _GL_FUNCDECL_RPL (wctomb, int, (char *s, wchar_t wc));
- _GL_CXXALIAS_RPL (wctomb, int, (char *s, wchar_t wc));
- # else
- _GL_CXXALIAS_SYS (wctomb, int, (char *s, wchar_t wc));
- # endif
- _GL_CXXALIASWARN (wctomb);
- #endif
- 
- 
- #endif /* _@GUARD_PREFIX@_STDLIB_H */
- #endif /* _@GUARD_PREFIX@_STDLIB_H */
- #endif
--- 0 ----
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/string.in.h texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/string.in.h
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/string.in.h	2015-07-12 12:49:16.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/string.in.h	2016-08-30 18:49:30.000000000 +0100
***************
*** 1,5 ****
  /* A GNU-like <string.h>.
  
!    Copyright (C) 1995-1996, 2001-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  /* A GNU-like <string.h>.
  
!    Copyright (C) 1995-1996, 2001-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
***************
*** 417,429 ****
  #   define strndup rpl_strndup
  #  endif
! _GL_FUNCDECL_RPL (strndup, char *, (char const *__string, size_t __n)
                                     _GL_ARG_NONNULL ((1)));
! _GL_CXXALIAS_RPL (strndup, char *, (char const *__string, size_t __n));
  # else
  #  if ! @HAVE_DECL_STRNDUP@
! _GL_FUNCDECL_SYS (strndup, char *, (char const *__string, size_t __n)
                                     _GL_ARG_NONNULL ((1)));
  #  endif
! _GL_CXXALIAS_SYS (strndup, char *, (char const *__string, size_t __n));
  # endif
  _GL_CXXALIASWARN (strndup);
--- 417,429 ----
  #   define strndup rpl_strndup
  #  endif
! _GL_FUNCDECL_RPL (strndup, char *, (char const *__s, size_t __n)
                                     _GL_ARG_NONNULL ((1)));
! _GL_CXXALIAS_RPL (strndup, char *, (char const *__s, size_t __n));
  # else
  #  if ! @HAVE_DECL_STRNDUP@
! _GL_FUNCDECL_SYS (strndup, char *, (char const *__s, size_t __n)
                                     _GL_ARG_NONNULL ((1)));
  #  endif
! _GL_CXXALIAS_SYS (strndup, char *, (char const *__s, size_t __n));
  # endif
  _GL_CXXALIASWARN (strndup);
***************
*** 445,459 ****
  #   define strnlen rpl_strnlen
  #  endif
! _GL_FUNCDECL_RPL (strnlen, size_t, (char const *__string, size_t __maxlen)
                                     _GL_ATTRIBUTE_PURE
                                     _GL_ARG_NONNULL ((1)));
! _GL_CXXALIAS_RPL (strnlen, size_t, (char const *__string, size_t __maxlen));
  # else
  #  if ! @HAVE_DECL_STRNLEN@
! _GL_FUNCDECL_SYS (strnlen, size_t, (char const *__string, size_t __maxlen)
                                     _GL_ATTRIBUTE_PURE
                                     _GL_ARG_NONNULL ((1)));
  #  endif
! _GL_CXXALIAS_SYS (strnlen, size_t, (char const *__string, size_t __maxlen));
  # endif
  _GL_CXXALIASWARN (strnlen);
--- 445,459 ----
  #   define strnlen rpl_strnlen
  #  endif
! _GL_FUNCDECL_RPL (strnlen, size_t, (char const *__s, size_t __maxlen)
                                     _GL_ATTRIBUTE_PURE
                                     _GL_ARG_NONNULL ((1)));
! _GL_CXXALIAS_RPL (strnlen, size_t, (char const *__s, size_t __maxlen));
  # else
  #  if ! @HAVE_DECL_STRNLEN@
! _GL_FUNCDECL_SYS (strnlen, size_t, (char const *__s, size_t __maxlen)
                                     _GL_ATTRIBUTE_PURE
                                     _GL_ARG_NONNULL ((1)));
  #  endif
! _GL_CXXALIAS_SYS (strnlen, size_t, (char const *__s, size_t __maxlen));
  # endif
  _GL_CXXALIASWARN (strnlen);
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/sys_types.in.h texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/sys_types.in.h
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/sys_types.in.h	2015-07-12 12:49:16.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/sys_types.in.h	2016-08-13 14:16:13.000000000 +0100
***************
*** 1,5 ****
  /* Provide a more complete sys/types.h.
  
!    Copyright (C) 2011-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  /* Provide a more complete sys/types.h.
  
!    Copyright (C) 2011-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/unistd.c texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/unistd.c
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/unistd.c	2016-01-23 12:46:10.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/unistd.c	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,4 ****
- #include <config.h>
- #define _GL_UNISTD_INLINE _GL_EXTERN_INLINE
- #include "unistd.h"
- typedef int dummy;
--- 0 ----
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/unistd.in.h texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/unistd.in.h
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/unistd.in.h	2016-01-23 12:46:10.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/unistd.in.h	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,1586 ****
- /* Substitute for and wrapper around <unistd.h>.
-    Copyright (C) 2003-2015 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 <http://www.gnu.org/licenses/>.  */
- 
- #ifndef _@GUARD_PREFIX@_UNISTD_H
- 
- #if __GNUC__ >= 3
- @PRAGMA_SYSTEM_HEADER@
- #endif
- @PRAGMA_COLUMNS@
- 
- #ifdef _GL_INCLUDING_UNISTD_H
- /* Special invocation convention:
-    - On Mac OS X 10.3.9 we have a sequence of nested includes
-      <unistd.h> -> <signal.h> -> <pthread.h> -> <unistd.h>
-      In this situation, the functions are not yet declared, therefore we cannot
-      provide the C++ aliases.  */
- 
- #@INCLUDE_NEXT@ @NEXT_UNISTD_H@
- 
- #else
- /* Normal invocation convention.  */
- 
- /* The include_next requires a split double-inclusion guard.  */
- #if @HAVE_UNISTD_H@
- # define _GL_INCLUDING_UNISTD_H
- # @INCLUDE_NEXT@ @NEXT_UNISTD_H@
- # undef _GL_INCLUDING_UNISTD_H
- #endif
- 
- /* Get all possible declarations of gethostname().  */
- #if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ \
-   && !defined _GL_INCLUDING_WINSOCK2_H
- # define _GL_INCLUDING_WINSOCK2_H
- # include <winsock2.h>
- # undef _GL_INCLUDING_WINSOCK2_H
- #endif
- 
- #if !defined _@GUARD_PREFIX@_UNISTD_H && !defined _GL_INCLUDING_WINSOCK2_H
- #define _@GUARD_PREFIX@_UNISTD_H
- 
- /* NetBSD 5.0 mis-defines NULL.  Also get size_t.  */
- #include <stddef.h>
- 
- /* mingw doesn't define the SEEK_* or *_FILENO macros in <unistd.h>.  */
- /* Cygwin 1.7.1 declares symlinkat in <stdio.h>, not in <unistd.h>.  */
- /* But avoid namespace pollution on glibc systems.  */
- #if (!(defined SEEK_CUR && defined SEEK_END && defined SEEK_SET) \
-      || ((@GNULIB_SYMLINKAT@ || defined GNULIB_POSIXCHECK) \
-          && defined __CYGWIN__)) \
-     && ! defined __GLIBC__
- # include <stdio.h>
- #endif
- 
- /* Cygwin 1.7.1 declares unlinkat in <fcntl.h>, not in <unistd.h>.  */
- /* But avoid namespace pollution on glibc systems.  */
- #if (@GNULIB_UNLINKAT@ || defined GNULIB_POSIXCHECK) && defined __CYGWIN__ \
-     && ! defined __GLIBC__
- # include <fcntl.h>
- #endif
- 
- /* mingw fails to declare _exit in <unistd.h>.  */
- /* mingw, MSVC, BeOS, Haiku declare environ in <stdlib.h>, not in
-    <unistd.h>.  */
- /* Solaris declares getcwd not only in <unistd.h> but also in <stdlib.h>.  */
- /* OSF Tru64 Unix cannot see gnulib rpl_strtod when system <stdlib.h> is
-    included here.  */
- /* But avoid namespace pollution on glibc systems.  */
- #if !defined __GLIBC__ && !defined __osf__
- # define __need_system_stdlib_h
- # include <stdlib.h>
- # undef __need_system_stdlib_h
- #endif
- 
- /* Native Windows platforms declare chdir, getcwd, rmdir in
-    <io.h> and/or <direct.h>, not in <unistd.h>.
-    They also declare access(), chmod(), close(), dup(), dup2(), isatty(),
-    lseek(), read(), unlink(), write() in <io.h>.  */
- #if ((@GNULIB_CHDIR@ || @GNULIB_GETCWD@ || @GNULIB_RMDIR@ \
-       || defined GNULIB_POSIXCHECK) \
-      && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
- # include <io.h>     /* mingw32, mingw64 */
- # include <direct.h> /* mingw64, MSVC 9 */
- #elif (@GNULIB_CLOSE@ || @GNULIB_DUP@ || @GNULIB_DUP2@ || @GNULIB_ISATTY@ \
-        || @GNULIB_LSEEK@ || @GNULIB_READ@ || @GNULIB_UNLINK@ || @GNULIB_WRITE@ \
-        || defined GNULIB_POSIXCHECK) \
-       && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
- # include <io.h>
- #endif
- 
- /* AIX and OSF/1 5.1 declare getdomainname in <netdb.h>, not in <unistd.h>.
-    NonStop Kernel declares gethostname in <netdb.h>, not in <unistd.h>.  */
- /* But avoid namespace pollution on glibc systems.  */
- #if ((@GNULIB_GETDOMAINNAME@ && (defined _AIX || defined __osf__)) \
-      || (@GNULIB_GETHOSTNAME@ && defined __TANDEM)) \
-     && !defined __GLIBC__
- # 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>
- #endif
- 
- #if (@GNULIB_READ@ || @GNULIB_WRITE@ \
-      || @GNULIB_READLINK@ || @GNULIB_READLINKAT@ \
-      || @GNULIB_PREAD@ || @GNULIB_PWRITE@ || defined GNULIB_POSIXCHECK)
- /* Get ssize_t.  */
- # include <sys/types.h>
- #endif
- 
- /* Get getopt(), optarg, optind, opterr, optopt.
-    But avoid namespace pollution on glibc systems.  */
- #if @GNULIB_UNISTD_H_GETOPT@ && !defined __GLIBC__ && !defined _GL_SYSTEM_GETOPT
- # define __need_getopt
- # include <getopt.h>
- #endif
- 
- #ifndef _GL_INLINE_HEADER_BEGIN
-  #error "Please include config.h first."
- #endif
- _GL_INLINE_HEADER_BEGIN
- #ifndef _GL_UNISTD_INLINE
- # define _GL_UNISTD_INLINE _GL_INLINE
- #endif
- 
- /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
- 
- /* The definition of _GL_ARG_NONNULL is copied here.  */
- 
- /* The definition of _GL_WARN_ON_USE is copied here.  */
- 
- 
- /* Hide some function declarations from <winsock2.h>.  */
- 
- #if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@
- # if !defined _@GUARD_PREFIX@_SYS_SOCKET_H
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef socket
- #   define socket              socket_used_without_including_sys_socket_h
- #   undef connect
- #   define connect             connect_used_without_including_sys_socket_h
- #   undef accept
- #   define accept              accept_used_without_including_sys_socket_h
- #   undef bind
- #   define bind                bind_used_without_including_sys_socket_h
- #   undef getpeername
- #   define getpeername         getpeername_used_without_including_sys_socket_h
- #   undef getsockname
- #   define getsockname         getsockname_used_without_including_sys_socket_h
- #   undef getsockopt
- #   define getsockopt          getsockopt_used_without_including_sys_socket_h
- #   undef listen
- #   define listen              listen_used_without_including_sys_socket_h
- #   undef recv
- #   define recv                recv_used_without_including_sys_socket_h
- #   undef send
- #   define send                send_used_without_including_sys_socket_h
- #   undef recvfrom
- #   define recvfrom            recvfrom_used_without_including_sys_socket_h
- #   undef sendto
- #   define sendto              sendto_used_without_including_sys_socket_h
- #   undef setsockopt
- #   define setsockopt          setsockopt_used_without_including_sys_socket_h
- #   undef shutdown
- #   define shutdown            shutdown_used_without_including_sys_socket_h
- #  else
-     _GL_WARN_ON_USE (socket,
-                      "socket() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (connect,
-                      "connect() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (accept,
-                      "accept() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (bind,
-                      "bind() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (getpeername,
-                      "getpeername() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (getsockname,
-                      "getsockname() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (getsockopt,
-                      "getsockopt() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (listen,
-                      "listen() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (recv,
-                      "recv() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (send,
-                      "send() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (recvfrom,
-                      "recvfrom() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (sendto,
-                      "sendto() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (setsockopt,
-                      "setsockopt() used without including <sys/socket.h>");
-     _GL_WARN_ON_USE (shutdown,
-                      "shutdown() used without including <sys/socket.h>");
- #  endif
- # endif
- # if !defined _@GUARD_PREFIX@_SYS_SELECT_H
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef select
- #   define select              select_used_without_including_sys_select_h
- #  else
-     _GL_WARN_ON_USE (select,
-                      "select() used without including <sys/select.h>");
- #  endif
- # endif
- #endif
- 
- 
- /* OS/2 EMX lacks these macros.  */
- #ifndef STDIN_FILENO
- # define STDIN_FILENO 0
- #endif
- #ifndef STDOUT_FILENO
- # define STDOUT_FILENO 1
- #endif
- #ifndef STDERR_FILENO
- # define STDERR_FILENO 2
- #endif
- 
- /* Ensure *_OK macros exist.  */
- #ifndef F_OK
- # define F_OK 0
- # define X_OK 1
- # define W_OK 2
- # define R_OK 4
- #endif
- 
- 
- /* Declare overridden functions.  */
- 
- 
- #if defined GNULIB_POSIXCHECK
- /* The access() function is a security risk.  */
- _GL_WARN_ON_USE (access, "the access function is a security risk - "
-                  "use the gnulib module faccessat instead");
- #endif
- 
- 
- #if @GNULIB_CHDIR@
- _GL_CXXALIAS_SYS (chdir, int, (const char *file) _GL_ARG_NONNULL ((1)));
- _GL_CXXALIASWARN (chdir);
- #elif defined GNULIB_POSIXCHECK
- # undef chdir
- # if HAVE_RAW_DECL_CHDIR
- _GL_WARN_ON_USE (chown, "chdir is not always in <unistd.h> - "
-                  "use gnulib module chdir for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_CHOWN@
- /* Change the owner of FILE to UID (if UID is not -1) and the group of FILE
-    to GID (if GID is not -1).  Follow symbolic links.
-    Return 0 if successful, otherwise -1 and errno set.
-    See the POSIX:2008 specification
-    <http://pubs.opengroup.org/onlinepubs/9699919799/functions/chown.html.  */
- # if @REPLACE_CHOWN@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef chown
- #   define chown rpl_chown
- #  endif
- _GL_FUNCDECL_RPL (chown, int, (const char *file, uid_t uid, gid_t gid)
-                               _GL_ARG_NONNULL ((1)));
- _GL_CXXALIAS_RPL (chown, int, (const char *file, uid_t uid, gid_t gid));
- # else
- #  if !@HAVE_CHOWN@
- _GL_FUNCDECL_SYS (chown, int, (const char *file, uid_t uid, gid_t gid)
-                               _GL_ARG_NONNULL ((1)));
- #  endif
- _GL_CXXALIAS_SYS (chown, int, (const char *file, uid_t uid, gid_t gid));
- # endif
- _GL_CXXALIASWARN (chown);
- #elif defined GNULIB_POSIXCHECK
- # undef chown
- # if HAVE_RAW_DECL_CHOWN
- _GL_WARN_ON_USE (chown, "chown fails to follow symlinks on some systems and "
-                  "doesn't treat a uid or gid of -1 on some systems - "
-                  "use gnulib module chown for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_CLOSE@
- # if @REPLACE_CLOSE@
- /* Automatically included by modules that need a replacement for close.  */
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef close
- #   define close rpl_close
- #  endif
- _GL_FUNCDECL_RPL (close, int, (int fd));
- _GL_CXXALIAS_RPL (close, int, (int fd));
- # else
- _GL_CXXALIAS_SYS (close, int, (int fd));
- # endif
- _GL_CXXALIASWARN (close);
- #elif @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
- # undef close
- # define close close_used_without_requesting_gnulib_module_close
- #elif defined GNULIB_POSIXCHECK
- # undef close
- /* Assume close is always declared.  */
- _GL_WARN_ON_USE (close, "close does not portably work on sockets - "
-                  "use gnulib module close for portability");
- #endif
- 
- 
- #if @GNULIB_DUP@
- # if @REPLACE_DUP@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   define dup rpl_dup
- #  endif
- _GL_FUNCDECL_RPL (dup, int, (int oldfd));
- _GL_CXXALIAS_RPL (dup, int, (int oldfd));
- # else
- _GL_CXXALIAS_SYS (dup, int, (int oldfd));
- # endif
- _GL_CXXALIASWARN (dup);
- #elif defined GNULIB_POSIXCHECK
- # undef dup
- # if HAVE_RAW_DECL_DUP
- _GL_WARN_ON_USE (dup, "dup is unportable - "
-                  "use gnulib module dup for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_DUP2@
- /* Copy the file descriptor OLDFD into file descriptor NEWFD.  Do nothing if
-    NEWFD = OLDFD, otherwise close NEWFD first if it is open.
-    Return newfd if successful, otherwise -1 and errno set.
-    See the POSIX:2008 specification
-    <http://pubs.opengroup.org/onlinepubs/9699919799/functions/dup2.html>.  */
- # if @REPLACE_DUP2@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   define dup2 rpl_dup2
- #  endif
- _GL_FUNCDECL_RPL (dup2, int, (int oldfd, int newfd));
- _GL_CXXALIAS_RPL (dup2, int, (int oldfd, int newfd));
- # else
- #  if !@HAVE_DUP2@
- _GL_FUNCDECL_SYS (dup2, int, (int oldfd, int newfd));
- #  endif
- _GL_CXXALIAS_SYS (dup2, int, (int oldfd, int newfd));
- # endif
- _GL_CXXALIASWARN (dup2);
- #elif defined GNULIB_POSIXCHECK
- # undef dup2
- # if HAVE_RAW_DECL_DUP2
- _GL_WARN_ON_USE (dup2, "dup2 is unportable - "
-                  "use gnulib module dup2 for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_DUP3@
- /* Copy the file descriptor OLDFD into file descriptor NEWFD, with the
-    specified flags.
-    The flags are a bitmask, possibly including O_CLOEXEC (defined in <fcntl.h>)
-    and O_TEXT, O_BINARY (defined in "binary-io.h").
-    Close NEWFD first if it is open.
-    Return newfd if successful, otherwise -1 and errno set.
-    See the Linux man page at
-    <http://www.kernel.org/doc/man-pages/online/pages/man2/dup3.2.html>.  */
- # if @HAVE_DUP3@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   define dup3 rpl_dup3
- #  endif
- _GL_FUNCDECL_RPL (dup3, int, (int oldfd, int newfd, int flags));
- _GL_CXXALIAS_RPL (dup3, int, (int oldfd, int newfd, int flags));
- # else
- _GL_FUNCDECL_SYS (dup3, int, (int oldfd, int newfd, int flags));
- _GL_CXXALIAS_SYS (dup3, int, (int oldfd, int newfd, int flags));
- # endif
- _GL_CXXALIASWARN (dup3);
- #elif defined GNULIB_POSIXCHECK
- # undef dup3
- # if HAVE_RAW_DECL_DUP3
- _GL_WARN_ON_USE (dup3, "dup3 is unportable - "
-                  "use gnulib module dup3 for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_ENVIRON@
- # if !@HAVE_DECL_ENVIRON@
- /* Set of environment variables and values.  An array of strings of the form
-    "VARIABLE=VALUE", terminated with a NULL.  */
- #  if defined __APPLE__ && defined __MACH__
- #   include <TargetConditionals.h>
- #   if !TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR
- #    define _GL_USE_CRT_EXTERNS
- #   endif
- #  endif
- #  ifdef _GL_USE_CRT_EXTERNS
- #   include <crt_externs.h>
- #   define environ (*_NSGetEnviron ())
- #  else
- #   ifdef __cplusplus
- extern "C" {
- #   endif
- extern char **environ;
- #   ifdef __cplusplus
- }
- #   endif
- #  endif
- # endif
- #elif defined GNULIB_POSIXCHECK
- # if HAVE_RAW_DECL_ENVIRON
- _GL_UNISTD_INLINE char ***
- rpl_environ (void)
- {
-   return &environ;
- }
- _GL_WARN_ON_USE (rpl_environ, "environ is unportable - "
-                  "use gnulib module environ for portability");
- #  undef environ
- #  define environ (*rpl_environ ())
- # endif
- #endif
- 
- 
- #if @GNULIB_EUIDACCESS@
- /* Like access(), except that it uses the effective user id and group id of
-    the current process.  */
- # if !@HAVE_EUIDACCESS@
- _GL_FUNCDECL_SYS (euidaccess, int, (const char *filename, int mode)
-                                    _GL_ARG_NONNULL ((1)));
- # endif
- _GL_CXXALIAS_SYS (euidaccess, int, (const char *filename, int mode));
- _GL_CXXALIASWARN (euidaccess);
- # if defined GNULIB_POSIXCHECK
- /* Like access(), this function is a security risk.  */
- _GL_WARN_ON_USE (euidaccess, "the euidaccess function is a security risk - "
-                  "use the gnulib module faccessat instead");
- # endif
- #elif defined GNULIB_POSIXCHECK
- # undef euidaccess
- # if HAVE_RAW_DECL_EUIDACCESS
- _GL_WARN_ON_USE (euidaccess, "euidaccess is unportable - "
-                  "use gnulib module euidaccess for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_FACCESSAT@
- # if !@HAVE_FACCESSAT@
- _GL_FUNCDECL_SYS (faccessat, int,
-                   (int fd, char const *file, int mode, int flag)
-                   _GL_ARG_NONNULL ((2)));
- # endif
- _GL_CXXALIAS_SYS (faccessat, int,
-                   (int fd, char const *file, int mode, int flag));
- _GL_CXXALIASWARN (faccessat);
- #elif defined GNULIB_POSIXCHECK
- # undef faccessat
- # if HAVE_RAW_DECL_FACCESSAT
- _GL_WARN_ON_USE (faccessat, "faccessat is not portable - "
-                  "use gnulib module faccessat for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_FCHDIR@
- /* Change the process' current working directory to the directory on which
-    the given file descriptor is open.
-    Return 0 if successful, otherwise -1 and errno set.
-    See the POSIX:2008 specification
-    <http://pubs.opengroup.org/onlinepubs/9699919799/functions/fchdir.html>.  */
- # if ! @HAVE_FCHDIR@
- _GL_FUNCDECL_SYS (fchdir, int, (int /*fd*/));
- 
- /* Gnulib internal hooks needed to maintain the fchdir metadata.  */
- _GL_EXTERN_C int _gl_register_fd (int fd, const char *filename)
-      _GL_ARG_NONNULL ((2));
- _GL_EXTERN_C void _gl_unregister_fd (int fd);
- _GL_EXTERN_C int _gl_register_dup (int oldfd, int newfd);
- _GL_EXTERN_C const char *_gl_directory_name (int fd);
- 
- # else
- #  if !@HAVE_DECL_FCHDIR@
- _GL_FUNCDECL_SYS (fchdir, int, (int /*fd*/));
- #  endif
- # endif
- _GL_CXXALIAS_SYS (fchdir, int, (int /*fd*/));
- _GL_CXXALIASWARN (fchdir);
- #elif defined GNULIB_POSIXCHECK
- # undef fchdir
- # if HAVE_RAW_DECL_FCHDIR
- _GL_WARN_ON_USE (fchdir, "fchdir is unportable - "
-                  "use gnulib module fchdir for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_FCHOWNAT@
- # if @REPLACE_FCHOWNAT@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef fchownat
- #   define fchownat rpl_fchownat
- #  endif
- _GL_FUNCDECL_RPL (fchownat, int, (int fd, char const *file,
-                                   uid_t owner, gid_t group, int flag)
-                                  _GL_ARG_NONNULL ((2)));
- _GL_CXXALIAS_RPL (fchownat, int, (int fd, char const *file,
-                                   uid_t owner, gid_t group, int flag));
- # else
- #  if !@HAVE_FCHOWNAT@
- _GL_FUNCDECL_SYS (fchownat, int, (int fd, char const *file,
-                                   uid_t owner, gid_t group, int flag)
-                                  _GL_ARG_NONNULL ((2)));
- #  endif
- _GL_CXXALIAS_SYS (fchownat, int, (int fd, char const *file,
-                                   uid_t owner, gid_t group, int flag));
- # endif
- _GL_CXXALIASWARN (fchownat);
- #elif defined GNULIB_POSIXCHECK
- # undef fchownat
- # if HAVE_RAW_DECL_FCHOWNAT
- _GL_WARN_ON_USE (fchownat, "fchownat is not portable - "
-                  "use gnulib module openat for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_FDATASYNC@
- /* Synchronize changes to a file.
-    Return 0 if successful, otherwise -1 and errno set.
-    See POSIX:2008 specification
-    <http://pubs.opengroup.org/onlinepubs/9699919799/functions/fdatasync.html>.  */
- # if !@HAVE_FDATASYNC@ || !@HAVE_DECL_FDATASYNC@
- _GL_FUNCDECL_SYS (fdatasync, int, (int fd));
- # endif
- _GL_CXXALIAS_SYS (fdatasync, int, (int fd));
- _GL_CXXALIASWARN (fdatasync);
- #elif defined GNULIB_POSIXCHECK
- # undef fdatasync
- # if HAVE_RAW_DECL_FDATASYNC
- _GL_WARN_ON_USE (fdatasync, "fdatasync is unportable - "
-                  "use gnulib module fdatasync for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_FSYNC@
- /* Synchronize changes, including metadata, to a file.
-    Return 0 if successful, otherwise -1 and errno set.
-    See POSIX:2008 specification
-    <http://pubs.opengroup.org/onlinepubs/9699919799/functions/fsync.html>.  */
- # if !@HAVE_FSYNC@
- _GL_FUNCDECL_SYS (fsync, int, (int fd));
- # endif
- _GL_CXXALIAS_SYS (fsync, int, (int fd));
- _GL_CXXALIASWARN (fsync);
- #elif defined GNULIB_POSIXCHECK
- # undef fsync
- # if HAVE_RAW_DECL_FSYNC
- _GL_WARN_ON_USE (fsync, "fsync is unportable - "
-                  "use gnulib module fsync for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_FTRUNCATE@
- /* Change the size of the file to which FD is opened to become equal to LENGTH.
-    Return 0 if successful, otherwise -1 and errno set.
-    See the POSIX:2008 specification
-    <http://pubs.opengroup.org/onlinepubs/9699919799/functions/ftruncate.html>.  */
- # if @REPLACE_FTRUNCATE@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef ftruncate
- #   define ftruncate rpl_ftruncate
- #  endif
- _GL_FUNCDECL_RPL (ftruncate, int, (int fd, off_t length));
- _GL_CXXALIAS_RPL (ftruncate, int, (int fd, off_t length));
- # else
- #  if !@HAVE_FTRUNCATE@
- _GL_FUNCDECL_SYS (ftruncate, int, (int fd, off_t length));
- #  endif
- _GL_CXXALIAS_SYS (ftruncate, int, (int fd, off_t length));
- # endif
- _GL_CXXALIASWARN (ftruncate);
- #elif defined GNULIB_POSIXCHECK
- # undef ftruncate
- # if HAVE_RAW_DECL_FTRUNCATE
- _GL_WARN_ON_USE (ftruncate, "ftruncate is unportable - "
-                  "use gnulib module ftruncate for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_GETCWD@
- /* Get the name of the current working directory, and put it in SIZE bytes
-    of BUF.
-    Return BUF if successful, or NULL if the directory couldn't be determined
-    or SIZE was too small.
-    See the POSIX:2008 specification
-    <http://pubs.opengroup.org/onlinepubs/9699919799/functions/getcwd.html>.
-    Additionally, the gnulib module 'getcwd' guarantees the following GNU
-    extension: If BUF is NULL, an array is allocated with 'malloc'; the array
-    is SIZE bytes long, unless SIZE == 0, in which case it is as big as
-    necessary.  */
- # if @REPLACE_GETCWD@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   define getcwd rpl_getcwd
- #  endif
- _GL_FUNCDECL_RPL (getcwd, char *, (char *buf, size_t size));
- _GL_CXXALIAS_RPL (getcwd, char *, (char *buf, size_t size));
- # else
- /* Need to cast, because on mingw, the second parameter is
-                                                    int size.  */
- _GL_CXXALIAS_SYS_CAST (getcwd, char *, (char *buf, size_t size));
- # endif
- _GL_CXXALIASWARN (getcwd);
- #elif defined GNULIB_POSIXCHECK
- # undef getcwd
- # if HAVE_RAW_DECL_GETCWD
- _GL_WARN_ON_USE (getcwd, "getcwd is unportable - "
-                  "use gnulib module getcwd for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_GETDOMAINNAME@
- /* Return the NIS domain name of the machine.
-    WARNING! The NIS domain name is unrelated to the fully qualified host name
-             of the machine.  It is also unrelated to email addresses.
-    WARNING! The NIS domain name is usually the empty string or "(none)" when
-             not using NIS.
- 
-    Put up to LEN bytes of the NIS domain name into NAME.
-    Null terminate it if the name is shorter than LEN.
-    If the NIS domain name is longer than LEN, set errno = EINVAL and return -1.
-    Return 0 if successful, otherwise set errno and return -1.  */
- # if @REPLACE_GETDOMAINNAME@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef getdomainname
- #   define getdomainname rpl_getdomainname
- #  endif
- _GL_FUNCDECL_RPL (getdomainname, int, (char *name, size_t len)
-                                       _GL_ARG_NONNULL ((1)));
- _GL_CXXALIAS_RPL (getdomainname, int, (char *name, size_t len));
- # else
- #  if !@HAVE_DECL_GETDOMAINNAME@
- _GL_FUNCDECL_SYS (getdomainname, int, (char *name, size_t len)
-                                       _GL_ARG_NONNULL ((1)));
- #  endif
- _GL_CXXALIAS_SYS (getdomainname, int, (char *name, size_t len));
- # endif
- _GL_CXXALIASWARN (getdomainname);
- #elif defined GNULIB_POSIXCHECK
- # undef getdomainname
- # if HAVE_RAW_DECL_GETDOMAINNAME
- _GL_WARN_ON_USE (getdomainname, "getdomainname is unportable - "
-                  "use gnulib module getdomainname for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_GETDTABLESIZE@
- /* Return the maximum number of file descriptors in the current process.
-    In POSIX, this is same as sysconf (_SC_OPEN_MAX).  */
- # if @REPLACE_GETDTABLESIZE@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef getdtablesize
- #   define getdtablesize rpl_getdtablesize
- #  endif
- _GL_FUNCDECL_RPL (getdtablesize, int, (void));
- _GL_CXXALIAS_RPL (getdtablesize, int, (void));
- # else
- #  if !@HAVE_GETDTABLESIZE@
- _GL_FUNCDECL_SYS (getdtablesize, int, (void));
- #  endif
- _GL_CXXALIAS_SYS (getdtablesize, int, (void));
- # endif
- _GL_CXXALIASWARN (getdtablesize);
- #elif defined GNULIB_POSIXCHECK
- # undef getdtablesize
- # if HAVE_RAW_DECL_GETDTABLESIZE
- _GL_WARN_ON_USE (getdtablesize, "getdtablesize is unportable - "
-                  "use gnulib module getdtablesize for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_GETGROUPS@
- /* Return the supplemental groups that the current process belongs to.
-    It is unspecified whether the effective group id is in the list.
-    If N is 0, return the group count; otherwise, N describes how many
-    entries are available in GROUPS.  Return -1 and set errno if N is
-    not 0 and not large enough.  Fails with ENOSYS on some systems.  */
- # if @REPLACE_GETGROUPS@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef getgroups
- #   define getgroups rpl_getgroups
- #  endif
- _GL_FUNCDECL_RPL (getgroups, int, (int n, gid_t *groups));
- _GL_CXXALIAS_RPL (getgroups, int, (int n, gid_t *groups));
- # else
- #  if !@HAVE_GETGROUPS@
- _GL_FUNCDECL_SYS (getgroups, int, (int n, gid_t *groups));
- #  endif
- _GL_CXXALIAS_SYS (getgroups, int, (int n, gid_t *groups));
- # endif
- _GL_CXXALIASWARN (getgroups);
- #elif defined GNULIB_POSIXCHECK
- # undef getgroups
- # if HAVE_RAW_DECL_GETGROUPS
- _GL_WARN_ON_USE (getgroups, "getgroups is unportable - "
-                  "use gnulib module getgroups for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_GETHOSTNAME@
- /* Return the standard host name of the machine.
-    WARNING! The host name may or may not be fully qualified.
- 
-    Put up to LEN bytes of the host name into NAME.
-    Null terminate it if the name is shorter than LEN.
-    If the host name is longer than LEN, set errno = EINVAL and return -1.
-    Return 0 if successful, otherwise set errno and return -1.  */
- # if @UNISTD_H_HAVE_WINSOCK2_H@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef gethostname
- #   define gethostname rpl_gethostname
- #  endif
- _GL_FUNCDECL_RPL (gethostname, int, (char *name, size_t len)
-                                     _GL_ARG_NONNULL ((1)));
- _GL_CXXALIAS_RPL (gethostname, int, (char *name, size_t len));
- # else
- #  if !@HAVE_GETHOSTNAME@
- _GL_FUNCDECL_SYS (gethostname, int, (char *name, size_t len)
-                                     _GL_ARG_NONNULL ((1)));
- #  endif
- /* Need to cast, because on Solaris 10 and OSF/1 5.1 systems, the second
-    parameter is
-                                                       int len.  */
- _GL_CXXALIAS_SYS_CAST (gethostname, int, (char *name, size_t len));
- # endif
- _GL_CXXALIASWARN (gethostname);
- #elif @UNISTD_H_HAVE_WINSOCK2_H@
- # undef gethostname
- # define gethostname gethostname_used_without_requesting_gnulib_module_gethostname
- #elif defined GNULIB_POSIXCHECK
- # undef gethostname
- # if HAVE_RAW_DECL_GETHOSTNAME
- _GL_WARN_ON_USE (gethostname, "gethostname is unportable - "
-                  "use gnulib module gethostname for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_GETLOGIN@
- /* Returns the user's login name, or NULL if it cannot be found.  Upon error,
-    returns NULL with errno set.
- 
-    See <http://www.opengroup.org/susv3xsh/getlogin.html>.
- 
-    Most programs don't need to use this function, because the information is
-    available through environment variables:
-      ${LOGNAME-$USER}        on Unix platforms,
-      $USERNAME               on native Windows platforms.
-  */
- # if !@HAVE_GETLOGIN@
- _GL_FUNCDECL_SYS (getlogin, char *, (void));
- # endif
- _GL_CXXALIAS_SYS (getlogin, char *, (void));
- _GL_CXXALIASWARN (getlogin);
- #elif defined GNULIB_POSIXCHECK
- # undef getlogin
- # if HAVE_RAW_DECL_GETLOGIN
- _GL_WARN_ON_USE (getlogin, "getlogin is unportable - "
-                  "use gnulib module getlogin for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_GETLOGIN_R@
- /* Copies the user's login name to NAME.
-    The array pointed to by NAME has room for SIZE bytes.
- 
-    Returns 0 if successful.  Upon error, an error number is returned, or -1 in
-    the case that the login name cannot be found but no specific error is
-    provided (this case is hopefully rare but is left open by the POSIX spec).
- 
-    See <http://www.opengroup.org/susv3xsh/getlogin.html>.
- 
-    Most programs don't need to use this function, because the information is
-    available through environment variables:
-      ${LOGNAME-$USER}        on Unix platforms,
-      $USERNAME               on native Windows platforms.
-  */
- # if @REPLACE_GETLOGIN_R@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   define getlogin_r rpl_getlogin_r
- #  endif
- _GL_FUNCDECL_RPL (getlogin_r, int, (char *name, size_t size)
-                                    _GL_ARG_NONNULL ((1)));
- _GL_CXXALIAS_RPL (getlogin_r, int, (char *name, size_t size));
- # else
- #  if !@HAVE_DECL_GETLOGIN_R@
- _GL_FUNCDECL_SYS (getlogin_r, int, (char *name, size_t size)
-                                    _GL_ARG_NONNULL ((1)));
- #  endif
- /* Need to cast, because on Solaris 10 systems, the second argument is
-                                                      int size.  */
- _GL_CXXALIAS_SYS_CAST (getlogin_r, int, (char *name, size_t size));
- # endif
- _GL_CXXALIASWARN (getlogin_r);
- #elif defined GNULIB_POSIXCHECK
- # undef getlogin_r
- # if HAVE_RAW_DECL_GETLOGIN_R
- _GL_WARN_ON_USE (getlogin_r, "getlogin_r is unportable - "
-                  "use gnulib module getlogin_r for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_GETPAGESIZE@
- # if @REPLACE_GETPAGESIZE@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   define getpagesize rpl_getpagesize
- #  endif
- _GL_FUNCDECL_RPL (getpagesize, int, (void));
- _GL_CXXALIAS_RPL (getpagesize, int, (void));
- # else
- #  if !@HAVE_GETPAGESIZE@
- #   if !defined getpagesize
- /* This is for POSIX systems.  */
- #    if !defined _gl_getpagesize && defined _SC_PAGESIZE
- #     if ! (defined __VMS && __VMS_VER < 70000000)
- #      define _gl_getpagesize() sysconf (_SC_PAGESIZE)
- #     endif
- #    endif
- /* This is for older VMS.  */
- #    if !defined _gl_getpagesize && defined __VMS
- #     ifdef __ALPHA
- #      define _gl_getpagesize() 8192
- #     else
- #      define _gl_getpagesize() 512
- #     endif
- #    endif
- /* This is for BeOS.  */
- #    if !defined _gl_getpagesize && @HAVE_OS_H@
- #     include <OS.h>
- #     if defined B_PAGE_SIZE
- #      define _gl_getpagesize() B_PAGE_SIZE
- #     endif
- #    endif
- /* This is for AmigaOS4.0.  */
- #    if !defined _gl_getpagesize && defined __amigaos4__
- #     define _gl_getpagesize() 2048
- #    endif
- /* This is for older Unix systems.  */
- #    if !defined _gl_getpagesize && @HAVE_SYS_PARAM_H@
- #     include <sys/param.h>
- #     ifdef EXEC_PAGESIZE
- #      define _gl_getpagesize() EXEC_PAGESIZE
- #     else
- #      ifdef NBPG
- #       ifndef CLSIZE
- #        define CLSIZE 1
- #       endif
- #       define _gl_getpagesize() (NBPG * CLSIZE)
- #      else
- #       ifdef NBPC
- #        define _gl_getpagesize() NBPC
- #       endif
- #      endif
- #     endif
- #    endif
- #    if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #     define getpagesize() _gl_getpagesize ()
- #    else
- #     if !GNULIB_defined_getpagesize_function
- _GL_UNISTD_INLINE int
- getpagesize ()
- {
-   return _gl_getpagesize ();
- }
- #      define GNULIB_defined_getpagesize_function 1
- #     endif
- #    endif
- #   endif
- #  endif
- /* Need to cast, because on Cygwin 1.5.x systems, the return type is size_t.  */
- _GL_CXXALIAS_SYS_CAST (getpagesize, int, (void));
- # endif
- # if @HAVE_DECL_GETPAGESIZE@
- _GL_CXXALIASWARN (getpagesize);
- # endif
- #elif defined GNULIB_POSIXCHECK
- # undef getpagesize
- # if HAVE_RAW_DECL_GETPAGESIZE
- _GL_WARN_ON_USE (getpagesize, "getpagesize is unportable - "
-                  "use gnulib module getpagesize for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_GETUSERSHELL@
- /* Return the next valid login shell on the system, or NULL when the end of
-    the list has been reached.  */
- # if !@HAVE_DECL_GETUSERSHELL@
- _GL_FUNCDECL_SYS (getusershell, char *, (void));
- # endif
- _GL_CXXALIAS_SYS (getusershell, char *, (void));
- _GL_CXXALIASWARN (getusershell);
- #elif defined GNULIB_POSIXCHECK
- # undef getusershell
- # if HAVE_RAW_DECL_GETUSERSHELL
- _GL_WARN_ON_USE (getusershell, "getusershell is unportable - "
-                  "use gnulib module getusershell for portability");
- # endif
- #endif
- 
- #if @GNULIB_GETUSERSHELL@
- /* Rewind to pointer that is advanced at each getusershell() call.  */
- # if !@HAVE_DECL_GETUSERSHELL@
- _GL_FUNCDECL_SYS (setusershell, void, (void));
- # endif
- _GL_CXXALIAS_SYS (setusershell, void, (void));
- _GL_CXXALIASWARN (setusershell);
- #elif defined GNULIB_POSIXCHECK
- # undef setusershell
- # if HAVE_RAW_DECL_SETUSERSHELL
- _GL_WARN_ON_USE (setusershell, "setusershell is unportable - "
-                  "use gnulib module getusershell for portability");
- # endif
- #endif
- 
- #if @GNULIB_GETUSERSHELL@
- /* Free the pointer that is advanced at each getusershell() call and
-    associated resources.  */
- # if !@HAVE_DECL_GETUSERSHELL@
- _GL_FUNCDECL_SYS (endusershell, void, (void));
- # endif
- _GL_CXXALIAS_SYS (endusershell, void, (void));
- _GL_CXXALIASWARN (endusershell);
- #elif defined GNULIB_POSIXCHECK
- # undef endusershell
- # if HAVE_RAW_DECL_ENDUSERSHELL
- _GL_WARN_ON_USE (endusershell, "endusershell is unportable - "
-                  "use gnulib module getusershell for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_GROUP_MEMBER@
- /* Determine whether group id is in calling user's group list.  */
- # if !@HAVE_GROUP_MEMBER@
- _GL_FUNCDECL_SYS (group_member, int, (gid_t gid));
- # endif
- _GL_CXXALIAS_SYS (group_member, int, (gid_t gid));
- _GL_CXXALIASWARN (group_member);
- #elif defined GNULIB_POSIXCHECK
- # undef group_member
- # if HAVE_RAW_DECL_GROUP_MEMBER
- _GL_WARN_ON_USE (group_member, "group_member is unportable - "
-                  "use gnulib module group-member for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_ISATTY@
- # if @REPLACE_ISATTY@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef isatty
- #   define isatty rpl_isatty
- #  endif
- _GL_FUNCDECL_RPL (isatty, int, (int fd));
- _GL_CXXALIAS_RPL (isatty, int, (int fd));
- # else
- _GL_CXXALIAS_SYS (isatty, int, (int fd));
- # endif
- _GL_CXXALIASWARN (isatty);
- #elif defined GNULIB_POSIXCHECK
- # undef isatty
- # if HAVE_RAW_DECL_ISATTY
- _GL_WARN_ON_USE (isatty, "isatty has portability problems on native Windows - "
-                  "use gnulib module isatty for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_LCHOWN@
- /* Change the owner of FILE to UID (if UID is not -1) and the group of FILE
-    to GID (if GID is not -1).  Do not follow symbolic links.
-    Return 0 if successful, otherwise -1 and errno set.
-    See the POSIX:2008 specification
-    <http://pubs.opengroup.org/onlinepubs/9699919799/functions/lchown.html>.  */
- # if @REPLACE_LCHOWN@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef lchown
- #   define lchown rpl_lchown
- #  endif
- _GL_FUNCDECL_RPL (lchown, int, (char const *file, uid_t owner, gid_t group)
-                                _GL_ARG_NONNULL ((1)));
- _GL_CXXALIAS_RPL (lchown, int, (char const *file, uid_t owner, gid_t group));
- # else
- #  if !@HAVE_LCHOWN@
- _GL_FUNCDECL_SYS (lchown, int, (char const *file, uid_t owner, gid_t group)
-                                _GL_ARG_NONNULL ((1)));
- #  endif
- _GL_CXXALIAS_SYS (lchown, int, (char const *file, uid_t owner, gid_t group));
- # endif
- _GL_CXXALIASWARN (lchown);
- #elif defined GNULIB_POSIXCHECK
- # undef lchown
- # if HAVE_RAW_DECL_LCHOWN
- _GL_WARN_ON_USE (lchown, "lchown is unportable to pre-POSIX.1-2001 systems - "
-                  "use gnulib module lchown for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_LINK@
- /* Create a new hard link for an existing file.
-    Return 0 if successful, otherwise -1 and errno set.
-    See POSIX:2008 specification
-    <http://pubs.opengroup.org/onlinepubs/9699919799/functions/link.html>.  */
- # if @REPLACE_LINK@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   define link rpl_link
- #  endif
- _GL_FUNCDECL_RPL (link, int, (const char *path1, const char *path2)
-                              _GL_ARG_NONNULL ((1, 2)));
- _GL_CXXALIAS_RPL (link, int, (const char *path1, const char *path2));
- # else
- #  if !@HAVE_LINK@
- _GL_FUNCDECL_SYS (link, int, (const char *path1, const char *path2)
-                              _GL_ARG_NONNULL ((1, 2)));
- #  endif
- _GL_CXXALIAS_SYS (link, int, (const char *path1, const char *path2));
- # endif
- _GL_CXXALIASWARN (link);
- #elif defined GNULIB_POSIXCHECK
- # undef link
- # if HAVE_RAW_DECL_LINK
- _GL_WARN_ON_USE (link, "link is unportable - "
-                  "use gnulib module link for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_LINKAT@
- /* Create a new hard link for an existing file, relative to two
-    directories.  FLAG controls whether symlinks are followed.
-    Return 0 if successful, otherwise -1 and errno set.  */
- # if @REPLACE_LINKAT@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef linkat
- #   define linkat rpl_linkat
- #  endif
- _GL_FUNCDECL_RPL (linkat, int,
-                   (int fd1, const char *path1, int fd2, const char *path2,
-                    int flag)
-                   _GL_ARG_NONNULL ((2, 4)));
- _GL_CXXALIAS_RPL (linkat, int,
-                   (int fd1, const char *path1, int fd2, const char *path2,
-                    int flag));
- # else
- #  if !@HAVE_LINKAT@
- _GL_FUNCDECL_SYS (linkat, int,
-                   (int fd1, const char *path1, int fd2, const char *path2,
-                    int flag)
-                   _GL_ARG_NONNULL ((2, 4)));
- #  endif
- _GL_CXXALIAS_SYS (linkat, int,
-                   (int fd1, const char *path1, int fd2, const char *path2,
-                    int flag));
- # endif
- _GL_CXXALIASWARN (linkat);
- #elif defined GNULIB_POSIXCHECK
- # undef linkat
- # if HAVE_RAW_DECL_LINKAT
- _GL_WARN_ON_USE (linkat, "linkat is unportable - "
-                  "use gnulib module linkat for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_LSEEK@
- /* Set the offset of FD relative to SEEK_SET, SEEK_CUR, or SEEK_END.
-    Return the new offset if successful, otherwise -1 and errno set.
-    See the POSIX:2008 specification
-    <http://pubs.opengroup.org/onlinepubs/9699919799/functions/lseek.html>.  */
- # if @REPLACE_LSEEK@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   define lseek rpl_lseek
- #  endif
- _GL_FUNCDECL_RPL (lseek, off_t, (int fd, off_t offset, int whence));
- _GL_CXXALIAS_RPL (lseek, off_t, (int fd, off_t offset, int whence));
- # else
- _GL_CXXALIAS_SYS (lseek, off_t, (int fd, off_t offset, int whence));
- # endif
- _GL_CXXALIASWARN (lseek);
- #elif defined GNULIB_POSIXCHECK
- # undef lseek
- # if HAVE_RAW_DECL_LSEEK
- _GL_WARN_ON_USE (lseek, "lseek does not fail with ESPIPE on pipes on some "
-                  "systems - use gnulib module lseek for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_PIPE@
- /* Create a pipe, defaulting to O_BINARY mode.
-    Store the read-end as fd[0] and the write-end as fd[1].
-    Return 0 upon success, or -1 with errno set upon failure.  */
- # if !@HAVE_PIPE@
- _GL_FUNCDECL_SYS (pipe, int, (int fd[2]) _GL_ARG_NONNULL ((1)));
- # endif
- _GL_CXXALIAS_SYS (pipe, int, (int fd[2]));
- _GL_CXXALIASWARN (pipe);
- #elif defined GNULIB_POSIXCHECK
- # undef pipe
- # if HAVE_RAW_DECL_PIPE
- _GL_WARN_ON_USE (pipe, "pipe is unportable - "
-                  "use gnulib module pipe-posix for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_PIPE2@
- /* Create a pipe, applying the given flags when opening the read-end of the
-    pipe and the write-end of the pipe.
-    The flags are a bitmask, possibly including O_CLOEXEC (defined in <fcntl.h>)
-    and O_TEXT, O_BINARY (defined in "binary-io.h").
-    Store the read-end as fd[0] and the write-end as fd[1].
-    Return 0 upon success, or -1 with errno set upon failure.
-    See also the Linux man page at
-    <http://www.kernel.org/doc/man-pages/online/pages/man2/pipe2.2.html>.  */
- # if @HAVE_PIPE2@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   define pipe2 rpl_pipe2
- #  endif
- _GL_FUNCDECL_RPL (pipe2, int, (int fd[2], int flags) _GL_ARG_NONNULL ((1)));
- _GL_CXXALIAS_RPL (pipe2, int, (int fd[2], int flags));
- # else
- _GL_FUNCDECL_SYS (pipe2, int, (int fd[2], int flags) _GL_ARG_NONNULL ((1)));
- _GL_CXXALIAS_SYS (pipe2, int, (int fd[2], int flags));
- # endif
- _GL_CXXALIASWARN (pipe2);
- #elif defined GNULIB_POSIXCHECK
- # undef pipe2
- # if HAVE_RAW_DECL_PIPE2
- _GL_WARN_ON_USE (pipe2, "pipe2 is unportable - "
-                  "use gnulib module pipe2 for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_PREAD@
- /* Read at most BUFSIZE bytes from FD into BUF, starting at OFFSET.
-    Return the number of bytes placed into BUF if successful, otherwise
-    set errno and return -1.  0 indicates EOF.
-    See the POSIX:2008 specification
-    <http://pubs.opengroup.org/onlinepubs/9699919799/functions/pread.html>.  */
- # if @REPLACE_PREAD@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef pread
- #   define pread rpl_pread
- #  endif
- _GL_FUNCDECL_RPL (pread, ssize_t,
-                   (int fd, void *buf, size_t bufsize, off_t offset)
-                   _GL_ARG_NONNULL ((2)));
- _GL_CXXALIAS_RPL (pread, ssize_t,
-                   (int fd, void *buf, size_t bufsize, off_t offset));
- # else
- #  if !@HAVE_PREAD@
- _GL_FUNCDECL_SYS (pread, ssize_t,
-                   (int fd, void *buf, size_t bufsize, off_t offset)
-                   _GL_ARG_NONNULL ((2)));
- #  endif
- _GL_CXXALIAS_SYS (pread, ssize_t,
-                   (int fd, void *buf, size_t bufsize, off_t offset));
- # endif
- _GL_CXXALIASWARN (pread);
- #elif defined GNULIB_POSIXCHECK
- # undef pread
- # if HAVE_RAW_DECL_PREAD
- _GL_WARN_ON_USE (pread, "pread is unportable - "
-                  "use gnulib module pread for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_PWRITE@
- /* Write at most BUFSIZE bytes from BUF into FD, starting at OFFSET.
-    Return the number of bytes written if successful, otherwise
-    set errno and return -1.  0 indicates nothing written.  See the
-    POSIX:2008 specification
-    <http://pubs.opengroup.org/onlinepubs/9699919799/functions/pwrite.html>.  */
- # if @REPLACE_PWRITE@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef pwrite
- #   define pwrite rpl_pwrite
- #  endif
- _GL_FUNCDECL_RPL (pwrite, ssize_t,
-                   (int fd, const void *buf, size_t bufsize, off_t offset)
-                   _GL_ARG_NONNULL ((2)));
- _GL_CXXALIAS_RPL (pwrite, ssize_t,
-                   (int fd, const void *buf, size_t bufsize, off_t offset));
- # else
- #  if !@HAVE_PWRITE@
- _GL_FUNCDECL_SYS (pwrite, ssize_t,
-                   (int fd, const void *buf, size_t bufsize, off_t offset)
-                   _GL_ARG_NONNULL ((2)));
- #  endif
- _GL_CXXALIAS_SYS (pwrite, ssize_t,
-                   (int fd, const void *buf, size_t bufsize, off_t offset));
- # endif
- _GL_CXXALIASWARN (pwrite);
- #elif defined GNULIB_POSIXCHECK
- # undef pwrite
- # if HAVE_RAW_DECL_PWRITE
- _GL_WARN_ON_USE (pwrite, "pwrite is unportable - "
-                  "use gnulib module pwrite for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_READ@
- /* Read up to COUNT bytes from file descriptor FD into the buffer starting
-    at BUF.  See the POSIX:2008 specification
-    <http://pubs.opengroup.org/onlinepubs/9699919799/functions/read.html>.  */
- # if @REPLACE_READ@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef read
- #   define read rpl_read
- #  endif
- _GL_FUNCDECL_RPL (read, ssize_t, (int fd, void *buf, size_t count)
-                                  _GL_ARG_NONNULL ((2)));
- _GL_CXXALIAS_RPL (read, ssize_t, (int fd, void *buf, size_t count));
- # else
- /* Need to cast, because on mingw, the third parameter is
-                                                           unsigned int count
-    and the return type is 'int'.  */
- _GL_CXXALIAS_SYS_CAST (read, ssize_t, (int fd, void *buf, size_t count));
- # endif
- _GL_CXXALIASWARN (read);
- #endif
- 
- 
- #if @GNULIB_READLINK@
- /* Read the contents of the symbolic link FILE and place the first BUFSIZE
-    bytes of it into BUF.  Return the number of bytes placed into BUF if
-    successful, otherwise -1 and errno set.
-    See the POSIX:2008 specification
-    <http://pubs.opengroup.org/onlinepubs/9699919799/functions/readlink.html>.  */
- # if @REPLACE_READLINK@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   define readlink rpl_readlink
- #  endif
- _GL_FUNCDECL_RPL (readlink, ssize_t,
-                   (const char *file, char *buf, size_t bufsize)
-                   _GL_ARG_NONNULL ((1, 2)));
- _GL_CXXALIAS_RPL (readlink, ssize_t,
-                   (const char *file, char *buf, size_t bufsize));
- # else
- #  if !@HAVE_READLINK@
- _GL_FUNCDECL_SYS (readlink, ssize_t,
-                   (const char *file, char *buf, size_t bufsize)
-                   _GL_ARG_NONNULL ((1, 2)));
- #  endif
- _GL_CXXALIAS_SYS (readlink, ssize_t,
-                   (const char *file, char *buf, size_t bufsize));
- # endif
- _GL_CXXALIASWARN (readlink);
- #elif defined GNULIB_POSIXCHECK
- # undef readlink
- # if HAVE_RAW_DECL_READLINK
- _GL_WARN_ON_USE (readlink, "readlink is unportable - "
-                  "use gnulib module readlink for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_READLINKAT@
- # if @REPLACE_READLINKAT@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   define readlinkat rpl_readlinkat
- #  endif
- _GL_FUNCDECL_RPL (readlinkat, ssize_t,
-                   (int fd, char const *file, char *buf, size_t len)
-                   _GL_ARG_NONNULL ((2, 3)));
- _GL_CXXALIAS_RPL (readlinkat, ssize_t,
-                   (int fd, char const *file, char *buf, size_t len));
- # else
- #  if !@HAVE_READLINKAT@
- _GL_FUNCDECL_SYS (readlinkat, ssize_t,
-                   (int fd, char const *file, char *buf, size_t len)
-                   _GL_ARG_NONNULL ((2, 3)));
- #  endif
- _GL_CXXALIAS_SYS (readlinkat, ssize_t,
-                   (int fd, char const *file, char *buf, size_t len));
- # endif
- _GL_CXXALIASWARN (readlinkat);
- #elif defined GNULIB_POSIXCHECK
- # undef readlinkat
- # if HAVE_RAW_DECL_READLINKAT
- _GL_WARN_ON_USE (readlinkat, "readlinkat is not portable - "
-                  "use gnulib module readlinkat for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_RMDIR@
- /* Remove the directory DIR.  */
- # if @REPLACE_RMDIR@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   define rmdir rpl_rmdir
- #  endif
- _GL_FUNCDECL_RPL (rmdir, int, (char const *name) _GL_ARG_NONNULL ((1)));
- _GL_CXXALIAS_RPL (rmdir, int, (char const *name));
- # else
- _GL_CXXALIAS_SYS (rmdir, int, (char const *name));
- # endif
- _GL_CXXALIASWARN (rmdir);
- #elif defined GNULIB_POSIXCHECK
- # undef rmdir
- # if HAVE_RAW_DECL_RMDIR
- _GL_WARN_ON_USE (rmdir, "rmdir is unportable - "
-                  "use gnulib module rmdir for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_SETHOSTNAME@
- /* Set the host name of the machine.
-    The host name may or may not be fully qualified.
- 
-    Put LEN bytes of NAME into the host name.
-    Return 0 if successful, otherwise, set errno and return -1.
- 
-    Platforms with no ability to set the hostname return -1 and set
-    errno = ENOSYS.  */
- # if !@HAVE_SETHOSTNAME@ || !@HAVE_DECL_SETHOSTNAME@
- _GL_FUNCDECL_SYS (sethostname, int, (const char *name, size_t len)
-                                     _GL_ARG_NONNULL ((1)));
- # endif
- /* Need to cast, because on Solaris 11 2011-10, Mac OS X 10.5, IRIX 6.5
-    and FreeBSD 6.4 the second parameter is int.  On Solaris 11
-    2011-10, the first parameter is not const.  */
- _GL_CXXALIAS_SYS_CAST (sethostname, int, (const char *name, size_t len));
- _GL_CXXALIASWARN (sethostname);
- #elif defined GNULIB_POSIXCHECK
- # undef sethostname
- # if HAVE_RAW_DECL_SETHOSTNAME
- _GL_WARN_ON_USE (sethostname, "sethostname is unportable - "
-                  "use gnulib module sethostname for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_SLEEP@
- /* Pause the execution of the current thread for N seconds.
-    Returns the number of seconds left to sleep.
-    See the POSIX:2008 specification
-    <http://pubs.opengroup.org/onlinepubs/9699919799/functions/sleep.html>.  */
- # if @REPLACE_SLEEP@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef sleep
- #   define sleep rpl_sleep
- #  endif
- _GL_FUNCDECL_RPL (sleep, unsigned int, (unsigned int n));
- _GL_CXXALIAS_RPL (sleep, unsigned int, (unsigned int n));
- # else
- #  if !@HAVE_SLEEP@
- _GL_FUNCDECL_SYS (sleep, unsigned int, (unsigned int n));
- #  endif
- _GL_CXXALIAS_SYS (sleep, unsigned int, (unsigned int n));
- # endif
- _GL_CXXALIASWARN (sleep);
- #elif defined GNULIB_POSIXCHECK
- # undef sleep
- # if HAVE_RAW_DECL_SLEEP
- _GL_WARN_ON_USE (sleep, "sleep is unportable - "
-                  "use gnulib module sleep for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_SYMLINK@
- # if @REPLACE_SYMLINK@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef symlink
- #   define symlink rpl_symlink
- #  endif
- _GL_FUNCDECL_RPL (symlink, int, (char const *contents, char const *file)
-                                 _GL_ARG_NONNULL ((1, 2)));
- _GL_CXXALIAS_RPL (symlink, int, (char const *contents, char const *file));
- # else
- #  if !@HAVE_SYMLINK@
- _GL_FUNCDECL_SYS (symlink, int, (char const *contents, char const *file)
-                                 _GL_ARG_NONNULL ((1, 2)));
- #  endif
- _GL_CXXALIAS_SYS (symlink, int, (char const *contents, char const *file));
- # endif
- _GL_CXXALIASWARN (symlink);
- #elif defined GNULIB_POSIXCHECK
- # undef symlink
- # if HAVE_RAW_DECL_SYMLINK
- _GL_WARN_ON_USE (symlink, "symlink is not portable - "
-                  "use gnulib module symlink for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_SYMLINKAT@
- # if @REPLACE_SYMLINKAT@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef symlinkat
- #   define symlinkat rpl_symlinkat
- #  endif
- _GL_FUNCDECL_RPL (symlinkat, int,
-                   (char const *contents, int fd, char const *file)
-                   _GL_ARG_NONNULL ((1, 3)));
- _GL_CXXALIAS_RPL (symlinkat, int,
-                   (char const *contents, int fd, char const *file));
- # else
- #  if !@HAVE_SYMLINKAT@
- _GL_FUNCDECL_SYS (symlinkat, int,
-                   (char const *contents, int fd, char const *file)
-                   _GL_ARG_NONNULL ((1, 3)));
- #  endif
- _GL_CXXALIAS_SYS (symlinkat, int,
-                   (char const *contents, int fd, char const *file));
- # endif
- _GL_CXXALIASWARN (symlinkat);
- #elif defined GNULIB_POSIXCHECK
- # undef symlinkat
- # if HAVE_RAW_DECL_SYMLINKAT
- _GL_WARN_ON_USE (symlinkat, "symlinkat is not portable - "
-                  "use gnulib module symlinkat for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_TTYNAME_R@
- /* Store at most BUFLEN characters of the pathname of the terminal FD is
-    open on in BUF.  Return 0 on success, otherwise an error number.  */
- # if @REPLACE_TTYNAME_R@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef ttyname_r
- #   define ttyname_r rpl_ttyname_r
- #  endif
- _GL_FUNCDECL_RPL (ttyname_r, int,
-                   (int fd, char *buf, size_t buflen) _GL_ARG_NONNULL ((2)));
- _GL_CXXALIAS_RPL (ttyname_r, int,
-                   (int fd, char *buf, size_t buflen));
- # else
- #  if !@HAVE_DECL_TTYNAME_R@
- _GL_FUNCDECL_SYS (ttyname_r, int,
-                   (int fd, char *buf, size_t buflen) _GL_ARG_NONNULL ((2)));
- #  endif
- _GL_CXXALIAS_SYS (ttyname_r, int,
-                   (int fd, char *buf, size_t buflen));
- # endif
- _GL_CXXALIASWARN (ttyname_r);
- #elif defined GNULIB_POSIXCHECK
- # undef ttyname_r
- # if HAVE_RAW_DECL_TTYNAME_R
- _GL_WARN_ON_USE (ttyname_r, "ttyname_r is not portable - "
-                  "use gnulib module ttyname_r for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_UNLINK@
- # if @REPLACE_UNLINK@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef unlink
- #   define unlink rpl_unlink
- #  endif
- _GL_FUNCDECL_RPL (unlink, int, (char const *file) _GL_ARG_NONNULL ((1)));
- _GL_CXXALIAS_RPL (unlink, int, (char const *file));
- # else
- _GL_CXXALIAS_SYS (unlink, int, (char const *file));
- # endif
- _GL_CXXALIASWARN (unlink);
- #elif defined GNULIB_POSIXCHECK
- # undef unlink
- # if HAVE_RAW_DECL_UNLINK
- _GL_WARN_ON_USE (unlink, "unlink is not portable - "
-                  "use gnulib module unlink for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_UNLINKAT@
- # if @REPLACE_UNLINKAT@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef unlinkat
- #   define unlinkat rpl_unlinkat
- #  endif
- _GL_FUNCDECL_RPL (unlinkat, int, (int fd, char const *file, int flag)
-                                  _GL_ARG_NONNULL ((2)));
- _GL_CXXALIAS_RPL (unlinkat, int, (int fd, char const *file, int flag));
- # else
- #  if !@HAVE_UNLINKAT@
- _GL_FUNCDECL_SYS (unlinkat, int, (int fd, char const *file, int flag)
-                                  _GL_ARG_NONNULL ((2)));
- #  endif
- _GL_CXXALIAS_SYS (unlinkat, int, (int fd, char const *file, int flag));
- # endif
- _GL_CXXALIASWARN (unlinkat);
- #elif defined GNULIB_POSIXCHECK
- # undef unlinkat
- # if HAVE_RAW_DECL_UNLINKAT
- _GL_WARN_ON_USE (unlinkat, "unlinkat is not portable - "
-                  "use gnulib module openat for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_USLEEP@
- /* Pause the execution of the current thread for N microseconds.
-    Returns 0 on completion, or -1 on range error.
-    See the POSIX:2001 specification
-    <http://www.opengroup.org/susv3xsh/usleep.html>.  */
- # if @REPLACE_USLEEP@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef usleep
- #   define usleep rpl_usleep
- #  endif
- _GL_FUNCDECL_RPL (usleep, int, (useconds_t n));
- _GL_CXXALIAS_RPL (usleep, int, (useconds_t n));
- # else
- #  if !@HAVE_USLEEP@
- _GL_FUNCDECL_SYS (usleep, int, (useconds_t n));
- #  endif
- _GL_CXXALIAS_SYS (usleep, int, (useconds_t n));
- # endif
- _GL_CXXALIASWARN (usleep);
- #elif defined GNULIB_POSIXCHECK
- # undef usleep
- # if HAVE_RAW_DECL_USLEEP
- _GL_WARN_ON_USE (usleep, "usleep is unportable - "
-                  "use gnulib module usleep for portability");
- # endif
- #endif
- 
- 
- #if @GNULIB_WRITE@
- /* Write up to COUNT bytes starting at BUF to file descriptor FD.
-    See the POSIX:2008 specification
-    <http://pubs.opengroup.org/onlinepubs/9699919799/functions/write.html>.  */
- # if @REPLACE_WRITE@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef write
- #   define write rpl_write
- #  endif
- _GL_FUNCDECL_RPL (write, ssize_t, (int fd, const void *buf, size_t count)
-                                   _GL_ARG_NONNULL ((2)));
- _GL_CXXALIAS_RPL (write, ssize_t, (int fd, const void *buf, size_t count));
- # else
- /* Need to cast, because on mingw, the third parameter is
-                                                              unsigned int count
-    and the return type is 'int'.  */
- _GL_CXXALIAS_SYS_CAST (write, ssize_t, (int fd, const void *buf, size_t count));
- # endif
- _GL_CXXALIASWARN (write);
- #endif
- 
- _GL_INLINE_HEADER_END
- 
- #endif /* _@GUARD_PREFIX@_UNISTD_H */
- #endif /* _GL_INCLUDING_UNISTD_H */
- #endif /* _@GUARD_PREFIX@_UNISTD_H */
--- 0 ----
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/vasnprintf.c texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/vasnprintf.c
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/vasnprintf.c	2015-07-12 12:49:16.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/vasnprintf.c	2016-08-13 14:16:13.000000000 +0100
***************
*** 1,4 ****
  /* vsprintf with automatic memory allocation.
!    Copyright (C) 1999, 2002-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,4 ----
  /* vsprintf with automatic memory allocation.
!    Copyright (C) 1999, 2002-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
***************
*** 196,200 ****
  /* GCC >= 4.0 with -Wall emits unjustified "... may be used uninitialized"
     warnings in this file.  Use -Dlint to suppress them.  */
! #ifdef lint
  # define IF_LINT(Code) Code
  #else
--- 196,200 ----
  /* GCC >= 4.0 with -Wall emits unjustified "... may be used uninitialized"
     warnings in this file.  Use -Dlint to suppress them.  */
! #if defined GCC_LINT || defined lint
  # define IF_LINT(Code) Code
  #else
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/vasnprintf.h texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/vasnprintf.h
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/vasnprintf.h	2015-07-12 12:49:16.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/vasnprintf.h	2016-08-13 14:16:13.000000000 +0100
***************
*** 1,4 ****
  /* vsprintf with automatic memory allocation.
!    Copyright (C) 2002-2004, 2007-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,4 ----
  /* vsprintf with automatic memory allocation.
!    Copyright (C) 2002-2004, 2007-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/vasprintf.c texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/vasprintf.c
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/vasprintf.c	2015-07-12 12:49:16.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/vasprintf.c	2016-08-13 14:16:13.000000000 +0100
***************
*** 1,4 ****
  /* Formatted output to strings.
!    Copyright (C) 1999, 2002, 2006-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,4 ----
  /* Formatted output to strings.
!    Copyright (C) 1999, 2002, 2006-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/verify.h texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/verify.h
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/verify.h	2015-07-12 12:49:16.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/verify.h	2016-08-13 14:16:13.000000000 +0100
***************
*** 1,5 ****
  /* Compile-time assert-like macros.
  
!    Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
--- 1,5 ----
  /* Compile-time assert-like macros.
  
!    Copyright (C) 2005-2006, 2009-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
***************
*** 264,268 ****
  #elif 1200 <= _MSC_VER
  # define assume(R) __assume (R)
! #elif (defined lint \
         && (__has_builtin (__builtin_trap) \
             || 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__))))
--- 264,268 ----
  #elif 1200 <= _MSC_VER
  # define assume(R) __assume (R)
! #elif ((defined GCC_LINT || defined lint) \
         && (__has_builtin (__builtin_trap) \
             || 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__))))
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/wchar.in.h texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/wchar.in.h
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/wchar.in.h	2015-07-12 12:49:16.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/wchar.in.h	2016-08-13 14:16:13.000000000 +0100
***************
*** 1,5 ****
  /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
  
!    Copyright (C) 2007-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
  
!    Copyright (C) 2007-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
***************
*** 32,36 ****
  
  #if (((defined __need_mbstate_t || defined __need_wint_t)               \
!       && !defined __MINGW32__)                                          \
       || (defined __hpux                                                 \
           && ((defined _INTTYPES_INCLUDED && !defined strtoimax)         \
--- 32,36 ----
  
  #if (((defined __need_mbstate_t || defined __need_wint_t)               \
!       && !defined __MINGW32__ && !defined __KLIBC__)                    \
       || (defined __hpux                                                 \
           && ((defined _INTTYPES_INCLUDED && !defined strtoimax)         \
***************
*** 446,449 ****
--- 446,454 ----
  /* wcwidth exists but is not declared.  */
  _GL_FUNCDECL_SYS (wcwidth, int, (wchar_t) _GL_ATTRIBUTE_PURE);
+ #  elif defined __KLIBC__
+ /* On OS/2 kLIBC, wcwidth is a macro that expands to the name of a
+    static inline function.  The implementation of wcwidth in wcwidth.c
+    causes a "conflicting types" error. */
+ #   undef wcwidth
  #  endif
  _GL_CXXALIAS_SYS (wcwidth, int, (wchar_t));
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/xsize.h texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/xsize.h
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/lib/xsize.h	2015-07-12 12:49:16.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/lib/xsize.h	2016-08-13 14:16:13.000000000 +0100
***************
*** 1,5 ****
  /* xsize.h -- Checked size_t computations.
  
!    Copyright (C) 2003, 2008-2015 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  /* xsize.h -- Checked size_t computations.
  
!    Copyright (C) 2003, 2008-2016 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/00gnulib.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/00gnulib.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/00gnulib.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/00gnulib.m4	2016-08-13 14:16:13.000000000 +0100
***************
*** 1,4 ****
  # 00gnulib.m4 serial 3
! dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # 00gnulib.m4 serial 3
! dnl Copyright (C) 2009-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,
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/absolute-header.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/absolute-header.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/absolute-header.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/absolute-header.m4	2016-08-13 14:16:13.000000000 +0100
***************
*** 1,4 ****
  # absolute-header.m4 serial 16
! dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # absolute-header.m4 serial 16
! dnl Copyright (C) 2006-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,
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/alloca.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/alloca.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/alloca.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/alloca.m4	2016-08-13 14:16:13.000000000 +0100
***************
*** 1,4 ****
  # alloca.m4 serial 14
! dnl Copyright (C) 2002-2004, 2006-2007, 2009-2015 Free Software Foundation,
  dnl Inc.
  dnl This file is free software; the Free Software Foundation
--- 1,4 ----
  # alloca.m4 serial 14
! dnl Copyright (C) 2002-2004, 2006-2007, 2009-2016 Free Software Foundation,
  dnl Inc.
  dnl This file is free software; the Free Software Foundation
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/errno_h.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/errno_h.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/errno_h.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/errno_h.m4	2016-08-13 14:16:13.000000000 +0100
***************
*** 1,4 ****
  # errno_h.m4 serial 12
! dnl Copyright (C) 2004, 2006, 2008-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # errno_h.m4 serial 12
! dnl Copyright (C) 2004, 2006, 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,
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/exponentd.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/exponentd.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/exponentd.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/exponentd.m4	2016-08-13 14:16:13.000000000 +0100
***************
*** 1,4 ****
  # exponentd.m4 serial 3
! dnl Copyright (C) 2007-2008, 2010-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # exponentd.m4 serial 3
! dnl Copyright (C) 2007-2008, 2010-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,
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/extensions.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/extensions.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/extensions.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/extensions.m4	2016-08-13 14:16:13.000000000 +0100
***************
*** 2,6 ****
  # Enable extensions on systems that normally disable them.
  
! # Copyright (C) 2003, 2006-2015 Free Software Foundation, Inc.
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
--- 2,6 ----
  # Enable extensions on systems that normally disable them.
  
! # Copyright (C) 2003, 2006-2016 Free Software Foundation, Inc.
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/extern-inline.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/extern-inline.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/extern-inline.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/extern-inline.m4	2016-08-13 14:16:13.000000000 +0100
***************
*** 1,5 ****
  dnl 'extern inline' a la ISO C99.
  
! dnl Copyright 2012-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,5 ----
  dnl 'extern inline' a la ISO C99.
  
! dnl Copyright 2012-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,
***************
*** 55,58 ****
--- 55,59 ----
        : (199901L <= __STDC_VERSION__ \
           && !defined __HP_cc \
+          && !defined __PGI \
           && !(defined __SUNPRO_C && __STDC__))) \
       && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/float_h.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/float_h.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/float_h.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/float_h.m4	2016-08-13 14:16:13.000000000 +0100
***************
*** 1,4 ****
  # float_h.m4 serial 9
! dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # float_h.m4 serial 9
! dnl Copyright (C) 2007, 2009-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,
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/getdelim.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/getdelim.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/getdelim.m4	2016-01-23 12:46:10.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/getdelim.m4	2016-08-13 14:16:13.000000000 +0100
***************
*** 1,5 ****
! # getdelim.m4 serial 10
  
! dnl Copyright (C) 2005-2007, 2009-2015 Free Software Foundation, Inc.
  dnl
  dnl This file is free software; the Free Software Foundation
--- 1,5 ----
! # getdelim.m4 serial 11
  
! dnl Copyright (C) 2005-2007, 2009-2016 Free Software Foundation, Inc.
  dnl
  dnl This file is free software; the Free Software Foundation
***************
*** 49,53 ****
--- 49,55 ----
          if (getdelim (&line, &siz, '\n', in) == -1)
            return 3;
+         free (line);
        }
+       fclose (in);
        return 0;
      }
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/getline.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/getline.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/getline.m4	2016-01-23 12:46:10.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/getline.m4	2016-08-13 14:16:13.000000000 +0100
***************
*** 1,5 ****
! # getline.m4 serial 26
  
! dnl Copyright (C) 1998-2003, 2005-2007, 2009-2015 Free Software Foundation,
  dnl Inc.
  dnl
--- 1,5 ----
! # getline.m4 serial 27
  
! dnl Copyright (C) 1998-2003, 2005-2007, 2009-2016 Free Software Foundation,
  dnl Inc.
  dnl
***************
*** 48,51 ****
--- 48,52 ----
          if (!(len == 4 && line && strcmp (line, "foo\n") == 0))
            return 2;
+         free (line);
        }
        {
***************
*** 56,60 ****
--- 57,63 ----
          if (getline (&line, &siz, in) == -1)
            return 3;
+         free (line);
        }
+       fclose (in);
        return 0;
      }
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/gnulib-cache.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/gnulib-cache.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/gnulib-cache.m4	2016-01-23 12:46:13.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/gnulib-cache.m4	2016-08-13 14:16:16.000000000 +0100
***************
*** 1,3 ****
! # Copyright (C) 2002-2015 Free Software Foundation, Inc.
  #
  # This file is free software; you can redistribute it and/or modify
--- 1,3 ----
! # Copyright (C) 2002-2016 Free Software Foundation, Inc.
  #
  # This file is free software; you can redistribute it and/or modify
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/gnulib-common.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/gnulib-common.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/gnulib-common.m4	2016-01-23 12:46:10.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/gnulib-common.m4	2016-08-13 14:16:13.000000000 +0100
***************
*** 1,4 ****
  # gnulib-common.m4 serial 36
! dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # gnulib-common.m4 serial 36
! dnl Copyright (C) 2007-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,
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/gnulib-comp.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/gnulib-comp.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/gnulib-comp.m4	2016-01-23 12:46:13.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/gnulib-comp.m4	2016-08-30 18:49:33.000000000 +0100
***************
*** 1,4 ****
  # DO NOT EDIT! GENERATED AUTOMATICALLY!
! # Copyright (C) 2002-2015 Free Software Foundation, Inc.
  #
  # This file is free software; you can redistribute it and/or modify
--- 1,4 ----
  # DO NOT EDIT! GENERATED AUTOMATICALLY!
! # Copyright (C) 2002-2016 Free Software Foundation, Inc.
  #
  # This file is free software; you can redistribute it and/or modify
***************
*** 54,60 ****
    # Code from module memchr:
    # Code from module multiarch:
-   # Code from module realloc-posix:
    # Code from module size_max:
-   # Code from module snippet/_Noreturn:
    # Code from module snippet/arg-nonnull:
    # Code from module snippet/c++defs:
--- 54,58 ----
***************
*** 64,71 ****
    # Code from module stdint:
    # Code from module stdio:
-   # Code from module stdlib:
    # Code from module string:
    # Code from module sys_types:
-   # Code from module unistd:
    # Code from module vasnprintf:
    # Code from module vasprintf:
--- 62,67 ----
***************
*** 118,126 ****
    gl_STRING_MODULE_INDICATOR([memchr])
    gl_MULTIARCH
-   gl_FUNC_REALLOC_POSIX
-   if test $REPLACE_REALLOC = 1; then
-     AC_LIBOBJ([realloc])
-   fi
-   gl_STDLIB_MODULE_INDICATOR([realloc-posix])
    gl_SIZE_MAX
    gt_TYPE_SSIZE_T
--- 114,117 ----
***************
*** 128,136 ****
    gl_STDINT_H
    gl_STDIO_H
-   gl_STDLIB_H
    gl_HEADER_STRING_H
    gl_SYS_TYPES_H
    AC_PROG_MKDIR_P
-   gl_UNISTD_H
    gl_FUNC_VASNPRINTF
    gl_FUNC_VASPRINTF
--- 119,125 ----
***************
*** 277,281 ****
  # gnulib-tool and may be removed by future gnulib-tool invocations.
  AC_DEFUN([gl_FILE_LIST], [
-   build-aux/snippet/_Noreturn.h
    build-aux/snippet/arg-nonnull.h
    build-aux/snippet/c++defs.h
--- 266,269 ----
***************
*** 297,310 ****
    lib/printf-parse.c
    lib/printf-parse.h
-   lib/realloc.c
    lib/size_max.h
    lib/stddef.in.h
    lib/stdint.in.h
    lib/stdio.in.h
-   lib/stdlib.in.h
    lib/string.in.h
    lib/sys_types.in.h
-   lib/unistd.c
-   lib/unistd.in.h
    lib/vasnprintf.c
    lib/vasnprintf.h
--- 285,294 ----
***************
*** 329,333 ****
    m4/inttypes_h.m4
    m4/longlong.m4
-   m4/malloc.m4
    m4/math_h.m4
    m4/memchr.m4
--- 313,316 ----
***************
*** 337,341 ****
    m4/onceonly.m4
    m4/printf.m4
-   m4/realloc.m4
    m4/size_max.m4
    m4/ssize_t.m4
--- 320,323 ----
***************
*** 344,351 ****
    m4/stdint_h.m4
    m4/stdio_h.m4
-   m4/stdlib_h.m4
    m4/string_h.m4
    m4/sys_types_h.m4
-   m4/unistd_h.m4
    m4/vasnprintf.m4
    m4/vasprintf.m4
--- 326,331 ----
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/include_next.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/include_next.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/include_next.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/include_next.m4	2016-08-13 14:16:13.000000000 +0100
***************
*** 1,4 ****
  # include_next.m4 serial 23
! dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # include_next.m4 serial 23
! dnl Copyright (C) 2006-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,
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/intmax_t.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/intmax_t.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/intmax_t.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/intmax_t.m4	2016-08-13 14:16:13.000000000 +0100
***************
*** 1,4 ****
  # intmax_t.m4 serial 8
! dnl Copyright (C) 1997-2004, 2006-2007, 2009-2015 Free Software Foundation,
  dnl Inc.
  dnl This file is free software; the Free Software Foundation
--- 1,4 ----
  # intmax_t.m4 serial 8
! dnl Copyright (C) 1997-2004, 2006-2007, 2009-2016 Free Software Foundation,
  dnl Inc.
  dnl This file is free software; the Free Software Foundation
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/inttypes_h.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/inttypes_h.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/inttypes_h.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/inttypes_h.m4	2016-08-13 14:16:13.000000000 +0100
***************
*** 1,4 ****
  # inttypes_h.m4 serial 10
! dnl Copyright (C) 1997-2004, 2006, 2008-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # inttypes_h.m4 serial 10
! dnl Copyright (C) 1997-2004, 2006, 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,
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/longlong.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/longlong.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/longlong.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/longlong.m4	2016-08-13 14:16:13.000000000 +0100
***************
*** 1,4 ****
  # longlong.m4 serial 17
! dnl Copyright (C) 1999-2007, 2009-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # longlong.m4 serial 17
! dnl Copyright (C) 1999-2007, 2009-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,
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/malloc.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/malloc.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/malloc.m4	2016-01-23 12:46:10.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/malloc.m4	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,98 ****
- # malloc.m4 serial 14
- dnl Copyright (C) 2007, 2009-2015 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.
- 
- m4_version_prereq([2.70], [] ,[
- 
- # This is taken from the following Autoconf patch:
- # http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=7fbb553727ed7e0e689a17594b58559ecf3ea6e9
- AC_DEFUN([_AC_FUNC_MALLOC_IF],
- [
-   AC_REQUIRE([AC_HEADER_STDC])dnl
-   AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles
-   AC_CHECK_HEADERS([stdlib.h])
-   AC_CACHE_CHECK([for GNU libc compatible malloc],
-     [ac_cv_func_malloc_0_nonnull],
-     [AC_RUN_IFELSE(
-        [AC_LANG_PROGRAM(
-           [[#if defined STDC_HEADERS || defined HAVE_STDLIB_H
-             # include <stdlib.h>
-             #else
-             char *malloc ();
-             #endif
-           ]],
-           [[return ! malloc (0);]])
-        ],
-        [ac_cv_func_malloc_0_nonnull=yes],
-        [ac_cv_func_malloc_0_nonnull=no],
-        [case "$host_os" in
-           # Guess yes on platforms where we know the result.
-           *-gnu* | freebsd* | netbsd* | openbsd* \
-           | hpux* | solaris* | cygwin* | mingw*)
-             ac_cv_func_malloc_0_nonnull=yes ;;
-           # If we don't know, assume the worst.
-           *) ac_cv_func_malloc_0_nonnull=no ;;
-         esac
-        ])
-     ])
-   AS_IF([test $ac_cv_func_malloc_0_nonnull = yes], [$1], [$2])
- ])# _AC_FUNC_MALLOC_IF
- 
- ])
- 
- # gl_FUNC_MALLOC_GNU
- # ------------------
- # Test whether 'malloc (0)' is handled like in GNU libc, and replace malloc if
- # it is not.
- AC_DEFUN([gl_FUNC_MALLOC_GNU],
- [
-   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-   dnl _AC_FUNC_MALLOC_IF is defined in Autoconf.
-   _AC_FUNC_MALLOC_IF(
-     [AC_DEFINE([HAVE_MALLOC_GNU], [1],
-                [Define to 1 if your system has a GNU libc compatible 'malloc'
-                 function, and to 0 otherwise.])],
-     [AC_DEFINE([HAVE_MALLOC_GNU], [0])
-      REPLACE_MALLOC=1
-     ])
- ])
- 
- # gl_FUNC_MALLOC_POSIX
- # --------------------
- # Test whether 'malloc' is POSIX compliant (sets errno to ENOMEM when it
- # fails), and replace malloc if it is not.
- AC_DEFUN([gl_FUNC_MALLOC_POSIX],
- [
-   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-   AC_REQUIRE([gl_CHECK_MALLOC_POSIX])
-   if test $gl_cv_func_malloc_posix = yes; then
-     AC_DEFINE([HAVE_MALLOC_POSIX], [1],
-       [Define if the 'malloc' function is POSIX compliant.])
-   else
-     REPLACE_MALLOC=1
-   fi
- ])
- 
- # Test whether malloc, realloc, calloc are POSIX compliant,
- # Set gl_cv_func_malloc_posix to yes or no accordingly.
- AC_DEFUN([gl_CHECK_MALLOC_POSIX],
- [
-   AC_CACHE_CHECK([whether malloc, realloc, calloc are POSIX compliant],
-     [gl_cv_func_malloc_posix],
-     [
-       dnl It is too dangerous to try to allocate a large amount of memory:
-       dnl some systems go to their knees when you do that. So assume that
-       dnl all Unix implementations of the function are POSIX compliant.
-       AC_COMPILE_IFELSE(
-         [AC_LANG_PROGRAM(
-            [[]],
-            [[#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-              choke me
-              #endif
-             ]])],
-         [gl_cv_func_malloc_posix=yes],
-         [gl_cv_func_malloc_posix=no])
-     ])
- ])
--- 0 ----
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/memchr.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/memchr.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/memchr.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/memchr.m4	2016-08-13 14:16:13.000000000 +0100
***************
*** 1,4 ****
  # memchr.m4 serial 12
! dnl Copyright (C) 2002-2004, 2009-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # memchr.m4 serial 12
! dnl Copyright (C) 2002-2004, 2009-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,
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/mmap-anon.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/mmap-anon.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/mmap-anon.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/mmap-anon.m4	2016-08-13 14:16:13.000000000 +0100
***************
*** 1,4 ****
  # mmap-anon.m4 serial 10
! dnl Copyright (C) 2005, 2007, 2009-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # mmap-anon.m4 serial 10
! dnl Copyright (C) 2005, 2007, 2009-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,
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/multiarch.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/multiarch.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/multiarch.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/multiarch.m4	2016-08-13 14:16:13.000000000 +0100
***************
*** 1,4 ****
  # multiarch.m4 serial 7
! dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # multiarch.m4 serial 7
! dnl Copyright (C) 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,
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/off_t.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/off_t.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/off_t.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/off_t.m4	2016-08-13 14:16:13.000000000 +0100
***************
*** 1,4 ****
  # off_t.m4 serial 1
! dnl Copyright (C) 2012-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # off_t.m4 serial 1
! dnl Copyright (C) 2012-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,
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/onceonly.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/onceonly.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/onceonly.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/onceonly.m4	2016-08-13 14:16:13.000000000 +0100
***************
*** 1,4 ****
  # onceonly.m4 serial 9
! dnl Copyright (C) 2002-2003, 2005-2006, 2008-2015 Free Software Foundation,
  dnl Inc.
  dnl
--- 1,4 ----
  # onceonly.m4 serial 9
! dnl Copyright (C) 2002-2003, 2005-2006, 2008-2016 Free Software Foundation,
  dnl Inc.
  dnl
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/printf.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/printf.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/printf.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/printf.m4	2016-08-13 14:16:13.000000000 +0100
***************
*** 1,4 ****
  # printf.m4 serial 52
! dnl Copyright (C) 2003, 2007-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # printf.m4 serial 52
! dnl Copyright (C) 2003, 2007-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,
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/realloc.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/realloc.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/realloc.m4	2016-01-23 12:46:10.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/realloc.m4	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,76 ****
- # realloc.m4 serial 13
- dnl Copyright (C) 2007, 2009-2015 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.
- 
- m4_version_prereq([2.70], [] ,[
- 
- # This is taken from the following Autoconf patch:
- # http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=7fbb553727ed7e0e689a17594b58559ecf3ea6e9
- AC_DEFUN([_AC_FUNC_REALLOC_IF],
- [
-   AC_REQUIRE([AC_HEADER_STDC])dnl
-   AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles
-   AC_CHECK_HEADERS([stdlib.h])
-   AC_CACHE_CHECK([for GNU libc compatible realloc],
-     [ac_cv_func_realloc_0_nonnull],
-     [AC_RUN_IFELSE(
-        [AC_LANG_PROGRAM(
-           [[#if defined STDC_HEADERS || defined HAVE_STDLIB_H
-             # include <stdlib.h>
-             #else
-             char *realloc ();
-             #endif
-           ]],
-           [[return ! realloc (0, 0);]])
-        ],
-        [ac_cv_func_realloc_0_nonnull=yes],
-        [ac_cv_func_realloc_0_nonnull=no],
-        [case "$host_os" in
-           # Guess yes on platforms where we know the result.
-           *-gnu* | freebsd* | netbsd* | openbsd* \
-           | hpux* | solaris* | cygwin* | mingw*)
-             ac_cv_func_realloc_0_nonnull=yes ;;
-           # If we don't know, assume the worst.
-           *) ac_cv_func_realloc_0_nonnull=no ;;
-         esac
-        ])
-     ])
-   AS_IF([test $ac_cv_func_realloc_0_nonnull = yes], [$1], [$2])
- ])# AC_FUNC_REALLOC
- 
- ])
- 
- # gl_FUNC_REALLOC_GNU
- # -------------------
- # Test whether 'realloc (0, 0)' is handled like in GNU libc, and replace
- # realloc if it is not.
- AC_DEFUN([gl_FUNC_REALLOC_GNU],
- [
-   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-   dnl _AC_FUNC_REALLOC_IF is defined in Autoconf.
-   _AC_FUNC_REALLOC_IF(
-     [AC_DEFINE([HAVE_REALLOC_GNU], [1],
-                [Define to 1 if your system has a GNU libc compatible 'realloc'
-                 function, and to 0 otherwise.])],
-     [AC_DEFINE([HAVE_REALLOC_GNU], [0])
-      REPLACE_REALLOC=1
-     ])
- ])# gl_FUNC_REALLOC_GNU
- 
- # gl_FUNC_REALLOC_POSIX
- # ---------------------
- # Test whether 'realloc' is POSIX compliant (sets errno to ENOMEM when it
- # fails), and replace realloc if it is not.
- AC_DEFUN([gl_FUNC_REALLOC_POSIX],
- [
-   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-   AC_REQUIRE([gl_CHECK_MALLOC_POSIX])
-   if test $gl_cv_func_malloc_posix = yes; then
-     AC_DEFINE([HAVE_REALLOC_POSIX], [1],
-       [Define if the 'realloc' function is POSIX compliant.])
-   else
-     REPLACE_REALLOC=1
-   fi
- ])
--- 0 ----
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/size_max.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/size_max.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/size_max.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/size_max.m4	2016-08-13 14:16:13.000000000 +0100
***************
*** 1,4 ****
  # size_max.m4 serial 10
! dnl Copyright (C) 2003, 2005-2006, 2008-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # size_max.m4 serial 10
! dnl Copyright (C) 2003, 2005-2006, 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,
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/ssize_t.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/ssize_t.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/ssize_t.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/ssize_t.m4	2016-08-13 14:16:13.000000000 +0100
***************
*** 1,4 ****
  # ssize_t.m4 serial 5 (gettext-0.18.2)
! dnl Copyright (C) 2001-2003, 2006, 2010-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # ssize_t.m4 serial 5 (gettext-0.18.2)
! dnl Copyright (C) 2001-2003, 2006, 2010-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,
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/stddef_h.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/stddef_h.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/stddef_h.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/stddef_h.m4	2016-08-13 14:16:14.000000000 +0100
***************
*** 1,5 ****
  dnl A placeholder for <stddef.h>, for platforms that have issues.
  # stddef_h.m4 serial 5
! dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,5 ----
  dnl A placeholder for <stddef.h>, for platforms that have issues.
  # stddef_h.m4 serial 5
! dnl Copyright (C) 2009-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,
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/stdint.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/stdint.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/stdint.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/stdint.m4	2016-08-13 14:16:14.000000000 +0100
***************
*** 1,4 ****
! # stdint.m4 serial 43
! dnl Copyright (C) 2001-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
! # stdint.m4 serial 44
! dnl Copyright (C) 2001-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,
***************
*** 71,74 ****
--- 71,76 ----
           AC_LANG_PROGRAM([[
  #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+ #define __STDC_CONSTANT_MACROS 1
+ #define __STDC_LIMIT_MACROS 1
  #include <stdint.h>
  /* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
***************
*** 219,222 ****
--- 221,226 ----
              AC_LANG_PROGRAM([[
  #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+ #define __STDC_CONSTANT_MACROS 1
+ #define __STDC_LIMIT_MACROS 1
  #include <stdint.h>
  ]
***************
*** 280,283 ****
--- 284,310 ----
    fi
    if test "$gl_cv_header_working_stdint_h" = yes; then
+     dnl Now see whether the system <stdint.h> works without
+     dnl __STDC_CONSTANT_MACROS/__STDC_LIMIT_MACROS defined.
+     AC_CACHE_CHECK([whether stdint.h predates C++11],
+       [gl_cv_header_stdint_predates_cxx11_h],
+       [gl_cv_header_stdint_predates_cxx11_h=yes
+        AC_COMPILE_IFELSE([
+ 	 AC_LANG_PROGRAM([[
+ #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+ #include <stdint.h>
+ ]
+ gl_STDINT_INCLUDES
+ [
+ intmax_t im = INTMAX_MAX;
+ int32_t i32 = INT32_C (0x7fffffff);
+          ]])],
+          [gl_cv_header_stdint_predates_cxx11_h=no])])
+ 
+     if test "$gl_cv_header_stdint_predates_cxx11_h" = yes; then
+       AC_DEFINE([__STDC_CONSTANT_MACROS], [1],
+                 [Define to 1 if the system <stdint.h> predates C++11.])
+       AC_DEFINE([__STDC_LIMIT_MACROS], [1],
+                 [Define to 1 if the system <stdint.h> predates C++11.])
+     fi
      STDINT_H=
    else
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/stdint_h.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/stdint_h.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/stdint_h.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/stdint_h.m4	2016-08-13 14:16:14.000000000 +0100
***************
*** 1,4 ****
  # stdint_h.m4 serial 9
! dnl Copyright (C) 1997-2004, 2006, 2008-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # stdint_h.m4 serial 9
! dnl Copyright (C) 1997-2004, 2006, 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,
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/stdio_h.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/stdio_h.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/stdio_h.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/stdio_h.m4	2016-08-13 14:16:14.000000000 +0100
***************
*** 1,4 ****
  # stdio_h.m4 serial 46
! dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # stdio_h.m4 serial 46
! dnl Copyright (C) 2007-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,
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/stdlib_h.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/stdlib_h.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/stdlib_h.m4	2016-01-23 12:46:10.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/stdlib_h.m4	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,119 ****
- # stdlib_h.m4 serial 42
- dnl Copyright (C) 2007-2015 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.
- 
- AC_DEFUN([gl_STDLIB_H],
- [
-   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-   gl_NEXT_HEADERS([stdlib.h])
- 
-   dnl Check for declarations of anything we want to poison if the
-   dnl corresponding gnulib module is not in use, and which is not
-   dnl guaranteed by C89.
-   gl_WARN_ON_USE_PREPARE([[#include <stdlib.h>
- #if HAVE_SYS_LOADAVG_H
- # include <sys/loadavg.h>
- #endif
- #if HAVE_RANDOM_H
- # include <random.h>
- #endif
-     ]], [_Exit atoll canonicalize_file_name getloadavg getsubopt grantpt
-     initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps
-     posix_openpt ptsname ptsname_r random random_r realpath rpmatch
-     secure_getenv setenv setstate setstate_r srandom srandom_r
-     strtod strtoll strtoull unlockpt unsetenv])
- ])
- 
- AC_DEFUN([gl_STDLIB_MODULE_INDICATOR],
- [
-   dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
-   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-   gl_MODULE_INDICATOR_SET_VARIABLE([$1])
-   dnl Define it also as a C macro, for the benefit of the unit tests.
-   gl_MODULE_INDICATOR_FOR_TESTS([$1])
- ])
- 
- AC_DEFUN([gl_STDLIB_H_DEFAULTS],
- [
-   GNULIB__EXIT=0;         AC_SUBST([GNULIB__EXIT])
-   GNULIB_ATOLL=0;         AC_SUBST([GNULIB_ATOLL])
-   GNULIB_CALLOC_POSIX=0;  AC_SUBST([GNULIB_CALLOC_POSIX])
-   GNULIB_CANONICALIZE_FILE_NAME=0;  AC_SUBST([GNULIB_CANONICALIZE_FILE_NAME])
-   GNULIB_GETLOADAVG=0;    AC_SUBST([GNULIB_GETLOADAVG])
-   GNULIB_GETSUBOPT=0;     AC_SUBST([GNULIB_GETSUBOPT])
-   GNULIB_GRANTPT=0;       AC_SUBST([GNULIB_GRANTPT])
-   GNULIB_MALLOC_POSIX=0;  AC_SUBST([GNULIB_MALLOC_POSIX])
-   GNULIB_MBTOWC=0;        AC_SUBST([GNULIB_MBTOWC])
-   GNULIB_MKDTEMP=0;       AC_SUBST([GNULIB_MKDTEMP])
-   GNULIB_MKOSTEMP=0;      AC_SUBST([GNULIB_MKOSTEMP])
-   GNULIB_MKOSTEMPS=0;     AC_SUBST([GNULIB_MKOSTEMPS])
-   GNULIB_MKSTEMP=0;       AC_SUBST([GNULIB_MKSTEMP])
-   GNULIB_MKSTEMPS=0;      AC_SUBST([GNULIB_MKSTEMPS])
-   GNULIB_POSIX_OPENPT=0;  AC_SUBST([GNULIB_POSIX_OPENPT])
-   GNULIB_PTSNAME=0;       AC_SUBST([GNULIB_PTSNAME])
-   GNULIB_PTSNAME_R=0;     AC_SUBST([GNULIB_PTSNAME_R])
-   GNULIB_PUTENV=0;        AC_SUBST([GNULIB_PUTENV])
-   GNULIB_QSORT_R=0;       AC_SUBST([GNULIB_QSORT_R])
-   GNULIB_RANDOM=0;        AC_SUBST([GNULIB_RANDOM])
-   GNULIB_RANDOM_R=0;      AC_SUBST([GNULIB_RANDOM_R])
-   GNULIB_REALLOC_POSIX=0; AC_SUBST([GNULIB_REALLOC_POSIX])
-   GNULIB_REALPATH=0;      AC_SUBST([GNULIB_REALPATH])
-   GNULIB_RPMATCH=0;       AC_SUBST([GNULIB_RPMATCH])
-   GNULIB_SECURE_GETENV=0; AC_SUBST([GNULIB_SECURE_GETENV])
-   GNULIB_SETENV=0;        AC_SUBST([GNULIB_SETENV])
-   GNULIB_STRTOD=0;        AC_SUBST([GNULIB_STRTOD])
-   GNULIB_STRTOLL=0;       AC_SUBST([GNULIB_STRTOLL])
-   GNULIB_STRTOULL=0;      AC_SUBST([GNULIB_STRTOULL])
-   GNULIB_SYSTEM_POSIX=0;  AC_SUBST([GNULIB_SYSTEM_POSIX])
-   GNULIB_UNLOCKPT=0;      AC_SUBST([GNULIB_UNLOCKPT])
-   GNULIB_UNSETENV=0;      AC_SUBST([GNULIB_UNSETENV])
-   GNULIB_WCTOMB=0;        AC_SUBST([GNULIB_WCTOMB])
-   dnl Assume proper GNU behavior unless another module says otherwise.
-   HAVE__EXIT=1;              AC_SUBST([HAVE__EXIT])
-   HAVE_ATOLL=1;              AC_SUBST([HAVE_ATOLL])
-   HAVE_CANONICALIZE_FILE_NAME=1;  AC_SUBST([HAVE_CANONICALIZE_FILE_NAME])
-   HAVE_DECL_GETLOADAVG=1;    AC_SUBST([HAVE_DECL_GETLOADAVG])
-   HAVE_GETSUBOPT=1;          AC_SUBST([HAVE_GETSUBOPT])
-   HAVE_GRANTPT=1;            AC_SUBST([HAVE_GRANTPT])
-   HAVE_MKDTEMP=1;            AC_SUBST([HAVE_MKDTEMP])
-   HAVE_MKOSTEMP=1;           AC_SUBST([HAVE_MKOSTEMP])
-   HAVE_MKOSTEMPS=1;          AC_SUBST([HAVE_MKOSTEMPS])
-   HAVE_MKSTEMP=1;            AC_SUBST([HAVE_MKSTEMP])
-   HAVE_MKSTEMPS=1;           AC_SUBST([HAVE_MKSTEMPS])
-   HAVE_POSIX_OPENPT=1;       AC_SUBST([HAVE_POSIX_OPENPT])
-   HAVE_PTSNAME=1;            AC_SUBST([HAVE_PTSNAME])
-   HAVE_PTSNAME_R=1;          AC_SUBST([HAVE_PTSNAME_R])
-   HAVE_RANDOM=1;             AC_SUBST([HAVE_RANDOM])
-   HAVE_RANDOM_H=1;           AC_SUBST([HAVE_RANDOM_H])
-   HAVE_RANDOM_R=1;           AC_SUBST([HAVE_RANDOM_R])
-   HAVE_REALPATH=1;           AC_SUBST([HAVE_REALPATH])
-   HAVE_RPMATCH=1;            AC_SUBST([HAVE_RPMATCH])
-   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_STRTOD=1;             AC_SUBST([HAVE_STRTOD])
-   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])
-   HAVE_SYS_LOADAVG_H=0;      AC_SUBST([HAVE_SYS_LOADAVG_H])
-   HAVE_UNLOCKPT=1;           AC_SUBST([HAVE_UNLOCKPT])
-   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_MALLOC=0;          AC_SUBST([REPLACE_MALLOC])
-   REPLACE_MBTOWC=0;          AC_SUBST([REPLACE_MBTOWC])
-   REPLACE_MKSTEMP=0;         AC_SUBST([REPLACE_MKSTEMP])
-   REPLACE_PTSNAME=0;         AC_SUBST([REPLACE_PTSNAME])
-   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_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_STRTOD=0;          AC_SUBST([REPLACE_STRTOD])
-   REPLACE_UNSETENV=0;        AC_SUBST([REPLACE_UNSETENV])
-   REPLACE_WCTOMB=0;          AC_SUBST([REPLACE_WCTOMB])
- ])
--- 0 ----
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/string_h.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/string_h.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/string_h.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/string_h.m4	2016-08-13 14:16:14.000000000 +0100
***************
*** 1,5 ****
  # Configure a GNU-like replacement for <string.h>.
  
! # Copyright (C) 2007-2015 Free Software Foundation, Inc.
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
--- 1,5 ----
  # Configure a GNU-like replacement for <string.h>.
  
! # Copyright (C) 2007-2016 Free Software Foundation, Inc.
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/sys_types_h.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/sys_types_h.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/sys_types_h.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/sys_types_h.m4	2016-08-13 14:16:14.000000000 +0100
***************
*** 1,4 ****
  # sys_types_h.m4 serial 5
! dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # sys_types_h.m4 serial 5
! dnl Copyright (C) 2011-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,
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/unistd_h.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/unistd_h.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/unistd_h.m4	2016-01-23 12:46:10.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/unistd_h.m4	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,189 ****
- # unistd_h.m4 serial 68
- dnl Copyright (C) 2006-2015 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 Written by Simon Josefsson, Bruno Haible.
- 
- AC_DEFUN([gl_UNISTD_H],
- [
-   dnl Use AC_REQUIRE here, so that the default behavior below is expanded
-   dnl once only, before all statements that occur in other macros.
-   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
- 
-   gl_CHECK_NEXT_HEADERS([unistd.h])
-   if test $ac_cv_header_unistd_h = yes; then
-     HAVE_UNISTD_H=1
-   else
-     HAVE_UNISTD_H=0
-   fi
-   AC_SUBST([HAVE_UNISTD_H])
- 
-   dnl Ensure the type pid_t gets defined.
-   AC_REQUIRE([AC_TYPE_PID_T])
- 
-   dnl Determine WINDOWS_64_BIT_OFF_T.
-   AC_REQUIRE([gl_TYPE_OFF_T])
- 
-   dnl Check for declarations of anything we want to poison if the
-   dnl corresponding gnulib module is not in use.
-   gl_WARN_ON_USE_PREPARE([[
- #if HAVE_UNISTD_H
- # include <unistd.h>
- #endif
- /* Some systems declare various items in the wrong headers.  */
- #if !(defined __GLIBC__ && !defined __UCLIBC__)
- # include <fcntl.h>
- # include <stdio.h>
- # include <stdlib.h>
- # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
- #  include <io.h>
- # endif
- #endif
-     ]], [chdir chown dup dup2 dup3 environ euidaccess faccessat fchdir fchownat
-     fdatasync fsync ftruncate getcwd getdomainname getdtablesize getgroups
-     gethostname getlogin getlogin_r getpagesize
-     getusershell setusershell endusershell
-     group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite
-     readlink readlinkat rmdir sethostname sleep symlink symlinkat ttyname_r
-     unlink unlinkat usleep])
- ])
- 
- AC_DEFUN([gl_UNISTD_MODULE_INDICATOR],
- [
-   dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
-   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-   gl_MODULE_INDICATOR_SET_VARIABLE([$1])
-   dnl Define it also as a C macro, for the benefit of the unit tests.
-   gl_MODULE_INDICATOR_FOR_TESTS([$1])
- ])
- 
- 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_DUP=0;                  AC_SUBST([GNULIB_DUP])
-   GNULIB_DUP2=0;                 AC_SUBST([GNULIB_DUP2])
-   GNULIB_DUP3=0;                 AC_SUBST([GNULIB_DUP3])
-   GNULIB_ENVIRON=0;              AC_SUBST([GNULIB_ENVIRON])
-   GNULIB_EUIDACCESS=0;           AC_SUBST([GNULIB_EUIDACCESS])
-   GNULIB_FACCESSAT=0;            AC_SUBST([GNULIB_FACCESSAT])
-   GNULIB_FCHDIR=0;               AC_SUBST([GNULIB_FCHDIR])
-   GNULIB_FCHOWNAT=0;             AC_SUBST([GNULIB_FCHOWNAT])
-   GNULIB_FDATASYNC=0;            AC_SUBST([GNULIB_FDATASYNC])
-   GNULIB_FSYNC=0;                AC_SUBST([GNULIB_FSYNC])
-   GNULIB_FTRUNCATE=0;            AC_SUBST([GNULIB_FTRUNCATE])
-   GNULIB_GETCWD=0;               AC_SUBST([GNULIB_GETCWD])
-   GNULIB_GETDOMAINNAME=0;        AC_SUBST([GNULIB_GETDOMAINNAME])
-   GNULIB_GETDTABLESIZE=0;        AC_SUBST([GNULIB_GETDTABLESIZE])
-   GNULIB_GETGROUPS=0;            AC_SUBST([GNULIB_GETGROUPS])
-   GNULIB_GETHOSTNAME=0;          AC_SUBST([GNULIB_GETHOSTNAME])
-   GNULIB_GETLOGIN=0;             AC_SUBST([GNULIB_GETLOGIN])
-   GNULIB_GETLOGIN_R=0;           AC_SUBST([GNULIB_GETLOGIN_R])
-   GNULIB_GETPAGESIZE=0;          AC_SUBST([GNULIB_GETPAGESIZE])
-   GNULIB_GETUSERSHELL=0;         AC_SUBST([GNULIB_GETUSERSHELL])
-   GNULIB_GROUP_MEMBER=0;         AC_SUBST([GNULIB_GROUP_MEMBER])
-   GNULIB_ISATTY=0;               AC_SUBST([GNULIB_ISATTY])
-   GNULIB_LCHOWN=0;               AC_SUBST([GNULIB_LCHOWN])
-   GNULIB_LINK=0;                 AC_SUBST([GNULIB_LINK])
-   GNULIB_LINKAT=0;               AC_SUBST([GNULIB_LINKAT])
-   GNULIB_LSEEK=0;                AC_SUBST([GNULIB_LSEEK])
-   GNULIB_PIPE=0;                 AC_SUBST([GNULIB_PIPE])
-   GNULIB_PIPE2=0;                AC_SUBST([GNULIB_PIPE2])
-   GNULIB_PREAD=0;                AC_SUBST([GNULIB_PREAD])
-   GNULIB_PWRITE=0;               AC_SUBST([GNULIB_PWRITE])
-   GNULIB_READ=0;                 AC_SUBST([GNULIB_READ])
-   GNULIB_READLINK=0;             AC_SUBST([GNULIB_READLINK])
-   GNULIB_READLINKAT=0;           AC_SUBST([GNULIB_READLINKAT])
-   GNULIB_RMDIR=0;                AC_SUBST([GNULIB_RMDIR])
-   GNULIB_SETHOSTNAME=0;          AC_SUBST([GNULIB_SETHOSTNAME])
-   GNULIB_SLEEP=0;                AC_SUBST([GNULIB_SLEEP])
-   GNULIB_SYMLINK=0;              AC_SUBST([GNULIB_SYMLINK])
-   GNULIB_SYMLINKAT=0;            AC_SUBST([GNULIB_SYMLINKAT])
-   GNULIB_TTYNAME_R=0;            AC_SUBST([GNULIB_TTYNAME_R])
-   GNULIB_UNISTD_H_NONBLOCKING=0; AC_SUBST([GNULIB_UNISTD_H_NONBLOCKING])
-   GNULIB_UNISTD_H_SIGPIPE=0;     AC_SUBST([GNULIB_UNISTD_H_SIGPIPE])
-   GNULIB_UNLINK=0;               AC_SUBST([GNULIB_UNLINK])
-   GNULIB_UNLINKAT=0;             AC_SUBST([GNULIB_UNLINKAT])
-   GNULIB_USLEEP=0;               AC_SUBST([GNULIB_USLEEP])
-   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_DUP2=1;            AC_SUBST([HAVE_DUP2])
-   HAVE_DUP3=1;            AC_SUBST([HAVE_DUP3])
-   HAVE_EUIDACCESS=1;      AC_SUBST([HAVE_EUIDACCESS])
-   HAVE_FACCESSAT=1;       AC_SUBST([HAVE_FACCESSAT])
-   HAVE_FCHDIR=1;          AC_SUBST([HAVE_FCHDIR])
-   HAVE_FCHOWNAT=1;        AC_SUBST([HAVE_FCHOWNAT])
-   HAVE_FDATASYNC=1;       AC_SUBST([HAVE_FDATASYNC])
-   HAVE_FSYNC=1;           AC_SUBST([HAVE_FSYNC])
-   HAVE_FTRUNCATE=1;       AC_SUBST([HAVE_FTRUNCATE])
-   HAVE_GETDTABLESIZE=1;   AC_SUBST([HAVE_GETDTABLESIZE])
-   HAVE_GETGROUPS=1;       AC_SUBST([HAVE_GETGROUPS])
-   HAVE_GETHOSTNAME=1;     AC_SUBST([HAVE_GETHOSTNAME])
-   HAVE_GETLOGIN=1;        AC_SUBST([HAVE_GETLOGIN])
-   HAVE_GETPAGESIZE=1;     AC_SUBST([HAVE_GETPAGESIZE])
-   HAVE_GROUP_MEMBER=1;    AC_SUBST([HAVE_GROUP_MEMBER])
-   HAVE_LCHOWN=1;          AC_SUBST([HAVE_LCHOWN])
-   HAVE_LINK=1;            AC_SUBST([HAVE_LINK])
-   HAVE_LINKAT=1;          AC_SUBST([HAVE_LINKAT])
-   HAVE_PIPE=1;            AC_SUBST([HAVE_PIPE])
-   HAVE_PIPE2=1;           AC_SUBST([HAVE_PIPE2])
-   HAVE_PREAD=1;           AC_SUBST([HAVE_PREAD])
-   HAVE_PWRITE=1;          AC_SUBST([HAVE_PWRITE])
-   HAVE_READLINK=1;        AC_SUBST([HAVE_READLINK])
-   HAVE_READLINKAT=1;      AC_SUBST([HAVE_READLINKAT])
-   HAVE_SETHOSTNAME=1;     AC_SUBST([HAVE_SETHOSTNAME])
-   HAVE_SLEEP=1;           AC_SUBST([HAVE_SLEEP])
-   HAVE_SYMLINK=1;         AC_SUBST([HAVE_SYMLINK])
-   HAVE_SYMLINKAT=1;       AC_SUBST([HAVE_SYMLINKAT])
-   HAVE_UNLINKAT=1;        AC_SUBST([HAVE_UNLINKAT])
-   HAVE_USLEEP=1;          AC_SUBST([HAVE_USLEEP])
-   HAVE_DECL_ENVIRON=1;    AC_SUBST([HAVE_DECL_ENVIRON])
-   HAVE_DECL_FCHDIR=1;     AC_SUBST([HAVE_DECL_FCHDIR])
-   HAVE_DECL_FDATASYNC=1;  AC_SUBST([HAVE_DECL_FDATASYNC])
-   HAVE_DECL_GETDOMAINNAME=1; AC_SUBST([HAVE_DECL_GETDOMAINNAME])
-   HAVE_DECL_GETLOGIN_R=1; AC_SUBST([HAVE_DECL_GETLOGIN_R])
-   HAVE_DECL_GETPAGESIZE=1; AC_SUBST([HAVE_DECL_GETPAGESIZE])
-   HAVE_DECL_GETUSERSHELL=1; AC_SUBST([HAVE_DECL_GETUSERSHELL])
-   HAVE_DECL_SETHOSTNAME=1; AC_SUBST([HAVE_DECL_SETHOSTNAME])
-   HAVE_DECL_TTYNAME_R=1;  AC_SUBST([HAVE_DECL_TTYNAME_R])
-   HAVE_OS_H=0;            AC_SUBST([HAVE_OS_H])
-   HAVE_SYS_PARAM_H=0;     AC_SUBST([HAVE_SYS_PARAM_H])
-   REPLACE_CHOWN=0;        AC_SUBST([REPLACE_CHOWN])
-   REPLACE_CLOSE=0;        AC_SUBST([REPLACE_CLOSE])
-   REPLACE_DUP=0;          AC_SUBST([REPLACE_DUP])
-   REPLACE_DUP2=0;         AC_SUBST([REPLACE_DUP2])
-   REPLACE_FCHOWNAT=0;     AC_SUBST([REPLACE_FCHOWNAT])
-   REPLACE_FTRUNCATE=0;    AC_SUBST([REPLACE_FTRUNCATE])
-   REPLACE_GETCWD=0;       AC_SUBST([REPLACE_GETCWD])
-   REPLACE_GETDOMAINNAME=0; AC_SUBST([REPLACE_GETDOMAINNAME])
-   REPLACE_GETDTABLESIZE=0; AC_SUBST([REPLACE_GETDTABLESIZE])
-   REPLACE_GETLOGIN_R=0;   AC_SUBST([REPLACE_GETLOGIN_R])
-   REPLACE_GETGROUPS=0;    AC_SUBST([REPLACE_GETGROUPS])
-   REPLACE_GETPAGESIZE=0;  AC_SUBST([REPLACE_GETPAGESIZE])
-   REPLACE_ISATTY=0;       AC_SUBST([REPLACE_ISATTY])
-   REPLACE_LCHOWN=0;       AC_SUBST([REPLACE_LCHOWN])
-   REPLACE_LINK=0;         AC_SUBST([REPLACE_LINK])
-   REPLACE_LINKAT=0;       AC_SUBST([REPLACE_LINKAT])
-   REPLACE_LSEEK=0;        AC_SUBST([REPLACE_LSEEK])
-   REPLACE_PREAD=0;        AC_SUBST([REPLACE_PREAD])
-   REPLACE_PWRITE=0;       AC_SUBST([REPLACE_PWRITE])
-   REPLACE_READ=0;         AC_SUBST([REPLACE_READ])
-   REPLACE_READLINK=0;     AC_SUBST([REPLACE_READLINK])
-   REPLACE_READLINKAT=0;   AC_SUBST([REPLACE_READLINKAT])
-   REPLACE_RMDIR=0;        AC_SUBST([REPLACE_RMDIR])
-   REPLACE_SLEEP=0;        AC_SUBST([REPLACE_SLEEP])
-   REPLACE_SYMLINK=0;      AC_SUBST([REPLACE_SYMLINK])
-   REPLACE_SYMLINKAT=0;    AC_SUBST([REPLACE_SYMLINKAT])
-   REPLACE_TTYNAME_R=0;    AC_SUBST([REPLACE_TTYNAME_R])
-   REPLACE_UNLINK=0;       AC_SUBST([REPLACE_UNLINK])
-   REPLACE_UNLINKAT=0;     AC_SUBST([REPLACE_UNLINKAT])
-   REPLACE_USLEEP=0;       AC_SUBST([REPLACE_USLEEP])
-   REPLACE_WRITE=0;        AC_SUBST([REPLACE_WRITE])
-   UNISTD_H_HAVE_WINSOCK2_H=0; AC_SUBST([UNISTD_H_HAVE_WINSOCK2_H])
-   UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=0;
-                            AC_SUBST([UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS])
- ])
--- 0 ----
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/vasnprintf.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/vasnprintf.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/vasnprintf.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/vasnprintf.m4	2016-08-13 14:16:14.000000000 +0100
***************
*** 1,4 ****
  # vasnprintf.m4 serial 36
! dnl Copyright (C) 2002-2004, 2006-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # vasnprintf.m4 serial 36
! dnl Copyright (C) 2002-2004, 2006-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,
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/vasprintf.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/vasprintf.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/vasprintf.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/vasprintf.m4	2016-08-13 14:16:14.000000000 +0100
***************
*** 1,4 ****
  # vasprintf.m4 serial 6
! dnl Copyright (C) 2002-2003, 2006-2007, 2009-2015 Free Software Foundation,
  dnl Inc.
  dnl This file is free software; the Free Software Foundation
--- 1,4 ----
  # vasprintf.m4 serial 6
! dnl Copyright (C) 2002-2003, 2006-2007, 2009-2016 Free Software Foundation,
  dnl Inc.
  dnl This file is free software; the Free Software Foundation
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/warn-on-use.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/warn-on-use.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/warn-on-use.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/warn-on-use.m4	2016-08-13 14:16:14.000000000 +0100
***************
*** 1,4 ****
  # warn-on-use.m4 serial 5
! dnl Copyright (C) 2010-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # warn-on-use.m4 serial 5
! dnl Copyright (C) 2010-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,
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/wchar_h.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/wchar_h.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/wchar_h.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/wchar_h.m4	2016-08-30 18:49:31.000000000 +0100
***************
*** 1,5 ****
  dnl A placeholder for ISO C99 <wchar.h>, for platforms that have issues.
  
! dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,5 ----
  dnl A placeholder for ISO C99 <wchar.h>, for platforms that have issues.
  
! dnl Copyright (C) 2007-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,
***************
*** 8,12 ****
  dnl Written by Eric Blake.
  
! # wchar_h.m4 serial 39
  
  AC_DEFUN([gl_WCHAR_H],
--- 8,12 ----
  dnl Written by Eric Blake.
  
! # wchar_h.m4 serial 40
  
  AC_DEFUN([gl_WCHAR_H],
***************
*** 82,87 ****
  int main () { return zero(); }
  ]])])
       if AC_TRY_EVAL([ac_compile]); then
-        mv conftest.$ac_objext conftest1.$ac_objext
         AC_LANG_CONFTEST([
           AC_LANG_SOURCE([[#define wcstod renamed_wcstod
--- 82,93 ----
  int main () { return zero(); }
  ]])])
+      dnl Do not rename the object file from conftest.$ac_objext to
+      dnl conftest1.$ac_objext, as this will cause the link to fail on
+      dnl z/OS when using the XPLINK object format (due to duplicate
+      dnl CSECT names). Instead, temporarily redefine $ac_compile so
+      dnl that the object file has the latter name from the start.
+      save_ac_compile="$ac_compile"
+      ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest1/`
       if AC_TRY_EVAL([ac_compile]); then
         AC_LANG_CONFTEST([
           AC_LANG_SOURCE([[#define wcstod renamed_wcstod
***************
*** 96,101 ****
  int zero (void) { return 0; }
  ]])])
         if AC_TRY_EVAL([ac_compile]); then
-          mv conftest.$ac_objext conftest2.$ac_objext
           if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&AS_MESSAGE_LOG_FD 2>&1; then
             :
--- 102,108 ----
  int zero (void) { return 0; }
  ]])])
+        dnl See note above about renaming object files.
+        ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest2/`
         if AC_TRY_EVAL([ac_compile]); then
           if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&AS_MESSAGE_LOG_FD 2>&1; then
             :
***************
*** 105,108 ****
--- 112,116 ----
         fi
       fi
+      ac_compile="$save_ac_compile"
       rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext
      ])
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/wchar_t.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/wchar_t.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/wchar_t.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/wchar_t.m4	2016-08-13 14:16:14.000000000 +0100
***************
*** 1,4 ****
  # wchar_t.m4 serial 4 (gettext-0.18.2)
! dnl Copyright (C) 2002-2003, 2008-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # wchar_t.m4 serial 4 (gettext-0.18.2)
! dnl Copyright (C) 2002-2003, 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,
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/wint_t.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/wint_t.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/wint_t.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/wint_t.m4	2016-08-13 14:16:14.000000000 +0100
***************
*** 1,4 ****
  # wint_t.m4 serial 5 (gettext-0.18.2)
! dnl Copyright (C) 2003, 2007-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # wint_t.m4 serial 5 (gettext-0.18.2)
! dnl Copyright (C) 2003, 2007-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,
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/xsize.m4 texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/xsize.m4
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/m4/xsize.m4	2015-08-15 19:40:38.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/m4/xsize.m4	2016-08-13 14:16:14.000000000 +0100
***************
*** 1,4 ****
  # xsize.m4 serial 5
! dnl Copyright (C) 2003-2004, 2008-2015 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
  # xsize.m4 serial 5
! dnl Copyright (C) 2003-2004, 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,
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/snippet/_Noreturn.h texinfo-6.3/tp/Texinfo/Convert/XSParagraph/snippet/_Noreturn.h
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/snippet/_Noreturn.h	2016-01-23 12:46:09.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/snippet/_Noreturn.h	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,10 ****
- #if !defined _Noreturn && __STDC_VERSION__ < 201112
- # if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
-       || 0x5110 <= __SUNPRO_C)
- #  define _Noreturn __attribute__ ((__noreturn__))
- # elif 1200 <= _MSC_VER
- #  define _Noreturn __declspec (noreturn)
- # else
- #  define _Noreturn
- # endif
- #endif
--- 0 ----
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/snippet/arg-nonnull.h texinfo-6.3/tp/Texinfo/Convert/XSParagraph/snippet/arg-nonnull.h
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/snippet/arg-nonnull.h	2015-07-12 12:49:16.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/snippet/arg-nonnull.h	2016-08-13 14:16:12.000000000 +0100
***************
*** 1,4 ****
  /* A C macro for declaring that specific arguments must not be NULL.
!    Copyright (C) 2009-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify it
--- 1,4 ----
  /* A C macro for declaring that specific arguments must not be NULL.
!    Copyright (C) 2009-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify it
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/snippet/c++defs.h texinfo-6.3/tp/Texinfo/Convert/XSParagraph/snippet/c++defs.h
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/snippet/c++defs.h	2015-07-12 12:49:16.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/snippet/c++defs.h	2016-08-13 14:16:12.000000000 +0100
***************
*** 1,4 ****
  /* C++ compatible function declaration macros.
!    Copyright (C) 2010-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify it
--- 1,4 ----
  /* C++ compatible function declaration macros.
!    Copyright (C) 2010-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify it
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/snippet/warn-on-use.h texinfo-6.3/tp/Texinfo/Convert/XSParagraph/snippet/warn-on-use.h
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/snippet/warn-on-use.h	2015-07-12 12:49:16.000000000 +0100
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/snippet/warn-on-use.h	2016-08-13 14:16:12.000000000 +0100
***************
*** 1,4 ****
  /* A C macro for emitting warnings if a function is used.
!    Copyright (C) 2010-2015 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify it
--- 1,4 ----
  /* A C macro for emitting warnings if a function is used.
!    Copyright (C) 2010-2016 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify it
diff -Nrc2 texinfo-6.1/tp/Texinfo/Convert/XSParagraph/xspara.c texinfo-6.3/tp/Texinfo/Convert/XSParagraph/xspara.c
*** texinfo-6.1/tp/Texinfo/Convert/XSParagraph/xspara.c	2016-01-23 11:31:17.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Convert/XSParagraph/xspara.c	2016-07-31 16:20:13.000000000 +0100
***************
*** 199,202 ****
--- 199,212 ----
  }
  
+ /* Avoid warnings due to redefinition of popen/pclose in Perl headers.  */
+ #ifdef popen
+ # undef popen
+ # define popen(c,m) _popen(c,m)
+ #endif
+ #ifdef pclose
+ # undef pclose
+ # define pclose(f)  _pclose(f)
+ #endif
+ 
  #endif
  
***************
*** 873,877 ****
                            if (state.space_counter > 0)
                              {
!                               /* Truncuate to at most 2 spaces, and replace any 
                                   '\n' or '\r' characters with ' '. */
  
--- 883,887 ----
                            if (state.space_counter > 0)
                              {
!                               /* Truncate to at most 2 spaces, and replace any 
                                   '\n' or '\r' characters with ' '. */
  
***************
*** 893,902 ****
                                    len = mbrlen (pspace, pspace_left, NULL);
  
!                                   /* Subtitute newlines in the pending space
                                       with spaces. */
                                    if (*pspace == '\n' || *pspace == '\r')
                                      text_append_n (&new_space, " ", 1);
!                                   else
                                      text_append_n (&new_space, pspace, len);
                                    state.space_counter++;
  
--- 903,916 ----
                                    len = mbrlen (pspace, pspace_left, NULL);
  
!                                   /* Substitute newlines in the pending space
                                       with spaces. */
                                    if (*pspace == '\n' || *pspace == '\r')
                                      text_append_n (&new_space, " ", 1);
!                                   else if (len > 0)
                                      text_append_n (&new_space, pspace, len);
+                                   else
+                                     /* Skip one character and try again. */
+                                     len = 1;
+ 
                                    state.space_counter++;
  
diff -Nrc2 texinfo-6.1/tp/Texinfo/Parser.pm texinfo-6.3/tp/Texinfo/Parser.pm
*** texinfo-6.1/tp/Texinfo/Parser.pm	2016-02-06 12:21:52.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Parser.pm	2016-09-10 20:27:56.000000000 +0100
***************
*** 1,6 ****
! # $Id: Parser.pm 6991 2016-02-06 12:16:13Z gavin $
  # Parser.pm: parse texinfo code into a tree.
  #
! # Copyright 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
  # 
  # This program is free software; you can redistribute it and/or modify
--- 1,7 ----
! # $Id: Parser.pm 7353 2016-09-10 13:03:54Z gavin $
  # Parser.pm: parse texinfo code into a tree.
  #
! # Copyright 2010, 2011, 2012, 2013, 2014, 2015, 2016 Free Software Foundation, 
! # Inc.
  # 
  # This program is free software; you can redistribute it and/or modify
***************
*** 57,62 ****
  use Texinfo::Encoding;
  
- # to expand file names in @include and similar @-commands
- use Texinfo::Convert::Text;
  # to normalize node name, anchor, float arg, listoffloats and first *ref argument.
  use Texinfo::Convert::NodeNameNormalization;
--- 58,61 ----
***************
*** 93,97 ****
  );
  
! $VERSION = '6.1';
  
  sub N__($)
--- 92,96 ----
  );
  
! $VERSION = '6.2';
  
  sub N__($)
***************
*** 100,109 ****
  }
  
- #sub __($$)
- #{
- #  my $self = shift;
- #  return &{$self->{'gettext'}}(@_);
- #}
- 
  # Customization variables obeyed by the Parser, and the default values.
  our %default_customization_values = (
--- 99,102 ----
***************
*** 152,156 ****
  # expanded_formats_hash   each key comes from expanded_formats value is 1
  # index_names             a structure holding the link between index 
! #                         names, prefixes, merged indices,
  #                         initial value is %index_names in Texinfo::Common.
  # context_stack           stack of the contexts, more recent on top.
--- 145,149 ----
  # expanded_formats_hash   each key comes from expanded_formats value is 1
  # index_names             a structure holding the link between index 
! #                         names, merged indices,
  #                         initial value is %index_names in Texinfo::Common.
  # context_stack           stack of the contexts, more recent on top.
***************
*** 167,173 ****
  #                         'inlineraw' are also added when in those commands
  # conditionals_stack      a stack of conditional commands that are expanded.
- # raw_formats_stack       a stack of 1 or 0 for raw formats (@html... or 
- #                         @inlineraw), is 0 if within a raw format that is
- #                         not expanded.
  # macro_stack             stack of macros being expanded (more recent first)
  # definfoenclose          an hash, key is the command name, value is an array
--- 160,163 ----
***************
*** 190,195 ****
  # current_section         last seen section.
  # nodes                   list of nodes.
! # command_index_prefix    associate a command name to an index prefix.
! # prefix_to_index_name    associate an index prefix to the index name.
  # floats                  key is the normalized float type, value is an array
  #                         reference holding all the floats.
--- 180,184 ----
  # current_section         last seen section.
  # nodes                   list of nodes.
! # command_index           associate a command name with an index name
  # floats                  key is the normalized float type, value is an array
  #                         reference holding all the floats.
***************
*** 250,254 ****
  my %root_commands             = %Texinfo::Common::root_commands;
  my %sectioning_commands       = %Texinfo::Common::sectioning_commands;
! my %command_index_prefix      = %Texinfo::Common::command_index_prefix;
  my %command_structuring_level = %Texinfo::Common::command_structuring_level;
  my %ref_commands              = %Texinfo::Common::ref_commands;
--- 239,243 ----
  my %root_commands             = %Texinfo::Common::root_commands;
  my %sectioning_commands       = %Texinfo::Common::sectioning_commands;
! my %command_index             = %Texinfo::Common::command_index;
  my %command_structuring_level = %Texinfo::Common::command_structuring_level;
  my %ref_commands              = %Texinfo::Common::ref_commands;
***************
*** 276,281 ****
  }
  foreach my $brace_command (keys (%brace_commands)) {
!   $keep_line_nr_brace_commands{$brace_command} = 1
!     if ($brace_commands{$brace_command} > 1);
  }
  
--- 265,269 ----
  }
  foreach my $brace_command (keys (%brace_commands)) {
!   $keep_line_nr_brace_commands{$brace_command} = 1;
  }
  
***************
*** 312,318 ****
  my %forbidden_index_name = ();
  
! foreach my $name(keys(%index_names)) {
!   foreach my $prefix (@{$index_names{$name}->{'prefix'}}) {
!     $forbidden_index_name{$prefix} = 1;
    }
  }
--- 300,307 ----
  my %forbidden_index_name = ();
  
! foreach my $name (keys(%index_names)) {
!   $forbidden_index_name{$name} = 1;
!   if ($name =~ /^(.).$/) {
!     $forbidden_index_name{$1} = 1;
    }
  }
***************
*** 325,329 ****
  # @-commands that do not start a paragraph
  my %default_no_paragraph_commands;
! # @-commands that should be at a line beginning
  my %begin_line_commands;
  
--- 314,318 ----
  # @-commands that do not start a paragraph
  my %default_no_paragraph_commands;
! # @-commands that should be at the beginning of a line
  my %begin_line_commands;
  
***************
*** 445,448 ****
--- 434,443 ----
  }
  
+ # Commands that don't contain other @-commands.
+ my %no_command_commands;
+ foreach my $command ('errormsg', 'U') {
+   $no_command_commands{$command} = 1;
+ }
+ 
  # commands that accept full text, but no block or top-level commands
  my %full_text_commands;
***************
*** 481,484 ****
--- 476,482 ----
    $default_valid_nestings{$command} = \%in_simple_text_commands;
  }
+ foreach my $command (keys(%no_command_commands)) {
+   $default_valid_nestings{$command} = {};
+ }
  foreach my $command (keys(%full_line_commands)) {
    $default_valid_nestings{$command} = \%in_full_line_commands;
***************
*** 553,587 ****
  }
  
- # return true if effect of global commands should be ignored.
- sub _ignore_global_commands($)
- {
-   my $self = shift;
-   return !$self->{'expanded_formats_stack'}->[-1];
- }
- 
- # enter all the commands associated with an index name using the prefix
- # list
- sub _register_index_commands($$)
- {
-   my $self = shift;
-   my $index_name = shift;
-   if (!$self->{'index_names'}->{$index_name}->{'prefix'}) {
-     $self->{'index_names'}->{$index_name}->{'prefix'} = [$index_name];
-   }
-   if (!exists($self->{'index_names'}->{$index_name}->{'name'})) {
-     $self->{'index_names'}->{$index_name}->{'name'} = $index_name;
-   }
-   if (!exists($self->{'index_names'}->{$index_name}->{'contained_indices'})) {
-     $self->{'index_names'}->{$index_name}->{'contained_indices'}->{$index_name} = 1;
-   }
-   foreach my $prefix (@{$self->{'index_names'}->{$index_name}->{'prefix'}}) {
-     $self->{'misc_commands'}->{$prefix.'index'} = 'line';
-     $self->{'no_paragraph_commands'}->{$prefix.'index'} = 1;
-     $self->{'valid_nestings'}->{$prefix.'index'} = \%in_simple_text_commands;
-     $self->{'command_index_prefix'}->{$prefix.'index'} = $prefix;
-     $self->{'prefix_to_index_name'}->{$prefix} = $index_name;
-   }
- }
- 
  sub _setup_conf($$$)
  {
--- 551,554 ----
***************
*** 667,673 ****
    _setup_conf($parser, $conf, "Texinfo::Parser::parser");
  
-   #foreach my $value (keys %{$parser->{'values'}}) {
-   #  print STDERR "   ->  $value $parser->{'values'}->{$value}\n";
-   #}
    # Now initialize command hash that are dynamically modified, notably
    # those for index commands, and lists, based on defaults and user provided.
--- 634,637 ----
***************
*** 676,680 ****
    $parser->{'no_paragraph_commands'} = { %default_no_paragraph_commands };
    $parser->{'index_names'} = dclone(\%index_names);
!   $parser->{'command_index_prefix'} = {%command_index_prefix};
    $parser->{'close_paragraph_commands'} = {%close_paragraph_commands};
    $parser->{'close_preformatted_commands'} = {%close_preformatted_commands};
--- 640,644 ----
    $parser->{'no_paragraph_commands'} = { %default_no_paragraph_commands };
    $parser->{'index_names'} = dclone(\%index_names);
!   $parser->{'command_index'} = {%command_index};
    $parser->{'close_paragraph_commands'} = {%close_paragraph_commands};
    $parser->{'close_preformatted_commands'} = {%close_preformatted_commands};
***************
*** 693,697 ****
    }
    foreach my $index (keys (%{$parser->{'index_names'}})) {
!     $parser->_register_index_commands($index);
    }
    if ($parser->{'merged_indices'}) {
--- 657,672 ----
    }
    foreach my $index (keys (%{$parser->{'index_names'}})) {
!     if (!exists($parser->{'index_names'}->{$index}->{'name'})) {
!       $parser->{'index_names'}->{$index}->{'name'} = $index;
!     }
!     if (!exists($parser->{'index_names'}->{$index}->{'contained_indices'})) {
!       $parser->{'index_names'}->{$index}->{'contained_indices'}->{$index} = 1;
!     }
!     foreach my $prefix ($index, substr($index, 0, 1)) {
!       $parser->{'misc_commands'}->{$prefix.'index'} = 'line';
!       $parser->{'no_paragraph_commands'}->{$prefix.'index'} = 1;
!       $parser->{'valid_nestings'}->{$prefix.'index'} = \%in_simple_text_commands;
!       $parser->{'command_index'}->{$prefix.'index'} = $index;
!     }
    }
    if ($parser->{'merged_indices'}) {
***************
*** 714,718 ****
    $parser->{'macro_stack'} = [];
    $parser->{'conditionals_stack'} = [];
-   $parser->{'expanded_formats_stack'} = [1];
  
    # turn the array to a hash for speed.  Not sure it really matters for such
--- 689,692 ----
***************
*** 740,744 ****
  my $simple_parser_no_paragraph_commands = { %default_no_paragraph_commands };
  my $simple_parser_index_names = dclone(\%index_names);
! my $simple_parser_command_index_prefix = {%command_index_prefix};
  my $simple_parser_close_paragraph_commands = {%close_paragraph_commands};
  my $simple_parser_close_preformatted_commands = {%close_preformatted_commands};
--- 714,718 ----
  my $simple_parser_no_paragraph_commands = { %default_no_paragraph_commands };
  my $simple_parser_index_names = dclone(\%index_names);
! my $simple_parser_command_index = {%command_index};
  my $simple_parser_close_paragraph_commands = {%close_paragraph_commands};
  my $simple_parser_close_preformatted_commands = {%close_preformatted_commands};
***************
*** 756,760 ****
    $parser->{'no_paragraph_commands'} = $simple_parser_no_paragraph_commands;
    $parser->{'index_names'} = $simple_parser_index_names;
!   $parser->{'command_index_prefix'} = $simple_parser_command_index_prefix;
    $parser->{'close_paragraph_commands'} = $simple_parser_close_paragraph_commands;
    $parser->{'close_preformatted_commands'} = $simple_parser_close_preformatted_commands;
--- 730,734 ----
    $parser->{'no_paragraph_commands'} = $simple_parser_no_paragraph_commands;
    $parser->{'index_names'} = $simple_parser_index_names;
!   $parser->{'command_index'} = $simple_parser_command_index;
    $parser->{'close_paragraph_commands'} = $simple_parser_close_paragraph_commands;
    $parser->{'close_preformatted_commands'} = $simple_parser_close_preformatted_commands;
***************
*** 769,773 ****
    $parser->{'macro_stack'} = [];
    $parser->{'conditionals_stack'} = [];
-   $parser->{'expanded_formats_stack'} = [1];
  
    # turn the array to a hash for speed.  Not sure it really matters for such
--- 743,746 ----
***************
*** 951,955 ****
        push @{$root->{'contents'}->[-1]->{'contents'}}, 
                                     { 'text' => $line,
!                                      'type' => 'preamble_text' };
      }
    }
--- 924,930 ----
        push @{$root->{'contents'}->[-1]->{'contents'}}, 
                                     { 'text' => $line,
!                                      'type' => 'preamble_text',
!                                      'parent' => $root->{'contents'}->[-1]
!                                    };
      }
    }
***************
*** 1122,1139 ****
  
  # For debugging
- my @kept_keys = ('contents', 'cmdname', 'type', 'text', 'args');
- my %kept_keys;
- foreach my $key (@kept_keys) {
-   $kept_keys{$key} = 1;
- }
- sub _filter_print_keys { [grep {$kept_keys{$_}} ( sort keys %{$_[0]} )] };
  sub _print_tree($)
  {
    my $tree = shift;
-   local $Data::Dumper::Sortkeys = \&_filter_print_keys;
-   local $Data::Dumper::Purity = 1;
-   local $Data::Dumper::Indent = 1;
  
!   return Data::Dumper->Dump([$tree]);
  }
  
--- 1097,1105 ----
  
  # For debugging
  sub _print_tree($)
  {
    my $tree = shift;
  
!   return Texinfo::Common::print_tree($tree);
  }
  
***************
*** 1148,1153 ****
    }
    if ($self->{'global_commands'}->{$command} and $command ne 'author') {
!     push @{$self->{'extra'}->{$command}}, $current
!       unless (_ignore_global_commands($self));
      $current->{'line_nr'} = $line_nr if (!$current->{'line_nr'});
      return 1;
--- 1114,1118 ----
    }
    if ($self->{'global_commands'}->{$command} and $command ne 'author') {
!     push @{$self->{'extra'}->{$command}}, $current;
      $current->{'line_nr'} = $line_nr if (!$current->{'line_nr'});
      return 1;
***************
*** 1161,1166 ****
                                 $current->{'cmdname'}), $line_nr); 
      } else {
!       $self->{'extra'}->{$current->{'cmdname'}} = $current
!                      unless (_ignore_global_commands($self));
      }
      return 1;
--- 1126,1130 ----
                                 $current->{'cmdname'}), $line_nr); 
      } else {
!       $self->{'extra'}->{$current->{'cmdname'}} = $current;
      }
      return 1;
***************
*** 1189,1200 ****
      }
   
-     # accept an @-command after the arguments in case there is a @c or
-     # @comment
-     if ($args_def =~ /^\s*[^\@]/) {
-       $self->line_error(sprintf($self->__("bad syntax for \@%s argument: %s"), 
-                                  $command, $args_def),
-                         $line_nr);
-       $macro->{'extra'}->{'invalid_syntax'} = 1;
-     }
      print STDERR "MACRO \@$command $macro_name\n" if ($self->{'DEBUG'});
  
--- 1153,1156 ----
***************
*** 1215,1218 ****
--- 1171,1182 ----
        $index++;
      }
+     # accept an @-command after the arguments in case there is a @c or
+     # @comment
+     if ($args_def =~ /^\s*[^\@]/) {
+       $self->line_error(sprintf($self->__("bad syntax for \@%s argument: %s"), 
+                                  $command, $args_def),
+                         $line_nr);
+       $macro->{'extra'}->{'invalid_syntax'} = 1;
+     }
    } elsif ($line !~ /\S/) {
      $self->line_error(sprintf($self->
***************
*** 1348,1352 ****
      } else {
        $self->_command_error($current, $line_nr, 
!         $self->__("%c%s missing close brace"), ord('@'), $current->{'cmdname'});
      }
    } else {
--- 1312,1316 ----
      } else {
        $self->_command_error($current, $line_nr, 
!         $self->__("%c%s missing closing brace"), ord('@'), $current->{'cmdname'});
      }
    } else {
***************
*** 1759,1764 ****
            or $format_raw_commands{$current->{'cmdname'}}) {
          my $context = pop @{$self->{'context_stack'}};
-         pop @{$self->{'expanded_formats_stack'}} 
-           if ($format_raw_commands{$current->{'cmdname'}});
        }
        pop @{$self->{'regions_stack'}} 
--- 1723,1726 ----
***************
*** 1855,1859 ****
                              $line_nr, $current);
        }
-       pop @{$self->{'expanded_formats_stack'}};
      } elsif ($menu_commands{$current->{'cmdname'}}) {
        my $context = pop @{$self->{'context_stack'}};
--- 1817,1820 ----
***************
*** 2067,2070 ****
--- 2028,2032 ----
  }
  
+ # $MACRO is the element in the tree defining the macro.
  sub _expand_macro_arguments($$$$)
  {
***************
*** 2130,2134 ****
        ($line, $line_nr) = _new_line($self, $line_nr, $macro);
        if (!defined($line)) {
!         $self->line_error(sprintf($self->__("\@%s missing close brace"), 
             $name), $line_nr_orig);
          return ($arguments, "\n", $line_nr);
--- 2092,2096 ----
        ($line, $line_nr) = _new_line($self, $line_nr, $macro);
        if (!defined($line)) {
!         $self->line_error(sprintf($self->__("\@%s missing closing brace"), 
             $name), $line_nr_orig);
          return ($arguments, "\n", $line_nr);
***************
*** 2146,2149 ****
--- 2108,2112 ----
  }
  
+ # $MACRO is a member of $self->{'macros'}.
  sub _expand_macro_body($$$$) {
    my $self = shift;
***************
*** 2152,2158 ****
    my $line_nr = shift;
  
!   my $macrobody = $macro->{'extra'}->{'macrobody'};
!   my $args_total = scalar(@{$macro->{'args'}}) -1;
!   my $args_index = $macro->{'extra'}->{'args_index'};
  
    my $i;
--- 2115,2121 ----
    my $line_nr = shift;
  
!   my $macrobody = $macro->{'macrobody'};
!   my $args_total = scalar(@{$macro->{'element'}->{'args'}}) -1;
!   my $args_index = $macro->{'args_index'};
  
    my $i;
***************
*** 2174,2178 ****
            $self->line_error(sprintf($self->__(
           "\\ in \@%s expansion followed `%s' instead of parameter name or \\"), 
!                              $macro->{'args'}->[0]->{'text'}, $arg), $line_nr);
            $result .= '\\' . $arg;
          }
--- 2137,2141 ----
            $self->line_error(sprintf($self->__(
           "\\ in \@%s expansion followed `%s' instead of parameter name or \\"), 
!              $macro->{'element'}->{'args'}->[0]->{'text'}, $arg), $line_nr);
            $result .= '\\' . $arg;
          }
***************
*** 2213,2217 ****
--- 2176,2202 ----
          delete ($current->{'extra'}->{'spaces_before_argument'});
          delete ($current->{'extra'}) if !(keys(%{$current->{'extra'}}));
+       } elsif ($current->{'parent'} and $current->{'parent'}->{'extra'} 
+           and $current->{'parent'}->{'extra'}->{'spaces_before_argument'}
+           and $current->{'parent'}->{'extra'}->{'spaces_before_argument'} 
+                 eq $current->{'contents'}->[-1]) {
+         delete ($current->{'parent'}->{'extra'}->{'spaces_before_argument'});
+         delete ($current->{'parent'}->{'extra'})
+           if !(keys(%{$current->{'parent'}->{'extra'}}));
+       } elsif ($current->{'extra'} 
+           and $current->{'extra'}->{'spaces_after_command'}
+           and $current->{'extra'}->{'spaces_after_command'} 
+                 eq $current->{'contents'}->[-1]) {
+         delete ($current->{'extra'}->{'spaces_after_command'});
+         delete ($current->{'extra'})
+           if !(keys(%{$current->{'extra'}}));
+       } elsif ($current->{'parent'} and $current->{'parent'}->{'extra'} 
+           and $current->{'parent'}->{'extra'}->{'spaces_after_command'}
+           and $current->{'parent'}->{'extra'}->{'spaces_after_command'} 
+                 eq $current->{'contents'}->[-1]) {
+         delete ($current->{'parent'}->{'extra'}->{'spaces_after_command'});
+         delete ($current->{'parent'}->{'extra'})
+           if !(keys(%{$current->{'parent'}->{'extra'}}));
        }
+ 
        pop @{$current->{'contents'}} 
      } elsif ($current->{'contents'}->[-1]->{'type'} eq 'empty_line') {
***************
*** 2270,2397 ****
  }
  
! # used to put a node name in error messages.
! sub _node_extra_to_texi($)
! {
!   my $node = shift;
!   my $result = '';
!   if ($node->{'manual_content'}) {
!     $result = '('.Texinfo::Convert::Texinfo::convert({'contents'
!                                      => $node->{'manual_content'}}) .')';
!   }
!   if ($node->{'node_content'}) {
!     $result .= Texinfo::Convert::Texinfo::convert ({'contents'
!                                           => $node->{'node_content'}});
!   }
!   return $result;
! }
! 
! sub _find_end_brace($$)
! {
!   my $text = shift;
!   my $braces_count = shift;
! 
!   my $before = '';
!   while ($braces_count > 0 and length($text)) {
!     if ($text =~ s/([^()]*)([()])//) {
!       $before .= $1.$2;
!       my $brace = $2;
!       if ($brace eq '(') {
!         $braces_count++;
!       } else {
!         $braces_count--;
!         if ($braces_count == 0) {
!           return ($before, $text, 0);
!         }
!       }
!     } else {
!       $before .= $text;
!       $text = '';
!     }
!   }
!   return ($before, undef, $braces_count);
! }
! 
! # This only counts opening braces, and returns 0 once all the parentheses
! # are closed
! sub _count_opened_tree_braces($$);
! sub _count_opened_tree_braces($$)
! {
!   my $current = shift;
!   my $braces_count = shift;
!   if (defined($current->{'text'})) {
!     my ($before, $after);
!     ($before, $after, $braces_count) = _find_end_brace($current->{'text'},
!                                                           $braces_count);
!   }
!   if ($current->{'args'}) {
!     foreach my $arg (@{$current->{'args'}}) {
!       $braces_count = _count_opened_tree_braces($arg, $braces_count);
!       return $braces_count if ($braces_count == 0);
!     }
!   }
!   if ($current->{'contents'}) {
!     foreach my $content (@{$current->{'contents'}}) {
!       $braces_count = _count_opened_tree_braces($content, $braces_count);
!       return $braces_count if ($braces_count == 0);
!     }
!   }
!   return $braces_count;
! }
! 
  # retrieve a leading manual name in parentheses, if there is one.
  sub _parse_node_manual($)
  {
    my $node = shift;
!   my @contents = @{$node->{'contents'}};
!   _trim_spaces_comment_from_content(\@contents);
! 
!   my $manual;
!   my $result;
! #print STDERR "RRR $contents[0] and $contents[0]->{'text'} \n";
!   if ($contents[0] and $contents[0]->{'text'} and $contents[0]->{'text'} =~ /^\(/) {
!     my $braces_count = 1;
!     if ($contents[0]->{'text'} !~ /^\($/) {
!       my $brace = shift @contents;
!       my $brace_text = $brace->{'text'};
!       $brace_text =~ s/^\(//;
!       unshift @contents, { 'text' => $brace_text, 'type' => $brace->{'type'},
!                            'parent' => $brace->{'parent'} } if $brace_text ne '';
!     } else {
!       shift @contents;
!     }
!     while(@contents) {
!       my $content = shift @contents;
!       if (!defined($content->{'text'}) or $content->{'text'} !~ /\)/) {
!         push @$manual, $content;
!         $braces_count = _count_opened_tree_braces($content, $braces_count);
!         # This is an error, braces were closed in a command
!         if ($braces_count == 0) {
!           last;
!         }
!       } else {
!         my ($before, $after);
!         ($before, $after, $braces_count) = _find_end_brace($content->{'text'},
!                                                               $braces_count);
!         if ($braces_count == 0) {
!           $before =~ s/\)$//;
!           push @$manual, { 'text' => $before, 'parent' => $content->{'parent'} }
!             if ($before ne '');
!           $after =~ s/^\s*//;
!           unshift @contents,  { 'text' => $after, 'parent' => $content->{'parent'} }
!             if ($after ne '');
!           last;
!         } else {
!           push @$manual, $content;
!         }
!       }
!     }
!     $result->{'manual_content'} = $manual if (defined($manual));
!   }
!   if (@contents) {
!     $result->{'node_content'} = \@contents;
!     $result->{'normalized'} =
!       Texinfo::Convert::NodeNameNormalization::normalize_node({'contents' => \@contents});
!   }
!   return $result;
  }
  
--- 2255,2272 ----
  }
  
! # $NODE->{'contents'} is the Texinfo fo the specification of a node.
! # Returned object is a hash with three fields:
! #
! #     manual_content - Texinfo tree for a manual name extracted from the
! #                      node specification.
! #     node_content - Texinfo tree for the node name on its own
! #     normalized - a string with the node name after HTML node name
! #                  normalization is applied
! #
  # retrieve a leading manual name in parentheses, if there is one.
  sub _parse_node_manual($)
  {
    my $node = shift;
!   return Texinfo::Common::parse_node_manual ($node);
  }
  
***************
*** 2440,2444 ****
      _isolate_last_space($self, $bracketed, 'empty_space_at_end_def_bracketed');
      my $bracketed_def_content = { 'contents' => $bracketed->{'contents'},
-                                   'parent' => $bracketed->{'parent'},
                                    'type' => 'bracketed_def_content', };
      if ($bracketed->{'extra'} and $bracketed->{'extra'}->{'spaces_before_argument'}) {
--- 2315,2318 ----
***************
*** 2523,2530 ****
      # it here.
      push @def_line, ['spaces', $spaces] if ((defined($spaces)) and scalar(@def_line) != 0);
-     #print STDERR "spaces `".Texinfo::Convert::Texinfo::convert($spaces)."'\n" if (defined($spaces));
      last if (!defined($next));
-     #print "$next, $next->{'type'}\n";
-     #print STDERR "NEXT ".Texinfo::Convert::Texinfo::convert($next)."\n";
      if ($next->{'type'} and $next->{'type'} eq 'bracketed_def_content') {
        push @def_line, ['bracketed', $next];
--- 2397,2401 ----
***************
*** 2537,2542 ****
    while (@def_line) {
      my $token = $def_line[0];
-     #print STDERR "next token: $token->[0]. arg $arg\n";
-     #print STDERR "NEXT ".Texinfo::Convert::Texinfo::convert($token->[1])."\n";
      # finish previous item
      if ($token->[0] eq 'spaces' or $token->[0] eq 'bracketed') {
--- 2408,2411 ----
***************
*** 2572,2591 ****
      push @result, [$arg, $argument_content->[0]];
    }
!   #foreach my $arg (@args) {
!   #  #print STDERR "$command $arg"._print_current($contents[0]);
!   #  #foreach my $content (@contents) {print STDERR " "._print_current($content)};
!   #  #print STDERR " contents ->".Texinfo::Convert::Texinfo::convert ({'contents' => \@contents});
!   #  my ($spaces, $next) = $self->_next_bracketed_or_word(\@contents);
!   #  last if (!defined($next));
!   #  #my $spaces_string = 'NOSPACE';
!   #  #if (defined($spaces)) {
!   #  #  $spaces_string = "`".Texinfo::Convert::Texinfo::convert($spaces)."'";
!  #   #}
!   #  #print STDERR "NEXT $spaces_string [$arg] ".Texinfo::Convert::Texinfo::convert($next)."\n";
!   #  push @result, ['spaces', $spaces] if (defined($spaces));
!   #  push @result, [$arg, $next];
!   #}
    my @args_results;
-   #while (@contents) {
    while (@def_line) {
      my $spaces;
--- 2441,2446 ----
      push @result, [$arg, $argument_content->[0]];
    }
! 
    my @args_results;
    while (@def_line) {
      my $spaces;
***************
*** 2596,2600 ****
      }
      my $next = $next_token->[1];
-     #my ($spaces, $next) = $self->_next_bracketed_or_word(\@contents);
      push @args_results, ['spaces', $spaces] if (defined($spaces));
      last if (!defined($next));
--- 2451,2454 ----
***************
*** 2643,2651 ****
    my $line_nr = shift;
    my $normalized = $label->{'normalized'};
!   if (_ignore_global_commands($self)) {
!     $current->{'extra'}->{'normalized'} = $normalized;
!     $current->{'extra'}->{'node_content'} = $label->{'node_content'};
!     return 0;
!   } elsif ($self->{'labels'}->{$normalized}) {
      $self->line_error(sprintf($self->__("\@%s `%s' previously defined"), 
                           $current->{'cmdname'}, 
--- 2497,2502 ----
    my $line_nr = shift;
    my $normalized = $label->{'normalized'};
! 
!   if ($self->{'labels'}->{$normalized}) {
      $self->line_error(sprintf($self->__("\@%s `%s' previously defined"), 
                           $current->{'cmdname'}, 
***************
*** 2696,2713 ****
    $content_normalized = $content if (!defined($content_normalized));
  
!   my $prefix = $self->{'command_index_prefix'}->{$command_container};
!   my $index_name = $self->{'prefix_to_index_name'}->{$prefix};
    my $index = $self->{'index_names'}->{$index_name};
  
!   my $number;
!   unless (_ignore_global_commands($self)) {
!     $number = (defined($index->{'index_entries'})
!                  ? (scalar(@{$index->{'index_entries'}}) + 1)
!                    : 1);
!   }
    my $index_entry = { 'index_name'           => $index_name,
                        'index_at_command'     => $command,
                        'index_type_command'   => $command_container,
-                       'index_prefix'         => $prefix,
                        'content'              => $content,
                        'content_normalized'   => $content_normalized,
--- 2547,2559 ----
    $content_normalized = $content if (!defined($content_normalized));
  
!   my $index_name = $self->{'command_index'}->{$command_container};
    my $index = $self->{'index_names'}->{$index_name};
  
!   my $number = (defined($index->{'index_entries'})
!                 ? (scalar(@{$index->{'index_entries'}}) + 1)
!                   : 1);
    my $index_entry = { 'index_name'           => $index_name,
                        'index_at_command'     => $command,
                        'index_type_command'   => $command_container,
                        'content'              => $content,
                        'content_normalized'   => $content_normalized,
***************
*** 2723,2730 ****
                               $index_name), $line_nr);
    }
!   #print STDERR "INDEX ENTRY \@$command $index_name($number)\n";
!   unless (_ignore_global_commands($self)) {
!     push @{$index->{'index_entries'}}, $index_entry;
!   }
    $current->{'extra'}->{'index_entry'} = $index_entry;
  }
--- 2569,2573 ----
                               $index_name), $line_nr);
    }
!   push @{$index->{'index_entries'}}, $index_entry;
    $current->{'extra'}->{'index_entry'} = $index_entry;
  }
***************
*** 2951,2963 ****
                    or $arg->[0] eq 'delimiter');
          next if ($arg->[0] eq 'spaces');
-         # change of type is done in _parse_def.
-         #if ($arg->[1]->{'type'} and $arg->[1]->{'type'} eq 'bracketed') {
-         #  $def_parsed_hash->{$arg->[0]} = { 'contents' => $arg->[1]->{'contents'},
-         #                                    'type' => 'bracketed_def_content',
-         #                                    'parent' => $arg->[1]->{'parent'}};
-         #} else {
-         #  $def_parsed_hash->{$arg->[0]} = $arg->[1];
-         #}
-         #print STDERR "DEF PARSED HASH $arg->[0] $arg->[1]|".Texinfo::Convert::Texinfo::convert($arg->[1])."|\n";
          $def_parsed_hash->{$arg->[0]} = $arg->[1];
        }
--- 2794,2797 ----
***************
*** 2979,2983 ****
          my $index_contents_normalized;
          if ($def_parsed_hash->{'class'}) {
!           if ($command_index_prefix{$def_command} eq 'f') {
              $index_entry = $self->gdt('{name} on {class}', 
                                    {'name' => $def_parsed_hash->{'name'},
--- 2813,2817 ----
          my $index_contents_normalized;
          if ($def_parsed_hash->{'class'}) {
!           if ($command_index{$def_command} eq 'fn') {
              $index_entry = $self->gdt('{name} on {class}', 
                                    {'name' => $def_parsed_hash->{'name'},
***************
*** 2987,2991 ****
                  { 'text' => ' on '},
                  _non_bracketed_contents($def_parsed_hash->{'class'})];
!           } elsif ($command_index_prefix{$def_command} eq 'v'
                    and $def_command ne 'defcv') {
              $index_entry = $self->gdt('{name} of {class}', 
--- 2821,2825 ----
                  { 'text' => ' on '},
                  _non_bracketed_contents($def_parsed_hash->{'class'})];
!           } elsif ($command_index{$def_command} eq 'vr'
                    and $def_command ne 'defcv') {
              $index_entry = $self->gdt('{name} of {class}', 
***************
*** 3039,3050 ****
        # parse the prototypes and put them in a special arg
        my @prototype_row;
-       # do the same but keeping spaces information
-       my @prototype_line;
        foreach my $content (@{$current->{'contents'}}) {
          if ($content->{'type'} and $content->{'type'} eq 'bracketed') {
            push @prototype_row, { 'contents' => $content->{'contents'},
-                                  'parent' => $content->{'parent'},
                                   'type' => 'bracketed_multitable_prototype'};
-           push @prototype_line, $content;
          } elsif ($content->{'text'}) {
            if ($content->{'text'} =~ /\S/) {
--- 2873,2880 ----
***************
*** 3054,3070 ****
              }
            }
-           # The regexp breaks between characters, with a non space followed
-           # by a space or a space followed by non space.  It is like \b, but
-           # for \s \S, and not \w \W.
-           foreach my $prototype_or_space (split /(?<=\S)(?=\s)|(?=\S)(?<=\s)/, 
-                                                           $content->{'text'}) {
-             if ($prototype_or_space =~ /\S/) {
-               push @prototype_line, {'text' => $prototype_or_space,
-                                      'type' => 'row_prototype' };
-             } elsif ($prototype_or_space =~ /\s/) {
-               push @prototype_line, {'text' => $prototype_or_space,
-                                      'type' => 'prototype_space' };
-             }
-           }
          } else {
            # FIXME could this happen?  Should be a debug message?
--- 2884,2887 ----
***************
*** 3078,3082 ****
            } else {
              push @prototype_row, $content;
-             push @prototype_line, $content;
            }
          }
--- 2895,2898 ----
***************
*** 3090,3094 ****
        }
        $multitable->{'extra'}->{'prototypes'} = \@prototype_row;
-       $multitable->{'extra'}->{'prototypes_line'} = \@prototype_line;
  
      } else {
--- 2906,2909 ----
***************
*** 3114,3120 ****
          $type = $float->{'extra'}->{'type'}->{'normalized'};
        }
!       push @{$self->{'floats'}->{$type}}, $float
!         unless (_ignore_global_commands($self));
!       $float->{'float_section'} = $self->{'current_section'} 
          if (defined($self->{'current_section'}));
      }
--- 2929,2934 ----
          $type = $float->{'extra'}->{'type'}->{'normalized'};
        }
!       push @{$self->{'floats'}->{$type}}, $float;
!       $float->{'extra'}->{'float_section'} = $self->{'current_section'} 
          if (defined($self->{'current_section'}));
      }
***************
*** 3210,3213 ****
--- 3024,3028 ----
          $current->{'extra'}->{'block_command_line_contents'} = [
            [ { 'cmdname' => 'bullet', 
+               'contents' => [],
              'type' => 'command_as_argument',
              'parent' => $current }
***************
*** 3220,3223 ****
--- 3035,3039 ----
          $current->{'extra'}->{'block_command_line_contents'} = [
            [ { 'cmdname' => 'asis', 
+               'contents' => [],
              'type' => 'command_as_argument',
              'parent' => $current }
***************
*** 3283,3292 ****
        }
      } elsif ($self->{'misc_commands'}->{$command} eq 'text') {
!       my $text = Texinfo::Convert::Text::convert($current->{'args'}->[0],
!                                                  {'code' => 1, 
!                                           Texinfo::Common::_convert_text_options($self)});
        if ($text eq '') {
!         $self->_command_warn($current, $line_nr, 
!                              $self->__("\@%s missing argument"), $command);
          $current->{'extra'}->{'missing_argument'} = 1;
        } else {
--- 3099,3128 ----
        }
      } elsif ($self->{'misc_commands'}->{$command} eq 'text') {
!       my $text = '';
!       my $superfluous_arg = 0;
!       my @contents = @{$current->{'args'}->[0]->{'contents'}};
!       _trim_spaces_comment_from_content (\@contents);
!       for my $c (@contents) {
!         # Allow @@, @{ and @} to give a way for @, { and } to appear in
!         # filenames (although it's not a good idea to use these characters
!         # in filenames).
!         if ($c->{'text'}) {
!           $text .= $c->{'text'};
!         } elsif ($c->{'cmdname'} and $c->{'cmdname'} eq '@') {
!           $text .= '@';
!         } elsif ($c->{'cmdname'} and $c->{'cmdname'} eq '{') {
!           $text .= '{';
!         } elsif ($c->{'cmdname'} and $c->{'cmdname'} eq '}') {
!           $text .= '}';
!         } else {
!           $superfluous_arg = 1;
!         }
!       }
        if ($text eq '') {
!         if (not $superfluous_arg) {
!           $self->_command_warn($current, $line_nr, 
!                                $self->__("\@%s missing argument"), $command);
!         }
!         # Otherwise an error message is issued below.
          $current->{'extra'}->{'missing_argument'} = 1;
        } else {
***************
*** 3317,3321 ****
                  if (defined($end_command));
              }
!             if ($line =~ /\S/ and defined($end_command)) {
                my $texi_line 
                  = Texinfo::Convert::Texinfo::convert($current->{'args'}->[0]);
--- 3153,3158 ----
                  if (defined($end_command));
              }
!             if (($superfluous_arg or $line =~ /\S/)
!                 and defined($end_command)) {
                my $texi_line 
                  = Texinfo::Convert::Texinfo::convert($current->{'args'}->[0]);
***************
*** 3324,3327 ****
--- 3161,3165 ----
                               $self->__("superfluous argument to \@%s %s: %s"),
                               $command, $end_command, $texi_line);
+               $superfluous_arg = 0; # Don't issue another error message below.
              }
            } else {
***************
*** 3330,3333 ****
--- 3168,3173 ----
                                $command, $line);
            }
+         } elsif ($superfluous_arg) {
+           # An error message is issued below.
          } elsif ($command eq 'include') {
            my $file = Texinfo::Common::locate_include_file($self, $text) ;
***************
*** 3361,3387 ****
                                 $text)
              if (!$texinfo_encoding or $texinfo_encoding ne lc($text));
!           if (! _ignore_global_commands($self)) {
!             if ($input_encoding) {
!               $current->{'extra'}->{'input_encoding_name'} = $input_encoding;
!             }
!             if (!$perl_encoding) {
!               $self->_command_warn($current, $line_nr,
!                    $self->__("unrecognized encoding name `%s'"), $text);
!             } else {
!               $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;
!                 }
                }
  
!               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'});
!                 }
                }
              }
--- 3201,3225 ----
                                 $text)
              if (!$texinfo_encoding or $texinfo_encoding ne lc($text));
!           if ($input_encoding) {
!             $current->{'extra'}->{'input_encoding_name'} = $input_encoding;
!           }
!           if (!$perl_encoding) {
!             $self->_command_warn($current, $line_nr,
!                  $self->__("unrecognized encoding name `%s'"), $text);
!           } else {
!             $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;
                }
+             }
  
!             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'});
                }
              }
***************
*** 3393,3402 ****
              $self->_command_warn($current, $line_nr, $message);
            }
!           if (!$self->{'set'}->{'documentlanguage'} 
!               and !_ignore_global_commands($self)) {
              $self->{'documentlanguage'} = $text;
            }
          }
        }
      } elsif ($command eq 'node') {
        foreach my $arg (@{$current->{'args'}}) {
--- 3231,3250 ----
              $self->_command_warn($current, $line_nr, $message);
            }
!           if (!$self->{'set'}->{'documentlanguage'}) {
              $self->{'documentlanguage'} = $text;
            }
          }
        }
+       if ($superfluous_arg) {
+         my $texi_line 
+           = Texinfo::Convert::Texinfo::convert($current->{'args'}->[0]);
+         $texi_line =~ s/^\s*//;
+         $texi_line =~ s/\s*$//;
+ 
+         $self->_command_error($current, $line_nr, 
+                        $self->__("bad argument to \@%s: %s"),
+                        $command, $texi_line);
+         
+       }
      } elsif ($command eq 'node') {
        foreach my $arg (@{$current->{'args'}}) {
***************
*** 3432,3441 ****
          $current->{'extra'}->{'misc_content'} = \@contents;
          if (($command eq 'item' or $command eq 'itemx')
!             and $self->{'command_index_prefix'}->{$current->{'parent'}->{'cmdname'}}) {
            _enter_index_entry($self, $current->{'parent'}->{'cmdname'}, 
                               $command, $current,
                               $current->{'extra'}->{'misc_content'}, 
                               undef, $line_nr);
!         } elsif ($self->{'command_index_prefix'}->{$current->{'cmdname'}}) {
            _enter_index_entry($self, $current->{'cmdname'}, 
                               $current->{'cmdname'}, $current,
--- 3280,3289 ----
          $current->{'extra'}->{'misc_content'} = \@contents;
          if (($command eq 'item' or $command eq 'itemx')
!             and $self->{'command_index'}->{$current->{'parent'}->{'cmdname'}}) {
            _enter_index_entry($self, $current->{'parent'}->{'cmdname'}, 
                               $command, $current,
                               $current->{'extra'}->{'misc_content'}, 
                               undef, $line_nr);
!         } elsif ($self->{'command_index'}->{$current->{'cmdname'}}) {
            _enter_index_entry($self, $current->{'cmdname'}, 
                               $current->{'cmdname'}, $current,
***************
*** 3473,3481 ****
              
              #chomp ($body);
!             $self->{'macros'}->{'insertcopying'} = {
                      'args' => [{'text' => 'insertcopying', 'type' => 'macro_name'}],
!                     'cmdname' => 'macro',
!                     'extra' => {'macrobody' => 
!                                  $self->_strip_macrobody_leading_space($body)}
              };
              $inline_copying = 1;
--- 3321,3329 ----
              
              #chomp ($body);
!             $self->{'macros'}->{'insertcopying'} =
!             { 'element' => {
                      'args' => [{'text' => 'insertcopying', 'type' => 'macro_name'}],
!                     'cmdname' => 'macro', },
!               'macrobody' => $self->_strip_macrobody_leading_space($body)
              };
              $inline_copying = 1;
***************
*** 3544,3551 ****
        $current = $current->{'contents'}->[-1];
        delete $current->{'remaining_args'};
-       $current->{'contents'} = [];
  
-       # we never should be in a raw format bock, so we don't check for
-       # _ignore_global_commands($self)
        # associate the section (not part) with the current node.
        if ($command ne 'node' and $command ne 'part') {
--- 3392,3396 ----
***************
*** 3696,3700 ****
    if ($parsed_node and $parsed_node->{'manual_content'}) {
      $self->line_error (sprintf($self->__("syntax for an external node used for `%s'"),
!           _node_extra_to_texi($parsed_node)), $line_nr)
    }
  }
--- 3541,3545 ----
    if ($parsed_node and $parsed_node->{'manual_content'}) {
      $self->line_error (sprintf($self->__("syntax for an external node used for `%s'"),
!           Texinfo::Structuring::node_extra_to_texi($parsed_node)), $line_nr)
    }
  }
***************
*** 3935,3939 ****
              push @{$current->{'contents'}}, 
                { 'text' => $1, 'type' => 'raw', 'parent' => $current };
!             $self->line_warn(sprintf($self->__("\@end %s should only appear at a line beginning"), 
                                       $end_command), $line_nr);
            }
--- 3780,3784 ----
              push @{$current->{'contents'}}, 
                { 'text' => $1, 'type' => 'raw', 'parent' => $current };
!             $self->line_warn(sprintf($self->__("\@end %s should only appear at the beginning of a line"), 
                                       $end_command), $line_nr);
            }
***************
*** 3950,3959 ****
                      or ($current->{'parent'}->{'cmdname'} ne 'macro'
                          and $current->{'parent'}->{'cmdname'} ne 'rmacro'))) {
!             $current->{'extra'}->{'macrobody'} = 
               $self->_strip_macrobody_leading_space(
                 Texinfo::Convert::Texinfo::convert({ 'contents' 
                                               => $current->{'contents'} }));
!             if ($current->{'args'} and $current->{'args'}->[0]
!                 and !_ignore_global_commands($self)) {
                my $name = $current->{'args'}->[0]->{'text'};
                if (exists($self->{'macros'}->{$name})) {
--- 3795,3803 ----
                      or ($current->{'parent'}->{'cmdname'} ne 'macro'
                          and $current->{'parent'}->{'cmdname'} ne 'rmacro'))) {
!             my $macrobody =
               $self->_strip_macrobody_leading_space(
                 Texinfo::Convert::Texinfo::convert({ 'contents' 
                                               => $current->{'contents'} }));
!             if ($current->{'args'} and $current->{'args'}->[0]) {
                my $name = $current->{'args'}->[0]->{'text'};
                if (exists($self->{'macros'}->{$name})) {
***************
*** 3962,3966 ****
                  $self->line_warn(sprintf($self->__(
                                     "here is the previous definition of `%s'"), 
!                                $name), $self->{'macros'}->{$name}->{'line_nr'});
                }
                if ($all_commands{$name}) {
--- 3806,3810 ----
                  $self->line_warn(sprintf($self->__(
                                     "here is the previous definition of `%s'"), 
!                $name), $self->{'macros'}->{$name}->{'element'}->{'line_nr'});
                }
                if ($all_commands{$name}) {
***************
*** 3969,3974 ****
                                            $name), $current->{'line_nr'});
                }
!               $self->{'macros'}->{$name} = $current
!                 unless ($current->{'extra'}->{'invalid_syntax'});
              }
            }
--- 3813,3830 ----
                                            $name), $current->{'line_nr'});
                }
!               if (!$current->{'extra'}->{'invalid_syntax'}) {
!                 $self->{'macros'}->{$name} = {
!                   'element' => $current,
!                   'macrobody' => $macrobody
!                 };
!                 # Don't need 'args_index' in final tree.
!                 if (defined $current->{'extra'}->{'args_index'}) {
!                   $self->{'macros'}->{$name}->{'args_index'}
!                                        = $current->{'extra'}->{'args_index'};
!                   delete $current->{'extra'}->{'args_index'};
!                 }
!               } elsif (defined $current->{'extra'}->{'args_index'}) {
!                 delete $current->{'extra'}->{'args_index'};
!               }
              }
            }
***************
*** 3992,3996 ****
            } else {
              print STDERR "CLOSED raw $end_command\n" if ($self->{'DEBUG'});
!             $line = _start_empty_line_after_command($line, $current, $raw_command);
            }
          } else {
--- 3848,3858 ----
            } else {
              print STDERR "CLOSED raw $end_command\n" if ($self->{'DEBUG'});
!             $line =~ s/^([^\S\r\n]*)//;
!             push @{$current->{'contents'}},
!                         { 'type' => 'empty_line_after_command',
!                           'text' => $1,
!                           'parent' => $current,
!                           'extra' => {'command' => $raw_command }
!                         };
            }
          } else {
***************
*** 4075,4079 ****
          }
  
!         my $expanded_macro = $self->{'macros'}->{$command};
          my $args_number = scalar(@{$expanded_macro->{'args'}}) -1;
          my $arguments = [];
--- 3937,3941 ----
          }
  
!         my $expanded_macro = $self->{'macros'}->{$command}->{'element'};
          my $args_number = scalar(@{$expanded_macro->{'args'}}) -1;
          my $arguments = [];
***************
*** 4098,4102 ****
            $line = "\n" if ($has_end_of_line);
          }
!         my $expanded = _expand_macro_body ($self, $expanded_macro, 
                                     $arguments, $line_nr);
          print STDERR "MACROBODY: $expanded".'||||||'."\n" 
--- 3960,3965 ----
            $line = "\n" if ($has_end_of_line);
          }
!         my $expanded = _expand_macro_body ($self,
!                                    $self->{'macros'}->{$command},
                                     $arguments, $line_nr);
          print STDERR "MACROBODY: $expanded".'||||||'."\n" 
***************
*** 4158,4162 ****
          # special case for @-command as argument of @itemize or @*table.
          if (_command_with_command_as_argument($current->{'parent'})) {
-           delete $current->{'contents'};
            print STDERR "FOR PARENT \@$current->{'parent'}->{'parent'}->{'cmdname'} command_as_argument $current->{'cmdname'}\n" if ($self->{'DEBUG'});
            $current->{'type'} = 'command_as_argument' if (!$current->{'type'});
--- 4021,4024 ----
***************
*** 4199,4203 ****
                $current->{'args'}->[-1]->{'type'} = 'space_command_arg';
              }
-             delete $current->{'contents'};
              $current = $current->{'parent'};
            } else { # The accent is at end of line
--- 4061,4064 ----
***************
*** 4345,4349 ****
          print STDERR "COMMAND $command\n" if ($self->{'DEBUG'});
  
- 
          if ($command eq 'value') {
            $line =~ s/^\s*// 
--- 4206,4209 ----
***************
*** 4357,4379 ****
                } elsif (!ref($self->{'values'}->{$value})) {
                  $line = $self->{'values'}->{$value} . $line;
!               # the push @{$current->{'contents'}}, {}; prevents a trailing
!               # text to be merged, to avoid having the value tree modified.
!               } elsif (ref($self->{'values'}->{$value}) eq 'ARRAY') {
!                 # we don't know for sure, but if we don't do it here it 
!                 # won't be done
!                 _abort_empty_line($self, $current);
!                 foreach my $content (@{$self->{'values'}->{$value}}) {
!                   push @{$current->{'contents'}}, $content;
!                 }
!                 push @{$current->{'contents'}}, {};
!               } elsif (ref($self->{'values'}->{$value}) eq 'HASH') {
!                 # we don't know for sure, but if we don't do it here it 
!                 # won't be done
!                 _abort_empty_line($self, $current);
!                 my $content = $self->{'values'}->{$value};
!                 push @{$current->{'contents'}}, $content;
!                 push @{$current->{'contents'}}, {};
                }
              } else {
                # caller should expand something along 
                # gdt('@{No value for `{value}\'@}', {'value' => $value}, {'keep_texi'=> 1});
--- 4217,4229 ----
                } elsif (!ref($self->{'values'}->{$value})) {
                  $line = $self->{'values'}->{$value} . $line;
!               } else {
!                 print STDERR "BUG? $value defined as reference\n";
                }
              } else {
+               # Flag not defined.  This is an error if it comes from
+               # a user's document.  It is also expected behaviour for
+               # Texinfo::Report::gdt, where we want to defer substitution
+               # of the value until after the containing Texinfo is parsed.
+               _abort_empty_line($self, $current);
                # caller should expand something along 
                # gdt('@{No value for `{value}\'@}', {'value' => $value}, {'keep_texi'=> 1});
***************
*** 4403,4407 ****
                 and $begin_line_commands{$command}) {
            $self->line_warn( 
!               sprintf($self->__("\@%s should only appear at a line beginning"), 
                        $command), $line_nr);
          }
--- 4253,4257 ----
                 and $begin_line_commands{$command}) {
            $self->line_warn( 
!               sprintf($self->__("\@%s should only appear at the beginning of a line"), 
                        $command), $line_nr);
          }
***************
*** 4586,4597 ****
                   if (scalar(@$args) and $arg_spec ne 'skipline');
              }
!             if (! _ignore_global_commands($self)) {
!               if ($command eq 'raisesections') {
!                 $self->{'sections_level'}++;
!               } elsif ($command eq 'lowersections') {
!                 $self->{'sections_level'}--;
!               } elsif ($command eq 'novalidate') {
!                 $self->{'novalidate'} = 1;
!               }
              }
              _mark_and_warn_invalid($self, $command, $invalid_parent,
--- 4436,4445 ----
                   if (scalar(@$args) and $arg_spec ne 'skipline');
              }
!             if ($command eq 'raisesections') {
!               $self->{'sections_level'}++;
!             } elsif ($command eq 'lowersections') {
!               $self->{'sections_level'}--;
!             } elsif ($command eq 'novalidate') {
!               $self->{'info'}->{'novalidate'} = 1;
              }
              _mark_and_warn_invalid($self, $command, $invalid_parent,
***************
*** 4721,4724 ****
--- 4569,4575 ----
                  $misc->{'level'} = _section_level($misc);
                }
+               if ($root_commands{$command}) {
+                 $misc->{'contents'} = [];
+               }
                # def*x
                if ($def_commands{$command}) {
***************
*** 4825,4831 ****
                                   $line_nr, $misc);
  
!           _register_global_command($self, $command, $misc, $line_nr);
!           if ($command eq 'dircategory' 
!               and ! _ignore_global_commands($self)) {
              push @{$self->{'info'}->{'dircategory_direntry'}}, $misc;
            }
--- 4676,4682 ----
                                   $line_nr, $misc);
  
!           _register_global_command($self, $command, $misc, $line_nr)
!             if $misc;
!           if ($command eq 'dircategory') {
              push @{$self->{'info'}->{'dircategory_direntry'}}, $misc;
            }
***************
*** 4869,4873 ****
                    or $self->{'definfoenclose'}->{$name}
                    or $self->{'aliases'}->{$name}
!                   or $self->{'command_index_prefix'}->{$name}
                  );
                  if (($command_is_defined
--- 4720,4724 ----
                    or $self->{'definfoenclose'}->{$name}
                    or $self->{'aliases'}->{$name}
!                   or $self->{'command_index'}->{$name}
                  );
                  if (($command_is_defined
***************
*** 4967,4975 ****
                } elsif ($format_raw_commands{$command}) {
                  push @{$self->{'context_stack'}}, 'rawpreformatted';
!                 if ($self->{'expanded_formats_hash'}->{$command} 
!                     and $self->{'expanded_formats_stack'}->[-1]) {
!                   push @{$self->{'expanded_formats_stack'}}, $command;
!                 } else {
!                   push @{$self->{'expanded_formats_stack'}}, 0;
                  }
                }
--- 4818,4843 ----
                } elsif ($format_raw_commands{$command}) {
                  push @{$self->{'context_stack'}}, 'rawpreformatted';
!                 if (not $self->{'expanded_formats_hash'}->{$command}) {
!                   push @{$current->{'contents'}}, {
!                     'parent' => $current,
!                     'type' => 'elided_block',
!                     'contents' => []
!                   };
!                   while (not $line =~ /^\s*\@end\s+$command/) {
!                     ($line, $line_nr) = _new_line($self, $line_nr, $current);
!                     if (!$line) {
!                       # unclosed block
!                       $line = '';
!                       last;
!                     }
!                   }
!                   push @{$current->{'contents'}},
!                                      { 'type' => 'empty_line_after_command', 
!                                        'text' => "\n",
!                                        'parent' => $current };
!                   push @{$current->{'contents'}}, { 'type' => 'empty_line', 
!                                                     'text' => '',
!                                                     'parent' => $current };
!                   next;
                  }
                }
***************
*** 4989,5015 ****
                    push @{$self->{'context_stack'}}, 'menu';
                  }
!                 if (! _ignore_global_commands($self)) {
!                   push @{$self->{'info'}->{'dircategory_direntry'}}, $block
!                     if ($command eq 'direntry');
!                   if ($self->{'current_node'}) {
!                     if ($command eq 'direntry') {
!                       if ($self->{'SHOW_MENU'}) {
!                         $self->line_warn($self->__("\@direntry after first node"),
!                                   $line_nr);
!                       }
!                     } elsif ($command eq 'menu') {
!                       push @{$self->{'current_node'}->{'menus'}}, $current;
!                     }
!                   } elsif ($command ne 'direntry') {
                      if ($self->{'SHOW_MENU'}) {
!                       $self->line_error(sprintf($self->__("\@%s seen before first \@node"), 
!                                                 $command), $line_nr);
!                       $self->line_error($self->__(
!       "perhaps your \@top node should be wrapped in \@ifnottex rather than \@ifinfo?"), 
!                                     $line_nr, 1);
!                     }
!                     if ($command eq 'menu') {
!                       push @{$self->{'info'}->{'unassociated_menus'}}, $current;
                      }
                    }
                  }
--- 4857,4881 ----
                    push @{$self->{'context_stack'}}, 'menu';
                  }
!                 push @{$self->{'info'}->{'dircategory_direntry'}}, $block
!                   if ($command eq 'direntry');
!                 if ($self->{'current_node'}) {
!                   if ($command eq 'direntry') {
                      if ($self->{'SHOW_MENU'}) {
!                       $self->line_warn($self->__("\@direntry after first node"),
!                                 $line_nr);
                      }
+                   } elsif ($command eq 'menu') {
+                     push @{$self->{'current_node'}->{'menus'}}, $current;
+                   }
+                 } elsif ($command ne 'direntry') {
+                   if ($self->{'SHOW_MENU'}) {
+                     $self->line_error(sprintf($self->__("\@%s seen before first \@node"), 
+                                               $command), $line_nr);
+                     $self->line_error($self->__(
+       "perhaps your \@top node should be wrapped in \@ifnottex rather than \@ifinfo?"), 
+                                   $line_nr, 1);
+                   }
+                   if ($command eq 'menu') {
+                     push @{$self->{'info'}->{'unassociated_menus'}}, $current;
                    }
                  }
***************
*** 5038,5042 ****
            
            push @{$current->{'contents'}}, { 'cmdname' => $command, 
!                                             'parent' => $current, 
                                              'contents' => [] };
            $current->{'contents'}->[-1]->{'line_nr'} = $line_nr
--- 4904,4908 ----
            
            push @{$current->{'contents'}}, { 'cmdname' => $command, 
!                                             'parent' => $current,
                                              'contents' => [] };
            $current->{'contents'}->[-1]->{'line_nr'} = $line_nr
***************
*** 5059,5065 ****
            if ($self->{'definfoenclose'}->{$command}) {
              $current->{'type'} = 'definfoenclose_command';
!             $current->{'extra'} = { 
!                  'begin' => $self->{'definfoenclose'}->{$command}->[0], 
!                  'end' => $self->{'definfoenclose'}->{$command}->[1] };
            }
          } elsif (exists ($no_brace_commands{$command})) {
--- 4925,4932 ----
            if ($self->{'definfoenclose'}->{$command}) {
              $current->{'type'} = 'definfoenclose_command';
!             $current->{'extra'}->{'begin'} =
!                  $self->{'definfoenclose'}->{$command}->[0]; 
!             $current->{'extra'}->{'end'} =
!                  $self->{'definfoenclose'}->{$command}->[1]; 
            }
          } elsif (exists ($no_brace_commands{$command})) {
***************
*** 5097,5101 ****
              $current->{'remaining_args'} = $brace_commands{$command} -1
                    if ($brace_commands{$command} and $brace_commands{$command} -1);
-             $current->{'line_nr'} = $line_nr if ($brace_commands{$command});
              if ($self->{'definfoenclose'}->{$command}) {
                $current->{'remaining_args'} = 0;
--- 4964,4967 ----
***************
*** 5151,5161 ****
                  push @{$current->{'contents'}}, 
                    {'type' => 'empty_spaces_before_argument',
!                    'text' => '' };
                  $current->{'parent'}->{'extra'}->{'spaces_before_argument'}
                     = $current->{'contents'}->[-1];
                }
                if ($inline_commands{$command}) {
-                 # this is changed when the first argument is known.
-                 push @{$self->{'expanded_formats_stack'}}, 0;
                  push @{$self->{'context_stack'}}, $command
                    if ($command eq 'inlineraw');
--- 5017,5026 ----
                  push @{$current->{'contents'}}, 
                    {'type' => 'empty_spaces_before_argument',
!                    'text' => '',
!                    'parent' => $current };
                  $current->{'parent'}->{'extra'}->{'spaces_before_argument'}
                     = $current->{'contents'}->[-1];
                }
                if ($inline_commands{$command}) {
                  push @{$self->{'context_stack'}}, $command
                    if ($command eq 'inlineraw');
***************
*** 5181,5185 ****
              push @{$current->{'contents'}}, 
                  {'type' => 'empty_spaces_before_argument',
!                  'text' => '' };
              print STDERR "BRACKETED in def/multitable\n" if ($self->{'DEBUG'});
              $current->{'extra'}->{'spaces_before_argument'}
--- 5046,5051 ----
              push @{$current->{'contents'}}, 
                  {'type' => 'empty_spaces_before_argument',
!                  'text' => '',
!                  'parent' => $current };
              print STDERR "BRACKETED in def/multitable\n" if ($self->{'DEBUG'});
              $current->{'extra'}->{'spaces_before_argument'}
***************
*** 5189,5199 ****
            } elsif ($current->{'type'} 
                     and $current->{'type'} eq 'rawpreformatted') {
!             push @{$current->{'contents'}}, {'text' => '{' };
            # matching braces accepted in a rawpreformatted or math or ignored
            # code
            } elsif ($self->{'context_stack'}->[-1] eq 'math'
                     or $self->{'context_stack'}->[-1] eq 'rawpreformatted'
!                    or $self->{'context_stack'}->[-1] eq 'inlineraw'
!                    or $self->_ignore_global_commands()) {
              push @{$current->{'contents'}},
                   { 'type' => 'bracketed', 'contents' => [],
--- 5055,5065 ----
            } elsif ($current->{'type'} 
                     and $current->{'type'} eq 'rawpreformatted') {
!             push @{$current->{'contents'}}, {'text' => '{',
!                                              'parent' => $current };
            # matching braces accepted in a rawpreformatted or math or ignored
            # code
            } elsif ($self->{'context_stack'}->[-1] eq 'math'
                     or $self->{'context_stack'}->[-1] eq 'rawpreformatted'
!                    or $self->{'context_stack'}->[-1] eq 'inlineraw') {
              push @{$current->{'contents'}},
                   { 'type' => 'bracketed', 'contents' => [],
***************
*** 5208,5212 ****
          } elsif ($separator eq '}') {
            _abort_empty_line($self, $current);
-           #print STDERR "GGGGG". _print_current ($current);
            if ($current->{'type'} and ($current->{'type'} eq 'bracketed')) {
              $current = $current->{'parent'};
--- 5074,5077 ----
***************
*** 5279,5284 ****
                    if ($closed_command ne 'inforef' 
                        and !defined($args[3]) and !defined($args[4])
!                       and !$parsed_ref_node->{'manual_content'}
!                       and ! _ignore_global_commands($self)) {
                      push @{$self->{'internal_references'}}, $ref;
                    }
--- 5144,5148 ----
                    if ($closed_command ne 'inforef' 
                        and !defined($args[3]) and !defined($args[4])
!                       and !$parsed_ref_node->{'manual_content'}) {
                      push @{$self->{'internal_references'}}, $ref;
                    }
***************
*** 5340,5344 ****
                    }
                  }
-                 pop @{$self->{'expanded_formats_stack'}};
                }
                if (!@{$current_command->{'args'}} 
--- 5204,5207 ----
***************
*** 5348,5388 ****
                     sprintf($self->__("\@%s missing first argument"),
                             $current_command->{'cmdname'}), $line_nr);
-               } else {
-                 if ($explained_commands{$current_command->{'cmdname'}}) {
-                   my $normalized_type
-                     = Texinfo::Convert::NodeNameNormalization::normalize_node(
-                         {'contents' =>
-                          $current_command->{'extra'}->{'brace_command_contents'}->[0]});
-                   $current_command->{'extra'}->{'normalized'} = $normalized_type;
-                   if (!$current_command->{'extra'}->{'brace_command_contents'}->[1]) {
-                     if ($self->{'explained_commands'}->{$current_command->{'cmdname'}}->{$normalized_type}) {
-                       $current_command->{'extra'}->{'explanation_contents'} 
-                         = $self->{'explained_commands'}->{$current_command->{'cmdname'}}->{$normalized_type};
-                     }
-                   } elsif (! _ignore_global_commands($self)) {
-                     $self->{'explained_commands'}->{$current_command->{'cmdname'}}->{$normalized_type} 
-                       = $current_command->{'extra'}->{'brace_command_contents'}->[1];
-                   }
-                 }# else {
-                 #  my $argument
-                 #   = Texinfo::Convert::Text::convert({'contents' =>
-                 #       $current_command->{'extra'}->{'brace_command_contents'}->[0]},
-                 #       {Texinfo::Common::_convert_text_options($self)});
-                 #  $current_command->{'extra'}->{'format'} = $argument; 
-                 #}
                }
- 
              } elsif ($current->{'parent'}->{'cmdname'} eq 'errormsg') {
!               if (! _ignore_global_commands($self)) {
!                 my $error_message_text 
!                  = Texinfo::Convert::Text::convert($current,
!                             {Texinfo::Common::_convert_text_options($self)});
!                 $self->line_error($error_message_text, $line_nr);
!               }
! 
              } elsif ($current->{'parent'}->{'cmdname'} eq 'U') {
!               my $arg 
!                = Texinfo::Convert::Text::convert($current,
!                           {Texinfo::Common::_convert_text_options($self)});
                if (!defined($arg) || !$arg) {
                  $self->line_warn($self->__("no argument specified for \@U"),
--- 5211,5225 ----
                     sprintf($self->__("\@%s missing first argument"),
                             $current_command->{'cmdname'}), $line_nr);
                }
              } elsif ($current->{'parent'}->{'cmdname'} eq 'errormsg') {
!               my @contents = @{$current->{'contents'}};
!               _trim_spaces_comment_from_content (\@contents);
!               my $error_message_text = $contents[0]->{'text'};
!               $self->line_error($error_message_text, $line_nr)
!                 if $error_message_text;
              } elsif ($current->{'parent'}->{'cmdname'} eq 'U') {
!               my @contents = @{$current->{'contents'}};
!               _trim_spaces_comment_from_content (\@contents);
!               my $arg = $contents[0]->{'text'};
                if (!defined($arg) || !$arg) {
                  $self->line_warn($self->__("no argument specified for \@U"),
***************
*** 5409,5418 ****
                    # leave clue in case something else went wrong.
                    warn "\@U hex($arg) eval failed: $@\n" if ($self->{'DEBUG'});
!                   $self->line_error(
!       sprintf($self->__("argument for \@U exceeds size of integer: %s"), $arg),
!                     $line_nr);
! 
                  # ok, value can be given to hex(), so try it.
!                 } elsif (hex($arg) > 0x10FFFF) {
                    $self->line_error(
      sprintf($self->__("argument for \@U exceeds Unicode maximum 0x10FFFF: %s"),
--- 5246,5253 ----
                    # leave clue in case something else went wrong.
                    warn "\@U hex($arg) eval failed: $@\n" if ($self->{'DEBUG'});
!                   # argument likely exceeds size of integer
!                 }
                  # ok, value can be given to hex(), so try it.
!                 if ($@ or hex($arg) > 0x10FFFF) {
                    $self->line_error(
      sprintf($self->__("argument for \@U exceeds Unicode maximum 0x10FFFF: %s"),
***************
*** 5435,5439 ****
                push @{$current->{'parent'}->{'parent'}->{'contents'}}, 
                   {'type' => 'empty_spaces_after_close_brace',
!                   'text' => '' };                          
              }
              $current = $current->{'parent'}->{'parent'};
--- 5270,5276 ----
                push @{$current->{'parent'}->{'parent'}->{'contents'}}, 
                   {'type' => 'empty_spaces_after_close_brace',
!                   'text' => '',
!                   'parent' => $current->{'parent'}->{'parent'}
!                  };                          
              }
              $current = $current->{'parent'}->{'parent'};
***************
*** 5443,5447 ****
            } elsif ($current->{'type'}
                     and $current->{'type'} eq 'rawpreformatted') {
!             push @{$current->{'contents'}}, {'text' => '}' };
            # footnote caption closing, when there is a paragraph inside.
            } elsif ($context_brace_commands{$self->{'context_stack'}->[-1]}) {
--- 5280,5285 ----
            } elsif ($current->{'type'}
                     and $current->{'type'} eq 'rawpreformatted') {
!             push @{$current->{'contents'}}, {'text' => '}',
!                                              'parent' => $current };
            # footnote caption closing, when there is a paragraph inside.
            } elsif ($context_brace_commands{$self->{'context_stack'}->[-1]}) {
***************
*** 5488,5530 ****
            $current = $current->{'parent'};
            if ($inline_commands{$current->{'cmdname'}}) {
              if (! $current->{'extra'}->{'format'}) {
!               # change the top of the raw_formats_stack now that we know the
!               # first arg of the inlineraw
!               my $inline_type
!                 = Texinfo::Convert::Text::convert({'contents' =>
!                   $current->{'extra'}->{'brace_command_contents'}->[0]},
!                           {Texinfo::Common::_convert_text_options($self)});
!               if ($self->{'expanded_formats_stack'}->[-2]) {
!                 if ($inline_format_commands{$current->{'cmdname'}}) {
!                   if ($self->{'expanded_formats_hash'}->{$inline_type}) { 
!                     $self->{'expanded_formats_stack'}->[-1] = $inline_type;
!                     $current->{'extra'}->{'expand_index'} = 1;
!                   } else {
!                     $self->{'expanded_formats_stack'}->[-1] = 0;
!                   }
!                 } elsif (($current->{'cmdname'} eq 'inlineifset'
!                           and exists($self->{'values'}->{$inline_type}))
!                          or ($current->{'cmdname'} eq 'inlineifclear' 
!                              and ! exists($self->{'values'}->{$inline_type}))) {
!                   $self->{'expanded_formats_stack'}->[-1] 
!                          = "$current->{'cmdname'} $inline_type";
                    $current->{'extra'}->{'expand_index'} = 1;
                  } else {
!                   $self->{'expanded_formats_stack'}->[-1] = 0;
                  }
                } else {
!                 $self->{'expanded_formats_stack'}->[-1] = 0;
                }
                $current->{'extra'}->{'format'} = $inline_type;
!             } else {
!               # happens for the second arg of inlinefmtifelse
!               my $inline_type = $current->{'extra'}->{'format'};
!               if ($self->{'expanded_formats_stack'}->[-2]
!                   and ! ($self->{'expanded_formats_hash'}->{$inline_type})) {
!                 $self->{'expanded_formats_stack'}->[-1] = $inline_type;
                  $current->{'extra'}->{'expand_index'} = 2;
!               } else {
!                 $self->{'expanded_formats_stack'}->[-1] = 0;
                }
              }
            }
--- 5326,5435 ----
            $current = $current->{'parent'};
            if ($inline_commands{$current->{'cmdname'}}) {
+             my $expandp = 0;
              if (! $current->{'extra'}->{'format'}) {
!               my @contents;
!               my $inline_type;
!               if (defined
!                     $current->{'extra'}->{'brace_command_contents'}->[0]) {
!                 @contents
!                    = @{$current->{'extra'}->{'brace_command_contents'}->[0]};
!                 _trim_spaces_comment_from_content (\@contents);
!                 $inline_type = $contents[0]->{'text'};
!               }
! 
!               if (!$inline_type) {
!                 # condition is missing for some reason
!                 print STDERR "INLINE COND MISSING\n"
!                   if ($self->{'DEBUG'});
!               } elsif ($inline_format_commands{$current->{'cmdname'}}) {
!                 if ($self->{'expanded_formats_hash'}->{$inline_type}) { 
!                   $expandp = 1;
                    $current->{'extra'}->{'expand_index'} = 1;
                  } else {
!                   $expandp = 0;
                  }
+               } elsif (($current->{'cmdname'} eq 'inlineifset'
+                         and exists($self->{'values'}->{$inline_type}))
+                        or ($current->{'cmdname'} eq 'inlineifclear' 
+                            and ! exists($self->{'values'}->{$inline_type}))) {
+                 $expandp = 1;
+                 $current->{'extra'}->{'expand_index'} = 1;
                } else {
!                 $expandp = 0;
                }
                $current->{'extra'}->{'format'} = $inline_type;
! 
!               # Skip first argument for a false @inlinefmtifelse
!               if (!$expandp and $current->{'cmdname'} eq 'inlinefmtifelse') {
                  $current->{'extra'}->{'expand_index'} = 2;
! 
!                 # Add a dummy argument for the first argument.
!                 push @{$current->{'args'}}, {'type' => 'elided',
!                                              'parent' => $current,
!                                              'contents' => []};
!                _register_command_arg($self, $current->{'args'}->[-1],
!                                      'brace_command_contents');
! 
!                 # Scan forward to get the next argument.
!                 my $brace_count = 1;
!                 while ($brace_count > 0) {
!                   # Forward to next comma or brace
!                   if ($line =~ s/[^{,}]*([,{}])//) {
!                     if ($1 eq ',' and $brace_count == 1) {
!                       last;
!                     } elsif ($1 eq '{') {
!                       $brace_count++;
!                     } elsif ($1 eq '}') {
!                       $brace_count--;
!                     }
!                   } else {
!                     my $new_text;
!                     ($new_text, $line_nr) = _next_text($self,
!                                                        $line_nr, $current);
!                     if (!$new_text) {
!                       # ERROR - unbalanced brace
!                     }
!                     $line .= $new_text;
!                   }
!                 }
!                 if ($brace_count == 0) {
!                   # second arg missing
!                   $line = '}' . $line;
!                 }
!                 $current->{'remaining_args'}--;
!                 $expandp = 1;
                }
+             } elsif ($current->{'cmdname'} eq 'inlinefmtifelse') {
+               # Second arg of @inlinefmtifelse when condition is true.
+               # Discard second argument.
+               $expandp = 0;
+             }
+             # If this command is not being expanded, add a dummy argument,
+             # and scan forward to the closing brace.
+             if (!$expandp) {
+               push @{$current->{'args'}}, {'type' => 'elided',
+                                            'parent' => $current,
+                                            'contents' => []};
+               my $brace_count = 1;
+               while ($brace_count > 0) {
+                 if ($line =~ s/[^{}]*([{}])//) {
+                   if ($1 eq '{') {
+                     $brace_count++;
+                   } else {
+                     $brace_count--;
+                   }
+                 } else {
+                   my $new_text;
+                   ($new_text, $line_nr) = _next_text($self,
+                                                      $line_nr, $current);
+                   $line .= $new_text;
+                   if (!$line) {
+                     # ERROR - unbalanced brace
+                   }
+                 }
+               }
+               $current = $current->{'args'}->[-1];
+               $line = '}' . $line;
+               next;
              }
            }
***************
*** 5532,5543 ****
            push @{$current->{'args'}},
                 { 'type' => $type, 'parent' => $current, 'contents' => [] };
-           #if ($inline_commands{$current->{'cmdname'}} 
-           #    and ! $self->{'expanded_formats_stack'}->[-1]) {
-           #  $current->{'args'}->[-1]->{'extra'}->{'ignore'} = 1;
-           #} 
            $current = $current->{'args'}->[-1];
            push @{$current->{'contents'}}, 
                   {'type' => 'empty_spaces_before_argument',
!                   'text' => '' };                          
          } elsif ($separator eq ',' and $current->{'type'}
              and $current->{'type'} eq 'misc_line_arg'
--- 5437,5445 ----
            push @{$current->{'args'}},
                 { 'type' => $type, 'parent' => $current, 'contents' => [] };
            $current = $current->{'args'}->[-1];
            push @{$current->{'contents'}}, 
                   {'type' => 'empty_spaces_before_argument',
!                   'text' => '',
!                   'parent' => $current };
          } elsif ($separator eq ',' and $current->{'type'}
              and $current->{'type'} eq 'misc_line_arg'
***************
*** 5608,5617 ****
      @{$self->{'context_stack'}} = ($self->{'context'});
    }
-   if (@{$self->{'expanded_formats_stack'}} != 1) {
-     if ($self->{'DEBUG'}) {
-       print STDERR "EXPANDED_FORMATS_STACK no empty end _parse_texi: ".join('|', @{$self->{'expanded_formats_stack'}})."\n";
-     }
-     @{$self->{'expanded_formats_stack'}} = ($self->{'expanded_formats_stack'}->[0]);
-   }
    return $root;
  }
--- 5510,5513 ----
***************
*** 5655,5659 ****
    if ($command eq 'set') {
      # REVALUE
-     #if ($line =~ s/^\s+([\w\-]+)(\s+(.*?))\s*$//) {
      if ($line =~ /^\s+([\w\-][^\s{\\}~`\^+"<>|@]*)(\@(c|comment)((\@|\s+).*)?|[^\S\f]+(.*?))?[^\S\f]*$/) {
        if ($line =~ s/\@(c|comment)((\@|\s+).*)?$//) {
--- 5551,5554 ----
***************
*** 5665,5670 ****
        $arg = '' if (!defined($arg));
        $args = [$name, $arg];
!       $self->{'values'}->{$name} = $arg
!         unless(_ignore_global_commands($self));
      } elsif ($line !~ /\S/) {
        $self->line_error(sprintf($self->
--- 5560,5564 ----
        $arg = '' if (!defined($arg));
        $args = [$name, $arg];
!       $self->{'values'}->{$name} = $arg;
      } elsif ($line !~ /\S/) {
        $self->line_error(sprintf($self->
***************
*** 5678,5686 ****
      if ($line =~ /^\s+([\w\-][^\s{\\}~`\^+"<>|@]*)\s*(\@(c|comment)((\@|\s+).*)?)?$/) {
        $args = [$1];
!       delete $self->{'values'}->{$1}
!         unless(_ignore_global_commands($self));
        $has_comment = 1 if (defined($3));
-       #$remaining = $line;
-       #$remaining =~ s/^\s+([\w\-]+)\s*(\@(c|comment)((\@|\s+).*)?)?//;
      } elsif ($line !~ /\S/) {
        $self->line_error(sprintf($self->
--- 5572,5577 ----
      if ($line =~ /^\s+([\w\-][^\s{\\}~`\^+"<>|@]*)\s*(\@(c|comment)((\@|\s+).*)?)?$/) {
        $args = [$1];
!       delete $self->{'values'}->{$1};
        $has_comment = 1 if (defined($3));
      } elsif ($line !~ /\S/) {
        $self->line_error(sprintf($self->
***************
*** 5694,5699 ****
      if ($line =~ /^\s+([[:alnum:]][[:alnum:]\-]*)\s*(\@(c|comment)((\@|\s+).*)?)?$/) {
        $args = [$1];
!       delete $self->{'macros'}->{$1}
!         unless(_ignore_global_commands($self));
        $has_comment = 1 if (defined($3));
        print STDERR "UNMACRO $1\n" if ($self->{'DEBUG'});
--- 5585,5589 ----
      if ($line =~ /^\s+([[:alnum:]][[:alnum:]\-]*)\s*(\@(c|comment)((\@|\s+).*)?)?$/) {
        $args = [$1];
!       delete $self->{'macros'}->{$1};
        $has_comment = 1 if (defined($3));
        print STDERR "UNMACRO $1\n" if ($self->{'DEBUG'});
***************
*** 5709,5714 ****
      if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) {
        $args = ['@'.$1];
!       $self->{'clickstyle'} = $1
!         unless(_ignore_global_commands($self));
        $remaining = $line;
        $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//;
--- 5599,5603 ----
      if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) {
        $args = ['@'.$1];
!       $self->{'clickstyle'} = $1;
        $remaining = $line;
        $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//;
***************
*** 5795,5800 ****
        my $existing_command = $3;
        $args = [$1, $3];
!       $self->{'aliases'}->{$new_command} = $existing_command
!         unless (_ignore_global_commands($self));
        if (exists($block_commands{$existing_command})) {
          $self->line_warn(sprintf($self->
--- 5684,5688 ----
        my $existing_command = $3;
        $args = [$1, $3];
!       $self->{'aliases'}->{$new_command} = $existing_command;
        if (exists($block_commands{$existing_command})) {
          $self->line_warn(sprintf($self->
***************
*** 5811,5816 ****
      if ($line =~ s/^([[:alnum:]][[:alnum:]\-]*)\s*,\s*([^\s,]*)\s*,\s*([^\s,]*)$//) {
        $args = [$1, $2, $3 ];
!       $self->{'definfoenclose'}->{$1} = [ $2, $3 ]
!         unless (_ignore_global_commands($self));
        print STDERR "DEFINFOENCLOSE \@$1: $2, $3\n" if ($self->{'DEBUG'});
      } else {
--- 5699,5703 ----
      if ($line =~ s/^([[:alnum:]][[:alnum:]\-]*)\s*,\s*([^\s,]*)\s*,\s*([^\s,]*)$//) {
        $args = [$1, $2, $3 ];
!       $self->{'definfoenclose'}->{$1} = [ $2, $3 ];
        print STDERR "DEFINFOENCLOSE \@$1: $2, $3\n" if ($self->{'DEBUG'});
      } else {
***************
*** 5852,5859 ****
          $in_code = 1 if ($command eq 'defcodeindex');
          $args = [$name];
!         if (! _ignore_global_commands($self)) {
!           $self->{'index_names'}->{$name} = {'in_code' => $in_code};
!           $self->_register_index_commands($name);
!         }
        }
      } else {
--- 5739,5753 ----
          $in_code = 1 if ($command eq 'defcodeindex');
          $args = [$name];
!         $self->{'index_names'}->{$name} = {'in_code' => $in_code};
!         if (!exists($self->{'index_names'}->{$name}->{'name'})) {
!           $self->{'index_names'}->{$name}->{'name'} = $name;
!         }
!         if (!exists($self->{'index_names'}->{$name}->{'contained_indices'})) {
!           $self->{'index_names'}->{$name}->{'contained_indices'}->{$name} = 1;
!         }
!         $self->{'misc_commands'}->{$name.'index'} = 'line';
!         $self->{'no_paragraph_commands'}->{$name.'index'} = 1;
!         $self->{'valid_nestings'}->{$name.'index'} = \%in_simple_text_commands;
!         $self->{'command_index'}->{$name.'index'} = $name;
        }
      } else {
***************
*** 5886,5899 ****
            my $in_code = 0;
            $in_code = 1 if ($command eq 'syncodeindex');
!           if (! _ignore_global_commands($self)) {
!             $self->{'merged_indices'}->{$index_from} = $current_to;
!             $index_from_info->{'in_code'} = $in_code;
!             foreach my $contained_index (keys %{$index_from_info->{'contained_indices'}}) {
!               $index_to_info->{'contained_indices'}->{$contained_index} = 1;
!               $self->{'index_names'}->{$contained_index}->{'merged_in'} = $current_to;
!             }
!             $index_from_info->{'merged_in'} = $current_to;
!             $index_to_info->{'contained_indices'}->{$index_from} = 1;
            }
            $args = [$index_from, $index_to];
          } else {
--- 5780,5791 ----
            my $in_code = 0;
            $in_code = 1 if ($command eq 'syncodeindex');
!           $self->{'merged_indices'}->{$index_from} = $current_to;
!           $index_from_info->{'in_code'} = $in_code;
!           foreach my $contained_index (keys %{$index_from_info->{'contained_indices'}}) {
!             $index_to_info->{'contained_indices'}->{$contained_index} = 1;
!             $self->{'index_names'}->{$contained_index}->{'merged_in'} = $current_to;
            }
+           $index_from_info->{'merged_in'} = $current_to;
+           $index_to_info->{'contained_indices'}->{$index_from} = 1;
            $args = [$index_from, $index_to];
          } else {
***************
*** 6001,6005 ****
      }
    } elsif ($command eq 'exampleindent') {
!     if ($line =~ /^([0-9]+)/) {
        $args = [$1];
      } elsif ($line =~ /^(asis)$/) {
--- 5893,5897 ----
      }
    } elsif ($command eq 'exampleindent') {
!     if ($line =~ /^([0-9]+)$/) {
        $args = [$1];
      } elsif ($line =~ /^(asis)$/) {
***************
*** 6024,6029 ****
    } elsif ($command eq 'kbdinputstyle') {
      if ($line eq 'code' or $line eq 'example' or $line eq 'distinct') {
!       $self->{'kbdinputstyle'} = $line
!           unless (_ignore_global_commands($self));
        $args = [$line];
      } else {
--- 5916,5920 ----
    } elsif ($command eq 'kbdinputstyle') {
      if ($line eq 'code' or $line eq 'example' or $line eq 'distinct') {
!       $self->{'kbdinputstyle'} = $line;
        $args = [$line];
      } else {
***************
*** 6129,6135 ****
  conditional blocks should be expanded.  Default is empty.
  
- The raw block formats (within C<@html> blocks, for example) are 
- always kept.
- 
  =item gettext
  
--- 6020,6023 ----
***************
*** 6301,6304 ****
--- 6189,6197 ----
  An array of menus that are not associated with a node.
  
+ =item novalidate
+ 
+ If set, it is as if C<@novalidate> was set in the document.
+ 
+ 
  =back
  
***************
*** 6414,6421 ****
  The index name.
  
- =item index_prefix
- 
- The associated index prefix.
- 
  =item index_at_command
  
--- 6307,6310 ----
***************
*** 6458,6462 ****
  =back
  
! The following shows the references corresponding with the default indexes
  I<cp> and I<fn>, the I<fn> index having its entries formatted as code and 
  the indices corresponding to the following texinfo
--- 6347,6351 ----
  =back
  
! The following shows the references corresponding to the default indexes
  I<cp> and I<fn>, the I<fn> index having its entries formatted as code and 
  the indices corresponding to the following texinfo
***************
*** 6465,6477 ****
    @defcodeindex code
  
!   $index_names = {'cp' => {'name' => 'cp', 'in_code' => 0, 
!                                            'prefix' => ['c', 'cp']},
!                   'fn' => {'name' => 'fn', 'in_code' => 1, 
!                                            'prefix' => ['f', 'fn']},
                    'some' => {'in_code' => 0},
                    'code' => {'in_code' => 1}};
  
! If C<name> is not set, it is set to the index name.  If C<prefix> is 
! not set, it is set to an array containing the index name.
  
  I<$merged_indices_hash> is a hash reference, the key is an index
--- 6354,6363 ----
    @defcodeindex code
  
!   $index_names = {'cp' => {'name' => 'cp', 'in_code' => 0, },
!                   'fn' => {'name' => 'fn', 'in_code' => 1, },
                    'some' => {'in_code' => 0},
                    'code' => {'in_code' => 1}};
  
! If C<name> is not set, it is set to the index name.
  
  I<$merged_indices_hash> is a hash reference, the key is an index
***************
*** 6500,6519 ****
  A string corresponding to a document language set by C<@documentlanguage>.
  
- =item explained_commands
- 
- A hash reference of explained commands (currently abbr or acronym).
- The value is also a hash reference.  The key of this hash is a normalized
- first argument of these commands, the value is a content array
- corresponding to the explanation associated with this first argument.
- 
- For example giving as an option:
- 
-   'explained_commands' 
-     => {'acronym' => {'EU' => [{'text' => 'European Union'}]} 
- 
- is the same as having the following texinfo code in the document:
- 
-   @acronym{EU, European Union}
- 
  =item INPUT_ENCODING_NAME
  
--- 6386,6389 ----
***************
*** 6564,6569 ****
                {'text' => 'arg', 'type' => 'macro_arg}],
     'contents' => [{'text' => "coucou \arg\ after arg\n", 'type' => 'raw'}],
!    'extra' => {'arg_line' => " mymacro{arg}\n",
!                'macrobody' => "coucou \arg\ after arg\n"}}
  
  = item merged_indices
--- 6434,6438 ----
                {'text' => 'arg', 'type' => 'macro_arg}],
     'contents' => [{'text' => "coucou \arg\ after arg\n", 'type' => 'raw'}],
!    'extra' => {'arg_line' => " mymacro{arg}\n", }}
  
  = item merged_indices
***************
*** 6572,6579 ****
  is merged in the value.  Same as setting C<@synindex> or C<syncodeindex>.
  
- =item novalidate
- 
- If set, it is as if C<@novalidate> was set in the document.
- 
  =item sections_level
  
--- 6441,6444 ----
***************
*** 7136,7143 ****
  
  I<invalid_syntax> is set if there was an error on the C<@macro>
! line.  The key I<args_index> associates format arguments with
! their index on the @macro line formal arguments definition.
! The I<macrobody> holds the @macro body.  I<arg_line> holds the
! line after C<@macro>.
  
  =item C<@node>
--- 7001,7005 ----
  
  I<invalid_syntax> is set if there was an error on the C<@macro>
! line.  I<arg_line> holds the line after C<@macro>.
  
  =item C<@node>
***************
*** 7204,7211 ****
  =item C<@acronym>
  
! The first argument normalized is in I<normalized>.  If there is no
! second argument, but a second argument appeared previously for the
! same first argument, the second argument content of the previous
! command is stored in I<explanation_contents>.
  
  =item definition command
--- 7066,7070 ----
  =item C<@acronym>
  
! The first argument normalized is in I<normalized>.
  
  =item definition command
***************
*** 7236,7242 ****
  The key I<max_columns> holds the maximal number of columns.  If there
  are prototypes on the line they are in the array associated with 
! I<prototypes>.  In that case, I<prototypes_line> also holds this 
! information, and, in addition, keeps spaces with type C<prototype_space>.  
! If there is a C<@columnfractions> as argument, then the 
  I<columnfractions> key is associated with the array of columnfractions
  arguments, holding all the column fractions.
--- 7095,7099 ----
  The key I<max_columns> holds the maximal number of columns.  If there
  are prototypes on the line they are in the array associated with 
! I<prototypes>.  If there is a C<@columnfractions> as argument, then the 
  I<columnfractions> key is associated with the array of columnfractions
  arguments, holding all the column fractions.
diff -Nrc2 texinfo-6.1/tp/Texinfo/Report.pm texinfo-6.3/tp/Texinfo/Report.pm
*** texinfo-6.1/tp/Texinfo/Report.pm	2016-02-06 11:31:29.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Report.pm	2016-09-10 20:27:56.000000000 +0100
***************
*** 245,249 ****
  }
  
! # handle translations of in-document strings.
  sub gdt($$;$$)
  {
--- 245,250 ----
  }
  
! # Get document translation - handle translations of in-document strings.
! # Return a parsed Texinfo tree
  sub gdt($$;$$)
  {
***************
*** 377,381 ****
      foreach my $substitution(keys %$context) {
        #print STDERR "$translation_result $substitution $context->{$substitution}\n";
!       $parser_conf->{'values'}->{'_'.$substitution} = $context->{$substitution};
      }
    }
--- 378,386 ----
      foreach my $substitution(keys %$context) {
        #print STDERR "$translation_result $substitution $context->{$substitution}\n";
!       # Only pass simple string @values to parser.
!       if (!ref($context->{$substitution})) {
!         $parser_conf->{'values'}->{'_'.$substitution}
!         = $context->{$substitution};
!       }
      }
    }
***************
*** 412,415 ****
--- 417,467 ----
      $tree = $parser->parse_texi_line($translation_result);
    }
+   $tree = _substitute ($tree, $context);
+   return $tree;
+ }
+ 
+ sub _substitute_element_array ($$);
+ sub _substitute_element_array ($$) {
+   my $array = shift; my $context = shift;
+ 
+   @{$array} = map {
+     if ($_->{'cmdname'} and $_->{'cmdname'} eq 'value') {
+       my $name = $_->{'type'};
+       $name =~ s/^_//;
+       if (ref($context->{$name}) eq 'HASH') {
+         ( $context->{$name} );
+       } elsif (ref($context->{$name}) eq 'ARRAY') {
+         @{$context->{$name}};
+       }
+     } else {
+       _substitute($_, $context);
+       ( $_ );
+     }
+   } @{$array};
+ }
+ 
+ # Recursively substitute @value elements in $TREE with their values given
+ # in $CONTEXT.
+ sub _substitute ($$);
+ sub _substitute ($$) {
+   my $tree = shift; my $context = shift;
+ 
+   if ($tree->{'contents'}) {
+     _substitute_element_array ($tree->{'contents'}, $context);
+   }
+ 
+   if ($tree->{'args'}) {
+     _substitute_element_array ($tree->{'args'}, $context);
+   }
+ 
+   # Used for @email and @url
+   if ($tree->{'extra'} and $tree->{'extra'}{'brace_command_contents'}) {
+     for my $arg (@{$tree->{'extra'}{'brace_command_contents'}}) {
+       if ($arg) {
+         _substitute_element_array ($arg, $context);
+       }
+     }
+   }
+ 
    return $tree;
  }
diff -Nrc2 texinfo-6.1/tp/Texinfo/Structuring.pm texinfo-6.3/tp/Texinfo/Structuring.pm
*** texinfo-6.1/tp/Texinfo/Structuring.pm	2016-02-06 11:31:29.000000000 +0000
--- texinfo-6.3/tp/Texinfo/Structuring.pm	2016-09-10 20:27:56.000000000 +0100
***************
*** 2,6 ****
  #                 document tree.
  #
! # Copyright 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
  # 
  # This program is free software; you can redistribute it and/or modify
--- 2,7 ----
  #                 document tree.
  #
! # Copyright 2010, 2011, 2012, 2013, 2014, 2015, 2016 Free Software Foundation, 
! # Inc.
  # 
  # This program is free software; you can redistribute it and/or modify
***************
*** 30,33 ****
--- 31,36 ----
  use Texinfo::Convert::Texinfo;
  
+ *node_extra_to_texi = \&Texinfo::Convert::Texinfo::node_extra_to_texi;
+ 
  use Carp qw(cluck);
  
***************
*** 71,75 ****
  );
  
! $VERSION = '6.1';
  
  
--- 74,78 ----
  );
  
! $VERSION = '6.2';
  
  
***************
*** 542,550 ****
      if ($check_menu_entries) {
        $self->line_error(sprintf($self->
!        __("\@%s reference to nonexistent node `%s'"), 
!          $command,
!          Texinfo::Parser::_node_extra_to_texi(
!                  $menu_content->{'extra'}->{'menu_entry_node'})), 
!         $menu_content->{'line_nr'});
      }
    } else {
--- 545,551 ----
      if ($check_menu_entries) {
        $self->line_error(sprintf($self->
!        __("\@%s reference to nonexistent node `%s'"), $command,
!           node_extra_to_texi($menu_content->{'extra'}->{'menu_entry_node'})), 
!        $menu_content->{'line_nr'});
      }
    } else {
***************
*** 557,565 ****
         __("\@%s entry node name `%s' different from %s name `%s'"), 
           $command,
!          Texinfo::Parser::_node_extra_to_texi(
!                  $menu_content->{'extra'}->{'menu_entry_node'}),
           $menu_node->{'cmdname'},
!          Texinfo::Parser::_node_extra_to_texi($menu_node->{'extra'})),
!         $menu_content->{'line_nr'});
      }
    }
--- 558,565 ----
         __("\@%s entry node name `%s' different from %s name `%s'"), 
           $command,
!          node_extra_to_texi($menu_content->{'extra'}->{'menu_entry_node'}),
           $menu_node->{'cmdname'},
!          node_extra_to_texi($menu_node->{'extra'})),
!                             $menu_content->{'line_nr'});
      }
    }
***************
*** 577,581 ****
    my $top_node_up;
  
!   my $check_menu_entries = (!$self->{'novalidate'} and $self->{'SHOW_MENU'});
  
    foreach my $node (@{$self->{'nodes'}}) {
--- 577,582 ----
    my $top_node_up;
  
!   my $check_menu_entries = (!$self->{'info'}->{'novalidate'}
!                               and $self->{'SHOW_MENU'});
  
    foreach my $node (@{$self->{'nodes'}}) {
***************
*** 586,590 ****
        $top_node_up
          = {'type' => 'top_node_up',
!            'extra' => Texinfo::Parser::_parse_node_manual(
                  {'contents' => $top_node_up_content_tree->{'contents'}})};
      }
--- 587,591 ----
        $top_node_up
          = {'type' => 'top_node_up',
!            'extra' => Texinfo::Common::parse_node_manual(
                  {'contents' => $top_node_up_content_tree->{'contents'}})};
      }
***************
*** 661,669 ****
      if ($self->{'SHOW_MENU'} and $node ne $top_node and !$node->{'menu_up'}) {
        $self->line_warn(sprintf($self->__("unreferenced node `%s'"), 
!                     Texinfo::Parser::_node_extra_to_texi($node->{'extra'})), 
!                        $node->{'line_nr'});
      }
-     #print STDERR "Processing "
-     #  .Texinfo::Parser::_node_extra_to_texi($node->{'extra'})."\n";
     
      my $automatic_directions = 
--- 662,667 ----
      if ($self->{'SHOW_MENU'} and $node ne $top_node and !$node->{'menu_up'}) {
        $self->line_warn(sprintf($self->__("unreferenced node `%s'"), 
!                     node_extra_to_texi($node->{'extra'})), $node->{'line_nr'});
      }
     
      my $automatic_directions = 
***************
*** 707,713 ****
                    $self->line_warn(sprintf($self->
                      __("node `%s' is %s for `%s' in sectioning but not in menu"), 
!                   Texinfo::Parser::_node_extra_to_texi($node->{'node_'.$direction}->{'extra'}), 
                    $direction,
!                   Texinfo::Parser::_node_extra_to_texi($node->{'extra'})),
                    $node->{'line_nr'});
                  } elsif ($node->{'menu_'.$direction} ne $node->{'node_'.$direction}) {
--- 705,711 ----
                    $self->line_warn(sprintf($self->
                      __("node `%s' is %s for `%s' in sectioning but not in menu"), 
!                   node_extra_to_texi($node->{'node_'.$direction}->{'extra'}), 
                    $direction,
!                   node_extra_to_texi($node->{'extra'})),
                    $node->{'line_nr'});
                  } elsif ($node->{'menu_'.$direction} ne $node->{'node_'.$direction}) {
***************
*** 715,721 ****
                      __("node %s `%s' in menu `%s' and in sectioning `%s' differ"), 
                      $direction,
!                     Texinfo::Parser::_node_extra_to_texi($node->{'extra'}),
!                     Texinfo::Parser::_node_extra_to_texi($node->{'menu_'.$direction}->{'extra'}), 
!                     Texinfo::Parser::_node_extra_to_texi($node->{'node_'.$direction}->{'extra'})),
                      $node->{'line_nr'});
                  }
--- 713,719 ----
                      __("node %s `%s' in menu `%s' and in sectioning `%s' differ"), 
                      $direction,
!                     node_extra_to_texi($node->{'extra'}),
!                     node_extra_to_texi($node->{'menu_'.$direction}->{'extra'}), 
!                     node_extra_to_texi($node->{'node_'.$direction}->{'extra'})),
                      $node->{'line_nr'});
                  }
***************
*** 732,738 ****
                $self->line_warn(sprintf($self->
                    __("node `%s' is %s for `%s' in menu but not in sectioning"), 
!                 Texinfo::Parser::_node_extra_to_texi($node->{'menu_'.$direction}->{'extra'}),
!                 $direction,
!                 Texinfo::Parser::_node_extra_to_texi($node->{'extra'}), 
                    ), 
                  $node->{'line_nr'});
--- 730,736 ----
                $self->line_warn(sprintf($self->
                    __("node `%s' is %s for `%s' in menu but not in sectioning"), 
!                 node_extra_to_texi($node->{'menu_'.$direction}->{'extra'}),
!                                    $direction,
!                 node_extra_to_texi($node->{'extra'}), 
                    ), 
                  $node->{'line_nr'});
***************
*** 782,801 ****
              $node->{'node_'.$direction} = $node_target;
  
!             if (! $self->{'novalidate'} and ! _check_node_same_texinfo_code(
!                 $node_target, $node_direction)) {
                $self->line_warn(sprintf($self->
                  __("%s pointer `%s' (for node `%s') different from %s name `%s'"),
                    $direction_texts{$direction},
!                   Texinfo::Parser::_node_extra_to_texi(
!                         $node_direction),
!                   Texinfo::Parser::_node_extra_to_texi(
!                         $node->{'extra'}),
!                   $node_target->{'cmdname'},
!                   Texinfo::Parser::_node_extra_to_texi(
!                         $node_target->{'extra'})),
!                 $node->{'line_nr'});
              }
            } else {
!             if ($self->{'novalidate'}) {
                $node->{'node_'.$direction} = { 'extra' => $node_direction };
              # special case of up for top an internal node and the same
--- 780,797 ----
              $node->{'node_'.$direction} = $node_target;
  
!             if (!$self->{'info'}->{'novalidate'}
!                 and !_check_node_same_texinfo_code($node_target,
!                                                    $node_direction)) {
                $self->line_warn(sprintf($self->
                  __("%s pointer `%s' (for node `%s') different from %s name `%s'"),
                    $direction_texts{$direction},
!                   node_extra_to_texi($node_direction),
!                   node_extra_to_texi($node->{'extra'}),
!                                      $node_target->{'cmdname'},
!                   node_extra_to_texi($node_target->{'extra'})),
!                                      $node->{'line_nr'});
              }
            } else {
!             if ($self->{'info'}->{'novalidate'}) {
                $node->{'node_'.$direction} = { 'extra' => $node_direction };
              # special case of up for top an internal node and the same
***************
*** 814,819 ****
                                    __("%s reference to nonexistent `%s'"),
                      $direction_texts{$direction},
!                     Texinfo::Parser::_node_extra_to_texi($node_direction)), 
!                     $node->{'line_nr'});
              }
            }
--- 810,814 ----
                                    __("%s reference to nonexistent `%s'"),
                      $direction_texts{$direction},
!                     node_extra_to_texi($node_direction)), $node->{'line_nr'});
              }
            }
***************
*** 833,838 ****
          $self->line_error(sprintf($self->
             __("node `%s' lacks menu item for `%s' despite being its Up target"), 
!            Texinfo::Parser::_node_extra_to_texi($node->{'node_up'}->{'extra'}), 
!            Texinfo::Parser::_node_extra_to_texi($node->{'extra'})),
             $node->{'node_up'}->{'line_nr'});
        # This leads to an error when there is an external nodes as up, and 
--- 828,833 ----
          $self->line_error(sprintf($self->
             __("node `%s' lacks menu item for `%s' despite being its Up target"), 
!            node_extra_to_texi($node->{'node_up'}->{'extra'}), 
!            node_extra_to_texi($node->{'extra'})),
             $node->{'node_up'}->{'line_nr'});
        # This leads to an error when there is an external nodes as up, and 
***************
*** 841,847 ****
          $self->line_warn(sprintf($self->
             __("for `%s', up in menu `%s' and up `%s' don't match"), 
!           Texinfo::Parser::_node_extra_to_texi($node->{'extra'}),
!           Texinfo::Parser::_node_extra_to_texi($node->{'menu_up'}->{'extra'}), 
!           Texinfo::Parser::_node_extra_to_texi($node->{'node_up'}->{'extra'})),
                          $node->{'line_nr'});
        }
--- 836,842 ----
          $self->line_warn(sprintf($self->
             __("for `%s', up in menu `%s' and up `%s' don't match"), 
!           node_extra_to_texi($node->{'extra'}),
!           node_extra_to_texi($node->{'menu_up'}->{'extra'}), 
!           node_extra_to_texi($node->{'node_up'}->{'extra'})),
                          $node->{'line_nr'});
        }
***************
*** 852,855 ****
--- 847,852 ----
  }
  
+ # Return a list of elements to be converted into pages.  Each element starts
+ # with a @node as its first child (except possibly the first one).
  sub split_by_node($)
  {
***************
*** 960,964 ****
  }
  
! # associate elements to pages according to the splitting specification.
  sub split_pages ($$)
  {
--- 957,963 ----
  }
  
! # Associate top-level elements with pages according to the splitting 
! # specification.  Set 'first_in_page' on each top-level element to the element 
! # that is the first in the output page.
  sub split_pages ($$)
  {
***************
*** 1322,1347 ****
    return if (!defined($refs));
    foreach my $ref (@$refs) {
!     if (!defined($labels->{$ref->{'extra'}->{'node_argument'}->{'normalized'}})
!          and !$self->{'novalidate'}) {
!       $self->line_error(sprintf($self->__("\@%s reference to nonexistent node `%s'"),
!                            $ref->{'cmdname'}, 
!                            Texinfo::Parser::_node_extra_to_texi(
!                                 $ref->{'extra'}->{'node_argument'})), 
!                         $ref->{'line_nr'})
      } else {
        my $node_target 
          = $labels->{$ref->{'extra'}->{'node_argument'}->{'normalized'}};
        $ref->{'extra'}->{'label'} = $node_target;
!       if (! $self->{'novalidate'} and ! _check_node_same_texinfo_code(
!           $node_target, $ref->{'extra'}->{'node_argument'})) {
          $self->line_warn(sprintf($self->
             __("\@%s to `%s', different from %s name `%s'"), 
             $ref->{'cmdname'},
!            Texinfo::Parser::_node_extra_to_texi(
!               $ref->{'extra'}->{'node_argument'}),
             $node_target->{'cmdname'},
!            Texinfo::Parser::_node_extra_to_texi(
!                         $node_target->{'extra'})),
!           $ref->{'line_nr'});
        }
      }
--- 1321,1344 ----
    return if (!defined($refs));
    foreach my $ref (@$refs) {
!     if (!defined($labels->{$ref->{'extra'}{'node_argument'}{'normalized'}})) {
!       if (!$self->{'info'}->{'novalidate'}) {
!         $self->line_error(sprintf($self->__("\@%s reference to nonexistent node `%s'"),
!                 $ref->{'cmdname'}, 
!                 node_extra_to_texi($ref->{'extra'}->{'node_argument'})), 
!                           $ref->{'line_nr'})
!       }
      } else {
        my $node_target 
          = $labels->{$ref->{'extra'}->{'node_argument'}->{'normalized'}};
        $ref->{'extra'}->{'label'} = $node_target;
!       if (!$self->{'info'}->{'novalidate'}
!           and !_check_node_same_texinfo_code($node_target,
!                                          $ref->{'extra'}->{'node_argument'})) {
          $self->line_warn(sprintf($self->
             __("\@%s to `%s', different from %s name `%s'"), 
             $ref->{'cmdname'},
!            node_extra_to_texi($ref->{'extra'}->{'node_argument'}),
             $node_target->{'cmdname'},
!            node_extra_to_texi($node_target->{'extra'})), $ref->{'line_nr'});
        }
      }
***************
*** 1361,1366 ****
        $float_index++;
        my $number;
!       if ($float->{'float_section'}) {
!         my $up = $float->{'float_section'};
          while ($up->{'section_up'} 
                 #and $command_structuring_level{$up->{'cmdname'}} 
--- 1358,1363 ----
        $float_index++;
        my $number;
!       if ($float->{'extra'}->{'float_section'}) {
!         my $up = $float->{'extra'}->{'float_section'};
          while ($up->{'section_up'} 
                 #and $command_structuring_level{$up->{'cmdname'}} 
diff -Nrc2 texinfo-6.1/tp/t/16raw.t texinfo-6.3/tp/t/16raw.t
*** texinfo-6.1/tp/t/16raw.t	2014-04-22 02:56:40.000000000 +0100
--- texinfo-6.3/tp/t/16raw.t	2016-07-31 16:35:11.000000000 +0100
***************
*** 27,31 ****
  in verbatim2
  @end verbatim
! '],
  ['misc_raw_comments','
  @html @c comment space
--- 27,33 ----
  in verbatim2
  @end verbatim
! ',
! {'expanded_formats' => ['tex', 'html']}
! ],
  ['misc_raw_comments','
  @html @c comment space
***************
*** 39,43 ****
  in verbatim2
  @end verbatim
! '],
  ['raw_in_para',
  'para
--- 41,47 ----
  in verbatim2
  @end verbatim
! ',
! {'expanded_formats' => ['tex', 'html']}
! ],
  ['raw_in_para',
  'para
***************
*** 60,64 ****
  
  End.
! '],
  ['raw_in_example',
  '@example
--- 64,70 ----
  
  End.
! ',
! {'expanded_formats' => ['tex', 'html']}
! ],
  ['raw_in_example',
  '@example
***************
*** 88,92 ****
  @end example
  
! '],
  ['braces_in_tex',
  '
--- 94,100 ----
  @end example
  
! ',
! {'expanded_formats' => ['tex', 'html']}
! ],
  ['braces_in_tex',
  '
***************
*** 110,114 ****
  @end example
  
! '],
  ['lone_braces_in_html',
  '@html
--- 118,124 ----
  @end example
  
! ',
! {'expanded_formats' => ['tex']}
! ],
  ['lone_braces_in_html',
  '@html
***************
*** 119,123 ****
  {
  @end html
! '],
  ['verbatim_and_verbatiminclude',
  '@verbatim
--- 129,135 ----
  {
  @end html
! ',
! {'expanded_formats' => ['html']}
! ],
  ['verbatim_and_verbatiminclude',
  '@verbatim
***************
*** 271,275 ****
  in block
  @end verbatim. A symbol after the closing command.
! '],
  ['inlinefmt',
  'A @inlinefmt{plaintext, plaintext `` @lbracechar{} } a.  Now html
--- 283,289 ----
  in block
  @end verbatim. A symbol after the closing command.
! ',
! {'expanded_formats' => ['tex', 'html']}
! ],
  ['inlinefmt',
  'A @inlinefmt{plaintext, plaintext `` @lbracechar{} } a.  Now html
***************
*** 292,296 ****
  in <i>@acronym{HTML}</i>}.
  @end example
! '],
  ['raw_in_style',
  '@code{
--- 306,312 ----
  in <i>@acronym{HTML}</i>}.
  @end example
! ',
! {'expanded_formats' => ['plaintext', 'html']}
! ],
  ['raw_in_style',
  '@code{
***************
*** 304,308 ****
  in html
  @end html
! }',{'expanded_formats' => ['html']}],
  ['verbatim_in_brace_command',
  '@samp{
--- 320,325 ----
  in html
  @end html
! }',{'expanded_formats' => ['html']}, {'expanded_formats' => ['html']}
! ],
  ['verbatim_in_brace_command',
  '@samp{
***************
*** 325,329 ****
  
  This is some \LaTeX{}
! '],
  ['verbatim_not_closed',
  '@verbatim
--- 342,348 ----
  
  This is some \LaTeX{}
! ',
! {'expanded_formats' => ['tex']}
! ],
  ['verbatim_not_closed',
  '@verbatim
***************
*** 356,360 ****
  '
  @tex in tex @end tex
! '],
  );
  
--- 375,381 ----
  '
  @tex in tex @end tex
! ',
! {'expanded_formats' => ['tex']}
! ],
  );
  
diff -Nrc2 texinfo-6.1/tp/t/30sectioning.t texinfo-6.3/tp/t/30sectioning.t
*** texinfo-6.1/tp/t/30sectioning.t	2015-10-02 16:30:47.000000000 +0100
--- texinfo-6.3/tp/t/30sectioning.t	2016-05-29 13:51:31.000000000 +0100
***************
*** 82,87 ****
  
  my $section_in_unnumbered_text = '
- @setcontentsaftertitlepage
- 
  @node Top
  @top Test section in unnumbered
--- 82,85 ----
***************
*** 306,323 ****
  
  my @tests_converted = (
- ['setcontentsaftertitlepage',
- '@setcontentsaftertitlepage
- '
- .$test_text.
- '
- @contents
- '],
- ['setshortcontentsaftertitlepage',
- '@setshortcontentsaftertitlepage
- '
- .$test_text.
- '
- @shortcontents
- '],
  ['contents',
  $test_text.
--- 304,307 ----
diff -Nrc2 texinfo-6.1/tp/t/50value.t texinfo-6.3/tp/t/50value.t
*** texinfo-6.1/tp/t/50value.t	2014-04-22 02:56:45.000000000 +0100
--- texinfo-6.3/tp/t/50value.t	2016-07-31 16:35:11.000000000 +0100
***************
*** 292,296 ****
  @set bye_macro @bye
  
! @value{bye_macro}'],
  ['value_in_invalid_documentencoding',
  '@set badvalue bad
--- 292,298 ----
  @set bye_macro @bye
  
! @value{bye_macro}',
! {'expanded_formats' => []}
! ],
  ['value_in_invalid_documentencoding',
  '@set badvalue bad
diff -Nrc2 texinfo-6.1/tp/t/55conditionals.t texinfo-6.3/tp/t/55conditionals.t
*** texinfo-6.1/tp/t/55conditionals.t	2014-04-22 02:56:45.000000000 +0100
--- texinfo-6.3/tp/t/55conditionals.t	2016-07-31 16:35:11.000000000 +0100
***************
*** 463,466 ****
--- 463,472 ----
  );
  
+ for my $test (@test_cases) {
+   if (!defined $test->[2]->{'expanded_formats'}) {
+     $test->[2]->{'expanded_formats'} = [];
+   }
+ }
+ 
  our ($arg_test_case, $arg_generate, $arg_debug);
  
diff -Nrc2 texinfo-6.1/tp/t/57invalid_nestings.t texinfo-6.3/tp/t/57invalid_nestings.t
*** texinfo-6.1/tp/t/57invalid_nestings.t	2014-04-22 02:56:45.000000000 +0100
--- texinfo-6.3/tp/t/57invalid_nestings.t	2016-07-31 16:35:11.000000000 +0100
***************
*** 31,39 ****
  ['raw_block_on_line',
  '@cindex @tex
! '],
  ['ignored_text',
  '@node before ignore @ifinfo
  in ifinfo
! @end ifinfo on the node line'],
  ['in_table',
  '
--- 31,43 ----
  ['raw_block_on_line',
  '@cindex @tex
! ',
! {'expanded_formats' => ['tex']}
! ],
  ['ignored_text',
  '@node before ignore @ifinfo
  in ifinfo
! @end ifinfo on the node line',
! {'expanded_formats' => []}
! ],
  ['in_table',
  '
diff -Nrc2 texinfo-6.1/tp/t/60macro.t texinfo-6.3/tp/t/60macro.t
*** texinfo-6.1/tp/t/60macro.t	2015-08-16 19:11:57.000000000 +0100
--- texinfo-6.3/tp/t/60macro.t	2016-07-31 16:35:11.000000000 +0100
***************
*** 522,526 ****
  @macroseven{aaa}
  
! '],
  ['expansion_order',
  '@macro bidule{arg}
--- 522,528 ----
  @macroseven{aaa}
  
! ',
! {'expanded_formats' => []}
! ],
  ['expansion_order',
  '@macro bidule{arg}
diff -Nrc2 texinfo-6.1/tp/t/converters_tests.t texinfo-6.3/tp/t/converters_tests.t
*** texinfo-6.1/tp/t/converters_tests.t	2015-07-25 13:23:01.000000000 +0100
--- texinfo-6.3/tp/t/converters_tests.t	2016-07-31 16:35:11.000000000 +0100
***************
*** 600,613 ****
  '],
  ['raw_block_commands',
! $raw_commands_text
  ],
  ['raw_block_commands_expand_tex',
! $raw_commands_text, {'expanded_formats' => ['tex']},
  ],
  ['inline',
! $inline_text
  ],
  ['inline_expand_tex',
  $inline_text, {'expanded_formats' => ['tex']},
  ],
  ['inlinefmtifelse',
--- 600,617 ----
  '],
  ['raw_block_commands',
! $raw_commands_text,
! {'expanded_formats' => ['tex', 'docbook', 'html', 'xml']}
  ],
  ['raw_block_commands_expand_tex',
! $raw_commands_text,
! {'expanded_formats' => ['tex', 'docbook', 'html', 'xml']},
! {'expanded_formats' => ['tex']},
  ],
  ['inline',
! $inline_text,
  ],
  ['inline_expand_tex',
  $inline_text, {'expanded_formats' => ['tex']},
+ {'expanded_formats' => ['tex']},
  ],
  ['inlinefmtifelse',
***************
*** 627,631 ****
  
  @inlinefmtifelse{tex,if tex,else tex}.
! '],
  ['inlineifsetifclear',
  '@inlineifclear{aaa, iclear first }.
--- 631,637 ----
  
  @inlinefmtifelse{tex,if tex,else tex}.
! ',
! {'expanded_formats' => []}
! ],
  ['inlineifsetifclear',
  '@inlineifclear{aaa, iclear first }.
***************
*** 947,951 ****
  Macros that should not be defined: @mymacro{}. @macroarg{with arg}.
  
! ', {'expanded_formats' => ['html']}], 
  );
  
--- 953,958 ----
  Macros that should not be defined: @mymacro{}. @macroarg{with arg}.
  
! ', {'expanded_formats' => ['html']}, {'expanded_formats' => ['html']}
! ], 
  );
  
diff -Nrc2 texinfo-6.1/tp/t/html_tests.t texinfo-6.3/tp/t/html_tests.t
*** texinfo-6.1/tp/t/html_tests.t	2014-05-18 14:06:00.000000000 +0100
--- texinfo-6.3/tp/t/html_tests.t	2016-07-31 16:35:10.000000000 +0100
***************
*** 193,197 ****
  @end tex
  @end copying
! ', {'expanded_formats' => ['tex']}
  ],
  ['titles',
--- 193,198 ----
  @end tex
  @end copying
! ', {'expanded_formats' => ['tex']},
! {'expanded_formats' => ['tex']}
  ],
  ['titles',
diff -Nrc2 texinfo-6.1/tp/t/nodenormalization.t texinfo-6.3/tp/t/nodenormalization.t
*** texinfo-6.1/tp/t/nodenormalization.t	2014-04-22 02:56:45.000000000 +0100
--- texinfo-6.3/tp/t/nodenormalization.t	2016-07-31 16:35:11.000000000 +0100
***************
*** 34,41 ****
  
  my $parser = Texinfo::Parser::parser({'TEST' => 1,
!                                         'include_directories' => [
                                            't/include_dir/',
                                            't/include/',
!                                           $srcdir.'t/include/'],});
  
  my $invalid_line = '@noindent Text @titlefont{in titlefont} @anchor{in anchor}@footnote{footnote} @exdent exdent';
--- 34,42 ----
  
  my $parser = Texinfo::Parser::parser({'TEST' => 1,
!                                       'include_directories' => [
                                            't/include_dir/',
                                            't/include/',
!                                           $srcdir.'t/include/'],
!                                       'expanded_formats' => ['html', 'tex']});
  
  my $invalid_line = '@noindent Text @titlefont{in titlefont} @anchor{in anchor}@footnote{footnote} @exdent exdent';
diff -Nrc2 texinfo-6.1/tp/t/plaintext_tests.t texinfo-6.3/tp/t/plaintext_tests.t
*** texinfo-6.1/tp/t/plaintext_tests.t	2015-11-21 14:55:04.000000000 +0000
--- texinfo-6.3/tp/t/plaintext_tests.t	2016-07-31 16:35:11.000000000 +0100
***************
*** 1,3 ****
! # $Id: plaintext_tests.t 6790 2015-11-21 14:50:34Z gavin $
  use strict;
  
--- 1,3 ----
! # $Id: plaintext_tests.t 7235 2016-06-25 20:20:46Z gavin $
  use strict;
  
***************
*** 91,95 ****
  @end html
  after.
! ',{'expanded_formats' => ['html']}
  ],
  ['isolated_html_expanded',
--- 91,95 ----
  @end html
  after.
! ',{'expanded_formats' => ['html']}, {'expanded_formats' => ['html']}
  ],
  ['isolated_html_expanded',
***************
*** 98,102 ****
  html
  @end html
! ',{'expanded_formats' => ['html']}
  ],
  ['star_at_command_formatting',
--- 98,102 ----
  html
  @end html
! ',{'expanded_formats' => ['html']}, {'expanded_formats' => ['html']}
  ],
  ['star_at_command_formatting',
***************
*** 478,482 ****
  @end tex
  bbbbbbbbb1 bbbbbbbbbbb2 bbbbbbbbbb3 bbbbbbbbbbbbbb4.
! ', {'expanded_formats' => ['tex']}
  ],
  ['paragraphindent',
--- 478,482 ----
  @end tex
  bbbbbbbbb1 bbbbbbbbbbb2 bbbbbbbbbb3 bbbbbbbbbbbbbb4.
! ', {'expanded_formats' => ['tex']}, {'expanded_formats' => ['tex']}
  ],
  ['paragraphindent',
diff -Nrc2 texinfo-6.1/tp/t/results/alias/alias_table_command.pl texinfo-6.3/tp/t/results/alias/alias_table_command.pl
*** texinfo-6.1/tp/t/results/alias/alias_table_command.pl	2016-01-22 07:50:09.000000000 +0000
--- texinfo-6.3/tp/t/results/alias/alias_table_command.pl	2016-08-02 18:44:47.000000000 +0100
***************
*** 70,73 ****
--- 70,79 ----
              {
                'cmdname' => 'code',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 3,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 191,199 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 3,
!         'macro' => ''
!       },
        'parent' => {}
      }
--- 197,201 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      }
***************
*** 236,239 ****
--- 238,242 ----
  $result_trees{'alias_table_command'}{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'alias_table_command'}{'contents'}[2]{'contents'}[1];
  $result_trees{'alias_table_command'}{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'alias_table_command'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+ $result_trees{'alias_table_command'}{'contents'}[2]{'line_nr'} = $result_trees{'alias_table_command'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'alias_table_command'}{'contents'}[2]{'parent'} = $result_trees{'alias_table_command'};
  
diff -Nrc2 texinfo-6.1/tp/t/results/conditionals/command_conditionals_user_defined.pl texinfo-6.3/tp/t/results/conditionals/command_conditionals_user_defined.pl
*** texinfo-6.1/tp/t/results/conditionals/command_conditionals_user_defined.pl	2016-01-22 07:50:07.000000000 +0000
--- texinfo-6.3/tp/t/results/conditionals/command_conditionals_user_defined.pl	2016-08-02 18:44:45.000000000 +0100
***************
*** 32,47 ****
        'extra' => {
          'arg_line' => ' truc
! ',
!         'macrobody' => 'machin
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 32,36 ----
        'extra' => {
          'arg_line' => ' truc
! '
        },
        'line_nr' => {
***************
*** 52,56 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 41,53 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 299,306 ****
  $result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'command_conditionals_user_defined'}{'contents'}[0];
  $result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'command_conditionals_user_defined'}{'contents'}[0];
- $result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'command_conditionals_user_defined'}{'contents'}[0];
- $result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'command_conditionals_user_defined'};
  $result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'parent'} = $result_trees{'command_conditionals_user_defined'};
! $result_trees{'command_conditionals_user_defined'}{'contents'}[1] = $result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'command_conditionals_user_defined'}{'contents'}[2]{'parent'} = $result_trees{'command_conditionals_user_defined'};
  $result_trees{'command_conditionals_user_defined'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'command_conditionals_user_defined'}{'contents'}[3];
--- 296,302 ----
  $result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'command_conditionals_user_defined'}{'contents'}[0];
  $result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'command_conditionals_user_defined'}{'contents'}[0];
  $result_trees{'command_conditionals_user_defined'}{'contents'}[0]{'parent'} = $result_trees{'command_conditionals_user_defined'};
! $result_trees{'command_conditionals_user_defined'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'command_conditionals_user_defined'}{'contents'}[0];
! $result_trees{'command_conditionals_user_defined'}{'contents'}[1]{'parent'} = $result_trees{'command_conditionals_user_defined'};
  $result_trees{'command_conditionals_user_defined'}{'contents'}[2]{'parent'} = $result_trees{'command_conditionals_user_defined'};
  $result_trees{'command_conditionals_user_defined'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'command_conditionals_user_defined'}{'contents'}[3];
***************
*** 390,397 ****
        },
        'in_code' => 0,
!       'name' => 'auth',
!       'prefix' => [
!         'auth'
!       ]
      },
      'cp' => {
--- 386,390 ----
        },
        'in_code' => 0,
!       'name' => 'auth'
      },
      'cp' => {
***************
*** 400,408 ****
        },
        'in_code' => 0,
!       'name' => 'cp',
!       'prefix' => [
!         'c',
!         'cp'
!       ]
      },
      'fn' => {
--- 393,397 ----
        },
        'in_code' => 0,
!       'name' => 'cp'
      },
      'fn' => {
***************
*** 411,419 ****
        },
        'in_code' => 1,
!       'name' => 'fn',
!       'prefix' => [
!         'f',
!         'fn'
!       ]
      },
      'ky' => {
--- 400,404 ----
        },
        'in_code' => 1,
!       'name' => 'fn'
      },
      'ky' => {
***************
*** 422,430 ****
        },
        'in_code' => 1,
!       'name' => 'ky',
!       'prefix' => [
!         'k',
!         'ky'
!       ]
      },
      'pg' => {
--- 407,411 ----
        },
        'in_code' => 1,
!       'name' => 'ky'
      },
      'pg' => {
***************
*** 433,441 ****
        },
        'in_code' => 1,
!       'name' => 'pg',
!       'prefix' => [
!         'p',
!         'pg'
!       ]
      },
      'tp' => {
--- 414,418 ----
        },
        'in_code' => 1,
!       'name' => 'pg'
      },
      'tp' => {
***************
*** 444,452 ****
        },
        'in_code' => 1,
!       'name' => 'tp',
!       'prefix' => [
!         't',
!         'tp'
!       ]
      },
      'vr' => {
--- 421,425 ----
        },
        'in_code' => 1,
!       'name' => 'tp'
      },
      'vr' => {
***************
*** 455,463 ****
        },
        'in_code' => 1,
!       'name' => 'vr',
!       'prefix' => [
!         'v',
!         'vr'
!       ]
      }
    }
--- 428,432 ----
        },
        'in_code' => 1,
!       'name' => 'vr'
      }
    }
diff -Nrc2 texinfo-6.1/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl texinfo-6.3/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl
*** texinfo-6.1/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl	2016-01-22 07:50:07.000000000 +0000
--- texinfo-6.3/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl	2016-08-02 18:44:45.000000000 +0100
***************
*** 64,76 ****
        ],
        'extra' => {
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 64,68 ----
        ],
        'extra' => {
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 81,85 ****
        'parent' => {}
      },
!     {}
    ],
    'type' => 'text_root'
--- 73,85 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     }
    ],
    'type' => 'text_root'
***************
*** 93,100 ****
  $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3];
  $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3];
! $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3];
! $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'empty_ifset_in_ifset_set'};
  $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3]{'parent'} = $result_trees{'empty_ifset_in_ifset_set'};
! $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[4] = $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3]{'extra'}{'spaces_after_command'};
  
  $result_texis{'empty_ifset_in_ifset_set'} = '
--- 93,100 ----
  $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3];
  $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3];
! $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3]{'contents'}[0];
  $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3]{'parent'} = $result_trees{'empty_ifset_in_ifset_set'};
! $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[4]{'extra'}{'command'} = $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[3];
! $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[4]{'parent'} = $result_trees{'empty_ifset_in_ifset_set'};
  
  $result_texis{'empty_ifset_in_ifset_set'} = '
diff -Nrc2 texinfo-6.1/tp/t/results/conditionals/end_conditional_not_at_line_begining.pl texinfo-6.3/tp/t/results/conditionals/end_conditional_not_at_line_begining.pl
*** texinfo-6.1/tp/t/results/conditionals/end_conditional_not_at_line_begining.pl	2016-01-22 07:50:07.000000000 +0000
--- texinfo-6.3/tp/t/results/conditionals/end_conditional_not_at_line_begining.pl	2016-08-02 18:44:45.000000000 +0100
***************
*** 18,27 ****
  $result_errors{'end_conditional_not_at_line_begining'} = [
    {
!     'error_line' => ':3: warning: @end ifhtml should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 3,
      'macro' => '',
!     'text' => '@end ifhtml should only appear at a line beginning',
      'type' => 'warning'
    }
--- 18,27 ----
  $result_errors{'end_conditional_not_at_line_begining'} = [
    {
!     'error_line' => ':3: warning: @end ifhtml should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 3,
      'macro' => '',
!     'text' => '@end ifhtml should only appear at the beginning of a line',
      'type' => 'warning'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/conditionals/end_ifset_in_format.pl texinfo-6.3/tp/t/results/conditionals/end_ifset_in_format.pl
*** texinfo-6.1/tp/t/results/conditionals/end_ifset_in_format.pl	2016-01-22 07:50:07.000000000 +0000
--- texinfo-6.3/tp/t/results/conditionals/end_ifset_in_format.pl	2016-08-02 18:44:45.000000000 +0100
***************
*** 69,81 ****
        ],
        'extra' => {
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 69,73 ----
        ],
        'extra' => {
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 86,90 ****
        'parent' => {}
      },
!     {},
      {
        'contents' => [
--- 78,90 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'contents' => [
***************
*** 124,136 ****
        ],
        'extra' => {
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 124,128 ----
        ],
        'extra' => {
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 141,145 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 133,145 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 202,209 ****
  $result_trees{'end_ifset_in_format'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'end_ifset_in_format'}{'contents'}[3];
  $result_trees{'end_ifset_in_format'}{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'end_ifset_in_format'}{'contents'}[3];
! $result_trees{'end_ifset_in_format'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'end_ifset_in_format'}{'contents'}[3];
! $result_trees{'end_ifset_in_format'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'end_ifset_in_format'};
  $result_trees{'end_ifset_in_format'}{'contents'}[3]{'parent'} = $result_trees{'end_ifset_in_format'};
! $result_trees{'end_ifset_in_format'}{'contents'}[4] = $result_trees{'end_ifset_in_format'}{'contents'}[3]{'extra'}{'spaces_after_command'};
  $result_trees{'end_ifset_in_format'}{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'end_ifset_in_format'}{'contents'}[5];
  $result_trees{'end_ifset_in_format'}{'contents'}[5]{'parent'} = $result_trees{'end_ifset_in_format'};
--- 202,209 ----
  $result_trees{'end_ifset_in_format'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'end_ifset_in_format'}{'contents'}[3];
  $result_trees{'end_ifset_in_format'}{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'end_ifset_in_format'}{'contents'}[3];
! $result_trees{'end_ifset_in_format'}{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'end_ifset_in_format'}{'contents'}[3]{'contents'}[0];
  $result_trees{'end_ifset_in_format'}{'contents'}[3]{'parent'} = $result_trees{'end_ifset_in_format'};
! $result_trees{'end_ifset_in_format'}{'contents'}[4]{'extra'}{'command'} = $result_trees{'end_ifset_in_format'}{'contents'}[3];
! $result_trees{'end_ifset_in_format'}{'contents'}[4]{'parent'} = $result_trees{'end_ifset_in_format'};
  $result_trees{'end_ifset_in_format'}{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'end_ifset_in_format'}{'contents'}[5];
  $result_trees{'end_ifset_in_format'}{'contents'}[5]{'parent'} = $result_trees{'end_ifset_in_format'};
***************
*** 212,219 ****
  $result_trees{'end_ifset_in_format'}{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'end_ifset_in_format'}{'contents'}[7];
  $result_trees{'end_ifset_in_format'}{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'end_ifset_in_format'}{'contents'}[7];
! $result_trees{'end_ifset_in_format'}{'contents'}[7]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'end_ifset_in_format'}{'contents'}[7];
! $result_trees{'end_ifset_in_format'}{'contents'}[7]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'end_ifset_in_format'};
  $result_trees{'end_ifset_in_format'}{'contents'}[7]{'parent'} = $result_trees{'end_ifset_in_format'};
! $result_trees{'end_ifset_in_format'}{'contents'}[8] = $result_trees{'end_ifset_in_format'}{'contents'}[7]{'extra'}{'spaces_after_command'};
  $result_trees{'end_ifset_in_format'}{'contents'}[9]{'parent'} = $result_trees{'end_ifset_in_format'};
  $result_trees{'end_ifset_in_format'}{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'end_ifset_in_format'}{'contents'}[10]{'contents'}[0]{'args'}[0];
--- 212,219 ----
  $result_trees{'end_ifset_in_format'}{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'end_ifset_in_format'}{'contents'}[7];
  $result_trees{'end_ifset_in_format'}{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'end_ifset_in_format'}{'contents'}[7];
! $result_trees{'end_ifset_in_format'}{'contents'}[7]{'extra'}{'spaces_after_command'} = $result_trees{'end_ifset_in_format'}{'contents'}[7]{'contents'}[0];
  $result_trees{'end_ifset_in_format'}{'contents'}[7]{'parent'} = $result_trees{'end_ifset_in_format'};
! $result_trees{'end_ifset_in_format'}{'contents'}[8]{'extra'}{'command'} = $result_trees{'end_ifset_in_format'}{'contents'}[7];
! $result_trees{'end_ifset_in_format'}{'contents'}[8]{'parent'} = $result_trees{'end_ifset_in_format'};
  $result_trees{'end_ifset_in_format'}{'contents'}[9]{'parent'} = $result_trees{'end_ifset_in_format'};
  $result_trees{'end_ifset_in_format'}{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'end_ifset_in_format'}{'contents'}[10]{'contents'}[0]{'args'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/conditionals/macro_in_ifset.pl texinfo-6.3/tp/t/results/conditionals/macro_in_ifset.pl
*** texinfo-6.1/tp/t/results/conditionals/macro_in_ifset.pl	2016-01-22 07:50:07.000000000 +0000
--- texinfo-6.3/tp/t/results/conditionals/macro_in_ifset.pl	2016-08-02 18:44:45.000000000 +0100
***************
*** 38,53 ****
        'extra' => {
          'arg_line' => ' truc {}
! ',
!         'macrobody' => 'truc
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 38,42 ----
        'extra' => {
          'arg_line' => ' truc {}
! '
        },
        'line_nr' => {
***************
*** 58,62 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 47,59 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 89,96 ****
  $result_trees{'macro_in_ifset'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'macro_in_ifset'}{'contents'}[1];
  $result_trees{'macro_in_ifset'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'macro_in_ifset'}{'contents'}[1];
- $result_trees{'macro_in_ifset'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_ifset'}{'contents'}[1];
- $result_trees{'macro_in_ifset'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_ifset'};
  $result_trees{'macro_in_ifset'}{'contents'}[1]{'parent'} = $result_trees{'macro_in_ifset'};
! $result_trees{'macro_in_ifset'}{'contents'}[2] = $result_trees{'macro_in_ifset'}{'contents'}[1]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_ifset'}{'contents'}[3]{'parent'} = $result_trees{'macro_in_ifset'};
  $result_trees{'macro_in_ifset'}{'contents'}[4]{'parent'} = $result_trees{'macro_in_ifset'};
--- 86,92 ----
  $result_trees{'macro_in_ifset'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'macro_in_ifset'}{'contents'}[1];
  $result_trees{'macro_in_ifset'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'macro_in_ifset'}{'contents'}[1];
  $result_trees{'macro_in_ifset'}{'contents'}[1]{'parent'} = $result_trees{'macro_in_ifset'};
! $result_trees{'macro_in_ifset'}{'contents'}[2]{'extra'}{'command'} = $result_trees{'macro_in_ifset'}{'contents'}[1];
! $result_trees{'macro_in_ifset'}{'contents'}[2]{'parent'} = $result_trees{'macro_in_ifset'};
  $result_trees{'macro_in_ifset'}{'contents'}[3]{'parent'} = $result_trees{'macro_in_ifset'};
  $result_trees{'macro_in_ifset'}{'contents'}[4]{'parent'} = $result_trees{'macro_in_ifset'};
diff -Nrc2 texinfo-6.1/tp/t/results/conditionals/macro_in_ifset_set.pl texinfo-6.3/tp/t/results/conditionals/macro_in_ifset_set.pl
*** texinfo-6.1/tp/t/results/conditionals/macro_in_ifset_set.pl	2016-01-22 07:50:07.000000000 +0000
--- texinfo-6.3/tp/t/results/conditionals/macro_in_ifset_set.pl	2016-08-02 18:44:45.000000000 +0100
***************
*** 68,83 ****
        'extra' => {
          'arg_line' => ' truc {}
! ',
!         'macrobody' => 'truc
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 68,72 ----
        'extra' => {
          'arg_line' => ' truc {}
! '
        },
        'line_nr' => {
***************
*** 88,92 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 77,89 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 137,152 ****
        'extra' => {
          'arg_line' => ' truc{}
! ',
!         'macrobody' => 'in ifset
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 134,138 ----
        'extra' => {
          'arg_line' => ' truc{}
! '
        },
        'line_nr' => {
***************
*** 157,161 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 143,155 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 186,193 ****
  $result_trees{'macro_in_ifset_set'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'macro_in_ifset_set'}{'contents'}[3];
  $result_trees{'macro_in_ifset_set'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'macro_in_ifset_set'}{'contents'}[3];
- $result_trees{'macro_in_ifset_set'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_ifset_set'}{'contents'}[3];
- $result_trees{'macro_in_ifset_set'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_ifset_set'};
  $result_trees{'macro_in_ifset_set'}{'contents'}[3]{'parent'} = $result_trees{'macro_in_ifset_set'};
! $result_trees{'macro_in_ifset_set'}{'contents'}[4] = $result_trees{'macro_in_ifset_set'}{'contents'}[3]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_ifset_set'}{'contents'}[5]{'parent'} = $result_trees{'macro_in_ifset_set'};
  $result_trees{'macro_in_ifset_set'}{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'macro_in_ifset_set'}{'contents'}[6];
--- 180,186 ----
  $result_trees{'macro_in_ifset_set'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'macro_in_ifset_set'}{'contents'}[3];
  $result_trees{'macro_in_ifset_set'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'macro_in_ifset_set'}{'contents'}[3];
  $result_trees{'macro_in_ifset_set'}{'contents'}[3]{'parent'} = $result_trees{'macro_in_ifset_set'};
! $result_trees{'macro_in_ifset_set'}{'contents'}[4]{'extra'}{'command'} = $result_trees{'macro_in_ifset_set'}{'contents'}[3];
! $result_trees{'macro_in_ifset_set'}{'contents'}[4]{'parent'} = $result_trees{'macro_in_ifset_set'};
  $result_trees{'macro_in_ifset_set'}{'contents'}[5]{'parent'} = $result_trees{'macro_in_ifset_set'};
  $result_trees{'macro_in_ifset_set'}{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'macro_in_ifset_set'}{'contents'}[6];
***************
*** 196,203 ****
  $result_trees{'macro_in_ifset_set'}{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'macro_in_ifset_set'}{'contents'}[7];
  $result_trees{'macro_in_ifset_set'}{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'macro_in_ifset_set'}{'contents'}[7];
- $result_trees{'macro_in_ifset_set'}{'contents'}[7]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_ifset_set'}{'contents'}[7];
- $result_trees{'macro_in_ifset_set'}{'contents'}[7]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_ifset_set'};
  $result_trees{'macro_in_ifset_set'}{'contents'}[7]{'parent'} = $result_trees{'macro_in_ifset_set'};
! $result_trees{'macro_in_ifset_set'}{'contents'}[8] = $result_trees{'macro_in_ifset_set'}{'contents'}[7]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_ifset_set'}{'contents'}[9]{'parent'} = $result_trees{'macro_in_ifset_set'};
  $result_trees{'macro_in_ifset_set'}{'contents'}[10]{'contents'}[0]{'parent'} = $result_trees{'macro_in_ifset_set'}{'contents'}[10];
--- 189,195 ----
  $result_trees{'macro_in_ifset_set'}{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'macro_in_ifset_set'}{'contents'}[7];
  $result_trees{'macro_in_ifset_set'}{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'macro_in_ifset_set'}{'contents'}[7];
  $result_trees{'macro_in_ifset_set'}{'contents'}[7]{'parent'} = $result_trees{'macro_in_ifset_set'};
! $result_trees{'macro_in_ifset_set'}{'contents'}[8]{'extra'}{'command'} = $result_trees{'macro_in_ifset_set'}{'contents'}[7];
! $result_trees{'macro_in_ifset_set'}{'contents'}[8]{'parent'} = $result_trees{'macro_in_ifset_set'};
  $result_trees{'macro_in_ifset_set'}{'contents'}[9]{'parent'} = $result_trees{'macro_in_ifset_set'};
  $result_trees{'macro_in_ifset_set'}{'contents'}[10]{'contents'}[0]{'parent'} = $result_trees{'macro_in_ifset_set'}{'contents'}[10];
diff -Nrc2 texinfo-6.1/tp/t/results/conditionals/many_conditionals.pl texinfo-6.3/tp/t/results/conditionals/many_conditionals.pl
*** texinfo-6.1/tp/t/results/conditionals/many_conditionals.pl	2016-01-22 07:50:07.000000000 +0000
--- texinfo-6.3/tp/t/results/conditionals/many_conditionals.pl	2016-08-02 18:44:45.000000000 +0100
***************
*** 152,173 ****
        'contents' => [
          {
!           'extra' => {
!             'command' => {}
!           },
            'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
          },
          {
-           'contents' => [
-             {
-               'parent' => {},
-               'text' => 'This is tex text.
- '
-             }
-           ],
            'parent' => {},
!           'type' => 'rawpreformatted'
          },
          {
--- 152,164 ----
        'contents' => [
          {
!           'contents' => [],
            'parent' => {},
!           'type' => 'elided_block'
          },
          {
            'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
          },
          {
***************
*** 214,224 ****
        ],
        'extra' => {
!         'end_command' => {},
!         'spaces_after_command' => {}
!       },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 23,
!         'macro' => ''
        },
        'parent' => {}
--- 205,209 ----
        ],
        'extra' => {
!         'end_command' => {}
        },
        'parent' => {}
***************
*** 276,282 ****
  $result_trees{'many_conditionals'}{'contents'}[8]{'parent'} = $result_trees{'many_conditionals'};
  $result_trees{'many_conditionals'}{'contents'}[9]{'parent'} = $result_trees{'many_conditionals'};
- $result_trees{'many_conditionals'}{'contents'}[10]{'contents'}[0]{'extra'}{'command'} = $result_trees{'many_conditionals'}{'contents'}[10];
  $result_trees{'many_conditionals'}{'contents'}[10]{'contents'}[0]{'parent'} = $result_trees{'many_conditionals'}{'contents'}[10];
- $result_trees{'many_conditionals'}{'contents'}[10]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'many_conditionals'}{'contents'}[10]{'contents'}[1];
  $result_trees{'many_conditionals'}{'contents'}[10]{'contents'}[1]{'parent'} = $result_trees{'many_conditionals'}{'contents'}[10];
  $result_trees{'many_conditionals'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'many_conditionals'}{'contents'}[10]{'contents'}[2];
--- 261,265 ----
***************
*** 289,293 ****
  $result_trees{'many_conditionals'}{'contents'}[10]{'contents'}[2]{'parent'} = $result_trees{'many_conditionals'}{'contents'}[10];
  $result_trees{'many_conditionals'}{'contents'}[10]{'extra'}{'end_command'} = $result_trees{'many_conditionals'}{'contents'}[10]{'contents'}[2];
- $result_trees{'many_conditionals'}{'contents'}[10]{'extra'}{'spaces_after_command'} = $result_trees{'many_conditionals'}{'contents'}[10]{'contents'}[0];
  $result_trees{'many_conditionals'}{'contents'}[10]{'parent'} = $result_trees{'many_conditionals'};
  $result_trees{'many_conditionals'}{'contents'}[11]{'parent'} = $result_trees{'many_conditionals'};
--- 272,275 ----
***************
*** 309,313 ****
  
  @tex
- This is tex text.
  @end tex
  
--- 291,294 ----
diff -Nrc2 texinfo-6.1/tp/t/results/conditionals/nested_ifset_ifclear.pl texinfo-6.3/tp/t/results/conditionals/nested_ifset_ifclear.pl
*** texinfo-6.1/tp/t/results/conditionals/nested_ifset_ifclear.pl	2016-01-22 07:50:07.000000000 +0000
--- texinfo-6.3/tp/t/results/conditionals/nested_ifset_ifclear.pl	2016-08-02 18:44:45.000000000 +0100
***************
*** 80,102 ****
        'extra' => {
          'arg_line' => ' conditionals{}
! ',
!         'macrobody' => '@ifset somevar
! @ifset anothervar
! Both somevar and anothervar are set.
! @end ifset
! @ifclear anothervar
! Somevar is set, anothervar is not.
! @end ifclear
! @end ifset
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 80,84 ----
        'extra' => {
          'arg_line' => ' conditionals{}
! '
        },
        'line_nr' => {
***************
*** 107,111 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 89,101 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 336,343 ****
  $result_trees{'nested_ifset_ifclear'}{'contents'}[1]{'contents'}[7]{'parent'} = $result_trees{'nested_ifset_ifclear'}{'contents'}[1];
  $result_trees{'nested_ifset_ifclear'}{'contents'}[1]{'contents'}[8]{'parent'} = $result_trees{'nested_ifset_ifclear'}{'contents'}[1];
- $result_trees{'nested_ifset_ifclear'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'nested_ifset_ifclear'}{'contents'}[1];
- $result_trees{'nested_ifset_ifclear'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'nested_ifset_ifclear'};
  $result_trees{'nested_ifset_ifclear'}{'contents'}[1]{'parent'} = $result_trees{'nested_ifset_ifclear'};
! $result_trees{'nested_ifset_ifclear'}{'contents'}[2] = $result_trees{'nested_ifset_ifclear'}{'contents'}[1]{'extra'}{'spaces_after_command'};
  $result_trees{'nested_ifset_ifclear'}{'contents'}[3]{'parent'} = $result_trees{'nested_ifset_ifclear'};
  $result_trees{'nested_ifset_ifclear'}{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'nested_ifset_ifclear'}{'contents'}[4];
--- 326,332 ----
  $result_trees{'nested_ifset_ifclear'}{'contents'}[1]{'contents'}[7]{'parent'} = $result_trees{'nested_ifset_ifclear'}{'contents'}[1];
  $result_trees{'nested_ifset_ifclear'}{'contents'}[1]{'contents'}[8]{'parent'} = $result_trees{'nested_ifset_ifclear'}{'contents'}[1];
  $result_trees{'nested_ifset_ifclear'}{'contents'}[1]{'parent'} = $result_trees{'nested_ifset_ifclear'};
! $result_trees{'nested_ifset_ifclear'}{'contents'}[2]{'extra'}{'command'} = $result_trees{'nested_ifset_ifclear'}{'contents'}[1];
! $result_trees{'nested_ifset_ifclear'}{'contents'}[2]{'parent'} = $result_trees{'nested_ifset_ifclear'};
  $result_trees{'nested_ifset_ifclear'}{'contents'}[3]{'parent'} = $result_trees{'nested_ifset_ifclear'};
  $result_trees{'nested_ifset_ifclear'}{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'nested_ifset_ifclear'}{'contents'}[4];
diff -Nrc2 texinfo-6.1/tp/t/results/conditionals/nested_ignore.pl texinfo-6.3/tp/t/results/conditionals/nested_ignore.pl
*** texinfo-6.1/tp/t/results/conditionals/nested_ignore.pl	2016-01-22 07:50:07.000000000 +0000
--- texinfo-6.3/tp/t/results/conditionals/nested_ignore.pl	2016-08-02 18:44:45.000000000 +0100
***************
*** 39,51 ****
        ],
        'extra' => {
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 39,43 ----
        ],
        'extra' => {
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 56,60 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 48,60 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 94,106 ****
        ],
        'extra' => {
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 94,98 ----
        ],
        'extra' => {
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 111,115 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 103,115 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 149,161 ****
        ],
        'extra' => {
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 149,153 ----
        ],
        'extra' => {
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 166,170 ****
        'parent' => {}
      },
!     {}
    ],
    'type' => 'text_root'
--- 158,170 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     }
    ],
    'type' => 'text_root'
***************
*** 175,182 ****
  $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'nested_ignore'}{'contents'}[0];
  $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'nested_ignore'}{'contents'}[0];
! $result_trees{'nested_ignore'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'nested_ignore'}{'contents'}[0];
! $result_trees{'nested_ignore'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'nested_ignore'};
  $result_trees{'nested_ignore'}{'contents'}[0]{'parent'} = $result_trees{'nested_ignore'};
! $result_trees{'nested_ignore'}{'contents'}[1] = $result_trees{'nested_ignore'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'nested_ignore'}{'contents'}[2]{'parent'} = $result_trees{'nested_ignore'};
  $result_trees{'nested_ignore'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'} = $result_trees{'nested_ignore'}{'contents'}[3];
--- 175,182 ----
  $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'nested_ignore'}{'contents'}[0];
  $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'nested_ignore'}{'contents'}[0];
! $result_trees{'nested_ignore'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0];
  $result_trees{'nested_ignore'}{'contents'}[0]{'parent'} = $result_trees{'nested_ignore'};
! $result_trees{'nested_ignore'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'nested_ignore'}{'contents'}[0];
! $result_trees{'nested_ignore'}{'contents'}[1]{'parent'} = $result_trees{'nested_ignore'};
  $result_trees{'nested_ignore'}{'contents'}[2]{'parent'} = $result_trees{'nested_ignore'};
  $result_trees{'nested_ignore'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'} = $result_trees{'nested_ignore'}{'contents'}[3];
***************
*** 185,192 ****
  $result_trees{'nested_ignore'}{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'nested_ignore'}{'contents'}[3];
  $result_trees{'nested_ignore'}{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'nested_ignore'}{'contents'}[3];
! $result_trees{'nested_ignore'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'nested_ignore'}{'contents'}[3];
! $result_trees{'nested_ignore'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'nested_ignore'};
  $result_trees{'nested_ignore'}{'contents'}[3]{'parent'} = $result_trees{'nested_ignore'};
! $result_trees{'nested_ignore'}{'contents'}[4] = $result_trees{'nested_ignore'}{'contents'}[3]{'extra'}{'spaces_after_command'};
  $result_trees{'nested_ignore'}{'contents'}[5]{'parent'} = $result_trees{'nested_ignore'};
  $result_trees{'nested_ignore'}{'contents'}[6]{'contents'}[0]{'extra'}{'command'} = $result_trees{'nested_ignore'}{'contents'}[6];
--- 185,192 ----
  $result_trees{'nested_ignore'}{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'nested_ignore'}{'contents'}[3];
  $result_trees{'nested_ignore'}{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'nested_ignore'}{'contents'}[3];
! $result_trees{'nested_ignore'}{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'nested_ignore'}{'contents'}[3]{'contents'}[0];
  $result_trees{'nested_ignore'}{'contents'}[3]{'parent'} = $result_trees{'nested_ignore'};
! $result_trees{'nested_ignore'}{'contents'}[4]{'extra'}{'command'} = $result_trees{'nested_ignore'}{'contents'}[3];
! $result_trees{'nested_ignore'}{'contents'}[4]{'parent'} = $result_trees{'nested_ignore'};
  $result_trees{'nested_ignore'}{'contents'}[5]{'parent'} = $result_trees{'nested_ignore'};
  $result_trees{'nested_ignore'}{'contents'}[6]{'contents'}[0]{'extra'}{'command'} = $result_trees{'nested_ignore'}{'contents'}[6];
***************
*** 195,202 ****
  $result_trees{'nested_ignore'}{'contents'}[6]{'contents'}[2]{'parent'} = $result_trees{'nested_ignore'}{'contents'}[6];
  $result_trees{'nested_ignore'}{'contents'}[6]{'contents'}[3]{'parent'} = $result_trees{'nested_ignore'}{'contents'}[6];
! $result_trees{'nested_ignore'}{'contents'}[6]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'nested_ignore'}{'contents'}[6];
! $result_trees{'nested_ignore'}{'contents'}[6]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'nested_ignore'};
  $result_trees{'nested_ignore'}{'contents'}[6]{'parent'} = $result_trees{'nested_ignore'};
! $result_trees{'nested_ignore'}{'contents'}[7] = $result_trees{'nested_ignore'}{'contents'}[6]{'extra'}{'spaces_after_command'};
  
  $result_texis{'nested_ignore'} = '@ignore
--- 195,202 ----
  $result_trees{'nested_ignore'}{'contents'}[6]{'contents'}[2]{'parent'} = $result_trees{'nested_ignore'}{'contents'}[6];
  $result_trees{'nested_ignore'}{'contents'}[6]{'contents'}[3]{'parent'} = $result_trees{'nested_ignore'}{'contents'}[6];
! $result_trees{'nested_ignore'}{'contents'}[6]{'extra'}{'spaces_after_command'} = $result_trees{'nested_ignore'}{'contents'}[6]{'contents'}[0];
  $result_trees{'nested_ignore'}{'contents'}[6]{'parent'} = $result_trees{'nested_ignore'};
! $result_trees{'nested_ignore'}{'contents'}[7]{'extra'}{'command'} = $result_trees{'nested_ignore'}{'contents'}[6];
! $result_trees{'nested_ignore'}{'contents'}[7]{'parent'} = $result_trees{'nested_ignore'};
  
  $result_texis{'nested_ignore'} = '@ignore
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/accent.pl texinfo-6.3/tp/t/results/converters_tests/accent.pl
*** texinfo-6.1/tp/t/results/converters_tests/accent.pl	2016-01-22 07:50:13.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/accent.pl	2016-08-02 18:44:52.000000000 +0100
***************
*** 143,146 ****
--- 143,148 ----
                ],
                'cmdname' => '`',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 206,209 ****
--- 208,213 ----
                ],
                'cmdname' => '\'',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 269,272 ****
--- 273,278 ----
                ],
                'cmdname' => '^',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 332,335 ****
--- 338,343 ----
                ],
                'cmdname' => '"',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 395,398 ****
--- 403,408 ----
                ],
                'cmdname' => '`',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 458,461 ****
--- 468,473 ----
                ],
                'cmdname' => '\'',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 521,524 ****
--- 533,538 ----
                ],
                'cmdname' => '^',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 584,587 ****
--- 598,603 ----
                ],
                'cmdname' => '"',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 647,650 ****
--- 663,668 ----
                ],
                'cmdname' => ',',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 710,713 ****
--- 728,733 ----
                ],
                'cmdname' => '~',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 773,776 ****
--- 793,798 ----
                ],
                'cmdname' => '=',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 858,864 ****
--- 880,888 ----
                ],
                'cmdname' => 'H',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 924,930 ****
--- 948,956 ----
                ],
                'cmdname' => 'dotaccent',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 990,996 ****
--- 1016,1024 ----
                ],
                'cmdname' => 'ringaccent',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1099,1105 ****
--- 1127,1135 ----
                ],
                'cmdname' => 'u',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1165,1171 ****
--- 1195,1203 ----
                ],
                'cmdname' => 'ubaraccent',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1231,1237 ****
--- 1263,1271 ----
                ],
                'cmdname' => 'udotaccent',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1297,1303 ****
--- 1331,1339 ----
                ],
                'cmdname' => 'v',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1363,1369 ****
--- 1399,1407 ----
                ],
                'cmdname' => 'ogonek',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1429,1435 ****
--- 1467,1475 ----
                ],
                'cmdname' => 'ogonek',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1465,1468 ****
--- 1505,1513 ----
                'cmdname' => 'questiondown',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 46,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 1481,1484 ****
--- 1526,1530 ----
                'cmdname' => 'exclamdown',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1514,1517 ****
--- 1560,1568 ----
                'cmdname' => 'aa',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 48,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 1530,1533 ****
--- 1581,1585 ----
                'cmdname' => 'AA',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1563,1566 ****
--- 1615,1623 ----
                'cmdname' => 'ae',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 50,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 1579,1582 ****
--- 1636,1640 ----
                'cmdname' => 'AE',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1595,1598 ****
--- 1653,1657 ----
                'cmdname' => 'oe',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1611,1614 ****
--- 1670,1674 ----
                'cmdname' => 'OE',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1709,1712 ****
--- 1769,1777 ----
                'cmdname' => 'l',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 54,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 1725,1728 ****
--- 1790,1794 ----
                'cmdname' => 'L',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1758,1761 ****
--- 1824,1832 ----
                'cmdname' => 'o',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 56,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 1774,1777 ****
--- 1845,1849 ----
                'cmdname' => 'O',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1807,1810 ****
--- 1879,1887 ----
                'cmdname' => 'ss',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 58,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 1840,1843 ****
--- 1917,1925 ----
                'cmdname' => 'pounds',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 60,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 2384,2387 ****
--- 2466,2470 ----
  $result_trees{'accent'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
+ $result_trees{'accent'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'line_nr'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'line_nr'};
  $result_trees{'accent'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[1];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[1];
***************
*** 2395,2398 ****
--- 2478,2482 ----
  $result_trees{'accent'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[3]{'contents'}[3];
+ $result_trees{'accent'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'line_nr'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'line_nr'};
  $result_trees{'accent'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[3];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[3];
***************
*** 2406,2409 ****
--- 2490,2494 ----
  $result_trees{'accent'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[5]{'contents'}[3];
+ $result_trees{'accent'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'line_nr'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'line_nr'};
  $result_trees{'accent'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[5];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[5];
***************
*** 2417,2420 ****
--- 2502,2506 ----
  $result_trees{'accent'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'args'}[0];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[7]{'contents'}[3];
+ $result_trees{'accent'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'line_nr'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'line_nr'};
  $result_trees{'accent'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[7];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[7]{'contents'}[4]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[7];
***************
*** 2428,2431 ****
--- 2514,2518 ----
  $result_trees{'accent'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'args'}[0];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[9]{'contents'}[3];
+ $result_trees{'accent'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'line_nr'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'line_nr'};
  $result_trees{'accent'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[9];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[9]{'contents'}[4]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[9];
***************
*** 2439,2442 ****
--- 2526,2530 ----
  $result_trees{'accent'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'args'}[0];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[11]{'contents'}[3];
+ $result_trees{'accent'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'line_nr'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'line_nr'};
  $result_trees{'accent'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[11];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[11]{'contents'}[4]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[11];
***************
*** 2450,2453 ****
--- 2538,2542 ----
  $result_trees{'accent'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'args'}[0];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[13]{'contents'}[3];
+ $result_trees{'accent'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'line_nr'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'line_nr'};
  $result_trees{'accent'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[13];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[13];
***************
*** 2461,2464 ****
--- 2550,2554 ----
  $result_trees{'accent'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'args'}[0];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[15]{'contents'}[3];
+ $result_trees{'accent'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'line_nr'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'line_nr'};
  $result_trees{'accent'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[15];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[15]{'contents'}[4]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[15];
***************
*** 2472,2475 ****
--- 2562,2566 ----
  $result_trees{'accent'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'args'}[0];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[17]{'contents'}[3];
+ $result_trees{'accent'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'line_nr'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[17]{'contents'}[1]{'line_nr'};
  $result_trees{'accent'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[17];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[17]{'contents'}[4]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[17];
***************
*** 2483,2486 ****
--- 2574,2578 ----
  $result_trees{'accent'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'args'}[0];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[19]{'contents'}[3];
+ $result_trees{'accent'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'line_nr'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[19]{'contents'}[1]{'line_nr'};
  $result_trees{'accent'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[19];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[19]{'contents'}[4]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[19];
***************
*** 2494,2497 ****
--- 2586,2590 ----
  $result_trees{'accent'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'args'}[0];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[21]{'contents'}[3];
+ $result_trees{'accent'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'line_nr'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[21]{'contents'}[1]{'line_nr'};
  $result_trees{'accent'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[21];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[21]{'contents'}[4]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[21];
***************
*** 2510,2513 ****
--- 2603,2607 ----
  $result_trees{'accent'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'args'}[0];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[23]{'contents'}[5];
+ $result_trees{'accent'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'line_nr'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[23]{'contents'}[1]{'line_nr'};
  $result_trees{'accent'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[23];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[23]{'contents'}[6]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[23];
***************
*** 2521,2524 ****
--- 2615,2619 ----
  $result_trees{'accent'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'args'}[0];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[25]{'contents'}[3];
+ $result_trees{'accent'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'line_nr'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'line_nr'};
  $result_trees{'accent'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[25];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[25]{'contents'}[4]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[25];
***************
*** 2532,2535 ****
--- 2627,2631 ----
  $result_trees{'accent'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'args'}[0];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[27]{'contents'}[3];
+ $result_trees{'accent'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'line_nr'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'line_nr'};
  $result_trees{'accent'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[27];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[27]{'contents'}[4]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[27];
***************
*** 2550,2553 ****
--- 2646,2650 ----
  $result_trees{'accent'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'args'}[0];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[31]{'contents'}[3];
+ $result_trees{'accent'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'line_nr'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'line_nr'};
  $result_trees{'accent'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[31];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[31]{'contents'}[4]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[31];
***************
*** 2561,2564 ****
--- 2658,2662 ----
  $result_trees{'accent'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'args'}[0];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[33]{'contents'}[3];
+ $result_trees{'accent'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'line_nr'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[33]{'contents'}[1]{'line_nr'};
  $result_trees{'accent'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[33];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[33]{'contents'}[4]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[33];
***************
*** 2572,2575 ****
--- 2670,2674 ----
  $result_trees{'accent'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'args'}[0];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[35]{'contents'}[3];
+ $result_trees{'accent'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'line_nr'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[35]{'contents'}[1]{'line_nr'};
  $result_trees{'accent'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[35];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[35]{'contents'}[4]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[35];
***************
*** 2583,2586 ****
--- 2682,2686 ----
  $result_trees{'accent'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'args'}[0];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[37]{'contents'}[3];
+ $result_trees{'accent'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'line_nr'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[37]{'contents'}[1]{'line_nr'};
  $result_trees{'accent'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[37];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[37]{'contents'}[4]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[37];
***************
*** 2594,2597 ****
--- 2694,2698 ----
  $result_trees{'accent'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'args'}[0];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[39]{'contents'}[3];
+ $result_trees{'accent'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'line_nr'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[39]{'contents'}[1]{'line_nr'};
  $result_trees{'accent'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[39];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[39]{'contents'}[4]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[39];
***************
*** 2605,2608 ****
--- 2706,2710 ----
  $result_trees{'accent'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'args'}[0];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[41]{'contents'}[3];
+ $result_trees{'accent'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'line_nr'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[41]{'contents'}[1]{'line_nr'};
  $result_trees{'accent'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[41];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[41]{'contents'}[4]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[41];
***************
*** 2614,2617 ****
--- 2716,2720 ----
  $result_trees{'accent'}{'contents'}[2]{'contents'}[43]{'contents'}[2]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[43];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[43]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[43]{'contents'}[3];
+ $result_trees{'accent'}{'contents'}[2]{'contents'}[43]{'contents'}[3]{'line_nr'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[43]{'contents'}[1]{'line_nr'};
  $result_trees{'accent'}{'contents'}[2]{'contents'}[43]{'contents'}[3]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[43];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[43]{'contents'}[4]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[43];
***************
*** 2623,2626 ****
--- 2726,2730 ----
  $result_trees{'accent'}{'contents'}[2]{'contents'}[45]{'contents'}[2]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[45];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[45]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[45]{'contents'}[3];
+ $result_trees{'accent'}{'contents'}[2]{'contents'}[45]{'contents'}[3]{'line_nr'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[45]{'contents'}[1]{'line_nr'};
  $result_trees{'accent'}{'contents'}[2]{'contents'}[45]{'contents'}[3]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[45];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[45]{'contents'}[4]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[45];
***************
*** 2632,2641 ****
--- 2736,2748 ----
  $result_trees{'accent'}{'contents'}[2]{'contents'}[47]{'contents'}[2]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[47];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[47]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[47]{'contents'}[3];
+ $result_trees{'accent'}{'contents'}[2]{'contents'}[47]{'contents'}[3]{'line_nr'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[47]{'contents'}[1]{'line_nr'};
  $result_trees{'accent'}{'contents'}[2]{'contents'}[47]{'contents'}[3]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[47];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[47]{'contents'}[4]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[47];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[47]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[47]{'contents'}[5];
+ $result_trees{'accent'}{'contents'}[2]{'contents'}[47]{'contents'}[5]{'line_nr'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[47]{'contents'}[1]{'line_nr'};
  $result_trees{'accent'}{'contents'}[2]{'contents'}[47]{'contents'}[5]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[47];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[47]{'contents'}[6]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[47];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[47]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[47]{'contents'}[7];
+ $result_trees{'accent'}{'contents'}[2]{'contents'}[47]{'contents'}[7]{'line_nr'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[47]{'contents'}[1]{'line_nr'};
  $result_trees{'accent'}{'contents'}[2]{'contents'}[47]{'contents'}[7]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[47];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[47]{'contents'}[8]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[47];
***************
*** 2659,2662 ****
--- 2766,2770 ----
  $result_trees{'accent'}{'contents'}[2]{'contents'}[51]{'contents'}[2]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[51];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[51]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[51]{'contents'}[3];
+ $result_trees{'accent'}{'contents'}[2]{'contents'}[51]{'contents'}[3]{'line_nr'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[51]{'contents'}[1]{'line_nr'};
  $result_trees{'accent'}{'contents'}[2]{'contents'}[51]{'contents'}[3]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[51];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[51]{'contents'}[4]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[51];
***************
*** 2668,2671 ****
--- 2776,2780 ----
  $result_trees{'accent'}{'contents'}[2]{'contents'}[53]{'contents'}[2]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[53];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[53]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[53]{'contents'}[3];
+ $result_trees{'accent'}{'contents'}[2]{'contents'}[53]{'contents'}[3]{'line_nr'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[53]{'contents'}[1]{'line_nr'};
  $result_trees{'accent'}{'contents'}[2]{'contents'}[53]{'contents'}[3]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[53];
  $result_trees{'accent'}{'contents'}[2]{'contents'}[53]{'contents'}[4]{'parent'} = $result_trees{'accent'}{'contents'}[2]{'contents'}[53];
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/accentenc.pl texinfo-6.3/tp/t/results/converters_tests/accentenc.pl
*** texinfo-6.1/tp/t/results/converters_tests/accentenc.pl	2016-01-22 07:50:13.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/accentenc.pl	2016-08-02 18:44:52.000000000 +0100
***************
*** 191,194 ****
--- 191,196 ----
                ],
                'cmdname' => '`',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 254,257 ****
--- 256,261 ----
                ],
                'cmdname' => '\'',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 317,320 ****
--- 321,326 ----
                ],
                'cmdname' => '^',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 380,383 ****
--- 386,391 ----
                ],
                'cmdname' => '"',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 443,446 ****
--- 451,456 ----
                ],
                'cmdname' => '`',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 506,509 ****
--- 516,521 ----
                ],
                'cmdname' => '\'',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 569,572 ****
--- 581,586 ----
                ],
                'cmdname' => '^',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 632,635 ****
--- 646,651 ----
                ],
                'cmdname' => '"',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 695,698 ****
--- 711,716 ----
                ],
                'cmdname' => ',',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 758,761 ****
--- 776,781 ----
                ],
                'cmdname' => '~',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 821,824 ****
--- 841,846 ----
                ],
                'cmdname' => '=',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 906,912 ****
--- 928,936 ----
                ],
                'cmdname' => 'H',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 972,978 ****
--- 996,1004 ----
                ],
                'cmdname' => 'dotaccent',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1038,1044 ****
--- 1064,1072 ----
                ],
                'cmdname' => 'ringaccent',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1147,1153 ****
--- 1175,1183 ----
                ],
                'cmdname' => 'u',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1213,1219 ****
--- 1243,1251 ----
                ],
                'cmdname' => 'ubaraccent',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1279,1285 ****
--- 1311,1319 ----
                ],
                'cmdname' => 'udotaccent',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1345,1351 ****
--- 1379,1387 ----
                ],
                'cmdname' => 'v',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1411,1417 ****
--- 1447,1455 ----
                ],
                'cmdname' => 'ogonek',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1477,1483 ****
--- 1515,1523 ----
                ],
                'cmdname' => 'ogonek',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1513,1516 ****
--- 1553,1561 ----
                'cmdname' => 'questiondown',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 48,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 1529,1532 ****
--- 1574,1578 ----
                'cmdname' => 'exclamdown',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1562,1565 ****
--- 1608,1616 ----
                'cmdname' => 'aa',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 50,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 1578,1581 ****
--- 1629,1633 ----
                'cmdname' => 'AA',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1611,1614 ****
--- 1663,1671 ----
                'cmdname' => 'ae',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 52,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 1627,1630 ****
--- 1684,1688 ----
                'cmdname' => 'AE',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1643,1646 ****
--- 1701,1705 ----
                'cmdname' => 'oe',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1659,1662 ****
--- 1718,1722 ----
                'cmdname' => 'OE',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1757,1760 ****
--- 1817,1825 ----
                'cmdname' => 'l',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 56,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 1773,1776 ****
--- 1838,1842 ----
                'cmdname' => 'L',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1806,1809 ****
--- 1872,1880 ----
                'cmdname' => 'o',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 58,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 1822,1825 ****
--- 1893,1897 ----
                'cmdname' => 'O',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1855,1858 ****
--- 1927,1935 ----
                'cmdname' => 'ss',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 60,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 1888,1891 ****
--- 1965,1973 ----
                'cmdname' => 'pounds',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 62,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 2440,2443 ****
--- 2522,2526 ----
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
+ $result_trees{'accentenc'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[1];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[1];
***************
*** 2451,2454 ****
--- 2534,2538 ----
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[3]{'contents'}[3];
+ $result_trees{'accentenc'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[3];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[3];
***************
*** 2462,2465 ****
--- 2546,2550 ----
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[5]{'contents'}[3];
+ $result_trees{'accentenc'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[5];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[5];
***************
*** 2473,2476 ****
--- 2558,2562 ----
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[7]{'contents'}[3];
+ $result_trees{'accentenc'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[7];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[7]{'contents'}[4]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[7];
***************
*** 2484,2487 ****
--- 2570,2574 ----
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[9]{'contents'}[3];
+ $result_trees{'accentenc'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[9];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[9]{'contents'}[4]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[9];
***************
*** 2495,2498 ****
--- 2582,2586 ----
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[11]{'contents'}[3];
+ $result_trees{'accentenc'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[11];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[11]{'contents'}[4]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[11];
***************
*** 2506,2509 ****
--- 2594,2598 ----
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[13]{'contents'}[3];
+ $result_trees{'accentenc'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[13];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[13];
***************
*** 2517,2520 ****
--- 2606,2610 ----
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[15]{'contents'}[3];
+ $result_trees{'accentenc'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[15];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[15]{'contents'}[4]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[15];
***************
*** 2528,2531 ****
--- 2618,2622 ----
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[17]{'contents'}[3];
+ $result_trees{'accentenc'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[17]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[17];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[17]{'contents'}[4]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[17];
***************
*** 2539,2542 ****
--- 2630,2634 ----
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[19]{'contents'}[3];
+ $result_trees{'accentenc'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[19]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[19];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[19]{'contents'}[4]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[19];
***************
*** 2550,2553 ****
--- 2642,2646 ----
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[21]{'contents'}[3];
+ $result_trees{'accentenc'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[21]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[21];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[21]{'contents'}[4]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[21];
***************
*** 2566,2569 ****
--- 2659,2663 ----
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'args'}[0];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[23]{'contents'}[5];
+ $result_trees{'accentenc'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'line_nr'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[23]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[23];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[23]{'contents'}[6]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[23];
***************
*** 2577,2580 ****
--- 2671,2675 ----
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[25]{'contents'}[3];
+ $result_trees{'accentenc'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[25];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[25]{'contents'}[4]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[25];
***************
*** 2588,2591 ****
--- 2683,2687 ----
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[27]{'contents'}[3];
+ $result_trees{'accentenc'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[27];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[27]{'contents'}[4]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[27];
***************
*** 2606,2609 ****
--- 2702,2706 ----
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[31]{'contents'}[3];
+ $result_trees{'accentenc'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[31];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[31]{'contents'}[4]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[31];
***************
*** 2617,2620 ****
--- 2714,2718 ----
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[33]{'contents'}[3];
+ $result_trees{'accentenc'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[33]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[33];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[33]{'contents'}[4]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[33];
***************
*** 2628,2631 ****
--- 2726,2730 ----
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[35]{'contents'}[3];
+ $result_trees{'accentenc'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[35]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[35];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[35]{'contents'}[4]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[35];
***************
*** 2639,2642 ****
--- 2738,2742 ----
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[37]{'contents'}[3];
+ $result_trees{'accentenc'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[37]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[37];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[37]{'contents'}[4]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[37];
***************
*** 2650,2653 ****
--- 2750,2754 ----
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[39]{'contents'}[3];
+ $result_trees{'accentenc'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[39]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[39];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[39]{'contents'}[4]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[39];
***************
*** 2661,2664 ****
--- 2762,2766 ----
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[41]{'contents'}[3];
+ $result_trees{'accentenc'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[41]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[41];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[41]{'contents'}[4]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[41];
***************
*** 2670,2673 ****
--- 2772,2776 ----
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[43]{'contents'}[2]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[43];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[43]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[43]{'contents'}[3];
+ $result_trees{'accentenc'}{'contents'}[2]{'contents'}[43]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[43]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[43]{'contents'}[3]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[43];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[43]{'contents'}[4]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[43];
***************
*** 2679,2682 ****
--- 2782,2786 ----
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[45]{'contents'}[2]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[45];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[45]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[45]{'contents'}[3];
+ $result_trees{'accentenc'}{'contents'}[2]{'contents'}[45]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[45]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[45]{'contents'}[3]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[45];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[45]{'contents'}[4]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[45];
***************
*** 2688,2697 ****
--- 2792,2804 ----
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[47]{'contents'}[2]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[47];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[47]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[47]{'contents'}[3];
+ $result_trees{'accentenc'}{'contents'}[2]{'contents'}[47]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[47]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[47]{'contents'}[3]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[47];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[47]{'contents'}[4]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[47];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[47]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[47]{'contents'}[5];
+ $result_trees{'accentenc'}{'contents'}[2]{'contents'}[47]{'contents'}[5]{'line_nr'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[47]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[47]{'contents'}[5]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[47];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[47]{'contents'}[6]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[47];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[47]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[47]{'contents'}[7];
+ $result_trees{'accentenc'}{'contents'}[2]{'contents'}[47]{'contents'}[7]{'line_nr'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[47]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[47]{'contents'}[7]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[47];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[47]{'contents'}[8]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[47];
***************
*** 2715,2718 ****
--- 2822,2826 ----
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[51]{'contents'}[2]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[51];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[51]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[51]{'contents'}[3];
+ $result_trees{'accentenc'}{'contents'}[2]{'contents'}[51]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[51]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[51]{'contents'}[3]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[51];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[51]{'contents'}[4]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[51];
***************
*** 2724,2727 ****
--- 2832,2836 ----
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[53]{'contents'}[2]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[53];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[53]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[53]{'contents'}[3];
+ $result_trees{'accentenc'}{'contents'}[2]{'contents'}[53]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[53]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[53]{'contents'}[3]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[53];
  $result_trees{'accentenc'}{'contents'}[2]{'contents'}[53]{'contents'}[4]{'parent'} = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[53];
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/accentenc_enable_encoding.pl texinfo-6.3/tp/t/results/converters_tests/accentenc_enable_encoding.pl
*** texinfo-6.1/tp/t/results/converters_tests/accentenc_enable_encoding.pl	2016-01-22 07:50:20.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/accentenc_enable_encoding.pl	2016-08-02 18:44:58.000000000 +0100
***************
*** 191,194 ****
--- 191,196 ----
                ],
                'cmdname' => '`',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 254,257 ****
--- 256,261 ----
                ],
                'cmdname' => '\'',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 317,320 ****
--- 321,326 ----
                ],
                'cmdname' => '^',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 380,383 ****
--- 386,391 ----
                ],
                'cmdname' => '"',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 443,446 ****
--- 451,456 ----
                ],
                'cmdname' => '`',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 506,509 ****
--- 516,521 ----
                ],
                'cmdname' => '\'',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 569,572 ****
--- 581,586 ----
                ],
                'cmdname' => '^',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 632,635 ****
--- 646,651 ----
                ],
                'cmdname' => '"',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 695,698 ****
--- 711,716 ----
                ],
                'cmdname' => ',',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 758,761 ****
--- 776,781 ----
                ],
                'cmdname' => '~',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 821,824 ****
--- 841,846 ----
                ],
                'cmdname' => '=',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 906,912 ****
--- 928,936 ----
                ],
                'cmdname' => 'H',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 972,978 ****
--- 996,1004 ----
                ],
                'cmdname' => 'dotaccent',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1038,1044 ****
--- 1064,1072 ----
                ],
                'cmdname' => 'ringaccent',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1147,1153 ****
--- 1175,1183 ----
                ],
                'cmdname' => 'u',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1213,1219 ****
--- 1243,1251 ----
                ],
                'cmdname' => 'ubaraccent',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1279,1285 ****
--- 1311,1319 ----
                ],
                'cmdname' => 'udotaccent',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1345,1351 ****
--- 1379,1387 ----
                ],
                'cmdname' => 'v',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1411,1417 ****
--- 1447,1455 ----
                ],
                'cmdname' => 'ogonek',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1477,1483 ****
--- 1515,1523 ----
                ],
                'cmdname' => 'ogonek',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1513,1516 ****
--- 1553,1561 ----
                'cmdname' => 'questiondown',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 48,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 1529,1532 ****
--- 1574,1578 ----
                'cmdname' => 'exclamdown',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1562,1565 ****
--- 1608,1616 ----
                'cmdname' => 'aa',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 50,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 1578,1581 ****
--- 1629,1633 ----
                'cmdname' => 'AA',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1611,1614 ****
--- 1663,1671 ----
                'cmdname' => 'ae',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 52,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 1627,1630 ****
--- 1684,1688 ----
                'cmdname' => 'AE',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1643,1646 ****
--- 1701,1705 ----
                'cmdname' => 'oe',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1659,1662 ****
--- 1718,1722 ----
                'cmdname' => 'OE',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1757,1760 ****
--- 1817,1825 ----
                'cmdname' => 'l',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 56,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 1773,1776 ****
--- 1838,1842 ----
                'cmdname' => 'L',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1806,1809 ****
--- 1872,1880 ----
                'cmdname' => 'o',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 58,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 1822,1825 ****
--- 1893,1897 ----
                'cmdname' => 'O',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1855,1858 ****
--- 1927,1935 ----
                'cmdname' => 'ss',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 60,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 1888,1891 ****
--- 1965,1973 ----
                'cmdname' => 'pounds',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 62,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 2440,2443 ****
--- 2522,2526 ----
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
+ $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[1];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[1];
***************
*** 2451,2454 ****
--- 2534,2538 ----
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[3]{'contents'}[3];
+ $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[3];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[3];
***************
*** 2462,2465 ****
--- 2546,2550 ----
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[5]{'contents'}[3];
+ $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[5];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[5];
***************
*** 2473,2476 ****
--- 2558,2562 ----
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[3];
+ $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[7];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[4]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[7];
***************
*** 2484,2487 ****
--- 2570,2574 ----
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[9]{'contents'}[3];
+ $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[9];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[9]{'contents'}[4]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[9];
***************
*** 2495,2498 ****
--- 2582,2586 ----
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[11]{'contents'}[3];
+ $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[11];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[11]{'contents'}[4]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[11];
***************
*** 2506,2509 ****
--- 2594,2598 ----
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[13]{'contents'}[3];
+ $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[13];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[13];
***************
*** 2517,2520 ****
--- 2606,2610 ----
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[15]{'contents'}[3];
+ $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[15];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[15]{'contents'}[4]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[15];
***************
*** 2528,2531 ****
--- 2618,2622 ----
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[17]{'contents'}[3];
+ $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[17]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[17];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[17]{'contents'}[4]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[17];
***************
*** 2539,2542 ****
--- 2630,2634 ----
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[19]{'contents'}[3];
+ $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[19]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[19];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[19]{'contents'}[4]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[19];
***************
*** 2550,2553 ****
--- 2642,2646 ----
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[21]{'contents'}[3];
+ $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[21]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[21];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[21]{'contents'}[4]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[21];
***************
*** 2566,2569 ****
--- 2659,2663 ----
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'args'}[0];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[23]{'contents'}[5];
+ $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'line_nr'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[23]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[23];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[23]{'contents'}[6]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[23];
***************
*** 2577,2580 ****
--- 2671,2675 ----
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[25]{'contents'}[3];
+ $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[25];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[25]{'contents'}[4]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[25];
***************
*** 2588,2591 ****
--- 2683,2687 ----
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[27]{'contents'}[3];
+ $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[27];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[27]{'contents'}[4]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[27];
***************
*** 2606,2609 ****
--- 2702,2706 ----
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[31]{'contents'}[3];
+ $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[31];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[31]{'contents'}[4]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[31];
***************
*** 2617,2620 ****
--- 2714,2718 ----
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[33]{'contents'}[3];
+ $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[33]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[33];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[33]{'contents'}[4]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[33];
***************
*** 2628,2631 ****
--- 2726,2730 ----
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[35]{'contents'}[3];
+ $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[35]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[35];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[35]{'contents'}[4]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[35];
***************
*** 2639,2642 ****
--- 2738,2742 ----
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[37]{'contents'}[3];
+ $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[37]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[37];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[37]{'contents'}[4]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[37];
***************
*** 2650,2653 ****
--- 2750,2754 ----
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[39]{'contents'}[3];
+ $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[39]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[39];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[39]{'contents'}[4]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[39];
***************
*** 2661,2664 ****
--- 2762,2766 ----
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[41]{'contents'}[3];
+ $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[41]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[41];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[41]{'contents'}[4]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[41];
***************
*** 2670,2673 ****
--- 2772,2776 ----
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[43]{'contents'}[2]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[43];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[43]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[43]{'contents'}[3];
+ $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[43]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[43]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[43]{'contents'}[3]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[43];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[43]{'contents'}[4]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[43];
***************
*** 2679,2682 ****
--- 2782,2786 ----
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[45]{'contents'}[2]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[45];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[45]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[45]{'contents'}[3];
+ $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[45]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[45]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[45]{'contents'}[3]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[45];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[45]{'contents'}[4]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[45];
***************
*** 2688,2697 ****
--- 2792,2804 ----
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[47]{'contents'}[2]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[47];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[47]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[47]{'contents'}[3];
+ $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[47]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[47]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[47]{'contents'}[3]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[47];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[47]{'contents'}[4]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[47];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[47]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[47]{'contents'}[5];
+ $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[47]{'contents'}[5]{'line_nr'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[47]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[47]{'contents'}[5]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[47];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[47]{'contents'}[6]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[47];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[47]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[47]{'contents'}[7];
+ $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[47]{'contents'}[7]{'line_nr'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[47]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[47]{'contents'}[7]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[47];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[47]{'contents'}[8]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[47];
***************
*** 2715,2718 ****
--- 2822,2826 ----
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[51]{'contents'}[2]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[51];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[51]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[51]{'contents'}[3];
+ $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[51]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[51]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[51]{'contents'}[3]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[51];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[51]{'contents'}[4]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[51];
***************
*** 2724,2727 ****
--- 2832,2836 ----
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[53]{'contents'}[2]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[53];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[53]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[53]{'contents'}[3];
+ $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[53]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[53]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[53]{'contents'}[3]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[53];
  $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[53]{'contents'}[4]{'parent'} = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[53];
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/accentenc_no_entity.pl texinfo-6.3/tp/t/results/converters_tests/accentenc_no_entity.pl
*** texinfo-6.1/tp/t/results/converters_tests/accentenc_no_entity.pl	2016-01-22 07:50:20.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/accentenc_no_entity.pl	2016-08-02 18:44:58.000000000 +0100
***************
*** 191,194 ****
--- 191,196 ----
                ],
                'cmdname' => '`',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 254,257 ****
--- 256,261 ----
                ],
                'cmdname' => '\'',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 317,320 ****
--- 321,326 ----
                ],
                'cmdname' => '^',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 380,383 ****
--- 386,391 ----
                ],
                'cmdname' => '"',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 443,446 ****
--- 451,456 ----
                ],
                'cmdname' => '`',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 506,509 ****
--- 516,521 ----
                ],
                'cmdname' => '\'',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 569,572 ****
--- 581,586 ----
                ],
                'cmdname' => '^',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 632,635 ****
--- 646,651 ----
                ],
                'cmdname' => '"',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 695,698 ****
--- 711,716 ----
                ],
                'cmdname' => ',',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 758,761 ****
--- 776,781 ----
                ],
                'cmdname' => '~',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 821,824 ****
--- 841,846 ----
                ],
                'cmdname' => '=',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 906,912 ****
--- 928,936 ----
                ],
                'cmdname' => 'H',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 972,978 ****
--- 996,1004 ----
                ],
                'cmdname' => 'dotaccent',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1038,1044 ****
--- 1064,1072 ----
                ],
                'cmdname' => 'ringaccent',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1147,1153 ****
--- 1175,1183 ----
                ],
                'cmdname' => 'u',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1213,1219 ****
--- 1243,1251 ----
                ],
                'cmdname' => 'ubaraccent',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1279,1285 ****
--- 1311,1319 ----
                ],
                'cmdname' => 'udotaccent',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1345,1351 ****
--- 1379,1387 ----
                ],
                'cmdname' => 'v',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1411,1417 ****
--- 1447,1455 ----
                ],
                'cmdname' => 'ogonek',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1477,1483 ****
--- 1515,1523 ----
                ],
                'cmdname' => 'ogonek',
+               'contents' => [],
                'extra' => {
                  'spaces' => ' '
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1513,1516 ****
--- 1553,1561 ----
                'cmdname' => 'questiondown',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 48,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 1529,1532 ****
--- 1574,1578 ----
                'cmdname' => 'exclamdown',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1562,1565 ****
--- 1608,1616 ----
                'cmdname' => 'aa',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 50,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 1578,1581 ****
--- 1629,1633 ----
                'cmdname' => 'AA',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1611,1614 ****
--- 1663,1671 ----
                'cmdname' => 'ae',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 52,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 1627,1630 ****
--- 1684,1688 ----
                'cmdname' => 'AE',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1643,1646 ****
--- 1701,1705 ----
                'cmdname' => 'oe',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1659,1662 ****
--- 1718,1722 ----
                'cmdname' => 'OE',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1757,1760 ****
--- 1817,1825 ----
                'cmdname' => 'l',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 56,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 1773,1776 ****
--- 1838,1842 ----
                'cmdname' => 'L',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1806,1809 ****
--- 1872,1880 ----
                'cmdname' => 'o',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 58,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 1822,1825 ****
--- 1893,1897 ----
                'cmdname' => 'O',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1855,1858 ****
--- 1927,1935 ----
                'cmdname' => 'ss',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 60,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 1888,1891 ****
--- 1965,1973 ----
                'cmdname' => 'pounds',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 62,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 2440,2443 ****
--- 2522,2526 ----
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
+ $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[1];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[1];
***************
*** 2451,2454 ****
--- 2534,2538 ----
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[3]{'contents'}[3];
+ $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[3];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[3];
***************
*** 2462,2465 ****
--- 2546,2550 ----
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[5]{'contents'}[3];
+ $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[5];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[5];
***************
*** 2473,2476 ****
--- 2558,2562 ----
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[7]{'contents'}[3];
+ $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[7];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[7]{'contents'}[4]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[7];
***************
*** 2484,2487 ****
--- 2570,2574 ----
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[9]{'contents'}[3];
+ $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[9];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[9]{'contents'}[4]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[9];
***************
*** 2495,2498 ****
--- 2582,2586 ----
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[11]{'contents'}[3];
+ $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[11];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[11]{'contents'}[4]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[11];
***************
*** 2506,2509 ****
--- 2594,2598 ----
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[13]{'contents'}[3];
+ $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[13];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[13];
***************
*** 2517,2520 ****
--- 2606,2610 ----
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[15]{'contents'}[3];
+ $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[15];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[15]{'contents'}[4]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[15];
***************
*** 2528,2531 ****
--- 2618,2622 ----
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[17]{'contents'}[3];
+ $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[17]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[17];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[17]{'contents'}[4]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[17];
***************
*** 2539,2542 ****
--- 2630,2634 ----
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[19]{'contents'}[3];
+ $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[19]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[19];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[19]{'contents'}[4]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[19];
***************
*** 2550,2553 ****
--- 2642,2646 ----
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[21]{'contents'}[3];
+ $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[21]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[21];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[21]{'contents'}[4]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[21];
***************
*** 2566,2569 ****
--- 2659,2663 ----
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'args'}[0];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[23]{'contents'}[5];
+ $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'line_nr'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[23]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[23];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[23]{'contents'}[6]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[23];
***************
*** 2577,2580 ****
--- 2671,2675 ----
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[25]{'contents'}[3];
+ $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[25];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[25]{'contents'}[4]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[25];
***************
*** 2588,2591 ****
--- 2683,2687 ----
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[27]{'contents'}[3];
+ $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[27];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[27]{'contents'}[4]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[27];
***************
*** 2606,2609 ****
--- 2702,2706 ----
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[31]{'contents'}[3];
+ $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[31];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[31]{'contents'}[4]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[31];
***************
*** 2617,2620 ****
--- 2714,2718 ----
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[33]{'contents'}[3];
+ $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[33]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[33];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[33]{'contents'}[4]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[33];
***************
*** 2628,2631 ****
--- 2726,2730 ----
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[35]{'contents'}[3];
+ $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[35]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[35];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[35]{'contents'}[4]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[35];
***************
*** 2639,2642 ****
--- 2738,2742 ----
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[37]{'contents'}[3];
+ $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[37]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[37];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[37]{'contents'}[4]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[37];
***************
*** 2650,2653 ****
--- 2750,2754 ----
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[39]{'contents'}[3];
+ $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[39]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[39];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[39]{'contents'}[4]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[39];
***************
*** 2661,2664 ****
--- 2762,2766 ----
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'args'}[0];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[41]{'contents'}[3];
+ $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[41]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[41];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[41]{'contents'}[4]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[41];
***************
*** 2670,2673 ****
--- 2772,2776 ----
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[43]{'contents'}[2]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[43];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[43]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[43]{'contents'}[3];
+ $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[43]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[43]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[43]{'contents'}[3]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[43];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[43]{'contents'}[4]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[43];
***************
*** 2679,2682 ****
--- 2782,2786 ----
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[45]{'contents'}[2]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[45];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[45]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[45]{'contents'}[3];
+ $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[45]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[45]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[45]{'contents'}[3]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[45];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[45]{'contents'}[4]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[45];
***************
*** 2688,2697 ****
--- 2792,2804 ----
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[47]{'contents'}[2]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[47];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[47]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[47]{'contents'}[3];
+ $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[47]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[47]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[47]{'contents'}[3]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[47];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[47]{'contents'}[4]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[47];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[47]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[47]{'contents'}[5];
+ $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[47]{'contents'}[5]{'line_nr'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[47]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[47]{'contents'}[5]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[47];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[47]{'contents'}[6]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[47];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[47]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[47]{'contents'}[7];
+ $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[47]{'contents'}[7]{'line_nr'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[47]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[47]{'contents'}[7]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[47];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[47]{'contents'}[8]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[47];
***************
*** 2715,2718 ****
--- 2822,2826 ----
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[51]{'contents'}[2]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[51];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[51]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[51]{'contents'}[3];
+ $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[51]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[51]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[51]{'contents'}[3]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[51];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[51]{'contents'}[4]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[51];
***************
*** 2724,2727 ****
--- 2832,2836 ----
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[53]{'contents'}[2]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[53];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[53]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[53]{'contents'}[3];
+ $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[53]{'contents'}[3]{'line_nr'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[53]{'contents'}[1]{'line_nr'};
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[53]{'contents'}[3]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[53];
  $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[53]{'contents'}[4]{'parent'} = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[53];
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/at_commands_in_raw.pl texinfo-6.3/tp/t/results/converters_tests/at_commands_in_raw.pl
*** texinfo-6.1/tp/t/results/converters_tests/at_commands_in_raw.pl	2016-01-22 07:50:17.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/at_commands_in_raw.pl	2016-08-02 18:44:56.000000000 +0100
***************
*** 72,87 ****
            'extra' => {
              'arg_line' => ' othermacro{}
! ',
!             'macrobody' => 'Other macro
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 72,76 ----
            'extra' => {
              'arg_line' => ' othermacro{}
! '
            },
            'line_nr' => {
***************
*** 92,96 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 81,93 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 138,148 ****
                    'cmdname' => 'footnote',
                    'contents' => [],
-                   'extra' => {
-                     'spaces_before_argument' => {
-                       'parent' => {},
-                       'text' => '',
-                       'type' => 'empty_spaces_before_argument'
-                     }
-                   },
                    'line_nr' => {
                      'file_name' => '',
--- 135,138 ----
***************
*** 154,1243 ****
                  {
                    'parent' => {},
!                   'text' => '.</b>
! '
!                 },
!                 {
!                   'args' => [
!                     {
!                       'contents' => [
!                         {
!                           'parent' => {},
!                           'text' => 'anchor in html'
!                         }
!                       ],
!                       'parent' => {},
!                       'type' => 'brace_command_arg'
!                     }
!                   ],
!                   'cmdname' => 'anchor',
!                   'contents' => [],
!                   'extra' => {
!                     'brace_command_contents' => [
!                       [
!                         {}
!                       ]
!                     ],
!                     'node_content' => [
!                       {}
!                     ],
!                     'normalized' => 'anchor-in-html',
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
!                   },
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 9,
!                     'macro' => ''
!                   },
!                   'parent' => {}
!                 },
!                 {
!                   'text' => '
! ',
!                   'type' => 'empty_spaces_after_close_brace'
!                 }
!               ],
!               'parent' => {},
!               'type' => 'rawpreformatted'
!             },
!             {
!               'args' => [
!                 {
!                   'contents' => [
!                     {
!                       'extra' => {
!                         'command' => {}
!                       },
!                       'parent' => {},
!                       'text' => ' ',
!                       'type' => 'empty_spaces_after_command'
!                     },
!                     {
!                       'parent' => {},
!                       'text' => 'html'
!                     },
!                     {
!                       'parent' => {},
!                       'text' => '
! ',
!                       'type' => 'spaces_at_end'
!                     }
!                   ],
!                   'parent' => {},
!                   'type' => 'misc_line_arg'
!                 }
!               ],
!               'cmdname' => 'end',
!               'extra' => {
!                 'command' => {},
!                 'command_argument' => 'html',
!                 'spaces_after_command' => {},
!                 'text_arg' => 'html'
!               },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 10,
!                 'macro' => ''
!               },
!               'parent' => {}
!             }
!           ],
!           'extra' => {
!             'end_command' => {},
!             'spaces_after_command' => {}
!           },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 7,
!             'macro' => ''
!           },
!           'parent' => {}
!         },
!         {
!           'contents' => [
!             {
!               'args' => [
!                 {
!                   'contents' => [
!                     {
!                       'parent' => {},
!                       'text' => 'in kbd before tex'
!                     }
!                   ],
!                   'parent' => {},
!                   'type' => 'brace_command_arg'
!                 }
!               ],
!               'cmdname' => 'kbd',
!               'contents' => [],
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 11,
!                 'macro' => ''
!               },
!               'parent' => {}
!             },
!             {
!               'args' => [
!                 {
!                   'contents' => [
!                     {
!                       'contents' => [
!                         {
!                           'parent' => {},
!                           'text' => 'second footnote'
!                         }
!                       ],
!                       'parent' => {},
!                       'type' => 'paragraph'
!                     }
!                   ],
!                   'parent' => {},
!                   'type' => 'brace_command_context'
!                 }
!               ],
!               'cmdname' => 'footnote',
!               'contents' => [],
!               'extra' => {
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
!               },
!               'line_nr' => {},
!               'parent' => {}
!             },
!             {
!               'parent' => {},
!               'text' => '.
! '
!             }
!           ],
!           'parent' => {},
!           'type' => 'paragraph'
!         },
!         {
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line'
!         },
!         {
!           'cmdname' => 'tex',
!           'contents' => [
!             {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             },
!             {
!               'contents' => [
!                 {
!                   'args' => [
!                     {
!                       'contents' => [
!                         {
!                           'extra' => {
!                             'command' => {}
!                           },
!                           'parent' => {},
!                           'text' => ' ',
!                           'type' => 'empty_spaces_after_command'
!                         },
!                         {
!                           'parent' => {},
!                           'text' => 'code'
!                         },
!                         {
!                           'parent' => {},
!                           'text' => '
! ',
!                           'type' => 'spaces_at_end'
!                         }
!                       ],
!                       'parent' => {},
!                       'type' => 'misc_line_arg'
!                     }
!                   ],
!                   'cmdname' => 'kbdinputstyle',
!                   'extra' => {
!                     'misc_args' => [
!                       'code'
!                     ],
!                     'spaces_after_command' => {}
!                   },
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 14,
!                     'macro' => ''
!                   },
!                   'parent' => {}
!                 },
!                 {
!                   'parent' => {},
!                   'text' => 'in tex'
!                 },
!                 {
!                   'args' => [
!                     {
!                       'contents' => [
!                         {
!                           'contents' => [
!                             {
!                               'parent' => {},
!                               'text' => 'footnote in tex'
!                             }
!                           ],
!                           'parent' => {},
!                           'type' => 'paragraph'
!                         }
!                       ],
!                       'parent' => {},
!                       'type' => 'brace_command_context'
!                     }
!                   ],
!                   'cmdname' => 'footnote',
!                   'contents' => [],
!                   'extra' => {
!                     'spaces_before_argument' => {
!                       'parent' => {},
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
!                   },
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 15,
!                     'macro' => ''
!                   },
!                   'parent' => {}
!                 },
!                 {
!                   'parent' => {},
!                   'text' => '
! '
!                 },
!                 {
!                   'args' => [
!                     {
!                       'contents' => [
!                         {
!                           'parent' => {},
!                           'text' => 'anchor in tex'
!                         }
!                       ],
!                       'parent' => {},
!                       'type' => 'brace_command_arg'
!                     }
!                   ],
!                   'cmdname' => 'anchor',
!                   'contents' => [],
!                   'extra' => {
!                     'brace_command_contents' => [
!                       [
!                         {}
!                       ]
!                     ],
!                     'node_content' => [
!                       {}
!                     ],
!                     'normalized' => 'anchor-in-tex',
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
!                   },
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 16,
!                     'macro' => ''
!                   },
!                   'parent' => {}
!                 },
!                 {
!                   'text' => '
! ',
!                   'type' => 'empty_spaces_after_close_brace'
!                 },
!                 {
!                   'args' => [
!                     {
!                       'contents' => [
!                         {
!                           'extra' => {
!                             'command' => {}
!                           },
!                           'parent' => {},
!                           'text' => ' ',
!                           'type' => 'empty_spaces_after_command'
!                         },
!                         {
!                           'parent' => {},
!                           'text' => 'entry'
!                         },
!                         {
!                           'parent' => {},
!                           'text' => '
! ',
!                           'type' => 'spaces_at_end'
!                         }
!                       ],
!                       'parent' => {},
!                       'type' => 'misc_line_arg'
!                     }
!                   ],
!                   'cmdname' => 'cindex',
!                   'extra' => {
!                     'index_entry' => {
!                       'command' => {},
!                       'content' => [
!                         {}
!                       ],
!                       'content_normalized' => [],
!                       'index_at_command' => 'cindex',
!                       'index_name' => 'cp',
!                       'index_prefix' => 'c',
!                       'index_type_command' => 'cindex',
!                       'node' => {},
!                       'number' => undef
!                     },
!                     'misc_content' => [],
!                     'spaces_after_command' => {}
!                   },
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 17,
!                     'macro' => ''
!                   },
!                   'parent' => {},
!                   'type' => 'index_entry_command'
!                 },
!                 {
!                   'args' => [
!                     {
!                       'contents' => [
!                         {
!                           'extra' => {
!                             'command' => {}
!                           },
!                           'parent' => {},
!                           'text' => ' ',
!                           'type' => 'empty_spaces_after_command'
!                         },
!                         {
!                           'parent' => {},
!                           'text' => 'fentry1'
!                         },
!                         {
!                           'parent' => {},
!                           'text' => '
! ',
!                           'type' => 'spaces_at_end'
!                         }
!                       ],
!                       'parent' => {},
!                       'type' => 'misc_line_arg'
!                     }
!                   ],
!                   'cmdname' => 'findex',
!                   'extra' => {
!                     'index_entry' => {
!                       'command' => {},
!                       'content' => [
!                         {}
!                       ],
!                       'content_normalized' => [],
!                       'index_at_command' => 'findex',
!                       'index_name' => 'fn',
!                       'index_prefix' => 'f',
!                       'index_type_command' => 'findex',
!                       'node' => {},
!                       'number' => undef
!                     },
!                     'misc_content' => [],
!                     'spaces_after_command' => {}
!                   },
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 18,
!                     'macro' => ''
!                   },
!                   'parent' => {},
!                   'type' => 'index_entry_command'
!                 },
!                 {
!                   'parent' => {},
!                   'text' => '
! ',
!                   'type' => 'empty_line'
!                 }
!               ],
!               'parent' => {},
!               'type' => 'rawpreformatted'
!             },
!             {
!               'args' => [
!                 {
!                   'contents' => [
!                     {
!                       'extra' => {
!                         'command' => {}
!                       },
!                       'parent' => {},
!                       'text' => ' ',
!                       'type' => 'empty_spaces_after_command'
!                     },
!                     {
!                       'parent' => {},
!                       'text' => 'Figs'
!                     }
!                   ],
!                   'parent' => {},
!                   'type' => 'block_line_arg'
!                 },
!                 {
!                   'contents' => [
!                     {
!                       'text' => ' ',
!                       'type' => 'empty_spaces_before_argument'
!                     },
!                     {
!                       'parent' => {},
!                       'text' => 'f1'
!                     },
!                     {
!                       'parent' => {},
!                       'text' => '
! ',
!                       'type' => 'space_at_end_block_command'
!                     }
!                   ],
!                   'parent' => {},
!                   'type' => 'block_line_arg'
!                 }
!               ],
!               'cmdname' => 'float',
!               'contents' => [
!                 {
!                   'contents' => [
!                     {
!                       'parent' => {},
!                       'text' => 'Float
! '
!                     }
!                   ],
!                   'parent' => {},
!                   'type' => 'rawpreformatted'
!                 },
!                 {
!                   'args' => [
!                     {
!                       'contents' => [
!                         {
!                           'contents' => [
!                             {
!                               'parent' => {},
!                               'text' => 'Fcaption'
!                             }
!                           ],
!                           'parent' => {},
!                           'type' => 'paragraph'
!                         }
!                       ],
!                       'parent' => {},
!                       'type' => 'brace_command_context'
!                     }
!                   ],
!                   'cmdname' => 'caption',
!                   'contents' => [],
!                   'extra' => {
!                     'float' => {},
!                     'spaces_before_argument' => {
!                       'parent' => {},
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
!                   },
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 22,
!                     'macro' => ''
!                   },
!                   'parent' => {}
!                 },
!                 {
!                   'contents' => [
!                     {
!                       'parent' => {},
!                       'text' => '
! '
!                     }
!                   ],
!                   'parent' => {},
!                   'type' => 'rawpreformatted'
!                 },
!                 {
!                   'args' => [
!                     {
!                       'contents' => [
!                         {
!                           'extra' => {
!                             'command' => {}
!                           },
!                           'parent' => {},
!                           'text' => ' ',
!                           'type' => 'empty_spaces_after_command'
!                         },
!                         {
!                           'parent' => {},
!                           'text' => 'float'
!                         },
!                         {
!                           'parent' => {},
!                           'text' => '
! ',
!                           'type' => 'spaces_at_end'
!                         }
!                       ],
!                       'parent' => {},
!                       'type' => 'misc_line_arg'
!                     }
!                   ],
!                   'cmdname' => 'end',
!                   'extra' => {
!                     'command' => {},
!                     'command_argument' => 'float',
!                     'spaces_after_command' => {},
!                     'text_arg' => 'float'
!                   },
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 23,
!                     'macro' => ''
!                   },
!                   'parent' => {}
!                 }
!               ],
!               'extra' => {
!                 'block_command_line_contents' => [
!                   [
!                     {}
!                   ],
!                   [
!                     {}
!                   ]
!                 ],
!                 'caption' => {},
!                 'end_command' => {},
!                 'node_content' => [
!                   {}
!                 ],
!                 'normalized' => 'f1',
!                 'spaces_after_command' => {},
!                 'type' => {
!                   'content' => [
!                     {}
!                   ],
!                   'normalized' => 'Figs'
!                 }
!               },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 20,
!                 'macro' => ''
!               },
!               'parent' => {}
!             },
!             {
!               'contents' => [
!                 {
!                   'parent' => {},
!                   'text' => '
! ',
!                   'type' => 'empty_line'
!                 }
!               ],
!               'parent' => {},
!               'type' => 'rawpreformatted'
!             },
!             {
!               'cmdname' => 'menu',
!               'contents' => [
!                 {
!                   'extra' => {
!                     'command' => {}
!                   },
!                   'parent' => {},
!                   'text' => '
! ',
!                   'type' => 'empty_line_after_command'
!                 },
!                 {
!                   'args' => [
!                     {
!                       'parent' => {},
!                       'text' => '* ',
!                       'type' => 'menu_entry_leading_text'
!                     },
!                     {
!                       'contents' => [
!                         {
!                           'parent' => {},
!                           'text' => 'n'
!                         }
!                       ],
!                       'parent' => {},
!                       'type' => 'menu_entry_node'
!                     },
!                     {
!                       'parent' => {},
!                       'text' => '::',
!                       'type' => 'menu_entry_separator'
!                     },
!                     {
!                       'contents' => [
!                         {
!                           'contents' => [
!                             {
!                               'parent' => {},
!                               'text' => '
! '
!                             }
!                           ],
!                           'parent' => {},
!                           'type' => 'preformatted'
!                         }
!                       ],
!                       'parent' => {},
!                       'type' => 'menu_entry_description'
!                     }
!                   ],
!                   'extra' => {
!                     'menu_entry_description' => {},
!                     'menu_entry_node' => {
!                       'node_content' => [
!                         {}
!                       ],
!                       'normalized' => 'n'
!                     }
!                   },
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 26,
!                     'macro' => ''
!                   },
!                   'parent' => {},
!                   'type' => 'menu_entry'
!                 },
!                 {
!                   'args' => [
!                     {
!                       'contents' => [
!                         {
!                           'extra' => {
!                             'command' => {}
!                           },
!                           'parent' => {},
!                           'text' => ' ',
!                           'type' => 'empty_spaces_after_command'
!                         },
!                         {
!                           'parent' => {},
!                           'text' => 'menu'
!                         },
!                         {
!                           'parent' => {},
!                           'text' => '
! ',
!                           'type' => 'spaces_at_end'
!                         }
!                       ],
!                       'parent' => {},
!                       'type' => 'misc_line_arg'
!                     }
!                   ],
!                   'cmdname' => 'end',
!                   'extra' => {
!                     'command' => {},
!                     'command_argument' => 'menu',
!                     'spaces_after_command' => {},
!                     'text_arg' => 'menu'
!                   },
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 27,
!                     'macro' => ''
!                   },
!                   'parent' => {}
!                 }
!               ],
!               'extra' => {
!                 'end_command' => {},
!                 'spaces_after_command' => {}
!               },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 25,
!                 'macro' => ''
!               },
!               'parent' => {}
!             },
!             {
!               'contents' => [
!                 {
!                   'parent' => {},
!                   'text' => '
! ',
!                   'type' => 'empty_line'
!                 },
!                 {
!                   'args' => [
!                     {
!                       'contents' => [
!                         {
!                           'parent' => {},
!                           'text' => 'FF'
!                         }
!                       ],
!                       'parent' => {},
!                       'type' => 'brace_command_arg'
!                     },
!                     {
!                       'contents' => [
!                         {
!                           'text' => ' ',
!                           'type' => 'empty_spaces_before_argument'
!                         },
!                         {
!                           'parent' => {},
!                           'text' => 'Fi Foo'
!                         }
!                       ],
!                       'parent' => {},
!                       'type' => 'brace_command_arg'
!                     }
!                   ],
!                   'cmdname' => 'acronym',
!                   'contents' => [],
!                   'extra' => {
!                     'brace_command_contents' => [
!                       [
!                         {}
!                       ],
!                       [
!                         {}
!                       ]
!                     ],
!                     'normalized' => 'FF',
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
!                   },
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 29,
!                     'macro' => ''
!                   },
!                   'parent' => {}
!                 },
!                 {
!                   'parent' => {},
!                   'text' => '
! '
!                 },
!                 {
!                   'parent' => {},
!                   'text' => '
! ',
!                   'type' => 'empty_line'
!                 },
!                 {
!                   'args' => [
!                     {
!                       'contents' => [
!                         {
!                           'extra' => {
!                             'command' => {}
!                           },
!                           'parent' => {},
!                           'text' => ' ',
!                           'type' => 'empty_spaces_after_command'
!                         },
!                         {
!                           'parent' => {},
!                           'text' => 'cp fn'
!                         },
!                         {
!                           'parent' => {},
!                           'text' => '
! ',
!                           'type' => 'spaces_at_end'
!                         }
!                       ],
!                       'parent' => {},
!                       'type' => 'misc_line_arg'
!                     }
!                   ],
!                   'cmdname' => 'synindex',
!                   'extra' => {
!                     'misc_args' => [
!                       'cp',
!                       'fn'
!                     ],
!                     'spaces_after_command' => {}
!                   },
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 31,
!                     'macro' => ''
!                   },
!                   'parent' => {}
!                 },
!                 {
!                   'parent' => {},
!                   'text' => '
! ',
!                   'type' => 'empty_line'
!                 },
!                 {
!                   'args' => [
!                     {
!                       'contents' => [
!                         {
!                           'extra' => {
!                             'command' => {}
!                           },
!                           'parent' => {},
!                           'text' => ' ',
!                           'type' => 'empty_spaces_after_command'
!                         },
!                         {
!                           'parent' => {},
!                           'text' => 'new'
!                         },
!                         {
!                           'parent' => {},
!                           'text' => '
! ',
!                           'type' => 'spaces_at_end'
!                         }
!                       ],
!                       'parent' => {},
!                       'type' => 'misc_line_arg'
!                     }
!                   ],
!                   'cmdname' => 'defindex',
!                   'extra' => {
!                     'misc_args' => [
!                       'new'
!                     ],
!                     'spaces_after_command' => {}
!                   },
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 33,
!                     'macro' => ''
!                   },
!                   'parent' => {}
!                 },
!                 {
!                   'parent' => {},
!                   'text' => '
! ',
!                   'type' => 'empty_line'
!                 },
!                 {
!                   'args' => [
!                     {
!                       'contents' => [
!                         {
!                           'extra' => {
!                             'command' => {}
!                           },
!                           'parent' => {},
!                           'text' => ' ',
!                           'type' => 'empty_spaces_after_command'
!                         },
!                         {
!                           'parent' => {},
!                           'text' => 'a,:,:'
!                         },
!                         {
!                           'parent' => {},
!                           'text' => '
! ',
!                           'type' => 'spaces_at_end'
!                         }
!                       ],
!                       'parent' => {},
!                       'type' => 'misc_line_arg'
!                     }
!                   ],
!                   'cmdname' => 'definfoenclose',
!                   'extra' => {
!                     'misc_args' => [
!                       'a',
!                       ':',
!                       ':'
!                     ],
!                     'spaces_after_command' => {}
!                   },
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 35,
!                     'macro' => ''
!                   },
!                   'parent' => {}
!                 },
!                 {
!                   'parent' => {},
!                   'text' => '
! ',
!                   'type' => 'empty_line'
!                 },
!                 {
!                   'args' => [
!                     {
!                       'contents' => [
!                         {
!                           'extra' => {
!                             'command' => {}
!                           },
!                           'parent' => {},
!                           'text' => ' ',
!                           'type' => 'empty_spaces_after_command'
!                         },
!                         {
!                           'parent' => {},
!                           'text' => 'moviecite = cite'
!                         },
!                         {
!                           'parent' => {},
!                           'text' => '
! ',
!                           'type' => 'spaces_at_end'
!                         }
!                       ],
!                       'parent' => {},
!                       'type' => 'misc_line_arg'
!                     }
!                   ],
!                   'cmdname' => 'alias',
!                   'extra' => {
!                     'misc_args' => [
!                       'moviecite',
!                       'cite'
!                     ],
!                     'spaces_after_command' => {}
!                   },
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 37,
!                     'macro' => ''
!                   },
!                   'parent' => {}
!                 },
!                 {
!                   'parent' => {},
!                   'text' => '
! ',
!                   'type' => 'empty_line'
!                 },
!                 {
!                   'args' => [
!                     {
!                       'contents' => [
!                         {
!                           'extra' => {
!                             'command' => {}
!                           },
!                           'parent' => {},
!                           'text' => ' ',
!                           'type' => 'empty_spaces_after_command'
!                         },
!                         {
!                           'parent' => {},
!                           'text' => 'fr'
!                         },
!                         {
!                           'parent' => {},
!                           'text' => '
! ',
!                           'type' => 'spaces_at_end'
!                         }
!                       ],
!                       'parent' => {},
!                       'type' => 'misc_line_arg'
!                     }
!                   ],
!                   'cmdname' => 'documentlanguage',
!                   'extra' => {
!                     'spaces_after_command' => {},
!                     'text_arg' => 'fr'
!                   },
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 39,
!                     'macro' => ''
!                   },
!                   'parent' => {}
!                 },
!                 {
!                   'parent' => {},
!                   'text' => '
! ',
!                   'type' => 'empty_line'
!                 },
!                 {
!                   'args' => [
!                     {
!                       'contents' => [
!                         {
!                           'parent' => {},
!                           'text' => 'mymsg'
!                         }
!                       ],
!                       'parent' => {},
!                       'type' => 'brace_command_arg'
!                     }
!                   ],
!                   'cmdname' => 'errormsg',
!                   'contents' => [],
!                   'extra' => {
!                     'brace_command_contents' => [
!                       [
!                         {}
!                       ]
!                     ],
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
!                   },
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 41,
!                     'macro' => ''
!                   },
!                   'parent' => {}
!                 },
!                 {
!                   'parent' => {},
!                   'text' => '
! '
!                 },
!                 {
!                   'parent' => {},
!                   'text' => '
! ',
!                   'type' => 'empty_line'
                  },
                  {
--- 144,149 ----
                  {
                    'parent' => {},
!                   'text' => '.</b>
! '
                  },
                  {
***************
*** 1247,1251 ****
                          {
                            'parent' => {},
!                           'text' => 'Somewhere'
                          }
                        ],
--- 153,157 ----
                          {
                            'parent' => {},
!                           'text' => 'anchor in html'
                          }
                        ],
***************
*** 1254,1258 ****
                      }
                    ],
!                   'cmdname' => 'ref',
                    'contents' => [],
                    'extra' => {
--- 160,164 ----
                      }
                    ],
!                   'cmdname' => 'anchor',
                    'contents' => [],
                    'extra' => {
***************
*** 1262,1279 ****
                        ]
                      ],
!                     'node_argument' => {
!                       'node_content' => [
!                         {}
!                       ],
!                       'normalized' => 'Somewhere'
!                     },
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {
                      'file_name' => '',
!                     'line_nr' => 43,
                      'macro' => ''
                    },
--- 168,179 ----
                        ]
                      ],
!                     'node_content' => [
!                       {}
!                     ],
!                     'normalized' => 'anchor-in-html'
                    },
                    'line_nr' => {
                      'file_name' => '',
!                     'line_nr' => 9,
                      'macro' => ''
                    },
***************
*** 1282,1338 ****
                  {
                    'parent' => {},
-                   'text' => '.
- '
-                 },
-                 {
-                   'parent' => {},
                    'text' => '
  ',
!                   'type' => 'empty_line'
!                 },
                  {
!                   'args' => [
                      {
                        'parent' => {},
!                       'text' => 'flag',
!                       'type' => 'misc_arg'
                      },
                      {
                        'parent' => {},
!                       'text' => 'soemthing',
!                       'type' => 'misc_arg'
!                     }
!                   ],
!                   'cmdname' => 'set',
!                   'extra' => {
!                     'arg_line' => ' flag soemthing
! ',
!                     'misc_args' => [
!                       'flag',
!                       'soemthing'
!                     ]
!                   },
!                   'parent' => {}
!                 },
!                 {
!                   'parent' => {},
!                   'text' => '
! ',
!                   'type' => 'empty_line'
!                 },
!                 {
!                   'args' => [
!                     {
!                       'parent' => {},
!                       'text' => 'mymacro',
!                       'type' => 'macro_name'
!                     }
!                   ],
!                   'cmdname' => 'macro',
!                   'contents' => [
!                     {
!                       'parent' => {},
!                       'text' => 'truc',
!                       'type' => 'raw'
                      },
                      {
--- 182,208 ----
                  {
                    'parent' => {},
                    'text' => '
  ',
!                   'type' => 'empty_spaces_after_close_brace'
!                 }
!               ],
!               'parent' => {},
!               'type' => 'rawpreformatted'
!             },
!             {
!               'args' => [
                  {
!                   'contents' => [
                      {
+                       'extra' => {
+                         'command' => {}
+                       },
                        'parent' => {},
!                       'text' => ' ',
!                       'type' => 'empty_spaces_after_command'
                      },
                      {
                        'parent' => {},
!                       'text' => 'html'
                      },
                      {
***************
*** 1340,1461 ****
                        'text' => '
  ',
!                       'type' => 'last_raw_newline'
                      }
                    ],
-                   'extra' => {
-                     'arg_line' => ' mymacro{}
- ',
-                     'macrobody' => 'truc
- ',
-                     'spaces_after_command' => {
-                       'extra' => {
-                         'command' => {}
-                       },
-                       'parent' => {},
-                       'text' => '
- ',
-                       'type' => 'empty_line_after_command'
-                     }
-                   },
-                   'line_nr' => {
-                     'file_name' => '',
-                     'line_nr' => 47,
-                     'macro' => ''
-                   },
-                   'parent' => {}
-                 },
-                 {},
-                 {
                    'parent' => {},
!                   'text' => '
! ',
!                   'type' => 'empty_line'
!                 },
                  {
-                   'args' => [
-                     {
-                       'parent' => {},
-                       'text' => 'macroarg',
-                       'type' => 'macro_name'
-                     },
-                     {
-                       'parent' => {},
-                       'text' => 'arg',
-                       'type' => 'macro_arg'
-                     }
-                   ],
-                   'cmdname' => 'macro',
                    'contents' => [
                      {
                        'parent' => {},
!                       'text' => 'Some \\arg\\.',
!                       'type' => 'raw'
!                     },
!                     {
!                       'parent' => {},
!                       'text' => '
! ',
!                       'type' => 'last_raw_newline'
                      }
                    ],
-                   'extra' => {
-                     'arg_line' => ' macroarg{arg}
- ',
-                     'args_index' => {
-                       'arg' => 0
-                     },
-                     'macrobody' => 'Some \\arg\\.
- ',
-                     'spaces_after_command' => {
-                       'extra' => {
-                         'command' => {}
-                       },
-                       'parent' => {},
-                       'text' => '
- ',
-                       'type' => 'empty_line_after_command'
-                     }
-                   },
-                   'line_nr' => {
-                     'file_name' => '',
-                     'line_nr' => 51,
-                     'macro' => ''
-                   },
-                   'parent' => {}
-                 },
-                 {},
-                 {
                    'parent' => {},
!                   'text' => '
! ',
!                   'type' => 'empty_line'
!                 },
                  {
!                   'args' => [
                      {
                        'parent' => {},
!                       'text' => 'othermacro',
!                       'type' => 'misc_arg'
                      }
                    ],
-                   'cmdname' => 'unmacro',
-                   'extra' => {
-                     'arg_line' => ' othermacro
- ',
-                     'misc_args' => [
-                       'othermacro'
-                     ]
-                   },
-                   'parent' => {}
-                 },
-                 {
                    'parent' => {},
!                   'text' => '
! ',
!                   'type' => 'empty_line'
                  }
                ],
                'parent' => {},
!               'type' => 'rawpreformatted'
              },
              {
--- 210,323 ----
                        'text' => '
  ',
!                       'type' => 'spaces_at_end'
                      }
                    ],
                    'parent' => {},
!                   'type' => 'misc_line_arg'
!                 }
!               ],
!               'cmdname' => 'end',
!               'extra' => {
!                 'command' => {},
!                 'command_argument' => 'html',
!                 'spaces_after_command' => {},
!                 'text_arg' => 'html'
!               },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 10,
!                 'macro' => ''
!               },
!               'parent' => {}
!             }
!           ],
!           'extra' => {
!             'end_command' => {},
!             'spaces_after_command' => {}
!           },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 7,
!             'macro' => ''
!           },
!           'parent' => {}
!         },
!         {
!           'contents' => [
!             {
!               'args' => [
                  {
                    'contents' => [
                      {
                        'parent' => {},
!                       'text' => 'in kbd before tex'
                      }
                    ],
                    'parent' => {},
!                   'type' => 'brace_command_arg'
!                 }
!               ],
!               'cmdname' => 'kbd',
!               'contents' => [],
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 11,
!                 'macro' => ''
!               },
!               'parent' => {}
!             },
!             {
!               'args' => [
                  {
!                   'contents' => [
                      {
+                       'contents' => [
+                         {
+                           'parent' => {},
+                           'text' => 'second footnote'
+                         }
+                       ],
                        'parent' => {},
!                       'type' => 'paragraph'
                      }
                    ],
                    'parent' => {},
!                   'type' => 'brace_command_context'
                  }
                ],
+               'cmdname' => 'footnote',
+               'contents' => [],
+               'line_nr' => {},
+               'parent' => {}
+             },
+             {
                'parent' => {},
!               'text' => '.
! '
!             }
!           ],
!           'parent' => {},
!           'type' => 'paragraph'
!         },
!         {
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line'
!         },
!         {
!           'cmdname' => 'tex',
!           'contents' => [
!             {
!               'contents' => [],
!               'parent' => {},
!               'type' => 'elided_block'
!             },
!             {
!               'extra' => {},
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
              },
              {
***************
*** 1502,1512 ****
            ],
            'extra' => {
!             'end_command' => {},
!             'spaces_after_command' => {}
!           },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 13,
!             'macro' => ''
            },
            'parent' => {}
--- 364,368 ----
            ],
            'extra' => {
!             'end_command' => {}
            },
            'parent' => {}
***************
*** 1531,1539 ****
          },
          {
-           'parent' => {},
-           'text' => '',
-           'type' => 'empty_line'
-         },
-         {
            'cmdname' => 'value',
            'type' => 'flag'
--- 387,390 ----
***************
*** 1624,1631 ****
                    ],
                    'normalized' => 'anchor-in-html'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 475,478 ----
***************
*** 1680,1687 ****
                    ],
                    'normalized' => 'anchor-in-tex'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 527,530 ----
***************
*** 1736,1740 ****
                    'index_at_command' => 'findex',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'findex',
                    'key' => 'fentry2',
--- 579,582 ----
***************
*** 1941,1949 ****
                    ]
                  ],
!                 'normalized' => 'FF',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 783,787 ----
                    ]
                  ],
!                 'explanation_contents' => []
                },
                'line_nr' => {
***************
*** 2071,2078 ****
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[2] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'};
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4];
--- 909,915 ----
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[2]{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[1];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4];
***************
*** 2082,2086 ****
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4]{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4]{'contents'}[1];
--- 919,922 ----
***************
*** 2090,2093 ****
--- 926,930 ----
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4]{'contents'}[1];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4]{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4]{'contents'}[2];
***************
*** 2108,2112 ****
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[5]{'contents'}[1];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'line_nr'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[5];
--- 945,948 ----
***************
*** 2114,2365 ****
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'args'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'args'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'args'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[2]{'args'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[2];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[2]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[2]{'args'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[4]{'args'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[4];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[4]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[4]{'extra'}{'node_content'}[0] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'args'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'args'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'args'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[1];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'content'};
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'node'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'extra'}{'misc_content'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'content'};
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'args'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'args'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'args'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'extra'}{'index_entry'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[1];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'extra'}{'index_entry'}{'content'};
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'extra'}{'index_entry'}{'node'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'extra'}{'misc_content'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'extra'}{'index_entry'}{'content'};
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[1];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[1];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'args'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[1];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'extra'}{'float'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'args'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[2];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[3];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'args'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'args'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'args'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[3];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'extra'}{'block_command_line_contents'}[0][0] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[1];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'extra'}{'block_command_line_contents'}[1][0] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[1]{'contents'}[1];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'extra'}{'caption'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[1];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[3];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'extra'}{'node_content'}[0] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[1]{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'extra'}{'type'}{'content'}[0] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[3];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'args'}[1];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'args'}[3];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'args'}[3]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'extra'}{'menu_entry_description'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'args'}[3];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'args'}[1]{'contents'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[2];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[2]{'args'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[2]{'args'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[2]{'args'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[2];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[2]{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'extra'}{'end_command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[2];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1]{'args'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1]{'args'}[1];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1]{'extra'}{'brace_command_contents'}[1][0] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1]{'args'}[1]{'contents'}[1];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[4];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[4]{'args'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[4]{'args'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[4]{'args'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[4];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[4]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[6];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[6]{'args'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[6]{'args'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[6]{'args'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[6];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[6]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[8];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[8]{'args'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[8]{'args'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[8]{'args'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[8];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[8]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[10];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[10]{'args'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[10]{'args'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[10]{'args'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[10];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[10]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[12];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[12]{'args'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[12]{'args'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[12]{'args'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[12];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[12]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[14]{'args'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[14];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[14]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[17]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[17]{'args'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[17]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[17];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[17]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[17]{'args'}[0]{'contents'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[17]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[17]{'args'}[0]{'contents'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[20]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[20];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[20]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[20];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[21]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[22]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[22];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[22]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[22];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[22]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[22];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[22]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[22];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[22]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[22]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[23] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[22]{'extra'}{'spaces_after_command'};
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[24]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[26] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25]{'extra'}{'spaces_after_command'};
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[27]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[28]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[28];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[28]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[29]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[6];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[6]{'args'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[6]{'args'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[6]{'args'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[6];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[6]{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[6]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'extra'}{'end_command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[6];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[0];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[13]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[13];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[15]{'contents'}[0]{'args'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[15]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[15]{'contents'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[15]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[15];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[15]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[15];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[17]{'contents'}[0]{'args'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[17]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[17]{'contents'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[17]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[17]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[3];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[17]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[17];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[17]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[17];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[0]{'args'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[2];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[2]{'args'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[2]{'args'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[2]{'args'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[2];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[2]{'extra'}{'index_entry'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[2];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[2]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[2]{'extra'}{'index_entry'}{'content'};
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[2]{'extra'}{'index_entry'}{'node'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[2]{'extra'}{'misc_content'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[2]{'extra'}{'index_entry'}{'content'};
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[21]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[21];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[21]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[22]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[23]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[23];
--- 950,1015 ----
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'extra'}{'end_command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[12];
! $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[14]{'contents'}[0];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[14];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[14]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[14];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[16]{'contents'}[0];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[3];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[16];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[16];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[0];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[2];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[2]{'args'}[0];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[2]{'args'}[0];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[2]{'args'}[0];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[2];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[2]{'extra'}{'index_entry'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[2];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[2]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[2]{'args'}[0]{'contents'}[1];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[2]{'extra'}{'index_entry'}{'content'};
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[2]{'extra'}{'index_entry'}{'node'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[2]{'extra'}{'misc_content'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[2]{'extra'}{'index_entry'}{'content'};
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[2]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[20];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[21]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[22]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[22];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[22]{'args'}[0];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[22]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[22]{'args'}[0];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[22]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[22]{'args'}[0];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[22]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[22];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[22]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[22]{'args'}[0]{'contents'}[0];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[22]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[23]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[23];
***************
*** 2370,2409 ****
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[23]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[23]{'args'}[0]{'contents'}[0];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[23]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[24]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[24];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[24]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[24]{'args'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[24]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[24]{'args'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[24]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[24]{'args'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[24]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[24];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[24]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[24]{'args'}[0]{'contents'}[0];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[24]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[25]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[26]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[26];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[26]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[26]{'args'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[26]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[26]{'args'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[26]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[26]{'args'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[26]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[26];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[26]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[26]{'args'}[0]{'contents'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[26]{'extra'}{'type'}{'content'}[0] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[26]{'args'}[0]{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[26]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[27]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[28]{'contents'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[0];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[28];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[28]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[28];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[28]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[29]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[30];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[30]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[31]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[32];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[32]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[33]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[34];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[34]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[35]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[36];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[36]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
- $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[37]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'args'}[0]{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'extra'}{'node_content'};
--- 1020,1052 ----
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[23]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[23]{'args'}[0]{'contents'}[0];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[23]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[24]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[25]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[25];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[25]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[25]{'args'}[0];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[25]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[25]{'args'}[0];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[25]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[25]{'args'}[0];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[25]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[25];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[25]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[25]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[25]{'extra'}{'type'}{'content'}[0] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[25]{'args'}[0]{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[25]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[26]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[27]{'contents'}[0]{'args'}[0];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[27]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[27]{'contents'}[0];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[27]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[27]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[27];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[27]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[27];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[27]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[28]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[29]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[29];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[29]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[30]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[31]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[31];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[31]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[32]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[33]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[33];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[33]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[34]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
+ $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[35]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[35];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[35]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[36]{'parent'} = $result_trees{'at_commands_in_raw'}{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'args'}[0]{'contents'}[1];
  $result_trees{'at_commands_in_raw'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'extra'}{'node_content'};
***************
*** 2424,2470 ****
  
  @tex
- @kbdinputstyle code
- in tex@footnote{footnote in tex}
- @anchor{anchor in tex}
- @cindex entry
- @findex fentry1
- 
- @float Figs, f1
- Float
- @caption{Fcaption}
- @end float
- 
- @menu
- * n::
- @end menu
- 
- @acronym{FF, Fi Foo}
- 
- @synindex cp fn
- 
- @defindex new
- 
- @definfoenclose a,:,:
- 
- @alias moviecite = cite
- 
- @documentlanguage fr
- 
- @errormsg{mymsg}
- 
- @ref{Somewhere}.
- 
- @set flag soemthing
- 
- @macro mymacro{}
- truc
- @end macro
- 
- @macro macroarg{arg}
- Some \\arg\\.
- @end macro
- 
- @unmacro othermacro
- 
  @end tex
  
--- 1067,1070 ----
***************
*** 2805,2849 ****
  </para>
  <tex endspaces=" ">
- <kbdinputstyle value="code" line=" code"></kbdinputstyle>
- in tex<footnote><para>footnote in tex</para></footnote>
- <anchor name="anchor-in-tex">anchor in tex</anchor>
- <cindex index="cp" spaces=" "><indexterm index="cp">entry</indexterm></cindex>
- <findex index="fn" spaces=" "><indexterm index="fn">fentry1</indexterm></findex>
- 
- <float name="f1" type="Figs" spaces=" " endspaces=" "><floattype>Figs</floattype><floatname spaces=" ">f1</floatname>
- Float
- <caption><para>Fcaption</para></caption>
- </float>
- 
- <menu endspaces=" ">
- <menuentry leadingtext="* "><menunode separator="::">n</menunode><menudescription><pre xml:space="preserve">
- </pre></menudescription></menuentry></menu>
- 
- <acronym><acronymword>FF</acronymword><acronymdesc spaces=" ">Fi Foo</acronymdesc></acronym>
- 
- <synindex from="cp" to="fn" line=" cp fn"></synindex>
- 
- <defindex value="new" line=" new"></defindex>
- 
- <definfoenclose command="a" open=":" close=":" line=" a,:,:"></definfoenclose>
- 
- <alias new="moviecite" existing="cite" line=" moviecite = cite"></alias>
- 
- <documentlanguage xml:lang="fr" spaces=" ">fr</documentlanguage>
- 
- <errormsg>mymsg</errormsg>
- 
- <ref label="Somewhere"><xrefnodename>Somewhere</xrefnodename></ref>.
- 
- <set name="flag" line=" flag soemthing">soemthing</set>
- 
- <macro name="mymacro" line=" mymacro{}">truc
- </macro>
- 
- <macro name="macroarg" line=" macroarg{arg}"><formalarg>arg</formalarg>Some \\arg\\.
- </macro>
- 
- <unmacro name="othermacro" line=" othermacro"></unmacro>
- 
  </tex>
  
--- 1405,1408 ----
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/at_commands_in_refs.pl texinfo-6.3/tp/t/results/converters_tests/at_commands_in_refs.pl
*** texinfo-6.1/tp/t/results/converters_tests/at_commands_in_refs.pl	2016-01-22 07:50:14.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/at_commands_in_refs.pl	2016-08-02 18:44:53.000000000 +0100
***************
*** 342,345 ****
--- 342,350 ----
                        'cmdname' => 'atchar',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 7,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 358,361 ****
--- 363,367 ----
                        'cmdname' => 'lbracechar',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 374,377 ****
--- 380,384 ----
                        'cmdname' => 'rbracechar',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 390,393 ****
--- 397,401 ----
                        'cmdname' => 'backslashchar',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 406,409 ****
--- 414,418 ----
                        'cmdname' => 'hashchar',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 452,460 ****
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 7,
!                 'macro' => ''
!               },
                'parent' => {},
                'type' => 'menu_entry'
--- 461,465 ----
                  }
                },
!               'line_nr' => {},
                'parent' => {},
                'type' => 'menu_entry'
***************
*** 479,482 ****
--- 484,492 ----
                        'cmdname' => 'LaTeX',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 8,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 495,498 ****
--- 505,509 ----
                        'cmdname' => 'TeX',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 511,514 ****
--- 522,526 ----
                        'cmdname' => 'bullet',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 527,530 ****
--- 539,543 ----
                        'cmdname' => 'comma',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 543,546 ****
--- 556,560 ----
                        'cmdname' => 'copyright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 559,562 ****
--- 573,577 ----
                        'cmdname' => 'dots',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 575,578 ****
--- 590,594 ----
                        'cmdname' => 'enddots',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 625,633 ****
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 8,
!                 'macro' => ''
!               },
                'parent' => {},
                'type' => 'menu_entry'
--- 641,645 ----
                  }
                },
!               'line_nr' => {},
                'parent' => {},
                'type' => 'menu_entry'
***************
*** 652,655 ****
--- 664,672 ----
                        'cmdname' => 'equiv',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 9,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 668,671 ****
--- 685,689 ----
                        'cmdname' => 'error',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 684,687 ****
--- 702,706 ----
                        'cmdname' => 'euro',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 700,703 ****
--- 719,723 ----
                        'cmdname' => 'exclamdown',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 716,719 ****
--- 736,740 ----
                        'cmdname' => 'expansion',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 732,735 ****
--- 753,757 ----
                        'cmdname' => 'minus',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 780,788 ****
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 9,
!                 'macro' => ''
!               },
                'parent' => {},
                'type' => 'menu_entry'
--- 802,806 ----
                  }
                },
!               'line_nr' => {},
                'parent' => {},
                'type' => 'menu_entry'
***************
*** 807,810 ****
--- 825,833 ----
                        'cmdname' => 'geq',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 10,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 823,826 ****
--- 846,850 ----
                        'cmdname' => 'leq',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 839,842 ****
--- 863,867 ----
                        'cmdname' => 'arrow',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 881,889 ****
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 10,
!                 'macro' => ''
!               },
                'parent' => {},
                'type' => 'menu_entry'
--- 906,910 ----
                  }
                },
!               'line_nr' => {},
                'parent' => {},
                'type' => 'menu_entry'
***************
*** 908,911 ****
--- 929,937 ----
                        'cmdname' => 'ordf',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 11,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 924,927 ****
--- 950,954 ----
                        'cmdname' => 'ordm',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 940,943 ****
--- 967,971 ----
                        'cmdname' => 'point',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 956,959 ****
--- 984,988 ----
                        'cmdname' => 'pounds',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 972,975 ****
--- 1001,1005 ----
                        'cmdname' => 'print',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 988,991 ****
--- 1018,1022 ----
                        'cmdname' => 'questiondown',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1004,1007 ****
--- 1035,1039 ----
                        'cmdname' => 'registeredsymbol',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 1054,1062 ****
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 11,
!                 'macro' => ''
!               },
                'parent' => {},
                'type' => 'menu_entry'
--- 1086,1090 ----
                  }
                },
!               'line_nr' => {},
                'parent' => {},
                'type' => 'menu_entry'
***************
*** 1081,1084 ****
--- 1109,1117 ----
                        'cmdname' => 'result',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 12,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 1097,1100 ****
--- 1130,1134 ----
                        'cmdname' => 'textdegree',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1113,1116 ****
--- 1147,1151 ----
                        'cmdname' => 'tie',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1129,1132 ****
--- 1164,1168 ----
                        'cmdname' => 'today',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1145,1148 ****
--- 1181,1185 ----
                        'cmdname' => 'aa',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 1191,1199 ****
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 12,
!                 'macro' => ''
!               },
                'parent' => {},
                'type' => 'menu_entry'
--- 1228,1232 ----
                  }
                },
!               'line_nr' => {},
                'parent' => {},
                'type' => 'menu_entry'
***************
*** 1218,1221 ****
--- 1251,1259 ----
                        'cmdname' => 'AA',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 13,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 1234,1237 ****
--- 1272,1276 ----
                        'cmdname' => 'ae',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1250,1253 ****
--- 1289,1293 ----
                        'cmdname' => 'oe',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1266,1269 ****
--- 1306,1310 ----
                        'cmdname' => 'AE',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1282,1285 ****
--- 1323,1327 ----
                        'cmdname' => 'OE',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1298,1301 ****
--- 1340,1344 ----
                        'cmdname' => 'o',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1314,1317 ****
--- 1357,1361 ----
                        'cmdname' => 'O',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1330,1333 ****
--- 1374,1378 ----
                        'cmdname' => 'ss',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1346,1349 ****
--- 1391,1395 ----
                        'cmdname' => 'l',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1362,1365 ****
--- 1408,1412 ----
                        'cmdname' => 'L',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1378,1381 ****
--- 1425,1429 ----
                        'cmdname' => 'DH',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1394,1397 ****
--- 1442,1446 ----
                        'cmdname' => 'dh',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1410,1413 ****
--- 1459,1463 ----
                        'cmdname' => 'TH',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1426,1429 ****
--- 1476,1480 ----
                        'cmdname' => 'th',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 1490,1498 ****
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 13,
!                 'macro' => ''
!               },
                'parent' => {},
                'type' => 'menu_entry'
--- 1541,1545 ----
                  }
                },
!               'line_nr' => {},
                'parent' => {},
                'type' => 'menu_entry'
***************
*** 1649,1652 ****
--- 1696,1701 ----
                        ],
                        'cmdname' => '\'',
+                       'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 2089,2092 ****
--- 2138,2143 ----
                                ],
                                'cmdname' => '=',
+                               'contents' => [],
+                               'line_nr' => {},
                                'parent' => {}
                              }
***************
*** 2123,2126 ****
--- 2174,2179 ----
                                ],
                                'cmdname' => '\'',
+                               'contents' => [],
+                               'line_nr' => {},
                                'parent' => {}
                              }
***************
*** 2198,2201 ****
--- 2251,2259 ----
                        'cmdname' => 'quotedblleft',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 17,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 2214,2217 ****
--- 2272,2276 ----
                        'cmdname' => 'quotedblright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 2230,2233 ****
--- 2289,2293 ----
                        'cmdname' => 'quoteleft',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 2246,2249 ****
--- 2306,2310 ----
                        'cmdname' => 'quoteright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 2262,2265 ****
--- 2323,2327 ----
                        'cmdname' => 'quotedblbase',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 2278,2281 ****
--- 2340,2344 ----
                        'cmdname' => 'quotesinglbase',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 2326,2334 ****
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 17,
!                 'macro' => ''
!               },
                'parent' => {},
                'type' => 'menu_entry'
--- 2389,2393 ----
                  }
                },
!               'line_nr' => {},
                'parent' => {},
                'type' => 'menu_entry'
***************
*** 2353,2356 ****
--- 2412,2420 ----
                        'cmdname' => 'guillemetleft',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 18,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 2369,2372 ****
--- 2433,2437 ----
                        'cmdname' => 'guillemetright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 2385,2388 ****
--- 2450,2454 ----
                        'cmdname' => 'guillemotleft',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 2401,2404 ****
--- 2467,2471 ----
                        'cmdname' => 'guillemotright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 2417,2420 ****
--- 2484,2488 ----
                        'cmdname' => 'guilsinglleft',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 2433,2436 ****
--- 2501,2505 ----
                        'cmdname' => 'guilsinglright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 2481,2489 ****
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 18,
!                 'macro' => ''
!               },
                'parent' => {},
                'type' => 'menu_entry'
--- 2550,2554 ----
                  }
                },
!               'line_nr' => {},
                'parent' => {},
                'type' => 'menu_entry'
***************
*** 2570,2573 ****
--- 2635,2639 ----
                            'contents' => [
                              {
+                               'parent' => {},
                                'text' => ' ',
                                'type' => 'empty_spaces_before_argument'
***************
*** 2592,2601 ****
                              {}
                            ]
!                         ],
!                         'normalized' => 'AAA',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 2658,2662 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 2631,2640 ****
                            ]
                          ],
!                         'explanation_contents' => [],
!                         'normalized' => 'AAA',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 2692,2696 ----
                            ]
                          ],
!                         'explanation_contents' => []
                        },
                        'line_nr' => {},
***************
*** 2666,2674 ****
                            ]
                          ],
!                         'normalized' => 'BBB',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 2722,2726 ----
                            ]
                          ],
!                         'explanation_contents' => []
                        },
                        'line_nr' => {},
***************
*** 2743,2746 ****
--- 2795,2799 ----
                            'contents' => [
                              {
+                               'parent' => {},
                                'text' => ' ',
                                'type' => 'empty_spaces_before_argument'
***************
*** 2765,2774 ****
                              {}
                            ]
!                         ],
!                         'normalized' => 'CCC',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 2818,2822 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 2804,2813 ****
                            ]
                          ],
!                         'explanation_contents' => [],
!                         'normalized' => 'CCC',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 2852,2856 ----
                            ]
                          ],
!                         'explanation_contents' => []
                        },
                        'line_nr' => {},
***************
*** 2839,2847 ****
                            ]
                          ],
!                         'normalized' => 'DDD',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 2882,2886 ----
                            ]
                          ],
!                         'explanation_contents' => []
                        },
                        'line_nr' => {},
***************
*** 2924,2927 ****
--- 2963,2967 ----
                            'contents' => [
                              {
+                               'parent' => {},
                                'text' => ' ',
                                'type' => 'empty_spaces_before_argument'
***************
*** 2948,2956 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 2988,2992 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 2995,3003 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 3031,3035 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {},
***************
*** 3075,3083 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 3107,3111 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 3164,3172 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 3192,3196 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {},
***************
*** 3861,3869 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 3885,3889 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 4039,4047 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 4059,4063 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 4216,4224 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 4232,4236 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 4248,4251 ****
--- 4260,4264 ----
                            'contents' => [
                              {
+                               'parent' => {},
                                'text' => ' ',
                                'type' => 'empty_spaces_before_argument'
***************
*** 4270,4278 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 4283,4287 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {},
***************
*** 4322,4330 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 4331,4335 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {},
***************
*** 4871,4874 ****
--- 4876,4884 ----
                'cmdname' => 'atchar',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 40,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 4887,4890 ****
--- 4897,4901 ----
                'cmdname' => 'lbracechar',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 4903,4906 ****
--- 4914,4918 ----
                'cmdname' => 'rbracechar',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 4919,4922 ****
--- 4931,4935 ----
                'cmdname' => 'backslashchar',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 4935,4938 ****
--- 4948,4952 ----
                'cmdname' => 'hashchar',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 4971,4979 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 40,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 4985,4989 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 5000,5003 ****
--- 5010,5018 ----
                'cmdname' => 'atchar',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 41,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 5016,5019 ****
--- 5031,5035 ----
                'cmdname' => 'lbracechar',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5032,5035 ****
--- 5048,5052 ----
                'cmdname' => 'rbracechar',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5048,5051 ****
--- 5065,5069 ----
                'cmdname' => 'backslashchar',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5064,5067 ****
--- 5082,5086 ----
                'cmdname' => 'hashchar',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5101,5109 ****
        },
        'level' => 1,
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 41,
!         'macro' => ''
!       },
        'number' => 3,
        'parent' => {}
--- 5120,5124 ----
        },
        'level' => 1,
!       'line_nr' => {},
        'number' => 3,
        'parent' => {}
***************
*** 5131,5134 ****
--- 5146,5154 ----
                'cmdname' => 'LaTeX',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 43,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 5147,5150 ****
--- 5167,5171 ----
                'cmdname' => 'TeX',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5163,5166 ****
--- 5184,5188 ----
                'cmdname' => 'bullet',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5179,5182 ****
--- 5201,5205 ----
                'cmdname' => 'comma',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5195,5198 ****
--- 5218,5222 ----
                'cmdname' => 'copyright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5211,5214 ****
--- 5235,5239 ----
                'cmdname' => 'dots',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5227,5230 ****
--- 5252,5256 ----
                'cmdname' => 'enddots',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5267,5275 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 43,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 5293,5297 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 5296,5299 ****
--- 5318,5326 ----
                'cmdname' => 'LaTeX',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 44,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 5312,5315 ****
--- 5339,5343 ----
                'cmdname' => 'TeX',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5328,5331 ****
--- 5356,5360 ----
                'cmdname' => 'bullet',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5344,5347 ****
--- 5373,5377 ----
                'cmdname' => 'comma',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5360,5363 ****
--- 5390,5394 ----
                'cmdname' => 'copyright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5376,5379 ****
--- 5407,5411 ----
                'cmdname' => 'dots',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5392,5395 ****
--- 5424,5428 ----
                'cmdname' => 'enddots',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5433,5441 ****
        },
        'level' => 1,
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 44,
!         'macro' => ''
!       },
        'number' => 4,
        'parent' => {}
--- 5466,5470 ----
        },
        'level' => 1,
!       'line_nr' => {},
        'number' => 4,
        'parent' => {}
***************
*** 5463,5466 ****
--- 5492,5500 ----
                'cmdname' => 'equiv',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 46,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 5479,5482 ****
--- 5513,5517 ----
                'cmdname' => 'error',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5495,5498 ****
--- 5530,5534 ----
                'cmdname' => 'euro',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5511,5514 ****
--- 5547,5551 ----
                'cmdname' => 'exclamdown',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5527,5530 ****
--- 5564,5568 ----
                'cmdname' => 'expansion',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5543,5546 ****
--- 5581,5585 ----
                'cmdname' => 'minus',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5581,5589 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 46,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 5620,5624 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 5610,5613 ****
--- 5645,5653 ----
                'cmdname' => 'equiv',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 47,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 5626,5629 ****
--- 5666,5670 ----
                'cmdname' => 'error',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5642,5645 ****
--- 5683,5687 ----
                'cmdname' => 'euro',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5658,5661 ****
--- 5700,5704 ----
                'cmdname' => 'exclamdown',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5674,5677 ****
--- 5717,5721 ----
                'cmdname' => 'expansion',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5690,5693 ****
--- 5734,5738 ----
                'cmdname' => 'minus',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5729,5737 ****
        },
        'level' => 1,
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 47,
!         'macro' => ''
!       },
        'number' => 5,
        'parent' => {}
--- 5774,5778 ----
        },
        'level' => 1,
!       'line_nr' => {},
        'number' => 5,
        'parent' => {}
***************
*** 5759,5762 ****
--- 5800,5808 ----
                'cmdname' => 'geq',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 49,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 5775,5778 ****
--- 5821,5825 ----
                'cmdname' => 'leq',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5791,5794 ****
--- 5838,5842 ----
                'cmdname' => 'arrow',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5823,5831 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 49,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 5871,5875 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 5852,5855 ****
--- 5896,5904 ----
                'cmdname' => 'geq',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 50,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 5868,5871 ****
--- 5917,5921 ----
                'cmdname' => 'leq',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5884,5887 ****
--- 5934,5938 ----
                'cmdname' => 'arrow',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5917,5925 ****
        },
        'level' => 1,
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 50,
!         'macro' => ''
!       },
        'number' => 6,
        'parent' => {}
--- 5968,5972 ----
        },
        'level' => 1,
!       'line_nr' => {},
        'number' => 6,
        'parent' => {}
***************
*** 5947,5950 ****
--- 5994,6002 ----
                'cmdname' => 'ordf',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 52,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 5963,5966 ****
--- 6015,6019 ----
                'cmdname' => 'ordm',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5979,5982 ****
--- 6032,6036 ----
                'cmdname' => 'point',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5995,5998 ****
--- 6049,6053 ----
                'cmdname' => 'pounds',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6011,6014 ****
--- 6066,6070 ----
                'cmdname' => 'print',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6027,6030 ****
--- 6083,6087 ----
                'cmdname' => 'questiondown',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6043,6046 ****
--- 6100,6104 ----
                'cmdname' => 'registeredsymbol',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6083,6091 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 52,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 6141,6145 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 6112,6115 ****
--- 6166,6174 ----
                'cmdname' => 'ordf',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 53,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 6128,6131 ****
--- 6187,6191 ----
                'cmdname' => 'ordm',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6144,6147 ****
--- 6204,6208 ----
                'cmdname' => 'point',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6160,6163 ****
--- 6221,6225 ----
                'cmdname' => 'pounds',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6176,6179 ****
--- 6238,6242 ----
                'cmdname' => 'print',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6192,6195 ****
--- 6255,6259 ----
                'cmdname' => 'questiondown',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6208,6211 ****
--- 6272,6276 ----
                'cmdname' => 'registeredsymbol',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6249,6257 ****
        },
        'level' => 1,
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 53,
!         'macro' => ''
!       },
        'number' => 7,
        'parent' => {}
--- 6314,6318 ----
        },
        'level' => 1,
!       'line_nr' => {},
        'number' => 7,
        'parent' => {}
***************
*** 6279,6282 ****
--- 6340,6348 ----
                'cmdname' => 'result',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 55,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 6295,6298 ****
--- 6361,6365 ----
                'cmdname' => 'textdegree',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6311,6314 ****
--- 6378,6382 ----
                'cmdname' => 'tie',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6327,6330 ****
--- 6395,6399 ----
                'cmdname' => 'today',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6343,6346 ****
--- 6412,6416 ----
                'cmdname' => 'aa',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6379,6387 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 55,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 6449,6453 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 6408,6411 ****
--- 6474,6482 ----
                'cmdname' => 'result',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 56,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 6424,6427 ****
--- 6495,6499 ----
                'cmdname' => 'textdegree',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6440,6443 ****
--- 6512,6516 ----
                'cmdname' => 'tie',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6456,6459 ****
--- 6529,6533 ----
                'cmdname' => 'today',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6472,6475 ****
--- 6546,6550 ----
                'cmdname' => 'aa',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6509,6517 ****
        },
        'level' => 1,
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 56,
!         'macro' => ''
!       },
        'number' => 8,
        'parent' => {}
--- 6584,6588 ----
        },
        'level' => 1,
!       'line_nr' => {},
        'number' => 8,
        'parent' => {}
***************
*** 6539,6542 ****
--- 6610,6618 ----
                'cmdname' => 'AA',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 58,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 6555,6558 ****
--- 6631,6635 ----
                'cmdname' => 'ae',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6571,6574 ****
--- 6648,6652 ----
                'cmdname' => 'oe',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6587,6590 ****
--- 6665,6669 ----
                'cmdname' => 'AE',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6603,6606 ****
--- 6682,6686 ----
                'cmdname' => 'OE',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6619,6622 ****
--- 6699,6703 ----
                'cmdname' => 'o',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6635,6638 ****
--- 6716,6720 ----
                'cmdname' => 'O',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6651,6654 ****
--- 6733,6737 ----
                'cmdname' => 'ss',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6667,6670 ****
--- 6750,6754 ----
                'cmdname' => 'l',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6683,6686 ****
--- 6767,6771 ----
                'cmdname' => 'L',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6699,6702 ****
--- 6784,6788 ----
                'cmdname' => 'DH',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6715,6718 ****
--- 6801,6805 ----
                'cmdname' => 'dh',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6731,6734 ****
--- 6818,6822 ----
                'cmdname' => 'TH',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6747,6750 ****
--- 6835,6839 ----
                'cmdname' => 'th',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6801,6809 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 58,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 6890,6894 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 6830,6833 ****
--- 6915,6923 ----
                'cmdname' => 'AA',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 59,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 6846,6849 ****
--- 6936,6940 ----
                'cmdname' => 'ae',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6862,6865 ****
--- 6953,6957 ----
                'cmdname' => 'oe',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6878,6881 ****
--- 6970,6974 ----
                'cmdname' => 'AE',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6894,6897 ****
--- 6987,6991 ----
                'cmdname' => 'OE',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6910,6913 ****
--- 7004,7008 ----
                'cmdname' => 'o',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6926,6929 ****
--- 7021,7025 ----
                'cmdname' => 'O',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6942,6945 ****
--- 7038,7042 ----
                'cmdname' => 'ss',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6958,6961 ****
--- 7055,7059 ----
                'cmdname' => 'l',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6974,6977 ****
--- 7072,7076 ----
                'cmdname' => 'L',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6990,6993 ****
--- 7089,7093 ----
                'cmdname' => 'DH',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 7006,7009 ****
--- 7106,7110 ----
                'cmdname' => 'dh',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 7022,7025 ****
--- 7123,7127 ----
                'cmdname' => 'TH',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 7038,7041 ****
--- 7140,7144 ----
                'cmdname' => 'th',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 7093,7101 ****
        },
        'level' => 1,
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 59,
!         'macro' => ''
!       },
        'number' => 9,
        'parent' => {}
--- 7196,7200 ----
        },
        'level' => 1,
!       'line_nr' => {},
        'number' => 9,
        'parent' => {}
***************
*** 7255,7258 ****
--- 7354,7359 ----
                ],
                'cmdname' => '\'',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 7570,7573 ****
--- 7671,7676 ----
                ],
                'cmdname' => '\'',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8205,8208 ****
--- 8308,8313 ----
                        ],
                        'cmdname' => '=',
+                       'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 8239,8242 ****
--- 8344,8349 ----
                        ],
                        'cmdname' => '\'',
+                       'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 8340,8343 ****
--- 8447,8452 ----
                        ],
                        'cmdname' => '=',
+                       'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 8374,8377 ****
--- 8483,8488 ----
                        ],
                        'cmdname' => '\'',
+                       'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 8443,8446 ****
--- 8554,8562 ----
                'cmdname' => 'quotedblleft',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 70,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 8459,8462 ****
--- 8575,8579 ----
                'cmdname' => 'quotedblright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8475,8478 ****
--- 8592,8596 ----
                'cmdname' => 'quoteleft',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8491,8494 ****
--- 8609,8613 ----
                'cmdname' => 'quoteright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8507,8510 ****
--- 8626,8630 ----
                'cmdname' => 'quotedblbase',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8523,8526 ****
--- 8643,8647 ----
                'cmdname' => 'quotesinglbase',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8561,8569 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 70,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 8682,8686 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 8590,8593 ****
--- 8707,8715 ----
                'cmdname' => 'quotedblleft',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 71,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 8606,8609 ****
--- 8728,8732 ----
                'cmdname' => 'quotedblright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8622,8625 ****
--- 8745,8749 ----
                'cmdname' => 'quoteleft',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8638,8641 ****
--- 8762,8766 ----
                'cmdname' => 'quoteright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8654,8657 ****
--- 8779,8783 ----
                'cmdname' => 'quotedblbase',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8670,8673 ****
--- 8796,8800 ----
                'cmdname' => 'quotesinglbase',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8709,8717 ****
        },
        'level' => 1,
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 71,
!         'macro' => ''
!       },
        'number' => 13,
        'parent' => {}
--- 8836,8840 ----
        },
        'level' => 1,
!       'line_nr' => {},
        'number' => 13,
        'parent' => {}
***************
*** 8739,8742 ****
--- 8862,8870 ----
                'cmdname' => 'guillemetleft',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 73,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 8755,8758 ****
--- 8883,8887 ----
                'cmdname' => 'guillemetright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8771,8774 ****
--- 8900,8904 ----
                'cmdname' => 'guillemotleft',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8787,8790 ****
--- 8917,8921 ----
                'cmdname' => 'guillemotright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8803,8806 ****
--- 8934,8938 ----
                'cmdname' => 'guilsinglleft',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8819,8822 ****
--- 8951,8955 ----
                'cmdname' => 'guilsinglright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8857,8865 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 73,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 8990,8994 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 8886,8889 ****
--- 9015,9023 ----
                'cmdname' => 'guillemetleft',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 74,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 8902,8905 ****
--- 9036,9040 ----
                'cmdname' => 'guillemetright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8918,8921 ****
--- 9053,9057 ----
                'cmdname' => 'guillemotleft',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8934,8937 ****
--- 9070,9074 ----
                'cmdname' => 'guillemotright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8950,8953 ****
--- 9087,9091 ----
                'cmdname' => 'guilsinglleft',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8966,8969 ****
--- 9104,9108 ----
                'cmdname' => 'guilsinglright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 9004,9013 ****
          'spaces_after_command' => {}
        },
!       'level' => 1,
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 74,
!         'macro' => ''
!       },
        'number' => 14,
        'parent' => {}
--- 9143,9148 ----
          'spaces_after_command' => {}
        },
!       'level' => 1,
!       'line_nr' => {},
        'number' => 14,
        'parent' => {}
***************
*** 9140,9143 ****
--- 9275,9279 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 9162,9171 ****
                      {}
                    ]
!                 ],
!                 'normalized' => 'AAA',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 9298,9302 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 9201,9210 ****
                    ]
                  ],
!                 'explanation_contents' => [],
!                 'normalized' => 'AAA',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 9332,9336 ----
                    ]
                  ],
!                 'explanation_contents' => []
                },
                'line_nr' => {},
***************
*** 9236,9244 ****
                    ]
                  ],
!                 'normalized' => 'BBB',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 9362,9366 ----
                    ]
                  ],
!                 'explanation_contents' => []
                },
                'line_nr' => {},
***************
*** 9305,9308 ****
--- 9427,9431 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 9327,9336 ****
                      {}
                    ]
!                 ],
!                 'normalized' => 'AAA',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 9450,9454 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 9366,9375 ****
                    ]
                  ],
!                 'explanation_contents' => [],
!                 'normalized' => 'AAA',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 9484,9488 ----
                    ]
                  ],
!                 'explanation_contents' => []
                },
                'line_nr' => {},
***************
*** 9401,9409 ****
                    ]
                  ],
!                 'normalized' => 'BBB',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 9514,9518 ----
                    ]
                  ],
!                 'explanation_contents' => []
                },
                'line_nr' => {},
***************
*** 9472,9475 ****
--- 9581,9585 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 9494,9503 ****
                      {}
                    ]
!                 ],
!                 'normalized' => 'CCC',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 9604,9608 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 9533,9542 ****
                    ]
                  ],
!                 'explanation_contents' => [],
!                 'normalized' => 'CCC',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 9638,9642 ----
                    ]
                  ],
!                 'explanation_contents' => []
                },
                'line_nr' => {},
***************
*** 9568,9576 ****
                    ]
                  ],
!                 'normalized' => 'DDD',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 9668,9672 ----
                    ]
                  ],
!                 'explanation_contents' => []
                },
                'line_nr' => {},
***************
*** 9637,9640 ****
--- 9733,9737 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 9659,9668 ****
                      {}
                    ]
!                 ],
!                 'normalized' => 'CCC',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 9756,9760 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 9698,9707 ****
                    ]
                  ],
!                 'explanation_contents' => [],
!                 'normalized' => 'CCC',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 9790,9794 ----
                    ]
                  ],
!                 'explanation_contents' => []
                },
                'line_nr' => {},
***************
*** 9733,9741 ****
                    ]
                  ],
!                 'normalized' => 'DDD',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 9820,9824 ----
                    ]
                  ],
!                 'explanation_contents' => []
                },
                'line_nr' => {},
***************
*** 9812,9815 ****
--- 9895,9899 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 9836,9844 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 9920,9924 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 9883,9891 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 9963,9967 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 9958,9961 ****
--- 10034,10038 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 9982,9990 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 10059,10063 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 10029,10037 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 10102,10106 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 10103,10111 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 10172,10176 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 10192,10200 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 10257,10261 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 10264,10272 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 10325,10329 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 10353,10361 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 10410,10414 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 11621,11629 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 11674,11678 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 11700,11708 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 11749,11753 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 11953,11961 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 11998,12002 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 12027,12035 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 12068,12072 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 12279,12287 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 12316,12320 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 12311,12314 ****
--- 12344,12348 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 12333,12341 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 12367,12371 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 12385,12393 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 12415,12419 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 12459,12467 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 12485,12489 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 12491,12494 ****
--- 12513,12517 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 12513,12521 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 12536,12540 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 12565,12573 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 12584,12588 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 12646,12653 ****
                    ],
                    'normalized' => '-_007b-_007d'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 12661,12664 ----
***************
*** 12799,12806 ****
                    ],
                    'normalized' => '----_0021---_002e--_002e-_003f-_0040'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 12810,12813 ----
***************
*** 12831,12834 ****
--- 12838,12846 ----
                        'cmdname' => 'atchar',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 124,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 12847,12850 ****
--- 12859,12863 ----
                        'cmdname' => 'lbracechar',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 12863,12866 ****
--- 12876,12880 ----
                        'cmdname' => 'rbracechar',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 12879,12882 ****
--- 12893,12897 ----
                        'cmdname' => 'backslashchar',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 12895,12898 ****
--- 12910,12914 ----
                        'cmdname' => 'hashchar',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 12932,12946 ****
                    ],
                    'normalized' => '_0040-_007b-_007d-_005c-_0023'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 124,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 12948,12954 ----
                    ],
                    'normalized' => '_0040-_007b-_007d-_005c-_0023'
                  }
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 12964,12967 ****
--- 12972,12980 ----
                        'cmdname' => 'LaTeX',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 125,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 12980,12983 ****
--- 12993,12997 ----
                        'cmdname' => 'TeX',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 12996,12999 ****
--- 13010,13014 ----
                        'cmdname' => 'bullet',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13012,13015 ****
--- 13027,13031 ----
                        'cmdname' => 'comma',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13028,13031 ****
--- 13044,13048 ----
                        'cmdname' => 'copyright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13044,13047 ****
--- 13061,13065 ----
                        'cmdname' => 'dots',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13060,13063 ****
--- 13078,13082 ----
                        'cmdname' => 'enddots',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 13105,13119 ****
                    ],
                    'normalized' => 'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 125,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 13124,13130 ----
                    ],
                    'normalized' => 'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
                  }
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 13137,13140 ****
--- 13148,13156 ----
                        'cmdname' => 'equiv',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 126,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 13153,13156 ****
--- 13169,13173 ----
                        'cmdname' => 'error',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13169,13172 ****
--- 13186,13190 ----
                        'cmdname' => 'euro',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13185,13188 ****
--- 13203,13207 ----
                        'cmdname' => 'exclamdown',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13201,13204 ****
--- 13220,13224 ----
                        'cmdname' => 'expansion',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13217,13220 ****
--- 13237,13241 ----
                        'cmdname' => 'minus',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 13258,13272 ****
                    ],
                    'normalized' => '_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 126,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 13279,13285 ----
                    ],
                    'normalized' => '_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
                  }
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 13302,13305 ****
--- 13315,13323 ----
                        'cmdname' => 'geq',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 128,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 13318,13321 ****
--- 13336,13340 ----
                        'cmdname' => 'leq',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13334,13337 ****
--- 13353,13357 ----
                        'cmdname' => 'arrow',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 13363,13377 ****
                    ],
                    'normalized' => '_2265-_2264-_2192'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 128,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 13383,13389 ----
                    ],
                    'normalized' => '_2265-_2264-_2192'
                  }
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 13407,13410 ****
--- 13419,13427 ----
                        'cmdname' => 'ordf',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 130,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 13423,13426 ****
--- 13440,13444 ----
                        'cmdname' => 'ordm',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13439,13442 ****
--- 13457,13461 ----
                        'cmdname' => 'point',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13455,13458 ****
--- 13474,13478 ----
                        'cmdname' => 'pounds',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13471,13474 ****
--- 13491,13495 ----
                        'cmdname' => 'print',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13487,13490 ****
--- 13508,13512 ----
                        'cmdname' => 'questiondown',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13503,13506 ****
--- 13525,13529 ----
                        'cmdname' => 'registeredsymbol',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 13548,13562 ****
                    ],
                    'normalized' => '_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 130,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 13571,13577 ----
                    ],
                    'normalized' => '_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae'
                  }
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 13580,13583 ****
--- 13595,13603 ----
                        'cmdname' => 'result',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 131,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 13596,13599 ****
--- 13616,13620 ----
                        'cmdname' => 'textdegree',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13612,13615 ****
--- 13633,13637 ----
                        'cmdname' => 'tie',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13628,13631 ****
--- 13650,13654 ----
                        'cmdname' => 'today',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13644,13647 ****
--- 13667,13671 ----
                        'cmdname' => 'aa',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 13681,13695 ****
                    ],
                    'normalized' => '_21d2-_00b0-a-b--_00e5'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 131,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 13705,13711 ----
                    ],
                    'normalized' => '_21d2-_00b0-a-b--_00e5'
                  }
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 13713,13716 ****
--- 13729,13737 ----
                        'cmdname' => 'AA',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 132,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 13729,13732 ****
--- 13750,13754 ----
                        'cmdname' => 'ae',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13745,13748 ****
--- 13767,13771 ----
                        'cmdname' => 'oe',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13761,13764 ****
--- 13784,13788 ----
                        'cmdname' => 'AE',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13777,13780 ****
--- 13801,13805 ----
                        'cmdname' => 'OE',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13793,13796 ****
--- 13818,13822 ----
                        'cmdname' => 'o',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13809,13812 ****
--- 13835,13839 ----
                        'cmdname' => 'O',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13825,13828 ****
--- 13852,13856 ----
                        'cmdname' => 'ss',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13841,13844 ****
--- 13869,13873 ----
                        'cmdname' => 'l',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13857,13860 ****
--- 13886,13890 ----
                        'cmdname' => 'L',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13873,13876 ****
--- 13903,13907 ----
                        'cmdname' => 'DH',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13889,13892 ****
--- 13920,13924 ----
                        'cmdname' => 'dh',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13905,13908 ****
--- 13937,13941 ----
                        'cmdname' => 'TH',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13921,13924 ****
--- 13954,13958 ----
                        'cmdname' => 'th',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 13994,14008 ****
                    ],
                    'normalized' => '_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 132,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 14028,14034 ----
                    ],
                    'normalized' => '_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
                  }
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 14158,14161 ****
--- 14184,14189 ----
                        ],
                        'cmdname' => '\'',
+                       'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 14329,14336 ****
                    ],
                    'normalized' => '_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 14357,14360 ----
***************
*** 14544,14551 ****
                    ],
                    'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 14568,14571 ----
***************
*** 14606,14609 ****
--- 14626,14631 ----
                                ],
                                'cmdname' => '=',
+                               'contents' => [],
+                               'line_nr' => {},
                                'parent' => {}
                              }
***************
*** 14640,14643 ****
--- 14662,14667 ----
                                ],
                                'cmdname' => '\'',
+                               'contents' => [],
+                               'line_nr' => {},
                                'parent' => {}
                              }
***************
*** 14679,14686 ****
                    ],
                    'normalized' => '_0131-_1e14-_1e08'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 14703,14706 ----
***************
*** 14707,14710 ****
--- 14727,14735 ----
                        'cmdname' => 'quotedblleft',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 136,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 14723,14726 ****
--- 14748,14752 ----
                        'cmdname' => 'quotedblright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 14739,14742 ****
--- 14765,14769 ----
                        'cmdname' => 'quoteleft',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 14755,14758 ****
--- 14782,14786 ----
                        'cmdname' => 'quoteright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 14771,14774 ****
--- 14799,14803 ----
                        'cmdname' => 'quotedblbase',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 14787,14790 ****
--- 14816,14820 ----
                        'cmdname' => 'quotesinglbase',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 14828,14842 ****
                    ],
                    'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 136,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 14858,14864 ----
                    ],
                    'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
                  }
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 14860,14863 ****
--- 14882,14890 ----
                        'cmdname' => 'guillemetleft',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 137,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 14876,14879 ****
--- 14903,14907 ----
                        'cmdname' => 'guillemetright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 14892,14895 ****
--- 14920,14924 ----
                        'cmdname' => 'guillemotleft',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 14908,14911 ****
--- 14937,14941 ----
                        'cmdname' => 'guillemotright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 14924,14927 ****
--- 14954,14958 ----
                        'cmdname' => 'guilsinglleft',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 14940,14943 ****
--- 14971,14975 ----
                        'cmdname' => 'guilsinglright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 14981,14995 ****
                    ],
                    'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 137,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 15013,15019 ----
                    ],
                    'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
                  }
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 15026,15033 ****
                    ],
                    'normalized' => '_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 15050,15053 ----
***************
*** 15063,15066 ****
--- 15083,15087 ----
                            'contents' => [
                              {
+                               'parent' => {},
                                'text' => ' ',
                                'type' => 'empty_spaces_before_argument'
***************
*** 15085,15094 ****
                              {}
                            ]
!                         ],
!                         'normalized' => 'AAA',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 15106,15110 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 15124,15133 ****
                            ]
                          ],
!                         'explanation_contents' => [],
!                         'normalized' => 'AAA',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 15140,15144 ----
                            ]
                          ],
!                         'explanation_contents' => []
                        },
                        'line_nr' => {},
***************
*** 15159,15167 ****
                            ]
                          ],
!                         'normalized' => 'BBB',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 15170,15174 ----
                            ]
                          ],
!                         'explanation_contents' => []
                        },
                        'line_nr' => {},
***************
*** 15195,15202 ****
                    ],
                    'normalized' => 'AAA-AAA-BBB'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 15202,15205 ----
***************
*** 15228,15231 ****
--- 15231,15235 ----
                            'contents' => [
                              {
+                               'parent' => {},
                                'text' => ' ',
                                'type' => 'empty_spaces_before_argument'
***************
*** 15250,15259 ****
                              {}
                            ]
!                         ],
!                         'normalized' => 'CCC',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 15254,15258 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 15289,15298 ****
                            ]
                          ],
!                         'explanation_contents' => [],
!                         'normalized' => 'CCC',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 15288,15292 ----
                            ]
                          ],
!                         'explanation_contents' => []
                        },
                        'line_nr' => {},
***************
*** 15324,15332 ****
                            ]
                          ],
!                         'normalized' => 'DDD',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 15318,15322 ----
                            ]
                          ],
!                         'explanation_contents' => []
                        },
                        'line_nr' => {},
***************
*** 15360,15367 ****
                    ],
                    'normalized' => 'CCC-CCC-DDD'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 15350,15353 ----
***************
*** 15401,15404 ****
--- 15387,15391 ----
                            'contents' => [
                              {
+                               'parent' => {},
                                'text' => ' ',
                                'type' => 'empty_spaces_before_argument'
***************
*** 15425,15433 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 15412,15416 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 15472,15480 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 15455,15459 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {},
***************
*** 15504,15511 ****
                    ],
                    'normalized' => 'someone_0040somewher-no_005fexplain_0040there'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 15483,15486 ----
***************
*** 15542,15550 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 15517,15521 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 15631,15639 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 15602,15606 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {},
***************
*** 15663,15670 ****
                    ],
                    'normalized' => 'f_002d_002dile1-f_002d_002dile'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 15630,15633 ----
***************
*** 15727,15734 ****
                    ],
                    'normalized' => '-_0040-_007b_007d-_002e-'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 15690,15693 ----
***************
*** 16038,16045 ****
                    ],
                    'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 15997,16000 ----
***************
*** 16271,16278 ****
                    ],
                    'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 16226,16229 ----
***************
*** 16313,16321 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 16264,16268 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 16347,16354 ****
                    ],
                    'normalized' => '8_002e27in'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 16294,16297 ----
***************
*** 16432,16439 ****
                    ],
                    'normalized' => 'sansserif-slanted'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 16375,16378 ----
***************
*** 16470,16478 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 16409,16413 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 16502,16509 ****
                    ],
                    'normalized' => 'indicateurl'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 16437,16440 ----
***************
*** 16587,16594 ****
                    ],
                    'normalized' => 'gH-3rd'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 16518,16521 ----
***************
*** 16625,16633 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 16552,16556 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 16657,16660 ****
--- 16580,16584 ----
                            'contents' => [
                              {
+                               'parent' => {},
                                'text' => ' ',
                                'type' => 'empty_spaces_before_argument'
***************
*** 16679,16687 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 16603,16607 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {},
***************
*** 16731,16739 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 16651,16655 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {},
***************
*** 16767,16774 ****
                    ],
                    'normalized' => 'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 16683,16686 ----
***************
*** 16905,16917 ****
--- 16817,16833 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[2];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[4];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[6];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[8];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
***************
*** 16930,16933 ****
--- 16846,16850 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[7] = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[7];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[8] = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[8];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4];
***************
*** 16936,16954 ****
--- 16853,16877 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[2];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[4];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[6];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[8];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[10];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[12];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4];
***************
*** 16971,16974 ****
--- 16894,16898 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[11] = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[11];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[12] = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[12];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
***************
*** 16977,16992 ****
--- 16901,16921 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[2];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[4];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[6];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[8];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[10];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
***************
*** 17007,17010 ****
--- 16936,16940 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node'}{'node_content'}[9] = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[9];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node'}{'node_content'}[10] = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[10];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6];
***************
*** 17013,17019 ****
--- 16943,16951 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[2];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[4];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6];
***************
*** 17028,17031 ****
--- 16960,16964 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[3];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[4];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7];
***************
*** 17034,17052 ****
--- 16967,16991 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[2];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[4];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[6];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[8];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[10];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[12];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7];
***************
*** 17069,17072 ****
--- 17008,17012 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node'}{'node_content'}[11] = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[11];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node'}{'node_content'}[12] = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[12];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8];
***************
*** 17075,17087 ****
--- 17015,17031 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[4];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[6];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[8];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8];
***************
*** 17100,17103 ****
--- 17044,17048 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[7] = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[7];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[8] = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[8];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9];
***************
*** 17106,17145 ****
--- 17051,17103 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[2];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[4];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[6];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[8];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[10];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[12];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[14];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[14]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[16];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[16]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[18]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[18];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[18]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[20]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[20];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[20]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[21]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[22]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[22];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[22]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[22]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[23]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[24]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[24];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[24]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[24]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[25]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[26]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[26];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[26]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[26]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9];
***************
*** 17176,17179 ****
--- 17134,17138 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node'}{'node_content'}[25] = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[25];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node'}{'node_content'}[26] = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[26];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10];
***************
*** 17207,17210 ****
--- 17166,17170 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1];
***************
*** 17324,17327 ****
--- 17284,17288 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2];
***************
*** 17331,17334 ****
--- 17292,17296 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4];
***************
*** 17353,17368 ****
--- 17315,17335 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[2];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[4];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[6];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[8];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[10];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13];
***************
*** 17383,17386 ****
--- 17350,17354 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node'}{'node_content'}[9] = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[9];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node'}{'node_content'}[10] = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[10];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14];
***************
*** 17389,17404 ****
--- 17357,17377 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[2];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[4];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[6];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[8];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[10];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14];
***************
*** 17419,17422 ****
--- 17392,17396 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'extra'}{'menu_entry_node'}{'node_content'}[9] = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[9];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'extra'}{'menu_entry_node'}{'node_content'}[10] = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[10];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15];
***************
*** 17433,17436 ****
--- 17407,17411 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0];
***************
*** 17467,17470 ****
--- 17442,17446 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0];
***************
*** 17503,17506 ****
--- 17479,17483 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0];
***************
*** 17794,17797 ****
--- 17771,17775 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[1]{'contents'}[2];
+ $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[1]{'contents'}[2]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[1]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[1]{'contents'}[2]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[1]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[1]{'contents'}[2];
***************
*** 17960,17972 ****
--- 17938,17954 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0];
***************
*** 17983,17986 ****
--- 17965,17969 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'at_commands_in_refs'}{'contents'}[7]{'extra'}{'node_content'};
  $result_trees{'at_commands_in_refs'}{'contents'}[7]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs'}{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'};
  $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs'}{'contents'}[8];
***************
*** 17990,18002 ****
--- 17973,17989 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0];
***************
*** 18013,18016 ****
--- 18000,18004 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[8]{'extra'}{'misc_content'}[8] = $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0]{'contents'}[9];
  $result_trees{'at_commands_in_refs'}{'contents'}[8]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs'}{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[8]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'};
  $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs'}{'contents'}[9];
***************
*** 18020,18038 ****
--- 18008,18032 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[13];
+ $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[13]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0];
***************
*** 18053,18056 ****
--- 18047,18051 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'at_commands_in_refs'}{'contents'}[9]{'extra'}{'node_content'};
  $result_trees{'at_commands_in_refs'}{'contents'}[9]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs'}{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'};
  $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs'}{'contents'}[10];
***************
*** 18060,18078 ****
--- 18055,18079 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[13];
+ $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[13]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0];
***************
*** 18093,18096 ****
--- 18094,18098 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[10]{'extra'}{'misc_content'}[12] = $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[13];
  $result_trees{'at_commands_in_refs'}{'contents'}[10]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs'}{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'};
  $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs'}{'contents'}[11];
***************
*** 18100,18115 ****
--- 18102,18122 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0];
***************
*** 18128,18131 ****
--- 18135,18139 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'at_commands_in_refs'}{'contents'}[11]{'extra'}{'node_content'};
  $result_trees{'at_commands_in_refs'}{'contents'}[11]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs'}{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'};
  $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs'}{'contents'}[12];
***************
*** 18135,18150 ****
--- 18143,18163 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0];
***************
*** 18163,18166 ****
--- 18176,18180 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[12]{'extra'}{'misc_content'}[10] = $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[11];
  $result_trees{'at_commands_in_refs'}{'contents'}[12]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs'}{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'};
  $result_trees{'at_commands_in_refs'}{'contents'}[13]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs'}{'contents'}[13];
***************
*** 18170,18176 ****
--- 18184,18192 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[13]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[13]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[13]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[13]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs'}{'contents'}[13]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[13]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[13]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[13]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[13]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[13]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[13]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[13]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs'}{'contents'}[13]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[13]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[13]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[13]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[13]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[13]{'args'}[0];
***************
*** 18183,18186 ****
--- 18199,18203 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[13]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'at_commands_in_refs'}{'contents'}[13]{'extra'}{'node_content'};
  $result_trees{'at_commands_in_refs'}{'contents'}[13]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs'}{'contents'}[13]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs'}{'contents'}[13]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[13]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs'};
  $result_trees{'at_commands_in_refs'}{'contents'}[14]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs'}{'contents'}[14];
***************
*** 18190,18196 ****
--- 18207,18215 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[14]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[14]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[14]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[14]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs'}{'contents'}[14]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[14]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[14]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[14]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[14]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[14]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[14]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[14]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs'}{'contents'}[14]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[14]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[14]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[14]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[14]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[14]{'args'}[0];
***************
*** 18203,18206 ****
--- 18222,18226 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[14]{'extra'}{'misc_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[14]{'args'}[0]{'contents'}[5];
  $result_trees{'at_commands_in_refs'}{'contents'}[14]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs'}{'contents'}[14]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs'}{'contents'}[14]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[14]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs'};
  $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs'}{'contents'}[15];
***************
*** 18210,18228 ****
--- 18230,18254 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[13];
+ $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[13]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0];
***************
*** 18243,18246 ****
--- 18269,18273 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[15]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'at_commands_in_refs'}{'contents'}[15]{'extra'}{'node_content'};
  $result_trees{'at_commands_in_refs'}{'contents'}[15]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs'}{'contents'}[15]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs'};
  $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs'}{'contents'}[16];
***************
*** 18250,18268 ****
--- 18277,18301 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[13];
+ $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[13]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0];
***************
*** 18283,18286 ****
--- 18316,18320 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[16]{'extra'}{'misc_content'}[12] = $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[13];
  $result_trees{'at_commands_in_refs'}{'contents'}[16]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs'}{'contents'}[16]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs'};
  $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs'}{'contents'}[17];
***************
*** 18290,18302 ****
--- 18324,18340 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0];
***************
*** 18313,18316 ****
--- 18351,18355 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[17]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'at_commands_in_refs'}{'contents'}[17]{'extra'}{'node_content'};
  $result_trees{'at_commands_in_refs'}{'contents'}[17]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs'}{'contents'}[17]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_refs'};
  $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs'}{'contents'}[18];
***************
*** 18320,18332 ****
--- 18359,18375 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0];
***************
*** 18343,18346 ****
--- 18386,18390 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[18]{'extra'}{'misc_content'}[8] = $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0]{'contents'}[9];
  $result_trees{'at_commands_in_refs'}{'contents'}[18]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs'}{'contents'}[18]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[18]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_refs'};
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs'}{'contents'}[19];
***************
*** 18350,18389 ****
--- 18394,18446 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[13];
+ $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[13]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[15]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[15];
+ $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[15]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[17]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[17];
+ $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[17]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[19]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[19];
+ $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[19]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[21]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[21];
+ $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[21]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[21]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[22]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[23]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[23];
+ $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[23]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[23]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[24]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[25]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[25];
+ $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[25]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[25]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[26]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[27]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[27];
+ $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[27]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[27]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[28]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0];
***************
*** 18418,18421 ****
--- 18475,18479 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'node_content'};
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs'}{'contents'}[19]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_refs'};
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs'}{'contents'}[20];
***************
*** 18425,18464 ****
--- 18483,18535 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[13];
+ $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[13]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[15]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[15];
+ $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[15]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[17]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[17];
+ $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[17]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[19]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[19];
+ $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[19]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[21]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[21];
+ $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[21]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[21]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[22]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[23]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[23];
+ $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[23]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[23]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[24]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[25]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[25];
+ $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[25]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[25]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[26]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[27]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[27];
+ $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[27]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[27]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[28]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0];
***************
*** 18493,18496 ****
--- 18564,18568 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'extra'}{'misc_content'}[26] = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[27];
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs'}{'contents'}[20]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_refs'};
  $result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs'}{'contents'}[21];
***************
*** 18525,18528 ****
--- 18597,18601 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0];
***************
*** 18609,18612 ****
--- 18682,18686 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[22]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[22]{'args'}[0]{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[22]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[22]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs'}{'contents'}[22]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[22]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[22]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[22]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[22]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[22]{'args'}[0];
***************
*** 18778,18781 ****
--- 18852,18856 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[3];
***************
*** 18785,18788 ****
--- 18860,18864 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[5];
***************
*** 18808,18811 ****
--- 18884,18888 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[3];
***************
*** 18815,18818 ****
--- 18892,18896 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[5];
***************
*** 18836,18851 ****
--- 18914,18934 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0];
***************
*** 18864,18867 ****
--- 18947,18951 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[27]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'at_commands_in_refs'}{'contents'}[27]{'extra'}{'node_content'};
  $result_trees{'at_commands_in_refs'}{'contents'}[27]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs'}{'contents'}[27]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[27]{'parent'} = $result_trees{'at_commands_in_refs'};
  $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs'}{'contents'}[28];
***************
*** 18871,18886 ****
--- 18955,18975 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0];
***************
*** 18899,18902 ****
--- 18988,18992 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[28]{'extra'}{'misc_content'}[10] = $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[11];
  $result_trees{'at_commands_in_refs'}{'contents'}[28]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs'}{'contents'}[28]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[28]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[28]{'parent'} = $result_trees{'at_commands_in_refs'};
  $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs'}{'contents'}[29];
***************
*** 18906,18921 ****
--- 18996,19016 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0];
***************
*** 18934,18937 ****
--- 19029,19033 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[29]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'at_commands_in_refs'}{'contents'}[29]{'extra'}{'node_content'};
  $result_trees{'at_commands_in_refs'}{'contents'}[29]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs'}{'contents'}[29]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[29]{'parent'} = $result_trees{'at_commands_in_refs'};
  $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs'}{'contents'}[30];
***************
*** 18941,18956 ****
--- 19037,19057 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0];
***************
*** 18969,18972 ****
--- 19070,19074 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[30]{'extra'}{'misc_content'}[10] = $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[11];
  $result_trees{'at_commands_in_refs'}{'contents'}[30]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs'}{'contents'}[30]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[30]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs'}{'contents'}[30]{'parent'} = $result_trees{'at_commands_in_refs'};
  $result_trees{'at_commands_in_refs'}{'contents'}[31]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs'}{'contents'}[31];
***************
*** 18992,18995 ****
--- 19094,19098 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[33]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[33]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[33]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[33]{'args'}[0]{'contents'}[1];
+ $result_trees{'at_commands_in_refs'}{'contents'}[33]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[33]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[33]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[33]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[33]{'args'}[0]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[33]{'args'}[0]{'contents'}[1];
***************
*** 19025,19028 ****
--- 19128,19132 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[34]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[34]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[34]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[34]{'args'}[0]{'contents'}[1];
+ $result_trees{'at_commands_in_refs'}{'contents'}[34]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[34]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[34]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[34]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[34]{'args'}[0]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[34]{'args'}[0]{'contents'}[1];
***************
*** 19058,19061 ****
--- 19162,19166 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[35]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[35]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[35]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[35]{'args'}[0]{'contents'}[1];
+ $result_trees{'at_commands_in_refs'}{'contents'}[35]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[35]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[35]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[35]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[35]{'args'}[0]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[35]{'args'}[0]{'contents'}[1];
***************
*** 19091,19094 ****
--- 19196,19200 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[36]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[36]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[36]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[36]{'args'}[0]{'contents'}[1];
+ $result_trees{'at_commands_in_refs'}{'contents'}[36]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[36]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[36]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[36]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[36]{'args'}[0]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[36]{'args'}[0]{'contents'}[1];
***************
*** 19126,19129 ****
--- 19232,19236 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[37]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[37]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[37]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[37]{'args'}[0]{'contents'}[1];
+ $result_trees{'at_commands_in_refs'}{'contents'}[37]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[37]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[37]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[37]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[37]{'args'}[0]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[37]{'args'}[0]{'contents'}[1];
***************
*** 19158,19161 ****
--- 19265,19269 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[38]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[38]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[38]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[38]{'args'}[0]{'contents'}[1];
+ $result_trees{'at_commands_in_refs'}{'contents'}[38]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[38]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[38]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[38]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[38]{'args'}[0]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[38]{'args'}[0]{'contents'}[1];
***************
*** 19687,19690 ****
--- 19795,19799 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[55]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[55]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[55]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[55]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs'}{'contents'}[55]{'args'}[0]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[55]{'args'}[0]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[55]{'args'}[0]{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[55]{'args'}[0]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[55]{'args'}[0]{'contents'}[3]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[55]{'args'}[0]{'contents'}[3];
***************
*** 19723,19726 ****
--- 19832,19836 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[56]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'at_commands_in_refs'}{'contents'}[56]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs'}{'contents'}[56]{'args'}[0]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'args'}[0]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[56]{'args'}[0]{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'args'}[0]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs'}{'contents'}[56]{'args'}[0]{'contents'}[3]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'args'}[0]{'contents'}[3];
***************
*** 19822,19834 ****
--- 19932,19948 ----
  $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];
***************
*** 19852,19855 ****
--- 19966,19970 ----
  $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];
***************
*** 19858,19876 ****
--- 19973,19997 ----
  $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];
***************
*** 19902,19905 ****
--- 20023,20027 ----
  $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];
***************
*** 19908,19923 ****
--- 20030,20050 ----
  $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];
***************
*** 19945,19948 ****
--- 20072,20076 ----
  $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];
***************
*** 19953,19959 ****
--- 20081,20089 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1]{'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'}[2]{'args'}[0]{'parent'} = $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]{'args'}[0]{'contents'}[2]{'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'}[2]{'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'}[3]{'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'}[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]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0];
***************
*** 19969,19972 ****
--- 20099,20103 ----
  $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]{'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];
***************
*** 19977,19995 ****
--- 20108,20132 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[1]{'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]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
+ $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2]{'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'}[2]{'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]{'contents'}[3]{'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]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[4];
+ $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[4]{'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'}[4]{'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]{'contents'}[5]{'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]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[6];
+ $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[6]{'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'}[6]{'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]{'contents'}[7]{'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]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[8];
+ $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[8]{'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'}[8]{'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]{'contents'}[9]{'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]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[10];
+ $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[10]{'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'}[10]{'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]{'contents'}[11]{'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]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[12];
+ $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];
***************
*** 20021,20024 ****
--- 20158,20162 ----
  $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[11];
  $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[12];
+ $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];
***************
*** 20027,20039 ****
--- 20165,20181 ----
  $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];
***************
*** 20057,20060 ****
--- 20199,20203 ----
  $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];
***************
*** 20063,20102 ****
--- 20206,20258 ----
  $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];
***************
*** 20156,20159 ****
--- 20312,20316 ----
  $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];
***************
*** 20187,20190 ****
--- 20344,20348 ----
  $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];
***************
*** 20330,20333 ****
--- 20488,20492 ----
  $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];
***************
*** 20337,20340 ****
--- 20496,20500 ----
  $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];
***************
*** 20360,20375 ****
--- 20520,20540 ----
  $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];
***************
*** 20397,20400 ****
--- 20562,20566 ----
  $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];
***************
*** 20403,20418 ****
--- 20569,20589 ----
  $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];
***************
*** 20440,20443 ****
--- 20611,20615 ----
  $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];
***************
*** 20451,20454 ****
--- 20623,20627 ----
  $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]{'contents'}[1]{'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];
***************
*** 20486,20489 ****
--- 20659,20663 ----
  $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]{'contents'}[1]{'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];
***************
*** 20523,20526 ****
--- 20697,20701 ----
  $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]{'contents'}[1]{'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];
***************
*** 20824,20827 ****
--- 20999,21003 ----
  $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]{'contents'}[1]{'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];
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/at_commands_in_refs_latin1.pl texinfo-6.3/tp/t/results/converters_tests/at_commands_in_refs_latin1.pl
*** texinfo-6.1/tp/t/results/converters_tests/at_commands_in_refs_latin1.pl	2016-01-22 07:50:20.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/at_commands_in_refs_latin1.pl	2016-08-02 18:44:58.000000000 +0100
***************
*** 429,432 ****
--- 429,437 ----
                        'cmdname' => 'atchar',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 10,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 445,448 ****
--- 450,454 ----
                        'cmdname' => 'lbracechar',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 461,464 ****
--- 467,471 ----
                        'cmdname' => 'rbracechar',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 477,480 ****
--- 484,488 ----
                        'cmdname' => 'backslashchar',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 493,496 ****
--- 501,505 ----
                        'cmdname' => 'hashchar',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 539,547 ****
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 10,
!                 'macro' => ''
!               },
                'parent' => {},
                'type' => 'menu_entry'
--- 548,552 ----
                  }
                },
!               'line_nr' => {},
                'parent' => {},
                'type' => 'menu_entry'
***************
*** 566,569 ****
--- 571,579 ----
                        'cmdname' => 'LaTeX',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 11,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 582,585 ****
--- 592,596 ----
                        'cmdname' => 'TeX',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 598,601 ****
--- 609,613 ----
                        'cmdname' => 'bullet',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 614,617 ****
--- 626,630 ----
                        'cmdname' => 'comma',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 630,633 ****
--- 643,647 ----
                        'cmdname' => 'copyright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 646,649 ****
--- 660,664 ----
                        'cmdname' => 'dots',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 662,665 ****
--- 677,681 ----
                        'cmdname' => 'enddots',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 712,720 ****
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 11,
!                 'macro' => ''
!               },
                'parent' => {},
                'type' => 'menu_entry'
--- 728,732 ----
                  }
                },
!               'line_nr' => {},
                'parent' => {},
                'type' => 'menu_entry'
***************
*** 739,742 ****
--- 751,759 ----
                        'cmdname' => 'equiv',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 12,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 755,758 ****
--- 772,776 ----
                        'cmdname' => 'error',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 771,774 ****
--- 789,793 ----
                        'cmdname' => 'euro',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 787,790 ****
--- 806,810 ----
                        'cmdname' => 'exclamdown',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 803,806 ****
--- 823,827 ----
                        'cmdname' => 'expansion',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 819,822 ****
--- 840,844 ----
                        'cmdname' => 'minus',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 867,875 ****
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 12,
!                 'macro' => ''
!               },
                'parent' => {},
                'type' => 'menu_entry'
--- 889,893 ----
                  }
                },
!               'line_nr' => {},
                'parent' => {},
                'type' => 'menu_entry'
***************
*** 894,897 ****
--- 912,920 ----
                        'cmdname' => 'geq',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 13,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 910,913 ****
--- 933,937 ----
                        'cmdname' => 'leq',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 926,929 ****
--- 950,954 ----
                        'cmdname' => 'arrow',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 968,976 ****
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 13,
!                 'macro' => ''
!               },
                'parent' => {},
                'type' => 'menu_entry'
--- 993,997 ----
                  }
                },
!               'line_nr' => {},
                'parent' => {},
                'type' => 'menu_entry'
***************
*** 995,998 ****
--- 1016,1024 ----
                        'cmdname' => 'ordf',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 14,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 1011,1014 ****
--- 1037,1041 ----
                        'cmdname' => 'ordm',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1027,1030 ****
--- 1054,1058 ----
                        'cmdname' => 'point',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1043,1046 ****
--- 1071,1075 ----
                        'cmdname' => 'pounds',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1059,1062 ****
--- 1088,1092 ----
                        'cmdname' => 'print',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1075,1078 ****
--- 1105,1109 ----
                        'cmdname' => 'questiondown',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1091,1094 ****
--- 1122,1126 ----
                        'cmdname' => 'registeredsymbol',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 1141,1149 ****
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 14,
!                 'macro' => ''
!               },
                'parent' => {},
                'type' => 'menu_entry'
--- 1173,1177 ----
                  }
                },
!               'line_nr' => {},
                'parent' => {},
                'type' => 'menu_entry'
***************
*** 1168,1171 ****
--- 1196,1204 ----
                        'cmdname' => 'result',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 15,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 1184,1187 ****
--- 1217,1221 ----
                        'cmdname' => 'textdegree',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1200,1203 ****
--- 1234,1238 ----
                        'cmdname' => 'tie',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1216,1219 ****
--- 1251,1255 ----
                        'cmdname' => 'today',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1232,1235 ****
--- 1268,1272 ----
                        'cmdname' => 'aa',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 1278,1286 ****
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 15,
!                 'macro' => ''
!               },
                'parent' => {},
                'type' => 'menu_entry'
--- 1315,1319 ----
                  }
                },
!               'line_nr' => {},
                'parent' => {},
                'type' => 'menu_entry'
***************
*** 1305,1308 ****
--- 1338,1346 ----
                        'cmdname' => 'AA',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 16,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 1321,1324 ****
--- 1359,1363 ----
                        'cmdname' => 'ae',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1337,1340 ****
--- 1376,1380 ----
                        'cmdname' => 'oe',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1353,1356 ****
--- 1393,1397 ----
                        'cmdname' => 'AE',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1369,1372 ****
--- 1410,1414 ----
                        'cmdname' => 'OE',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1385,1388 ****
--- 1427,1431 ----
                        'cmdname' => 'o',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1401,1404 ****
--- 1444,1448 ----
                        'cmdname' => 'O',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1417,1420 ****
--- 1461,1465 ----
                        'cmdname' => 'ss',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1433,1436 ****
--- 1478,1482 ----
                        'cmdname' => 'l',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1449,1452 ****
--- 1495,1499 ----
                        'cmdname' => 'L',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1465,1468 ****
--- 1512,1516 ----
                        'cmdname' => 'DH',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1481,1484 ****
--- 1529,1533 ----
                        'cmdname' => 'dh',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1497,1500 ****
--- 1546,1550 ----
                        'cmdname' => 'TH',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1513,1516 ****
--- 1563,1567 ----
                        'cmdname' => 'th',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 1577,1585 ****
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 16,
!                 'macro' => ''
!               },
                'parent' => {},
                'type' => 'menu_entry'
--- 1628,1632 ----
                  }
                },
!               'line_nr' => {},
                'parent' => {},
                'type' => 'menu_entry'
***************
*** 1736,1739 ****
--- 1783,1788 ----
                        ],
                        'cmdname' => '\'',
+                       'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 2176,2179 ****
--- 2225,2230 ----
                                ],
                                'cmdname' => '=',
+                               'contents' => [],
+                               'line_nr' => {},
                                'parent' => {}
                              }
***************
*** 2210,2213 ****
--- 2261,2266 ----
                                ],
                                'cmdname' => '\'',
+                               'contents' => [],
+                               'line_nr' => {},
                                'parent' => {}
                              }
***************
*** 2285,2288 ****
--- 2338,2346 ----
                        'cmdname' => 'quotedblleft',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 20,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 2301,2304 ****
--- 2359,2363 ----
                        'cmdname' => 'quotedblright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 2317,2320 ****
--- 2376,2380 ----
                        'cmdname' => 'quoteleft',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 2333,2336 ****
--- 2393,2397 ----
                        'cmdname' => 'quoteright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 2349,2352 ****
--- 2410,2414 ----
                        'cmdname' => 'quotedblbase',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 2365,2368 ****
--- 2427,2431 ----
                        'cmdname' => 'quotesinglbase',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 2413,2421 ****
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 20,
!                 'macro' => ''
!               },
                'parent' => {},
                'type' => 'menu_entry'
--- 2476,2480 ----
                  }
                },
!               'line_nr' => {},
                'parent' => {},
                'type' => 'menu_entry'
***************
*** 2440,2443 ****
--- 2499,2507 ----
                        'cmdname' => 'guillemetleft',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 21,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 2456,2459 ****
--- 2520,2524 ----
                        'cmdname' => 'guillemetright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 2472,2475 ****
--- 2537,2541 ----
                        'cmdname' => 'guillemotleft',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 2488,2491 ****
--- 2554,2558 ----
                        'cmdname' => 'guillemotright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 2504,2507 ****
--- 2571,2575 ----
                        'cmdname' => 'guilsinglleft',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 2520,2523 ****
--- 2588,2592 ----
                        'cmdname' => 'guilsinglright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 2568,2576 ****
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 21,
!                 'macro' => ''
!               },
                'parent' => {},
                'type' => 'menu_entry'
--- 2637,2641 ----
                  }
                },
!               'line_nr' => {},
                'parent' => {},
                'type' => 'menu_entry'
***************
*** 2657,2660 ****
--- 2722,2726 ----
                            'contents' => [
                              {
+                               'parent' => {},
                                'text' => ' ',
                                'type' => 'empty_spaces_before_argument'
***************
*** 2679,2688 ****
                              {}
                            ]
!                         ],
!                         'normalized' => 'AAA',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 2745,2749 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 2718,2727 ****
                            ]
                          ],
!                         'explanation_contents' => [],
!                         'normalized' => 'AAA',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 2779,2783 ----
                            ]
                          ],
!                         'explanation_contents' => []
                        },
                        'line_nr' => {},
***************
*** 2753,2761 ****
                            ]
                          ],
!                         'normalized' => 'BBB',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 2809,2813 ----
                            ]
                          ],
!                         'explanation_contents' => []
                        },
                        'line_nr' => {},
***************
*** 2830,2833 ****
--- 2882,2886 ----
                            'contents' => [
                              {
+                               'parent' => {},
                                'text' => ' ',
                                'type' => 'empty_spaces_before_argument'
***************
*** 2852,2861 ****
                              {}
                            ]
!                         ],
!                         'normalized' => 'CCC',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 2905,2909 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 2891,2900 ****
                            ]
                          ],
!                         'explanation_contents' => [],
!                         'normalized' => 'CCC',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 2939,2943 ----
                            ]
                          ],
!                         'explanation_contents' => []
                        },
                        'line_nr' => {},
***************
*** 2926,2934 ****
                            ]
                          ],
!                         'normalized' => 'DDD',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 2969,2973 ----
                            ]
                          ],
!                         'explanation_contents' => []
                        },
                        'line_nr' => {},
***************
*** 3011,3014 ****
--- 3050,3054 ----
                            'contents' => [
                              {
+                               'parent' => {},
                                'text' => ' ',
                                'type' => 'empty_spaces_before_argument'
***************
*** 3035,3043 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 3075,3079 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 3082,3090 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 3118,3122 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {},
***************
*** 3162,3170 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 3194,3198 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 3251,3259 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 3279,3283 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {},
***************
*** 3948,3956 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 3972,3976 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 4126,4134 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 4146,4150 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 4303,4311 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 4319,4323 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 4335,4338 ****
--- 4347,4351 ----
                            'contents' => [
                              {
+                               'parent' => {},
                                'text' => ' ',
                                'type' => 'empty_spaces_before_argument'
***************
*** 4357,4365 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 4370,4374 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {},
***************
*** 4409,4417 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 4418,4422 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {},
***************
*** 4958,4961 ****
--- 4963,4971 ----
                'cmdname' => 'atchar',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 43,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 4974,4977 ****
--- 4984,4988 ----
                'cmdname' => 'lbracechar',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 4990,4993 ****
--- 5001,5005 ----
                'cmdname' => 'rbracechar',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5006,5009 ****
--- 5018,5022 ----
                'cmdname' => 'backslashchar',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5022,5025 ****
--- 5035,5039 ----
                'cmdname' => 'hashchar',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5058,5066 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 43,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 5072,5076 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 5087,5090 ****
--- 5097,5105 ----
                'cmdname' => 'atchar',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 44,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 5103,5106 ****
--- 5118,5122 ----
                'cmdname' => 'lbracechar',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5119,5122 ****
--- 5135,5139 ----
                'cmdname' => 'rbracechar',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5135,5138 ****
--- 5152,5156 ----
                'cmdname' => 'backslashchar',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5151,5154 ****
--- 5169,5173 ----
                'cmdname' => 'hashchar',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5188,5196 ****
        },
        'level' => 1,
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 44,
!         'macro' => ''
!       },
        'number' => 3,
        'parent' => {}
--- 5207,5211 ----
        },
        'level' => 1,
!       'line_nr' => {},
        'number' => 3,
        'parent' => {}
***************
*** 5218,5221 ****
--- 5233,5241 ----
                'cmdname' => 'LaTeX',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 46,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 5234,5237 ****
--- 5254,5258 ----
                'cmdname' => 'TeX',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5250,5253 ****
--- 5271,5275 ----
                'cmdname' => 'bullet',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5266,5269 ****
--- 5288,5292 ----
                'cmdname' => 'comma',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5282,5285 ****
--- 5305,5309 ----
                'cmdname' => 'copyright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5298,5301 ****
--- 5322,5326 ----
                'cmdname' => 'dots',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5314,5317 ****
--- 5339,5343 ----
                'cmdname' => 'enddots',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5354,5362 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 46,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 5380,5384 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 5383,5386 ****
--- 5405,5413 ----
                'cmdname' => 'LaTeX',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 47,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 5399,5402 ****
--- 5426,5430 ----
                'cmdname' => 'TeX',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5415,5418 ****
--- 5443,5447 ----
                'cmdname' => 'bullet',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5431,5434 ****
--- 5460,5464 ----
                'cmdname' => 'comma',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5447,5450 ****
--- 5477,5481 ----
                'cmdname' => 'copyright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5463,5466 ****
--- 5494,5498 ----
                'cmdname' => 'dots',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5479,5482 ****
--- 5511,5515 ----
                'cmdname' => 'enddots',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5520,5528 ****
        },
        'level' => 1,
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 47,
!         'macro' => ''
!       },
        'number' => 4,
        'parent' => {}
--- 5553,5557 ----
        },
        'level' => 1,
!       'line_nr' => {},
        'number' => 4,
        'parent' => {}
***************
*** 5550,5553 ****
--- 5579,5587 ----
                'cmdname' => 'equiv',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 49,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 5566,5569 ****
--- 5600,5604 ----
                'cmdname' => 'error',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5582,5585 ****
--- 5617,5621 ----
                'cmdname' => 'euro',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5598,5601 ****
--- 5634,5638 ----
                'cmdname' => 'exclamdown',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5614,5617 ****
--- 5651,5655 ----
                'cmdname' => 'expansion',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5630,5633 ****
--- 5668,5672 ----
                'cmdname' => 'minus',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5668,5676 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 49,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 5707,5711 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 5697,5700 ****
--- 5732,5740 ----
                'cmdname' => 'equiv',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 50,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 5713,5716 ****
--- 5753,5757 ----
                'cmdname' => 'error',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5729,5732 ****
--- 5770,5774 ----
                'cmdname' => 'euro',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5745,5748 ****
--- 5787,5791 ----
                'cmdname' => 'exclamdown',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5761,5764 ****
--- 5804,5808 ----
                'cmdname' => 'expansion',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5777,5780 ****
--- 5821,5825 ----
                'cmdname' => 'minus',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5816,5824 ****
        },
        'level' => 1,
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 50,
!         'macro' => ''
!       },
        'number' => 5,
        'parent' => {}
--- 5861,5865 ----
        },
        'level' => 1,
!       'line_nr' => {},
        'number' => 5,
        'parent' => {}
***************
*** 5846,5849 ****
--- 5887,5895 ----
                'cmdname' => 'geq',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 52,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 5862,5865 ****
--- 5908,5912 ----
                'cmdname' => 'leq',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5878,5881 ****
--- 5925,5929 ----
                'cmdname' => 'arrow',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5910,5918 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 52,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 5958,5962 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 5939,5942 ****
--- 5983,5991 ----
                'cmdname' => 'geq',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 53,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 5955,5958 ****
--- 6004,6008 ----
                'cmdname' => 'leq',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5971,5974 ****
--- 6021,6025 ----
                'cmdname' => 'arrow',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6004,6012 ****
        },
        'level' => 1,
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 53,
!         'macro' => ''
!       },
        'number' => 6,
        'parent' => {}
--- 6055,6059 ----
        },
        'level' => 1,
!       'line_nr' => {},
        'number' => 6,
        'parent' => {}
***************
*** 6034,6037 ****
--- 6081,6089 ----
                'cmdname' => 'ordf',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 55,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 6050,6053 ****
--- 6102,6106 ----
                'cmdname' => 'ordm',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6066,6069 ****
--- 6119,6123 ----
                'cmdname' => 'point',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6082,6085 ****
--- 6136,6140 ----
                'cmdname' => 'pounds',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6098,6101 ****
--- 6153,6157 ----
                'cmdname' => 'print',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6114,6117 ****
--- 6170,6174 ----
                'cmdname' => 'questiondown',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6130,6133 ****
--- 6187,6191 ----
                'cmdname' => 'registeredsymbol',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6170,6178 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 55,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 6228,6232 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 6199,6202 ****
--- 6253,6261 ----
                'cmdname' => 'ordf',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 56,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 6215,6218 ****
--- 6274,6278 ----
                'cmdname' => 'ordm',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6231,6234 ****
--- 6291,6295 ----
                'cmdname' => 'point',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6247,6250 ****
--- 6308,6312 ----
                'cmdname' => 'pounds',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6263,6266 ****
--- 6325,6329 ----
                'cmdname' => 'print',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6279,6282 ****
--- 6342,6346 ----
                'cmdname' => 'questiondown',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6295,6298 ****
--- 6359,6363 ----
                'cmdname' => 'registeredsymbol',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6336,6344 ****
        },
        'level' => 1,
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 56,
!         'macro' => ''
!       },
        'number' => 7,
        'parent' => {}
--- 6401,6405 ----
        },
        'level' => 1,
!       'line_nr' => {},
        'number' => 7,
        'parent' => {}
***************
*** 6366,6369 ****
--- 6427,6435 ----
                'cmdname' => 'result',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 58,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 6382,6385 ****
--- 6448,6452 ----
                'cmdname' => 'textdegree',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6398,6401 ****
--- 6465,6469 ----
                'cmdname' => 'tie',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6414,6417 ****
--- 6482,6486 ----
                'cmdname' => 'today',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6430,6433 ****
--- 6499,6503 ----
                'cmdname' => 'aa',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6466,6474 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 58,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 6536,6540 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 6495,6498 ****
--- 6561,6569 ----
                'cmdname' => 'result',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 59,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 6511,6514 ****
--- 6582,6586 ----
                'cmdname' => 'textdegree',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6527,6530 ****
--- 6599,6603 ----
                'cmdname' => 'tie',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6543,6546 ****
--- 6616,6620 ----
                'cmdname' => 'today',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6559,6562 ****
--- 6633,6637 ----
                'cmdname' => 'aa',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6596,6604 ****
        },
        'level' => 1,
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 59,
!         'macro' => ''
!       },
        'number' => 8,
        'parent' => {}
--- 6671,6675 ----
        },
        'level' => 1,
!       'line_nr' => {},
        'number' => 8,
        'parent' => {}
***************
*** 6626,6629 ****
--- 6697,6705 ----
                'cmdname' => 'AA',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 61,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 6642,6645 ****
--- 6718,6722 ----
                'cmdname' => 'ae',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6658,6661 ****
--- 6735,6739 ----
                'cmdname' => 'oe',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6674,6677 ****
--- 6752,6756 ----
                'cmdname' => 'AE',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6690,6693 ****
--- 6769,6773 ----
                'cmdname' => 'OE',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6706,6709 ****
--- 6786,6790 ----
                'cmdname' => 'o',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6722,6725 ****
--- 6803,6807 ----
                'cmdname' => 'O',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6738,6741 ****
--- 6820,6824 ----
                'cmdname' => 'ss',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6754,6757 ****
--- 6837,6841 ----
                'cmdname' => 'l',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6770,6773 ****
--- 6854,6858 ----
                'cmdname' => 'L',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6786,6789 ****
--- 6871,6875 ----
                'cmdname' => 'DH',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6802,6805 ****
--- 6888,6892 ----
                'cmdname' => 'dh',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6818,6821 ****
--- 6905,6909 ----
                'cmdname' => 'TH',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6834,6837 ****
--- 6922,6926 ----
                'cmdname' => 'th',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6888,6896 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 61,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 6977,6981 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 6917,6920 ****
--- 7002,7010 ----
                'cmdname' => 'AA',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 62,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 6933,6936 ****
--- 7023,7027 ----
                'cmdname' => 'ae',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6949,6952 ****
--- 7040,7044 ----
                'cmdname' => 'oe',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6965,6968 ****
--- 7057,7061 ----
                'cmdname' => 'AE',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6981,6984 ****
--- 7074,7078 ----
                'cmdname' => 'OE',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6997,7000 ****
--- 7091,7095 ----
                'cmdname' => 'o',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 7013,7016 ****
--- 7108,7112 ----
                'cmdname' => 'O',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 7029,7032 ****
--- 7125,7129 ----
                'cmdname' => 'ss',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 7045,7048 ****
--- 7142,7146 ----
                'cmdname' => 'l',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 7061,7064 ****
--- 7159,7163 ----
                'cmdname' => 'L',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 7077,7080 ****
--- 7176,7180 ----
                'cmdname' => 'DH',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 7093,7096 ****
--- 7193,7197 ----
                'cmdname' => 'dh',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 7109,7112 ****
--- 7210,7214 ----
                'cmdname' => 'TH',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 7125,7128 ****
--- 7227,7231 ----
                'cmdname' => 'th',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 7180,7188 ****
        },
        'level' => 1,
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 62,
!         'macro' => ''
!       },
        'number' => 9,
        'parent' => {}
--- 7283,7287 ----
        },
        'level' => 1,
!       'line_nr' => {},
        'number' => 9,
        'parent' => {}
***************
*** 7342,7345 ****
--- 7441,7446 ----
                ],
                'cmdname' => '\'',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 7657,7660 ****
--- 7758,7763 ----
                ],
                'cmdname' => '\'',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8292,8295 ****
--- 8395,8400 ----
                        ],
                        'cmdname' => '=',
+                       'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 8326,8329 ****
--- 8431,8436 ----
                        ],
                        'cmdname' => '\'',
+                       'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 8427,8430 ****
--- 8534,8539 ----
                        ],
                        'cmdname' => '=',
+                       'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 8461,8464 ****
--- 8570,8575 ----
                        ],
                        'cmdname' => '\'',
+                       'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 8530,8533 ****
--- 8641,8649 ----
                'cmdname' => 'quotedblleft',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 73,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 8546,8549 ****
--- 8662,8666 ----
                'cmdname' => 'quotedblright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8562,8565 ****
--- 8679,8683 ----
                'cmdname' => 'quoteleft',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8578,8581 ****
--- 8696,8700 ----
                'cmdname' => 'quoteright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8594,8597 ****
--- 8713,8717 ----
                'cmdname' => 'quotedblbase',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8610,8613 ****
--- 8730,8734 ----
                'cmdname' => 'quotesinglbase',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8648,8656 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 73,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 8769,8773 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 8677,8680 ****
--- 8794,8802 ----
                'cmdname' => 'quotedblleft',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 74,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 8693,8696 ****
--- 8815,8819 ----
                'cmdname' => 'quotedblright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8709,8712 ****
--- 8832,8836 ----
                'cmdname' => 'quoteleft',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8725,8728 ****
--- 8849,8853 ----
                'cmdname' => 'quoteright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8741,8744 ****
--- 8866,8870 ----
                'cmdname' => 'quotedblbase',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8757,8760 ****
--- 8883,8887 ----
                'cmdname' => 'quotesinglbase',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8796,8804 ****
        },
        'level' => 1,
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 74,
!         'macro' => ''
!       },
        'number' => 13,
        'parent' => {}
--- 8923,8927 ----
        },
        'level' => 1,
!       'line_nr' => {},
        'number' => 13,
        'parent' => {}
***************
*** 8826,8829 ****
--- 8949,8957 ----
                'cmdname' => 'guillemetleft',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 76,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 8842,8845 ****
--- 8970,8974 ----
                'cmdname' => 'guillemetright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8858,8861 ****
--- 8987,8991 ----
                'cmdname' => 'guillemotleft',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8874,8877 ****
--- 9004,9008 ----
                'cmdname' => 'guillemotright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8890,8893 ****
--- 9021,9025 ----
                'cmdname' => 'guilsinglleft',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8906,8909 ****
--- 9038,9042 ----
                'cmdname' => 'guilsinglright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8944,8952 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 76,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 9077,9081 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 8973,8976 ****
--- 9102,9110 ----
                'cmdname' => 'guillemetleft',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 77,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 8989,8992 ****
--- 9123,9127 ----
                'cmdname' => 'guillemetright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 9005,9008 ****
--- 9140,9144 ----
                'cmdname' => 'guillemotleft',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 9021,9024 ****
--- 9157,9161 ----
                'cmdname' => 'guillemotright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 9037,9040 ****
--- 9174,9178 ----
                'cmdname' => 'guilsinglleft',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 9053,9056 ****
--- 9191,9195 ----
                'cmdname' => 'guilsinglright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 9091,9100 ****
          'spaces_after_command' => {}
        },
!       'level' => 1,
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 77,
!         'macro' => ''
!       },
        'number' => 14,
        'parent' => {}
--- 9230,9235 ----
          'spaces_after_command' => {}
        },
!       'level' => 1,
!       'line_nr' => {},
        'number' => 14,
        'parent' => {}
***************
*** 9227,9230 ****
--- 9362,9366 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 9249,9258 ****
                      {}
                    ]
!                 ],
!                 'normalized' => 'AAA',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 9385,9389 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 9288,9297 ****
                    ]
                  ],
!                 'explanation_contents' => [],
!                 'normalized' => 'AAA',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 9419,9423 ----
                    ]
                  ],
!                 'explanation_contents' => []
                },
                'line_nr' => {},
***************
*** 9323,9331 ****
                    ]
                  ],
!                 'normalized' => 'BBB',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 9449,9453 ----
                    ]
                  ],
!                 'explanation_contents' => []
                },
                'line_nr' => {},
***************
*** 9392,9395 ****
--- 9514,9518 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 9414,9423 ****
                      {}
                    ]
!                 ],
!                 'normalized' => 'AAA',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 9537,9541 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 9453,9462 ****
                    ]
                  ],
!                 'explanation_contents' => [],
!                 'normalized' => 'AAA',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 9571,9575 ----
                    ]
                  ],
!                 'explanation_contents' => []
                },
                'line_nr' => {},
***************
*** 9488,9496 ****
                    ]
                  ],
!                 'normalized' => 'BBB',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 9601,9605 ----
                    ]
                  ],
!                 'explanation_contents' => []
                },
                'line_nr' => {},
***************
*** 9559,9562 ****
--- 9668,9672 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 9581,9590 ****
                      {}
                    ]
!                 ],
!                 'normalized' => 'CCC',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 9691,9695 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 9620,9629 ****
                    ]
                  ],
!                 'explanation_contents' => [],
!                 'normalized' => 'CCC',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 9725,9729 ----
                    ]
                  ],
!                 'explanation_contents' => []
                },
                'line_nr' => {},
***************
*** 9655,9663 ****
                    ]
                  ],
!                 'normalized' => 'DDD',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 9755,9759 ----
                    ]
                  ],
!                 'explanation_contents' => []
                },
                'line_nr' => {},
***************
*** 9724,9727 ****
--- 9820,9824 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 9746,9755 ****
                      {}
                    ]
!                 ],
!                 'normalized' => 'CCC',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 9843,9847 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 9785,9794 ****
                    ]
                  ],
!                 'explanation_contents' => [],
!                 'normalized' => 'CCC',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 9877,9881 ----
                    ]
                  ],
!                 'explanation_contents' => []
                },
                'line_nr' => {},
***************
*** 9820,9828 ****
                    ]
                  ],
!                 'normalized' => 'DDD',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 9907,9911 ----
                    ]
                  ],
!                 'explanation_contents' => []
                },
                'line_nr' => {},
***************
*** 9899,9902 ****
--- 9982,9986 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 9923,9931 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 10007,10011 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 9970,9978 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 10050,10054 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 10045,10048 ****
--- 10121,10125 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 10069,10077 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 10146,10150 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 10116,10124 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 10189,10193 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 10190,10198 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 10259,10263 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 10279,10287 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 10344,10348 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 10351,10359 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 10412,10416 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 10440,10448 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 10497,10501 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 11708,11716 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 11761,11765 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 11787,11795 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 11836,11840 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 12040,12048 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 12085,12089 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 12114,12122 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 12155,12159 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 12366,12374 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 12403,12407 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 12398,12401 ****
--- 12431,12435 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 12420,12428 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 12454,12458 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 12472,12480 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 12502,12506 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 12546,12554 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 12572,12576 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 12578,12581 ****
--- 12600,12604 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 12600,12608 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 12623,12627 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 12652,12660 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 12671,12675 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 12733,12740 ****
                    ],
                    'normalized' => '-_007b-_007d'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 12748,12751 ----
***************
*** 12886,12893 ****
                    ],
                    'normalized' => '----_0021---_002e--_002e-_003f-_0040'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 12897,12900 ----
***************
*** 12918,12921 ****
--- 12925,12933 ----
                        'cmdname' => 'atchar',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 127,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 12934,12937 ****
--- 12946,12950 ----
                        'cmdname' => 'lbracechar',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 12950,12953 ****
--- 12963,12967 ----
                        'cmdname' => 'rbracechar',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 12966,12969 ****
--- 12980,12984 ----
                        'cmdname' => 'backslashchar',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 12982,12985 ****
--- 12997,13001 ----
                        'cmdname' => 'hashchar',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 13019,13033 ****
                    ],
                    'normalized' => '_0040-_007b-_007d-_005c-_0023'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 127,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 13035,13041 ----
                    ],
                    'normalized' => '_0040-_007b-_007d-_005c-_0023'
                  }
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 13051,13054 ****
--- 13059,13067 ----
                        'cmdname' => 'LaTeX',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 128,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 13067,13070 ****
--- 13080,13084 ----
                        'cmdname' => 'TeX',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13083,13086 ****
--- 13097,13101 ----
                        'cmdname' => 'bullet',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13099,13102 ****
--- 13114,13118 ----
                        'cmdname' => 'comma',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13115,13118 ****
--- 13131,13135 ----
                        'cmdname' => 'copyright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13131,13134 ****
--- 13148,13152 ----
                        'cmdname' => 'dots',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13147,13150 ****
--- 13165,13169 ----
                        'cmdname' => 'enddots',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 13192,13206 ****
                    ],
                    'normalized' => 'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 128,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 13211,13217 ----
                    ],
                    'normalized' => 'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
                  }
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 13224,13227 ****
--- 13235,13243 ----
                        'cmdname' => 'equiv',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 129,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 13240,13243 ****
--- 13256,13260 ----
                        'cmdname' => 'error',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13256,13259 ****
--- 13273,13277 ----
                        'cmdname' => 'euro',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13272,13275 ****
--- 13290,13294 ----
                        'cmdname' => 'exclamdown',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13288,13291 ****
--- 13307,13311 ----
                        'cmdname' => 'expansion',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13304,13307 ****
--- 13324,13328 ----
                        'cmdname' => 'minus',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 13345,13359 ****
                    ],
                    'normalized' => '_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 129,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 13366,13372 ----
                    ],
                    'normalized' => '_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
                  }
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 13389,13392 ****
--- 13402,13410 ----
                        'cmdname' => 'geq',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 131,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 13405,13408 ****
--- 13423,13427 ----
                        'cmdname' => 'leq',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13421,13424 ****
--- 13440,13444 ----
                        'cmdname' => 'arrow',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 13450,13464 ****
                    ],
                    'normalized' => '_2265-_2264-_2192'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 131,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 13470,13476 ----
                    ],
                    'normalized' => '_2265-_2264-_2192'
                  }
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 13494,13497 ****
--- 13506,13514 ----
                        'cmdname' => 'ordf',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 133,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 13510,13513 ****
--- 13527,13531 ----
                        'cmdname' => 'ordm',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13526,13529 ****
--- 13544,13548 ----
                        'cmdname' => 'point',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13542,13545 ****
--- 13561,13565 ----
                        'cmdname' => 'pounds',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13558,13561 ****
--- 13578,13582 ----
                        'cmdname' => 'print',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13574,13577 ****
--- 13595,13599 ----
                        'cmdname' => 'questiondown',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13590,13593 ****
--- 13612,13616 ----
                        'cmdname' => 'registeredsymbol',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 13635,13649 ****
                    ],
                    'normalized' => '_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 133,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 13658,13664 ----
                    ],
                    'normalized' => '_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae'
                  }
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 13667,13670 ****
--- 13682,13690 ----
                        'cmdname' => 'result',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 134,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 13683,13686 ****
--- 13703,13707 ----
                        'cmdname' => 'textdegree',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13699,13702 ****
--- 13720,13724 ----
                        'cmdname' => 'tie',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13715,13718 ****
--- 13737,13741 ----
                        'cmdname' => 'today',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13731,13734 ****
--- 13754,13758 ----
                        'cmdname' => 'aa',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 13768,13782 ****
                    ],
                    'normalized' => '_21d2-_00b0-a-b--_00e5'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 134,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 13792,13798 ----
                    ],
                    'normalized' => '_21d2-_00b0-a-b--_00e5'
                  }
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 13800,13803 ****
--- 13816,13824 ----
                        'cmdname' => 'AA',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 135,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 13816,13819 ****
--- 13837,13841 ----
                        'cmdname' => 'ae',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13832,13835 ****
--- 13854,13858 ----
                        'cmdname' => 'oe',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13848,13851 ****
--- 13871,13875 ----
                        'cmdname' => 'AE',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13864,13867 ****
--- 13888,13892 ----
                        'cmdname' => 'OE',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13880,13883 ****
--- 13905,13909 ----
                        'cmdname' => 'o',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13896,13899 ****
--- 13922,13926 ----
                        'cmdname' => 'O',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13912,13915 ****
--- 13939,13943 ----
                        'cmdname' => 'ss',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13928,13931 ****
--- 13956,13960 ----
                        'cmdname' => 'l',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13944,13947 ****
--- 13973,13977 ----
                        'cmdname' => 'L',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13960,13963 ****
--- 13990,13994 ----
                        'cmdname' => 'DH',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13976,13979 ****
--- 14007,14011 ----
                        'cmdname' => 'dh',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13992,13995 ****
--- 14024,14028 ----
                        'cmdname' => 'TH',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 14008,14011 ****
--- 14041,14045 ----
                        'cmdname' => 'th',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 14081,14095 ****
                    ],
                    'normalized' => '_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 135,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 14115,14121 ----
                    ],
                    'normalized' => '_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
                  }
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 14245,14248 ****
--- 14271,14276 ----
                        ],
                        'cmdname' => '\'',
+                       'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 14416,14423 ****
                    ],
                    'normalized' => '_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 14444,14447 ----
***************
*** 14631,14638 ****
                    ],
                    'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 14655,14658 ----
***************
*** 14693,14696 ****
--- 14713,14718 ----
                                ],
                                'cmdname' => '=',
+                               'contents' => [],
+                               'line_nr' => {},
                                'parent' => {}
                              }
***************
*** 14727,14730 ****
--- 14749,14754 ----
                                ],
                                'cmdname' => '\'',
+                               'contents' => [],
+                               'line_nr' => {},
                                'parent' => {}
                              }
***************
*** 14766,14773 ****
                    ],
                    'normalized' => '_0131-_1e14-_1e08'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 14790,14793 ----
***************
*** 14794,14797 ****
--- 14814,14822 ----
                        'cmdname' => 'quotedblleft',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 139,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 14810,14813 ****
--- 14835,14839 ----
                        'cmdname' => 'quotedblright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 14826,14829 ****
--- 14852,14856 ----
                        'cmdname' => 'quoteleft',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 14842,14845 ****
--- 14869,14873 ----
                        'cmdname' => 'quoteright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 14858,14861 ****
--- 14886,14890 ----
                        'cmdname' => 'quotedblbase',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 14874,14877 ****
--- 14903,14907 ----
                        'cmdname' => 'quotesinglbase',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 14915,14929 ****
                    ],
                    'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 139,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 14945,14951 ----
                    ],
                    'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
                  }
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 14947,14950 ****
--- 14969,14977 ----
                        'cmdname' => 'guillemetleft',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 140,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 14963,14966 ****
--- 14990,14994 ----
                        'cmdname' => 'guillemetright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 14979,14982 ****
--- 15007,15011 ----
                        'cmdname' => 'guillemotleft',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 14995,14998 ****
--- 15024,15028 ----
                        'cmdname' => 'guillemotright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 15011,15014 ****
--- 15041,15045 ----
                        'cmdname' => 'guilsinglleft',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 15027,15030 ****
--- 15058,15062 ----
                        'cmdname' => 'guilsinglright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 15068,15082 ****
                    ],
                    'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 140,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 15100,15106 ----
                    ],
                    'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
                  }
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 15113,15120 ****
                    ],
                    'normalized' => '_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 15137,15140 ----
***************
*** 15150,15153 ****
--- 15170,15174 ----
                            'contents' => [
                              {
+                               'parent' => {},
                                'text' => ' ',
                                'type' => 'empty_spaces_before_argument'
***************
*** 15172,15181 ****
                              {}
                            ]
!                         ],
!                         'normalized' => 'AAA',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 15193,15197 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 15211,15220 ****
                            ]
                          ],
!                         'explanation_contents' => [],
!                         'normalized' => 'AAA',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 15227,15231 ----
                            ]
                          ],
!                         'explanation_contents' => []
                        },
                        'line_nr' => {},
***************
*** 15246,15254 ****
                            ]
                          ],
!                         'normalized' => 'BBB',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 15257,15261 ----
                            ]
                          ],
!                         'explanation_contents' => []
                        },
                        'line_nr' => {},
***************
*** 15282,15289 ****
                    ],
                    'normalized' => 'AAA-AAA-BBB'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 15289,15292 ----
***************
*** 15315,15318 ****
--- 15318,15322 ----
                            'contents' => [
                              {
+                               'parent' => {},
                                'text' => ' ',
                                'type' => 'empty_spaces_before_argument'
***************
*** 15337,15346 ****
                              {}
                            ]
!                         ],
!                         'normalized' => 'CCC',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 15341,15345 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 15376,15385 ****
                            ]
                          ],
!                         'explanation_contents' => [],
!                         'normalized' => 'CCC',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 15375,15379 ----
                            ]
                          ],
!                         'explanation_contents' => []
                        },
                        'line_nr' => {},
***************
*** 15411,15419 ****
                            ]
                          ],
!                         'normalized' => 'DDD',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 15405,15409 ----
                            ]
                          ],
!                         'explanation_contents' => []
                        },
                        'line_nr' => {},
***************
*** 15447,15454 ****
                    ],
                    'normalized' => 'CCC-CCC-DDD'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 15437,15440 ----
***************
*** 15488,15491 ****
--- 15474,15478 ----
                            'contents' => [
                              {
+                               'parent' => {},
                                'text' => ' ',
                                'type' => 'empty_spaces_before_argument'
***************
*** 15512,15520 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 15499,15503 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 15559,15567 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 15542,15546 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {},
***************
*** 15591,15598 ****
                    ],
                    'normalized' => 'someone_0040somewher-no_005fexplain_0040there'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 15570,15573 ----
***************
*** 15629,15637 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 15604,15608 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 15718,15726 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 15689,15693 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {},
***************
*** 15750,15757 ****
                    ],
                    'normalized' => 'f_002d_002dile1-f_002d_002dile'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 15717,15720 ----
***************
*** 15814,15821 ****
                    ],
                    'normalized' => '-_0040-_007b_007d-_002e-'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 15777,15780 ----
***************
*** 16125,16132 ****
                    ],
                    'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 16084,16087 ----
***************
*** 16358,16365 ****
                    ],
                    'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 16313,16316 ----
***************
*** 16400,16408 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 16351,16355 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 16434,16441 ****
                    ],
                    'normalized' => '8_002e27in'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 16381,16384 ----
***************
*** 16519,16526 ****
                    ],
                    'normalized' => 'sansserif-slanted'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 16462,16465 ----
***************
*** 16557,16565 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 16496,16500 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 16589,16596 ****
                    ],
                    'normalized' => 'indicateurl'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 16524,16527 ----
***************
*** 16674,16681 ****
                    ],
                    'normalized' => 'gH-3rd'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 16605,16608 ----
***************
*** 16712,16720 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 16639,16643 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 16744,16747 ****
--- 16667,16671 ----
                            'contents' => [
                              {
+                               'parent' => {},
                                'text' => ' ',
                                'type' => 'empty_spaces_before_argument'
***************
*** 16766,16774 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 16690,16694 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {},
***************
*** 16818,16826 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 16738,16742 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {},
***************
*** 16854,16861 ****
                    ],
                    'normalized' => 'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 16770,16773 ----
***************
*** 17007,17019 ****
--- 16919,16935 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[2];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[4];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[6];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[8];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
***************
*** 17032,17035 ****
--- 16948,16952 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[7];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[8];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4];
***************
*** 17038,17056 ****
--- 16955,16979 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[2];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[4];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[6];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[8];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[10];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[12];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4];
***************
*** 17073,17076 ****
--- 16996,17000 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[11] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[11];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[12] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[12];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
***************
*** 17079,17094 ****
--- 17003,17023 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[2];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[4];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[6];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[8];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[10];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
***************
*** 17109,17112 ****
--- 17038,17042 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[9];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[10];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6];
***************
*** 17115,17121 ****
--- 17045,17053 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[2];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[4];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6];
***************
*** 17130,17133 ****
--- 17062,17066 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[3];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[4];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7];
***************
*** 17136,17154 ****
--- 17069,17093 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[2];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[4];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[6];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[8];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[10];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[12];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7];
***************
*** 17171,17174 ****
--- 17110,17114 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node'}{'node_content'}[11] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[11];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node'}{'node_content'}[12] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[12];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8];
***************
*** 17177,17189 ****
--- 17117,17133 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[4];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[6];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[8];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8];
***************
*** 17202,17205 ****
--- 17146,17150 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[7];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[8];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9];
***************
*** 17208,17247 ****
--- 17153,17205 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[2];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[4];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[6];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[8];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[10];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[12];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[14];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[14]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[16];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[16]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[18]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[18];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[18]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[20]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[20];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[20]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[21]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[22]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[22];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[22]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[22]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[23]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[24]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[24];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[24]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[24]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[25]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[26]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[26];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[26]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[26]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9];
***************
*** 17278,17281 ****
--- 17236,17240 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node'}{'node_content'}[25] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[25];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node'}{'node_content'}[26] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[26];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10];
***************
*** 17309,17312 ****
--- 17268,17272 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1];
***************
*** 17426,17429 ****
--- 17386,17390 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2];
***************
*** 17433,17436 ****
--- 17394,17398 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4];
***************
*** 17455,17470 ****
--- 17417,17437 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[2];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[4];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[6];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[8];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[10];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13];
***************
*** 17485,17488 ****
--- 17452,17456 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[9];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[10];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14];
***************
*** 17491,17506 ****
--- 17459,17479 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[2];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[4];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[6];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[8];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[10];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14];
***************
*** 17521,17524 ****
--- 17494,17498 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'extra'}{'menu_entry_node'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[9];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'extra'}{'menu_entry_node'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[10];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[15];
***************
*** 17535,17538 ****
--- 17509,17513 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0];
***************
*** 17569,17572 ****
--- 17544,17548 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0];
***************
*** 17605,17608 ****
--- 17581,17585 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0];
***************
*** 17896,17899 ****
--- 17873,17877 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[1]{'contents'}[2];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[1]{'contents'}[2]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[1]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[1]{'contents'}[2]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[1]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[1]{'contents'}[2];
***************
*** 18062,18074 ****
--- 18040,18056 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0];
***************
*** 18085,18088 ****
--- 18067,18071 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'extra'}{'node_content'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8];
***************
*** 18092,18104 ****
--- 18075,18091 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0];
***************
*** 18115,18118 ****
--- 18102,18106 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'extra'}{'misc_content'}[8] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0]{'contents'}[9];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9];
***************
*** 18122,18140 ****
--- 18110,18134 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[13];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[13]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0];
***************
*** 18155,18158 ****
--- 18149,18153 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'extra'}{'node_content'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10];
***************
*** 18162,18180 ****
--- 18157,18181 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[13];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[13]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0];
***************
*** 18195,18198 ****
--- 18196,18200 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'extra'}{'misc_content'}[12] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[13];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11];
***************
*** 18202,18217 ****
--- 18204,18224 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0];
***************
*** 18230,18233 ****
--- 18237,18241 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'extra'}{'node_content'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12];
***************
*** 18237,18252 ****
--- 18245,18265 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0];
***************
*** 18265,18268 ****
--- 18278,18282 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'extra'}{'misc_content'}[10] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[11];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[13];
***************
*** 18272,18278 ****
--- 18286,18294 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'args'}[0];
***************
*** 18285,18288 ****
--- 18301,18305 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'extra'}{'node_content'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_latin1'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[14]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[14];
***************
*** 18292,18298 ****
--- 18309,18317 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[14]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[14]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[14]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[14]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[14]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[14]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[14]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[14]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[14]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[14]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[14]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[14]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[14]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[14]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[14]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[14]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[14]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[14]{'args'}[0];
***************
*** 18305,18308 ****
--- 18324,18328 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[14]{'extra'}{'misc_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[14]{'args'}[0]{'contents'}[5];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[14]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[14]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[14]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[14]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_latin1'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15];
***************
*** 18312,18330 ****
--- 18332,18356 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[13];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[13]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0];
***************
*** 18345,18348 ****
--- 18371,18375 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'extra'}{'node_content'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs_latin1'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16];
***************
*** 18352,18370 ****
--- 18379,18403 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[13];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[13]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0];
***************
*** 18385,18388 ****
--- 18418,18422 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'extra'}{'misc_content'}[12] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[13];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs_latin1'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17];
***************
*** 18392,18404 ****
--- 18426,18442 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0];
***************
*** 18415,18418 ****
--- 18453,18457 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'extra'}{'node_content'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_refs_latin1'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18];
***************
*** 18422,18434 ****
--- 18461,18477 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0];
***************
*** 18445,18448 ****
--- 18488,18492 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'extra'}{'misc_content'}[8] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0]{'contents'}[9];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_refs_latin1'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19];
***************
*** 18452,18491 ****
--- 18496,18548 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[13];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[13]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[15]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[15];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[15]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[17]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[17];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[17]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[19]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[19];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[19]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[21]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[21];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[21]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[21]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[22]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[23]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[23];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[23]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[23]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[24]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[25]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[25];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[25]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[25]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[26]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[27]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[27];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[27]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[27]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[28]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0];
***************
*** 18520,18523 ****
--- 18577,18581 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'node_content'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_refs_latin1'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20];
***************
*** 18527,18566 ****
--- 18585,18637 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[13];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[13]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[15]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[15];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[15]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[17]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[17];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[17]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[19]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[19];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[19]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[21]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[21];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[21]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[21]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[22]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[23]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[23];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[23]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[23]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[24]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[25]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[25];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[25]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[25]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[26]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[27]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[27];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[27]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[27]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[28]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0];
***************
*** 18595,18598 ****
--- 18666,18670 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'extra'}{'misc_content'}[26] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[27];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_refs_latin1'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[21];
***************
*** 18627,18630 ****
--- 18699,18703 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0];
***************
*** 18711,18714 ****
--- 18784,18788 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[22]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[22]{'args'}[0]{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[22]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[22]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[22]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[22]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[22]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[22]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[22]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[22]{'args'}[0];
***************
*** 18880,18883 ****
--- 18954,18958 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[3];
***************
*** 18887,18890 ****
--- 18962,18966 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[5];
***************
*** 18910,18913 ****
--- 18986,18990 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[3];
***************
*** 18917,18920 ****
--- 18994,18998 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[5];
***************
*** 18938,18953 ****
--- 19016,19036 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0];
***************
*** 18966,18969 ****
--- 19049,19053 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'extra'}{'node_content'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'parent'} = $result_trees{'at_commands_in_refs_latin1'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28];
***************
*** 18973,18988 ****
--- 19057,19077 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0];
***************
*** 19001,19004 ****
--- 19090,19094 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'extra'}{'misc_content'}[10] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[11];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[28]{'parent'} = $result_trees{'at_commands_in_refs_latin1'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29];
***************
*** 19008,19023 ****
--- 19098,19118 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0];
***************
*** 19036,19039 ****
--- 19131,19135 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'extra'}{'node_content'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'parent'} = $result_trees{'at_commands_in_refs_latin1'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30];
***************
*** 19043,19058 ****
--- 19139,19159 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0];
***************
*** 19071,19074 ****
--- 19172,19176 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'extra'}{'misc_content'}[10] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[11];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[30]{'parent'} = $result_trees{'at_commands_in_refs_latin1'};
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[31]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[31];
***************
*** 19094,19097 ****
--- 19196,19200 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[33]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[33]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[33]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[33]{'args'}[0]{'contents'}[1];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[33]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[33]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[33]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[33]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[33]{'args'}[0]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[33]{'args'}[0]{'contents'}[1];
***************
*** 19127,19130 ****
--- 19230,19234 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[34]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[34]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[34]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[34]{'args'}[0]{'contents'}[1];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[34]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[34]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[34]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[34]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[34]{'args'}[0]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[34]{'args'}[0]{'contents'}[1];
***************
*** 19160,19163 ****
--- 19264,19268 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[35]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[35]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[35]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[35]{'args'}[0]{'contents'}[1];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[35]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[35]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[35]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[35]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[35]{'args'}[0]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[35]{'args'}[0]{'contents'}[1];
***************
*** 19193,19196 ****
--- 19298,19302 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[36]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[36]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[36]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[36]{'args'}[0]{'contents'}[1];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[36]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[36]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[36]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[36]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[36]{'args'}[0]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[36]{'args'}[0]{'contents'}[1];
***************
*** 19228,19231 ****
--- 19334,19338 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[37]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[37]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[37]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[37]{'args'}[0]{'contents'}[1];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[37]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[37]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[37]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[37]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[37]{'args'}[0]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[37]{'args'}[0]{'contents'}[1];
***************
*** 19260,19263 ****
--- 19367,19371 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[38]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[38]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[38]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[38]{'args'}[0]{'contents'}[1];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[38]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[38]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[38]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[38]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[38]{'args'}[0]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[38]{'args'}[0]{'contents'}[1];
***************
*** 19789,19792 ****
--- 19897,19901 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[55]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[55]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[55]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[55]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[55]{'args'}[0]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[55]{'args'}[0]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[55]{'args'}[0]{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[55]{'args'}[0]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[55]{'args'}[0]{'contents'}[3]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[55]{'args'}[0]{'contents'}[3];
***************
*** 19825,19828 ****
--- 19934,19938 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'args'}[0]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'args'}[0]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'args'}[0]{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'args'}[0]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'args'}[0]{'contents'}[3]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'args'}[0]{'contents'}[3];
***************
*** 19924,19936 ****
--- 20034,20050 ----
  $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];
***************
*** 19954,19957 ****
--- 20068,20072 ----
  $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];
***************
*** 19960,19978 ****
--- 20075,20099 ----
  $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];
***************
*** 20004,20007 ****
--- 20125,20129 ----
  $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];
***************
*** 20010,20025 ****
--- 20132,20152 ----
  $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];
***************
*** 20047,20050 ****
--- 20174,20178 ----
  $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];
***************
*** 20055,20061 ****
--- 20183,20191 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1]{'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'}[2]{'args'}[0]{'parent'} = $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]{'args'}[0]{'contents'}[2]{'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'}[2]{'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'}[3]{'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'}[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]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0];
***************
*** 20071,20074 ****
--- 20201,20205 ----
  $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]{'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];
***************
*** 20079,20097 ****
--- 20210,20234 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[1]{'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]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2]{'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'}[2]{'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]{'contents'}[3]{'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]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[4];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[4]{'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'}[4]{'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]{'contents'}[5]{'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]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[6];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[6]{'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'}[6]{'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]{'contents'}[7]{'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]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[8];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[8]{'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'}[8]{'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]{'contents'}[9]{'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]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[10];
+ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[10]{'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'}[10]{'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]{'contents'}[11]{'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]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[12];
+ $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];
***************
*** 20123,20126 ****
--- 20260,20264 ----
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[11];
  $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[12];
+ $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];
***************
*** 20129,20141 ****
--- 20267,20283 ----
  $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];
***************
*** 20159,20162 ****
--- 20301,20305 ----
  $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];
***************
*** 20165,20204 ****
--- 20308,20360 ----
  $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];
***************
*** 20258,20261 ****
--- 20414,20418 ----
  $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];
***************
*** 20289,20292 ****
--- 20446,20450 ----
  $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];
***************
*** 20432,20435 ****
--- 20590,20594 ----
  $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];
***************
*** 20439,20442 ****
--- 20598,20602 ----
  $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];
***************
*** 20462,20477 ****
--- 20622,20642 ----
  $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];
***************
*** 20499,20502 ****
--- 20664,20668 ----
  $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];
***************
*** 20505,20520 ****
--- 20671,20691 ----
  $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];
***************
*** 20542,20545 ****
--- 20713,20717 ----
  $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];
***************
*** 20553,20556 ****
--- 20725,20729 ----
  $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]{'contents'}[1]{'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];
***************
*** 20588,20591 ****
--- 20761,20765 ----
  $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]{'contents'}[1]{'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];
***************
*** 20625,20628 ****
--- 20799,20803 ----
  $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]{'contents'}[1]{'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];
***************
*** 20926,20929 ****
--- 21101,21105 ----
  $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]{'contents'}[1]{'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];
Binary files texinfo-6.1/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info and texinfo-6.3/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info differ
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/at_commands_in_refs_utf8.pl texinfo-6.3/tp/t/results/converters_tests/at_commands_in_refs_utf8.pl
*** texinfo-6.1/tp/t/results/converters_tests/at_commands_in_refs_utf8.pl	2016-01-22 07:50:19.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/at_commands_in_refs_utf8.pl	2016-08-02 18:44:57.000000000 +0100
***************
*** 429,432 ****
--- 429,437 ----
                        'cmdname' => 'atchar',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 10,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 445,448 ****
--- 450,454 ----
                        'cmdname' => 'lbracechar',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 461,464 ****
--- 467,471 ----
                        'cmdname' => 'rbracechar',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 477,480 ****
--- 484,488 ----
                        'cmdname' => 'backslashchar',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 493,496 ****
--- 501,505 ----
                        'cmdname' => 'hashchar',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 539,547 ****
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 10,
!                 'macro' => ''
!               },
                'parent' => {},
                'type' => 'menu_entry'
--- 548,552 ----
                  }
                },
!               'line_nr' => {},
                'parent' => {},
                'type' => 'menu_entry'
***************
*** 566,569 ****
--- 571,579 ----
                        'cmdname' => 'LaTeX',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 11,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 582,585 ****
--- 592,596 ----
                        'cmdname' => 'TeX',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 598,601 ****
--- 609,613 ----
                        'cmdname' => 'bullet',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 614,617 ****
--- 626,630 ----
                        'cmdname' => 'comma',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 630,633 ****
--- 643,647 ----
                        'cmdname' => 'copyright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 646,649 ****
--- 660,664 ----
                        'cmdname' => 'dots',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 662,665 ****
--- 677,681 ----
                        'cmdname' => 'enddots',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 712,720 ****
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 11,
!                 'macro' => ''
!               },
                'parent' => {},
                'type' => 'menu_entry'
--- 728,732 ----
                  }
                },
!               'line_nr' => {},
                'parent' => {},
                'type' => 'menu_entry'
***************
*** 739,742 ****
--- 751,759 ----
                        'cmdname' => 'equiv',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 12,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 755,758 ****
--- 772,776 ----
                        'cmdname' => 'error',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 771,774 ****
--- 789,793 ----
                        'cmdname' => 'euro',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 787,790 ****
--- 806,810 ----
                        'cmdname' => 'exclamdown',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 803,806 ****
--- 823,827 ----
                        'cmdname' => 'expansion',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 819,822 ****
--- 840,844 ----
                        'cmdname' => 'minus',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 867,875 ****
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 12,
!                 'macro' => ''
!               },
                'parent' => {},
                'type' => 'menu_entry'
--- 889,893 ----
                  }
                },
!               'line_nr' => {},
                'parent' => {},
                'type' => 'menu_entry'
***************
*** 894,897 ****
--- 912,920 ----
                        'cmdname' => 'geq',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 13,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 910,913 ****
--- 933,937 ----
                        'cmdname' => 'leq',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 926,929 ****
--- 950,954 ----
                        'cmdname' => 'arrow',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 968,976 ****
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 13,
!                 'macro' => ''
!               },
                'parent' => {},
                'type' => 'menu_entry'
--- 993,997 ----
                  }
                },
!               'line_nr' => {},
                'parent' => {},
                'type' => 'menu_entry'
***************
*** 995,998 ****
--- 1016,1024 ----
                        'cmdname' => 'ordf',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 14,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 1011,1014 ****
--- 1037,1041 ----
                        'cmdname' => 'ordm',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1027,1030 ****
--- 1054,1058 ----
                        'cmdname' => 'point',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1043,1046 ****
--- 1071,1075 ----
                        'cmdname' => 'pounds',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1059,1062 ****
--- 1088,1092 ----
                        'cmdname' => 'print',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1075,1078 ****
--- 1105,1109 ----
                        'cmdname' => 'questiondown',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1091,1094 ****
--- 1122,1126 ----
                        'cmdname' => 'registeredsymbol',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 1141,1149 ****
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 14,
!                 'macro' => ''
!               },
                'parent' => {},
                'type' => 'menu_entry'
--- 1173,1177 ----
                  }
                },
!               'line_nr' => {},
                'parent' => {},
                'type' => 'menu_entry'
***************
*** 1168,1171 ****
--- 1196,1204 ----
                        'cmdname' => 'result',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 15,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 1184,1187 ****
--- 1217,1221 ----
                        'cmdname' => 'textdegree',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1200,1203 ****
--- 1234,1238 ----
                        'cmdname' => 'tie',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1216,1219 ****
--- 1251,1255 ----
                        'cmdname' => 'today',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1232,1235 ****
--- 1268,1272 ----
                        'cmdname' => 'aa',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 1278,1286 ****
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 15,
!                 'macro' => ''
!               },
                'parent' => {},
                'type' => 'menu_entry'
--- 1315,1319 ----
                  }
                },
!               'line_nr' => {},
                'parent' => {},
                'type' => 'menu_entry'
***************
*** 1305,1308 ****
--- 1338,1346 ----
                        'cmdname' => 'AA',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 16,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 1321,1324 ****
--- 1359,1363 ----
                        'cmdname' => 'ae',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1337,1340 ****
--- 1376,1380 ----
                        'cmdname' => 'oe',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1353,1356 ****
--- 1393,1397 ----
                        'cmdname' => 'AE',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1369,1372 ****
--- 1410,1414 ----
                        'cmdname' => 'OE',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1385,1388 ****
--- 1427,1431 ----
                        'cmdname' => 'o',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1401,1404 ****
--- 1444,1448 ----
                        'cmdname' => 'O',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1417,1420 ****
--- 1461,1465 ----
                        'cmdname' => 'ss',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1433,1436 ****
--- 1478,1482 ----
                        'cmdname' => 'l',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1449,1452 ****
--- 1495,1499 ----
                        'cmdname' => 'L',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1465,1468 ****
--- 1512,1516 ----
                        'cmdname' => 'DH',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1481,1484 ****
--- 1529,1533 ----
                        'cmdname' => 'dh',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1497,1500 ****
--- 1546,1550 ----
                        'cmdname' => 'TH',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1513,1516 ****
--- 1563,1567 ----
                        'cmdname' => 'th',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 1577,1585 ****
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 16,
!                 'macro' => ''
!               },
                'parent' => {},
                'type' => 'menu_entry'
--- 1628,1632 ----
                  }
                },
!               'line_nr' => {},
                'parent' => {},
                'type' => 'menu_entry'
***************
*** 1736,1739 ****
--- 1783,1788 ----
                        ],
                        'cmdname' => '\'',
+                       'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 2176,2179 ****
--- 2225,2230 ----
                                ],
                                'cmdname' => '=',
+                               'contents' => [],
+                               'line_nr' => {},
                                'parent' => {}
                              }
***************
*** 2210,2213 ****
--- 2261,2266 ----
                                ],
                                'cmdname' => '\'',
+                               'contents' => [],
+                               'line_nr' => {},
                                'parent' => {}
                              }
***************
*** 2285,2288 ****
--- 2338,2346 ----
                        'cmdname' => 'quotedblleft',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 20,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 2301,2304 ****
--- 2359,2363 ----
                        'cmdname' => 'quotedblright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 2317,2320 ****
--- 2376,2380 ----
                        'cmdname' => 'quoteleft',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 2333,2336 ****
--- 2393,2397 ----
                        'cmdname' => 'quoteright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 2349,2352 ****
--- 2410,2414 ----
                        'cmdname' => 'quotedblbase',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 2365,2368 ****
--- 2427,2431 ----
                        'cmdname' => 'quotesinglbase',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 2413,2421 ****
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 20,
!                 'macro' => ''
!               },
                'parent' => {},
                'type' => 'menu_entry'
--- 2476,2480 ----
                  }
                },
!               'line_nr' => {},
                'parent' => {},
                'type' => 'menu_entry'
***************
*** 2440,2443 ****
--- 2499,2507 ----
                        'cmdname' => 'guillemetleft',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 21,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 2456,2459 ****
--- 2520,2524 ----
                        'cmdname' => 'guillemetright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 2472,2475 ****
--- 2537,2541 ----
                        'cmdname' => 'guillemotleft',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 2488,2491 ****
--- 2554,2558 ----
                        'cmdname' => 'guillemotright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 2504,2507 ****
--- 2571,2575 ----
                        'cmdname' => 'guilsinglleft',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 2520,2523 ****
--- 2588,2592 ----
                        'cmdname' => 'guilsinglright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 2568,2576 ****
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 21,
!                 'macro' => ''
!               },
                'parent' => {},
                'type' => 'menu_entry'
--- 2637,2641 ----
                  }
                },
!               'line_nr' => {},
                'parent' => {},
                'type' => 'menu_entry'
***************
*** 2657,2660 ****
--- 2722,2726 ----
                            'contents' => [
                              {
+                               'parent' => {},
                                'text' => ' ',
                                'type' => 'empty_spaces_before_argument'
***************
*** 2679,2688 ****
                              {}
                            ]
!                         ],
!                         'normalized' => 'AAA',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 2745,2749 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 2718,2727 ****
                            ]
                          ],
!                         'explanation_contents' => [],
!                         'normalized' => 'AAA',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 2779,2783 ----
                            ]
                          ],
!                         'explanation_contents' => []
                        },
                        'line_nr' => {},
***************
*** 2753,2761 ****
                            ]
                          ],
!                         'normalized' => 'BBB',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 2809,2813 ----
                            ]
                          ],
!                         'explanation_contents' => []
                        },
                        'line_nr' => {},
***************
*** 2830,2833 ****
--- 2882,2886 ----
                            'contents' => [
                              {
+                               'parent' => {},
                                'text' => ' ',
                                'type' => 'empty_spaces_before_argument'
***************
*** 2852,2861 ****
                              {}
                            ]
!                         ],
!                         'normalized' => 'CCC',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 2905,2909 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 2891,2900 ****
                            ]
                          ],
!                         'explanation_contents' => [],
!                         'normalized' => 'CCC',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 2939,2943 ----
                            ]
                          ],
!                         'explanation_contents' => []
                        },
                        'line_nr' => {},
***************
*** 2926,2934 ****
                            ]
                          ],
!                         'normalized' => 'DDD',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 2969,2973 ----
                            ]
                          ],
!                         'explanation_contents' => []
                        },
                        'line_nr' => {},
***************
*** 3011,3014 ****
--- 3050,3054 ----
                            'contents' => [
                              {
+                               'parent' => {},
                                'text' => ' ',
                                'type' => 'empty_spaces_before_argument'
***************
*** 3035,3043 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 3075,3079 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 3082,3090 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 3118,3122 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {},
***************
*** 3162,3170 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 3194,3198 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 3251,3259 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 3279,3283 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {},
***************
*** 3948,3956 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 3972,3976 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 4126,4134 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 4146,4150 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 4303,4311 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 4319,4323 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 4335,4338 ****
--- 4347,4351 ----
                            'contents' => [
                              {
+                               'parent' => {},
                                'text' => ' ',
                                'type' => 'empty_spaces_before_argument'
***************
*** 4357,4365 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 4370,4374 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {},
***************
*** 4409,4417 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 4418,4422 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {},
***************
*** 4958,4961 ****
--- 4963,4971 ----
                'cmdname' => 'atchar',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 43,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 4974,4977 ****
--- 4984,4988 ----
                'cmdname' => 'lbracechar',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 4990,4993 ****
--- 5001,5005 ----
                'cmdname' => 'rbracechar',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5006,5009 ****
--- 5018,5022 ----
                'cmdname' => 'backslashchar',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5022,5025 ****
--- 5035,5039 ----
                'cmdname' => 'hashchar',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5058,5066 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 43,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 5072,5076 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 5087,5090 ****
--- 5097,5105 ----
                'cmdname' => 'atchar',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 44,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 5103,5106 ****
--- 5118,5122 ----
                'cmdname' => 'lbracechar',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5119,5122 ****
--- 5135,5139 ----
                'cmdname' => 'rbracechar',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5135,5138 ****
--- 5152,5156 ----
                'cmdname' => 'backslashchar',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5151,5154 ****
--- 5169,5173 ----
                'cmdname' => 'hashchar',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5188,5196 ****
        },
        'level' => 1,
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 44,
!         'macro' => ''
!       },
        'number' => 3,
        'parent' => {}
--- 5207,5211 ----
        },
        'level' => 1,
!       'line_nr' => {},
        'number' => 3,
        'parent' => {}
***************
*** 5218,5221 ****
--- 5233,5241 ----
                'cmdname' => 'LaTeX',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 46,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 5234,5237 ****
--- 5254,5258 ----
                'cmdname' => 'TeX',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5250,5253 ****
--- 5271,5275 ----
                'cmdname' => 'bullet',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5266,5269 ****
--- 5288,5292 ----
                'cmdname' => 'comma',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5282,5285 ****
--- 5305,5309 ----
                'cmdname' => 'copyright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5298,5301 ****
--- 5322,5326 ----
                'cmdname' => 'dots',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5314,5317 ****
--- 5339,5343 ----
                'cmdname' => 'enddots',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5354,5362 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 46,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 5380,5384 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 5383,5386 ****
--- 5405,5413 ----
                'cmdname' => 'LaTeX',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 47,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 5399,5402 ****
--- 5426,5430 ----
                'cmdname' => 'TeX',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5415,5418 ****
--- 5443,5447 ----
                'cmdname' => 'bullet',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5431,5434 ****
--- 5460,5464 ----
                'cmdname' => 'comma',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5447,5450 ****
--- 5477,5481 ----
                'cmdname' => 'copyright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5463,5466 ****
--- 5494,5498 ----
                'cmdname' => 'dots',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5479,5482 ****
--- 5511,5515 ----
                'cmdname' => 'enddots',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5520,5528 ****
        },
        'level' => 1,
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 47,
!         'macro' => ''
!       },
        'number' => 4,
        'parent' => {}
--- 5553,5557 ----
        },
        'level' => 1,
!       'line_nr' => {},
        'number' => 4,
        'parent' => {}
***************
*** 5550,5553 ****
--- 5579,5587 ----
                'cmdname' => 'equiv',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 49,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 5566,5569 ****
--- 5600,5604 ----
                'cmdname' => 'error',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5582,5585 ****
--- 5617,5621 ----
                'cmdname' => 'euro',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5598,5601 ****
--- 5634,5638 ----
                'cmdname' => 'exclamdown',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5614,5617 ****
--- 5651,5655 ----
                'cmdname' => 'expansion',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5630,5633 ****
--- 5668,5672 ----
                'cmdname' => 'minus',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5668,5676 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 49,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 5707,5711 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 5697,5700 ****
--- 5732,5740 ----
                'cmdname' => 'equiv',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 50,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 5713,5716 ****
--- 5753,5757 ----
                'cmdname' => 'error',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5729,5732 ****
--- 5770,5774 ----
                'cmdname' => 'euro',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5745,5748 ****
--- 5787,5791 ----
                'cmdname' => 'exclamdown',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5761,5764 ****
--- 5804,5808 ----
                'cmdname' => 'expansion',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5777,5780 ****
--- 5821,5825 ----
                'cmdname' => 'minus',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5816,5824 ****
        },
        'level' => 1,
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 50,
!         'macro' => ''
!       },
        'number' => 5,
        'parent' => {}
--- 5861,5865 ----
        },
        'level' => 1,
!       'line_nr' => {},
        'number' => 5,
        'parent' => {}
***************
*** 5846,5849 ****
--- 5887,5895 ----
                'cmdname' => 'geq',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 52,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 5862,5865 ****
--- 5908,5912 ----
                'cmdname' => 'leq',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5878,5881 ****
--- 5925,5929 ----
                'cmdname' => 'arrow',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5910,5918 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 52,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 5958,5962 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 5939,5942 ****
--- 5983,5991 ----
                'cmdname' => 'geq',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 53,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 5955,5958 ****
--- 6004,6008 ----
                'cmdname' => 'leq',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 5971,5974 ****
--- 6021,6025 ----
                'cmdname' => 'arrow',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6004,6012 ****
        },
        'level' => 1,
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 53,
!         'macro' => ''
!       },
        'number' => 6,
        'parent' => {}
--- 6055,6059 ----
        },
        'level' => 1,
!       'line_nr' => {},
        'number' => 6,
        'parent' => {}
***************
*** 6034,6037 ****
--- 6081,6089 ----
                'cmdname' => 'ordf',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 55,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 6050,6053 ****
--- 6102,6106 ----
                'cmdname' => 'ordm',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6066,6069 ****
--- 6119,6123 ----
                'cmdname' => 'point',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6082,6085 ****
--- 6136,6140 ----
                'cmdname' => 'pounds',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6098,6101 ****
--- 6153,6157 ----
                'cmdname' => 'print',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6114,6117 ****
--- 6170,6174 ----
                'cmdname' => 'questiondown',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6130,6133 ****
--- 6187,6191 ----
                'cmdname' => 'registeredsymbol',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6170,6178 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 55,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 6228,6232 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 6199,6202 ****
--- 6253,6261 ----
                'cmdname' => 'ordf',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 56,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 6215,6218 ****
--- 6274,6278 ----
                'cmdname' => 'ordm',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6231,6234 ****
--- 6291,6295 ----
                'cmdname' => 'point',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6247,6250 ****
--- 6308,6312 ----
                'cmdname' => 'pounds',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6263,6266 ****
--- 6325,6329 ----
                'cmdname' => 'print',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6279,6282 ****
--- 6342,6346 ----
                'cmdname' => 'questiondown',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6295,6298 ****
--- 6359,6363 ----
                'cmdname' => 'registeredsymbol',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6336,6344 ****
        },
        'level' => 1,
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 56,
!         'macro' => ''
!       },
        'number' => 7,
        'parent' => {}
--- 6401,6405 ----
        },
        'level' => 1,
!       'line_nr' => {},
        'number' => 7,
        'parent' => {}
***************
*** 6366,6369 ****
--- 6427,6435 ----
                'cmdname' => 'result',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 58,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 6382,6385 ****
--- 6448,6452 ----
                'cmdname' => 'textdegree',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6398,6401 ****
--- 6465,6469 ----
                'cmdname' => 'tie',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6414,6417 ****
--- 6482,6486 ----
                'cmdname' => 'today',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6430,6433 ****
--- 6499,6503 ----
                'cmdname' => 'aa',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6466,6474 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 58,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 6536,6540 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 6495,6498 ****
--- 6561,6569 ----
                'cmdname' => 'result',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 59,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 6511,6514 ****
--- 6582,6586 ----
                'cmdname' => 'textdegree',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6527,6530 ****
--- 6599,6603 ----
                'cmdname' => 'tie',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6543,6546 ****
--- 6616,6620 ----
                'cmdname' => 'today',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6559,6562 ****
--- 6633,6637 ----
                'cmdname' => 'aa',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6596,6604 ****
        },
        'level' => 1,
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 59,
!         'macro' => ''
!       },
        'number' => 8,
        'parent' => {}
--- 6671,6675 ----
        },
        'level' => 1,
!       'line_nr' => {},
        'number' => 8,
        'parent' => {}
***************
*** 6626,6629 ****
--- 6697,6705 ----
                'cmdname' => 'AA',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 61,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 6642,6645 ****
--- 6718,6722 ----
                'cmdname' => 'ae',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6658,6661 ****
--- 6735,6739 ----
                'cmdname' => 'oe',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6674,6677 ****
--- 6752,6756 ----
                'cmdname' => 'AE',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6690,6693 ****
--- 6769,6773 ----
                'cmdname' => 'OE',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6706,6709 ****
--- 6786,6790 ----
                'cmdname' => 'o',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6722,6725 ****
--- 6803,6807 ----
                'cmdname' => 'O',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6738,6741 ****
--- 6820,6824 ----
                'cmdname' => 'ss',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6754,6757 ****
--- 6837,6841 ----
                'cmdname' => 'l',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6770,6773 ****
--- 6854,6858 ----
                'cmdname' => 'L',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6786,6789 ****
--- 6871,6875 ----
                'cmdname' => 'DH',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6802,6805 ****
--- 6888,6892 ----
                'cmdname' => 'dh',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6818,6821 ****
--- 6905,6909 ----
                'cmdname' => 'TH',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6834,6837 ****
--- 6922,6926 ----
                'cmdname' => 'th',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6888,6896 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 61,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 6977,6981 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 6917,6920 ****
--- 7002,7010 ----
                'cmdname' => 'AA',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 62,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 6933,6936 ****
--- 7023,7027 ----
                'cmdname' => 'ae',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6949,6952 ****
--- 7040,7044 ----
                'cmdname' => 'oe',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6965,6968 ****
--- 7057,7061 ----
                'cmdname' => 'AE',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6981,6984 ****
--- 7074,7078 ----
                'cmdname' => 'OE',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 6997,7000 ****
--- 7091,7095 ----
                'cmdname' => 'o',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 7013,7016 ****
--- 7108,7112 ----
                'cmdname' => 'O',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 7029,7032 ****
--- 7125,7129 ----
                'cmdname' => 'ss',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 7045,7048 ****
--- 7142,7146 ----
                'cmdname' => 'l',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 7061,7064 ****
--- 7159,7163 ----
                'cmdname' => 'L',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 7077,7080 ****
--- 7176,7180 ----
                'cmdname' => 'DH',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 7093,7096 ****
--- 7193,7197 ----
                'cmdname' => 'dh',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 7109,7112 ****
--- 7210,7214 ----
                'cmdname' => 'TH',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 7125,7128 ****
--- 7227,7231 ----
                'cmdname' => 'th',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 7180,7188 ****
        },
        'level' => 1,
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 62,
!         'macro' => ''
!       },
        'number' => 9,
        'parent' => {}
--- 7283,7287 ----
        },
        'level' => 1,
!       'line_nr' => {},
        'number' => 9,
        'parent' => {}
***************
*** 7342,7345 ****
--- 7441,7446 ----
                ],
                'cmdname' => '\'',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 7657,7660 ****
--- 7758,7763 ----
                ],
                'cmdname' => '\'',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8292,8295 ****
--- 8395,8400 ----
                        ],
                        'cmdname' => '=',
+                       'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 8326,8329 ****
--- 8431,8436 ----
                        ],
                        'cmdname' => '\'',
+                       'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 8427,8430 ****
--- 8534,8539 ----
                        ],
                        'cmdname' => '=',
+                       'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 8461,8464 ****
--- 8570,8575 ----
                        ],
                        'cmdname' => '\'',
+                       'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 8530,8533 ****
--- 8641,8649 ----
                'cmdname' => 'quotedblleft',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 73,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 8546,8549 ****
--- 8662,8666 ----
                'cmdname' => 'quotedblright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8562,8565 ****
--- 8679,8683 ----
                'cmdname' => 'quoteleft',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8578,8581 ****
--- 8696,8700 ----
                'cmdname' => 'quoteright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8594,8597 ****
--- 8713,8717 ----
                'cmdname' => 'quotedblbase',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8610,8613 ****
--- 8730,8734 ----
                'cmdname' => 'quotesinglbase',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8648,8656 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 73,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 8769,8773 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 8677,8680 ****
--- 8794,8802 ----
                'cmdname' => 'quotedblleft',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 74,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 8693,8696 ****
--- 8815,8819 ----
                'cmdname' => 'quotedblright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8709,8712 ****
--- 8832,8836 ----
                'cmdname' => 'quoteleft',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8725,8728 ****
--- 8849,8853 ----
                'cmdname' => 'quoteright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8741,8744 ****
--- 8866,8870 ----
                'cmdname' => 'quotedblbase',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8757,8760 ****
--- 8883,8887 ----
                'cmdname' => 'quotesinglbase',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8796,8804 ****
        },
        'level' => 1,
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 74,
!         'macro' => ''
!       },
        'number' => 13,
        'parent' => {}
--- 8923,8927 ----
        },
        'level' => 1,
!       'line_nr' => {},
        'number' => 13,
        'parent' => {}
***************
*** 8826,8829 ****
--- 8949,8957 ----
                'cmdname' => 'guillemetleft',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 76,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 8842,8845 ****
--- 8970,8974 ----
                'cmdname' => 'guillemetright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8858,8861 ****
--- 8987,8991 ----
                'cmdname' => 'guillemotleft',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8874,8877 ****
--- 9004,9008 ----
                'cmdname' => 'guillemotright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8890,8893 ****
--- 9021,9025 ----
                'cmdname' => 'guilsinglleft',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8906,8909 ****
--- 9038,9042 ----
                'cmdname' => 'guilsinglright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 8944,8952 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 76,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 9077,9081 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 8973,8976 ****
--- 9102,9110 ----
                'cmdname' => 'guillemetleft',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 77,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 8989,8992 ****
--- 9123,9127 ----
                'cmdname' => 'guillemetright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 9005,9008 ****
--- 9140,9144 ----
                'cmdname' => 'guillemotleft',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 9021,9024 ****
--- 9157,9161 ----
                'cmdname' => 'guillemotright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 9037,9040 ****
--- 9174,9178 ----
                'cmdname' => 'guilsinglleft',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 9053,9056 ****
--- 9191,9195 ----
                'cmdname' => 'guilsinglright',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 9091,9100 ****
          'spaces_after_command' => {}
        },
!       'level' => 1,
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 77,
!         'macro' => ''
!       },
        'number' => 14,
        'parent' => {}
--- 9230,9235 ----
          'spaces_after_command' => {}
        },
!       'level' => 1,
!       'line_nr' => {},
        'number' => 14,
        'parent' => {}
***************
*** 9227,9230 ****
--- 9362,9366 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 9249,9258 ****
                      {}
                    ]
!                 ],
!                 'normalized' => 'AAA',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 9385,9389 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 9288,9297 ****
                    ]
                  ],
!                 'explanation_contents' => [],
!                 'normalized' => 'AAA',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 9419,9423 ----
                    ]
                  ],
!                 'explanation_contents' => []
                },
                'line_nr' => {},
***************
*** 9323,9331 ****
                    ]
                  ],
!                 'normalized' => 'BBB',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 9449,9453 ----
                    ]
                  ],
!                 'explanation_contents' => []
                },
                'line_nr' => {},
***************
*** 9392,9395 ****
--- 9514,9518 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 9414,9423 ****
                      {}
                    ]
!                 ],
!                 'normalized' => 'AAA',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 9537,9541 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 9453,9462 ****
                    ]
                  ],
!                 'explanation_contents' => [],
!                 'normalized' => 'AAA',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 9571,9575 ----
                    ]
                  ],
!                 'explanation_contents' => []
                },
                'line_nr' => {},
***************
*** 9488,9496 ****
                    ]
                  ],
!                 'normalized' => 'BBB',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 9601,9605 ----
                    ]
                  ],
!                 'explanation_contents' => []
                },
                'line_nr' => {},
***************
*** 9559,9562 ****
--- 9668,9672 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 9581,9590 ****
                      {}
                    ]
!                 ],
!                 'normalized' => 'CCC',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 9691,9695 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 9620,9629 ****
                    ]
                  ],
!                 'explanation_contents' => [],
!                 'normalized' => 'CCC',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 9725,9729 ----
                    ]
                  ],
!                 'explanation_contents' => []
                },
                'line_nr' => {},
***************
*** 9655,9663 ****
                    ]
                  ],
!                 'normalized' => 'DDD',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 9755,9759 ----
                    ]
                  ],
!                 'explanation_contents' => []
                },
                'line_nr' => {},
***************
*** 9724,9727 ****
--- 9820,9824 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 9746,9755 ****
                      {}
                    ]
!                 ],
!                 'normalized' => 'CCC',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 9843,9847 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 9785,9794 ****
                    ]
                  ],
!                 'explanation_contents' => [],
!                 'normalized' => 'CCC',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 9877,9881 ----
                    ]
                  ],
!                 'explanation_contents' => []
                },
                'line_nr' => {},
***************
*** 9820,9828 ****
                    ]
                  ],
!                 'normalized' => 'DDD',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 9907,9911 ----
                    ]
                  ],
!                 'explanation_contents' => []
                },
                'line_nr' => {},
***************
*** 9899,9902 ****
--- 9982,9986 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 9923,9931 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 10007,10011 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 9970,9978 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 10050,10054 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 10045,10048 ****
--- 10121,10125 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 10069,10077 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 10146,10150 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 10116,10124 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 10189,10193 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 10190,10198 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 10259,10263 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 10279,10287 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 10344,10348 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 10351,10359 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 10412,10416 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 10440,10448 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 10497,10501 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 11708,11716 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 11761,11765 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 11787,11795 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 11836,11840 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 12040,12048 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 12085,12089 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 12114,12122 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 12155,12159 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 12366,12374 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 12403,12407 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 12398,12401 ****
--- 12431,12435 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 12420,12428 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 12454,12458 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 12472,12480 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 12502,12506 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 12546,12554 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 12572,12576 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 12578,12581 ****
--- 12600,12604 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 12600,12608 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 12623,12627 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 12652,12660 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 12671,12675 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 12733,12740 ****
                    ],
                    'normalized' => '-_007b-_007d'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 12748,12751 ----
***************
*** 12886,12893 ****
                    ],
                    'normalized' => '----_0021---_002e--_002e-_003f-_0040'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 12897,12900 ----
***************
*** 12918,12921 ****
--- 12925,12933 ----
                        'cmdname' => 'atchar',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 127,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 12934,12937 ****
--- 12946,12950 ----
                        'cmdname' => 'lbracechar',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 12950,12953 ****
--- 12963,12967 ----
                        'cmdname' => 'rbracechar',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 12966,12969 ****
--- 12980,12984 ----
                        'cmdname' => 'backslashchar',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 12982,12985 ****
--- 12997,13001 ----
                        'cmdname' => 'hashchar',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 13019,13033 ****
                    ],
                    'normalized' => '_0040-_007b-_007d-_005c-_0023'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 127,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 13035,13041 ----
                    ],
                    'normalized' => '_0040-_007b-_007d-_005c-_0023'
                  }
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 13051,13054 ****
--- 13059,13067 ----
                        'cmdname' => 'LaTeX',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 128,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 13067,13070 ****
--- 13080,13084 ----
                        'cmdname' => 'TeX',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13083,13086 ****
--- 13097,13101 ----
                        'cmdname' => 'bullet',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13099,13102 ****
--- 13114,13118 ----
                        'cmdname' => 'comma',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13115,13118 ****
--- 13131,13135 ----
                        'cmdname' => 'copyright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13131,13134 ****
--- 13148,13152 ----
                        'cmdname' => 'dots',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13147,13150 ****
--- 13165,13169 ----
                        'cmdname' => 'enddots',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 13192,13206 ****
                    ],
                    'normalized' => 'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 128,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 13211,13217 ----
                    ],
                    'normalized' => 'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
                  }
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 13224,13227 ****
--- 13235,13243 ----
                        'cmdname' => 'equiv',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 129,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 13240,13243 ****
--- 13256,13260 ----
                        'cmdname' => 'error',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13256,13259 ****
--- 13273,13277 ----
                        'cmdname' => 'euro',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13272,13275 ****
--- 13290,13294 ----
                        'cmdname' => 'exclamdown',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13288,13291 ****
--- 13307,13311 ----
                        'cmdname' => 'expansion',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13304,13307 ****
--- 13324,13328 ----
                        'cmdname' => 'minus',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 13345,13359 ****
                    ],
                    'normalized' => '_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 129,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 13366,13372 ----
                    ],
                    'normalized' => '_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
                  }
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 13389,13392 ****
--- 13402,13410 ----
                        'cmdname' => 'geq',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 131,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 13405,13408 ****
--- 13423,13427 ----
                        'cmdname' => 'leq',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13421,13424 ****
--- 13440,13444 ----
                        'cmdname' => 'arrow',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 13450,13464 ****
                    ],
                    'normalized' => '_2265-_2264-_2192'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 131,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 13470,13476 ----
                    ],
                    'normalized' => '_2265-_2264-_2192'
                  }
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 13494,13497 ****
--- 13506,13514 ----
                        'cmdname' => 'ordf',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 133,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 13510,13513 ****
--- 13527,13531 ----
                        'cmdname' => 'ordm',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13526,13529 ****
--- 13544,13548 ----
                        'cmdname' => 'point',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13542,13545 ****
--- 13561,13565 ----
                        'cmdname' => 'pounds',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13558,13561 ****
--- 13578,13582 ----
                        'cmdname' => 'print',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13574,13577 ****
--- 13595,13599 ----
                        'cmdname' => 'questiondown',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13590,13593 ****
--- 13612,13616 ----
                        'cmdname' => 'registeredsymbol',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 13635,13649 ****
                    ],
                    'normalized' => '_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 133,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 13658,13664 ----
                    ],
                    'normalized' => '_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae'
                  }
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 13667,13670 ****
--- 13682,13690 ----
                        'cmdname' => 'result',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 134,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 13683,13686 ****
--- 13703,13707 ----
                        'cmdname' => 'textdegree',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13699,13702 ****
--- 13720,13724 ----
                        'cmdname' => 'tie',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13715,13718 ****
--- 13737,13741 ----
                        'cmdname' => 'today',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13731,13734 ****
--- 13754,13758 ----
                        'cmdname' => 'aa',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 13768,13782 ****
                    ],
                    'normalized' => '_21d2-_00b0-a-b--_00e5'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 134,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 13792,13798 ----
                    ],
                    'normalized' => '_21d2-_00b0-a-b--_00e5'
                  }
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 13800,13803 ****
--- 13816,13824 ----
                        'cmdname' => 'AA',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 135,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 13816,13819 ****
--- 13837,13841 ----
                        'cmdname' => 'ae',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13832,13835 ****
--- 13854,13858 ----
                        'cmdname' => 'oe',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13848,13851 ****
--- 13871,13875 ----
                        'cmdname' => 'AE',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13864,13867 ****
--- 13888,13892 ----
                        'cmdname' => 'OE',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13880,13883 ****
--- 13905,13909 ----
                        'cmdname' => 'o',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13896,13899 ****
--- 13922,13926 ----
                        'cmdname' => 'O',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13912,13915 ****
--- 13939,13943 ----
                        'cmdname' => 'ss',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13928,13931 ****
--- 13956,13960 ----
                        'cmdname' => 'l',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13944,13947 ****
--- 13973,13977 ----
                        'cmdname' => 'L',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13960,13963 ****
--- 13990,13994 ----
                        'cmdname' => 'DH',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13976,13979 ****
--- 14007,14011 ----
                        'cmdname' => 'dh',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 13992,13995 ****
--- 14024,14028 ----
                        'cmdname' => 'TH',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 14008,14011 ****
--- 14041,14045 ----
                        'cmdname' => 'th',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 14081,14095 ****
                    ],
                    'normalized' => '_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 135,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 14115,14121 ----
                    ],
                    'normalized' => '_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
                  }
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 14245,14248 ****
--- 14271,14276 ----
                        ],
                        'cmdname' => '\'',
+                       'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 14416,14423 ****
                    ],
                    'normalized' => '_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 14444,14447 ----
***************
*** 14631,14638 ****
                    ],
                    'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 14655,14658 ----
***************
*** 14693,14696 ****
--- 14713,14718 ----
                                ],
                                'cmdname' => '=',
+                               'contents' => [],
+                               'line_nr' => {},
                                'parent' => {}
                              }
***************
*** 14727,14730 ****
--- 14749,14754 ----
                                ],
                                'cmdname' => '\'',
+                               'contents' => [],
+                               'line_nr' => {},
                                'parent' => {}
                              }
***************
*** 14766,14773 ****
                    ],
                    'normalized' => '_0131-_1e14-_1e08'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 14790,14793 ----
***************
*** 14794,14797 ****
--- 14814,14822 ----
                        'cmdname' => 'quotedblleft',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 139,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 14810,14813 ****
--- 14835,14839 ----
                        'cmdname' => 'quotedblright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 14826,14829 ****
--- 14852,14856 ----
                        'cmdname' => 'quoteleft',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 14842,14845 ****
--- 14869,14873 ----
                        'cmdname' => 'quoteright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 14858,14861 ****
--- 14886,14890 ----
                        'cmdname' => 'quotedblbase',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 14874,14877 ****
--- 14903,14907 ----
                        'cmdname' => 'quotesinglbase',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 14915,14929 ****
                    ],
                    'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 139,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 14945,14951 ----
                    ],
                    'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
                  }
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 14947,14950 ****
--- 14969,14977 ----
                        'cmdname' => 'guillemetleft',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 140,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 14963,14966 ****
--- 14990,14994 ----
                        'cmdname' => 'guillemetright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 14979,14982 ****
--- 15007,15011 ----
                        'cmdname' => 'guillemotleft',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 14995,14998 ****
--- 15024,15028 ----
                        'cmdname' => 'guillemotright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 15011,15014 ****
--- 15041,15045 ----
                        'cmdname' => 'guilsinglleft',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 15027,15030 ****
--- 15058,15062 ----
                        'cmdname' => 'guilsinglright',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 15068,15082 ****
                    ],
                    'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 140,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 15100,15106 ----
                    ],
                    'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
                  }
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 15113,15120 ****
                    ],
                    'normalized' => '_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 15137,15140 ----
***************
*** 15150,15153 ****
--- 15170,15174 ----
                            'contents' => [
                              {
+                               'parent' => {},
                                'text' => ' ',
                                'type' => 'empty_spaces_before_argument'
***************
*** 15172,15181 ****
                              {}
                            ]
!                         ],
!                         'normalized' => 'AAA',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 15193,15197 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 15211,15220 ****
                            ]
                          ],
!                         'explanation_contents' => [],
!                         'normalized' => 'AAA',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 15227,15231 ----
                            ]
                          ],
!                         'explanation_contents' => []
                        },
                        'line_nr' => {},
***************
*** 15246,15254 ****
                            ]
                          ],
!                         'normalized' => 'BBB',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 15257,15261 ----
                            ]
                          ],
!                         'explanation_contents' => []
                        },
                        'line_nr' => {},
***************
*** 15282,15289 ****
                    ],
                    'normalized' => 'AAA-AAA-BBB'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 15289,15292 ----
***************
*** 15315,15318 ****
--- 15318,15322 ----
                            'contents' => [
                              {
+                               'parent' => {},
                                'text' => ' ',
                                'type' => 'empty_spaces_before_argument'
***************
*** 15337,15346 ****
                              {}
                            ]
!                         ],
!                         'normalized' => 'CCC',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 15341,15345 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 15376,15385 ****
                            ]
                          ],
!                         'explanation_contents' => [],
!                         'normalized' => 'CCC',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 15375,15379 ----
                            ]
                          ],
!                         'explanation_contents' => []
                        },
                        'line_nr' => {},
***************
*** 15411,15419 ****
                            ]
                          ],
!                         'normalized' => 'DDD',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 15405,15409 ----
                            ]
                          ],
!                         'explanation_contents' => []
                        },
                        'line_nr' => {},
***************
*** 15447,15454 ****
                    ],
                    'normalized' => 'CCC-CCC-DDD'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 15437,15440 ----
***************
*** 15488,15491 ****
--- 15474,15478 ----
                            'contents' => [
                              {
+                               'parent' => {},
                                'text' => ' ',
                                'type' => 'empty_spaces_before_argument'
***************
*** 15512,15520 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 15499,15503 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 15559,15567 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 15542,15546 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {},
***************
*** 15591,15598 ****
                    ],
                    'normalized' => 'someone_0040somewher-no_005fexplain_0040there'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 15570,15573 ----
***************
*** 15629,15637 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 15604,15608 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 15718,15726 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 15689,15693 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {},
***************
*** 15750,15757 ****
                    ],
                    'normalized' => 'f_002d_002dile1-f_002d_002dile'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 15717,15720 ----
***************
*** 15814,15821 ****
                    ],
                    'normalized' => '-_0040-_007b_007d-_002e-'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 15777,15780 ----
***************
*** 16125,16132 ****
                    ],
                    'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 16084,16087 ----
***************
*** 16358,16365 ****
                    ],
                    'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 16313,16316 ----
***************
*** 16400,16408 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 16351,16355 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 16434,16441 ****
                    ],
                    'normalized' => '8_002e27in'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 16381,16384 ----
***************
*** 16519,16526 ****
                    ],
                    'normalized' => 'sansserif-slanted'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 16462,16465 ----
***************
*** 16557,16565 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 16496,16500 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 16589,16596 ****
                    ],
                    'normalized' => 'indicateurl'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 16524,16527 ----
***************
*** 16674,16681 ****
                    ],
                    'normalized' => 'gH-3rd'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 16605,16608 ----
***************
*** 16712,16720 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 16639,16643 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 16744,16747 ****
--- 16667,16671 ----
                            'contents' => [
                              {
+                               'parent' => {},
                                'text' => ' ',
                                'type' => 'empty_spaces_before_argument'
***************
*** 16766,16774 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 16690,16694 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {},
***************
*** 16818,16826 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 16738,16742 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {},
***************
*** 16854,16861 ****
                    ],
                    'normalized' => 'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 16770,16773 ----
***************
*** 17007,17019 ****
--- 16919,16935 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[2];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[4];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[6];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[8];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
***************
*** 17032,17035 ****
--- 16948,16952 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[7];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[8];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4];
***************
*** 17038,17056 ****
--- 16955,16979 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[2];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[4];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[6];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[8];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[10];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[12];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4];
***************
*** 17073,17076 ****
--- 16996,17000 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[11] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[11];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[12] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[12];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
***************
*** 17079,17094 ****
--- 17003,17023 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[2];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[4];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[6];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[8];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[10];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
***************
*** 17109,17112 ****
--- 17038,17042 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[9];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[10];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6];
***************
*** 17115,17121 ****
--- 17045,17053 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[2];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[4];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6];
***************
*** 17130,17133 ****
--- 17062,17066 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[3];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[4];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7];
***************
*** 17136,17154 ****
--- 17069,17093 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[2];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[4];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[6];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[8];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[10];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[12];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7];
***************
*** 17171,17174 ****
--- 17110,17114 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node'}{'node_content'}[11] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[11];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node'}{'node_content'}[12] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[12];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8];
***************
*** 17177,17189 ****
--- 17117,17133 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[4];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[6];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[8];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8];
***************
*** 17202,17205 ****
--- 17146,17150 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[7];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[8];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9];
***************
*** 17208,17247 ****
--- 17153,17205 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[2];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[4];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[6];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[8];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[10];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[12];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[14];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[14]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[16];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[16]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[18]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[18];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[18]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[20]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[20];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[20]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[21]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[22]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[22];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[22]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[22]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[23]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[24]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[24];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[24]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[24]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[25]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[26]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[26];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[26]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[26]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9];
***************
*** 17278,17281 ****
--- 17236,17240 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node'}{'node_content'}[25] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[25];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node'}{'node_content'}[26] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[26];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10];
***************
*** 17309,17312 ****
--- 17268,17272 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1];
***************
*** 17426,17429 ****
--- 17386,17390 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2];
***************
*** 17433,17436 ****
--- 17394,17398 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4];
***************
*** 17455,17470 ****
--- 17417,17437 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[2];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[4];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[6];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[8];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[10];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13];
***************
*** 17485,17488 ****
--- 17452,17456 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[9];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[10];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14];
***************
*** 17491,17506 ****
--- 17459,17479 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[2];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[4];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[6];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[8];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[10];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14];
***************
*** 17521,17524 ****
--- 17494,17498 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'extra'}{'menu_entry_node'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[9];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'extra'}{'menu_entry_node'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[10];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[15];
***************
*** 17535,17538 ****
--- 17509,17513 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0];
***************
*** 17569,17572 ****
--- 17544,17548 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0];
***************
*** 17605,17608 ****
--- 17581,17585 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0];
***************
*** 17896,17899 ****
--- 17873,17877 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[1]{'contents'}[2];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[1]{'contents'}[2]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[1]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[1]{'contents'}[2]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[1]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[1]{'contents'}[2];
***************
*** 18062,18074 ****
--- 18040,18056 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0];
***************
*** 18085,18088 ****
--- 18067,18071 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'extra'}{'node_content'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8];
***************
*** 18092,18104 ****
--- 18075,18091 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0];
***************
*** 18115,18118 ****
--- 18102,18106 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'extra'}{'misc_content'}[8] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0]{'contents'}[9];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9];
***************
*** 18122,18140 ****
--- 18110,18134 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[13];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[13]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0];
***************
*** 18155,18158 ****
--- 18149,18153 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'extra'}{'node_content'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10];
***************
*** 18162,18180 ****
--- 18157,18181 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[13];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[13]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0];
***************
*** 18195,18198 ****
--- 18196,18200 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'extra'}{'misc_content'}[12] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[13];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11];
***************
*** 18202,18217 ****
--- 18204,18224 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0];
***************
*** 18230,18233 ****
--- 18237,18241 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'extra'}{'node_content'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12];
***************
*** 18237,18252 ****
--- 18245,18265 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0];
***************
*** 18265,18268 ****
--- 18278,18282 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'extra'}{'misc_content'}[10] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[11];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[13];
***************
*** 18272,18278 ****
--- 18286,18294 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'args'}[0];
***************
*** 18285,18288 ****
--- 18301,18305 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'extra'}{'node_content'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_utf8'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[14]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[14];
***************
*** 18292,18298 ****
--- 18309,18317 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[14]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[14]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[14]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[14]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[14]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[14]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[14]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[14]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[14]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[14]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[14]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[14]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[14]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[14]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[14]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[14]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[14]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[14]{'args'}[0];
***************
*** 18305,18308 ****
--- 18324,18328 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[14]{'extra'}{'misc_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[14]{'args'}[0]{'contents'}[5];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[14]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[14]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[14]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[14]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_utf8'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15];
***************
*** 18312,18330 ****
--- 18332,18356 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[13];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[13]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0];
***************
*** 18345,18348 ****
--- 18371,18375 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'extra'}{'node_content'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs_utf8'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16];
***************
*** 18352,18370 ****
--- 18379,18403 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[13];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[13]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0];
***************
*** 18385,18388 ****
--- 18418,18422 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'extra'}{'misc_content'}[12] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[13];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs_utf8'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17];
***************
*** 18392,18404 ****
--- 18426,18442 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0];
***************
*** 18415,18418 ****
--- 18453,18457 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'extra'}{'node_content'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_refs_utf8'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18];
***************
*** 18422,18434 ****
--- 18461,18477 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0];
***************
*** 18445,18448 ****
--- 18488,18492 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'extra'}{'misc_content'}[8] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0]{'contents'}[9];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_refs_utf8'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19];
***************
*** 18452,18491 ****
--- 18496,18548 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[13];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[13]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[15]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[15];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[15]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[17]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[17];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[17]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[19]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[19];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[19]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[21]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[21];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[21]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[21]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[22]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[23]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[23];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[23]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[23]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[24]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[25]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[25];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[25]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[25]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[26]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[27]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[27];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[27]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[27]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[28]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0];
***************
*** 18520,18523 ****
--- 18577,18581 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'node_content'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_refs_utf8'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20];
***************
*** 18527,18566 ****
--- 18585,18637 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[13];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[13]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[15]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[15];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[15]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[17]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[17];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[17]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[19]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[19];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[19]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[21]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[21];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[21]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[21]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[22]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[23]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[23];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[23]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[23]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[24]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[25]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[25];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[25]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[25]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[26]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[27]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[27];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[27]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[27]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[28]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0];
***************
*** 18595,18598 ****
--- 18666,18670 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'extra'}{'misc_content'}[26] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[27];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_refs_utf8'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[21];
***************
*** 18627,18630 ****
--- 18699,18703 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0];
***************
*** 18711,18714 ****
--- 18784,18788 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[22]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[22]{'args'}[0]{'contents'}[11]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[22]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[22]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[22]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[22]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[22]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[22]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[22]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[22]{'args'}[0];
***************
*** 18880,18883 ****
--- 18954,18958 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[3];
***************
*** 18887,18890 ****
--- 18962,18966 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[5];
***************
*** 18910,18913 ****
--- 18986,18990 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[3];
***************
*** 18917,18920 ****
--- 18994,18998 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[5];
***************
*** 18938,18953 ****
--- 19016,19036 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0];
***************
*** 18966,18969 ****
--- 19049,19053 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'extra'}{'node_content'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'parent'} = $result_trees{'at_commands_in_refs_utf8'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28];
***************
*** 18973,18988 ****
--- 19057,19077 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0];
***************
*** 19001,19004 ****
--- 19090,19094 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'extra'}{'misc_content'}[10] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[11];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[28]{'parent'} = $result_trees{'at_commands_in_refs_utf8'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29];
***************
*** 19008,19023 ****
--- 19098,19118 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0];
***************
*** 19036,19039 ****
--- 19131,19135 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'extra'}{'node_content'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'parent'} = $result_trees{'at_commands_in_refs_utf8'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30];
***************
*** 19043,19058 ****
--- 19139,19159 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[5];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[7];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[9];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[11];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0];
***************
*** 19071,19074 ****
--- 19172,19176 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'extra'}{'misc_content'}[10] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[11];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'extra'}{'spaces_after_command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[30]{'parent'} = $result_trees{'at_commands_in_refs_utf8'};
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[31]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[31];
***************
*** 19094,19097 ****
--- 19196,19200 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[33]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[33]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[33]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[33]{'args'}[0]{'contents'}[1];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[33]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[33]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[33]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[33]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[33]{'args'}[0]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[33]{'args'}[0]{'contents'}[1];
***************
*** 19127,19130 ****
--- 19230,19234 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[34]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[34]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[34]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[34]{'args'}[0]{'contents'}[1];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[34]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[34]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[34]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[34]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[34]{'args'}[0]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[34]{'args'}[0]{'contents'}[1];
***************
*** 19160,19163 ****
--- 19264,19268 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[35]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[35]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[35]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[35]{'args'}[0]{'contents'}[1];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[35]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[35]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[35]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[35]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[35]{'args'}[0]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[35]{'args'}[0]{'contents'}[1];
***************
*** 19193,19196 ****
--- 19298,19302 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[36]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[36]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[36]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[36]{'args'}[0]{'contents'}[1];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[36]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[36]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[36]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[36]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[36]{'args'}[0]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[36]{'args'}[0]{'contents'}[1];
***************
*** 19228,19231 ****
--- 19334,19338 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[37]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[37]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[37]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[37]{'args'}[0]{'contents'}[1];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[37]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[37]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[37]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[37]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[37]{'args'}[0]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[37]{'args'}[0]{'contents'}[1];
***************
*** 19260,19263 ****
--- 19367,19371 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[38]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[38]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[38]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[38]{'args'}[0]{'contents'}[1];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[38]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[38]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[38]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[38]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[38]{'args'}[0]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[38]{'args'}[0]{'contents'}[1];
***************
*** 19789,19792 ****
--- 19897,19901 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[55]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[55]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[55]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[55]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[55]{'args'}[0]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[55]{'args'}[0]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[55]{'args'}[0]{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[55]{'args'}[0]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[55]{'args'}[0]{'contents'}[3]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[55]{'args'}[0]{'contents'}[3];
***************
*** 19825,19828 ****
--- 19934,19938 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'args'}[0]{'contents'}[3];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'args'}[0]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'args'}[0]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'args'}[0]{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'args'}[0]{'contents'}[3]{'args'}[1];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'args'}[0]{'contents'}[3]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'args'}[0]{'contents'}[3];
***************
*** 19924,19936 ****
--- 20034,20050 ----
  $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];
***************
*** 19954,19957 ****
--- 20068,20072 ----
  $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];
***************
*** 19960,19978 ****
--- 20075,20099 ----
  $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];
***************
*** 20004,20007 ****
--- 20125,20129 ----
  $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];
***************
*** 20010,20025 ****
--- 20132,20152 ----
  $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];
***************
*** 20047,20050 ****
--- 20174,20178 ----
  $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];
***************
*** 20055,20061 ****
--- 20183,20191 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1]{'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'}[2]{'args'}[0]{'parent'} = $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]{'args'}[0]{'contents'}[2]{'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'}[2]{'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'}[3]{'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'}[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]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0];
***************
*** 20071,20074 ****
--- 20201,20205 ----
  $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]{'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];
***************
*** 20079,20097 ****
--- 20210,20234 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[1]{'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]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2]{'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'}[2]{'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]{'contents'}[3]{'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]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[4];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[4]{'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'}[4]{'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]{'contents'}[5]{'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]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[6];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[6]{'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'}[6]{'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]{'contents'}[7]{'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]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[8];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[8]{'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'}[8]{'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]{'contents'}[9]{'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]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[10];
+ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[10]{'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'}[10]{'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]{'contents'}[11]{'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]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[12];
+ $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];
***************
*** 20123,20126 ****
--- 20260,20264 ----
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[11];
  $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[12];
+ $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];
***************
*** 20129,20141 ****
--- 20267,20283 ----
  $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];
***************
*** 20159,20162 ****
--- 20301,20305 ----
  $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];
***************
*** 20165,20204 ****
--- 20308,20360 ----
  $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];
***************
*** 20258,20261 ****
--- 20414,20418 ----
  $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];
***************
*** 20289,20292 ****
--- 20446,20450 ----
  $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];
***************
*** 20432,20435 ****
--- 20590,20594 ----
  $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];
***************
*** 20439,20442 ****
--- 20598,20602 ----
  $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];
***************
*** 20462,20477 ****
--- 20622,20642 ----
  $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];
***************
*** 20499,20502 ****
--- 20664,20668 ----
  $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];
***************
*** 20505,20520 ****
--- 20671,20691 ----
  $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];
***************
*** 20542,20545 ****
--- 20713,20717 ----
  $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];
***************
*** 20553,20556 ****
--- 20725,20729 ----
  $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]{'contents'}[1]{'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];
***************
*** 20588,20591 ****
--- 20761,20765 ----
  $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]{'contents'}[1]{'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];
***************
*** 20625,20628 ****
--- 20799,20803 ----
  $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]{'contents'}[1]{'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];
***************
*** 20926,20929 ****
--- 21101,21105 ----
  $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]{'contents'}[1]{'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];
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/char_latin1_latin1_in_refs.pl texinfo-6.3/tp/t/results/converters_tests/char_latin1_latin1_in_refs.pl
*** texinfo-6.1/tp/t/results/converters_tests/char_latin1_latin1_in_refs.pl	2016-01-22 07:50:17.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/char_latin1_latin1_in_refs.pl	2016-08-02 18:44:56.000000000 +0100
***************
*** 15,18 ****
--- 15,19 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => '\\input texinfo
  ',
***************
*** 20,23 ****
--- 21,25 ----
                  },
                  {
+                   'parent' => {},
                    'text' => '
  ',
***************
*** 1143,1150 ****
                    ],
                    'normalized' => '_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1145,1148 ----
***************
*** 1188,1195 ****
                    ],
                    'normalized' => '_00e9'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1186,1189 ----
***************
*** 1233,1240 ****
                    ],
                    'normalized' => '_00e0-_00e8-_00f9'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1227,1230 ----
***************
*** 1278,1285 ****
                    ],
                    'normalized' => '_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1268,1271 ----
***************
*** 1323,1330 ****
                    ],
                    'normalized' => '_00e7'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1309,1312 ----
***************
*** 1389,1393 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{e4} \x{eb} \x{ef} \x{f6} \x{fc} \x{ff}",
--- 1371,1374 ----
***************
*** 1444,1448 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{c4} \x{cb} \x{cf} \x{d6} \x{dc}",
--- 1425,1428 ----
***************
*** 1499,1503 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{e9}",
--- 1479,1482 ----
***************
*** 1554,1558 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{e8}",
--- 1533,1536 ----
***************
*** 1609,1613 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{e2} \x{ea} \x{ee} \x{f4} \x{fb} \x{c2} \x{ca} \x{ce} \x{d4} \x{db}",
--- 1587,1590 ----
***************
*** 1664,1668 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{e7}",
--- 1641,1644 ----
***************
*** 1718,1721 ****
--- 1694,1699 ----
    'type' => 'document_root'
  };
+ $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+ $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
  $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[0]{'contents'}[0];
  $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/char_latin1_utf8_in_refs.pl texinfo-6.3/tp/t/results/converters_tests/char_latin1_utf8_in_refs.pl
*** texinfo-6.1/tp/t/results/converters_tests/char_latin1_utf8_in_refs.pl	2016-01-22 07:50:17.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/char_latin1_utf8_in_refs.pl	2016-08-02 18:44:56.000000000 +0100
***************
*** 15,18 ****
--- 15,19 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => '\\input texinfo
  ',
***************
*** 20,23 ****
--- 21,25 ----
                  },
                  {
+                   'parent' => {},
                    'text' => '
  ',
***************
*** 1143,1150 ****
                    ],
                    'normalized' => '_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1145,1148 ----
***************
*** 1188,1195 ****
                    ],
                    'normalized' => '_00e9'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1186,1189 ----
***************
*** 1233,1240 ****
                    ],
                    'normalized' => '_00e0-_00e8-_00f9'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1227,1230 ----
***************
*** 1278,1285 ****
                    ],
                    'normalized' => '_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1268,1271 ----
***************
*** 1323,1330 ****
                    ],
                    'normalized' => '_00e7'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1309,1312 ----
***************
*** 1389,1393 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{e4} \x{eb} \x{ef} \x{f6} \x{fc} \x{ff}",
--- 1371,1374 ----
***************
*** 1444,1448 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{c4} \x{cb} \x{cf} \x{d6} \x{dc}",
--- 1425,1428 ----
***************
*** 1499,1503 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{e9}",
--- 1479,1482 ----
***************
*** 1554,1558 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{e8}",
--- 1533,1536 ----
***************
*** 1609,1613 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{e2} \x{ea} \x{ee} \x{f4} \x{fb} \x{c2} \x{ca} \x{ce} \x{d4} \x{db}",
--- 1587,1590 ----
***************
*** 1664,1668 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{e7}",
--- 1641,1644 ----
***************
*** 1718,1721 ****
--- 1694,1699 ----
    'type' => 'document_root'
  };
+ $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+ $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
  $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[0]{'contents'}[0];
  $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/char_latin2_latin2_in_refs.pl texinfo-6.3/tp/t/results/converters_tests/char_latin2_latin2_in_refs.pl
*** texinfo-6.1/tp/t/results/converters_tests/char_latin2_latin2_in_refs.pl	2016-01-22 07:50:18.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/char_latin2_latin2_in_refs.pl	2016-08-02 18:44:56.000000000 +0100
***************
*** 15,18 ****
--- 15,19 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => '\\input texinfo
  ',
***************
*** 284,291 ****
                    ],
                    'normalized' => '_0104-_0105-_02db-_0118-_0119'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 285,288 ----
***************
*** 594,598 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{104} \x{105} \x{2db} \x{118} \x{119}",
--- 591,594 ----
***************
*** 648,651 ****
--- 644,648 ----
    'type' => 'document_root'
  };
+ $result_trees{'char_latin2_latin2_in_refs'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'char_latin2_latin2_in_refs'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
  $result_trees{'char_latin2_latin2_in_refs'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'char_latin2_latin2_in_refs'}{'contents'}[0]{'contents'}[0];
  $result_trees{'char_latin2_latin2_in_refs'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'char_latin2_latin2_in_refs'}{'contents'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/complex_nestings.pl texinfo-6.3/tp/t/results/converters_tests/complex_nestings.pl
*** texinfo-6.1/tp/t/results/converters_tests/complex_nestings.pl	2016-01-22 07:50:16.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/complex_nestings.pl	2016-08-02 18:44:55.000000000 +0100
***************
*** 137,140 ****
--- 137,141 ----
                            'cmdname' => 'dots',
                            'contents' => [],
+                           'line_nr' => {},
                            'parent' => {}
                          },
***************
*** 168,172 ****
                          {
                            'contents' => [],
-                           'parent' => {},
                            'type' => 'bracketed_def_content'
                          }
--- 169,172 ----
***************
*** 224,228 ****
                        'index_at_command' => 'defun',
                        'index_name' => 'fn',
-                       'index_prefix' => 'f',
                        'index_type_command' => 'defun',
                        'key' => 'my def',
--- 224,227 ----
***************
*** 293,297 ****
                          {
                            'contents' => [],
-                           'parent' => {},
                            'type' => 'bracketed_def_content'
                          }
--- 292,295 ----
***************
*** 340,344 ****
                        'index_at_command' => 'defunx',
                        'index_name' => 'fn',
-                       'index_prefix' => 'f',
                        'index_type_command' => 'defun',
                        'key' => 'other def',
--- 338,341 ----
***************
*** 416,420 ****
                                  {
                                    'contents' => [],
-                                   'parent' => {},
                                    'type' => 'bracketed_def_content'
                                  }
--- 413,416 ----
***************
*** 431,435 ****
                                  {
                                    'contents' => [],
-                                   'parent' => {},
                                    'type' => 'bracketed_def_content'
                                  }
--- 427,430 ----
***************
*** 504,508 ****
                                'index_at_command' => 'deffn',
                                'index_name' => 'fn',
-                               'index_prefix' => 'f',
                                'index_type_command' => 'deffn',
                                'key' => 'name',
--- 499,502 ----
***************
*** 577,581 ****
                                          {
                                            'contents' => [],
-                                           'parent' => {},
                                            'type' => 'bracketed_def_content'
                                          }
--- 571,574 ----
***************
*** 611,615 ****
                                        'index_at_command' => 'defvar',
                                        'index_name' => 'vr',
-                                       'index_prefix' => 'v',
                                        'index_type_command' => 'defvar',
                                        'key' => 'variables',
--- 604,607 ----
***************
*** 698,702 ****
                                          {
                                            'contents' => [],
-                                           'parent' => {},
                                            'type' => 'bracketed_def_content'
                                          }
--- 690,693 ----
***************
*** 732,736 ****
                                        'index_at_command' => 'defvarx',
                                        'index_name' => 'vr',
-                                       'index_prefix' => 'v',
                                        'index_type_command' => 'defvar',
                                        'key' => 'variables too',
--- 723,726 ----
***************
*** 783,786 ****
--- 773,782 ----
                                              {
                                                'cmdname' => 'asis',
+                                               'contents' => [],
+                                               'line_nr' => {
+                                                 'file_name' => '',
+                                                 'line_nr' => 14,
+                                                 'macro' => ''
+                                               },
                                                'parent' => {},
                                                'type' => 'command_as_argument'
***************
*** 985,993 ****
                                          'spaces_after_command' => {}
                                        },
!                                       'line_nr' => {
!                                         'file_name' => '',
!                                         'line_nr' => 14,
!                                         'macro' => ''
!                                       },
                                        'parent' => {}
                                      },
--- 981,985 ----
                                          'spaces_after_command' => {}
                                        },
!                                       'line_nr' => {},
                                        'parent' => {}
                                      },
***************
*** 1279,1287 ****
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5];
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0];
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[6][1] = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[8][1] = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5];
--- 1271,1279 ----
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5];
+ $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0];
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[6][1] = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[8][1] = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5];
***************
*** 1301,1305 ****
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1];
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0];
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'def_args'}[0][1];
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'def_args'}[2][1];
--- 1293,1296 ----
***************
*** 1322,1328 ****
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0];
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 1313,1317 ----
***************
*** 1340,1344 ****
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 1329,1332 ----
***************
*** 1359,1363 ****
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[0][1];
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[2][1];
--- 1347,1350 ----
***************
*** 1415,1418 ****
--- 1402,1406 ----
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[2];
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
+ $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'line_nr'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3];
  $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'complex_nestings'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[2];
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/documentencoding_utf8_and_insertions.pl texinfo-6.3/tp/t/results/converters_tests/documentencoding_utf8_and_insertions.pl
*** texinfo-6.1/tp/t/results/converters_tests/documentencoding_utf8_and_insertions.pl	2016-01-22 07:50:16.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/documentencoding_utf8_and_insertions.pl	2016-08-02 18:44:54.000000000 +0100
***************
*** 101,104 ****
--- 101,106 ----
            ],
            'cmdname' => '~',
+           'contents' => [],
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 176,179 ****
--- 178,183 ----
                ],
                'cmdname' => '~',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 258,261 ****
--- 262,266 ----
  $result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[2]{'contents'}[3];
+ $result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[2]{'contents'}[3]{'line_nr'} = $result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[2]{'contents'}[1]{'line_nr'};
  $result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[2];
  $result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[2]{'contents'}[4]{'parent'} = $result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[2];
***************
*** 271,274 ****
--- 276,280 ----
  $result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0];
  $result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[4]{'contents'}[1]{'contents'}[3];
+ $result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'line_nr'} = $result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'line_nr'};
  $result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[4]{'contents'}[1];
  $result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[4]{'contents'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/email_table_command_as_argument.pl texinfo-6.3/tp/t/results/converters_tests/email_table_command_as_argument.pl
*** texinfo-6.1/tp/t/results/converters_tests/email_table_command_as_argument.pl	2016-01-22 07:50:17.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/email_table_command_as_argument.pl	2016-08-02 18:44:56.000000000 +0100
***************
*** 22,25 ****
--- 22,26 ----
              {
                'cmdname' => 'email',
+               'contents' => [],
                'line_nr' => {
                  'file_name' => '',
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/footnote_no_number.pl texinfo-6.3/tp/t/results/converters_tests/footnote_no_number.pl
*** texinfo-6.1/tp/t/results/converters_tests/footnote_no_number.pl	2016-01-22 07:50:17.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/footnote_no_number.pl	2016-08-02 18:44:55.000000000 +0100
***************
*** 75,85 ****
                'cmdname' => 'footnote',
                'contents' => [],
-               'extra' => {
-                 'spaces_before_argument' => {
-                   'parent' => {},
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
-                 }
-               },
                'line_nr' => {
                  'file_name' => '',
--- 75,78 ----
***************
*** 131,141 ****
                'cmdname' => 'footnote',
                'contents' => [],
-               'extra' => {
-                 'spaces_before_argument' => {
-                   'parent' => {},
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
-                 }
-               },
                'line_nr' => {
                  'file_name' => '',
--- 124,127 ----
***************
*** 189,193 ****
  $result_trees{'footnote_no_number'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'footnote_no_number'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'footnote_no_number'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'footnote_no_number'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
- $result_trees{'footnote_no_number'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'footnote_no_number'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'footnote_no_number'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'footnote_no_number'}{'contents'}[1]{'contents'}[1];
  $result_trees{'footnote_no_number'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'footnote_no_number'}{'contents'}[1]{'contents'}[1];
--- 175,178 ----
***************
*** 198,202 ****
  $result_trees{'footnote_no_number'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'footnote_no_number'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'footnote_no_number'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'footnote_no_number'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
- $result_trees{'footnote_no_number'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'footnote_no_number'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'footnote_no_number'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'footnote_no_number'}{'contents'}[1]{'contents'}[3];
  $result_trees{'footnote_no_number'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'footnote_no_number'}{'contents'}[1]{'contents'}[3];
--- 183,186 ----
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/footnote_no_number_separate.pl texinfo-6.3/tp/t/results/converters_tests/footnote_no_number_separate.pl
*** texinfo-6.1/tp/t/results/converters_tests/footnote_no_number_separate.pl	2016-01-22 07:50:17.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/footnote_no_number_separate.pl	2016-08-02 18:44:55.000000000 +0100
***************
*** 75,85 ****
                'cmdname' => 'footnote',
                'contents' => [],
-               'extra' => {
-                 'spaces_before_argument' => {
-                   'parent' => {},
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
-                 }
-               },
                'line_nr' => {
                  'file_name' => '',
--- 75,78 ----
***************
*** 131,141 ****
                'cmdname' => 'footnote',
                'contents' => [],
-               'extra' => {
-                 'spaces_before_argument' => {
-                   'parent' => {},
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
-                 }
-               },
                'line_nr' => {
                  'file_name' => '',
--- 124,127 ----
***************
*** 189,193 ****
  $result_trees{'footnote_no_number_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'footnote_no_number_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'footnote_no_number_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'footnote_no_number_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
- $result_trees{'footnote_no_number_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'footnote_no_number_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'footnote_no_number_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'footnote_no_number_separate'}{'contents'}[1]{'contents'}[1];
  $result_trees{'footnote_no_number_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'footnote_no_number_separate'}{'contents'}[1]{'contents'}[1];
--- 175,178 ----
***************
*** 198,202 ****
  $result_trees{'footnote_no_number_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'footnote_no_number_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'footnote_no_number_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'footnote_no_number_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
- $result_trees{'footnote_no_number_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'footnote_no_number_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'footnote_no_number_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'footnote_no_number_separate'}{'contents'}[1]{'contents'}[3];
  $result_trees{'footnote_no_number_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'footnote_no_number_separate'}{'contents'}[1]{'contents'}[3];
--- 183,186 ----
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/image_extension.pl texinfo-6.3/tp/t/results/converters_tests/image_extension.pl
*** texinfo-6.1/tp/t/results/converters_tests/image_extension.pl	2016-01-22 07:50:16.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/image_extension.pl	2016-08-02 18:44:55.000000000 +0100
***************
*** 59,67 ****
              {}
            ]
!         ],
!         'spaces_before_argument' => {
!           'text' => '',
!           'type' => 'empty_spaces_before_argument'
!         }
        },
        'line_nr' => {
--- 59,63 ----
              {}
            ]
!         ]
        },
        'line_nr' => {
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/image_formatting.pl texinfo-6.3/tp/t/results/converters_tests/image_formatting.pl
*** texinfo-6.1/tp/t/results/converters_tests/image_formatting.pl	2016-01-22 07:50:16.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/image_formatting.pl	2016-08-02 18:44:55.000000000 +0100
***************
*** 112,120 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 112,116 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 201,209 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 197,201 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 296,304 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 288,292 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 397,405 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 385,389 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 504,512 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 488,492 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 632,640 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 612,616 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 740,748 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 716,720 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 976,984 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 948,952 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 1010,1018 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 978,982 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 1047,1055 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 1011,1015 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 1147,1155 ****
                          {}
                        ]
!                     ],
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {},
--- 1107,1111 ----
                          {}
                        ]
!                     ]
                    },
                    'line_nr' => {},
***************
*** 1236,1244 ****
                          {}
                        ]
!                     ],
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {},
--- 1192,1196 ----
                          {}
                        ]
!                     ]
                    },
                    'line_nr' => {},
***************
*** 1331,1339 ****
                          {}
                        ]
!                     ],
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {},
--- 1283,1287 ----
                          {}
                        ]
!                     ]
                    },
                    'line_nr' => {},
***************
*** 1432,1440 ****
                          {}
                        ]
!                     ],
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {},
--- 1380,1384 ----
                          {}
                        ]
!                     ]
                    },
                    'line_nr' => {},
***************
*** 1539,1547 ****
                          {}
                        ]
!                     ],
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {},
--- 1483,1487 ----
                          {}
                        ]
!                     ]
                    },
                    'line_nr' => {},
***************
*** 1667,1675 ****
                          {}
                        ]
!                     ],
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {},
--- 1607,1611 ----
                          {}
                        ]
!                     ]
                    },
                    'line_nr' => {},
***************
*** 1775,1783 ****
                          {}
                        ]
!                     ],
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {},
--- 1711,1715 ----
                          {}
                        ]
!                     ]
                    },
                    'line_nr' => {},
***************
*** 2011,2019 ****
                          {}
                        ]
!                     ],
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {},
--- 1943,1947 ----
                          {}
                        ]
!                     ]
                    },
                    'line_nr' => {},
***************
*** 2045,2053 ****
                          {}
                        ]
!                     ],
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {
--- 1973,1977 ----
                          {}
                        ]
!                     ]
                    },
                    'line_nr' => {
***************
*** 2082,2090 ****
                          {}
                        ]
!                     ],
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {},
--- 2006,2010 ----
                          {}
                        ]
!                     ]
                    },
                    'line_nr' => {},
***************
*** 2204,2212 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 2124,2128 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 2280,2288 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 2196,2200 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/image_with_spaces.pl texinfo-6.3/tp/t/results/converters_tests/image_with_spaces.pl
*** texinfo-6.1/tp/t/results/converters_tests/image_with_spaces.pl	2016-01-22 07:50:16.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/image_with_spaces.pl	2016-08-02 18:44:55.000000000 +0100
***************
*** 53,61 ****
              {}
            ]
!         ],
!         'spaces_before_argument' => {
!           'text' => '',
!           'type' => 'empty_spaces_before_argument'
!         }
        },
        'line_nr' => {
--- 53,57 ----
              {}
            ]
!         ]
        },
        'line_nr' => {
***************
*** 118,126 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 114,118 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/index_entry_in_preformatted.pl texinfo-6.3/tp/t/results/converters_tests/index_entry_in_preformatted.pl
*** texinfo-6.1/tp/t/results/converters_tests/index_entry_in_preformatted.pl	2016-01-22 07:50:17.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/index_entry_in_preformatted.pl	2016-08-02 18:44:56.000000000 +0100
***************
*** 100,104 ****
                        'index_at_command' => 'cindex',
                        'index_name' => 'cp',
-                       'index_prefix' => 'c',
                        'index_type_command' => 'cindex',
                        'key' => 'first',
--- 100,103 ----
***************
*** 183,187 ****
                        'index_at_command' => 'cindex',
                        'index_name' => 'cp',
-                       'index_prefix' => 'c',
                        'index_type_command' => 'cindex',
                        'key' => 'other',
--- 182,185 ----
***************
*** 243,247 ****
                        'index_at_command' => 'cindex',
                        'index_name' => 'cp',
-                       'index_prefix' => 'c',
                        'index_type_command' => 'cindex',
                        'key' => 'last',
--- 241,244 ----
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/inline.pl texinfo-6.3/tp/t/results/converters_tests/inline.pl
*** texinfo-6.1/tp/t/results/converters_tests/inline.pl	2016-01-22 07:50:16.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/inline.pl	2016-08-02 18:44:54.000000000 +0100
***************
*** 31,34 ****
--- 31,35 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 54,62 ****
                ]
              ],
!             'format' => 'html',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 55,60 ----
                ]
              ],
!             'expand_index' => 1,
!             'format' => 'html'
            },
            'line_nr' => {
***************
*** 87,90 ****
--- 85,89 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 110,118 ****
                ]
              ],
!             'format' => 'plaintext',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 109,114 ----
                ]
              ],
!             'expand_index' => 1,
!             'format' => 'plaintext'
            },
            'line_nr' => {
***************
*** 143,146 ****
--- 139,143 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 166,174 ****
                ]
              ],
!             'format' => 'xml',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 163,168 ----
                ]
              ],
!             'expand_index' => 1,
!             'format' => 'xml'
            },
            'line_nr' => {
***************
*** 199,202 ****
--- 193,197 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 222,230 ****
                ]
              ],
!             'format' => 'docbook',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 217,222 ----
                ]
              ],
!             'expand_index' => 1,
!             'format' => 'docbook'
            },
            'line_nr' => {
***************
*** 253,316 ****
              },
              {
!               'contents' => [
!                 {
!                   'text' => ' ',
!                   'type' => 'empty_spaces_before_argument'
!                 },
!                 {
!                   'parent' => {},
!                   'text' => '$\\underline'
!                 },
!                 {
!                   'contents' => [
!                     {
!                       'parent' => {},
!                       'text' => 'a < b '
!                     },
!                     {
!                       'args' => [
!                         {
!                           'contents' => [
!                             {
!                               'parent' => {},
!                               'text' => 'tex \\hbox'
!                             },
!                             {
!                               'contents' => [
!                                 {
!                                   'parent' => {},
!                                   'text' => ' code '
!                                 }
!                               ],
!                               'line_nr' => {
!                                 'file_name' => '',
!                                 'line_nr' => 6,
!                                 'macro' => ''
!                               },
!                               'parent' => {},
!                               'type' => 'bracketed'
!                             }
!                           ],
!                           'parent' => {},
!                           'type' => 'brace_command_arg'
!                         }
!                       ],
!                       'cmdname' => 'code',
!                       'contents' => [],
!                       'line_nr' => {},
!                       'parent' => {}
!                     }
!                   ],
!                   'line_nr' => {},
!                   'parent' => {},
!                   'type' => 'bracketed'
!                 },
!                 {
!                   'parent' => {},
!                   'text' => '$ ``'
!                 }
!               ],
                'parent' => {},
!               'type' => 'brace_command_arg'
              }
            ],
--- 245,251 ----
              },
              {
!               'contents' => [],
                'parent' => {},
!               'type' => 'elided'
              }
            ],
***************
*** 322,338 ****
                  {}
                ],
!               [
!                 {},
!                 {},
!                 {}
!               ]
              ],
!             'format' => 'tex',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
-           'line_nr' => {},
            'parent' => {}
          },
--- 257,269 ----
                  {}
                ],
!               undef
              ],
!             'format' => 'tex'
!           },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 6,
!             'macro' => ''
            },
            'parent' => {}
          },
***************
*** 375,378 ****
--- 306,310 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 398,406 ****
                ]
              ],
!             'format' => 'html',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 330,335 ----
                ]
              ],
!             'expand_index' => 1,
!             'format' => 'html'
            },
            'line_nr' => {
***************
*** 431,434 ****
--- 360,364 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 454,462 ****
                ]
              ],
!             'format' => 'plaintext',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 384,389 ----
                ]
              ],
!             'expand_index' => 1,
!             'format' => 'plaintext'
            },
            'line_nr' => {
***************
*** 487,490 ****
--- 414,418 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 510,518 ****
                ]
              ],
!             'format' => 'xml',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 438,443 ----
                ]
              ],
!             'expand_index' => 1,
!             'format' => 'xml'
            },
            'line_nr' => {
***************
*** 543,546 ****
--- 468,472 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 566,574 ****
                ]
              ],
!             'format' => 'docbook',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 492,497 ----
                ]
              ],
!             'expand_index' => 1,
!             'format' => 'docbook'
            },
            'line_nr' => {
***************
*** 597,660 ****
              },
              {
!               'contents' => [
!                 {
!                   'text' => ' ',
!                   'type' => 'empty_spaces_before_argument'
!                 },
!                 {
!                   'parent' => {},
!                   'text' => 'raw $\\underline'
!                 },
!                 {
!                   'contents' => [
!                     {
!                       'parent' => {},
!                       'text' => 'a < b '
!                     },
!                     {
!                       'args' => [
!                         {
!                           'contents' => [
!                             {
!                               'parent' => {},
!                               'text' => 'tex \\hbox'
!                             },
!                             {
!                               'contents' => [
!                                 {
!                                   'parent' => {},
!                                   'text' => ' code '
!                                 }
!                               ],
!                               'line_nr' => {
!                                 'file_name' => '',
!                                 'line_nr' => 13,
!                                 'macro' => ''
!                               },
!                               'parent' => {},
!                               'type' => 'bracketed'
!                             }
!                           ],
!                           'parent' => {},
!                           'type' => 'brace_command_arg'
!                         }
!                       ],
!                       'cmdname' => 'code',
!                       'contents' => [],
!                       'line_nr' => {},
!                       'parent' => {}
!                     }
!                   ],
!                   'line_nr' => {},
!                   'parent' => {},
!                   'type' => 'bracketed'
!                 },
!                 {
!                   'parent' => {},
!                   'text' => '$ ``'
!                 }
!               ],
                'parent' => {},
!               'type' => 'brace_command_arg'
              }
            ],
--- 520,526 ----
              },
              {
!               'contents' => [],
                'parent' => {},
!               'type' => 'elided'
              }
            ],
***************
*** 666,682 ****
                  {}
                ],
!               [
!                 {},
!                 {},
!                 {}
!               ]
              ],
!             'format' => 'tex',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
-           'line_nr' => {},
            'parent' => {}
          },
--- 532,544 ----
                  {}
                ],
!               undef
              ],
!             'format' => 'tex'
!           },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 13,
!             'macro' => ''
            },
            'parent' => {}
          },
***************
*** 696,699 ****
--- 558,562 ----
  $result_trees{'inline'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'inline'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[0];
+ $result_trees{'inline'}{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'inline'}{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'inline'}{'contents'}[1]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[0];
***************
*** 704,707 ****
--- 567,571 ----
  $result_trees{'inline'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'inline'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[2];
+ $result_trees{'inline'}{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[2]{'args'}[1];
  $result_trees{'inline'}{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[2]{'args'}[1];
  $result_trees{'inline'}{'contents'}[1]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[2];
***************
*** 712,715 ****
--- 576,580 ----
  $result_trees{'inline'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[4]{'args'}[0];
  $result_trees{'inline'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[4];
+ $result_trees{'inline'}{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'inline'}{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'inline'}{'contents'}[1]{'contents'}[4]{'args'}[1]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[4];
***************
*** 720,723 ****
--- 585,589 ----
  $result_trees{'inline'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[6]{'args'}[0];
  $result_trees{'inline'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[6];
+ $result_trees{'inline'}{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[6]{'args'}[1];
  $result_trees{'inline'}{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[6]{'args'}[1];
  $result_trees{'inline'}{'contents'}[1]{'contents'}[6]{'args'}[1]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[6];
***************
*** 728,748 ****
  $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[0];
  $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[8];
- $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1];
- $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2];
- $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0];
- $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1];
- $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0];
- $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1];
- $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'line_nr'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
- $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2];
- $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
- $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1];
- $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1];
  $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'parent'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[8];
  $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0];
- $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'extra'}{'brace_command_contents'}[1][0] = $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[1];
- $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'extra'}{'brace_command_contents'}[1][1] = $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2];
- $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'extra'}{'brace_command_contents'}[1][2] = $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[3];
- $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'parent'} = $result_trees{'inline'}{'contents'}[1];
  $result_trees{'inline'}{'contents'}[1]{'contents'}[9]{'parent'} = $result_trees{'inline'}{'contents'}[1];
--- 594,599 ----
***************
*** 752,755 ****
--- 603,607 ----
  $result_trees{'inline'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[0]{'args'}[0];
  $result_trees{'inline'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[0];
+ $result_trees{'inline'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[0]{'args'}[1];
  $result_trees{'inline'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[0]{'args'}[1];
  $result_trees{'inline'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[0];
***************
*** 760,763 ****
--- 612,616 ----
  $result_trees{'inline'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[2]{'args'}[0];
  $result_trees{'inline'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[2];
+ $result_trees{'inline'}{'contents'}[4]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[2]{'args'}[1];
  $result_trees{'inline'}{'contents'}[4]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[2]{'args'}[1];
  $result_trees{'inline'}{'contents'}[4]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[2];
***************
*** 768,771 ****
--- 621,625 ----
  $result_trees{'inline'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[4]{'args'}[0];
  $result_trees{'inline'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[4];
+ $result_trees{'inline'}{'contents'}[4]{'contents'}[4]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[4]{'args'}[1];
  $result_trees{'inline'}{'contents'}[4]{'contents'}[4]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[4]{'args'}[1];
  $result_trees{'inline'}{'contents'}[4]{'contents'}[4]{'args'}[1]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[4];
***************
*** 776,779 ****
--- 630,634 ----
  $result_trees{'inline'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[6]{'args'}[0];
  $result_trees{'inline'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[6];
+ $result_trees{'inline'}{'contents'}[4]{'contents'}[6]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[6]{'args'}[1];
  $result_trees{'inline'}{'contents'}[4]{'contents'}[6]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[6]{'args'}[1];
  $result_trees{'inline'}{'contents'}[4]{'contents'}[6]{'args'}[1]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[6];
***************
*** 784,804 ****
  $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[0];
  $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[8];
- $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1];
- $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2];
- $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0];
- $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1];
- $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0];
- $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1];
- $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'line_nr'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
- $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2];
- $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
- $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1];
- $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1];
  $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'parent'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[8];
  $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'}[0];
- $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'extra'}{'brace_command_contents'}[1][0] = $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[1];
- $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'extra'}{'brace_command_contents'}[1][1] = $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2];
- $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'extra'}{'brace_command_contents'}[1][2] = $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[3];
- $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'line_nr'} = $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'parent'} = $result_trees{'inline'}{'contents'}[4];
  $result_trees{'inline'}{'contents'}[4]{'contents'}[9]{'parent'} = $result_trees{'inline'}{'contents'}[4];
--- 639,644 ----
***************
*** 810,814 ****
  @inlinefmt{xml, <para>xml</para> ``},
  @inlinefmt{docbook, <emphasis>docbook</emphasis> ``}, 
! @inlinefmt{tex, $\\underline{a < b @code{tex \\hbox{ code }}}$ ``}
  
  
--- 650,654 ----
  @inlinefmt{xml, <para>xml</para> ``},
  @inlinefmt{docbook, <emphasis>docbook</emphasis> ``}, 
! @inlinefmt{tex,}
  
  
***************
*** 817,821 ****
  @inlineraw{xml, raw <para>xml</para> ``},
  @inlineraw{docbook, raw <emphasis>docbook</emphasis> ``}, 
! @inlineraw{tex, raw $\\underline{a < b @code{tex \\hbox{ code }}}$ ``}
  ';
  
--- 657,661 ----
  @inlineraw{xml, raw <para>xml</para> ``},
  @inlineraw{docbook, raw <emphasis>docbook</emphasis> ``}, 
! @inlineraw{tex,}
  ';
  
***************
*** 867,871 ****
  &lt;para&gt;xml&lt;/para&gt; &textldquo;,
  <inlinefmt><inlinefmtformat>docbook</inlinefmtformat><inlinefmtcontent spaces=" ">&lt;emphasis&gt;docbook&lt;/emphasis&gt; &textldquo;</inlinefmtcontent></inlinefmt>, 
! <inlinefmt><inlinefmtformat>tex</inlinefmtformat><inlinefmtcontent spaces=" ">$\\underline{a &lt; b <code>tex \\hbox{ code }</code>}$ &textldquo;</inlinefmtcontent></inlinefmt>
  </para>
  
--- 707,711 ----
  &lt;para&gt;xml&lt;/para&gt; &textldquo;,
  <inlinefmt><inlinefmtformat>docbook</inlinefmtformat><inlinefmtcontent spaces=" ">&lt;emphasis&gt;docbook&lt;/emphasis&gt; &textldquo;</inlinefmtcontent></inlinefmt>, 
! <inlinefmt><inlinefmtformat>tex</inlinefmtformat></inlinefmt>
  </para>
  
***************
*** 874,878 ****
  raw <para>xml</para> ``,
  <inlineraw><inlinerawformat>docbook</inlinerawformat><inlinerawcontent spaces=" ">raw &lt;emphasis&gt;docbook&lt;/emphasis&gt; &textldquo;</inlinerawcontent></inlineraw>, 
! <inlineraw><inlinerawformat>tex</inlinerawformat><inlinerawcontent spaces=" ">raw $\\underline{a &lt; b <code>tex \\hbox{ code }</code>}$ &textldquo;</inlinerawcontent></inlineraw>
  </para>';
  
--- 714,718 ----
  raw <para>xml</para> ``,
  <inlineraw><inlinerawformat>docbook</inlinerawformat><inlinerawcontent spaces=" ">raw &lt;emphasis&gt;docbook&lt;/emphasis&gt; &textldquo;</inlinerawcontent></inlineraw>, 
! <inlineraw><inlinerawformat>tex</inlinerawformat></inlineraw>
  </para>';
  
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/inline_expand_tex.pl texinfo-6.3/tp/t/results/converters_tests/inline_expand_tex.pl
*** texinfo-6.1/tp/t/results/converters_tests/inline_expand_tex.pl	2016-01-22 07:50:16.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/inline_expand_tex.pl	2016-08-02 18:44:54.000000000 +0100
***************
*** 29,44 ****
              },
              {
!               'contents' => [
!                 {
!                   'text' => ' ',
!                   'type' => 'empty_spaces_before_argument'
!                 },
!                 {
!                   'parent' => {},
!                   'text' => '<blink>html</blink> ``'
!                 }
!               ],
                'parent' => {},
!               'type' => 'brace_command_arg'
              }
            ],
--- 29,35 ----
              },
              {
!               'contents' => [],
                'parent' => {},
!               'type' => 'elided'
              }
            ],
***************
*** 50,62 ****
                  {}
                ],
!               [
!                 {}
!               ]
              ],
!             'format' => 'html',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 41,47 ----
                  {}
                ],
!               undef
              ],
!             'format' => 'html'
            },
            'line_nr' => {
***************
*** 85,100 ****
              },
              {
!               'contents' => [
!                 {
!                   'text' => ' ',
!                   'type' => 'empty_spaces_before_argument'
!                 },
!                 {
!                   'parent' => {},
!                   'text' => 'plaintext ``'
!                 }
!               ],
                'parent' => {},
!               'type' => 'brace_command_arg'
              }
            ],
--- 70,76 ----
              },
              {
!               'contents' => [],
                'parent' => {},
!               'type' => 'elided'
              }
            ],
***************
*** 106,118 ****
                  {}
                ],
!               [
!                 {}
!               ]
              ],
!             'format' => 'plaintext',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 82,88 ----
                  {}
                ],
!               undef
              ],
!             'format' => 'plaintext'
            },
            'line_nr' => {
***************
*** 141,156 ****
              },
              {
!               'contents' => [
!                 {
!                   'text' => ' ',
!                   'type' => 'empty_spaces_before_argument'
!                 },
!                 {
!                   'parent' => {},
!                   'text' => '<para>xml</para> ``'
!                 }
!               ],
                'parent' => {},
!               'type' => 'brace_command_arg'
              }
            ],
--- 111,117 ----
              },
              {
!               'contents' => [],
                'parent' => {},
!               'type' => 'elided'
              }
            ],
***************
*** 162,174 ****
                  {}
                ],
!               [
!                 {}
!               ]
              ],
!             'format' => 'xml',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 123,129 ----
                  {}
                ],
!               undef
              ],
!             'format' => 'xml'
            },
            'line_nr' => {
***************
*** 197,212 ****
              },
              {
!               'contents' => [
!                 {
!                   'text' => ' ',
!                   'type' => 'empty_spaces_before_argument'
!                 },
!                 {
!                   'parent' => {},
!                   'text' => '<emphasis>docbook</emphasis> ``'
!                 }
!               ],
                'parent' => {},
!               'type' => 'brace_command_arg'
              }
            ],
--- 152,158 ----
              },
              {
!               'contents' => [],
                'parent' => {},
!               'type' => 'elided'
              }
            ],
***************
*** 218,230 ****
                  {}
                ],
!               [
!                 {}
!               ]
              ],
!             'format' => 'docbook',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 164,170 ----
                  {}
                ],
!               undef
              ],
!             'format' => 'docbook'
            },
            'line_nr' => {
***************
*** 255,258 ****
--- 195,199 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 302,310 ****
              ],
              'expand_index' => 1,
!             'format' => 'tex',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 243,247 ----
              ],
              'expand_index' => 1,
!             'format' => 'tex'
            },
            'line_nr' => {},
***************
*** 347,362 ****
              },
              {
!               'contents' => [
!                 {
!                   'text' => ' ',
!                   'type' => 'empty_spaces_before_argument'
!                 },
!                 {
!                   'parent' => {},
!                   'text' => 'raw <blink>html</blink> ``'
!                 }
!               ],
                'parent' => {},
!               'type' => 'brace_command_arg'
              }
            ],
--- 284,290 ----
              },
              {
!               'contents' => [],
                'parent' => {},
!               'type' => 'elided'
              }
            ],
***************
*** 368,380 ****
                  {}
                ],
!               [
!                 {}
!               ]
              ],
!             'format' => 'html',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 296,302 ----
                  {}
                ],
!               undef
              ],
!             'format' => 'html'
            },
            'line_nr' => {
***************
*** 403,418 ****
              },
              {
!               'contents' => [
!                 {
!                   'text' => ' ',
!                   'type' => 'empty_spaces_before_argument'
!                 },
!                 {
!                   'parent' => {},
!                   'text' => 'raw plaintext ``'
!                 }
!               ],
                'parent' => {},
!               'type' => 'brace_command_arg'
              }
            ],
--- 325,331 ----
              },
              {
!               'contents' => [],
                'parent' => {},
!               'type' => 'elided'
              }
            ],
***************
*** 424,436 ****
                  {}
                ],
!               [
!                 {}
!               ]
              ],
!             'format' => 'plaintext',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 337,343 ----
                  {}
                ],
!               undef
              ],
!             'format' => 'plaintext'
            },
            'line_nr' => {
***************
*** 459,474 ****
              },
              {
!               'contents' => [
!                 {
!                   'text' => ' ',
!                   'type' => 'empty_spaces_before_argument'
!                 },
!                 {
!                   'parent' => {},
!                   'text' => 'raw <para>xml</para> ``'
!                 }
!               ],
                'parent' => {},
!               'type' => 'brace_command_arg'
              }
            ],
--- 366,372 ----
              },
              {
!               'contents' => [],
                'parent' => {},
!               'type' => 'elided'
              }
            ],
***************
*** 480,492 ****
                  {}
                ],
!               [
!                 {}
!               ]
              ],
!             'format' => 'xml',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 378,384 ----
                  {}
                ],
!               undef
              ],
!             'format' => 'xml'
            },
            'line_nr' => {
***************
*** 515,530 ****
              },
              {
!               'contents' => [
!                 {
!                   'text' => ' ',
!                   'type' => 'empty_spaces_before_argument'
!                 },
!                 {
!                   'parent' => {},
!                   'text' => 'raw <emphasis>docbook</emphasis> ``'
!                 }
!               ],
                'parent' => {},
!               'type' => 'brace_command_arg'
              }
            ],
--- 407,413 ----
              },
              {
!               'contents' => [],
                'parent' => {},
!               'type' => 'elided'
              }
            ],
***************
*** 536,548 ****
                  {}
                ],
!               [
!                 {}
!               ]
              ],
!             'format' => 'docbook',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 419,425 ----
                  {}
                ],
!               undef
              ],
!             'format' => 'docbook'
            },
            'line_nr' => {
***************
*** 573,576 ****
--- 450,454 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 647,655 ****
              ],
              'expand_index' => 1,
!             'format' => 'tex',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 525,529 ----
              ],
              'expand_index' => 1,
!             'format' => 'tex'
            },
            'line_nr' => {},
***************
*** 671,706 ****
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0];
- $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
- $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0] = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2];
- $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2]{'args'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
- $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2]{'extra'}{'brace_command_contents'}[1][0] = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4]{'args'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4];
- $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4]{'args'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
- $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4]{'extra'}{'brace_command_contents'}[1][0] = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6]{'args'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6];
- $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6]{'args'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6]{'args'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0];
- $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6]{'extra'}{'brace_command_contents'}[1][0] = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[7]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[8]{'args'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[8];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[8]{'args'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'args'}[0];
--- 545,573 ----
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4]{'args'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4]{'args'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6]{'args'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6]{'args'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[7]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[8]{'args'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[8];
+ $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[8]{'args'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[8]{'args'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'args'}[0];
***************
*** 719,754 ****
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0]{'args'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0];
- $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0]{'args'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
- $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0] = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2]{'args'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2];
- $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2]{'args'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0];
- $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2]{'extra'}{'brace_command_contents'}[1][0] = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2]{'args'}[1]{'contents'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[3]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4]{'args'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4];
- $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4]{'args'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4]{'args'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0];
- $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4]{'extra'}{'brace_command_contents'}[1][0] = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4]{'args'}[1]{'contents'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[5]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6]{'args'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6];
- $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6]{'args'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6]{'args'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'}[0];
- $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6]{'extra'}{'brace_command_contents'}[1][0] = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6]{'args'}[1]{'contents'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[7]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[8]{'args'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[8];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[8]{'args'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2];
--- 586,614 ----
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0]{'args'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2]{'args'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[3]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4]{'args'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4]{'args'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[5]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6]{'args'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6]{'args'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[7]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[8]{'args'}[0];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[8];
+ $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[8]{'args'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[8]{'args'}[1];
  $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2];
***************
*** 773,787 ****
  
  $result_texis{'inline_expand_tex'} = '
! @inlinefmt{html, <blink>html</blink> ``}, 
! @inlinefmt{plaintext, plaintext ``}, 
! @inlinefmt{xml, <para>xml</para> ``},
! @inlinefmt{docbook, <emphasis>docbook</emphasis> ``}, 
  @inlinefmt{tex, $\\underlinea < b @code{tex \\hbox code }}$ ``
  
  
! @inlineraw{html, raw <blink>html</blink> ``}, 
! @inlineraw{plaintext, raw plaintext ``}, 
! @inlineraw{xml, raw <para>xml</para> ``},
! @inlineraw{docbook, raw <emphasis>docbook</emphasis> ``}, 
  @inlineraw{tex, raw $\\underline{a < b @code{tex \\hbox{ code }}}$ ``}
  ';
--- 633,647 ----
  
  $result_texis{'inline_expand_tex'} = '
! @inlinefmt{html,}, 
! @inlinefmt{plaintext,}, 
! @inlinefmt{xml,},
! @inlinefmt{docbook,}, 
  @inlinefmt{tex, $\\underlinea < b @code{tex \\hbox code }}$ ``
  
  
! @inlineraw{html,}, 
! @inlineraw{plaintext,}, 
! @inlineraw{xml,},
! @inlineraw{docbook,}, 
  @inlineraw{tex, raw $\\underline{a < b @code{tex \\hbox{ code }}}$ ``}
  ';
***************
*** 867,881 ****
  
  $result_converted{'xml'}->{'inline_expand_tex'} = '
! <para><inlinefmt><inlinefmtformat>html</inlinefmtformat><inlinefmtcontent spaces=" ">&lt;blink&gt;html&lt;/blink&gt; &textldquo;</inlinefmtcontent></inlinefmt>, 
! <inlinefmt><inlinefmtformat>plaintext</inlinefmtformat><inlinefmtcontent spaces=" ">plaintext &textldquo;</inlinefmtcontent></inlinefmt>, 
! <inlinefmt><inlinefmtformat>xml</inlinefmtformat><inlinefmtcontent spaces=" ">&lt;para&gt;xml&lt;/para&gt; &textldquo;</inlinefmtcontent></inlinefmt>,
! <inlinefmt><inlinefmtformat>docbook</inlinefmtformat><inlinefmtcontent spaces=" ">&lt;emphasis&gt;docbook&lt;/emphasis&gt; &textldquo;</inlinefmtcontent></inlinefmt>, 
  $\\underlinea &lt; b <code>tex \\hbox code </code>$ &textldquo;
  </para>
  
! <para><inlineraw><inlinerawformat>html</inlinerawformat><inlinerawcontent spaces=" ">raw &lt;blink&gt;html&lt;/blink&gt; &textldquo;</inlinerawcontent></inlineraw>, 
! <inlineraw><inlinerawformat>plaintext</inlinerawformat><inlinerawcontent spaces=" ">raw plaintext &textldquo;</inlinerawcontent></inlineraw>, 
! <inlineraw><inlinerawformat>xml</inlinerawformat><inlinerawcontent spaces=" ">raw &lt;para&gt;xml&lt;/para&gt; &textldquo;</inlinerawcontent></inlineraw>,
! <inlineraw><inlinerawformat>docbook</inlinerawformat><inlinerawcontent spaces=" ">raw &lt;emphasis&gt;docbook&lt;/emphasis&gt; &textldquo;</inlinerawcontent></inlineraw>, 
  raw $\\underline{a < b <code>tex \\hbox{ code }</code>}$ ``
  </para>';
--- 727,741 ----
  
  $result_converted{'xml'}->{'inline_expand_tex'} = '
! <para><inlinefmt><inlinefmtformat>html</inlinefmtformat></inlinefmt>, 
! <inlinefmt><inlinefmtformat>plaintext</inlinefmtformat></inlinefmt>, 
! <inlinefmt><inlinefmtformat>xml</inlinefmtformat></inlinefmt>,
! <inlinefmt><inlinefmtformat>docbook</inlinefmtformat></inlinefmt>, 
  $\\underlinea &lt; b <code>tex \\hbox code </code>$ &textldquo;
  </para>
  
! <para><inlineraw><inlinerawformat>html</inlinerawformat></inlineraw>, 
! <inlineraw><inlinerawformat>plaintext</inlinerawformat></inlineraw>, 
! <inlineraw><inlinerawformat>xml</inlinerawformat></inlineraw>,
! <inlineraw><inlinerawformat>docbook</inlinerawformat></inlineraw>, 
  raw $\\underline{a < b <code>tex \\hbox{ code }</code>}$ ``
  </para>';
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/inlinefmtifelse.pl texinfo-6.3/tp/t/results/converters_tests/inlinefmtifelse.pl
*** texinfo-6.1/tp/t/results/converters_tests/inlinefmtifelse.pl	2016-01-22 07:50:16.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/inlinefmtifelse.pl	2016-08-02 18:44:55.000000000 +0100
***************
*** 25,29 ****
                'contents' => [],
                'parent' => {},
!               'type' => 'brace_command_arg'
              },
              {
--- 25,29 ----
                'contents' => [],
                'parent' => {},
!               'type' => 'elided'
              },
              {
***************
*** 51,59 ****
              ],
              'expand_index' => 2,
!             'format' => 'html',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 51,55 ----
              ],
              'expand_index' => 2,
!             'format' => 'html'
            },
            'line_nr' => {
***************
*** 82,93 ****
              },
              {
!               'contents' => [
!                 {
!                   'parent' => {},
!                   'text' => 'if html'
!                 }
!               ],
                'parent' => {},
!               'type' => 'brace_command_arg'
              },
              {
--- 78,84 ----
              },
              {
!               'contents' => [],
                'parent' => {},
!               'type' => 'elided'
              },
              {
***************
*** 109,115 ****
                  {}
                ],
!               [
!                 {}
!               ],
                [
                  {}
--- 100,104 ----
                  {}
                ],
!               undef,
                [
                  {}
***************
*** 117,125 ****
              ],
              'expand_index' => 2,
!             'format' => 'html',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 106,110 ----
              ],
              'expand_index' => 2,
!             'format' => 'html'
            },
            'line_nr' => {
***************
*** 160,169 ****
              },
              {
!               'contents' => [
!                 {
!                   'parent' => {},
!                   'text' => 'if plaintext no second arg'
!                 }
!               ],
                'parent' => {},
                'type' => 'brace_command_arg'
--- 145,154 ----
              },
              {
!               'contents' => [],
!               'parent' => {},
!               'type' => 'elided'
!             },
!             {
!               'contents' => [],
                'parent' => {},
                'type' => 'brace_command_arg'
***************
*** 177,189 ****
                  {}
                ],
!               [
!                 {}
!               ]
              ],
!             'format' => 'plaintext',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 162,170 ----
                  {}
                ],
!               undef,
!               undef
              ],
!             'expand_index' => 2,
!             'format' => 'plaintext'
            },
            'line_nr' => {
***************
*** 212,223 ****
              },
              {
!               'contents' => [
!                 {
!                   'parent' => {},
!                   'text' => 'if plaintext'
!                 }
!               ],
                'parent' => {},
!               'type' => 'brace_command_arg'
              },
              {
--- 193,199 ----
              },
              {
!               'contents' => [],
                'parent' => {},
!               'type' => 'elided'
              },
              {
***************
*** 239,245 ****
                  {}
                ],
!               [
!                 {}
!               ],
                [
                  {}
--- 215,219 ----
                  {}
                ],
!               undef,
                [
                  {}
***************
*** 247,255 ****
              ],
              'expand_index' => 2,
!             'format' => 'plaintext',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 221,225 ----
              ],
              'expand_index' => 2,
!             'format' => 'plaintext'
            },
            'line_nr' => {
***************
*** 290,301 ****
              },
              {
!               'contents' => [
!                 {
!                   'parent' => {},
!                   'text' => 'if xml empty second arg'
!                 }
!               ],
                'parent' => {},
!               'type' => 'brace_command_arg'
              },
              {
--- 260,266 ----
              },
              {
!               'contents' => [],
                'parent' => {},
!               'type' => 'elided'
              },
              {
***************
*** 312,326 ****
                  {}
                ],
!               [
!                 {}
!               ],
                undef
              ],
              'expand_index' => 2,
!             'format' => 'xml',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 277,285 ----
                  {}
                ],
!               undef,
                undef
              ],
              'expand_index' => 2,
!             'format' => 'xml'
            },
            'line_nr' => {
***************
*** 353,356 ****
--- 312,316 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 370,394 ****
              },
              {
!               'contents' => [
!                 {
!                   'text' => ' ',
!                   'type' => 'empty_spaces_before_argument'
!                 },
!                 {
!                   'parent' => {},
!                   'text' => 'if docbook spaces'
!                 },
!                 {
!                   'parent' => {},
!                   'text' => ' ',
!                   'type' => 'spaces_at_end'
!                 }
!               ],
                'parent' => {},
!               'type' => 'brace_command_arg'
              },
              {
                'contents' => [
                  {
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
--- 330,341 ----
              },
              {
!               'contents' => [],
                'parent' => {},
!               'type' => 'elided'
              },
              {
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 410,416 ****
                  {}
                ],
!               [
!                 {}
!               ],
                [
                  {}
--- 357,361 ----
                  {}
                ],
!               undef,
                [
                  {}
***************
*** 450,453 ****
--- 395,399 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 467,491 ****
              },
              {
!               'contents' => [
!                 {
!                   'text' => ' ',
!                   'type' => 'empty_spaces_before_argument'
!                 },
!                 {
!                   'parent' => {},
!                   'text' => 'if tex spaces'
!                 },
!                 {
!                   'parent' => {},
!                   'text' => ' ',
!                   'type' => 'spaces_at_end'
!                 }
!               ],
                'parent' => {},
!               'type' => 'brace_command_arg'
              },
              {
                'contents' => [
                  {
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
--- 413,424 ----
              },
              {
!               'contents' => [],
                'parent' => {},
!               'type' => 'elided'
              },
              {
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 507,513 ****
                  {}
                ],
!               [
!                 {}
!               ],
                [
                  {}
--- 440,444 ----
                  {}
                ],
!               undef,
                [
                  {}
***************
*** 555,566 ****
              },
              {
!               'contents' => [
!                 {
!                   'parent' => {},
!                   'text' => 'if docbook'
!                 }
!               ],
                'parent' => {},
!               'type' => 'brace_command_arg'
              },
              {
--- 486,492 ----
              },
              {
!               'contents' => [],
                'parent' => {},
!               'type' => 'elided'
              },
              {
***************
*** 582,588 ****
                  {}
                ],
!               [
!                 {}
!               ],
                [
                  {}
--- 508,512 ----
                  {}
                ],
!               undef,
                [
                  {}
***************
*** 590,598 ****
              ],
              'expand_index' => 2,
!             'format' => 'docbook',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 514,518 ----
              ],
              'expand_index' => 2,
!             'format' => 'docbook'
            },
            'line_nr' => {
***************
*** 633,644 ****
              },
              {
!               'contents' => [
!                 {
!                   'parent' => {},
!                   'text' => 'if tex'
!                 }
!               ],
                'parent' => {},
!               'type' => 'brace_command_arg'
              },
              {
--- 553,559 ----
              },
              {
!               'contents' => [],
                'parent' => {},
!               'type' => 'elided'
              },
              {
***************
*** 660,666 ****
                  {}
                ],
!               [
!                 {}
!               ],
                [
                  {}
--- 575,579 ----
                  {}
                ],
!               undef,
                [
                  {}
***************
*** 668,676 ****
              ],
              'expand_index' => 2,
!             'format' => 'tex',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 581,585 ----
              ],
              'expand_index' => 2,
!             'format' => 'tex'
            },
            'line_nr' => {
***************
*** 704,713 ****
  $result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2];
- $result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'args'}[1];
  $result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2];
  $result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'args'}[2];
  $result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'args'}[2]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2];
  $result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
- $result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'extra'}{'brace_command_contents'}[1][0] = $result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'extra'}{'brace_command_contents'}[2][0] = $result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'args'}[2]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[0];
--- 613,620 ----
***************
*** 717,734 ****
  $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0]{'args'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0];
- $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0]{'args'}[1];
  $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
- $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0] = $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[2];
  $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[2];
  $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2];
- $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[1];
  $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2];
  $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[2];
  $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[2]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2];
  $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
- $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'extra'}{'brace_command_contents'}[1][0] = $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[1]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'extra'}{'brace_command_contents'}[2][0] = $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[2]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[2];
--- 624,638 ----
  $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0]{'args'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0];
+ $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0]{'args'}[2]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[2];
  $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[2];
  $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2];
  $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2];
  $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[2];
  $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[2]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2];
  $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'extra'}{'brace_command_contents'}[2][0] = $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[2]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[2];
***************
*** 738,760 ****
  $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'args'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0];
- $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'args'}[1];
  $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'args'}[2]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
- $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0] = $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[4];
  $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[4];
  $result_trees{'inlinefmtifelse'}{'contents'}[4]{'parent'} = $result_trees{'inlinefmtifelse'};
  $result_trees{'inlinefmtifelse'}{'contents'}[5]{'parent'} = $result_trees{'inlinefmtifelse'};
  $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0];
- $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[1];
- $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[1];
  $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[2];
  $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[2]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[1];
- $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0] = $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[1]{'contents'}[1];
  $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'extra'}{'brace_command_contents'}[2][0] = $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[2]{'contents'}[1];
  $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'extra'}{'spaces_before_argument'} = $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
--- 642,661 ----
  $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'args'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'args'}[2]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[4];
  $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[4];
  $result_trees{'inlinefmtifelse'}{'contents'}[4]{'parent'} = $result_trees{'inlinefmtifelse'};
  $result_trees{'inlinefmtifelse'}{'contents'}[5]{'parent'} = $result_trees{'inlinefmtifelse'};
+ $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0];
+ $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[2];
  $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[2];
  $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[2]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[1];
  $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'extra'}{'brace_command_contents'}[2][0] = $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[2]{'contents'}[1];
  $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'extra'}{'spaces_before_argument'} = $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
***************
*** 763,776 ****
  $result_trees{'inlinefmtifelse'}{'contents'}[6]{'parent'} = $result_trees{'inlinefmtifelse'};
  $result_trees{'inlinefmtifelse'}{'contents'}[7]{'parent'} = $result_trees{'inlinefmtifelse'};
  $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0];
- $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[1];
- $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[1];
  $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[2];
  $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[2]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[1];
- $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0] = $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[1]{'contents'}[1];
  $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'extra'}{'brace_command_contents'}[2][0] = $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[2]{'contents'}[1];
  $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'extra'}{'spaces_before_argument'} = $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0];
--- 664,676 ----
  $result_trees{'inlinefmtifelse'}{'contents'}[6]{'parent'} = $result_trees{'inlinefmtifelse'};
  $result_trees{'inlinefmtifelse'}{'contents'}[7]{'parent'} = $result_trees{'inlinefmtifelse'};
+ $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0];
+ $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[2];
  $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[2];
  $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[2]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[1];
  $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'extra'}{'brace_command_contents'}[2][0] = $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[2]{'contents'}[1];
  $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'extra'}{'spaces_before_argument'} = $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0];
***************
*** 781,790 ****
  $result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'args'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0];
- $result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'args'}[1];
  $result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'args'}[2];
  $result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'args'}[2]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0];
- $result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0] = $result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'args'}[1]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'extra'}{'brace_command_contents'}[2][0] = $result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'args'}[2]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[10];
--- 681,688 ----
***************
*** 794,803 ****
  $result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'args'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0];
- $result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'args'}[1];
  $result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'args'}[2];
  $result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'args'}[2]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[0];
- $result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0] = $result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'args'}[1]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'extra'}{'brace_command_contents'}[2][0] = $result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'args'}[2]{'contents'}[0];
  $result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'parent'} = $result_trees{'inlinefmtifelse'}{'contents'}[12];
--- 692,699 ----
***************
*** 806,823 ****
  
  $result_texis{'inlinefmtifelse'} = '@inlinefmtifelse{html,,else html no if}.
! @inlinefmtifelse{html,if html,else html}.
  
! @inlinefmtifelse{plaintext,if plaintext no second arg}.
! @inlinefmtifelse{plaintext,if plaintext,else plaintext}.
  
! @inlinefmtifelse{xml,if xml empty second arg,}.
  
! @inlinefmtifelse{ docbook , if docbook spaces , else docbook spaces }.
  
! @inlinefmtifelse{ tex , if tex spaces , else tex spaces }.
  
! @inlinefmtifelse{docbook,if docbook,else docbook}.
  
! @inlinefmtifelse{tex,if tex,else tex}.
  ';
  
--- 702,719 ----
  
  $result_texis{'inlinefmtifelse'} = '@inlinefmtifelse{html,,else html no if}.
! @inlinefmtifelse{html,,else html}.
  
! @inlinefmtifelse{plaintext,,}.
! @inlinefmtifelse{plaintext,,else plaintext}.
  
! @inlinefmtifelse{xml,,}.
  
! @inlinefmtifelse{ docbook ,, else docbook spaces }.
  
! @inlinefmtifelse{ tex ,, else tex spaces }.
  
! @inlinefmtifelse{docbook,,else docbook}.
  
! @inlinefmtifelse{tex,,else tex}.
  ';
  
***************
*** 846,850 ****
  $result_converted{'plaintext'}->{'inlinefmtifelse'} = 'else html no if.  else html.
  
!    if plaintext no second arg.  if plaintext.
  
     .
--- 742,746 ----
  $result_converted{'plaintext'}->{'inlinefmtifelse'} = 'else html no if.  else html.
  
!    .  .
  
     .
***************
*** 861,865 ****
  
  $result_converted{'html_text'}->{'inlinefmtifelse'} = '<p>.
! if html.
  </p>
  <p>.
--- 757,761 ----
  
  $result_converted{'html_text'}->{'inlinefmtifelse'} = '<p>.
! .
  </p>
  <p>.
***************
*** 879,896 ****
  
  $result_converted{'xml'}->{'inlinefmtifelse'} = '<para><inlinefmtifelse><inlinefmtifelseformat>html</inlinefmtifelseformat><inlinefmtifelsecontentelse>else html no if</inlinefmtifelsecontentelse></inlinefmtifelse>.
! <inlinefmtifelse><inlinefmtifelseformat>html</inlinefmtifelseformat><inlinefmtifelsecontentif>if html</inlinefmtifelsecontentif><inlinefmtifelsecontentelse>else html</inlinefmtifelsecontentelse></inlinefmtifelse>.
  </para>
! <para><inlinefmtifelse><inlinefmtifelseformat>plaintext</inlinefmtifelseformat><inlinefmtifelsecontentif>if plaintext no second arg</inlinefmtifelsecontentif></inlinefmtifelse>.
! <inlinefmtifelse><inlinefmtifelseformat>plaintext</inlinefmtifelseformat><inlinefmtifelsecontentif>if plaintext</inlinefmtifelsecontentif><inlinefmtifelsecontentelse>else plaintext</inlinefmtifelsecontentelse></inlinefmtifelse>.
  </para>
  <para>.
  </para>
! <para><inlinefmtifelse spaces=" "><inlinefmtifelseformat>docbook </inlinefmtifelseformat><inlinefmtifelsecontentif spaces=" ">if docbook spaces </inlinefmtifelsecontentif><inlinefmtifelsecontentelse spaces=" ">else docbook spaces </inlinefmtifelsecontentelse></inlinefmtifelse>.
  </para>
! <para><inlinefmtifelse spaces=" "><inlinefmtifelseformat>tex </inlinefmtifelseformat><inlinefmtifelsecontentif spaces=" ">if tex spaces </inlinefmtifelsecontentif><inlinefmtifelsecontentelse spaces=" ">else tex spaces </inlinefmtifelsecontentelse></inlinefmtifelse>.
  </para>
! <para><inlinefmtifelse><inlinefmtifelseformat>docbook</inlinefmtifelseformat><inlinefmtifelsecontentif>if docbook</inlinefmtifelsecontentif><inlinefmtifelsecontentelse>else docbook</inlinefmtifelsecontentelse></inlinefmtifelse>.
  </para>
! <para><inlinefmtifelse><inlinefmtifelseformat>tex</inlinefmtifelseformat><inlinefmtifelsecontentif>if tex</inlinefmtifelsecontentif><inlinefmtifelsecontentelse>else tex</inlinefmtifelsecontentelse></inlinefmtifelse>.
  </para>';
  
--- 775,792 ----
  
  $result_converted{'xml'}->{'inlinefmtifelse'} = '<para><inlinefmtifelse><inlinefmtifelseformat>html</inlinefmtifelseformat><inlinefmtifelsecontentelse>else html no if</inlinefmtifelsecontentelse></inlinefmtifelse>.
! <inlinefmtifelse><inlinefmtifelseformat>html</inlinefmtifelseformat><inlinefmtifelsecontentelse>else html</inlinefmtifelsecontentelse></inlinefmtifelse>.
  </para>
! <para><inlinefmtifelse><inlinefmtifelseformat>plaintext</inlinefmtifelseformat></inlinefmtifelse>.
! <inlinefmtifelse><inlinefmtifelseformat>plaintext</inlinefmtifelseformat><inlinefmtifelsecontentelse>else plaintext</inlinefmtifelsecontentelse></inlinefmtifelse>.
  </para>
  <para>.
  </para>
! <para><inlinefmtifelse spaces=" "><inlinefmtifelseformat>docbook </inlinefmtifelseformat><inlinefmtifelsecontentelse spaces=" ">else docbook spaces </inlinefmtifelsecontentelse></inlinefmtifelse>.
  </para>
! <para><inlinefmtifelse spaces=" "><inlinefmtifelseformat>tex </inlinefmtifelseformat><inlinefmtifelsecontentelse spaces=" ">else tex spaces </inlinefmtifelsecontentelse></inlinefmtifelse>.
  </para>
! <para><inlinefmtifelse><inlinefmtifelseformat>docbook</inlinefmtifelseformat><inlinefmtifelsecontentelse>else docbook</inlinefmtifelsecontentelse></inlinefmtifelse>.
  </para>
! <para><inlinefmtifelse><inlinefmtifelseformat>tex</inlinefmtifelseformat><inlinefmtifelsecontentelse>else tex</inlinefmtifelsecontentelse></inlinefmtifelse>.
  </para>';
  
***************
*** 904,912 ****
  <para>.
  </para>
! <para>if docbook spaces.
  </para>
  <para>else tex spaces .
  </para>
! <para>if docbook.
  </para>
  <para>else tex.
--- 800,808 ----
  <para>.
  </para>
! <para>.
  </para>
  <para>else tex spaces .
  </para>
! <para>.
  </para>
  <para>else tex.
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/inlineifsetifclear.pl texinfo-6.3/tp/t/results/converters_tests/inlineifsetifclear.pl
*** texinfo-6.1/tp/t/results/converters_tests/inlineifsetifclear.pl	2016-01-22 07:50:16.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/inlineifsetifclear.pl	2016-08-02 18:44:55.000000000 +0100
***************
*** 25,28 ****
--- 25,29 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 49,57 ****
              ],
              'expand_index' => 1,
!             'format' => 'aaa',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 50,54 ----
              ],
              'expand_index' => 1,
!             'format' => 'aaa'
            },
            'line_nr' => {
***************
*** 92,107 ****
              },
              {
!               'contents' => [
!                 {
!                   'text' => ' ',
!                   'type' => 'empty_spaces_before_argument'
!                 },
!                 {
!                   'parent' => {},
!                   'text' => 'ifset first '
!                 }
!               ],
                'parent' => {},
!               'type' => 'brace_command_arg'
              }
            ],
--- 89,95 ----
              },
              {
!               'contents' => [],
                'parent' => {},
!               'type' => 'elided'
              }
            ],
***************
*** 113,125 ****
                  {}
                ],
!               [
!                 {}
!               ]
              ],
!             'format' => 'aaa',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 101,107 ----
                  {}
                ],
!               undef
              ],
!             'format' => 'aaa'
            },
            'line_nr' => {
***************
*** 190,205 ****
              },
              {
!               'contents' => [
!                 {
!                   'text' => ' ',
!                   'type' => 'empty_spaces_before_argument'
!                 },
!                 {
!                   'parent' => {},
!                   'text' => 'ifclear second '
!                 }
!               ],
                'parent' => {},
!               'type' => 'brace_command_arg'
              }
            ],
--- 172,178 ----
              },
              {
!               'contents' => [],
                'parent' => {},
!               'type' => 'elided'
              }
            ],
***************
*** 211,223 ****
                  {}
                ],
!               [
!                 {}
!               ]
              ],
!             'format' => 'aaa',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 184,190 ----
                  {}
                ],
!               undef
              ],
!             'format' => 'aaa'
            },
            'line_nr' => {
***************
*** 260,263 ****
--- 227,231 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 284,292 ****
              ],
              'expand_index' => 1,
!             'format' => 'aaa',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 252,256 ----
              ],
              'expand_index' => 1,
!             'format' => 'aaa'
            },
            'line_nr' => {
***************
*** 311,314 ****
--- 275,279 ----
  $result_trees{'inlineifsetifclear'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inlineifsetifclear'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'inlineifsetifclear'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'inlineifsetifclear'}{'contents'}[0]{'contents'}[0];
+ $result_trees{'inlineifsetifclear'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'inlineifsetifclear'}{'contents'}[0]{'contents'}[0]{'args'}[1];
  $result_trees{'inlineifsetifclear'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inlineifsetifclear'}{'contents'}[0]{'contents'}[0]{'args'}[1];
  $result_trees{'inlineifsetifclear'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'inlineifsetifclear'}{'contents'}[0]{'contents'}[0];
***************
*** 321,328 ****
  $result_trees{'inlineifsetifclear'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inlineifsetifclear'}{'contents'}[2]{'contents'}[0]{'args'}[0];
  $result_trees{'inlineifsetifclear'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'inlineifsetifclear'}{'contents'}[2]{'contents'}[0];
- $result_trees{'inlineifsetifclear'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inlineifsetifclear'}{'contents'}[2]{'contents'}[0]{'args'}[1];
  $result_trees{'inlineifsetifclear'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'inlineifsetifclear'}{'contents'}[2]{'contents'}[0];
  $result_trees{'inlineifsetifclear'}{'contents'}[2]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inlineifsetifclear'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
- $result_trees{'inlineifsetifclear'}{'contents'}[2]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0] = $result_trees{'inlineifsetifclear'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'contents'}[1];
  $result_trees{'inlineifsetifclear'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'inlineifsetifclear'}{'contents'}[2];
  $result_trees{'inlineifsetifclear'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'inlineifsetifclear'}{'contents'}[2];
--- 286,291 ----
***************
*** 335,342 ****
  $result_trees{'inlineifsetifclear'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inlineifsetifclear'}{'contents'}[6]{'contents'}[0]{'args'}[0];
  $result_trees{'inlineifsetifclear'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'inlineifsetifclear'}{'contents'}[6]{'contents'}[0];
- $result_trees{'inlineifsetifclear'}{'contents'}[6]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inlineifsetifclear'}{'contents'}[6]{'contents'}[0]{'args'}[1];
  $result_trees{'inlineifsetifclear'}{'contents'}[6]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'inlineifsetifclear'}{'contents'}[6]{'contents'}[0];
  $result_trees{'inlineifsetifclear'}{'contents'}[6]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'inlineifsetifclear'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
- $result_trees{'inlineifsetifclear'}{'contents'}[6]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0] = $result_trees{'inlineifsetifclear'}{'contents'}[6]{'contents'}[0]{'args'}[1]{'contents'}[1];
  $result_trees{'inlineifsetifclear'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'inlineifsetifclear'}{'contents'}[6];
  $result_trees{'inlineifsetifclear'}{'contents'}[6]{'contents'}[1]{'parent'} = $result_trees{'inlineifsetifclear'}{'contents'}[6];
--- 298,303 ----
***************
*** 345,348 ****
--- 306,310 ----
  $result_trees{'inlineifsetifclear'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inlineifsetifclear'}{'contents'}[8]{'contents'}[0]{'args'}[0];
  $result_trees{'inlineifsetifclear'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'inlineifsetifclear'}{'contents'}[8]{'contents'}[0];
+ $result_trees{'inlineifsetifclear'}{'contents'}[8]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'inlineifsetifclear'}{'contents'}[8]{'contents'}[0]{'args'}[1];
  $result_trees{'inlineifsetifclear'}{'contents'}[8]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inlineifsetifclear'}{'contents'}[8]{'contents'}[0]{'args'}[1];
  $result_trees{'inlineifsetifclear'}{'contents'}[8]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'inlineifsetifclear'}{'contents'}[8]{'contents'}[0];
***************
*** 355,363 ****
  $result_texis{'inlineifsetifclear'} = '@inlineifclear{aaa, iclear first }.
  
! @inlineifset{aaa, ifset first }.
  
  @set aaa
  
! @inlineifclear{aaa, ifclear second }.
  
  @inlineifset{aaa, ifset second }.
--- 317,325 ----
  $result_texis{'inlineifsetifclear'} = '@inlineifclear{aaa, iclear first }.
  
! @inlineifset{aaa,}.
  
  @set aaa
  
! @inlineifclear{aaa,}.
  
  @inlineifset{aaa, ifset second }.
***************
*** 402,410 ****
  $result_converted{'xml'}->{'inlineifsetifclear'} = '<para><inlineifclear><inlineifclearformat>aaa</inlineifclearformat><inlineifclearcontent spaces=" ">iclear first </inlineifclearcontent></inlineifclear>.
  </para>
! <para><inlineifset><inlineifsetformat>aaa</inlineifsetformat><inlineifsetcontent spaces=" ">ifset first </inlineifsetcontent></inlineifset>.
  </para>
  <set name="aaa" line=" aaa"></set>
  
! <para><inlineifclear><inlineifclearformat>aaa</inlineifclearformat><inlineifclearcontent spaces=" ">ifclear second </inlineifclearcontent></inlineifclear>.
  </para>
  <para><inlineifset><inlineifsetformat>aaa</inlineifsetformat><inlineifsetcontent spaces=" ">ifset second </inlineifsetcontent></inlineifset>.
--- 364,372 ----
  $result_converted{'xml'}->{'inlineifsetifclear'} = '<para><inlineifclear><inlineifclearformat>aaa</inlineifclearformat><inlineifclearcontent spaces=" ">iclear first </inlineifclearcontent></inlineifclear>.
  </para>
! <para><inlineifset><inlineifsetformat>aaa</inlineifsetformat></inlineifset>.
  </para>
  <set name="aaa" line=" aaa"></set>
  
! <para><inlineifclear><inlineifclearformat>aaa</inlineifclearformat></inlineifclear>.
  </para>
  <para><inlineifset><inlineifsetformat>aaa</inlineifsetformat><inlineifsetcontent spaces=" ">ifset second </inlineifsetcontent></inlineifset>.
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/japanese_shift_jis.pl texinfo-6.3/tp/t/results/converters_tests/japanese_shift_jis.pl
*** texinfo-6.1/tp/t/results/converters_tests/japanese_shift_jis.pl	2016-01-22 07:50:18.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/japanese_shift_jis.pl	2016-08-02 18:44:57.000000000 +0100
***************
*** 15,18 ****
--- 15,19 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => '\\input texinfo @c -*- coding: utf-8; mode: texinfo; -*-
  ',
***************
*** 315,318 ****
--- 316,324 ----
                    'cmdname' => 'copyright',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => 'japanese_shift_jis.texi',
+                     'line_nr' => 12,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 956,959 ****
--- 962,966 ----
    'type' => 'document_root'
  };
+ $result_trees{'japanese_shift_jis'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'japanese_shift_jis'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
  $result_trees{'japanese_shift_jis'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'japanese_shift_jis'}{'contents'}[0]{'contents'}[0];
  $result_trees{'japanese_shift_jis'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'japanese_shift_jis'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/line_breaks.pl texinfo-6.3/tp/t/results/converters_tests/line_breaks.pl
*** texinfo-6.1/tp/t/results/converters_tests/line_breaks.pl	2016-01-22 07:50:16.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/line_breaks.pl	2016-08-02 18:44:54.000000000 +0100
***************
*** 277,280 ****
--- 277,286 ----
              {
                'cmdname' => 'strong',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 10,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 476,484 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 10,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 482,486 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 702,705 ****
--- 704,708 ----
  $result_trees{'line_breaks'}{'contents'}[7]{'extra'}{'end_command'} = $result_trees{'line_breaks'}{'contents'}[7]{'contents'}[1];
  $result_trees{'line_breaks'}{'contents'}[7]{'extra'}{'spaces_after_command'} = $result_trees{'line_breaks'}{'contents'}[7]{'args'}[0]{'contents'}[0];
+ $result_trees{'line_breaks'}{'contents'}[7]{'line_nr'} = $result_trees{'line_breaks'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'line_breaks'}{'contents'}[7]{'parent'} = $result_trees{'line_breaks'};
  $result_trees{'line_breaks'}{'contents'}[8]{'parent'} = $result_trees{'line_breaks'};
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/no_documentencoding_and_insertions.pl texinfo-6.3/tp/t/results/converters_tests/no_documentencoding_and_insertions.pl
*** texinfo-6.1/tp/t/results/converters_tests/no_documentencoding_and_insertions.pl	2016-01-22 07:50:16.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/no_documentencoding_and_insertions.pl	2016-08-02 18:44:54.000000000 +0100
***************
*** 60,63 ****
--- 60,65 ----
            ],
            'cmdname' => '~',
+           'contents' => [],
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 135,138 ****
--- 137,142 ----
                ],
                'cmdname' => '~',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 210,213 ****
--- 214,218 ----
  $result_trees{'no_documentencoding_and_insertions'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'no_documentencoding_and_insertions'}{'contents'}[1]{'contents'}[3]{'args'}[0];
  $result_trees{'no_documentencoding_and_insertions'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'no_documentencoding_and_insertions'}{'contents'}[1]{'contents'}[3];
+ $result_trees{'no_documentencoding_and_insertions'}{'contents'}[1]{'contents'}[3]{'line_nr'} = $result_trees{'no_documentencoding_and_insertions'}{'contents'}[1]{'contents'}[1]{'line_nr'};
  $result_trees{'no_documentencoding_and_insertions'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'no_documentencoding_and_insertions'}{'contents'}[1];
  $result_trees{'no_documentencoding_and_insertions'}{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'no_documentencoding_and_insertions'}{'contents'}[1];
***************
*** 223,226 ****
--- 228,232 ----
  $result_trees{'no_documentencoding_and_insertions'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'no_documentencoding_and_insertions'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'args'}[0];
  $result_trees{'no_documentencoding_and_insertions'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'no_documentencoding_and_insertions'}{'contents'}[3]{'contents'}[1]{'contents'}[3];
+ $result_trees{'no_documentencoding_and_insertions'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'line_nr'} = $result_trees{'no_documentencoding_and_insertions'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'line_nr'};
  $result_trees{'no_documentencoding_and_insertions'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'no_documentencoding_and_insertions'}{'contents'}[3]{'contents'}[1];
  $result_trees{'no_documentencoding_and_insertions'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'no_documentencoding_and_insertions'}{'contents'}[3]{'contents'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl texinfo-6.3/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
*** texinfo-6.1/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl	2016-01-22 07:50:17.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl	2016-08-02 18:44:56.000000000 +0100
***************
*** 182,186 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'c"b',
--- 182,185 ----
***************
*** 243,247 ****
                'index_at_command' => 'vindex',
                'index_name' => 'vr',
-               'index_prefix' => 'v',
                'index_type_command' => 'vindex',
                'key' => 'v"j',
--- 242,245 ----
***************
*** 304,308 ****
                'index_at_command' => 'findex',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'findex',
                'key' => 'f``g',
--- 302,305 ----
***************
*** 460,464 ****
                'index_at_command' => 'cdiindex',
                'index_name' => 'cdi',
-               'index_prefix' => 'cdi',
                'index_type_command' => 'cdiindex',
                'key' => 'cdi"h',
--- 457,460 ----
***************
*** 616,620 ****
                'index_at_command' => 'ddiindex',
                'index_name' => 'ddi',
-               'index_prefix' => 'ddi',
                'index_type_command' => 'ddiindex',
                'key' => 'ddi``g',
--- 612,615 ----
***************
*** 917,924 ****
        'in_code' => 0,
        'merged_in' => 'fn',
!       'name' => 'cdi',
!       'prefix' => [
!         'cdi'
!       ]
      },
      'cp' => {
--- 912,916 ----
        'in_code' => 0,
        'merged_in' => 'fn',
!       'name' => 'cdi'
      },
      'cp' => {
***************
*** 928,936 ****
        'in_code' => 0,
        'merged_in' => 'fn',
!       'name' => 'cp',
!       'prefix' => [
!         'c',
!         'cp'
!       ]
      },
      'ddi' => {
--- 920,924 ----
        'in_code' => 0,
        'merged_in' => 'fn',
!       'name' => 'cp'
      },
      'ddi' => {
***************
*** 940,947 ****
        'in_code' => 1,
        'merged_in' => 'fn',
!       'name' => 'ddi',
!       'prefix' => [
!         'ddi'
!       ]
      },
      'fn' => {
--- 928,932 ----
        'in_code' => 1,
        'merged_in' => 'fn',
!       'name' => 'ddi'
      },
      'fn' => {
***************
*** 954,962 ****
        },
        'in_code' => 1,
!       'name' => 'fn',
!       'prefix' => [
!         'f',
!         'fn'
!       ]
      },
      'ky' => {
--- 939,943 ----
        },
        'in_code' => 1,
!       'name' => 'fn'
      },
      'ky' => {
***************
*** 965,973 ****
        },
        'in_code' => 1,
!       'name' => 'ky',
!       'prefix' => [
!         'k',
!         'ky'
!       ]
      },
      'pg' => {
--- 946,950 ----
        },
        'in_code' => 1,
!       'name' => 'ky'
      },
      'pg' => {
***************
*** 976,984 ****
        },
        'in_code' => 1,
!       'name' => 'pg',
!       'prefix' => [
!         'p',
!         'pg'
!       ]
      },
      'tp' => {
--- 953,957 ----
        },
        'in_code' => 1,
!       'name' => 'pg'
      },
      'tp' => {
***************
*** 987,995 ****
        },
        'in_code' => 1,
!       'name' => 'tp',
!       'prefix' => [
!         't',
!         'tp'
!       ]
      },
      'vr' => {
--- 960,964 ----
        },
        'in_code' => 1,
!       'name' => 'tp'
      },
      'vr' => {
***************
*** 999,1007 ****
        'in_code' => 0,
        'merged_in' => 'fn',
!       'name' => 'vr',
!       'prefix' => [
!         'v',
!         'vr'
!       ]
      }
    },
--- 968,972 ----
        'in_code' => 0,
        'merged_in' => 'fn',
!       'name' => 'vr'
      }
    },
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/raw_block_commands.pl texinfo-6.3/tp/t/results/converters_tests/raw_block_commands.pl
*** texinfo-6.1/tp/t/results/converters_tests/raw_block_commands.pl	2016-01-22 07:50:16.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/raw_block_commands.pl	2016-08-02 18:44:54.000000000 +0100
***************
*** 33,36 ****
--- 33,37 ----
              },
              {
+               'parent' => {},
                'text' => '}
  '
***************
*** 118,121 ****
--- 119,123 ----
              },
              {
+               'parent' => {},
                'text' => '}
  '
***************
*** 203,206 ****
--- 205,209 ----
              },
              {
+               'parent' => {},
                'text' => '}
  '
***************
*** 288,291 ****
--- 291,295 ----
              },
              {
+               'parent' => {},
                'text' => '{a < b '
              },
***************
*** 324,330 ****
--- 328,336 ----
              },
              {
+               'parent' => {},
                'text' => '}$ ``'
              },
              {
+               'parent' => {},
                'text' => '}
  '
***************
*** 394,397 ****
--- 400,404 ----
  $result_trees{'raw_block_commands'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'raw_block_commands'}{'contents'}[1];
  $result_trees{'raw_block_commands'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'raw_block_commands'}{'contents'}[1]{'contents'}[1];
+ $result_trees{'raw_block_commands'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'raw_block_commands'}{'contents'}[1]{'contents'}[1];
  $result_trees{'raw_block_commands'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'raw_block_commands'}{'contents'}[1];
  $result_trees{'raw_block_commands'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'raw_block_commands'}{'contents'}[1]{'contents'}[2];
***************
*** 410,413 ****
--- 417,421 ----
  $result_trees{'raw_block_commands'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'raw_block_commands'}{'contents'}[3];
  $result_trees{'raw_block_commands'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'raw_block_commands'}{'contents'}[3]{'contents'}[1];
+ $result_trees{'raw_block_commands'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'raw_block_commands'}{'contents'}[3]{'contents'}[1];
  $result_trees{'raw_block_commands'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'raw_block_commands'}{'contents'}[3];
  $result_trees{'raw_block_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'raw_block_commands'}{'contents'}[3]{'contents'}[2];
***************
*** 426,429 ****
--- 434,438 ----
  $result_trees{'raw_block_commands'}{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'raw_block_commands'}{'contents'}[5];
  $result_trees{'raw_block_commands'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'raw_block_commands'}{'contents'}[5]{'contents'}[1];
+ $result_trees{'raw_block_commands'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'raw_block_commands'}{'contents'}[5]{'contents'}[1];
  $result_trees{'raw_block_commands'}{'contents'}[5]{'contents'}[1]{'parent'} = $result_trees{'raw_block_commands'}{'contents'}[5];
  $result_trees{'raw_block_commands'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'raw_block_commands'}{'contents'}[5]{'contents'}[2];
***************
*** 442,445 ****
--- 451,455 ----
  $result_trees{'raw_block_commands'}{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'raw_block_commands'}{'contents'}[7];
  $result_trees{'raw_block_commands'}{'contents'}[7]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'raw_block_commands'}{'contents'}[7]{'contents'}[1];
+ $result_trees{'raw_block_commands'}{'contents'}[7]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'raw_block_commands'}{'contents'}[7]{'contents'}[1];
  $result_trees{'raw_block_commands'}{'contents'}[7]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'raw_block_commands'}{'contents'}[7]{'contents'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'raw_block_commands'}{'contents'}[7]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'raw_block_commands'}{'contents'}[7]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1];
***************
*** 448,451 ****
--- 458,463 ----
  $result_trees{'raw_block_commands'}{'contents'}[7]{'contents'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'raw_block_commands'}{'contents'}[7]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'raw_block_commands'}{'contents'}[7]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'raw_block_commands'}{'contents'}[7]{'contents'}[1];
+ $result_trees{'raw_block_commands'}{'contents'}[7]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'raw_block_commands'}{'contents'}[7]{'contents'}[1];
+ $result_trees{'raw_block_commands'}{'contents'}[7]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'raw_block_commands'}{'contents'}[7]{'contents'}[1];
  $result_trees{'raw_block_commands'}{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'raw_block_commands'}{'contents'}[7];
  $result_trees{'raw_block_commands'}{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'raw_block_commands'}{'contents'}[7]{'contents'}[2];
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl texinfo-6.3/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl
*** texinfo-6.1/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl	2016-01-22 07:50:16.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl	2016-08-02 18:44:54.000000000 +0100
***************
*** 33,36 ****
--- 33,37 ----
              },
              {
+               'parent' => {},
                'text' => '}
  '
***************
*** 118,121 ****
--- 119,123 ----
              },
              {
+               'parent' => {},
                'text' => '}
  '
***************
*** 203,206 ****
--- 205,209 ----
              },
              {
+               'parent' => {},
                'text' => '}
  '
***************
*** 288,291 ****
--- 291,295 ----
              },
              {
+               'parent' => {},
                'text' => '{a < b '
              },
***************
*** 324,330 ****
--- 328,336 ----
              },
              {
+               'parent' => {},
                'text' => '}$ ``'
              },
              {
+               'parent' => {},
                'text' => '}
  '
***************
*** 394,397 ****
--- 400,404 ----
  $result_trees{'raw_block_commands_expand_tex'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[1];
  $result_trees{'raw_block_commands_expand_tex'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[1]{'contents'}[1];
+ $result_trees{'raw_block_commands_expand_tex'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[1]{'contents'}[1];
  $result_trees{'raw_block_commands_expand_tex'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[1];
  $result_trees{'raw_block_commands_expand_tex'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[1]{'contents'}[2];
***************
*** 410,413 ****
--- 417,421 ----
  $result_trees{'raw_block_commands_expand_tex'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[3];
  $result_trees{'raw_block_commands_expand_tex'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[3]{'contents'}[1];
+ $result_trees{'raw_block_commands_expand_tex'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[3]{'contents'}[1];
  $result_trees{'raw_block_commands_expand_tex'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[3];
  $result_trees{'raw_block_commands_expand_tex'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[3]{'contents'}[2];
***************
*** 426,429 ****
--- 434,438 ----
  $result_trees{'raw_block_commands_expand_tex'}{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[5];
  $result_trees{'raw_block_commands_expand_tex'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[5]{'contents'}[1];
+ $result_trees{'raw_block_commands_expand_tex'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[5]{'contents'}[1];
  $result_trees{'raw_block_commands_expand_tex'}{'contents'}[5]{'contents'}[1]{'parent'} = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[5];
  $result_trees{'raw_block_commands_expand_tex'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[5]{'contents'}[2];
***************
*** 442,445 ****
--- 451,455 ----
  $result_trees{'raw_block_commands_expand_tex'}{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[7];
  $result_trees{'raw_block_commands_expand_tex'}{'contents'}[7]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[7]{'contents'}[1];
+ $result_trees{'raw_block_commands_expand_tex'}{'contents'}[7]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[7]{'contents'}[1];
  $result_trees{'raw_block_commands_expand_tex'}{'contents'}[7]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[7]{'contents'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'raw_block_commands_expand_tex'}{'contents'}[7]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[7]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1];
***************
*** 448,451 ****
--- 458,463 ----
  $result_trees{'raw_block_commands_expand_tex'}{'contents'}[7]{'contents'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[7]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'raw_block_commands_expand_tex'}{'contents'}[7]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[7]{'contents'}[1];
+ $result_trees{'raw_block_commands_expand_tex'}{'contents'}[7]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[7]{'contents'}[1];
+ $result_trees{'raw_block_commands_expand_tex'}{'contents'}[7]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[7]{'contents'}[1];
  $result_trees{'raw_block_commands_expand_tex'}{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[7];
  $result_trees{'raw_block_commands_expand_tex'}{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[7]{'contents'}[2];
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/ref_error_formatting.pl texinfo-6.3/tp/t/results/converters_tests/ref_error_formatting.pl
*** texinfo-6.1/tp/t/results/converters_tests/ref_error_formatting.pl	2016-01-22 07:50:15.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/ref_error_formatting.pl	2016-08-02 18:44:54.000000000 +0100
***************
*** 84,91 ****
                ],
                'normalized' => 'node'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 84,87 ----
***************
*** 178,186 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 174,178 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 266,274 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 258,262 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 360,368 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 348,352 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 460,468 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 444,448 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 555,562 ****
                ],
                'normalized' => 'node'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 535,538 ----
***************
*** 656,663 ****
                ],
                'normalized' => 'node'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 632,635 ----
***************
*** 763,770 ****
                ],
                'normalized' => 'node'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 735,738 ----
***************
*** 876,883 ****
                ],
                'normalized' => 'node'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 844,847 ----
***************
*** 990,997 ****
                ],
                'normalized' => 'node'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 954,957 ----
***************
*** 1104,1111 ****
                ],
                'normalized' => 'node'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 1064,1067 ----
***************
*** 1224,1231 ****
                ],
                'normalized' => 'node'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 1180,1183 ----
***************
*** 1345,1352 ****
                ],
                'normalized' => 'node'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 1297,1300 ----
***************
*** 1472,1479 ****
                ],
                'normalized' => 'node'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 1420,1423 ----
***************
*** 1563,1566 ****
--- 1507,1511 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 1577,1580 ****
--- 1522,1526 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 1614,1621 ****
                ],
                'normalized' => 'node'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 1560,1563 ----
***************
*** 1728,1735 ****
                ],
                'normalized' => 'node'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 1670,1673 ----
***************
*** 1848,1855 ****
                ],
                'normalized' => 'node'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 1786,1789 ----
***************
*** 1934,1937 ****
--- 1868,1872 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 1948,1951 ****
--- 1883,1887 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 1983,1990 ****
                ],
                'normalized' => 'node'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 1919,1922 ----
***************
*** 2103,2110 ****
                ],
                'normalized' => 'node'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 2035,2038 ----
***************
*** 2204,2212 ****
                ],
                undef
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 2132,2136 ----
                ],
                undef
!             ]
            },
            'line_nr' => {},
***************
*** 2305,2313 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 2229,2233 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 2412,2420 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 2332,2336 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 2520,2528 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 2436,2440 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 2634,2642 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 2546,2550 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 2720,2723 ****
--- 2628,2632 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 2734,2737 ****
--- 2643,2647 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 2763,2771 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 2673,2677 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 2864,2872 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 2770,2774 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 2971,2979 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 2873,2877 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 3052,3055 ****
--- 2950,2954 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 3066,3069 ****
--- 2965,2969 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 3093,3101 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 2993,2997 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 3200,3208 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 3096,3100 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 3299,3307 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 3191,3195 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 3387,3395 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 3275,3279 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 3463,3466 ****
--- 3347,3351 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 3486,3494 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 3371,3375 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 3551,3559 ****
              'brace_command_contents' => [
                undef
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 3432,3436 ----
              'brace_command_contents' => [
                undef
!             ]
            },
            'line_nr' => {},
***************
*** 3634,3637 ****
--- 3511,3515 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 3648,3651 ****
--- 3526,3530 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 3679,3686 ****
                ],
                'normalized' => 'node'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 3558,3561 ----
***************
*** 3761,3768 ****
                ],
                'normalized' => 'node'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 3636,3639 ----
***************
*** 3832,3835 ****
--- 3703,3707 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 3860,3867 ****
                ],
                'normalized' => 'node'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 3732,3735 ----
***************
*** 3961,3968 ****
                ],
                'normalized' => 'node'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 3829,3832 ----
***************
*** 4274,4279 ****
--- 4138,4145 ----
  $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[54]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[54]{'args'}[2];
  $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[54]{'args'}[2]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[54];
+ $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[54]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[54]{'args'}[3];
  $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[54]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[54]{'args'}[3];
  $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[54]{'args'}[3]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[54];
+ $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[54]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[54]{'args'}[4];
  $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[54]{'args'}[4]{'contents'}[1]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[54]{'args'}[4];
  $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[54]{'args'}[4]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[54];
***************
*** 4345,4350 ****
--- 4211,4218 ----
  $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[66]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[66]{'args'}[2];
  $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[66]{'args'}[2]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[66];
+ $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[66]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[66]{'args'}[3];
  $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[66]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[66]{'args'}[3];
  $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[66]{'args'}[3]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[66];
+ $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[66]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[66]{'args'}[4];
  $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[66]{'args'}[4]{'contents'}[1]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[66]{'args'}[4];
  $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[66]{'args'}[4]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[66];
***************
*** 4494,4499 ****
--- 4362,4369 ----
  $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[94]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[94]{'args'}[2];
  $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[94]{'args'}[2]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[94];
+ $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[94]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[94]{'args'}[3];
  $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[94]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[94]{'args'}[3];
  $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[94]{'args'}[3]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[94];
+ $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[94]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[94]{'args'}[4];
  $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[94]{'args'}[4]{'contents'}[1]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[94]{'args'}[4];
  $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[94]{'args'}[4]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[94];
***************
*** 4556,4561 ****
--- 4426,4433 ----
  $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[106]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[106]{'args'}[2];
  $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[106]{'args'}[2]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[106];
+ $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[106]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[106]{'args'}[3];
  $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[106]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[106]{'args'}[3];
  $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[106]{'args'}[3]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[106];
+ $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[106]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[106]{'args'}[4];
  $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[106]{'args'}[4]{'contents'}[1]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[106]{'args'}[4];
  $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[106]{'args'}[4]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[3]{'contents'}[106];
***************
*** 4631,4634 ****
--- 4503,4507 ----
  $result_trees{'ref_error_formatting'}{'contents'}[5]{'contents'}[10]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[5]{'contents'}[10]{'args'}[1];
  $result_trees{'ref_error_formatting'}{'contents'}[5]{'contents'}[10]{'args'}[1]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[5]{'contents'}[10];
+ $result_trees{'ref_error_formatting'}{'contents'}[5]{'contents'}[10]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[5]{'contents'}[10]{'args'}[2];
  $result_trees{'ref_error_formatting'}{'contents'}[5]{'contents'}[10]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[5]{'contents'}[10]{'args'}[2];
  $result_trees{'ref_error_formatting'}{'contents'}[5]{'contents'}[10]{'args'}[2]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[5]{'contents'}[10];
***************
*** 4661,4666 ****
--- 4534,4541 ----
  $result_trees{'ref_error_formatting'}{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[7]{'contents'}[2]{'args'}[0];
  $result_trees{'ref_error_formatting'}{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[7]{'contents'}[2];
+ $result_trees{'ref_error_formatting'}{'contents'}[7]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[7]{'contents'}[2]{'args'}[1];
  $result_trees{'ref_error_formatting'}{'contents'}[7]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[7]{'contents'}[2]{'args'}[1];
  $result_trees{'ref_error_formatting'}{'contents'}[7]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[7]{'contents'}[2];
+ $result_trees{'ref_error_formatting'}{'contents'}[7]{'contents'}[2]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[7]{'contents'}[2]{'args'}[2];
  $result_trees{'ref_error_formatting'}{'contents'}[7]{'contents'}[2]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[7]{'contents'}[2]{'args'}[2];
  $result_trees{'ref_error_formatting'}{'contents'}[7]{'contents'}[2]{'args'}[2]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[7]{'contents'}[2];
***************
*** 4697,4700 ****
--- 4572,4576 ----
  $result_trees{'ref_error_formatting'}{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[7]{'contents'}[10]{'args'}[0];
  $result_trees{'ref_error_formatting'}{'contents'}[7]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[7]{'contents'}[10];
+ $result_trees{'ref_error_formatting'}{'contents'}[7]{'contents'}[10]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[7]{'contents'}[10]{'args'}[1];
  $result_trees{'ref_error_formatting'}{'contents'}[7]{'contents'}[10]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[7]{'contents'}[10]{'args'}[1];
  $result_trees{'ref_error_formatting'}{'contents'}[7]{'contents'}[10]{'args'}[1]{'parent'} = $result_trees{'ref_error_formatting'}{'contents'}[7]{'contents'}[10];
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/ref_in_sectioning.pl texinfo-6.3/tp/t/results/converters_tests/ref_in_sectioning.pl
*** texinfo-6.1/tp/t/results/converters_tests/ref_in_sectioning.pl	2016-01-22 07:50:15.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/ref_in_sectioning.pl	2016-08-02 18:44:54.000000000 +0100
***************
*** 177,184 ****
                    ],
                    'normalized' => 'node'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 177,180 ----
***************
*** 221,228 ****
                    ],
                    'normalized' => 'node'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 217,220 ----
***************
*** 259,262 ****
--- 251,255 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 273,276 ****
--- 266,270 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 306,313 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 300,303 ----
***************
*** 583,586 ****
--- 573,577 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 597,600 ****
--- 588,592 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 632,639 ****
                    ],
                    'normalized' => 'node'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 624,627 ----
***************
*** 769,776 ****
                    ],
                    'normalized' => 'node'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 757,760 ----
***************
*** 845,848 ****
--- 829,833 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 874,881 ****
                    ],
                    'normalized' => 'node'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 859,862 ----
***************
*** 973,976 ****
--- 954,958 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1017,1024 ****
                    ],
                    'normalized' => 'node'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 999,1002 ----
***************
*** 1117,1120 ****
--- 1095,1099 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1147,1154 ****
                    ],
                    'normalized' => 'node'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1126,1129 ----
***************
*** 1234,1237 ****
--- 1209,1213 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1270,1277 ****
                    ],
                    'normalized' => 'node'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1246,1249 ----
***************
*** 1361,1364 ****
--- 1333,1337 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1397,1404 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1370,1373 ----
***************
*** 1483,1486 ****
--- 1452,1456 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1511,1519 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 1481,1485 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 1592,1595 ****
--- 1558,1562 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1614,1622 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 1581,1585 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 1690,1693 ****
--- 1653,1657 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1704,1707 ****
--- 1668,1672 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1735,1742 ****
                    ],
                    'normalized' => 'a'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1700,1703 ----
***************
*** 1805,1808 ****
--- 1766,1770 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1834,1837 ****
--- 1796,1800 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1952,1955 ****
--- 1915,1919 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1979,1987 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 1943,1947 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 2092,2099 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 2052,2055 ----
***************
*** 2191,2199 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 2147,2151 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 2286,2291 ****
--- 2238,2245 ----
  $result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[6]{'args'}[1]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[6];
  $result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[6]{'args'}[2]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[6];
+ $result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[6]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[6]{'args'}[3];
  $result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[6]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[6]{'args'}[3];
  $result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[6]{'args'}[3]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[6];
+ $result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[6]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[6]{'args'}[4];
  $result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[6]{'args'}[4]{'contents'}[1]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[6]{'args'}[4];
  $result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[6]{'args'}[4]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[6];
***************
*** 2352,2357 ****
--- 2306,2313 ----
  $result_trees{'ref_in_sectioning'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'args'}[2];
  $result_trees{'ref_in_sectioning'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[4]{'args'}[0]{'contents'}[1];
+ $result_trees{'ref_in_sectioning'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'args'}[3];
  $result_trees{'ref_in_sectioning'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'args'}[3];
  $result_trees{'ref_in_sectioning'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'args'}[3]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[4]{'args'}[0]{'contents'}[1];
+ $result_trees{'ref_in_sectioning'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'args'}[4];
  $result_trees{'ref_in_sectioning'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'args'}[4]{'contents'}[1]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'args'}[4];
  $result_trees{'ref_in_sectioning'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'args'}[4]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[4]{'args'}[0]{'contents'}[1];
***************
*** 2401,2404 ****
--- 2357,2361 ----
  $result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[1];
+ $result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[1];
***************
*** 2424,2427 ****
--- 2381,2385 ----
  $result_trees{'ref_in_sectioning'}{'contents'}[8]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[8]{'args'}[0]{'contents'}[1];
  $result_trees{'ref_in_sectioning'}{'contents'}[8]{'args'}[0]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[8]{'args'}[0]{'contents'}[1];
+ $result_trees{'ref_in_sectioning'}{'contents'}[8]{'args'}[0]{'contents'}[1]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[8]{'args'}[0]{'contents'}[1]{'args'}[2];
  $result_trees{'ref_in_sectioning'}{'contents'}[8]{'args'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[8]{'args'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1]{'args'}[0];
  $result_trees{'ref_in_sectioning'}{'contents'}[8]{'args'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[8]{'args'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1];
***************
*** 2452,2455 ****
--- 2410,2414 ----
  $result_trees{'ref_in_sectioning'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[9]{'args'}[0]{'contents'}[1];
  $result_trees{'ref_in_sectioning'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[9]{'args'}[0]{'contents'}[1];
+ $result_trees{'ref_in_sectioning'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'args'}[3];
  $result_trees{'ref_in_sectioning'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'args'}[3];
  $result_trees{'ref_in_sectioning'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'args'}[3]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[9]{'args'}[0]{'contents'}[1];
***************
*** 2475,2478 ****
--- 2434,2438 ----
  $result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[1];
  $result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[3]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[1];
+ $result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[4];
  $result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[4]{'contents'}[1]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[4];
  $result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[4]{'contents'}[2]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[4];
***************
*** 2498,2501 ****
--- 2458,2462 ----
  $result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[1];
  $result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'args'}[3]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[1];
+ $result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'args'}[4];
  $result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'args'}[4]{'contents'}[1]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'args'}[4];
  $result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'args'}[4]{'contents'}[2]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'args'}[4];
***************
*** 2520,2523 ****
--- 2481,2485 ----
  $result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[1];
  $result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[3]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[1];
+ $result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[4];
  $result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[4]{'contents'}[1]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[4];
  $result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[4]{'contents'}[2]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[4];
***************
*** 2539,2542 ****
--- 2501,2505 ----
  $result_trees{'ref_in_sectioning'}{'contents'}[13]{'args'}[0]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[13]{'args'}[0]{'contents'}[1];
  $result_trees{'ref_in_sectioning'}{'contents'}[13]{'args'}[0]{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[13]{'args'}[0]{'contents'}[1];
+ $result_trees{'ref_in_sectioning'}{'contents'}[13]{'args'}[0]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[13]{'args'}[0]{'contents'}[1]{'args'}[3];
  $result_trees{'ref_in_sectioning'}{'contents'}[13]{'args'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[13]{'args'}[0]{'contents'}[1]{'args'}[3];
  $result_trees{'ref_in_sectioning'}{'contents'}[13]{'args'}[0]{'contents'}[1]{'args'}[3]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[13]{'args'}[0]{'contents'}[1];
***************
*** 2556,2561 ****
--- 2519,2526 ----
  $result_trees{'ref_in_sectioning'}{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'ref_in_sectioning'}{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[14]{'args'}[0]{'contents'}[1];
+ $result_trees{'ref_in_sectioning'}{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'ref_in_sectioning'}{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'ref_in_sectioning'}{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[14]{'args'}[0]{'contents'}[1];
+ $result_trees{'ref_in_sectioning'}{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[2];
  $result_trees{'ref_in_sectioning'}{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[2];
  $result_trees{'ref_in_sectioning'}{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[14]{'args'}[0]{'contents'}[1];
***************
*** 2577,2580 ****
--- 2542,2546 ----
  $result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0];
  $result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0];
+ $result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'args'}[0];
***************
*** 2582,2585 ****
--- 2548,2552 ----
  $result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2];
  $result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'args'}[2]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2];
+ $result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'args'}[3];
  $result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'args'}[3];
  $result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'args'}[3];
***************
*** 2606,2609 ****
--- 2573,2577 ----
  $result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[2];
  $result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[2]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[2];
+ $result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[3];
  $result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[3];
  $result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/refs_formatting.pl texinfo-6.3/tp/t/results/converters_tests/refs_formatting.pl
*** texinfo-6.1/tp/t/results/converters_tests/refs_formatting.pl	2016-01-22 07:50:15.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/refs_formatting.pl	2016-08-02 18:44:53.000000000 +0100
***************
*** 181,188 ****
                    ],
                    'normalized' => 'chapter'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 181,184 ----
***************
*** 283,290 ****
                    ],
                    'normalized' => 'chapter'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 279,282 ----
***************
*** 390,397 ****
                    ],
                    'normalized' => 'chapter'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 382,385 ----
***************
*** 503,510 ****
                    ],
                    'normalized' => 'chapter'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 491,494 ----
***************
*** 618,625 ****
                    ],
                    'normalized' => 'chapter'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 602,605 ----
***************
*** 732,739 ****
                    ],
                    'normalized' => 'chapter'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 712,715 ----
***************
*** 852,859 ****
                    ],
                    'normalized' => 'chapter'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 828,831 ----
***************
*** 973,980 ****
                    ],
                    'normalized' => 'chapter'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 945,948 ----
***************
*** 1100,1107 ****
                    ],
                    'normalized' => 'chapter'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1068,1071 ----
***************
*** 1191,1194 ****
--- 1155,1159 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1205,1208 ****
--- 1170,1174 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1242,1249 ****
                    ],
                    'normalized' => 'chapter'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1208,1211 ----
***************
*** 1356,1363 ****
                    ],
                    'normalized' => 'chapter'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1318,1321 ----
***************
*** 1476,1483 ****
                    ],
                    'normalized' => 'chapter'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1434,1437 ----
***************
*** 1562,1565 ****
--- 1516,1520 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1576,1579 ****
--- 1531,1535 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1611,1618 ****
                    ],
                    'normalized' => 'chapter'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1567,1570 ----
***************
*** 1731,1738 ****
                    ],
                    'normalized' => 'chapter'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1683,1686 ----
***************
*** 1847,1854 ****
                    ],
                    'normalized' => 'anode'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1795,1798 ----
***************
*** 1957,1964 ****
                    ],
                    'normalized' => 'anode'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1901,1904 ----
***************
*** 2073,2080 ****
                    ],
                    'normalized' => 'anode'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 2013,2016 ----
***************
*** 2195,2202 ****
                    ],
                    'normalized' => 'anode'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 2131,2134 ----
***************
*** 2318,2325 ****
                    ],
                    'normalized' => 'anode'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 2250,2253 ----
***************
*** 2441,2448 ****
                    ],
                    'normalized' => 'anode'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 2369,2372 ----
***************
*** 2570,2577 ****
                    ],
                    'normalized' => 'anode'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 2494,2497 ----
***************
*** 2700,2707 ****
                    ],
                    'normalized' => 'anode'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 2620,2623 ----
***************
*** 2836,2843 ****
                    ],
                    'normalized' => 'anode'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 2752,2755 ----
***************
*** 2927,2930 ****
--- 2839,2843 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 2941,2944 ****
--- 2854,2858 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 2987,2994 ****
                    ],
                    'normalized' => 'anode'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 2901,2904 ----
***************
*** 3110,3117 ****
                    ],
                    'normalized' => 'anode'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 3020,3023 ----
***************
*** 3239,3246 ****
                    ],
                    'normalized' => 'anode'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 3145,3148 ----
***************
*** 3325,3328 ****
--- 3227,3231 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 3339,3342 ****
--- 3242,3246 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 3383,3390 ****
                    ],
                    'normalized' => 'anode'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 3287,3290 ----
***************
*** 3512,3519 ****
                    ],
                    'normalized' => 'anode'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 3412,3415 ----
***************
*** 3595,3598 ****
--- 3491,3495 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 3609,3612 ****
--- 3506,3510 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 3640,3647 ****
                    ],
                    'normalized' => 'chapter'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 3538,3541 ----
***************
*** 3722,3729 ****
                    ],
                    'normalized' => 'chapter'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 3616,3619 ----
***************
*** 3793,3796 ****
--- 3683,3687 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 3821,3828 ****
                    ],
                    'normalized' => 'chapter'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 3712,3715 ----
***************
*** 3922,3929 ****
                    ],
                    'normalized' => 'chapter'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 3809,3812 ----
***************
*** 4186,4191 ****
--- 4069,4076 ----
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'args'}[2];
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'args'}[2]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[38];
+ $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'args'}[3];
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'args'}[3];
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'args'}[3]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[38];
+ $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'args'}[4];
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'args'}[4]{'contents'}[1]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'args'}[4];
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'args'}[4]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[38];
***************
*** 4257,4262 ****
--- 4142,4149 ----
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'args'}[2];
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'args'}[2]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[50];
+ $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'args'}[3];
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'args'}[3];
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'args'}[3]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[50];
+ $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'args'}[4];
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'args'}[4]{'contents'}[1]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'args'}[4];
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'args'}[4]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[50];
***************
*** 4511,4516 ****
--- 4398,4405 ----
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'args'}[2];
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'args'}[2]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38];
+ $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'args'}[3];
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'args'}[3];
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'args'}[3]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38];
+ $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'args'}[4];
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'args'}[4]{'contents'}[1]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'args'}[4];
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'args'}[4]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38];
***************
*** 4585,4590 ****
--- 4474,4481 ----
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'args'}[2];
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'args'}[2]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50];
+ $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'args'}[3];
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'args'}[3];
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'args'}[3]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50];
+ $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'args'}[4];
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'args'}[4]{'contents'}[1]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'args'}[4];
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'args'}[4]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50];
***************
*** 4634,4639 ****
--- 4525,4532 ----
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0];
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[2];
+ $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[1];
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[1];
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[2];
+ $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[2];
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[2];
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[2]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[2];
***************
*** 4670,4673 ****
--- 4563,4567 ----
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[10]{'args'}[0];
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[10];
+ $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[10]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[10]{'args'}[1];
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[10]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[10]{'args'}[1];
  $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[10]{'args'}[1]{'parent'} = $result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[10];
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/sample_utf8.pl texinfo-6.3/tp/t/results/converters_tests/sample_utf8.pl
*** texinfo-6.1/tp/t/results/converters_tests/sample_utf8.pl	2016-01-22 07:50:18.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/sample_utf8.pl	2016-08-02 18:44:57.000000000 +0100
***************
*** 15,18 ****
--- 15,19 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => '\\input texinfo   @c -*-texinfo-*-
  ',
***************
*** 1000,1004 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'chapter, first',
--- 1001,1004 ----
***************
*** 1068,1072 ****
                    'index_at_command' => 'cindex',
                    'index_name' => 'cp',
-                   'index_prefix' => 'c',
                    'index_type_command' => 'cindex',
                    'key' => "\x{53e6}\x{4e00}\x{4e2a}\x{ff0c}index entry",
--- 1068,1071 ----
***************
*** 1123,1127 ****
                    'index_at_command' => 'cindex',
                    'index_name' => 'cp',
-                   'index_prefix' => 'c',
                    'index_type_command' => 'cindex',
                    'key' => "\x{104}\x{118} ae \x{105}\x{119}",
--- 1122,1125 ----
***************
*** 1178,1182 ****
                    'index_at_command' => 'cindex',
                    'index_name' => 'cp',
-                   'index_prefix' => 'c',
                    'index_type_command' => 'cindex',
                    'key' => "\x{e9} \x{c2}",
--- 1176,1179 ----
***************
*** 1672,1675 ****
--- 1669,1673 ----
    'type' => 'document_root'
  };
+ $result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
  $result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[0];
  $result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl texinfo-6.3/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
*** texinfo-6.1/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl	2016-01-22 07:50:14.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl	2016-08-02 18:44:52.000000000 +0100
***************
*** 151,154 ****
--- 151,160 ----
                                ],
                                'cmdname' => '~',
+                               'contents' => [],
+                               'line_nr' => {
+                                 'file_name' => '',
+                                 'line_nr' => 6,
+                                 'macro' => ''
+                               },
                                'parent' => {}
                              },
***************
*** 167,170 ****
--- 173,177 ----
                                'cmdname' => 'aa',
                                'contents' => [],
+                               'line_nr' => {},
                                'parent' => {}
                              },
***************
*** 183,186 ****
--- 190,194 ----
                                'cmdname' => 'TeX',
                                'contents' => [],
+                               'line_nr' => {},
                                'parent' => {}
                              }
***************
*** 192,200 ****
                        'cmdname' => 'sc',
                        'contents' => [],
!                       'line_nr' => {
!                         'file_name' => '',
!                         'line_nr' => 6,
!                         'macro' => ''
!                       },
                        'parent' => {}
                      },
--- 200,204 ----
                        'cmdname' => 'sc',
                        'contents' => [],
!                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 217,220 ****
--- 221,226 ----
                        ],
                        'cmdname' => '"',
+                       'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 277,280 ****
--- 283,288 ----
                                ],
                                'cmdname' => '=',
+                               'contents' => [],
+                               'line_nr' => {},
                                'parent' => {}
                              }
***************
*** 303,306 ****
--- 311,315 ----
                        'cmdname' => 'l',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 327,330 ****
--- 336,341 ----
                                ],
                                'cmdname' => '\'',
+                               'contents' => [],
+                               'line_nr' => {},
                                'parent' => {}
                              }
***************
*** 353,356 ****
--- 364,368 ----
                        'cmdname' => 'exclamdown',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 520,523 ****
--- 532,541 ----
                        ],
                        'cmdname' => '~',
+                       'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 9,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 536,539 ****
--- 554,558 ----
                        'cmdname' => 'aa',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 552,555 ****
--- 571,575 ----
                        'cmdname' => 'TeX',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 561,569 ****
                'cmdname' => 'sc',
                'contents' => [],
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 9,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 581,585 ----
                'cmdname' => 'sc',
                'contents' => [],
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 586,589 ****
--- 602,607 ----
                ],
                'cmdname' => '"',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 646,649 ****
--- 664,669 ----
                        ],
                        'cmdname' => '=',
+                       'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 672,675 ****
--- 692,696 ----
                'cmdname' => 'l',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 696,699 ****
--- 717,722 ----
                        ],
                        'cmdname' => '\'',
+                       'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 722,725 ****
--- 745,749 ----
                'cmdname' => 'exclamdown',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 822,825 ****
--- 846,851 ----
                ],
                'cmdname' => '"',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 882,885 ****
--- 908,913 ----
                        ],
                        'cmdname' => '=',
+                       'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 908,911 ****
--- 936,940 ----
                'cmdname' => 'l',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 932,935 ****
--- 961,966 ----
                        ],
                        'cmdname' => '\'',
+                       'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 958,961 ****
--- 989,993 ----
                'cmdname' => 'exclamdown',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1047,1050 ****
--- 1079,1083 ----
                        'cmdname' => 'comma',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1067,1070 ****
--- 1100,1105 ----
                        ],
                        'cmdname' => '"',
+                       'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1079,1082 ****
--- 1114,1118 ----
                        'cmdname' => 'comma',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1139,1142 ****
--- 1175,1180 ----
                                ],
                                'cmdname' => '=',
+                               'contents' => [],
+                               'line_nr' => {},
                                'parent' => {}
                              }
***************
*** 1165,1168 ****
--- 1203,1207 ----
                        'cmdname' => 'exclamdown',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 1236,1243 ****
                    ],
                    'normalized' => 'a-strong-ref-with-SC_002c-a-i-trema-_00ef_002c-a-dotless-i-trema-_00ef-_1e14-and-exclamdown-_00a1'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1275,1278 ----
***************
*** 1309,1349 ****
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[5];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[3]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[3];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0];
! $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5];
! $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[6]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7];
! $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[8]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[9];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[9]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[10]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11]{'args'}[0]{'contents'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11];
! $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[12]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[13];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[13]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
--- 1344,1392 ----
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3];
+ $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[5];
+ $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1];
+ $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[3]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[3];
+ $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[3]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0];
! $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5];
! $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[6]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0];
+ $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7];
! $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[8]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[9];
+ $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[9]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[9]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[10]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11]{'args'}[0]{'contents'}[0];
+ $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11];
! $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[12]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[13];
+ $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[13]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[13]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
***************
*** 1367,1371 ****
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[12] = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[12];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[13] = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[13];
! $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
--- 1410,1414 ----
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[12] = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[12];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[13] = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[13];
! $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
***************
*** 1393,1433 ****
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[5];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[4];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
! $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6];
! $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8];
! $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[10];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12];
! $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[14];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[15]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
--- 1436,1484 ----
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3];
+ $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[5];
+ $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2];
+ $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[4];
+ $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
! $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6];
! $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
+ $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8];
! $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[10];
+ $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0];
+ $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12];
! $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[14];
+ $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[14]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[15]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
***************
*** 1449,1453 ****
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'extra'}{'node_content'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
! $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4];
--- 1500,1504 ----
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'extra'}{'node_content'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
! $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4];
***************
*** 1460,1463 ****
--- 1511,1515 ----
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[4]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[4];
+ $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0];
***************
*** 1472,1475 ****
--- 1524,1528 ----
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
+ $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[8]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[8];
***************
*** 1478,1485 ****
--- 1531,1540 ----
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[10];
+ $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0];
+ $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[12]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[12];
***************
*** 1488,1491 ****
--- 1543,1547 ----
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[14];
+ $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[14]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[15]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0];
***************
*** 1503,1512 ****
--- 1559,1571 ----
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[4];
+ $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[6]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[6];
+ $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[7];
+ $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
***************
*** 1521,1524 ****
--- 1580,1584 ----
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0];
+ $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[11]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[11];
***************
*** 1527,1530 ****
--- 1587,1591 ----
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[13];
+ $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[13]{'line_nr'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/spaces_in_empty_node_names.pl texinfo-6.3/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
*** texinfo-6.1/tp/t/results/converters_tests/spaces_in_empty_node_names.pl	2016-01-22 07:50:17.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/spaces_in_empty_node_names.pl	2016-08-02 18:44:56.000000000 +0100
***************
*** 551,558 ****
                    ],
                    'normalized' => '--'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 551,554 ----
***************
*** 630,637 ****
                    ],
                    'normalized' => '-'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 626,629 ----
***************
*** 700,707 ****
                    ],
                    'normalized' => '-'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 692,695 ----
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/spaces_in_node_names.pl texinfo-6.3/tp/t/results/converters_tests/spaces_in_node_names.pl
*** texinfo-6.1/tp/t/results/converters_tests/spaces_in_node_names.pl	2016-01-22 07:50:17.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/spaces_in_node_names.pl	2016-08-02 18:44:55.000000000 +0100
***************
*** 591,598 ****
                    ],
                    'normalized' => 'a--'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 591,594 ----
***************
*** 677,684 ****
                    ],
                    'normalized' => 'b-'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 673,676 ----
***************
*** 754,761 ****
                    ],
                    'normalized' => 'c-'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 746,749 ----
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/table_in_display_in_example.pl texinfo-6.3/tp/t/results/converters_tests/table_in_display_in_example.pl
*** texinfo-6.1/tp/t/results/converters_tests/table_in_display_in_example.pl	2016-01-22 07:50:16.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/table_in_display_in_example.pl	2016-08-02 18:44:55.000000000 +0100
***************
*** 46,49 ****
--- 46,55 ----
                      {
                        'cmdname' => 'asis',
+                       'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 3,
+                         'macro' => ''
+                       },
                        'parent' => {},
                        'type' => 'command_as_argument'
***************
*** 184,192 ****
                  'spaces_after_command' => {}
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 3,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 190,194 ----
                  'spaces_after_command' => {}
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 334,337 ****
--- 336,340 ----
  $result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
  $result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
+ $result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[1];
  $result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/table_in_example_in_display.pl texinfo-6.3/tp/t/results/converters_tests/table_in_example_in_display.pl
*** texinfo-6.1/tp/t/results/converters_tests/table_in_example_in_display.pl	2016-01-22 07:50:16.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/table_in_example_in_display.pl	2016-08-02 18:44:55.000000000 +0100
***************
*** 46,49 ****
--- 46,55 ----
                      {
                        'cmdname' => 'asis',
+                       'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 3,
+                         'macro' => ''
+                       },
                        'parent' => {},
                        'type' => 'command_as_argument'
***************
*** 184,192 ****
                  'spaces_after_command' => {}
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 3,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 190,194 ----
                  'spaces_after_command' => {}
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 334,337 ****
--- 336,340 ----
  $result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
  $result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
+ $result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[1];
  $result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/test_deftypefnnewline.pl texinfo-6.3/tp/t/results/converters_tests/test_deftypefnnewline.pl
*** texinfo-6.1/tp/t/results/converters_tests/test_deftypefnnewline.pl	2016-01-22 07:50:16.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/test_deftypefnnewline.pl	2016-08-02 18:44:54.000000000 +0100
***************
*** 186,190 ****
                    'index_at_command' => 'deftypefun',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deftypefun',
                    'key' => 'name',
--- 186,189 ----
***************
*** 337,341 ****
                    'index_at_command' => 'deffn',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deffn',
                    'key' => 'arg',
--- 336,339 ----
***************
*** 562,566 ****
                    'index_at_command' => 'deftypefun',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deftypefun',
                    'key' => 'name2',
--- 560,563 ----
***************
*** 713,717 ****
                    'index_at_command' => 'deffn',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deffn',
                    'key' => 'arg2',
--- 710,713 ----
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/things_before_setfilename.pl texinfo-6.3/tp/t/results/converters_tests/things_before_setfilename.pl
*** texinfo-6.1/tp/t/results/converters_tests/things_before_setfilename.pl	2016-01-22 07:50:17.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/things_before_setfilename.pl	2016-08-02 18:44:55.000000000 +0100
***************
*** 15,18 ****
--- 15,19 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => '\\input texinfo
  ',
***************
*** 20,23 ****
--- 21,25 ----
                  },
                  {
+                   'parent' => {},
                    'text' => '
  ',
***************
*** 52,60 ****
                    {}
                  ],
!                 'normalized' => 'An-anchor',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 54,58 ----
                    {}
                  ],
!                 'normalized' => 'An-anchor'
                },
                'line_nr' => {
***************
*** 111,118 ****
                        ],
                        'normalized' => 'An-anchor'
-                     },
-                     'spaces_before_argument' => {
-                       'text' => '',
-                       'type' => 'empty_spaces_before_argument'
                      }
                    },
--- 109,112 ----
***************
*** 191,199 ****
                            {}
                          ],
!                         'normalized' => 'Anchor-in-footnote',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 185,189 ----
                            {}
                          ],
!                         'normalized' => 'Anchor-in-footnote'
                        },
                        'line_nr' => {
***************
*** 223,226 ****
--- 213,217 ----
                            {},
                            {
+                             'parent' => {},
                              'text' => '
  ',
***************
*** 267,274 ****
                                      ],
                                      'normalized' => 'An-anchor'
-                                   },
-                                   'spaces_before_argument' => {
-                                     'text' => '',
-                                     'type' => 'empty_spaces_before_argument'
                                    }
                                  },
--- 258,261 ----
***************
*** 296,306 ****
                            'cmdname' => 'footnote',
                            'contents' => [],
-                           'extra' => {
-                             'spaces_before_argument' => {
-                               'parent' => {},
-                               'text' => '',
-                               'type' => 'empty_spaces_before_argument'
-                             }
-                           },
                            'line_nr' => {
                              'file_name' => 'things_before_setfilename.texi',
--- 283,286 ----
***************
*** 329,336 ****
                        ],
                        'normalized' => 'Anchor-in-footnote'
-                     },
-                     'spaces_before_argument' => {
-                       'text' => '',
-                       'type' => 'empty_spaces_before_argument'
                      }
                    },
--- 309,312 ----
***************
*** 383,386 ****
--- 359,363 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 521,528 ****
                        ],
                        'normalized' => 'float-anchor'
-                     },
-                     'spaces_before_argument' => {
-                       'text' => '',
-                       'type' => 'empty_spaces_before_argument'
                      }
                    },
--- 498,501 ----
***************
*** 572,575 ****
--- 545,549 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 631,640 ****
                    'contents' => [],
                    'extra' => {
!                     'float' => {},
!                     'spaces_before_argument' => {
!                       'parent' => {},
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {
--- 605,609 ----
                    'contents' => [],
                    'extra' => {
!                     'float' => {}
                    },
                    'line_nr' => {
***************
*** 918,922 ****
                    'index_at_command' => 'cindex',
                    'index_name' => 'cp',
-                   'index_prefix' => 'c',
                    'index_type_command' => 'cindex',
                    'key' => 'index entry',
--- 887,890 ----
***************
*** 1208,1215 ****
                    ],
                    'normalized' => 'An-anchor'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1176,1179 ----
***************
*** 1270,1277 ****
                    ],
                    'normalized' => 'Anchor-in-footnote'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1234,1237 ----
***************
*** 1316,1319 ****
--- 1276,1281 ----
    'type' => 'document_root'
  };
+ $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+ $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
  $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0];
  $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
***************
*** 1346,1349 ****
--- 1308,1312 ----
  $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[1]{'parent'} = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'};
  $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[2] = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'};
+ $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[3]{'parent'} = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'};
  $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[4]{'parent'} = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'};
  $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[5];
***************
*** 1357,1361 ****
  $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[5]{'parent'} = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'};
  $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'}{'parent'}{'args'}[0] = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'};
- $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'}{'parent'}{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'};
  $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'}{'parent'}{'parent'}{'contents'}[0] = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'}{'parent'};
  $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'}{'parent'}{'parent'}{'contents'}[1]{'parent'} = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'}{'parent'}{'parent'};
--- 1320,1323 ----
***************
*** 1371,1374 ****
--- 1333,1337 ----
  $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'args'}[0];
  $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[10];
+ $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'args'}[1];
  $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'args'}[1];
  $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'args'}[1];
***************
*** 1404,1407 ****
--- 1367,1371 ----
  $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'args'}[0];
  $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14];
+ $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'args'}[1];
  $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'args'}[1];
  $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'args'}[1];
***************
*** 1414,1418 ****
  $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[2];
  $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[2]{'extra'}{'float'} = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14];
- $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[2]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[2]{'args'}[0];
  $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[2]{'parent'} = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14];
  $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[3]{'parent'} = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14];
--- 1378,1381 ----
***************
*** 1753,1761 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 1716,1720 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/things_before_setfilename_no_element.pl texinfo-6.3/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
*** texinfo-6.1/tp/t/results/converters_tests/things_before_setfilename_no_element.pl	2016-01-22 07:50:17.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/things_before_setfilename_no_element.pl	2016-08-02 18:44:55.000000000 +0100
***************
*** 13,16 ****
--- 13,17 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => '\\input texinfo
  ',
***************
*** 18,21 ****
--- 19,23 ----
              },
              {
+               'parent' => {},
                'text' => '
  ',
***************
*** 50,58 ****
                {}
              ],
!             'normalized' => 'An-anchor',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 52,56 ----
                {}
              ],
!             'normalized' => 'An-anchor'
            },
            'line_nr' => {
***************
*** 109,116 ****
                    ],
                    'normalized' => 'An-anchor'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 107,110 ----
***************
*** 189,197 ****
                        {}
                      ],
!                     'normalized' => 'Anchor-in-footnote',
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {
--- 183,187 ----
                        {}
                      ],
!                     'normalized' => 'Anchor-in-footnote'
                    },
                    'line_nr' => {
***************
*** 221,224 ****
--- 211,215 ----
                        {},
                        {
+                         'parent' => {},
                          'text' => '
  ',
***************
*** 265,272 ****
                                  ],
                                  'normalized' => 'An-anchor'
-                               },
-                               'spaces_before_argument' => {
-                                 'text' => '',
-                                 'type' => 'empty_spaces_before_argument'
                                }
                              },
--- 256,259 ----
***************
*** 294,304 ****
                        'cmdname' => 'footnote',
                        'contents' => [],
-                       'extra' => {
-                         'spaces_before_argument' => {
-                           'parent' => {},
-                           'text' => '',
-                           'type' => 'empty_spaces_before_argument'
-                         }
-                       },
                        'line_nr' => {
                          'file_name' => 'things_before_setfilename_no_element.texi',
--- 281,284 ----
***************
*** 327,334 ****
                    ],
                    'normalized' => 'Anchor-in-footnote'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 307,310 ----
***************
*** 381,384 ****
--- 357,361 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 519,526 ****
                    ],
                    'normalized' => 'float-anchor'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 496,499 ----
***************
*** 570,573 ****
--- 543,547 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 629,638 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 603,607 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 916,920 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'index entry',
--- 885,888 ----
***************
*** 1118,1125 ****
                ],
                'normalized' => 'An-anchor'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 1086,1089 ----
***************
*** 1180,1187 ****
                ],
                'normalized' => 'Anchor-in-footnote'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 1144,1147 ----
***************
*** 1211,1214 ****
--- 1171,1176 ----
    'type' => 'text_root'
  };
+ $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0];
+ $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0];
  $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'things_before_setfilename_no_element'}{'contents'}[0];
  $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[1]{'args'}[0];
***************
*** 1241,1244 ****
--- 1203,1207 ----
  $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[1]{'parent'} = $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'};
  $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[2] = $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'};
+ $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[3]{'parent'} = $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'};
  $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[4]{'parent'} = $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'};
  $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[5];
***************
*** 1252,1256 ****
  $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[5]{'parent'} = $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'};
  $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'}{'parent'}{'args'}[0] = $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'};
- $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'}{'parent'}{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'};
  $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'}{'parent'}{'parent'}{'contents'}[0] = $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'}{'parent'};
  $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'}{'parent'}{'parent'}{'contents'}[1]{'parent'} = $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'parent'}{'parent'}{'parent'};
--- 1215,1218 ----
***************
*** 1266,1269 ****
--- 1228,1232 ----
  $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[10]{'args'}[0];
  $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[10];
+ $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[10]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[10]{'args'}[1];
  $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[10]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[10]{'args'}[1];
  $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[10]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[10]{'args'}[1];
***************
*** 1299,1302 ****
--- 1262,1266 ----
  $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[14]{'args'}[0];
  $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[14];
+ $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[14]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[14]{'args'}[1];
  $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[14]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[14]{'args'}[1];
  $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[14]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[14]{'args'}[1];
***************
*** 1309,1313 ****
  $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[14]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[14]{'contents'}[2];
  $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[14]{'contents'}[2]{'extra'}{'float'} = $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[14];
- $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[14]{'contents'}[2]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[14]{'contents'}[2]{'args'}[0];
  $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[14]{'contents'}[2]{'parent'} = $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[14];
  $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[14]{'contents'}[3]{'parent'} = $result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[14];
--- 1273,1276 ----
***************
*** 1572,1580 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 1535,1539 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/top_in_ref.pl texinfo-6.3/tp/t/results/converters_tests/top_in_ref.pl
*** texinfo-6.1/tp/t/results/converters_tests/top_in_ref.pl	2016-01-22 07:50:15.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/top_in_ref.pl	2016-08-02 18:44:53.000000000 +0100
***************
*** 132,139 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 132,135 ----
***************
*** 234,241 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 230,233 ----
***************
*** 341,348 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 333,336 ----
***************
*** 454,461 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 442,445 ----
***************
*** 569,576 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 553,556 ----
***************
*** 683,690 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 663,666 ----
***************
*** 803,810 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 779,782 ----
***************
*** 924,931 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 896,899 ----
***************
*** 1051,1058 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1019,1022 ----
***************
*** 1142,1145 ****
--- 1106,1110 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1156,1159 ****
--- 1121,1125 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1193,1200 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1159,1162 ----
***************
*** 1307,1314 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1269,1272 ----
***************
*** 1427,1434 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1385,1388 ----
***************
*** 1513,1516 ****
--- 1467,1471 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1527,1530 ****
--- 1482,1486 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1562,1569 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1518,1521 ----
***************
*** 1682,1689 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1634,1637 ----
***************
*** 1798,1805 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1746,1749 ----
***************
*** 1908,1915 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1852,1855 ----
***************
*** 2024,2031 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1964,1967 ----
***************
*** 2146,2153 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 2082,2085 ----
***************
*** 2269,2276 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 2201,2204 ----
***************
*** 2392,2399 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 2320,2323 ----
***************
*** 2521,2528 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 2445,2448 ----
***************
*** 2651,2658 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 2571,2574 ----
***************
*** 2787,2794 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 2703,2706 ----
***************
*** 2878,2881 ****
--- 2790,2794 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 2892,2895 ****
--- 2805,2809 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 2938,2945 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 2852,2855 ----
***************
*** 3061,3068 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 2971,2974 ----
***************
*** 3190,3197 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 3096,3099 ----
***************
*** 3276,3279 ****
--- 3178,3182 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 3290,3293 ****
--- 3193,3197 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 3334,3341 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 3238,3241 ----
***************
*** 3463,3470 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 3363,3366 ----
***************
*** 3546,3549 ****
--- 3442,3446 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 3560,3563 ****
--- 3457,3461 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 3591,3598 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 3489,3492 ----
***************
*** 3673,3680 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 3567,3570 ----
***************
*** 3744,3747 ****
--- 3634,3638 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 3772,3779 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 3663,3666 ----
***************
*** 3873,3880 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 3760,3763 ----
***************
*** 4133,4138 ****
--- 4016,4023 ----
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[38]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[38]{'args'}[2];
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[38]{'args'}[2]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[38];
+ $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[38]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[38]{'args'}[3];
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[38]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[38]{'args'}[3];
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[38]{'args'}[3]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[38];
+ $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[38]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[38]{'args'}[4];
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[38]{'args'}[4]{'contents'}[1]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[38]{'args'}[4];
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[38]{'args'}[4]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[38];
***************
*** 4204,4209 ****
--- 4089,4096 ----
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[50]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[50]{'args'}[2];
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[50]{'args'}[2]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[50];
+ $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[50]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[50]{'args'}[3];
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[50]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[50]{'args'}[3];
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[50]{'args'}[3]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[50];
+ $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[50]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[50]{'args'}[4];
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[50]{'args'}[4]{'contents'}[1]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[50]{'args'}[4];
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[50]{'args'}[4]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[50];
***************
*** 4458,4463 ****
--- 4345,4352 ----
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[38]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[38]{'args'}[2];
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[38]{'args'}[2]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[38];
+ $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[38]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[38]{'args'}[3];
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[38]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[38]{'args'}[3];
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[38]{'args'}[3]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[38];
+ $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[38]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[38]{'args'}[4];
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[38]{'args'}[4]{'contents'}[1]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[38]{'args'}[4];
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[38]{'args'}[4]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[38];
***************
*** 4532,4537 ****
--- 4421,4428 ----
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[50]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[50]{'args'}[2];
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[50]{'args'}[2]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[50];
+ $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[50]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[50]{'args'}[3];
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[50]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[50]{'args'}[3];
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[50]{'args'}[3]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[50];
+ $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[50]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[50]{'args'}[4];
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[50]{'args'}[4]{'contents'}[1]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[50]{'args'}[4];
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[50]{'args'}[4]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[50];
***************
*** 4581,4586 ****
--- 4472,4479 ----
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[0];
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[5]{'contents'}[2];
+ $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[1];
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[1];
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[5]{'contents'}[2];
+ $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[2];
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[2];
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[2]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[5]{'contents'}[2];
***************
*** 4617,4620 ****
--- 4510,4514 ----
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[5]{'contents'}[10]{'args'}[0];
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[5]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[5]{'contents'}[10];
+ $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[5]{'contents'}[10]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[5]{'contents'}[10]{'args'}[1];
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[5]{'contents'}[10]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[5]{'contents'}[10]{'args'}[1];
  $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[5]{'contents'}[10]{'args'}[1]{'parent'} = $result_trees{'top_in_ref'}{'contents'}[1]{'contents'}[5]{'contents'}[10];
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/top_in_ref_keep_top.pl texinfo-6.3/tp/t/results/converters_tests/top_in_ref_keep_top.pl
*** texinfo-6.1/tp/t/results/converters_tests/top_in_ref_keep_top.pl	2016-01-22 07:50:20.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/top_in_ref_keep_top.pl	2016-08-02 18:44:59.000000000 +0100
***************
*** 132,139 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 132,135 ----
***************
*** 234,241 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 230,233 ----
***************
*** 341,348 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 333,336 ----
***************
*** 454,461 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 442,445 ----
***************
*** 569,576 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 553,556 ----
***************
*** 683,690 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 663,666 ----
***************
*** 803,810 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 779,782 ----
***************
*** 924,931 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 896,899 ----
***************
*** 1051,1058 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1019,1022 ----
***************
*** 1142,1145 ****
--- 1106,1110 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1156,1159 ****
--- 1121,1125 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1193,1200 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1159,1162 ----
***************
*** 1307,1314 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1269,1272 ----
***************
*** 1427,1434 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1385,1388 ----
***************
*** 1513,1516 ****
--- 1467,1471 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1527,1530 ****
--- 1482,1486 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1562,1569 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1518,1521 ----
***************
*** 1682,1689 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1634,1637 ----
***************
*** 1798,1805 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1746,1749 ----
***************
*** 1908,1915 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1852,1855 ----
***************
*** 2024,2031 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1964,1967 ----
***************
*** 2146,2153 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 2082,2085 ----
***************
*** 2269,2276 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 2201,2204 ----
***************
*** 2392,2399 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 2320,2323 ----
***************
*** 2521,2528 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 2445,2448 ----
***************
*** 2651,2658 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 2571,2574 ----
***************
*** 2787,2794 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 2703,2706 ----
***************
*** 2878,2881 ****
--- 2790,2794 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 2892,2895 ****
--- 2805,2809 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 2938,2945 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 2852,2855 ----
***************
*** 3061,3068 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 2971,2974 ----
***************
*** 3190,3197 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 3096,3099 ----
***************
*** 3276,3279 ****
--- 3178,3182 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 3290,3293 ****
--- 3193,3197 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 3334,3341 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 3238,3241 ----
***************
*** 3463,3470 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 3363,3366 ----
***************
*** 3546,3549 ****
--- 3442,3446 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 3560,3563 ****
--- 3457,3461 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 3591,3598 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 3489,3492 ----
***************
*** 3673,3680 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 3567,3570 ----
***************
*** 3744,3747 ****
--- 3634,3638 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 3772,3779 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 3663,3666 ----
***************
*** 3873,3880 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 3760,3763 ----
***************
*** 4133,4138 ****
--- 4016,4023 ----
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[38]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[38]{'args'}[2];
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[38]{'args'}[2]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[38];
+ $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[38]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[38]{'args'}[3];
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[38]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[38]{'args'}[3];
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[38]{'args'}[3]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[38];
+ $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[38]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[38]{'args'}[4];
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[38]{'args'}[4]{'contents'}[1]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[38]{'args'}[4];
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[38]{'args'}[4]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[38];
***************
*** 4204,4209 ****
--- 4089,4096 ----
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[50]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[50]{'args'}[2];
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[50]{'args'}[2]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[50];
+ $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[50]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[50]{'args'}[3];
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[50]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[50]{'args'}[3];
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[50]{'args'}[3]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[50];
+ $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[50]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[50]{'args'}[4];
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[50]{'args'}[4]{'contents'}[1]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[50]{'args'}[4];
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[50]{'args'}[4]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[1]{'contents'}[50];
***************
*** 4458,4463 ****
--- 4345,4352 ----
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[38]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[38]{'args'}[2];
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[38]{'args'}[2]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[38];
+ $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[38]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[38]{'args'}[3];
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[38]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[38]{'args'}[3];
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[38]{'args'}[3]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[38];
+ $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[38]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[38]{'args'}[4];
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[38]{'args'}[4]{'contents'}[1]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[38]{'args'}[4];
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[38]{'args'}[4]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[38];
***************
*** 4532,4537 ****
--- 4421,4428 ----
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[50]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[50]{'args'}[2];
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[50]{'args'}[2]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[50];
+ $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[50]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[50]{'args'}[3];
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[50]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[50]{'args'}[3];
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[50]{'args'}[3]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[50];
+ $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[50]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[50]{'args'}[4];
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[50]{'args'}[4]{'contents'}[1]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[50]{'args'}[4];
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[50]{'args'}[4]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[3]{'contents'}[50];
***************
*** 4581,4586 ****
--- 4472,4479 ----
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[0];
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[5]{'contents'}[2];
+ $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[1];
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[1];
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[5]{'contents'}[2];
+ $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[2];
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[2];
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[2]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[5]{'contents'}[2];
***************
*** 4617,4620 ****
--- 4510,4514 ----
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[5]{'contents'}[10]{'args'}[0];
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[5]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[5]{'contents'}[10];
+ $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[5]{'contents'}[10]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[5]{'contents'}[10]{'args'}[1];
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[5]{'contents'}[10]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[5]{'contents'}[10]{'args'}[1];
  $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[5]{'contents'}[10]{'args'}[1]{'parent'} = $result_trees{'top_in_ref_keep_top'}{'contents'}[1]{'contents'}[5]{'contents'}[10];
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/unknown_value.pl texinfo-6.3/tp/t/results/converters_tests/unknown_value.pl
*** texinfo-6.1/tp/t/results/converters_tests/unknown_value.pl	2016-01-22 07:50:15.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/unknown_value.pl	2016-08-02 18:44:54.000000000 +0100
***************
*** 9,17 ****
    'contents' => [
      {
-       'parent' => {},
-       'text' => '',
-       'type' => 'empty_line'
-     },
-     {
        'cmdname' => 'value',
        'type' => 'unknown'
--- 9,12 ----
***************
*** 20,24 ****
    'type' => 'text_root'
  };
- $result_trees{'unknown_value'}{'contents'}[0]{'parent'} = $result_trees{'unknown_value'};
  
  $result_texis{'unknown_value'} = '@value{unknown}';
--- 15,18 ----
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/weird_accents.pl texinfo-6.3/tp/t/results/converters_tests/weird_accents.pl
*** texinfo-6.1/tp/t/results/converters_tests/weird_accents.pl	2016-01-22 07:50:13.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/weird_accents.pl	2016-08-02 18:44:52.000000000 +0100
***************
*** 356,359 ****
--- 356,365 ----
                                ],
                                'cmdname' => '`',
+                               'contents' => [],
+                               'line_nr' => {
+                                 'file_name' => '',
+                                 'line_nr' => 12,
+                                 'macro' => ''
+                               },
                                'parent' => {}
                              }
***************
*** 365,373 ****
                        'cmdname' => 'udotaccent',
                        'contents' => [],
!                       'line_nr' => {
!                         'file_name' => '',
!                         'line_nr' => 12,
!                         'macro' => ''
!                       },
                        'parent' => {}
                      }
--- 371,375 ----
                        'cmdname' => 'udotaccent',
                        'contents' => [],
!                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 537,543 ****
  $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
  $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0];
  $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0];
! $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'line_nr'} = $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7];
  $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7];
--- 539,546 ----
  $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0];
  $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0];
! $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'line_nr'} = $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7];
  $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7];
diff -Nrc2 texinfo-6.1/tp/t/results/converters_tests/weird_accents_disable_encoding.pl texinfo-6.3/tp/t/results/converters_tests/weird_accents_disable_encoding.pl
*** texinfo-6.1/tp/t/results/converters_tests/weird_accents_disable_encoding.pl	2016-01-22 07:50:13.000000000 +0000
--- texinfo-6.3/tp/t/results/converters_tests/weird_accents_disable_encoding.pl	2016-08-02 18:44:52.000000000 +0100
***************
*** 356,359 ****
--- 356,365 ----
                                ],
                                'cmdname' => '`',
+                               'contents' => [],
+                               'line_nr' => {
+                                 'file_name' => '',
+                                 'line_nr' => 12,
+                                 'macro' => ''
+                               },
                                'parent' => {}
                              }
***************
*** 365,373 ****
                        'cmdname' => 'udotaccent',
                        'contents' => [],
!                       'line_nr' => {
!                         'file_name' => '',
!                         'line_nr' => 12,
!                         'macro' => ''
!                       },
                        'parent' => {}
                      }
--- 371,375 ----
                        'cmdname' => 'udotaccent',
                        'contents' => [],
!                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 537,543 ****
  $result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
  $result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0];
  $result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0];
! $result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'line_nr'} = $result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7];
  $result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7];
--- 539,546 ----
  $result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0];
  $result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0];
! $result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'line_nr'} = $result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7];
  $result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7];
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/accent_no_closed.pl texinfo-6.3/tp/t/results/coverage/accent_no_closed.pl
*** texinfo-6.1/tp/t/results/coverage/accent_no_closed.pl	2016-01-22 07:49:28.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/accent_no_closed.pl	2016-08-02 18:44:12.000000000 +0100
***************
*** 51,60 ****
  $result_errors{'accent_no_closed'} = [
    {
!     'error_line' => ':1: @~ missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@~ missing close brace',
      'type' => 'error'
    }
--- 51,60 ----
  $result_errors{'accent_no_closed'} = [
    {
!     'error_line' => ':1: @~ missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@~ missing closing brace',
      'type' => 'error'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/accent_no_closed_comment.pl texinfo-6.3/tp/t/results/coverage/accent_no_closed_comment.pl
*** texinfo-6.1/tp/t/results/coverage/accent_no_closed_comment.pl	2016-01-22 07:49:28.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/accent_no_closed_comment.pl	2016-08-02 18:44:12.000000000 +0100
***************
*** 72,81 ****
  $result_errors{'accent_no_closed_comment'} = [
    {
!     'error_line' => ':1: @~ missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@~ missing close brace',
      'type' => 'error'
    }
--- 72,81 ----
  $result_errors{'accent_no_closed_comment'} = [
    {
!     'error_line' => ':1: @~ missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@~ missing closing brace',
      'type' => 'error'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/accent_no_closed_newline.pl texinfo-6.3/tp/t/results/coverage/accent_no_closed_newline.pl
*** texinfo-6.1/tp/t/results/coverage/accent_no_closed_newline.pl	2016-01-22 07:49:28.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/accent_no_closed_newline.pl	2016-08-02 18:44:12.000000000 +0100
***************
*** 63,72 ****
  $result_errors{'accent_no_closed_newline'} = [
    {
!     'error_line' => ':1: @~ missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@~ missing close brace',
      'type' => 'error'
    }
--- 63,72 ----
  $result_errors{'accent_no_closed_newline'} = [
    {
!     'error_line' => ':1: @~ missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@~ missing closing brace',
      'type' => 'error'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/accent_no_closed_paragraph.pl texinfo-6.3/tp/t/results/coverage/accent_no_closed_paragraph.pl
*** texinfo-6.1/tp/t/results/coverage/accent_no_closed_paragraph.pl	2016-01-22 07:49:28.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/accent_no_closed_paragraph.pl	2016-08-02 18:44:12.000000000 +0100
***************
*** 78,87 ****
  $result_errors{'accent_no_closed_paragraph'} = [
    {
!     'error_line' => ':1: @~ missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@~ missing close brace',
      'type' => 'error'
    }
--- 78,87 ----
  $result_errors{'accent_no_closed_paragraph'} = [
    {
!     'error_line' => ':1: @~ missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@~ missing closing brace',
      'type' => 'error'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/accents_errors.pl texinfo-6.3/tp/t/results/coverage/accents_errors.pl
*** texinfo-6.1/tp/t/results/coverage/accents_errors.pl	2016-01-22 07:49:28.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/accents_errors.pl	2016-08-02 18:44:12.000000000 +0100
***************
*** 17,20 ****
--- 17,25 ----
            'cmdname' => 'ringaccent',
            'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 1,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 34,37 ****
--- 39,47 ----
              'spaces' => '  '
            },
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 2,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 56,59 ****
--- 66,74 ----
            'cmdname' => 'ringaccent',
            'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 3,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 86,89 ****
--- 101,109 ----
            'cmdname' => '~',
            'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 5,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 100,103 ****
--- 120,128 ----
            'cmdname' => '~',
            'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 6,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 122,125 ****
--- 147,155 ----
            'cmdname' => '~',
            'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 7,
+             'macro' => ''
+           },
            'parent' => {}
          },
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/arg_in_brace_no_arg_command.pl texinfo-6.3/tp/t/results/coverage/arg_in_brace_no_arg_command.pl
*** texinfo-6.1/tp/t/results/coverage/arg_in_brace_no_arg_command.pl	2016-01-22 07:49:28.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/arg_in_brace_no_arg_command.pl	2016-08-02 18:44:12.000000000 +0100
***************
*** 25,28 ****
--- 25,33 ----
            'cmdname' => 'TeX',
            'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 1,
+             'macro' => ''
+           },
            'parent' => {}
          },
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/at_after_accent_command.pl texinfo-6.3/tp/t/results/coverage/at_after_accent_command.pl
*** texinfo-6.1/tp/t/results/coverage/at_after_accent_command.pl	2016-01-22 07:49:28.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/at_after_accent_command.pl	2016-08-02 18:44:12.000000000 +0100
***************
*** 16,19 ****
--- 16,24 ----
              'spaces' => ' '
            },
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 1,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 29,32 ****
--- 34,38 ----
            'cmdname' => '^',
            'contents' => [],
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 50,53 ****
--- 56,60 ----
  $result_trees{'at_after_accent_command'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_after_accent_command'}{'contents'}[0];
  $result_trees{'at_after_accent_command'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_after_accent_command'}{'contents'}[0];
+ $result_trees{'at_after_accent_command'}{'contents'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_after_accent_command'}{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'at_after_accent_command'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_after_accent_command'}{'contents'}[0];
  $result_trees{'at_after_accent_command'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_after_accent_command'}{'contents'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/block_commands.pl texinfo-6.3/tp/t/results/coverage/block_commands.pl
*** texinfo-6.1/tp/t/results/coverage/block_commands.pl	2016-01-22 07:49:26.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/block_commands.pl	2016-08-02 18:44:10.000000000 +0100
***************
*** 223,226 ****
--- 223,227 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 305,314 ****
            'contents' => [],
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'parent' => {},
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 306,310 ----
            'contents' => [],
            'extra' => {
!             'float' => {}
            },
            'line_nr' => {
***************
*** 441,444 ****
--- 437,441 ----
  $result_trees{'block_commands'}{'contents'}[5]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'block_commands'}{'contents'}[5]{'args'}[0];
  $result_trees{'block_commands'}{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'block_commands'}{'contents'}[5];
+ $result_trees{'block_commands'}{'contents'}[5]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'block_commands'}{'contents'}[5]{'args'}[1];
  $result_trees{'block_commands'}{'contents'}[5]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'block_commands'}{'contents'}[5]{'args'}[1];
  $result_trees{'block_commands'}{'contents'}[5]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'block_commands'}{'contents'}[5]{'args'}[1];
***************
*** 455,459 ****
  $result_trees{'block_commands'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'block_commands'}{'contents'}[5]{'contents'}[3];
  $result_trees{'block_commands'}{'contents'}[5]{'contents'}[3]{'extra'}{'float'} = $result_trees{'block_commands'}{'contents'}[5];
- $result_trees{'block_commands'}{'contents'}[5]{'contents'}[3]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'block_commands'}{'contents'}[5]{'contents'}[3]{'args'}[0];
  $result_trees{'block_commands'}{'contents'}[5]{'contents'}[3]{'parent'} = $result_trees{'block_commands'}{'contents'}[5];
  $result_trees{'block_commands'}{'contents'}[5]{'contents'}[4]{'parent'} = $result_trees{'block_commands'}{'contents'}[5];
--- 452,455 ----
***************
*** 519,527 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 515,519 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/commands.pl texinfo-6.3/tp/t/results/coverage/commands.pl
*** texinfo-6.1/tp/t/results/coverage/commands.pl	2016-01-22 07:49:26.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/commands.pl	2016-08-02 18:44:10.000000000 +0100
***************
*** 28,31 ****
--- 28,36 ----
            'cmdname' => 'TeX',
            'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 1,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 53,56 ****
--- 58,67 ----
            ],
            'cmdname' => '"',
+           'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 2,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 78,86 ****
                    'cmdname' => 'dotless',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 2,
!                     'macro' => ''
!                   },
                    'parent' => {}
                  }
--- 89,93 ----
                    'cmdname' => 'dotless',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 135,141 ****
--- 142,150 ----
            ],
            'cmdname' => 'ringaccent',
+           'contents' => [],
            'extra' => {
              'spaces' => ' '
            },
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 166,169 ****
--- 175,183 ----
                      'clickstyle' => 'arrow'
                    },
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 3,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 179,187 ****
            'cmdname' => 'clicksequence',
            'contents' => [],
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 3,
!             'macro' => ''
!           },
            'parent' => {}
          },
--- 193,197 ----
            'cmdname' => 'clicksequence',
            'contents' => [],
!           'line_nr' => {},
            'parent' => {}
          },
***************
*** 210,213 ****
--- 220,224 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 232,240 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 243,247 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 339,342 ****
--- 346,354 ----
                'cmdname' => 'LaTeX',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 7,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 364,368 ****
            'index_at_command' => 'cindex',
            'index_name' => 'cp',
-           'index_prefix' => 'c',
            'index_type_command' => 'cindex',
            'key' => 'index entry "in text" LaTeX',
--- 376,379 ----
***************
*** 372,380 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 7,
!         'macro' => ''
!       },
        'parent' => {},
        'type' => 'index_entry_command'
--- 383,387 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {},
        'type' => 'index_entry_command'
***************
*** 462,477 ****
  $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[7];
! $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'commands'}{'contents'}[0];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[8]{'parent'} = $result_trees{'commands'}{'contents'}[0];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[9]{'args'}[0];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[9];
! $result_trees{'commands'}{'contents'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'commands'}{'contents'}[0]{'contents'}[9]{'parent'} = $result_trees{'commands'}{'contents'}[0];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[10]{'parent'} = $result_trees{'commands'}{'contents'}[0];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[11]{'args'}[0];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[11];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[11]{'parent'} = $result_trees{'commands'}{'contents'}[0];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[12]{'parent'} = $result_trees{'commands'}{'contents'}[0];
--- 469,486 ----
  $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
+ $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[5]{'line_nr'};
  $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[7];
! $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[5]{'line_nr'};
  $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'commands'}{'contents'}[0];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[8]{'parent'} = $result_trees{'commands'}{'contents'}[0];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[9]{'args'}[0];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[9];
! $result_trees{'commands'}{'contents'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[5]{'line_nr'};
  $result_trees{'commands'}{'contents'}[0]{'contents'}[9]{'parent'} = $result_trees{'commands'}{'contents'}[0];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[10]{'parent'} = $result_trees{'commands'}{'contents'}[0];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[11]{'args'}[0];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[11];
+ $result_trees{'commands'}{'contents'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[5]{'line_nr'};
  $result_trees{'commands'}{'contents'}[0]{'contents'}[11]{'parent'} = $result_trees{'commands'}{'contents'}[0];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[12]{'parent'} = $result_trees{'commands'}{'contents'}[0];
***************
*** 481,484 ****
--- 490,494 ----
  $result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[0];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[13];
+ $result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'line_nr'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'parent'} = $result_trees{'commands'}{'contents'}[0];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[14]{'parent'} = $result_trees{'commands'}{'contents'}[0];
***************
*** 486,489 ****
--- 496,500 ----
  $result_trees{'commands'}{'contents'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[16]{'args'}[0];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[16];
+ $result_trees{'commands'}{'contents'}[0]{'contents'}[16]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[16]{'args'}[1];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[16]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[16]{'args'}[1];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[16]{'args'}[1]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[16];
***************
*** 517,520 ****
--- 528,532 ----
  $result_trees{'commands'}{'contents'}[2]{'extra'}{'misc_content'} = $result_trees{'commands'}{'contents'}[2]{'extra'}{'index_entry'}{'content'};
  $result_trees{'commands'}{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'commands'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+ $result_trees{'commands'}{'contents'}[2]{'line_nr'} = $result_trees{'commands'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'commands'}{'contents'}[2]{'parent'} = $result_trees{'commands'};
  $result_trees{'commands'}{'contents'}[3]{'parent'} = $result_trees{'commands'};
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/def.pl texinfo-6.3/tp/t/results/coverage/def.pl
*** texinfo-6.1/tp/t/results/coverage/def.pl	2016-01-22 07:49:26.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/def.pl	2016-08-02 18:44:10.000000000 +0100
***************
*** 60,64 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 60,63 ----
***************
*** 107,111 ****
                'index_at_command' => 'deffn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'd--effn_name',
--- 106,109 ----
***************
*** 350,354 ****
                'index_at_command' => 'deffn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'de--ffn_name',
--- 348,351 ----
***************
*** 550,554 ****
                'index_at_command' => 'deffn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'i',
--- 547,550 ----
***************
*** 615,619 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 611,614 ----
***************
*** 643,647 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 638,641 ----
***************
*** 664,668 ****
                'index_at_command' => 'deffnx',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'truc',
--- 658,661 ----
***************
*** 747,751 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 740,743 ----
***************
*** 762,766 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 754,757 ----
***************
*** 783,787 ****
                'index_at_command' => 'deffnx',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'log trap',
--- 774,777 ----
***************
*** 814,817 ****
--- 804,808 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 876,880 ****
                      'spaces_before_argument' => {}
                    },
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 867,870 ----
***************
*** 891,895 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 881,884 ----
***************
*** 919,923 ****
                'index_at_command' => 'deffnx',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'log trap1',
--- 908,911 ----
***************
*** 1007,1011 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 995,998 ----
***************
*** 1022,1026 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 1009,1012 ----
***************
*** 1043,1047 ****
                'index_at_command' => 'deffnx',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'log trap2',
--- 1029,1032 ----
***************
*** 1153,1157 ****
                'index_at_command' => 'deffnx',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'id ule',
--- 1138,1141 ----
***************
*** 1285,1289 ****
                'index_at_command' => 'deffnx',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'id i ule',
--- 1269,1272 ----
***************
*** 1328,1332 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 1311,1314 ----
***************
*** 1362,1379 ****
                'index_at_command' => 'deffnx',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'machin',
                'number' => 10
              },
!             'original_def_cmdname' => 'deffnx',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {},
--- 1344,1352 ----
                'index_at_command' => 'deffnx',
                'index_name' => 'fn',
                'index_type_command' => 'deffn',
                'key' => 'machin',
                'number' => 10
              },
!             'original_def_cmdname' => 'deffnx'
            },
            'line_nr' => {},
***************
*** 1427,1431 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 1400,1403 ----
***************
*** 1442,1446 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 1414,1417 ----
***************
*** 1463,1480 ****
                'index_at_command' => 'deffnx',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'bidule machin',
                'number' => 11
              },
!             'original_def_cmdname' => 'deffnx',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {},
--- 1434,1442 ----
                'index_at_command' => 'deffnx',
                'index_name' => 'fn',
                'index_type_command' => 'deffn',
                'key' => 'bidule machin',
                'number' => 11
              },
!             'original_def_cmdname' => 'deffnx'
            },
            'line_nr' => {},
***************
*** 1518,1522 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 1480,1483 ----
***************
*** 1552,1569 ****
                'index_at_command' => 'deffnx',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'machin',
                'number' => 12
              },
!             'original_def_cmdname' => 'deffnx',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {},
--- 1513,1521 ----
                'index_at_command' => 'deffnx',
                'index_name' => 'fn',
                'index_type_command' => 'deffn',
                'key' => 'machin',
                'number' => 12
              },
!             'original_def_cmdname' => 'deffnx'
            },
            'line_nr' => {},
***************
*** 1615,1619 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 1567,1570 ----
***************
*** 1688,1692 ****
                'index_at_command' => 'deffnx',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'followed',
--- 1639,1642 ----
***************
*** 1768,1772 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 1718,1721 ----
***************
*** 1841,1845 ****
                'index_at_command' => 'deffnx',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'after',
--- 1790,1793 ----
***************
*** 1921,1925 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 1869,1872 ----
***************
*** 1994,1998 ****
                'index_at_command' => 'deffnx',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'deffnx',
--- 1941,1944 ----
***************
*** 2083,2087 ****
  $result_trees{'def'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[1]{'contents'}[0];
  $result_trees{'def'}{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'def'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'def'}{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'def'}{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'def'}{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'def'}{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 2029,2032 ----
***************
*** 2162,2168 ****
  $result_trees{'def'}{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[1];
  $result_trees{'def'}{'contents'}[5]{'contents'}[1]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'def'}{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'def'}{'contents'}[5]{'contents'}[1]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[1]{'args'}[0];
  $result_trees{'def'}{'contents'}[5]{'contents'}[1]{'extra'}{'def_args'}[4][1]{'contents'} = $result_trees{'def'}{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'def'}{'contents'}[5]{'contents'}[1]{'extra'}{'def_args'}[4][1]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[1]{'args'}[0];
  $result_trees{'def'}{'contents'}[5]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[5]{'contents'}[1]{'extra'}{'def_args'}[0][1];
  $result_trees{'def'}{'contents'}[5]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[5]{'contents'}[1]{'extra'}{'def_args'}[2][1];
--- 2107,2111 ----
***************
*** 2184,2190 ****
  $result_trees{'def'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[2];
  $result_trees{'def'}{'contents'}[5]{'contents'}[2]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'def'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'};
- $result_trees{'def'}{'contents'}[5]{'contents'}[2]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[2]{'args'}[0];
  $result_trees{'def'}{'contents'}[5]{'contents'}[2]{'extra'}{'def_args'}[4][1]{'contents'} = $result_trees{'def'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'contents'};
- $result_trees{'def'}{'contents'}[5]{'contents'}[2]{'extra'}{'def_args'}[4][1]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[2]{'args'}[0];
  $result_trees{'def'}{'contents'}[5]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[5]{'contents'}[2]{'extra'}{'def_args'}[0][1];
  $result_trees{'def'}{'contents'}[5]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[5]{'contents'}[2]{'extra'}{'def_args'}[2][1];
--- 2127,2131 ----
***************
*** 2198,2201 ****
--- 2139,2143 ----
  $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0];
  $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0];
+ $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2];
  $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2];
  $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2]{'extra'}{'spaces_before_argument'} = $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[0];
***************
*** 2208,2214 ****
  $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'};
  $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'extra'}{'def_args'}[2][1]{'extra'}{'spaces_before_argument'} = $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[0];
- $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0];
  $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'extra'}{'def_args'}[4][1]{'contents'} = $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[4]{'contents'};
- $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'extra'}{'def_args'}[4][1]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0];
  $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'extra'}{'def_args'}[0][1];
  $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'extra'}{'def_args'}[2][1];
--- 2150,2154 ----
***************
*** 2231,2237 ****
  $result_trees{'def'}{'contents'}[5]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[4];
  $result_trees{'def'}{'contents'}[5]{'contents'}[4]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'def'}{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[2]{'contents'};
- $result_trees{'def'}{'contents'}[5]{'contents'}[4]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[4]{'args'}[0];
  $result_trees{'def'}{'contents'}[5]{'contents'}[4]{'extra'}{'def_args'}[4][1]{'contents'} = $result_trees{'def'}{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[4]{'contents'};
- $result_trees{'def'}{'contents'}[5]{'contents'}[4]{'extra'}{'def_args'}[4][1]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[4]{'args'}[0];
  $result_trees{'def'}{'contents'}[5]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[5]{'contents'}[4]{'extra'}{'def_args'}[0][1];
  $result_trees{'def'}{'contents'}[5]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[5]{'contents'}[4]{'extra'}{'def_args'}[2][1];
--- 2171,2175 ----
***************
*** 2285,2289 ****
  $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[7];
  $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[0]{'contents'};
- $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'args'}[0];
  $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'extra'}{'def_args'}[0][1];
  $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'extra'}{'def_args'}[2][1];
--- 2223,2226 ----
***************
*** 2291,2296 ****
  $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'extra'}{'def_args'}[2][1];
  $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'extra'}{'def_args'}[2][1];
- $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'def'}{'contents'}[5]{'contents'}[7];
- $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'args'}[0];
  $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'line_nr'} = $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'parent'} = $result_trees{'def'}{'contents'}[5];
--- 2228,2231 ----
***************
*** 2303,2309 ****
  $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[8];
  $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[0]{'contents'};
- $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'args'}[0];
  $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[2]{'contents'};
- $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'args'}[0];
  $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'extra'}{'def_args'}[0][1];
  $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'extra'}{'def_args'}[2][1];
--- 2238,2242 ----
***************
*** 2311,2316 ****
  $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'extra'}{'def_args'}[2][1];
  $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'extra'}{'def_args'}[2][1];
- $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'def'}{'contents'}[5]{'contents'}[8];
- $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'args'}[0];
  $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'line_nr'} = $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'parent'} = $result_trees{'def'}{'contents'}[5];
--- 2244,2247 ----
***************
*** 2320,2324 ****
  $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[9];
  $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[0]{'contents'};
- $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'args'}[0];
  $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'extra'}{'def_args'}[0][1];
  $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'extra'}{'def_args'}[2][1];
--- 2251,2254 ----
***************
*** 2326,2331 ****
  $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'extra'}{'def_args'}[2][1];
  $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'extra'}{'def_args'}[2][1];
- $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'def'}{'contents'}[5]{'contents'}[9];
- $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'args'}[0];
  $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'line_nr'} = $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'parent'} = $result_trees{'def'}{'contents'}[5];
--- 2256,2259 ----
***************
*** 2337,2341 ****
  $result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[10];
  $result_trees{'def'}{'contents'}[5]{'contents'}[10]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'def'}{'contents'}[5]{'contents'}[10]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0];
  $result_trees{'def'}{'contents'}[5]{'contents'}[10]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[5]{'contents'}[10]{'extra'}{'def_args'}[0][1];
  $result_trees{'def'}{'contents'}[5]{'contents'}[10]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[5]{'contents'}[10]{'extra'}{'def_args'}[2][1];
--- 2265,2268 ----
***************
*** 2356,2360 ****
  $result_trees{'def'}{'contents'}[5]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[12];
  $result_trees{'def'}{'contents'}[5]{'contents'}[12]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'def'}{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'def'}{'contents'}[5]{'contents'}[12]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[12]{'args'}[0];
  $result_trees{'def'}{'contents'}[5]{'contents'}[12]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[5]{'contents'}[12]{'extra'}{'def_args'}[0][1];
  $result_trees{'def'}{'contents'}[5]{'contents'}[12]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[5]{'contents'}[12]{'extra'}{'def_args'}[2][1];
--- 2283,2286 ----
***************
*** 2375,2379 ****
  $result_trees{'def'}{'contents'}[5]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[14];
  $result_trees{'def'}{'contents'}[5]{'contents'}[14]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'def'}{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'def'}{'contents'}[5]{'contents'}[14]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'def'}{'contents'}[5]{'contents'}[14]{'args'}[0];
  $result_trees{'def'}{'contents'}[5]{'contents'}[14]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def'}{'contents'}[5]{'contents'}[14]{'extra'}{'def_args'}[0][1];
  $result_trees{'def'}{'contents'}[5]{'contents'}[14]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def'}{'contents'}[5]{'contents'}[14]{'extra'}{'def_args'}[2][1];
--- 2301,2304 ----
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/delcomment.pl texinfo-6.3/tp/t/results/coverage/delcomment.pl
*** texinfo-6.1/tp/t/results/coverage/delcomment.pl	2016-01-22 07:49:28.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/delcomment.pl	2016-08-02 18:44:12.000000000 +0100
***************
*** 13,16 ****
--- 13,17 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => '\\input texinfo
  ',
***************
*** 150,153 ****
--- 151,155 ----
    'type' => 'text_root'
  };
+ $result_trees{'delcomment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'delcomment'}{'contents'}[0]{'contents'}[0];
  $result_trees{'delcomment'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'delcomment'}{'contents'}[0];
  $result_trees{'delcomment'}{'contents'}[0]{'parent'} = $result_trees{'delcomment'};
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/exdent_and_formats.pl texinfo-6.3/tp/t/results/coverage/exdent_and_formats.pl
*** texinfo-6.1/tp/t/results/coverage/exdent_and_formats.pl	2016-01-22 07:49:27.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/exdent_and_formats.pl	2016-08-02 18:44:11.000000000 +0100
***************
*** 36,39 ****
--- 36,44 ----
                'cmdname' => 'TeX',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 2,
+                 'macro' => ''
+               },
                'parent' => {}
              },
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/formats_only_title_comments.pl texinfo-6.3/tp/t/results/coverage/formats_only_title_comments.pl
*** texinfo-6.1/tp/t/results/coverage/formats_only_title_comments.pl	2016-01-22 07:49:28.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/formats_only_title_comments.pl	2016-08-02 18:44:12.000000000 +0100
***************
*** 102,105 ****
--- 102,106 ----
              {
                'cmdname' => 'bullet',
+               'contents' => [],
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 270,273 ****
--- 271,280 ----
              {
                'cmdname' => 'emph',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 11,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 373,381 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 11,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 380,384 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 400,403 ****
--- 403,412 ----
              {
                'cmdname' => 'asis',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 16,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 502,510 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 16,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 511,515 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 730,733 ****
--- 735,739 ----
  $result_trees{'formats_only_title_comments'}{'contents'}[4]{'extra'}{'end_command'} = $result_trees{'formats_only_title_comments'}{'contents'}[4]{'contents'}[1];
  $result_trees{'formats_only_title_comments'}{'contents'}[4]{'extra'}{'spaces_after_command'} = $result_trees{'formats_only_title_comments'}{'contents'}[4]{'args'}[0]{'contents'}[0];
+ $result_trees{'formats_only_title_comments'}{'contents'}[4]{'line_nr'} = $result_trees{'formats_only_title_comments'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'formats_only_title_comments'}{'contents'}[4]{'parent'} = $result_trees{'formats_only_title_comments'};
  $result_trees{'formats_only_title_comments'}{'contents'}[5]{'parent'} = $result_trees{'formats_only_title_comments'};
***************
*** 754,757 ****
--- 760,764 ----
  $result_trees{'formats_only_title_comments'}{'contents'}[6]{'extra'}{'end_command'} = $result_trees{'formats_only_title_comments'}{'contents'}[6]{'contents'}[1];
  $result_trees{'formats_only_title_comments'}{'contents'}[6]{'extra'}{'spaces_after_command'} = $result_trees{'formats_only_title_comments'}{'contents'}[6]{'args'}[0]{'contents'}[0];
+ $result_trees{'formats_only_title_comments'}{'contents'}[6]{'line_nr'} = $result_trees{'formats_only_title_comments'}{'contents'}[6]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'formats_only_title_comments'}{'contents'}[6]{'parent'} = $result_trees{'formats_only_title_comments'};
  $result_trees{'formats_only_title_comments'}{'contents'}[7]{'parent'} = $result_trees{'formats_only_title_comments'};
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/formats_only_titles.pl texinfo-6.3/tp/t/results/coverage/formats_only_titles.pl
*** texinfo-6.1/tp/t/results/coverage/formats_only_titles.pl	2016-01-22 07:49:28.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/formats_only_titles.pl	2016-08-02 18:44:12.000000000 +0100
***************
*** 84,87 ****
--- 84,88 ----
              {
                'cmdname' => 'bullet',
+               'contents' => [],
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 209,212 ****
--- 210,219 ----
              {
                'cmdname' => 'emph',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 9,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 294,302 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 9,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 301,305 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 321,324 ****
--- 324,333 ----
              {
                'cmdname' => 'asis',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 13,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 406,414 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 13,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 415,419 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 607,610 ****
--- 612,616 ----
  $result_trees{'formats_only_titles'}{'contents'}[4]{'extra'}{'end_command'} = $result_trees{'formats_only_titles'}{'contents'}[4]{'contents'}[1];
  $result_trees{'formats_only_titles'}{'contents'}[4]{'extra'}{'spaces_after_command'} = $result_trees{'formats_only_titles'}{'contents'}[4]{'args'}[0]{'contents'}[0];
+ $result_trees{'formats_only_titles'}{'contents'}[4]{'line_nr'} = $result_trees{'formats_only_titles'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'formats_only_titles'}{'contents'}[4]{'parent'} = $result_trees{'formats_only_titles'};
  $result_trees{'formats_only_titles'}{'contents'}[5]{'parent'} = $result_trees{'formats_only_titles'};
***************
*** 629,632 ****
--- 635,639 ----
  $result_trees{'formats_only_titles'}{'contents'}[6]{'extra'}{'end_command'} = $result_trees{'formats_only_titles'}{'contents'}[6]{'contents'}[1];
  $result_trees{'formats_only_titles'}{'contents'}[6]{'extra'}{'spaces_after_command'} = $result_trees{'formats_only_titles'}{'contents'}[6]{'args'}[0]{'contents'}[0];
+ $result_trees{'formats_only_titles'}{'contents'}[6]{'line_nr'} = $result_trees{'formats_only_titles'}{'contents'}[6]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'formats_only_titles'}{'contents'}[6]{'parent'} = $result_trees{'formats_only_titles'};
  $result_trees{'formats_only_titles'}{'contents'}[7]{'parent'} = $result_trees{'formats_only_titles'};
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/formats_titles.pl texinfo-6.3/tp/t/results/coverage/formats_titles.pl
*** texinfo-6.1/tp/t/results/coverage/formats_titles.pl	2016-01-22 07:49:28.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/formats_titles.pl	2016-08-02 18:44:12.000000000 +0100
***************
*** 118,121 ****
--- 118,122 ----
              {
                'cmdname' => 'bullet',
+               'contents' => [],
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 277,280 ****
--- 278,287 ----
              {
                'cmdname' => 'emph',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 11,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 415,423 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 11,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 422,426 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 442,445 ****
--- 445,454 ----
              {
                'cmdname' => 'asis',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 16,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 517,521 ****
                        'index_at_command' => 'item',
                        'index_name' => 'vr',
-                       'index_prefix' => 'v',
                        'index_type_command' => 'vtable',
                        'key' => 'vtab',
--- 526,529 ----
***************
*** 592,600 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 16,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 600,604 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 893,896 ****
--- 897,901 ----
  $result_trees{'formats_titles'}{'contents'}[4]{'extra'}{'end_command'} = $result_trees{'formats_titles'}{'contents'}[4]{'contents'}[2];
  $result_trees{'formats_titles'}{'contents'}[4]{'extra'}{'spaces_after_command'} = $result_trees{'formats_titles'}{'contents'}[4]{'args'}[0]{'contents'}[0];
+ $result_trees{'formats_titles'}{'contents'}[4]{'line_nr'} = $result_trees{'formats_titles'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'formats_titles'}{'contents'}[4]{'parent'} = $result_trees{'formats_titles'};
  $result_trees{'formats_titles'}{'contents'}[5]{'parent'} = $result_trees{'formats_titles'};
***************
*** 928,931 ****
--- 933,937 ----
  $result_trees{'formats_titles'}{'contents'}[6]{'extra'}{'end_command'} = $result_trees{'formats_titles'}{'contents'}[6]{'contents'}[2];
  $result_trees{'formats_titles'}{'contents'}[6]{'extra'}{'spaces_after_command'} = $result_trees{'formats_titles'}{'contents'}[6]{'args'}[0]{'contents'}[0];
+ $result_trees{'formats_titles'}{'contents'}[6]{'line_nr'} = $result_trees{'formats_titles'}{'contents'}[6]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'formats_titles'}{'contents'}[6]{'parent'} = $result_trees{'formats_titles'};
  $result_trees{'formats_titles'}{'contents'}[7]{'parent'} = $result_trees{'formats_titles'};
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/group_beginning_and_end_on_line.pl texinfo-6.3/tp/t/results/coverage/group_beginning_and_end_on_line.pl
*** texinfo-6.1/tp/t/results/coverage/group_beginning_and_end_on_line.pl	2016-01-22 07:49:28.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/group_beginning_and_end_on_line.pl	2016-08-02 18:44:12.000000000 +0100
***************
*** 108,117 ****
  $result_errors{'group_beginning_and_end_on_line'} = [
    {
!     'error_line' => ':1: warning: @end should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@end should only appear at a line beginning',
      'type' => 'warning'
    }
--- 108,117 ----
  $result_errors{'group_beginning_and_end_on_line'} = [
    {
!     'error_line' => ':1: warning: @end should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@end should only appear at the beginning of a line',
      'type' => 'warning'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/hyphenation.pl texinfo-6.3/tp/t/results/coverage/hyphenation.pl
*** texinfo-6.1/tp/t/results/coverage/hyphenation.pl	2016-01-22 07:49:26.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/hyphenation.pl	2016-08-02 18:44:10.000000000 +0100
***************
*** 37,40 ****
--- 37,41 ----
      },
      {
+       'parent' => {},
        'text' => '
  ',
***************
*** 54,57 ****
--- 55,59 ----
  $result_trees{'hyphenation'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'hyphenation'}{'contents'}[1];
  $result_trees{'hyphenation'}{'contents'}[1]{'parent'} = $result_trees{'hyphenation'};
+ $result_trees{'hyphenation'}{'contents'}[2]{'parent'} = $result_trees{'hyphenation'};
  $result_trees{'hyphenation'}{'contents'}[3]{'parent'} = $result_trees{'hyphenation'};
  
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/indicateurl_end_lines.pl texinfo-6.3/tp/t/results/coverage/indicateurl_end_lines.pl
*** texinfo-6.1/tp/t/results/coverage/indicateurl_end_lines.pl	2016-01-22 07:49:28.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/indicateurl_end_lines.pl	2016-08-02 18:44:12.000000000 +0100
***************
*** 36,44 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 36,40 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 88,97 ****
            'cmdname' => 'indicateurl',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {
              'file_name' => '',
--- 84,87 ----
***************
*** 155,164 ****
  $result_errors{'indicateurl_end_lines'} = [
    {
!     'error_line' => ':4: @indicateurl missing close brace
  ',
      'file_name' => '',
      'line_nr' => 4,
      'macro' => '',
!     'text' => '@indicateurl missing close brace',
      'type' => 'error'
    },
--- 145,154 ----
  $result_errors{'indicateurl_end_lines'} = [
    {
!     'error_line' => ':4: @indicateurl missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 4,
      'macro' => '',
!     'text' => '@indicateurl missing closing brace',
      'type' => 'error'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/invalid_U.pl texinfo-6.3/tp/t/results/coverage/invalid_U.pl
*** texinfo-6.1/tp/t/results/coverage/invalid_U.pl	2016-01-22 07:49:28.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/invalid_U.pl	2016-08-02 18:44:12.000000000 +0100
***************
*** 20,23 ****
--- 20,28 ----
              ]
            },
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 1,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 37,51 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
!           },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 1,
!             'macro' => ''
            },
            'parent' => {}
          },
--- 42,48 ----
                  {}
                ]
!             ]
            },
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 74,82 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 71,75 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 107,115 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 100,104 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 140,148 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 129,133 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 173,181 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 158,162 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 206,214 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 187,191 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 229,232 ****
--- 206,210 ----
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[1];
+ $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
***************
*** 234,238 ****
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[3];
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[3]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
! $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
--- 212,216 ----
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[3];
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[3]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
! $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
***************
*** 240,244 ****
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[5];
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[5]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
! $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[6]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
--- 218,222 ----
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[5];
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[5]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
! $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[6]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
***************
*** 246,250 ****
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[7];
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[7]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
! $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[8]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
--- 224,228 ----
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[7];
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[7]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
! $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[8]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
***************
*** 252,256 ****
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[9];
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[9]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0];
! $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[9]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[10]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
--- 230,234 ----
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[9];
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[9]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0];
! $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[9]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[10]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
***************
*** 258,262 ****
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[11];
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[11]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0];
! $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[11]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[12]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
--- 236,240 ----
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[11];
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[11]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0];
! $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[11]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
  $result_trees{'invalid_U'}{'contents'}[0]{'contents'}[12]{'parent'} = $result_trees{'invalid_U'}{'contents'}[0];
***************
*** 308,317 ****
    },
    {
!     'error_line' => ':1: argument for @U exceeds size of integer: 9999999999999
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => 'argument for @U exceeds size of integer: 9999999999999',
      'type' => 'error'
    },
--- 286,295 ----
    },
    {
!     'error_line' => ':1: argument for @U exceeds Unicode maximum 0x10FFFF: 9999999999999
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => 'argument for @U exceeds Unicode maximum 0x10FFFF: 9999999999999',
      'type' => 'error'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/item_container.pl texinfo-6.3/tp/t/results/coverage/item_container.pl
*** texinfo-6.1/tp/t/results/coverage/item_container.pl	2016-01-22 07:49:26.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/item_container.pl	2016-08-02 18:44:10.000000000 +0100
***************
*** 155,158 ****
--- 155,164 ----
              {
                'cmdname' => 'bullet',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 6,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 263,271 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 6,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 269,273 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 369,372 ****
--- 371,375 ----
              {
                'cmdname' => 'bullet',
+               'contents' => [],
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 437,440 ****
--- 440,444 ----
  $result_trees{'item_container'}{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'item_container'}{'contents'}[3]{'contents'}[1];
  $result_trees{'item_container'}{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'item_container'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+ $result_trees{'item_container'}{'contents'}[3]{'line_nr'} = $result_trees{'item_container'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'item_container'}{'contents'}[3]{'parent'} = $result_trees{'item_container'};
  $result_trees{'item_container'}{'contents'}[4]{'parent'} = $result_trees{'item_container'};
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/lettered_accent_and_spaces.pl texinfo-6.3/tp/t/results/coverage/lettered_accent_and_spaces.pl
*** texinfo-6.1/tp/t/results/coverage/lettered_accent_and_spaces.pl	2016-01-22 07:49:26.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/lettered_accent_and_spaces.pl	2016-08-02 18:44:10.000000000 +0100
***************
*** 24,30 ****
--- 24,36 ----
            ],
            'cmdname' => 'ringaccent',
+           'contents' => [],
            'extra' => {
              'spaces' => '    '
            },
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 1,
+             'macro' => ''
+           },
            'parent' => {}
          },
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/math.pl texinfo-6.3/tp/t/results/coverage/math.pl
*** texinfo-6.1/tp/t/results/coverage/math.pl	2016-01-22 07:49:26.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/math.pl	2016-08-02 18:44:10.000000000 +0100
***************
*** 60,70 ****
            'cmdname' => 'math',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {},
            'parent' => {}
--- 60,63 ----
***************
*** 177,187 ****
            'cmdname' => 'math',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {},
            'parent' => {}
--- 170,173 ----
***************
*** 442,446 ****
  $result_trees{'math'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'math'}{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'math'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'math'}{'contents'}[0]{'contents'}[1];
- $result_trees{'math'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'math'}{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'math'}{'contents'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'math'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'math'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'math'}{'contents'}[0];
--- 428,431 ----
***************
*** 465,469 ****
  $result_trees{'math'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'math'}{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'math'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'math'}{'contents'}[2]{'contents'}[3];
- $result_trees{'math'}{'contents'}[2]{'contents'}[3]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'math'}{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'math'}{'contents'}[2]{'contents'}[3]{'line_nr'} = $result_trees{'math'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'math'}{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'math'}{'contents'}[2];
--- 450,453 ----
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/multitable.pl texinfo-6.3/tp/t/results/coverage/multitable.pl
*** texinfo-6.1/tp/t/results/coverage/multitable.pl	2016-01-22 07:49:26.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/multitable.pl	2016-08-02 18:44:10.000000000 +0100
***************
*** 336,340 ****
                                'index_at_command' => 'cindex',
                                'index_name' => 'cp',
-                               'index_prefix' => 'c',
                                'index_type_command' => 'cindex',
                                'key' => 'index entry within multitable',
--- 336,339 ----
***************
*** 649,658 ****
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            },
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            }
--- 648,655 ----
***************
*** 810,816 ****
  $result_trees{'multitable'}{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'multitable'}{'contents'}[3]{'contents'}[1];
  $result_trees{'multitable'}{'contents'}[3]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'multitable'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'multitable'}{'contents'}[3]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[3]{'args'}[0];
  $result_trees{'multitable'}{'contents'}[3]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'multitable'}{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'multitable'}{'contents'}[3]{'extra'}{'prototypes'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[3]{'args'}[0];
  $result_trees{'multitable'}{'contents'}[3]{'extra'}{'prototypes_line'}[1] = $result_trees{'multitable'}{'contents'}[3]{'args'}[0]{'contents'}[1];
  $result_trees{'multitable'}{'contents'}[3]{'extra'}{'prototypes_line'}[3] = $result_trees{'multitable'}{'contents'}[3]{'args'}[0]{'contents'}[3];
--- 807,811 ----
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/not_i_j_in_dotless.pl texinfo-6.3/tp/t/results/coverage/not_i_j_in_dotless.pl
*** texinfo-6.1/tp/t/results/coverage/not_i_j_in_dotless.pl	2016-01-22 07:49:28.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/not_i_j_in_dotless.pl	2016-08-02 18:44:12.000000000 +0100
***************
*** 24,30 ****
--- 24,36 ----
            ],
            'cmdname' => 'dotless',
+           'contents' => [],
            'extra' => {
              'spaces' => ' '
            },
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 1,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 52,60 ****
                    'cmdname' => 'dotless',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 1,
!                     'macro' => ''
!                   },
                    'parent' => {}
                  }
--- 58,62 ----
                    'cmdname' => 'dotless',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 86,92 ****
  $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
  $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2];
! $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'not_i_j_in_dotless'}{'contents'}[0];
  $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'not_i_j_in_dotless'}{'contents'}[0];
--- 88,95 ----
  $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+ $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2];
! $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'not_i_j_in_dotless'}{'contents'}[0];
  $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'not_i_j_in_dotless'}{'contents'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/preformatted.pl texinfo-6.3/tp/t/results/coverage/preformatted.pl
*** texinfo-6.1/tp/t/results/coverage/preformatted.pl	2016-01-22 07:49:26.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/preformatted.pl	2016-08-02 18:44:10.000000000 +0100
***************
*** 133,136 ****
--- 133,142 ----
                  {
                    'cmdname' => 'code',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 9,
+                     'macro' => ''
+                   },
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 191,195 ****
                            'index_at_command' => 'item',
                            'index_name' => 'vr',
-                           'index_prefix' => 'v',
                            'index_type_command' => 'vtable',
                            'key' => 'item in table in format',
--- 197,200 ----
***************
*** 289,297 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 9,
!             'macro' => ''
!           },
            'parent' => {}
          },
--- 294,298 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {}
          },
***************
*** 407,410 ****
--- 408,412 ----
  $result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'contents'}[1];
  $result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
+ $result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'line_nr'} = $result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'preformatted'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'preformatted'}{'contents'}[3];
  $result_trees{'preformatted'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'preformatted'}{'contents'}[3]{'contents'}[2];
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/punctuation_in_line_commands.pl texinfo-6.3/tp/t/results/coverage/punctuation_in_line_commands.pl
*** texinfo-6.1/tp/t/results/coverage/punctuation_in_line_commands.pl	2016-01-22 07:49:27.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/punctuation_in_line_commands.pl	2016-08-02 18:44:11.000000000 +0100
***************
*** 118,121 ****
--- 118,127 ----
                  {
                    'cmdname' => 'asis',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 5,
+                     'macro' => ''
+                   },
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 239,247 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 5,
!             'macro' => ''
!           },
            'parent' => {}
          },
--- 245,249 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {}
          },
***************
*** 420,423 ****
--- 422,426 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 473,482 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 476,480 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 544,547 ****
--- 542,546 ----
              ],
              'end_command' => {},
+             'float_section' => {},
              'node_content' => [
                {}
***************
*** 557,561 ****
              }
            },
-           'float_section' => {},
            'line_nr' => {
              'file_name' => '',
--- 556,559 ----
***************
*** 595,598 ****
--- 593,597 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 648,657 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 647,651 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 720,723 ****
--- 714,718 ----
              'caption' => {},
              'end_command' => {},
+             'float_section' => {},
              'node_content' => [
                {}
***************
*** 732,736 ****
              }
            },
-           'float_section' => {},
            'line_nr' => {
              'file_name' => '',
--- 727,730 ----
***************
*** 835,839 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'index! After punc',
--- 829,832 ----
***************
*** 926,934 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 919,923 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 1129,1132 ****
--- 1118,1122 ----
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
+ $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'line_nr'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
***************
*** 1163,1166 ****
--- 1153,1157 ----
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'args'}[0];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5];
+ $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'args'}[1];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'args'}[1];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'args'}[1];
***************
*** 1172,1176 ****
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'float'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5];
- $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5];
--- 1163,1166 ----
***************
*** 1186,1194 ****
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'block_command_line_contents'}[1][0] = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'args'}[1]{'contents'}[1];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'end_command'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[3];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'node_content'}[0] = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'args'}[1]{'contents'}[1];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'shortcaption'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'spaces_after_command'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'type'}{'content'}[0] = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[1];
- $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'float_section'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[6]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
--- 1176,1184 ----
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'block_command_line_contents'}[1][0] = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'args'}[1]{'contents'}[1];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'end_command'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[3];
+ $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'float_section'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'node_content'}[0] = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'args'}[1]{'contents'}[1];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'shortcaption'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'spaces_after_command'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'type'}{'content'}[0] = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[1];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[6]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
***************
*** 1197,1200 ****
--- 1187,1191 ----
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'args'}[0];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7];
+ $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'args'}[1];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'args'}[1];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'args'}[1];
***************
*** 1206,1210 ****
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[1];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'float'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7];
- $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'args'}[0];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[2]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7];
--- 1197,1200 ----
***************
*** 1221,1228 ****
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'caption'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[1];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'end_command'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[3];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'node_content'}[0] = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'args'}[1]{'contents'}[1];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'spaces_after_command'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'type'}{'content'}[0] = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[1];
- $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'float_section'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[8]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
--- 1211,1218 ----
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'caption'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[1];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'end_command'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[3];
+ $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'float_section'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'node_content'}[0] = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'args'}[1]{'contents'}[1];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'spaces_after_command'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'type'}{'content'}[0] = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[1];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
  $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[8]{'parent'} = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
***************
*** 1414,1426 ****
            }
          },
          'normalized' => 'float-label_0021-After-punc',
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 1404,1417 ----
            }
          },
+         'float_section' => {
+           'cmdname' => 'top',
+           'extra' => {},
+           'level' => 0
+         },
          'normalized' => 'float-label_0021-After-punc',
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 1434,1442 ****
          }
        },
-       'float_section' => {
-         'cmdname' => 'top',
-         'extra' => {},
-         'level' => 0
-       },
        'number' => 1
      },
--- 1425,1428 ----
***************
*** 1447,1455 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 1433,1437 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 1462,1465 ****
--- 1444,1448 ----
            }
          },
+         'float_section' => {},
          'normalized' => 'label-with-caption',
          'type' => {
***************
*** 1472,1476 ****
          }
        },
-       'float_section' => {},
        'number' => 2
      }
--- 1455,1458 ----
***************
*** 1481,1485 ****
  $result_floats{'punctuation_in_line_commands'}{'float-type_0021-After-punc'}[1]{'extra'}{'caption'}{'extra'}{'float'} = $result_floats{'punctuation_in_line_commands'}{'float-type_0021-After-punc'}[1];
  $result_floats{'punctuation_in_line_commands'}{'float-type_0021-After-punc'}[1]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'punctuation_in_line_commands'}{'float-type_0021-After-punc'}[1];
! $result_floats{'punctuation_in_line_commands'}{'float-type_0021-After-punc'}[1]{'float_section'} = $result_floats{'punctuation_in_line_commands'}{'float-type_0021-After-punc'}[0]{'float_section'};
  
  
--- 1463,1467 ----
  $result_floats{'punctuation_in_line_commands'}{'float-type_0021-After-punc'}[1]{'extra'}{'caption'}{'extra'}{'float'} = $result_floats{'punctuation_in_line_commands'}{'float-type_0021-After-punc'}[1];
  $result_floats{'punctuation_in_line_commands'}{'float-type_0021-After-punc'}[1]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'punctuation_in_line_commands'}{'float-type_0021-After-punc'}[1];
! $result_floats{'punctuation_in_line_commands'}{'float-type_0021-After-punc'}[1]{'extra'}{'float_section'} = $result_floats{'punctuation_in_line_commands'}{'float-type_0021-After-punc'}[0]{'extra'}{'float_section'};
  
  
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/quotation_author.pl texinfo-6.3/tp/t/results/coverage/quotation_author.pl
*** texinfo-6.1/tp/t/results/coverage/quotation_author.pl	2016-01-22 07:49:27.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/quotation_author.pl	2016-08-02 18:44:11.000000000 +0100
***************
*** 105,108 ****
--- 105,114 ----
                        ],
                        'cmdname' => '~',
+                       'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 5,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 132,140 ****
                  'spaces_after_command' => {}
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 5,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 138,142 ----
                  'spaces_after_command' => {}
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 241,244 ****
--- 243,247 ----
  $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'quotation'} = $result_trees{'quotation_author'}{'contents'}[0];
  $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
+ $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'line_nr'} = $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3];
  $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/spaces_after_braced_command.pl texinfo-6.3/tp/t/results/coverage/spaces_after_braced_command.pl
*** texinfo-6.1/tp/t/results/coverage/spaces_after_braced_command.pl	2016-01-22 07:49:28.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/spaces_after_braced_command.pl	2016-08-02 18:44:12.000000000 +0100
***************
*** 66,70 ****
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 4,
              'macro' => ''
            },
--- 66,70 ----
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 3,
              'macro' => ''
            },
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/spaces_no_brace_after_braced_command.pl texinfo-6.3/tp/t/results/coverage/spaces_no_brace_after_braced_command.pl
*** texinfo-6.1/tp/t/results/coverage/spaces_no_brace_after_braced_command.pl	2016-01-22 07:49:28.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/spaces_no_brace_after_braced_command.pl	2016-08-02 18:44:12.000000000 +0100
***************
*** 13,16 ****
--- 13,21 ----
            'cmdname' => 'code',
            'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 1,
+             'macro' => ''
+           },
            'parent' => {}
          },
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/symbol_after_block.pl texinfo-6.3/tp/t/results/coverage/symbol_after_block.pl
*** texinfo-6.1/tp/t/results/coverage/symbol_after_block.pl	2016-01-22 07:49:28.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/symbol_after_block.pl	2016-08-02 18:44:12.000000000 +0100
***************
*** 217,228 ****
        ],
        'extra' => {
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 217,221 ----
        ],
        'extra' => {
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 270,281 ****
        ],
        'extra' => {
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 263,267 ----
        ],
        'extra' => {
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 338,341 ****
--- 324,333 ----
              {
                'cmdname' => 'emph',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 21,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 476,484 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 21,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 468,472 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 503,506 ****
--- 491,500 ----
              {
                'cmdname' => 'emph',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 26,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 645,653 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 26,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 639,643 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 689,692 ****
--- 679,688 ----
              {
                'cmdname' => 'bullet',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 33,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 791,799 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 33,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 787,791 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 818,821 ****
--- 810,819 ----
              {
                'cmdname' => 'bullet',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 37,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 924,932 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 37,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 922,926 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 1913,1918 ****
  $result_trees{'symbol_after_block'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[6];
  $result_trees{'symbol_after_block'}{'contents'}[6]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[6];
! $result_trees{'symbol_after_block'}{'contents'}[6]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'symbol_after_block'}{'contents'}[6];
! $result_trees{'symbol_after_block'}{'contents'}[6]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'symbol_after_block'};
  $result_trees{'symbol_after_block'}{'contents'}[6]{'parent'} = $result_trees{'symbol_after_block'};
  $result_trees{'symbol_after_block'}{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[7];
--- 1907,1911 ----
  $result_trees{'symbol_after_block'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[6];
  $result_trees{'symbol_after_block'}{'contents'}[6]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[6];
! $result_trees{'symbol_after_block'}{'contents'}[6]{'extra'}{'spaces_after_command'} = $result_trees{'symbol_after_block'}{'contents'}[6]{'contents'}[0];
  $result_trees{'symbol_after_block'}{'contents'}[6]{'parent'} = $result_trees{'symbol_after_block'};
  $result_trees{'symbol_after_block'}{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[7];
***************
*** 1922,1927 ****
  $result_trees{'symbol_after_block'}{'contents'}[9]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[9];
  $result_trees{'symbol_after_block'}{'contents'}[9]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[9];
! $result_trees{'symbol_after_block'}{'contents'}[9]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'symbol_after_block'}{'contents'}[9];
! $result_trees{'symbol_after_block'}{'contents'}[9]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'symbol_after_block'};
  $result_trees{'symbol_after_block'}{'contents'}[9]{'parent'} = $result_trees{'symbol_after_block'};
  $result_trees{'symbol_after_block'}{'contents'}[10]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[10];
--- 1915,1919 ----
  $result_trees{'symbol_after_block'}{'contents'}[9]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[9];
  $result_trees{'symbol_after_block'}{'contents'}[9]{'contents'}[1]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[9];
! $result_trees{'symbol_after_block'}{'contents'}[9]{'extra'}{'spaces_after_command'} = $result_trees{'symbol_after_block'}{'contents'}[9]{'contents'}[0];
  $result_trees{'symbol_after_block'}{'contents'}[9]{'parent'} = $result_trees{'symbol_after_block'};
  $result_trees{'symbol_after_block'}{'contents'}[10]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_block'}{'contents'}[10];
***************
*** 1962,1965 ****
--- 1954,1958 ----
  $result_trees{'symbol_after_block'}{'contents'}[14]{'extra'}{'end_command'} = $result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[1];
  $result_trees{'symbol_after_block'}{'contents'}[14]{'extra'}{'spaces_after_command'} = $result_trees{'symbol_after_block'}{'contents'}[14]{'args'}[0]{'contents'}[0];
+ $result_trees{'symbol_after_block'}{'contents'}[14]{'line_nr'} = $result_trees{'symbol_after_block'}{'contents'}[14]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'symbol_after_block'}{'contents'}[14]{'parent'} = $result_trees{'symbol_after_block'};
  $result_trees{'symbol_after_block'}{'contents'}[15]{'parent'} = $result_trees{'symbol_after_block'};
***************
*** 1995,1998 ****
--- 1988,1992 ----
  $result_trees{'symbol_after_block'}{'contents'}[16]{'extra'}{'end_command'} = $result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[1];
  $result_trees{'symbol_after_block'}{'contents'}[16]{'extra'}{'spaces_after_command'} = $result_trees{'symbol_after_block'}{'contents'}[16]{'args'}[0]{'contents'}[0];
+ $result_trees{'symbol_after_block'}{'contents'}[16]{'line_nr'} = $result_trees{'symbol_after_block'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'symbol_after_block'}{'contents'}[16]{'parent'} = $result_trees{'symbol_after_block'};
  $result_trees{'symbol_after_block'}{'contents'}[17]{'parent'} = $result_trees{'symbol_after_block'};
***************
*** 2023,2026 ****
--- 2017,2021 ----
  $result_trees{'symbol_after_block'}{'contents'}[20]{'extra'}{'end_command'} = $result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[1];
  $result_trees{'symbol_after_block'}{'contents'}[20]{'extra'}{'spaces_after_command'} = $result_trees{'symbol_after_block'}{'contents'}[20]{'args'}[0]{'contents'}[0];
+ $result_trees{'symbol_after_block'}{'contents'}[20]{'line_nr'} = $result_trees{'symbol_after_block'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'symbol_after_block'}{'contents'}[20]{'parent'} = $result_trees{'symbol_after_block'};
  $result_trees{'symbol_after_block'}{'contents'}[21]{'parent'} = $result_trees{'symbol_after_block'};
***************
*** 2049,2052 ****
--- 2044,2048 ----
  $result_trees{'symbol_after_block'}{'contents'}[22]{'extra'}{'end_command'} = $result_trees{'symbol_after_block'}{'contents'}[22]{'contents'}[1];
  $result_trees{'symbol_after_block'}{'contents'}[22]{'extra'}{'spaces_after_command'} = $result_trees{'symbol_after_block'}{'contents'}[22]{'args'}[0]{'contents'}[0];
+ $result_trees{'symbol_after_block'}{'contents'}[22]{'line_nr'} = $result_trees{'symbol_after_block'}{'contents'}[22]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'symbol_after_block'}{'contents'}[22]{'parent'} = $result_trees{'symbol_after_block'};
  $result_trees{'symbol_after_block'}{'contents'}[23]{'parent'} = $result_trees{'symbol_after_block'};
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/symbol_after_command.pl texinfo-6.3/tp/t/results/coverage/symbol_after_command.pl
*** texinfo-6.1/tp/t/results/coverage/symbol_after_command.pl	2016-01-22 07:49:26.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/symbol_after_command.pl	2016-08-02 18:44:10.000000000 +0100
***************
*** 22,25 ****
--- 22,31 ----
              {
                'cmdname' => 'asis',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 1,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 65,77 ****
                      'misc_content' => [
                        {}
!                     ],
!                     'spaces_after_command' => {
!                       'extra' => {
!                         'command' => {}
!                       },
!                       'parent' => {},
!                       'text' => '',
!                       'type' => 'empty_line_after_command'
!                     }
                    },
                    'line_nr' => {
--- 71,75 ----
                      'misc_content' => [
                        {}
!                     ]
                    },
                    'line_nr' => {
***************
*** 117,129 ****
                      'misc_content' => [
                        {}
!                     ],
!                     'spaces_after_command' => {
!                       'extra' => {
!                         'command' => {}
!                       },
!                       'parent' => {},
!                       'text' => '',
!                       'type' => 'empty_line_after_command'
!                     }
                    },
                    'line_nr' => {
--- 115,119 ----
                      'misc_content' => [
                        {}
!                     ]
                    },
                    'line_nr' => {
***************
*** 179,191 ****
                        {},
                        {}
!                     ],
!                     'spaces_after_command' => {
!                       'extra' => {
!                         'command' => {}
!                       },
!                       'parent' => {},
!                       'text' => '',
!                       'type' => 'empty_line_after_command'
!                     }
                    },
                    'line_nr' => {
--- 169,173 ----
                        {},
                        {}
!                     ]
                    },
                    'line_nr' => {
***************
*** 241,253 ****
                        {},
                        {}
!                     ],
!                     'spaces_after_command' => {
!                       'extra' => {
!                         'command' => {}
!                       },
!                       'parent' => {},
!                       'text' => '',
!                       'type' => 'empty_line_after_command'
!                     }
                    },
                    'line_nr' => {
--- 223,227 ----
                        {},
                        {}
!                     ]
                    },
                    'line_nr' => {
***************
*** 293,305 ****
                      'misc_content' => [
                        {}
!                     ],
!                     'spaces_after_command' => {
!                       'extra' => {
!                         'command' => {}
!                       },
!                       'parent' => {},
!                       'text' => '',
!                       'type' => 'empty_line_after_command'
!                     }
                    },
                    'line_nr' => {
--- 267,271 ----
                      'misc_content' => [
                        {}
!                     ]
                    },
                    'line_nr' => {
***************
*** 345,357 ****
                      'misc_content' => [
                        {}
!                     ],
!                     'spaces_after_command' => {
!                       'extra' => {
!                         'command' => {}
!                       },
!                       'parent' => {},
!                       'text' => '',
!                       'type' => 'empty_line_after_command'
!                     }
                    },
                    'line_nr' => {
--- 311,315 ----
                      'misc_content' => [
                        {}
!                     ]
                    },
                    'line_nr' => {
***************
*** 397,409 ****
                      'misc_content' => [
                        {}
!                     ],
!                     'spaces_after_command' => {
!                       'extra' => {
!                         'command' => {}
!                       },
!                       'parent' => {},
!                       'text' => '',
!                       'type' => 'empty_line_after_command'
!                     }
                    },
                    'line_nr' => {
--- 355,359 ----
                      'misc_content' => [
                        {}
!                     ]
                    },
                    'line_nr' => {
***************
*** 474,482 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 1,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 424,428 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 578,583 ****
  $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
  $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0] = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
- $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
- $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
  $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0];
--- 524,527 ----
***************
*** 587,592 ****
  $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
  $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0] = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
- $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
- $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
  $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1];
--- 531,534 ----
***************
*** 600,605 ****
  $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[1] = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
  $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[2] = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
- $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
- $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
  $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2];
--- 542,545 ----
***************
*** 613,618 ****
  $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[1] = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
  $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[2] = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
- $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0];
- $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
  $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3];
--- 553,556 ----
***************
*** 622,627 ****
  $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0];
  $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0] = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
- $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0];
- $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
  $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4];
--- 560,563 ----
***************
*** 631,636 ****
  $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0];
  $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0] = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
- $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0];
- $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'contents'}[0];
  $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5];
--- 567,570 ----
***************
*** 640,645 ****
  $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0];
  $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0] = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
- $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0];
- $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
  $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6];
--- 574,577 ----
***************
*** 657,660 ****
--- 589,593 ----
  $result_trees{'symbol_after_command'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[7];
  $result_trees{'symbol_after_command'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'symbol_after_command'}{'contents'}[0]{'line_nr'} = $result_trees{'symbol_after_command'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'symbol_after_command'}{'contents'}[0]{'parent'} = $result_trees{'symbol_after_command'};
  $result_trees{'symbol_after_command'}{'contents'}[1]{'parent'} = $result_trees{'symbol_after_command'};
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/table.pl texinfo-6.3/tp/t/results/coverage/table.pl
*** texinfo-6.1/tp/t/results/coverage/table.pl	2016-01-22 07:49:26.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/table.pl	2016-08-02 18:44:10.000000000 +0100
***************
*** 28,31 ****
--- 28,37 ----
              {
                'cmdname' => 'asis',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 2,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 213,221 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 2,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 219,223 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 240,243 ****
--- 242,251 ----
              {
                'cmdname' => 'samp',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 9,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 326,330 ****
                    'index_at_command' => 'cindex',
                    'index_name' => 'cp',
-                   'index_prefix' => 'c',
                    'index_type_command' => 'cindex',
                    'key' => 'index entry',
--- 334,337 ----
***************
*** 394,398 ****
                        'index_at_command' => 'item',
                        'index_name' => 'vr',
-                       'index_prefix' => 'v',
                        'index_type_command' => 'vtable',
                        'key' => 'vtable item',
--- 401,404 ----
***************
*** 467,471 ****
                            'index_at_command' => 'kindex',
                            'index_name' => 'ky',
-                           'index_prefix' => 'k',
                            'index_type_command' => 'kindex',
                            'key' => 'key',
--- 473,476 ----
***************
*** 542,546 ****
                        'index_at_command' => 'itemx',
                        'index_name' => 'vr',
-                       'index_prefix' => 'v',
                        'index_type_command' => 'vtable',
                        'key' => 'itemx vtable',
--- 547,550 ----
***************
*** 629,637 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 9,
!         'macro' => ''
!       },
        'parent' => {}
      }
--- 633,637 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      }
***************
*** 679,682 ****
--- 679,683 ----
  $result_trees{'table'}{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'table'}{'contents'}[1]{'contents'}[1];
  $result_trees{'table'}{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'table'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+ $result_trees{'table'}{'contents'}[1]{'line_nr'} = $result_trees{'table'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'table'}{'contents'}[1]{'parent'} = $result_trees{'table'};
  $result_trees{'table'}{'contents'}[2]{'parent'} = $result_trees{'table'};
***************
*** 756,759 ****
--- 757,761 ----
  $result_trees{'table'}{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'table'}{'contents'}[3]{'contents'}[2];
  $result_trees{'table'}{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'table'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+ $result_trees{'table'}{'contents'}[3]{'line_nr'} = $result_trees{'table'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'table'}{'contents'}[3]{'parent'} = $result_trees{'table'};
  
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/table_command_comment.pl texinfo-6.3/tp/t/results/coverage/table_command_comment.pl
*** texinfo-6.1/tp/t/results/coverage/table_command_comment.pl	2016-01-22 07:49:26.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/table_command_comment.pl	2016-08-02 18:44:10.000000000 +0100
***************
*** 22,25 ****
--- 22,31 ----
              {
                'cmdname' => 'code',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 1,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 149,157 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 1,
!         'macro' => ''
!       },
        'parent' => {}
      }
--- 155,159 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      }
***************
*** 186,189 ****
--- 188,192 ----
  $result_trees{'table_command_comment'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[1];
  $result_trees{'table_command_comment'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'table_command_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'table_command_comment'}{'contents'}[0]{'line_nr'} = $result_trees{'table_command_comment'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'table_command_comment'}{'contents'}[0]{'parent'} = $result_trees{'table_command_comment'};
  
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/test_errormsg.pl texinfo-6.3/tp/t/results/coverage/test_errormsg.pl
*** texinfo-6.1/tp/t/results/coverage/test_errormsg.pl	2016-01-22 07:49:28.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/test_errormsg.pl	2016-08-02 18:52:07.000000000 +0100
***************
*** 37,40 ****
--- 37,49 ----
                    ],
                    'cmdname' => '~',
+                   'contents' => [],
+                   'extra' => {
+                     'invalid_nesting' => 1
+                   },
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 2,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 58,66 ****
                    'cmdname' => 'code',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 2,
!                     'macro' => ''
                    },
                    'parent' => {}
                  }
--- 67,74 ----
                    'cmdname' => 'code',
                    'contents' => [],
!                   'extra' => {
!                     'invalid_nesting' => 1
                    },
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 80,88 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 88,92 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 109,112 ****
--- 113,117 ----
  $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3];
+ $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1];
***************
*** 115,119 ****
  $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][2] = $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
  $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][3] = $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3];
! $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'line_nr'};
  $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'test_errormsg'}{'contents'}[0];
  $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'test_errormsg'}{'contents'}[0];
--- 120,124 ----
  $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][2] = $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
  $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][3] = $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3];
! $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'test_errormsg'}{'contents'}[0];
  $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'test_errormsg'}{'contents'}[0];
***************
*** 131,140 ****
  $result_errors{'test_errormsg'} = [
    {
!     'error_line' => ':2: Text e~ code
  ',
      'file_name' => '',
      'line_nr' => 2,
      'macro' => '',
!     'text' => 'Text e~ code',
      'type' => 'error'
    }
--- 136,163 ----
  $result_errors{'test_errormsg'} = [
    {
!     'error_line' => ':2: warning: @~ should not appear in @errormsg
! ',
!     'file_name' => '',
!     'line_nr' => 2,
!     'macro' => '',
!     'text' => '@~ should not appear in @errormsg',
!     'type' => 'warning'
!   },
!   {
!     'error_line' => ':2: warning: @code should not appear in @errormsg
! ',
!     'file_name' => '',
!     'line_nr' => 2,
!     'macro' => '',
!     'text' => '@code should not appear in @errormsg',
!     'type' => 'warning'
!   },
!   {
!     'error_line' => ':2: Text 
  ',
      'file_name' => '',
      'line_nr' => 2,
      'macro' => '',
!     'text' => 'Text ',
      'type' => 'error'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/test_tie.pl texinfo-6.3/tp/t/results/coverage/test_tie.pl
*** texinfo-6.1/tp/t/results/coverage/test_tie.pl	2016-01-22 07:49:27.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/test_tie.pl	2016-08-02 18:44:12.000000000 +0100
***************
*** 24,27 ****
--- 24,32 ----
            'cmdname' => 'tie',
            'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 1,
+             'macro' => ''
+           },
            'parent' => {}
          },
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/test_today.pl texinfo-6.3/tp/t/results/coverage/test_today.pl
*** texinfo-6.1/tp/t/results/coverage/test_today.pl	2016-01-22 07:49:27.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/test_today.pl	2016-08-02 18:44:12.000000000 +0100
***************
*** 20,23 ****
--- 20,28 ----
            'cmdname' => 'today',
            'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 1,
+             'macro' => ''
+           },
            'parent' => {}
          },
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/titlefont_in_center.pl texinfo-6.3/tp/t/results/coverage/titlefont_in_center.pl
*** texinfo-6.1/tp/t/results/coverage/titlefont_in_center.pl	2016-01-22 07:49:27.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/titlefont_in_center.pl	2016-08-02 18:44:11.000000000 +0100
***************
*** 46,54 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 46,50 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
diff -Nrc2 texinfo-6.1/tp/t/results/coverage/unknown_accents.pl texinfo-6.3/tp/t/results/coverage/unknown_accents.pl
*** texinfo-6.1/tp/t/results/coverage/unknown_accents.pl	2016-01-22 07:49:28.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage/unknown_accents.pl	2016-08-02 18:44:12.000000000 +0100
***************
*** 24,27 ****
--- 24,33 ----
            ],
            'cmdname' => '"',
+           'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 1,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 44,47 ****
--- 50,55 ----
            ],
            'cmdname' => '"',
+           'contents' => [],
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 64,67 ****
--- 72,77 ----
            ],
            'cmdname' => '"',
+           'contents' => [],
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 84,87 ****
--- 94,99 ----
            ],
            'cmdname' => '"',
+           'contents' => [],
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 117,120 ****
--- 129,138 ----
            ],
            'cmdname' => '\'',
+           'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 3,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 137,140 ****
--- 155,160 ----
            ],
            'cmdname' => '\'',
+           'contents' => [],
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 157,160 ****
--- 177,182 ----
            ],
            'cmdname' => '\'',
+           'contents' => [],
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 178,181 ****
--- 200,209 ----
            ],
            'cmdname' => '\'',
+           'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 4,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 198,201 ****
--- 226,231 ----
            ],
            'cmdname' => '\'',
+           'contents' => [],
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 218,221 ****
--- 248,253 ----
            ],
            'cmdname' => '\'',
+           'contents' => [],
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 312,315 ****
--- 344,353 ----
            ],
            'cmdname' => '^',
+           'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 8,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 332,335 ****
--- 370,375 ----
            ],
            'cmdname' => '^',
+           'contents' => [],
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 352,355 ****
--- 392,397 ----
            ],
            'cmdname' => '^',
+           'contents' => [],
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 372,375 ****
--- 414,419 ----
            ],
            'cmdname' => '^',
+           'contents' => [],
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 393,396 ****
--- 437,446 ----
            ],
            'cmdname' => '^',
+           'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 9,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 413,416 ****
--- 463,468 ----
            ],
            'cmdname' => '^',
+           'contents' => [],
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 433,436 ****
--- 485,490 ----
            ],
            'cmdname' => '^',
+           'contents' => [],
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 453,456 ****
--- 507,512 ----
            ],
            'cmdname' => '^',
+           'contents' => [],
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 486,489 ****
--- 542,551 ----
            ],
            'cmdname' => '`',
+           'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 11,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 506,509 ****
--- 568,573 ----
            ],
            'cmdname' => '`',
+           'contents' => [],
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 526,529 ****
--- 590,595 ----
            ],
            'cmdname' => '`',
+           'contents' => [],
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 559,562 ****
--- 625,634 ----
            ],
            'cmdname' => '~',
+           'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 13,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 579,582 ****
--- 651,656 ----
            ],
            'cmdname' => '~',
+           'contents' => [],
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 599,610 ****
--- 673,687 ----
  $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[2];
+ $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[0];
  $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[0];
  $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[4]{'args'}[0];
  $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[4];
+ $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[0];
  $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[0];
  $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[6]{'args'}[0];
  $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[6];
+ $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[6]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[0];
  $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[0];
***************
*** 617,624 ****
--- 694,703 ----
  $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[2]{'args'}[0];
  $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[2];
+ $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[2]{'line_nr'} = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[0]{'line_nr'};
  $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2];
  $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2];
  $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[4]{'args'}[0];
  $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[4];
+ $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[4]{'line_nr'} = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[0]{'line_nr'};
  $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[4]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2];
  $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[5]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2];
***************
*** 629,636 ****
--- 708,717 ----
  $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[8]{'args'}[0];
  $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[8];
+ $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[8]{'line_nr'} = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[6]{'line_nr'};
  $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[8]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2];
  $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[9]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2];
  $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[10]{'args'}[0];
  $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[10];
+ $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[10]{'line_nr'} = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[6]{'line_nr'};
  $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[10]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2];
  $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[11]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[2];
***************
*** 654,665 ****
--- 735,749 ----
  $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[2]{'args'}[0];
  $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[2];
+ $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[2]{'line_nr'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[0]{'line_nr'};
  $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[2]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6];
  $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[3]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6];
  $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[4]{'args'}[0];
  $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[4];
+ $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[4]{'line_nr'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[0]{'line_nr'};
  $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[4]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6];
  $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[5]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6];
  $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[6]{'args'}[0];
  $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[6];
+ $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[6]{'line_nr'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[0]{'line_nr'};
  $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[6]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6];
  $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[7]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6];
***************
*** 670,681 ****
--- 754,768 ----
  $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[10]{'args'}[0];
  $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[10];
+ $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[10]{'line_nr'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[8]{'line_nr'};
  $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[10]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6];
  $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[11]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6];
  $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[12]{'args'}[0];
  $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[12];
+ $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[12]{'line_nr'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[8]{'line_nr'};
  $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[12]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6];
  $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[13]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6];
  $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[14]{'args'}[0];
  $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[14];
+ $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[14]{'line_nr'} = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[8]{'line_nr'};
  $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[14]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6];
  $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[15]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[6];
***************
*** 688,695 ****
--- 775,784 ----
  $result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[2]{'args'}[0];
  $result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[2];
+ $result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[2]{'line_nr'} = $result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[0]{'line_nr'};
  $result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[2]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[8];
  $result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[3]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[8];
  $result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[4]{'args'}[0];
  $result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[4];
+ $result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[4]{'line_nr'} = $result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[0]{'line_nr'};
  $result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[4]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[8];
  $result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[5]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[8];
***************
*** 702,705 ****
--- 791,795 ----
  $result_trees{'unknown_accents'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[10]{'contents'}[2]{'args'}[0];
  $result_trees{'unknown_accents'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[10]{'contents'}[2];
+ $result_trees{'unknown_accents'}{'contents'}[10]{'contents'}[2]{'line_nr'} = $result_trees{'unknown_accents'}{'contents'}[10]{'contents'}[0]{'line_nr'};
  $result_trees{'unknown_accents'}{'contents'}[10]{'contents'}[2]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[10];
  $result_trees{'unknown_accents'}{'contents'}[10]{'contents'}[3]{'parent'} = $result_trees{'unknown_accents'}{'contents'}[10];
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/abbr_acronym.pl texinfo-6.3/tp/t/results/coverage_braces/abbr_acronym.pl
*** texinfo-6.1/tp/t/results/coverage_braces/abbr_acronym.pl	2016-01-22 07:49:29.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/abbr_acronym.pl	2016-08-02 18:44:13.000000000 +0100
***************
*** 43,52 ****
                  {}
                ]
!             ],
!             'normalized' => '_002d_002da',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 43,47 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 83,92 ****
                ]
              ],
!             'explanation_contents' => [],
!             'normalized' => '_002d_002da',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 78,82 ----
                ]
              ],
!             'explanation_contents' => []
            },
            'line_nr' => {
***************
*** 130,133 ****
--- 120,128 ----
                    'cmdname' => 'comma',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 3,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 146,149 ****
--- 141,145 ----
                    'cmdname' => 'enddots',
                    'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 166,181 ****
                  {}
                ]
!             ],
!             'normalized' => '_002d_002da',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
!           },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 3,
!             'macro' => ''
            },
            'parent' => {}
          },
--- 162,168 ----
                  {}
                ]
!             ]
            },
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 203,206 ****
--- 190,199 ----
                    ],
                    'cmdname' => '\'',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 4,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 219,222 ****
--- 212,216 ----
                    'cmdname' => 'comma',
                    'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 232,235 ****
--- 226,230 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 249,252 ****
--- 244,249 ----
                    ],
                    'cmdname' => '\'',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 265,268 ****
--- 262,266 ----
                    'cmdname' => 'comma',
                    'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 286,294 ****
                    'cmdname' => 'b',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 4,
!                     'macro' => ''
!                   },
                    'parent' => {}
                  },
--- 284,288 ----
                    'cmdname' => 'b',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 320,329 ****
                  {}
                ]
!             ],
!             'normalized' => '_00c9_002d_002da_002e-_002cA_002e',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 314,318 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 353,356 ****
--- 342,351 ----
                    ],
                    'cmdname' => '\'',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 5,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 369,372 ****
--- 364,368 ----
                    'cmdname' => 'comma',
                    'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 391,406 ****
                ]
              ],
!             'explanation_contents' => [],
!             'normalized' => '_00c9_002d_002da_002e-_002cA_002e',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
!           },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 5,
!             'macro' => ''
            },
            'parent' => {}
          },
--- 387,393 ----
                ]
              ],
!             'explanation_contents' => []
            },
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 438,441 ****
--- 425,429 ----
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'args'}[1];
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'contents'}[3];
+ $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'contents'}[3]{'line_nr'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'contents'}[1]{'line_nr'};
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'args'}[1];
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4];
***************
*** 445,448 ****
--- 433,437 ----
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'extra'}{'brace_command_contents'}[1][2] = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'contents'}[2];
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'extra'}{'brace_command_contents'}[1][3] = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'contents'}[3];
+ $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'contents'}[1]{'line_nr'};
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0];
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0];
***************
*** 452,467 ****
--- 441,461 ----
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0];
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[2];
+ $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0];
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0];
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6];
+ $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1];
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[1];
+ $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1];
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1];
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[3];
+ $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[3]{'line_nr'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1];
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1];
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[5]{'args'}[0];
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[5];
+ $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[5]{'line_nr'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[5]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1];
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[6]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1];
***************
*** 476,480 ****
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'extra'}{'brace_command_contents'}[1][3] = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[4];
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'extra'}{'brace_command_contents'}[1][4] = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[5];
! $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[5]{'line_nr'};
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0];
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0];
--- 470,474 ----
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'extra'}{'brace_command_contents'}[1][3] = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[4];
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'extra'}{'brace_command_contents'}[1][4] = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[5];
! $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0];
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0];
***************
*** 484,487 ****
--- 478,482 ----
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0];
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[2];
+ $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0];
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0];
***************
*** 492,495 ****
--- 487,491 ----
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'extra'}{'brace_command_contents'}[0][3] = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[3];
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'extra'}{'explanation_contents'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'extra'}{'brace_command_contents'}[1];
+ $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0];
  $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[9]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/anchor_not_closed.pl texinfo-6.3/tp/t/results/coverage_braces/anchor_not_closed.pl
*** texinfo-6.1/tp/t/results/coverage_braces/anchor_not_closed.pl	2016-01-22 07:49:32.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/anchor_not_closed.pl	2016-08-02 18:44:14.000000000 +0100
***************
*** 30,39 ****
        'cmdname' => 'anchor',
        'contents' => [],
-       'extra' => {
-         'spaces_before_argument' => {
-           'text' => '',
-           'type' => 'empty_spaces_before_argument'
-         }
-       },
        'line_nr' => {
          'file_name' => '',
--- 30,33 ----
***************
*** 60,69 ****
  $result_errors{'anchor_not_closed'} = [
    {
!     'error_line' => ':1: @anchor missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@anchor missing close brace',
      'type' => 'error'
    }
--- 54,63 ----
  $result_errors{'anchor_not_closed'} = [
    {
!     'error_line' => ':1: @anchor missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@anchor missing closing brace',
      'type' => 'error'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/brace_opened_no_command.pl texinfo-6.3/tp/t/results/coverage_braces/brace_opened_no_command.pl
*** texinfo-6.1/tp/t/results/coverage_braces/brace_opened_no_command.pl	2016-01-22 07:49:32.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/brace_opened_no_command.pl	2016-08-02 18:44:14.000000000 +0100
***************
*** 46,54 ****
                {}
              ],
!             'normalized' => 'truc',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 46,50 ----
                {}
              ],
!             'normalized' => 'truc'
            },
            'line_nr' => {
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/caption_not_closed.pl texinfo-6.3/tp/t/results/coverage_braces/caption_not_closed.pl
*** texinfo-6.1/tp/t/results/coverage_braces/caption_not_closed.pl	2016-01-22 07:49:32.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/caption_not_closed.pl	2016-08-02 18:44:14.000000000 +0100
***************
*** 110,119 ****
            'contents' => [],
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'parent' => {},
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 110,114 ----
            'contents' => [],
            'extra' => {
!             'float' => {}
            },
            'line_nr' => {
***************
*** 229,233 ****
  $result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[1];
  $result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[1]{'extra'}{'float'} = $result_trees{'caption_not_closed'}{'contents'}[0];
- $result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'caption_not_closed'}{'contents'}[0];
  $result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[2];
--- 224,227 ----
***************
*** 288,296 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 282,286 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/code_not_closed.pl texinfo-6.3/tp/t/results/coverage_braces/code_not_closed.pl
*** texinfo-6.1/tp/t/results/coverage_braces/code_not_closed.pl	2016-01-22 07:49:32.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/code_not_closed.pl	2016-08-02 18:44:14.000000000 +0100
***************
*** 51,60 ****
  $result_errors{'code_not_closed'} = [
    {
!     'error_line' => ':1: @code missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@code missing close brace',
      'type' => 'error'
    }
--- 51,60 ----
  $result_errors{'code_not_closed'} = [
    {
!     'error_line' => ':1: @code missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@code missing closing brace',
      'type' => 'error'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/ctrl.pl texinfo-6.3/tp/t/results/coverage_braces/ctrl.pl
*** texinfo-6.1/tp/t/results/coverage_braces/ctrl.pl	2016-01-22 07:49:31.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/ctrl.pl	2016-08-02 18:44:14.000000000 +0100
***************
*** 36,44 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 36,40 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 90,98 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 86,90 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/email_possibilities.pl texinfo-6.3/tp/t/results/coverage_braces/email_possibilities.pl
*** texinfo-6.1/tp/t/results/coverage_braces/email_possibilities.pl	2016-01-22 07:49:29.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/email_possibilities.pl	2016-08-02 18:44:13.000000000 +0100
***************
*** 43,51 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 43,47 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 87,95 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 83,87 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 125,133 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 117,121 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/empty_commands.pl texinfo-6.3/tp/t/results/coverage_braces/empty_commands.pl
*** texinfo-6.1/tp/t/results/coverage_braces/empty_commands.pl	2016-01-22 07:49:29.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/empty_commands.pl	2016-08-02 18:44:13.000000000 +0100
***************
*** 21,29 ****
          'brace_command_contents' => [
            undef
!         ],
!         'spaces_before_argument' => {
!           'text' => '',
!           'type' => 'empty_spaces_before_argument'
!         }
        },
        'line_nr' => {
--- 21,25 ----
          'brace_command_contents' => [
            undef
!         ]
        },
        'line_nr' => {
***************
*** 60,68 ****
              'brace_command_contents' => [
                undef
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 56,60 ----
              'brace_command_contents' => [
                undef
!             ]
            },
            'line_nr' => {
***************
*** 91,98 ****
                undef
              ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 83,87 ----
                undef
              ],
!             'explanation_contents' => []
            },
            'line_nr' => {},
***************
*** 116,124 ****
              'brace_command_contents' => [
                undef
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 105,109 ----
              'brace_command_contents' => [
                undef
!             ]
            },
            'line_nr' => {},
***************
*** 152,162 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {},
            'parent' => {}
--- 137,140 ----
***************
*** 245,249 ****
  $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[6]{'parent'} = $result_trees{'empty_commands'}{'contents'}[3];
  $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[7];
- $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[7]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[7]{'args'}[0];
  $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[7]{'line_nr'} = $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[0]{'line_nr'};
  $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[7]{'parent'} = $result_trees{'empty_commands'}{'contents'}[3];
--- 223,226 ----
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/empty_images.pl texinfo-6.3/tp/t/results/coverage_braces/empty_images.pl
*** texinfo-6.1/tp/t/results/coverage_braces/empty_images.pl	2016-01-22 07:49:32.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/empty_images.pl	2016-08-02 18:44:14.000000000 +0100
***************
*** 21,29 ****
          'brace_command_contents' => [
            undef
!         ],
!         'spaces_before_argument' => {
!           'text' => '',
!           'type' => 'empty_spaces_before_argument'
!         }
        },
        'line_nr' => {
--- 21,25 ----
          'brace_command_contents' => [
            undef
!         ]
        },
        'line_nr' => {
***************
*** 50,53 ****
--- 46,50 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 179,187 ****
              {}
            ]
!         ],
!         'spaces_before_argument' => {
!           'text' => '',
!           'type' => 'empty_spaces_before_argument'
!         }
        },
        'line_nr' => {
--- 176,180 ----
              {}
            ]
!         ]
        },
        'line_nr' => {
***************
*** 235,243 ****
              {}
            ]
!         ],
!         'spaces_before_argument' => {
!           'text' => '',
!           'type' => 'empty_spaces_before_argument'
!         }
        },
        'line_nr' => {
--- 228,232 ----
              {}
            ]
!         ]
        },
        'line_nr' => {
***************
*** 260,263 ****
--- 249,253 ----
  $result_trees{'empty_images'}{'contents'}[1]{'parent'} = $result_trees{'empty_images'};
  $result_trees{'empty_images'}{'contents'}[2]{'parent'} = $result_trees{'empty_images'};
+ $result_trees{'empty_images'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'empty_images'}{'contents'}[3]{'args'}[0];
  $result_trees{'empty_images'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'empty_images'}{'contents'}[3];
  $result_trees{'empty_images'}{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'empty_images'}{'contents'}[3]{'args'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/empty_line_in_anchor.pl texinfo-6.3/tp/t/results/coverage_braces/empty_line_in_anchor.pl
*** texinfo-6.1/tp/t/results/coverage_braces/empty_line_in_anchor.pl	2016-01-22 07:49:32.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/empty_line_in_anchor.pl	2016-08-02 18:44:14.000000000 +0100
***************
*** 30,39 ****
        'cmdname' => 'anchor',
        'contents' => [],
-       'extra' => {
-         'spaces_before_argument' => {
-           'text' => '',
-           'type' => 'empty_spaces_before_argument'
-         }
-       },
        'line_nr' => {
          'file_name' => '',
--- 30,33 ----
***************
*** 75,84 ****
  $result_errors{'empty_line_in_anchor'} = [
    {
!     'error_line' => ':1: @anchor missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@anchor missing close brace',
      'type' => 'error'
    },
--- 69,78 ----
  $result_errors{'empty_line_in_anchor'} = [
    {
!     'error_line' => ':1: @anchor missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@anchor missing closing brace',
      'type' => 'error'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/empty_ref.pl texinfo-6.3/tp/t/results/coverage_braces/empty_ref.pl
*** texinfo-6.1/tp/t/results/coverage_braces/empty_ref.pl	2016-01-22 07:49:32.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/empty_ref.pl	2016-08-02 18:44:14.000000000 +0100
***************
*** 29,37 ****
              'brace_command_contents' => [
                undef
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 29,33 ----
              'brace_command_contents' => [
                undef
!             ]
            },
            'line_nr' => {
***************
*** 78,86 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 74,78 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 96,99 ****
--- 88,92 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 129,132 ****
--- 122,126 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 139,142 ****
--- 133,137 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 193,196 ****
--- 188,192 ----
  $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'empty_ref'}{'contents'}[1];
  $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'empty_ref'}{'contents'}[1];
+ $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[4]{'args'}[0];
  $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[4];
  $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[4]{'extra'}{'spaces_before_argument'} = $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
***************
*** 199,203 ****
--- 195,201 ----
  $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'empty_ref'}{'contents'}[1];
  $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'empty_ref'}{'contents'}[1];
+ $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[7]{'args'}[0];
  $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[7];
+ $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[7]{'args'}[1]{'parent'} = $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[7];
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/empty_second_email_argument.pl texinfo-6.3/tp/t/results/coverage_braces/empty_second_email_argument.pl
*** texinfo-6.1/tp/t/results/coverage_braces/empty_second_email_argument.pl	2016-01-22 07:49:29.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/empty_second_email_argument.pl	2016-08-02 18:44:13.000000000 +0100
***************
*** 15,18 ****
--- 15,19 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 37,40 ****
--- 38,42 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 72,79 ****
--- 74,83 ----
    'type' => 'text_root'
  };
+ $result_trees{'empty_second_email_argument'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'empty_second_email_argument'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'empty_second_email_argument'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'empty_second_email_argument'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'empty_second_email_argument'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'empty_second_email_argument'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'empty_second_email_argument'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'empty_second_email_argument'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'empty_second_email_argument'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'empty_second_email_argument'}{'contents'}[0]{'contents'}[0];
+ $result_trees{'empty_second_email_argument'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'empty_second_email_argument'}{'contents'}[0]{'contents'}[0]{'args'}[1];
  $result_trees{'empty_second_email_argument'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'empty_second_email_argument'}{'contents'}[0]{'contents'}[0];
  $result_trees{'empty_second_email_argument'}{'contents'}[0]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'empty_second_email_argument'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/end_line_in_anchor.pl texinfo-6.3/tp/t/results/coverage_braces/end_line_in_anchor.pl
*** texinfo-6.1/tp/t/results/coverage_braces/end_line_in_anchor.pl	2016-01-22 07:49:31.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/end_line_in_anchor.pl	2016-08-02 18:44:14.000000000 +0100
***************
*** 39,47 ****
            {}
          ],
!         'normalized' => 'an-anchor',
!         'spaces_before_argument' => {
!           'text' => '',
!           'type' => 'empty_spaces_before_argument'
!         }
        },
        'line_nr' => {
--- 39,43 ----
            {}
          ],
!         'normalized' => 'an-anchor'
        },
        'line_nr' => {
***************
*** 53,56 ****
--- 49,53 ----
      },
      {
+       'parent' => {},
        'text' => '
  ',
***************
*** 68,71 ****
--- 65,69 ----
  $result_trees{'end_line_in_anchor'}{'contents'}[0]{'extra'}{'node_content'}[1] = $result_trees{'end_line_in_anchor'}{'contents'}[0]{'args'}[0]{'contents'}[1];
  $result_trees{'end_line_in_anchor'}{'contents'}[0]{'parent'} = $result_trees{'end_line_in_anchor'};
+ $result_trees{'end_line_in_anchor'}{'contents'}[1]{'parent'} = $result_trees{'end_line_in_anchor'};
  
  $result_texis{'end_line_in_anchor'} = '@anchor{an
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/footnote.pl texinfo-6.3/tp/t/results/coverage_braces/footnote.pl
*** texinfo-6.1/tp/t/results/coverage_braces/footnote.pl	2016-01-22 07:49:30.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/footnote.pl	2016-08-02 18:44:13.000000000 +0100
***************
*** 74,84 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {
              'file_name' => '',
--- 74,77 ----
***************
*** 109,113 ****
  $result_trees{'footnote'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'footnote'}{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'footnote'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'footnote'}{'contents'}[0]{'contents'}[1];
- $result_trees{'footnote'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'footnote'}{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'footnote'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'footnote'}{'contents'}[0];
  $result_trees{'footnote'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'footnote'}{'contents'}[0];
--- 102,105 ----
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/footnote_in_command_not_closed.pl texinfo-6.3/tp/t/results/coverage_braces/footnote_in_command_not_closed.pl
*** texinfo-6.1/tp/t/results/coverage_braces/footnote_in_command_not_closed.pl	2016-01-22 07:49:32.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/footnote_in_command_not_closed.pl	2016-08-02 18:44:14.000000000 +0100
***************
*** 43,53 ****
                    'cmdname' => 'footnote',
                    'contents' => [],
-                   'extra' => {
-                     'spaces_before_argument' => {
-                       'parent' => {},
-                       'text' => '',
-                       'type' => 'empty_spaces_before_argument'
-                     }
-                   },
                    'line_nr' => {
                      'file_name' => '',
--- 43,46 ----
***************
*** 79,83 ****
  $result_trees{'footnote_in_command_not_closed'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'footnote_in_command_not_closed'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'footnote_in_command_not_closed'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'footnote_in_command_not_closed'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1];
- $result_trees{'footnote_in_command_not_closed'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'footnote_in_command_not_closed'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'footnote_in_command_not_closed'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'footnote_in_command_not_closed'}{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'footnote_in_command_not_closed'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'footnote_in_command_not_closed'}{'contents'}[0]{'contents'}[1];
--- 72,75 ----
***************
*** 93,111 ****
  $result_errors{'footnote_in_command_not_closed'} = [
    {
!     'error_line' => ':1: @footnote missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@footnote missing close brace',
      'type' => 'error'
    },
    {
!     'error_line' => ':1: @code missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@code missing close brace',
      'type' => 'error'
    }
--- 85,103 ----
  $result_errors{'footnote_in_command_not_closed'} = [
    {
!     'error_line' => ':1: @footnote missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@footnote missing closing brace',
      'type' => 'error'
    },
    {
!     'error_line' => ':1: @code missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@code missing closing brace',
      'type' => 'error'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/footnote_no_node.pl texinfo-6.3/tp/t/results/coverage_braces/footnote_no_node.pl
*** texinfo-6.1/tp/t/results/coverage_braces/footnote_no_node.pl	2016-01-22 07:49:31.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/footnote_no_node.pl	2016-08-02 18:44:13.000000000 +0100
***************
*** 75,85 ****
                'cmdname' => 'footnote',
                'contents' => [],
-               'extra' => {
-                 'spaces_before_argument' => {
-                   'parent' => {},
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
-                 }
-               },
                'line_nr' => {
                  'file_name' => '',
--- 75,78 ----
***************
*** 127,131 ****
  $result_trees{'footnote_no_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'footnote_no_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'footnote_no_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'footnote_no_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
- $result_trees{'footnote_no_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'footnote_no_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'footnote_no_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'footnote_no_node'}{'contents'}[1]{'contents'}[1];
  $result_trees{'footnote_no_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'footnote_no_node'}{'contents'}[1]{'contents'}[1];
--- 120,123 ----
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/footnote_not_closed.pl texinfo-6.3/tp/t/results/coverage_braces/footnote_not_closed.pl
*** texinfo-6.1/tp/t/results/coverage_braces/footnote_not_closed.pl	2016-01-22 07:49:32.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/footnote_not_closed.pl	2016-08-02 18:44:14.000000000 +0100
***************
*** 97,106 ****
  $result_errors{'footnote_not_closed'} = [
    {
!     'error_line' => ':1: @footnote missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@footnote missing close brace',
      'type' => 'error'
    }
--- 97,106 ----
  $result_errors{'footnote_not_closed'} = [
    {
!     'error_line' => ':1: @footnote missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@footnote missing closing brace',
      'type' => 'error'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl texinfo-6.3/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl
*** texinfo-6.1/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl	2016-01-22 07:49:32.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl	2016-08-02 18:44:14.000000000 +0100
***************
*** 60,68 ****
                {}
              ],
!             'normalized' => 'aa',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 60,64 ----
                {}
              ],
!             'normalized' => 'aa'
            },
            'line_nr' => {},
***************
*** 70,73 ****
--- 66,70 ----
          },
          {
+           'parent' => {},
            'text' => '',
            'type' => 'empty_spaces_after_close_brace'
***************
*** 93,96 ****
--- 90,94 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => '',
                    'type' => 'empty_spaces_before_argument'
***************
*** 107,110 ****
--- 105,109 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => '  ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 255,263 ****
--- 254,265 ----
  $result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'form_feed_in_brace_commands'}{'contents'}[0];
+ $result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'form_feed_in_brace_commands'}{'contents'}[0];
  $result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'parent'} = $result_trees{'form_feed_in_brace_commands'};
  $result_trees{'form_feed_in_brace_commands'}{'contents'}[1]{'parent'} = $result_trees{'form_feed_in_brace_commands'};
  $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'form_feed_in_brace_commands'}{'contents'}[2];
+ $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]{'args'}[0];
  $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]{'args'}[0];
  $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1];
+ $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]{'args'}[1];
  $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]{'args'}[1];
  $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/format_on_first_footnote_line.pl texinfo-6.3/tp/t/results/coverage_braces/format_on_first_footnote_line.pl
*** texinfo-6.1/tp/t/results/coverage_braces/format_on_first_footnote_line.pl	2016-01-22 07:49:31.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/format_on_first_footnote_line.pl	2016-08-02 18:44:14.000000000 +0100
***************
*** 101,111 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {},
            'parent' => {}
--- 101,104 ----
***************
*** 225,235 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {},
            'parent' => {}
--- 218,221 ----
***************
*** 264,268 ****
  $result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[1];
- $result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'format_on_first_footnote_line'}{'contents'}[0];
--- 250,253 ----
***************
*** 288,292 ****
  $result_trees{'format_on_first_footnote_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'format_on_first_footnote_line'}{'contents'}[2]{'contents'}[1]{'args'}[0];
  $result_trees{'format_on_first_footnote_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'format_on_first_footnote_line'}{'contents'}[2]{'contents'}[1];
- $result_trees{'format_on_first_footnote_line'}{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'format_on_first_footnote_line'}{'contents'}[2]{'contents'}[1]{'args'}[0];
  $result_trees{'format_on_first_footnote_line'}{'contents'}[2]{'contents'}[1]{'line_nr'} = $result_trees{'format_on_first_footnote_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'format_on_first_footnote_line'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'format_on_first_footnote_line'}{'contents'}[2];
--- 273,276 ----
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/heading_in_footnote.pl texinfo-6.3/tp/t/results/coverage_braces/heading_in_footnote.pl
*** texinfo-6.1/tp/t/results/coverage_braces/heading_in_footnote.pl	2016-01-22 07:49:31.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/heading_in_footnote.pl	2016-08-02 18:44:13.000000000 +0100
***************
*** 115,119 ****
                        'index_at_command' => 'cindex',
                        'index_name' => 'cp',
-                       'index_prefix' => 'c',
                        'index_type_command' => 'cindex',
                        'key' => 'ind e',
--- 115,118 ----
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/inforef_too_much_args.pl texinfo-6.3/tp/t/results/coverage_braces/inforef_too_much_args.pl
*** texinfo-6.1/tp/t/results/coverage_braces/inforef_too_much_args.pl	2016-01-22 07:49:30.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/inforef_too_much_args.pl	2016-08-02 18:44:13.000000000 +0100
***************
*** 65,68 ****
--- 65,69 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 79,82 ****
--- 80,84 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 110,117 ****
                    ],
                    'normalized' => 'chapter'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 112,115 ----
***************
*** 165,170 ****
--- 163,170 ----
  $result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
+ $result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
+ $result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[2];
  $result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[2];
  $result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[2]{'parent'} = $result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/math_bracketed_inside_not_closed.pl texinfo-6.3/tp/t/results/coverage_braces/math_bracketed_inside_not_closed.pl
*** texinfo-6.1/tp/t/results/coverage_braces/math_bracketed_inside_not_closed.pl	2016-01-22 07:49:32.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/math_bracketed_inside_not_closed.pl	2016-08-02 18:44:14.000000000 +0100
***************
*** 51,61 ****
            'cmdname' => 'math',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {},
            'parent' => {}
--- 51,54 ----
***************
*** 75,79 ****
  $result_trees{'math_bracketed_inside_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'math_bracketed_inside_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'math_bracketed_inside_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'math_bracketed_inside_not_closed'}{'contents'}[0]{'contents'}[0];
- $result_trees{'math_bracketed_inside_not_closed'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'math_bracketed_inside_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'math_bracketed_inside_not_closed'}{'contents'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'math_bracketed_inside_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'math_bracketed_inside_not_closed'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'math_bracketed_inside_not_closed'}{'contents'}[0];
--- 68,71 ----
***************
*** 87,96 ****
  $result_errors{'math_bracketed_inside_not_closed'} = [
    {
!     'error_line' => ':1: @math missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@math missing close brace',
      'type' => 'error'
    }
--- 79,88 ----
  $result_errors{'math_bracketed_inside_not_closed'} = [
    {
!     'error_line' => ':1: @math missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@math missing closing brace',
      'type' => 'error'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/math_bracketed_not_closed.pl texinfo-6.3/tp/t/results/coverage_braces/math_bracketed_not_closed.pl
*** texinfo-6.1/tp/t/results/coverage_braces/math_bracketed_not_closed.pl	2016-01-22 07:49:32.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/math_bracketed_not_closed.pl	2016-08-02 18:44:14.000000000 +0100
***************
*** 51,61 ****
            'cmdname' => 'math',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {},
            'parent' => {}
--- 51,54 ----
***************
*** 75,79 ****
  $result_trees{'math_bracketed_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'math_bracketed_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'math_bracketed_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'math_bracketed_not_closed'}{'contents'}[0]{'contents'}[0];
- $result_trees{'math_bracketed_not_closed'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'math_bracketed_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'math_bracketed_not_closed'}{'contents'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'math_bracketed_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'math_bracketed_not_closed'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'math_bracketed_not_closed'}{'contents'}[0];
--- 68,71 ----
***************
*** 96,105 ****
    },
    {
!     'error_line' => ':1: @math missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@math missing close brace',
      'type' => 'error'
    }
--- 88,97 ----
    },
    {
!     'error_line' => ':1: @math missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@math missing closing brace',
      'type' => 'error'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/math_bracketed_not_closed_next_line.pl texinfo-6.3/tp/t/results/coverage_braces/math_bracketed_not_closed_next_line.pl
*** texinfo-6.1/tp/t/results/coverage_braces/math_bracketed_not_closed_next_line.pl	2016-01-22 07:49:32.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/math_bracketed_not_closed_next_line.pl	2016-08-02 18:44:14.000000000 +0100
***************
*** 47,57 ****
            'cmdname' => 'math',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {},
            'parent' => {}
--- 47,50 ----
***************
*** 69,73 ****
  $result_trees{'math_bracketed_not_closed_next_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'math_bracketed_not_closed_next_line'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'math_bracketed_not_closed_next_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'math_bracketed_not_closed_next_line'}{'contents'}[0]{'contents'}[0];
- $result_trees{'math_bracketed_not_closed_next_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'math_bracketed_not_closed_next_line'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'math_bracketed_not_closed_next_line'}{'contents'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'math_bracketed_not_closed_next_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'math_bracketed_not_closed_next_line'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'math_bracketed_not_closed_next_line'}{'contents'}[0];
--- 62,65 ----
***************
*** 94,103 ****
    },
    {
!     'error_line' => ':1: @math missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@math missing close brace',
      'type' => 'error'
    }
--- 86,95 ----
    },
    {
!     'error_line' => ':1: @math missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@math missing closing brace',
      'type' => 'error'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/math_not_closed.pl texinfo-6.3/tp/t/results/coverage_braces/math_not_closed.pl
*** texinfo-6.1/tp/t/results/coverage_braces/math_not_closed.pl	2016-01-22 07:49:32.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/math_not_closed.pl	2016-08-02 18:44:14.000000000 +0100
***************
*** 25,35 ****
            'cmdname' => 'math',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {
              'file_name' => '',
--- 25,28 ----
***************
*** 48,52 ****
  $result_trees{'math_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'math_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'math_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'math_not_closed'}{'contents'}[0]{'contents'}[0];
- $result_trees{'math_not_closed'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'math_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'math_not_closed'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'math_not_closed'}{'contents'}[0];
  $result_trees{'math_not_closed'}{'contents'}[0]{'parent'} = $result_trees{'math_not_closed'};
--- 41,44 ----
***************
*** 59,68 ****
  $result_errors{'math_not_closed'} = [
    {
!     'error_line' => ':1: @math missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@math missing close brace',
      'type' => 'error'
    }
--- 51,60 ----
  $result_errors{'math_not_closed'} = [
    {
!     'error_line' => ':1: @math missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@math missing closing brace',
      'type' => 'error'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/nested_args.pl texinfo-6.3/tp/t/results/coverage_braces/nested_args.pl
*** texinfo-6.1/tp/t/results/coverage_braces/nested_args.pl	2016-01-22 07:49:30.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/nested_args.pl	2016-08-02 18:44:13.000000000 +0100
***************
*** 51,54 ****
--- 51,55 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 83,86 ****
--- 84,88 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 119,122 ****
--- 121,125 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' 
  ',
***************
*** 179,186 ****
                ],
                'normalized' => '_0040-in-samp'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 182,185 ----
***************
*** 205,208 ****
--- 204,208 ----
  $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0];
+ $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1];
  $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1];
  $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[2]{'args'}[0];
***************
*** 211,214 ****
--- 211,215 ----
  $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1];
  $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0];
+ $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[2];
  $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[2];
  $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'contents'}[2]{'args'}[0];
***************
*** 218,221 ****
--- 219,223 ----
  $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'contents'}[3]{'parent'} = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[2];
  $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'parent'} = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0];
+ $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[3];
  $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/nested_in_sc.pl texinfo-6.3/tp/t/results/coverage_braces/nested_in_sc.pl
*** texinfo-6.1/tp/t/results/coverage_braces/nested_in_sc.pl	2016-01-22 07:49:30.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/nested_in_sc.pl	2016-08-02 18:44:13.000000000 +0100
***************
*** 36,39 ****
--- 36,45 ----
                            ],
                            'cmdname' => '~',
+                           'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 1,
+                             'macro' => ''
+                           },
                            'parent' => {}
                          },
***************
*** 52,55 ****
--- 58,62 ----
                            'cmdname' => 'aa',
                            'contents' => [],
+                           'line_nr' => {},
                            'parent' => {}
                          },
***************
*** 68,71 ****
--- 75,79 ----
                            'cmdname' => 'TeX',
                            'contents' => [],
+                           'line_nr' => {},
                            'parent' => {}
                          },
***************
*** 88,91 ****
--- 96,100 ----
                                    'cmdname' => 'aa',
                                    'contents' => [],
+                                   'line_nr' => {},
                                    'parent' => {}
                                  }
***************
*** 97,105 ****
                            'cmdname' => '~',
                            'contents' => [],
!                           'line_nr' => {
!                             'file_name' => '',
!                             'line_nr' => 1,
!                             'macro' => ''
!                           },
                            'parent' => {}
                          },
--- 106,110 ----
                            'cmdname' => '~',
                            'contents' => [],
!                           'line_nr' => {},
                            'parent' => {}
                          },
***************
*** 129,139 ****
                            'cmdname' => 'footnote',
                            'contents' => [],
-                           'extra' => {
-                             'spaces_before_argument' => {
-                               'parent' => {},
-                               'text' => '',
-                               'type' => 'empty_spaces_before_argument'
-                             }
-                           },
                            'line_nr' => {},
                            'parent' => {}
--- 134,137 ----
***************
*** 158,161 ****
--- 156,160 ----
                                'contents' => [
                                  {
+                                   'parent' => {},
                                    'text' => ' ',
                                    'type' => 'empty_spaces_before_argument'
***************
*** 180,189 ****
                                  {}
                                ]
!                             ],
!                             'normalized' => 'ABr',
!                             'spaces_before_argument' => {
!                               'text' => '',
!                               'type' => 'empty_spaces_before_argument'
!                             }
                            },
                            'line_nr' => {},
--- 179,183 ----
                                  {}
                                ]
!                             ]
                            },
                            'line_nr' => {},
***************
*** 257,268 ****
--- 251,266 ----
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3];
+ $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5];
+ $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
+ $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0];
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7];
+ $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
***************
*** 270,284 ****
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0];
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9];
! $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0];
! $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'line_nr'};
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0];
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11];
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[1];
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[1]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11];
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0];
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'extra'}{'brace_command_contents'}[1][0] = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[1]{'contents'}[1];
! $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'line_nr'};
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
--- 268,282 ----
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0];
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9];
! $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0];
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11];
+ $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[1];
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[1];
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[1]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11];
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0];
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'extra'}{'brace_command_contents'}[1][0] = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[1]{'contents'}[1];
! $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
***************
*** 287,294 ****
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
! $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'line_nr'};
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0];
! $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'line_nr'};
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0];
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0];
--- 285,292 ----
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
! $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0];
! $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0];
  $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/no_brace.pl texinfo-6.3/tp/t/results/coverage_braces/no_brace.pl
*** texinfo-6.1/tp/t/results/coverage_braces/no_brace.pl	2016-01-22 07:49:32.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/no_brace.pl	2016-08-02 18:44:14.000000000 +0100
***************
*** 13,16 ****
--- 13,21 ----
            'cmdname' => 'TeX',
            'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 1,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 22,25 ****
--- 27,31 ----
            'cmdname' => 'code',
            'contents' => [],
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 31,39 ****
            'cmdname' => 'footnote',
            'contents' => [],
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 1,
!             'macro' => ''
!           },
            'parent' => {}
          },
--- 37,41 ----
            'cmdname' => 'footnote',
            'contents' => [],
!           'line_nr' => {},
            'parent' => {}
          },
***************
*** 51,56 ****
--- 53,60 ----
  $result_trees{'no_brace'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'no_brace'}{'contents'}[0];
  $result_trees{'no_brace'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'no_brace'}{'contents'}[0];
+ $result_trees{'no_brace'}{'contents'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'no_brace'}{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'no_brace'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'no_brace'}{'contents'}[0];
  $result_trees{'no_brace'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'no_brace'}{'contents'}[0];
+ $result_trees{'no_brace'}{'contents'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'no_brace'}{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'no_brace'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'no_brace'}{'contents'}[0];
  $result_trees{'no_brace'}{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'no_brace'}{'contents'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/no_brace_space_end_line.pl texinfo-6.3/tp/t/results/coverage_braces/no_brace_space_end_line.pl
*** texinfo-6.1/tp/t/results/coverage_braces/no_brace_space_end_line.pl	2016-01-22 07:49:32.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/no_brace_space_end_line.pl	2016-08-02 18:44:14.000000000 +0100
***************
*** 52,55 ****
--- 52,60 ----
            'cmdname' => 'TeX',
            'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 3,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 62,65 ****
--- 67,75 ----
            'cmdname' => 'code',
            'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 5,
+             'macro' => ''
+           },
            'parent' => {}
          },
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/recursive_acronym.pl texinfo-6.3/tp/t/results/coverage_braces/recursive_acronym.pl
*** texinfo-6.1/tp/t/results/coverage_braces/recursive_acronym.pl	2016-01-22 07:49:29.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/recursive_acronym.pl	2016-08-02 18:44:13.000000000 +0100
***************
*** 25,28 ****
--- 25,29 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 49,57 ****
                        ]
                      ],
!                     'normalized' => 'GNU',
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {
--- 50,54 ----
                        ]
                      ],
!                     'explanation_contents' => []
                    },
                    'line_nr' => {
***************
*** 82,91 ****
                  {}
                ]
!             ],
!             'normalized' => 'GNU',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 79,83 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 106,109 ****
--- 98,102 ----
  $result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0];
+ $result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[1];
  $result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/ref_empty_node.pl texinfo-6.3/tp/t/results/coverage_braces/ref_empty_node.pl
*** texinfo-6.1/tp/t/results/coverage_braces/ref_empty_node.pl	2016-01-22 07:49:32.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/ref_empty_node.pl	2016-08-02 18:44:14.000000000 +0100
***************
*** 54,62 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 54,58 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 91,94 ****
--- 87,91 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 101,104 ****
--- 98,102 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 124,132 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 122,126 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 169,177 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 163,167 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 188,191 ****
--- 178,182 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 198,201 ****
--- 189,193 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 212,215 ****
--- 204,208 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 226,229 ****
--- 219,223 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 240,243 ****
--- 234,238 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 303,307 ****
--- 298,304 ----
  $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[2];
  $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[2]{'args'}[2]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[2];
+ $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[2]{'args'}[3];
  $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[2]{'args'}[3]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[2];
+ $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[2]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[2]{'args'}[4];
  $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[2]{'args'}[4]{'contents'}[1]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[2]{'args'}[4];
  $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[2]{'args'}[4]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[2];
***************
*** 318,328 ****
--- 315,330 ----
  $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1];
  $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1];
+ $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[6]{'args'}[0];
  $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[6];
+ $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[6]{'args'}[1];
  $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[6]{'args'}[1];
  $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[6]{'args'}[1]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[6];
+ $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[6]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[6]{'args'}[2];
  $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[6]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[6]{'args'}[2];
  $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[6]{'args'}[2]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[6];
+ $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[6]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[6]{'args'}[3];
  $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[6]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[6]{'args'}[3];
  $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[6]{'args'}[3]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[6];
+ $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[6]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[6]{'args'}[4];
  $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[6]{'args'}[4]{'contents'}[1]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[6]{'args'}[4];
  $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[6]{'args'}[4]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[6];
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/ref_in_style_command.pl texinfo-6.3/tp/t/results/coverage_braces/ref_in_style_command.pl
*** texinfo-6.1/tp/t/results/coverage_braces/ref_in_style_command.pl	2016-01-22 07:49:30.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/ref_in_style_command.pl	2016-08-02 18:44:13.000000000 +0100
***************
*** 49,56 ****
                        ],
                        'normalized' => 'other-node'
-                     },
-                     'spaces_before_argument' => {
-                       'text' => '',
-                       'type' => 'empty_spaces_before_argument'
                      }
                    },
--- 49,52 ----
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/space_command_in_image.pl texinfo-6.3/tp/t/results/coverage_braces/space_command_in_image.pl
*** texinfo-6.1/tp/t/results/coverage_braces/space_command_in_image.pl	2016-01-22 07:49:31.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/space_command_in_image.pl	2016-08-02 18:44:14.000000000 +0100
***************
*** 53,61 ****
              {}
            ]
!         ],
!         'spaces_before_argument' => {
!           'text' => '',
!           'type' => 'empty_spaces_before_argument'
!         }
        },
        'line_nr' => {
--- 53,57 ----
              {}
            ]
!         ]
        },
        'line_nr' => {
***************
*** 115,123 ****
              {}
            ]
!         ],
!         'spaces_before_argument' => {
!           'text' => '',
!           'type' => 'empty_spaces_before_argument'
!         }
        },
        'line_nr' => {},
--- 111,115 ----
              {}
            ]
!         ]
        },
        'line_nr' => {},
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/space_in_anchor.pl texinfo-6.3/tp/t/results/coverage_braces/space_in_anchor.pl
*** texinfo-6.1/tp/t/results/coverage_braces/space_in_anchor.pl	2016-01-22 07:49:31.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/space_in_anchor.pl	2016-08-02 18:44:14.000000000 +0100
***************
*** 13,16 ****
--- 13,17 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => '   ',
                'type' => 'empty_spaces_before_argument'
***************
*** 65,68 ****
--- 66,70 ----
    'type' => 'text_root'
  };
+ $result_trees{'space_in_anchor'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'space_in_anchor'}{'contents'}[0]{'args'}[0];
  $result_trees{'space_in_anchor'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'space_in_anchor'}{'contents'}[0]{'args'}[0];
  $result_trees{'space_in_anchor'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'space_in_anchor'}{'contents'}[0]{'args'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/space_in_image.pl texinfo-6.3/tp/t/results/coverage_braces/space_in_image.pl
*** texinfo-6.1/tp/t/results/coverage_braces/space_in_image.pl	2016-01-22 07:49:31.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/space_in_image.pl	2016-08-02 18:44:14.000000000 +0100
***************
*** 13,16 ****
--- 13,17 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 42,45 ****
--- 43,47 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 124,127 ****
--- 126,130 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 165,168 ****
--- 168,172 ----
    'type' => 'text_root'
  };
+ $result_trees{'space_in_image'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'space_in_image'}{'contents'}[0]{'args'}[0];
  $result_trees{'space_in_image'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'space_in_image'}{'contents'}[0]{'args'}[0];
  $result_trees{'space_in_image'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'space_in_image'}{'contents'}[0]{'args'}[0];
***************
*** 170,173 ****
--- 174,178 ----
  $result_trees{'space_in_image'}{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'space_in_image'}{'contents'}[0]{'args'}[1];
  $result_trees{'space_in_image'}{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'space_in_image'}{'contents'}[0];
+ $result_trees{'space_in_image'}{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'space_in_image'}{'contents'}[0]{'args'}[2];
  $result_trees{'space_in_image'}{'contents'}[0]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'space_in_image'}{'contents'}[0]{'args'}[2];
  $result_trees{'space_in_image'}{'contents'}[0]{'args'}[2]{'parent'} = $result_trees{'space_in_image'}{'contents'}[0];
***************
*** 186,189 ****
--- 191,195 ----
  $result_trees{'space_in_image'}{'contents'}[0]{'parent'} = $result_trees{'space_in_image'};
  $result_trees{'space_in_image'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'space_in_image'}{'contents'}[1];
+ $result_trees{'space_in_image'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'space_in_image'}{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'space_in_image'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'space_in_image'}{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'space_in_image'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'space_in_image'}{'contents'}[1]{'contents'}[1]{'args'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/test_image.pl texinfo-6.3/tp/t/results/coverage_braces/test_image.pl
*** texinfo-6.1/tp/t/results/coverage_braces/test_image.pl	2016-01-22 07:49:31.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/test_image.pl	2016-08-02 18:44:14.000000000 +0100
***************
*** 46,63 ****
            'extra' => {
              'arg_line' => ' files-char
! ',
!             'macrobody' => '@image{f@@i--le@/.@.  a@@<"%@@@verb{:  < & @ % " :} ,,,,ext@@i--le@/.@.  a@@<"%@@@verb{:  < & @ % " :}}
! 
! In text @image{f@@i--le@/.@.  a@@<"%@@@verb{:  < & @ % " :} ,1in, 1cm, alt @b{@^{@dotless{i}}--le@/.@.}  a@*<"%@@@verb{:  < & @ % " :}  ,ext@@i--le@/.@.  a@@<"%@@@verb{:  < & @ % " :}}.
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 46,50 ----
            'extra' => {
              'arg_line' => ' files-char
! '
            },
            'line_nr' => {
***************
*** 68,72 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 55,67 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 292,300 ****
                          {}
                        ]
!                     ],
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {},
--- 287,291 ----
                          {}
                        ]
!                     ]
                    },
                    'line_nr' => {},
***************
*** 415,418 ****
--- 406,410 ----
                        'contents' => [
                          {
+                           'parent' => {},
                            'text' => ' ',
                            'type' => 'empty_spaces_before_argument'
***************
*** 429,432 ****
--- 421,425 ----
                        'contents' => [
                          {
+                           'parent' => {},
                            'text' => ' ',
                            'type' => 'empty_spaces_before_argument'
***************
*** 661,669 ****
                          {}
                        ]
!                     ],
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {},
--- 654,658 ----
                          {}
                        ]
!                     ]
                    },
                    'line_nr' => {},
***************
*** 975,983 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 964,968 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 1094,1097 ****
--- 1079,1083 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1108,1111 ****
--- 1094,1098 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1340,1348 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 1327,1331 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 1607,1615 ****
                          {}
                        ]
!                     ],
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {},
--- 1590,1594 ----
                          {}
                        ]
!                     ]
                    },
                    'line_nr' => {},
***************
*** 1724,1727 ****
--- 1703,1707 ----
                        'contents' => [
                          {
+                           'parent' => {},
                            'text' => ' ',
                            'type' => 'empty_spaces_before_argument'
***************
*** 1738,1741 ****
--- 1718,1722 ----
                        'contents' => [
                          {
+                           'parent' => {},
                            'text' => ' ',
                            'type' => 'empty_spaces_before_argument'
***************
*** 1970,1978 ****
                          {}
                        ]
!                     ],
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {},
--- 1951,1955 ----
                          {}
                        ]
!                     ]
                    },
                    'line_nr' => {},
***************
*** 2070,2073 ****
--- 2047,2051 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 2288,2296 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 2266,2270 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 2407,2410 ****
--- 2381,2385 ----
                        'contents' => [
                          {
+                           'parent' => {},
                            'text' => ' ',
                            'type' => 'empty_spaces_before_argument'
***************
*** 2421,2424 ****
--- 2396,2400 ----
                        'contents' => [
                          {
+                           'parent' => {},
                            'text' => ' ',
                            'type' => 'empty_spaces_before_argument'
***************
*** 2653,2661 ****
                          {}
                        ]
!                     ],
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {},
--- 2629,2633 ----
                          {}
                        ]
!                     ]
                    },
                    'line_nr' => {},
***************
*** 2879,2887 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 2851,2855 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {},
***************
*** 2998,3001 ****
--- 2966,2970 ----
                                'contents' => [
                                  {
+                                   'parent' => {},
                                    'text' => ' ',
                                    'type' => 'empty_spaces_before_argument'
***************
*** 3012,3015 ****
--- 2981,2985 ----
                                'contents' => [
                                  {
+                                   'parent' => {},
                                    'text' => ' ',
                                    'type' => 'empty_spaces_before_argument'
***************
*** 3244,3252 ****
                                  {}
                                ]
!                             ],
!                             'spaces_before_argument' => {
!                               'text' => '',
!                               'type' => 'empty_spaces_before_argument'
!                             }
                            },
                            'line_nr' => {},
--- 3214,3218 ----
                                  {}
                                ]
!                             ]
                            },
                            'line_nr' => {},
***************
*** 3269,3278 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 3235,3239 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 3446,3453 ****
  $result_trees{'test_image'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[0];
  $result_trees{'test_image'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[0];
- $result_trees{'test_image'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[0];
- $result_trees{'test_image'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'test_image'}{'contents'}[0];
  $result_trees{'test_image'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[0];
! $result_trees{'test_image'}{'contents'}[0]{'contents'}[1] = $result_trees{'test_image'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'test_image'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'test_image'}{'contents'}[0];
  $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'command'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3];
--- 3407,3413 ----
  $result_trees{'test_image'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[0];
  $result_trees{'test_image'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[0];
  $result_trees{'test_image'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[0];
! $result_trees{'test_image'}{'contents'}[0]{'contents'}[1]{'extra'}{'command'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[0];
! $result_trees{'test_image'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[0];
  $result_trees{'test_image'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'test_image'}{'contents'}[0];
  $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'command'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3];
***************
*** 3532,3537 ****
--- 3492,3499 ----
  $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[1];
  $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1];
+ $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[2];
  $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[2];
  $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1];
+ $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3];
  $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3];
  $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
***************
*** 3705,3710 ****
--- 3667,3674 ----
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[1];
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1];
+ $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[2];
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[2];
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1];
+ $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3];
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3];
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
***************
*** 3867,3872 ****
--- 3831,3838 ----
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4];
+ $result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[2];
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[2];
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[2]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4];
+ $result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[3];
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[3];
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
***************
*** 3960,3963 ****
--- 3926,3930 ----
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'args'}[0];
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[12];
+ $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'args'}[1];
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'args'}[1];
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'args'}[1];
***************
*** 4040,4045 ****
--- 4007,4014 ----
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[1];
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1];
+ $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[2];
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[2];
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1];
+ $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[3];
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[3];
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
***************
*** 4195,4200 ****
--- 4164,4171 ----
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[1];
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1];
+ $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[2];
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[2];
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1];
+ $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3];
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3];
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
***************
*** 4274,4278 ****
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5];
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'extra'}{'float'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[12];
- $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0];
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[12];
  $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[6]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[12];
--- 4245,4248 ----
***************
*** 4640,4648 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 4610,4614 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/test_w.pl texinfo-6.3/tp/t/results/coverage_braces/test_w.pl
*** texinfo-6.1/tp/t/results/coverage_braces/test_w.pl	2016-01-22 07:49:31.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/test_w.pl	2016-08-02 18:44:14.000000000 +0100
***************
*** 650,653 ****
--- 650,654 ----
                            'cmdname' => 'dots',
                            'contents' => [],
+                           'line_nr' => {},
                            'parent' => {}
                          },
***************
*** 816,819 ****
--- 817,821 ----
  $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3];
+ $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/too_much_args.pl texinfo-6.3/tp/t/results/coverage_braces/too_much_args.pl
*** texinfo-6.1/tp/t/results/coverage_braces/too_much_args.pl	2016-01-22 07:49:30.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/too_much_args.pl	2016-08-02 18:44:13.000000000 +0100
***************
*** 25,28 ****
--- 25,29 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 47,56 ****
                  {}
                ]
!             ],
!             'normalized' => 'AZE',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 48,52 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 70,73 ****
--- 66,70 ----
  $result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0];
+ $result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'args'}[1];
  $result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'args'}[1];
  $result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl texinfo-6.3/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
*** texinfo-6.1/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl	2016-01-22 07:49:32.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl	2016-08-02 18:44:14.000000000 +0100
***************
*** 141,151 ****
                'cmdname' => 'footnote',
                'contents' => [],
-               'extra' => {
-                 'spaces_before_argument' => {
-                   'parent' => {},
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
-                 }
-               },
                'line_nr' => {
                  'file_name' => '',
--- 141,144 ----
***************
*** 214,224 ****
                'cmdname' => 'footnote',
                'contents' => [],
-               'extra' => {
-                 'spaces_before_argument' => {
-                   'parent' => {},
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
-                 }
-               },
                'line_nr' => {
                  'file_name' => '',
--- 207,210 ----
***************
*** 514,524 ****
                'cmdname' => 'footnote',
                'contents' => [],
-               'extra' => {
-                 'spaces_before_argument' => {
-                   'parent' => {},
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
-                 }
-               },
                'line_nr' => {
                  'file_name' => '',
--- 500,503 ----
***************
*** 587,597 ****
                'cmdname' => 'footnote',
                'contents' => [],
-               'extra' => {
-                 'spaces_before_argument' => {
-                   'parent' => {},
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
-                 }
-               },
                'line_nr' => {
                  'file_name' => '',
--- 566,569 ----
***************
*** 658,662 ****
  $result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
- $result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[1];
  $result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[1];
--- 630,633 ----
***************
*** 670,674 ****
  $result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
- $result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[3];
  $result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[3];
--- 641,644 ----
***************
*** 724,728 ****
  $result_trees{'two_footnotes_in_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'two_footnotes_in_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'two_footnotes_in_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'two_footnotes_in_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
- $result_trees{'two_footnotes_in_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'two_footnotes_in_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'two_footnotes_in_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'two_footnotes_in_nodes'}{'contents'}[4]{'contents'}[1];
  $result_trees{'two_footnotes_in_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'two_footnotes_in_nodes'}{'contents'}[4]{'contents'}[1];
--- 694,697 ----
***************
*** 736,740 ****
  $result_trees{'two_footnotes_in_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'two_footnotes_in_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'two_footnotes_in_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'two_footnotes_in_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
- $result_trees{'two_footnotes_in_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'two_footnotes_in_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'two_footnotes_in_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'two_footnotes_in_nodes'}{'contents'}[4]{'contents'}[3];
  $result_trees{'two_footnotes_in_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'two_footnotes_in_nodes'}{'contents'}[4]{'contents'}[3];
--- 705,708 ----
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl texinfo-6.3/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
*** texinfo-6.1/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl	2016-01-22 07:49:32.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl	2016-08-02 18:44:14.000000000 +0100
***************
*** 183,193 ****
                'cmdname' => 'footnote',
                'contents' => [],
-               'extra' => {
-                 'spaces_before_argument' => {
-                   'parent' => {},
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
-                 }
-               },
                'line_nr' => {
                  'file_name' => '',
--- 183,186 ----
***************
*** 256,266 ****
                'cmdname' => 'footnote',
                'contents' => [],
-               'extra' => {
-                 'spaces_before_argument' => {
-                   'parent' => {},
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
-                 }
-               },
                'line_nr' => {
                  'file_name' => '',
--- 249,252 ----
***************
*** 556,566 ****
                'cmdname' => 'footnote',
                'contents' => [],
-               'extra' => {
-                 'spaces_before_argument' => {
-                   'parent' => {},
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
-                 }
-               },
                'line_nr' => {
                  'file_name' => '',
--- 542,545 ----
***************
*** 629,639 ****
                'cmdname' => 'footnote',
                'contents' => [],
-               'extra' => {
-                 'spaces_before_argument' => {
-                   'parent' => {},
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
-                 }
-               },
                'line_nr' => {
                  'file_name' => '',
--- 608,611 ----
***************
*** 707,711 ****
  $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
- $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[1];
  $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[1];
--- 679,682 ----
***************
*** 719,723 ****
  $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
- $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[3];
  $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[3];
--- 690,693 ----
***************
*** 773,777 ****
  $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
- $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[4]{'contents'}[1];
  $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[4]{'contents'}[1];
--- 743,746 ----
***************
*** 785,789 ****
  $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
- $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[4]{'contents'}[3];
  $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[4]{'contents'}[3];
--- 754,757 ----
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/uref_in_ref.pl texinfo-6.3/tp/t/results/coverage_braces/uref_in_ref.pl
*** texinfo-6.1/tp/t/results/coverage_braces/uref_in_ref.pl	2016-01-22 07:49:30.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/uref_in_ref.pl	2016-08-02 18:44:13.000000000 +0100
***************
*** 25,28 ****
--- 25,29 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 65,73 ****
                          {}
                        ]
!                     ],
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {
--- 66,70 ----
                          {}
                        ]
!                     ]
                    },
                    'line_nr' => {
***************
*** 85,88 ****
--- 82,86 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 125,133 ****
                          {}
                        ]
!                     ],
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {},
--- 123,127 ----
                          {}
                        ]
!                     ]
                    },
                    'line_nr' => {},
***************
*** 141,144 ****
--- 135,139 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 181,189 ****
                          {}
                        ]
!                     ],
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {},
--- 176,180 ----
                          {}
                        ]
!                     ]
                    },
                    'line_nr' => {},
***************
*** 197,200 ****
--- 188,192 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 237,245 ****
                          {}
                        ]
!                     ],
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {},
--- 229,233 ----
                          {}
                        ]
!                     ]
                    },
                    'line_nr' => {},
***************
*** 289,296 ****
                ],
                'normalized' => 'node'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 277,280 ----
***************
*** 312,315 ****
--- 296,300 ----
  $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0];
+ $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[1];
  $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[1];
  $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[2]{'args'}[0];
***************
*** 321,324 ****
--- 306,310 ----
  $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[1];
  $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0];
+ $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[2];
  $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[2];
  $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'contents'}[2]{'args'}[0];
***************
*** 331,334 ****
--- 317,321 ----
  $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'contents'}[2]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[2];
  $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0];
+ $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[3];
  $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[3];
  $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[2]{'args'}[0];
***************
*** 341,344 ****
--- 328,332 ----
  $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[3];
  $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[3]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0];
+ $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[4];
  $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[4]{'contents'}[1]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[4];
  $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[4]{'contents'}[2]{'args'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/uref_url.pl texinfo-6.3/tp/t/results/coverage_braces/uref_url.pl
*** texinfo-6.1/tp/t/results/coverage_braces/uref_url.pl	2016-01-22 07:49:29.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/uref_url.pl	2016-08-02 18:44:13.000000000 +0100
***************
*** 43,51 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 43,47 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 81,89 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 77,81 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 125,133 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 117,121 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 189,197 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 177,181 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 246,254 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 230,234 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 303,311 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 283,287 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 353,361 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 329,333 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 404,412 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 376,380 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 468,476 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 436,440 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
diff -Nrc2 texinfo-6.1/tp/t/results/coverage_braces/verb_in_xref.pl texinfo-6.3/tp/t/results/coverage_braces/verb_in_xref.pl
*** texinfo-6.1/tp/t/results/coverage_braces/verb_in_xref.pl	2016-01-22 07:49:30.000000000 +0000
--- texinfo-6.3/tp/t/results/coverage_braces/verb_in_xref.pl	2016-08-02 18:44:13.000000000 +0100
***************
*** 65,68 ****
--- 65,69 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 135,142 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 136,139 ----
***************
*** 186,189 ****
--- 183,187 ----
  $result_trees{'verb_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'verb_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'verb_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'verb_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
+ $result_trees{'verb_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'verb_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'verb_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'verb_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'verb_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'verb_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/def/all_commands.pl texinfo-6.3/tp/t/results/def/all_commands.pl
*** texinfo-6.1/tp/t/results/def/all_commands.pl	2016-01-22 07:49:48.000000000 +0000
--- texinfo-6.3/tp/t/results/def/all_commands.pl	2016-08-02 18:44:29.000000000 +0100
***************
*** 71,75 ****
                'index_at_command' => 'defvr',
                'index_name' => 'vr',
-               'index_prefix' => 'v',
                'index_type_command' => 'defvr',
                'key' => 'd--efvr_name',
--- 71,74 ----
***************
*** 248,252 ****
                'index_at_command' => 'deftypefn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deftypefn',
                'key' => 'd--eftypefn_name',
--- 247,250 ----
***************
*** 432,436 ****
                'content' => [
                  {},
-                 {},
                  {
                    'parent' => {
--- 430,433 ----
***************
*** 440,444 ****
                    'text' => ' on '
                  },
-                 {},
                  {}
                ],
--- 437,440 ----
***************
*** 453,457 ****
                'index_at_command' => 'deftypeop',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deftypeop',
                'key' => 'd--eftypeop_name on c--lass',
--- 449,452 ----
***************
*** 617,621 ****
                'index_at_command' => 'deftypevr',
                'index_name' => 'vr',
-               'index_prefix' => 'v',
                'index_type_command' => 'deftypevr',
                'key' => 'd--eftypevr_name',
--- 612,615 ----
***************
*** 781,785 ****
                'index_at_command' => 'defcv',
                'index_name' => 'vr',
-               'index_prefix' => 'v',
                'index_type_command' => 'defcv',
                'key' => 'd--efcv_name',
--- 775,778 ----
***************
*** 951,955 ****
                'content' => [
                  {},
-                 {},
                  {
                    'parent' => {
--- 944,947 ----
***************
*** 959,963 ****
                    'text' => ' on '
                  },
-                 {},
                  {}
                ],
--- 951,954 ----
***************
*** 972,976 ****
                'index_at_command' => 'defop',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'defop',
                'key' => 'd--efop_name on c--lass',
--- 963,966 ----
***************
*** 1135,1139 ****
                'index_at_command' => 'deftp',
                'index_name' => 'tp',
-               'index_prefix' => 't',
                'index_type_command' => 'deftp',
                'key' => 'd--eftp_name',
--- 1125,1128 ----
***************
*** 1298,1302 ****
                'index_at_command' => 'defun',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'defun',
                'key' => 'd--efun_name',
--- 1287,1290 ----
***************
*** 1461,1465 ****
                'index_at_command' => 'defmac',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'defmac',
                'key' => 'd--efmac_name',
--- 1449,1452 ----
***************
*** 1587,1591 ****
                      }
                    ],
-                   'parent' => undef,
                    'type' => 'bracketed_def_content'
                  }
--- 1574,1577 ----
***************
*** 1634,1638 ****
                'index_at_command' => 'defspec',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'defspec',
                'key' => 'd--efspec_name',
--- 1620,1623 ----
***************
*** 1784,1788 ****
                'index_at_command' => 'defvar',
                'index_name' => 'vr',
-               'index_prefix' => 'v',
                'index_type_command' => 'defvar',
                'key' => 'd--efvar_name',
--- 1769,1772 ----
***************
*** 1910,1914 ****
                      }
                    ],
-                   'parent' => undef,
                    'type' => 'bracketed_def_content'
                  }
--- 1894,1897 ----
***************
*** 1944,1948 ****
                'index_at_command' => 'defopt',
                'index_name' => 'vr',
-               'index_prefix' => 'v',
                'index_type_command' => 'defopt',
                'key' => 'd--efopt_name',
--- 1927,1930 ----
***************
*** 2121,2125 ****
                'index_at_command' => 'deftypefun',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deftypefun',
                'key' => 'd--eftypefun_name',
--- 2103,2106 ----
***************
*** 2285,2289 ****
                'index_at_command' => 'deftypevar',
                'index_name' => 'vr',
-               'index_prefix' => 'v',
                'index_type_command' => 'deftypevar',
                'key' => 'd--eftypevar_name',
--- 2266,2269 ----
***************
*** 2411,2415 ****
                      }
                    ],
-                   'parent' => undef,
                    'type' => 'bracketed_def_content'
                  }
--- 2391,2394 ----
***************
*** 2452,2456 ****
                'content' => [
                  {},
-                 {},
                  {
                    'parent' => {
--- 2431,2434 ----
***************
*** 2460,2464 ****
                    'text' => ' of '
                  },
-                 {},
                  {}
                ],
--- 2438,2441 ----
***************
*** 2473,2477 ****
                'index_at_command' => 'defivar',
                'index_name' => 'vr',
-               'index_prefix' => 'v',
                'index_type_command' => 'defivar',
                'key' => 'd--efivar_name of c--lass',
--- 2450,2453 ----
***************
*** 2599,2603 ****
                      }
                    ],
-                   'parent' => undef,
                    'type' => 'bracketed_def_content'
                  }
--- 2575,2578 ----
***************
*** 2654,2658 ****
                'content' => [
                  {},
-                 {},
                  {
                    'parent' => {
--- 2629,2632 ----
***************
*** 2662,2666 ****
                    'text' => ' of '
                  },
-                 {},
                  {}
                ],
--- 2636,2639 ----
***************
*** 2675,2679 ****
                'index_at_command' => 'deftypeivar',
                'index_name' => 'vr',
-               'index_prefix' => 'v',
                'index_type_command' => 'deftypeivar',
                'key' => 'd--eftypeivar_name of c--lass',
--- 2648,2651 ----
***************
*** 2845,2849 ****
                'content' => [
                  {},
-                 {},
                  {
                    'parent' => {
--- 2817,2820 ----
***************
*** 2853,2857 ****
                    'text' => ' on '
                  },
-                 {},
                  {}
                ],
--- 2824,2827 ----
***************
*** 2866,2870 ****
                'index_at_command' => 'defmethod',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'defmethod',
                'key' => 'd--efmethod_name on c--lass',
--- 2836,2839 ----
***************
*** 3050,3054 ****
                'content' => [
                  {},
-                 {},
                  {
                    'parent' => {
--- 3019,3022 ----
***************
*** 3058,3062 ****
                    'text' => ' on '
                  },
-                 {},
                  {}
                ],
--- 3026,3029 ----
***************
*** 3071,3075 ****
                'index_at_command' => 'deftypemethod',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deftypemethod',
                'key' => 'd--eftypemethod_name on c--lass',
--- 3038,3041 ----
***************
*** 3218,3223 ****
  $result_trees{'all_commands'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands'}{'contents'}[4]{'contents'}[0];
  $result_trees{'all_commands'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 3184,3189 ----
  $result_trees{'all_commands'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands'}{'contents'}[4]{'contents'}[0];
  $result_trees{'all_commands'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 3302,3307 ****
  $result_trees{'all_commands'}{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands'}{'contents'}[10]{'contents'}[0];
  $result_trees{'all_commands'}{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands'}{'contents'}[10]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'all_commands'}{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands'}{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands'}{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands'}{'contents'}[10]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands'}{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands'}{'contents'}[10]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'all_commands'}{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands'}{'contents'}[10]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 3268,3273 ----
  $result_trees{'all_commands'}{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands'}{'contents'}[10]{'contents'}[0];
  $result_trees{'all_commands'}{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands'}{'contents'}[10]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'all_commands'}{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands'}{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands'}{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands'}{'contents'}[10]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands'}{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands'}{'contents'}[10]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'all_commands'}{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands'}{'contents'}[10]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 3545,3550 ****
  $result_trees{'all_commands'}{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands'}{'contents'}[28]{'contents'}[0];
  $result_trees{'all_commands'}{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands'}{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'all_commands'}{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands'}{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands'}{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands'}{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands'}{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands'}{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'all_commands'}{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands'}{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 3511,3516 ----
  $result_trees{'all_commands'}{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands'}{'contents'}[28]{'contents'}[0];
  $result_trees{'all_commands'}{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands'}{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'all_commands'}{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands'}{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands'}{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands'}{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands'}{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands'}{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'all_commands'}{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands'}{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 3577,3582 ****
  $result_trees{'all_commands'}{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands'}{'contents'}[30]{'contents'}[0];
  $result_trees{'all_commands'}{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands'}{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands'}{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands'}{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands'}{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands'}{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands'}{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands'}{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands'}{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands'}{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 3543,3548 ----
  $result_trees{'all_commands'}{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands'}{'contents'}[30]{'contents'}[0];
  $result_trees{'all_commands'}{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands'}{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands'}{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands'}{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands'}{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands'}{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands'}{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands'}{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands'}{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands'}{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 3607,3612 ****
  $result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands'}{'contents'}[32]{'contents'}[0];
  $result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 3573,3578 ----
  $result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands'}{'contents'}[32]{'contents'}[0];
  $result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands'}{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 3638,3643 ****
  $result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands'}{'contents'}[34]{'contents'}[0];
  $result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 3604,3609 ----
  $result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands'}{'contents'}[34]{'contents'}[0];
  $result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[2][1];
diff -Nrc2 texinfo-6.1/tp/t/results/def/all_commands_delimiters.pl texinfo-6.3/tp/t/results/def/all_commands_delimiters.pl
*** texinfo-6.1/tp/t/results/def/all_commands_delimiters.pl	2016-01-22 07:49:49.000000000 +0000
--- texinfo-6.3/tp/t/results/def/all_commands_delimiters.pl	2016-08-02 18:44:29.000000000 +0100
***************
*** 237,241 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 237,240 ----
***************
*** 252,256 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 251,254 ----
***************
*** 369,373 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 367,370 ----
***************
*** 447,451 ****
                'index_at_command' => 'deffn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'forward--char',
--- 444,447 ----
***************
*** 689,693 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 685,688 ----
***************
*** 704,708 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 699,702 ----
***************
*** 821,825 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 815,818 ----
***************
*** 899,903 ****
                'index_at_command' => 'defvr',
                'index_name' => 'vr',
-               'index_prefix' => 'v',
                'index_type_command' => 'defvr',
                'key' => 'fill-column',
--- 892,895 ----
***************
*** 1055,1059 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 1047,1050 ----
***************
*** 1172,1176 ****
                'index_at_command' => 'deftypefn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deftypefn',
                'key' => 'foobar',
--- 1163,1166 ----
***************
*** 1440,1444 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 1430,1433 ----
***************
*** 1603,1607 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 1592,1595 ----
***************
*** 1647,1651 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 1635,1638 ----
***************
*** 1747,1751 ****
                'index_at_command' => 'deftypefn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deftypefn',
                'key' => 'foobar',
--- 1734,1737 ----
***************
*** 1874,1878 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 1860,1863 ----
***************
*** 1915,1919 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 1900,1903 ----
***************
*** 1937,1941 ****
                'index_at_command' => 'deftypefn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deftypefn',
                'key' => 'foobug',
--- 1921,1924 ----
***************
*** 2284,2288 ****
                'index_at_command' => 'deftypefn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deftypefn',
                'key' => 'push',
--- 2267,2270 ----
***************
*** 2481,2485 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 2463,2466 ----
***************
*** 2624,2628 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 2605,2608 ----
***************
*** 2703,2707 ****
                'index_at_command' => 'deftypevr',
                'index_name' => 'vr',
-               'index_prefix' => 'v',
                'index_type_command' => 'deftypevr',
                'key' => 'enable',
--- 2683,2686 ----
***************
*** 2900,2904 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 2879,2882 ----
***************
*** 3056,3060 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 3034,3037 ----
***************
*** 3134,3138 ****
                'index_at_command' => 'deftp',
                'index_name' => 'tp',
-               'index_prefix' => 't',
                'index_type_command' => 'deftp',
                'key' => 'pair',
--- 3111,3114 ----
***************
*** 3331,3335 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 3307,3310 ----
***************
*** 3474,3478 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 3449,3452 ----
***************
*** 3553,3557 ****
                'index_at_command' => 'defcv',
                'index_name' => 'vr',
-               'index_prefix' => 'v',
                'index_type_command' => 'defcv',
                'key' => 'border-pattern',
--- 3527,3530 ----
***************
*** 3772,3776 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 3745,3748 ----
***************
*** 3926,3930 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 3898,3901 ----
***************
*** 3999,4003 ****
                'content' => [
                  {},
-                 {},
                  {
                    'parent' => {
--- 3970,3973 ----
***************
*** 4007,4011 ****
                    'text' => ' of '
                  },
-                 {},
                  {}
                ],
--- 3977,3980 ----
***************
*** 4020,4024 ****
                'index_at_command' => 'deftypecv',
                'index_name' => 'vr',
-               'index_prefix' => 'v',
                'index_type_command' => 'deftypecv',
                'key' => 'border-pattern of Window',
--- 3989,3992 ----
***************
*** 4343,4347 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 4311,4314 ----
***************
*** 4415,4419 ****
                'content' => [
                  {},
-                 {},
                  {
                    'parent' => {
--- 4382,4385 ----
***************
*** 4423,4427 ****
                    'text' => ' on '
                  },
-                 {},
                  {}
                ],
--- 4389,4392 ----
***************
*** 4436,4440 ****
                'index_at_command' => 'defop',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'defop',
                'key' => 'expose on windows',
--- 4401,4404 ----
***************
*** 4800,4804 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 4764,4767 ----
***************
*** 4873,4877 ****
                'content' => [
                  {},
-                 {},
                  {
                    'parent' => {
--- 4836,4839 ----
***************
*** 4881,4885 ****
                    'text' => ' on '
                  },
-                 {},
                  {}
                ],
--- 4843,4846 ----
***************
*** 4894,4898 ****
                'index_at_command' => 'deftypeop',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deftypeop',
                'key' => 'expose on W,indow',
--- 4855,4858 ----
***************
*** 5094,5098 ****
                'content' => [
                  {},
-                 {},
                  {
                    'parent' => {
--- 5054,5057 ----
***************
*** 5102,5106 ****
                    'text' => ' on '
                  },
-                 {},
                  {}
                ],
--- 5061,5064 ----
***************
*** 5115,5119 ****
                'index_at_command' => 'deftypeop',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deftypeop',
                'key' => 'expose on Window',
--- 5073,5076 ----
***************
*** 5281,5285 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 5238,5241 ----
***************
*** 5307,5311 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 5263,5266 ----
***************
*** 5349,5353 ****
                'content' => [
                  {},
-                 {},
                  {
                    'parent' => {
--- 5304,5307 ----
***************
*** 5357,5361 ****
                    'text' => ' on '
                  },
-                 {},
                  {}
                ],
--- 5311,5314 ----
***************
*** 5370,5374 ****
                'index_at_command' => 'deftypeop',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deftypeop',
                'key' => 'e,xpose on W,indow',
--- 5323,5326 ----
***************
*** 5536,5540 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 5488,5491 ----
***************
*** 5562,5566 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 5513,5516 ----
***************
*** 5604,5608 ****
                'content' => [
                  {},
-                 {},
                  {
                    'parent' => {
--- 5554,5557 ----
***************
*** 5612,5616 ****
                    'text' => ' on '
                  },
-                 {},
                  {}
                ],
--- 5561,5564 ----
***************
*** 5625,5629 ****
                'index_at_command' => 'deftypeop',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deftypeop',
                'key' => ',expose on ,Window',
--- 5573,5576 ----
***************
*** 5825,5829 ****
                'content' => [
                  {},
-                 {},
                  {
                    'parent' => {
--- 5772,5775 ----
***************
*** 5833,5837 ****
                    'text' => ' on '
                  },
-                 {},
                  {}
                ],
--- 5779,5782 ----
***************
*** 5846,5850 ****
                'index_at_command' => 'deftypeop',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deftypeop',
                'key' => 'e,xpose on W,indow',
--- 5791,5794 ----
***************
*** 6046,6050 ****
                'content' => [
                  {},
-                 {},
                  {
                    'parent' => {
--- 5990,5993 ----
***************
*** 6054,6058 ****
                    'text' => ' on '
                  },
-                 {},
                  {}
                ],
--- 5997,6000 ----
***************
*** 6067,6071 ****
                'index_at_command' => 'deftypeop',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deftypeop',
                'key' => ',expose on ,Window',
--- 6009,6012 ----
***************
*** 6233,6237 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 6174,6177 ----
***************
*** 6259,6263 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 6199,6202 ----
***************
*** 6301,6305 ****
                'content' => [
                  {},
-                 {},
                  {
                    'parent' => {
--- 6240,6243 ----
***************
*** 6309,6313 ****
                    'text' => ' on '
                  },
-                 {},
                  {}
                ],
--- 6247,6250 ----
***************
*** 6322,6326 ****
                'index_at_command' => 'deftypeop',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deftypeop',
                'key' => 'e)xpose on W)indow',
--- 6259,6262 ----
***************
*** 6488,6492 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 6424,6427 ----
***************
*** 6514,6518 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 6449,6452 ----
***************
*** 6556,6560 ****
                'content' => [
                  {},
-                 {},
                  {
                    'parent' => {
--- 6490,6493 ----
***************
*** 6564,6568 ****
                    'text' => ' on '
                  },
-                 {},
                  {}
                ],
--- 6497,6500 ----
***************
*** 6577,6581 ****
                'index_at_command' => 'deftypeop',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deftypeop',
                'key' => ')expose on )Window',
--- 6509,6512 ----
***************
*** 6777,6781 ****
                'content' => [
                  {},
-                 {},
                  {
                    'parent' => {
--- 6708,6711 ----
***************
*** 6785,6789 ****
                    'text' => ' on '
                  },
-                 {},
                  {}
                ],
--- 6715,6718 ----
***************
*** 6798,6802 ****
                'index_at_command' => 'deftypeop',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deftypeop',
                'key' => 'e)xpose on W)indow',
--- 6727,6730 ----
***************
*** 6998,7002 ****
                'content' => [
                  {},
-                 {},
                  {
                    'parent' => {
--- 6926,6929 ----
***************
*** 7006,7010 ****
                    'text' => ' on '
                  },
-                 {},
                  {}
                ],
--- 6933,6936 ----
***************
*** 7019,7023 ****
                'index_at_command' => 'deftypeop',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deftypeop',
                'key' => ')expose on )Window',
--- 6945,6948 ----
***************
*** 7185,7189 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 7110,7113 ----
***************
*** 7211,7215 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 7135,7138 ----
***************
*** 7253,7257 ****
                'content' => [
                  {},
-                 {},
                  {
                    'parent' => {
--- 7176,7179 ----
***************
*** 7261,7265 ****
                    'text' => ' on '
                  },
-                 {},
                  {}
                ],
--- 7183,7186 ----
***************
*** 7274,7278 ****
                'index_at_command' => 'deftypeop',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deftypeop',
                'key' => 'e;xpose on W;indow',
--- 7195,7198 ----
***************
*** 7440,7444 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 7360,7363 ----
***************
*** 7466,7470 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 7385,7388 ----
***************
*** 7508,7512 ****
                'content' => [
                  {},
-                 {},
                  {
                    'parent' => {
--- 7426,7429 ----
***************
*** 7516,7520 ****
                    'text' => ' on '
                  },
-                 {},
                  {}
                ],
--- 7433,7436 ----
***************
*** 7529,7533 ****
                'index_at_command' => 'deftypeop',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deftypeop',
                'key' => ';expose on ;Window',
--- 7445,7448 ----
***************
*** 7729,7733 ****
                'content' => [
                  {},
-                 {},
                  {
                    'parent' => {
--- 7644,7647 ----
***************
*** 7737,7741 ****
                    'text' => ' on '
                  },
-                 {},
                  {}
                ],
--- 7651,7654 ----
***************
*** 7750,7754 ****
                'index_at_command' => 'deftypeop',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deftypeop',
                'key' => 'e;xpose on W;indow',
--- 7663,7666 ----
***************
*** 7950,7954 ****
                'content' => [
                  {},
-                 {},
                  {
                    'parent' => {
--- 7862,7865 ----
***************
*** 7958,7962 ****
                    'text' => ' on '
                  },
-                 {},
                  {}
                ],
--- 7869,7872 ----
***************
*** 7971,7975 ****
                'index_at_command' => 'deftypeop',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deftypeop',
                'key' => ';expose on ;Window',
--- 7881,7884 ----
***************
*** 8167,8171 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 8076,8079 ----
***************
*** 8214,8218 ****
                'content' => [
                  {},
-                 {},
                  {
                    'parent' => {
--- 8122,8125 ----
***************
*** 8222,8226 ****
                    'text' => ' on '
                  },
-                 {},
                  {}
                ],
--- 8129,8132 ----
***************
*** 8235,8239 ****
                'index_at_command' => 'deftypeop',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deftypeop',
                'key' => 'name on Windowint',
--- 8141,8144 ----
***************
*** 8403,8407 ****
                'index_at_command' => 'defun',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'defun',
                'key' => 'apply',
--- 8308,8311 ----
***************
*** 8642,8646 ****
                'index_at_command' => 'deffn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'A2',
--- 8546,8549 ----
***************
*** 8877,8881 ****
                'index_at_command' => 'deffn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'A2',
--- 8780,8783 ----
***************
*** 9112,9116 ****
                'index_at_command' => 'defvr',
                'index_name' => 'vr',
-               'index_prefix' => 'v',
                'index_type_command' => 'defvr',
                'key' => 'A2',
--- 9014,9017 ----
***************
*** 9347,9351 ****
                'index_at_command' => 'defvr',
                'index_name' => 'vr',
-               'index_prefix' => 'v',
                'index_type_command' => 'defvr',
                'key' => 'A2',
--- 9248,9251 ----
***************
*** 9616,9620 ****
                'index_at_command' => 'deftypefn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deftypefn',
                'key' => 'A3',
--- 9516,9519 ----
***************
*** 9885,9889 ****
                'index_at_command' => 'deftypefn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deftypefn',
                'key' => 'A3',
--- 9784,9787 ----
***************
*** 10154,10158 ****
                'index_at_command' => 'deftypevr',
                'index_name' => 'vr',
-               'index_prefix' => 'v',
                'index_type_command' => 'deftypevr',
                'key' => 'A3',
--- 10052,10055 ----
***************
*** 10423,10427 ****
                'index_at_command' => 'deftypevr',
                'index_name' => 'vr',
-               'index_prefix' => 'v',
                'index_type_command' => 'deftypevr',
                'key' => 'A3',
--- 10320,10323 ----
***************
*** 10658,10662 ****
                'index_at_command' => 'deftp',
                'index_name' => 'tp',
-               'index_prefix' => 't',
                'index_type_command' => 'deftp',
                'key' => 'A2',
--- 10554,10557 ----
***************
*** 10893,10897 ****
                'index_at_command' => 'deftp',
                'index_name' => 'tp',
-               'index_prefix' => 't',
                'index_type_command' => 'deftp',
                'key' => 'A2',
--- 10788,10791 ----
***************
*** 11162,11166 ****
                'index_at_command' => 'defcv',
                'index_name' => 'vr',
-               'index_prefix' => 'v',
                'index_type_command' => 'defcv',
                'key' => 'A3',
--- 11056,11059 ----
***************
*** 11430,11434 ****
                'index_at_command' => 'deftp',
                'index_name' => 'tp',
-               'index_prefix' => 't',
                'index_type_command' => 'deftp',
                'key' => 'A2',
--- 11323,11326 ----
***************
*** 11726,11730 ****
                'content' => [
                  {},
-                 {},
                  {
                    'parent' => {
--- 11618,11621 ----
***************
*** 11734,11738 ****
                    'text' => ' of '
                  },
-                 {},
                  {}
                ],
--- 11625,11628 ----
***************
*** 11747,11751 ****
                'index_at_command' => 'deftypecv',
                'index_name' => 'vr',
-               'index_prefix' => 'v',
                'index_type_command' => 'deftypecv',
                'key' => 'A4 of A2',
--- 11637,11640 ----
***************
*** 12043,12047 ****
                'content' => [
                  {},
-                 {},
                  {
                    'parent' => {
--- 11932,11935 ----
***************
*** 12051,12055 ****
                    'text' => ' of '
                  },
-                 {},
                  {}
                ],
--- 11939,11942 ----
***************
*** 12064,12068 ****
                'index_at_command' => 'deftypecv',
                'index_name' => 'vr',
-               'index_prefix' => 'v',
                'index_type_command' => 'deftypecv',
                'key' => 'A4 of A2',
--- 11951,11954 ----
***************
*** 12326,12330 ****
                'content' => [
                  {},
-                 {},
                  {
                    'parent' => {
--- 12212,12215 ----
***************
*** 12334,12338 ****
                    'text' => ' on '
                  },
-                 {},
                  {}
                ],
--- 12219,12222 ----
***************
*** 12347,12351 ****
                'index_at_command' => 'defop',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'defop',
                'key' => 'A3 on A2',
--- 12231,12234 ----
***************
*** 12609,12613 ****
                'content' => [
                  {},
-                 {},
                  {
                    'parent' => {
--- 12492,12495 ----
***************
*** 12617,12621 ****
                    'text' => ' on '
                  },
-                 {},
                  {}
                ],
--- 12499,12502 ----
***************
*** 12630,12634 ****
                'index_at_command' => 'defop',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'defop',
                'key' => 'A3 on A2',
--- 12511,12514 ----
***************
*** 12926,12930 ****
                'content' => [
                  {},
-                 {},
                  {
                    'parent' => {
--- 12806,12809 ----
***************
*** 12934,12938 ****
                    'text' => ' on '
                  },
-                 {},
                  {}
                ],
--- 12813,12816 ----
***************
*** 12947,12951 ****
                'index_at_command' => 'deftypeop',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deftypeop',
                'key' => 'A4 on A2',
--- 12825,12828 ----
***************
*** 13243,13247 ****
                'content' => [
                  {},
-                 {},
                  {
                    'parent' => {
--- 13120,13123 ----
***************
*** 13251,13255 ****
                    'text' => ' on '
                  },
-                 {},
                  {}
                ],
--- 13127,13130 ----
***************
*** 13264,13268 ****
                'index_at_command' => 'deftypeop',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deftypeop',
                'key' => 'A4 on A2',
--- 13139,13142 ----
***************
*** 13494,13498 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 13368,13371 ----
***************
*** 13509,13513 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 13382,13385 ----
***************
*** 13524,13528 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 13396,13399 ----
***************
*** 13590,13594 ****
                'index_at_command' => 'deftypefn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deftypefn',
                'key' => 'fun_name',
--- 13461,13464 ----
***************
*** 13820,13824 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 13690,13693 ----
***************
*** 13835,13839 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 13704,13707 ----
***************
*** 13850,13854 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 13718,13721 ----
***************
*** 13916,13920 ****
                'index_at_command' => 'deftypefn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deftypefn',
                'key' => 'fun_name1',
--- 13783,13786 ----
***************
*** 14021,14031 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[4][1] = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
  $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[8][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[8]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[8][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[21][1] = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[10];
  $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[24][1] = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[12];
  $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[26][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[14]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[26][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[29][1] = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[16];
  $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1];
--- 13887,13894 ----
***************
*** 14079,14089 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[2]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[2]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[2]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[19][1] = $result_trees{'all_commands_delimiters'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6];
  $result_trees{'all_commands_delimiters'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[22][1] = $result_trees{'all_commands_delimiters'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[8];
  $result_trees{'all_commands_delimiters'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[24][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[10]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[24][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[2]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[27][1] = $result_trees{'all_commands_delimiters'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[12];
  $result_trees{'all_commands_delimiters'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[0][1];
--- 13942,13949 ----
***************
*** 14124,14128 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[4]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[4]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[9][1] = $result_trees{'all_commands_delimiters'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[14][1] = $result_trees{'all_commands_delimiters'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[5];
--- 13984,13987 ----
***************
*** 14190,14202 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[6]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[6]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[9][1] = $result_trees{'all_commands_delimiters'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[14][1] = $result_trees{'all_commands_delimiters'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[5];
  $result_trees{'all_commands_delimiters'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[25][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[7]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[25][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[6]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[27][1] = $result_trees{'all_commands_delimiters'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[9];
  $result_trees{'all_commands_delimiters'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[30][1] = $result_trees{'all_commands_delimiters'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[11];
  $result_trees{'all_commands_delimiters'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[32][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[13]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[32][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[6]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[35][1] = $result_trees{'all_commands_delimiters'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[15];
  $result_trees{'all_commands_delimiters'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[42][1] = $result_trees{'all_commands_delimiters'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[17];
--- 14049,14058 ----
***************
*** 14234,14240 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[8]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[8]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[8]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[8]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[8]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[8]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[8]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters'}{'contents'}[8]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'all_commands_delimiters'}{'contents'}[8]{'contents'}[0]{'extra'}{'def_args'}[4][1];
--- 14090,14094 ----
***************
*** 14318,14326 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[12]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[12]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[12]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[12]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[12]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[12]{'contents'}[0]{'extra'}{'def_args'}[17][1] = $result_trees{'all_commands_delimiters'}{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters'}{'contents'}[12]{'contents'}[0]{'extra'}{'def_args'}[20][1] = $result_trees{'all_commands_delimiters'}{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[5];
  $result_trees{'all_commands_delimiters'}{'contents'}[12]{'contents'}[0]{'extra'}{'def_args'}[22][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[7]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[12]{'contents'}[0]{'extra'}{'def_args'}[22][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[12]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[12]{'contents'}[0]{'extra'}{'def_args'}[25][1] = $result_trees{'all_commands_delimiters'}{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[9];
  $result_trees{'all_commands_delimiters'}{'contents'}[12]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters'}{'contents'}[12]{'contents'}[0]{'extra'}{'def_args'}[0][1];
--- 14172,14178 ----
***************
*** 14370,14378 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[14]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[14]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[14]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[14]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[14]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[14]{'contents'}[0]{'extra'}{'def_args'}[19][1] = $result_trees{'all_commands_delimiters'}{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters'}{'contents'}[14]{'contents'}[0]{'extra'}{'def_args'}[22][1] = $result_trees{'all_commands_delimiters'}{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[5];
  $result_trees{'all_commands_delimiters'}{'contents'}[14]{'contents'}[0]{'extra'}{'def_args'}[24][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[7]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[14]{'contents'}[0]{'extra'}{'def_args'}[24][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[14]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[14]{'contents'}[0]{'extra'}{'def_args'}[27][1] = $result_trees{'all_commands_delimiters'}{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[9];
  $result_trees{'all_commands_delimiters'}{'contents'}[14]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters'}{'contents'}[14]{'contents'}[0]{'extra'}{'def_args'}[0][1];
--- 14222,14228 ----
***************
*** 14421,14429 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[16]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[16]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[16]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[16]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[16]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[16]{'contents'}[0]{'extra'}{'def_args'}[17][1] = $result_trees{'all_commands_delimiters'}{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters'}{'contents'}[16]{'contents'}[0]{'extra'}{'def_args'}[20][1] = $result_trees{'all_commands_delimiters'}{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[5];
  $result_trees{'all_commands_delimiters'}{'contents'}[16]{'contents'}[0]{'extra'}{'def_args'}[22][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[7]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[16]{'contents'}[0]{'extra'}{'def_args'}[22][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[16]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[16]{'contents'}[0]{'extra'}{'def_args'}[25][1] = $result_trees{'all_commands_delimiters'}{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[9];
  $result_trees{'all_commands_delimiters'}{'contents'}[16]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters'}{'contents'}[16]{'contents'}[0]{'extra'}{'def_args'}[0][1];
--- 14271,14277 ----
***************
*** 14478,14487 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[4][1] = $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[19][1] = $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[5];
  $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[22][1] = $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[7];
  $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[24][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[9]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[24][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[27][1] = $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[11];
  $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[0][1];
--- 14326,14333 ----
***************
*** 14491,14496 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14337,14342 ----
  $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 14535,14539 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[20][1] = $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[4];
  $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[22][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[22][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[25][1] = $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[8];
  $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[0][1];
--- 14381,14384 ----
***************
*** 14542,14547 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14387,14392 ----
  $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 14590,14594 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'extra'}{'def_args'}[22][1] = $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[6];
  $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'extra'}{'def_args'}[24][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[8]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'extra'}{'def_args'}[24][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'extra'}{'def_args'}[27][1] = $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[10];
  $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'extra'}{'def_args'}[0][1];
--- 14435,14438 ----
***************
*** 14598,14603 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14442,14447 ----
  $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[22]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 14632,14637 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[24]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[24]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters'}{'contents'}[24]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[24]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[24]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14476,14481 ----
  $result_trees{'all_commands_delimiters'}{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[24]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[24]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[24]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[24]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[24]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 14668,14675 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[4][1] = $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[4];
  $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'} = $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14512,14517 ----
***************
*** 14678,14683 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14520,14525 ----
  $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 14714,14721 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[4][1] = $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[4];
  $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'} = $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14556,14561 ----
***************
*** 14724,14729 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14564,14569 ----
  $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 14758,14763 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[30]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters'}{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14598,14603 ----
  $result_trees{'all_commands_delimiters'}{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[30]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 14792,14797 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[32]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters'}{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14632,14637 ----
  $result_trees{'all_commands_delimiters'}{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[32]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 14828,14835 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[4][1] = $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[4];
  $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'} = $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14668,14673 ----
***************
*** 14838,14843 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14676,14681 ----
  $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 14874,14881 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'extra'}{'def_args'}[4][1] = $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[4];
  $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'} = $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14712,14717 ----
***************
*** 14884,14889 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14720,14725 ----
  $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[36]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 14918,14923 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[38]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[38]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters'}{'contents'}[38]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[38]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[38]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14754,14759 ----
  $result_trees{'all_commands_delimiters'}{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[38]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[38]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[38]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[38]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[38]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 14952,14957 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[40]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[40]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters'}{'contents'}[40]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[40]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[40]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14788,14793 ----
  $result_trees{'all_commands_delimiters'}{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[40]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[40]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[40]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[40]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[40]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 14988,14995 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'extra'}{'def_args'}[4][1] = $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[4];
  $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'} = $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14824,14829 ----
***************
*** 14998,15003 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14832,14837 ----
  $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[42]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 15034,15041 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[4][1] = $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[4];
  $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'} = $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14868,14873 ----
***************
*** 15044,15049 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14876,14881 ----
  $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 15078,15083 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[46]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters'}{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14910,14915 ----
  $result_trees{'all_commands_delimiters'}{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[46]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 15112,15117 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[48]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[48]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters'}{'contents'}[48]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[48]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[48]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14944,14949 ----
  $result_trees{'all_commands_delimiters'}{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[48]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[48]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[48]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[48]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[48]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 15154,15158 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[1] = $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
  $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[4]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'contents'}[1] = $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[6];
  $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[0][1];
--- 14986,14989 ----
***************
*** 15162,15167 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14993,14998 ----
  $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 15841,15846 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[78]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[7];
! $result_trees{'all_commands_delimiters'}{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters'}{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters'}{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[7];
  $result_trees{'all_commands_delimiters'}{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[3];
--- 15672,15677 ----
  $result_trees{'all_commands_delimiters'}{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[78]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[7];
! $result_trees{'all_commands_delimiters'}{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters'}{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[7];
  $result_trees{'all_commands_delimiters'}{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[3];
***************
*** 15904,15909 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[80]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[7];
! $result_trees{'all_commands_delimiters'}{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters'}{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters'}{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[7];
  $result_trees{'all_commands_delimiters'}{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[3];
--- 15735,15740 ----
  $result_trees{'all_commands_delimiters'}{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[80]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[7];
! $result_trees{'all_commands_delimiters'}{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters'}{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[7];
  $result_trees{'all_commands_delimiters'}{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[3];
***************
*** 15960,15965 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[82]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[5];
! $result_trees{'all_commands_delimiters'}{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters'}{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters'}{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[5];
  $result_trees{'all_commands_delimiters'}{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[3];
--- 15791,15796 ----
  $result_trees{'all_commands_delimiters'}{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[82]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[5];
! $result_trees{'all_commands_delimiters'}{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters'}{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[5];
  $result_trees{'all_commands_delimiters'}{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[3];
***************
*** 16016,16021 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[84]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[5];
! $result_trees{'all_commands_delimiters'}{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters'}{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters'}{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[5];
  $result_trees{'all_commands_delimiters'}{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[3];
--- 15847,15852 ----
  $result_trees{'all_commands_delimiters'}{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[84]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[5];
! $result_trees{'all_commands_delimiters'}{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters'}{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[5];
  $result_trees{'all_commands_delimiters'}{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[3];
***************
*** 16079,16084 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[86]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[7];
! $result_trees{'all_commands_delimiters'}{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters'}{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters'}{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[7];
  $result_trees{'all_commands_delimiters'}{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[3];
--- 15910,15915 ----
  $result_trees{'all_commands_delimiters'}{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[86]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[7];
! $result_trees{'all_commands_delimiters'}{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters'}{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[7];
  $result_trees{'all_commands_delimiters'}{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[3];
***************
*** 16142,16147 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[88]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[7];
! $result_trees{'all_commands_delimiters'}{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters'}{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters'}{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[7];
  $result_trees{'all_commands_delimiters'}{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[3];
--- 15973,15978 ----
  $result_trees{'all_commands_delimiters'}{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters'}{'contents'}[88]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[7];
! $result_trees{'all_commands_delimiters'}{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters'}{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters'}{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters'}{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[7];
  $result_trees{'all_commands_delimiters'}{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters'}{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[3];
***************
*** 16196,16204 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[90]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[90]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[90]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[90]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[90]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[90]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[90]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[90]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[90]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[90]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[90]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[90]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[90]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[90]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[90]{'contents'}[0]{'extra'}{'def_args'}[6][1] = $result_trees{'all_commands_delimiters'}{'contents'}[90]{'contents'}[0]{'args'}[0]{'contents'}[7];
  $result_trees{'all_commands_delimiters'}{'contents'}[90]{'contents'}[0]{'extra'}{'def_args'}[8][1] = $result_trees{'all_commands_delimiters'}{'contents'}[90]{'contents'}[0]{'args'}[0]{'contents'}[9];
--- 16027,16032 ----
***************
*** 16261,16269 ****
  $result_trees{'all_commands_delimiters'}{'contents'}[92]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[92]{'contents'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[92]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[92]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[92]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[92]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[92]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[92]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[92]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[92]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[92]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'contents'} = $result_trees{'all_commands_delimiters'}{'contents'}[92]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'};
- $result_trees{'all_commands_delimiters'}{'contents'}[92]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'parent'} = $result_trees{'all_commands_delimiters'}{'contents'}[92]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters'}{'contents'}[92]{'contents'}[0]{'extra'}{'def_args'}[6][1] = $result_trees{'all_commands_delimiters'}{'contents'}[92]{'contents'}[0]{'args'}[0]{'contents'}[7];
  $result_trees{'all_commands_delimiters'}{'contents'}[92]{'contents'}[0]{'extra'}{'def_args'}[8][1] = $result_trees{'all_commands_delimiters'}{'contents'}[92]{'contents'}[0]{'args'}[0]{'contents'}[9];
--- 16089,16094 ----
diff -Nrc2 texinfo-6.1/tp/t/results/def/all_commands_delimiters_printindex.pl texinfo-6.3/tp/t/results/def/all_commands_delimiters_printindex.pl
*** texinfo-6.1/tp/t/results/def/all_commands_delimiters_printindex.pl	2016-01-22 07:49:50.000000000 +0000
--- texinfo-6.3/tp/t/results/def/all_commands_delimiters_printindex.pl	2016-08-02 18:44:30.000000000 +0100
***************
*** 271,275 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 271,274 ----
***************
*** 286,290 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 285,288 ----
***************
*** 403,407 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 401,404 ----
***************
*** 481,485 ****
                    'index_at_command' => 'deffn',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deffn',
                    'key' => 'forward--char',
--- 478,481 ----
***************
*** 724,728 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 720,723 ----
***************
*** 739,743 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 734,737 ----
***************
*** 856,860 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 850,853 ----
***************
*** 934,938 ****
                    'index_at_command' => 'defvr',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'defvr',
                    'key' => 'fill-column',
--- 927,930 ----
***************
*** 1091,1095 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 1083,1086 ----
***************
*** 1208,1212 ****
                    'index_at_command' => 'deftypefn',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deftypefn',
                    'key' => 'foobar',
--- 1199,1202 ----
***************
*** 1477,1481 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 1467,1470 ----
***************
*** 1640,1644 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 1629,1632 ----
***************
*** 1684,1688 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 1672,1675 ----
***************
*** 1784,1788 ****
                    'index_at_command' => 'deftypefn',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deftypefn',
                    'key' => 'foobar',
--- 1771,1774 ----
***************
*** 1912,1916 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 1898,1901 ----
***************
*** 1953,1957 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 1938,1941 ----
***************
*** 1975,1979 ****
                    'index_at_command' => 'deftypefn',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deftypefn',
                    'key' => 'foobug',
--- 1959,1962 ----
***************
*** 2323,2327 ****
                    'index_at_command' => 'deftypefn',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deftypefn',
                    'key' => 'push',
--- 2306,2309 ----
***************
*** 2521,2525 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 2503,2506 ----
***************
*** 2664,2668 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 2645,2648 ----
***************
*** 2743,2747 ****
                    'index_at_command' => 'deftypevr',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'deftypevr',
                    'key' => 'enable',
--- 2723,2726 ----
***************
*** 2941,2945 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 2920,2923 ----
***************
*** 3097,3101 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 3075,3078 ----
***************
*** 3175,3179 ****
                    'index_at_command' => 'deftp',
                    'index_name' => 'tp',
-                   'index_prefix' => 't',
                    'index_type_command' => 'deftp',
                    'key' => 'pair',
--- 3152,3155 ----
***************
*** 3373,3377 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 3349,3352 ----
***************
*** 3516,3520 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 3491,3494 ----
***************
*** 3595,3599 ****
                    'index_at_command' => 'defcv',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'defcv',
                    'key' => 'border-pattern',
--- 3569,3572 ----
***************
*** 3815,3819 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 3788,3791 ----
***************
*** 3969,3973 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 3941,3944 ----
***************
*** 4042,4046 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 4013,4016 ----
***************
*** 4050,4054 ****
                        'text' => ' of '
                      },
-                     {},
                      {}
                    ],
--- 4020,4023 ----
***************
*** 4063,4067 ****
                    'index_at_command' => 'deftypecv',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'deftypecv',
                    'key' => 'border-pattern of Window',
--- 4032,4035 ----
***************
*** 4387,4391 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 4355,4358 ----
***************
*** 4459,4463 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 4426,4429 ----
***************
*** 4467,4471 ****
                        'text' => ' on '
                      },
-                     {},
                      {}
                    ],
--- 4433,4436 ----
***************
*** 4480,4484 ****
                    'index_at_command' => 'defop',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'defop',
                    'key' => 'expose on windows',
--- 4445,4448 ----
***************
*** 4845,4849 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 4809,4812 ----
***************
*** 4918,4922 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 4881,4884 ----
***************
*** 4926,4930 ****
                        'text' => ' on '
                      },
-                     {},
                      {}
                    ],
--- 4888,4891 ----
***************
*** 4939,4943 ****
                    'index_at_command' => 'deftypeop',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deftypeop',
                    'key' => 'expose on W,indow',
--- 4900,4903 ----
***************
*** 5140,5144 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 5100,5103 ----
***************
*** 5148,5152 ****
                        'text' => ' on '
                      },
-                     {},
                      {}
                    ],
--- 5107,5110 ----
***************
*** 5161,5165 ****
                    'index_at_command' => 'deftypeop',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deftypeop',
                    'key' => 'expose on Window',
--- 5119,5122 ----
***************
*** 5328,5332 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 5285,5288 ----
***************
*** 5354,5358 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 5310,5313 ----
***************
*** 5396,5400 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 5351,5354 ----
***************
*** 5404,5408 ****
                        'text' => ' on '
                      },
-                     {},
                      {}
                    ],
--- 5358,5361 ----
***************
*** 5417,5421 ****
                    'index_at_command' => 'deftypeop',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deftypeop',
                    'key' => 'e,xpose on W,indow',
--- 5370,5373 ----
***************
*** 5584,5588 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 5536,5539 ----
***************
*** 5610,5614 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 5561,5564 ----
***************
*** 5652,5656 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 5602,5605 ----
***************
*** 5660,5664 ****
                        'text' => ' on '
                      },
-                     {},
                      {}
                    ],
--- 5609,5612 ----
***************
*** 5673,5677 ****
                    'index_at_command' => 'deftypeop',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deftypeop',
                    'key' => ',expose on ,Window',
--- 5621,5624 ----
***************
*** 5874,5878 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 5821,5824 ----
***************
*** 5882,5886 ****
                        'text' => ' on '
                      },
-                     {},
                      {}
                    ],
--- 5828,5831 ----
***************
*** 5895,5899 ****
                    'index_at_command' => 'deftypeop',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deftypeop',
                    'key' => 'e,xpose on W,indow',
--- 5840,5843 ----
***************
*** 6096,6100 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 6040,6043 ----
***************
*** 6104,6108 ****
                        'text' => ' on '
                      },
-                     {},
                      {}
                    ],
--- 6047,6050 ----
***************
*** 6117,6121 ****
                    'index_at_command' => 'deftypeop',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deftypeop',
                    'key' => ',expose on ,Window',
--- 6059,6062 ----
***************
*** 6284,6288 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 6225,6228 ----
***************
*** 6310,6314 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 6250,6253 ----
***************
*** 6352,6356 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 6291,6294 ----
***************
*** 6360,6364 ****
                        'text' => ' on '
                      },
-                     {},
                      {}
                    ],
--- 6298,6301 ----
***************
*** 6373,6377 ****
                    'index_at_command' => 'deftypeop',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deftypeop',
                    'key' => 'e)xpose on W)indow',
--- 6310,6313 ----
***************
*** 6540,6544 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 6476,6479 ----
***************
*** 6566,6570 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 6501,6504 ----
***************
*** 6608,6612 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 6542,6545 ----
***************
*** 6616,6620 ****
                        'text' => ' on '
                      },
-                     {},
                      {}
                    ],
--- 6549,6552 ----
***************
*** 6629,6633 ****
                    'index_at_command' => 'deftypeop',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deftypeop',
                    'key' => ')expose on )Window',
--- 6561,6564 ----
***************
*** 6830,6834 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 6761,6764 ----
***************
*** 6838,6842 ****
                        'text' => ' on '
                      },
-                     {},
                      {}
                    ],
--- 6768,6771 ----
***************
*** 6851,6855 ****
                    'index_at_command' => 'deftypeop',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deftypeop',
                    'key' => 'e)xpose on W)indow',
--- 6780,6783 ----
***************
*** 7052,7056 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 6980,6983 ----
***************
*** 7060,7064 ****
                        'text' => ' on '
                      },
-                     {},
                      {}
                    ],
--- 6987,6990 ----
***************
*** 7073,7077 ****
                    'index_at_command' => 'deftypeop',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deftypeop',
                    'key' => ')expose on )Window',
--- 6999,7002 ----
***************
*** 7240,7244 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 7165,7168 ----
***************
*** 7266,7270 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 7190,7193 ----
***************
*** 7308,7312 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 7231,7234 ----
***************
*** 7316,7320 ****
                        'text' => ' on '
                      },
-                     {},
                      {}
                    ],
--- 7238,7241 ----
***************
*** 7329,7333 ****
                    'index_at_command' => 'deftypeop',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deftypeop',
                    'key' => 'e;xpose on W;indow',
--- 7250,7253 ----
***************
*** 7496,7500 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 7416,7419 ----
***************
*** 7522,7526 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 7441,7444 ----
***************
*** 7564,7568 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 7482,7485 ----
***************
*** 7572,7576 ****
                        'text' => ' on '
                      },
-                     {},
                      {}
                    ],
--- 7489,7492 ----
***************
*** 7585,7589 ****
                    'index_at_command' => 'deftypeop',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deftypeop',
                    'key' => ';expose on ;Window',
--- 7501,7504 ----
***************
*** 7786,7790 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 7701,7704 ----
***************
*** 7794,7798 ****
                        'text' => ' on '
                      },
-                     {},
                      {}
                    ],
--- 7708,7711 ----
***************
*** 7807,7811 ****
                    'index_at_command' => 'deftypeop',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deftypeop',
                    'key' => 'e;xpose on W;indow',
--- 7720,7723 ----
***************
*** 8008,8012 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 7920,7923 ----
***************
*** 8016,8020 ****
                        'text' => ' on '
                      },
-                     {},
                      {}
                    ],
--- 7927,7930 ----
***************
*** 8029,8033 ****
                    'index_at_command' => 'deftypeop',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deftypeop',
                    'key' => ';expose on ;Window',
--- 7939,7942 ----
***************
*** 8226,8230 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 8135,8138 ----
***************
*** 8273,8277 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 8181,8184 ----
***************
*** 8281,8285 ****
                        'text' => ' on '
                      },
-                     {},
                      {}
                    ],
--- 8188,8191 ----
***************
*** 8294,8298 ****
                    'index_at_command' => 'deftypeop',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deftypeop',
                    'key' => 'name on Windowint',
--- 8200,8203 ----
***************
*** 8463,8467 ****
                    'index_at_command' => 'defun',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'defun',
                    'key' => 'apply',
--- 8368,8371 ----
***************
*** 8703,8707 ****
                    'index_at_command' => 'deffn',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deffn',
                    'key' => 'A2',
--- 8607,8610 ----
***************
*** 8939,8943 ****
                    'index_at_command' => 'deffn',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deffn',
                    'key' => 'A2',
--- 8842,8845 ----
***************
*** 9175,9179 ****
                    'index_at_command' => 'defvr',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'defvr',
                    'key' => 'A2',
--- 9077,9080 ----
***************
*** 9411,9415 ****
                    'index_at_command' => 'defvr',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'defvr',
                    'key' => 'A2',
--- 9312,9315 ----
***************
*** 9681,9685 ****
                    'index_at_command' => 'deftypefn',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deftypefn',
                    'key' => 'A3',
--- 9581,9584 ----
***************
*** 9951,9955 ****
                    'index_at_command' => 'deftypefn',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deftypefn',
                    'key' => 'A3',
--- 9850,9853 ----
***************
*** 10221,10225 ****
                    'index_at_command' => 'deftypevr',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'deftypevr',
                    'key' => 'A3',
--- 10119,10122 ----
***************
*** 10491,10495 ****
                    'index_at_command' => 'deftypevr',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'deftypevr',
                    'key' => 'A3',
--- 10388,10391 ----
***************
*** 10727,10731 ****
                    'index_at_command' => 'deftp',
                    'index_name' => 'tp',
-                   'index_prefix' => 't',
                    'index_type_command' => 'deftp',
                    'key' => 'A2',
--- 10623,10626 ----
***************
*** 10963,10967 ****
                    'index_at_command' => 'deftp',
                    'index_name' => 'tp',
-                   'index_prefix' => 't',
                    'index_type_command' => 'deftp',
                    'key' => 'A2',
--- 10858,10861 ----
***************
*** 11233,11237 ****
                    'index_at_command' => 'defcv',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'defcv',
                    'key' => 'A3',
--- 11127,11130 ----
***************
*** 11502,11506 ****
                    'index_at_command' => 'deftp',
                    'index_name' => 'tp',
-                   'index_prefix' => 't',
                    'index_type_command' => 'deftp',
                    'key' => 'A2',
--- 11395,11398 ----
***************
*** 11799,11803 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 11691,11694 ----
***************
*** 11807,11811 ****
                        'text' => ' of '
                      },
-                     {},
                      {}
                    ],
--- 11698,11701 ----
***************
*** 11820,11824 ****
                    'index_at_command' => 'deftypecv',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'deftypecv',
                    'key' => 'A4 of A2',
--- 11710,11713 ----
***************
*** 12117,12121 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 12006,12009 ----
***************
*** 12125,12129 ****
                        'text' => ' of '
                      },
-                     {},
                      {}
                    ],
--- 12013,12016 ----
***************
*** 12138,12142 ****
                    'index_at_command' => 'deftypecv',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'deftypecv',
                    'key' => 'A4 of A2',
--- 12025,12028 ----
***************
*** 12401,12405 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 12287,12290 ----
***************
*** 12409,12413 ****
                        'text' => ' on '
                      },
-                     {},
                      {}
                    ],
--- 12294,12297 ----
***************
*** 12422,12426 ****
                    'index_at_command' => 'defop',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'defop',
                    'key' => 'A3 on A2',
--- 12306,12309 ----
***************
*** 12685,12689 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 12568,12571 ----
***************
*** 12693,12697 ****
                        'text' => ' on '
                      },
-                     {},
                      {}
                    ],
--- 12575,12578 ----
***************
*** 12706,12710 ****
                    'index_at_command' => 'defop',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'defop',
                    'key' => 'A3 on A2',
--- 12587,12590 ----
***************
*** 13003,13007 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 12883,12886 ----
***************
*** 13011,13015 ****
                        'text' => ' on '
                      },
-                     {},
                      {}
                    ],
--- 12890,12893 ----
***************
*** 13024,13028 ****
                    'index_at_command' => 'deftypeop',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deftypeop',
                    'key' => 'A4 on A2',
--- 12902,12905 ----
***************
*** 13321,13325 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 13198,13201 ----
***************
*** 13329,13333 ****
                        'text' => ' on '
                      },
-                     {},
                      {}
                    ],
--- 13205,13208 ----
***************
*** 13342,13346 ****
                    'index_at_command' => 'deftypeop',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deftypeop',
                    'key' => 'A4 on A2',
--- 13217,13220 ----
***************
*** 13573,13577 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 13447,13450 ----
***************
*** 13588,13592 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 13461,13464 ----
***************
*** 13603,13607 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 13475,13478 ----
***************
*** 13669,13673 ****
                    'index_at_command' => 'deftypefn',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deftypefn',
                    'key' => 'fun_name',
--- 13540,13543 ----
***************
*** 13900,13904 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 13770,13773 ----
***************
*** 13915,13919 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 13784,13787 ----
***************
*** 13930,13934 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 13798,13801 ----
***************
*** 13996,14000 ****
                    'index_at_command' => 'deftypefn',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deftypefn',
                    'key' => 'fun_name1',
--- 13863,13866 ----
***************
*** 14396,14406 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[4][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[8][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[8]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[8][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[21][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[10];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[24][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[12];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[26][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[14]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[26][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[29][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[16];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1];
--- 14262,14269 ----
***************
*** 14455,14465 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[19][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[22][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[8];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[24][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[10]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[24][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[27][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[12];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[0][1];
--- 14318,14325 ----
***************
*** 14501,14505 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[9][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[14][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[5];
--- 14361,14364 ----
***************
*** 14568,14580 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[9][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[14][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[5];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[25][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[7]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[25][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[27][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[9];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[30][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[11];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[32][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[13]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[32][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[35][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[15];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[42][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[17];
--- 14427,14436 ----
***************
*** 14613,14619 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'def_args'}[4][1];
--- 14469,14473 ----
***************
*** 14699,14707 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'def_args'}[17][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'def_args'}[20][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[5];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'def_args'}[22][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[7]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'def_args'}[22][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'def_args'}[25][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[9];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'def_args'}[0][1];
--- 14553,14559 ----
***************
*** 14752,14760 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'def_args'}[19][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'def_args'}[22][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[5];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'def_args'}[24][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[7]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'def_args'}[24][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'def_args'}[27][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[9];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'def_args'}[0][1];
--- 14604,14610 ----
***************
*** 14804,14812 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'def_args'}[17][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'def_args'}[20][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[5];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'def_args'}[22][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[7]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'def_args'}[22][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'def_args'}[25][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[9];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'def_args'}[0][1];
--- 14654,14660 ----
***************
*** 14862,14871 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[4][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[19][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[5];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[22][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[7];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[24][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[9]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[24][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[27][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[11];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[0][1];
--- 14710,14717 ----
***************
*** 14875,14880 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14721,14726 ----
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 14920,14924 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[20][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[4];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[22][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[22][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[25][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[8];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[0][1];
--- 14766,14769 ----
***************
*** 14927,14932 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14772,14777 ----
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 14976,14980 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'def_args'}[22][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[6];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'def_args'}[24][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[8]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'def_args'}[24][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'def_args'}[27][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[10];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'def_args'}[0][1];
--- 14821,14824 ----
***************
*** 14984,14989 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14828,14833 ----
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 15019,15024 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14863,14868 ----
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 15056,15063 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[4][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[4];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14900,14905 ----
***************
*** 15066,15071 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14908,14913 ----
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 15103,15110 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[4][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[4];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14945,14950 ----
***************
*** 15113,15118 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14953,14958 ----
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 15148,15153 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 14988,14993 ----
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 15183,15188 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 15023,15028 ----
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 15220,15227 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[4][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[4];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 15060,15065 ----
***************
*** 15230,15235 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 15068,15073 ----
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 15267,15274 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'def_args'}[4][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[4];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 15105,15110 ----
***************
*** 15277,15282 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 15113,15118 ----
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 15312,15317 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 15148,15153 ----
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 15347,15352 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 15183,15188 ----
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 15384,15391 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'def_args'}[4][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[4];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 15220,15225 ----
***************
*** 15394,15399 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 15228,15233 ----
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 15431,15438 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[4][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[4];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 15265,15270 ----
***************
*** 15441,15446 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 15273,15278 ----
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 15476,15481 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 15308,15313 ----
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 15511,15516 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 15343,15348 ----
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 15554,15558 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[4]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'contents'}[1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[6];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[0][1];
--- 15386,15389 ----
***************
*** 15562,15567 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 15393,15398 ----
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 16255,16260 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[7];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[7];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[3];
--- 16086,16091 ----
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[7];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[7];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[3];
***************
*** 16319,16324 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[7];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[7];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[3];
--- 16150,16155 ----
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[7];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[7];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[3];
***************
*** 16376,16381 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[5];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[5];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[3];
--- 16207,16212 ----
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[5];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[5];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[3];
***************
*** 16433,16438 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[5];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[5];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[3];
--- 16264,16269 ----
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[5];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[5];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[3];
***************
*** 16497,16502 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[7];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[7];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[3];
--- 16328,16333 ----
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[7];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[7];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[3];
***************
*** 16561,16566 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[7];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[7];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[3];
--- 16392,16397 ----
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[7];
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[7];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[3];
***************
*** 16616,16624 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'extra'}{'def_args'}[6][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'args'}[0]{'contents'}[7];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'extra'}{'def_args'}[8][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'args'}[0]{'contents'}[9];
--- 16447,16452 ----
***************
*** 16682,16690 ****
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'contents'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'};
- $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'parent'} = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'args'}[0];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'extra'}{'def_args'}[6][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'args'}[0]{'contents'}[7];
  $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'extra'}{'def_args'}[8][1] = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'args'}[0]{'contents'}[9];
--- 16510,16515 ----
diff -Nrc2 texinfo-6.1/tp/t/results/def/all_commands_printindex.pl texinfo-6.3/tp/t/results/def/all_commands_printindex.pl
*** texinfo-6.1/tp/t/results/def/all_commands_printindex.pl	2016-01-22 07:49:50.000000000 +0000
--- texinfo-6.3/tp/t/results/def/all_commands_printindex.pl	2016-08-02 18:44:29.000000000 +0100
***************
*** 105,109 ****
                    'index_at_command' => 'defvr',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'defvr',
                    'key' => 'd--efvr_name',
--- 105,108 ----
***************
*** 283,287 ****
                    'index_at_command' => 'deftypefn',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deftypefn',
                    'key' => 'd--eftypefn_name',
--- 282,285 ----
***************
*** 468,472 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 466,469 ----
***************
*** 476,480 ****
                        'text' => ' on '
                      },
-                     {},
                      {}
                    ],
--- 473,476 ----
***************
*** 489,493 ****
                    'index_at_command' => 'deftypeop',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deftypeop',
                    'key' => 'd--eftypeop_name on c--lass',
--- 485,488 ----
***************
*** 654,658 ****
                    'index_at_command' => 'deftypevr',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'deftypevr',
                    'key' => 'd--eftypevr_name',
--- 649,652 ----
***************
*** 819,823 ****
                    'index_at_command' => 'defcv',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'defcv',
                    'key' => 'd--efcv_name',
--- 813,816 ----
***************
*** 990,994 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 983,986 ----
***************
*** 998,1002 ****
                        'text' => ' on '
                      },
-                     {},
                      {}
                    ],
--- 990,993 ----
***************
*** 1011,1015 ****
                    'index_at_command' => 'defop',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'defop',
                    'key' => 'd--efop_name on c--lass',
--- 1002,1005 ----
***************
*** 1175,1179 ****
                    'index_at_command' => 'deftp',
                    'index_name' => 'tp',
-                   'index_prefix' => 't',
                    'index_type_command' => 'deftp',
                    'key' => 'd--eftp_name',
--- 1165,1168 ----
***************
*** 1339,1343 ****
                    'index_at_command' => 'defun',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'defun',
                    'key' => 'd--efun_name',
--- 1328,1331 ----
***************
*** 1503,1507 ****
                    'index_at_command' => 'defmac',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'defmac',
                    'key' => 'd--efmac_name',
--- 1491,1494 ----
***************
*** 1630,1634 ****
                          }
                        ],
-                       'parent' => undef,
                        'type' => 'bracketed_def_content'
                      }
--- 1617,1620 ----
***************
*** 1677,1681 ****
                    'index_at_command' => 'defspec',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'defspec',
                    'key' => 'd--efspec_name',
--- 1663,1666 ----
***************
*** 1828,1832 ****
                    'index_at_command' => 'defvar',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'defvar',
                    'key' => 'd--efvar_name',
--- 1813,1816 ----
***************
*** 1955,1959 ****
                          }
                        ],
-                       'parent' => undef,
                        'type' => 'bracketed_def_content'
                      }
--- 1939,1942 ----
***************
*** 1989,1993 ****
                    'index_at_command' => 'defopt',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'defopt',
                    'key' => 'd--efopt_name',
--- 1972,1975 ----
***************
*** 2167,2171 ****
                    'index_at_command' => 'deftypefun',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deftypefun',
                    'key' => 'd--eftypefun_name',
--- 2149,2152 ----
***************
*** 2332,2336 ****
                    'index_at_command' => 'deftypevar',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'deftypevar',
                    'key' => 'd--eftypevar_name',
--- 2313,2316 ----
***************
*** 2459,2463 ****
                          }
                        ],
-                       'parent' => undef,
                        'type' => 'bracketed_def_content'
                      }
--- 2439,2442 ----
***************
*** 2500,2504 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 2479,2482 ----
***************
*** 2508,2512 ****
                        'text' => ' of '
                      },
-                     {},
                      {}
                    ],
--- 2486,2489 ----
***************
*** 2521,2525 ****
                    'index_at_command' => 'defivar',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'defivar',
                    'key' => 'd--efivar_name of c--lass',
--- 2498,2501 ----
***************
*** 2648,2652 ****
                          }
                        ],
-                       'parent' => undef,
                        'type' => 'bracketed_def_content'
                      }
--- 2624,2627 ----
***************
*** 2703,2707 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 2678,2681 ----
***************
*** 2711,2715 ****
                        'text' => ' of '
                      },
-                     {},
                      {}
                    ],
--- 2685,2688 ----
***************
*** 2724,2728 ****
                    'index_at_command' => 'deftypeivar',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'deftypeivar',
                    'key' => 'd--eftypeivar_name of c--lass',
--- 2697,2700 ----
***************
*** 2895,2899 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 2867,2870 ----
***************
*** 2903,2907 ****
                        'text' => ' on '
                      },
-                     {},
                      {}
                    ],
--- 2874,2877 ----
***************
*** 2916,2920 ****
                    'index_at_command' => 'defmethod',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'defmethod',
                    'key' => 'd--efmethod_name on c--lass',
--- 2886,2889 ----
***************
*** 3101,3105 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 3070,3073 ----
***************
*** 3109,3113 ****
                        'text' => ' on '
                      },
-                     {},
                      {}
                    ],
--- 3077,3080 ----
***************
*** 3122,3126 ****
                    'index_at_command' => 'deftypemethod',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deftypemethod',
                    'key' => 'd--eftypemethod_name on c--lass',
--- 3089,3092 ----
***************
*** 3566,3571 ****
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 3532,3537 ----
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 3653,3658 ****
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 3619,3624 ----
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 3905,3910 ****
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 3871,3876 ----
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 3938,3943 ****
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 3904,3909 ----
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 3969,3974 ****
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 3935,3940 ----
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 4001,4006 ****
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 3967,3972 ----
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_args'}[2][1];
diff -Nrc2 texinfo-6.1/tp/t/results/def/def_defx_mismatch.pl texinfo-6.3/tp/t/results/def/def_defx_mismatch.pl
*** texinfo-6.1/tp/t/results/def/def_defx_mismatch.pl	2016-01-22 07:49:49.000000000 +0000
--- texinfo-6.3/tp/t/results/def/def_defx_mismatch.pl	2016-08-02 18:44:29.000000000 +0100
***************
*** 74,77 ****
--- 74,78 ----
                    'cmdname' => 'dots',
                    'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 105,109 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 106,109 ----
***************
*** 161,165 ****
                'index_at_command' => 'defun',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'defun',
                'key' => 'my def',
--- 161,164 ----
***************
*** 231,235 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 230,233 ----
***************
*** 246,250 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 244,247 ----
***************
*** 319,323 ****
                'index_at_command' => 'deffnx',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'name',
--- 316,319 ----
***************
*** 424,432 ****
  $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5];
  $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0];
  $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[6][1] = $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[8][1] = $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5];
--- 420,428 ----
  $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5];
+ $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0];
  $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
  $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[6][1] = $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[8][1] = $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5];
***************
*** 449,455 ****
  $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[1];
  $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[1]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[1]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[1]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[1]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[1]{'extra'}{'def_args'}[0][1];
  $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[1]{'extra'}{'def_args'}[2][1];
--- 445,449 ----
diff -Nrc2 texinfo-6.1/tp/t/results/def/defx_after_comment.pl texinfo-6.3/tp/t/results/def/defx_after_comment.pl
*** texinfo-6.1/tp/t/results/def/defx_after_comment.pl	2016-01-22 07:49:48.000000000 +0000
--- texinfo-6.3/tp/t/results/def/defx_after_comment.pl	2016-08-02 18:44:29.000000000 +0100
***************
*** 121,125 ****
                'index_at_command' => 'deffn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'i',
--- 121,124 ----
***************
*** 200,204 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 199,202 ----
***************
*** 247,251 ****
                'index_at_command' => 'deffnx',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'bidulr',
--- 245,248 ----
***************
*** 331,335 ****
  $result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[2];
  $result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[0][1];
  $result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[2][1];
--- 328,331 ----
diff -Nrc2 texinfo-6.1/tp/t/results/def/defx_after_comment_in_example.pl texinfo-6.3/tp/t/results/def/defx_after_comment_in_example.pl
*** texinfo-6.1/tp/t/results/def/defx_after_comment_in_example.pl	2016-01-22 07:49:49.000000000 +0000
--- texinfo-6.3/tp/t/results/def/defx_after_comment_in_example.pl	2016-08-02 18:44:29.000000000 +0100
***************
*** 133,137 ****
                    'index_at_command' => 'deffn',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deffn',
                    'key' => 'i',
--- 133,136 ----
***************
*** 218,222 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 217,220 ----
***************
*** 265,269 ****
                    'index_at_command' => 'deffnx',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deffn',
                    'key' => 'bidulr',
--- 263,266 ----
***************
*** 411,415 ****
  $result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
  $result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_args'}[0][1];
  $result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_args'}[2][1];
--- 408,411 ----
diff -Nrc2 texinfo-6.1/tp/t/results/def/defx_after_empty_line.pl texinfo-6.3/tp/t/results/def/defx_after_empty_line.pl
*** texinfo-6.1/tp/t/results/def/defx_after_empty_line.pl	2016-01-22 07:49:49.000000000 +0000
--- texinfo-6.3/tp/t/results/def/defx_after_empty_line.pl	2016-08-02 18:44:29.000000000 +0100
***************
*** 121,125 ****
                'index_at_command' => 'deffn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'i',
--- 121,124 ----
***************
*** 188,192 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 187,190 ----
***************
*** 235,239 ****
                'index_at_command' => 'deffnx',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'bidulr',
--- 233,236 ----
***************
*** 318,322 ****
  $result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[2];
  $result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[0][1];
  $result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[2][1];
--- 315,318 ----
diff -Nrc2 texinfo-6.1/tp/t/results/def/defx_after_empty_line_in_example.pl texinfo-6.3/tp/t/results/def/defx_after_empty_line_in_example.pl
*** texinfo-6.1/tp/t/results/def/defx_after_empty_line_in_example.pl	2016-01-22 07:49:49.000000000 +0000
--- texinfo-6.3/tp/t/results/def/defx_after_empty_line_in_example.pl	2016-08-02 18:44:29.000000000 +0100
***************
*** 133,137 ****
                    'index_at_command' => 'deffn',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deffn',
                    'key' => 'i',
--- 133,136 ----
***************
*** 248,252 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 247,250 ----
***************
*** 295,299 ****
                    'index_at_command' => 'deffnx',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deffn',
                    'key' => 'bidulr',
--- 293,296 ----
***************
*** 445,449 ****
  $result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
  $result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_args'}[0][1];
  $result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_args'}[2][1];
--- 442,445 ----
diff -Nrc2 texinfo-6.1/tp/t/results/def/defx_after_paragraph_end.pl texinfo-6.3/tp/t/results/def/defx_after_paragraph_end.pl
*** texinfo-6.1/tp/t/results/def/defx_after_paragraph_end.pl	2016-01-22 07:49:49.000000000 +0000
--- texinfo-6.3/tp/t/results/def/defx_after_paragraph_end.pl	2016-08-02 18:44:29.000000000 +0100
***************
*** 121,125 ****
                'index_at_command' => 'deffn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'i',
--- 121,124 ----
***************
*** 199,203 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 198,201 ----
***************
*** 246,250 ****
                'index_at_command' => 'deffnx',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'bidulr',
--- 244,247 ----
***************
*** 332,336 ****
  $result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[2];
  $result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[0][1];
  $result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[2][1];
--- 329,332 ----
diff -Nrc2 texinfo-6.1/tp/t/results/def/defx_after_preformatted_with_text.pl texinfo-6.3/tp/t/results/def/defx_after_preformatted_with_text.pl
*** texinfo-6.1/tp/t/results/def/defx_after_preformatted_with_text.pl	2016-01-22 07:49:49.000000000 +0000
--- texinfo-6.3/tp/t/results/def/defx_after_preformatted_with_text.pl	2016-08-02 18:44:29.000000000 +0100
***************
*** 133,137 ****
                    'index_at_command' => 'deffn',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deffn',
                    'key' => 'i',
--- 133,136 ----
***************
*** 211,215 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 210,213 ----
***************
*** 258,262 ****
                    'index_at_command' => 'deffnx',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deffn',
                    'key' => 'bidulr',
--- 256,259 ----
***************
*** 405,409 ****
  $result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
  $result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_args'}[0][1];
  $result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_args'}[2][1];
--- 402,405 ----
diff -Nrc2 texinfo-6.1/tp/t/results/def/defx_after_text.pl texinfo-6.3/tp/t/results/def/defx_after_text.pl
*** texinfo-6.1/tp/t/results/def/defx_after_text.pl	2016-01-22 07:49:49.000000000 +0000
--- texinfo-6.3/tp/t/results/def/defx_after_text.pl	2016-08-02 18:44:29.000000000 +0100
***************
*** 121,125 ****
                'index_at_command' => 'deffn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'i',
--- 121,124 ----
***************
*** 193,197 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 192,195 ----
***************
*** 240,244 ****
                'index_at_command' => 'deffnx',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'bidulr',
--- 238,241 ----
***************
*** 325,329 ****
  $result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[2];
  $result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[0][1];
  $result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[2][1];
--- 322,325 ----
diff -Nrc2 texinfo-6.1/tp/t/results/def/defx_in_example.pl texinfo-6.3/tp/t/results/def/defx_in_example.pl
*** texinfo-6.1/tp/t/results/def/defx_in_example.pl	2016-01-22 07:49:49.000000000 +0000
--- texinfo-6.3/tp/t/results/def/defx_in_example.pl	2016-08-02 18:44:29.000000000 +0100
***************
*** 133,137 ****
                    'index_at_command' => 'deffn',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deffn',
                    'key' => 'i',
--- 133,136 ----
***************
*** 188,192 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 187,190 ----
***************
*** 235,239 ****
                    'index_at_command' => 'deffnx',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deffn',
                    'key' => 'bidulr',
--- 233,236 ----
***************
*** 377,381 ****
  $result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
  $result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'def_args'}[0][1];
  $result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'def_args'}[2][1];
--- 374,377 ----
diff -Nrc2 texinfo-6.1/tp/t/results/def/double_command.pl texinfo-6.3/tp/t/results/def/double_command.pl
*** texinfo-6.1/tp/t/results/def/double_command.pl	2016-01-22 07:49:49.000000000 +0000
--- texinfo-6.3/tp/t/results/def/double_command.pl	2016-08-02 18:44:29.000000000 +0100
***************
*** 195,199 ****
                        'index_at_command' => 'deffnx',
                        'index_name' => 'fn',
-                       'index_prefix' => 'f',
                        'index_type_command' => 'deffn',
                        'key' => 'plot2',
--- 195,198 ----
***************
*** 354,358 ****
                'index_at_command' => 'deffn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'plot',
--- 353,356 ----
***************
*** 519,523 ****
                            'index_at_command' => 'defvr',
                            'index_name' => 'vr',
-                           'index_prefix' => 'v',
                            'index_type_command' => 'defvr',
                            'key' => 'd--efvr_name',
--- 517,520 ----
***************
*** 609,613 ****
                'index_at_command' => 'deffn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'aaaa',
--- 606,609 ----
***************
*** 790,799 ****
  $result_errors{'double_command'} = [
    {
!     'error_line' => ':1: warning: @deffnx should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@deffnx should only appear at a line beginning',
      'type' => 'warning'
    },
--- 786,795 ----
  $result_errors{'double_command'} = [
    {
!     'error_line' => ':1: warning: @deffnx should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@deffnx should only appear at the beginning of a line',
      'type' => 'warning'
    },
***************
*** 835,844 ****
    },
    {
!     'error_line' => ':5: warning: @defvr should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 5,
      'macro' => '',
!     'text' => '@defvr should only appear at a line beginning',
      'type' => 'warning'
    },
--- 831,840 ----
    },
    {
!     'error_line' => ':5: warning: @defvr should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 5,
      'macro' => '',
!     'text' => '@defvr should only appear at the beginning of a line',
      'type' => 'warning'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/def/empty_def_arguments.pl texinfo-6.3/tp/t/results/def/empty_def_arguments.pl
*** texinfo-6.1/tp/t/results/def/empty_def_arguments.pl	2016-01-22 07:49:49.000000000 +0000
--- texinfo-6.3/tp/t/results/def/empty_def_arguments.pl	2016-08-02 18:44:29.000000000 +0100
***************
*** 121,125 ****
                'index_at_command' => 'deffn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'i',
--- 121,124 ----
***************
*** 352,356 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 351,354 ----
***************
*** 367,371 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 365,368 ----
***************
*** 415,419 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 412,415 ----
***************
*** 424,436 ****
                'category' => {}
              },
!             'original_def_cmdname' => 'deffnx',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {},
--- 420,424 ----
                'category' => {}
              },
!             'original_def_cmdname' => 'deffnx'
            },
            'line_nr' => {},
***************
*** 464,467 ****
--- 452,456 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 492,496 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 481,484 ----
***************
*** 510,514 ****
                      'spaces_before_argument' => {}
                    },
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 498,501 ----
***************
*** 520,532 ****
                'name' => {}
              },
!             'original_def_cmdname' => 'deffnx',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {},
--- 507,511 ----
                'name' => {}
              },
!             'original_def_cmdname' => 'deffnx'
            },
            'line_nr' => {},
***************
*** 570,574 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 549,552 ----
***************
*** 579,591 ****
                'category' => {}
              },
!             'original_def_cmdname' => 'deffnx',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {},
--- 557,561 ----
                'category' => {}
              },
!             'original_def_cmdname' => 'deffnx'
            },
            'line_nr' => {},
***************
*** 634,638 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 604,607 ----
***************
*** 649,653 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 618,621 ----
***************
*** 659,671 ****
                'name' => {}
              },
!             'original_def_cmdname' => 'deffnx',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {},
--- 627,631 ----
                'name' => {}
              },
!             'original_def_cmdname' => 'deffnx'
            },
            'line_nr' => {},
***************
*** 779,785 ****
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4];
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4]{'args'}[0];
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4]{'args'}[0];
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4]{'extra'}{'def_args'}[0][1];
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4]{'extra'}{'def_args'}[2][1];
--- 739,743 ----
***************
*** 791,798 ****
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5];
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'contents'};
- $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'args'}[0];
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'extra'}{'def_args'}[0][1];
- $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5];
- $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'args'}[0];
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'empty_def_arguments'}{'contents'}[0];
--- 749,753 ----
***************
*** 800,803 ****
--- 755,759 ----
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0];
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0];
+ $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[2];
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[2]{'extra'}{'spaces_before_argument'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[2]{'contents'}[0];
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
***************
*** 806,817 ****
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6];
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'contents'};
- $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0];
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[2]{'contents'};
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'def_args'}[2][1]{'extra'}{'spaces_before_argument'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[2]{'contents'}[0];
- $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0];
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'def_args'}[0][1];
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'def_args'}[2][1];
- $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6];
- $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0];
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'parent'} = $result_trees{'empty_def_arguments'}{'contents'}[0];
--- 762,769 ----
***************
*** 821,828 ****
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7];
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'contents'};
- $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'args'}[0];
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'extra'}{'def_args'}[0][1];
- $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7];
- $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'args'}[0];
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'empty_def_arguments'}{'contents'}[0];
--- 773,777 ----
***************
*** 834,844 ****
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8];
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'contents'};
- $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'args'}[0];
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[2]{'contents'};
- $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'args'}[0];
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'extra'}{'def_args'}[0][1];
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'extra'}{'def_args'}[2][1];
- $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8];
- $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'args'}[0];
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'parent'} = $result_trees{'empty_def_arguments'}{'contents'}[0];
--- 783,789 ----
diff -Nrc2 texinfo-6.1/tp/t/results/def/empty_def_command.pl texinfo-6.3/tp/t/results/def/empty_def_command.pl
*** texinfo-6.1/tp/t/results/def/empty_def_command.pl	2016-01-22 07:49:48.000000000 +0000
--- texinfo-6.3/tp/t/results/def/empty_def_command.pl	2016-08-02 18:44:29.000000000 +0100
***************
*** 71,75 ****
                'index_at_command' => 'deffn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'deffn',
--- 71,74 ----
***************
*** 230,234 ****
                'index_at_command' => 'deffn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'deffn',
--- 229,232 ----
***************
*** 306,310 ****
                'index_at_command' => 'deffnx',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'deffnx',
--- 304,307 ----
diff -Nrc2 texinfo-6.1/tp/t/results/def/empty_deftype.pl texinfo-6.3/tp/t/results/def/empty_deftype.pl
*** texinfo-6.1/tp/t/results/def/empty_deftype.pl	2016-01-22 07:49:49.000000000 +0000
--- texinfo-6.3/tp/t/results/def/empty_deftype.pl	2016-08-02 18:44:29.000000000 +0100
***************
*** 62,66 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 62,65 ----
***************
*** 150,154 ****
                'index_at_command' => 'deftypefun',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deftypefun',
                'key' => 'f',
--- 149,152 ----
***************
*** 349,353 ****
                'index_at_command' => 'defun',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'defun',
                'key' => 'f',
--- 347,350 ----
***************
*** 507,511 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 504,507 ----
***************
*** 589,593 ****
                'content' => [
                  {},
-                 {},
                  {
                    'parent' => {
--- 585,588 ----
***************
*** 597,601 ****
                    'text' => ' on '
                  },
-                 {},
                  {}
                ],
--- 592,595 ----
***************
*** 610,614 ****
                'index_at_command' => 'deftypemethod',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deftypemethod',
                'key' => 'f on c',
--- 604,607 ----
***************
*** 816,820 ****
                'content' => [
                  {},
-                 {},
                  {
                    'parent' => {
--- 809,812 ----
***************
*** 824,828 ****
                    'text' => ' on '
                  },
-                 {},
                  {}
                ],
--- 816,819 ----
***************
*** 837,841 ****
                'index_at_command' => 'defmethod',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'defmethod',
                'key' => 'f on c',
--- 828,831 ----
***************
*** 927,931 ****
  $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0];
  $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[4][1];
--- 917,920 ----
***************
*** 985,989 ****
  $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0];
  $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'contents'} = $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'};
- $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'parent'} = $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'args'}[0];
  $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'} = $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 974,977 ----
***************
*** 992,997 ****
  $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0];
  $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 980,985 ----
  $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0];
  $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[6][1];
! $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[6][1];
  $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'empty_deftype'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 1023,1028 ****
  $result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0];
  $result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 1011,1016 ----
  $result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0];
  $result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'empty_deftype'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[2][1];
diff -Nrc2 texinfo-6.1/tp/t/results/def/empty_deftypeop_name.pl texinfo-6.3/tp/t/results/def/empty_deftypeop_name.pl
*** texinfo-6.1/tp/t/results/def/empty_deftypeop_name.pl	2016-01-22 07:49:49.000000000 +0000
--- texinfo-6.3/tp/t/results/def/empty_deftypeop_name.pl	2016-08-02 18:44:29.000000000 +0100
***************
*** 138,142 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 138,141 ----
***************
*** 248,252 ****
  $result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}[1] = $result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
  $result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4]{'contents'};
- $result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'contents'}[1] = $result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[6];
  $result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1];
--- 247,250 ----
diff -Nrc2 texinfo-6.1/tp/t/results/def/end_of_line_protect_at_end.pl texinfo-6.3/tp/t/results/def/end_of_line_protect_at_end.pl
*** texinfo-6.1/tp/t/results/def/end_of_line_protect_at_end.pl	2016-01-22 07:49:49.000000000 +0000
--- texinfo-6.3/tp/t/results/def/end_of_line_protect_at_end.pl	2016-08-02 18:44:29.000000000 +0100
***************
*** 96,100 ****
                'index_at_command' => 'deffn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'deffn_name2',
--- 96,99 ----
diff -Nrc2 texinfo-6.1/tp/t/results/def/end_of_lines_protected.pl texinfo-6.3/tp/t/results/def/end_of_lines_protected.pl
*** texinfo-6.1/tp/t/results/def/end_of_lines_protected.pl	2016-01-22 07:49:48.000000000 +0000
--- texinfo-6.3/tp/t/results/def/end_of_lines_protected.pl	2016-08-02 18:44:29.000000000 +0100
***************
*** 145,149 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 145,148 ----
***************
*** 208,212 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 207,210 ----
***************
*** 229,233 ****
                'index_at_command' => 'deffn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'deffn_name',
--- 227,230 ----
***************
*** 328,336 ****
  $result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0];
  $result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[8][1]{'contents'} = $result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'};
- $result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[8][1]{'parent'} = $result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[14][1] = $result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
  $result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[16][1] = $result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[6];
  $result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[18][1]{'contents'} = $result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[8]{'contents'};
- $result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[18][1]{'parent'} = $result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 325,331 ----
diff -Nrc2 texinfo-6.1/tp/t/results/def/end_of_lines_protected_in_footnote.pl texinfo-6.3/tp/t/results/def/end_of_lines_protected_in_footnote.pl
*** texinfo-6.1/tp/t/results/def/end_of_lines_protected_in_footnote.pl	2016-01-22 07:49:49.000000000 +0000
--- texinfo-6.3/tp/t/results/def/end_of_lines_protected_in_footnote.pl	2016-08-02 18:44:29.000000000 +0100
***************
*** 170,174 ****
                              {
                                'contents' => [],
-                               'parent' => {},
                                'type' => 'bracketed_def_content'
                              }
--- 170,173 ----
***************
*** 233,237 ****
                              {
                                'contents' => [],
-                               'parent' => {},
                                'type' => 'bracketed_def_content'
                              }
--- 232,235 ----
***************
*** 254,258 ****
                            'index_at_command' => 'deffn',
                            'index_name' => 'fn',
-                           'index_prefix' => 'f',
                            'index_type_command' => 'deffn',
                            'key' => 'deffn_name',
--- 252,255 ----
***************
*** 380,388 ****
  $result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0];
  $result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[10][1]{'contents'} = $result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'};
- $result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[10][1]{'parent'} = $result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[16][1] = $result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
  $result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[18][1] = $result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[6];
  $result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[20][1]{'contents'} = $result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[8]{'contents'};
- $result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[20][1]{'parent'} = $result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 377,383 ----
diff -Nrc2 texinfo-6.1/tp/t/results/def/inter_item_commands_in_def.pl texinfo-6.3/tp/t/results/def/inter_item_commands_in_def.pl
*** texinfo-6.1/tp/t/results/def/inter_item_commands_in_def.pl	2016-01-22 07:49:48.000000000 +0000
--- texinfo-6.3/tp/t/results/def/inter_item_commands_in_def.pl	2016-08-02 18:44:29.000000000 +0100
***************
*** 121,125 ****
                'index_at_command' => 'deffn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'i',
--- 121,124 ----
***************
*** 181,184 ****
--- 180,184 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 243,247 ****
                      'spaces_before_argument' => {}
                    },
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 243,246 ----
***************
*** 258,262 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 257,260 ----
***************
*** 286,290 ****
                'index_at_command' => 'deffnx',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'log trap1',
--- 284,287 ----
***************
*** 338,342 ****
                    'index_at_command' => 'cindex',
                    'index_name' => 'cp',
-                   'index_prefix' => 'c',
                    'index_type_command' => 'cindex',
                    'key' => 'between deffnx',
--- 335,338 ----
***************
*** 478,482 ****
                'index_at_command' => 'deffnx',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'id i ule',
--- 474,477 ----
***************
*** 530,534 ****
                    'index_at_command' => 'cindex',
                    'index_name' => 'cp',
-                   'index_prefix' => 'c',
                    'index_type_command' => 'cindex',
                    'key' => 'cindex in deff item',
--- 525,528 ----
***************
*** 642,645 ****
--- 636,640 ----
  $result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+ $result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
  $result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
  $result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'extra'}{'spaces_before_argument'} = $result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'}[0];
***************
*** 652,658 ****
  $result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'};
  $result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[2][1]{'extra'}{'spaces_before_argument'} = $result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'}[0];
- $result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[4][1]{'contents'} = $result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[4]{'contents'};
- $result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[4][1]{'parent'} = $result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[0][1];
  $result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[2][1];
--- 647,651 ----
diff -Nrc2 texinfo-6.1/tp/t/results/def/inter_item_commands_in_def_in_example.pl texinfo-6.3/tp/t/results/def/inter_item_commands_in_def_in_example.pl
*** texinfo-6.1/tp/t/results/def/inter_item_commands_in_def_in_example.pl	2016-01-22 07:49:48.000000000 +0000
--- texinfo-6.3/tp/t/results/def/inter_item_commands_in_def_in_example.pl	2016-08-02 18:44:29.000000000 +0100
***************
*** 133,137 ****
                    'index_at_command' => 'deffn',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deffn',
                    'key' => 'i',
--- 133,136 ----
***************
*** 199,202 ****
--- 198,202 ----
                        'contents' => [
                          {
+                           'parent' => {},
                            'text' => ' ',
                            'type' => 'empty_spaces_before_argument'
***************
*** 261,265 ****
                          'spaces_before_argument' => {}
                        },
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 261,264 ----
***************
*** 276,280 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 275,278 ----
***************
*** 304,308 ****
                    'index_at_command' => 'deffnx',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deffn',
                    'key' => 'log trap1',
--- 302,305 ----
***************
*** 358,362 ****
                            'index_at_command' => 'cindex',
                            'index_name' => 'cp',
-                           'index_prefix' => 'c',
                            'index_type_command' => 'cindex',
                            'key' => 'between deffnx',
--- 355,358 ----
***************
*** 502,506 ****
                    'index_at_command' => 'deffnx',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deffn',
                    'key' => 'id i ule',
--- 498,501 ----
***************
*** 556,560 ****
                            'index_at_command' => 'cindex',
                            'index_name' => 'cp',
-                           'index_prefix' => 'c',
                            'index_type_command' => 'cindex',
                            'key' => 'cindex in deff item',
--- 551,554 ----
***************
*** 722,725 ****
--- 716,720 ----
  $result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
+ $result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2];
  $result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2];
  $result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'extra'}{'spaces_before_argument'} = $result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'}[0];
***************
*** 732,738 ****
  $result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'};
  $result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_args'}[2][1]{'extra'}{'spaces_before_argument'} = $result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'}[0];
- $result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_args'}[4][1]{'contents'} = $result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[4]{'contents'};
- $result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_args'}[4][1]{'parent'} = $result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_args'}[0][1];
  $result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_args'}[2][1];
--- 727,731 ----
diff -Nrc2 texinfo-6.1/tp/t/results/def/leading_space_in_def_arg.pl texinfo-6.3/tp/t/results/def/leading_space_in_def_arg.pl
*** texinfo-6.1/tp/t/results/def/leading_space_in_def_arg.pl	2016-01-22 07:49:48.000000000 +0000
--- texinfo-6.3/tp/t/results/def/leading_space_in_def_arg.pl	2016-08-02 18:44:29.000000000 +0100
***************
*** 30,33 ****
--- 30,34 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 81,85 ****
                      'spaces_before_argument' => {}
                    },
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 82,85 ----
***************
*** 115,119 ****
                'index_at_command' => 'deffn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'name',
--- 115,118 ----
***************
*** 181,184 ****
--- 180,184 ----
  $result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+ $result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
  $result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
  $result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'extra'}{'spaces_before_argument'} = $result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0];
***************
*** 188,192 ****
  $result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'};
  $result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'extra'}{'spaces_before_argument'} = $result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0];
- $result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 188,191 ----
diff -Nrc2 texinfo-6.1/tp/t/results/def/no_category_or_no_name.pl texinfo-6.3/tp/t/results/def/no_category_or_no_name.pl
*** texinfo-6.1/tp/t/results/def/no_category_or_no_name.pl	2016-01-22 07:49:49.000000000 +0000
--- texinfo-6.3/tp/t/results/def/no_category_or_no_name.pl	2016-08-02 18:44:29.000000000 +0100
***************
*** 159,163 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 159,162 ----
***************
*** 342,346 ****
                'index_at_command' => 'deffn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'b',
--- 341,344 ----
***************
*** 532,536 ****
  $result_trees{'no_category_or_no_name'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'no_category_or_no_name'}{'contents'}[2]{'contents'}[0];
  $result_trees{'no_category_or_no_name'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'no_category_or_no_name'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'no_category_or_no_name'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'no_category_or_no_name'}{'contents'}[2]{'contents'}[0]{'args'}[0];
  $result_trees{'no_category_or_no_name'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'no_category_or_no_name'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'no_category_or_no_name'}{'contents'}[2]{'contents'}[0]{'line_nr'} = $result_trees{'no_category_or_no_name'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
--- 530,533 ----
diff -Nrc2 texinfo-6.1/tp/t/results/def/not_closed.pl texinfo-6.3/tp/t/results/def/not_closed.pl
*** texinfo-6.1/tp/t/results/def/not_closed.pl	2016-01-22 07:49:49.000000000 +0000
--- texinfo-6.3/tp/t/results/def/not_closed.pl	2016-08-02 18:44:29.000000000 +0100
***************
*** 84,88 ****
                'index_at_command' => 'deffn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'bidule',
--- 84,87 ----
***************
*** 173,177 ****
                'index_at_command' => 'deffnx',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'chose',
--- 172,175 ----
***************
*** 280,284 ****
                        'index_at_command' => 'defvar',
                        'index_name' => 'vr',
-                       'index_prefix' => 'v',
                        'index_type_command' => 'defvar',
                        'key' => 'type1',
--- 278,281 ----
diff -Nrc2 texinfo-6.1/tp/t/results/def/protected_brace.pl texinfo-6.3/tp/t/results/def/protected_brace.pl
*** texinfo-6.1/tp/t/results/def/protected_brace.pl	2016-01-22 07:49:49.000000000 +0000
--- texinfo-6.3/tp/t/results/def/protected_brace.pl	2016-08-02 18:44:29.000000000 +0100
***************
*** 77,81 ****
                'index_at_command' => 'deffn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => '{',
--- 77,80 ----
diff -Nrc2 texinfo-6.1/tp/t/results/def/ref_in_def.pl texinfo-6.3/tp/t/results/def/ref_in_def.pl
*** texinfo-6.1/tp/t/results/def/ref_in_def.pl	2016-01-22 07:49:49.000000000 +0000
--- texinfo-6.3/tp/t/results/def/ref_in_def.pl	2016-08-02 18:44:29.000000000 +0100
***************
*** 115,123 ****
                                {}
                              ],
!                             'normalized' => 'myanchor',
!                             'spaces_before_argument' => {
!                               'text' => '',
!                               'type' => 'empty_spaces_before_argument'
!                             }
                            },
                            'line_nr' => {
--- 115,119 ----
                                {}
                              ],
!                             'normalized' => 'myanchor'
                            },
                            'line_nr' => {
***************
*** 133,140 ****
                            ],
                            'normalized' => 'myanchor'
-                         },
-                         'spaces_before_argument' => {
-                           'text' => '',
-                           'type' => 'empty_spaces_before_argument'
                          }
                        },
--- 129,132 ----
***************
*** 177,184 ****
                            ],
                            'normalized' => 'myanchor'
-                         },
-                         'spaces_before_argument' => {
-                           'text' => '',
-                           'type' => 'empty_spaces_before_argument'
                          }
                        },
--- 169,172 ----
***************
*** 219,226 ****
                                ],
                                'normalized' => 'myanchor'
-                             },
-                             'spaces_before_argument' => {
-                               'text' => '',
-                               'type' => 'empty_spaces_before_argument'
                              }
                            },
--- 207,210 ----
***************
*** 264,271 ****
                            ],
                            'normalized' => 'myanchor'
-                         },
-                         'spaces_before_argument' => {
-                           'text' => '',
-                           'type' => 'empty_spaces_before_argument'
                          }
                        },
--- 248,251 ----
***************
*** 304,311 ****
                            ],
                            'normalized' => 'myanchor'
-                         },
-                         'spaces_before_argument' => {
-                           'text' => '',
-                           'type' => 'empty_spaces_before_argument'
                          }
                        },
--- 284,287 ----
***************
*** 351,355 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 327,330 ----
***************
*** 394,398 ****
                    'index_at_command' => 'deffn',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deffn',
                    'key' => 'myanchor',
--- 369,372 ----
***************
*** 445,452 ****
                            ],
                            'normalized' => 'myanchor'
-                         },
-                         'spaces_before_argument' => {
-                           'text' => '',
-                           'type' => 'empty_spaces_before_argument'
                          }
                        },
--- 419,422 ----
***************
*** 489,496 ****
                            ],
                            'normalized' => 'myanchor'
-                         },
-                         'spaces_before_argument' => {
-                           'text' => '',
-                           'type' => 'empty_spaces_before_argument'
                          }
                        },
--- 459,462 ----
***************
*** 531,538 ****
                                ],
                                'normalized' => 'myanchor'
-                             },
-                             'spaces_before_argument' => {
-                               'text' => '',
-                               'type' => 'empty_spaces_before_argument'
                              }
                            },
--- 497,500 ----
***************
*** 576,583 ****
                            ],
                            'normalized' => 'myanchor'
-                         },
-                         'spaces_before_argument' => {
-                           'text' => '',
-                           'type' => 'empty_spaces_before_argument'
                          }
                        },
--- 538,541 ----
***************
*** 616,623 ****
                            ],
                            'normalized' => 'myanchor'
-                         },
-                         'spaces_before_argument' => {
-                           'text' => '',
-                           'type' => 'empty_spaces_before_argument'
                          }
                        },
--- 574,577 ----
***************
*** 664,668 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 618,621 ----
***************
*** 707,711 ****
                    'index_at_command' => 'deffnx',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deffn',
                    'key' => 'myanchor',
--- 660,663 ----
***************
*** 794,797 ****
--- 746,750 ----
          {},
          {
+           'parent' => {},
            'text' => '
  ',
***************
*** 881,885 ****
  $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1] = $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'contents'} = $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'};
- $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'parent'} = $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[6][1] = $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[7];
  $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[8][1] = $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[9];
--- 834,837 ----
***************
*** 939,943 ****
  $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_args'}[2][1] = $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3];
  $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_args'}[4][1]{'contents'} = $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[5]{'contents'};
- $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_args'}[4][1]{'parent'} = $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_args'}[6][1] = $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[7];
  $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_args'}[8][1] = $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[9];
--- 891,894 ----
***************
*** 968,971 ****
--- 919,923 ----
  $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'ref_in_def'}{'contents'}[1];
  $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[3] = $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'extra'}{'label'};
+ $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'ref_in_def'}{'contents'}[1];
  $result_trees{'ref_in_def'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'ref_in_def'}{'contents'}[1]{'args'}[0]{'contents'}[1];
  $result_trees{'ref_in_def'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'ref_in_def'}{'contents'}[1]{'extra'}{'node_content'};
diff -Nrc2 texinfo-6.1/tp/t/results/def/space_in_def_for_index.pl texinfo-6.3/tp/t/results/def/space_in_def_for_index.pl
*** texinfo-6.1/tp/t/results/def/space_in_def_for_index.pl	2016-01-22 07:49:49.000000000 +0000
--- texinfo-6.3/tp/t/results/def/space_in_def_for_index.pl	2016-08-02 18:44:29.000000000 +0100
***************
*** 66,69 ****
--- 66,70 ----
                        'contents' => [
                          {
+                           'parent' => {},
                            'text' => ' ',
                            'type' => 'empty_spaces_before_argument'
***************
*** 97,100 ****
--- 98,102 ----
                        'contents' => [
                          {
+                           'parent' => {},
                            'text' => ' ',
                            'type' => 'empty_spaces_before_argument'
***************
*** 124,127 ****
--- 126,130 ----
                        'contents' => [
                          {
+                           'parent' => {},
                            'text' => ' ',
                            'type' => 'empty_spaces_before_argument'
***************
*** 163,167 ****
                          'spaces_before_argument' => {}
                        },
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 166,169 ----
***************
*** 181,185 ****
                          'spaces_before_argument' => {}
                        },
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 183,186 ----
***************
*** 199,203 ****
                          'spaces_before_argument' => {}
                        },
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 200,203 ----
***************
*** 233,237 ****
                    'index_at_command' => 'deffn',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deffn',
                    'key' => 'name',
--- 233,236 ----
***************
*** 304,308 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 303,306 ----
***************
*** 319,323 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 317,320 ----
***************
*** 353,357 ****
                    'index_at_command' => 'deffnx',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deffn',
                    'key' => 'AAA2',
--- 350,353 ----
***************
*** 495,498 ****
--- 491,495 ----
  $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1];
  $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
+ $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
  $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
  $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
***************
*** 500,503 ****
--- 497,501 ----
  $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
+ $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3];
***************
*** 506,509 ****
--- 504,508 ----
  $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
+ $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[5];
  $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'parent'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[5];
  $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[2]{'parent'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[5];
***************
*** 515,525 ****
  $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
  $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'extra'}{'spaces_before_argument'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0];
- $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
  $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'extra'}{'spaces_before_argument'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'}[0];
- $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'contents'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'};
  $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'extra'}{'spaces_before_argument'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[0];
- $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'parent'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 514,521 ----
***************
*** 541,547 ****
  $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
  $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_args'}[0][1];
  $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_args'}[2][1];
--- 537,541 ----
diff -Nrc2 texinfo-6.1/tp/t/results/def/wrong_braces_simple.pl texinfo-6.3/tp/t/results/def/wrong_braces_simple.pl
*** texinfo-6.1/tp/t/results/def/wrong_braces_simple.pl	2016-01-22 07:49:49.000000000 +0000
--- texinfo-6.3/tp/t/results/def/wrong_braces_simple.pl	2016-08-02 18:44:29.000000000 +0100
***************
*** 117,121 ****
                'index_at_command' => 'deffn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'machin',
--- 117,120 ----
***************
*** 302,306 ****
                'index_at_command' => 'deffn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'machin',
--- 301,304 ----
***************
*** 394,397 ****
--- 392,396 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => '
  ',
***************
*** 489,493 ****
                      'spaces_before_argument' => {}
                    },
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 488,491 ----
***************
*** 510,514 ****
                'index_at_command' => 'deffn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'machin',
--- 508,511 ----
***************
*** 598,601 ****
--- 595,599 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 702,706 ****
                      'spaces_before_argument' => {}
                    },
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 700,703 ----
***************
*** 723,727 ****
                'index_at_command' => 'deffn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'machin',
--- 720,723 ----
***************
*** 891,895 ****
                'index_at_command' => 'deffn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'b',
--- 887,890 ----
***************
*** 1013,1017 ****
                'index_at_command' => 'deffnx',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'machin',
--- 1008,1011 ----
***************
*** 1142,1146 ****
                'index_at_command' => 'deffnx',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'machin',
--- 1136,1139 ----
***************
*** 1177,1180 ****
--- 1170,1174 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => '
  ',
***************
*** 1273,1277 ****
                      'spaces_before_argument' => {}
                    },
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 1267,1270 ----
***************
*** 1294,1298 ****
                'index_at_command' => 'deffnx',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'machin',
--- 1287,1290 ----
***************
*** 1325,1328 ****
--- 1317,1321 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1430,1434 ****
                      'spaces_before_argument' => {}
                    },
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 1423,1426 ----
***************
*** 1451,1455 ****
                'index_at_command' => 'deffnx',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'machin',
--- 1443,1446 ----
***************
*** 1564,1567 ****
--- 1555,1559 ----
  $result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0];
  $result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0];
+ $result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
  $result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2]{'extra'}{'spaces_before_argument'} = $result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0];
  $result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0];
***************
*** 1569,1573 ****
  $result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[10][1]{'contents'} = $result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'};
  $result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[10][1]{'extra'}{'spaces_before_argument'} = $result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0];
- $result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[10][1]{'parent'} = $result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0];
  $result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 1561,1564 ----
***************
*** 1593,1596 ****
--- 1584,1588 ----
  $result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0];
  $result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0];
+ $result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2];
  $result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2];
  $result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2];
***************
*** 1600,1604 ****
  $result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[10][1]{'contents'} = $result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'};
  $result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[10][1]{'extra'}{'spaces_before_argument'} = $result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0];
- $result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[10][1]{'parent'} = $result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0];
  $result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 1592,1595 ----
***************
*** 1656,1659 ****
--- 1647,1651 ----
  $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0];
  $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0];
+ $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[2];
  $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[2]{'extra'}{'spaces_before_argument'} = $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[0];
  $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0];
***************
*** 1661,1665 ****
  $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'extra'}{'def_args'}[10][1]{'contents'} = $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'};
  $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'extra'}{'def_args'}[10][1]{'extra'}{'spaces_before_argument'} = $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[0];
- $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'extra'}{'def_args'}[10][1]{'parent'} = $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0];
  $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'extra'}{'def_args'}[0][1];
  $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'extra'}{'def_args'}[2][1];
--- 1653,1656 ----
***************
*** 1673,1676 ****
--- 1664,1668 ----
  $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0];
  $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0];
+ $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2];
  $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2];
  $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2];
***************
*** 1680,1684 ****
  $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'extra'}{'def_args'}[10][1]{'contents'} = $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2]{'contents'};
  $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'extra'}{'def_args'}[10][1]{'extra'}{'spaces_before_argument'} = $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2]{'contents'}[0];
- $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'extra'}{'def_args'}[10][1]{'parent'} = $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0];
  $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'extra'}{'def_args'}[0][1];
  $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'extra'}{'def_args'}[2][1];
--- 1672,1675 ----
diff -Nrc2 texinfo-6.1/tp/t/results/def/wrong_braces_with_end_of_lines.pl texinfo-6.3/tp/t/results/def/wrong_braces_with_end_of_lines.pl
*** texinfo-6.1/tp/t/results/def/wrong_braces_with_end_of_lines.pl	2016-01-22 07:49:49.000000000 +0000
--- texinfo-6.3/tp/t/results/def/wrong_braces_with_end_of_lines.pl	2016-08-02 18:44:29.000000000 +0100
***************
*** 30,33 ****
--- 30,34 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => '   ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 108,112 ****
                      'spaces_before_argument' => {}
                    },
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 109,112 ----
***************
*** 129,133 ****
                'index_at_command' => 'deffn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'name',
--- 129,132 ----
***************
*** 322,326 ****
                'index_at_command' => 'deffn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'name',
--- 321,324 ----
***************
*** 417,420 ****
--- 415,419 ----
  $result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+ $result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
  $result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
  $result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
***************
*** 424,428 ****
  $result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'contents'} = $result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'};
  $result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'extra'}{'spaces_before_argument'} = $result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0];
- $result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'parent'} = $result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 423,426 ----
diff -Nrc2 texinfo-6.1/tp/t/results/float/anchor_in_caption.pl texinfo-6.3/tp/t/results/float/anchor_in_caption.pl
*** texinfo-6.1/tp/t/results/float/anchor_in_caption.pl	2016-01-22 07:49:56.000000000 +0000
--- texinfo-6.3/tp/t/results/float/anchor_in_caption.pl	2016-08-02 18:44:36.000000000 +0100
***************
*** 121,124 ****
--- 121,125 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 186,194 ****
                                {}
                              ],
!                             'normalized' => 'in-anchor',
!                             'spaces_before_argument' => {
!                               'text' => '',
!                               'type' => 'empty_spaces_before_argument'
!                             }
                            },
                            'line_nr' => {
--- 187,191 ----
                                {}
                              ],
!                             'normalized' => 'in-anchor'
                            },
                            'line_nr' => {
***************
*** 211,220 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 208,212 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {},
***************
*** 343,346 ****
--- 335,339 ----
  $result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[0];
  $result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3];
+ $result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[1];
***************
*** 357,361 ****
  $result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
  $result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'float'} = $result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3];
- $result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'line_nr'} = $result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3];
--- 350,353 ----
***************
*** 439,447 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 431,435 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
diff -Nrc2 texinfo-6.1/tp/t/results/float/cindex_in_caption.pl texinfo-6.3/tp/t/results/float/cindex_in_caption.pl
*** texinfo-6.1/tp/t/results/float/cindex_in_caption.pl	2016-01-22 07:49:56.000000000 +0000
--- texinfo-6.3/tp/t/results/float/cindex_in_caption.pl	2016-08-02 18:44:36.000000000 +0100
***************
*** 121,124 ****
--- 121,125 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 201,205 ****
                                'index_at_command' => 'cindex',
                                'index_name' => 'cp',
-                               'index_prefix' => 'c',
                                'index_type_command' => 'cindex',
                                'key' => 'index entry',
--- 202,205 ----
***************
*** 230,239 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 230,234 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 419,422 ****
--- 414,418 ----
  $result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[0];
  $result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3];
+ $result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[1];
***************
*** 440,444 ****
  $result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
  $result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'float'} = $result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3];
- $result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3];
  $result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3];
--- 436,439 ----
***************
*** 537,545 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 532,536 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
diff -Nrc2 texinfo-6.1/tp/t/results/float/comment_space_comand_in_float.pl texinfo-6.3/tp/t/results/float/comment_space_comand_in_float.pl
*** texinfo-6.1/tp/t/results/float/comment_space_comand_in_float.pl	2016-01-22 07:49:57.000000000 +0000
--- texinfo-6.3/tp/t/results/float/comment_space_comand_in_float.pl	2016-08-02 18:44:36.000000000 +0100
***************
*** 75,78 ****
--- 75,79 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 301,304 ****
--- 302,306 ----
  $result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1];
+ $result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'args'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/float/complex_float.pl texinfo-6.3/tp/t/results/float/complex_float.pl
*** texinfo-6.1/tp/t/results/float/complex_float.pl	2016-01-22 07:49:57.000000000 +0000
--- texinfo-6.3/tp/t/results/float/complex_float.pl	2016-08-02 18:44:36.000000000 +0100
***************
*** 320,323 ****
--- 320,324 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 356,359 ****
--- 357,365 ----
                    'cmdname' => 'enddots',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 13,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 442,446 ****
                        'index_at_command' => 'cindex',
                        'index_name' => 'cp',
-                       'index_prefix' => 'c',
                        'index_type_command' => 'cindex',
                        'key' => 'float example',
--- 448,451 ----
***************
*** 494,497 ****
--- 499,508 ----
                      {
                        'cmdname' => 'emph',
+                       'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 33,
+                         'macro' => ''
+                       },
                        'parent' => {},
                        'type' => 'command_as_argument'
***************
*** 632,640 ****
                  'spaces_after_command' => {}
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 33,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 643,647 ----
                  'spaces_after_command' => {}
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 670,673 ****
--- 677,686 ----
                      {
                        'cmdname' => 'minus',
+                       'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 39,
+                         'macro' => ''
+                       },
                        'parent' => {},
                        'type' => 'command_as_argument'
***************
*** 777,785 ****
                  'spaces_after_command' => {}
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 39,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 790,794 ----
                  'spaces_after_command' => {}
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 837,844 ****
                        ],
                        'normalized' => 'Top'
-                     },
-                     'spaces_before_argument' => {
-                       'text' => '',
-                       'type' => 'empty_spaces_before_argument'
                      }
                    },
--- 846,849 ----
***************
*** 881,891 ****
                    'cmdname' => 'footnote',
                    'contents' => [],
-                   'extra' => {
-                     'spaces_before_argument' => {
-                       'parent' => {},
-                       'text' => '',
-                       'type' => 'empty_spaces_before_argument'
-                     }
-                   },
                    'line_nr' => {
                      'file_name' => '',
--- 886,889 ----
***************
*** 922,925 ****
--- 920,928 ----
                    'cmdname' => 'TeX',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 49,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 954,957 ****
--- 957,962 ----
                                    ],
                                    'cmdname' => '\'',
+                                   'contents' => [],
+                                   'line_nr' => {},
                                    'parent' => {}
                                  },
***************
*** 975,983 ****
                                            'cmdname' => 'dotless',
                                            'contents' => [],
!                                           'line_nr' => {
!                                             'file_name' => '',
!                                             'line_nr' => 49,
!                                             'macro' => ''
!                                           },
                                            'parent' => {}
                                          }
--- 980,984 ----
                                            'cmdname' => 'dotless',
                                            'contents' => [],
!                                           'line_nr' => {},
                                            'parent' => {}
                                          }
***************
*** 1022,1030 ****
                                  {}
                                ]
!                             ],
!                             'spaces_before_argument' => {
!                               'text' => '',
!                               'type' => 'empty_spaces_before_argument'
!                             }
                            },
                            'line_nr' => {},
--- 1023,1027 ----
                                  {}
                                ]
!                             ]
                            },
                            'line_nr' => {},
***************
*** 1129,1132 ****
--- 1126,1130 ----
                    'cmdname' => 'AE',
                    'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 1171,1174 ****
--- 1169,1177 ----
                            'cmdname' => 'enddots',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 51,
+                             'macro' => ''
+                           },
                            'parent' => {}
                          },
***************
*** 1293,1301 ****
                            {}
                          ],
!                         'normalized' => 'Anchor-in-caption',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 1296,1300 ----
                            {}
                          ],
!                         'normalized' => 'Anchor-in-caption'
                        },
                        'line_nr' => {
***************
*** 1307,1310 ****
--- 1306,1310 ----
                      },
                      {
+                       'parent' => {},
                        'text' => '
  ',
***************
*** 1342,1345 ****
--- 1342,1351 ----
                              {
                                'cmdname' => 'emph',
+                               'contents' => [],
+                               'line_nr' => {
+                                 'file_name' => '',
+                                 'line_nr' => 60,
+                                 'macro' => ''
+                               },
                                'parent' => {},
                                'type' => 'command_as_argument'
***************
*** 1480,1488 ****
                          'spaces_after_command' => {}
                        },
!                       'line_nr' => {
!                         'file_name' => '',
!                         'line_nr' => 60,
!                         'macro' => ''
!                       },
                        'parent' => {}
                      },
--- 1486,1490 ----
                          'spaces_after_command' => {}
                        },
!                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1750,1779 ****
                            {
                              'contents' => [],
-                             'parent' => {},
                              'type' => 'bracketed_multitable_prototype'
                            },
                            {
                              'contents' => [],
-                             'parent' => {},
                              'type' => 'bracketed_multitable_prototype'
                            }
                          ],
-                         'prototypes_line' => [
-                           {
-                             'text' => ' ',
-                             'type' => 'prototype_space'
-                           },
-                           {},
-                           {
-                             'text' => ' ',
-                             'type' => 'prototype_space'
-                           },
-                           {},
-                           {
-                             'text' => '
- ',
-                             'type' => 'prototype_space'
-                           }
-                         ],
                          'spaces_after_command' => {}
                        },
--- 1752,1762 ----
***************
*** 1830,1834 ****
                                'index_at_command' => 'cindex',
                                'index_name' => 'cp',
-                               'index_prefix' => 'c',
                                'index_type_command' => 'cindex',
                                'key' => 'float example in caption',
--- 1813,1816 ----
***************
*** 1882,1885 ****
--- 1864,1873 ----
                              {
                                'cmdname' => 'minus',
+                               'contents' => [],
+                               'line_nr' => {
+                                 'file_name' => '',
+                                 'line_nr' => 74,
+                                 'macro' => ''
+                               },
                                'parent' => {},
                                'type' => 'command_as_argument'
***************
*** 1989,1997 ****
                          'spaces_after_command' => {}
                        },
!                       'line_nr' => {
!                         'file_name' => '',
!                         'line_nr' => 74,
!                         'macro' => ''
!                       },
                        'parent' => {}
                      },
--- 1977,1981 ----
                          'spaces_after_command' => {}
                        },
!                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 2049,2056 ****
                                ],
                                'normalized' => 'Top'
-                             },
-                             'spaces_before_argument' => {
-                               'text' => '',
-                               'type' => 'empty_spaces_before_argument'
                              }
                            },
--- 2033,2036 ----
***************
*** 2093,2103 ****
                            'cmdname' => 'footnote',
                            'contents' => [],
-                           'extra' => {
-                             'spaces_before_argument' => {
-                               'parent' => {},
-                               'text' => '',
-                               'type' => 'empty_spaces_before_argument'
-                             }
-                           },
                            'line_nr' => {
                              'file_name' => '',
--- 2073,2076 ----
***************
*** 2134,2137 ****
--- 2107,2115 ----
                            'cmdname' => 'TeX',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 84,
+                             'macro' => ''
+                           },
                            'parent' => {}
                          },
***************
*** 2166,2169 ****
--- 2144,2149 ----
                                            ],
                                            'cmdname' => '\'',
+                                           'contents' => [],
+                                           'line_nr' => {},
                                            'parent' => {}
                                          },
***************
*** 2187,2195 ****
                                                    'cmdname' => 'dotless',
                                                    'contents' => [],
!                                                   'line_nr' => {
!                                                     'file_name' => '',
!                                                     'line_nr' => 84,
!                                                     'macro' => ''
!                                                   },
                                                    'parent' => {}
                                                  }
--- 2167,2171 ----
                                                    'cmdname' => 'dotless',
                                                    'contents' => [],
!                                                   'line_nr' => {},
                                                    'parent' => {}
                                                  }
***************
*** 2234,2242 ****
                                          {}
                                        ]
!                                     ],
!                                     'spaces_before_argument' => {
!                                       'text' => '',
!                                       'type' => 'empty_spaces_before_argument'
!                                     }
                                    },
                                    'line_nr' => {},
--- 2210,2214 ----
                                          {}
                                        ]
!                                     ]
                                    },
                                    'line_nr' => {},
***************
*** 2341,2344 ****
--- 2313,2317 ----
                            'cmdname' => 'AE',
                            'contents' => [],
+                           'line_nr' => {},
                            'parent' => {}
                          },
***************
*** 2363,2371 ****
                  'spaces_before_argument' => {}
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 51,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 2336,2340 ----
                  'spaces_before_argument' => {}
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 2397,2400 ****
--- 2366,2374 ----
                            'cmdname' => 'TeX',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 87,
+                             'macro' => ''
+                           },
                            'parent' => {}
                          },
***************
*** 2429,2432 ****
--- 2403,2408 ----
                                            ],
                                            'cmdname' => '\'',
+                                           'contents' => [],
+                                           'line_nr' => {},
                                            'parent' => {}
                                          },
***************
*** 2450,2458 ****
                                                    'cmdname' => 'dotless',
                                                    'contents' => [],
!                                                   'line_nr' => {
!                                                     'file_name' => '',
!                                                     'line_nr' => 87,
!                                                     'macro' => ''
!                                                   },
                                                    'parent' => {}
                                                  }
--- 2426,2430 ----
                                                    'cmdname' => 'dotless',
                                                    'contents' => [],
!                                                   'line_nr' => {},
                                                    'parent' => {}
                                                  }
***************
*** 2497,2505 ****
                                          {}
                                        ]
!                                     ],
!                                     'spaces_before_argument' => {
!                                       'text' => '',
!                                       'type' => 'empty_spaces_before_argument'
!                                     }
                                    },
                                    'line_nr' => {},
--- 2469,2473 ----
                                          {}
                                        ]
!                                     ]
                                    },
                                    'line_nr' => {},
***************
*** 2604,2607 ****
--- 2572,2576 ----
                            'cmdname' => 'AE',
                            'contents' => [],
+                           'line_nr' => {},
                            'parent' => {}
                          },
***************
*** 2622,2631 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 2591,2595 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {},
***************
*** 2696,2699 ****
--- 2660,2664 ----
              'caption' => {},
              'end_command' => {},
+             'float_section' => {},
              'node_content' => [
                {}
***************
*** 2709,2713 ****
              }
            },
-           'float_section' => {},
            'line_nr' => {
              'file_name' => '',
--- 2674,2677 ----
***************
*** 2846,2849 ****
--- 2810,2814 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 2914,2917 ****
--- 2879,2887 ----
                            'cmdname' => 'enddots',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 98,
+                             'macro' => ''
+                           },
                            'parent' => {}
                          },
***************
*** 3037,3040 ****
--- 3007,3016 ----
                              {
                                'cmdname' => 'emph',
+                               'contents' => [],
+                               'line_nr' => {
+                                 'file_name' => '',
+                                 'line_nr' => 105,
+                                 'macro' => ''
+                               },
                                'parent' => {},
                                'type' => 'command_as_argument'
***************
*** 3175,3183 ****
                          'spaces_after_command' => {}
                        },
!                       'line_nr' => {
!                         'file_name' => '',
!                         'line_nr' => 105,
!                         'macro' => ''
!                       },
                        'parent' => {}
                      },
--- 3151,3155 ----
                          'spaces_after_command' => {}
                        },
!                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 3445,3474 ****
                            {
                              'contents' => [],
-                             'parent' => {},
                              'type' => 'bracketed_multitable_prototype'
                            },
                            {
                              'contents' => [],
-                             'parent' => {},
                              'type' => 'bracketed_multitable_prototype'
                            }
                          ],
-                         'prototypes_line' => [
-                           {
-                             'text' => ' ',
-                             'type' => 'prototype_space'
-                           },
-                           {},
-                           {
-                             'text' => ' ',
-                             'type' => 'prototype_space'
-                           },
-                           {},
-                           {
-                             'text' => '
- ',
-                             'type' => 'prototype_space'
-                           }
-                         ],
                          'spaces_after_command' => {}
                        },
--- 3417,3427 ----
***************
*** 3525,3529 ****
                                'index_at_command' => 'cindex',
                                'index_name' => 'cp',
-                               'index_prefix' => 'c',
                                'index_type_command' => 'cindex',
                                'key' => 'float example in caption 2',
--- 3478,3481 ----
***************
*** 3577,3580 ****
--- 3529,3538 ----
                              {
                                'cmdname' => 'minus',
+                               'contents' => [],
+                               'line_nr' => {
+                                 'file_name' => '',
+                                 'line_nr' => 119,
+                                 'macro' => ''
+                               },
                                'parent' => {},
                                'type' => 'command_as_argument'
***************
*** 3684,3692 ****
                          'spaces_after_command' => {}
                        },
!                       'line_nr' => {
!                         'file_name' => '',
!                         'line_nr' => 119,
!                         'macro' => ''
!                       },
                        'parent' => {}
                      },
--- 3642,3646 ----
                          'spaces_after_command' => {}
                        },
!                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 3721,3729 ****
                            {}
                          ],
!                         'normalized' => 'Anchor-in-caption-2',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 3675,3679 ----
                            {}
                          ],
!                         'normalized' => 'Anchor-in-caption-2'
                        },
                        'line_nr' => {
***************
*** 3735,3738 ****
--- 3685,3689 ----
                      },
                      {
+                       'parent' => {},
                        'text' => '
  ',
***************
*** 3792,3799 ****
                                ],
                                'normalized' => 'Top'
-                             },
-                             'spaces_before_argument' => {
-                               'text' => '',
-                               'type' => 'empty_spaces_before_argument'
                              }
                            },
--- 3743,3746 ----
***************
*** 3836,3846 ****
                            'cmdname' => 'footnote',
                            'contents' => [],
-                           'extra' => {
-                             'spaces_before_argument' => {
-                               'parent' => {},
-                               'text' => '',
-                               'type' => 'empty_spaces_before_argument'
-                             }
-                           },
                            'line_nr' => {
                              'file_name' => '',
--- 3783,3786 ----
***************
*** 3877,3880 ****
--- 3817,3825 ----
                            'cmdname' => 'TeX',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 131,
+                             'macro' => ''
+                           },
                            'parent' => {}
                          },
***************
*** 3909,3912 ****
--- 3854,3859 ----
                                            ],
                                            'cmdname' => '\'',
+                                           'contents' => [],
+                                           'line_nr' => {},
                                            'parent' => {}
                                          },
***************
*** 3930,3938 ****
                                                    'cmdname' => 'dotless',
                                                    'contents' => [],
!                                                   'line_nr' => {
!                                                     'file_name' => '',
!                                                     'line_nr' => 131,
!                                                     'macro' => ''
!                                                   },
                                                    'parent' => {}
                                                  }
--- 3877,3881 ----
                                                    'cmdname' => 'dotless',
                                                    'contents' => [],
!                                                   'line_nr' => {},
                                                    'parent' => {}
                                                  }
***************
*** 3977,3985 ****
                                          {}
                                        ]
!                                     ],
!                                     'spaces_before_argument' => {
!                                       'text' => '',
!                                       'type' => 'empty_spaces_before_argument'
!                                     }
                                    },
                                    'line_nr' => {},
--- 3920,3924 ----
                                          {}
                                        ]
!                                     ]
                                    },
                                    'line_nr' => {},
***************
*** 4084,4087 ****
--- 4023,4027 ----
                            'cmdname' => 'AE',
                            'contents' => [],
+                           'line_nr' => {},
                            'parent' => {}
                          },
***************
*** 4106,4114 ****
                  'spaces_before_argument' => {}
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 98,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 4046,4050 ----
                  'spaces_before_argument' => {}
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 4177,4180 ****
--- 4113,4117 ----
              'caption' => {},
              'end_command' => {},
+             'float_section' => {},
              'node_content' => [
                {}
***************
*** 4189,4193 ****
              }
            },
-           'float_section' => {},
            'line_nr' => {
              'file_name' => '',
--- 4126,4129 ----
***************
*** 4233,4240 ****
                    ],
                    'normalized' => 'text-with-a-lot-of-features'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 4169,4172 ----
***************
*** 4337,4340 ****
--- 4269,4273 ----
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
+ $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'args'}[1];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'args'}[1];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'args'}[1];
***************
*** 4396,4399 ****
--- 4329,4333 ----
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'extra'}{'end_command'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'contents'}[1];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'extra'}{'spaces_after_command'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[0];
+ $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[8]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
***************
*** 4424,4427 ****
--- 4358,4362 ----
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[10]{'extra'}{'end_command'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[10]{'contents'}[1];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[10]{'extra'}{'spaces_after_command'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0];
+ $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[10]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[10]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[11]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
***************
*** 4441,4445 ****
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[12]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[12]{'contents'}[4]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[12]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[12]{'contents'}[4];
- $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[12]{'contents'}[4]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[12]{'contents'}[4]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[12]{'contents'}[4]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[12];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[12]{'contents'}[5]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[12];
--- 4376,4379 ----
***************
*** 4452,4482 ****
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[3]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[4]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[4];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[4]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[4]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[5]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[6]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[6];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[6]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[6]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[7]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14];
--- 4386,4418 ----
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+ $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+ $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[3]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[4]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[4];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[4]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[4]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[5]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[6]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[6];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[6]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[6]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[7]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14];
***************
*** 4489,4492 ****
--- 4425,4429 ----
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[14]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[15]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[15];
+ $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[15]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[15]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[16]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14];
***************
*** 4521,4524 ****
--- 4458,4462 ----
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[4]{'extra'}{'node_content'}[0] = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0];
+ $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[7];
***************
*** 4554,4557 ****
--- 4492,4496 ----
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[8]{'extra'}{'end_command'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[8]{'contents'}[1];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[8]{'extra'}{'spaces_after_command'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
+ $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0];
***************
*** 4606,4614 ****
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'extra'}{'end_command'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'contents'}[1];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'extra'}{'prototypes'}[1]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'args'}[0];
- $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'extra'}{'prototypes_line'}[1] = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[1];
- $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'extra'}{'prototypes_line'}[3] = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[3];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'extra'}{'spaces_after_command'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0];
--- 4545,4549 ----
***************
*** 4654,4657 ****
--- 4589,4593 ----
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[15]{'extra'}{'end_command'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[15]{'contents'}[1];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[15]{'extra'}{'spaces_after_command'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[15]{'args'}[0]{'contents'}[0];
+ $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[15]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[15]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[15]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[16]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0];
***************
*** 4671,4675 ****
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[17]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[17]{'contents'}[4]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[17]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[17]{'contents'}[4];
- $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[17]{'contents'}[4]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[17]{'contents'}[4]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[17]{'contents'}[4]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[17];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[17]{'contents'}[5]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[17];
--- 4607,4610 ----
***************
*** 4682,4712 ****
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[3]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[4]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[4];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[4]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[4]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[5]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[6]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[6];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[6]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[6]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[7]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19];
--- 4617,4649 ----
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+ $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+ $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[3]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[4]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[4];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[4]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[4]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[5]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[6]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[6];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[6]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[6]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[7]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19];
***************
*** 4719,4722 ****
--- 4656,4660 ----
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[14]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[15]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[15];
+ $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[15]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[15]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[16]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19];
***************
*** 4725,4728 ****
--- 4663,4667 ----
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'extra'}{'float'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'extra'}{'spaces_before_argument'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[0];
+ $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[1]{'contents'}[1]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
***************
*** 4734,4764 ****
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[4];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[6];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[6]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0];
--- 4673,4705 ----
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+ $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+ $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[4];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[6];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[6]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0];
***************
*** 4771,4774 ****
--- 4712,4716 ----
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[14]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[15]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[15];
+ $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[15]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[15]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[16]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0];
***************
*** 4776,4781 ****
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'extra'}{'float'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[20]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
--- 4718,4722 ----
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'extra'}{'float'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
! $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[20]{'parent'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
***************
*** 4793,4801 ****
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'extra'}{'caption'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'extra'}{'end_command'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[22];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'extra'}{'node_content'}[0] = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'args'}[1]{'contents'}[1];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'extra'}{'shortcaption'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'extra'}{'spaces_after_command'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'extra'}{'type'}{'content'}[0] = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[1];
- $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'float_section'} = $result_trees{'complex_float'}{'contents'}[2];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'parent'} = $result_trees{'complex_float'}{'contents'}[2];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'parent'} = $result_trees{'complex_float'}{'contents'}[2];
--- 4734,4742 ----
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'extra'}{'caption'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'extra'}{'end_command'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[22];
+ $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'extra'}{'float_section'} = $result_trees{'complex_float'}{'contents'}[2];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'extra'}{'node_content'}[0] = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'args'}[1]{'contents'}[1];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'extra'}{'shortcaption'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'extra'}{'spaces_after_command'} = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'extra'}{'type'}{'content'}[0] = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[1];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'parent'} = $result_trees{'complex_float'}{'contents'}[2];
  $result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'parent'} = $result_trees{'complex_float'}{'contents'}[2];
***************
*** 4822,4825 ****
--- 4763,4767 ----
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1];
+ $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'args'}[1];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'args'}[1];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'args'}[1];
***************
*** 4884,4887 ****
--- 4826,4830 ----
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'extra'}{'end_command'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'contents'}[1];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'extra'}{'spaces_after_command'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
+ $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0];
***************
*** 4936,4944 ****
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'extra'}{'end_command'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'contents'}[1];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'extra'}{'prototypes'}[1]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0];
- $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'extra'}{'prototypes_line'}[1] = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[1];
- $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'extra'}{'prototypes_line'}[3] = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[3];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'extra'}{'spaces_after_command'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0];
--- 4879,4883 ----
***************
*** 4984,4987 ****
--- 4923,4927 ----
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[12]{'extra'}{'end_command'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[12]{'contents'}[1];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[12]{'extra'}{'spaces_after_command'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0];
+ $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0];
***************
*** 4991,4994 ****
--- 4931,4935 ----
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[14]{'extra'}{'node_content'}[0] = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0];
+ $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[15]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[16]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[17]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[17];
***************
*** 5007,5011 ****
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[17]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[17]{'contents'}[4]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[17]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[17]{'contents'}[4];
- $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[17]{'contents'}[4]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[17]{'contents'}[4]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[17]{'contents'}[4]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[17];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[17]{'contents'}[5]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[17];
--- 4948,4951 ----
***************
*** 5018,5048 ****
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
! $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0];
! $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
! $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2];
! $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[3]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[4]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[4];
! $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[4]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[4]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[5]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[6]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[6];
! $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[6]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[6]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[7]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19];
--- 4958,4990 ----
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+ $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+ $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
! $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0];
! $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
! $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2];
! $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[3]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[4]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[4];
! $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[4]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[4]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[5]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[6]{'args'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[6];
! $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[6]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[6]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[7]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19];
***************
*** 5055,5058 ****
--- 4997,5001 ----
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[14]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[15]{'args'}[0]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[15];
+ $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[15]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[0]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[15]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[16]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19];
***************
*** 5061,5064 ****
--- 5004,5008 ----
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'extra'}{'float'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'extra'}{'spaces_before_argument'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
+ $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'line_nr'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'contents'}[1]{'line_nr'};
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1];
***************
*** 5076,5083 ****
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'extra'}{'caption'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[6];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'args'}[1]{'contents'}[1];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'extra'}{'type'}{'content'}[0] = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1];
- $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'float_section'} = $result_trees{'complex_float'}{'contents'}[4];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'complex_float'}{'contents'}[4];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[2]{'parent'} = $result_trees{'complex_float'}{'contents'}[4];
--- 5020,5027 ----
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'extra'}{'caption'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[6];
+ $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'extra'}{'float_section'} = $result_trees{'complex_float'}{'contents'}[4];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'args'}[1]{'contents'}[1];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'extra'}{'type'}{'content'}[0] = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'complex_float'}{'contents'}[4];
  $result_trees{'complex_float'}{'contents'}[4]{'contents'}[2]{'parent'} = $result_trees{'complex_float'}{'contents'}[4];
***************
*** 5414,5426 ****
            }
          },
          'normalized' => 'text-with-a-lot-of-features',
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 5358,5371 ----
            }
          },
+         'float_section' => {
+           'cmdname' => 'top',
+           'extra' => {},
+           'level' => 0
+         },
          'normalized' => 'text-with-a-lot-of-features',
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 5434,5442 ****
          }
        },
-       'float_section' => {
-         'cmdname' => 'top',
-         'extra' => {},
-         'level' => 0
-       },
        'number' => 1
      },
--- 5379,5382 ----
***************
*** 5462,5465 ****
--- 5402,5411 ----
            }
          },
+         'float_section' => {
+           'cmdname' => 'chapter',
+           'extra' => {},
+           'level' => 1,
+           'number' => 1
+         },
          'normalized' => 'float-with-a-lot-of-features-and-no-shortcaption',
          'type' => {
***************
*** 5472,5481 ****
          }
        },
-       'float_section' => {
-         'cmdname' => 'chapter',
-         'extra' => {},
-         'level' => 1,
-         'number' => 1
-       },
        'number' => '1.1'
      }
--- 5418,5421 ----
diff -Nrc2 texinfo-6.1/tp/t/results/float/empty_listoffloats_with_floats.pl texinfo-6.3/tp/t/results/float/empty_listoffloats_with_floats.pl
*** texinfo-6.1/tp/t/results/float/empty_listoffloats_with_floats.pl	2016-01-22 07:49:57.000000000 +0000
--- texinfo-6.3/tp/t/results/float/empty_listoffloats_with_floats.pl	2016-08-02 18:44:36.000000000 +0100
***************
*** 33,36 ****
--- 33,37 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 156,159 ****
--- 157,161 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 209,218 ****
            'contents' => [],
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'parent' => {},
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 211,215 ----
            'contents' => [],
            'extra' => {
!             'float' => {}
            },
            'line_nr' => {
***************
*** 433,442 ****
            'contents' => [],
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'parent' => {},
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 430,434 ----
            'contents' => [],
            'extra' => {
!             'float' => {}
            },
            'line_nr' => {
***************
*** 555,558 ****
--- 547,551 ----
  $result_trees{'empty_listoffloats_with_floats'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'empty_listoffloats_with_floats'}{'contents'}[1]{'args'}[0];
  $result_trees{'empty_listoffloats_with_floats'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'empty_listoffloats_with_floats'}{'contents'}[1];
+ $result_trees{'empty_listoffloats_with_floats'}{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'empty_listoffloats_with_floats'}{'contents'}[1]{'args'}[1];
  $result_trees{'empty_listoffloats_with_floats'}{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'empty_listoffloats_with_floats'}{'contents'}[1]{'args'}[1];
  $result_trees{'empty_listoffloats_with_floats'}{'contents'}[1]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'empty_listoffloats_with_floats'}{'contents'}[1]{'args'}[1];
***************
*** 577,580 ****
--- 570,574 ----
  $result_trees{'empty_listoffloats_with_floats'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'empty_listoffloats_with_floats'}{'contents'}[3]{'args'}[0];
  $result_trees{'empty_listoffloats_with_floats'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'empty_listoffloats_with_floats'}{'contents'}[3];
+ $result_trees{'empty_listoffloats_with_floats'}{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'empty_listoffloats_with_floats'}{'contents'}[3]{'args'}[1];
  $result_trees{'empty_listoffloats_with_floats'}{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'empty_listoffloats_with_floats'}{'contents'}[3]{'args'}[1];
  $result_trees{'empty_listoffloats_with_floats'}{'contents'}[3]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'empty_listoffloats_with_floats'}{'contents'}[3]{'args'}[1];
***************
*** 586,590 ****
  $result_trees{'empty_listoffloats_with_floats'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'empty_listoffloats_with_floats'}{'contents'}[3]{'contents'}[1];
  $result_trees{'empty_listoffloats_with_floats'}{'contents'}[3]{'contents'}[1]{'extra'}{'float'} = $result_trees{'empty_listoffloats_with_floats'}{'contents'}[3];
- $result_trees{'empty_listoffloats_with_floats'}{'contents'}[3]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'empty_listoffloats_with_floats'}{'contents'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'empty_listoffloats_with_floats'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'empty_listoffloats_with_floats'}{'contents'}[3];
  $result_trees{'empty_listoffloats_with_floats'}{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'empty_listoffloats_with_floats'}{'contents'}[3];
--- 580,583 ----
***************
*** 628,632 ****
  $result_trees{'empty_listoffloats_with_floats'}{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'empty_listoffloats_with_floats'}{'contents'}[7]{'contents'}[2];
  $result_trees{'empty_listoffloats_with_floats'}{'contents'}[7]{'contents'}[2]{'extra'}{'float'} = $result_trees{'empty_listoffloats_with_floats'}{'contents'}[7];
- $result_trees{'empty_listoffloats_with_floats'}{'contents'}[7]{'contents'}[2]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'empty_listoffloats_with_floats'}{'contents'}[7]{'contents'}[2]{'args'}[0];
  $result_trees{'empty_listoffloats_with_floats'}{'contents'}[7]{'contents'}[2]{'parent'} = $result_trees{'empty_listoffloats_with_floats'}{'contents'}[7];
  $result_trees{'empty_listoffloats_with_floats'}{'contents'}[7]{'contents'}[3]{'parent'} = $result_trees{'empty_listoffloats_with_floats'}{'contents'}[7];
--- 621,624 ----
***************
*** 717,725 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 709,713 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 761,769 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 749,753 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
diff -Nrc2 texinfo-6.1/tp/t/results/float/float_copying.pl texinfo-6.3/tp/t/results/float/float_copying.pl
*** texinfo-6.1/tp/t/results/float/float_copying.pl	2016-01-22 07:49:57.000000000 +0000
--- texinfo-6.3/tp/t/results/float/float_copying.pl	2016-08-02 18:44:36.000000000 +0100
***************
*** 51,54 ****
--- 51,55 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 153,161 ****
                                                {}
                                              ],
!                                             'normalized' => 'caption-copying-footnote-anchor',
!                                             'spaces_before_argument' => {
!                                               'text' => '',
!                                               'type' => 'empty_spaces_before_argument'
!                                             }
                                            },
                                            'line_nr' => {
--- 154,158 ----
                                                {}
                                              ],
!                                             'normalized' => 'caption-copying-footnote-anchor'
                                            },
                                            'line_nr' => {
***************
*** 167,170 ****
--- 164,168 ----
                                          },
                                          {
+                                           'parent' => {},
                                            'text' => '
  ',
***************
*** 219,223 ****
                                            'index_at_command' => 'cindex',
                                            'index_name' => 'cp',
-                                           'index_prefix' => 'c',
                                            'index_type_command' => 'cindex',
                                            'key' => 'indexed caption copying footnote',
--- 217,220 ----
***************
*** 274,278 ****
                                            'index_at_command' => 'findex',
                                            'index_name' => 'fn',
-                                           'index_prefix' => 'f',
                                            'index_type_command' => 'findex',
                                            'key' => 'public domain function',
--- 271,274 ----
***************
*** 378,385 ****
                                                ],
                                                'normalized' => 'Copying-and-floats'
-                                             },
-                                             'spaces_before_argument' => {
-                                               'text' => '',
-                                               'type' => 'empty_spaces_before_argument'
                                              }
                                            },
--- 374,377 ----
***************
*** 465,473 ****
                                {}
                              ],
!                             'normalized' => 'public-domain-anchor',
!                             'spaces_before_argument' => {
!                               'text' => '',
!                               'type' => 'empty_spaces_before_argument'
!                             }
                            },
                            'line_nr' => {
--- 457,461 ----
                                {}
                              ],
!                             'normalized' => 'public-domain-anchor'
                            },
                            'line_nr' => {
***************
*** 479,482 ****
--- 467,471 ----
                          },
                          {
+                           'parent' => {},
                            'text' => '
  ',
***************
*** 521,525 ****
                                'index_at_command' => 'cindex',
                                'index_name' => 'cp',
-                               'index_prefix' => 'c',
                                'index_type_command' => 'cindex',
                                'key' => 'indexed caption',
--- 510,513 ----
***************
*** 576,580 ****
                                'index_at_command' => 'findex',
                                'index_name' => 'fn',
-                               'index_prefix' => 'f',
                                'index_type_command' => 'findex',
                                'key' => 'indexed caption function',
--- 564,567 ----
***************
*** 601,610 ****
                    'contents' => [],
                    'extra' => {
!                     'float' => {},
!                     'spaces_before_argument' => {
!                       'parent' => {},
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {},
--- 588,592 ----
                    'contents' => [],
                    'extra' => {
!                     'float' => {}
                    },
                    'line_nr' => {},
***************
*** 612,615 ****
--- 594,598 ----
                  },
                  {
+                   'parent' => {},
                    'text' => '
  ',
***************
*** 1227,1230 ****
--- 1210,1214 ----
  $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+ $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[1];
  $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[1];
  $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[1];
***************
*** 1244,1247 ****
--- 1228,1232 ----
  $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
  $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1];
+ $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1];
  $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
***************
*** 1301,1304 ****
--- 1286,1290 ----
  $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[2]{'extra'}{'node_content'}[0] = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
  $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0];
+ $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4];
  $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0];
***************
*** 1327,1333 ****
  $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3];
  $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'extra'}{'float'} = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
- $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'line_nr'} = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
  $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[5];
  $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[5]{'args'}[0];
--- 1313,1319 ----
  $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3];
  $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'extra'}{'float'} = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
  $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'line_nr'} = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+ $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'parent'} = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
  $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[5];
  $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[5]{'args'}[0];
***************
*** 1635,1643 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 1621,1625 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
diff -Nrc2 texinfo-6.1/tp/t/results/float/float_with_at_commands.pl texinfo-6.3/tp/t/results/float/float_with_at_commands.pl
*** texinfo-6.1/tp/t/results/float/float_with_at_commands.pl	2016-01-22 07:49:56.000000000 +0000
--- texinfo-6.3/tp/t/results/float/float_with_at_commands.pl	2016-08-02 18:44:35.000000000 +0100
***************
*** 38,41 ****
--- 38,47 ----
                ],
                'cmdname' => '\'',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 1,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 51,54 ****
--- 57,61 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 72,75 ****
--- 79,84 ----
                ],
                'cmdname' => '`',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 92,95 ****
--- 101,106 ----
                ],
                'cmdname' => '\'',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 137,140 ****
--- 148,157 ----
                ],
                'cmdname' => '`',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 3,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 157,160 ****
--- 174,179 ----
                ],
                'cmdname' => '\'',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 192,195 ****
--- 211,220 ----
                        ],
                        'cmdname' => '`',
+                       'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 4,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 212,215 ****
--- 237,242 ----
                        ],
                        'cmdname' => '\'',
+                       'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 230,245 ****
            'contents' => [],
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'parent' => {},
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
!           },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 4,
!             'macro' => ''
            },
            'parent' => {}
          },
--- 257,263 ----
            'contents' => [],
            'extra' => {
!             'float' => {}
            },
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 332,340 ****
          }
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 1,
!         'macro' => ''
!       },
        'number' => 1,
        'parent' => {}
--- 350,354 ----
          }
        },
!       'line_nr' => {},
        'number' => 1,
        'parent' => {}
***************
*** 382,385 ****
--- 396,405 ----
                ],
                'cmdname' => '\'',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 9,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 411,419 ****
          }
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 9,
!         'macro' => ''
!       },
        'parent' => {}
      }
--- 431,435 ----
          }
        },
!       'line_nr' => {},
        'parent' => {}
      }
***************
*** 429,439 ****
--- 445,458 ----
  $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[0];
  $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'float_with_at_commands'}{'contents'}[0];
+ $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1];
  $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1];
  $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[2];
+ $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1];
  $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1];
  $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[4]{'args'}[0];
  $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[4];
+ $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1];
  $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[5]{'parent'} = $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1];
***************
*** 448,451 ****
--- 467,471 ----
  $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0];
  $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[3];
+ $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'line_nr'} = $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'line_nr'};
  $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1];
  $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1];
***************
*** 458,461 ****
--- 478,482 ----
  $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[3];
+ $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
  $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
***************
*** 463,467 ****
  $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2];
  $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'extra'}{'float'} = $result_trees{'float_with_at_commands'}{'contents'}[0];
! $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'float_with_at_commands'}{'contents'}[0];
  $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'float_with_at_commands'}{'contents'}[0];
--- 484,488 ----
  $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2];
  $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'extra'}{'float'} = $result_trees{'float_with_at_commands'}{'contents'}[0];
! $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'float_with_at_commands'}{'contents'}[0];
  $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'float_with_at_commands'}{'contents'}[0];
***************
*** 494,497 ****
--- 515,519 ----
  $result_trees{'float_with_at_commands'}{'contents'}[0]{'extra'}{'type'}{'content'}[1] = $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[0]{'contents'}[2];
  $result_trees{'float_with_at_commands'}{'contents'}[0]{'extra'}{'type'}{'content'}[2] = $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[0]{'contents'}[3];
+ $result_trees{'float_with_at_commands'}{'contents'}[0]{'line_nr'} = $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'float_with_at_commands'}{'contents'}[0]{'parent'} = $result_trees{'float_with_at_commands'};
  $result_trees{'float_with_at_commands'}{'contents'}[1]{'parent'} = $result_trees{'float_with_at_commands'};
***************
*** 510,513 ****
--- 532,536 ----
  $result_trees{'float_with_at_commands'}{'contents'}[3]{'extra'}{'type'}{'content'}[1] = $result_trees{'float_with_at_commands'}{'contents'}[3]{'args'}[0]{'contents'}[2];
  $result_trees{'float_with_at_commands'}{'contents'}[3]{'extra'}{'type'}{'content'}[2] = $result_trees{'float_with_at_commands'}{'contents'}[3]{'args'}[0]{'contents'}[3];
+ $result_trees{'float_with_at_commands'}{'contents'}[3]{'line_nr'} = $result_trees{'float_with_at_commands'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'float_with_at_commands'}{'contents'}[3]{'parent'} = $result_trees{'float_with_at_commands'};
  
***************
*** 544,552 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 567,571 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
diff -Nrc2 texinfo-6.1/tp/t/results/float/footnote_in_caption.pl texinfo-6.3/tp/t/results/float/footnote_in_caption.pl
*** texinfo-6.1/tp/t/results/float/footnote_in_caption.pl	2016-01-22 07:49:56.000000000 +0000
--- texinfo-6.3/tp/t/results/float/footnote_in_caption.pl	2016-08-02 18:44:36.000000000 +0100
***************
*** 121,124 ****
--- 121,125 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 183,193 ****
                            'cmdname' => 'footnote',
                            'contents' => [],
-                           'extra' => {
-                             'spaces_before_argument' => {
-                               'parent' => {},
-                               'text' => '',
-                               'type' => 'empty_spaces_before_argument'
-                             }
-                           },
                            'line_nr' => {
                              'file_name' => '',
--- 184,187 ----
***************
*** 209,218 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 203,207 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {},
***************
*** 341,344 ****
--- 330,334 ----
  $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[0];
  $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3];
+ $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[1];
***************
*** 350,359 ****
  $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
- $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
  $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
  $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'float'} = $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3];
- $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'line_nr'} = $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3];
--- 340,347 ----
***************
*** 437,445 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 425,429 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
diff -Nrc2 texinfo-6.1/tp/t/results/float/footnote_in_caption_and_error.pl texinfo-6.3/tp/t/results/float/footnote_in_caption_and_error.pl
*** texinfo-6.1/tp/t/results/float/footnote_in_caption_and_error.pl	2016-01-22 07:49:56.000000000 +0000
--- texinfo-6.3/tp/t/results/float/footnote_in_caption_and_error.pl	2016-08-02 18:44:36.000000000 +0100
***************
*** 121,124 ****
--- 121,125 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 175,178 ****
--- 176,184 ----
                                        'cmdname' => 'error',
                                        'contents' => [],
+                                       'line_nr' => {
+                                         'file_name' => '',
+                                         'line_nr' => 7,
+                                         'macro' => ''
+                                       },
                                        'parent' => {}
                                      }
***************
*** 188,203 ****
                            'cmdname' => 'footnote',
                            'contents' => [],
!                           'extra' => {
!                             'spaces_before_argument' => {
!                               'parent' => {},
!                               'text' => '',
!                               'type' => 'empty_spaces_before_argument'
!                             }
!                           },
!                           'line_nr' => {
!                             'file_name' => '',
!                             'line_nr' => 7,
!                             'macro' => ''
!                           },
                            'parent' => {}
                          }
--- 194,198 ----
                            'cmdname' => 'footnote',
                            'contents' => [],
!                           'line_nr' => {},
                            'parent' => {}
                          }
***************
*** 214,223 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 209,213 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {},
***************
*** 346,349 ****
--- 336,340 ----
  $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'args'}[0];
  $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3];
+ $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'args'}[1];
***************
*** 356,366 ****
  $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
! $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
  $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
  $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'float'} = $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3];
! $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
! $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'line_nr'} = $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3];
  $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3];
--- 347,356 ----
  $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
! $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
  $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
  $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'float'} = $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3];
! $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'line_nr'} = $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3];
  $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3];
***************
*** 453,461 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 443,447 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
diff -Nrc2 texinfo-6.1/tp/t/results/float/listoffloats_with_commands.pl texinfo-6.3/tp/t/results/float/listoffloats_with_commands.pl
*** texinfo-6.1/tp/t/results/float/listoffloats_with_commands.pl	2016-01-22 07:49:56.000000000 +0000
--- texinfo-6.3/tp/t/results/float/listoffloats_with_commands.pl	2016-08-02 18:44:35.000000000 +0100
***************
*** 38,41 ****
--- 38,47 ----
                ],
                'cmdname' => '\'',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 1,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 58,61 ****
--- 64,69 ----
                ],
                'cmdname' => '`',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 89,97 ****
          }
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 1,
!         'macro' => ''
!       },
        'parent' => {}
      }
--- 97,101 ----
          }
        },
!       'line_nr' => {},
        'parent' => {}
      }
***************
*** 108,111 ****
--- 112,116 ----
  $result_trees{'listoffloats_with_commands'}{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'listoffloats_with_commands'}{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0];
  $result_trees{'listoffloats_with_commands'}{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'listoffloats_with_commands'}{'contents'}[0]{'args'}[0]{'contents'}[4];
+ $result_trees{'listoffloats_with_commands'}{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'listoffloats_with_commands'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'listoffloats_with_commands'}{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'listoffloats_with_commands'}{'contents'}[0]{'args'}[0];
  $result_trees{'listoffloats_with_commands'}{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'listoffloats_with_commands'}{'contents'}[0]{'args'}[0];
***************
*** 118,121 ****
--- 123,127 ----
  $result_trees{'listoffloats_with_commands'}{'contents'}[0]{'extra'}{'type'}{'content'}[3] = $result_trees{'listoffloats_with_commands'}{'contents'}[0]{'args'}[0]{'contents'}[4];
  $result_trees{'listoffloats_with_commands'}{'contents'}[0]{'extra'}{'type'}{'content'}[4] = $result_trees{'listoffloats_with_commands'}{'contents'}[0]{'args'}[0]{'contents'}[5];
+ $result_trees{'listoffloats_with_commands'}{'contents'}[0]{'line_nr'} = $result_trees{'listoffloats_with_commands'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'listoffloats_with_commands'}{'contents'}[0]{'parent'} = $result_trees{'listoffloats_with_commands'};
  
diff -Nrc2 texinfo-6.1/tp/t/results/float/numbering_captions_listoffloats.pl texinfo-6.3/tp/t/results/float/numbering_captions_listoffloats.pl
*** texinfo-6.1/tp/t/results/float/numbering_captions_listoffloats.pl	2016-01-22 07:49:57.000000000 +0000
--- texinfo-6.3/tp/t/results/float/numbering_captions_listoffloats.pl	2016-08-02 18:44:36.000000000 +0100
***************
*** 120,123 ****
--- 120,124 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 171,174 ****
--- 172,180 ----
                            'cmdname' => 'enddots',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 6,
+                             'macro' => ''
+                           },
                            'parent' => {}
                          }
***************
*** 188,196 ****
                  'spaces_before_argument' => {}
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 6,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 194,198 ----
                  'spaces_before_argument' => {}
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 216,219 ****
--- 218,226 ----
                            'cmdname' => 'TeX',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 7,
+                             'macro' => ''
+                           },
                            'parent' => {}
                          },
***************
*** 234,249 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
!               },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 7,
!                 'macro' => ''
                },
                'parent' => {}
              },
--- 241,247 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 306,309 ****
--- 304,308 ----
              'caption' => {},
              'end_command' => {},
+             'float_section' => {},
              'node_content' => [
                {}
***************
*** 319,323 ****
              }
            },
-           'float_section' => {},
            'line_nr' => {
              'file_name' => '',
--- 318,321 ----
***************
*** 402,411 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 400,404 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 443,452 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 436,440 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 512,515 ****
--- 500,504 ----
              'caption' => {},
              'end_command' => {},
+             'float_section' => {},
              'shortcaption' => {},
              'spaces_after_command' => {},
***************
*** 521,525 ****
              }
            },
-           'float_section' => {},
            'line_nr' => {
              'file_name' => '',
--- 510,513 ----
***************
*** 609,618 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 597,601 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 650,659 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 633,637 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 720,723 ****
--- 698,702 ----
              'caption' => {},
              'end_command' => {},
+             'float_section' => {},
              'node_content' => [
                {}
***************
*** 730,734 ****
              }
            },
-           'float_section' => {},
            'line_nr' => {
              'file_name' => '',
--- 709,712 ----
***************
*** 853,856 ****
--- 831,835 ----
              ],
              'end_command' => {},
+             'float_section' => {},
              'node_content' => [
                {}
***************
*** 862,866 ****
              }
            },
-           'float_section' => {},
            'line_nr' => {
              'file_name' => '',
--- 841,844 ----
***************
*** 956,959 ****
--- 934,938 ----
            'extra' => {
              'end_command' => {},
+             'float_section' => {},
              'spaces_after_command' => {},
              'type' => {
***************
*** 961,965 ****
              }
            },
-           'float_section' => {},
            'line_nr' => {
              'file_name' => '',
--- 940,943 ----
***************
*** 1020,1029 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 998,1002 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 1061,1070 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 1034,1038 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 1125,1128 ****
--- 1093,1097 ----
              'caption' => {},
              'end_command' => {},
+             'float_section' => {},
              'shortcaption' => {},
              'spaces_after_command' => {},
***************
*** 1131,1135 ****
              }
            },
-           'float_section' => {},
            'line_nr' => {
              'file_name' => '',
--- 1100,1103 ----
***************
*** 1219,1228 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 1187,1191 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 1260,1269 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 1223,1227 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 1330,1333 ****
--- 1288,1292 ----
              'caption' => {},
              'end_command' => {},
+             'float_section' => {},
              'node_content' => [
                {}
***************
*** 1340,1344 ****
              }
            },
-           'float_section' => {},
            'line_nr' => {
              'file_name' => '',
--- 1299,1302 ----
***************
*** 1378,1381 ****
--- 1336,1340 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 1437,1446 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 1396,1400 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 1478,1487 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 1432,1436 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 1550,1553 ****
--- 1499,1503 ----
              'caption' => {},
              'end_command' => {},
+             'float_section' => {},
              'node_content' => [
                {}
***************
*** 1563,1567 ****
              }
            },
-           'float_section' => {},
            'line_nr' => {
              'file_name' => '',
--- 1513,1516 ----
***************
*** 2056,2059 ****
--- 2005,2009 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 2115,2124 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 2065,2069 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 2187,2190 ****
--- 2132,2136 ----
              'caption' => {},
              'end_command' => {},
+             'float_section' => {},
              'node_content' => [
                {}
***************
*** 2199,2203 ****
              }
            },
-           'float_section' => {},
            'line_nr' => {
              'file_name' => '',
--- 2145,2148 ----
***************
*** 2237,2240 ****
--- 2182,2186 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 2282,2285 ****
--- 2228,2236 ----
                            'cmdname' => 'enddots',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 74,
+                             'macro' => ''
+                           },
                            'parent' => {}
                          }
***************
*** 2299,2307 ****
                  'spaces_before_argument' => {}
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 74,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 2250,2254 ----
                  'spaces_before_argument' => {}
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 2364,2367 ****
--- 2311,2315 ----
              'caption' => {},
              'end_command' => {},
+             'float_section' => {},
              'node_content' => [
                {}
***************
*** 2376,2380 ****
              }
            },
-           'float_section' => {},
            'line_nr' => {
              'file_name' => '',
--- 2324,2327 ----
***************
*** 2421,2424 ****
--- 2368,2377 ----
                    ],
                    'cmdname' => '\'',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 77,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2441,2444 ****
--- 2394,2399 ----
                    ],
                    'cmdname' => '`',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 2454,2457 ****
--- 2409,2413 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 2494,2497 ****
--- 2450,2459 ----
                    ],
                    'cmdname' => '\'',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 78,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2514,2517 ****
--- 2476,2481 ----
                    ],
                    'cmdname' => '`',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 2555,2558 ****
--- 2519,2528 ----
                            ],
                            'cmdname' => '\'',
+                           'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 80,
+                             'macro' => ''
+                           },
                            'parent' => {}
                          },
***************
*** 2575,2578 ****
--- 2545,2550 ----
                            ],
                            'cmdname' => '`',
+                           'contents' => [],
+                           'line_nr' => {},
                            'parent' => {}
                          },
***************
*** 2593,2608 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
!               },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 80,
!                 'macro' => ''
                },
                'parent' => {}
              },
--- 2565,2571 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 2669,2672 ****
--- 2632,2636 ----
              'caption' => {},
              'end_command' => {},
+             'float_section' => {},
              'node_content' => [
                {}
***************
*** 2685,2694 ****
              }
            },
!           'float_section' => {},
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 77,
!             'macro' => ''
!           },
            'number' => '1.1',
            'parent' => {}
--- 2649,2653 ----
              }
            },
!           'line_nr' => {},
            'number' => '1.1',
            'parent' => {}
***************
*** 2774,2783 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 2733,2737 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 2815,2824 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 2769,2773 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 2885,2888 ****
--- 2834,2838 ----
              'caption' => {},
              'end_command' => {},
+             'float_section' => {},
              'node_content' => [
                {}
***************
*** 2895,2899 ****
              }
            },
-           'float_section' => {},
            'line_nr' => {
              'file_name' => '',
--- 2845,2848 ----
***************
*** 2933,2936 ****
--- 2882,2886 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 2992,3001 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 2942,2946 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 3033,3042 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 2978,2982 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 3105,3108 ****
--- 3045,3049 ----
              'caption' => {},
              'end_command' => {},
+             'float_section' => {},
              'node_content' => [
                {}
***************
*** 3118,3122 ****
              }
            },
-           'float_section' => {},
            'line_nr' => {
              'file_name' => '',
--- 3059,3062 ----
***************
*** 3384,3387 ****
--- 3324,3328 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 3479,3482 ****
--- 3420,3424 ----
              ],
              'end_command' => {},
+             'float_section' => {},
              'node_content' => [
                {}
***************
*** 3491,3495 ****
              }
            },
-           'float_section' => {},
            'line_nr' => {
              'file_name' => '',
--- 3433,3436 ----
***************
*** 3751,3754 ****
--- 3692,3696 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 3804,3813 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 3746,3750 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 3845,3854 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 3782,3786 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 3917,3920 ****
--- 3849,3853 ----
              'caption' => {},
              'end_command' => {},
+             'float_section' => {},
              'node_content' => [
                {}
***************
*** 3930,3934 ****
              }
            },
-           'float_section' => {},
            'line_nr' => {
              'file_name' => '',
--- 3863,3866 ----
***************
*** 4013,4022 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 3945,3949 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 4054,4063 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 3981,3985 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 4124,4127 ****
--- 4046,4050 ----
              'caption' => {},
              'end_command' => {},
+             'float_section' => {},
              'node_content' => [
                {}
***************
*** 4134,4138 ****
              }
            },
-           'float_section' => {},
            'line_nr' => {
              'file_name' => '',
--- 4057,4060 ----
***************
*** 4283,4286 ****
--- 4205,4209 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 4336,4345 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 4259,4263 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 4377,4386 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 4295,4299 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 4449,4452 ****
--- 4362,4366 ----
              'caption' => {},
              'end_command' => {},
+             'float_section' => {},
              'node_content' => [
                {}
***************
*** 4462,4466 ****
              }
            },
-           'float_section' => {},
            'line_nr' => {
              'file_name' => '',
--- 4376,4379 ----
***************
*** 4721,4724 ****
--- 4634,4638 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 4774,4783 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 4688,4692 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 4815,4824 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 4724,4728 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 4887,4890 ****
--- 4791,4795 ----
              'caption' => {},
              'end_command' => {},
+             'float_section' => {},
              'node_content' => [
                {}
***************
*** 4900,4904 ****
              }
            },
-           'float_section' => {},
            'line_nr' => {
              'file_name' => '',
--- 4805,4808 ----
***************
*** 5038,5041 ****
--- 4942,4946 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 5091,5100 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 4996,5000 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 5132,5141 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 5032,5036 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 5204,5207 ****
--- 5099,5103 ----
              'caption' => {},
              'end_command' => {},
+             'float_section' => {},
              'node_content' => [
                {}
***************
*** 5217,5221 ****
              }
            },
-           'float_section' => {},
            'line_nr' => {
              'file_name' => '',
--- 5113,5116 ----
***************
*** 5306,5315 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 5201,5205 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 5347,5356 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 5237,5241 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 5417,5420 ****
--- 5302,5306 ----
              'caption' => {},
              'end_command' => {},
+             'float_section' => {},
              'node_content' => [
                {}
***************
*** 5427,5431 ****
              }
            },
-           'float_section' => {},
            'line_nr' => {
              'file_name' => '',
--- 5313,5316 ----
***************
*** 5564,5567 ****
--- 5449,5453 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 5623,5632 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 5509,5513 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 5664,5673 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 5545,5549 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 5736,5739 ****
--- 5612,5616 ----
              'caption' => {},
              'end_command' => {},
+             'float_section' => {},
              'node_content' => [
                {}
***************
*** 5749,5753 ****
              }
            },
-           'float_section' => {},
            'line_nr' => {
              'file_name' => '',
--- 5626,5629 ----
***************
*** 5897,5904 ****
                    ],
                    'normalized' => 'text-in-section'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 5773,5776 ----
***************
*** 5946,5953 ****
                    ],
                    'normalized' => 'text-in-chapter'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 5818,5821 ----
***************
*** 5991,5998 ****
                    ],
                    'normalized' => 'text-with-a-lot-of-features'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 5859,5862 ----
***************
*** 6041,6044 ****
--- 5905,5909 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 6055,6058 ****
--- 5920,5924 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 6087,6094 ****
                    ],
                    'normalized' => 'text-with-a-lot-of-features'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 5953,5956 ----
***************
*** 6137,6140 ****
--- 5999,6003 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 6151,6154 ****
--- 6014,6018 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 6165,6168 ****
--- 6029,6033 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 6199,6206 ****
                    ],
                    'normalized' => 'text-with-a-lot-of-features'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 6064,6067 ----
***************
*** 6249,6252 ****
--- 6110,6114 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 6263,6266 ****
--- 6125,6129 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 6282,6285 ****
--- 6145,6149 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 6317,6324 ****
                    ],
                    'normalized' => 'text-with-a-lot-of-features'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 6181,6184 ----
***************
*** 6378,6385 ****
                    ],
                    'normalized' => 'label-but-no-type'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 6238,6241 ----
***************
*** 6480,6483 ****
--- 6336,6345 ----
                    ],
                    'cmdname' => '\'',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 196,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 6500,6503 ****
--- 6362,6367 ----
                    ],
                    'cmdname' => '`',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 6531,6539 ****
              }
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 196,
!             'macro' => ''
!           },
            'parent' => {}
          },
--- 6395,6399 ----
              }
            },
!           'line_nr' => {},
            'parent' => {}
          },
***************
*** 6594,6597 ****
--- 6454,6458 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'args'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'args'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'args'}[1];
***************
*** 6606,6609 ****
--- 6467,6471 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_before_argument'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[1]{'line_nr'};
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1];
***************
*** 6614,6618 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1];
! $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1];
--- 6476,6480 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1];
! $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'line_nr'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1];
***************
*** 6629,6637 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'args'}[1]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'extra'}{'shortcaption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'extra'}{'type'}{'content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
--- 6491,6499 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'extra'}{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'args'}[1]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'extra'}{'shortcaption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'extra'}{'type'}{'content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
***************
*** 6648,6652 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3];
--- 6510,6513 ----
***************
*** 6655,6659 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[5]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3];
--- 6516,6519 ----
***************
*** 6669,6676 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[6];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'extra'}{'shortcaption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'extra'}{'type'}{'content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[4]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
--- 6529,6536 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[6];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'extra'}{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'extra'}{'shortcaption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'extra'}{'type'}{'content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[4]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
***************
*** 6688,6692 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5];
--- 6548,6551 ----
***************
*** 6695,6699 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[5]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5];
--- 6554,6557 ----
***************
*** 6709,6716 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[6];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'args'}[1]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'extra'}{'shortcaption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[6]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
--- 6567,6574 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[6];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'extra'}{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'args'}[1]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'extra'}{'shortcaption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[6]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
***************
*** 6735,6741 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'extra'}{'block_command_line_contents'}[1][0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'args'}[1]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'args'}[1]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'}[0];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[9]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
--- 6593,6599 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'extra'}{'block_command_line_contents'}[1][0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'args'}[1]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'contents'}[2];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'extra'}{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'args'}[1]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[9]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
***************
*** 6755,6760 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[11];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[11]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[11]{'contents'}[3];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[11]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[11]{'contents'}[0];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[11]{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[11]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[12]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
--- 6613,6618 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[11];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[11]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[11]{'contents'}[3];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[11]{'extra'}{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[11]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[11]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[11]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[12]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
***************
*** 6767,6771 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13];
--- 6625,6628 ----
***************
*** 6774,6778 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13];
--- 6631,6634 ----
***************
*** 6787,6793 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[6];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'extra'}{'shortcaption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[0];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[14]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
--- 6643,6649 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[6];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'extra'}{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'extra'}{'shortcaption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[14]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
***************
*** 6805,6809 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15];
--- 6661,6664 ----
***************
*** 6812,6816 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[4]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[4]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[4]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[4]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[5]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15];
--- 6667,6670 ----
***************
*** 6826,6833 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[6];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'args'}[1]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'extra'}{'shortcaption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'contents'}[0];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[16]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
--- 6680,6687 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[6];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'extra'}{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'args'}[1]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'extra'}{'shortcaption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[16]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
***************
*** 6836,6839 ****
--- 6690,6694 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'args'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'args'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'args'}[1];
***************
*** 6846,6850 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[2]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[2]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[2]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17];
--- 6701,6704 ----
***************
*** 6853,6857 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[4]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[4]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[4]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[4]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[5]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17];
--- 6707,6710 ----
***************
*** 6868,6876 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[6];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'args'}[1]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'extra'}{'shortcaption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'extra'}{'type'}{'content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'}[1];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[18]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
--- 6721,6729 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[6];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'extra'}{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'args'}[1]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'extra'}{'shortcaption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'extra'}{'type'}{'content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[18]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
***************
*** 6961,6964 ****
--- 6814,6818 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'args'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'args'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'args'}[1];
***************
*** 6971,6975 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1];
--- 6825,6828 ----
***************
*** 6986,6993 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'args'}[1]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'extra'}{'type'}{'content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
--- 6839,6846 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'contents'}[4];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'extra'}{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'args'}[1]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'extra'}{'type'}{'content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
***************
*** 6996,6999 ****
--- 6849,6853 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'args'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'args'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'args'}[1];
***************
*** 7007,7010 ****
--- 6861,6865 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'spaces_before_argument'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'line_nr'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1]{'line_nr'};
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3];
***************
*** 7021,7028 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'args'}[1]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'extra'}{'type'}{'content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[1];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[4]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
--- 6876,6883 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'contents'}[2];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'extra'}{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'args'}[1]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'extra'}{'type'}{'content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[4]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
***************
*** 7036,7042 ****
--- 6891,6899 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[4]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[4];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[1];
***************
*** 7049,7052 ****
--- 6906,6910 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[3];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[0];
***************
*** 7060,7063 ****
--- 6918,6922 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[3];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
***************
*** 7065,7069 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5];
! $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5];
--- 6924,6928 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5];
! $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'line_nr'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5];
***************
*** 7084,7087 ****
--- 6943,6947 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[4];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'extra'}{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[1]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0];
***************
*** 7091,7095 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'extra'}{'type'}{'content'}[3] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'extra'}{'type'}{'content'}[4] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[5];
! $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[6]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
--- 6951,6955 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'extra'}{'type'}{'content'}[3] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'extra'}{'type'}{'content'}[4] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[5];
! $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'line_nr'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[6]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
***************
*** 7107,7111 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7];
--- 6967,6970 ----
***************
*** 7114,7118 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7];
--- 6973,6976 ----
***************
*** 7128,7135 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[6];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'args'}[1]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'extra'}{'shortcaption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[0];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[8]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
--- 6986,6993 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[6];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'extra'}{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'args'}[1]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'extra'}{'shortcaption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[8]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
***************
*** 7138,7141 ****
--- 6996,7000 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'args'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'args'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'args'}[1];
***************
*** 7148,7152 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9];
--- 7007,7010 ----
***************
*** 7155,7159 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9];
--- 7013,7016 ----
***************
*** 7170,7178 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[6];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'args'}[1]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'extra'}{'shortcaption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'extra'}{'type'}{'content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'contents'}[1];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[10]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
--- 7027,7035 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[6];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'extra'}{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'args'}[1]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'extra'}{'shortcaption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'extra'}{'type'}{'content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[10]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
***************
*** 7223,7226 ****
--- 7080,7084 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'args'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'args'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'args'}[1];
***************
*** 7241,7248 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'extra'}{'block_command_line_contents'}[1][0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'args'}[1]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'contents'}[3];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'args'}[1]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'extra'}{'type'}{'content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[1];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[6];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[6];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[6];
--- 7099,7106 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'extra'}{'block_command_line_contents'}[1][0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'args'}[1]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'contents'}[3];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'extra'}{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[6];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'args'}[1]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'extra'}{'type'}{'content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[6];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[6];
***************
*** 7292,7295 ****
--- 7150,7154 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'args'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'args'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'args'}[1];
***************
*** 7301,7305 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2];
--- 7160,7163 ----
***************
*** 7308,7312 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[3];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[3]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[3]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[4]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2];
--- 7166,7169 ----
***************
*** 7323,7331 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[3];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[5];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'args'}[1]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'extra'}{'shortcaption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'extra'}{'type'}{'content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[1];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3];
--- 7180,7188 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[3];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[5];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'extra'}{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'args'}[1]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'extra'}{'shortcaption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'extra'}{'type'}{'content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3];
***************
*** 7342,7346 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[2]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[2]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[2]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3];
--- 7199,7202 ----
***************
*** 7349,7353 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[4]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[4]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[4]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[4]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[5]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3];
--- 7205,7208 ----
***************
*** 7363,7370 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[6];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'args'}[1]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'extra'}{'shortcaption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[0];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[4]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8];
--- 7218,7225 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[6];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'extra'}{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'args'}[1]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'extra'}{'shortcaption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[4]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8];
***************
*** 7393,7396 ****
--- 7248,7252 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'args'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'args'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'args'}[1];
***************
*** 7402,7406 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[1]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[1]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2];
--- 7258,7261 ----
***************
*** 7409,7413 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[3];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[3]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[3]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[4]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2];
--- 7264,7267 ----
***************
*** 7424,7432 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[3];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[5];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'args'}[1]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'extra'}{'shortcaption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'extra'}{'type'}{'content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[1];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10];
--- 7278,7286 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[3];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[5];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'extra'}{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'args'}[1]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'extra'}{'shortcaption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'extra'}{'type'}{'content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10];
***************
*** 7476,7479 ****
--- 7330,7334 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'args'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'args'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'args'}[1];
***************
*** 7485,7489 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[1]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[1]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2];
--- 7340,7343 ----
***************
*** 7492,7496 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[3];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[3]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[3]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[4]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2];
--- 7346,7349 ----
***************
*** 7507,7515 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[3];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[5];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'args'}[1]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'extra'}{'shortcaption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'args'}[0]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'extra'}{'type'}{'content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'args'}[0]{'contents'}[1];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12];
--- 7360,7368 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[3];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[5];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'extra'}{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'args'}[1]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'extra'}{'shortcaption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'args'}[0]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'extra'}{'type'}{'content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'args'}[0]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12];
***************
*** 7536,7539 ****
--- 7389,7393 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'args'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'args'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'args'}[1];
***************
*** 7545,7549 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[1]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1];
--- 7399,7402 ----
***************
*** 7552,7556 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[3];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[3]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[3]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[3]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1];
--- 7405,7408 ----
***************
*** 7567,7575 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[3];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[5];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'args'}[1]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'extra'}{'shortcaption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'extra'}{'type'}{'content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[1];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14];
--- 7419,7427 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[3];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[5];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'extra'}{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'args'}[1]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'extra'}{'shortcaption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'extra'}{'type'}{'content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14];
***************
*** 7587,7591 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[2]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[2]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[2]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3];
--- 7439,7442 ----
***************
*** 7594,7598 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[4]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[4]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[4]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[4]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[5]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3];
--- 7445,7448 ----
***************
*** 7608,7615 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[6];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'args'}[1]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'extra'}{'shortcaption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'args'}[0]{'contents'}[0];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[4]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14];
--- 7458,7465 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[6];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'extra'}{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'args'}[1]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'extra'}{'shortcaption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'args'}[0]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[4]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14];
***************
*** 7636,7639 ****
--- 7486,7490 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'args'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'args'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'args'}[1];
***************
*** 7646,7650 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[2]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[2]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1];
--- 7497,7500 ----
***************
*** 7653,7657 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[4]{'extra'}{'float'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[4]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[4]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1];
--- 7503,7506 ----
***************
*** 7668,7676 ****
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[6];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'args'}[1]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'extra'}{'shortcaption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'extra'}{'type'}{'content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[1];
- $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16];
--- 7517,7525 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'extra'}{'caption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[6];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'extra'}{'float_section'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'args'}[1]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'extra'}{'shortcaption'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'extra'}{'type'}{'content'}[0] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16];
***************
*** 7721,7726 ****
--- 7570,7577 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[3]{'contents'}[1];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'args'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'args'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[3]{'contents'}[1];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'args'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'args'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[3]{'contents'}[1];
***************
*** 7737,7744 ****
--- 7588,7598 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[5]{'contents'}[1];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[5]{'contents'}[1];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[5]{'contents'}[1];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[3];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[3];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[5]{'contents'}[1];
***************
*** 7755,7763 ****
--- 7609,7620 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[7]{'contents'}[1]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[7]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[7]{'contents'}[1];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[7]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[7]{'contents'}[1]{'args'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[7]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[7]{'contents'}[1]{'args'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[7]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[7]{'contents'}[1];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[7]{'contents'}[1]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[7]{'contents'}[1]{'args'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[7]{'contents'}[1]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[7]{'contents'}[1]{'args'}[2];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[7]{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[7]{'contents'}[1];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[7]{'contents'}[1]{'args'}[3]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[7]{'contents'}[1];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[7]{'contents'}[1]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[7]{'contents'}[1]{'args'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[7]{'contents'}[1]{'args'}[4]{'contents'}[1]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[7]{'contents'}[1]{'args'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[7]{'contents'}[1]{'args'}[4]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[7]{'contents'}[1];
***************
*** 7798,7801 ****
--- 7655,7659 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'args'}[0]{'contents'}[4]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'args'}[0]{'contents'}[4];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'args'}[0];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'args'}[0];
***************
*** 7808,7811 ****
--- 7666,7670 ----
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'extra'}{'type'}{'content'}[3] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'args'}[0]{'contents'}[4];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'extra'}{'type'}{'content'}[4] = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'args'}[0]{'contents'}[5];
+ $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'line_nr'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18];
  $result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[13]{'parent'} = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18];
***************
*** 8677,8685 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 8536,8540 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 8692,8704 ****
            }
          },
          'normalized' => 'label-but-no-type',
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 8547,8560 ----
            }
          },
+         'float_section' => {
+           'cmdname' => 'top',
+           'extra' => {},
+           'level' => 0
+         },
          'normalized' => 'label-but-no-type',
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 8707,8715 ****
          }
        },
-       'float_section' => {
-         'cmdname' => 'top',
-         'extra' => {},
-         'level' => 0
-       },
        'number' => 1
      },
--- 8563,8566 ----
***************
*** 8725,8728 ****
--- 8576,8580 ----
            }
          },
+         'float_section' => {},
          'normalized' => 'label-but-no-type-and-no-caption',
          'type' => {
***************
*** 8730,8734 ****
          }
        },
-       'float_section' => {},
        'number' => 2
      },
--- 8582,8585 ----
***************
*** 8744,8752 ****
            }
          },
          'type' => {
            'normalized' => ''
          }
!       },
!       'float_section' => {}
      },
      {
--- 8595,8603 ----
            }
          },
+         'float_section' => {},
          'type' => {
            'normalized' => ''
          }
!       }
      },
      {
***************
*** 8756,8764 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 8607,8611 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 8771,8782 ****
            }
          },
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 8618,8626 ----
            }
          },
+         'float_section' => {},
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 8784,8789 ****
            'normalized' => ''
          }
!       },
!       'float_section' => {}
      },
      {
--- 8628,8632 ----
            'normalized' => ''
          }
!       }
      },
      {
***************
*** 8793,8801 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 8636,8640 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 8808,8820 ****
            }
          },
          'normalized' => 'label-but-no-type-2',
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 8647,8656 ----
            }
          },
+         'float_section' => {},
          'normalized' => 'label-but-no-type-2',
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 8823,8827 ****
          }
        },
-       'float_section' => {},
        'number' => 3
      },
--- 8659,8662 ----
***************
*** 8832,8840 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 8667,8671 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 8847,8859 ****
            }
          },
          'normalized' => 'label-but-no-type-in-chapter',
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 8678,8692 ----
            }
          },
+         'float_section' => {
+           'cmdname' => 'chapter',
+           'extra' => {},
+           'level' => 1,
+           'number' => 1
+         },
          'normalized' => 'label-but-no-type-in-chapter',
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 8862,8871 ****
          }
        },
-       'float_section' => {
-         'cmdname' => 'chapter',
-         'extra' => {},
-         'level' => 1,
-         'number' => 1
-       },
        'number' => '1.1'
      },
--- 8695,8698 ----
***************
*** 8876,8884 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 8703,8707 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 8891,8903 ****
            }
          },
          'normalized' => 'label-but-no-type-in-unnumbered',
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 8714,8727 ----
            }
          },
+         'float_section' => {
+           'cmdname' => 'unnumbered',
+           'extra' => {},
+           'level' => 1
+         },
          'normalized' => 'label-but-no-type-in-unnumbered',
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 8906,8914 ****
          }
        },
-       'float_section' => {
-         'cmdname' => 'unnumbered',
-         'extra' => {},
-         'level' => 1
-       },
        'number' => 5
      },
--- 8730,8733 ----
***************
*** 8919,8927 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 8738,8742 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 8934,8946 ****
            }
          },
          'normalized' => 'label-but-no-type-in-unnumbered-subsec-in-chapter',
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 8749,8762 ----
            }
          },
+         'float_section' => {
+           'cmdname' => 'unnumberedsec',
+           'extra' => {},
+           'level' => 2
+         },
          'normalized' => 'label-but-no-type-in-unnumbered-subsec-in-chapter',
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 8949,8957 ****
          }
        },
-       'float_section' => {
-         'cmdname' => 'unnumberedsec',
-         'extra' => {},
-         'level' => 2
-       },
        'number' => '2.1'
      }
--- 8765,8768 ----
***************
*** 8979,8991 ****
            }
          },
          'normalized' => 'text-with-a-lot-of-features',
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 8790,8799 ----
            }
          },
+         'float_section' => {},
          'normalized' => 'text-with-a-lot-of-features',
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 8999,9003 ****
          }
        },
-       'float_section' => {},
        'number' => 1
      },
--- 8807,8810 ----
***************
*** 9008,9016 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 8815,8819 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 9023,9034 ****
            }
          },
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 8826,8834 ----
            }
          },
+         'float_section' => {},
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 9041,9046 ****
            'normalized' => 'Text'
          }
!       },
!       'float_section' => {}
      },
      {
--- 8841,8845 ----
            'normalized' => 'Text'
          }
!       }
      },
      {
***************
*** 9050,9058 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 8849,8853 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 9065,9068 ****
--- 8860,8864 ----
            }
          },
+         'float_section' => {},
          'normalized' => 'text-in-chapter',
          'type' => {
***************
*** 9075,9079 ****
          }
        },
-       'float_section' => {},
        'number' => '1.1'
      },
--- 8871,8874 ----
***************
*** 9099,9102 ****
--- 8894,8898 ----
            }
          },
+         'float_section' => {},
          'normalized' => 'float-with-a-lot-of-features-and-no-shortcaption',
          'type' => {
***************
*** 9109,9113 ****
          }
        },
-       'float_section' => {},
        'number' => '1.2'
      },
--- 8905,8908 ----
***************
*** 9123,9126 ****
--- 8918,8927 ----
            }
          },
+         'float_section' => {
+           'cmdname' => 'section',
+           'extra' => {},
+           'level' => 2,
+           'number' => '1.1'
+         },
          'normalized' => 'text-in-section',
          'type' => {
***************
*** 9133,9142 ****
          }
        },
-       'float_section' => {
-         'cmdname' => 'section',
-         'extra' => {},
-         'level' => 2,
-         'number' => '1.1'
-       },
        'number' => '1.3'
      },
--- 8934,8937 ----
***************
*** 9147,9155 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 8942,8946 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 9162,9174 ****
            }
          },
          'normalized' => 'unnumbered-float',
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 8953,8962 ----
            }
          },
+         'float_section' => {},
          'normalized' => 'unnumbered-float',
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 9182,9186 ****
          }
        },
-       'float_section' => {},
        'number' => 5
      },
--- 8970,8973 ----
***************
*** 9191,9199 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 8978,8982 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 9206,9218 ****
            }
          },
          'normalized' => 'Section-within-unnumbered-float',
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 8989,9002 ----
            }
          },
+         'float_section' => {
+           'cmdname' => 'section',
+           'extra' => {},
+           'level' => 2
+         },
          'normalized' => 'Section-within-unnumbered-float',
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 9226,9234 ****
          }
        },
-       'float_section' => {
-         'cmdname' => 'section',
-         'extra' => {},
-         'level' => 2
-       },
        'number' => 6
      },
--- 9010,9013 ----
***************
*** 9239,9247 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 9018,9022 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 9254,9266 ****
            }
          },
          'normalized' => 'Chapter-with-subsec-float',
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 9029,9043 ----
            }
          },
+         'float_section' => {
+           'cmdname' => 'chapter',
+           'extra' => {},
+           'level' => 1,
+           'number' => 2
+         },
          'normalized' => 'Chapter-with-subsec-float',
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 9274,9283 ****
          }
        },
-       'float_section' => {
-         'cmdname' => 'chapter',
-         'extra' => {},
-         'level' => 1,
-         'number' => 2
-       },
        'number' => '2.1'
      },
--- 9051,9054 ----
***************
*** 9288,9296 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 9059,9063 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 9303,9315 ****
            }
          },
          'normalized' => 'unnumbered-sec-float',
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 9070,9079 ----
            }
          },
+         'float_section' => {},
          'normalized' => 'unnumbered-sec-float',
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 9323,9327 ****
          }
        },
-       'float_section' => {},
        'number' => '2.2'
      },
--- 9087,9090 ----
***************
*** 9332,9340 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 9095,9099 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 9347,9359 ****
            }
          },
          'normalized' => 'appendix-sec-float',
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 9106,9120 ----
            }
          },
+         'float_section' => {
+           'cmdname' => 'appendix',
+           'extra' => {},
+           'level' => 1,
+           'number' => 'A'
+         },
          'normalized' => 'appendix-sec-float',
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 9367,9376 ****
          }
        },
-       'float_section' => {
-         'cmdname' => 'appendix',
-         'extra' => {},
-         'level' => 1,
-         'number' => 'A'
-       },
        'number' => 'A.1'
      }
--- 9128,9131 ----
***************
*** 9383,9391 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 9138,9142 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 9398,9410 ****
            }
          },
          'normalized' => 'warning-in-top',
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 9149,9158 ----
            }
          },
+         'float_section' => {},
          'normalized' => 'warning-in-top',
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 9418,9422 ****
          }
        },
-       'float_section' => {},
        'number' => 1
      },
--- 9166,9169 ----
***************
*** 9427,9435 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 9174,9178 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 9442,9454 ****
            }
          },
          'normalized' => 'warning-in-chapter',
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 9185,9194 ----
            }
          },
+         'float_section' => {},
          'normalized' => 'warning-in-chapter',
          'shortcaption' => {
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 9462,9466 ****
          }
        },
-       'float_section' => {},
        'number' => '1.1'
      }
--- 9202,9205 ----
***************
*** 9473,9481 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 9212,9216 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 9488,9491 ****
--- 9223,9227 ----
            }
          },
+         'float_section' => {},
          'normalized' => 'theoreme',
          'type' => {
***************
*** 9510,9514 ****
          }
        },
-       'float_section' => {},
        'number' => '1.1'
      }
--- 9246,9249 ----
***************
*** 9519,9533 ****
  $result_floats{'numbering_captions_listoffloats'}{''}[0]{'extra'}{'shortcaption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{''}[0];
  $result_floats{'numbering_captions_listoffloats'}{''}[1]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{''}[1];
! $result_floats{'numbering_captions_listoffloats'}{''}[1]{'float_section'} = $result_floats{'numbering_captions_listoffloats'}{''}[0]{'float_section'};
  $result_floats{'numbering_captions_listoffloats'}{''}[2]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{''}[2];
! $result_floats{'numbering_captions_listoffloats'}{''}[2]{'float_section'} = $result_floats{'numbering_captions_listoffloats'}{''}[0]{'float_section'};
  $result_floats{'numbering_captions_listoffloats'}{''}[3]{'extra'}{'caption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{''}[3];
  $result_floats{'numbering_captions_listoffloats'}{''}[3]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{''}[3];
  $result_floats{'numbering_captions_listoffloats'}{''}[3]{'extra'}{'shortcaption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{''}[3];
- $result_floats{'numbering_captions_listoffloats'}{''}[3]{'float_section'} = $result_floats{'numbering_captions_listoffloats'}{''}[0]{'float_section'};
  $result_floats{'numbering_captions_listoffloats'}{''}[4]{'extra'}{'caption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{''}[4];
  $result_floats{'numbering_captions_listoffloats'}{''}[4]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{''}[4];
  $result_floats{'numbering_captions_listoffloats'}{''}[4]{'extra'}{'shortcaption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{''}[4];
- $result_floats{'numbering_captions_listoffloats'}{''}[4]{'float_section'} = $result_floats{'numbering_captions_listoffloats'}{''}[0]{'float_section'};
  $result_floats{'numbering_captions_listoffloats'}{''}[5]{'extra'}{'caption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{''}[5];
  $result_floats{'numbering_captions_listoffloats'}{''}[5]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{''}[5];
--- 9254,9268 ----
  $result_floats{'numbering_captions_listoffloats'}{''}[0]{'extra'}{'shortcaption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{''}[0];
  $result_floats{'numbering_captions_listoffloats'}{''}[1]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{''}[1];
! $result_floats{'numbering_captions_listoffloats'}{''}[1]{'extra'}{'float_section'} = $result_floats{'numbering_captions_listoffloats'}{''}[0]{'extra'}{'float_section'};
  $result_floats{'numbering_captions_listoffloats'}{''}[2]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{''}[2];
! $result_floats{'numbering_captions_listoffloats'}{''}[2]{'extra'}{'float_section'} = $result_floats{'numbering_captions_listoffloats'}{''}[0]{'extra'}{'float_section'};
  $result_floats{'numbering_captions_listoffloats'}{''}[3]{'extra'}{'caption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{''}[3];
  $result_floats{'numbering_captions_listoffloats'}{''}[3]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{''}[3];
+ $result_floats{'numbering_captions_listoffloats'}{''}[3]{'extra'}{'float_section'} = $result_floats{'numbering_captions_listoffloats'}{''}[0]{'extra'}{'float_section'};
  $result_floats{'numbering_captions_listoffloats'}{''}[3]{'extra'}{'shortcaption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{''}[3];
  $result_floats{'numbering_captions_listoffloats'}{''}[4]{'extra'}{'caption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{''}[4];
  $result_floats{'numbering_captions_listoffloats'}{''}[4]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{''}[4];
+ $result_floats{'numbering_captions_listoffloats'}{''}[4]{'extra'}{'float_section'} = $result_floats{'numbering_captions_listoffloats'}{''}[0]{'extra'}{'float_section'};
  $result_floats{'numbering_captions_listoffloats'}{''}[4]{'extra'}{'shortcaption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{''}[4];
  $result_floats{'numbering_captions_listoffloats'}{''}[5]{'extra'}{'caption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{''}[5];
  $result_floats{'numbering_captions_listoffloats'}{''}[5]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{''}[5];
***************
*** 9541,9561 ****
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[0]{'extra'}{'caption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[0];
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[0]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[0];
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[0]{'extra'}{'shortcaption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[0];
- $result_floats{'numbering_captions_listoffloats'}{'Text'}[0]{'float_section'} = $result_floats{'numbering_captions_listoffloats'}{''}[0]{'float_section'};
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[1]{'extra'}{'caption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[1];
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[1]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[1];
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[1]{'extra'}{'shortcaption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[1];
- $result_floats{'numbering_captions_listoffloats'}{'Text'}[1]{'float_section'} = $result_floats{'numbering_captions_listoffloats'}{''}[0]{'float_section'};
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[2]{'extra'}{'caption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[2];
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[2]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[2];
! $result_floats{'numbering_captions_listoffloats'}{'Text'}[2]{'float_section'} = $result_floats{'numbering_captions_listoffloats'}{''}[5]{'float_section'};
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[3]{'extra'}{'caption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[3];
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[3]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[3];
! $result_floats{'numbering_captions_listoffloats'}{'Text'}[3]{'float_section'} = $result_floats{'numbering_captions_listoffloats'}{''}[5]{'float_section'};
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[4]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[4];
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[5]{'extra'}{'caption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[5];
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[5]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[5];
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[5]{'extra'}{'shortcaption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[5];
- $result_floats{'numbering_captions_listoffloats'}{'Text'}[5]{'float_section'} = $result_floats{'numbering_captions_listoffloats'}{''}[6]{'float_section'};
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[6]{'extra'}{'caption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[6];
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[6]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[6];
--- 9276,9296 ----
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[0]{'extra'}{'caption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[0];
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[0]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[0];
+ $result_floats{'numbering_captions_listoffloats'}{'Text'}[0]{'extra'}{'float_section'} = $result_floats{'numbering_captions_listoffloats'}{''}[0]{'extra'}{'float_section'};
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[0]{'extra'}{'shortcaption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[0];
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[1]{'extra'}{'caption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[1];
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[1]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[1];
+ $result_floats{'numbering_captions_listoffloats'}{'Text'}[1]{'extra'}{'float_section'} = $result_floats{'numbering_captions_listoffloats'}{''}[0]{'extra'}{'float_section'};
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[1]{'extra'}{'shortcaption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[1];
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[2]{'extra'}{'caption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[2];
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[2]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[2];
! $result_floats{'numbering_captions_listoffloats'}{'Text'}[2]{'extra'}{'float_section'} = $result_floats{'numbering_captions_listoffloats'}{''}[5]{'extra'}{'float_section'};
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[3]{'extra'}{'caption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[3];
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[3]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[3];
! $result_floats{'numbering_captions_listoffloats'}{'Text'}[3]{'extra'}{'float_section'} = $result_floats{'numbering_captions_listoffloats'}{''}[5]{'extra'}{'float_section'};
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[4]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[4];
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[5]{'extra'}{'caption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[5];
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[5]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[5];
+ $result_floats{'numbering_captions_listoffloats'}{'Text'}[5]{'extra'}{'float_section'} = $result_floats{'numbering_captions_listoffloats'}{''}[6]{'extra'}{'float_section'};
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[5]{'extra'}{'shortcaption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[5];
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[6]{'extra'}{'caption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[6];
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[6]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[6];
***************
*** 9566,9571 ****
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[8]{'extra'}{'caption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[8];
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[8]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[8];
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[8]{'extra'}{'shortcaption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[8];
- $result_floats{'numbering_captions_listoffloats'}{'Text'}[8]{'float_section'} = $result_floats{'numbering_captions_listoffloats'}{''}[7]{'float_section'};
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[9]{'extra'}{'caption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[9];
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[9]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[9];
--- 9301,9306 ----
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[8]{'extra'}{'caption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[8];
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[8]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[8];
+ $result_floats{'numbering_captions_listoffloats'}{'Text'}[8]{'extra'}{'float_section'} = $result_floats{'numbering_captions_listoffloats'}{''}[7]{'extra'}{'float_section'};
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[8]{'extra'}{'shortcaption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[8];
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[9]{'extra'}{'caption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[9];
  $result_floats{'numbering_captions_listoffloats'}{'Text'}[9]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{'Text'}[9];
***************
*** 9573,9585 ****
  $result_floats{'numbering_captions_listoffloats'}{'Warning'}[0]{'extra'}{'caption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Warning'}[0];
  $result_floats{'numbering_captions_listoffloats'}{'Warning'}[0]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{'Warning'}[0];
  $result_floats{'numbering_captions_listoffloats'}{'Warning'}[0]{'extra'}{'shortcaption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Warning'}[0];
- $result_floats{'numbering_captions_listoffloats'}{'Warning'}[0]{'float_section'} = $result_floats{'numbering_captions_listoffloats'}{''}[0]{'float_section'};
  $result_floats{'numbering_captions_listoffloats'}{'Warning'}[1]{'extra'}{'caption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Warning'}[1];
  $result_floats{'numbering_captions_listoffloats'}{'Warning'}[1]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{'Warning'}[1];
  $result_floats{'numbering_captions_listoffloats'}{'Warning'}[1]{'extra'}{'shortcaption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Warning'}[1];
- $result_floats{'numbering_captions_listoffloats'}{'Warning'}[1]{'float_section'} = $result_floats{'numbering_captions_listoffloats'}{''}[5]{'float_section'};
  $result_floats{'numbering_captions_listoffloats'}{'th_00e9or_00e8me'}[0]{'extra'}{'caption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'th_00e9or_00e8me'}[0];
  $result_floats{'numbering_captions_listoffloats'}{'th_00e9or_00e8me'}[0]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{'th_00e9or_00e8me'}[0];
! $result_floats{'numbering_captions_listoffloats'}{'th_00e9or_00e8me'}[0]{'float_section'} = $result_floats{'numbering_captions_listoffloats'}{''}[5]{'float_section'};
  
  
--- 9308,9320 ----
  $result_floats{'numbering_captions_listoffloats'}{'Warning'}[0]{'extra'}{'caption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Warning'}[0];
  $result_floats{'numbering_captions_listoffloats'}{'Warning'}[0]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{'Warning'}[0];
+ $result_floats{'numbering_captions_listoffloats'}{'Warning'}[0]{'extra'}{'float_section'} = $result_floats{'numbering_captions_listoffloats'}{''}[0]{'extra'}{'float_section'};
  $result_floats{'numbering_captions_listoffloats'}{'Warning'}[0]{'extra'}{'shortcaption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Warning'}[0];
  $result_floats{'numbering_captions_listoffloats'}{'Warning'}[1]{'extra'}{'caption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Warning'}[1];
  $result_floats{'numbering_captions_listoffloats'}{'Warning'}[1]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{'Warning'}[1];
+ $result_floats{'numbering_captions_listoffloats'}{'Warning'}[1]{'extra'}{'float_section'} = $result_floats{'numbering_captions_listoffloats'}{''}[5]{'extra'}{'float_section'};
  $result_floats{'numbering_captions_listoffloats'}{'Warning'}[1]{'extra'}{'shortcaption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'Warning'}[1];
  $result_floats{'numbering_captions_listoffloats'}{'th_00e9or_00e8me'}[0]{'extra'}{'caption'}{'extra'}{'float'} = $result_floats{'numbering_captions_listoffloats'}{'th_00e9or_00e8me'}[0];
  $result_floats{'numbering_captions_listoffloats'}{'th_00e9or_00e8me'}[0]{'extra'}{'end_command'}{'extra'}{'command'} = $result_floats{'numbering_captions_listoffloats'}{'th_00e9or_00e8me'}[0];
! $result_floats{'numbering_captions_listoffloats'}{'th_00e9or_00e8me'}[0]{'extra'}{'float_section'} = $result_floats{'numbering_captions_listoffloats'}{''}[5]{'extra'}{'float_section'};
  
  
diff -Nrc2 texinfo-6.1/tp/t/results/float/ref_to_float.pl texinfo-6.3/tp/t/results/float/ref_to_float.pl
*** texinfo-6.1/tp/t/results/float/ref_to_float.pl	2016-01-22 07:49:56.000000000 +0000
--- texinfo-6.3/tp/t/results/float/ref_to_float.pl	2016-08-02 18:44:35.000000000 +0100
***************
*** 31,34 ****
--- 31,35 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 159,162 ****
--- 160,164 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 292,299 ****
                ],
                'normalized' => 'Label1'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 294,297 ----
***************
*** 349,356 ****
                ],
                'normalized' => 'Label2'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 347,350 ----
***************
*** 378,381 ****
--- 372,376 ----
  $result_trees{'ref_to_float'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'ref_to_float'}{'contents'}[0]{'args'}[0];
  $result_trees{'ref_to_float'}{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'ref_to_float'}{'contents'}[0];
+ $result_trees{'ref_to_float'}{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'ref_to_float'}{'contents'}[0]{'args'}[1];
  $result_trees{'ref_to_float'}{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'ref_to_float'}{'contents'}[0]{'args'}[1];
  $result_trees{'ref_to_float'}{'contents'}[0]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'ref_to_float'}{'contents'}[0]{'args'}[1];
***************
*** 402,405 ****
--- 397,401 ----
  $result_trees{'ref_to_float'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'ref_to_float'}{'contents'}[2]{'args'}[0];
  $result_trees{'ref_to_float'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'ref_to_float'}{'contents'}[2];
+ $result_trees{'ref_to_float'}{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'ref_to_float'}{'contents'}[2]{'args'}[1];
  $result_trees{'ref_to_float'}{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'ref_to_float'}{'contents'}[2]{'args'}[1];
  $result_trees{'ref_to_float'}{'contents'}[2]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'ref_to_float'}{'contents'}[2]{'args'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/float/simple.pl texinfo-6.3/tp/t/results/float/simple.pl
*** texinfo-6.1/tp/t/results/float/simple.pl	2016-01-22 07:49:56.000000000 +0000
--- texinfo-6.3/tp/t/results/float/simple.pl	2016-08-02 18:44:35.000000000 +0100
***************
*** 31,34 ****
--- 31,35 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 90,99 ****
            'contents' => [],
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'parent' => {},
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 91,95 ----
            'contents' => [],
            'extra' => {
!             'float' => {}
            },
            'line_nr' => {
***************
*** 183,186 ****
--- 179,183 ----
  $result_trees{'simple'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'simple'}{'contents'}[0]{'args'}[0];
  $result_trees{'simple'}{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'simple'}{'contents'}[0];
+ $result_trees{'simple'}{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'simple'}{'contents'}[0]{'args'}[1];
  $result_trees{'simple'}{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'simple'}{'contents'}[0]{'args'}[1];
  $result_trees{'simple'}{'contents'}[0]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'simple'}{'contents'}[0]{'args'}[1];
***************
*** 193,197 ****
  $result_trees{'simple'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'simple'}{'contents'}[0]{'contents'}[2];
  $result_trees{'simple'}{'contents'}[0]{'contents'}[2]{'extra'}{'float'} = $result_trees{'simple'}{'contents'}[0];
- $result_trees{'simple'}{'contents'}[0]{'contents'}[2]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'simple'}{'contents'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'simple'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'simple'}{'contents'}[0];
  $result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'simple'}{'contents'}[0];
--- 190,193 ----
***************
*** 236,244 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 232,236 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
diff -Nrc2 texinfo-6.1/tp/t/results/heading/heading_in_copying.pl texinfo-6.3/tp/t/results/heading/heading_in_copying.pl
*** texinfo-6.1/tp/t/results/heading/heading_in_copying.pl	2016-01-22 07:49:58.000000000 +0000
--- texinfo-6.3/tp/t/results/heading/heading_in_copying.pl	2016-08-02 18:44:37.000000000 +0100
***************
*** 137,141 ****
                    'index_at_command' => 'cindex',
                    'index_name' => 'cp',
-                   'index_prefix' => 'c',
                    'index_type_command' => 'cindex',
                    'key' => 'cindex copying',
--- 137,140 ----
diff -Nrc2 texinfo-6.1/tp/t/results/html_tests/check_htmlxref.pl texinfo-6.3/tp/t/results/html_tests/check_htmlxref.pl
*** texinfo-6.1/tp/t/results/html_tests/check_htmlxref.pl	2016-01-22 07:50:24.000000000 +0000
--- texinfo-6.3/tp/t/results/html_tests/check_htmlxref.pl	2016-08-02 18:45:01.000000000 +0100
***************
*** 43,46 ****
--- 43,47 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 57,60 ****
--- 58,62 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 71,74 ****
--- 73,77 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 186,189 ****
--- 189,193 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 200,203 ****
--- 204,208 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 214,217 ****
--- 219,223 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 248,255 ****
                    ],
                    'normalized' => 'a'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 254,257 ----
***************
*** 281,284 ****
--- 283,287 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 295,298 ****
--- 298,302 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 309,312 ****
--- 313,317 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 343,350 ****
                    ],
                    'normalized' => 'a'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 348,351 ----
***************
*** 596,599 ****
--- 597,601 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 653,660 ****
--- 655,665 ----
  $result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[0];
  $result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[1];
+ $result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[1];
  $result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[1];
  $result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[1];
+ $result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[2];
  $result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[2];
  $result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[1];
+ $result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[3];
  $result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[3];
  $result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[3];
***************
*** 676,683 ****
--- 681,691 ----
  $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
+ $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
+ $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[2];
  $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[2];
  $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[2]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
+ $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3];
  $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3];
  $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
***************
*** 691,698 ****
--- 699,709 ----
  $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
+ $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1];
  $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1];
  $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
+ $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[2];
  $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[2];
  $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[2]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
+ $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[3];
  $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[3];
  $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[3]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
***************
*** 747,750 ****
--- 758,762 ----
  $result_trees{'check_htmlxref'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[3]{'args'}[0];
  $result_trees{'check_htmlxref'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[3];
+ $result_trees{'check_htmlxref'}{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[3]{'args'}[1];
  $result_trees{'check_htmlxref'}{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[3]{'args'}[1];
  $result_trees{'check_htmlxref'}{'contents'}[3]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[3]{'args'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/html_tests/commands_in_abbr.pl texinfo-6.3/tp/t/results/html_tests/commands_in_abbr.pl
*** texinfo-6.1/tp/t/results/html_tests/commands_in_abbr.pl	2016-01-22 07:50:22.000000000 +0000
--- texinfo-6.3/tp/t/results/html_tests/commands_in_abbr.pl	2016-08-02 18:45:01.000000000 +0100
***************
*** 25,28 ****
--- 25,29 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 70,79 ****
                  {}
                ]
!             ],
!             'normalized' => 'A',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 71,75 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 124,127 ****
--- 120,124 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 169,178 ****
                      {}
                    ]
!                 ],
!                 'normalized' => 'A',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 166,170 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 246,249 ****
--- 238,242 ----
  $result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0];
+ $result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0]{'args'}[1];
  $result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1];
***************
*** 263,266 ****
--- 256,260 ----
  $result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
+ $result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'commands_in_abbr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/html_tests/commands_in_alt.pl texinfo-6.3/tp/t/results/html_tests/commands_in_alt.pl
*** texinfo-6.1/tp/t/results/html_tests/commands_in_alt.pl	2016-01-22 07:50:22.000000000 +0000
--- texinfo-6.3/tp/t/results/html_tests/commands_in_alt.pl	2016-08-02 18:45:01.000000000 +0100
***************
*** 76,84 ****
              {}
            ]
!         ],
!         'spaces_before_argument' => {
!           'text' => '',
!           'type' => 'empty_spaces_before_argument'
!         }
        },
        'line_nr' => {},
--- 76,80 ----
              {}
            ]
!         ]
        },
        'line_nr' => {},
***************
*** 178,186 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 174,178 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
diff -Nrc2 texinfo-6.1/tp/t/results/html_tests/commands_in_email.pl texinfo-6.3/tp/t/results/html_tests/commands_in_email.pl
*** texinfo-6.1/tp/t/results/html_tests/commands_in_email.pl	2016-01-22 07:50:24.000000000 +0000
--- texinfo-6.3/tp/t/results/html_tests/commands_in_email.pl	2016-08-02 18:45:01.000000000 +0100
***************
*** 28,31 ****
--- 28,36 ----
                    'cmdname' => 'enddots',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 1,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 49,57 ****
                    'cmdname' => 'code',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 1,
!                     'macro' => ''
!                   },
                    'parent' => {}
                  }
--- 54,58 ----
                    'cmdname' => 'code',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 71,79 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 72,76 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 93,96 ****
--- 90,94 ----
  $result_trees{'commands_in_email'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands_in_email'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'commands_in_email'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'commands_in_email'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3];
+ $result_trees{'commands_in_email'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'commands_in_email'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'commands_in_email'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'commands_in_email'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'commands_in_email'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'commands_in_email'}{'contents'}[0]{'contents'}[0];
***************
*** 99,103 ****
  $result_trees{'commands_in_email'}{'contents'}[0]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][2] = $result_trees{'commands_in_email'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
  $result_trees{'commands_in_email'}{'contents'}[0]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][3] = $result_trees{'commands_in_email'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3];
! $result_trees{'commands_in_email'}{'contents'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'commands_in_email'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'line_nr'};
  $result_trees{'commands_in_email'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands_in_email'}{'contents'}[0];
  $result_trees{'commands_in_email'}{'contents'}[0]{'parent'} = $result_trees{'commands_in_email'};
--- 97,101 ----
  $result_trees{'commands_in_email'}{'contents'}[0]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][2] = $result_trees{'commands_in_email'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
  $result_trees{'commands_in_email'}{'contents'}[0]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][3] = $result_trees{'commands_in_email'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3];
! $result_trees{'commands_in_email'}{'contents'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'commands_in_email'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'commands_in_email'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands_in_email'}{'contents'}[0];
  $result_trees{'commands_in_email'}{'contents'}[0]{'parent'} = $result_trees{'commands_in_email'};
diff -Nrc2 texinfo-6.1/tp/t/results/html_tests/documentdescription.pl texinfo-6.3/tp/t/results/html_tests/documentdescription.pl
*** texinfo-6.1/tp/t/results/html_tests/documentdescription.pl	2016-01-22 07:50:23.000000000 +0000
--- texinfo-6.3/tp/t/results/html_tests/documentdescription.pl	2016-08-02 18:45:01.000000000 +0100
***************
*** 64,67 ****
--- 64,68 ----
                    'cmdname' => 'bullet',
                    'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 80,83 ****
--- 81,85 ----
                    'cmdname' => 'enddots',
                    'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 120,123 ****
--- 122,126 ----
                    'cmdname' => 'aa',
                    'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 201,209 ****
                          {}
                        ]
!                     ],
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {},
--- 204,208 ----
                          {}
                        ]
!                     ]
                    },
                    'line_nr' => {},
***************
*** 336,342 ****
--- 335,343 ----
  $result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
  $result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3];
+ $result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'line_nr'} = $result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'line_nr'};
  $result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
  $result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
  $result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[5];
+ $result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[5]{'line_nr'} = $result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'line_nr'};
  $result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
  $result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
***************
*** 347,350 ****
--- 348,352 ----
  $result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[8]{'parent'} = $result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
  $result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[9];
+ $result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[9]{'line_nr'} = $result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'line_nr'};
  $result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[9]{'parent'} = $result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
  $result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[10]{'parent'} = $result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl texinfo-6.3/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
*** texinfo-6.1/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl	2016-01-22 07:50:24.000000000 +0000
--- texinfo-6.3/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl	2016-08-02 18:45:01.000000000 +0100
***************
*** 13,16 ****
--- 13,17 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => '\\input texinfo
  ',
***************
*** 18,21 ****
--- 19,23 ----
              },
              {
+               'parent' => {},
                'text' => '
  ',
***************
*** 23,26 ****
--- 25,29 ----
              },
              {
+               'parent' => {},
                'text' => '
  ',
***************
*** 172,175 ****
--- 175,181 ----
    'type' => 'document_root'
  };
+ $result_trees{'empty_lines_at_beginning_no_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'empty_lines_at_beginning_no_setfilename'}{'contents'}[0]{'contents'}[0];
+ $result_trees{'empty_lines_at_beginning_no_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'empty_lines_at_beginning_no_setfilename'}{'contents'}[0]{'contents'}[0];
+ $result_trees{'empty_lines_at_beginning_no_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'empty_lines_at_beginning_no_setfilename'}{'contents'}[0]{'contents'}[0];
  $result_trees{'empty_lines_at_beginning_no_setfilename'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'empty_lines_at_beginning_no_setfilename'}{'contents'}[0]{'contents'}[1];
  $result_trees{'empty_lines_at_beginning_no_setfilename'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'empty_lines_at_beginning_no_setfilename'}{'contents'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename_no_element.pl texinfo-6.3/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename_no_element.pl
*** texinfo-6.1/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename_no_element.pl	2016-01-22 07:50:24.000000000 +0000
--- texinfo-6.3/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename_no_element.pl	2016-08-02 18:45:01.000000000 +0100
***************
*** 11,14 ****
--- 11,15 ----
        'contents' => [
          {
+           'parent' => {},
            'text' => '\\input texinfo
  ',
***************
*** 16,19 ****
--- 17,21 ----
          },
          {
+           'parent' => {},
            'text' => '
  ',
***************
*** 21,24 ****
--- 23,27 ----
          },
          {
+           'parent' => {},
            'text' => '
  ',
***************
*** 107,110 ****
--- 110,116 ----
    'type' => 'text_root'
  };
+ $result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0];
+ $result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0];
+ $result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[0];
  $result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[1];
  $result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'empty_lines_at_beginning_no_setfilename_no_element'}{'contents'}[1]{'args'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/html_tests/image_link_prefix.pl texinfo-6.3/tp/t/results/html_tests/image_link_prefix.pl
*** texinfo-6.1/tp/t/results/html_tests/image_link_prefix.pl	2016-01-22 07:50:22.000000000 +0000
--- texinfo-6.3/tp/t/results/html_tests/image_link_prefix.pl	2016-08-02 18:45:01.000000000 +0100
***************
*** 28,36 ****
              {}
            ]
!         ],
!         'spaces_before_argument' => {
!           'text' => '',
!           'type' => 'empty_spaces_before_argument'
!         }
        },
        'line_nr' => {
--- 28,32 ----
              {}
            ]
!         ]
        },
        'line_nr' => {
diff -Nrc2 texinfo-6.1/tp/t/results/html_tests/index_and_node_same_name.pl texinfo-6.3/tp/t/results/html_tests/index_and_node_same_name.pl
*** texinfo-6.1/tp/t/results/html_tests/index_and_node_same_name.pl	2016-01-22 07:50:23.000000000 +0000
--- texinfo-6.3/tp/t/results/html_tests/index_and_node_same_name.pl	2016-08-02 18:45:01.000000000 +0100
***************
*** 129,133 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'node',
--- 129,132 ----
diff -Nrc2 texinfo-6.1/tp/t/results/html_tests/index_below.pl texinfo-6.3/tp/t/results/html_tests/index_below.pl
*** texinfo-6.1/tp/t/results/html_tests/index_below.pl	2016-01-22 07:50:23.000000000 +0000
--- texinfo-6.3/tp/t/results/html_tests/index_below.pl	2016-08-02 18:45:01.000000000 +0100
***************
*** 207,211 ****
                  'index_at_command' => 'cindex',
                  'index_name' => 'cp',
-                 'index_prefix' => 'c',
                  'index_type_command' => 'cindex',
                  'key' => 'entry',
--- 207,210 ----
diff -Nrc2 texinfo-6.1/tp/t/results/html_tests/no_use_iso.pl texinfo-6.3/tp/t/results/html_tests/no_use_iso.pl
*** texinfo-6.1/tp/t/results/html_tests/no_use_iso.pl	2016-01-22 07:50:24.000000000 +0000
--- texinfo-6.3/tp/t/results/html_tests/no_use_iso.pl	2016-08-02 18:45:02.000000000 +0100
***************
*** 28,31 ****
--- 28,37 ----
            ],
            'cmdname' => '^',
+           'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 1,
+             'macro' => ''
+           },
            'parent' => {}
          },
diff -Nrc2 texinfo-6.1/tp/t/results/html_tests/redirection_same_labels.pl texinfo-6.3/tp/t/results/html_tests/redirection_same_labels.pl
*** texinfo-6.1/tp/t/results/html_tests/redirection_same_labels.pl	2016-01-22 07:50:24.000000000 +0000
--- texinfo-6.3/tp/t/results/html_tests/redirection_same_labels.pl	2016-08-02 18:45:02.000000000 +0100
***************
*** 539,542 ****
--- 539,548 ----
                          ],
                          'cmdname' => '"',
+                         'contents' => [],
+                         'line_nr' => {
+                           'file_name' => '',
+                           'line_nr' => 18,
+                           'macro' => ''
+                         },
                          'parent' => {}
                        }
***************
*** 577,585 ****
                    }
                  },
!                 'line_nr' => {
!                   'file_name' => '',
!                   'line_nr' => 18,
!                   'macro' => ''
!                 },
                  'parent' => {},
                  'type' => 'menu_entry'
--- 583,587 ----
                    }
                  },
!                 'line_nr' => {},
                  'parent' => {},
                  'type' => 'menu_entry'
***************
*** 771,774 ****
--- 773,782 ----
                  ],
                  'cmdname' => '"',
+                 'contents' => [],
+                 'line_nr' => {
+                   'file_name' => '',
+                   'line_nr' => 22,
+                   'macro' => ''
+                 },
                  'parent' => {}
                },
***************
*** 806,814 ****
            'spaces_after_command' => {}
          },
!         'line_nr' => {
!           'file_name' => '',
!           'line_nr' => 22,
!           'macro' => ''
!         },
          'parent' => {}
        },
--- 814,818 ----
            'spaces_after_command' => {}
          },
!         'line_nr' => {},
          'parent' => {}
        },
***************
*** 1027,1030 ****
--- 1031,1040 ----
                          ],
                          'cmdname' => '^',
+                         'contents' => [],
+                         'line_nr' => {
+                           'file_name' => '',
+                           'line_nr' => 30,
+                           'macro' => ''
+                         },
                          'parent' => {}
                        }
***************
*** 1065,1073 ****
                    }
                  },
!                 'line_nr' => {
!                   'file_name' => '',
!                   'line_nr' => 30,
!                   'macro' => ''
!                 },
                  'parent' => {},
                  'type' => 'menu_entry'
--- 1075,1079 ----
                    }
                  },
!                 'line_nr' => {},
                  'parent' => {},
                  'type' => 'menu_entry'
***************
*** 1174,1177 ****
--- 1180,1189 ----
                  ],
                  'cmdname' => '^',
+                 'contents' => [],
+                 'line_nr' => {
+                   'file_name' => '',
+                   'line_nr' => 33,
+                   'macro' => ''
+                 },
                  'parent' => {}
                },
***************
*** 1202,1210 ****
            'spaces_after_command' => {}
          },
!         'line_nr' => {
!           'file_name' => '',
!           'line_nr' => 33,
!           'macro' => ''
!         },
          'parent' => {}
        }
--- 1214,1218 ----
            'spaces_after_command' => {}
          },
!         'line_nr' => {},
          'parent' => {}
        }
***************
*** 1319,1322 ****
--- 1327,1331 ----
  $result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'} = $result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
  $result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
+ $result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1];
  $result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2];
***************
*** 1362,1365 ****
--- 1371,1375 ----
  $result_trees{'redirection_same_labels'}[1]{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'redirection_same_labels'}[1]{'contents'}[2]{'extra'}{'node_content'};
  $result_trees{'redirection_same_labels'}[1]{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'redirection_same_labels'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
+ $result_trees{'redirection_same_labels'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'redirection_same_labels'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'redirection_same_labels'}[1]{'contents'}[2]{'parent'} = $result_trees{'redirection_same_labels'}[1];
  $result_trees{'redirection_same_labels'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'redirection_same_labels'}[1]{'contents'}[3];
***************
*** 1411,1414 ****
--- 1421,1425 ----
  $result_trees{'redirection_same_labels'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'} = $result_trees{'redirection_same_labels'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
  $result_trees{'redirection_same_labels'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'redirection_same_labels'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
+ $result_trees{'redirection_same_labels'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'redirection_same_labels'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'redirection_same_labels'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'redirection_same_labels'}[2]{'contents'}[1]{'contents'}[1];
  $result_trees{'redirection_same_labels'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'redirection_same_labels'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2];
***************
*** 1437,1440 ****
--- 1448,1452 ----
  $result_trees{'redirection_same_labels'}[2]{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'redirection_same_labels'}[2]{'contents'}[2]{'extra'}{'node_content'};
  $result_trees{'redirection_same_labels'}[2]{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'redirection_same_labels'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
+ $result_trees{'redirection_same_labels'}[2]{'contents'}[2]{'line_nr'} = $result_trees{'redirection_same_labels'}[2]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'redirection_same_labels'}[2]{'contents'}[2]{'parent'} = $result_trees{'redirection_same_labels'}[2];
  $result_trees{'redirection_same_labels'}[2]{'element_prev'} = $result_trees{'redirection_same_labels'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/html_tests/ref_in_preformatted.pl texinfo-6.3/tp/t/results/html_tests/ref_in_preformatted.pl
*** texinfo-6.1/tp/t/results/html_tests/ref_in_preformatted.pl	2016-01-22 07:50:24.000000000 +0000
--- texinfo-6.3/tp/t/results/html_tests/ref_in_preformatted.pl	2016-08-02 18:45:02.000000000 +0100
***************
*** 276,283 ****
                        ],
                        'normalized' => 'nnn-the-node-name'
-                     },
-                     'spaces_before_argument' => {
-                       'text' => '',
-                       'type' => 'empty_spaces_before_argument'
                      }
                    },
--- 276,279 ----
diff -Nrc2 texinfo-6.1/tp/t/results/html_tests/simple_menu.pl texinfo-6.3/tp/t/results/html_tests/simple_menu.pl
*** texinfo-6.1/tp/t/results/html_tests/simple_menu.pl	2016-01-22 07:50:23.000000000 +0000
--- texinfo-6.3/tp/t/results/html_tests/simple_menu.pl	2016-08-02 18:45:01.000000000 +0100
***************
*** 152,155 ****
--- 152,156 ----
                              {
                                'cmdname' => 'bullet',
+                               'contents' => [],
                                'parent' => {},
                                'type' => 'command_as_argument'
***************
*** 393,396 ****
--- 394,398 ----
                  {
                    'cmdname' => 'bullet',
+                   'contents' => [],
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 607,610 ****
--- 609,613 ----
                  {
                    'cmdname' => 'bullet',
+                   'contents' => [],
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 979,982 ****
--- 982,986 ----
                                  {
                                    'cmdname' => 'bullet',
+                                   'contents' => [],
                                    'parent' => {},
                                    'type' => 'command_as_argument'
***************
*** 1220,1223 ****
--- 1224,1228 ----
                      {
                        'cmdname' => 'bullet',
+                       'contents' => [],
                        'parent' => {},
                        'type' => 'command_as_argument'
***************
*** 1434,1437 ****
--- 1439,1443 ----
                      {
                        'cmdname' => 'bullet',
+                       'contents' => [],
                        'parent' => {},
                        'type' => 'command_as_argument'
diff -Nrc2 texinfo-6.1/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl texinfo-6.3/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
*** texinfo-6.1/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl	2016-01-22 07:50:23.000000000 +0000
--- texinfo-6.3/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl	2016-08-02 18:45:01.000000000 +0100
***************
*** 400,407 ****
                    ],
                    'normalized' => 'chap'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 400,403 ----
***************
*** 504,511 ****
                    ],
                    'normalized' => 'chap'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 500,503 ----
diff -Nrc2 texinfo-6.1/tp/t/results/html_tests/utf8_enable_encoding.pl texinfo-6.3/tp/t/results/html_tests/utf8_enable_encoding.pl
*** texinfo-6.1/tp/t/results/html_tests/utf8_enable_encoding.pl	2016-01-22 07:50:24.000000000 +0000
--- texinfo-6.3/tp/t/results/html_tests/utf8_enable_encoding.pl	2016-08-02 18:45:02.000000000 +0100
***************
*** 75,78 ****
--- 75,84 ----
            ],
            'cmdname' => '^',
+           'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 3,
+             'macro' => ''
+           },
            'parent' => {}
          },
diff -Nrc2 texinfo-6.1/tp/t/results/html_tests/utf8_enable_encoding_no_use_iso.pl texinfo-6.3/tp/t/results/html_tests/utf8_enable_encoding_no_use_iso.pl
*** texinfo-6.1/tp/t/results/html_tests/utf8_enable_encoding_no_use_iso.pl	2016-01-22 07:50:24.000000000 +0000
--- texinfo-6.3/tp/t/results/html_tests/utf8_enable_encoding_no_use_iso.pl	2016-08-02 18:45:02.000000000 +0100
***************
*** 75,78 ****
--- 75,84 ----
            ],
            'cmdname' => '^',
+           'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 3,
+             'macro' => ''
+           },
            'parent' => {}
          },
diff -Nrc2 texinfo-6.1/tp/t/results/html_tests/utf8_no_use_entity.pl texinfo-6.3/tp/t/results/html_tests/utf8_no_use_entity.pl
*** texinfo-6.1/tp/t/results/html_tests/utf8_no_use_entity.pl	2016-01-22 07:50:24.000000000 +0000
--- texinfo-6.3/tp/t/results/html_tests/utf8_no_use_entity.pl	2016-08-02 18:45:02.000000000 +0100
***************
*** 75,78 ****
--- 75,84 ----
            ],
            'cmdname' => '^',
+           'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 3,
+             'macro' => ''
+           },
            'parent' => {}
          },
diff -Nrc2 texinfo-6.1/tp/t/results/html_tests/utf8_no_use_entity_enable_encoding.pl texinfo-6.3/tp/t/results/html_tests/utf8_no_use_entity_enable_encoding.pl
*** texinfo-6.1/tp/t/results/html_tests/utf8_no_use_entity_enable_encoding.pl	2016-01-22 07:50:24.000000000 +0000
--- texinfo-6.3/tp/t/results/html_tests/utf8_no_use_entity_enable_encoding.pl	2016-08-02 18:45:02.000000000 +0100
***************
*** 75,78 ****
--- 75,84 ----
            ],
            'cmdname' => '^',
+           'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 3,
+             'macro' => ''
+           },
            'parent' => {}
          },
diff -Nrc2 texinfo-6.1/tp/t/results/html_tests/utf8_no_use_entity_enable_encoding_no_use_iso.pl texinfo-6.3/tp/t/results/html_tests/utf8_no_use_entity_enable_encoding_no_use_iso.pl
*** texinfo-6.1/tp/t/results/html_tests/utf8_no_use_entity_enable_encoding_no_use_iso.pl	2016-01-22 07:50:24.000000000 +0000
--- texinfo-6.3/tp/t/results/html_tests/utf8_no_use_entity_enable_encoding_no_use_iso.pl	2016-08-02 18:45:02.000000000 +0100
***************
*** 75,78 ****
--- 75,84 ----
            ],
            'cmdname' => '^',
+           'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 3,
+             'macro' => ''
+           },
            'parent' => {}
          },
diff -Nrc2 texinfo-6.1/tp/t/results/html_tests/utf8_no_use_entity_no_use_iso.pl texinfo-6.3/tp/t/results/html_tests/utf8_no_use_entity_no_use_iso.pl
*** texinfo-6.1/tp/t/results/html_tests/utf8_no_use_entity_no_use_iso.pl	2016-01-22 07:50:24.000000000 +0000
--- texinfo-6.3/tp/t/results/html_tests/utf8_no_use_entity_no_use_iso.pl	2016-08-02 18:45:02.000000000 +0100
***************
*** 75,78 ****
--- 75,84 ----
            ],
            'cmdname' => '^',
+           'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 3,
+             'macro' => ''
+           },
            'parent' => {}
          },
diff -Nrc2 texinfo-6.1/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl texinfo-6.3/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
*** texinfo-6.1/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl	2016-01-22 07:50:22.000000000 +0000
--- texinfo-6.3/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl	2016-08-02 18:45:01.000000000 +0100
***************
*** 194,206 ****
                            ],
                            'extra' => {
!                             'spaces_after_command' => {
!                               'extra' => {
!                                 'command' => {}
!                               },
!                               'parent' => {},
!                               'text' => '
! ',
!                               'type' => 'empty_line_after_command'
!                             }
                            },
                            'line_nr' => {
--- 194,198 ----
                            ],
                            'extra' => {
!                             'spaces_after_command' => {}
                            },
                            'line_nr' => {
***************
*** 211,215 ****
                            'parent' => {}
                          },
!                         {}
                        ],
                        'extra' => {
--- 203,215 ----
                            'parent' => {}
                          },
!                         {
!                           'extra' => {
!                             'command' => {}
!                           },
!                           'parent' => {},
!                           'text' => '
! ',
!                           'type' => 'empty_line_after_command'
!                         }
                        ],
                        'extra' => {
***************
*** 435,442 ****
  $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
  $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
! $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
! $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
  $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
! $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2] = $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'};
  $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
  $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
--- 435,442 ----
  $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
  $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
! $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
  $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
! $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'command'} = $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
! $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
  $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
  $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/html_tests/xml_protected_in_verb.pl texinfo-6.3/tp/t/results/html_tests/xml_protected_in_verb.pl
*** texinfo-6.1/tp/t/results/html_tests/xml_protected_in_verb.pl	2016-01-22 07:50:23.000000000 +0000
--- texinfo-6.3/tp/t/results/html_tests/xml_protected_in_verb.pl	2016-08-02 18:45:01.000000000 +0100
***************
*** 28,40 ****
        ],
        'extra' => {
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 28,32 ----
        ],
        'extra' => {
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 45,49 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 37,49 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 138,145 ****
  $result_trees{'xml_protected_in_verb'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'xml_protected_in_verb'}{'contents'}[0];
  $result_trees{'xml_protected_in_verb'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'xml_protected_in_verb'}{'contents'}[0];
! $result_trees{'xml_protected_in_verb'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'xml_protected_in_verb'}{'contents'}[0];
! $result_trees{'xml_protected_in_verb'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'xml_protected_in_verb'};
  $result_trees{'xml_protected_in_verb'}{'contents'}[0]{'parent'} = $result_trees{'xml_protected_in_verb'};
! $result_trees{'xml_protected_in_verb'}{'contents'}[1] = $result_trees{'xml_protected_in_verb'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'xml_protected_in_verb'}{'contents'}[2]{'parent'} = $result_trees{'xml_protected_in_verb'};
  $result_trees{'xml_protected_in_verb'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'xml_protected_in_verb'}{'contents'}[3]{'contents'}[0]{'args'}[0];
--- 138,145 ----
  $result_trees{'xml_protected_in_verb'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'xml_protected_in_verb'}{'contents'}[0];
  $result_trees{'xml_protected_in_verb'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'xml_protected_in_verb'}{'contents'}[0];
! $result_trees{'xml_protected_in_verb'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'xml_protected_in_verb'}{'contents'}[0]{'contents'}[0];
  $result_trees{'xml_protected_in_verb'}{'contents'}[0]{'parent'} = $result_trees{'xml_protected_in_verb'};
! $result_trees{'xml_protected_in_verb'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'xml_protected_in_verb'}{'contents'}[0];
! $result_trees{'xml_protected_in_verb'}{'contents'}[1]{'parent'} = $result_trees{'xml_protected_in_verb'};
  $result_trees{'xml_protected_in_verb'}{'contents'}[2]{'parent'} = $result_trees{'xml_protected_in_verb'};
  $result_trees{'xml_protected_in_verb'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'xml_protected_in_verb'}{'contents'}[3]{'contents'}[0]{'args'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/include/cpp_lines.pl texinfo-6.3/tp/t/results/include/cpp_lines.pl
*** texinfo-6.1/tp/t/results/include/cpp_lines.pl	2016-01-22 07:50:11.000000000 +0000
--- texinfo-6.3/tp/t/results/include/cpp_lines.pl	2016-08-02 18:44:49.000000000 +0100
***************
*** 15,18 ****
--- 15,19 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => '\\input texinfo
  ',
***************
*** 100,108 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 101,105 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 215,227 ****
            ],
            'extra' => {
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 212,216 ----
            ],
            'extra' => {
!             'spaces_after_command' => {}
            },
            'line_nr' => {
***************
*** 232,236 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 221,233 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 263,278 ****
            'extra' => {
              'arg_line' => ' macr
! ',
!             'macrobody' => '# line 7 "k"
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 260,264 ----
            'extra' => {
              'arg_line' => ' macr
! '
            },
            'line_nr' => {
***************
*** 283,287 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 269,281 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 312,320 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 306,310 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 379,387 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 369,373 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 441,449 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 427,431 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 491,499 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 473,477 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 589,597 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 567,571 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 653,656 ****
--- 627,631 ----
    'type' => 'document_root'
  };
+ $result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
  $result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[0];
  $result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'cpp_lines'}{'contents'}[0];
***************
*** 686,701 ****
  $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3];
  $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3];
! $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3];
! $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'cpp_lines'}{'contents'}[1];
  $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'cpp_lines'}{'contents'}[1];
! $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[4] = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'extra'}{'spaces_after_command'};
  $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'cpp_lines'}{'contents'}[1];
  $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6];
  $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6];
  $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'parent'} = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6];
- $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6];
- $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'cpp_lines'}{'contents'}[1];
  $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'cpp_lines'}{'contents'}[1];
! $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[7] = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6]{'extra'}{'spaces_after_command'};
  $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[8]{'parent'} = $result_trees{'cpp_lines'}{'contents'}[1];
  $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[9]{'contents'}[0]{'args'}[0];
--- 661,675 ----
  $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3];
  $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3];
! $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'contents'}[0];
  $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'cpp_lines'}{'contents'}[1];
! $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[4]{'extra'}{'command'} = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3];
! $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'cpp_lines'}{'contents'}[1];
  $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'cpp_lines'}{'contents'}[1];
  $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6];
  $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6];
  $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'parent'} = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6];
  $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'cpp_lines'}{'contents'}[1];
! $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[7]{'extra'}{'command'} = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6];
! $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[7]{'parent'} = $result_trees{'cpp_lines'}{'contents'}[1];
  $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[8]{'parent'} = $result_trees{'cpp_lines'}{'contents'}[1];
  $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[9]{'contents'}[0]{'args'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/include/double_include.pl texinfo-6.3/tp/t/results/include/double_include.pl
*** texinfo-6.1/tp/t/results/include/double_include.pl	2016-01-22 07:50:11.000000000 +0000
--- texinfo-6.3/tp/t/results/include/double_include.pl	2016-08-02 18:44:49.000000000 +0100
***************
*** 51,60 ****
  $result_errors{'double_include'} = [
    {
!     'error_line' => ':2: warning: @include should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 2,
      'macro' => '',
!     'text' => '@include should only appear at a line beginning',
      'type' => 'warning'
    },
--- 51,60 ----
  $result_errors{'double_include'} = [
    {
!     'error_line' => ':2: warning: @include should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 2,
      'macro' => '',
!     'text' => '@include should only appear at the beginning of a line',
      'type' => 'warning'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/include/include_at_end_line.pl texinfo-6.3/tp/t/results/include/include_at_end_line.pl
*** texinfo-6.1/tp/t/results/include/include_at_end_line.pl	2016-01-22 07:50:11.000000000 +0000
--- texinfo-6.3/tp/t/results/include/include_at_end_line.pl	2016-08-02 18:44:49.000000000 +0100
***************
*** 37,41 ****
        'extra' => {
          'spaces_after_command' => {},
!         'text_arg' => 'inc_file.texi '
        },
        'line_nr' => {
--- 37,41 ----
        'extra' => {
          'spaces_after_command' => {},
!         'text_arg' => 'inc_file.texi'
        },
        'line_nr' => {
***************
*** 86,95 ****
  $result_errors{'include_at_end_line'} = [
    {
!     'error_line' => ':1: @include: could not find inc_file.texi 
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@include: could not find inc_file.texi ',
      'type' => 'error'
    }
--- 86,95 ----
  $result_errors{'include_at_end_line'} = [
    {
!     'error_line' => ':1: bad argument to @include: inc_file.texi@
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => 'bad argument to @include: inc_file.texi@',
      'type' => 'error'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/include/include_setfilename_on_setfilename_line.pl texinfo-6.3/tp/t/results/include/include_setfilename_on_setfilename_line.pl
*** texinfo-6.1/tp/t/results/include/include_setfilename_on_setfilename_line.pl	2016-01-22 07:50:11.000000000 +0000
--- texinfo-6.3/tp/t/results/include/include_setfilename_on_setfilename_line.pl	2016-08-02 18:44:49.000000000 +0100
***************
*** 99,103 ****
                  'invalid_nesting' => 1,
                  'spaces_after_command' => {},
!                 'text_arg' => 'other file'
                },
                'line_nr' => {},
--- 99,103 ----
                  'invalid_nesting' => 1,
                  'spaces_after_command' => {},
!                 'text_arg' => 'other file '
                },
                'line_nr' => {},
***************
*** 112,116 ****
        'extra' => {
          'spaces_after_command' => {},
!         'text_arg' => 'file'
        },
        'line_nr' => {},
--- 112,116 ----
        'extra' => {
          'spaces_after_command' => {},
!         'text_arg' => 'file '
        },
        'line_nr' => {},
***************
*** 152,161 ****
  $result_errors{'include_setfilename_on_setfilename_line'} = [
    {
!     'error_line' => ':1: warning: @setfilename should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@setfilename should only appear at a line beginning',
      'type' => 'warning'
    },
--- 152,161 ----
  $result_errors{'include_setfilename_on_setfilename_line'} = [
    {
!     'error_line' => ':1: warning: @setfilename should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@setfilename should only appear at the beginning of a line',
      'type' => 'warning'
    },
***************
*** 179,188 ****
    },
    {
!     'error_line' => ':1: warning: @include should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@include should only appear at a line beginning',
      'type' => 'warning'
    },
--- 179,188 ----
    },
    {
!     'error_line' => ':1: warning: @include should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@include should only appear at the beginning of a line',
      'type' => 'warning'
    },
***************
*** 204,207 ****
--- 204,225 ----
      'text' => '@include: could not find are you joking!',
      'type' => 'error'
+   },
+   {
+     'error_line' => ':1: bad argument to @setfilename: other file @include are you joking!
+ ',
+     'file_name' => '',
+     'line_nr' => 1,
+     'macro' => '',
+     'text' => 'bad argument to @setfilename: other file @include are you joking!',
+     'type' => 'error'
+   },
+   {
+     'error_line' => ':1: bad argument to @setfilename: file @setfilename other file @include are you joking!
+ ',
+     'file_name' => '',
+     'line_nr' => 1,
+     'macro' => '',
+     'text' => 'bad argument to @setfilename: file @setfilename other file @include are you joking!',
+     'type' => 'error'
    }
  ];
diff -Nrc2 texinfo-6.1/tp/t/results/include/macro_and_commands_in_early_commands.pl texinfo-6.3/tp/t/results/include/macro_and_commands_in_early_commands.pl
*** texinfo-6.1/tp/t/results/include/macro_and_commands_in_early_commands.pl	2016-01-22 07:50:11.000000000 +0000
--- texinfo-6.3/tp/t/results/include/macro_and_commands_in_early_commands.pl	2016-08-02 18:44:49.000000000 +0100
***************
*** 34,49 ****
            'extra' => {
              'arg_line' => ' begin-file
! ',
!             'macrobody' => 'macro_i--n_pass@@
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 34,38 ----
            'extra' => {
              'arg_line' => ' begin-file
! '
            },
            'line_nr' => {
***************
*** 54,58 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 43,55 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 138,153 ****
            'extra' => {
              'arg_line' => ' latin1 
! ',
!             'macrobody' => 'ISO-8859-1@@
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 135,139 ----
            'extra' => {
              'arg_line' => ' latin1 
! '
            },
            'line_nr' => {
***************
*** 158,162 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 144,156 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 244,260 ****
            'extra' => {
              'arg_line' => ' multiinclude
! ',
!             'macrobody' => 'macro_included.texi
! @include inc_@@f--ile.texi
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 238,242 ----
            'extra' => {
              'arg_line' => ' multiinclude
! '
            },
            'line_nr' => {
***************
*** 265,269 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 247,259 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 384,399 ****
            'extra' => {
              'arg_line' => ' themacro
! ',
!             'macrobody' => 'in themacro
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 374,378 ----
            'extra' => {
              'arg_line' => ' themacro
! '
            },
            'line_nr' => {
***************
*** 404,408 ****
            'parent' => {}
          },
!         {},
          {
            'contents' => [
--- 383,395 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'contents' => [
***************
*** 507,514 ****
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0];
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0];
- $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0];
- $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
! $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[1] = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[3];
--- 494,500 ----
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0];
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0];
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
! $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[1]{'extra'}{'command'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0];
! $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[3];
***************
*** 525,532 ****
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5];
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5];
- $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5];
- $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
! $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[6] = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[8];
--- 511,517 ----
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5];
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5];
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
! $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[6]{'extra'}{'command'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[5];
! $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[6]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[8];
***************
*** 543,550 ****
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10];
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[2]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10];
- $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10];
- $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
! $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[11] = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[12]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'};
--- 528,534 ----
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10];
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[2]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10];
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
! $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[11]{'extra'}{'command'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[10];
! $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[11]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[12]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'};
***************
*** 567,574 ****
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1];
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1];
- $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1];
- $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2];
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2];
! $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[2] = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3];
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2];
--- 551,557 ----
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1];
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1];
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2];
! $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[2]{'extra'}{'command'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1];
! $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2];
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3];
  $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2];
diff -Nrc2 texinfo-6.1/tp/t/results/include/macro_definition_in_include.pl texinfo-6.3/tp/t/results/include/macro_definition_in_include.pl
*** texinfo-6.1/tp/t/results/include/macro_definition_in_include.pl	2016-01-22 07:50:11.000000000 +0000
--- texinfo-6.3/tp/t/results/include/macro_definition_in_include.pl	2016-08-02 18:44:49.000000000 +0100
***************
*** 32,47 ****
        'extra' => {
          'arg_line' => ' themacro
! ',
!         'macrobody' => 'in themacro
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 32,36 ----
        'extra' => {
          'arg_line' => ' themacro
! '
        },
        'line_nr' => {
***************
*** 52,56 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 41,53 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 81,88 ****
  $result_trees{'macro_definition_in_include'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_definition_in_include'}{'contents'}[0];
  $result_trees{'macro_definition_in_include'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_definition_in_include'}{'contents'}[0];
- $result_trees{'macro_definition_in_include'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_definition_in_include'}{'contents'}[0];
- $result_trees{'macro_definition_in_include'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_definition_in_include'};
  $result_trees{'macro_definition_in_include'}{'contents'}[0]{'parent'} = $result_trees{'macro_definition_in_include'};
! $result_trees{'macro_definition_in_include'}{'contents'}[1] = $result_trees{'macro_definition_in_include'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_definition_in_include'}{'contents'}[2]{'parent'} = $result_trees{'macro_definition_in_include'};
  $result_trees{'macro_definition_in_include'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'macro_definition_in_include'}{'contents'}[3];
--- 78,84 ----
  $result_trees{'macro_definition_in_include'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_definition_in_include'}{'contents'}[0];
  $result_trees{'macro_definition_in_include'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_definition_in_include'}{'contents'}[0];
  $result_trees{'macro_definition_in_include'}{'contents'}[0]{'parent'} = $result_trees{'macro_definition_in_include'};
! $result_trees{'macro_definition_in_include'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'macro_definition_in_include'}{'contents'}[0];
! $result_trees{'macro_definition_in_include'}{'contents'}[1]{'parent'} = $result_trees{'macro_definition_in_include'};
  $result_trees{'macro_definition_in_include'}{'contents'}[2]{'parent'} = $result_trees{'macro_definition_in_include'};
  $result_trees{'macro_definition_in_include'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'macro_definition_in_include'}{'contents'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/include/macro_in_early_commands.pl texinfo-6.3/tp/t/results/include/macro_in_early_commands.pl
*** texinfo-6.1/tp/t/results/include/macro_in_early_commands.pl	2016-01-22 07:50:11.000000000 +0000
--- texinfo-6.3/tp/t/results/include/macro_in_early_commands.pl	2016-08-02 18:44:49.000000000 +0100
***************
*** 34,49 ****
            'extra' => {
              'arg_line' => ' begin-file
! ',
!             'macrobody' => 'macro_in_pass
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 34,38 ----
            'extra' => {
              'arg_line' => ' begin-file
! '
            },
            'line_nr' => {
***************
*** 54,58 ****
            'parent' => {}
          },
!         {},
          {
            'args' => [
--- 43,55 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'args' => [
***************
*** 84,102 ****
            'extra' => {
              'arg_line' => ' end-file-name {ext}
! ',
!             'args_index' => {
!               'ext' => 0
!             },
!             'macrobody' => 'texi_commands.\\ext\\
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 81,85 ----
            'extra' => {
              'arg_line' => ' end-file-name {ext}
! '
            },
            'line_nr' => {
***************
*** 107,111 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 90,102 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 183,198 ****
            'extra' => {
              'arg_line' => ' latin1 
! ',
!             'macrobody' => 'ISO-8859-1
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 174,178 ----
            'extra' => {
              'arg_line' => ' latin1 
! '
            },
            'line_nr' => {
***************
*** 203,207 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 183,195 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 234,249 ****
            'extra' => {
              'arg_line' => ' documentencoding-command
! ',
!             'macrobody' => '@documentencoding
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 222,226 ----
            'extra' => {
              'arg_line' => ' documentencoding-command
! '
            },
            'line_nr' => {
***************
*** 254,258 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 231,243 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 338,354 ****
            'extra' => {
              'arg_line' => ' multiinclude
! ',
!             'macrobody' => 'macro_included.texi
! @include inc_file.texi
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 323,327 ----
            'extra' => {
              'arg_line' => ' multiinclude
! '
            },
            'line_nr' => {
***************
*** 359,363 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 332,344 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 478,493 ****
            'extra' => {
              'arg_line' => ' themacro
! ',
!             'macrobody' => 'in themacro
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 459,463 ----
            'extra' => {
              'arg_line' => ' themacro
! '
            },
            'line_nr' => {
***************
*** 498,502 ****
            'parent' => {}
          },
!         {},
          {
            'contents' => [
--- 468,480 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'contents' => [
***************
*** 586,601 ****
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0];
- $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0];
- $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0];
! $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[1] = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2];
- $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2];
- $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0];
! $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[3] = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[5];
--- 564,577 ----
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0];
! $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[1]{'extra'}{'command'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0];
! $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0];
! $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[3]{'extra'}{'command'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[2];
! $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[5];
***************
*** 610,625 ****
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7];
- $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7];
- $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0];
! $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[8] = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[9]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10];
- $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10];
- $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0];
! $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[11] = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[12]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[13];
--- 586,599 ----
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0];
! $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[8]{'extra'}{'command'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[7];
! $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[8]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[9]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0];
! $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[11]{'extra'}{'command'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[10];
! $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[11]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[12]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[13];
***************
*** 635,642 ****
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15]{'contents'}[2]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15];
- $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15];
- $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0];
! $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[16] = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[17]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'parent'} = $result_trees{'macro_in_early_commands'};
--- 609,615 ----
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15]{'contents'}[2]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0];
! $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[16]{'extra'}{'command'} = $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[15];
! $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[16]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[17]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[0];
  $result_trees{'macro_in_early_commands'}{'contents'}[0]{'parent'} = $result_trees{'macro_in_early_commands'};
***************
*** 659,666 ****
  $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1];
  $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1];
- $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1];
- $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[2];
  $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[2];
! $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[2] = $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[3];
  $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[2];
--- 632,638 ----
  $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1];
  $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1];
  $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[2];
! $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[2]{'extra'}{'command'} = $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[1];
! $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[2];
  $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[3];
  $result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'macro_in_early_commands'}{'contents'}[2];
diff -Nrc2 texinfo-6.1/tp/t/results/include/value_expansion_in_include.pl texinfo-6.3/tp/t/results/include/value_expansion_in_include.pl
*** texinfo-6.1/tp/t/results/include/value_expansion_in_include.pl	2016-01-22 07:50:11.000000000 +0000
--- texinfo-6.3/tp/t/results/include/value_expansion_in_include.pl	2016-08-02 18:44:49.000000000 +0100
***************
*** 660,687 ****
  $result_errors{'value_expansion_in_include'} = [
    {
!     'error_line' => ':12: warning: @include should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 12,
      'macro' => '',
!     'text' => '@include should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':17: warning: @include should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 17,
      'macro' => '',
!     'text' => '@include should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':22: warning: @include should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 22,
      'macro' => '',
!     'text' => '@include should only appear at a line beginning',
      'type' => 'warning'
    }
--- 660,687 ----
  $result_errors{'value_expansion_in_include'} = [
    {
!     'error_line' => ':12: warning: @include should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 12,
      'macro' => '',
!     'text' => '@include should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':17: warning: @include should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 17,
      'macro' => '',
!     'text' => '@include should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':22: warning: @include should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 22,
      'macro' => '',
!     'text' => '@include should only appear at the beginning of a line',
      'type' => 'warning'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/indices/complex_recursive_synindex.pl texinfo-6.3/tp/t/results/indices/complex_recursive_synindex.pl
*** texinfo-6.1/tp/t/results/indices/complex_recursive_synindex.pl	2016-01-22 07:49:38.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/complex_recursive_synindex.pl	2016-08-02 18:44:19.000000000 +0100
***************
*** 467,471 ****
                'index_at_command' => 'eeeindex',
                'index_name' => 'eee',
-               'index_prefix' => 'eee',
                'index_type_command' => 'eeeindex',
                'key' => 'e before synindex',
--- 467,470 ----
***************
*** 614,618 ****
                'index_at_command' => 'cccindex',
                'index_name' => 'ccc',
-               'index_prefix' => 'ccc',
                'index_type_command' => 'cccindex',
                'key' => 'c index',
--- 613,616 ----
***************
*** 669,673 ****
                'index_at_command' => 'bbbindex',
                'index_name' => 'bbb',
-               'index_prefix' => 'bbb',
                'index_type_command' => 'bbbindex',
                'key' => 'b entry',
--- 667,670 ----
***************
*** 724,728 ****
                'index_at_command' => 'aaaindex',
                'index_name' => 'aaa',
-               'index_prefix' => 'aaa',
                'index_type_command' => 'aaaindex',
                'key' => 'a entry',
--- 721,724 ----
***************
*** 779,783 ****
                'index_at_command' => 'dddindex',
                'index_name' => 'ddd',
-               'index_prefix' => 'ddd',
                'index_type_command' => 'dddindex',
                'key' => 'd index',
--- 775,778 ----
***************
*** 834,838 ****
                'index_at_command' => 'eeeindex',
                'index_name' => 'eee',
-               'index_prefix' => 'eee',
                'index_type_command' => 'eeeindex',
                'key' => 'e index',
--- 829,832 ----
***************
*** 1532,1539 ****
        'in_code' => 0,
        'merged_in' => 'bbb',
!       'name' => 'aaa',
!       'prefix' => [
!         'aaa'
!       ]
      },
      'bbb' => {
--- 1526,1530 ----
        'in_code' => 0,
        'merged_in' => 'bbb',
!       'name' => 'aaa'
      },
      'bbb' => {
***************
*** 1546,1553 ****
        },
        'in_code' => 0,
!       'name' => 'bbb',
!       'prefix' => [
!         'bbb'
!       ]
      },
      'ccc' => {
--- 1537,1541 ----
        },
        'in_code' => 0,
!       'name' => 'bbb'
      },
      'ccc' => {
***************
*** 1557,1564 ****
        'in_code' => 0,
        'merged_in' => 'bbb',
!       'name' => 'ccc',
!       'prefix' => [
!         'ccc'
!       ]
      },
      'cp' => {
--- 1545,1549 ----
        'in_code' => 0,
        'merged_in' => 'bbb',
!       'name' => 'ccc'
      },
      'cp' => {
***************
*** 1567,1575 ****
        },
        'in_code' => 0,
!       'name' => 'cp',
!       'prefix' => [
!         'c',
!         'cp'
!       ]
      },
      'ddd' => {
--- 1552,1556 ----
        },
        'in_code' => 0,
!       'name' => 'cp'
      },
      'ddd' => {
***************
*** 1579,1586 ****
        'in_code' => 0,
        'merged_in' => 'bbb',
!       'name' => 'ddd',
!       'prefix' => [
!         'ddd'
!       ]
      },
      'eee' => {
--- 1560,1564 ----
        'in_code' => 0,
        'merged_in' => 'bbb',
!       'name' => 'ddd'
      },
      'eee' => {
***************
*** 1590,1597 ****
        'in_code' => 0,
        'merged_in' => 'bbb',
!       'name' => 'eee',
!       'prefix' => [
!         'eee'
!       ]
      },
      'fn' => {
--- 1568,1572 ----
        'in_code' => 0,
        'merged_in' => 'bbb',
!       'name' => 'eee'
      },
      'fn' => {
***************
*** 1600,1608 ****
        },
        'in_code' => 1,
!       'name' => 'fn',
!       'prefix' => [
!         'f',
!         'fn'
!       ]
      },
      'ky' => {
--- 1575,1579 ----
        },
        'in_code' => 1,
!       'name' => 'fn'
      },
      'ky' => {
***************
*** 1611,1619 ****
        },
        'in_code' => 1,
!       'name' => 'ky',
!       'prefix' => [
!         'k',
!         'ky'
!       ]
      },
      'pg' => {
--- 1582,1586 ----
        },
        'in_code' => 1,
!       'name' => 'ky'
      },
      'pg' => {
***************
*** 1622,1630 ****
        },
        'in_code' => 1,
!       'name' => 'pg',
!       'prefix' => [
!         'p',
!         'pg'
!       ]
      },
      'tp' => {
--- 1589,1593 ----
        },
        'in_code' => 1,
!       'name' => 'pg'
      },
      'tp' => {
***************
*** 1633,1641 ****
        },
        'in_code' => 1,
!       'name' => 'tp',
!       'prefix' => [
!         't',
!         'tp'
!       ]
      },
      'vr' => {
--- 1596,1600 ----
        },
        'in_code' => 1,
!       'name' => 'tp'
      },
      'vr' => {
***************
*** 1644,1652 ****
        },
        'in_code' => 1,
!       'name' => 'vr',
!       'prefix' => [
!         'v',
!         'vr'
!       ]
      }
    },
--- 1603,1607 ----
        },
        'in_code' => 1,
!       'name' => 'vr'
      }
    },
diff -Nrc2 texinfo-6.1/tp/t/results/indices/def_syn_indices.pl texinfo-6.3/tp/t/results/indices/def_syn_indices.pl
*** texinfo-6.1/tp/t/results/indices/def_syn_indices.pl	2016-01-22 07:49:39.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/def_syn_indices.pl	2016-08-02 18:44:21.000000000 +0100
***************
*** 204,208 ****
                'index_at_command' => 'trucindex',
                'index_name' => 'truc',
-               'index_prefix' => 'truc',
                'index_type_command' => 'trucindex',
                'key' => 'index truc',
--- 204,207 ----
***************
*** 330,333 ****
--- 329,334 ----
                    ],
                    'cmdname' => '~',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 395,399 ****
                'index_at_command' => 'codeidxindex',
                'index_name' => 'codeidx',
-               'index_prefix' => 'codeidx',
                'index_type_command' => 'codeidxindex',
                'key' => 'a index entry te~ i^',
--- 396,399 ----
***************
*** 452,456 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'cindex entry',
--- 452,455 ----
***************
*** 561,565 ****
                'index_at_command' => 'kindex',
                'index_name' => 'ky',
-               'index_prefix' => 'k',
                'index_type_command' => 'kindex',
                'key' => 'truc kindex',
--- 560,563 ----
***************
*** 616,620 ****
                'index_at_command' => 'pindex',
                'index_name' => 'pg',
-               'index_prefix' => 'p',
                'index_type_command' => 'pindex',
                'key' => 'pindex codeidx',
--- 614,617 ----
***************
*** 903,907 ****
                'index_at_command' => 'defgindex',
                'index_name' => 'defg',
-               'index_prefix' => 'defg',
                'index_type_command' => 'defgindex',
                'key' => 'defg index entry',
--- 900,903 ----
***************
*** 964,968 ****
                'index_at_command' => 'abcindex',
                'index_name' => 'abc',
-               'index_prefix' => 'abc',
                'index_type_command' => 'abcindex',
                'key' => 'abc index entry',
--- 960,963 ----
***************
*** 1584,1587 ****
--- 1579,1583 ----
  $result_trees{'def_syn_indices'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'def_syn_indices'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[4]{'args'}[0];
  $result_trees{'def_syn_indices'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'def_syn_indices'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[4];
+ $result_trees{'def_syn_indices'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'def_syn_indices'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'def_syn_indices'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'def_syn_indices'}{'contents'}[1]{'contents'}[7]{'args'}[0];
  $result_trees{'def_syn_indices'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'def_syn_indices'}{'contents'}[1]{'contents'}[7]{'args'}[0];
***************
*** 2015,2022 ****
        'in_code' => 0,
        'merged_in' => 'pg',
!       'name' => 'abc',
!       'prefix' => [
!         'abc'
!       ]
      },
      'codeidx' => {
--- 2011,2015 ----
        'in_code' => 0,
        'merged_in' => 'pg',
!       'name' => 'abc'
      },
      'codeidx' => {
***************
*** 2025,2032 ****
        },
        'in_code' => 1,
!       'name' => 'codeidx',
!       'prefix' => [
!         'codeidx'
!       ]
      },
      'cp' => {
--- 2018,2022 ----
        },
        'in_code' => 1,
!       'name' => 'codeidx'
      },
      'cp' => {
***************
*** 2036,2044 ****
        'in_code' => 1,
        'merged_in' => 'fn',
!       'name' => 'cp',
!       'prefix' => [
!         'c',
!         'cp'
!       ]
      },
      'defg' => {
--- 2026,2030 ----
        'in_code' => 1,
        'merged_in' => 'fn',
!       'name' => 'cp'
      },
      'defg' => {
***************
*** 2049,2056 ****
        'in_code' => 0,
        'merged_in' => 'pg',
!       'name' => 'defg',
!       'prefix' => [
!         'defg'
!       ]
      },
      'fn' => {
--- 2035,2039 ----
        'in_code' => 0,
        'merged_in' => 'pg',
!       'name' => 'defg'
      },
      'fn' => {
***************
*** 2061,2069 ****
        },
        'in_code' => 1,
!       'name' => 'fn',
!       'prefix' => [
!         'f',
!         'fn'
!       ]
      },
      'ky' => {
--- 2044,2048 ----
        },
        'in_code' => 1,
!       'name' => 'fn'
      },
      'ky' => {
***************
*** 2073,2081 ****
        'in_code' => 1,
        'merged_in' => 'pg',
!       'name' => 'ky',
!       'prefix' => [
!         'k',
!         'ky'
!       ]
      },
      'pg' => {
--- 2052,2056 ----
        'in_code' => 1,
        'merged_in' => 'pg',
!       'name' => 'ky'
      },
      'pg' => {
***************
*** 2087,2095 ****
        },
        'in_code' => 1,
!       'name' => 'pg',
!       'prefix' => [
!         'p',
!         'pg'
!       ]
      },
      'tp' => {
--- 2062,2066 ----
        },
        'in_code' => 1,
!       'name' => 'pg'
      },
      'tp' => {
***************
*** 2098,2106 ****
        },
        'in_code' => 1,
!       'name' => 'tp',
!       'prefix' => [
!         't',
!         'tp'
!       ]
      },
      'truc' => {
--- 2069,2073 ----
        },
        'in_code' => 1,
!       'name' => 'tp'
      },
      'truc' => {
***************
*** 2110,2117 ****
        'in_code' => 0,
        'merged_in' => 'fn',
!       'name' => 'truc',
!       'prefix' => [
!         'truc'
!       ]
      },
      'vr' => {
--- 2077,2081 ----
        'in_code' => 0,
        'merged_in' => 'fn',
!       'name' => 'truc'
      },
      'vr' => {
***************
*** 2120,2128 ****
        },
        'in_code' => 1,
!       'name' => 'vr',
!       'prefix' => [
!         'v',
!         'vr'
!       ]
      }
    },
--- 2084,2088 ----
        },
        'in_code' => 1,
!       'name' => 'vr'
      }
    },
diff -Nrc2 texinfo-6.1/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl texinfo-6.3/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
*** texinfo-6.1/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl	2016-01-22 07:49:39.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl	2016-08-02 18:44:21.000000000 +0100
***************
*** 134,138 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '--cindex',
--- 134,137 ----
***************
*** 189,193 ****
                'index_at_command' => 'cpindex',
                'index_name' => 'cp',
-               'index_prefix' => 'cp',
                'index_type_command' => 'cpindex',
                'key' => '--cpindex',
--- 188,191 ----
***************
*** 384,392 ****
        'in_code' => 1,
        'merged_in' => 'fn',
!       'name' => 'cp',
!       'prefix' => [
!         'c',
!         'cp'
!       ]
      },
      'fn' => {
--- 382,386 ----
        'in_code' => 1,
        'merged_in' => 'fn',
!       'name' => 'cp'
      },
      'fn' => {
***************
*** 396,404 ****
        },
        'in_code' => 1,
!       'name' => 'fn',
!       'prefix' => [
!         'f',
!         'fn'
!       ]
      },
      'ky' => {
--- 390,394 ----
        },
        'in_code' => 1,
!       'name' => 'fn'
      },
      'ky' => {
***************
*** 407,415 ****
        },
        'in_code' => 1,
!       'name' => 'ky',
!       'prefix' => [
!         'k',
!         'ky'
!       ]
      },
      'pg' => {
--- 397,401 ----
        },
        'in_code' => 1,
!       'name' => 'ky'
      },
      'pg' => {
***************
*** 418,426 ****
        },
        'in_code' => 1,
!       'name' => 'pg',
!       'prefix' => [
!         'p',
!         'pg'
!       ]
      },
      'tp' => {
--- 404,408 ----
        },
        'in_code' => 1,
!       'name' => 'pg'
      },
      'tp' => {
***************
*** 429,437 ****
        },
        'in_code' => 1,
!       'name' => 'tp',
!       'prefix' => [
!         't',
!         'tp'
!       ]
      },
      'vr' => {
--- 411,415 ----
        },
        'in_code' => 1,
!       'name' => 'tp'
      },
      'vr' => {
***************
*** 440,448 ****
        },
        'in_code' => 1,
!       'name' => 'vr',
!       'prefix' => [
!         'v',
!         'vr'
!       ]
      }
    },
--- 418,422 ----
        },
        'in_code' => 1,
!       'name' => 'vr'
      }
    },
diff -Nrc2 texinfo-6.1/tp/t/results/indices/double_index_entry.pl texinfo-6.3/tp/t/results/indices/double_index_entry.pl
*** texinfo-6.1/tp/t/results/indices/double_index_entry.pl	2016-01-22 07:49:38.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/double_index_entry.pl	2016-08-02 18:44:19.000000000 +0100
***************
*** 86,90 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'aaa',
--- 86,89 ----
***************
*** 164,168 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'aaa',
--- 163,166 ----
***************
*** 429,433 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'aaa',
--- 427,430 ----
diff -Nrc2 texinfo-6.1/tp/t/results/indices/double_syncodeindex.pl texinfo-6.3/tp/t/results/indices/double_syncodeindex.pl
*** texinfo-6.1/tp/t/results/indices/double_syncodeindex.pl	2016-01-22 07:49:39.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/double_syncodeindex.pl	2016-08-02 18:44:21.000000000 +0100
***************
*** 177,181 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'cindex entry',
--- 177,180 ----
***************
*** 232,236 ****
                'index_at_command' => 'findex',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'findex',
                'key' => 'findex entry',
--- 231,234 ----
***************
*** 494,502 ****
        'in_code' => 1,
        'merged_in' => 'fn',
!       'name' => 'cp',
!       'prefix' => [
!         'c',
!         'cp'
!       ]
      },
      'fn' => {
--- 492,496 ----
        'in_code' => 1,
        'merged_in' => 'fn',
!       'name' => 'cp'
      },
      'fn' => {
***************
*** 506,514 ****
        },
        'in_code' => 1,
!       'name' => 'fn',
!       'prefix' => [
!         'f',
!         'fn'
!       ]
      },
      'ky' => {
--- 500,504 ----
        },
        'in_code' => 1,
!       'name' => 'fn'
      },
      'ky' => {
***************
*** 517,525 ****
        },
        'in_code' => 1,
!       'name' => 'ky',
!       'prefix' => [
!         'k',
!         'ky'
!       ]
      },
      'pg' => {
--- 507,511 ----
        },
        'in_code' => 1,
!       'name' => 'ky'
      },
      'pg' => {
***************
*** 528,536 ****
        },
        'in_code' => 1,
!       'name' => 'pg',
!       'prefix' => [
!         'p',
!         'pg'
!       ]
      },
      'tp' => {
--- 514,518 ----
        },
        'in_code' => 1,
!       'name' => 'pg'
      },
      'tp' => {
***************
*** 539,547 ****
        },
        'in_code' => 1,
!       'name' => 'tp',
!       'prefix' => [
!         't',
!         'tp'
!       ]
      },
      'vr' => {
--- 521,525 ----
        },
        'in_code' => 1,
!       'name' => 'tp'
      },
      'vr' => {
***************
*** 550,558 ****
        },
        'in_code' => 1,
!       'name' => 'vr',
!       'prefix' => [
!         'v',
!         'vr'
!       ]
      }
    },
--- 528,532 ----
        },
        'in_code' => 1,
!       'name' => 'vr'
      }
    },
diff -Nrc2 texinfo-6.1/tp/t/results/indices/empty_index_entry.pl texinfo-6.3/tp/t/results/indices/empty_index_entry.pl
*** texinfo-6.1/tp/t/results/indices/empty_index_entry.pl	2016-01-22 07:49:38.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/empty_index_entry.pl	2016-08-02 18:44:20.000000000 +0100
***************
*** 80,83 ****
--- 80,84 ----
                        'contents' => [
                          {
+                           'parent' => {},
                            'text' => ' ',
                            'type' => 'empty_spaces_before_argument'
***************
*** 107,111 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 108,111 ----
***************
*** 125,129 ****
                          'spaces_before_argument' => {}
                        },
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 125,128 ----
***************
*** 272,275 ****
--- 271,275 ----
  $result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
+ $result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'extra'}{'spaces_before_argument'} = $result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'}[0];
  $result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
***************
*** 278,285 ****
  $result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
  $result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
  $result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'extra'}{'spaces_before_argument'} = $result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'}[0];
- $result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 278,283 ----
diff -Nrc2 texinfo-6.1/tp/t/results/indices/empty_string_index_entry.pl texinfo-6.3/tp/t/results/indices/empty_string_index_entry.pl
*** texinfo-6.1/tp/t/results/indices/empty_string_index_entry.pl	2016-01-22 07:49:39.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/empty_string_index_entry.pl	2016-08-02 18:44:20.000000000 +0100
***************
*** 99,103 ****
                'index_at_command' => 'findex',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'findex',
                'key' => '',
--- 99,102 ----
***************
*** 132,135 ****
--- 131,140 ----
                  {
                    'cmdname' => 'code',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 5,
+                     'macro' => ''
+                   },
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 203,207 ****
                            'index_at_command' => 'item',
                            'index_name' => 'fn',
-                           'index_prefix' => 'f',
                            'index_type_command' => 'ftable',
                            'key' => '',
--- 208,211 ----
***************
*** 275,283 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 5,
!             'macro' => ''
!           },
            'parent' => {}
          },
--- 279,283 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {}
          },
***************
*** 376,380 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 376,379 ----
***************
*** 391,395 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 390,393 ----
***************
*** 406,410 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 404,407 ----
***************
*** 427,431 ****
                    'index_at_command' => 'defun',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'defun',
                    'key' => '',
--- 424,427 ----
***************
*** 525,529 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 521,524 ----
***************
*** 540,544 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 535,538 ----
***************
*** 555,559 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 549,552 ----
***************
*** 576,580 ****
                    'index_at_command' => 'defunx',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'defun',
                    'key' => '',
--- 569,572 ----
***************
*** 764,767 ****
--- 756,760 ----
  $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
  $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
+ $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'line_nr'} = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'empty_string_index_entry'}{'contents'}[1];
  $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'empty_string_index_entry'}{'contents'}[1];
***************
*** 781,789 ****
  $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0];
  $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0];
  $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'contents'} = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'parent'} = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0];
  $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'contents'} = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'};
- $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'parent'} = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0];
  $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 774,779 ----
***************
*** 809,817 ****
  $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1];
  $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0];
  $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'def_args'}[4][1]{'contents'} = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'def_args'}[4][1]{'parent'} = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0];
  $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'def_args'}[6][1]{'contents'} = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[5]{'contents'};
- $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'def_args'}[6][1]{'parent'} = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0];
  $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'def_args'}[0][1];
  $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'def_args'}[2][1];
--- 799,804 ----
diff -Nrc2 texinfo-6.1/tp/t/results/indices/encoding_index_ascii.pl texinfo-6.3/tp/t/results/indices/encoding_index_ascii.pl
*** texinfo-6.1/tp/t/results/indices/encoding_index_ascii.pl	2016-01-22 07:49:40.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/encoding_index_ascii.pl	2016-08-02 18:44:21.000000000 +0100
***************
*** 216,219 ****
--- 216,225 ----
                    ],
                    'cmdname' => '\'',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 8,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 236,239 ****
--- 242,247 ----
                    ],
                    'cmdname' => '\'',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 262,266 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'e\' e\'',
--- 270,273 ----
***************
*** 271,279 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 8,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 278,282 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 397,401 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'i" i"i"i"',
--- 400,403 ----
***************
*** 436,439 ****
--- 438,447 ----
                    ],
                    'cmdname' => '^',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 10,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 456,459 ****
--- 464,469 ----
                    ],
                    'cmdname' => '^',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 472,475 ****
--- 482,487 ----
                    ],
                    'cmdname' => '^',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 488,491 ****
--- 500,505 ----
                    ],
                    'cmdname' => '^',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 504,507 ****
--- 518,523 ----
                    ],
                    'cmdname' => '^',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 533,537 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'i^ i^i^i^i^',
--- 549,552 ----
***************
*** 542,550 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 10,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 557,561 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 588,592 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'a',
--- 599,602 ----
***************
*** 643,647 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'b',
--- 653,656 ----
***************
*** 698,702 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'c',
--- 707,710 ----
***************
*** 753,757 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'd',
--- 761,764 ----
***************
*** 808,812 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'e',
--- 815,818 ----
***************
*** 863,867 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'f',
--- 869,872 ----
***************
*** 918,922 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'g',
--- 923,926 ----
***************
*** 973,977 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'h',
--- 977,980 ----
***************
*** 1028,1032 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'i',
--- 1031,1034 ----
***************
*** 1083,1087 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'j',
--- 1085,1088 ----
***************
*** 1138,1142 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'k',
--- 1139,1142 ----
***************
*** 1193,1197 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'l',
--- 1193,1196 ----
***************
*** 1248,1252 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'm',
--- 1247,1250 ----
***************
*** 1303,1307 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'n',
--- 1301,1304 ----
***************
*** 1358,1362 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'o',
--- 1355,1358 ----
***************
*** 1413,1417 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'p',
--- 1409,1412 ----
***************
*** 1468,1472 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'q',
--- 1463,1466 ----
***************
*** 1523,1527 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'r',
--- 1517,1520 ----
***************
*** 1578,1582 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 's',
--- 1571,1574 ----
***************
*** 1633,1637 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 't',
--- 1625,1628 ----
***************
*** 1688,1692 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'u',
--- 1679,1682 ----
***************
*** 1743,1747 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'v',
--- 1733,1736 ----
***************
*** 1798,1802 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'w',
--- 1787,1790 ----
***************
*** 1853,1857 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'x',
--- 1841,1844 ----
***************
*** 1908,1912 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'y',
--- 1895,1898 ----
***************
*** 1963,1967 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'z',
--- 1949,1952 ----
***************
*** 2018,2022 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'A',
--- 2003,2006 ----
***************
*** 2073,2077 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'B',
--- 2057,2060 ----
***************
*** 2112,2115 ****
--- 2095,2103 ----
                    'cmdname' => 'l',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 39,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2136,2140 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'l',
--- 2124,2127 ----
***************
*** 2145,2153 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 39,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2132,2136 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2175,2178 ****
--- 2158,2166 ----
                    'cmdname' => 'L',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 40,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2199,2203 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'L',
--- 2187,2190 ----
***************
*** 2208,2216 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 40,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2195,2199 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2301,2305 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'i i (dotless)',
--- 2284,2287 ----
***************
*** 2427,2431 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'i^ i^ (dotless)',
--- 2409,2412 ----
***************
*** 2462,2465 ****
--- 2443,2451 ----
                    'cmdname' => 'ss',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 43,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2486,2490 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'ss',
--- 2472,2475 ----
***************
*** 2495,2503 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 43,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2480,2484 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2525,2528 ****
--- 2506,2514 ----
                    'cmdname' => 'euro',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 44,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2549,2553 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'Euro',
--- 2535,2538 ----
***************
*** 2558,2566 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 44,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2543,2547 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2588,2591 ****
--- 2569,2577 ----
                    'cmdname' => 'AE',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 45,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2612,2616 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'AE',
--- 2598,2601 ----
***************
*** 2621,2629 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 45,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2606,2610 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2651,2654 ****
--- 2632,2640 ----
                    'cmdname' => 'exclamdown',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 46,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2675,2679 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '!',
--- 2661,2664 ----
***************
*** 2684,2692 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 46,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2669,2673 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2714,2717 ****
--- 2695,2703 ----
                    'cmdname' => 'TH',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 47,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2738,2742 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'TH',
--- 2724,2727 ----
***************
*** 2747,2755 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 47,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2732,2736 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2777,2780 ****
--- 2758,2766 ----
                    'cmdname' => 'DH',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 48,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2801,2805 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'D',
--- 2787,2790 ----
***************
*** 2810,2818 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 48,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2795,2799 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2840,2843 ****
--- 2821,2829 ----
                    'cmdname' => 'textdegree',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 49,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2864,2868 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'o',
--- 2850,2853 ----
***************
*** 2873,2881 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 49,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2858,2862 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2919,2923 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '0',
--- 2900,2903 ----
***************
*** 2974,2978 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '9',
--- 2954,2957 ----
***************
*** 3013,3016 ****
--- 2992,3000 ----
                    'cmdname' => 'quotedblleft',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 52,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 3037,3041 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '``',
--- 3021,3024 ----
***************
*** 3046,3054 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 52,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 3029,3033 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 3076,3079 ****
--- 3055,3063 ----
                    'cmdname' => 'geq',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 53,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 3100,3104 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '>=',
--- 3084,3087 ----
***************
*** 3109,3117 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 53,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 3092,3096 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 3139,3142 ****
--- 3118,3126 ----
                    'cmdname' => 'comma',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 54,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 3163,3167 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => ',',
--- 3147,3150 ----
***************
*** 3172,3180 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 54,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 3155,3159 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 3218,3222 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '"',
--- 3197,3200 ----
***************
*** 3273,3277 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '`',
--- 3251,3254 ----
***************
*** 3328,3332 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '\'',
--- 3305,3308 ----
***************
*** 3383,3387 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '"',
--- 3359,3362 ----
***************
*** 3438,3442 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '"',
--- 3413,3416 ----
***************
*** 3493,3497 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '@',
--- 3467,3470 ----
***************
*** 3548,3552 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '-',
--- 3521,3524 ----
***************
*** 3603,3607 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '--',
--- 3575,3578 ----
***************
*** 3725,3728 ****
--- 3696,3700 ----
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[3];
+ $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0];
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0];
***************
*** 3736,3739 ****
--- 3708,3712 ----
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'extra'}{'misc_content'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'line_nr'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'encoding_index_ascii'}{'contents'}[2];
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[2];
***************
*** 3777,3789 ****
--- 3750,3766 ----
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3];
+ $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0];
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4];
+ $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0];
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5];
+ $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0];
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6];
+ $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0];
***************
*** 3800,3803 ****
--- 3777,3781 ----
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'extra'}{'misc_content'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'line_nr'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'encoding_index_ascii'}{'contents'}[2];
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[4];
***************
*** 4149,4152 ****
--- 4127,4131 ----
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[32]{'extra'}{'misc_content'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[32]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[32]{'line_nr'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[32]{'parent'} = $result_trees{'encoding_index_ascii'}{'contents'}[2];
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[33];
***************
*** 4162,4165 ****
--- 4141,4145 ----
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[33]{'extra'}{'misc_content'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[33]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[33]{'line_nr'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[33]{'parent'} = $result_trees{'encoding_index_ascii'}{'contents'}[2];
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[34];
***************
*** 4229,4232 ****
--- 4209,4213 ----
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[36]{'extra'}{'misc_content'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[36]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[36]{'line_nr'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[36]{'parent'} = $result_trees{'encoding_index_ascii'}{'contents'}[2];
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[37];
***************
*** 4242,4245 ****
--- 4223,4227 ----
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[37]{'extra'}{'misc_content'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[37]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[37]{'line_nr'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[37]{'parent'} = $result_trees{'encoding_index_ascii'}{'contents'}[2];
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[38];
***************
*** 4255,4258 ****
--- 4237,4241 ----
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[38]{'extra'}{'misc_content'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[38]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[38]{'line_nr'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[38]{'parent'} = $result_trees{'encoding_index_ascii'}{'contents'}[2];
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[39];
***************
*** 4268,4271 ****
--- 4251,4255 ----
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[39]{'extra'}{'misc_content'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[39]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[39]{'line_nr'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[39]{'parent'} = $result_trees{'encoding_index_ascii'}{'contents'}[2];
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[40];
***************
*** 4281,4284 ****
--- 4265,4269 ----
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[40]{'extra'}{'misc_content'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[40]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[40]{'line_nr'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[40]{'parent'} = $result_trees{'encoding_index_ascii'}{'contents'}[2];
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[41];
***************
*** 4294,4297 ****
--- 4279,4283 ----
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[41]{'extra'}{'misc_content'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[41]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[41]{'line_nr'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[41]{'parent'} = $result_trees{'encoding_index_ascii'}{'contents'}[2];
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[42];
***************
*** 4307,4310 ****
--- 4293,4297 ----
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[42]{'extra'}{'misc_content'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[42]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[42]{'line_nr'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[42]{'parent'} = $result_trees{'encoding_index_ascii'}{'contents'}[2];
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[43];
***************
*** 4344,4347 ****
--- 4331,4335 ----
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[45]{'extra'}{'misc_content'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[45]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[45]{'line_nr'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[45]{'parent'} = $result_trees{'encoding_index_ascii'}{'contents'}[2];
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[46];
***************
*** 4357,4360 ****
--- 4345,4349 ----
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[46]{'extra'}{'misc_content'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[46]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[46]{'line_nr'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[46]{'parent'} = $result_trees{'encoding_index_ascii'}{'contents'}[2];
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[47];
***************
*** 4370,4373 ****
--- 4359,4363 ----
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[47]{'extra'}{'misc_content'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[47]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[47]{'line_nr'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[47]{'parent'} = $result_trees{'encoding_index_ascii'}{'contents'}[2];
  $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[48];
diff -Nrc2 texinfo-6.1/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl texinfo-6.3/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
*** texinfo-6.1/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl	2016-01-22 07:49:40.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl	2016-08-02 18:44:22.000000000 +0100
***************
*** 216,219 ****
--- 216,225 ----
                    ],
                    'cmdname' => '\'',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 8,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 236,239 ****
--- 242,247 ----
                    ],
                    'cmdname' => '\'',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 262,266 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'e\' e\'',
--- 270,273 ----
***************
*** 271,279 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 8,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 278,282 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 397,401 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'i" i"i"i"',
--- 400,403 ----
***************
*** 436,439 ****
--- 438,447 ----
                    ],
                    'cmdname' => '^',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 10,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 456,459 ****
--- 464,469 ----
                    ],
                    'cmdname' => '^',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 472,475 ****
--- 482,487 ----
                    ],
                    'cmdname' => '^',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 488,491 ****
--- 500,505 ----
                    ],
                    'cmdname' => '^',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 504,507 ****
--- 518,523 ----
                    ],
                    'cmdname' => '^',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 533,537 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'i^ i^i^i^i^',
--- 549,552 ----
***************
*** 542,550 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 10,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 557,561 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 588,592 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'a',
--- 599,602 ----
***************
*** 643,647 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'b',
--- 653,656 ----
***************
*** 698,702 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'c',
--- 707,710 ----
***************
*** 753,757 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'd',
--- 761,764 ----
***************
*** 808,812 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'e',
--- 815,818 ----
***************
*** 863,867 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'f',
--- 869,872 ----
***************
*** 918,922 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'g',
--- 923,926 ----
***************
*** 973,977 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'h',
--- 977,980 ----
***************
*** 1028,1032 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'i',
--- 1031,1034 ----
***************
*** 1083,1087 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'j',
--- 1085,1088 ----
***************
*** 1138,1142 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'k',
--- 1139,1142 ----
***************
*** 1193,1197 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'l',
--- 1193,1196 ----
***************
*** 1248,1252 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'm',
--- 1247,1250 ----
***************
*** 1303,1307 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'n',
--- 1301,1304 ----
***************
*** 1358,1362 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'o',
--- 1355,1358 ----
***************
*** 1413,1417 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'p',
--- 1409,1412 ----
***************
*** 1468,1472 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'q',
--- 1463,1466 ----
***************
*** 1523,1527 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'r',
--- 1517,1520 ----
***************
*** 1578,1582 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 's',
--- 1571,1574 ----
***************
*** 1633,1637 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 't',
--- 1625,1628 ----
***************
*** 1688,1692 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'u',
--- 1679,1682 ----
***************
*** 1743,1747 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'v',
--- 1733,1736 ----
***************
*** 1798,1802 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'w',
--- 1787,1790 ----
***************
*** 1853,1857 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'x',
--- 1841,1844 ----
***************
*** 1908,1912 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'y',
--- 1895,1898 ----
***************
*** 1963,1967 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'z',
--- 1949,1952 ----
***************
*** 2018,2022 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'A',
--- 2003,2006 ----
***************
*** 2073,2077 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'B',
--- 2057,2060 ----
***************
*** 2112,2115 ****
--- 2095,2103 ----
                    'cmdname' => 'l',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 39,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2136,2140 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'l',
--- 2124,2127 ----
***************
*** 2145,2153 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 39,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2132,2136 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2175,2178 ****
--- 2158,2166 ----
                    'cmdname' => 'L',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 40,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2199,2203 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'L',
--- 2187,2190 ----
***************
*** 2208,2216 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 40,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2195,2199 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2301,2305 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'i i (dotless)',
--- 2284,2287 ----
***************
*** 2427,2431 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'i^ i^ (dotless)',
--- 2409,2412 ----
***************
*** 2462,2465 ****
--- 2443,2451 ----
                    'cmdname' => 'ss',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 43,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2486,2490 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'ss',
--- 2472,2475 ----
***************
*** 2495,2503 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 43,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2480,2484 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2525,2528 ****
--- 2506,2514 ----
                    'cmdname' => 'euro',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 44,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2549,2553 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'Euro',
--- 2535,2538 ----
***************
*** 2558,2566 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 44,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2543,2547 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2588,2591 ****
--- 2569,2577 ----
                    'cmdname' => 'AE',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 45,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2612,2616 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'AE',
--- 2598,2601 ----
***************
*** 2621,2629 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 45,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2606,2610 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2651,2654 ****
--- 2632,2640 ----
                    'cmdname' => 'exclamdown',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 46,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2675,2679 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '!',
--- 2661,2664 ----
***************
*** 2684,2692 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 46,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2669,2673 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2714,2717 ****
--- 2695,2703 ----
                    'cmdname' => 'TH',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 47,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2738,2742 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'TH',
--- 2724,2727 ----
***************
*** 2747,2755 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 47,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2732,2736 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2777,2780 ****
--- 2758,2766 ----
                    'cmdname' => 'DH',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 48,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2801,2805 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'D',
--- 2787,2790 ----
***************
*** 2810,2818 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 48,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2795,2799 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2840,2843 ****
--- 2821,2829 ----
                    'cmdname' => 'textdegree',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 49,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2864,2868 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'o',
--- 2850,2853 ----
***************
*** 2873,2881 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 49,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2858,2862 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2919,2923 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '0',
--- 2900,2903 ----
***************
*** 2974,2978 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '9',
--- 2954,2957 ----
***************
*** 3013,3016 ****
--- 2992,3000 ----
                    'cmdname' => 'quotedblleft',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 52,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 3037,3041 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '``',
--- 3021,3024 ----
***************
*** 3046,3054 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 52,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 3029,3033 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 3076,3079 ****
--- 3055,3063 ----
                    'cmdname' => 'geq',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 53,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 3100,3104 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '>=',
--- 3084,3087 ----
***************
*** 3109,3117 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 53,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 3092,3096 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 3139,3142 ****
--- 3118,3126 ----
                    'cmdname' => 'comma',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 54,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 3163,3167 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => ',',
--- 3147,3150 ----
***************
*** 3172,3180 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 54,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 3155,3159 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 3218,3222 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '"',
--- 3197,3200 ----
***************
*** 3273,3277 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '`',
--- 3251,3254 ----
***************
*** 3328,3332 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '\'',
--- 3305,3308 ----
***************
*** 3383,3387 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '"',
--- 3359,3362 ----
***************
*** 3438,3442 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '"',
--- 3413,3416 ----
***************
*** 3493,3497 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '@',
--- 3467,3470 ----
***************
*** 3548,3552 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '-',
--- 3521,3524 ----
***************
*** 3603,3607 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '--',
--- 3575,3578 ----
***************
*** 3725,3728 ****
--- 3696,3700 ----
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[3];
+ $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0];
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0];
***************
*** 3736,3739 ****
--- 3708,3712 ----
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'extra'}{'misc_content'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'line_nr'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[2];
***************
*** 3777,3789 ****
--- 3750,3766 ----
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3];
+ $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0];
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4];
+ $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0];
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5];
+ $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0];
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6];
+ $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
***************
*** 3800,3803 ****
--- 3777,3781 ----
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'misc_content'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'line_nr'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[4];
***************
*** 4149,4152 ****
--- 4127,4131 ----
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[32]{'extra'}{'misc_content'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[32]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[32]{'line_nr'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[32]{'parent'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[33];
***************
*** 4162,4165 ****
--- 4141,4145 ----
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[33]{'extra'}{'misc_content'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[33]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[33]{'line_nr'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[33]{'parent'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[34];
***************
*** 4229,4232 ****
--- 4209,4213 ----
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[36]{'extra'}{'misc_content'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[36]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[36]{'line_nr'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[36]{'parent'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[37];
***************
*** 4242,4245 ****
--- 4223,4227 ----
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[37]{'extra'}{'misc_content'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[37]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[37]{'line_nr'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[37]{'parent'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[38];
***************
*** 4255,4258 ****
--- 4237,4241 ----
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[38]{'extra'}{'misc_content'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[38]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[38]{'line_nr'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[38]{'parent'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[39];
***************
*** 4268,4271 ****
--- 4251,4255 ----
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[39]{'extra'}{'misc_content'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[39]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[39]{'line_nr'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[39]{'parent'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[40];
***************
*** 4281,4284 ****
--- 4265,4269 ----
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[40]{'extra'}{'misc_content'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[40]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[40]{'line_nr'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[40]{'parent'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[41];
***************
*** 4294,4297 ****
--- 4279,4283 ----
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[41]{'extra'}{'misc_content'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[41]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[41]{'line_nr'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[41]{'parent'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[42];
***************
*** 4307,4310 ****
--- 4293,4297 ----
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[42]{'extra'}{'misc_content'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[42]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[42]{'line_nr'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[42]{'parent'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[43];
***************
*** 4344,4347 ****
--- 4331,4335 ----
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[45]{'extra'}{'misc_content'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[45]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[45]{'line_nr'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[45]{'parent'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[46];
***************
*** 4357,4360 ****
--- 4345,4349 ----
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[46]{'extra'}{'misc_content'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[46]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[46]{'line_nr'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[46]{'parent'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[47];
***************
*** 4370,4373 ****
--- 4359,4363 ----
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[47]{'extra'}{'misc_content'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[47]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[47]{'line_nr'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[47]{'parent'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[48];
diff -Nrc2 texinfo-6.1/tp/t/results/indices/encoding_index_latin1.pl texinfo-6.3/tp/t/results/indices/encoding_index_latin1.pl
*** texinfo-6.1/tp/t/results/indices/encoding_index_latin1.pl	2016-01-22 07:49:40.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/encoding_index_latin1.pl	2016-08-02 18:44:21.000000000 +0100
***************
*** 228,232 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'Ã© Ã©',
--- 228,231 ----
***************
*** 363,367 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'i" i"i"i"',
--- 362,365 ----
***************
*** 402,405 ****
--- 400,409 ----
                    ],
                    'cmdname' => '^',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 10,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 422,425 ****
--- 426,431 ----
                    ],
                    'cmdname' => '^',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 438,441 ****
--- 444,449 ----
                    ],
                    'cmdname' => '^',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 454,457 ****
--- 462,467 ----
                    ],
                    'cmdname' => '^',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 470,473 ****
--- 480,485 ----
                    ],
                    'cmdname' => '^',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 499,503 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'i^ i^i^i^i^',
--- 511,514 ----
***************
*** 508,516 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 10,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 519,523 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 554,558 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'a',
--- 561,564 ----
***************
*** 609,613 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'b',
--- 615,618 ----
***************
*** 664,668 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'c',
--- 669,672 ----
***************
*** 719,723 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'd',
--- 723,726 ----
***************
*** 774,778 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'e',
--- 777,780 ----
***************
*** 829,833 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'f',
--- 831,834 ----
***************
*** 884,888 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'g',
--- 885,888 ----
***************
*** 939,943 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'h',
--- 939,942 ----
***************
*** 994,998 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'i',
--- 993,996 ----
***************
*** 1049,1053 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'j',
--- 1047,1050 ----
***************
*** 1104,1108 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'k',
--- 1101,1104 ----
***************
*** 1159,1163 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'l',
--- 1155,1158 ----
***************
*** 1214,1218 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'm',
--- 1209,1212 ----
***************
*** 1269,1273 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'n',
--- 1263,1266 ----
***************
*** 1324,1328 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'o',
--- 1317,1320 ----
***************
*** 1379,1383 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'p',
--- 1371,1374 ----
***************
*** 1434,1438 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'q',
--- 1425,1428 ----
***************
*** 1489,1493 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'r',
--- 1479,1482 ----
***************
*** 1544,1548 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 's',
--- 1533,1536 ----
***************
*** 1599,1603 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 't',
--- 1587,1590 ----
***************
*** 1654,1658 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'u',
--- 1641,1644 ----
***************
*** 1709,1713 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'v',
--- 1695,1698 ----
***************
*** 1764,1768 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'w',
--- 1749,1752 ----
***************
*** 1819,1823 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'x',
--- 1803,1806 ----
***************
*** 1874,1878 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'y',
--- 1857,1860 ----
***************
*** 1929,1933 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'z',
--- 1911,1914 ----
***************
*** 1984,1988 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'A',
--- 1965,1968 ----
***************
*** 2039,2043 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'B',
--- 2019,2022 ----
***************
*** 2078,2081 ****
--- 2057,2065 ----
                    'cmdname' => 'l',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 39,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2102,2106 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'l',
--- 2086,2089 ----
***************
*** 2111,2119 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 39,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2094,2098 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2141,2144 ****
--- 2120,2128 ----
                    'cmdname' => 'L',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 40,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2165,2169 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'L',
--- 2149,2152 ----
***************
*** 2174,2182 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 40,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2157,2161 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2267,2271 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'i i (dotless)',
--- 2246,2249 ----
***************
*** 2393,2397 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'i^ i^ (dotless)',
--- 2371,2374 ----
***************
*** 2428,2431 ****
--- 2405,2413 ----
                    'cmdname' => 'ss',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 43,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2452,2456 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'ss',
--- 2434,2437 ----
***************
*** 2461,2469 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 43,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2442,2446 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2491,2494 ****
--- 2468,2476 ----
                    'cmdname' => 'euro',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 44,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2515,2519 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'Euro',
--- 2497,2500 ----
***************
*** 2524,2532 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 44,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2505,2509 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2554,2557 ****
--- 2531,2539 ----
                    'cmdname' => 'AE',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 45,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2578,2582 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'AE',
--- 2560,2563 ----
***************
*** 2587,2595 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 45,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2568,2572 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2617,2620 ****
--- 2594,2602 ----
                    'cmdname' => 'exclamdown',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 46,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2641,2645 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '!',
--- 2623,2626 ----
***************
*** 2650,2658 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 46,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2631,2635 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2680,2683 ****
--- 2657,2665 ----
                    'cmdname' => 'TH',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 47,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2704,2708 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'TH',
--- 2686,2689 ----
***************
*** 2713,2721 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 47,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2694,2698 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2743,2746 ****
--- 2720,2728 ----
                    'cmdname' => 'DH',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 48,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2767,2771 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'D',
--- 2749,2752 ----
***************
*** 2776,2784 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 48,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2757,2761 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2806,2809 ****
--- 2783,2791 ----
                    'cmdname' => 'textdegree',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 49,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2830,2834 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'o',
--- 2812,2815 ----
***************
*** 2839,2847 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 49,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2820,2824 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2885,2889 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '0',
--- 2862,2865 ----
***************
*** 2940,2944 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '9',
--- 2916,2919 ----
***************
*** 2979,2982 ****
--- 2954,2962 ----
                    'cmdname' => 'quotedblleft',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 52,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 3003,3007 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '``',
--- 2983,2986 ----
***************
*** 3012,3020 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 52,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2991,2995 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 3042,3045 ****
--- 3017,3025 ----
                    'cmdname' => 'geq',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 53,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 3066,3070 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '>=',
--- 3046,3049 ----
***************
*** 3075,3083 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 53,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 3054,3058 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 3105,3108 ****
--- 3080,3088 ----
                    'cmdname' => 'comma',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 54,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 3129,3133 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => ',',
--- 3109,3112 ----
***************
*** 3138,3146 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 54,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 3117,3121 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 3184,3188 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '"',
--- 3159,3162 ----
***************
*** 3239,3243 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '`',
--- 3213,3216 ----
***************
*** 3294,3298 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '\'',
--- 3267,3270 ----
***************
*** 3349,3353 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '"',
--- 3321,3324 ----
***************
*** 3404,3408 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '"',
--- 3375,3378 ----
***************
*** 3459,3463 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '@',
--- 3429,3432 ----
***************
*** 3514,3518 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '-',
--- 3483,3486 ----
***************
*** 3569,3573 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '--',
--- 3537,3540 ----
***************
*** 3735,3747 ****
--- 3702,3718 ----
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3];
+ $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0];
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4];
+ $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0];
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5];
+ $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0];
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6];
+ $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0];
***************
*** 3758,3761 ****
--- 3729,3733 ----
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'extra'}{'misc_content'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'line_nr'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'encoding_index_latin1'}{'contents'}[2];
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[4];
***************
*** 4107,4110 ****
--- 4079,4083 ----
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[32]{'extra'}{'misc_content'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[32]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[32]{'line_nr'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[32]{'parent'} = $result_trees{'encoding_index_latin1'}{'contents'}[2];
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[33];
***************
*** 4120,4123 ****
--- 4093,4097 ----
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[33]{'extra'}{'misc_content'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[33]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[33]{'line_nr'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[33]{'parent'} = $result_trees{'encoding_index_latin1'}{'contents'}[2];
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[34];
***************
*** 4187,4190 ****
--- 4161,4165 ----
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[36]{'extra'}{'misc_content'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[36]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[36]{'line_nr'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[36]{'parent'} = $result_trees{'encoding_index_latin1'}{'contents'}[2];
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[37];
***************
*** 4200,4203 ****
--- 4175,4179 ----
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[37]{'extra'}{'misc_content'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[37]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[37]{'line_nr'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[37]{'parent'} = $result_trees{'encoding_index_latin1'}{'contents'}[2];
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[38];
***************
*** 4213,4216 ****
--- 4189,4193 ----
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[38]{'extra'}{'misc_content'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[38]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[38]{'line_nr'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[38]{'parent'} = $result_trees{'encoding_index_latin1'}{'contents'}[2];
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[39];
***************
*** 4226,4229 ****
--- 4203,4207 ----
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[39]{'extra'}{'misc_content'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[39]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[39]{'line_nr'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[39]{'parent'} = $result_trees{'encoding_index_latin1'}{'contents'}[2];
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[40];
***************
*** 4239,4242 ****
--- 4217,4221 ----
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[40]{'extra'}{'misc_content'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[40]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[40]{'line_nr'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[40]{'parent'} = $result_trees{'encoding_index_latin1'}{'contents'}[2];
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[41];
***************
*** 4252,4255 ****
--- 4231,4235 ----
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[41]{'extra'}{'misc_content'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[41]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[41]{'line_nr'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[41]{'parent'} = $result_trees{'encoding_index_latin1'}{'contents'}[2];
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[42];
***************
*** 4265,4268 ****
--- 4245,4249 ----
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[42]{'extra'}{'misc_content'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[42]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[42]{'line_nr'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[42]{'parent'} = $result_trees{'encoding_index_latin1'}{'contents'}[2];
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[43];
***************
*** 4302,4305 ****
--- 4283,4287 ----
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[45]{'extra'}{'misc_content'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[45]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[45]{'line_nr'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[45]{'parent'} = $result_trees{'encoding_index_latin1'}{'contents'}[2];
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[46];
***************
*** 4315,4318 ****
--- 4297,4301 ----
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[46]{'extra'}{'misc_content'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[46]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[46]{'line_nr'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[46]{'parent'} = $result_trees{'encoding_index_latin1'}{'contents'}[2];
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[47];
***************
*** 4328,4331 ****
--- 4311,4315 ----
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[47]{'extra'}{'misc_content'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[47]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[47]{'line_nr'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[47]{'parent'} = $result_trees{'encoding_index_latin1'}{'contents'}[2];
  $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[48];
diff -Nrc2 texinfo-6.1/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl texinfo-6.3/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
*** texinfo-6.1/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl	2016-01-22 07:49:40.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl	2016-08-02 18:44:22.000000000 +0100
***************
*** 228,232 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'Ã© Ã©',
--- 228,231 ----
***************
*** 363,367 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{ef} \x{ef}\x{ef}\x{ef}",
--- 362,365 ----
***************
*** 402,405 ****
--- 400,409 ----
                    ],
                    'cmdname' => '^',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 10,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 422,425 ****
--- 426,431 ----
                    ],
                    'cmdname' => '^',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 438,441 ****
--- 444,449 ----
                    ],
                    'cmdname' => '^',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 454,457 ****
--- 462,467 ----
                    ],
                    'cmdname' => '^',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 470,473 ****
--- 480,485 ----
                    ],
                    'cmdname' => '^',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 499,503 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{ee} \x{ee}\x{ee}\x{ee}\x{ee}",
--- 511,514 ----
***************
*** 508,516 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 10,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 519,523 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 554,558 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'a',
--- 561,564 ----
***************
*** 609,613 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'b',
--- 615,618 ----
***************
*** 664,668 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'c',
--- 669,672 ----
***************
*** 719,723 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'd',
--- 723,726 ----
***************
*** 774,778 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'e',
--- 777,780 ----
***************
*** 829,833 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'f',
--- 831,834 ----
***************
*** 884,888 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'g',
--- 885,888 ----
***************
*** 939,943 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'h',
--- 939,942 ----
***************
*** 994,998 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'i',
--- 993,996 ----
***************
*** 1049,1053 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'j',
--- 1047,1050 ----
***************
*** 1104,1108 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'k',
--- 1101,1104 ----
***************
*** 1159,1163 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'l',
--- 1155,1158 ----
***************
*** 1214,1218 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'm',
--- 1209,1212 ----
***************
*** 1269,1273 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'n',
--- 1263,1266 ----
***************
*** 1324,1328 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'o',
--- 1317,1320 ----
***************
*** 1379,1383 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'p',
--- 1371,1374 ----
***************
*** 1434,1438 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'q',
--- 1425,1428 ----
***************
*** 1489,1493 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'r',
--- 1479,1482 ----
***************
*** 1544,1548 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 's',
--- 1533,1536 ----
***************
*** 1599,1603 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 't',
--- 1587,1590 ----
***************
*** 1654,1658 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'u',
--- 1641,1644 ----
***************
*** 1709,1713 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'v',
--- 1695,1698 ----
***************
*** 1764,1768 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'w',
--- 1749,1752 ----
***************
*** 1819,1823 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'x',
--- 1803,1806 ----
***************
*** 1874,1878 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'y',
--- 1857,1860 ----
***************
*** 1929,1933 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'z',
--- 1911,1914 ----
***************
*** 1984,1988 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'A',
--- 1965,1968 ----
***************
*** 2039,2043 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'B',
--- 2019,2022 ----
***************
*** 2078,2081 ****
--- 2057,2065 ----
                    'cmdname' => 'l',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 39,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2102,2106 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'l',
--- 2086,2089 ----
***************
*** 2111,2119 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 39,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2094,2098 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2141,2144 ****
--- 2120,2128 ----
                    'cmdname' => 'L',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 40,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2165,2169 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'L',
--- 2149,2152 ----
***************
*** 2174,2182 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 40,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2157,2161 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2267,2271 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'i i (dotless)',
--- 2246,2249 ----
***************
*** 2393,2397 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{ee} \x{ee} (dotless)",
--- 2371,2374 ----
***************
*** 2428,2431 ****
--- 2405,2413 ----
                    'cmdname' => 'ss',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 43,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2452,2456 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{df}",
--- 2434,2437 ----
***************
*** 2461,2469 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 43,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2442,2446 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2491,2494 ****
--- 2468,2476 ----
                    'cmdname' => 'euro',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 44,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2515,2519 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'Euro',
--- 2497,2500 ----
***************
*** 2524,2532 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 44,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2505,2509 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2554,2557 ****
--- 2531,2539 ----
                    'cmdname' => 'AE',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 45,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2578,2582 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{c6}",
--- 2560,2563 ----
***************
*** 2587,2595 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 45,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2568,2572 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2617,2620 ****
--- 2594,2602 ----
                    'cmdname' => 'exclamdown',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 46,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2641,2645 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{a1}",
--- 2623,2626 ----
***************
*** 2650,2658 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 46,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2631,2635 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2680,2683 ****
--- 2657,2665 ----
                    'cmdname' => 'TH',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 47,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2704,2708 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{de}",
--- 2686,2689 ----
***************
*** 2713,2721 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 47,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2694,2698 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2743,2746 ****
--- 2720,2728 ----
                    'cmdname' => 'DH',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 48,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2767,2771 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{d0}",
--- 2749,2752 ----
***************
*** 2776,2784 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 48,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2757,2761 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2806,2809 ****
--- 2783,2791 ----
                    'cmdname' => 'textdegree',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 49,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2830,2834 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{b0}",
--- 2812,2815 ----
***************
*** 2839,2847 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 49,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2820,2824 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2885,2889 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '0',
--- 2862,2865 ----
***************
*** 2940,2944 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '9',
--- 2916,2919 ----
***************
*** 2979,2982 ****
--- 2954,2962 ----
                    'cmdname' => 'quotedblleft',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 52,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 3003,3007 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '``',
--- 2983,2986 ----
***************
*** 3012,3020 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 52,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2991,2995 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 3042,3045 ****
--- 3017,3025 ----
                    'cmdname' => 'geq',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 53,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 3066,3070 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '>=',
--- 3046,3049 ----
***************
*** 3075,3083 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 53,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 3054,3058 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 3105,3108 ****
--- 3080,3088 ----
                    'cmdname' => 'comma',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 54,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 3129,3133 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => ',',
--- 3109,3112 ----
***************
*** 3138,3146 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 54,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 3117,3121 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 3184,3188 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '"',
--- 3159,3162 ----
***************
*** 3239,3243 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '`',
--- 3213,3216 ----
***************
*** 3294,3298 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '\'',
--- 3267,3270 ----
***************
*** 3349,3353 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '"',
--- 3321,3324 ----
***************
*** 3404,3408 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '"',
--- 3375,3378 ----
***************
*** 3459,3463 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '@',
--- 3429,3432 ----
***************
*** 3514,3518 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '-',
--- 3483,3486 ----
***************
*** 3569,3573 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '--',
--- 3537,3540 ----
***************
*** 3735,3747 ****
--- 3702,3718 ----
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3];
+ $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0];
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4];
+ $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0];
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5];
+ $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0];
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6];
+ $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
***************
*** 3758,3761 ****
--- 3729,3733 ----
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'misc_content'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'line_nr'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[4];
***************
*** 4107,4110 ****
--- 4079,4083 ----
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[32]{'extra'}{'misc_content'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[32]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[32]{'line_nr'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[32]{'parent'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[33];
***************
*** 4120,4123 ****
--- 4093,4097 ----
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[33]{'extra'}{'misc_content'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[33]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[33]{'line_nr'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[33]{'parent'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[34];
***************
*** 4187,4190 ****
--- 4161,4165 ----
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[36]{'extra'}{'misc_content'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[36]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[36]{'line_nr'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[36]{'parent'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[37];
***************
*** 4200,4203 ****
--- 4175,4179 ----
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[37]{'extra'}{'misc_content'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[37]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[37]{'line_nr'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[37]{'parent'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[38];
***************
*** 4213,4216 ****
--- 4189,4193 ----
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[38]{'extra'}{'misc_content'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[38]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[38]{'line_nr'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[38]{'parent'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[39];
***************
*** 4226,4229 ****
--- 4203,4207 ----
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[39]{'extra'}{'misc_content'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[39]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[39]{'line_nr'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[39]{'parent'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[40];
***************
*** 4239,4242 ****
--- 4217,4221 ----
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[40]{'extra'}{'misc_content'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[40]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[40]{'line_nr'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[40]{'parent'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[41];
***************
*** 4252,4255 ****
--- 4231,4235 ----
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[41]{'extra'}{'misc_content'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[41]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[41]{'line_nr'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[41]{'parent'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[42];
***************
*** 4265,4268 ****
--- 4245,4249 ----
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[42]{'extra'}{'misc_content'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[42]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[42]{'line_nr'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[42]{'parent'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[43];
***************
*** 4302,4305 ****
--- 4283,4287 ----
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[45]{'extra'}{'misc_content'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[45]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[45]{'line_nr'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[45]{'parent'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[46];
***************
*** 4315,4318 ****
--- 4297,4301 ----
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[46]{'extra'}{'misc_content'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[46]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[46]{'line_nr'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[46]{'parent'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[47];
***************
*** 4328,4331 ****
--- 4311,4315 ----
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[47]{'extra'}{'misc_content'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[47]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[47]{'line_nr'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[47]{'parent'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[48];
diff -Nrc2 texinfo-6.1/tp/t/results/indices/encoding_index_utf8.pl texinfo-6.3/tp/t/results/indices/encoding_index_utf8.pl
*** texinfo-6.1/tp/t/results/indices/encoding_index_utf8.pl	2016-01-22 07:49:40.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/encoding_index_utf8.pl	2016-08-02 18:44:21.000000000 +0100
***************
*** 228,232 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'Ã© Ã©',
--- 228,231 ----
***************
*** 363,367 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'i" i"i"i"',
--- 362,365 ----
***************
*** 402,405 ****
--- 400,409 ----
                    ],
                    'cmdname' => '^',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 10,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 422,425 ****
--- 426,431 ----
                    ],
                    'cmdname' => '^',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 438,441 ****
--- 444,449 ----
                    ],
                    'cmdname' => '^',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 454,457 ****
--- 462,467 ----
                    ],
                    'cmdname' => '^',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 470,473 ****
--- 480,485 ----
                    ],
                    'cmdname' => '^',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 499,503 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'i^ i^i^i^i^',
--- 511,514 ----
***************
*** 508,516 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 10,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 519,523 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 554,558 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'a',
--- 561,564 ----
***************
*** 609,613 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'b',
--- 615,618 ----
***************
*** 664,668 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'c',
--- 669,672 ----
***************
*** 719,723 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'd',
--- 723,726 ----
***************
*** 774,778 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'e',
--- 777,780 ----
***************
*** 829,833 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'f',
--- 831,834 ----
***************
*** 884,888 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'g',
--- 885,888 ----
***************
*** 939,943 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'h',
--- 939,942 ----
***************
*** 994,998 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'i',
--- 993,996 ----
***************
*** 1049,1053 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'j',
--- 1047,1050 ----
***************
*** 1104,1108 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'k',
--- 1101,1104 ----
***************
*** 1159,1163 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'l',
--- 1155,1158 ----
***************
*** 1214,1218 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'm',
--- 1209,1212 ----
***************
*** 1269,1273 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'n',
--- 1263,1266 ----
***************
*** 1324,1328 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'o',
--- 1317,1320 ----
***************
*** 1379,1383 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'p',
--- 1371,1374 ----
***************
*** 1434,1438 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'q',
--- 1425,1428 ----
***************
*** 1489,1493 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'r',
--- 1479,1482 ----
***************
*** 1544,1548 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 's',
--- 1533,1536 ----
***************
*** 1599,1603 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 't',
--- 1587,1590 ----
***************
*** 1654,1658 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'u',
--- 1641,1644 ----
***************
*** 1709,1713 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'v',
--- 1695,1698 ----
***************
*** 1764,1768 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'w',
--- 1749,1752 ----
***************
*** 1819,1823 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'x',
--- 1803,1806 ----
***************
*** 1874,1878 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'y',
--- 1857,1860 ----
***************
*** 1929,1933 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'z',
--- 1911,1914 ----
***************
*** 1984,1988 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'A',
--- 1965,1968 ----
***************
*** 2039,2043 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'B',
--- 2019,2022 ----
***************
*** 2078,2081 ****
--- 2057,2065 ----
                    'cmdname' => 'l',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 39,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2102,2106 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'l',
--- 2086,2089 ----
***************
*** 2111,2119 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 39,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2094,2098 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2141,2144 ****
--- 2120,2128 ----
                    'cmdname' => 'L',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 40,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2165,2169 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'L',
--- 2149,2152 ----
***************
*** 2174,2182 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 40,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2157,2161 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2267,2271 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'i i (dotless)',
--- 2246,2249 ----
***************
*** 2393,2397 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'i^ i^ (dotless)',
--- 2371,2374 ----
***************
*** 2428,2431 ****
--- 2405,2413 ----
                    'cmdname' => 'ss',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 43,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2452,2456 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'ss',
--- 2434,2437 ----
***************
*** 2461,2469 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 43,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2442,2446 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2491,2494 ****
--- 2468,2476 ----
                    'cmdname' => 'euro',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 44,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2515,2519 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'Euro',
--- 2497,2500 ----
***************
*** 2524,2532 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 44,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2505,2509 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2554,2557 ****
--- 2531,2539 ----
                    'cmdname' => 'AE',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 45,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2578,2582 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'AE',
--- 2560,2563 ----
***************
*** 2587,2595 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 45,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2568,2572 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2617,2620 ****
--- 2594,2602 ----
                    'cmdname' => 'exclamdown',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 46,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2641,2645 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '!',
--- 2623,2626 ----
***************
*** 2650,2658 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 46,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2631,2635 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2680,2683 ****
--- 2657,2665 ----
                    'cmdname' => 'TH',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 47,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2704,2708 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'TH',
--- 2686,2689 ----
***************
*** 2713,2721 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 47,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2694,2698 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2743,2746 ****
--- 2720,2728 ----
                    'cmdname' => 'DH',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 48,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2767,2771 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'D',
--- 2749,2752 ----
***************
*** 2776,2784 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 48,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2757,2761 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2806,2809 ****
--- 2783,2791 ----
                    'cmdname' => 'textdegree',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 49,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2830,2834 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'o',
--- 2812,2815 ----
***************
*** 2839,2847 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 49,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2820,2824 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2885,2889 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '0',
--- 2862,2865 ----
***************
*** 2940,2944 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '9',
--- 2916,2919 ----
***************
*** 2979,2982 ****
--- 2954,2962 ----
                    'cmdname' => 'quotedblleft',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 52,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 3003,3007 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '``',
--- 2983,2986 ----
***************
*** 3012,3020 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 52,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2991,2995 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 3042,3045 ****
--- 3017,3025 ----
                    'cmdname' => 'geq',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 53,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 3066,3070 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '>=',
--- 3046,3049 ----
***************
*** 3075,3083 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 53,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 3054,3058 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 3105,3108 ****
--- 3080,3088 ----
                    'cmdname' => 'comma',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 54,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 3129,3133 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => ',',
--- 3109,3112 ----
***************
*** 3138,3146 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 54,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 3117,3121 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 3184,3188 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '"',
--- 3159,3162 ----
***************
*** 3239,3243 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '`',
--- 3213,3216 ----
***************
*** 3294,3298 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '\'',
--- 3267,3270 ----
***************
*** 3349,3353 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '"',
--- 3321,3324 ----
***************
*** 3404,3408 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '"',
--- 3375,3378 ----
***************
*** 3459,3463 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '@',
--- 3429,3432 ----
***************
*** 3514,3518 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '-',
--- 3483,3486 ----
***************
*** 3569,3573 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '--',
--- 3537,3540 ----
***************
*** 3735,3747 ****
--- 3702,3718 ----
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3];
+ $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0];
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4];
+ $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0];
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5];
+ $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0];
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6];
+ $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0];
***************
*** 3758,3761 ****
--- 3729,3733 ----
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'extra'}{'misc_content'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'line_nr'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'encoding_index_utf8'}{'contents'}[2];
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[4];
***************
*** 4107,4110 ****
--- 4079,4083 ----
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[32]{'extra'}{'misc_content'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[32]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[32]{'line_nr'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[32]{'parent'} = $result_trees{'encoding_index_utf8'}{'contents'}[2];
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[33];
***************
*** 4120,4123 ****
--- 4093,4097 ----
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[33]{'extra'}{'misc_content'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[33]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[33]{'line_nr'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[33]{'parent'} = $result_trees{'encoding_index_utf8'}{'contents'}[2];
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[34];
***************
*** 4187,4190 ****
--- 4161,4165 ----
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[36]{'extra'}{'misc_content'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[36]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[36]{'line_nr'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[36]{'parent'} = $result_trees{'encoding_index_utf8'}{'contents'}[2];
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[37];
***************
*** 4200,4203 ****
--- 4175,4179 ----
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[37]{'extra'}{'misc_content'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[37]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[37]{'line_nr'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[37]{'parent'} = $result_trees{'encoding_index_utf8'}{'contents'}[2];
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[38];
***************
*** 4213,4216 ****
--- 4189,4193 ----
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[38]{'extra'}{'misc_content'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[38]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[38]{'line_nr'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[38]{'parent'} = $result_trees{'encoding_index_utf8'}{'contents'}[2];
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[39];
***************
*** 4226,4229 ****
--- 4203,4207 ----
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[39]{'extra'}{'misc_content'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[39]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[39]{'line_nr'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[39]{'parent'} = $result_trees{'encoding_index_utf8'}{'contents'}[2];
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[40];
***************
*** 4239,4242 ****
--- 4217,4221 ----
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[40]{'extra'}{'misc_content'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[40]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[40]{'line_nr'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[40]{'parent'} = $result_trees{'encoding_index_utf8'}{'contents'}[2];
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[41];
***************
*** 4252,4255 ****
--- 4231,4235 ----
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[41]{'extra'}{'misc_content'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[41]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[41]{'line_nr'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[41]{'parent'} = $result_trees{'encoding_index_utf8'}{'contents'}[2];
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[42];
***************
*** 4265,4268 ****
--- 4245,4249 ----
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[42]{'extra'}{'misc_content'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[42]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[42]{'line_nr'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[42]{'parent'} = $result_trees{'encoding_index_utf8'}{'contents'}[2];
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[43];
***************
*** 4302,4305 ****
--- 4283,4287 ----
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[45]{'extra'}{'misc_content'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[45]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[45]{'line_nr'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[45]{'parent'} = $result_trees{'encoding_index_utf8'}{'contents'}[2];
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[46];
***************
*** 4315,4318 ****
--- 4297,4301 ----
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[46]{'extra'}{'misc_content'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[46]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[46]{'line_nr'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[46]{'parent'} = $result_trees{'encoding_index_utf8'}{'contents'}[2];
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[47];
***************
*** 4328,4331 ****
--- 4311,4315 ----
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[47]{'extra'}{'misc_content'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[47]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[47]{'line_nr'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[47]{'parent'} = $result_trees{'encoding_index_utf8'}{'contents'}[2];
  $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[48];
diff -Nrc2 texinfo-6.1/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl texinfo-6.3/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
*** texinfo-6.1/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl	2016-01-22 07:49:41.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl	2016-08-02 18:44:22.000000000 +0100
***************
*** 228,232 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'Ã© Ã©',
--- 228,231 ----
***************
*** 363,367 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{ef} \x{ef}\x{ef}\x{ef}",
--- 362,365 ----
***************
*** 402,405 ****
--- 400,409 ----
                    ],
                    'cmdname' => '^',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 10,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 422,425 ****
--- 426,431 ----
                    ],
                    'cmdname' => '^',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 438,441 ****
--- 444,449 ----
                    ],
                    'cmdname' => '^',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 454,457 ****
--- 462,467 ----
                    ],
                    'cmdname' => '^',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 470,473 ****
--- 480,485 ----
                    ],
                    'cmdname' => '^',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 499,503 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{ee} \x{ee}\x{ee}\x{ee}\x{ee}",
--- 511,514 ----
***************
*** 508,516 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 10,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 519,523 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 554,558 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'a',
--- 561,564 ----
***************
*** 609,613 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'b',
--- 615,618 ----
***************
*** 664,668 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'c',
--- 669,672 ----
***************
*** 719,723 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'd',
--- 723,726 ----
***************
*** 774,778 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'e',
--- 777,780 ----
***************
*** 829,833 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'f',
--- 831,834 ----
***************
*** 884,888 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'g',
--- 885,888 ----
***************
*** 939,943 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'h',
--- 939,942 ----
***************
*** 994,998 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'i',
--- 993,996 ----
***************
*** 1049,1053 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'j',
--- 1047,1050 ----
***************
*** 1104,1108 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'k',
--- 1101,1104 ----
***************
*** 1159,1163 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'l',
--- 1155,1158 ----
***************
*** 1214,1218 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'm',
--- 1209,1212 ----
***************
*** 1269,1273 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'n',
--- 1263,1266 ----
***************
*** 1324,1328 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'o',
--- 1317,1320 ----
***************
*** 1379,1383 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'p',
--- 1371,1374 ----
***************
*** 1434,1438 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'q',
--- 1425,1428 ----
***************
*** 1489,1493 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'r',
--- 1479,1482 ----
***************
*** 1544,1548 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 's',
--- 1533,1536 ----
***************
*** 1599,1603 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 't',
--- 1587,1590 ----
***************
*** 1654,1658 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'u',
--- 1641,1644 ----
***************
*** 1709,1713 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'v',
--- 1695,1698 ----
***************
*** 1764,1768 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'w',
--- 1749,1752 ----
***************
*** 1819,1823 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'x',
--- 1803,1806 ----
***************
*** 1874,1878 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'y',
--- 1857,1860 ----
***************
*** 1929,1933 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'z',
--- 1911,1914 ----
***************
*** 1984,1988 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'A',
--- 1965,1968 ----
***************
*** 2039,2043 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'B',
--- 2019,2022 ----
***************
*** 2078,2081 ****
--- 2057,2065 ----
                    'cmdname' => 'l',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 39,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2102,2106 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{142}",
--- 2086,2089 ----
***************
*** 2111,2119 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 39,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2094,2098 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2141,2144 ****
--- 2120,2128 ----
                    'cmdname' => 'L',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 40,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2165,2169 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{141}",
--- 2149,2152 ----
***************
*** 2174,2182 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 40,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2157,2161 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2267,2271 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{131} \x{131} (dotless)",
--- 2246,2249 ----
***************
*** 2393,2397 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{ee} \x{ee} (dotless)",
--- 2371,2374 ----
***************
*** 2428,2431 ****
--- 2405,2413 ----
                    'cmdname' => 'ss',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 43,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2452,2456 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{df}",
--- 2434,2437 ----
***************
*** 2461,2469 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 43,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2442,2446 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2491,2494 ****
--- 2468,2476 ----
                    'cmdname' => 'euro',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 44,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2515,2519 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{20ac}",
--- 2497,2500 ----
***************
*** 2524,2532 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 44,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2505,2509 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2554,2557 ****
--- 2531,2539 ----
                    'cmdname' => 'AE',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 45,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2578,2582 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{c6}",
--- 2560,2563 ----
***************
*** 2587,2595 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 45,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2568,2572 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2617,2620 ****
--- 2594,2602 ----
                    'cmdname' => 'exclamdown',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 46,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2641,2645 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{a1}",
--- 2623,2626 ----
***************
*** 2650,2658 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 46,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2631,2635 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2680,2683 ****
--- 2657,2665 ----
                    'cmdname' => 'TH',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 47,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2704,2708 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{de}",
--- 2686,2689 ----
***************
*** 2713,2721 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 47,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2694,2698 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2743,2746 ****
--- 2720,2728 ----
                    'cmdname' => 'DH',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 48,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2767,2771 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{d0}",
--- 2749,2752 ----
***************
*** 2776,2784 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 48,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2757,2761 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2806,2809 ****
--- 2783,2791 ----
                    'cmdname' => 'textdegree',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 49,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 2830,2834 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{b0}",
--- 2812,2815 ----
***************
*** 2839,2847 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 49,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2820,2824 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 2885,2889 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '0',
--- 2862,2865 ----
***************
*** 2940,2944 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '9',
--- 2916,2919 ----
***************
*** 2979,2982 ****
--- 2954,2962 ----
                    'cmdname' => 'quotedblleft',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 52,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 3003,3007 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{201c}",
--- 2983,2986 ----
***************
*** 3012,3020 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 52,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 2991,2995 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 3042,3045 ****
--- 3017,3025 ----
                    'cmdname' => 'geq',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 53,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 3066,3070 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => "\x{2265}",
--- 3046,3049 ----
***************
*** 3075,3083 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 53,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 3054,3058 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 3105,3108 ****
--- 3080,3088 ----
                    'cmdname' => 'comma',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 54,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 3129,3133 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => ',',
--- 3109,3112 ----
***************
*** 3138,3146 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 54,
!             'macro' => ''
!           },
            'parent' => {},
            'type' => 'index_entry_command'
--- 3117,3121 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {},
            'type' => 'index_entry_command'
***************
*** 3184,3188 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '"',
--- 3159,3162 ----
***************
*** 3239,3243 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '`',
--- 3213,3216 ----
***************
*** 3294,3298 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '\'',
--- 3267,3270 ----
***************
*** 3349,3353 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '"',
--- 3321,3324 ----
***************
*** 3404,3408 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '"',
--- 3375,3378 ----
***************
*** 3459,3463 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '@',
--- 3429,3432 ----
***************
*** 3514,3518 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '-',
--- 3483,3486 ----
***************
*** 3569,3573 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '--',
--- 3537,3540 ----
***************
*** 3735,3747 ****
--- 3702,3718 ----
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3];
+ $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0];
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4];
+ $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0];
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5];
+ $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0];
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6];
+ $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
***************
*** 3758,3761 ****
--- 3729,3733 ----
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'misc_content'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'line_nr'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[4];
***************
*** 4107,4110 ****
--- 4079,4083 ----
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[32]{'extra'}{'misc_content'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[32]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[32]{'line_nr'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[32]{'parent'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[33];
***************
*** 4120,4123 ****
--- 4093,4097 ----
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[33]{'extra'}{'misc_content'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[33]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[33]{'line_nr'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[33]{'parent'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[34];
***************
*** 4187,4190 ****
--- 4161,4165 ----
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[36]{'extra'}{'misc_content'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[36]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[36]{'line_nr'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[36]{'parent'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[37];
***************
*** 4200,4203 ****
--- 4175,4179 ----
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[37]{'extra'}{'misc_content'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[37]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[37]{'line_nr'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[37]{'parent'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[38];
***************
*** 4213,4216 ****
--- 4189,4193 ----
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[38]{'extra'}{'misc_content'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[38]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[38]{'line_nr'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[38]{'parent'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[39];
***************
*** 4226,4229 ****
--- 4203,4207 ----
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[39]{'extra'}{'misc_content'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[39]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[39]{'line_nr'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[39]{'parent'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[40];
***************
*** 4239,4242 ****
--- 4217,4221 ----
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[40]{'extra'}{'misc_content'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[40]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[40]{'line_nr'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[40]{'parent'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[41];
***************
*** 4252,4255 ****
--- 4231,4235 ----
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[41]{'extra'}{'misc_content'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[41]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[41]{'line_nr'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[41]{'parent'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[42];
***************
*** 4265,4268 ****
--- 4245,4249 ----
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[42]{'extra'}{'misc_content'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[42]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[42]{'line_nr'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[42]{'parent'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[43];
***************
*** 4302,4305 ****
--- 4283,4287 ----
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[45]{'extra'}{'misc_content'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[45]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[45]{'line_nr'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[45]{'parent'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[46];
***************
*** 4315,4318 ****
--- 4297,4301 ----
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[46]{'extra'}{'misc_content'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[46]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[46]{'line_nr'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[46]{'parent'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[47];
***************
*** 4328,4331 ****
--- 4311,4315 ----
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[47]{'extra'}{'misc_content'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'content'};
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[47]{'extra'}{'spaces_after_command'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[0];
+ $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[47]{'line_nr'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[47]{'parent'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
  $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[48];
diff -Nrc2 texinfo-6.1/tp/t/results/indices/ftable_vtable.pl texinfo-6.3/tp/t/results/indices/ftable_vtable.pl
*** texinfo-6.1/tp/t/results/indices/ftable_vtable.pl	2016-01-22 07:49:38.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/ftable_vtable.pl	2016-08-02 18:44:19.000000000 +0100
***************
*** 69,72 ****
--- 69,78 ----
                  {
                    'cmdname' => 'emph',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 4,
+                     'macro' => ''
+                   },
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 127,131 ****
                            'index_at_command' => 'item',
                            'index_name' => 'fn',
-                           'index_prefix' => 'f',
                            'index_type_command' => 'ftable',
                            'key' => 'function1',
--- 133,136 ----
***************
*** 181,185 ****
                            'index_at_command' => 'itemx',
                            'index_name' => 'fn',
-                           'index_prefix' => 'f',
                            'index_type_command' => 'ftable',
                            'key' => 'function2x',
--- 186,189 ----
***************
*** 264,268 ****
                            'index_at_command' => 'item',
                            'index_name' => 'fn',
-                           'index_prefix' => 'f',
                            'index_type_command' => 'ftable',
                            'key' => 'fun3',
--- 268,271 ----
***************
*** 340,348 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 4,
!             'macro' => ''
!           },
            'parent' => {}
          },
--- 343,347 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {}
          },
***************
*** 367,370 ****
--- 366,375 ----
                  {
                    'cmdname' => 'emph',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 11,
+                     'macro' => ''
+                   },
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 413,416 ****
--- 418,426 ----
                                'cmdname' => 'error',
                                'contents' => [],
+                               'line_nr' => {
+                                 'file_name' => '',
+                                 'line_nr' => 12,
+                                 'macro' => ''
+                               },
                                'parent' => {}
                              },
***************
*** 438,442 ****
                            'index_at_command' => 'item',
                            'index_name' => 'vr',
-                           'index_prefix' => 'v',
                            'index_type_command' => 'vtable',
                            'key' => 'var1 error->',
--- 448,451 ----
***************
*** 447,455 ****
                          'spaces_after_command' => {}
                        },
!                       'line_nr' => {
!                         'file_name' => '',
!                         'line_nr' => 12,
!                         'macro' => ''
!                       },
                        'parent' => {}
                      },
--- 456,460 ----
                          'spaces_after_command' => {}
                        },
!                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 492,496 ****
                            'index_at_command' => 'itemx',
                            'index_name' => 'vr',
-                           'index_prefix' => 'v',
                            'index_type_command' => 'vtable',
                            'key' => 'varx2',
--- 497,500 ----
***************
*** 575,579 ****
                            'index_at_command' => 'item',
                            'index_name' => 'vr',
-                           'index_prefix' => 'v',
                            'index_type_command' => 'vtable',
                            'key' => 'var3',
--- 579,582 ----
***************
*** 651,659 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 11,
!             'macro' => ''
!           },
            'parent' => {}
          },
--- 654,658 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {}
          },
***************
*** 702,706 ****
                'index_at_command' => 'findex',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'findex',
                'key' => 'function1',
--- 701,704 ----
***************
*** 911,914 ****
--- 909,913 ----
  $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
  $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
+ $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'ftable_vtable'}{'contents'}[1];
  $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'ftable_vtable'}{'contents'}[1];
***************
*** 932,935 ****
--- 931,935 ----
  $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'} = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
  $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0];
  $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1];
***************
*** 976,979 ****
--- 976,980 ----
  $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[2];
  $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
+ $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'line_nr'} = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'ftable_vtable'}{'contents'}[1];
  $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'ftable_vtable'}{'contents'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/indices/image_lines_count.pl texinfo-6.3/tp/t/results/indices/image_lines_count.pl
*** texinfo-6.1/tp/t/results/indices/image_lines_count.pl	2016-01-22 07:49:38.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/image_lines_count.pl	2016-08-02 18:44:20.000000000 +0100
***************
*** 68,76 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 68,72 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 130,134 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'index entry',
--- 126,129 ----
diff -Nrc2 texinfo-6.1/tp/t/results/indices/image_text_lines_count.pl texinfo-6.3/tp/t/results/indices/image_text_lines_count.pl
*** texinfo-6.1/tp/t/results/indices/image_text_lines_count.pl	2016-01-22 07:49:38.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/image_text_lines_count.pl	2016-08-02 18:44:20.000000000 +0100
***************
*** 68,76 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 68,72 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 130,134 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'index entry',
--- 126,129 ----
diff -Nrc2 texinfo-6.1/tp/t/results/indices/index_entries_locations.pl texinfo-6.3/tp/t/results/indices/index_entries_locations.pl
*** texinfo-6.1/tp/t/results/indices/index_entries_locations.pl	2016-01-22 07:49:38.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/index_entries_locations.pl	2016-08-02 18:44:20.000000000 +0100
***************
*** 117,121 ****
                    'index_at_command' => 'cindex',
                    'index_name' => 'cp',
-                   'index_prefix' => 'c',
                    'index_type_command' => 'cindex',
                    'key' => 'entry in paragraph',
--- 117,120 ----
***************
*** 177,181 ****
                    'index_at_command' => 'cindex',
                    'index_name' => 'cp',
-                   'index_prefix' => 'c',
                    'index_type_command' => 'cindex',
                    'key' => 'entry at end of paragraph.',
--- 176,179 ----
***************
*** 259,263 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'Entry before paragraph',
--- 257,260 ----
***************
*** 331,335 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'lone entry',
--- 328,331 ----
diff -Nrc2 texinfo-6.1/tp/t/results/indices/index_entry_before_first_node.pl texinfo-6.3/tp/t/results/indices/index_entry_before_first_node.pl
*** texinfo-6.1/tp/t/results/indices/index_entry_before_first_node.pl	2016-01-22 07:49:39.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/index_entry_before_first_node.pl	2016-08-02 18:44:20.000000000 +0100
***************
*** 54,58 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'before nodes',
--- 54,57 ----
diff -Nrc2 texinfo-6.1/tp/t/results/indices/index_entry_before_node.pl texinfo-6.3/tp/t/results/indices/index_entry_before_node.pl
*** texinfo-6.1/tp/t/results/indices/index_entry_before_node.pl	2016-01-22 07:49:38.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/index_entry_before_node.pl	2016-08-02 18:44:20.000000000 +0100
***************
*** 369,373 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'lone entry',
--- 369,372 ----
diff -Nrc2 texinfo-6.1/tp/t/results/indices/index_entry_in_footnote.pl texinfo-6.3/tp/t/results/indices/index_entry_in_footnote.pl
*** texinfo-6.1/tp/t/results/indices/index_entry_in_footnote.pl	2016-01-22 07:49:39.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/index_entry_in_footnote.pl	2016-08-02 18:44:20.000000000 +0100
***************
*** 103,107 ****
                                'index_at_command' => 'cindex',
                                'index_name' => 'cp',
-                               'index_prefix' => 'c',
                                'index_type_command' => 'cindex',
                                'key' => 'index entry in footnote',
--- 103,106 ----
***************
*** 131,141 ****
                'cmdname' => 'footnote',
                'contents' => [],
-               'extra' => {
-                 'spaces_before_argument' => {
-                   'parent' => {},
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
-                 }
-               },
                'line_nr' => {
                  'file_name' => '',
--- 130,133 ----
***************
*** 248,252 ****
  $result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
- $result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1];
  $result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1];
--- 240,243 ----
diff -Nrc2 texinfo-6.1/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl texinfo-6.3/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl
*** texinfo-6.1/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl	2016-01-22 07:49:39.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl	2016-08-02 18:44:20.000000000 +0100
***************
*** 231,235 ****
                                'index_at_command' => 'cindex',
                                'index_name' => 'cp',
-                               'index_prefix' => 'c',
                                'index_type_command' => 'cindex',
                                'key' => 'index entry in footnote',
--- 231,234 ----
***************
*** 330,334 ****
                            'index_at_command' => 'cindex',
                            'index_name' => 'cp',
-                           'index_prefix' => 'c',
                            'index_type_command' => 'cindex',
                            'key' => 'counting entry',
--- 329,332 ----
***************
*** 354,364 ****
                'cmdname' => 'footnote',
                'contents' => [],
-               'extra' => {
-                 'spaces_before_argument' => {
-                   'parent' => {},
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
-                 }
-               },
                'line_nr' => {
                  'file_name' => '',
--- 352,355 ----
***************
*** 570,574 ****
  $result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
- $result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3];
  $result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3];
--- 561,564 ----
diff -Nrc2 texinfo-6.1/tp/t/results/indices/index_entry_in_footnote_separate.pl texinfo-6.3/tp/t/results/indices/index_entry_in_footnote_separate.pl
*** texinfo-6.1/tp/t/results/indices/index_entry_in_footnote_separate.pl	2016-01-22 07:49:39.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/index_entry_in_footnote_separate.pl	2016-08-02 18:44:20.000000000 +0100
***************
*** 273,277 ****
                                'index_at_command' => 'cindex',
                                'index_name' => 'cp',
-                               'index_prefix' => 'c',
                                'index_type_command' => 'cindex',
                                'key' => 'index entry in footnote',
--- 273,276 ----
***************
*** 372,376 ****
                            'index_at_command' => 'cindex',
                            'index_name' => 'cp',
-                           'index_prefix' => 'c',
                            'index_type_command' => 'cindex',
                            'key' => 'counting entry',
--- 371,374 ----
***************
*** 396,406 ****
                'cmdname' => 'footnote',
                'contents' => [],
-               'extra' => {
-                 'spaces_before_argument' => {
-                   'parent' => {},
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
-                 }
-               },
                'line_nr' => {
                  'file_name' => '',
--- 394,397 ----
***************
*** 619,623 ****
  $result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
- $result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3];
  $result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3];
--- 610,613 ----
diff -Nrc2 texinfo-6.1/tp/t/results/indices/print_merged_index.pl texinfo-6.3/tp/t/results/indices/print_merged_index.pl
*** texinfo-6.1/tp/t/results/indices/print_merged_index.pl	2016-01-22 07:49:38.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/print_merged_index.pl	2016-08-02 18:44:19.000000000 +0100
***************
*** 224,232 ****
        },
        'in_code' => 0,
!       'name' => 'cp',
!       'prefix' => [
!         'c',
!         'cp'
!       ]
      },
      'fn' => {
--- 224,228 ----
        },
        'in_code' => 0,
!       'name' => 'cp'
      },
      'fn' => {
***************
*** 236,244 ****
        'in_code' => 1,
        'merged_in' => 'cp',
!       'name' => 'fn',
!       'prefix' => [
!         'f',
!         'fn'
!       ]
      },
      'ky' => {
--- 232,236 ----
        'in_code' => 1,
        'merged_in' => 'cp',
!       'name' => 'fn'
      },
      'ky' => {
***************
*** 247,255 ****
        },
        'in_code' => 1,
!       'name' => 'ky',
!       'prefix' => [
!         'k',
!         'ky'
!       ]
      },
      'pg' => {
--- 239,243 ----
        },
        'in_code' => 1,
!       'name' => 'ky'
      },
      'pg' => {
***************
*** 258,266 ****
        },
        'in_code' => 1,
!       'name' => 'pg',
!       'prefix' => [
!         'p',
!         'pg'
!       ]
      },
      'tp' => {
--- 246,250 ----
        },
        'in_code' => 1,
!       'name' => 'pg'
      },
      'tp' => {
***************
*** 269,277 ****
        },
        'in_code' => 1,
!       'name' => 'tp',
!       'prefix' => [
!         't',
!         'tp'
!       ]
      },
      'vr' => {
--- 253,257 ----
        },
        'in_code' => 1,
!       'name' => 'tp'
      },
      'vr' => {
***************
*** 280,288 ****
        },
        'in_code' => 1,
!       'name' => 'vr',
!       'prefix' => [
!         'v',
!         'vr'
!       ]
      }
    },
--- 260,264 ----
        },
        'in_code' => 1,
!       'name' => 'vr'
      }
    },
diff -Nrc2 texinfo-6.1/tp/t/results/indices/printindex_index_entry_in_copying.pl texinfo-6.3/tp/t/results/indices/printindex_index_entry_in_copying.pl
*** texinfo-6.1/tp/t/results/indices/printindex_index_entry_in_copying.pl	2016-01-22 07:49:39.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/printindex_index_entry_in_copying.pl	2016-08-02 18:44:20.000000000 +0100
***************
*** 66,70 ****
                    'index_at_command' => 'findex',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'findex',
                    'key' => 'Copying this document',
--- 66,69 ----
***************
*** 165,169 ****
                        'index_at_command' => 'defun',
                        'index_name' => 'fn',
-                       'index_prefix' => 'f',
                        'index_type_command' => 'defun',
                        'key' => 'fun',
--- 164,167 ----
***************
*** 255,259 ****
                        'index_at_command' => 'defunx',
                        'index_name' => 'fn',
-                       'index_prefix' => 'f',
                        'index_type_command' => 'defun',
                        'key' => 'xf',
--- 253,256 ----
***************
*** 358,361 ****
--- 355,364 ----
                      {
                        'cmdname' => 'asis',
+                       'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 10,
+                         'macro' => ''
+                       },
                        'parent' => {},
                        'type' => 'command_as_argument'
***************
*** 416,420 ****
                                'index_at_command' => 'item',
                                'index_name' => 'fn',
-                               'index_prefix' => 'f',
                                'index_type_command' => 'ftable',
                                'key' => 'ftable item',
--- 419,422 ----
***************
*** 470,474 ****
                                'index_at_command' => 'itemx',
                                'index_name' => 'fn',
-                               'index_prefix' => 'f',
                                'index_type_command' => 'ftable',
                                'key' => 'xftable xitem',
--- 472,475 ----
***************
*** 546,554 ****
                  'spaces_after_command' => {}
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 10,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 547,551 ----
                  'spaces_after_command' => {}
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1195,1198 ****
--- 1192,1196 ----
  $result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'extra'}{'end_command'} = $result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1];
  $result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'extra'}{'spaces_after_command'} = $result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
+ $result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'parent'} = $result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0];
  $result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl texinfo-6.3/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
*** texinfo-6.1/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl	2016-01-22 07:49:39.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl	2016-08-02 18:44:21.000000000 +0100
***************
*** 89,93 ****
                                    'index_at_command' => 'cindex',
                                    'index_name' => 'cp',
-                                   'index_prefix' => 'c',
                                    'index_type_command' => 'cindex',
                                    'key' => 'Copying this document',
--- 89,92 ----
diff -Nrc2 texinfo-6.1/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl texinfo-6.3/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
*** texinfo-6.1/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl	2016-01-22 07:49:39.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl	2016-08-02 18:44:20.000000000 +0100
***************
*** 66,70 ****
                    'index_at_command' => 'findex',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'findex',
                    'key' => 'Copying this document',
--- 66,69 ----
***************
*** 165,169 ****
                        'index_at_command' => 'defun',
                        'index_name' => 'fn',
-                       'index_prefix' => 'f',
                        'index_type_command' => 'defun',
                        'key' => 'fun',
--- 164,167 ----
***************
*** 255,259 ****
                        'index_at_command' => 'defunx',
                        'index_name' => 'fn',
-                       'index_prefix' => 'f',
                        'index_type_command' => 'defun',
                        'key' => 'xf',
--- 253,256 ----
***************
*** 358,361 ****
--- 355,364 ----
                      {
                        'cmdname' => 'asis',
+                       'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 10,
+                         'macro' => ''
+                       },
                        'parent' => {},
                        'type' => 'command_as_argument'
***************
*** 416,420 ****
                                'index_at_command' => 'item',
                                'index_name' => 'fn',
-                               'index_prefix' => 'f',
                                'index_type_command' => 'ftable',
                                'key' => 'ftable item',
--- 419,422 ----
***************
*** 470,474 ****
                                'index_at_command' => 'itemx',
                                'index_name' => 'fn',
-                               'index_prefix' => 'f',
                                'index_type_command' => 'ftable',
                                'key' => 'xftable xitem',
--- 472,475 ----
***************
*** 546,554 ****
                  'spaces_after_command' => {}
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 10,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 547,551 ----
                  'spaces_after_command' => {}
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1167,1170 ****
--- 1164,1168 ----
  $result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'extra'}{'end_command'} = $result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1];
  $result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'extra'}{'spaces_after_command'} = $result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
+ $result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'parent'} = $result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0];
  $result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/indices/printindex_with_space_before.pl texinfo-6.3/tp/t/results/indices/printindex_with_space_before.pl
*** texinfo-6.1/tp/t/results/indices/printindex_with_space_before.pl	2016-01-22 07:49:38.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/printindex_with_space_before.pl	2016-08-02 18:44:20.000000000 +0100
***************
*** 86,90 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'index',
--- 86,89 ----
diff -Nrc2 texinfo-6.1/tp/t/results/indices/recursive_synindex.pl texinfo-6.3/tp/t/results/indices/recursive_synindex.pl
*** texinfo-6.1/tp/t/results/indices/recursive_synindex.pl	2016-01-22 07:49:38.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/recursive_synindex.pl	2016-08-02 18:44:19.000000000 +0100
***************
*** 224,231 ****
        'in_code' => 0,
        'merged_in' => 'bbb',
!       'name' => 'aaa',
!       'prefix' => [
!         'aaa'
!       ]
      },
      'bbb' => {
--- 224,228 ----
        'in_code' => 0,
        'merged_in' => 'bbb',
!       'name' => 'aaa'
      },
      'bbb' => {
***************
*** 235,242 ****
        },
        'in_code' => 0,
!       'name' => 'bbb',
!       'prefix' => [
!         'bbb'
!       ]
      },
      'cp' => {
--- 232,236 ----
        },
        'in_code' => 0,
!       'name' => 'bbb'
      },
      'cp' => {
***************
*** 245,253 ****
        },
        'in_code' => 0,
!       'name' => 'cp',
!       'prefix' => [
!         'c',
!         'cp'
!       ]
      },
      'fn' => {
--- 239,243 ----
        },
        'in_code' => 0,
!       'name' => 'cp'
      },
      'fn' => {
***************
*** 256,264 ****
        },
        'in_code' => 1,
!       'name' => 'fn',
!       'prefix' => [
!         'f',
!         'fn'
!       ]
      },
      'ky' => {
--- 246,250 ----
        },
        'in_code' => 1,
!       'name' => 'fn'
      },
      'ky' => {
***************
*** 267,275 ****
        },
        'in_code' => 1,
!       'name' => 'ky',
!       'prefix' => [
!         'k',
!         'ky'
!       ]
      },
      'pg' => {
--- 253,257 ----
        },
        'in_code' => 1,
!       'name' => 'ky'
      },
      'pg' => {
***************
*** 278,286 ****
        },
        'in_code' => 1,
!       'name' => 'pg',
!       'prefix' => [
!         'p',
!         'pg'
!       ]
      },
      'tp' => {
--- 260,264 ----
        },
        'in_code' => 1,
!       'name' => 'pg'
      },
      'tp' => {
***************
*** 289,297 ****
        },
        'in_code' => 1,
!       'name' => 'tp',
!       'prefix' => [
!         't',
!         'tp'
!       ]
      },
      'vr' => {
--- 267,271 ----
        },
        'in_code' => 1,
!       'name' => 'tp'
      },
      'vr' => {
***************
*** 300,308 ****
        },
        'in_code' => 1,
!       'name' => 'vr',
!       'prefix' => [
!         'v',
!         'vr'
!       ]
      }
    },
--- 274,278 ----
        },
        'in_code' => 1,
!       'name' => 'vr'
      }
    },
diff -Nrc2 texinfo-6.1/tp/t/results/indices/same_index_entry_merged_indices.pl texinfo-6.3/tp/t/results/indices/same_index_entry_merged_indices.pl
*** texinfo-6.1/tp/t/results/indices/same_index_entry_merged_indices.pl	2016-01-22 07:49:39.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/same_index_entry_merged_indices.pl	2016-08-02 18:44:21.000000000 +0100
***************
*** 254,258 ****
                    'index_at_command' => 'deffn',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deffn',
                    'key' => 'mmm-mode',
--- 254,257 ----
***************
*** 401,405 ****
                    'index_at_command' => 'defvar',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'defvar',
                    'key' => 'mmm-mode',
--- 400,403 ----
***************
*** 733,741 ****
        },
        'in_code' => 0,
!       'name' => 'cp',
!       'prefix' => [
!         'c',
!         'cp'
!       ]
      },
      'fn' => {
--- 731,735 ----
        },
        'in_code' => 0,
!       'name' => 'cp'
      },
      'fn' => {
***************
*** 745,753 ****
        },
        'in_code' => 1,
!       'name' => 'fn',
!       'prefix' => [
!         'f',
!         'fn'
!       ]
      },
      'ky' => {
--- 739,743 ----
        },
        'in_code' => 1,
!       'name' => 'fn'
      },
      'ky' => {
***************
*** 756,764 ****
        },
        'in_code' => 1,
!       'name' => 'ky',
!       'prefix' => [
!         'k',
!         'ky'
!       ]
      },
      'pg' => {
--- 746,750 ----
        },
        'in_code' => 1,
!       'name' => 'ky'
      },
      'pg' => {
***************
*** 767,775 ****
        },
        'in_code' => 1,
!       'name' => 'pg',
!       'prefix' => [
!         'p',
!         'pg'
!       ]
      },
      'tp' => {
--- 753,757 ----
        },
        'in_code' => 1,
!       'name' => 'pg'
      },
      'tp' => {
***************
*** 778,786 ****
        },
        'in_code' => 1,
!       'name' => 'tp',
!       'prefix' => [
!         't',
!         'tp'
!       ]
      },
      'vr' => {
--- 760,764 ----
        },
        'in_code' => 1,
!       'name' => 'tp'
      },
      'vr' => {
***************
*** 790,798 ****
        'in_code' => 1,
        'merged_in' => 'fn',
!       'name' => 'vr',
!       'prefix' => [
!         'v',
!         'vr'
!       ]
      }
    },
--- 768,772 ----
        'in_code' => 1,
        'merged_in' => 'fn',
!       'name' => 'vr'
      }
    },
diff -Nrc2 texinfo-6.1/tp/t/results/indices/syncode_index_print_both.pl texinfo-6.3/tp/t/results/indices/syncode_index_print_both.pl
*** texinfo-6.1/tp/t/results/indices/syncode_index_print_both.pl	2016-01-22 07:49:38.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/syncode_index_print_both.pl	2016-08-02 18:44:20.000000000 +0100
***************
*** 135,139 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'c--oncept',
--- 135,138 ----
***************
*** 190,194 ****
                'index_at_command' => 'findex',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'findex',
                'key' => 'f---un',
--- 189,192 ----
***************
*** 519,527 ****
        },
        'in_code' => 0,
!       'name' => 'cp',
!       'prefix' => [
!         'c',
!         'cp'
!       ]
      },
      'fn' => {
--- 517,521 ----
        },
        'in_code' => 0,
!       'name' => 'cp'
      },
      'fn' => {
***************
*** 531,539 ****
        'in_code' => 1,
        'merged_in' => 'cp',
!       'name' => 'fn',
!       'prefix' => [
!         'f',
!         'fn'
!       ]
      },
      'ky' => {
--- 525,529 ----
        'in_code' => 1,
        'merged_in' => 'cp',
!       'name' => 'fn'
      },
      'ky' => {
***************
*** 542,550 ****
        },
        'in_code' => 1,
!       'name' => 'ky',
!       'prefix' => [
!         'k',
!         'ky'
!       ]
      },
      'pg' => {
--- 532,536 ----
        },
        'in_code' => 1,
!       'name' => 'ky'
      },
      'pg' => {
***************
*** 553,561 ****
        },
        'in_code' => 1,
!       'name' => 'pg',
!       'prefix' => [
!         'p',
!         'pg'
!       ]
      },
      'tp' => {
--- 539,543 ----
        },
        'in_code' => 1,
!       'name' => 'pg'
      },
      'tp' => {
***************
*** 564,572 ****
        },
        'in_code' => 1,
!       'name' => 'tp',
!       'prefix' => [
!         't',
!         'tp'
!       ]
      },
      'vr' => {
--- 546,550 ----
        },
        'in_code' => 1,
!       'name' => 'tp'
      },
      'vr' => {
***************
*** 575,583 ****
        },
        'in_code' => 1,
!       'name' => 'vr',
!       'prefix' => [
!         'v',
!         'vr'
!       ]
      }
    },
--- 553,557 ----
        },
        'in_code' => 1,
!       'name' => 'vr'
      }
    },
diff -Nrc2 texinfo-6.1/tp/t/results/indices/syncodeindex_to_plain.pl texinfo-6.3/tp/t/results/indices/syncodeindex_to_plain.pl
*** texinfo-6.1/tp/t/results/indices/syncodeindex_to_plain.pl	2016-01-22 07:49:39.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/syncodeindex_to_plain.pl	2016-08-02 18:44:21.000000000 +0100
***************
*** 135,139 ****
                'index_at_command' => 'kindex',
                'index_name' => 'ky',
-               'index_prefix' => 'k',
                'index_type_command' => 'kindex',
                'key' => '--k1',
--- 135,138 ----
***************
*** 190,194 ****
                'index_at_command' => 'vindex',
                'index_name' => 'vr',
-               'index_prefix' => 'v',
                'index_type_command' => 'vindex',
                'key' => '--v',
--- 189,192 ----
***************
*** 245,249 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => '-c',
--- 243,246 ----
***************
*** 541,549 ****
        },
        'in_code' => 0,
!       'name' => 'cp',
!       'prefix' => [
!         'c',
!         'cp'
!       ]
      },
      'fn' => {
--- 538,542 ----
        },
        'in_code' => 0,
!       'name' => 'cp'
      },
      'fn' => {
***************
*** 552,560 ****
        },
        'in_code' => 1,
!       'name' => 'fn',
!       'prefix' => [
!         'f',
!         'fn'
!       ]
      },
      'ky' => {
--- 545,549 ----
        },
        'in_code' => 1,
!       'name' => 'fn'
      },
      'ky' => {
***************
*** 564,572 ****
        'in_code' => 1,
        'merged_in' => 'cp',
!       'name' => 'ky',
!       'prefix' => [
!         'k',
!         'ky'
!       ]
      },
      'pg' => {
--- 553,557 ----
        'in_code' => 1,
        'merged_in' => 'cp',
!       'name' => 'ky'
      },
      'pg' => {
***************
*** 575,583 ****
        },
        'in_code' => 1,
!       'name' => 'pg',
!       'prefix' => [
!         'p',
!         'pg'
!       ]
      },
      'tp' => {
--- 560,564 ----
        },
        'in_code' => 1,
!       'name' => 'pg'
      },
      'tp' => {
***************
*** 586,594 ****
        },
        'in_code' => 1,
!       'name' => 'tp',
!       'prefix' => [
!         't',
!         'tp'
!       ]
      },
      'vr' => {
--- 567,571 ----
        },
        'in_code' => 1,
!       'name' => 'tp'
      },
      'vr' => {
***************
*** 597,605 ****
        },
        'in_code' => 1,
!       'name' => 'vr',
!       'prefix' => [
!         'v',
!         'vr'
!       ]
      }
    },
--- 574,578 ----
        },
        'in_code' => 1,
!       'name' => 'vr'
      }
    },
diff -Nrc2 texinfo-6.1/tp/t/results/indices/unknown_then_known_index_entry.pl texinfo-6.3/tp/t/results/indices/unknown_then_known_index_entry.pl
*** texinfo-6.1/tp/t/results/indices/unknown_then_known_index_entry.pl	2016-01-22 07:49:38.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/unknown_then_known_index_entry.pl	2016-08-02 18:44:19.000000000 +0100
***************
*** 94,98 ****
                'index_at_command' => 'someindex',
                'index_name' => 'some',
-               'index_prefix' => 'some',
                'index_type_command' => 'someindex',
                'key' => 'someindex entry.',
--- 94,97 ----
***************
*** 176,184 ****
        },
        'in_code' => 0,
!       'name' => 'cp',
!       'prefix' => [
!         'c',
!         'cp'
!       ]
      },
      'fn' => {
--- 175,179 ----
        },
        'in_code' => 0,
!       'name' => 'cp'
      },
      'fn' => {
***************
*** 187,195 ****
        },
        'in_code' => 1,
!       'name' => 'fn',
!       'prefix' => [
!         'f',
!         'fn'
!       ]
      },
      'ky' => {
--- 182,186 ----
        },
        'in_code' => 1,
!       'name' => 'fn'
      },
      'ky' => {
***************
*** 198,206 ****
        },
        'in_code' => 1,
!       'name' => 'ky',
!       'prefix' => [
!         'k',
!         'ky'
!       ]
      },
      'pg' => {
--- 189,193 ----
        },
        'in_code' => 1,
!       'name' => 'ky'
      },
      'pg' => {
***************
*** 209,217 ****
        },
        'in_code' => 1,
!       'name' => 'pg',
!       'prefix' => [
!         'p',
!         'pg'
!       ]
      },
      'some' => {
--- 196,200 ----
        },
        'in_code' => 1,
!       'name' => 'pg'
      },
      'some' => {
***************
*** 220,227 ****
        },
        'in_code' => 0,
!       'name' => 'some',
!       'prefix' => [
!         'some'
!       ]
      },
      'tp' => {
--- 203,207 ----
        },
        'in_code' => 0,
!       'name' => 'some'
      },
      'tp' => {
***************
*** 230,238 ****
        },
        'in_code' => 1,
!       'name' => 'tp',
!       'prefix' => [
!         't',
!         'tp'
!       ]
      },
      'vr' => {
--- 210,214 ----
        },
        'in_code' => 1,
!       'name' => 'tp'
      },
      'vr' => {
***************
*** 241,249 ****
        },
        'in_code' => 1,
!       'name' => 'vr',
!       'prefix' => [
!         'v',
!         'vr'
!       ]
      }
    }
--- 217,221 ----
        },
        'in_code' => 1,
!       'name' => 'vr'
      }
    }
diff -Nrc2 texinfo-6.1/tp/t/results/indices/wrong_synindex.pl texinfo-6.3/tp/t/results/indices/wrong_synindex.pl
*** texinfo-6.1/tp/t/results/indices/wrong_synindex.pl	2016-01-22 07:49:38.000000000 +0000
--- texinfo-6.3/tp/t/results/indices/wrong_synindex.pl	2016-08-02 18:44:19.000000000 +0100
***************
*** 124,131 ****
        },
        'in_code' => 0,
!       'name' => 'aaa',
!       'prefix' => [
!         'aaa'
!       ]
      },
      'cp' => {
--- 124,128 ----
        },
        'in_code' => 0,
!       'name' => 'aaa'
      },
      'cp' => {
***************
*** 134,142 ****
        },
        'in_code' => 0,
!       'name' => 'cp',
!       'prefix' => [
!         'c',
!         'cp'
!       ]
      },
      'fn' => {
--- 131,135 ----
        },
        'in_code' => 0,
!       'name' => 'cp'
      },
      'fn' => {
***************
*** 145,153 ****
        },
        'in_code' => 1,
!       'name' => 'fn',
!       'prefix' => [
!         'f',
!         'fn'
!       ]
      },
      'ky' => {
--- 138,142 ----
        },
        'in_code' => 1,
!       'name' => 'fn'
      },
      'ky' => {
***************
*** 156,164 ****
        },
        'in_code' => 1,
!       'name' => 'ky',
!       'prefix' => [
!         'k',
!         'ky'
!       ]
      },
      'pg' => {
--- 145,149 ----
        },
        'in_code' => 1,
!       'name' => 'ky'
      },
      'pg' => {
***************
*** 167,175 ****
        },
        'in_code' => 1,
!       'name' => 'pg',
!       'prefix' => [
!         'p',
!         'pg'
!       ]
      },
      'tp' => {
--- 152,156 ----
        },
        'in_code' => 1,
!       'name' => 'pg'
      },
      'tp' => {
***************
*** 178,186 ****
        },
        'in_code' => 1,
!       'name' => 'tp',
!       'prefix' => [
!         't',
!         'tp'
!       ]
      },
      'vr' => {
--- 159,163 ----
        },
        'in_code' => 1,
!       'name' => 'tp'
      },
      'vr' => {
***************
*** 189,197 ****
        },
        'in_code' => 1,
!       'name' => 'vr',
!       'prefix' => [
!         'v',
!         'vr'
!       ]
      }
    }
--- 166,170 ----
        },
        'in_code' => 1,
!       'name' => 'vr'
      }
    }
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/anchor_and_spaces.pl texinfo-6.3/tp/t/results/info_tests/anchor_and_spaces.pl
*** texinfo-6.1/tp/t/results/info_tests/anchor_and_spaces.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/anchor_and_spaces.pl	2016-08-02 18:45:03.000000000 +0100
***************
*** 115,123 ****
                {}
              ],
!             'normalized' => 'anchor-0',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 115,119 ----
                {}
              ],
!             'normalized' => 'anchor-0'
            },
            'line_nr' => {
***************
*** 129,132 ****
--- 125,129 ----
          },
          {
+           'parent' => {},
            'text' => '
  ',
***************
*** 169,177 ****
                    {}
                  ],
!                 'normalized' => 'anchor1',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 166,170 ----
                    {}
                  ],
!                 'normalized' => 'anchor1'
                },
                'line_nr' => {
***************
*** 227,235 ****
                    {}
                  ],
!                 'normalized' => 'anchor2',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 220,224 ----
                    {}
                  ],
!                 'normalized' => 'anchor2'
                },
                'line_nr' => {
***************
*** 287,290 ****
--- 276,280 ----
  $result_trees{'anchor_and_spaces'}{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}[0] = $result_trees{'anchor_and_spaces'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
  $result_trees{'anchor_and_spaces'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'anchor_and_spaces'}{'contents'}[2];
+ $result_trees{'anchor_and_spaces'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'anchor_and_spaces'}{'contents'}[2];
  $result_trees{'anchor_and_spaces'}{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'anchor_and_spaces'}{'contents'}[2];
  $result_trees{'anchor_and_spaces'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'anchor_and_spaces'}{'contents'}[2]{'contents'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/anchor_in_command.pl texinfo-6.3/tp/t/results/info_tests/anchor_in_command.pl
*** texinfo-6.1/tp/t/results/info_tests/anchor_in_command.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/anchor_in_command.pl	2016-08-02 18:45:03.000000000 +0100
***************
*** 68,71 ****
--- 68,76 ----
                        'cmdname' => 'TeX',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 3,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 89,97 ****
                        'cmdname' => 'emph',
                        'contents' => [],
!                       'line_nr' => {
!                         'file_name' => '',
!                         'line_nr' => 3,
!                         'macro' => ''
!                       },
                        'parent' => {}
                      },
--- 94,98 ----
                        'cmdname' => 'emph',
                        'contents' => [],
!                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 155,163 ****
                                    {}
                                  ],
!                                 'normalized' => 'anchor-in-emph',
!                                 'spaces_before_argument' => {
!                                   'text' => '',
!                                   'type' => 'empty_spaces_before_argument'
!                                 }
                                },
                                'line_nr' => {
--- 156,160 ----
                                    {}
                                  ],
!                                 'normalized' => 'anchor-in-emph'
                                },
                                'line_nr' => {
***************
*** 234,237 ****
--- 231,235 ----
  $result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3];
+ $result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
***************
*** 249,253 ****
  $result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
! $result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'line_nr'} = $result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'line_nr'};
  $result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1];
  $result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1];
--- 247,251 ----
  $result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
! $result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'line_nr'} = $result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1];
  $result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/before_node_and_section.pl texinfo-6.3/tp/t/results/info_tests/before_node_and_section.pl
*** texinfo-6.1/tp/t/results/info_tests/before_node_and_section.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/before_node_and_section.pl	2016-08-02 18:45:04.000000000 +0100
***************
*** 96,103 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 96,99 ----
***************
*** 152,156 ****
                    'index_at_command' => 'cindex',
                    'index_name' => 'cp',
-                   'index_prefix' => 'c',
                    'index_type_command' => 'cindex',
                    'key' => 'index entry before anything',
--- 148,151 ----
***************
*** 193,203 ****
                'cmdname' => 'footnote',
                'contents' => [],
-               'extra' => {
-                 'spaces_before_argument' => {
-                   'parent' => {},
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
-                 }
-               },
                'line_nr' => {
                  'file_name' => '',
--- 188,191 ----
***************
*** 240,248 ****
                    {}
                  ],
!                 'normalized' => 'anchor1',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 228,232 ----
                    {}
                  ],
!                 'normalized' => 'anchor1'
                },
                'line_nr' => {
***************
*** 482,492 ****
                'cmdname' => 'footnote',
                'contents' => [],
-               'extra' => {
-                 'spaces_before_argument' => {
-                   'parent' => {},
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
-                 }
-               },
                'line_nr' => {
                  'file_name' => '',
--- 466,469 ----
***************
*** 535,542 ****
                    ],
                    'normalized' => 'anchor1'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 512,515 ----
***************
*** 880,884 ****
  $result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0];
  $result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[6];
- $result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0];
  $result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'parent'} = $result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0];
  $result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0];
--- 853,856 ----
***************
*** 932,936 ****
  $result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'args'}[0];
  $result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[2]{'contents'}[1];
- $result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'args'}[0];
  $result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[2];
  $result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[2];
--- 904,907 ----
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/center_flush.pl texinfo-6.3/tp/t/results/info_tests/center_flush.pl
*** texinfo-6.1/tp/t/results/info_tests/center_flush.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/center_flush.pl	2016-08-02 18:45:04.000000000 +0100
***************
*** 165,173 ****
                    {}
                  ],
!                 'normalized' => 'anchor-in-flushleft',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 165,169 ----
                    {}
                  ],
!                 'normalized' => 'anchor-in-flushleft'
                },
                'line_nr' => {
***************
*** 179,182 ****
--- 175,179 ----
              },
              {
+               'parent' => {},
                'text' => '
  ',
***************
*** 361,369 ****
                    {}
                  ],
!                 'normalized' => 'anchor-in-flushright',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 358,362 ----
                    {}
                  ],
!                 'normalized' => 'anchor-in-flushright'
                },
                'line_nr' => {
***************
*** 375,378 ****
--- 368,372 ----
              },
              {
+               'parent' => {},
                'text' => '
  ',
***************
*** 412,420 ****
                    {}
                  ],
!                 'normalized' => 'second-anchor-in-flushright',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 406,410 ----
                    {}
                  ],
!                 'normalized' => 'second-anchor-in-flushright'
                },
                'line_nr' => {
***************
*** 426,429 ****
--- 416,420 ----
              },
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_after_close_brace'
***************
*** 523,526 ****
--- 514,518 ----
  $result_trees{'center_flush'}{'contents'}[2]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'center_flush'}{'contents'}[2]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0];
  $result_trees{'center_flush'}{'contents'}[2]{'contents'}[8]{'contents'}[1]{'parent'} = $result_trees{'center_flush'}{'contents'}[2]{'contents'}[8];
+ $result_trees{'center_flush'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'parent'} = $result_trees{'center_flush'}{'contents'}[2]{'contents'}[8];
  $result_trees{'center_flush'}{'contents'}[2]{'contents'}[8]{'contents'}[3]{'parent'} = $result_trees{'center_flush'}{'contents'}[2]{'contents'}[8];
  $result_trees{'center_flush'}{'contents'}[2]{'contents'}[8]{'parent'} = $result_trees{'center_flush'}{'contents'}[2];
***************
*** 557,560 ****
--- 549,553 ----
  $result_trees{'center_flush'}{'contents'}[4]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'center_flush'}{'contents'}[4]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0];
  $result_trees{'center_flush'}{'contents'}[4]{'contents'}[8]{'contents'}[1]{'parent'} = $result_trees{'center_flush'}{'contents'}[4]{'contents'}[8];
+ $result_trees{'center_flush'}{'contents'}[4]{'contents'}[8]{'contents'}[2]{'parent'} = $result_trees{'center_flush'}{'contents'}[4]{'contents'}[8];
  $result_trees{'center_flush'}{'contents'}[4]{'contents'}[8]{'contents'}[3]{'parent'} = $result_trees{'center_flush'}{'contents'}[4]{'contents'}[8];
  $result_trees{'center_flush'}{'contents'}[4]{'contents'}[8]{'contents'}[4]{'parent'} = $result_trees{'center_flush'}{'contents'}[4]{'contents'}[8];
***************
*** 564,567 ****
--- 557,561 ----
  $result_trees{'center_flush'}{'contents'}[4]{'contents'}[8]{'contents'}[5]{'extra'}{'node_content'}[0] = $result_trees{'center_flush'}{'contents'}[4]{'contents'}[8]{'contents'}[5]{'args'}[0]{'contents'}[0];
  $result_trees{'center_flush'}{'contents'}[4]{'contents'}[8]{'contents'}[5]{'parent'} = $result_trees{'center_flush'}{'contents'}[4]{'contents'}[8];
+ $result_trees{'center_flush'}{'contents'}[4]{'contents'}[8]{'contents'}[6]{'parent'} = $result_trees{'center_flush'}{'contents'}[4]{'contents'}[8];
  $result_trees{'center_flush'}{'contents'}[4]{'contents'}[8]{'contents'}[7]{'parent'} = $result_trees{'center_flush'}{'contents'}[4]{'contents'}[8];
  $result_trees{'center_flush'}{'contents'}[4]{'contents'}[8]{'parent'} = $result_trees{'center_flush'}{'contents'}[4];
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/colon_in_index_entry.pl texinfo-6.3/tp/t/results/info_tests/colon_in_index_entry.pl
*** texinfo-6.1/tp/t/results/info_tests/colon_in_index_entry.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/colon_in_index_entry.pl	2016-08-02 18:45:04.000000000 +0100
***************
*** 134,138 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'a:b',
--- 134,137 ----
***************
*** 171,174 ****
--- 170,179 ----
                  {
                    'cmdname' => 'emph',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 7,
+                     'macro' => ''
+                   },
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 229,233 ****
                            'index_at_command' => 'item',
                            'index_name' => 'vr',
-                           'index_prefix' => 'v',
                            'index_type_command' => 'vtable',
                            'key' => '%main::value',
--- 234,237 ----
***************
*** 305,313 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 7,
!             'macro' => ''
!           },
            'parent' => {}
          },
--- 309,313 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {}
          },
***************
*** 379,383 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 379,382 ----
***************
*** 394,398 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 393,396 ----
***************
*** 441,445 ****
                    'index_at_command' => 'defvr',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'defvr',
                    'key' => 'c:d',
--- 439,442 ----
***************
*** 512,516 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 509,512 ----
***************
*** 527,531 ****
                      {
                        'contents' => [],
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 523,526 ----
***************
*** 587,591 ****
                    'index_at_command' => 'defvrx',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'defvr',
                    'key' => 'z:t',
--- 582,585 ----
***************
*** 779,782 ****
--- 773,777 ----
  $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'extra'}{'end_command'} = $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1];
  $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'extra'}{'spaces_after_command'} = $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0];
+ $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'line_nr'} = $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'colon_in_index_entry'}{'contents'}[1];
  $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'colon_in_index_entry'}{'contents'}[1];
***************
*** 792,798 ****
  $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0];
  $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'args'}[0];
  $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'args'}[0];
  $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 787,791 ----
***************
*** 814,820 ****
  $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
  $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0];
  $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0];
  $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'def_args'}[0][1];
  $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'def_args'}[2][1];
--- 807,811 ----
***************
*** 918,926 ****
        },
        'in_code' => 0,
!       'name' => 'cp',
!       'prefix' => [
!         'c',
!         'cp'
!       ]
      },
      'fn' => {
--- 909,913 ----
        },
        'in_code' => 0,
!       'name' => 'cp'
      },
      'fn' => {
***************
*** 929,937 ****
        },
        'in_code' => 1,
!       'name' => 'fn',
!       'prefix' => [
!         'f',
!         'fn'
!       ]
      },
      'ky' => {
--- 916,920 ----
        },
        'in_code' => 1,
!       'name' => 'fn'
      },
      'ky' => {
***************
*** 940,948 ****
        },
        'in_code' => 1,
!       'name' => 'ky',
!       'prefix' => [
!         'k',
!         'ky'
!       ]
      },
      'pg' => {
--- 923,927 ----
        },
        'in_code' => 1,
!       'name' => 'ky'
      },
      'pg' => {
***************
*** 951,959 ****
        },
        'in_code' => 1,
!       'name' => 'pg',
!       'prefix' => [
!         'p',
!         'pg'
!       ]
      },
      'tp' => {
--- 930,934 ----
        },
        'in_code' => 1,
!       'name' => 'pg'
      },
      'tp' => {
***************
*** 962,970 ****
        },
        'in_code' => 1,
!       'name' => 'tp',
!       'prefix' => [
!         't',
!         'tp'
!       ]
      },
      'vr' => {
--- 937,941 ----
        },
        'in_code' => 1,
!       'name' => 'tp'
      },
      'vr' => {
***************
*** 974,982 ****
        'in_code' => 0,
        'merged_in' => 'cp',
!       'name' => 'vr',
!       'prefix' => [
!         'v',
!         'vr'
!       ]
      }
    },
--- 945,949 ----
        'in_code' => 0,
        'merged_in' => 'cp',
!       'name' => 'vr'
      }
    },
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/contents_setcontentsaftertitlepage_before_node.pl texinfo-6.3/tp/t/results/info_tests/contents_setcontentsaftertitlepage_before_node.pl
*** texinfo-6.1/tp/t/results/info_tests/contents_setcontentsaftertitlepage_before_node.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/contents_setcontentsaftertitlepage_before_node.pl	2016-08-02 18:45:03.000000000 +0100
***************
*** 43,51 ****
            ],
            'cmdname' => 'setcontentsaftertitlepage',
-           'line_nr' => {
-             'file_name' => '',
-             'line_nr' => 3,
-             'macro' => ''
-           },
            'parent' => {}
          },
--- 43,46 ----
***************
*** 246,250 ****
  };
  
! $result_errors{'contents_setcontentsaftertitlepage_before_node'} = [];
  
  
--- 241,255 ----
  };
  
! $result_errors{'contents_setcontentsaftertitlepage_before_node'} = [
!   {
!     'error_line' => ':3: warning: @setcontentsaftertitlepage is obsolete; move your @contents command if you want the contents after the title page
! ',
!     'file_name' => '',
!     'line_nr' => 3,
!     'macro' => '',
!     'text' => '@setcontentsaftertitlepage is obsolete; move your @contents command if you want the contents after the title page',
!     'type' => 'warning'
!   }
! ];
  
  
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/def_in_copying.pl texinfo-6.3/tp/t/results/info_tests/def_in_copying.pl
*** texinfo-6.1/tp/t/results/info_tests/def_in_copying.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/def_in_copying.pl	2016-08-02 18:45:04.000000000 +0100
***************
*** 52,70 ****
            'extra' => {
              'arg_line' => ' mymacro
! ',
!             'macrobody' => '@deffn aa bb cc
! @deffnx aax bbx ccx
! deffnx lines
! @end deffn
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 52,56 ----
            'extra' => {
              'arg_line' => ' mymacro
! '
            },
            'line_nr' => {
***************
*** 75,79 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 61,73 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 269,273 ****
                        'index_at_command' => 'deffn',
                        'index_name' => 'fn',
-                       'index_prefix' => 'f',
                        'index_type_command' => 'deffn',
                        'key' => 'bb',
--- 263,266 ----
***************
*** 359,363 ****
                        'index_at_command' => 'deffnx',
                        'index_name' => 'fn',
-                       'index_prefix' => 'f',
                        'index_type_command' => 'deffn',
                        'key' => 'bbx',
--- 352,355 ----
***************
*** 588,592 ****
                    'index_at_command' => 'deffn',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deffn',
                    'key' => 'bb',
--- 580,583 ----
***************
*** 678,682 ****
                    'index_at_command' => 'deffnx',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deffn',
                    'key' => 'bbx',
--- 669,672 ----
***************
*** 832,839 ****
  $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0];
  $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0];
- $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0];
- $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'def_in_copying'}{'contents'}[0];
  $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'def_in_copying'}{'contents'}[0];
! $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[1] = $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'def_in_copying'}{'contents'}[0];
  $result_trees{'def_in_copying'}{'contents'}[0]{'parent'} = $result_trees{'def_in_copying'};
--- 822,828 ----
  $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0];
  $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0];
  $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'def_in_copying'}{'contents'}[0];
! $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[1]{'extra'}{'command'} = $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[0];
! $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'def_in_copying'}{'contents'}[0];
  $result_trees{'def_in_copying'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'def_in_copying'}{'contents'}[0];
  $result_trees{'def_in_copying'}{'contents'}[0]{'parent'} = $result_trees{'def_in_copying'};
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/error_in_footnote.pl texinfo-6.3/tp/t/results/info_tests/error_in_footnote.pl
*** texinfo-6.1/tp/t/results/info_tests/error_in_footnote.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/error_in_footnote.pl	2016-08-02 18:45:04.000000000 +0100
***************
*** 78,81 ****
--- 78,82 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 134,137 ****
--- 135,143 ----
                            'cmdname' => 'TeX',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 8,
+                             'macro' => ''
+                           },
                            'parent' => {}
                          },
***************
*** 185,188 ****
--- 191,199 ----
                                        'cmdname' => 'LaTeX',
                                        'contents' => [],
+                                       'line_nr' => {
+                                         'file_name' => '',
+                                         'line_nr' => 10,
+                                         'macro' => ''
+                                       },
                                        'parent' => {}
                                      },
***************
*** 233,248 ****
                            'cmdname' => 'footnote',
                            'contents' => [],
!                           'extra' => {
!                             'spaces_before_argument' => {
!                               'parent' => {},
!                               'text' => '',
!                               'type' => 'empty_spaces_before_argument'
!                             }
!                           },
!                           'line_nr' => {
!                             'file_name' => '',
!                             'line_nr' => 10,
!                             'macro' => ''
!                           },
                            'parent' => {}
                          }
--- 244,248 ----
                            'cmdname' => 'footnote',
                            'contents' => [],
!                           'line_nr' => {},
                            'parent' => {}
                          }
***************
*** 259,274 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
!               },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 8,
!                 'macro' => ''
                },
                'parent' => {}
              },
--- 259,265 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 487,490 ****
--- 478,482 ----
  $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1];
+ $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'args'}[1];
***************
*** 512,521 ****
  $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0];
  $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[7];
! $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[7]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0];
  $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
  $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0];
  $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
  $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'float'} = $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1];
! $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0];
  $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1];
  $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1];
--- 504,513 ----
  $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0];
  $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[7];
! $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
  $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0];
  $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
  $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'float'} = $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1];
! $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'line_nr'} = $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1];
  $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1];
***************
*** 647,655 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 639,643 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/file_only_png.pl texinfo-6.3/tp/t/results/info_tests/file_only_png.pl
*** texinfo-6.1/tp/t/results/info_tests/file_only_png.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/file_only_png.pl	2016-08-02 18:45:04.000000000 +0100
***************
*** 74,82 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 74,78 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 111,119 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 107,111 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/float_long_captions.pl texinfo-6.3/tp/t/results/info_tests/float_long_captions.pl
*** texinfo-6.1/tp/t/results/info_tests/float_long_captions.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/float_long_captions.pl	2016-08-02 18:45:04.000000000 +0100
***************
*** 71,74 ****
--- 71,75 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 113,122 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 114,118 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 234,237 ****
--- 230,234 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 276,285 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 273,277 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 453,456 ****
--- 445,449 ----
  $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1];
+ $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'args'}[1];
***************
*** 460,464 ****
  $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
  $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'float'} = $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1];
- $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1];
  $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1];
--- 453,456 ----
***************
*** 484,487 ****
--- 476,480 ----
  $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'args'}[0];
  $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3];
+ $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'args'}[1];
***************
*** 491,495 ****
  $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'contents'}[0];
  $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'float'} = $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3];
- $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'args'}[0];
  $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3];
  $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3];
--- 484,487 ----
***************
*** 586,594 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 578,582 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 619,627 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 607,611 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/image_and_punctuation.pl texinfo-6.3/tp/t/results/info_tests/image_and_punctuation.pl
*** texinfo-6.1/tp/t/results/info_tests/image_and_punctuation.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/image_and_punctuation.pl	2016-08-02 18:45:04.000000000 +0100
***************
*** 74,82 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 74,78 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 128,136 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 124,128 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 183,191 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 175,179 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 237,245 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 225,229 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 291,299 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 275,279 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 346,354 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 326,330 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/image_and_spaces_formatting.pl texinfo-6.3/tp/t/results/info_tests/image_and_spaces_formatting.pl
*** texinfo-6.1/tp/t/results/info_tests/image_and_spaces_formatting.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/image_and_spaces_formatting.pl	2016-08-02 18:45:04.000000000 +0100
***************
*** 68,76 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 68,72 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 105,113 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 101,105 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 138,146 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 130,134 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 171,179 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 159,163 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 204,212 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 188,192 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 237,245 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 217,221 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 270,278 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 246,250 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 316,324 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 288,292 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 353,361 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 321,325 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 386,394 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 350,354 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 419,427 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 379,383 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 452,460 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 408,412 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 485,493 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 437,441 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 518,526 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 466,470 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 568,576 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 512,516 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 605,613 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 545,549 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 638,646 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 574,578 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 671,679 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 603,607 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 704,712 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 632,636 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 737,745 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 661,665 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 770,778 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 690,694 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 820,828 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 736,740 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 874,882 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 786,790 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 928,936 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 836,840 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 965,973 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 869,873 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/image_extension.pl texinfo-6.3/tp/t/results/info_tests/image_extension.pl
*** texinfo-6.1/tp/t/results/info_tests/image_extension.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/image_extension.pl	2016-08-02 18:45:04.000000000 +0100
***************
*** 99,107 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 99,103 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 168,176 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 164,168 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 237,245 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 229,233 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/image_file_search.pl texinfo-6.3/tp/t/results/info_tests/image_file_search.pl
*** texinfo-6.1/tp/t/results/info_tests/image_file_search.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/image_file_search.pl	2016-08-02 18:45:04.000000000 +0100
***************
*** 121,129 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 121,125 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 180,188 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 176,180 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/image_in_paragraph.pl texinfo-6.3/tp/t/results/info_tests/image_in_paragraph.pl
*** texinfo-6.1/tp/t/results/info_tests/image_in_paragraph.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/image_in_paragraph.pl	2016-08-02 18:45:04.000000000 +0100
***************
*** 100,108 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 100,104 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/image_not_found.pl texinfo-6.3/tp/t/results/info_tests/image_not_found.pl
*** texinfo-6.1/tp/t/results/info_tests/image_not_found.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/image_not_found.pl	2016-08-02 18:45:04.000000000 +0100
***************
*** 62,70 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 62,66 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/image_quotes.pl texinfo-6.3/tp/t/results/info_tests/image_quotes.pl
*** texinfo-6.1/tp/t/results/info_tests/image_quotes.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/image_quotes.pl	2016-08-02 18:45:04.000000000 +0100
***************
*** 93,101 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 93,97 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/image_text_encoded.pl texinfo-6.3/tp/t/results/info_tests/image_text_encoded.pl
*** texinfo-6.1/tp/t/results/info_tests/image_text_encoded.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/image_text_encoded.pl	2016-08-02 18:45:04.000000000 +0100
***************
*** 75,83 ****
              {}
            ]
!         ],
!         'spaces_before_argument' => {
!           'text' => '',
!           'type' => 'empty_spaces_before_argument'
!         }
        },
        'line_nr' => {
--- 75,79 ----
              {}
            ]
!         ]
        },
        'line_nr' => {
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/index_entry_at_end_node.pl texinfo-6.3/tp/t/results/info_tests/index_entry_at_end_node.pl
*** texinfo-6.1/tp/t/results/info_tests/index_entry_at_end_node.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/index_entry_at_end_node.pl	2016-08-02 18:45:04.000000000 +0100
***************
*** 437,441 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'index entry',
--- 437,440 ----
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/invalid_node_name_no_warning.pl texinfo-6.3/tp/t/results/info_tests/invalid_node_name_no_warning.pl
*** texinfo-6.1/tp/t/results/info_tests/invalid_node_name_no_warning.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/invalid_node_name_no_warning.pl	2016-08-02 18:45:04.000000000 +0100
***************
*** 202,205 ****
--- 202,210 ----
                        'cmdname' => 'comma',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 6,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 247,255 ****
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 6,
!                 'macro' => ''
!               },
                'parent' => {},
                'type' => 'menu_entry'
--- 252,256 ----
                  }
                },
!               'line_nr' => {},
                'parent' => {},
                'type' => 'menu_entry'
***************
*** 502,505 ****
--- 503,511 ----
                'cmdname' => 'comma',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 12,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 543,551 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 12,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 549,553 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 638,641 ****
--- 640,644 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 681,688 ****
                    ],
                    'normalized' => 'nodename_002e-a'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 684,687 ----
***************
*** 712,715 ****
--- 711,715 ----
                        'cmdname' => 'comma',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 725,728 ****
--- 725,729 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 758,765 ****
                    ],
                    'normalized' => 'node_002ccomma'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 759,762 ----
***************
*** 817,824 ****
                    ],
                    'normalized' => 'bidule_003a'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 814,817 ----
***************
*** 903,906 ****
--- 896,900 ----
  $result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[1] = $result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[1];
  $result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[2] = $result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[2];
+ $result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[1]{'line_nr'};
  $result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1];
  $result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
***************
*** 960,963 ****
--- 954,958 ----
  $result_trees{'invalid_node_name_no_warning'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'invalid_node_name_no_warning'}{'contents'}[3]{'extra'}{'node_content'};
  $result_trees{'invalid_node_name_no_warning'}{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'invalid_node_name_no_warning'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+ $result_trees{'invalid_node_name_no_warning'}{'contents'}[3]{'line_nr'} = $result_trees{'invalid_node_name_no_warning'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'invalid_node_name_no_warning'}{'contents'}[3]{'parent'} = $result_trees{'invalid_node_name_no_warning'};
  $result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'invalid_node_name_no_warning'}{'contents'}[4];
***************
*** 973,976 ****
--- 968,972 ----
  $result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
+ $result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1];
***************
*** 987,993 ****
--- 983,991 ----
  $result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1];
+ $result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
+ $result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[1];
  $result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[1];
  $result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/invalid_node_name_warning.pl texinfo-6.3/tp/t/results/info_tests/invalid_node_name_warning.pl
*** texinfo-6.1/tp/t/results/info_tests/invalid_node_name_warning.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/invalid_node_name_warning.pl	2016-08-02 18:45:04.000000000 +0100
***************
*** 202,205 ****
--- 202,210 ----
                        'cmdname' => 'comma',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 6,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 247,255 ****
                  }
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 6,
!                 'macro' => ''
!               },
                'parent' => {},
                'type' => 'menu_entry'
--- 252,256 ----
                  }
                },
!               'line_nr' => {},
                'parent' => {},
                'type' => 'menu_entry'
***************
*** 502,505 ****
--- 503,511 ----
                'cmdname' => 'comma',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 12,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 543,551 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 12,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 549,553 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 638,641 ****
--- 640,644 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 681,688 ****
                    ],
                    'normalized' => 'nodename_002e-a'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 684,687 ----
***************
*** 712,715 ****
--- 711,715 ----
                        'cmdname' => 'comma',
                        'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 725,728 ****
--- 725,729 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 758,765 ****
                    ],
                    'normalized' => 'node_002ccomma'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 759,762 ----
***************
*** 817,824 ****
                    ],
                    'normalized' => 'bidule_003a'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 814,817 ----
***************
*** 903,906 ****
--- 896,900 ----
  $result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[1] = $result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[1];
  $result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[2] = $result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[2];
+ $result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[1]{'line_nr'};
  $result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1];
  $result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
***************
*** 960,963 ****
--- 954,958 ----
  $result_trees{'invalid_node_name_warning'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'invalid_node_name_warning'}{'contents'}[3]{'extra'}{'node_content'};
  $result_trees{'invalid_node_name_warning'}{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'invalid_node_name_warning'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+ $result_trees{'invalid_node_name_warning'}{'contents'}[3]{'line_nr'} = $result_trees{'invalid_node_name_warning'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'invalid_node_name_warning'}{'contents'}[3]{'parent'} = $result_trees{'invalid_node_name_warning'};
  $result_trees{'invalid_node_name_warning'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'invalid_node_name_warning'}{'contents'}[4];
***************
*** 973,976 ****
--- 968,972 ----
  $result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
+ $result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1];
***************
*** 987,993 ****
--- 983,991 ----
  $result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1];
+ $result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
+ $result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[1];
  $result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[1];
  $result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/multiline_image_and_align.pl texinfo-6.3/tp/t/results/info_tests/multiline_image_and_align.pl
*** texinfo-6.1/tp/t/results/info_tests/multiline_image_and_align.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/multiline_image_and_align.pl	2016-08-02 18:45:04.000000000 +0100
***************
*** 40,48 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 40,44 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 116,124 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 112,116 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 193,201 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 185,189 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 270,278 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 258,262 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 355,363 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 339,343 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 409,417 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 389,393 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 446,454 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 422,426 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 497,505 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 469,473 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 605,608 ****
--- 573,577 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 615,618 ****
--- 584,588 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 625,628 ****
--- 595,599 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 656,664 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 627,631 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 727,730 ****
--- 694,698 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 737,740 ****
--- 705,709 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 747,750 ****
--- 716,720 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 778,786 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 748,752 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 850,853 ****
--- 816,820 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 860,863 ****
--- 827,831 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 870,873 ****
--- 838,842 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 901,909 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 870,874 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 973,976 ****
--- 938,942 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 983,986 ****
--- 949,953 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 993,996 ****
--- 960,964 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1024,1032 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 992,996 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 1104,1107 ****
--- 1068,1072 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1114,1117 ****
--- 1079,1083 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1124,1127 ****
--- 1090,1094 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1155,1163 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 1122,1126 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 1204,1207 ****
--- 1167,1171 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1214,1217 ****
--- 1178,1182 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1224,1227 ****
--- 1189,1193 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1255,1263 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 1221,1225 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 1287,1290 ****
--- 1249,1253 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1297,1300 ****
--- 1260,1264 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1307,1310 ****
--- 1271,1275 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1338,1346 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 1303,1307 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 1384,1387 ****
--- 1345,1349 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1394,1397 ****
--- 1356,1360 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1404,1407 ****
--- 1367,1371 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1435,1443 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 1399,1403 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 1620,1625 ****
--- 1580,1588 ----
  $result_trees{'multiline_image_and_align'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'multiline_image_and_align'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[10]{'args'}[0]{'contents'}[1];
+ $result_trees{'multiline_image_and_align'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'multiline_image_and_align'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[10]{'args'}[0]{'contents'}[1];
+ $result_trees{'multiline_image_and_align'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[2];
  $result_trees{'multiline_image_and_align'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[10]{'args'}[0]{'contents'}[1];
+ $result_trees{'multiline_image_and_align'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[3];
  $result_trees{'multiline_image_and_align'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[3]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[10]{'args'}[0]{'contents'}[1];
  $result_trees{'multiline_image_and_align'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[4];
***************
*** 1640,1645 ****
--- 1603,1611 ----
  $result_trees{'multiline_image_and_align'}{'contents'}[12]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[12]{'args'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'multiline_image_and_align'}{'contents'}[12]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[12]{'args'}[0]{'contents'}[2];
+ $result_trees{'multiline_image_and_align'}{'contents'}[12]{'args'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[12]{'args'}[0]{'contents'}[2]{'args'}[1];
  $result_trees{'multiline_image_and_align'}{'contents'}[12]{'args'}[0]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[12]{'args'}[0]{'contents'}[2];
+ $result_trees{'multiline_image_and_align'}{'contents'}[12]{'args'}[0]{'contents'}[2]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[12]{'args'}[0]{'contents'}[2]{'args'}[2];
  $result_trees{'multiline_image_and_align'}{'contents'}[12]{'args'}[0]{'contents'}[2]{'args'}[2]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[12]{'args'}[0]{'contents'}[2];
+ $result_trees{'multiline_image_and_align'}{'contents'}[12]{'args'}[0]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[12]{'args'}[0]{'contents'}[2]{'args'}[3];
  $result_trees{'multiline_image_and_align'}{'contents'}[12]{'args'}[0]{'contents'}[2]{'args'}[3]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[12]{'args'}[0]{'contents'}[2];
  $result_trees{'multiline_image_and_align'}{'contents'}[12]{'args'}[0]{'contents'}[2]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[12]{'args'}[0]{'contents'}[2]{'args'}[4];
***************
*** 1661,1666 ****
--- 1627,1635 ----
  $result_trees{'multiline_image_and_align'}{'contents'}[14]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[14]{'args'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'multiline_image_and_align'}{'contents'}[14]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[14]{'args'}[0]{'contents'}[2];
+ $result_trees{'multiline_image_and_align'}{'contents'}[14]{'args'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[14]{'args'}[0]{'contents'}[2]{'args'}[1];
  $result_trees{'multiline_image_and_align'}{'contents'}[14]{'args'}[0]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[14]{'args'}[0]{'contents'}[2];
+ $result_trees{'multiline_image_and_align'}{'contents'}[14]{'args'}[0]{'contents'}[2]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[14]{'args'}[0]{'contents'}[2]{'args'}[2];
  $result_trees{'multiline_image_and_align'}{'contents'}[14]{'args'}[0]{'contents'}[2]{'args'}[2]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[14]{'args'}[0]{'contents'}[2];
+ $result_trees{'multiline_image_and_align'}{'contents'}[14]{'args'}[0]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[14]{'args'}[0]{'contents'}[2]{'args'}[3];
  $result_trees{'multiline_image_and_align'}{'contents'}[14]{'args'}[0]{'contents'}[2]{'args'}[3]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[14]{'args'}[0]{'contents'}[2];
  $result_trees{'multiline_image_and_align'}{'contents'}[14]{'args'}[0]{'contents'}[2]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[14]{'args'}[0]{'contents'}[2]{'args'}[4];
***************
*** 1682,1687 ****
--- 1651,1659 ----
  $result_trees{'multiline_image_and_align'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'multiline_image_and_align'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[16]{'args'}[0]{'contents'}[2];
+ $result_trees{'multiline_image_and_align'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[1];
  $result_trees{'multiline_image_and_align'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[16]{'args'}[0]{'contents'}[2];
+ $result_trees{'multiline_image_and_align'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[2];
  $result_trees{'multiline_image_and_align'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[2]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[16]{'args'}[0]{'contents'}[2];
+ $result_trees{'multiline_image_and_align'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[3];
  $result_trees{'multiline_image_and_align'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[3]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[16]{'args'}[0]{'contents'}[2];
  $result_trees{'multiline_image_and_align'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[4];
***************
*** 1705,1710 ****
--- 1677,1685 ----
  $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[1]{'contents'}[1];
+ $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[1]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[1]{'contents'}[1];
+ $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[1]{'contents'}[1]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[1]{'contents'}[1]{'args'}[2];
  $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[1]{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[1]{'contents'}[1];
+ $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[1]{'contents'}[1]{'args'}[3];
  $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[1]{'contents'}[1];
  $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[1]{'contents'}[1]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[1]{'contents'}[1]{'args'}[4];
***************
*** 1719,1724 ****
--- 1694,1702 ----
  $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[1];
+ $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'args'}[1];
  $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[1];
+ $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'args'}[2];
  $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[1];
+ $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'args'}[3];
  $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'args'}[3]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[1];
  $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'args'}[4];
***************
*** 1730,1735 ****
--- 1708,1716 ----
  $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[3]{'args'}[0];
  $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[3];
+ $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[3]{'args'}[1];
  $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[3]{'args'}[1]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[3];
+ $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[3]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[3]{'args'}[2];
  $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[3]{'args'}[2]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[3];
+ $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[3]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[3]{'args'}[3];
  $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[3]{'args'}[3]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[3];
  $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[3]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[3]{'contents'}[3]{'args'}[4];
***************
*** 1745,1750 ****
--- 1726,1734 ----
  $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[0];
  $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[5]{'contents'}[1];
+ $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[1];
  $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[5]{'contents'}[1];
+ $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[2];
  $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[5]{'contents'}[1];
+ $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[3];
  $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[3]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[5]{'contents'}[1];
  $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'args'}[4];
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl texinfo-6.3/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
*** texinfo-6.1/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl	2016-08-02 18:45:04.000000000 +0100
***************
*** 370,374 ****
                                    'index_at_command' => 'cindex',
                                    'index_name' => 'cp',
-                                   'index_prefix' => 'c',
                                    'index_type_command' => 'cindex',
                                    'key' => 'index entry within multitable',
--- 370,373 ----
***************
*** 411,419 ****
                                    {}
                                  ],
!                                 'normalized' => 'anchor-in-multitable',
!                                 'spaces_before_argument' => {
!                                   'text' => '',
!                                   'type' => 'empty_spaces_before_argument'
!                                 }
                                },
                                'line_nr' => {
--- 410,414 ----
                                    {}
                                  ],
!                                 'normalized' => 'anchor-in-multitable'
                                },
                                'line_nr' => {
***************
*** 425,428 ****
--- 420,424 ----
                              },
                              {
+                               'parent' => {},
                                'text' => '
  ',
***************
*** 764,768 ****
                                    'index_at_command' => 'cindex',
                                    'index_name' => 'cp',
-                                   'index_prefix' => 'c',
                                    'index_type_command' => 'cindex',
                                    'key' => 'index entry',
--- 760,763 ----
***************
*** 891,899 ****
                                    {}
                                  ],
!                                 'normalized' => 'mark',
!                                 'spaces_before_argument' => {
!                                   'text' => '',
!                                   'type' => 'empty_spaces_before_argument'
!                                 }
                                },
                                'line_nr' => {
--- 886,890 ----
                                    {}
                                  ],
!                                 'normalized' => 'mark'
                                },
                                'line_nr' => {
***************
*** 905,908 ****
--- 896,900 ----
                              },
                              {
+                               'parent' => {},
                                'text' => '
  ',
***************
*** 1007,1036 ****
                {
                  'contents' => [],
-                 'parent' => {},
                  'type' => 'bracketed_multitable_prototype'
                },
                {
                  'contents' => [],
-                 'parent' => {},
                  'type' => 'bracketed_multitable_prototype'
                }
              ],
-             'prototypes_line' => [
-               {
-                 'text' => ' ',
-                 'type' => 'prototype_space'
-               },
-               {},
-               {
-                 'text' => ' ',
-                 'type' => 'prototype_space'
-               },
-               {},
-               {
-                 'text' => '
- ',
-                 'type' => 'prototype_space'
-               }
-             ],
              'spaces_after_command' => {}
            },
--- 999,1009 ----
***************
*** 1118,1125 ****
                    ],
                    'normalized' => 'mark'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1091,1094 ----
***************
*** 1163,1170 ****
                    ],
                    'normalized' => 'anchor-in-multitable'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1132,1135 ----
***************
*** 1283,1286 ****
--- 1248,1252 ----
  $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'node_content'}[0] = $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
  $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+ $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
  $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
  $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
***************
*** 1372,1375 ****
--- 1338,1342 ----
  $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'node_content'}[0] = $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
  $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+ $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
  $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[1];
  $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[1];
***************
*** 1391,1399 ****
  $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
  $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0];
  $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'prototypes'}[1]{'parent'} = $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0];
- $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'prototypes_line'}[1] = $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1];
- $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'prototypes_line'}[3] = $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[3];
  $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
  $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1];
--- 1358,1362 ----
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/nested_footnotes_separate.pl texinfo-6.3/tp/t/results/info_tests/nested_footnotes_separate.pl
*** texinfo-6.1/tp/t/results/info_tests/nested_footnotes_separate.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/nested_footnotes_separate.pl	2016-08-02 18:45:04.000000000 +0100
***************
*** 144,154 ****
                            'cmdname' => 'footnote',
                            'contents' => [],
-                           'extra' => {
-                             'spaces_before_argument' => {
-                               'parent' => {},
-                               'text' => '',
-                               'type' => 'empty_spaces_before_argument'
-                             }
-                           },
                            'line_nr' => {
                              'file_name' => '',
--- 144,147 ----
***************
*** 174,184 ****
                'cmdname' => 'footnote',
                'contents' => [],
-               'extra' => {
-                 'spaces_before_argument' => {
-                   'parent' => {},
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
-                 }
-               },
                'line_nr' => {
                  'file_name' => '',
--- 167,170 ----
***************
*** 243,252 ****
  $result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
  $result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[1];
- $result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
  $result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
  $result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
  $result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
- $result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1];
  $result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'nested_footnotes_separate'}{'contents'}[1]{'contents'}[1];
--- 229,236 ----
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/nested_multitable_anchor_index.pl texinfo-6.3/tp/t/results/info_tests/nested_multitable_anchor_index.pl
*** texinfo-6.1/tp/t/results/info_tests/nested_multitable_anchor_index.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/nested_multitable_anchor_index.pl	2016-08-02 18:45:04.000000000 +0100
***************
*** 238,246 ****
                                                    {}
                                                  ],
!                                                 'normalized' => 'mark-inside',
!                                                 'spaces_before_argument' => {
!                                                   'text' => '',
!                                                   'type' => 'empty_spaces_before_argument'
!                                                 }
                                                },
                                                'line_nr' => {},
--- 238,242 ----
                                                    {}
                                                  ],
!                                                 'normalized' => 'mark-inside'
                                                },
                                                'line_nr' => {},
***************
*** 248,251 ****
--- 244,248 ----
                                              },
                                              {
+                                               'parent' => {},
                                                'text' => '
  ',
***************
*** 290,294 ****
                                                    'index_at_command' => 'cindex',
                                                    'index_name' => 'cp',
-                                                   'index_prefix' => 'c',
                                                    'index_type_command' => 'cindex',
                                                    'key' => 'index entry inside',
--- 287,290 ----
***************
*** 378,407 ****
                                {
                                  'contents' => [],
-                                 'parent' => {},
                                  'type' => 'bracketed_multitable_prototype'
                                },
                                {
                                  'contents' => [],
-                                 'parent' => {},
                                  'type' => 'bracketed_multitable_prototype'
                                }
                              ],
-                             'prototypes_line' => [
-                               {
-                                 'text' => ' ',
-                                 'type' => 'prototype_space'
-                               },
-                               {},
-                               {
-                                 'text' => ' ',
-                                 'type' => 'prototype_space'
-                               },
-                               {},
-                               {
-                                 'text' => '
- ',
-                                 'type' => 'prototype_space'
-                               }
-                             ],
                              'spaces_after_command' => {}
                            },
--- 374,384 ----
***************
*** 547,555 ****
                                    {}
                                  ],
!                                 'normalized' => 'mark',
!                                 'spaces_before_argument' => {
!                                   'text' => '',
!                                   'type' => 'empty_spaces_before_argument'
!                                 }
                                },
                                'line_nr' => {},
--- 524,528 ----
                                    {}
                                  ],
!                                 'normalized' => 'mark'
                                },
                                'line_nr' => {},
***************
*** 557,560 ****
--- 530,534 ----
                              },
                              {
+                               'parent' => {},
                                'text' => '
  ',
***************
*** 599,603 ****
                                    'index_at_command' => 'cindex',
                                    'index_name' => 'cp',
-                                   'index_prefix' => 'c',
                                    'index_type_command' => 'cindex',
                                    'key' => 'index entry',
--- 573,576 ----
***************
*** 687,716 ****
                {
                  'contents' => [],
-                 'parent' => {},
                  'type' => 'bracketed_multitable_prototype'
                },
                {
                  'contents' => [],
-                 'parent' => {},
                  'type' => 'bracketed_multitable_prototype'
                }
              ],
-             'prototypes_line' => [
-               {
-                 'text' => ' ',
-                 'type' => 'prototype_space'
-               },
-               {},
-               {
-                 'text' => '    ',
-                 'type' => 'prototype_space'
-               },
-               {},
-               {
-                 'text' => '
- ',
-                 'type' => 'prototype_space'
-               }
-             ],
              'spaces_after_command' => {}
            },
--- 660,670 ----
***************
*** 804,811 ****
                    ],
                    'normalized' => 'mark'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 758,761 ----
***************
*** 849,856 ****
                    ],
                    'normalized' => 'mark-inside'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 799,802 ----
***************
*** 937,940 ****
--- 883,887 ----
  $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+ $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
  $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3];
  $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0];
***************
*** 965,973 ****
  $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
  $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[1]{'parent'} = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
- $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes_line'}[1] = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1];
- $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes_line'}[3] = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3];
  $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
  $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
--- 912,916 ----
***************
*** 997,1000 ****
--- 940,944 ----
  $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+ $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
  $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
  $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0];
***************
*** 1025,1033 ****
  $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
  $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'extra'}{'prototypes'}[1]{'parent'} = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'args'}[0];
- $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'extra'}{'prototypes_line'}[1] = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1];
- $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'extra'}{'prototypes_line'}[3] = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3];
  $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
  $result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1];
--- 969,973 ----
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/novalidate_empty_refs.pl texinfo-6.3/tp/t/results/info_tests/novalidate_empty_refs.pl
*** texinfo-6.1/tp/t/results/info_tests/novalidate_empty_refs.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/novalidate_empty_refs.pl	2016-08-02 18:45:04.000000000 +0100
***************
*** 101,105 ****
                    ]
                  ],
-                 'label' => undef,
                  'node_argument' => {
                    'node_content' => [
--- 101,104 ----
***************
*** 107,114 ****
                    ],
                    'normalized' => ''
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 106,109 ----
***************
*** 164,168 ****
                    ]
                  ],
-                 'label' => undef,
                  'node_argument' => {
                    'node_content' => [
--- 159,162 ----
***************
*** 170,177 ****
                    ],
                    'normalized' => '-'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 164,167 ----
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/pxref_test.pl texinfo-6.3/tp/t/results/info_tests/pxref_test.pl
*** texinfo-6.1/tp/t/results/info_tests/pxref_test.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/pxref_test.pl	2016-08-02 18:45:03.000000000 +0100
***************
*** 89,96 ****
                    ],
                    'normalized' => 'in-pxref'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 89,92 ----
***************
*** 121,124 ****
--- 117,121 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 158,165 ****
                    ],
                    'normalized' => 'in-pxref'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 155,158 ----
***************
*** 207,214 ****
                    ],
                    'normalized' => 'n'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 200,203 ----
***************
*** 239,242 ****
--- 228,232 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 276,283 ****
                    ],
                    'normalized' => 'n'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 266,269 ----
***************
*** 335,338 ****
--- 321,325 ----
  $result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0];
  $result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
+ $result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'parent'} = $result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
***************
*** 353,356 ****
--- 340,344 ----
  $result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'args'}[0];
  $result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[7];
+ $result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'args'}[1]{'parent'} = $result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[7];
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/ref_tests.pl texinfo-6.3/tp/t/results/info_tests/ref_tests.pl
*** texinfo-6.1/tp/t/results/info_tests/ref_tests.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/ref_tests.pl	2016-08-02 18:45:03.000000000 +0100
***************
*** 92,99 ****
                    ],
                    'normalized' => 'in-ref-followed-by-comma'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 92,95 ----
***************
*** 145,152 ****
                    ],
                    'normalized' => 'in-ref-not-followed-by-comma'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 141,144 ----
***************
*** 202,209 ****
                            ],
                            'normalized' => 'in-ref-followed-by-end-command'
-                         },
-                         'spaces_before_argument' => {
-                           'text' => '',
-                           'type' => 'empty_spaces_before_argument'
                          }
                        },
--- 194,197 ----
***************
*** 263,266 ****
--- 251,255 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 300,307 ****
                    ],
                    'normalized' => 'in-ref-followed-by-comma'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 289,292 ----
***************
*** 333,336 ****
--- 318,322 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 370,377 ****
                    ],
                    'normalized' => 'in-ref-not-followed-by-comma'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 356,359 ----
***************
*** 407,410 ****
--- 389,393 ----
                            'contents' => [
                              {
+                               'parent' => {},
                                'text' => ' ',
                                'type' => 'empty_spaces_before_argument'
***************
*** 444,451 ****
                            ],
                            'normalized' => 'in-ref-followed-by-end-command'
-                         },
-                         'spaces_before_argument' => {
-                           'text' => '',
-                           'type' => 'empty_spaces_before_argument'
                          }
                        },
--- 427,430 ----
***************
*** 487,490 ****
--- 466,470 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 524,531 ****
                    ],
                    'normalized' => 'in-ref-ending-with-a-dot_002e'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 504,507 ----
***************
*** 613,616 ****
--- 589,593 ----
  $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[0];
  $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[0];
+ $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[1];
  $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[1];
  $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[0];
***************
*** 623,626 ****
--- 600,604 ----
  $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[0];
  $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[2];
+ $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[1];
  $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[1];
  $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[2];
***************
*** 633,636 ****
--- 611,615 ----
  $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0];
+ $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[1];
  $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[1];
  $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0];
***************
*** 646,649 ****
--- 625,629 ----
  $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[6]{'args'}[0];
  $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[6];
+ $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[6]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[6]{'args'}[1];
  $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[6]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[6]{'args'}[1];
  $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[6]{'args'}[1]{'parent'} = $result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[6];
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/space_in_setfilename.pl texinfo-6.3/tp/t/results/info_tests/space_in_setfilename.pl
*** texinfo-6.1/tp/t/results/info_tests/space_in_setfilename.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/space_in_setfilename.pl	2016-08-02 18:45:04.000000000 +0100
***************
*** 70,75 ****
            'cmdname' => 'setfilename',
            'extra' => {
!             'spaces_after_command' => {},
!             'text_arg' => '  name  '
            },
            'line_nr' => {},
--- 70,75 ----
            'cmdname' => 'setfilename',
            'extra' => {
!             'missing_argument' => 1,
!             'spaces_after_command' => {}
            },
            'line_nr' => {},
***************
*** 208,211 ****
--- 208,220 ----
      'text' => '@verb should not appear in @setfilename',
      'type' => 'warning'
+   },
+   {
+     'error_line' => ':1: bad argument to @setfilename: @ @verb{: name :}@
+ ',
+     'file_name' => '',
+     'line_nr' => 1,
+     'macro' => '',
+     'text' => 'bad argument to @setfilename: @ @verb{: name :}@',
+     'type' => 'error'
    }
  ];
***************
*** 213,225 ****
  
  
! $result_converted{'info'}->{'space_in_setfilename'} = 'This is   name  , produced from .
  
  
! File:   name  ,  Node: Top,  Up: (dir)
  
  
  
  Tag Table:
! Node: Top35
  
  End Tag Table
--- 222,234 ----
  
  
! $result_converted{'info'}->{'space_in_setfilename'} = 'This is , produced from .
  
  
! File: ,  Node: Top,  Up: (dir)
  
  
  
  Tag Table:
! Node: Top27
  
  End Tag Table
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/test_index.pl texinfo-6.3/tp/t/results/info_tests/test_index.pl
*** texinfo-6.1/tp/t/results/info_tests/test_index.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/test_index.pl	2016-08-02 18:45:04.000000000 +0100
***************
*** 144,152 ****
                        {}
                      ],
!                     'normalized' => 'a-counting-anchor',
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {
--- 144,148 ----
                        {}
                      ],
!                     'normalized' => 'a-counting-anchor'
                    },
                    'line_nr' => {
***************
*** 228,232 ****
                              'index_at_command' => 'cindex',
                              'index_name' => 'cp',
-                             'index_prefix' => 'c',
                              'index_type_command' => 'cindex',
                              'key' => 'index in chapter end',
--- 224,227 ----
***************
*** 301,304 ****
--- 296,300 ----
                        {},
                        {
+                         'parent' => {},
                          'text' => '
  ',
***************
*** 333,340 ****
                    ],
                    'normalized' => 'a-counting-anchor'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 329,332 ----
***************
*** 406,410 ****
                    'index_at_command' => 'cindex',
                    'index_name' => 'cp',
-                   'index_prefix' => 'c',
                    'index_type_command' => 'cindex',
                    'key' => 'in Top',
--- 398,401 ----
***************
*** 461,465 ****
                    'index_at_command' => 'cindex',
                    'index_name' => 'cp',
-                   'index_prefix' => 'c',
                    'index_type_command' => 'cindex',
                    'key' => '@',
--- 452,455 ----
***************
*** 500,503 ****
--- 490,498 ----
                        'cmdname' => 'exclamdown',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 9,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 524,528 ****
                    'index_at_command' => 'cindex',
                    'index_name' => 'cp',
-                   'index_prefix' => 'c',
                    'index_type_command' => 'cindex',
                    'key' => '!',
--- 519,522 ----
***************
*** 533,541 ****
                  'spaces_after_command' => {}
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 9,
!                 'macro' => ''
!               },
                'parent' => {},
                'type' => 'index_entry_command'
--- 527,531 ----
                  'spaces_after_command' => {}
                },
!               'line_nr' => {},
                'parent' => {},
                'type' => 'index_entry_command'
***************
*** 579,583 ****
                    'index_at_command' => 'cindex',
                    'index_name' => 'cp',
-                   'index_prefix' => 'c',
                    'index_type_command' => 'cindex',
                    'key' => '"',
--- 569,572 ----
***************
*** 719,723 ****
                    'index_at_command' => 'deffn',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deffn',
                    'key' => 'i',
--- 708,711 ----
***************
*** 818,822 ****
                    'index_at_command' => 'deffnx',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deffn',
                    'key' => 'machin',
--- 806,809 ----
***************
*** 916,919 ****
--- 903,912 ----
                  {
                    'cmdname' => 'emph',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 17,
+                     'macro' => ''
+                   },
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 974,978 ****
                            'index_at_command' => 'item',
                            'index_name' => 'fn',
-                           'index_prefix' => 'f',
                            'index_type_command' => 'ftable',
                            'key' => 'a fun',
--- 967,970 ----
***************
*** 1063,1067 ****
                            'index_at_command' => 'item',
                            'index_name' => 'fn',
-                           'index_prefix' => 'f',
                            'index_type_command' => 'ftable',
                            'key' => 'second fun',
--- 1055,1058 ----
***************
*** 1117,1121 ****
                            'index_at_command' => 'itemx',
                            'index_name' => 'fn',
-                           'index_prefix' => 'f',
                            'index_type_command' => 'ftable',
                            'key' => 'itemx fun',
--- 1108,1111 ----
***************
*** 1205,1213 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 17,
!             'macro' => ''
!           },
            'parent' => {}
          },
--- 1195,1199 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {}
          },
***************
*** 1540,1544 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'index entry looooooooooooooooooooooooooooooooooooooooooooooooooooooooong',
--- 1526,1529 ----
***************
*** 1595,1599 ****
                'index_at_command' => 'findex',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'findex',
                'key' => 'function index entry',
--- 1580,1583 ----
***************
*** 1663,1667 ****
                    'index_at_command' => 'findex',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'findex',
                    'key' => 'other function',
--- 1647,1650 ----
***************
*** 1818,1822 ****
                'index_at_command' => 'findex',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'findex',
                'key' => 'after lines.',
--- 1801,1804 ----
***************
*** 3154,3158 ****
                'index_at_command' => 'findex',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'findex',
                'key' => 'after more than 100 lines',
--- 3136,3139 ----
***************
*** 3267,3271 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'index entry in appendix before para',
--- 3248,3251 ----
***************
*** 3397,3401 ****
                'index_at_command' => 'findex',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'findex',
                'key' => 'index entry between indices',
--- 3377,3380 ----
***************
*** 3812,3815 ****
--- 3791,3795 ----
  $result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[2]{'parent'} = $result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'};
  $result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[3] = $result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'};
+ $result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[4]{'parent'} = $result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'};
  $result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[5]{'parent'} = $result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'};
  $result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'extra'}{'misc_content'}[0] = $result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'args'}[0]{'contents'}[1];
***************
*** 3858,3861 ****
--- 3838,3842 ----
  $result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'extra'}{'misc_content'} = $result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'content'};
  $result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0];
+ $result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'line_nr'} = $result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'test_index'}{'contents'}[2]{'contents'}[3];
  $result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[4];
***************
*** 3980,3983 ****
--- 3961,3965 ----
  $result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'extra'}{'end_command'} = $result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[2];
  $result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'extra'}{'spaces_after_command'} = $result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0];
+ $result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'line_nr'} = $result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'parent'} = $result_trees{'test_index'}{'contents'}[2];
  $result_trees{'test_index'}{'contents'}[2]{'contents'}[8]{'parent'} = $result_trees{'test_index'}{'contents'}[2];
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/top_node_normalization.pl texinfo-6.3/tp/t/results/info_tests/top_node_normalization.pl
*** texinfo-6.1/tp/t/results/info_tests/top_node_normalization.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/top_node_normalization.pl	2016-08-02 18:45:04.000000000 +0100
***************
*** 77,84 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 77,80 ----
***************
*** 121,128 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 117,120 ----
diff -Nrc2 texinfo-6.1/tp/t/results/info_tests/xref_test.pl texinfo-6.3/tp/t/results/info_tests/xref_test.pl
*** texinfo-6.1/tp/t/results/info_tests/xref_test.pl	2016-01-22 07:50:26.000000000 +0000
--- texinfo-6.3/tp/t/results/info_tests/xref_test.pl	2016-08-02 18:45:03.000000000 +0100
***************
*** 92,99 ****
                    ],
                    'normalized' => 'in-xref'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 92,95 ----
***************
*** 144,151 ****
                    ],
                    'normalized' => 'bad-xref'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 140,143 ----
***************
*** 197,204 ****
                            ],
                            'normalized' => 'bad-nested-xref'
-                         },
-                         'spaces_before_argument' => {
-                           'text' => '',
-                           'type' => 'empty_spaces_before_argument'
                          }
                        },
--- 189,192 ----
***************
*** 240,243 ****
--- 228,232 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 277,284 ****
                    ],
                    'normalized' => 'in-ref-ending-with-a-dot_002e'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 266,269 ----
***************
*** 330,337 ****
                    ],
                    'normalized' => 'in-ref-followed-by-symbol'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 315,318 ----
***************
*** 411,414 ****
--- 392,396 ----
  $result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[0];
  $result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[6];
+ $result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[1];
  $result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[1];
  $result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[1]{'parent'} = $result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[6];
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/accents.pl texinfo-6.3/tp/t/results/invalid_nestings/accents.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/accents.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/accents.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 29,32 ****
--- 29,37 ----
                    'cmdname' => 'TeX',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 2,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  }
***************
*** 38,46 ****
            'cmdname' => '~',
            'contents' => [],
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 2,
!             'macro' => ''
!           },
            'parent' => {}
          },
--- 43,47 ----
            'cmdname' => '~',
            'contents' => [],
!           'line_nr' => {},
            'parent' => {}
          },
***************
*** 161,169 ****
                        {}
                      ],
!                     'normalized' => 'truc',
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {},
--- 162,166 ----
                        {}
                      ],
!                     'normalized' => 'truc'
                    },
                    'line_nr' => {},
***************
*** 196,204 ****
  $result_trees{'accents'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accents'}{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'accents'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'accents'}{'contents'}[0]{'contents'}[1];
  $result_trees{'accents'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'accents'}{'contents'}[0];
  $result_trees{'accents'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'accents'}{'contents'}[0];
  $result_trees{'accents'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accents'}{'contents'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'accents'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accents'}{'contents'}[0]{'contents'}[3];
! $result_trees{'accents'}{'contents'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'accents'}{'contents'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'accents'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'accents'}{'contents'}[0];
  $result_trees{'accents'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'accents'}{'contents'}[0];
--- 193,202 ----
  $result_trees{'accents'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accents'}{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'accents'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'accents'}{'contents'}[0]{'contents'}[1];
+ $result_trees{'accents'}{'contents'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'accents'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'accents'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'accents'}{'contents'}[0];
  $result_trees{'accents'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'accents'}{'contents'}[0];
  $result_trees{'accents'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accents'}{'contents'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'accents'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accents'}{'contents'}[0]{'contents'}[3];
! $result_trees{'accents'}{'contents'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'accents'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'accents'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'accents'}{'contents'}[0];
  $result_trees{'accents'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'accents'}{'contents'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/bad_style_nesting.pl texinfo-6.3/tp/t/results/invalid_nestings/bad_style_nesting.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/bad_style_nesting.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/bad_style_nesting.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 150,159 ****
  $result_errors{'bad_style_nesting'} = [
    {
!     'error_line' => ':1: @code missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@code missing close brace',
      'type' => 'error'
    },
--- 150,159 ----
  $result_errors{'bad_style_nesting'} = [
    {
!     'error_line' => ':1: @code missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@code missing closing brace',
      'type' => 'error'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/bad_tab_nesting.pl texinfo-6.3/tp/t/results/invalid_nestings/bad_tab_nesting.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/bad_tab_nesting.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/bad_tab_nesting.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 201,230 ****
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            },
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            }
          ],
-         'prototypes_line' => [
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => '
- ',
-             'type' => 'prototype_space'
-           }
-         ],
          'spaces_after_command' => {}
        },
--- 201,211 ----
***************
*** 275,283 ****
  $result_trees{'bad_tab_nesting'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'bad_tab_nesting'}{'contents'}[0]{'contents'}[1];
  $result_trees{'bad_tab_nesting'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'bad_tab_nesting'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'bad_tab_nesting'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'bad_tab_nesting'}{'contents'}[0]{'args'}[0];
  $result_trees{'bad_tab_nesting'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'bad_tab_nesting'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'bad_tab_nesting'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'parent'} = $result_trees{'bad_tab_nesting'}{'contents'}[0]{'args'}[0];
- $result_trees{'bad_tab_nesting'}{'contents'}[0]{'extra'}{'prototypes_line'}[1] = $result_trees{'bad_tab_nesting'}{'contents'}[0]{'args'}[0]{'contents'}[1];
- $result_trees{'bad_tab_nesting'}{'contents'}[0]{'extra'}{'prototypes_line'}[3] = $result_trees{'bad_tab_nesting'}{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'bad_tab_nesting'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'bad_tab_nesting'}{'contents'}[0]{'args'}[0]{'contents'}[0];
  $result_trees{'bad_tab_nesting'}{'contents'}[0]{'parent'} = $result_trees{'bad_tab_nesting'};
--- 256,260 ----
***************
*** 296,305 ****
  $result_errors{'bad_tab_nesting'} = [
    {
!     'error_line' => ':3: @code missing close brace
  ',
      'file_name' => '',
      'line_nr' => 3,
      'macro' => '',
!     'text' => '@code missing close brace',
      'type' => 'error'
    },
--- 273,282 ----
  $result_errors{'bad_tab_nesting'} = [
    {
!     'error_line' => ':3: @code missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 3,
      'macro' => '',
!     'text' => '@code missing closing brace',
      'type' => 'error'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/block_not_matching.pl texinfo-6.3/tp/t/results/invalid_nestings/block_not_matching.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/block_not_matching.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/block_not_matching.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 94,98 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 94,97 ----
***************
*** 141,145 ****
                'index_at_command' => 'deffn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'print_navigation',
--- 140,143 ----
***************
*** 196,199 ****
--- 194,203 ----
              {
                'cmdname' => 'asis',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 9,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 292,300 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 9,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 296,300 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 319,322 ****
--- 319,328 ----
              {
                'cmdname' => 'emph',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 14,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 438,446 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 14,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 444,448 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 622,626 ****
  $result_trees{'block_not_matching'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'block_not_matching'}{'contents'}[2]{'contents'}[0];
  $result_trees{'block_not_matching'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'block_not_matching'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'block_not_matching'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'block_not_matching'}{'contents'}[2]{'contents'}[0]{'args'}[0];
  $result_trees{'block_not_matching'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'block_not_matching'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'block_not_matching'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'block_not_matching'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 624,627 ----
***************
*** 658,661 ****
--- 659,663 ----
  $result_trees{'block_not_matching'}{'contents'}[4]{'extra'}{'command_as_argument'} = $result_trees{'block_not_matching'}{'contents'}[4]{'args'}[0]{'contents'}[1];
  $result_trees{'block_not_matching'}{'contents'}[4]{'extra'}{'spaces_after_command'} = $result_trees{'block_not_matching'}{'contents'}[4]{'args'}[0]{'contents'}[0];
+ $result_trees{'block_not_matching'}{'contents'}[4]{'line_nr'} = $result_trees{'block_not_matching'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'block_not_matching'}{'contents'}[4]{'parent'} = $result_trees{'block_not_matching'};
  $result_trees{'block_not_matching'}{'contents'}[5]{'parent'} = $result_trees{'block_not_matching'};
***************
*** 685,688 ****
--- 687,691 ----
  $result_trees{'block_not_matching'}{'contents'}[6]{'extra'}{'command_as_argument'} = $result_trees{'block_not_matching'}{'contents'}[6]{'args'}[0]{'contents'}[1];
  $result_trees{'block_not_matching'}{'contents'}[6]{'extra'}{'spaces_after_command'} = $result_trees{'block_not_matching'}{'contents'}[6]{'args'}[0]{'contents'}[0];
+ $result_trees{'block_not_matching'}{'contents'}[6]{'line_nr'} = $result_trees{'block_not_matching'}{'contents'}[6]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'block_not_matching'}{'contents'}[6]{'parent'} = $result_trees{'block_not_matching'};
  $result_trees{'block_not_matching'}{'contents'}[7]{'parent'} = $result_trees{'block_not_matching'};
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/cartouche_in_style_command.pl texinfo-6.3/tp/t/results/invalid_nestings/cartouche_in_style_command.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/cartouche_in_style_command.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/cartouche_in_style_command.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 158,167 ****
  $result_errors{'cartouche_in_style_command'} = [
    {
!     'error_line' => ':1: @code missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@code missing close brace',
      'type' => 'error'
    },
--- 158,167 ----
  $result_errors{'cartouche_in_style_command'} = [
    {
!     'error_line' => ':1: @code missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@code missing closing brace',
      'type' => 'error'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/center.pl texinfo-6.3/tp/t/results/invalid_nestings/center.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/center.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/center.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 61,69 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 61,65 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 98,106 ****
                    {}
                  ],
!                 'normalized' => 'in-anchor',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 94,98 ----
                    {}
                  ],
!                 'normalized' => 'in-anchor'
                },
                'line_nr' => {},
***************
*** 128,138 ****
                'cmdname' => 'footnote',
                'contents' => [],
-               'extra' => {
-                 'spaces_before_argument' => {
-                   'parent' => {},
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
-                 }
-               },
                'line_nr' => {},
                'parent' => {}
--- 120,123 ----
***************
*** 229,233 ****
                    'index_at_command' => 'cindex',
                    'index_name' => 'cp',
-                   'index_prefix' => 'c',
                    'index_type_command' => 'cindex',
                    'key' => 'cindex',
--- 214,217 ----
***************
*** 676,679 ****
--- 660,669 ----
              {
                'cmdname' => 'asis',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 21,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 802,810 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 21,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 792,796 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 829,832 ****
--- 815,824 ----
              {
                'cmdname' => 'emph',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 25,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 1008,1016 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 25,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 1000,1004 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 1580,1609 ****
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            },
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            }
          ],
-         'prototypes_line' => [
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => '  ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => '
- ',
-             'type' => 'prototype_space'
-           }
-         ],
          'spaces_after_command' => {}
        },
--- 1568,1578 ----
***************
*** 1651,1654 ****
--- 1620,1629 ----
                      {
                        'cmdname' => 'asis',
+                       'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 45,
+                         'macro' => ''
+                       },
                        'parent' => {},
                        'type' => 'command_as_argument'
***************
*** 1683,1691 ****
                  'spaces_after_command' => {}
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 45,
!                 'macro' => ''
!               },
                'parent' => {}
              }
--- 1658,1662 ----
                  'spaces_after_command' => {}
                },
!               'line_nr' => {},
                'parent' => {}
              }
***************
*** 1773,1777 ****
  $result_trees{'center'}{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'center'}{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0];
  $result_trees{'center'}{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'center'}{'contents'}[0]{'args'}[0]{'contents'}[6];
- $result_trees{'center'}{'contents'}[0]{'args'}[0]{'contents'}[6]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'center'}{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0];
  $result_trees{'center'}{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'center'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'center'}{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'center'}{'contents'}[0]{'args'}[0];
--- 1744,1747 ----
***************
*** 1924,1927 ****
--- 1894,1898 ----
  $result_trees{'center'}{'contents'}[20]{'extra'}{'end_command'} = $result_trees{'center'}{'contents'}[20]{'contents'}[1];
  $result_trees{'center'}{'contents'}[20]{'extra'}{'spaces_after_command'} = $result_trees{'center'}{'contents'}[20]{'args'}[0]{'contents'}[0];
+ $result_trees{'center'}{'contents'}[20]{'line_nr'} = $result_trees{'center'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'center'}{'contents'}[20]{'parent'} = $result_trees{'center'};
  $result_trees{'center'}{'contents'}[21]{'parent'} = $result_trees{'center'};
***************
*** 1966,1969 ****
--- 1937,1941 ----
  $result_trees{'center'}{'contents'}[22]{'extra'}{'end_command'} = $result_trees{'center'}{'contents'}[22]{'contents'}[1];
  $result_trees{'center'}{'contents'}[22]{'extra'}{'spaces_after_command'} = $result_trees{'center'}{'contents'}[22]{'args'}[0]{'contents'}[0];
+ $result_trees{'center'}{'contents'}[22]{'line_nr'} = $result_trees{'center'}{'contents'}[22]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'center'}{'contents'}[22]{'parent'} = $result_trees{'center'};
  $result_trees{'center'}{'contents'}[23]{'parent'} = $result_trees{'center'};
***************
*** 2087,2095 ****
  $result_trees{'center'}{'contents'}[33]{'extra'}{'end_command'} = $result_trees{'center'}{'contents'}[33]{'contents'}[1];
  $result_trees{'center'}{'contents'}[33]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'center'}{'contents'}[33]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'center'}{'contents'}[33]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'center'}{'contents'}[33]{'args'}[0];
  $result_trees{'center'}{'contents'}[33]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'center'}{'contents'}[33]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'center'}{'contents'}[33]{'extra'}{'prototypes'}[1]{'parent'} = $result_trees{'center'}{'contents'}[33]{'args'}[0];
- $result_trees{'center'}{'contents'}[33]{'extra'}{'prototypes_line'}[1] = $result_trees{'center'}{'contents'}[33]{'args'}[0]{'contents'}[1];
- $result_trees{'center'}{'contents'}[33]{'extra'}{'prototypes_line'}[3] = $result_trees{'center'}{'contents'}[33]{'args'}[0]{'contents'}[3];
  $result_trees{'center'}{'contents'}[33]{'extra'}{'spaces_after_command'} = $result_trees{'center'}{'contents'}[33]{'args'}[0]{'contents'}[0];
  $result_trees{'center'}{'contents'}[33]{'parent'} = $result_trees{'center'};
--- 2059,2063 ----
***************
*** 2107,2110 ****
--- 2075,2079 ----
  $result_trees{'center'}{'contents'}[35]{'args'}[0]{'contents'}[2]{'extra'}{'command_as_argument'} = $result_trees{'center'}{'contents'}[35]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1];
  $result_trees{'center'}{'contents'}[35]{'args'}[0]{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'center'}{'contents'}[35]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+ $result_trees{'center'}{'contents'}[35]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'center'}{'contents'}[35]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'center'}{'contents'}[35]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'center'}{'contents'}[35]{'args'}[0];
  $result_trees{'center'}{'contents'}[35]{'args'}[0]{'parent'} = $result_trees{'center'}{'contents'}[35];
***************
*** 2112,2116 ****
  $result_trees{'center'}{'contents'}[35]{'extra'}{'misc_content'}[1] = $result_trees{'center'}{'contents'}[35]{'args'}[0]{'contents'}[2];
  $result_trees{'center'}{'contents'}[35]{'extra'}{'spaces_after_command'} = $result_trees{'center'}{'contents'}[35]{'args'}[0]{'contents'}[0];
! $result_trees{'center'}{'contents'}[35]{'line_nr'} = $result_trees{'center'}{'contents'}[35]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'center'}{'contents'}[35]{'parent'} = $result_trees{'center'};
  $result_trees{'center'}{'contents'}[36]{'parent'} = $result_trees{'center'};
--- 2081,2085 ----
  $result_trees{'center'}{'contents'}[35]{'extra'}{'misc_content'}[1] = $result_trees{'center'}{'contents'}[35]{'args'}[0]{'contents'}[2];
  $result_trees{'center'}{'contents'}[35]{'extra'}{'spaces_after_command'} = $result_trees{'center'}{'contents'}[35]{'args'}[0]{'contents'}[0];
! $result_trees{'center'}{'contents'}[35]{'line_nr'} = $result_trees{'center'}{'contents'}[35]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'center'}{'contents'}[35]{'parent'} = $result_trees{'center'};
  $result_trees{'center'}{'contents'}[36]{'parent'} = $result_trees{'center'};
***************
*** 2229,2238 ****
    },
    {
!     'error_line' => ':3: warning: @cindex should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 3,
      'macro' => '',
!     'text' => '@cindex should only appear at a line beginning',
      'type' => 'warning'
    },
--- 2198,2207 ----
    },
    {
!     'error_line' => ':3: warning: @cindex should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 3,
      'macro' => '',
!     'text' => '@cindex should only appear at the beginning of a line',
      'type' => 'warning'
    },
***************
*** 2283,2292 ****
    },
    {
!     'error_line' => ':9: warning: @center should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 9,
      'macro' => '',
!     'text' => '@center should only appear at a line beginning',
      'type' => 'warning'
    },
--- 2252,2261 ----
    },
    {
!     'error_line' => ':9: warning: @center should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 9,
      'macro' => '',
!     'text' => '@center should only appear at the beginning of a line',
      'type' => 'warning'
    },
***************
*** 2301,2310 ****
    },
    {
!     'error_line' => ':11: @code missing close brace
  ',
      'file_name' => '',
      'line_nr' => 11,
      'macro' => '',
!     'text' => '@code missing close brace',
      'type' => 'error'
    },
--- 2270,2279 ----
    },
    {
!     'error_line' => ':11: @code missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 11,
      'macro' => '',
!     'text' => '@code missing closing brace',
      'type' => 'error'
    },
***************
*** 2319,2337 ****
    },
    {
!     'error_line' => ':15: warning: @center should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 15,
      'macro' => '',
!     'text' => '@center should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':15: @code missing close brace
  ',
      'file_name' => '',
      'line_nr' => 15,
      'macro' => '',
!     'text' => '@code missing close brace',
      'type' => 'error'
    },
--- 2288,2306 ----
    },
    {
!     'error_line' => ':15: warning: @center should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 15,
      'macro' => '',
!     'text' => '@center should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':15: @code missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 15,
      'macro' => '',
!     'text' => '@code missing closing brace',
      'type' => 'error'
    },
***************
*** 2355,2373 ****
    },
    {
!     'error_line' => ':19: warning: @center should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 19,
      'macro' => '',
!     'text' => '@center should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':19: @code missing close brace
  ',
      'file_name' => '',
      'line_nr' => 19,
      'macro' => '',
!     'text' => '@code missing close brace',
      'type' => 'error'
    },
--- 2324,2342 ----
    },
    {
!     'error_line' => ':19: warning: @center should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 19,
      'macro' => '',
!     'text' => '@center should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':19: @code missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 19,
      'macro' => '',
!     'text' => '@code missing closing brace',
      'type' => 'error'
    },
***************
*** 2454,2472 ****
    },
    {
!     'error_line' => ':33: warning: @center should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 33,
      'macro' => '',
!     'text' => '@center should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':33: @samp missing close brace
  ',
      'file_name' => '',
      'line_nr' => 33,
      'macro' => '',
!     'text' => '@samp missing close brace',
      'type' => 'error'
    },
--- 2423,2441 ----
    },
    {
!     'error_line' => ':33: warning: @center should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 33,
      'macro' => '',
!     'text' => '@center should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':33: @samp missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 33,
      'macro' => '',
!     'text' => '@samp missing closing brace',
      'type' => 'error'
    },
***************
*** 2490,2508 ****
    },
    {
!     'error_line' => ':35: warning: @center should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 35,
      'macro' => '',
!     'text' => '@center should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':35: @samp missing close brace
  ',
      'file_name' => '',
      'line_nr' => 35,
      'macro' => '',
!     'text' => '@samp missing close brace',
      'type' => 'error'
    },
--- 2459,2477 ----
    },
    {
!     'error_line' => ':35: warning: @center should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 35,
      'macro' => '',
!     'text' => '@center should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':35: @samp missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 35,
      'macro' => '',
!     'text' => '@samp missing closing brace',
      'type' => 'error'
    },
***************
*** 2580,2589 ****
    },
    {
!     'error_line' => ':45: warning: @table should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 45,
      'macro' => '',
!     'text' => '@table should only appear at a line beginning',
      'type' => 'warning'
    },
--- 2549,2558 ----
    },
    {
!     'error_line' => ':45: warning: @table should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 45,
      'macro' => '',
!     'text' => '@table should only appear at the beginning of a line',
      'type' => 'warning'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/def_in_style_command.pl texinfo-6.3/tp/t/results/invalid_nestings/def_in_style_command.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/def_in_style_command.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/def_in_style_command.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 113,117 ****
                'index_at_command' => 'defun',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'defun',
                'key' => 'name',
--- 113,116 ----
***************
*** 242,251 ****
  $result_errors{'def_in_style_command'} = [
    {
!     'error_line' => ':1: @code missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@code missing close brace',
      'type' => 'error'
    },
--- 241,250 ----
  $result_errors{'def_in_style_command'} = [
    {
!     'error_line' => ':1: @code missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@code missing closing brace',
      'type' => 'error'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl texinfo-6.3/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 130,134 ****
                            'index_at_command' => 'deffn',
                            'index_name' => 'fn',
-                           'index_prefix' => 'f',
                            'index_type_command' => 'deffn',
                            'key' => 'truc',
--- 130,133 ----
***************
*** 326,335 ****
    },
    {
!     'error_line' => ':2: warning: @deffn should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 2,
      'macro' => '',
!     'text' => '@deffn should only appear at a line beginning',
      'type' => 'warning'
    },
--- 325,334 ----
    },
    {
!     'error_line' => ':2: warning: @deffn should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 2,
      'macro' => '',
!     'text' => '@deffn should only appear at the beginning of a line',
      'type' => 'warning'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/enumerate_in_style_command.pl texinfo-6.3/tp/t/results/invalid_nestings/enumerate_in_style_command.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/enumerate_in_style_command.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/enumerate_in_style_command.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 204,213 ****
  $result_errors{'enumerate_in_style_command'} = [
    {
!     'error_line' => ':1: @code missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@code missing close brace',
      'type' => 'error'
    },
--- 204,213 ----
  $result_errors{'enumerate_in_style_command'} = [
    {
!     'error_line' => ':1: @code missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@code missing closing brace',
      'type' => 'error'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/example_in_style_command.pl texinfo-6.3/tp/t/results/invalid_nestings/example_in_style_command.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/example_in_style_command.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/example_in_style_command.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 150,159 ****
  $result_errors{'example_in_style_command'} = [
    {
!     'error_line' => ':1: @code missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@code missing close brace',
      'type' => 'error'
    },
--- 150,159 ----
  $result_errors{'example_in_style_command'} = [
    {
!     'error_line' => ':1: @code missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@code missing closing brace',
      'type' => 'error'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/float_in_style_command.pl texinfo-6.3/tp/t/results/invalid_nestings/float_in_style_command.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/float_in_style_command.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/float_in_style_command.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 60,63 ****
--- 60,64 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 113,122 ****
            'contents' => [],
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'parent' => {},
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 114,118 ----
            'contents' => [],
            'extra' => {
!             'float' => {}
            },
            'line_nr' => {
***************
*** 217,220 ****
--- 213,217 ----
  $result_trees{'float_in_style_command'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'float_in_style_command'}{'contents'}[1]{'args'}[0];
  $result_trees{'float_in_style_command'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'float_in_style_command'}{'contents'}[1];
+ $result_trees{'float_in_style_command'}{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'float_in_style_command'}{'contents'}[1]{'args'}[1];
  $result_trees{'float_in_style_command'}{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'float_in_style_command'}{'contents'}[1]{'args'}[1];
  $result_trees{'float_in_style_command'}{'contents'}[1]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'float_in_style_command'}{'contents'}[1]{'args'}[1];
***************
*** 226,230 ****
  $result_trees{'float_in_style_command'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'float_in_style_command'}{'contents'}[1]{'contents'}[1];
  $result_trees{'float_in_style_command'}{'contents'}[1]{'contents'}[1]{'extra'}{'float'} = $result_trees{'float_in_style_command'}{'contents'}[1];
- $result_trees{'float_in_style_command'}{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'float_in_style_command'}{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'float_in_style_command'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'float_in_style_command'}{'contents'}[1];
  $result_trees{'float_in_style_command'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'float_in_style_command'}{'contents'}[1];
--- 223,226 ----
***************
*** 262,271 ****
  $result_errors{'float_in_style_command'} = [
    {
!     'error_line' => ':1: @code missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@code missing close brace',
      'type' => 'error'
    },
--- 258,267 ----
  $result_errors{'float_in_style_command'} = [
    {
!     'error_line' => ':1: @code missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@code missing closing brace',
      'type' => 'error'
    },
***************
*** 299,307 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 295,299 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/flushright_in_style_command.pl texinfo-6.3/tp/t/results/invalid_nestings/flushright_in_style_command.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/flushright_in_style_command.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/flushright_in_style_command.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 150,159 ****
  $result_errors{'flushright_in_style_command'} = [
    {
!     'error_line' => ':1: @code missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@code missing close brace',
      'type' => 'error'
    },
--- 150,159 ----
  $result_errors{'flushright_in_style_command'} = [
    {
!     'error_line' => ':1: @code missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@code missing closing brace',
      'type' => 'error'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/footnote_in_ref.pl texinfo-6.3/tp/t/results/invalid_nestings/footnote_in_ref.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/footnote_in_ref.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/footnote_in_ref.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 65,68 ****
--- 65,69 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 111,120 ****
                        'contents' => [],
                        'extra' => {
!                         'invalid_nesting' => 1,
!                         'spaces_before_argument' => {
!                           'parent' => {},
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 112,116 ----
                        'contents' => [],
                        'extra' => {
!                         'invalid_nesting' => 1
                        },
                        'line_nr' => {
***************
*** 141,153 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
!               'parent' => {},
!               'remaining_args' => 3
              }
            ],
--- 137,144 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
!               'parent' => {}
              }
            ],
***************
*** 188,191 ****
--- 179,183 ----
  $result_trees{'footnote_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'footnote_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'footnote_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'footnote_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
+ $result_trees{'footnote_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'footnote_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'footnote_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'footnote_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'footnote_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'footnote_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
***************
*** 195,199 ****
  $result_trees{'footnote_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'footnote_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'footnote_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'footnote_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[2];
- $result_trees{'footnote_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[2]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'footnote_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'footnote_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'footnote_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'footnote_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'footnote_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1];
--- 187,190 ----
***************
*** 257,266 ****
    },
    {
!     'error_line' => ':3: @xref missing close brace
  ',
      'file_name' => '',
      'line_nr' => 3,
      'macro' => '',
!     'text' => '@xref missing close brace',
      'type' => 'error'
    }
--- 248,257 ----
    },
    {
!     'error_line' => ':3: @xref missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 3,
      'macro' => '',
!     'text' => '@xref missing closing brace',
      'type' => 'error'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl texinfo-6.3/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 46,49 ****
--- 46,55 ----
                  {
                    'cmdname' => 'asis',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 3,
+                     'macro' => ''
+                   },
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 269,277 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 3,
!             'macro' => ''
!           },
            'parent' => {}
          },
--- 275,279 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {}
          },
***************
*** 379,382 ****
--- 381,385 ----
  $result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'} = $result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1];
  $result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+ $result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'formats_not_closed_in_example'}{'contents'}[0];
  $result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/ignore_in_xref.pl texinfo-6.3/tp/t/results/invalid_nestings/ignore_in_xref.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/ignore_in_xref.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/ignore_in_xref.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 65,68 ****
--- 65,69 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => '
  ',
***************
*** 95,107 ****
                        'extra' => {
                          'invalid_nesting' => 1,
!                         'spaces_after_command' => {
!                           'extra' => {
!                             'command' => {}
!                           },
!                           'parent' => {},
!                           'text' => '
! ',
!                           'type' => 'empty_line_after_command'
!                         }
                        },
                        'line_nr' => {
--- 96,100 ----
                        'extra' => {
                          'invalid_nesting' => 1,
!                         'spaces_after_command' => {}
                        },
                        'line_nr' => {
***************
*** 112,116 ****
                        'parent' => {}
                      },
!                     {}
                    ],
                    'parent' => {},
--- 105,117 ----
                        'parent' => {}
                      },
!                     {
!                       'extra' => {
!                         'command' => {}
!                       },
!                       'parent' => {},
!                       'text' => '
! ',
!                       'type' => 'empty_line_after_command'
!                     }
                    ],
                    'parent' => {},
***************
*** 136,143 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 137,140 ----
***************
*** 191,206 ****
  $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
  $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'command'} = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1];
  $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1];
  $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1];
  $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1];
! $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1];
! $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1];
! $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[2] = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'};
  $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
  $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
  $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0] = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1];
! $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][1] = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'};
  $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'label'} = $result_trees{'ignore_in_xref'}{'contents'}[1];
  $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
--- 188,204 ----
  $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
+ $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'command'} = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1];
  $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1];
  $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1];
  $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1];
! $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'contents'}[0];
  $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1];
! $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[2]{'extra'}{'command'} = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1];
! $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
  $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
  $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0] = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1];
! $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][1] = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[2];
  $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'label'} = $result_trees{'ignore_in_xref'}{'contents'}[1];
  $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/ignored_text.pl texinfo-6.3/tp/t/results/invalid_nestings/ignored_text.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/ignored_text.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/ignored_text.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 35,38 ****
--- 35,39 ----
        ],
        'cmdname' => 'node',
+       'contents' => [],
        'extra' => {
          'spaces_after_command' => {}
***************
*** 43,48 ****
          'macro' => ''
        },
!       'parent' => {},
!       'remaining_args' => 3
      }
    ],
--- 44,48 ----
          'macro' => ''
        },
!       'parent' => {}
      }
    ],
***************
*** 66,75 ****
  $result_errors{'ignored_text'} = [
    {
!     'error_line' => ':1: warning: @ifinfo should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@ifinfo should only appear at a line beginning',
      'type' => 'warning'
    },
--- 66,75 ----
  $result_errors{'ignored_text'} = [
    {
!     'error_line' => ':1: warning: @ifinfo should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@ifinfo should only appear at the beginning of a line',
      'type' => 'warning'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/in_errormsg.pl texinfo-6.3/tp/t/results/invalid_nestings/in_errormsg.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/in_errormsg.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/in_errormsg.pl	2016-08-02 18:52:07.000000000 +0100
***************
*** 38,46 ****
            {}
          ],
!         'normalized' => 'in-ref',
!         'spaces_before_argument' => {
!           'text' => '',
!           'type' => 'empty_spaces_before_argument'
!         }
        },
        'line_nr' => {
--- 38,42 ----
            {}
          ],
!         'normalized' => 'in-ref'
        },
        'line_nr' => {
***************
*** 52,55 ****
--- 48,52 ----
      },
      {
+       'parent' => {},
        'text' => '
  ',
***************
*** 91,99 ****
                        {}
                      ],
!                     'normalized' => 'in-anchor',
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {
--- 88,92 ----
                        {}
                      ],
!                     'normalized' => 'in-anchor'
                    },
                    'line_nr' => {
***************
*** 105,108 ****
--- 98,102 ----
                  },
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_after_close_brace'
***************
*** 136,143 ****
                        ],
                        'normalized' => 'in-ref'
-                     },
-                     'spaces_before_argument' => {
-                       'text' => '',
-                       'type' => 'empty_spaces_before_argument'
                      }
                    },
--- 130,133 ----
***************
*** 159,167 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 149,153 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 188,191 ****
--- 174,178 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => '
  ',
***************
*** 223,226 ****
--- 210,219 ----
              {
                'cmdname' => 'asis',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 6,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 345,353 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 6,
!         'macro' => ''
!       },
        'parent' => {}
      }
--- 338,342 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      }
***************
*** 361,364 ****
--- 350,354 ----
  $result_trees{'in_errormsg'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'in_errormsg'}{'contents'}[1]{'args'}[0]{'contents'}[0];
  $result_trees{'in_errormsg'}{'contents'}[1]{'parent'} = $result_trees{'in_errormsg'};
+ $result_trees{'in_errormsg'}{'contents'}[2]{'parent'} = $result_trees{'in_errormsg'};
  $result_trees{'in_errormsg'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'in_errormsg'}{'contents'}[3];
  $result_trees{'in_errormsg'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'in_errormsg'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0];
***************
*** 367,370 ****
--- 357,361 ----
  $result_trees{'in_errormsg'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0] = $result_trees{'in_errormsg'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
  $result_trees{'in_errormsg'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'in_errormsg'}{'contents'}[3]{'contents'}[1]{'args'}[0];
+ $result_trees{'in_errormsg'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'in_errormsg'}{'contents'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'in_errormsg'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'in_errormsg'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'in_errormsg'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'in_errormsg'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2];
***************
*** 383,386 ****
--- 374,378 ----
  $result_trees{'in_errormsg'}{'contents'}[3]{'parent'} = $result_trees{'in_errormsg'};
  $result_trees{'in_errormsg'}{'contents'}[4]{'parent'} = $result_trees{'in_errormsg'};
+ $result_trees{'in_errormsg'}{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'in_errormsg'}{'contents'}[5]{'args'}[0];
  $result_trees{'in_errormsg'}{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'in_errormsg'}{'contents'}[5];
  $result_trees{'in_errormsg'}{'contents'}[5]{'extra'}{'spaces_before_argument'} = $result_trees{'in_errormsg'}{'contents'}[5]{'args'}[0]{'contents'}[0];
***************
*** 413,416 ****
--- 405,409 ----
  $result_trees{'in_errormsg'}{'contents'}[6]{'extra'}{'end_command'} = $result_trees{'in_errormsg'}{'contents'}[6]{'contents'}[1];
  $result_trees{'in_errormsg'}{'contents'}[6]{'extra'}{'spaces_after_command'} = $result_trees{'in_errormsg'}{'contents'}[6]{'args'}[0]{'contents'}[0];
+ $result_trees{'in_errormsg'}{'contents'}[6]{'line_nr'} = $result_trees{'in_errormsg'}{'contents'}[6]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'in_errormsg'}{'contents'}[6]{'parent'} = $result_trees{'in_errormsg'};
  
***************
*** 452,470 ****
    },
    {
!     'error_line' => ':3: in ref
! ',
!     'file_name' => '',
!     'line_nr' => 3,
!     'macro' => '',
!     'text' => 'in ref',
!     'type' => 'error'
!   },
!   {
!     'error_line' => ':5: @errormsg missing close brace
  ',
      'file_name' => '',
      'line_nr' => 5,
      'macro' => '',
!     'text' => '@errormsg missing close brace',
      'type' => 'error'
    },
--- 445,454 ----
    },
    {
!     'error_line' => ':5: @errormsg missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 5,
      'macro' => '',
!     'text' => '@errormsg missing closing brace',
      'type' => 'error'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/in_table.pl texinfo-6.3/tp/t/results/invalid_nestings/in_table.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/in_table.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/in_table.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 69,72 ****
--- 69,73 ----
                  {
                    'cmdname' => 'xref',
+                   'contents' => [],
                    'extra' => {
                      'invalid_nesting' => 1
***************
*** 168,171 ****
--- 169,178 ----
                  {
                    'cmdname' => 'code',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 7,
+                     'macro' => ''
+                   },
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 241,249 ****
                                      {}
                                    ]
!                                 ],
!                                 'spaces_before_argument' => {
!                                   'text' => '',
!                                   'type' => 'empty_spaces_before_argument'
!                                 }
                                },
                                'line_nr' => {},
--- 248,252 ----
                                      {}
                                    ]
!                                 ]
                                },
                                'line_nr' => {},
***************
*** 278,286 ****
                                    {}
                                  ],
!                                 'normalized' => 'in-anchor',
!                                 'spaces_before_argument' => {
!                                   'text' => '',
!                                   'type' => 'empty_spaces_before_argument'
!                                 }
                                },
                                'line_nr' => {},
--- 281,285 ----
                                    {}
                                  ],
!                                 'normalized' => 'in-anchor'
                                },
                                'line_nr' => {},
***************
*** 308,318 ****
                                'cmdname' => 'footnote',
                                'contents' => [],
-                               'extra' => {
-                                 'spaces_before_argument' => {
-                                   'parent' => {},
-                                   'text' => '',
-                                   'type' => 'empty_spaces_before_argument'
-                                 }
-                               },
                                'line_nr' => {},
                                'parent' => {}
--- 307,310 ----
***************
*** 416,426 ****
                            'cmdname' => 'footnote',
                            'contents' => [],
-                           'extra' => {
-                             'spaces_before_argument' => {
-                               'parent' => {},
-                               'text' => '',
-                               'type' => 'empty_spaces_before_argument'
-                             }
-                           },
                            'line_nr' => {
                              'file_name' => '',
--- 408,411 ----
***************
*** 483,486 ****
--- 468,472 ----
                                    'contents' => [
                                      {
+                                       'parent' => {},
                                        'text' => ' ',
                                        'type' => 'empty_spaces_before_argument'
***************
*** 504,512 ****
                                    ],
                                    undef
!                                 ],
!                                 'spaces_before_argument' => {
!                                   'text' => '',
!                                   'type' => 'empty_spaces_before_argument'
!                                 }
                                },
                                'line_nr' => {
--- 490,494 ----
                                    ],
                                    undef
!                                 ]
                                },
                                'line_nr' => {
***************
*** 515,520 ****
                                  'macro' => ''
                                },
!                               'parent' => {},
!                               'remaining_args' => 2
                              }
                            ],
--- 497,501 ----
                                  'macro' => ''
                                },
!                               'parent' => {}
                              }
                            ],
***************
*** 693,697 ****
                                    'index_at_command' => 'cindex',
                                    'index_name' => 'cp',
-                                   'index_prefix' => 'c',
                                    'index_type_command' => 'cindex',
                                    'key' => 'index',
--- 674,677 ----
***************
*** 786,794 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 7,
!             'macro' => ''
!           },
            'parent' => {}
          },
--- 766,770 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {}
          },
***************
*** 813,816 ****
--- 789,798 ----
                  {
                    'cmdname' => 'asis',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 16,
+                     'macro' => ''
+                   },
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 883,887 ****
                                    'index_at_command' => 'cindex',
                                    'index_name' => 'cp',
-                                   'index_prefix' => 'c',
                                    'index_type_command' => 'cindex',
                                    'key' => 'index',
--- 865,868 ----
***************
*** 917,921 ****
                            'index_at_command' => 'item',
                            'index_name' => 'vr',
-                           'index_prefix' => 'v',
                            'index_type_command' => 'vtable',
                            'key' => '',
--- 898,901 ----
***************
*** 1035,1039 ****
                                    'index_at_command' => 'cindex',
                                    'index_name' => 'cp',
-                                   'index_prefix' => 'c',
                                    'index_type_command' => 'cindex',
                                    'key' => '2 index',
--- 1015,1018 ----
***************
*** 1069,1073 ****
                            'index_at_command' => 'item',
                            'index_name' => 'vr',
-                           'index_prefix' => 'v',
                            'index_type_command' => 'vtable',
                            'key' => '',
--- 1048,1051 ----
***************
*** 1185,1193 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 16,
!             'macro' => ''
!           },
            'parent' => {}
          },
--- 1163,1167 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {}
          },
***************
*** 1364,1368 ****
  $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0];
  $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[6];
- $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[6]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0];
  $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
--- 1338,1341 ----
***************
*** 1394,1398 ****
  $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
- $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
  $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
--- 1367,1370 ----
***************
*** 1405,1408 ****
--- 1377,1381 ----
  $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
  $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+ $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[2];
  $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[2];
  $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
***************
*** 1469,1472 ****
--- 1442,1446 ----
  $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[4];
  $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
+ $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'line_nr'} = $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'in_table'}{'contents'}[1];
  $result_trees{'in_table'}{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'in_table'}{'contents'}[1];
***************
*** 1552,1555 ****
--- 1526,1530 ----
  $result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'extra'}{'end_command'} = $result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[2];
  $result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'extra'}{'spaces_after_command'} = $result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0];
+ $result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'line_nr'} = $result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'in_table'}{'contents'}[1];
  $result_trees{'in_table'}{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'in_table'}{'contents'}[1];
***************
*** 1672,1681 ****
    },
    {
!     'error_line' => ':8: warning: @exdent should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 8,
      'macro' => '',
!     'text' => '@exdent should only appear at a line beginning',
      'type' => 'warning'
    },
--- 1647,1656 ----
    },
    {
!     'error_line' => ':8: warning: @exdent should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 8,
      'macro' => '',
!     'text' => '@exdent should only appear at the beginning of a line',
      'type' => 'warning'
    },
***************
*** 1690,1699 ****
    },
    {
!     'error_line' => ':10: @ref missing close brace
  ',
      'file_name' => '',
      'line_nr' => 10,
      'macro' => '',
!     'text' => '@ref missing close brace',
      'type' => 'error'
    },
--- 1665,1674 ----
    },
    {
!     'error_line' => ':10: @ref missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 10,
      'macro' => '',
!     'text' => '@ref missing closing brace',
      'type' => 'error'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/item_in_ref.pl texinfo-6.3/tp/t/results/invalid_nestings/item_in_ref.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/item_in_ref.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/item_in_ref.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 22,25 ****
--- 22,31 ----
              {
                'cmdname' => 'asis',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 1,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 128,131 ****
--- 134,138 ----
                            'contents' => [
                              {
+                               'parent' => {},
                                'text' => ' ',
                                'type' => 'empty_spaces_before_argument'
***************
*** 149,157 ****
                            ],
                            undef
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 156,160 ----
                            ],
                            undef
!                         ]
                        },
                        'line_nr' => {
***************
*** 160,165 ****
                          'macro' => ''
                        },
!                       'parent' => {},
!                       'remaining_args' => 2
                      }
                    ],
--- 163,167 ----
                          'macro' => ''
                        },
!                       'parent' => {}
                      }
                    ],
***************
*** 281,289 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 1,
!         'macro' => ''
!       },
        'parent' => {}
      }
--- 283,287 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      }
***************
*** 311,314 ****
--- 309,313 ----
  $result_trees{'item_in_ref'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'item_in_ref'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0];
  $result_trees{'item_in_ref'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'item_in_ref'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0];
+ $result_trees{'item_in_ref'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'item_in_ref'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[2];
  $result_trees{'item_in_ref'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'item_in_ref'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[2];
  $result_trees{'item_in_ref'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[2]{'parent'} = $result_trees{'item_in_ref'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0];
***************
*** 340,343 ****
--- 339,343 ----
  $result_trees{'item_in_ref'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'item_in_ref'}{'contents'}[0]{'contents'}[2];
  $result_trees{'item_in_ref'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'item_in_ref'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'item_in_ref'}{'contents'}[0]{'line_nr'} = $result_trees{'item_in_ref'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'item_in_ref'}{'contents'}[0]{'parent'} = $result_trees{'item_in_ref'};
  
***************
*** 360,369 ****
  $result_errors{'item_in_ref'} = [
    {
!     'error_line' => ':5: @ref missing close brace
  ',
      'file_name' => '',
      'line_nr' => 5,
      'macro' => '',
!     'text' => '@ref missing close brace',
      'type' => 'error'
    },
--- 360,369 ----
  $result_errors{'item_in_ref'} = [
    {
!     'error_line' => ':5: @ref missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 5,
      'macro' => '',
!     'text' => '@ref missing closing brace',
      'type' => 'error'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl texinfo-6.3/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 22,25 ****
--- 22,31 ----
              {
                'cmdname' => 'strong',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 1,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 187,190 ****
--- 193,197 ----
                          {
                            'cmdname' => 'bullet',
+                           'contents' => [],
                            'parent' => {},
                            'type' => 'command_as_argument'
***************
*** 363,371 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 1,
!         'macro' => ''
!       },
        'parent' => {}
      }
--- 370,374 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      }
***************
*** 442,445 ****
--- 445,449 ----
  $result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[1];
  $result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'line_nr'} = $result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'parent'} = $result_trees{'itemx_in_itemize_enumerate_in_table'};
  
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/menu_in_style_command.pl texinfo-6.3/tp/t/results/invalid_nestings/menu_in_style_command.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/menu_in_style_command.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/menu_in_style_command.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 345,354 ****
  $result_errors{'menu_in_style_command'} = [
    {
!     'error_line' => ':3: @code missing close brace
  ',
      'file_name' => '',
      'line_nr' => 3,
      'macro' => '',
!     'text' => '@code missing close brace',
      'type' => 'error'
    },
--- 345,354 ----
  $result_errors{'menu_in_style_command'} = [
    {
!     'error_line' => ':3: @code missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 3,
      'macro' => '',
!     'text' => '@code missing closing brace',
      'type' => 'error'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/multitable_in_style_command.pl texinfo-6.3/tp/t/results/invalid_nestings/multitable_in_style_command.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/multitable_in_style_command.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/multitable_in_style_command.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 217,246 ****
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            },
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            }
          ],
-         'prototypes_line' => [
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => '
- ',
-             'type' => 'prototype_space'
-           }
-         ],
          'spaces_after_command' => {}
        },
--- 217,227 ----
***************
*** 294,302 ****
  $result_trees{'multitable_in_style_command'}{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'multitable_in_style_command'}{'contents'}[1]{'contents'}[1];
  $result_trees{'multitable_in_style_command'}{'contents'}[1]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'multitable_in_style_command'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'multitable_in_style_command'}{'contents'}[1]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'multitable_in_style_command'}{'contents'}[1]{'args'}[0];
  $result_trees{'multitable_in_style_command'}{'contents'}[1]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'multitable_in_style_command'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'multitable_in_style_command'}{'contents'}[1]{'extra'}{'prototypes'}[1]{'parent'} = $result_trees{'multitable_in_style_command'}{'contents'}[1]{'args'}[0];
- $result_trees{'multitable_in_style_command'}{'contents'}[1]{'extra'}{'prototypes_line'}[1] = $result_trees{'multitable_in_style_command'}{'contents'}[1]{'args'}[0]{'contents'}[1];
- $result_trees{'multitable_in_style_command'}{'contents'}[1]{'extra'}{'prototypes_line'}[3] = $result_trees{'multitable_in_style_command'}{'contents'}[1]{'args'}[0]{'contents'}[3];
  $result_trees{'multitable_in_style_command'}{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'multitable_in_style_command'}{'contents'}[1]{'args'}[0]{'contents'}[0];
  $result_trees{'multitable_in_style_command'}{'contents'}[1]{'parent'} = $result_trees{'multitable_in_style_command'};
--- 275,279 ----
***************
*** 317,326 ****
  $result_errors{'multitable_in_style_command'} = [
    {
!     'error_line' => ':1: @code missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@code missing close brace',
      'type' => 'error'
    },
--- 294,303 ----
  $result_errors{'multitable_in_style_command'} = [
    {
!     'error_line' => ':1: @code missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@code missing closing brace',
      'type' => 'error'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/multitable_item_in_index.pl texinfo-6.3/tp/t/results/invalid_nestings/multitable_item_in_index.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/multitable_item_in_index.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/multitable_item_in_index.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 102,106 ****
                    'index_at_command' => 'vindex',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'vindex',
                    'key' => 'on item line',
--- 102,105 ----
***************
*** 170,199 ****
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            },
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            }
          ],
-         'prototypes_line' => [
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => '
- ',
-             'type' => 'prototype_space'
-           }
-         ],
          'spaces_after_command' => {}
        },
--- 169,179 ----
***************
*** 241,249 ****
  $result_trees{'multitable_item_in_index'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[1];
  $result_trees{'multitable_item_in_index'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'multitable_item_in_index'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'multitable_item_in_index'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'multitable_item_in_index'}{'contents'}[0]{'args'}[0];
  $result_trees{'multitable_item_in_index'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'multitable_item_in_index'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'multitable_item_in_index'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'parent'} = $result_trees{'multitable_item_in_index'}{'contents'}[0]{'args'}[0];
- $result_trees{'multitable_item_in_index'}{'contents'}[0]{'extra'}{'prototypes_line'}[1] = $result_trees{'multitable_item_in_index'}{'contents'}[0]{'args'}[0]{'contents'}[1];
- $result_trees{'multitable_item_in_index'}{'contents'}[0]{'extra'}{'prototypes_line'}[3] = $result_trees{'multitable_item_in_index'}{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'multitable_item_in_index'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'multitable_item_in_index'}{'contents'}[0]{'args'}[0]{'contents'}[0];
  $result_trees{'multitable_item_in_index'}{'contents'}[0]{'parent'} = $result_trees{'multitable_item_in_index'};
--- 221,225 ----
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/node_on_index_entry_line.pl texinfo-6.3/tp/t/results/invalid_nestings/node_on_index_entry_line.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/node_on_index_entry_line.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/node_on_index_entry_line.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 75,78 ****
--- 75,79 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 89,92 ****
--- 90,94 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 103,106 ****
--- 105,109 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 218,225 ****
--- 221,231 ----
  $result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[0];
  $result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'node_on_index_entry_line'}{'contents'}[1];
+ $result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[1];
  $result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[1];
  $result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'node_on_index_entry_line'}{'contents'}[1];
+ $result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[2];
  $result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[2];
  $result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'node_on_index_entry_line'}{'contents'}[1];
+ $result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[3];
  $result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[3];
  $result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[3];
***************
*** 300,309 ****
  $result_errors{'node_on_index_entry_line'} = [
    {
!     'error_line' => ':2: warning: @node should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 2,
      'macro' => '',
!     'text' => '@node should only appear at a line beginning',
      'type' => 'warning'
    },
--- 306,315 ----
  $result_errors{'node_on_index_entry_line'} = [
    {
!     'error_line' => ':2: warning: @node should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 2,
      'macro' => '',
!     'text' => '@node should only appear at the beginning of a line',
      'type' => 'warning'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/on_block_command_line.pl texinfo-6.3/tp/t/results/invalid_nestings/on_block_command_line.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/on_block_command_line.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/on_block_command_line.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 46,54 ****
                        {}
                      ],
!                     'normalized' => 'in-anchor',
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {
--- 46,50 ----
                        {}
                      ],
!                     'normalized' => 'in-anchor'
                    },
                    'line_nr' => {
***************
*** 88,96 ****
                    ]
                  ],
!                 'invalid_nesting' => 1,
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 84,88 ----
                    ]
                  ],
!                 'invalid_nesting' => 1
                },
                'line_nr' => {},
***************
*** 144,152 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 136,140 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 229,254 ****
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            },
            {}
          ],
-         'prototypes_line' => [
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => '
- ',
-             'type' => 'prototype_space'
-           }
-         ],
          'spaces_after_command' => {}
        },
--- 217,224 ----
***************
*** 316,324 ****
                    ]
                  ],
!                 'invalid_nesting' => 1,
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 286,290 ----
                    ]
                  ],
!                 'invalid_nesting' => 1
                },
                'line_nr' => {},
***************
*** 354,362 ****
                    {}
                  ],
!                 'normalized' => 'in-quotation-anchor',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 320,324 ----
                    {}
                  ],
!                 'normalized' => 'in-quotation-anchor'
                },
                'line_nr' => {},
***************
*** 385,394 ****
                'contents' => [],
                'extra' => {
!                 'invalid_nesting' => 1,
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 347,351 ----
                'contents' => [],
                'extra' => {
!                 'invalid_nesting' => 1
                },
                'line_nr' => {},
***************
*** 547,554 ****
  $result_trees{'on_block_command_line'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[1];
  $result_trees{'on_block_command_line'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'on_block_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'on_block_command_line'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'on_block_command_line'}{'contents'}[0]{'args'}[0];
  $result_trees{'on_block_command_line'}{'contents'}[0]{'extra'}{'prototypes'}[1] = $result_trees{'on_block_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[3];
- $result_trees{'on_block_command_line'}{'contents'}[0]{'extra'}{'prototypes_line'}[1] = $result_trees{'on_block_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[1];
- $result_trees{'on_block_command_line'}{'contents'}[0]{'extra'}{'prototypes_line'}[3] = $result_trees{'on_block_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'on_block_command_line'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'on_block_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[0];
  $result_trees{'on_block_command_line'}{'contents'}[0]{'line_nr'} = $result_trees{'on_block_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'line_nr'};
--- 504,508 ----
***************
*** 576,580 ****
  $result_trees{'on_block_command_line'}{'contents'}[2]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'on_block_command_line'}{'contents'}[2]{'args'}[0]{'contents'}[6]{'args'}[0];
  $result_trees{'on_block_command_line'}{'contents'}[2]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'on_block_command_line'}{'contents'}[2]{'args'}[0]{'contents'}[6];
- $result_trees{'on_block_command_line'}{'contents'}[2]{'args'}[0]{'contents'}[6]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'on_block_command_line'}{'contents'}[2]{'args'}[0]{'contents'}[6]{'args'}[0];
  $result_trees{'on_block_command_line'}{'contents'}[2]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'on_block_command_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'on_block_command_line'}{'contents'}[2]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'on_block_command_line'}{'contents'}[2]{'args'}[0];
--- 530,533 ----
***************
*** 672,681 ****
    },
    {
!     'error_line' => ':5: warning: @exdent should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 5,
      'macro' => '',
!     'text' => '@exdent should only appear at a line beginning',
      'type' => 'warning'
    },
--- 625,634 ----
    },
    {
!     'error_line' => ':5: warning: @exdent should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 5,
      'macro' => '',
!     'text' => '@exdent should only appear at the beginning of a line',
      'type' => 'warning'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/on_def_line.pl texinfo-6.3/tp/t/results/invalid_nestings/on_def_line.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/on_def_line.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/on_def_line.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 50,58 ****
                            {}
                          ],
!                         'normalized' => 'in-anchor',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 50,54 ----
                            {}
                          ],
!                         'normalized' => 'in-anchor'
                        },
                        'line_nr' => {
***************
*** 93,101 ****
                        ]
                      ],
!                     'invalid_nesting' => 1,
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {},
--- 89,93 ----
                        ]
                      ],
!                     'invalid_nesting' => 1
                    },
                    'line_nr' => {},
***************
*** 128,137 ****
                    'contents' => [],
                    'extra' => {
!                     'invalid_nesting' => 1,
!                     'spaces_before_argument' => {
!                       'parent' => {},
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {},
--- 120,124 ----
                    'contents' => [],
                    'extra' => {
!                     'invalid_nesting' => 1
                    },
                    'line_nr' => {},
***************
*** 191,195 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 178,181 ----
***************
*** 245,249 ****
                'index_at_command' => 'deffn',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'in titlefont',
--- 231,234 ----
***************
*** 295,303 ****
                            {}
                          ],
!                         'normalized' => 'in-anchorx',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 280,284 ----
                            {}
                          ],
!                         'normalized' => 'in-anchorx'
                        },
                        'line_nr' => {
***************
*** 338,346 ****
                        ]
                      ],
!                     'invalid_nesting' => 1,
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {},
--- 319,323 ----
                        ]
                      ],
!                     'invalid_nesting' => 1
                    },
                    'line_nr' => {},
***************
*** 373,382 ****
                    'contents' => [],
                    'extra' => {
!                     'invalid_nesting' => 1,
!                     'spaces_before_argument' => {
!                       'parent' => {},
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {},
--- 350,354 ----
                    'contents' => [],
                    'extra' => {
!                     'invalid_nesting' => 1
                    },
                    'line_nr' => {},
***************
*** 437,441 ****
                  {
                    'contents' => [],
-                   'parent' => {},
                    'type' => 'bracketed_def_content'
                  }
--- 409,412 ----
***************
*** 491,495 ****
                'index_at_command' => 'deffnx',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'deffn',
                'key' => 'in titlefontx',
--- 462,465 ----
***************
*** 574,578 ****
  $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0];
  $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5];
- $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0];
  $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'args'}[0];
--- 544,547 ----
***************
*** 589,593 ****
  $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0];
  $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1] = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[4][1] = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5];
--- 558,561 ----
***************
*** 619,623 ****
  $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[5]{'args'}[0];
  $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[5];
- $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[5]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[5]{'args'}[0];
  $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
--- 587,590 ----
***************
*** 634,638 ****
  $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[1];
  $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[1]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[1]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[1]{'extra'}{'def_args'}[2][1] = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3];
  $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[1]{'extra'}{'def_args'}[4][1] = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[5];
--- 601,604 ----
***************
*** 700,709 ****
    },
    {
!     'error_line' => ':1: warning: @exdent should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@exdent should only appear at a line beginning',
      'type' => 'warning'
    },
--- 666,675 ----
    },
    {
!     'error_line' => ':1: warning: @exdent should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@exdent should only appear at the beginning of a line',
      'type' => 'warning'
    },
***************
*** 754,763 ****
    },
    {
!     'error_line' => ':2: warning: @exdent should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 2,
      'macro' => '',
!     'text' => '@exdent should only appear at a line beginning',
      'type' => 'warning'
    },
--- 720,729 ----
    },
    {
!     'error_line' => ':2: warning: @exdent should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 2,
      'macro' => '',
!     'text' => '@exdent should only appear at the beginning of a line',
      'type' => 'warning'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/on_index_entry_line.pl texinfo-6.3/tp/t/results/invalid_nestings/on_index_entry_line.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/on_index_entry_line.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/on_index_entry_line.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 62,70 ****
                    ]
                  ],
!                 'invalid_nesting' => 1,
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 62,66 ----
                    ]
                  ],
!                 'invalid_nesting' => 1
                },
                'line_nr' => {},
***************
*** 100,108 ****
                    {}
                  ],
!                 'normalized' => 'in-anchor',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 96,100 ----
                    {}
                  ],
!                 'normalized' => 'in-anchor'
                },
                'line_nr' => {},
***************
*** 131,140 ****
                'contents' => [],
                'extra' => {
!                 'invalid_nesting' => 1,
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 123,127 ----
                'contents' => [],
                'extra' => {
!                 'invalid_nesting' => 1
                },
                'line_nr' => {},
***************
*** 207,211 ****
            'index_at_command' => 'cindex',
            'index_name' => 'cp',
-           'index_prefix' => 'c',
            'index_type_command' => 'cindex',
            'key' => 'in titlefont exdent
--- 194,197 ----
***************
*** 244,248 ****
  $result_trees{'on_index_entry_line'}{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'on_index_entry_line'}{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0];
  $result_trees{'on_index_entry_line'}{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'on_index_entry_line'}{'contents'}[0]{'args'}[0]{'contents'}[6];
- $result_trees{'on_index_entry_line'}{'contents'}[0]{'args'}[0]{'contents'}[6]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'on_index_entry_line'}{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0];
  $result_trees{'on_index_entry_line'}{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'on_index_entry_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'on_index_entry_line'}{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'on_index_entry_line'}{'contents'}[0]{'args'}[0];
--- 230,233 ----
***************
*** 317,326 ****
    },
    {
!     'error_line' => ':1: warning: @exdent should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@exdent should only appear at a line beginning',
      'type' => 'warning'
    },
--- 302,311 ----
    },
    {
!     'error_line' => ':1: warning: @exdent should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@exdent should only appear at the beginning of a line',
      'type' => 'warning'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/on_itemize_line.pl texinfo-6.3/tp/t/results/invalid_nestings/on_itemize_line.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/on_itemize_line.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/on_itemize_line.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 62,70 ****
                    ]
                  ],
!                 'invalid_nesting' => 1,
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 62,66 ----
                    ]
                  ],
!                 'invalid_nesting' => 1
                },
                'line_nr' => {},
***************
*** 100,108 ****
                    {}
                  ],
!                 'normalized' => 'in-anchor',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 96,100 ----
                    {}
                  ],
!                 'normalized' => 'in-anchor'
                },
                'line_nr' => {},
***************
*** 131,140 ****
                'contents' => [],
                'extra' => {
!                 'invalid_nesting' => 1,
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 123,127 ----
                'contents' => [],
                'extra' => {
!                 'invalid_nesting' => 1
                },
                'line_nr' => {},
***************
*** 414,418 ****
  $result_trees{'on_itemize_line'}{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'on_itemize_line'}{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0];
  $result_trees{'on_itemize_line'}{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'on_itemize_line'}{'contents'}[0]{'args'}[0]{'contents'}[6];
- $result_trees{'on_itemize_line'}{'contents'}[0]{'args'}[0]{'contents'}[6]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'on_itemize_line'}{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0];
  $result_trees{'on_itemize_line'}{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'on_itemize_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'on_itemize_line'}{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'on_itemize_line'}{'contents'}[0]{'args'}[0];
--- 401,404 ----
***************
*** 528,537 ****
    },
    {
!     'error_line' => ':1: warning: @exdent should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@exdent should only appear at a line beginning',
      'type' => 'warning'
    },
--- 514,523 ----
    },
    {
!     'error_line' => ':1: warning: @exdent should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@exdent should only appear at the beginning of a line',
      'type' => 'warning'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/on_node_line.pl texinfo-6.3/tp/t/results/invalid_nestings/on_node_line.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/on_node_line.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/on_node_line.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 40,43 ****
--- 40,44 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 54,57 ****
--- 55,59 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 68,71 ****
--- 70,74 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 103,110 ****
                    ],
                    'normalized' => 'a'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 106,109 ----
***************
*** 123,126 ****
--- 122,126 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 166,173 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 166,169 ----
***************
*** 204,212 ****
                    {}
                  ],
!                 'normalized' => 'in-anchor',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 200,204 ----
                    {}
                  ],
!                 'normalized' => 'in-anchor'
                },
                'line_nr' => {},
***************
*** 235,244 ****
                'contents' => [],
                'extra' => {
!                 'invalid_nesting' => 1,
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 227,231 ----
                'contents' => [],
                'extra' => {
!                 'invalid_nesting' => 1
                },
                'line_nr' => {},
***************
*** 331,338 ****
--- 318,328 ----
  $result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[1];
+ $result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[1];
+ $result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[2];
  $result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[2];
  $result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[1];
+ $result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[3];
  $result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[3];
  $result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[3]{'parent'} = $result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[1];
***************
*** 344,347 ****
--- 334,338 ----
  $result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'on_node_line'}{'contents'}[1]{'args'}[0];
  $result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'on_node_line'}{'contents'}[1];
+ $result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'on_node_line'}{'contents'}[1]{'args'}[1];
  $result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'on_node_line'}{'contents'}[1]{'args'}[1];
  $result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[2]{'args'}[0];
***************
*** 362,366 ****
  $result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[5]{'args'}[0];
  $result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[5];
- $result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[5]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[5]{'args'}[0];
  $result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[5]{'line_nr'} = $result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[5]{'parent'} = $result_trees{'on_node_line'}{'contents'}[1]{'args'}[1];
--- 353,356 ----
***************
*** 420,427 ****
                ],
                'normalized' => 'Top'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            }
--- 410,413 ----
***************
*** 478,487 ****
    },
    {
!     'error_line' => ':1: warning: @exdent should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@exdent should only appear at a line beginning',
      'type' => 'warning'
    },
--- 464,473 ----
    },
    {
!     'error_line' => ':1: warning: @exdent should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@exdent should only appear at the beginning of a line',
      'type' => 'warning'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/on_section_line.pl texinfo-6.3/tp/t/results/invalid_nestings/on_section_line.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/on_section_line.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/on_section_line.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 71,79 ****
                    ]
                  ],
!                 'invalid_nesting' => 1,
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 71,75 ----
                    ]
                  ],
!                 'invalid_nesting' => 1
                },
                'line_nr' => {},
***************
*** 109,117 ****
                    {}
                  ],
!                 'normalized' => 'in-anchor',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 105,109 ----
                    {}
                  ],
!                 'normalized' => 'in-anchor'
                },
                'line_nr' => {},
***************
*** 140,149 ****
                'contents' => [],
                'extra' => {
!                 'invalid_nesting' => 1,
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 132,136 ----
                'contents' => [],
                'extra' => {
!                 'invalid_nesting' => 1
                },
                'line_nr' => {},
***************
*** 245,249 ****
  $result_trees{'on_section_line'}{'contents'}[1]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'on_section_line'}{'contents'}[1]{'args'}[0]{'contents'}[7]{'args'}[0];
  $result_trees{'on_section_line'}{'contents'}[1]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'on_section_line'}{'contents'}[1]{'args'}[0]{'contents'}[7];
- $result_trees{'on_section_line'}{'contents'}[1]{'args'}[0]{'contents'}[7]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'on_section_line'}{'contents'}[1]{'args'}[0]{'contents'}[7]{'args'}[0];
  $result_trees{'on_section_line'}{'contents'}[1]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'on_section_line'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'on_section_line'}{'contents'}[1]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'on_section_line'}{'contents'}[1]{'args'}[0];
--- 232,235 ----
***************
*** 332,341 ****
    },
    {
!     'error_line' => ':1: warning: @exdent should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@exdent should only appear at a line beginning',
      'type' => 'warning'
    },
--- 318,327 ----
    },
    {
!     'error_line' => ':1: warning: @exdent should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@exdent should only appear at the beginning of a line',
      'type' => 'warning'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/on_subheading_line.pl texinfo-6.3/tp/t/results/invalid_nestings/on_subheading_line.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/on_subheading_line.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/on_subheading_line.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 66,74 ****
                    ]
                  ],
!                 'invalid_nesting' => 1,
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 66,70 ----
                    ]
                  ],
!                 'invalid_nesting' => 1
                },
                'line_nr' => {},
***************
*** 104,112 ****
                    {}
                  ],
!                 'normalized' => 'in-anchor',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 100,104 ----
                    {}
                  ],
!                 'normalized' => 'in-anchor'
                },
                'line_nr' => {},
***************
*** 135,144 ****
                'contents' => [],
                'extra' => {
!                 'invalid_nesting' => 1,
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 127,131 ----
                'contents' => [],
                'extra' => {
!                 'invalid_nesting' => 1
                },
                'line_nr' => {},
***************
*** 237,241 ****
  $result_trees{'on_subheading_line'}{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'on_subheading_line'}{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0];
  $result_trees{'on_subheading_line'}{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'on_subheading_line'}{'contents'}[0]{'args'}[0]{'contents'}[7];
- $result_trees{'on_subheading_line'}{'contents'}[0]{'args'}[0]{'contents'}[7]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'on_subheading_line'}{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0];
  $result_trees{'on_subheading_line'}{'contents'}[0]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'on_subheading_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'on_subheading_line'}{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'on_subheading_line'}{'contents'}[0]{'args'}[0];
--- 224,227 ----
***************
*** 310,319 ****
    },
    {
!     'error_line' => ':1: warning: @exdent should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@exdent should only appear at a line beginning',
      'type' => 'warning'
    },
--- 296,305 ----
    },
    {
!     'error_line' => ':1: warning: @exdent should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@exdent should only appear at the beginning of a line',
      'type' => 'warning'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/quotation_in_ref.pl texinfo-6.3/tp/t/results/invalid_nestings/quotation_in_ref.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/quotation_in_ref.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/quotation_in_ref.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 65,68 ****
--- 65,69 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => '
  ',
***************
*** 81,89 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 82,86 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 92,97 ****
                  'macro' => ''
                },
!               'parent' => {},
!               'remaining_args' => 3
              }
            ],
--- 89,93 ----
                  'macro' => ''
                },
!               'parent' => {}
              }
            ],
***************
*** 220,223 ****
--- 216,220 ----
  $result_trees{'quotation_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'quotation_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'quotation_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'quotation_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
+ $result_trees{'quotation_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'quotation_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'quotation_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'quotation_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
  $result_trees{'quotation_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'quotation_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
***************
*** 291,300 ****
  $result_errors{'quotation_in_ref'} = [
    {
!     'error_line' => ':3: @xref missing close brace
  ',
      'file_name' => '',
      'line_nr' => 3,
      'macro' => '',
!     'text' => '@xref missing close brace',
      'type' => 'error'
    },
--- 288,297 ----
  $result_errors{'quotation_in_ref'} = [
    {
!     'error_line' => ':3: @xref missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 3,
      'macro' => '',
!     'text' => '@xref missing closing brace',
      'type' => 'error'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/quotation_in_style_command.pl texinfo-6.3/tp/t/results/invalid_nestings/quotation_in_style_command.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/quotation_in_style_command.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/quotation_in_style_command.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 150,159 ****
  $result_errors{'quotation_in_style_command'} = [
    {
!     'error_line' => ':1: @code missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@code missing close brace',
      'type' => 'error'
    },
--- 150,159 ----
  $result_errors{'quotation_in_style_command'} = [
    {
!     'error_line' => ':1: @code missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@code missing closing brace',
      'type' => 'error'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/ref_in_anchor.pl texinfo-6.3/tp/t/results/invalid_nestings/ref_in_anchor.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/ref_in_anchor.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/ref_in_anchor.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 78,85 ****
                        ],
                        'normalized' => 'Top'
-                     },
-                     'spaces_before_argument' => {
-                       'text' => '',
-                       'type' => 'empty_spaces_before_argument'
                      }
                    },
--- 78,81 ----
***************
*** 109,117 ****
                {}
              ],
!             'normalized' => 'TOP-Top',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 105,109 ----
                {}
              ],
!             'normalized' => 'TOP-Top'
            },
            'line_nr' => {},
***************
*** 119,122 ****
--- 111,115 ----
          },
          {
+           'parent' => {},
            'text' => '',
            'type' => 'empty_spaces_after_close_brace'
***************
*** 166,169 ****
--- 159,163 ----
  $result_trees{'ref_in_anchor'}{'contents'}[1]{'contents'}[0]{'line_nr'} = $result_trees{'ref_in_anchor'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'ref_in_anchor'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'ref_in_anchor'}{'contents'}[1];
+ $result_trees{'ref_in_anchor'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'ref_in_anchor'}{'contents'}[1];
  $result_trees{'ref_in_anchor'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'ref_in_anchor'}{'contents'}[1]{'args'}[0]{'contents'}[1];
  $result_trees{'ref_in_anchor'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'ref_in_anchor'}{'contents'}[1]{'extra'}{'node_content'};
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/ref_in_ref.pl texinfo-6.3/tp/t/results/invalid_nestings/ref_in_ref.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/ref_in_ref.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/ref_in_ref.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 76,83 ****
                            ],
                            'normalized' => 'Top'
-                         },
-                         'spaces_before_argument' => {
-                           'text' => '',
-                           'type' => 'empty_spaces_before_argument'
                          }
                        },
--- 76,79 ----
***************
*** 108,115 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 104,107 ----
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/section_in_math.pl texinfo-6.3/tp/t/results/invalid_nestings/section_in_math.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/section_in_math.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/section_in_math.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 59,69 ****
                'cmdname' => 'math',
                'contents' => [],
-               'extra' => {
-                 'spaces_before_argument' => {
-                   'parent' => {},
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
-                 }
-               },
                'line_nr' => {},
                'parent' => {}
--- 59,62 ----
***************
*** 230,234 ****
  $result_trees{'section_in_math'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'section_in_math'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'section_in_math'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'section_in_math'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
- $result_trees{'section_in_math'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'section_in_math'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'section_in_math'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'section_in_math'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'section_in_math'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'section_in_math'}{'contents'}[0]{'contents'}[1];
--- 223,226 ----
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl texinfo-6.3/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 24,27 ****
--- 24,33 ----
                  {
                    'cmdname' => 'strong',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 1,
+                     'macro' => ''
+                   },
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 172,180 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 1,
!             'macro' => ''
!           },
            'parent' => {}
          }
--- 178,182 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {}
          }
***************
*** 260,263 ****
--- 262,266 ----
  $result_trees{'section_in_nested_block_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'} = $result_trees{'section_in_nested_block_commands'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
  $result_trees{'section_in_nested_block_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'section_in_nested_block_commands'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'section_in_nested_block_commands'}{'contents'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'section_in_nested_block_commands'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'section_in_nested_block_commands'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'section_in_nested_block_commands'}{'contents'}[0];
  $result_trees{'section_in_nested_block_commands'}{'contents'}[0]{'parent'} = $result_trees{'section_in_nested_block_commands'};
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/section_in_table.pl texinfo-6.3/tp/t/results/invalid_nestings/section_in_table.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/section_in_table.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/section_in_table.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 24,27 ****
--- 24,33 ----
                  {
                    'cmdname' => 'asis',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 1,
+                     'macro' => ''
+                   },
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 115,123 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 1,
!             'macro' => ''
!           },
            'parent' => {}
          }
--- 121,125 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {}
          }
***************
*** 222,225 ****
--- 224,228 ----
  $result_trees{'section_in_table'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'} = $result_trees{'section_in_table'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
  $result_trees{'section_in_table'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'section_in_table'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'section_in_table'}{'contents'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'section_in_table'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'section_in_table'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'section_in_table'}{'contents'}[0];
  $result_trees{'section_in_table'}{'contents'}[0]{'parent'} = $result_trees{'section_in_table'};
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/section_on_def_line.pl texinfo-6.3/tp/t/results/invalid_nestings/section_on_def_line.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/section_on_def_line.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/section_on_def_line.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 178,187 ****
  $result_errors{'section_on_def_line'} = [
    {
!     'error_line' => ':1: warning: @section should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@section should only appear at a line beginning',
      'type' => 'warning'
    },
--- 178,187 ----
  $result_errors{'section_on_def_line'} = [
    {
!     'error_line' => ':1: warning: @section should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@section should only appear at the beginning of a line',
      'type' => 'warning'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/section_on_defx_line.pl texinfo-6.3/tp/t/results/invalid_nestings/section_on_defx_line.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/section_on_defx_line.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/section_on_defx_line.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 106,110 ****
                    'index_at_command' => 'deffn',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deffn',
                    'key' => 'j',
--- 106,109 ----
***************
*** 310,319 ****
    },
    {
!     'error_line' => ':2: warning: @section should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 2,
      'macro' => '',
!     'text' => '@section should only appear at a line beginning',
      'type' => 'warning'
    },
--- 309,318 ----
    },
    {
!     'error_line' => ':2: warning: @section should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 2,
      'macro' => '',
!     'text' => '@section should only appear at the beginning of a line',
      'type' => 'warning'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/section_on_index_entry_line.pl texinfo-6.3/tp/t/results/invalid_nestings/section_on_index_entry_line.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/section_on_index_entry_line.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/section_on_index_entry_line.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 156,165 ****
  $result_errors{'section_on_index_entry_line'} = [
    {
!     'error_line' => ':1: warning: @section should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@section should only appear at a line beginning',
      'type' => 'warning'
    },
--- 156,165 ----
  $result_errors{'section_on_index_entry_line'} = [
    {
!     'error_line' => ':1: warning: @section should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@section should only appear at the beginning of a line',
      'type' => 'warning'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl texinfo-6.3/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 173,182 ****
  $result_errors{'style_not_closed_before_first_node'} = [
    {
!     'error_line' => ':1: @code missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@code missing close brace',
      'type' => 'error'
    }
--- 173,182 ----
  $result_errors{'style_not_closed_before_first_node'} = [
    {
!     'error_line' => ':1: @code missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@code missing closing brace',
      'type' => 'error'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl texinfo-6.3/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 22,25 ****
--- 22,31 ----
              {
                'cmdname' => 'asis',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 1,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 236,244 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 1,
!         'macro' => ''
!       },
        'parent' => {}
      }
--- 242,246 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      }
***************
*** 291,294 ****
--- 293,297 ----
  $result_trees{'style_not_closed_in_table_line'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'style_not_closed_in_table_line'}{'contents'}[0]{'contents'}[2];
  $result_trees{'style_not_closed_in_table_line'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'style_not_closed_in_table_line'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'style_not_closed_in_table_line'}{'contents'}[0]{'line_nr'} = $result_trees{'style_not_closed_in_table_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'style_not_closed_in_table_line'}{'contents'}[0]{'parent'} = $result_trees{'style_not_closed_in_table_line'};
  
***************
*** 308,317 ****
  $result_errors{'style_not_closed_in_table_line'} = [
    {
!     'error_line' => ':4: @code missing close brace
  ',
      'file_name' => '',
      'line_nr' => 4,
      'macro' => '',
!     'text' => '@code missing close brace',
      'type' => 'error'
    },
--- 311,320 ----
  $result_errors{'style_not_closed_in_table_line'} = [
    {
!     'error_line' => ':4: @code missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 4,
      'macro' => '',
!     'text' => '@code missing closing brace',
      'type' => 'error'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl texinfo-6.3/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 650,668 ****
  $result_errors{'style_not_closed_root_commands'} = [
    {
!     'error_line' => ':8: @code missing close brace
  ',
      'file_name' => '',
      'line_nr' => 8,
      'macro' => '',
!     'text' => '@code missing close brace',
      'type' => 'error'
    },
    {
!     'error_line' => ':13: @code missing close brace
  ',
      'file_name' => '',
      'line_nr' => 13,
      'macro' => '',
!     'text' => '@code missing close brace',
      'type' => 'error'
    }
--- 650,668 ----
  $result_errors{'style_not_closed_root_commands'} = [
    {
!     'error_line' => ':8: @code missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 8,
      'macro' => '',
!     'text' => '@code missing closing brace',
      'type' => 'error'
    },
    {
!     'error_line' => ':13: @code missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 13,
      'macro' => '',
!     'text' => '@code missing closing brace',
      'type' => 'error'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/tab_in_index.pl texinfo-6.3/tp/t/results/invalid_nestings/tab_in_index.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/tab_in_index.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/tab_in_index.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 160,164 ****
                                'index_at_command' => 'vindex',
                                'index_name' => 'vr',
-                               'index_prefix' => 'v',
                                'index_type_command' => 'vindex',
                                'key' => 'in index entry in tab',
--- 160,163 ----
***************
*** 247,276 ****
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            },
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            }
          ],
-         'prototypes_line' => [
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => '
- ',
-             'type' => 'prototype_space'
-           }
-         ],
          'spaces_after_command' => {}
        },
--- 246,256 ----
***************
*** 334,342 ****
  $result_trees{'tab_in_index'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[1];
  $result_trees{'tab_in_index'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'tab_in_index'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'tab_in_index'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'tab_in_index'}{'contents'}[0]{'args'}[0];
  $result_trees{'tab_in_index'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'tab_in_index'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'tab_in_index'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'parent'} = $result_trees{'tab_in_index'}{'contents'}[0]{'args'}[0];
- $result_trees{'tab_in_index'}{'contents'}[0]{'extra'}{'prototypes_line'}[1] = $result_trees{'tab_in_index'}{'contents'}[0]{'args'}[0]{'contents'}[1];
- $result_trees{'tab_in_index'}{'contents'}[0]{'extra'}{'prototypes_line'}[3] = $result_trees{'tab_in_index'}{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'tab_in_index'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'tab_in_index'}{'contents'}[0]{'args'}[0]{'contents'}[0];
  $result_trees{'tab_in_index'}{'contents'}[0]{'parent'} = $result_trees{'tab_in_index'};
--- 314,318 ----
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/table_in_code.pl texinfo-6.3/tp/t/results/invalid_nestings/table_in_code.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/table_in_code.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/table_in_code.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 56,59 ****
--- 56,65 ----
              {
                'cmdname' => 'emph',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 3,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 195,203 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 3,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 201,205 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 245,248 ****
--- 247,251 ----
  $result_trees{'table_in_code'}{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'table_in_code'}{'contents'}[1]{'contents'}[1];
  $result_trees{'table_in_code'}{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'table_in_code'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+ $result_trees{'table_in_code'}{'contents'}[1]{'line_nr'} = $result_trees{'table_in_code'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'table_in_code'}{'contents'}[1]{'parent'} = $result_trees{'table_in_code'};
  $result_trees{'table_in_code'}{'contents'}[2]{'parent'} = $result_trees{'table_in_code'};
***************
*** 267,276 ****
  $result_errors{'table_in_code'} = [
    {
!     'error_line' => ':1: @code missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@code missing close brace',
      'type' => 'error'
    },
--- 270,279 ----
  $result_errors{'table_in_code'} = [
    {
!     'error_line' => ':1: @code missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@code missing closing brace',
      'type' => 'error'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl texinfo-6.3/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 107,110 ****
--- 107,116 ----
                      {
                        'cmdname' => 'asis',
+                       'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 4,
+                         'macro' => ''
+                       },
                        'parent' => {},
                        'type' => 'command_as_argument'
***************
*** 208,216 ****
                  'spaces_after_command' => {}
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 4,
!                 'macro' => ''
!               },
                'parent' => {}
              }
--- 214,218 ----
                  'spaces_after_command' => {}
                },
!               'line_nr' => {},
                'parent' => {}
              }
***************
*** 311,314 ****
--- 313,317 ----
  $result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'} = $result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1];
  $result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
+ $result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'line_nr'} = $result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2];
  $result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl texinfo-6.3/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 68,71 ****
--- 68,77 ----
                          {
                            'cmdname' => 'asis',
+                           'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 2,
+                             'macro' => ''
+                           },
                            'parent' => {},
                            'type' => 'command_as_argument'
***************
*** 164,172 ****
                      'spaces_after_command' => {}
                    },
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 2,
!                     'macro' => ''
!                   },
                    'parent' => {}
                  }
--- 170,174 ----
                      'spaces_after_command' => {}
                    },
!                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 276,284 ****
  $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'extra'}{'command_as_argument'} = $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1];
  $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
  $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3];
  $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'parent'} = $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1];
  $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_description'} = $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3];
  $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'} = $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[1];
! $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'line_nr'};
  $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0];
  $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[2];
--- 278,287 ----
  $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'extra'}{'command_as_argument'} = $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1];
  $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
+ $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'line_nr'} = $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3];
  $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'parent'} = $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1];
  $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_description'} = $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3];
  $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'} = $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[1];
! $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0];
  $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[2];
***************
*** 326,335 ****
    },
    {
!     'error_line' => ':2: warning: @table should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 2,
      'macro' => '',
!     'text' => '@table should only appear at a line beginning',
      'type' => 'warning'
    },
--- 329,338 ----
    },
    {
!     'error_line' => ':2: warning: @table should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 2,
      'macro' => '',
!     'text' => '@table should only appear at the beginning of a line',
      'type' => 'warning'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/table_on_item_line.pl texinfo-6.3/tp/t/results/invalid_nestings/table_on_item_line.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/table_on_item_line.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/table_on_item_line.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 22,25 ****
--- 22,31 ----
              {
                'cmdname' => 'asis',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 1,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 72,75 ****
--- 78,87 ----
                                  {
                                    'cmdname' => 'asis',
+                                   'contents' => [],
+                                   'line_nr' => {
+                                     'file_name' => '',
+                                     'line_nr' => 2,
+                                     'macro' => ''
+                                   },
                                    'parent' => {},
                                    'type' => 'command_as_argument'
***************
*** 104,112 ****
                              'spaces_after_command' => {}
                            },
!                           'line_nr' => {
!                             'file_name' => '',
!                             'line_nr' => 2,
!                             'macro' => ''
!                           },
                            'parent' => {}
                          }
--- 116,120 ----
                              'spaces_after_command' => {}
                            },
!                           'line_nr' => {},
                            'parent' => {}
                          }
***************
*** 277,285 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 1,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 285,289 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 315,318 ****
--- 319,323 ----
  $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'extra'}{'command_as_argument'} = $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1];
  $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+ $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
***************
*** 320,324 ****
  $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[1] = $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
  $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
! $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
  $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0];
--- 325,329 ----
  $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[1] = $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
  $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
! $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
  $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0];
***************
*** 353,356 ****
--- 358,362 ----
  $result_trees{'table_on_item_line'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[2];
  $result_trees{'table_on_item_line'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'table_on_item_line'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'table_on_item_line'}{'contents'}[0]{'line_nr'} = $result_trees{'table_on_item_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'table_on_item_line'}{'contents'}[0]{'parent'} = $result_trees{'table_on_item_line'};
  $result_trees{'table_on_item_line'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'table_on_item_line'}{'contents'}[1];
***************
*** 374,383 ****
  $result_errors{'table_on_item_line'} = [
    {
!     'error_line' => ':2: warning: @table should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 2,
      'macro' => '',
!     'text' => '@table should only appear at a line beginning',
      'type' => 'warning'
    },
--- 380,389 ----
  $result_errors{'table_on_item_line'} = [
    {
!     'error_line' => ':2: warning: @table should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 2,
      'macro' => '',
!     'text' => '@table should only appear at the beginning of a line',
      'type' => 'warning'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/unclosed_verb_end_of_line_on_misc_line.pl texinfo-6.3/tp/t/results/invalid_nestings/unclosed_verb_end_of_line_on_misc_line.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/unclosed_verb_end_of_line_on_misc_line.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/unclosed_verb_end_of_line_on_misc_line.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 104,113 ****
    },
    {
!     'error_line' => ':1: @verb missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@verb missing close brace',
      'type' => 'error'
    }
--- 104,113 ----
    },
    {
!     'error_line' => ':1: @verb missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@verb missing closing brace',
      'type' => 'error'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl texinfo-6.3/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 75,78 ****
--- 75,79 ----
        ],
        'cmdname' => 'section',
+       'contents' => [],
        'extra' => {
          'spaces_after_command' => {}
diff -Nrc2 texinfo-6.1/tp/t/results/invalid_nestings/verbatim_in_ref.pl texinfo-6.3/tp/t/results/invalid_nestings/verbatim_in_ref.pl
*** texinfo-6.1/tp/t/results/invalid_nestings/verbatim_in_ref.pl	2016-01-22 07:50:08.000000000 +0000
--- texinfo-6.3/tp/t/results/invalid_nestings/verbatim_in_ref.pl	2016-08-02 18:44:46.000000000 +0100
***************
*** 65,68 ****
--- 65,69 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' 
  ',
***************
*** 81,89 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 82,86 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 92,97 ****
                  'macro' => ''
                },
!               'parent' => {},
!               'remaining_args' => 3
              }
            ],
--- 89,93 ----
                  'macro' => ''
                },
!               'parent' => {}
              }
            ],
***************
*** 120,132 ****
            'extra' => {
              'invalid_nesting' => 1,
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 116,120 ----
            'extra' => {
              'invalid_nesting' => 1,
!             'spaces_after_command' => {}
            },
            'line_nr' => {
***************
*** 137,141 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 125,137 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 187,190 ****
--- 183,187 ----
  $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
+ $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
  $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
***************
*** 194,201 ****
  $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2];
  $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2];
! $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2];
! $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'verbatim_in_ref'}{'contents'}[1];
  $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'verbatim_in_ref'}{'contents'}[1];
! $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[3] = $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2]{'extra'}{'spaces_after_command'};
  $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'verbatim_in_ref'}{'contents'}[1];
  $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[5];
--- 191,198 ----
  $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2];
  $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2];
! $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2]{'contents'}[0];
  $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'verbatim_in_ref'}{'contents'}[1];
! $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[3]{'extra'}{'command'} = $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2];
! $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'verbatim_in_ref'}{'contents'}[1];
  $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'verbatim_in_ref'}{'contents'}[1];
  $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[5];
***************
*** 250,259 ****
  $result_errors{'verbatim_in_ref'} = [
    {
!     'error_line' => ':3: @xref missing close brace
  ',
      'file_name' => '',
      'line_nr' => 3,
      'macro' => '',
!     'text' => '@xref missing close brace',
      'type' => 'error'
    },
--- 247,256 ----
  $result_errors{'verbatim_in_ref'} = [
    {
!     'error_line' => ':3: @xref missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 3,
      'macro' => '',
!     'text' => '@xref missing closing brace',
      'type' => 'error'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/itemize/accent_argument.pl texinfo-6.3/tp/t/results/itemize/accent_argument.pl
*** texinfo-6.1/tp/t/results/itemize/accent_argument.pl	2016-01-22 07:49:46.000000000 +0000
--- texinfo-6.3/tp/t/results/itemize/accent_argument.pl	2016-08-02 18:44:27.000000000 +0100
***************
*** 22,25 ****
--- 22,31 ----
              {
                'cmdname' => '~',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 1,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 131,134 ****
--- 137,141 ----
              {
                'cmdname' => 'bullet',
+               'contents' => [],
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 140,148 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 1,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 147,151 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 167,170 ****
--- 170,179 ----
              {
                'cmdname' => '~',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 5,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 264,267 ****
--- 273,277 ----
              {
                'cmdname' => 'bullet',
+               'contents' => [],
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 273,281 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 5,
!         'macro' => ''
!       },
        'parent' => {}
      }
--- 283,287 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      }
***************
*** 307,310 ****
--- 313,317 ----
  $result_trees{'accent_argument'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'accent_argument'}{'contents'}[0]{'contents'}[1];
  $result_trees{'accent_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'accent_argument'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'accent_argument'}{'contents'}[0]{'line_nr'} = $result_trees{'accent_argument'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'accent_argument'}{'contents'}[0]{'parent'} = $result_trees{'accent_argument'};
  $result_trees{'accent_argument'}{'contents'}[1]{'parent'} = $result_trees{'accent_argument'};
***************
*** 332,335 ****
--- 339,343 ----
  $result_trees{'accent_argument'}{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'accent_argument'}{'contents'}[2]{'contents'}[1];
  $result_trees{'accent_argument'}{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'accent_argument'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+ $result_trees{'accent_argument'}{'contents'}[2]{'line_nr'} = $result_trees{'accent_argument'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'accent_argument'}{'contents'}[2]{'parent'} = $result_trees{'accent_argument'};
  
diff -Nrc2 texinfo-6.1/tp/t/results/itemize/asis_as_itemize_argument.pl texinfo-6.3/tp/t/results/itemize/asis_as_itemize_argument.pl
*** texinfo-6.1/tp/t/results/itemize/asis_as_itemize_argument.pl	2016-01-22 07:49:47.000000000 +0000
--- texinfo-6.3/tp/t/results/itemize/asis_as_itemize_argument.pl	2016-08-02 18:44:28.000000000 +0100
***************
*** 22,25 ****
--- 22,31 ----
              {
                'cmdname' => 'asis',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 1,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 124,132 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 1,
!         'macro' => ''
!       },
        'parent' => {}
      }
--- 130,134 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      }
***************
*** 157,160 ****
--- 159,163 ----
  $result_trees{'asis_as_itemize_argument'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'asis_as_itemize_argument'}{'contents'}[0]{'contents'}[1];
  $result_trees{'asis_as_itemize_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'asis_as_itemize_argument'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'asis_as_itemize_argument'}{'contents'}[0]{'line_nr'} = $result_trees{'asis_as_itemize_argument'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'asis_as_itemize_argument'}{'contents'}[0]{'parent'} = $result_trees{'asis_as_itemize_argument'};
  
diff -Nrc2 texinfo-6.1/tp/t/results/itemize/comment_first_on_itemize_line.pl texinfo-6.3/tp/t/results/itemize/comment_first_on_itemize_line.pl
*** texinfo-6.1/tp/t/results/itemize/comment_first_on_itemize_line.pl	2016-01-22 07:49:47.000000000 +0000
--- texinfo-6.3/tp/t/results/itemize/comment_first_on_itemize_line.pl	2016-08-02 18:44:27.000000000 +0100
***************
*** 126,129 ****
--- 126,130 ----
              {
                'cmdname' => 'bullet',
+               'contents' => [],
                'parent' => {},
                'type' => 'command_as_argument'
diff -Nrc2 texinfo-6.1/tp/t/results/itemize/headitem_itemx_in_itemize.pl texinfo-6.3/tp/t/results/itemize/headitem_itemx_in_itemize.pl
*** texinfo-6.1/tp/t/results/itemize/headitem_itemx_in_itemize.pl	2016-01-22 07:49:48.000000000 +0000
--- texinfo-6.3/tp/t/results/itemize/headitem_itemx_in_itemize.pl	2016-08-02 18:44:28.000000000 +0100
***************
*** 133,136 ****
--- 133,137 ----
              {
                'cmdname' => 'bullet',
+               'contents' => [],
                'parent' => {},
                'type' => 'command_as_argument'
diff -Nrc2 texinfo-6.1/tp/t/results/itemize/inter_item_commands_in_enumerate.pl texinfo-6.3/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
*** texinfo-6.1/tp/t/results/itemize/inter_item_commands_in_enumerate.pl	2016-01-22 07:49:48.000000000 +0000
--- texinfo-6.3/tp/t/results/itemize/inter_item_commands_in_enumerate.pl	2016-08-02 18:44:28.000000000 +0100
***************
*** 203,207 ****
                        'index_at_command' => 'cindex',
                        'index_name' => 'cp',
-                       'index_prefix' => 'c',
                        'index_type_command' => 'cindex',
                        'key' => 'cindex',
--- 203,206 ----
diff -Nrc2 texinfo-6.1/tp/t/results/itemize/inter_item_commands_in_itemize.pl texinfo-6.3/tp/t/results/itemize/inter_item_commands_in_itemize.pl
*** texinfo-6.1/tp/t/results/itemize/inter_item_commands_in_itemize.pl	2016-01-22 07:49:48.000000000 +0000
--- texinfo-6.3/tp/t/results/itemize/inter_item_commands_in_itemize.pl	2016-08-02 18:44:28.000000000 +0100
***************
*** 22,25 ****
--- 22,31 ----
              {
                'cmdname' => 'minus',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 1,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 96,100 ****
                    'index_at_command' => 'cindex',
                    'index_name' => 'cp',
-                   'index_prefix' => 'c',
                    'index_type_command' => 'cindex',
                    'key' => 'also a cindex in itemize',
--- 102,105 ----
***************
*** 202,210 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 1,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 207,211 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 229,232 ****
--- 230,239 ----
              {
                'cmdname' => 'bullet',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 7,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 285,289 ****
                    'index_at_command' => 'cindex',
                    'index_name' => 'cp',
-                   'index_prefix' => 'c',
                    'index_type_command' => 'cindex',
                    'key' => 'index entry within itemize',
--- 292,295 ----
***************
*** 398,402 ****
                    'index_at_command' => 'cindex',
                    'index_name' => 'cp',
-                   'index_prefix' => 'c',
                    'index_type_command' => 'cindex',
                    'key' => 'index entry right after @item',
--- 404,407 ----
***************
*** 485,493 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 7,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 490,494 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 575,579 ****
                        'index_at_command' => 'cindex',
                        'index_name' => 'cp',
-                       'index_prefix' => 'c',
                        'index_type_command' => 'cindex',
                        'key' => 'also a cindex in itemize',
--- 576,579 ----
***************
*** 680,683 ****
--- 680,684 ----
              {
                'cmdname' => 'bullet',
+               'contents' => [],
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 736,739 ****
--- 737,741 ----
  $result_trees{'inter_item_commands_in_itemize'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[0]{'contents'}[2];
  $result_trees{'inter_item_commands_in_itemize'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'inter_item_commands_in_itemize'}{'contents'}[0]{'line_nr'} = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'inter_item_commands_in_itemize'}{'contents'}[0]{'parent'} = $result_trees{'inter_item_commands_in_itemize'};
  $result_trees{'inter_item_commands_in_itemize'}{'contents'}[1]{'parent'} = $result_trees{'inter_item_commands_in_itemize'};
***************
*** 795,798 ****
--- 797,801 ----
  $result_trees{'inter_item_commands_in_itemize'}{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[2]{'contents'}[3];
  $result_trees{'inter_item_commands_in_itemize'}{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+ $result_trees{'inter_item_commands_in_itemize'}{'contents'}[2]{'line_nr'} = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'inter_item_commands_in_itemize'}{'contents'}[2]{'parent'} = $result_trees{'inter_item_commands_in_itemize'};
  $result_trees{'inter_item_commands_in_itemize'}{'contents'}[3]{'parent'} = $result_trees{'inter_item_commands_in_itemize'};
diff -Nrc2 texinfo-6.1/tp/t/results/itemize/itemize_and_empty_lines.pl texinfo-6.3/tp/t/results/itemize/itemize_and_empty_lines.pl
*** texinfo-6.1/tp/t/results/itemize/itemize_and_empty_lines.pl	2016-01-22 07:49:47.000000000 +0000
--- texinfo-6.3/tp/t/results/itemize/itemize_and_empty_lines.pl	2016-08-02 18:44:27.000000000 +0100
***************
*** 1144,1147 ****
--- 1144,1148 ----
              {
                'cmdname' => 'bullet',
+               'contents' => [],
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 1191,1194 ****
--- 1192,1201 ----
              {
                'cmdname' => 'minus',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 57,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 1298,1306 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 57,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 1305,1309 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 1353,1356 ****
--- 1356,1365 ----
              {
                'cmdname' => 'minus',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 65,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 1410,1413 ****
--- 1419,1428 ----
                      {
                        'cmdname' => 'bullet',
+                       'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 68,
+                         'macro' => ''
+                       },
                        'parent' => {},
                        'type' => 'command_as_argument'
***************
*** 1512,1520 ****
                  'spaces_after_command' => {}
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 68,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 1527,1531 ----
                  'spaces_after_command' => {}
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1594,1602 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 65,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 1605,1609 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 1632,1635 ****
--- 1639,1648 ----
              {
                'cmdname' => 'bullet',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 75,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 1807,1815 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 75,
!         'macro' => ''
!       },
        'parent' => {}
      }
--- 1820,1824 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      }
***************
*** 2061,2064 ****
--- 2070,2074 ----
  $result_trees{'itemize_and_empty_lines'}{'contents'}[5]{'extra'}{'end_command'} = $result_trees{'itemize_and_empty_lines'}{'contents'}[5]{'contents'}[1];
  $result_trees{'itemize_and_empty_lines'}{'contents'}[5]{'extra'}{'spaces_after_command'} = $result_trees{'itemize_and_empty_lines'}{'contents'}[5]{'args'}[0]{'contents'}[0];
+ $result_trees{'itemize_and_empty_lines'}{'contents'}[5]{'line_nr'} = $result_trees{'itemize_and_empty_lines'}{'contents'}[5]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'itemize_and_empty_lines'}{'contents'}[5]{'parent'} = $result_trees{'itemize_and_empty_lines'};
  $result_trees{'itemize_and_empty_lines'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'itemize_and_empty_lines'}{'contents'}[6];
***************
*** 2101,2104 ****
--- 2111,2115 ----
  $result_trees{'itemize_and_empty_lines'}{'contents'}[10]{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'itemize_and_empty_lines'}{'contents'}[10]{'contents'}[0]{'contents'}[2]{'contents'}[1];
  $result_trees{'itemize_and_empty_lines'}{'contents'}[10]{'contents'}[0]{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'itemize_and_empty_lines'}{'contents'}[10]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+ $result_trees{'itemize_and_empty_lines'}{'contents'}[10]{'contents'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'itemize_and_empty_lines'}{'contents'}[10]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'itemize_and_empty_lines'}{'contents'}[10]{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'itemize_and_empty_lines'}{'contents'}[10]{'contents'}[0];
  $result_trees{'itemize_and_empty_lines'}{'contents'}[10]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'itemize_and_empty_lines'}{'contents'}[10]{'contents'}[0]{'contents'}[3];
***************
*** 2118,2121 ****
--- 2129,2133 ----
  $result_trees{'itemize_and_empty_lines'}{'contents'}[10]{'extra'}{'end_command'} = $result_trees{'itemize_and_empty_lines'}{'contents'}[10]{'contents'}[1];
  $result_trees{'itemize_and_empty_lines'}{'contents'}[10]{'extra'}{'spaces_after_command'} = $result_trees{'itemize_and_empty_lines'}{'contents'}[10]{'args'}[0]{'contents'}[0];
+ $result_trees{'itemize_and_empty_lines'}{'contents'}[10]{'line_nr'} = $result_trees{'itemize_and_empty_lines'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'itemize_and_empty_lines'}{'contents'}[10]{'parent'} = $result_trees{'itemize_and_empty_lines'};
  $result_trees{'itemize_and_empty_lines'}{'contents'}[11]{'contents'}[0]{'parent'} = $result_trees{'itemize_and_empty_lines'}{'contents'}[11];
***************
*** 2158,2161 ****
--- 2170,2174 ----
  $result_trees{'itemize_and_empty_lines'}{'contents'}[13]{'extra'}{'end_command'} = $result_trees{'itemize_and_empty_lines'}{'contents'}[13]{'contents'}[3];
  $result_trees{'itemize_and_empty_lines'}{'contents'}[13]{'extra'}{'spaces_after_command'} = $result_trees{'itemize_and_empty_lines'}{'contents'}[13]{'args'}[0]{'contents'}[0];
+ $result_trees{'itemize_and_empty_lines'}{'contents'}[13]{'line_nr'} = $result_trees{'itemize_and_empty_lines'}{'contents'}[13]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'itemize_and_empty_lines'}{'contents'}[13]{'parent'} = $result_trees{'itemize_and_empty_lines'};
  
diff -Nrc2 texinfo-6.1/tp/t/results/itemize/itemize_in_example.pl texinfo-6.3/tp/t/results/itemize/itemize_in_example.pl
*** texinfo-6.1/tp/t/results/itemize/itemize_in_example.pl	2016-01-22 07:49:47.000000000 +0000
--- texinfo-6.3/tp/t/results/itemize/itemize_in_example.pl	2016-08-02 18:44:28.000000000 +0100
***************
*** 34,37 ****
--- 34,43 ----
                  {
                    'cmdname' => 'bullet',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 2,
+                     'macro' => ''
+                   },
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 147,155 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 2,
!             'macro' => ''
!           },
            'parent' => {}
          },
--- 153,157 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {}
          },
***************
*** 180,183 ****
--- 182,191 ----
                  {
                    'cmdname' => 'asis',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 8,
+                     'macro' => ''
+                   },
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 282,290 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 8,
!             'macro' => ''
!           },
            'parent' => {}
          },
--- 290,294 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {}
          },
***************
*** 456,459 ****
--- 460,468 ----
                    'cmdname' => 'bullet',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 16,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 561,569 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 16,
!             'macro' => ''
!           },
            'parent' => {}
          },
--- 570,574 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {}
          },
***************
*** 651,654 ****
--- 656,660 ----
  $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
  $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
+ $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'itemize_in_example'}{'contents'}[0];
  $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[2];
***************
*** 677,680 ****
--- 683,687 ----
  $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
  $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
+ $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'itemize_in_example'}{'contents'}[0];
  $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[4];
***************
*** 730,733 ****
--- 737,741 ----
  $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[7]{'extra'}{'end_command'} = $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[7]{'contents'}[1];
  $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[7]{'extra'}{'spaces_after_command'} = $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
+ $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'itemize_in_example'}{'contents'}[0];
  $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[8];
diff -Nrc2 texinfo-6.1/tp/t/results/itemize/itemize_line_commands_with_brace.pl texinfo-6.3/tp/t/results/itemize/itemize_line_commands_with_brace.pl
*** texinfo-6.1/tp/t/results/itemize/itemize_line_commands_with_brace.pl	2016-01-22 07:49:47.000000000 +0000
--- texinfo-6.3/tp/t/results/itemize/itemize_line_commands_with_brace.pl	2016-08-02 18:44:28.000000000 +0100
***************
*** 30,33 ****
--- 30,38 ----
                'cmdname' => 'bullet',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 1,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 132,140 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 1,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 137,141 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 167,170 ****
--- 168,176 ----
                'cmdname' => 'minus',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 5,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 269,277 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 5,
!         'macro' => ''
!       },
        'parent' => {}
      }
--- 275,279 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      }
***************
*** 303,306 ****
--- 305,309 ----
  $result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[1];
  $result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'line_nr'} = $result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'parent'} = $result_trees{'itemize_line_commands_with_brace'};
  $result_trees{'itemize_line_commands_with_brace'}{'contents'}[1]{'parent'} = $result_trees{'itemize_line_commands_with_brace'};
***************
*** 329,332 ****
--- 332,336 ----
  $result_trees{'itemize_line_commands_with_brace'}{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'itemize_line_commands_with_brace'}{'contents'}[2]{'contents'}[1];
  $result_trees{'itemize_line_commands_with_brace'}{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'itemize_line_commands_with_brace'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+ $result_trees{'itemize_line_commands_with_brace'}{'contents'}[2]{'line_nr'} = $result_trees{'itemize_line_commands_with_brace'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'itemize_line_commands_with_brace'}{'contents'}[2]{'parent'} = $result_trees{'itemize_line_commands_with_brace'};
  
diff -Nrc2 texinfo-6.1/tp/t/results/itemize/not_closed_item.pl texinfo-6.3/tp/t/results/itemize/not_closed_item.pl
*** texinfo-6.1/tp/t/results/itemize/not_closed_item.pl	2016-01-22 07:49:48.000000000 +0000
--- texinfo-6.3/tp/t/results/itemize/not_closed_item.pl	2016-08-02 18:44:28.000000000 +0100
***************
*** 60,63 ****
--- 60,64 ----
              {
                'cmdname' => 'bullet',
+               'contents' => [],
                'parent' => {},
                'type' => 'command_as_argument'
diff -Nrc2 texinfo-6.1/tp/t/results/itemize/not_closed_itemize.pl texinfo-6.3/tp/t/results/itemize/not_closed_itemize.pl
*** texinfo-6.1/tp/t/results/itemize/not_closed_itemize.pl	2016-01-22 07:49:48.000000000 +0000
--- texinfo-6.3/tp/t/results/itemize/not_closed_itemize.pl	2016-08-02 18:44:28.000000000 +0100
***************
*** 26,29 ****
--- 26,30 ----
              {
                'cmdname' => 'bullet',
+               'contents' => [],
                'parent' => {},
                'type' => 'command_as_argument'
diff -Nrc2 texinfo-6.1/tp/t/results/languages/appendix_translated.pl texinfo-6.3/tp/t/results/languages/appendix_translated.pl
*** texinfo-6.1/tp/t/results/languages/appendix_translated.pl	2016-01-22 07:50:27.000000000 +0000
--- texinfo-6.3/tp/t/results/languages/appendix_translated.pl	2016-09-10 13:35:32.000000000 +0100
***************
*** 360,368 ****
  ***
  
! Appendice A dernier
! *******************
  
  top
! Appendice A dernier
  ';
  
--- 360,368 ----
  ***
  
! Annexe A dernier
! ****************
  
  top
! Annexe A dernier
  ';
  
***************
*** 376,381 ****
  ***
  
! Appendice A dernier
! *******************
  
  
--- 376,381 ----
  ***
  
! Annexe A dernier
! ****************
  
  
***************
*** 439,443 ****
  
  <a name="dernier"></a>
! <h2 class="appendix">Appendice A dernier</h2>
  
  <a name="SEC_Contents"></a>
--- 439,443 ----
  
  <a name="dernier"></a>
! <h2 class="appendix">Annexe A dernier</h2>
  
  <a name="SEC_Contents"></a>
***************
*** 447,451 ****
  
  <ul class="no-bullet">
!   <li><a name="toc-dernier" href="#dernier">Appendice A dernier</a></li>
  </ul>
  </div>
--- 447,451 ----
  
  <ul class="no-bullet">
!   <li><a name="toc-dernier" href="#dernier">Annexe A dernier</a></li>
  </ul>
  </div>
diff -Nrc2 texinfo-6.1/tp/t/results/languages/command_translated.pl texinfo-6.3/tp/t/results/languages/command_translated.pl
*** texinfo-6.1/tp/t/results/languages/command_translated.pl	2016-01-22 07:50:28.000000000 +0000
--- texinfo-6.3/tp/t/results/languages/command_translated.pl	2016-08-02 18:45:05.000000000 +0100
***************
*** 134,137 ****
--- 134,142 ----
                'cmdname' => 'error',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 4,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 167,170 ****
--- 172,180 ----
                'cmdname' => 'error',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 6,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 187,195 ****
        },
        'level' => 0,
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 4,
!         'macro' => ''
!       },
        'parent' => {}
      }
--- 197,201 ----
        },
        'level' => 0,
!       'line_nr' => {},
        'parent' => {}
      }
***************
*** 230,233 ****
--- 236,240 ----
  $result_trees{'command_translated'}{'contents'}[2]{'extra'}{'misc_content'}[1] = $result_trees{'command_translated'}{'contents'}[2]{'args'}[0]{'contents'}[2];
  $result_trees{'command_translated'}{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'command_translated'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+ $result_trees{'command_translated'}{'contents'}[2]{'line_nr'} = $result_trees{'command_translated'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'command_translated'}{'contents'}[2]{'parent'} = $result_trees{'command_translated'};
  
diff -Nrc2 texinfo-6.1/tp/t/results/languages/multiple.pl texinfo-6.3/tp/t/results/languages/multiple.pl
*** texinfo-6.1/tp/t/results/languages/multiple.pl	2016-01-22 07:50:27.000000000 +0000
--- texinfo-6.3/tp/t/results/languages/multiple.pl	2016-08-02 18:45:05.000000000 +0100
***************
*** 106,110 ****
                              }
                            ],
-                           'parent' => undef,
                            'type' => 'bracketed_def_content'
                          }
--- 106,109 ----
***************
*** 160,164 ****
                        'content' => [
                          {},
-                         {},
                          {
                            'parent' => {
--- 159,162 ----
***************
*** 168,172 ****
                            'text' => ' de '
                          },
-                         {},
                          {}
                        ],
--- 166,169 ----
***************
*** 181,185 ****
                        'index_at_command' => 'defivar',
                        'index_name' => 'vr',
-                       'index_prefix' => 'v',
                        'index_type_command' => 'defivar',
                        'key' => 'a de copying',
--- 178,181 ----
***************
*** 383,387 ****
                          }
                        ],
-                       'parent' => undef,
                        'type' => 'bracketed_def_content'
                      }
--- 379,382 ----
***************
*** 437,441 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 432,435 ----
***************
*** 445,449 ****
                        'text' => ' de '
                      },
-                     {},
                      {}
                    ],
--- 439,442 ----
***************
*** 458,462 ****
                    'index_at_command' => 'defivar',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'defivar',
                    'key' => 'BBB de fr',
--- 451,454 ----
***************
*** 633,637 ****
                          }
                        ],
-                       'parent' => undef,
                        'type' => 'bracketed_def_content'
                      }
--- 625,628 ----
***************
*** 687,691 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 678,681 ----
***************
*** 695,699 ****
                        'text' => ' da '
                      },
-                     {},
                      {}
                    ],
--- 685,688 ----
***************
*** 708,712 ****
                    'index_at_command' => 'defivar',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'defivar',
                    'key' => 'BBB da pt',
--- 697,700 ----
***************
*** 837,842 ****
  $result_trees{'multiple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'multiple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
  $result_trees{'multiple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'multiple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'multiple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'multiple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'multiple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'multiple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'multiple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'multiple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'multiple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'multiple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 825,830 ----
  $result_trees{'multiple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'multiple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
  $result_trees{'multiple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'multiple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'multiple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'multiple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'multiple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'multiple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'multiple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'multiple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'multiple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'multiple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 884,889 ****
  $result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
  $result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 872,877 ----
  $result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
  $result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'multiple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 924,929 ****
  $result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0];
  $result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 912,917 ----
  $result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0];
  $result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'multiple'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'def_args'}[2][1];
diff -Nrc2 texinfo-6.1/tp/t/results/languages/multiple_lang_chapters.pl texinfo-6.3/tp/t/results/languages/multiple_lang_chapters.pl
*** texinfo-6.1/tp/t/results/languages/multiple_lang_chapters.pl	2016-01-22 07:50:28.000000000 +0000
--- texinfo-6.3/tp/t/results/languages/multiple_lang_chapters.pl	2016-08-02 18:45:06.000000000 +0100
***************
*** 711,718 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 711,714 ----
***************
*** 772,776 ****
                          }
                        ],
-                       'parent' => undef,
                        'type' => 'bracketed_def_content'
                      }
--- 768,771 ----
***************
*** 826,830 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 821,824 ----
***************
*** 834,838 ****
                        'text' => ' of '
                      },
-                     {},
                      {}
                    ],
--- 828,831 ----
***************
*** 847,851 ****
                    'index_at_command' => 'defivar',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'defivar',
                    'key' => 'BBB of AAA',
--- 840,843 ----
***************
*** 1090,1097 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1082,1085 ----
***************
*** 1151,1155 ****
                          }
                        ],
-                       'parent' => undef,
                        'type' => 'bracketed_def_content'
                      }
--- 1139,1142 ----
***************
*** 1205,1209 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 1192,1195 ----
***************
*** 1213,1217 ****
                        'text' => ' of '
                      },
-                     {},
                      {}
                    ],
--- 1199,1202 ----
***************
*** 1226,1230 ****
                    'index_at_command' => 'defivar',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'defivar',
                    'key' => 'BBB of AAA',
--- 1211,1214 ----
***************
*** 1475,1479 ****
                          }
                        ],
-                       'parent' => undef,
                        'type' => 'bracketed_def_content'
                      }
--- 1459,1462 ----
***************
*** 1529,1533 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 1512,1515 ----
***************
*** 1537,1541 ****
                        'text' => ' de '
                      },
-                     {},
                      {}
                    ],
--- 1519,1522 ----
***************
*** 1550,1554 ****
                    'index_at_command' => 'defivar',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'defivar',
                    'key' => 'BBB de AAA',
--- 1531,1534 ----
***************
*** 1932,1939 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1912,1915 ----
***************
*** 2112,2117 ****
  $result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0];
  $result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 2088,2093 ----
  $result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0];
  $result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 2175,2180 ****
  $result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0];
  $result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 2151,2156 ----
  $result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0];
  $result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 2229,2234 ****
  $result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0];
  $result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 2205,2210 ----
  $result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0];
  $result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
diff -Nrc2 texinfo-6.1/tp/t/results/languages/multiple_lang_chapters_texi2html/res_html/multiple_lang_chapters.html texinfo-6.3/tp/t/results/languages/multiple_lang_chapters_texi2html/res_html/multiple_lang_chapters.html
*** texinfo-6.1/tp/t/results/languages/multiple_lang_chapters_texi2html/res_html/multiple_lang_chapters.html	2016-01-22 07:50:28.000000000 +0000
--- texinfo-6.3/tp/t/results/languages/multiple_lang_chapters_texi2html/res_html/multiple_lang_chapters.html	2016-09-03 16:03:52.000000000 +0100
***************
*** 194,198 ****
  
  <p>
!   This document was generated on <em>a sunny day</em>.
  </p>
  <p>
--- 194,198 ----
  
  <p>
!   Esse documento foi gerado em <em>a sunny day</em>.
  </p>
  <p>
***************
*** 295,299 ****
  <hr>
  <p><font size="-1">
!   This document was generated on <em>a sunny day</em>.
  </font></p>
  
--- 295,299 ----
  <hr>
  <p><font size="-1">
!   Esse documento foi gerado em <em>a sunny day</em>.
  </font></p>
  
diff -Nrc2 texinfo-6.1/tp/t/results/languages/multiple_lang_chapters_texi2html.pl texinfo-6.3/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
*** texinfo-6.1/tp/t/results/languages/multiple_lang_chapters_texi2html.pl	2016-01-22 07:50:29.000000000 +0000
--- texinfo-6.3/tp/t/results/languages/multiple_lang_chapters_texi2html.pl	2016-08-02 18:45:06.000000000 +0100
***************
*** 711,718 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 711,714 ----
***************
*** 772,776 ****
                          }
                        ],
-                       'parent' => undef,
                        'type' => 'bracketed_def_content'
                      }
--- 768,771 ----
***************
*** 826,830 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 821,824 ----
***************
*** 834,838 ****
                        'text' => ' of '
                      },
-                     {},
                      {}
                    ],
--- 828,831 ----
***************
*** 847,851 ****
                    'index_at_command' => 'defivar',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'defivar',
                    'key' => 'BBB of AAA',
--- 840,843 ----
***************
*** 1090,1097 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1082,1085 ----
***************
*** 1151,1155 ****
                          }
                        ],
-                       'parent' => undef,
                        'type' => 'bracketed_def_content'
                      }
--- 1139,1142 ----
***************
*** 1205,1209 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 1192,1195 ----
***************
*** 1213,1217 ****
                        'text' => ' of '
                      },
-                     {},
                      {}
                    ],
--- 1199,1202 ----
***************
*** 1226,1230 ****
                    'index_at_command' => 'defivar',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'defivar',
                    'key' => 'BBB of AAA',
--- 1211,1214 ----
***************
*** 1475,1479 ****
                          }
                        ],
-                       'parent' => undef,
                        'type' => 'bracketed_def_content'
                      }
--- 1459,1462 ----
***************
*** 1529,1533 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 1512,1515 ----
***************
*** 1537,1541 ****
                        'text' => ' de '
                      },
-                     {},
                      {}
                    ],
--- 1519,1522 ----
***************
*** 1550,1554 ****
                    'index_at_command' => 'defivar',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'defivar',
                    'key' => 'BBB de AAA',
--- 1531,1534 ----
***************
*** 1932,1939 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 1912,1915 ----
***************
*** 2112,2117 ****
  $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0];
  $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 2088,2093 ----
  $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0];
  $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 2175,2180 ****
  $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0];
  $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 2151,2156 ----
  $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0];
  $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[2][1];
***************
*** 2229,2234 ****
  $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0];
  $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 2205,2210 ----
  $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0];
  $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
diff -Nrc2 texinfo-6.1/tp/t/results/languages/simple.pl texinfo-6.3/tp/t/results/languages/simple.pl
*** texinfo-6.1/tp/t/results/languages/simple.pl	2016-01-22 07:50:27.000000000 +0000
--- texinfo-6.3/tp/t/results/languages/simple.pl	2016-08-02 18:45:05.000000000 +0100
***************
*** 133,137 ****
                          }
                        ],
-                       'parent' => undef,
                        'type' => 'bracketed_def_content'
                      }
--- 133,136 ----
***************
*** 187,191 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 186,189 ----
***************
*** 195,199 ****
                        'text' => ' de '
                      },
-                     {},
                      {}
                    ],
--- 193,196 ----
***************
*** 208,212 ****
                    'index_at_command' => 'defivar',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'defivar',
                    'key' => 'BBB de AAA',
--- 205,208 ----
***************
*** 322,327 ****
  $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
  $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 318,323 ----
  $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
  $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
diff -Nrc2 texinfo-6.1/tp/t/results/languages/unknown_language.pl texinfo-6.3/tp/t/results/languages/unknown_language.pl
*** texinfo-6.1/tp/t/results/languages/unknown_language.pl	2016-01-22 07:50:28.000000000 +0000
--- texinfo-6.3/tp/t/results/languages/unknown_language.pl	2016-08-02 18:45:06.000000000 +0100
***************
*** 176,183 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 176,179 ----
***************
*** 282,289 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 278,281 ----
diff -Nrc2 texinfo-6.1/tp/t/results/languages/unknown_region.pl texinfo-6.3/tp/t/results/languages/unknown_region.pl
*** texinfo-6.1/tp/t/results/languages/unknown_region.pl	2016-01-22 07:50:28.000000000 +0000
--- texinfo-6.3/tp/t/results/languages/unknown_region.pl	2016-08-02 18:45:06.000000000 +0100
***************
*** 133,137 ****
                          }
                        ],
-                       'parent' => undef,
                        'type' => 'bracketed_def_content'
                      }
--- 133,136 ----
***************
*** 187,191 ****
                    'content' => [
                      {},
-                     {},
                      {
                        'parent' => {
--- 186,189 ----
***************
*** 195,199 ****
                        'text' => ' de '
                      },
-                     {},
                      {}
                    ],
--- 193,196 ----
***************
*** 208,212 ****
                    'index_at_command' => 'defivar',
                    'index_name' => 'vr',
-                   'index_prefix' => 'v',
                    'index_type_command' => 'defivar',
                    'key' => 'BBB de AAA',
--- 205,208 ----
***************
*** 322,327 ****
  $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
  $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]{'parent'}{'contents'} = $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[3] = $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 318,323 ----
  $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'} = $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
  $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1];
! $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[1]{'parent'}{'contents'} = $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
! $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2] = $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
  $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1];
  $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2] = $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/arg_body_expansion_order.pl texinfo-6.3/tp/t/results/macro/arg_body_expansion_order.pl
*** texinfo-6.1/tp/t/results/macro/arg_body_expansion_order.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/arg_body_expansion_order.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 38,53 ****
        'extra' => {
          'arg_line' => ' othermacro
! ',
!         'macrobody' => 'initial
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 38,42 ----
        'extra' => {
          'arg_line' => ' othermacro
! '
        },
        'line_nr' => {
***************
*** 58,62 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 47,59 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 103,120 ****
            'extra' => {
              'arg_line' => ' othermacro
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 100,116 ----
            'extra' => {
              'arg_line' => ' othermacro
! '
            },
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 131,153 ****
        'extra' => {
          'arg_line' => ' redefineothermacro {arg}
! ',
!         'args_index' => {
!           'arg' => 0
!         },
!         'macrobody' => '@unmacro othermacro
! @macro othermacro
! different
! @end macro
! \\arg\\
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 127,131 ----
        'extra' => {
          'arg_line' => ' redefineothermacro {arg}
! '
        },
        'line_nr' => {
***************
*** 158,162 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 136,148 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 207,222 ****
        'extra' => {
          'arg_line' => ' othermacro
! ',
!         'macrobody' => 'different
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 193,197 ----
        'extra' => {
          'arg_line' => ' othermacro
! '
        },
        'line_nr' => {
***************
*** 227,231 ****
        'parent' => {}
      },
!     {},
      {
        'contents' => [
--- 202,214 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'contents' => [
***************
*** 246,253 ****
  $result_trees{'arg_body_expansion_order'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'arg_body_expansion_order'}{'contents'}[1];
  $result_trees{'arg_body_expansion_order'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'arg_body_expansion_order'}{'contents'}[1];
- $result_trees{'arg_body_expansion_order'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'arg_body_expansion_order'}{'contents'}[1];
- $result_trees{'arg_body_expansion_order'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'arg_body_expansion_order'};
  $result_trees{'arg_body_expansion_order'}{'contents'}[1]{'parent'} = $result_trees{'arg_body_expansion_order'};
! $result_trees{'arg_body_expansion_order'}{'contents'}[2] = $result_trees{'arg_body_expansion_order'}{'contents'}[1]{'extra'}{'spaces_after_command'};
  $result_trees{'arg_body_expansion_order'}{'contents'}[3]{'parent'} = $result_trees{'arg_body_expansion_order'};
  $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'arg_body_expansion_order'}{'contents'}[4];
--- 229,235 ----
  $result_trees{'arg_body_expansion_order'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'arg_body_expansion_order'}{'contents'}[1];
  $result_trees{'arg_body_expansion_order'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'arg_body_expansion_order'}{'contents'}[1];
  $result_trees{'arg_body_expansion_order'}{'contents'}[1]{'parent'} = $result_trees{'arg_body_expansion_order'};
! $result_trees{'arg_body_expansion_order'}{'contents'}[2]{'extra'}{'command'} = $result_trees{'arg_body_expansion_order'}{'contents'}[1];
! $result_trees{'arg_body_expansion_order'}{'contents'}[2]{'parent'} = $result_trees{'arg_body_expansion_order'};
  $result_trees{'arg_body_expansion_order'}{'contents'}[3]{'parent'} = $result_trees{'arg_body_expansion_order'};
  $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'arg_body_expansion_order'}{'contents'}[4];
***************
*** 256,269 ****
  $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[1];
  $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[1];
- $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[1];
- $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'arg_body_expansion_order'}{'contents'}[4];
  $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'arg_body_expansion_order'}{'contents'}[4];
! $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[2] = $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[1]{'extra'}{'spaces_after_command'};
  $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[3]{'parent'} = $result_trees{'arg_body_expansion_order'}{'contents'}[4];
  $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[4]{'parent'} = $result_trees{'arg_body_expansion_order'}{'contents'}[4];
- $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'arg_body_expansion_order'}{'contents'}[4];
- $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'arg_body_expansion_order'};
  $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'parent'} = $result_trees{'arg_body_expansion_order'};
! $result_trees{'arg_body_expansion_order'}{'contents'}[5] = $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'extra'}{'spaces_after_command'};
  $result_trees{'arg_body_expansion_order'}{'contents'}[6]{'parent'} = $result_trees{'arg_body_expansion_order'};
  $result_trees{'arg_body_expansion_order'}{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'arg_body_expansion_order'}{'contents'}[7];
--- 238,249 ----
  $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[1];
  $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[1];
  $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'arg_body_expansion_order'}{'contents'}[4];
! $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[2]{'extra'}{'command'} = $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[1];
! $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[2]{'parent'} = $result_trees{'arg_body_expansion_order'}{'contents'}[4];
  $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[3]{'parent'} = $result_trees{'arg_body_expansion_order'}{'contents'}[4];
  $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'contents'}[4]{'parent'} = $result_trees{'arg_body_expansion_order'}{'contents'}[4];
  $result_trees{'arg_body_expansion_order'}{'contents'}[4]{'parent'} = $result_trees{'arg_body_expansion_order'};
! $result_trees{'arg_body_expansion_order'}{'contents'}[5]{'extra'}{'command'} = $result_trees{'arg_body_expansion_order'}{'contents'}[4];
! $result_trees{'arg_body_expansion_order'}{'contents'}[5]{'parent'} = $result_trees{'arg_body_expansion_order'};
  $result_trees{'arg_body_expansion_order'}{'contents'}[6]{'parent'} = $result_trees{'arg_body_expansion_order'};
  $result_trees{'arg_body_expansion_order'}{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'arg_body_expansion_order'}{'contents'}[7];
***************
*** 272,279 ****
  $result_trees{'arg_body_expansion_order'}{'contents'}[8]{'contents'}[0]{'parent'} = $result_trees{'arg_body_expansion_order'}{'contents'}[8];
  $result_trees{'arg_body_expansion_order'}{'contents'}[8]{'contents'}[1]{'parent'} = $result_trees{'arg_body_expansion_order'}{'contents'}[8];
- $result_trees{'arg_body_expansion_order'}{'contents'}[8]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'arg_body_expansion_order'}{'contents'}[8];
- $result_trees{'arg_body_expansion_order'}{'contents'}[8]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'arg_body_expansion_order'};
  $result_trees{'arg_body_expansion_order'}{'contents'}[8]{'parent'} = $result_trees{'arg_body_expansion_order'};
! $result_trees{'arg_body_expansion_order'}{'contents'}[9] = $result_trees{'arg_body_expansion_order'}{'contents'}[8]{'extra'}{'spaces_after_command'};
  $result_trees{'arg_body_expansion_order'}{'contents'}[10]{'contents'}[0]{'parent'} = $result_trees{'arg_body_expansion_order'}{'contents'}[10];
  $result_trees{'arg_body_expansion_order'}{'contents'}[10]{'parent'} = $result_trees{'arg_body_expansion_order'};
--- 252,258 ----
  $result_trees{'arg_body_expansion_order'}{'contents'}[8]{'contents'}[0]{'parent'} = $result_trees{'arg_body_expansion_order'}{'contents'}[8];
  $result_trees{'arg_body_expansion_order'}{'contents'}[8]{'contents'}[1]{'parent'} = $result_trees{'arg_body_expansion_order'}{'contents'}[8];
  $result_trees{'arg_body_expansion_order'}{'contents'}[8]{'parent'} = $result_trees{'arg_body_expansion_order'};
! $result_trees{'arg_body_expansion_order'}{'contents'}[9]{'extra'}{'command'} = $result_trees{'arg_body_expansion_order'}{'contents'}[8];
! $result_trees{'arg_body_expansion_order'}{'contents'}[9]{'parent'} = $result_trees{'arg_body_expansion_order'};
  $result_trees{'arg_body_expansion_order'}{'contents'}[10]{'contents'}[0]{'parent'} = $result_trees{'arg_body_expansion_order'}{'contents'}[10];
  $result_trees{'arg_body_expansion_order'}{'contents'}[10]{'parent'} = $result_trees{'arg_body_expansion_order'};
diff -Nrc2 texinfo-6.1/tp/t/results/macro/arg_not_closed.pl texinfo-6.3/tp/t/results/macro/arg_not_closed.pl
*** texinfo-6.1/tp/t/results/macro/arg_not_closed.pl	2016-01-22 07:50:09.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/arg_not_closed.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 37,55 ****
        'extra' => {
          'arg_line' => ' foo {arg}
! ',
!         'args_index' => {
!           'arg' => 0
!         },
!         'macrobody' => 'foo
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 37,41 ----
        'extra' => {
          'arg_line' => ' foo {arg}
! '
        },
        'line_nr' => {
***************
*** 60,64 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 46,58 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 85,92 ****
  $result_trees{'arg_not_closed'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'arg_not_closed'}{'contents'}[0];
  $result_trees{'arg_not_closed'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'arg_not_closed'}{'contents'}[0];
- $result_trees{'arg_not_closed'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'arg_not_closed'}{'contents'}[0];
- $result_trees{'arg_not_closed'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'arg_not_closed'};
  $result_trees{'arg_not_closed'}{'contents'}[0]{'parent'} = $result_trees{'arg_not_closed'};
! $result_trees{'arg_not_closed'}{'contents'}[1] = $result_trees{'arg_not_closed'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'arg_not_closed'}{'contents'}[2]{'parent'} = $result_trees{'arg_not_closed'};
  $result_trees{'arg_not_closed'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'arg_not_closed'}{'contents'}[3];
--- 79,85 ----
  $result_trees{'arg_not_closed'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'arg_not_closed'}{'contents'}[0];
  $result_trees{'arg_not_closed'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'arg_not_closed'}{'contents'}[0];
  $result_trees{'arg_not_closed'}{'contents'}[0]{'parent'} = $result_trees{'arg_not_closed'};
! $result_trees{'arg_not_closed'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'arg_not_closed'}{'contents'}[0];
! $result_trees{'arg_not_closed'}{'contents'}[1]{'parent'} = $result_trees{'arg_not_closed'};
  $result_trees{'arg_not_closed'}{'contents'}[2]{'parent'} = $result_trees{'arg_not_closed'};
  $result_trees{'arg_not_closed'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'arg_not_closed'}{'contents'}[3];
***************
*** 107,116 ****
  $result_errors{'arg_not_closed'} = [
    {
!     'error_line' => ':5: @foo missing close brace
  ',
      'file_name' => '',
      'line_nr' => 5,
      'macro' => '',
!     'text' => '@foo missing close brace',
      'type' => 'error'
    }
--- 100,109 ----
  $result_errors{'arg_not_closed'} = [
    {
!     'error_line' => ':5: @foo missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 5,
      'macro' => '',
!     'text' => '@foo missing closing brace',
      'type' => 'error'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/macro/backslash_in_arg.pl texinfo-6.3/tp/t/results/macro/backslash_in_arg.pl
*** texinfo-6.1/tp/t/results/macro/backslash_in_arg.pl	2016-01-22 07:50:09.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/backslash_in_arg.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 77,95 ****
            'extra' => {
              'arg_line' => ' funindex {TEXT}
! ',
!             'args_index' => {
!               'TEXT' => 0
!             },
!             'macrobody' => '@findex \\TEXT\\
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 77,81 ----
            'extra' => {
              'arg_line' => ' funindex {TEXT}
! '
            },
            'line_nr' => {
***************
*** 100,104 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 86,98 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 145,149 ****
                'index_at_command' => 'findex',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'findex',
                'key' => '\\\\q',
--- 139,142 ----
***************
*** 200,204 ****
                'index_at_command' => 'findex',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'findex',
                'key' => '\\r',
--- 193,196 ----
***************
*** 255,259 ****
                'index_at_command' => 'findex',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'findex',
                'key' => '\\q',
--- 247,250 ----
***************
*** 310,314 ****
                'index_at_command' => 'findex',
                'index_name' => 'fn',
-               'index_prefix' => 'f',
                'index_type_command' => 'findex',
                'key' => '\\r',
--- 301,304 ----
***************
*** 403,410 ****
  $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1];
  $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1];
- $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1];
- $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'backslash_in_arg'}{'contents'}[1];
  $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'backslash_in_arg'}{'contents'}[1];
! $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[2] = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'};
  $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'backslash_in_arg'}{'contents'}[1];
  $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4];
--- 393,399 ----
  $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1];
  $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1];
  $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'backslash_in_arg'}{'contents'}[1];
! $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[2]{'extra'}{'command'} = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1];
! $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'backslash_in_arg'}{'contents'}[1];
  $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'backslash_in_arg'}{'contents'}[1];
  $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/bad_argument.pl texinfo-6.3/tp/t/results/macro/bad_argument.pl
*** texinfo-6.1/tp/t/results/macro/bad_argument.pl	2016-01-22 07:50:09.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/bad_argument.pl	2016-08-02 18:44:47.000000000 +0100
***************
*** 26,41 ****
          'arg_line' => '
  ',
!         'invalid_syntax' => 1,
!         'macrobody' => 'in macro
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 26,30 ----
          'arg_line' => '
  ',
!         'invalid_syntax' => 1
        },
        'line_nr' => {
***************
*** 46,50 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 35,47 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 78,93 ****
          'arg_line' => ' abar aaa
  ',
!         'invalid_syntax' => 1,
!         'macrobody' => 'in
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 75,79 ----
          'arg_line' => ' abar aaa
  ',
!         'invalid_syntax' => 1
        },
        'line_nr' => {
***************
*** 98,102 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 84,96 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 135,153 ****
          'arg_line' => ' aftername {ggg} more
  ',
!         'args_index' => {
!           'ggg' => 0
!         },
!         'invalid_syntax' => 1,
!         'macrobody' => 'in macro
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 129,133 ----
          'arg_line' => ' aftername {ggg} more
  ',
!         'invalid_syntax' => 1
        },
        'line_nr' => {
***************
*** 158,162 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 138,150 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 183,198 ****
          'arg_line' => ' #badname
  ',
!         'invalid_syntax' => 1,
!         'macrobody' => 'in #
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 171,175 ----
          'arg_line' => ' #badname
  ',
!         'invalid_syntax' => 1
        },
        'line_nr' => {
***************
*** 203,207 ****
        'parent' => {}
      },
!     {}
    ],
    'type' => 'text_root'
--- 180,192 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     }
    ],
    'type' => 'text_root'
***************
*** 209,224 ****
  $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'bad_argument'}{'contents'}[0];
  $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'bad_argument'}{'contents'}[0];
- $result_trees{'bad_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'bad_argument'}{'contents'}[0];
- $result_trees{'bad_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'bad_argument'};
  $result_trees{'bad_argument'}{'contents'}[0]{'parent'} = $result_trees{'bad_argument'};
! $result_trees{'bad_argument'}{'contents'}[1] = $result_trees{'bad_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'bad_argument'}{'contents'}[2]{'parent'} = $result_trees{'bad_argument'};
  $result_trees{'bad_argument'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'bad_argument'}{'contents'}[3];
  $result_trees{'bad_argument'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'bad_argument'}{'contents'}[3];
  $result_trees{'bad_argument'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'bad_argument'}{'contents'}[3];
- $result_trees{'bad_argument'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'bad_argument'}{'contents'}[3];
- $result_trees{'bad_argument'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'bad_argument'};
  $result_trees{'bad_argument'}{'contents'}[3]{'parent'} = $result_trees{'bad_argument'};
! $result_trees{'bad_argument'}{'contents'}[4] = $result_trees{'bad_argument'}{'contents'}[3]{'extra'}{'spaces_after_command'};
  $result_trees{'bad_argument'}{'contents'}[5]{'parent'} = $result_trees{'bad_argument'};
  $result_trees{'bad_argument'}{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'bad_argument'}{'contents'}[6];
--- 194,207 ----
  $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'bad_argument'}{'contents'}[0];
  $result_trees{'bad_argument'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'bad_argument'}{'contents'}[0];
  $result_trees{'bad_argument'}{'contents'}[0]{'parent'} = $result_trees{'bad_argument'};
! $result_trees{'bad_argument'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'bad_argument'}{'contents'}[0];
! $result_trees{'bad_argument'}{'contents'}[1]{'parent'} = $result_trees{'bad_argument'};
  $result_trees{'bad_argument'}{'contents'}[2]{'parent'} = $result_trees{'bad_argument'};
  $result_trees{'bad_argument'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'bad_argument'}{'contents'}[3];
  $result_trees{'bad_argument'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'bad_argument'}{'contents'}[3];
  $result_trees{'bad_argument'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'bad_argument'}{'contents'}[3];
  $result_trees{'bad_argument'}{'contents'}[3]{'parent'} = $result_trees{'bad_argument'};
! $result_trees{'bad_argument'}{'contents'}[4]{'extra'}{'command'} = $result_trees{'bad_argument'}{'contents'}[3];
! $result_trees{'bad_argument'}{'contents'}[4]{'parent'} = $result_trees{'bad_argument'};
  $result_trees{'bad_argument'}{'contents'}[5]{'parent'} = $result_trees{'bad_argument'};
  $result_trees{'bad_argument'}{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'bad_argument'}{'contents'}[6];
***************
*** 226,240 ****
  $result_trees{'bad_argument'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'bad_argument'}{'contents'}[6];
  $result_trees{'bad_argument'}{'contents'}[6]{'contents'}[1]{'parent'} = $result_trees{'bad_argument'}{'contents'}[6];
- $result_trees{'bad_argument'}{'contents'}[6]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'bad_argument'}{'contents'}[6];
- $result_trees{'bad_argument'}{'contents'}[6]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'bad_argument'};
  $result_trees{'bad_argument'}{'contents'}[6]{'parent'} = $result_trees{'bad_argument'};
! $result_trees{'bad_argument'}{'contents'}[7] = $result_trees{'bad_argument'}{'contents'}[6]{'extra'}{'spaces_after_command'};
  $result_trees{'bad_argument'}{'contents'}[8]{'parent'} = $result_trees{'bad_argument'};
  $result_trees{'bad_argument'}{'contents'}[9]{'contents'}[0]{'parent'} = $result_trees{'bad_argument'}{'contents'}[9];
  $result_trees{'bad_argument'}{'contents'}[9]{'contents'}[1]{'parent'} = $result_trees{'bad_argument'}{'contents'}[9];
- $result_trees{'bad_argument'}{'contents'}[9]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'bad_argument'}{'contents'}[9];
- $result_trees{'bad_argument'}{'contents'}[9]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'bad_argument'};
  $result_trees{'bad_argument'}{'contents'}[9]{'parent'} = $result_trees{'bad_argument'};
! $result_trees{'bad_argument'}{'contents'}[10] = $result_trees{'bad_argument'}{'contents'}[9]{'extra'}{'spaces_after_command'};
  
  $result_texis{'bad_argument'} = '@macro
--- 209,221 ----
  $result_trees{'bad_argument'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'bad_argument'}{'contents'}[6];
  $result_trees{'bad_argument'}{'contents'}[6]{'contents'}[1]{'parent'} = $result_trees{'bad_argument'}{'contents'}[6];
  $result_trees{'bad_argument'}{'contents'}[6]{'parent'} = $result_trees{'bad_argument'};
! $result_trees{'bad_argument'}{'contents'}[7]{'extra'}{'command'} = $result_trees{'bad_argument'}{'contents'}[6];
! $result_trees{'bad_argument'}{'contents'}[7]{'parent'} = $result_trees{'bad_argument'};
  $result_trees{'bad_argument'}{'contents'}[8]{'parent'} = $result_trees{'bad_argument'};
  $result_trees{'bad_argument'}{'contents'}[9]{'contents'}[0]{'parent'} = $result_trees{'bad_argument'}{'contents'}[9];
  $result_trees{'bad_argument'}{'contents'}[9]{'contents'}[1]{'parent'} = $result_trees{'bad_argument'}{'contents'}[9];
  $result_trees{'bad_argument'}{'contents'}[9]{'parent'} = $result_trees{'bad_argument'};
! $result_trees{'bad_argument'}{'contents'}[10]{'extra'}{'command'} = $result_trees{'bad_argument'}{'contents'}[9];
! $result_trees{'bad_argument'}{'contents'}[10]{'parent'} = $result_trees{'bad_argument'};
  
  $result_texis{'bad_argument'} = '@macro
diff -Nrc2 texinfo-6.1/tp/t/results/macro/bad_formal_arg.pl texinfo-6.3/tp/t/results/macro/bad_formal_arg.pl
*** texinfo-6.1/tp/t/results/macro/bad_formal_arg.pl	2016-01-22 07:50:09.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/bad_formal_arg.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 49,68 ****
          'arg_line' => ' bad  { , not_empty}
  ',
!         'args_index' => {
!           '' => 0,
!           'not_empty' => 1
!         },
!         'invalid_syntax' => 1,
!         'macrobody' => 'in bad macro
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 49,53 ----
          'arg_line' => ' bad  { , not_empty}
  ',
!         'invalid_syntax' => 1
        },
        'line_nr' => {
***************
*** 73,77 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 58,70 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 115,134 ****
          'arg_line' => ' badspace{first, in 2arg}
  ',
!         'args_index' => {
!           'first' => 0,
!           'in 2arg' => 1
!         },
!         'invalid_syntax' => 1,
!         'macrobody' => 'bad space
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 108,112 ----
          'arg_line' => ' badspace{first, in 2arg}
  ',
!         'invalid_syntax' => 1
        },
        'line_nr' => {
***************
*** 139,143 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 117,129 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 184,215 ****
            'extra' => {
              'arg_line' => ' foo {? aaa}
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'parent' => {}
          },
!         {}
!       ],
!       'extra' => {
!         'arg_line' => ' abar {:::}
! ',
!         'args_index' => {
!           ':::' => 0
!         },
!         'invalid_syntax' => 1,
!         'macrobody' => 'in bar
! @macro foo {? aaa}
! in macro foo
! @end macro
! ',
!         'spaces_after_command' => {
            'extra' => {
              'command' => {}
--- 170,178 ----
            'extra' => {
              'arg_line' => ' foo {? aaa}
! '
            },
            'parent' => {}
          },
!         {
            'extra' => {
              'command' => {}
***************
*** 220,223 ****
--- 183,191 ----
            'type' => 'empty_line_after_command'
          }
+       ],
+       'extra' => {
+         'arg_line' => ' abar {:::}
+ ',
+         'invalid_syntax' => 1
        },
        'line_nr' => {
***************
*** 228,232 ****
        'parent' => {}
      },
!     {}
    ],
    'type' => 'text_root'
--- 196,208 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     }
    ],
    'type' => 'text_root'
***************
*** 238,245 ****
  $result_trees{'bad_formal_arg'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'bad_formal_arg'}{'contents'}[1];
  $result_trees{'bad_formal_arg'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'bad_formal_arg'}{'contents'}[1];
- $result_trees{'bad_formal_arg'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'bad_formal_arg'}{'contents'}[1];
- $result_trees{'bad_formal_arg'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'bad_formal_arg'};
  $result_trees{'bad_formal_arg'}{'contents'}[1]{'parent'} = $result_trees{'bad_formal_arg'};
! $result_trees{'bad_formal_arg'}{'contents'}[2] = $result_trees{'bad_formal_arg'}{'contents'}[1]{'extra'}{'spaces_after_command'};
  $result_trees{'bad_formal_arg'}{'contents'}[3]{'parent'} = $result_trees{'bad_formal_arg'};
  $result_trees{'bad_formal_arg'}{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'bad_formal_arg'}{'contents'}[4];
--- 214,220 ----
  $result_trees{'bad_formal_arg'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'bad_formal_arg'}{'contents'}[1];
  $result_trees{'bad_formal_arg'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'bad_formal_arg'}{'contents'}[1];
  $result_trees{'bad_formal_arg'}{'contents'}[1]{'parent'} = $result_trees{'bad_formal_arg'};
! $result_trees{'bad_formal_arg'}{'contents'}[2]{'extra'}{'command'} = $result_trees{'bad_formal_arg'}{'contents'}[1];
! $result_trees{'bad_formal_arg'}{'contents'}[2]{'parent'} = $result_trees{'bad_formal_arg'};
  $result_trees{'bad_formal_arg'}{'contents'}[3]{'parent'} = $result_trees{'bad_formal_arg'};
  $result_trees{'bad_formal_arg'}{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'bad_formal_arg'}{'contents'}[4];
***************
*** 248,255 ****
  $result_trees{'bad_formal_arg'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'bad_formal_arg'}{'contents'}[4];
  $result_trees{'bad_formal_arg'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'bad_formal_arg'}{'contents'}[4];
- $result_trees{'bad_formal_arg'}{'contents'}[4]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'bad_formal_arg'}{'contents'}[4];
- $result_trees{'bad_formal_arg'}{'contents'}[4]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'bad_formal_arg'};
  $result_trees{'bad_formal_arg'}{'contents'}[4]{'parent'} = $result_trees{'bad_formal_arg'};
! $result_trees{'bad_formal_arg'}{'contents'}[5] = $result_trees{'bad_formal_arg'}{'contents'}[4]{'extra'}{'spaces_after_command'};
  $result_trees{'bad_formal_arg'}{'contents'}[6]{'parent'} = $result_trees{'bad_formal_arg'};
  $result_trees{'bad_formal_arg'}{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'bad_formal_arg'}{'contents'}[7];
--- 223,229 ----
  $result_trees{'bad_formal_arg'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'bad_formal_arg'}{'contents'}[4];
  $result_trees{'bad_formal_arg'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'bad_formal_arg'}{'contents'}[4];
  $result_trees{'bad_formal_arg'}{'contents'}[4]{'parent'} = $result_trees{'bad_formal_arg'};
! $result_trees{'bad_formal_arg'}{'contents'}[5]{'extra'}{'command'} = $result_trees{'bad_formal_arg'}{'contents'}[4];
! $result_trees{'bad_formal_arg'}{'contents'}[5]{'parent'} = $result_trees{'bad_formal_arg'};
  $result_trees{'bad_formal_arg'}{'contents'}[6]{'parent'} = $result_trees{'bad_formal_arg'};
  $result_trees{'bad_formal_arg'}{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'bad_formal_arg'}{'contents'}[7];
***************
*** 258,269 ****
  $result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[1];
  $result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[1];
- $result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[1];
- $result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'bad_formal_arg'}{'contents'}[7];
  $result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'bad_formal_arg'}{'contents'}[7];
! $result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[2] = $result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[1]{'extra'}{'spaces_after_command'};
! $result_trees{'bad_formal_arg'}{'contents'}[7]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'bad_formal_arg'}{'contents'}[7];
! $result_trees{'bad_formal_arg'}{'contents'}[7]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'bad_formal_arg'};
  $result_trees{'bad_formal_arg'}{'contents'}[7]{'parent'} = $result_trees{'bad_formal_arg'};
! $result_trees{'bad_formal_arg'}{'contents'}[8] = $result_trees{'bad_formal_arg'}{'contents'}[7]{'extra'}{'spaces_after_command'};
  
  $result_texis{'bad_formal_arg'} = '
--- 232,241 ----
  $result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[1];
  $result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[1];
  $result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'bad_formal_arg'}{'contents'}[7];
! $result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[2]{'extra'}{'command'} = $result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[1];
! $result_trees{'bad_formal_arg'}{'contents'}[7]{'contents'}[2]{'parent'} = $result_trees{'bad_formal_arg'}{'contents'}[7];
  $result_trees{'bad_formal_arg'}{'contents'}[7]{'parent'} = $result_trees{'bad_formal_arg'};
! $result_trees{'bad_formal_arg'}{'contents'}[8]{'extra'}{'command'} = $result_trees{'bad_formal_arg'}{'contents'}[7];
! $result_trees{'bad_formal_arg'}{'contents'}[8]{'parent'} = $result_trees{'bad_formal_arg'};
  
  $result_texis{'bad_formal_arg'} = '
diff -Nrc2 texinfo-6.1/tp/t/results/macro/bad_macro_name_with_underscore.pl texinfo-6.3/tp/t/results/macro/bad_macro_name_with_underscore.pl
*** texinfo-6.1/tp/t/results/macro/bad_macro_name_with_underscore.pl	2016-01-22 07:50:09.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/bad_macro_name_with_underscore.pl	2016-08-02 18:44:47.000000000 +0100
***************
*** 33,48 ****
          'arg_line' => ' the_macro {arg1, arg2}
  ',
!         'invalid_syntax' => 1,
!         'macrobody' => 'In macro
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 33,37 ----
          'arg_line' => ' the_macro {arg1, arg2}
  ',
!         'invalid_syntax' => 1
        },
        'line_nr' => {
***************
*** 53,57 ****
        'parent' => {}
      },
!     {}
    ],
    'type' => 'text_root'
--- 42,54 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     }
    ],
    'type' => 'text_root'
***************
*** 60,67 ****
  $result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'bad_macro_name_with_underscore'}{'contents'}[0];
  $result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'bad_macro_name_with_underscore'}{'contents'}[0];
- $result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'bad_macro_name_with_underscore'}{'contents'}[0];
- $result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'bad_macro_name_with_underscore'};
  $result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'parent'} = $result_trees{'bad_macro_name_with_underscore'};
! $result_trees{'bad_macro_name_with_underscore'}{'contents'}[1] = $result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  
  $result_texis{'bad_macro_name_with_underscore'} = '@macro the_macro {arg1, arg2}
--- 57,63 ----
  $result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'bad_macro_name_with_underscore'}{'contents'}[0];
  $result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'bad_macro_name_with_underscore'}{'contents'}[0];
  $result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'parent'} = $result_trees{'bad_macro_name_with_underscore'};
! $result_trees{'bad_macro_name_with_underscore'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'bad_macro_name_with_underscore'}{'contents'}[0];
! $result_trees{'bad_macro_name_with_underscore'}{'contents'}[1]{'parent'} = $result_trees{'bad_macro_name_with_underscore'};
  
  $result_texis{'bad_macro_name_with_underscore'} = '@macro the_macro {arg1, arg2}
diff -Nrc2 texinfo-6.1/tp/t/results/macro/complete_macro_for_end.pl texinfo-6.3/tp/t/results/macro/complete_macro_for_end.pl
*** texinfo-6.1/tp/t/results/macro/complete_macro_for_end.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/complete_macro_for_end.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 32,47 ****
        'extra' => {
          'arg_line' => ' theend
! ',
!         'macrobody' => '@end cartouche
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 32,36 ----
        'extra' => {
          'arg_line' => ' theend
! '
        },
        'line_nr' => {
***************
*** 52,56 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 41,53 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 124,131 ****
  $result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'complete_macro_for_end'}{'contents'}[0];
  $result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'complete_macro_for_end'}{'contents'}[0];
- $result_trees{'complete_macro_for_end'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'complete_macro_for_end'}{'contents'}[0];
- $result_trees{'complete_macro_for_end'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'complete_macro_for_end'};
  $result_trees{'complete_macro_for_end'}{'contents'}[0]{'parent'} = $result_trees{'complete_macro_for_end'};
! $result_trees{'complete_macro_for_end'}{'contents'}[1] = $result_trees{'complete_macro_for_end'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'complete_macro_for_end'}{'contents'}[2]{'parent'} = $result_trees{'complete_macro_for_end'};
  $result_trees{'complete_macro_for_end'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'} = $result_trees{'complete_macro_for_end'}{'contents'}[3];
--- 121,127 ----
  $result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'complete_macro_for_end'}{'contents'}[0];
  $result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'complete_macro_for_end'}{'contents'}[0];
  $result_trees{'complete_macro_for_end'}{'contents'}[0]{'parent'} = $result_trees{'complete_macro_for_end'};
! $result_trees{'complete_macro_for_end'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'complete_macro_for_end'}{'contents'}[0];
! $result_trees{'complete_macro_for_end'}{'contents'}[1]{'parent'} = $result_trees{'complete_macro_for_end'};
  $result_trees{'complete_macro_for_end'}{'contents'}[2]{'parent'} = $result_trees{'complete_macro_for_end'};
  $result_trees{'complete_macro_for_end'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'} = $result_trees{'complete_macro_for_end'}{'contents'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/complex_argument.pl texinfo-6.3/tp/t/results/macro/complex_argument.pl
*** texinfo-6.1/tp/t/results/macro/complex_argument.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/complex_argument.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 37,55 ****
        'extra' => {
          'arg_line' => ' macrotwo{arg}
! ',
!         'args_index' => {
!           'arg' => 0
!         },
!         'macrobody' => 'coucou \\arg\\ after arg
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 37,41 ----
        'extra' => {
          'arg_line' => ' macrotwo{arg}
! '
        },
        'line_nr' => {
***************
*** 60,64 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 46,58 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 109,127 ****
        'extra' => {
          'arg_line' => ' macrofour {}
! ',
!         'macrobody' => '1
! 2
! 3
! 4
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 103,107 ----
        'extra' => {
          'arg_line' => ' macrofour {}
! '
        },
        'line_nr' => {
***************
*** 132,136 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 112,124 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 179,199 ****
        'extra' => {
          'arg_line' => ' macrothree{text, arg}
! ',
!         'args_index' => {
!           'arg' => 1,
!           'text' => 0
!         },
!         'macrobody' => '\\text\\
! &&&& \\arg\\
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 167,171 ----
        'extra' => {
          'arg_line' => ' macrothree{text, arg}
! '
        },
        'line_nr' => {
***************
*** 204,208 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 176,188 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 393,405 ****
        ],
        'extra' => {
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 373,377 ----
        ],
        'extra' => {
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 410,414 ****
        'parent' => {}
      },
!     {},
      {
        'cmdname' => 'ignore',
--- 382,394 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'cmdname' => 'ignore',
***************
*** 436,448 ****
        ],
        'extra' => {
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 416,420 ----
        ],
        'extra' => {
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 453,457 ****
        'parent' => {}
      },
!     {},
      {
        'args' => [
--- 425,437 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'args' => [
***************
*** 483,501 ****
        'extra' => {
          'arg_line' => ' macroseven {truc}
! ',
!         'args_index' => {
!           'truc' => 0
!         },
!         'macrobody' => '@emph{\\truc\\}
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 463,467 ----
        'extra' => {
          'arg_line' => ' macroseven {truc}
! '
        },
        'line_nr' => {
***************
*** 506,510 ****
        'parent' => {}
      },
!     {},
      {
        'contents' => [
--- 472,484 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'contents' => [
***************
*** 612,619 ****
  $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_argument'}{'contents'}[0];
  $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'complex_argument'}{'contents'}[0];
- $result_trees{'complex_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'complex_argument'}{'contents'}[0];
- $result_trees{'complex_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'complex_argument'};
  $result_trees{'complex_argument'}{'contents'}[0]{'parent'} = $result_trees{'complex_argument'};
! $result_trees{'complex_argument'}{'contents'}[1] = $result_trees{'complex_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'complex_argument'}{'contents'}[2]{'parent'} = $result_trees{'complex_argument'};
  $result_trees{'complex_argument'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'complex_argument'}{'contents'}[3];
--- 586,592 ----
  $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_argument'}{'contents'}[0];
  $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'complex_argument'}{'contents'}[0];
  $result_trees{'complex_argument'}{'contents'}[0]{'parent'} = $result_trees{'complex_argument'};
! $result_trees{'complex_argument'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'complex_argument'}{'contents'}[0];
! $result_trees{'complex_argument'}{'contents'}[1]{'parent'} = $result_trees{'complex_argument'};
  $result_trees{'complex_argument'}{'contents'}[2]{'parent'} = $result_trees{'complex_argument'};
  $result_trees{'complex_argument'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'complex_argument'}{'contents'}[3];
***************
*** 623,630 ****
  $result_trees{'complex_argument'}{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'complex_argument'}{'contents'}[3];
  $result_trees{'complex_argument'}{'contents'}[3]{'contents'}[4]{'parent'} = $result_trees{'complex_argument'}{'contents'}[3];
- $result_trees{'complex_argument'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'complex_argument'}{'contents'}[3];
- $result_trees{'complex_argument'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'complex_argument'};
  $result_trees{'complex_argument'}{'contents'}[3]{'parent'} = $result_trees{'complex_argument'};
! $result_trees{'complex_argument'}{'contents'}[4] = $result_trees{'complex_argument'}{'contents'}[3]{'extra'}{'spaces_after_command'};
  $result_trees{'complex_argument'}{'contents'}[5]{'parent'} = $result_trees{'complex_argument'};
  $result_trees{'complex_argument'}{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'complex_argument'}{'contents'}[6];
--- 596,602 ----
  $result_trees{'complex_argument'}{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'complex_argument'}{'contents'}[3];
  $result_trees{'complex_argument'}{'contents'}[3]{'contents'}[4]{'parent'} = $result_trees{'complex_argument'}{'contents'}[3];
  $result_trees{'complex_argument'}{'contents'}[3]{'parent'} = $result_trees{'complex_argument'};
! $result_trees{'complex_argument'}{'contents'}[4]{'extra'}{'command'} = $result_trees{'complex_argument'}{'contents'}[3];
! $result_trees{'complex_argument'}{'contents'}[4]{'parent'} = $result_trees{'complex_argument'};
  $result_trees{'complex_argument'}{'contents'}[5]{'parent'} = $result_trees{'complex_argument'};
  $result_trees{'complex_argument'}{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'complex_argument'}{'contents'}[6];
***************
*** 634,641 ****
  $result_trees{'complex_argument'}{'contents'}[6]{'contents'}[1]{'parent'} = $result_trees{'complex_argument'}{'contents'}[6];
  $result_trees{'complex_argument'}{'contents'}[6]{'contents'}[2]{'parent'} = $result_trees{'complex_argument'}{'contents'}[6];
- $result_trees{'complex_argument'}{'contents'}[6]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'complex_argument'}{'contents'}[6];
- $result_trees{'complex_argument'}{'contents'}[6]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'complex_argument'};
  $result_trees{'complex_argument'}{'contents'}[6]{'parent'} = $result_trees{'complex_argument'};
! $result_trees{'complex_argument'}{'contents'}[7] = $result_trees{'complex_argument'}{'contents'}[6]{'extra'}{'spaces_after_command'};
  $result_trees{'complex_argument'}{'contents'}[8]{'parent'} = $result_trees{'complex_argument'};
  $result_trees{'complex_argument'}{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_argument'}{'contents'}[9]{'contents'}[0]{'args'}[0];
--- 606,612 ----
  $result_trees{'complex_argument'}{'contents'}[6]{'contents'}[1]{'parent'} = $result_trees{'complex_argument'}{'contents'}[6];
  $result_trees{'complex_argument'}{'contents'}[6]{'contents'}[2]{'parent'} = $result_trees{'complex_argument'}{'contents'}[6];
  $result_trees{'complex_argument'}{'contents'}[6]{'parent'} = $result_trees{'complex_argument'};
! $result_trees{'complex_argument'}{'contents'}[7]{'extra'}{'command'} = $result_trees{'complex_argument'}{'contents'}[6];
! $result_trees{'complex_argument'}{'contents'}[7]{'parent'} = $result_trees{'complex_argument'};
  $result_trees{'complex_argument'}{'contents'}[8]{'parent'} = $result_trees{'complex_argument'};
  $result_trees{'complex_argument'}{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'complex_argument'}{'contents'}[9]{'contents'}[0]{'args'}[0];
***************
*** 670,693 ****
  $result_trees{'complex_argument'}{'contents'}[10]{'contents'}[0]{'parent'} = $result_trees{'complex_argument'}{'contents'}[10];
  $result_trees{'complex_argument'}{'contents'}[10]{'contents'}[1]{'parent'} = $result_trees{'complex_argument'}{'contents'}[10];
! $result_trees{'complex_argument'}{'contents'}[10]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'complex_argument'}{'contents'}[10];
! $result_trees{'complex_argument'}{'contents'}[10]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'complex_argument'};
  $result_trees{'complex_argument'}{'contents'}[10]{'parent'} = $result_trees{'complex_argument'};
! $result_trees{'complex_argument'}{'contents'}[11] = $result_trees{'complex_argument'}{'contents'}[10]{'extra'}{'spaces_after_command'};
  $result_trees{'complex_argument'}{'contents'}[12]{'contents'}[0]{'extra'}{'command'} = $result_trees{'complex_argument'}{'contents'}[12];
  $result_trees{'complex_argument'}{'contents'}[12]{'contents'}[0]{'parent'} = $result_trees{'complex_argument'}{'contents'}[12];
  $result_trees{'complex_argument'}{'contents'}[12]{'contents'}[1]{'parent'} = $result_trees{'complex_argument'}{'contents'}[12];
  $result_trees{'complex_argument'}{'contents'}[12]{'contents'}[2]{'parent'} = $result_trees{'complex_argument'}{'contents'}[12];
! $result_trees{'complex_argument'}{'contents'}[12]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'complex_argument'}{'contents'}[12];
! $result_trees{'complex_argument'}{'contents'}[12]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'complex_argument'};
  $result_trees{'complex_argument'}{'contents'}[12]{'parent'} = $result_trees{'complex_argument'};
! $result_trees{'complex_argument'}{'contents'}[13] = $result_trees{'complex_argument'}{'contents'}[12]{'extra'}{'spaces_after_command'};
  $result_trees{'complex_argument'}{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'complex_argument'}{'contents'}[14];
  $result_trees{'complex_argument'}{'contents'}[14]{'args'}[1]{'parent'} = $result_trees{'complex_argument'}{'contents'}[14];
  $result_trees{'complex_argument'}{'contents'}[14]{'contents'}[0]{'parent'} = $result_trees{'complex_argument'}{'contents'}[14];
  $result_trees{'complex_argument'}{'contents'}[14]{'contents'}[1]{'parent'} = $result_trees{'complex_argument'}{'contents'}[14];
- $result_trees{'complex_argument'}{'contents'}[14]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'complex_argument'}{'contents'}[14];
- $result_trees{'complex_argument'}{'contents'}[14]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'complex_argument'};
  $result_trees{'complex_argument'}{'contents'}[14]{'parent'} = $result_trees{'complex_argument'};
! $result_trees{'complex_argument'}{'contents'}[15] = $result_trees{'complex_argument'}{'contents'}[14]{'extra'}{'spaces_after_command'};
  $result_trees{'complex_argument'}{'contents'}[16]{'contents'}[0]{'parent'} = $result_trees{'complex_argument'}{'contents'}[16];
  $result_trees{'complex_argument'}{'contents'}[16]{'contents'}[1]{'parent'} = $result_trees{'complex_argument'}{'contents'}[16];
--- 641,663 ----
  $result_trees{'complex_argument'}{'contents'}[10]{'contents'}[0]{'parent'} = $result_trees{'complex_argument'}{'contents'}[10];
  $result_trees{'complex_argument'}{'contents'}[10]{'contents'}[1]{'parent'} = $result_trees{'complex_argument'}{'contents'}[10];
! $result_trees{'complex_argument'}{'contents'}[10]{'extra'}{'spaces_after_command'} = $result_trees{'complex_argument'}{'contents'}[10]{'contents'}[0];
  $result_trees{'complex_argument'}{'contents'}[10]{'parent'} = $result_trees{'complex_argument'};
! $result_trees{'complex_argument'}{'contents'}[11]{'extra'}{'command'} = $result_trees{'complex_argument'}{'contents'}[10];
! $result_trees{'complex_argument'}{'contents'}[11]{'parent'} = $result_trees{'complex_argument'};
  $result_trees{'complex_argument'}{'contents'}[12]{'contents'}[0]{'extra'}{'command'} = $result_trees{'complex_argument'}{'contents'}[12];
  $result_trees{'complex_argument'}{'contents'}[12]{'contents'}[0]{'parent'} = $result_trees{'complex_argument'}{'contents'}[12];
  $result_trees{'complex_argument'}{'contents'}[12]{'contents'}[1]{'parent'} = $result_trees{'complex_argument'}{'contents'}[12];
  $result_trees{'complex_argument'}{'contents'}[12]{'contents'}[2]{'parent'} = $result_trees{'complex_argument'}{'contents'}[12];
! $result_trees{'complex_argument'}{'contents'}[12]{'extra'}{'spaces_after_command'} = $result_trees{'complex_argument'}{'contents'}[12]{'contents'}[0];
  $result_trees{'complex_argument'}{'contents'}[12]{'parent'} = $result_trees{'complex_argument'};
! $result_trees{'complex_argument'}{'contents'}[13]{'extra'}{'command'} = $result_trees{'complex_argument'}{'contents'}[12];
! $result_trees{'complex_argument'}{'contents'}[13]{'parent'} = $result_trees{'complex_argument'};
  $result_trees{'complex_argument'}{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'complex_argument'}{'contents'}[14];
  $result_trees{'complex_argument'}{'contents'}[14]{'args'}[1]{'parent'} = $result_trees{'complex_argument'}{'contents'}[14];
  $result_trees{'complex_argument'}{'contents'}[14]{'contents'}[0]{'parent'} = $result_trees{'complex_argument'}{'contents'}[14];
  $result_trees{'complex_argument'}{'contents'}[14]{'contents'}[1]{'parent'} = $result_trees{'complex_argument'}{'contents'}[14];
  $result_trees{'complex_argument'}{'contents'}[14]{'parent'} = $result_trees{'complex_argument'};
! $result_trees{'complex_argument'}{'contents'}[15]{'extra'}{'command'} = $result_trees{'complex_argument'}{'contents'}[14];
! $result_trees{'complex_argument'}{'contents'}[15]{'parent'} = $result_trees{'complex_argument'};
  $result_trees{'complex_argument'}{'contents'}[16]{'contents'}[0]{'parent'} = $result_trees{'complex_argument'}{'contents'}[16];
  $result_trees{'complex_argument'}{'contents'}[16]{'contents'}[1]{'parent'} = $result_trees{'complex_argument'}{'contents'}[16];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/double_macro_definition.pl texinfo-6.3/tp/t/results/macro/double_macro_definition.pl
*** texinfo-6.1/tp/t/results/macro/double_macro_definition.pl	2016-01-22 07:50:09.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/double_macro_definition.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 20,34 ****
        'extra' => {
          'arg_line' => ' foo
! ',
!         'macrobody' => '',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 20,24 ----
        'extra' => {
          'arg_line' => ' foo
! '
        },
        'line_nr' => {
***************
*** 39,43 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 29,41 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 58,72 ****
        'extra' => {
          'arg_line' => ' foo
! ',
!         'macrobody' => '',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 56,60 ----
        'extra' => {
          'arg_line' => ' foo
! '
        },
        'line_nr' => {
***************
*** 77,95 ****
        'parent' => {}
      },
!     {}
    ],
    'type' => 'text_root'
  };
  $result_trees{'double_macro_definition'}{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'double_macro_definition'}{'contents'}[0];
- $result_trees{'double_macro_definition'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'double_macro_definition'}{'contents'}[0];
- $result_trees{'double_macro_definition'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'double_macro_definition'};
  $result_trees{'double_macro_definition'}{'contents'}[0]{'parent'} = $result_trees{'double_macro_definition'};
! $result_trees{'double_macro_definition'}{'contents'}[1] = $result_trees{'double_macro_definition'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'double_macro_definition'}{'contents'}[2]{'parent'} = $result_trees{'double_macro_definition'};
  $result_trees{'double_macro_definition'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'double_macro_definition'}{'contents'}[3];
- $result_trees{'double_macro_definition'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'double_macro_definition'}{'contents'}[3];
- $result_trees{'double_macro_definition'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'double_macro_definition'};
  $result_trees{'double_macro_definition'}{'contents'}[3]{'parent'} = $result_trees{'double_macro_definition'};
! $result_trees{'double_macro_definition'}{'contents'}[4] = $result_trees{'double_macro_definition'}{'contents'}[3]{'extra'}{'spaces_after_command'};
  
  $result_texis{'double_macro_definition'} = '@macro foo
--- 65,89 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     }
    ],
    'type' => 'text_root'
  };
  $result_trees{'double_macro_definition'}{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'double_macro_definition'}{'contents'}[0];
  $result_trees{'double_macro_definition'}{'contents'}[0]{'parent'} = $result_trees{'double_macro_definition'};
! $result_trees{'double_macro_definition'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'double_macro_definition'}{'contents'}[0];
! $result_trees{'double_macro_definition'}{'contents'}[1]{'parent'} = $result_trees{'double_macro_definition'};
  $result_trees{'double_macro_definition'}{'contents'}[2]{'parent'} = $result_trees{'double_macro_definition'};
  $result_trees{'double_macro_definition'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'double_macro_definition'}{'contents'}[3];
  $result_trees{'double_macro_definition'}{'contents'}[3]{'parent'} = $result_trees{'double_macro_definition'};
! $result_trees{'double_macro_definition'}{'contents'}[4]{'extra'}{'command'} = $result_trees{'double_macro_definition'}{'contents'}[3];
! $result_trees{'double_macro_definition'}{'contents'}[4]{'parent'} = $result_trees{'double_macro_definition'};
  
  $result_texis{'double_macro_definition'} = '@macro foo
diff -Nrc2 texinfo-6.1/tp/t/results/macro/double_recursive_macro_call.pl texinfo-6.3/tp/t/results/macro/double_recursive_macro_call.pl
*** texinfo-6.1/tp/t/results/macro/double_recursive_macro_call.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/double_recursive_macro_call.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 43,61 ****
        'extra' => {
          'arg_line' => ' macone {arg}
! ',
!         'args_index' => {
!           'arg' => 0
!         },
!         'macrobody' => '@mactwo{}
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 43,47 ----
        'extra' => {
          'arg_line' => ' macone {arg}
! '
        },
        'line_nr' => {
***************
*** 66,70 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 52,64 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 102,120 ****
        'extra' => {
          'arg_line' => ' mactwo{arg}
! ',
!         'args_index' => {
!           'arg' => 0
!         },
!         'macrobody' => '@macone{}
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 96,100 ----
        'extra' => {
          'arg_line' => ' mactwo{arg}
! '
        },
        'line_nr' => {
***************
*** 125,129 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 105,117 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 146,153 ****
  $result_trees{'double_recursive_macro_call'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'double_recursive_macro_call'}{'contents'}[1];
  $result_trees{'double_recursive_macro_call'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'double_recursive_macro_call'}{'contents'}[1];
- $result_trees{'double_recursive_macro_call'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'double_recursive_macro_call'}{'contents'}[1];
- $result_trees{'double_recursive_macro_call'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'double_recursive_macro_call'};
  $result_trees{'double_recursive_macro_call'}{'contents'}[1]{'parent'} = $result_trees{'double_recursive_macro_call'};
! $result_trees{'double_recursive_macro_call'}{'contents'}[2] = $result_trees{'double_recursive_macro_call'}{'contents'}[1]{'extra'}{'spaces_after_command'};
  $result_trees{'double_recursive_macro_call'}{'contents'}[3]{'parent'} = $result_trees{'double_recursive_macro_call'};
  $result_trees{'double_recursive_macro_call'}{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'double_recursive_macro_call'}{'contents'}[4];
--- 134,140 ----
  $result_trees{'double_recursive_macro_call'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'double_recursive_macro_call'}{'contents'}[1];
  $result_trees{'double_recursive_macro_call'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'double_recursive_macro_call'}{'contents'}[1];
  $result_trees{'double_recursive_macro_call'}{'contents'}[1]{'parent'} = $result_trees{'double_recursive_macro_call'};
! $result_trees{'double_recursive_macro_call'}{'contents'}[2]{'extra'}{'command'} = $result_trees{'double_recursive_macro_call'}{'contents'}[1];
! $result_trees{'double_recursive_macro_call'}{'contents'}[2]{'parent'} = $result_trees{'double_recursive_macro_call'};
  $result_trees{'double_recursive_macro_call'}{'contents'}[3]{'parent'} = $result_trees{'double_recursive_macro_call'};
  $result_trees{'double_recursive_macro_call'}{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'double_recursive_macro_call'}{'contents'}[4];
***************
*** 155,162 ****
  $result_trees{'double_recursive_macro_call'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'double_recursive_macro_call'}{'contents'}[4];
  $result_trees{'double_recursive_macro_call'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'double_recursive_macro_call'}{'contents'}[4];
- $result_trees{'double_recursive_macro_call'}{'contents'}[4]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'double_recursive_macro_call'}{'contents'}[4];
- $result_trees{'double_recursive_macro_call'}{'contents'}[4]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'double_recursive_macro_call'};
  $result_trees{'double_recursive_macro_call'}{'contents'}[4]{'parent'} = $result_trees{'double_recursive_macro_call'};
! $result_trees{'double_recursive_macro_call'}{'contents'}[5] = $result_trees{'double_recursive_macro_call'}{'contents'}[4]{'extra'}{'spaces_after_command'};
  $result_trees{'double_recursive_macro_call'}{'contents'}[6]{'parent'} = $result_trees{'double_recursive_macro_call'};
  $result_trees{'double_recursive_macro_call'}{'contents'}[7]{'parent'} = $result_trees{'double_recursive_macro_call'};
--- 142,148 ----
  $result_trees{'double_recursive_macro_call'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'double_recursive_macro_call'}{'contents'}[4];
  $result_trees{'double_recursive_macro_call'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'double_recursive_macro_call'}{'contents'}[4];
  $result_trees{'double_recursive_macro_call'}{'contents'}[4]{'parent'} = $result_trees{'double_recursive_macro_call'};
! $result_trees{'double_recursive_macro_call'}{'contents'}[5]{'extra'}{'command'} = $result_trees{'double_recursive_macro_call'}{'contents'}[4];
! $result_trees{'double_recursive_macro_call'}{'contents'}[5]{'parent'} = $result_trees{'double_recursive_macro_call'};
  $result_trees{'double_recursive_macro_call'}{'contents'}[6]{'parent'} = $result_trees{'double_recursive_macro_call'};
  $result_trees{'double_recursive_macro_call'}{'contents'}[7]{'parent'} = $result_trees{'double_recursive_macro_call'};
diff -Nrc2 texinfo-6.1/tp/t/results/macro/empty_end.pl texinfo-6.3/tp/t/results/macro/empty_end.pl
*** texinfo-6.1/tp/t/results/macro/empty_end.pl	2016-01-22 07:50:09.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/empty_end.pl	2016-08-02 18:44:47.000000000 +0100
***************
*** 37,54 ****
        'extra' => {
          'arg_line' => ' foo {aaa, }
! ',
!         'args_index' => {
!           'aaa' => 0
!         },
!         'macrobody' => 'in foo
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 37,41 ----
        'extra' => {
          'arg_line' => ' foo {aaa, }
! '
        },
        'line_nr' => {
***************
*** 59,63 ****
        'parent' => {}
      },
!     {}
    ],
    'type' => 'text_root'
--- 46,57 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '',
!       'type' => 'empty_line_after_command'
!     }
    ],
    'type' => 'text_root'
***************
*** 67,74 ****
  $result_trees{'empty_end'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'empty_end'}{'contents'}[0];
  $result_trees{'empty_end'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'empty_end'}{'contents'}[0];
- $result_trees{'empty_end'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'empty_end'}{'contents'}[0];
- $result_trees{'empty_end'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'empty_end'};
  $result_trees{'empty_end'}{'contents'}[0]{'parent'} = $result_trees{'empty_end'};
! $result_trees{'empty_end'}{'contents'}[1] = $result_trees{'empty_end'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  
  $result_texis{'empty_end'} = '@macro foo {aaa, }
--- 61,67 ----
  $result_trees{'empty_end'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'empty_end'}{'contents'}[0];
  $result_trees{'empty_end'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'empty_end'}{'contents'}[0];
  $result_trees{'empty_end'}{'contents'}[0]{'parent'} = $result_trees{'empty_end'};
! $result_trees{'empty_end'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'empty_end'}{'contents'}[0];
! $result_trees{'empty_end'}{'contents'}[1]{'parent'} = $result_trees{'empty_end'};
  
  $result_texis{'empty_end'} = '@macro foo {aaa, }
diff -Nrc2 texinfo-6.1/tp/t/results/macro/empty_macro_in_text_no_arg.pl texinfo-6.3/tp/t/results/macro/empty_macro_in_text_no_arg.pl
*** texinfo-6.1/tp/t/results/macro/empty_macro_in_text_no_arg.pl	2016-01-22 07:50:09.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/empty_macro_in_text_no_arg.pl	2016-08-02 18:44:47.000000000 +0100
***************
*** 20,34 ****
        'extra' => {
          'arg_line' => ' texnl{}
! ',
!         'macrobody' => '',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 20,24 ----
        'extra' => {
          'arg_line' => ' texnl{}
! '
        },
        'line_nr' => {
***************
*** 39,43 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 29,41 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 80,94 ****
        'extra' => {
          'arg_line' => ' texnltwo
! ',
!         'macrobody' => '',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 78,82 ----
        'extra' => {
          'arg_line' => ' texnltwo
! '
        },
        'line_nr' => {
***************
*** 99,103 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 87,99 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 121,128 ****
  };
  $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[0];
- $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[0];
- $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'empty_macro_in_text_no_arg'};
  $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[0]{'parent'} = $result_trees{'empty_macro_in_text_no_arg'};
! $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[1] = $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[2]{'parent'} = $result_trees{'empty_macro_in_text_no_arg'};
  $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[3]{'parent'} = $result_trees{'empty_macro_in_text_no_arg'};
--- 117,123 ----
  };
  $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[0];
  $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[0]{'parent'} = $result_trees{'empty_macro_in_text_no_arg'};
! $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[0];
! $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[1]{'parent'} = $result_trees{'empty_macro_in_text_no_arg'};
  $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[2]{'parent'} = $result_trees{'empty_macro_in_text_no_arg'};
  $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[3]{'parent'} = $result_trees{'empty_macro_in_text_no_arg'};
***************
*** 131,138 ****
  $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[5]{'parent'} = $result_trees{'empty_macro_in_text_no_arg'};
  $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[6];
- $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[6]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[6];
- $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[6]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'empty_macro_in_text_no_arg'};
  $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[6]{'parent'} = $result_trees{'empty_macro_in_text_no_arg'};
! $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[7] = $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[6]{'extra'}{'spaces_after_command'};
  $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[8]{'parent'} = $result_trees{'empty_macro_in_text_no_arg'};
  $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[9]{'contents'}[0]{'parent'} = $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[9];
--- 126,132 ----
  $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[5]{'parent'} = $result_trees{'empty_macro_in_text_no_arg'};
  $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[6];
  $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[6]{'parent'} = $result_trees{'empty_macro_in_text_no_arg'};
! $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[7]{'extra'}{'command'} = $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[6];
! $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[7]{'parent'} = $result_trees{'empty_macro_in_text_no_arg'};
  $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[8]{'parent'} = $result_trees{'empty_macro_in_text_no_arg'};
  $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[9]{'contents'}[0]{'parent'} = $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[9];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/empty_macro_no_arg.pl texinfo-6.3/tp/t/results/macro/empty_macro_no_arg.pl
*** texinfo-6.1/tp/t/results/macro/empty_macro_no_arg.pl	2016-01-22 07:50:09.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/empty_macro_no_arg.pl	2016-08-02 18:44:47.000000000 +0100
***************
*** 20,34 ****
        'extra' => {
          'arg_line' => ' foo
! ',
!         'macrobody' => '',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 20,24 ----
        'extra' => {
          'arg_line' => ' foo
! '
        },
        'line_nr' => {
***************
*** 39,43 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 29,41 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 68,75 ****
  };
  $result_trees{'empty_macro_no_arg'}{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'empty_macro_no_arg'}{'contents'}[0];
- $result_trees{'empty_macro_no_arg'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'empty_macro_no_arg'}{'contents'}[0];
- $result_trees{'empty_macro_no_arg'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'empty_macro_no_arg'};
  $result_trees{'empty_macro_no_arg'}{'contents'}[0]{'parent'} = $result_trees{'empty_macro_no_arg'};
! $result_trees{'empty_macro_no_arg'}{'contents'}[1] = $result_trees{'empty_macro_no_arg'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'empty_macro_no_arg'}{'contents'}[2]{'parent'} = $result_trees{'empty_macro_no_arg'};
  $result_trees{'empty_macro_no_arg'}{'contents'}[3]{'parent'} = $result_trees{'empty_macro_no_arg'};
--- 66,72 ----
  };
  $result_trees{'empty_macro_no_arg'}{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'empty_macro_no_arg'}{'contents'}[0];
  $result_trees{'empty_macro_no_arg'}{'contents'}[0]{'parent'} = $result_trees{'empty_macro_no_arg'};
! $result_trees{'empty_macro_no_arg'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'empty_macro_no_arg'}{'contents'}[0];
! $result_trees{'empty_macro_no_arg'}{'contents'}[1]{'parent'} = $result_trees{'empty_macro_no_arg'};
  $result_trees{'empty_macro_no_arg'}{'contents'}[2]{'parent'} = $result_trees{'empty_macro_no_arg'};
  $result_trees{'empty_macro_no_arg'}{'contents'}[3]{'parent'} = $result_trees{'empty_macro_no_arg'};
diff -Nrc2 texinfo-6.1/tp/t/results/macro/expand_two_same.pl texinfo-6.3/tp/t/results/macro/expand_two_same.pl
*** texinfo-6.1/tp/t/results/macro/expand_two_same.pl	2016-01-22 07:50:09.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/expand_two_same.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 43,62 ****
        'extra' => {
          'arg_line' => ' macrotwo { arg }
! ',
!         'args_index' => {
!           'arg' => 0
!         },
!         'macrobody' => 'With a doubles arg \\arg\\ and re \\arg\\
! 
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 43,47 ----
        'extra' => {
          'arg_line' => ' macrotwo { arg }
! '
        },
        'line_nr' => {
***************
*** 67,71 ****
        'parent' => {}
      },
!     {},
      {
        'contents' => [
--- 52,64 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'contents' => [
***************
*** 193,200 ****
  $result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'expand_two_same'}{'contents'}[0];
  $result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'expand_two_same'}{'contents'}[0];
- $result_trees{'expand_two_same'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'expand_two_same'}{'contents'}[0];
- $result_trees{'expand_two_same'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'expand_two_same'};
  $result_trees{'expand_two_same'}{'contents'}[0]{'parent'} = $result_trees{'expand_two_same'};
! $result_trees{'expand_two_same'}{'contents'}[1] = $result_trees{'expand_two_same'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'expand_two_same'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'expand_two_same'}{'contents'}[2];
  $result_trees{'expand_two_same'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'expand_two_same'}{'contents'}[2];
--- 186,192 ----
  $result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'expand_two_same'}{'contents'}[0];
  $result_trees{'expand_two_same'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'expand_two_same'}{'contents'}[0];
  $result_trees{'expand_two_same'}{'contents'}[0]{'parent'} = $result_trees{'expand_two_same'};
! $result_trees{'expand_two_same'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'expand_two_same'}{'contents'}[0];
! $result_trees{'expand_two_same'}{'contents'}[1]{'parent'} = $result_trees{'expand_two_same'};
  $result_trees{'expand_two_same'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'expand_two_same'}{'contents'}[2];
  $result_trees{'expand_two_same'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'expand_two_same'}{'contents'}[2];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/expansion_order.pl texinfo-6.3/tp/t/results/macro/expansion_order.pl
*** texinfo-6.1/tp/t/results/macro/expansion_order.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/expansion_order.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 37,55 ****
        'extra' => {
          'arg_line' => ' bidule{arg}
! ',
!         'args_index' => {
!           'arg' => 0
!         },
!         'macrobody' => '@machin{}
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 37,41 ----
        'extra' => {
          'arg_line' => ' bidule{arg}
! '
        },
        'line_nr' => {
***************
*** 60,64 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 46,58 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 97,113 ****
        'extra' => {
          'arg_line' => ' machin
! ',
!         'macrobody' => '\\\\arg\\\\
! 
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 91,95 ----
        'extra' => {
          'arg_line' => ' machin
! '
        },
        'line_nr' => {
***************
*** 118,122 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 100,112 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 149,156 ****
  $result_trees{'expansion_order'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'expansion_order'}{'contents'}[0];
  $result_trees{'expansion_order'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'expansion_order'}{'contents'}[0];
- $result_trees{'expansion_order'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'expansion_order'}{'contents'}[0];
- $result_trees{'expansion_order'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'expansion_order'};
  $result_trees{'expansion_order'}{'contents'}[0]{'parent'} = $result_trees{'expansion_order'};
! $result_trees{'expansion_order'}{'contents'}[1] = $result_trees{'expansion_order'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'expansion_order'}{'contents'}[2]{'parent'} = $result_trees{'expansion_order'};
  $result_trees{'expansion_order'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'expansion_order'}{'contents'}[3];
--- 139,145 ----
  $result_trees{'expansion_order'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'expansion_order'}{'contents'}[0];
  $result_trees{'expansion_order'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'expansion_order'}{'contents'}[0];
  $result_trees{'expansion_order'}{'contents'}[0]{'parent'} = $result_trees{'expansion_order'};
! $result_trees{'expansion_order'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'expansion_order'}{'contents'}[0];
! $result_trees{'expansion_order'}{'contents'}[1]{'parent'} = $result_trees{'expansion_order'};
  $result_trees{'expansion_order'}{'contents'}[2]{'parent'} = $result_trees{'expansion_order'};
  $result_trees{'expansion_order'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'expansion_order'}{'contents'}[3];
***************
*** 158,165 ****
  $result_trees{'expansion_order'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'expansion_order'}{'contents'}[3];
  $result_trees{'expansion_order'}{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'expansion_order'}{'contents'}[3];
- $result_trees{'expansion_order'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'expansion_order'}{'contents'}[3];
- $result_trees{'expansion_order'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'expansion_order'};
  $result_trees{'expansion_order'}{'contents'}[3]{'parent'} = $result_trees{'expansion_order'};
! $result_trees{'expansion_order'}{'contents'}[4] = $result_trees{'expansion_order'}{'contents'}[3]{'extra'}{'spaces_after_command'};
  $result_trees{'expansion_order'}{'contents'}[5]{'parent'} = $result_trees{'expansion_order'};
  $result_trees{'expansion_order'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'expansion_order'}{'contents'}[6];
--- 147,153 ----
  $result_trees{'expansion_order'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'expansion_order'}{'contents'}[3];
  $result_trees{'expansion_order'}{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'expansion_order'}{'contents'}[3];
  $result_trees{'expansion_order'}{'contents'}[3]{'parent'} = $result_trees{'expansion_order'};
! $result_trees{'expansion_order'}{'contents'}[4]{'extra'}{'command'} = $result_trees{'expansion_order'}{'contents'}[3];
! $result_trees{'expansion_order'}{'contents'}[4]{'parent'} = $result_trees{'expansion_order'};
  $result_trees{'expansion_order'}{'contents'}[5]{'parent'} = $result_trees{'expansion_order'};
  $result_trees{'expansion_order'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'expansion_order'}{'contents'}[6];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/form_feeds.pl texinfo-6.3/tp/t/results/macro/form_feeds.pl
*** texinfo-6.1/tp/t/results/macro/form_feeds.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/form_feeds.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 42,61 ****
        'extra' => {
          'arg_line' => ' mymacro{a, b}
! ',
!         'args_index' => {
!           'a' => 0,
!           'b' => 1
!         },
!         'macrobody' => 'f \\a\\ n \\b\\
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 42,46 ----
        'extra' => {
          'arg_line' => ' mymacro{a, b}
! '
        },
        'line_nr' => {
***************
*** 66,70 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 51,63 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 102,120 ****
        'extra' => {
          'arg_line' => ' oneargmacro{c}
! ',
!         'args_index' => {
!           'c' => 0
!         },
!         'macrobody' => 'g \\c\\ v
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 95,99 ----
        'extra' => {
          'arg_line' => ' oneargmacro{c}
! '
        },
        'line_nr' => {
***************
*** 125,129 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 104,116 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 262,269 ****
  $result_trees{'form_feeds'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'form_feeds'}{'contents'}[0];
  $result_trees{'form_feeds'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'form_feeds'}{'contents'}[0];
- $result_trees{'form_feeds'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'form_feeds'}{'contents'}[0];
- $result_trees{'form_feeds'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'form_feeds'};
  $result_trees{'form_feeds'}{'contents'}[0]{'parent'} = $result_trees{'form_feeds'};
! $result_trees{'form_feeds'}{'contents'}[1] = $result_trees{'form_feeds'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'form_feeds'}{'contents'}[2]{'parent'} = $result_trees{'form_feeds'};
  $result_trees{'form_feeds'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'form_feeds'}{'contents'}[3];
--- 249,255 ----
  $result_trees{'form_feeds'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'form_feeds'}{'contents'}[0];
  $result_trees{'form_feeds'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'form_feeds'}{'contents'}[0];
  $result_trees{'form_feeds'}{'contents'}[0]{'parent'} = $result_trees{'form_feeds'};
! $result_trees{'form_feeds'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'form_feeds'}{'contents'}[0];
! $result_trees{'form_feeds'}{'contents'}[1]{'parent'} = $result_trees{'form_feeds'};
  $result_trees{'form_feeds'}{'contents'}[2]{'parent'} = $result_trees{'form_feeds'};
  $result_trees{'form_feeds'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'form_feeds'}{'contents'}[3];
***************
*** 271,278 ****
  $result_trees{'form_feeds'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'form_feeds'}{'contents'}[3];
  $result_trees{'form_feeds'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'form_feeds'}{'contents'}[3];
- $result_trees{'form_feeds'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'form_feeds'}{'contents'}[3];
- $result_trees{'form_feeds'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'form_feeds'};
  $result_trees{'form_feeds'}{'contents'}[3]{'parent'} = $result_trees{'form_feeds'};
! $result_trees{'form_feeds'}{'contents'}[4] = $result_trees{'form_feeds'}{'contents'}[3]{'extra'}{'spaces_after_command'};
  $result_trees{'form_feeds'}{'contents'}[5]{'parent'} = $result_trees{'form_feeds'};
  $result_trees{'form_feeds'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'form_feeds'}{'contents'}[6];
--- 257,263 ----
  $result_trees{'form_feeds'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'form_feeds'}{'contents'}[3];
  $result_trees{'form_feeds'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'form_feeds'}{'contents'}[3];
  $result_trees{'form_feeds'}{'contents'}[3]{'parent'} = $result_trees{'form_feeds'};
! $result_trees{'form_feeds'}{'contents'}[4]{'extra'}{'command'} = $result_trees{'form_feeds'}{'contents'}[3];
! $result_trees{'form_feeds'}{'contents'}[4]{'parent'} = $result_trees{'form_feeds'};
  $result_trees{'form_feeds'}{'contents'}[5]{'parent'} = $result_trees{'form_feeds'};
  $result_trees{'form_feeds'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'form_feeds'}{'contents'}[6];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/ifclear_in_macro.pl texinfo-6.3/tp/t/results/macro/ifclear_in_macro.pl
*** texinfo-6.1/tp/t/results/macro/ifclear_in_macro.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/ifclear_in_macro.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 49,69 ****
        'extra' => {
          'arg_line' => ' note {arg}
! ',
!         'args_index' => {
!           'arg' => 0
!         },
!         'macrobody' => '@ifclear notes 
! \\arg\\
! @end ifclear
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 49,53 ----
        'extra' => {
          'arg_line' => ' note {arg}
! '
        },
        'line_nr' => {
***************
*** 74,78 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 58,70 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 107,114 ****
  $result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'ifclear_in_macro'}{'contents'}[0];
  $result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'ifclear_in_macro'}{'contents'}[0];
- $result_trees{'ifclear_in_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'ifclear_in_macro'}{'contents'}[0];
- $result_trees{'ifclear_in_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'ifclear_in_macro'};
  $result_trees{'ifclear_in_macro'}{'contents'}[0]{'parent'} = $result_trees{'ifclear_in_macro'};
! $result_trees{'ifclear_in_macro'}{'contents'}[1] = $result_trees{'ifclear_in_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'ifclear_in_macro'}{'contents'}[2]{'parent'} = $result_trees{'ifclear_in_macro'};
  $result_trees{'ifclear_in_macro'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'ifclear_in_macro'}{'contents'}[3];
--- 99,105 ----
  $result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'ifclear_in_macro'}{'contents'}[0];
  $result_trees{'ifclear_in_macro'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'ifclear_in_macro'}{'contents'}[0];
  $result_trees{'ifclear_in_macro'}{'contents'}[0]{'parent'} = $result_trees{'ifclear_in_macro'};
! $result_trees{'ifclear_in_macro'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'ifclear_in_macro'}{'contents'}[0];
! $result_trees{'ifclear_in_macro'}{'contents'}[1]{'parent'} = $result_trees{'ifclear_in_macro'};
  $result_trees{'ifclear_in_macro'}{'contents'}[2]{'parent'} = $result_trees{'ifclear_in_macro'};
  $result_trees{'ifclear_in_macro'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'ifclear_in_macro'}{'contents'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/ifset_and_end_isef_in_macro.pl texinfo-6.3/tp/t/results/macro/ifset_and_end_isef_in_macro.pl
*** texinfo-6.1/tp/t/results/macro/ifset_and_end_isef_in_macro.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/ifset_and_end_isef_in_macro.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 32,47 ****
        'extra' => {
          'arg_line' => ' beginifset {}
! ',
!         'macrobody' => '@ifset a
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 32,36 ----
        'extra' => {
          'arg_line' => ' beginifset {}
! '
        },
        'line_nr' => {
***************
*** 52,56 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 41,53 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 83,98 ****
        'extra' => {
          'arg_line' => ' endifset {}
! ',
!         'macrobody' => '@end ifset
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 80,84 ----
        'extra' => {
          'arg_line' => ' endifset {}
! '
        },
        'line_nr' => {
***************
*** 103,107 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 89,101 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 116,131 ****
  $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0];
  $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0];
- $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0];
- $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'ifset_and_end_isef_in_macro'};
  $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'parent'} = $result_trees{'ifset_and_end_isef_in_macro'};
! $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[1] = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[2]{'parent'} = $result_trees{'ifset_and_end_isef_in_macro'};
  $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3];
  $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3];
  $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3];
- $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3];
- $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'ifset_and_end_isef_in_macro'};
  $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3]{'parent'} = $result_trees{'ifset_and_end_isef_in_macro'};
! $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[4] = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3]{'extra'}{'spaces_after_command'};
  $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[5]{'parent'} = $result_trees{'ifset_and_end_isef_in_macro'};
  
--- 110,123 ----
  $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0];
  $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0];
  $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0]{'parent'} = $result_trees{'ifset_and_end_isef_in_macro'};
! $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[0];
! $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[1]{'parent'} = $result_trees{'ifset_and_end_isef_in_macro'};
  $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[2]{'parent'} = $result_trees{'ifset_and_end_isef_in_macro'};
  $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3];
  $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3];
  $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3];
  $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3]{'parent'} = $result_trees{'ifset_and_end_isef_in_macro'};
! $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[4]{'extra'}{'command'} = $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[3];
! $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[4]{'parent'} = $result_trees{'ifset_and_end_isef_in_macro'};
  $result_trees{'ifset_and_end_isef_in_macro'}{'contents'}[5]{'parent'} = $result_trees{'ifset_and_end_isef_in_macro'};
  
diff -Nrc2 texinfo-6.1/tp/t/results/macro/ifset_in_macro.pl texinfo-6.3/tp/t/results/macro/ifset_in_macro.pl
*** texinfo-6.1/tp/t/results/macro/ifset_in_macro.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/ifset_in_macro.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 49,69 ****
        'extra' => {
          'arg_line' => ' note {arg}
! ',
!         'args_index' => {
!           'arg' => 0
!         },
!         'macrobody' => '@ifset notes 
! \\arg\\
! @end ifset
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 49,53 ----
        'extra' => {
          'arg_line' => ' note {arg}
! '
        },
        'line_nr' => {
***************
*** 74,78 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 58,70 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 90,97 ****
  $result_trees{'ifset_in_macro'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'ifset_in_macro'}{'contents'}[0];
  $result_trees{'ifset_in_macro'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'ifset_in_macro'}{'contents'}[0];
- $result_trees{'ifset_in_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'ifset_in_macro'}{'contents'}[0];
- $result_trees{'ifset_in_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'ifset_in_macro'};
  $result_trees{'ifset_in_macro'}{'contents'}[0]{'parent'} = $result_trees{'ifset_in_macro'};
! $result_trees{'ifset_in_macro'}{'contents'}[1] = $result_trees{'ifset_in_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'ifset_in_macro'}{'contents'}[2]{'parent'} = $result_trees{'ifset_in_macro'};
  
--- 82,88 ----
  $result_trees{'ifset_in_macro'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'ifset_in_macro'}{'contents'}[0];
  $result_trees{'ifset_in_macro'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'ifset_in_macro'}{'contents'}[0];
  $result_trees{'ifset_in_macro'}{'contents'}[0]{'parent'} = $result_trees{'ifset_in_macro'};
! $result_trees{'ifset_in_macro'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'ifset_in_macro'}{'contents'}[0];
! $result_trees{'ifset_in_macro'}{'contents'}[1]{'parent'} = $result_trees{'ifset_in_macro'};
  $result_trees{'ifset_in_macro'}{'contents'}[2]{'parent'} = $result_trees{'ifset_in_macro'};
  
diff -Nrc2 texinfo-6.1/tp/t/results/macro/ifset_in_macro_set.pl texinfo-6.3/tp/t/results/macro/ifset_in_macro_set.pl
*** texinfo-6.1/tp/t/results/macro/ifset_in_macro_set.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/ifset_in_macro_set.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 49,69 ****
        'extra' => {
          'arg_line' => ' note {arg}
! ',
!         'args_index' => {
!           'arg' => 0
!         },
!         'macrobody' => '@ifset notes 
! \\arg\\
! @end ifset
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 49,53 ----
        'extra' => {
          'arg_line' => ' note {arg}
! '
        },
        'line_nr' => {
***************
*** 74,78 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 58,70 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 107,114 ****
  $result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'ifset_in_macro_set'}{'contents'}[0];
  $result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'ifset_in_macro_set'}{'contents'}[0];
- $result_trees{'ifset_in_macro_set'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'ifset_in_macro_set'}{'contents'}[0];
- $result_trees{'ifset_in_macro_set'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'ifset_in_macro_set'};
  $result_trees{'ifset_in_macro_set'}{'contents'}[0]{'parent'} = $result_trees{'ifset_in_macro_set'};
! $result_trees{'ifset_in_macro_set'}{'contents'}[1] = $result_trees{'ifset_in_macro_set'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'ifset_in_macro_set'}{'contents'}[2]{'parent'} = $result_trees{'ifset_in_macro_set'};
  $result_trees{'ifset_in_macro_set'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'ifset_in_macro_set'}{'contents'}[3];
--- 99,105 ----
  $result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'ifset_in_macro_set'}{'contents'}[0];
  $result_trees{'ifset_in_macro_set'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'ifset_in_macro_set'}{'contents'}[0];
  $result_trees{'ifset_in_macro_set'}{'contents'}[0]{'parent'} = $result_trees{'ifset_in_macro_set'};
! $result_trees{'ifset_in_macro_set'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'ifset_in_macro_set'}{'contents'}[0];
! $result_trees{'ifset_in_macro_set'}{'contents'}[1]{'parent'} = $result_trees{'ifset_in_macro_set'};
  $result_trees{'ifset_in_macro_set'}{'contents'}[2]{'parent'} = $result_trees{'ifset_in_macro_set'};
  $result_trees{'ifset_in_macro_set'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'ifset_in_macro_set'}{'contents'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/ignored_macro_definition.pl texinfo-6.3/tp/t/results/macro/ignored_macro_definition.pl
*** texinfo-6.1/tp/t/results/macro/ignored_macro_definition.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/ignored_macro_definition.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 32,47 ****
        'extra' => {
          'arg_line' => ' mymacro{}
! ',
!         'macrobody' => 'outside
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 32,36 ----
        'extra' => {
          'arg_line' => ' mymacro{}
! '
        },
        'line_nr' => {
***************
*** 52,56 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 41,53 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 80,155 ****
              },
              {
!               'contents' => [
!                 {
!                   'text' => '
! ',
!                   'type' => 'empty_spaces_before_argument'
!                 },
!                 {
!                   'args' => [
!                     {
!                       'parent' => {},
!                       'text' => 'mymacro',
!                       'type' => 'misc_arg'
!                     }
!                   ],
!                   'cmdname' => 'unmacro',
!                   'extra' => {
!                     'arg_line' => ' mymacro
! ',
!                     'misc_args' => [
!                       'mymacro'
!                     ]
!                   },
!                   'parent' => {}
!                 },
!                 {
!                   'args' => [
!                     {
!                       'parent' => {},
!                       'text' => 'mymacro',
!                       'type' => 'macro_name'
!                     }
!                   ],
!                   'cmdname' => 'macro',
!                   'contents' => [
!                     {
!                       'parent' => {},
!                       'text' => 'in inlinefmt tex',
!                       'type' => 'raw'
!                     },
!                     {
!                       'parent' => {},
!                       'text' => '
! ',
!                       'type' => 'last_raw_newline'
!                     }
!                   ],
!                   'extra' => {
!                     'arg_line' => ' mymacro{}
! ',
!                     'macrobody' => 'in inlinefmt tex
! ',
!                     'spaces_after_command' => {
!                       'extra' => {
!                         'command' => {}
!                       },
!                       'parent' => {},
!                       'text' => '
! ',
!                       'type' => 'empty_line_after_command'
!                     }
!                   },
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 8,
!                     'macro' => ''
!                   },
!                   'parent' => {}
!                 },
!                 {}
!               ],
                'parent' => {},
!               'type' => 'brace_command_arg'
              }
            ],
--- 77,83 ----
              },
              {
!               'contents' => [],
                'parent' => {},
!               'type' => 'elided'
              }
            ],
***************
*** 161,175 ****
                  {}
                ],
!               [
!                 {},
!                 {},
!                 {}
!               ]
              ],
!             'format' => 'tex',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 89,95 ----
                  {}
                ],
!               undef
              ],
!             'format' => 'tex'
            },
            'line_nr' => {
***************
*** 212,237 ****
  $result_trees{'ignored_macro_definition'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'ignored_macro_definition'}{'contents'}[0];
  $result_trees{'ignored_macro_definition'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'ignored_macro_definition'}{'contents'}[0];
- $result_trees{'ignored_macro_definition'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'ignored_macro_definition'}{'contents'}[0];
- $result_trees{'ignored_macro_definition'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'ignored_macro_definition'};
  $result_trees{'ignored_macro_definition'}{'contents'}[0]{'parent'} = $result_trees{'ignored_macro_definition'};
! $result_trees{'ignored_macro_definition'}{'contents'}[1] = $result_trees{'ignored_macro_definition'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'ignored_macro_definition'}{'contents'}[2]{'parent'} = $result_trees{'ignored_macro_definition'};
  $result_trees{'ignored_macro_definition'}{'contents'}[3]{'parent'} = $result_trees{'ignored_macro_definition'};
  $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[0];
  $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0];
- $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[1];
- $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1];
- $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2];
- $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2];
- $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2];
- $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2];
- $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1];
- $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1];
- $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[3] = $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2]{'extra'}{'spaces_after_command'};
  $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0];
  $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
- $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0] = $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[1];
- $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][1] = $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2];
- $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][2] = $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2]{'extra'}{'spaces_after_command'};
  $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'ignored_macro_definition'}{'contents'}[4];
  $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'ignored_macro_definition'}{'contents'}[4];
--- 132,144 ----
  $result_trees{'ignored_macro_definition'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'ignored_macro_definition'}{'contents'}[0];
  $result_trees{'ignored_macro_definition'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'ignored_macro_definition'}{'contents'}[0];
  $result_trees{'ignored_macro_definition'}{'contents'}[0]{'parent'} = $result_trees{'ignored_macro_definition'};
! $result_trees{'ignored_macro_definition'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'ignored_macro_definition'}{'contents'}[0];
! $result_trees{'ignored_macro_definition'}{'contents'}[1]{'parent'} = $result_trees{'ignored_macro_definition'};
  $result_trees{'ignored_macro_definition'}{'contents'}[2]{'parent'} = $result_trees{'ignored_macro_definition'};
  $result_trees{'ignored_macro_definition'}{'contents'}[3]{'parent'} = $result_trees{'ignored_macro_definition'};
  $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[0];
  $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0];
  $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0];
  $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
  $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'ignored_macro_definition'}{'contents'}[4];
  $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'ignored_macro_definition'}{'contents'}[4];
***************
*** 246,255 ****
  
  
! @inlinefmt{tex,
! @unmacro mymacro
! @macro mymacro{}
! in inlinefmt tex
! @end macro
! }
  
  outside.
--- 153,157 ----
  
  
! @inlinefmt{tex,}
  
  outside.
diff -Nrc2 texinfo-6.1/tp/t/results/macro/implicit_quoting_one_arg.pl texinfo-6.3/tp/t/results/macro/implicit_quoting_one_arg.pl
*** texinfo-6.1/tp/t/results/macro/implicit_quoting_one_arg.pl	2016-01-22 07:50:09.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/implicit_quoting_one_arg.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 43,61 ****
        'extra' => {
          'arg_line' => ' FIXME{a}
! ',
!         'args_index' => {
!           'a' => 0
!         },
!         'macrobody' => '@strong{FIXME: \\a\\}
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 43,47 ----
        'extra' => {
          'arg_line' => ' FIXME{a}
! '
        },
        'line_nr' => {
***************
*** 66,70 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 52,64 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 114,121 ****
  $result_trees{'implicit_quoting_one_arg'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'implicit_quoting_one_arg'}{'contents'}[1];
  $result_trees{'implicit_quoting_one_arg'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'implicit_quoting_one_arg'}{'contents'}[1];
- $result_trees{'implicit_quoting_one_arg'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'implicit_quoting_one_arg'}{'contents'}[1];
- $result_trees{'implicit_quoting_one_arg'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'implicit_quoting_one_arg'};
  $result_trees{'implicit_quoting_one_arg'}{'contents'}[1]{'parent'} = $result_trees{'implicit_quoting_one_arg'};
! $result_trees{'implicit_quoting_one_arg'}{'contents'}[2] = $result_trees{'implicit_quoting_one_arg'}{'contents'}[1]{'extra'}{'spaces_after_command'};
  $result_trees{'implicit_quoting_one_arg'}{'contents'}[3]{'parent'} = $result_trees{'implicit_quoting_one_arg'};
  $result_trees{'implicit_quoting_one_arg'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'implicit_quoting_one_arg'}{'contents'}[4]{'contents'}[0]{'args'}[0];
--- 108,114 ----
  $result_trees{'implicit_quoting_one_arg'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'implicit_quoting_one_arg'}{'contents'}[1];
  $result_trees{'implicit_quoting_one_arg'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'implicit_quoting_one_arg'}{'contents'}[1];
  $result_trees{'implicit_quoting_one_arg'}{'contents'}[1]{'parent'} = $result_trees{'implicit_quoting_one_arg'};
! $result_trees{'implicit_quoting_one_arg'}{'contents'}[2]{'extra'}{'command'} = $result_trees{'implicit_quoting_one_arg'}{'contents'}[1];
! $result_trees{'implicit_quoting_one_arg'}{'contents'}[2]{'parent'} = $result_trees{'implicit_quoting_one_arg'};
  $result_trees{'implicit_quoting_one_arg'}{'contents'}[3]{'parent'} = $result_trees{'implicit_quoting_one_arg'};
  $result_trees{'implicit_quoting_one_arg'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'implicit_quoting_one_arg'}{'contents'}[4]{'contents'}[0]{'args'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/implicit_quoting_recursion.pl texinfo-6.3/tp/t/results/macro/implicit_quoting_recursion.pl
*** texinfo-6.1/tp/t/results/macro/implicit_quoting_recursion.pl	2016-01-22 07:50:09.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/implicit_quoting_recursion.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 42,61 ****
        'extra' => {
          'arg_line' => ' cat{a,b}
! ',
!         'args_index' => {
!           'a' => 0,
!           'b' => 1
!         },
!         'macrobody' => '\\a\\\\b\\
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 42,46 ----
        'extra' => {
          'arg_line' => ' cat{a,b}
! '
        },
        'line_nr' => {
***************
*** 66,70 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 51,63 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 92,99 ****
  $result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'implicit_quoting_recursion'}{'contents'}[0];
  $result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'implicit_quoting_recursion'}{'contents'}[0];
- $result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'implicit_quoting_recursion'}{'contents'}[0];
- $result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'implicit_quoting_recursion'};
  $result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'parent'} = $result_trees{'implicit_quoting_recursion'};
! $result_trees{'implicit_quoting_recursion'}{'contents'}[1] = $result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'implicit_quoting_recursion'}{'contents'}[2]{'parent'} = $result_trees{'implicit_quoting_recursion'};
  $result_trees{'implicit_quoting_recursion'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'implicit_quoting_recursion'}{'contents'}[3];
--- 85,91 ----
  $result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'implicit_quoting_recursion'}{'contents'}[0];
  $result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'implicit_quoting_recursion'}{'contents'}[0];
  $result_trees{'implicit_quoting_recursion'}{'contents'}[0]{'parent'} = $result_trees{'implicit_quoting_recursion'};
! $result_trees{'implicit_quoting_recursion'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'implicit_quoting_recursion'}{'contents'}[0];
! $result_trees{'implicit_quoting_recursion'}{'contents'}[1]{'parent'} = $result_trees{'implicit_quoting_recursion'};
  $result_trees{'implicit_quoting_recursion'}{'contents'}[2]{'parent'} = $result_trees{'implicit_quoting_recursion'};
  $result_trees{'implicit_quoting_recursion'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'implicit_quoting_recursion'}{'contents'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/leading_spaces_ignore.pl texinfo-6.3/tp/t/results/macro/leading_spaces_ignore.pl
*** texinfo-6.1/tp/t/results/macro/leading_spaces_ignore.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/leading_spaces_ignore.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 38,54 ****
        'extra' => {
          'arg_line' => ' mymacro
! ',
!         'macrobody' => 'Some  here
! text
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 38,42 ----
        'extra' => {
          'arg_line' => ' mymacro
! '
        },
        'line_nr' => {
***************
*** 59,63 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 47,59 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 89,96 ****
  $result_trees{'leading_spaces_ignore'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'leading_spaces_ignore'}{'contents'}[0];
  $result_trees{'leading_spaces_ignore'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'leading_spaces_ignore'}{'contents'}[0];
- $result_trees{'leading_spaces_ignore'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'leading_spaces_ignore'}{'contents'}[0];
- $result_trees{'leading_spaces_ignore'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'leading_spaces_ignore'};
  $result_trees{'leading_spaces_ignore'}{'contents'}[0]{'parent'} = $result_trees{'leading_spaces_ignore'};
! $result_trees{'leading_spaces_ignore'}{'contents'}[1] = $result_trees{'leading_spaces_ignore'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'leading_spaces_ignore'}{'contents'}[2]{'parent'} = $result_trees{'leading_spaces_ignore'};
  $result_trees{'leading_spaces_ignore'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'leading_spaces_ignore'}{'contents'}[3];
--- 85,91 ----
  $result_trees{'leading_spaces_ignore'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'leading_spaces_ignore'}{'contents'}[0];
  $result_trees{'leading_spaces_ignore'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'leading_spaces_ignore'}{'contents'}[0];
  $result_trees{'leading_spaces_ignore'}{'contents'}[0]{'parent'} = $result_trees{'leading_spaces_ignore'};
! $result_trees{'leading_spaces_ignore'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'leading_spaces_ignore'}{'contents'}[0];
! $result_trees{'leading_spaces_ignore'}{'contents'}[1]{'parent'} = $result_trees{'leading_spaces_ignore'};
  $result_trees{'leading_spaces_ignore'}{'contents'}[2]{'parent'} = $result_trees{'leading_spaces_ignore'};
  $result_trees{'leading_spaces_ignore'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'leading_spaces_ignore'}{'contents'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/leading_spaces_no_ignore.pl texinfo-6.3/tp/t/results/macro/leading_spaces_no_ignore.pl
*** texinfo-6.1/tp/t/results/macro/leading_spaces_no_ignore.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/leading_spaces_no_ignore.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 38,54 ****
        'extra' => {
          'arg_line' => ' mymacro
! ',
!         'macrobody' => '  Some  here
!   text
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 38,42 ----
        'extra' => {
          'arg_line' => ' mymacro
! '
        },
        'line_nr' => {
***************
*** 59,63 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 47,59 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 94,101 ****
  $result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'leading_spaces_no_ignore'}{'contents'}[0];
  $result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'leading_spaces_no_ignore'}{'contents'}[0];
- $result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'leading_spaces_no_ignore'}{'contents'}[0];
- $result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'leading_spaces_no_ignore'};
  $result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'parent'} = $result_trees{'leading_spaces_no_ignore'};
! $result_trees{'leading_spaces_no_ignore'}{'contents'}[1] = $result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'leading_spaces_no_ignore'}{'contents'}[2]{'parent'} = $result_trees{'leading_spaces_no_ignore'};
  $result_trees{'leading_spaces_no_ignore'}{'contents'}[3]{'parent'} = $result_trees{'leading_spaces_no_ignore'};
--- 90,96 ----
  $result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'leading_spaces_no_ignore'}{'contents'}[0];
  $result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'leading_spaces_no_ignore'}{'contents'}[0];
  $result_trees{'leading_spaces_no_ignore'}{'contents'}[0]{'parent'} = $result_trees{'leading_spaces_no_ignore'};
! $result_trees{'leading_spaces_no_ignore'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'leading_spaces_no_ignore'}{'contents'}[0];
! $result_trees{'leading_spaces_no_ignore'}{'contents'}[1]{'parent'} = $result_trees{'leading_spaces_no_ignore'};
  $result_trees{'leading_spaces_no_ignore'}{'contents'}[2]{'parent'} = $result_trees{'leading_spaces_no_ignore'};
  $result_trees{'leading_spaces_no_ignore'}{'contents'}[3]{'parent'} = $result_trees{'leading_spaces_no_ignore'};
diff -Nrc2 texinfo-6.1/tp/t/results/macro/macro_expands_to_empty.pl texinfo-6.3/tp/t/results/macro/macro_expands_to_empty.pl
*** texinfo-6.1/tp/t/results/macro/macro_expands_to_empty.pl	2016-01-22 07:50:09.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/macro_expands_to_empty.pl	2016-08-02 18:44:47.000000000 +0100
***************
*** 37,55 ****
        'extra' => {
          'arg_line' => ' foo {arg}
! ',
!         'args_index' => {
!           'arg' => 0
!         },
!         'macrobody' => '\\arg\\
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 37,41 ----
        'extra' => {
          'arg_line' => ' foo {arg}
! '
        },
        'line_nr' => {
***************
*** 60,64 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 46,58 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 91,98 ****
  $result_trees{'macro_expands_to_empty'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_expands_to_empty'}{'contents'}[0];
  $result_trees{'macro_expands_to_empty'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_expands_to_empty'}{'contents'}[0];
- $result_trees{'macro_expands_to_empty'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_expands_to_empty'}{'contents'}[0];
- $result_trees{'macro_expands_to_empty'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_expands_to_empty'};
  $result_trees{'macro_expands_to_empty'}{'contents'}[0]{'parent'} = $result_trees{'macro_expands_to_empty'};
! $result_trees{'macro_expands_to_empty'}{'contents'}[1] = $result_trees{'macro_expands_to_empty'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_expands_to_empty'}{'contents'}[2]{'parent'} = $result_trees{'macro_expands_to_empty'};
  $result_trees{'macro_expands_to_empty'}{'contents'}[3]{'parent'} = $result_trees{'macro_expands_to_empty'};
--- 85,91 ----
  $result_trees{'macro_expands_to_empty'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_expands_to_empty'}{'contents'}[0];
  $result_trees{'macro_expands_to_empty'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_expands_to_empty'}{'contents'}[0];
  $result_trees{'macro_expands_to_empty'}{'contents'}[0]{'parent'} = $result_trees{'macro_expands_to_empty'};
! $result_trees{'macro_expands_to_empty'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'macro_expands_to_empty'}{'contents'}[0];
! $result_trees{'macro_expands_to_empty'}{'contents'}[1]{'parent'} = $result_trees{'macro_expands_to_empty'};
  $result_trees{'macro_expands_to_empty'}{'contents'}[2]{'parent'} = $result_trees{'macro_expands_to_empty'};
  $result_trees{'macro_expands_to_empty'}{'contents'}[3]{'parent'} = $result_trees{'macro_expands_to_empty'};
diff -Nrc2 texinfo-6.1/tp/t/results/macro/macro_expansion.pl texinfo-6.3/tp/t/results/macro/macro_expansion.pl
*** texinfo-6.1/tp/t/results/macro/macro_expansion.pl	2016-01-22 07:50:09.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/macro_expansion.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 66,88 ****
        'extra' => {
          'arg_line' => ' macroone {arg1, arg2 }
! ',
!         'args_index' => {
!           'arg1' => 0,
!           'arg2' => 1
!         },
!         'macrobody' => 'result of a macro with \\arg1\\ and 
! @verbatim
! \\arg2\\
! @end verbatim
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 66,70 ----
        'extra' => {
          'arg_line' => ' macroone {arg1, arg2 }
! '
        },
        'line_nr' => {
***************
*** 93,97 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 75,87 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 131,142 ****
        ],
        'extra' => {
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 121,125 ----
        ],
        'extra' => {
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 221,232 ****
        ],
        'extra' => {
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 204,208 ----
        ],
        'extra' => {
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 285,296 ****
        ],
        'extra' => {
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => ' ',
!           'type' => 'empty_spaces_after_command'
!         }
        },
        'line_nr' => {
--- 261,265 ----
        ],
        'extra' => {
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 301,305 ****
        'parent' => {}
      },
!     {},
      {
        'contents' => [
--- 270,281 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => ' ',
!       'type' => 'empty_spaces_after_command'
!     },
      {
        'contents' => [
***************
*** 350,361 ****
        ],
        'extra' => {
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 326,330 ----
        ],
        'extra' => {
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 414,425 ****
        ],
        'extra' => {
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 383,387 ----
        ],
        'extra' => {
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 507,518 ****
        ],
        'extra' => {
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 469,473 ----
        ],
        'extra' => {
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 545,552 ****
  $result_trees{'macro_expansion'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[1];
  $result_trees{'macro_expansion'}{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[1];
- $result_trees{'macro_expansion'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_expansion'}{'contents'}[1];
- $result_trees{'macro_expansion'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_expansion'};
  $result_trees{'macro_expansion'}{'contents'}[1]{'parent'} = $result_trees{'macro_expansion'};
! $result_trees{'macro_expansion'}{'contents'}[2] = $result_trees{'macro_expansion'}{'contents'}[1]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_expansion'}{'contents'}[3]{'parent'} = $result_trees{'macro_expansion'};
  $result_trees{'macro_expansion'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[4];
--- 500,506 ----
  $result_trees{'macro_expansion'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[1];
  $result_trees{'macro_expansion'}{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[1];
  $result_trees{'macro_expansion'}{'contents'}[1]{'parent'} = $result_trees{'macro_expansion'};
! $result_trees{'macro_expansion'}{'contents'}[2]{'extra'}{'command'} = $result_trees{'macro_expansion'}{'contents'}[1];
! $result_trees{'macro_expansion'}{'contents'}[2]{'parent'} = $result_trees{'macro_expansion'};
  $result_trees{'macro_expansion'}{'contents'}[3]{'parent'} = $result_trees{'macro_expansion'};
  $result_trees{'macro_expansion'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[4];
***************
*** 555,560 ****
  $result_trees{'macro_expansion'}{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[5];
  $result_trees{'macro_expansion'}{'contents'}[5]{'contents'}[1]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[5];
! $result_trees{'macro_expansion'}{'contents'}[5]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_expansion'}{'contents'}[5];
! $result_trees{'macro_expansion'}{'contents'}[5]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_expansion'};
  $result_trees{'macro_expansion'}{'contents'}[5]{'parent'} = $result_trees{'macro_expansion'};
  $result_trees{'macro_expansion'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[6];
--- 509,513 ----
  $result_trees{'macro_expansion'}{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[5];
  $result_trees{'macro_expansion'}{'contents'}[5]{'contents'}[1]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[5];
! $result_trees{'macro_expansion'}{'contents'}[5]{'extra'}{'spaces_after_command'} = $result_trees{'macro_expansion'}{'contents'}[5]{'contents'}[0];
  $result_trees{'macro_expansion'}{'contents'}[5]{'parent'} = $result_trees{'macro_expansion'};
  $result_trees{'macro_expansion'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[6];
***************
*** 570,575 ****
  $result_trees{'macro_expansion'}{'contents'}[9]{'contents'}[0]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[9];
  $result_trees{'macro_expansion'}{'contents'}[9]{'contents'}[1]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[9];
! $result_trees{'macro_expansion'}{'contents'}[9]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_expansion'}{'contents'}[9];
! $result_trees{'macro_expansion'}{'contents'}[9]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_expansion'};
  $result_trees{'macro_expansion'}{'contents'}[9]{'parent'} = $result_trees{'macro_expansion'};
  $result_trees{'macro_expansion'}{'contents'}[10]{'contents'}[0]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[10];
--- 523,527 ----
  $result_trees{'macro_expansion'}{'contents'}[9]{'contents'}[0]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[9];
  $result_trees{'macro_expansion'}{'contents'}[9]{'contents'}[1]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[9];
! $result_trees{'macro_expansion'}{'contents'}[9]{'extra'}{'spaces_after_command'} = $result_trees{'macro_expansion'}{'contents'}[9]{'contents'}[0];
  $result_trees{'macro_expansion'}{'contents'}[9]{'parent'} = $result_trees{'macro_expansion'};
  $result_trees{'macro_expansion'}{'contents'}[10]{'contents'}[0]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[10];
***************
*** 581,588 ****
  $result_trees{'macro_expansion'}{'contents'}[13]{'contents'}[0]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[13];
  $result_trees{'macro_expansion'}{'contents'}[13]{'contents'}[1]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[13];
! $result_trees{'macro_expansion'}{'contents'}[13]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_expansion'}{'contents'}[13];
! $result_trees{'macro_expansion'}{'contents'}[13]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_expansion'};
  $result_trees{'macro_expansion'}{'contents'}[13]{'parent'} = $result_trees{'macro_expansion'};
! $result_trees{'macro_expansion'}{'contents'}[14] = $result_trees{'macro_expansion'}{'contents'}[13]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_expansion'}{'contents'}[15]{'contents'}[0]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[15];
  $result_trees{'macro_expansion'}{'contents'}[15]{'parent'} = $result_trees{'macro_expansion'};
--- 533,540 ----
  $result_trees{'macro_expansion'}{'contents'}[13]{'contents'}[0]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[13];
  $result_trees{'macro_expansion'}{'contents'}[13]{'contents'}[1]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[13];
! $result_trees{'macro_expansion'}{'contents'}[13]{'extra'}{'spaces_after_command'} = $result_trees{'macro_expansion'}{'contents'}[13]{'contents'}[0];
  $result_trees{'macro_expansion'}{'contents'}[13]{'parent'} = $result_trees{'macro_expansion'};
! $result_trees{'macro_expansion'}{'contents'}[14]{'extra'}{'command'} = $result_trees{'macro_expansion'}{'contents'}[13];
! $result_trees{'macro_expansion'}{'contents'}[14]{'parent'} = $result_trees{'macro_expansion'};
  $result_trees{'macro_expansion'}{'contents'}[15]{'contents'}[0]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[15];
  $result_trees{'macro_expansion'}{'contents'}[15]{'parent'} = $result_trees{'macro_expansion'};
***************
*** 593,598 ****
  $result_trees{'macro_expansion'}{'contents'}[18]{'contents'}[0]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[18];
  $result_trees{'macro_expansion'}{'contents'}[18]{'contents'}[1]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[18];
! $result_trees{'macro_expansion'}{'contents'}[18]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_expansion'}{'contents'}[18];
! $result_trees{'macro_expansion'}{'contents'}[18]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_expansion'};
  $result_trees{'macro_expansion'}{'contents'}[18]{'parent'} = $result_trees{'macro_expansion'};
  $result_trees{'macro_expansion'}{'contents'}[19]{'contents'}[0]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[19];
--- 545,549 ----
  $result_trees{'macro_expansion'}{'contents'}[18]{'contents'}[0]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[18];
  $result_trees{'macro_expansion'}{'contents'}[18]{'contents'}[1]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[18];
! $result_trees{'macro_expansion'}{'contents'}[18]{'extra'}{'spaces_after_command'} = $result_trees{'macro_expansion'}{'contents'}[18]{'contents'}[0];
  $result_trees{'macro_expansion'}{'contents'}[18]{'parent'} = $result_trees{'macro_expansion'};
  $result_trees{'macro_expansion'}{'contents'}[19]{'contents'}[0]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[19];
***************
*** 604,609 ****
  $result_trees{'macro_expansion'}{'contents'}[22]{'contents'}[0]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[22];
  $result_trees{'macro_expansion'}{'contents'}[22]{'contents'}[1]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[22];
! $result_trees{'macro_expansion'}{'contents'}[22]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_expansion'}{'contents'}[22];
! $result_trees{'macro_expansion'}{'contents'}[22]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_expansion'};
  $result_trees{'macro_expansion'}{'contents'}[22]{'parent'} = $result_trees{'macro_expansion'};
  $result_trees{'macro_expansion'}{'contents'}[23]{'contents'}[0]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[23];
--- 555,559 ----
  $result_trees{'macro_expansion'}{'contents'}[22]{'contents'}[0]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[22];
  $result_trees{'macro_expansion'}{'contents'}[22]{'contents'}[1]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[22];
! $result_trees{'macro_expansion'}{'contents'}[22]{'extra'}{'spaces_after_command'} = $result_trees{'macro_expansion'}{'contents'}[22]{'contents'}[0];
  $result_trees{'macro_expansion'}{'contents'}[22]{'parent'} = $result_trees{'macro_expansion'};
  $result_trees{'macro_expansion'}{'contents'}[23]{'contents'}[0]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[23];
***************
*** 620,625 ****
  $result_trees{'macro_expansion'}{'contents'}[28]{'contents'}[2]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[28];
  $result_trees{'macro_expansion'}{'contents'}[28]{'contents'}[3]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[28];
! $result_trees{'macro_expansion'}{'contents'}[28]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_expansion'}{'contents'}[28];
! $result_trees{'macro_expansion'}{'contents'}[28]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_expansion'};
  $result_trees{'macro_expansion'}{'contents'}[28]{'parent'} = $result_trees{'macro_expansion'};
  $result_trees{'macro_expansion'}{'contents'}[29]{'contents'}[0]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[29];
--- 570,574 ----
  $result_trees{'macro_expansion'}{'contents'}[28]{'contents'}[2]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[28];
  $result_trees{'macro_expansion'}{'contents'}[28]{'contents'}[3]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[28];
! $result_trees{'macro_expansion'}{'contents'}[28]{'extra'}{'spaces_after_command'} = $result_trees{'macro_expansion'}{'contents'}[28]{'contents'}[0];
  $result_trees{'macro_expansion'}{'contents'}[28]{'parent'} = $result_trees{'macro_expansion'};
  $result_trees{'macro_expansion'}{'contents'}[29]{'contents'}[0]{'parent'} = $result_trees{'macro_expansion'}{'contents'}[29];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/macro_for_end.pl texinfo-6.3/tp/t/results/macro/macro_for_end.pl
*** texinfo-6.1/tp/t/results/macro/macro_for_end.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/macro_for_end.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 32,47 ****
        'extra' => {
          'arg_line' => ' myend
! ',
!         'macrobody' => '@end
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 32,36 ----
        'extra' => {
          'arg_line' => ' myend
! '
        },
        'line_nr' => {
***************
*** 52,56 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 41,53 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 130,137 ****
  $result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_for_end'}{'contents'}[0];
  $result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_for_end'}{'contents'}[0];
- $result_trees{'macro_for_end'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_for_end'}{'contents'}[0];
- $result_trees{'macro_for_end'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_for_end'};
  $result_trees{'macro_for_end'}{'contents'}[0]{'parent'} = $result_trees{'macro_for_end'};
! $result_trees{'macro_for_end'}{'contents'}[1] = $result_trees{'macro_for_end'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_for_end'}{'contents'}[2]{'parent'} = $result_trees{'macro_for_end'};
  $result_trees{'macro_for_end'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_for_end'}{'contents'}[3];
--- 127,133 ----
  $result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_for_end'}{'contents'}[0];
  $result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_for_end'}{'contents'}[0];
  $result_trees{'macro_for_end'}{'contents'}[0]{'parent'} = $result_trees{'macro_for_end'};
! $result_trees{'macro_for_end'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'macro_for_end'}{'contents'}[0];
! $result_trees{'macro_for_end'}{'contents'}[1]{'parent'} = $result_trees{'macro_for_end'};
  $result_trees{'macro_for_end'}{'contents'}[2]{'parent'} = $result_trees{'macro_for_end'};
  $result_trees{'macro_for_end'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_for_end'}{'contents'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/macro_for_ignored_line_command.pl texinfo-6.3/tp/t/results/macro/macro_for_ignored_line_command.pl
*** texinfo-6.1/tp/t/results/macro/macro_for_ignored_line_command.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/macro_for_ignored_line_command.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 32,47 ****
        'extra' => {
          'arg_line' => ' pagemacro
! ',
!         'macrobody' => '@page
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 32,36 ----
        'extra' => {
          'arg_line' => ' pagemacro
! '
        },
        'line_nr' => {
***************
*** 52,56 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 41,53 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 77,84 ****
  $result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_for_ignored_line_command'}{'contents'}[0];
  $result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_for_ignored_line_command'}{'contents'}[0];
- $result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_for_ignored_line_command'}{'contents'}[0];
- $result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_for_ignored_line_command'};
  $result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'parent'} = $result_trees{'macro_for_ignored_line_command'};
! $result_trees{'macro_for_ignored_line_command'}{'contents'}[1] = $result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_for_ignored_line_command'}{'contents'}[2]{'parent'} = $result_trees{'macro_for_ignored_line_command'};
  $result_trees{'macro_for_ignored_line_command'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'macro_for_ignored_line_command'}{'contents'}[3];
--- 74,80 ----
  $result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_for_ignored_line_command'}{'contents'}[0];
  $result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_for_ignored_line_command'}{'contents'}[0];
  $result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'parent'} = $result_trees{'macro_for_ignored_line_command'};
! $result_trees{'macro_for_ignored_line_command'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'macro_for_ignored_line_command'}{'contents'}[0];
! $result_trees{'macro_for_ignored_line_command'}{'contents'}[1]{'parent'} = $result_trees{'macro_for_ignored_line_command'};
  $result_trees{'macro_for_ignored_line_command'}{'contents'}[2]{'parent'} = $result_trees{'macro_for_ignored_line_command'};
  $result_trees{'macro_for_ignored_line_command'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'macro_for_ignored_line_command'}{'contents'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/macro_in_accent.pl texinfo-6.3/tp/t/results/macro/macro_in_accent.pl
*** texinfo-6.1/tp/t/results/macro/macro_in_accent.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/macro_in_accent.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 32,47 ****
        'extra' => {
          'arg_line' => ' aletter
! ',
!         'macrobody' => 'a
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 32,36 ----
        'extra' => {
          'arg_line' => ' aletter
! '
        },
        'line_nr' => {
***************
*** 52,56 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 41,53 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 83,98 ****
        'extra' => {
          'arg_line' => ' aspace
! ',
!         'macrobody' => '  
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 80,84 ----
        'extra' => {
          'arg_line' => ' aspace
! '
        },
        'line_nr' => {
***************
*** 103,107 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 89,101 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 126,132 ****
--- 120,132 ----
            ],
            'cmdname' => 'ringaccent',
+           'contents' => [],
            'extra' => {
              'spaces' => ' '
            },
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 9,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 150,153 ****
--- 150,159 ----
            ],
            'cmdname' => 'ringaccent',
+           'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 10,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 171,174 ****
--- 177,186 ----
            ],
            'cmdname' => '~',
+           'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 11,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 231,237 ****
--- 243,255 ----
            ],
            'cmdname' => 'ringaccent',
+           'contents' => [],
            'extra' => {
              'spaces' => '  '
            },
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 14,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 251,266 ****
  $result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_accent'}{'contents'}[0];
  $result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_in_accent'}{'contents'}[0];
- $result_trees{'macro_in_accent'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_accent'}{'contents'}[0];
- $result_trees{'macro_in_accent'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_accent'};
  $result_trees{'macro_in_accent'}{'contents'}[0]{'parent'} = $result_trees{'macro_in_accent'};
! $result_trees{'macro_in_accent'}{'contents'}[1] = $result_trees{'macro_in_accent'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_accent'}{'contents'}[2]{'parent'} = $result_trees{'macro_in_accent'};
  $result_trees{'macro_in_accent'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'macro_in_accent'}{'contents'}[3];
  $result_trees{'macro_in_accent'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'macro_in_accent'}{'contents'}[3];
  $result_trees{'macro_in_accent'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'macro_in_accent'}{'contents'}[3];
- $result_trees{'macro_in_accent'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_accent'}{'contents'}[3];
- $result_trees{'macro_in_accent'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_accent'};
  $result_trees{'macro_in_accent'}{'contents'}[3]{'parent'} = $result_trees{'macro_in_accent'};
! $result_trees{'macro_in_accent'}{'contents'}[4] = $result_trees{'macro_in_accent'}{'contents'}[3]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_accent'}{'contents'}[5]{'parent'} = $result_trees{'macro_in_accent'};
  $result_trees{'macro_in_accent'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_accent'}{'contents'}[6]{'contents'}[0]{'args'}[0];
--- 269,282 ----
  $result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_accent'}{'contents'}[0];
  $result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_in_accent'}{'contents'}[0];
  $result_trees{'macro_in_accent'}{'contents'}[0]{'parent'} = $result_trees{'macro_in_accent'};
! $result_trees{'macro_in_accent'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'macro_in_accent'}{'contents'}[0];
! $result_trees{'macro_in_accent'}{'contents'}[1]{'parent'} = $result_trees{'macro_in_accent'};
  $result_trees{'macro_in_accent'}{'contents'}[2]{'parent'} = $result_trees{'macro_in_accent'};
  $result_trees{'macro_in_accent'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'macro_in_accent'}{'contents'}[3];
  $result_trees{'macro_in_accent'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'macro_in_accent'}{'contents'}[3];
  $result_trees{'macro_in_accent'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'macro_in_accent'}{'contents'}[3];
  $result_trees{'macro_in_accent'}{'contents'}[3]{'parent'} = $result_trees{'macro_in_accent'};
! $result_trees{'macro_in_accent'}{'contents'}[4]{'extra'}{'command'} = $result_trees{'macro_in_accent'}{'contents'}[3];
! $result_trees{'macro_in_accent'}{'contents'}[4]{'parent'} = $result_trees{'macro_in_accent'};
  $result_trees{'macro_in_accent'}{'contents'}[5]{'parent'} = $result_trees{'macro_in_accent'};
  $result_trees{'macro_in_accent'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_accent'}{'contents'}[6]{'contents'}[0]{'args'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/macro_in_brace_command.pl texinfo-6.3/tp/t/results/macro/macro_in_brace_command.pl
*** texinfo-6.1/tp/t/results/macro/macro_in_brace_command.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/macro_in_brace_command.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 32,47 ****
        'extra' => {
          'arg_line' => ' foo
! ',
!         'macrobody' => 'foo-expansion
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 32,36 ----
        'extra' => {
          'arg_line' => ' foo
! '
        },
        'line_nr' => {
***************
*** 52,56 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 41,53 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 83,98 ****
        'extra' => {
          'arg_line' => ' abar
! ',
!         'macrobody' => 'bar-expansion
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 80,84 ----
        'extra' => {
          'arg_line' => ' abar
! '
        },
        'line_nr' => {
***************
*** 103,107 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 89,101 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 124,127 ****
--- 118,127 ----
              {
                'cmdname' => 'bullet',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 9,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 183,191 ****
                          {}
                        ]
!                     ],
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {
--- 183,187 ----
                          {}
                        ]
!                     ]
                    },
                    'line_nr' => {
***************
*** 270,278 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 9,
!         'macro' => ''
!       },
        'parent' => {}
      }
--- 266,270 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      }
***************
*** 283,298 ****
  $result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_brace_command'}{'contents'}[0];
  $result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_in_brace_command'}{'contents'}[0];
- $result_trees{'macro_in_brace_command'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_brace_command'}{'contents'}[0];
- $result_trees{'macro_in_brace_command'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_brace_command'};
  $result_trees{'macro_in_brace_command'}{'contents'}[0]{'parent'} = $result_trees{'macro_in_brace_command'};
! $result_trees{'macro_in_brace_command'}{'contents'}[1] = $result_trees{'macro_in_brace_command'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_brace_command'}{'contents'}[2]{'parent'} = $result_trees{'macro_in_brace_command'};
  $result_trees{'macro_in_brace_command'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'macro_in_brace_command'}{'contents'}[3];
  $result_trees{'macro_in_brace_command'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'macro_in_brace_command'}{'contents'}[3];
  $result_trees{'macro_in_brace_command'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'macro_in_brace_command'}{'contents'}[3];
- $result_trees{'macro_in_brace_command'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_brace_command'}{'contents'}[3];
- $result_trees{'macro_in_brace_command'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_brace_command'};
  $result_trees{'macro_in_brace_command'}{'contents'}[3]{'parent'} = $result_trees{'macro_in_brace_command'};
! $result_trees{'macro_in_brace_command'}{'contents'}[4] = $result_trees{'macro_in_brace_command'}{'contents'}[3]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_brace_command'}{'contents'}[5]{'parent'} = $result_trees{'macro_in_brace_command'};
  $result_trees{'macro_in_brace_command'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_brace_command'}{'contents'}[6];
--- 275,288 ----
  $result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_brace_command'}{'contents'}[0];
  $result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_in_brace_command'}{'contents'}[0];
  $result_trees{'macro_in_brace_command'}{'contents'}[0]{'parent'} = $result_trees{'macro_in_brace_command'};
! $result_trees{'macro_in_brace_command'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'macro_in_brace_command'}{'contents'}[0];
! $result_trees{'macro_in_brace_command'}{'contents'}[1]{'parent'} = $result_trees{'macro_in_brace_command'};
  $result_trees{'macro_in_brace_command'}{'contents'}[2]{'parent'} = $result_trees{'macro_in_brace_command'};
  $result_trees{'macro_in_brace_command'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'macro_in_brace_command'}{'contents'}[3];
  $result_trees{'macro_in_brace_command'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'macro_in_brace_command'}{'contents'}[3];
  $result_trees{'macro_in_brace_command'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'macro_in_brace_command'}{'contents'}[3];
  $result_trees{'macro_in_brace_command'}{'contents'}[3]{'parent'} = $result_trees{'macro_in_brace_command'};
! $result_trees{'macro_in_brace_command'}{'contents'}[4]{'extra'}{'command'} = $result_trees{'macro_in_brace_command'}{'contents'}[3];
! $result_trees{'macro_in_brace_command'}{'contents'}[4]{'parent'} = $result_trees{'macro_in_brace_command'};
  $result_trees{'macro_in_brace_command'}{'contents'}[5]{'parent'} = $result_trees{'macro_in_brace_command'};
  $result_trees{'macro_in_brace_command'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_brace_command'}{'contents'}[6];
***************
*** 329,332 ****
--- 319,323 ----
  $result_trees{'macro_in_brace_command'}{'contents'}[6]{'extra'}{'end_command'} = $result_trees{'macro_in_brace_command'}{'contents'}[6]{'contents'}[1];
  $result_trees{'macro_in_brace_command'}{'contents'}[6]{'extra'}{'spaces_after_command'} = $result_trees{'macro_in_brace_command'}{'contents'}[6]{'args'}[0]{'contents'}[0];
+ $result_trees{'macro_in_brace_command'}{'contents'}[6]{'line_nr'} = $result_trees{'macro_in_brace_command'}{'contents'}[6]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'macro_in_brace_command'}{'contents'}[6]{'parent'} = $result_trees{'macro_in_brace_command'};
  
diff -Nrc2 texinfo-6.1/tp/t/results/macro/macro_in_end_argument.pl texinfo-6.3/tp/t/results/macro/macro_in_end_argument.pl
*** texinfo-6.1/tp/t/results/macro/macro_in_end_argument.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/macro_in_end_argument.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 32,47 ****
        'extra' => {
          'arg_line' => ' acartouche
! ',
!         'macrobody' => 'cartouche
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 32,36 ----
        'extra' => {
          'arg_line' => ' acartouche
! '
        },
        'line_nr' => {
***************
*** 52,56 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 41,53 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 130,137 ****
  $result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_end_argument'}{'contents'}[0];
  $result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_in_end_argument'}{'contents'}[0];
- $result_trees{'macro_in_end_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_end_argument'}{'contents'}[0];
- $result_trees{'macro_in_end_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_end_argument'};
  $result_trees{'macro_in_end_argument'}{'contents'}[0]{'parent'} = $result_trees{'macro_in_end_argument'};
! $result_trees{'macro_in_end_argument'}{'contents'}[1] = $result_trees{'macro_in_end_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_end_argument'}{'contents'}[2]{'parent'} = $result_trees{'macro_in_end_argument'};
  $result_trees{'macro_in_end_argument'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_end_argument'}{'contents'}[3];
--- 127,133 ----
  $result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_end_argument'}{'contents'}[0];
  $result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_in_end_argument'}{'contents'}[0];
  $result_trees{'macro_in_end_argument'}{'contents'}[0]{'parent'} = $result_trees{'macro_in_end_argument'};
! $result_trees{'macro_in_end_argument'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'macro_in_end_argument'}{'contents'}[0];
! $result_trees{'macro_in_end_argument'}{'contents'}[1]{'parent'} = $result_trees{'macro_in_end_argument'};
  $result_trees{'macro_in_end_argument'}{'contents'}[2]{'parent'} = $result_trees{'macro_in_end_argument'};
  $result_trees{'macro_in_end_argument'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_end_argument'}{'contents'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/macro_in_ifset.pl texinfo-6.3/tp/t/results/macro/macro_in_ifset.pl
*** texinfo-6.1/tp/t/results/macro/macro_in_ifset.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/macro_in_ifset.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 37,55 ****
        'extra' => {
          'arg_line' => ' macroone {arg}
! ',
!         'args_index' => {
!           'arg' => 0
!         },
!         'macrobody' => '@end ifset
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 37,41 ----
        'extra' => {
          'arg_line' => ' macroone {arg}
! '
        },
        'line_nr' => {
***************
*** 60,64 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 46,58 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 74,81 ****
  $result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_ifset'}{'contents'}[0];
  $result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_in_ifset'}{'contents'}[0];
- $result_trees{'macro_in_ifset'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_ifset'}{'contents'}[0];
- $result_trees{'macro_in_ifset'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_ifset'};
  $result_trees{'macro_in_ifset'}{'contents'}[0]{'parent'} = $result_trees{'macro_in_ifset'};
! $result_trees{'macro_in_ifset'}{'contents'}[1] = $result_trees{'macro_in_ifset'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_ifset'}{'contents'}[2]{'parent'} = $result_trees{'macro_in_ifset'};
  
--- 68,74 ----
  $result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_ifset'}{'contents'}[0];
  $result_trees{'macro_in_ifset'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_in_ifset'}{'contents'}[0];
  $result_trees{'macro_in_ifset'}{'contents'}[0]{'parent'} = $result_trees{'macro_in_ifset'};
! $result_trees{'macro_in_ifset'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'macro_in_ifset'}{'contents'}[0];
! $result_trees{'macro_in_ifset'}{'contents'}[1]{'parent'} = $result_trees{'macro_in_ifset'};
  $result_trees{'macro_in_ifset'}{'contents'}[2]{'parent'} = $result_trees{'macro_in_ifset'};
  
diff -Nrc2 texinfo-6.1/tp/t/results/macro/macro_in_ifset_end_in_arg.pl texinfo-6.3/tp/t/results/macro/macro_in_ifset_end_in_arg.pl
*** texinfo-6.1/tp/t/results/macro/macro_in_ifset_end_in_arg.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/macro_in_ifset_end_in_arg.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 37,55 ****
        'extra' => {
          'arg_line' => ' macroone {arg}
! ',
!         'args_index' => {
!           'arg' => 0
!         },
!         'macrobody' => '@end ifset
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 37,41 ----
        'extra' => {
          'arg_line' => ' macroone {arg}
! '
        },
        'line_nr' => {
***************
*** 60,64 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 46,58 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 129,136 ****
  $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0];
  $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0];
- $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0];
- $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_ifset_end_in_arg'};
  $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'parent'} = $result_trees{'macro_in_ifset_end_in_arg'};
! $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[1] = $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[2]{'parent'} = $result_trees{'macro_in_ifset_end_in_arg'};
  $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[3]{'parent'} = $result_trees{'macro_in_ifset_end_in_arg'};
--- 123,129 ----
  $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0];
  $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0];
  $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0]{'parent'} = $result_trees{'macro_in_ifset_end_in_arg'};
! $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[0];
! $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[1]{'parent'} = $result_trees{'macro_in_ifset_end_in_arg'};
  $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[2]{'parent'} = $result_trees{'macro_in_ifset_end_in_arg'};
  $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[3]{'parent'} = $result_trees{'macro_in_ifset_end_in_arg'};
diff -Nrc2 texinfo-6.1/tp/t/results/macro/macro_in_index_commands.pl texinfo-6.3/tp/t/results/macro/macro_in_index_commands.pl
*** texinfo-6.1/tp/t/results/macro/macro_in_index_commands.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/macro_in_index_commands.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 34,49 ****
            'extra' => {
              'arg_line' => ' cp
! ',
!             'macrobody' => 'cp
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 34,38 ----
            'extra' => {
              'arg_line' => ' cp
! '
            },
            'line_nr' => {
***************
*** 54,58 ****
            'parent' => {}
          },
!         {},
          {
            'args' => [
--- 43,55 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'args' => [
***************
*** 79,94 ****
            'extra' => {
              'arg_line' => ' fn 
! ',
!             'macrobody' => 'fn
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 76,80 ----
            'extra' => {
              'arg_line' => ' fn 
! '
            },
            'line_nr' => {
***************
*** 99,103 ****
            'parent' => {}
          },
!         {},
          {
            'args' => [
--- 85,97 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'args' => [
***************
*** 124,139 ****
            'extra' => {
              'arg_line' => ' syncodeindexcommand 
! ',
!             'macrobody' => '@syncodeindex
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 118,122 ----
            'extra' => {
              'arg_line' => ' syncodeindexcommand 
! '
            },
            'line_nr' => {
***************
*** 144,148 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 127,139 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 265,280 ****
            'extra' => {
              'arg_line' => ' truc 
! ',
!             'macrobody' => 'truc
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 256,260 ----
            'extra' => {
              'arg_line' => ' truc 
! '
            },
            'line_nr' => {
***************
*** 285,289 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 265,277 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 379,394 ****
            'extra' => {
              'arg_line' => ' trucindexcommand 
! ',
!             'macrobody' => '@trucindex
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 367,371 ----
            'extra' => {
              'arg_line' => ' trucindexcommand 
! '
            },
            'line_nr' => {
***************
*** 399,403 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 376,388 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 430,445 ****
            'extra' => {
              'arg_line' => ' codeidx 
! ',
!             'macrobody' => 'codeidx
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 415,419 ----
            'extra' => {
              'arg_line' => ' codeidx 
! '
            },
            'line_nr' => {
***************
*** 450,454 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 424,436 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 528,543 ****
            'extra' => {
              'arg_line' => ' defcodeindexentry 
! ',
!             'macrobody' => 'a @var{index entry} t@\'e @^{@dotless{i}}
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 510,514 ----
            'extra' => {
              'arg_line' => ' defcodeindexentry 
! '
            },
            'line_nr' => {
***************
*** 548,552 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 519,531 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 632,636 ****
                'index_at_command' => 'trucindex',
                'index_name' => 'truc',
-               'index_prefix' => 'truc',
                'index_type_command' => 'trucindex',
                'key' => 'index truc',
--- 611,614 ----
***************
*** 711,714 ****
--- 689,694 ----
                    ],
                    'cmdname' => '\'',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 776,780 ****
                'index_at_command' => 'codeidxindex',
                'index_name' => 'codeidx',
-               'index_prefix' => 'codeidx',
                'index_type_command' => 'codeidxindex',
                'key' => 'a index entry te\' i^',
--- 756,759 ----
***************
*** 837,841 ****
                'index_at_command' => 'kindex',
                'index_name' => 'ky',
-               'index_prefix' => 'k',
                'index_type_command' => 'kindex',
                'key' => 'truc kindex',
--- 816,819 ----
***************
*** 892,896 ****
                'index_at_command' => 'pindex',
                'index_name' => 'pg',
-               'index_prefix' => 'p',
                'index_type_command' => 'pindex',
                'key' => 'pindex codeidx',
--- 870,873 ----
***************
*** 1058,1079 ****
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0];
- $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0];
- $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
! $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[1] = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2];
- $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2];
- $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
! $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[3] = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4];
- $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4];
- $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
! $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[5] = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[6]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[7];
--- 1035,1053 ----
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
! $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[1]{'extra'}{'command'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[0];
! $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
! $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[3]{'extra'}{'command'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[2];
! $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
! $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[5]{'extra'}{'command'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[4];
! $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[6]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[7];
***************
*** 1095,1102 ****
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10];
- $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10];
- $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
! $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[11] = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[12]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[13];
--- 1069,1075 ----
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
! $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[11]{'extra'}{'command'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[10];
! $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[11]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[12]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[13];
***************
*** 1114,1129 ****
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15]{'contents'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15];
- $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15];
- $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
! $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[16] = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[17]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18]{'args'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[1]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18];
- $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18];
- $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
! $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[19] = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[20]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[21]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[21];
--- 1087,1100 ----
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15]{'contents'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
! $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[16]{'extra'}{'command'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[15];
! $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[16]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[17]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18]{'args'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[1]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
! $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[19]{'extra'}{'command'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[18];
! $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[19]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[20]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[21]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[21];
***************
*** 1138,1145 ****
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23]{'contents'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23];
- $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23];
- $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
! $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[24] = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[25]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'parent'} = $result_trees{'macro_in_index_commands'};
--- 1109,1115 ----
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23]{'contents'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
! $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[24]{'extra'}{'command'} = $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[23];
! $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[24]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'contents'}[25]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[0];
  $result_trees{'macro_in_index_commands'}{'contents'}[0]{'parent'} = $result_trees{'macro_in_index_commands'};
***************
*** 1172,1175 ****
--- 1142,1146 ----
  $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0];
  $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4];
+ $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0];
  $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0];
***************
*** 1367,1374 ****
        },
        'in_code' => 1,
!       'name' => 'codeidx',
!       'prefix' => [
!         'codeidx'
!       ]
      },
      'cp' => {
--- 1338,1342 ----
        },
        'in_code' => 1,
!       'name' => 'codeidx'
      },
      'cp' => {
***************
*** 1378,1386 ****
        'in_code' => 1,
        'merged_in' => 'fn',
!       'name' => 'cp',
!       'prefix' => [
!         'c',
!         'cp'
!       ]
      },
      'fn' => {
--- 1346,1350 ----
        'in_code' => 1,
        'merged_in' => 'fn',
!       'name' => 'cp'
      },
      'fn' => {
***************
*** 1390,1398 ****
        },
        'in_code' => 1,
!       'name' => 'fn',
!       'prefix' => [
!         'f',
!         'fn'
!       ]
      },
      'ky' => {
--- 1354,1358 ----
        },
        'in_code' => 1,
!       'name' => 'fn'
      },
      'ky' => {
***************
*** 1401,1409 ****
        },
        'in_code' => 1,
!       'name' => 'ky',
!       'prefix' => [
!         'k',
!         'ky'
!       ]
      },
      'pg' => {
--- 1361,1365 ----
        },
        'in_code' => 1,
!       'name' => 'ky'
      },
      'pg' => {
***************
*** 1412,1420 ****
        },
        'in_code' => 1,
!       'name' => 'pg',
!       'prefix' => [
!         'p',
!         'pg'
!       ]
      },
      'tp' => {
--- 1368,1372 ----
        },
        'in_code' => 1,
!       'name' => 'pg'
      },
      'tp' => {
***************
*** 1423,1431 ****
        },
        'in_code' => 1,
!       'name' => 'tp',
!       'prefix' => [
!         't',
!         'tp'
!       ]
      },
      'truc' => {
--- 1375,1379 ----
        },
        'in_code' => 1,
!       'name' => 'tp'
      },
      'truc' => {
***************
*** 1434,1441 ****
        },
        'in_code' => 0,
!       'name' => 'truc',
!       'prefix' => [
!         'truc'
!       ]
      },
      'vr' => {
--- 1382,1386 ----
        },
        'in_code' => 0,
!       'name' => 'truc'
      },
      'vr' => {
***************
*** 1444,1452 ****
        },
        'in_code' => 1,
!       'name' => 'vr',
!       'prefix' => [
!         'v',
!         'vr'
!       ]
      }
    },
--- 1389,1393 ----
        },
        'in_code' => 1,
!       'name' => 'vr'
      }
    },
diff -Nrc2 texinfo-6.1/tp/t/results/macro/macro_in_invalid_documentencoding.pl texinfo-6.3/tp/t/results/macro/macro_in_invalid_documentencoding.pl
*** texinfo-6.1/tp/t/results/macro/macro_in_invalid_documentencoding.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/macro_in_invalid_documentencoding.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 32,47 ****
        'extra' => {
          'arg_line' => ' badmacro
! ',
!         'macrobody' => 'badm
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 32,36 ----
        'extra' => {
          'arg_line' => ' badmacro
! '
        },
        'line_nr' => {
***************
*** 52,56 ****
        'parent' => {}
      },
!     {},
      {
        'args' => [
--- 41,53 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'args' => [
***************
*** 98,105 ****
  $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0];
  $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0];
- $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0];
- $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_invalid_documentencoding'};
  $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'parent'} = $result_trees{'macro_in_invalid_documentencoding'};
! $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[1] = $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[2];
  $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[2]{'args'}[0];
--- 95,101 ----
  $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0];
  $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0];
  $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0]{'parent'} = $result_trees{'macro_in_invalid_documentencoding'};
! $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[0];
! $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[1]{'parent'} = $result_trees{'macro_in_invalid_documentencoding'};
  $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[2];
  $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_invalid_documentencoding'}{'contents'}[2]{'args'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/macro_in_macro_arg.pl texinfo-6.3/tp/t/results/macro/macro_in_macro_arg.pl
*** texinfo-6.1/tp/t/results/macro/macro_in_macro_arg.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/macro_in_macro_arg.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 38,53 ****
        'extra' => {
          'arg_line' => ' macroone
! ',
!         'macrobody' => 'a, @macrotwo
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 38,42 ----
        'extra' => {
          'arg_line' => ' macroone
! '
        },
        'line_nr' => {
***************
*** 58,62 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 47,59 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 94,112 ****
        'extra' => {
          'arg_line' => ' macrotwo{arg}
! ',
!         'args_index' => {
!           'arg' => 0
!         },
!         'macrobody' => 'hello \\arg\\ after arg
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 91,95 ----
        'extra' => {
          'arg_line' => ' macrotwo{arg}
! '
        },
        'line_nr' => {
***************
*** 117,121 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 100,112 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 164,184 ****
        'extra' => {
          'arg_line' => ' macrothree{text, arg}
! ',
!         'args_index' => {
!           'arg' => 1,
!           'text' => 0
!         },
!         'macrobody' => '\\text\\
! &&&& \\arg\\
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 155,159 ----
        'extra' => {
          'arg_line' => ' macrothree{text, arg}
! '
        },
        'line_nr' => {
***************
*** 189,193 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 164,176 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 219,226 ****
  $result_trees{'macro_in_macro_arg'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'macro_in_macro_arg'}{'contents'}[1];
  $result_trees{'macro_in_macro_arg'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'macro_in_macro_arg'}{'contents'}[1];
- $result_trees{'macro_in_macro_arg'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_macro_arg'}{'contents'}[1];
- $result_trees{'macro_in_macro_arg'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_macro_arg'};
  $result_trees{'macro_in_macro_arg'}{'contents'}[1]{'parent'} = $result_trees{'macro_in_macro_arg'};
! $result_trees{'macro_in_macro_arg'}{'contents'}[2] = $result_trees{'macro_in_macro_arg'}{'contents'}[1]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_macro_arg'}{'contents'}[3]{'parent'} = $result_trees{'macro_in_macro_arg'};
  $result_trees{'macro_in_macro_arg'}{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'macro_in_macro_arg'}{'contents'}[4];
--- 202,208 ----
  $result_trees{'macro_in_macro_arg'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'macro_in_macro_arg'}{'contents'}[1];
  $result_trees{'macro_in_macro_arg'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'macro_in_macro_arg'}{'contents'}[1];
  $result_trees{'macro_in_macro_arg'}{'contents'}[1]{'parent'} = $result_trees{'macro_in_macro_arg'};
! $result_trees{'macro_in_macro_arg'}{'contents'}[2]{'extra'}{'command'} = $result_trees{'macro_in_macro_arg'}{'contents'}[1];
! $result_trees{'macro_in_macro_arg'}{'contents'}[2]{'parent'} = $result_trees{'macro_in_macro_arg'};
  $result_trees{'macro_in_macro_arg'}{'contents'}[3]{'parent'} = $result_trees{'macro_in_macro_arg'};
  $result_trees{'macro_in_macro_arg'}{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'macro_in_macro_arg'}{'contents'}[4];
***************
*** 228,235 ****
  $result_trees{'macro_in_macro_arg'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'macro_in_macro_arg'}{'contents'}[4];
  $result_trees{'macro_in_macro_arg'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'macro_in_macro_arg'}{'contents'}[4];
- $result_trees{'macro_in_macro_arg'}{'contents'}[4]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_macro_arg'}{'contents'}[4];
- $result_trees{'macro_in_macro_arg'}{'contents'}[4]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_macro_arg'};
  $result_trees{'macro_in_macro_arg'}{'contents'}[4]{'parent'} = $result_trees{'macro_in_macro_arg'};
! $result_trees{'macro_in_macro_arg'}{'contents'}[5] = $result_trees{'macro_in_macro_arg'}{'contents'}[4]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_macro_arg'}{'contents'}[6]{'parent'} = $result_trees{'macro_in_macro_arg'};
  $result_trees{'macro_in_macro_arg'}{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'macro_in_macro_arg'}{'contents'}[7];
--- 210,216 ----
  $result_trees{'macro_in_macro_arg'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'macro_in_macro_arg'}{'contents'}[4];
  $result_trees{'macro_in_macro_arg'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'macro_in_macro_arg'}{'contents'}[4];
  $result_trees{'macro_in_macro_arg'}{'contents'}[4]{'parent'} = $result_trees{'macro_in_macro_arg'};
! $result_trees{'macro_in_macro_arg'}{'contents'}[5]{'extra'}{'command'} = $result_trees{'macro_in_macro_arg'}{'contents'}[4];
! $result_trees{'macro_in_macro_arg'}{'contents'}[5]{'parent'} = $result_trees{'macro_in_macro_arg'};
  $result_trees{'macro_in_macro_arg'}{'contents'}[6]{'parent'} = $result_trees{'macro_in_macro_arg'};
  $result_trees{'macro_in_macro_arg'}{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'macro_in_macro_arg'}{'contents'}[7];
***************
*** 239,246 ****
  $result_trees{'macro_in_macro_arg'}{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'macro_in_macro_arg'}{'contents'}[7];
  $result_trees{'macro_in_macro_arg'}{'contents'}[7]{'contents'}[2]{'parent'} = $result_trees{'macro_in_macro_arg'}{'contents'}[7];
- $result_trees{'macro_in_macro_arg'}{'contents'}[7]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_macro_arg'}{'contents'}[7];
- $result_trees{'macro_in_macro_arg'}{'contents'}[7]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_macro_arg'};
  $result_trees{'macro_in_macro_arg'}{'contents'}[7]{'parent'} = $result_trees{'macro_in_macro_arg'};
! $result_trees{'macro_in_macro_arg'}{'contents'}[8] = $result_trees{'macro_in_macro_arg'}{'contents'}[7]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_macro_arg'}{'contents'}[9]{'parent'} = $result_trees{'macro_in_macro_arg'};
  $result_trees{'macro_in_macro_arg'}{'contents'}[10]{'contents'}[0]{'parent'} = $result_trees{'macro_in_macro_arg'}{'contents'}[10];
--- 220,226 ----
  $result_trees{'macro_in_macro_arg'}{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'macro_in_macro_arg'}{'contents'}[7];
  $result_trees{'macro_in_macro_arg'}{'contents'}[7]{'contents'}[2]{'parent'} = $result_trees{'macro_in_macro_arg'}{'contents'}[7];
  $result_trees{'macro_in_macro_arg'}{'contents'}[7]{'parent'} = $result_trees{'macro_in_macro_arg'};
! $result_trees{'macro_in_macro_arg'}{'contents'}[8]{'extra'}{'command'} = $result_trees{'macro_in_macro_arg'}{'contents'}[7];
! $result_trees{'macro_in_macro_arg'}{'contents'}[8]{'parent'} = $result_trees{'macro_in_macro_arg'};
  $result_trees{'macro_in_macro_arg'}{'contents'}[9]{'parent'} = $result_trees{'macro_in_macro_arg'};
  $result_trees{'macro_in_macro_arg'}{'contents'}[10]{'contents'}[0]{'parent'} = $result_trees{'macro_in_macro_arg'}{'contents'}[10];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/macro_in_macro_arg_simpler.pl texinfo-6.3/tp/t/results/macro/macro_in_macro_arg_simpler.pl
*** texinfo-6.1/tp/t/results/macro/macro_in_macro_arg_simpler.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/macro_in_macro_arg_simpler.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 32,47 ****
        'extra' => {
          'arg_line' => ' macrooneone
! ',
!         'macrobody' => 'a, macro2
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 32,36 ----
        'extra' => {
          'arg_line' => ' macrooneone
! '
        },
        'line_nr' => {
***************
*** 52,56 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 41,53 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 99,119 ****
        'extra' => {
          'arg_line' => ' macrothree{text, arg}
! ',
!         'args_index' => {
!           'arg' => 1,
!           'text' => 0
!         },
!         'macrobody' => '\\text\\
! &&&& \\arg\\
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 96,100 ----
        'extra' => {
          'arg_line' => ' macrothree{text, arg}
! '
        },
        'line_nr' => {
***************
*** 124,128 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 105,117 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 153,160 ****
  $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0];
  $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0];
- $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0];
- $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_macro_arg_simpler'};
  $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'parent'} = $result_trees{'macro_in_macro_arg_simpler'};
! $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[1] = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[2]{'parent'} = $result_trees{'macro_in_macro_arg_simpler'};
  $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3];
--- 142,148 ----
  $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0];
  $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0];
  $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0]{'parent'} = $result_trees{'macro_in_macro_arg_simpler'};
! $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[0];
! $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[1]{'parent'} = $result_trees{'macro_in_macro_arg_simpler'};
  $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[2]{'parent'} = $result_trees{'macro_in_macro_arg_simpler'};
  $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3];
***************
*** 164,171 ****
  $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3];
  $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3];
- $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3];
- $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_macro_arg_simpler'};
  $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3]{'parent'} = $result_trees{'macro_in_macro_arg_simpler'};
! $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[4] = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[5]{'parent'} = $result_trees{'macro_in_macro_arg_simpler'};
  $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[6];
--- 152,158 ----
  $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3];
  $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3];
  $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3]{'parent'} = $result_trees{'macro_in_macro_arg_simpler'};
! $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[4]{'extra'}{'command'} = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[3];
! $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[4]{'parent'} = $result_trees{'macro_in_macro_arg_simpler'};
  $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[5]{'parent'} = $result_trees{'macro_in_macro_arg_simpler'};
  $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[6];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/macro_in_menu.pl texinfo-6.3/tp/t/results/macro/macro_in_menu.pl
*** texinfo-6.1/tp/t/results/macro/macro_in_menu.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/macro_in_menu.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 38,53 ****
        'extra' => {
          'arg_line' => ' astar
! ',
!         'macrobody' => '*
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 38,42 ----
        'extra' => {
          'arg_line' => ' astar
! '
        },
        'line_nr' => {
***************
*** 58,62 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 47,59 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 89,104 ****
        'extra' => {
          'arg_line' => ' starspaces
! ',
!         'macrobody' => '* 
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 86,90 ----
        'extra' => {
          'arg_line' => ' starspaces
! '
        },
        'line_nr' => {
***************
*** 109,113 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 95,107 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 140,155 ****
        'extra' => {
          'arg_line' => ' spaces
! ',
!         'macrobody' => '  
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 134,138 ----
        'extra' => {
          'arg_line' => ' spaces
! '
        },
        'line_nr' => {
***************
*** 160,164 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 143,155 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 191,206 ****
        'extra' => {
          'arg_line' => ' aspace
! ',
!         'macrobody' => ' 
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 182,186 ----
        'extra' => {
          'arg_line' => ' aspace
! '
        },
        'line_nr' => {
***************
*** 211,215 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 191,203 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 242,257 ****
        'extra' => {
          'arg_line' => ' twocolon
! ',
!         'macrobody' => '::
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 230,234 ----
        'extra' => {
          'arg_line' => ' twocolon
! '
        },
        'line_nr' => {
***************
*** 262,266 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 239,251 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 293,308 ****
        'extra' => {
          'arg_line' => ' acolon
! ',
!         'macrobody' => ':
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 278,282 ----
        'extra' => {
          'arg_line' => ' acolon
! '
        },
        'line_nr' => {
***************
*** 313,317 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 287,299 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 716,763 ****
  $result_trees{'macro_in_menu'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[1];
  $result_trees{'macro_in_menu'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[1];
- $result_trees{'macro_in_menu'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_menu'}{'contents'}[1];
- $result_trees{'macro_in_menu'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_menu'};
  $result_trees{'macro_in_menu'}{'contents'}[1]{'parent'} = $result_trees{'macro_in_menu'};
! $result_trees{'macro_in_menu'}{'contents'}[2] = $result_trees{'macro_in_menu'}{'contents'}[1]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_menu'}{'contents'}[3]{'parent'} = $result_trees{'macro_in_menu'};
  $result_trees{'macro_in_menu'}{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[4];
  $result_trees{'macro_in_menu'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[4];
  $result_trees{'macro_in_menu'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[4];
- $result_trees{'macro_in_menu'}{'contents'}[4]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_menu'}{'contents'}[4];
- $result_trees{'macro_in_menu'}{'contents'}[4]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_menu'};
  $result_trees{'macro_in_menu'}{'contents'}[4]{'parent'} = $result_trees{'macro_in_menu'};
! $result_trees{'macro_in_menu'}{'contents'}[5] = $result_trees{'macro_in_menu'}{'contents'}[4]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_menu'}{'contents'}[6]{'parent'} = $result_trees{'macro_in_menu'};
  $result_trees{'macro_in_menu'}{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[7];
  $result_trees{'macro_in_menu'}{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[7];
  $result_trees{'macro_in_menu'}{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[7];
- $result_trees{'macro_in_menu'}{'contents'}[7]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_menu'}{'contents'}[7];
- $result_trees{'macro_in_menu'}{'contents'}[7]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_menu'};
  $result_trees{'macro_in_menu'}{'contents'}[7]{'parent'} = $result_trees{'macro_in_menu'};
! $result_trees{'macro_in_menu'}{'contents'}[8] = $result_trees{'macro_in_menu'}{'contents'}[7]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_menu'}{'contents'}[9]{'parent'} = $result_trees{'macro_in_menu'};
  $result_trees{'macro_in_menu'}{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[10];
  $result_trees{'macro_in_menu'}{'contents'}[10]{'contents'}[0]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[10];
  $result_trees{'macro_in_menu'}{'contents'}[10]{'contents'}[1]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[10];
- $result_trees{'macro_in_menu'}{'contents'}[10]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_menu'}{'contents'}[10];
- $result_trees{'macro_in_menu'}{'contents'}[10]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_menu'};
  $result_trees{'macro_in_menu'}{'contents'}[10]{'parent'} = $result_trees{'macro_in_menu'};
! $result_trees{'macro_in_menu'}{'contents'}[11] = $result_trees{'macro_in_menu'}{'contents'}[10]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_menu'}{'contents'}[12]{'parent'} = $result_trees{'macro_in_menu'};
  $result_trees{'macro_in_menu'}{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[13];
  $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[0]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[13];
  $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[1]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[13];
- $result_trees{'macro_in_menu'}{'contents'}[13]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_menu'}{'contents'}[13];
- $result_trees{'macro_in_menu'}{'contents'}[13]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_menu'};
  $result_trees{'macro_in_menu'}{'contents'}[13]{'parent'} = $result_trees{'macro_in_menu'};
! $result_trees{'macro_in_menu'}{'contents'}[14] = $result_trees{'macro_in_menu'}{'contents'}[13]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_menu'}{'contents'}[15]{'parent'} = $result_trees{'macro_in_menu'};
  $result_trees{'macro_in_menu'}{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[16];
  $result_trees{'macro_in_menu'}{'contents'}[16]{'contents'}[0]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[16];
  $result_trees{'macro_in_menu'}{'contents'}[16]{'contents'}[1]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[16];
- $result_trees{'macro_in_menu'}{'contents'}[16]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_menu'}{'contents'}[16];
- $result_trees{'macro_in_menu'}{'contents'}[16]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_menu'};
  $result_trees{'macro_in_menu'}{'contents'}[16]{'parent'} = $result_trees{'macro_in_menu'};
! $result_trees{'macro_in_menu'}{'contents'}[17] = $result_trees{'macro_in_menu'}{'contents'}[16]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_menu'}{'contents'}[18]{'parent'} = $result_trees{'macro_in_menu'};
  $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_menu'}{'contents'}[19];
--- 698,739 ----
  $result_trees{'macro_in_menu'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[1];
  $result_trees{'macro_in_menu'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[1];
  $result_trees{'macro_in_menu'}{'contents'}[1]{'parent'} = $result_trees{'macro_in_menu'};
! $result_trees{'macro_in_menu'}{'contents'}[2]{'extra'}{'command'} = $result_trees{'macro_in_menu'}{'contents'}[1];
! $result_trees{'macro_in_menu'}{'contents'}[2]{'parent'} = $result_trees{'macro_in_menu'};
  $result_trees{'macro_in_menu'}{'contents'}[3]{'parent'} = $result_trees{'macro_in_menu'};
  $result_trees{'macro_in_menu'}{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[4];
  $result_trees{'macro_in_menu'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[4];
  $result_trees{'macro_in_menu'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[4];
  $result_trees{'macro_in_menu'}{'contents'}[4]{'parent'} = $result_trees{'macro_in_menu'};
! $result_trees{'macro_in_menu'}{'contents'}[5]{'extra'}{'command'} = $result_trees{'macro_in_menu'}{'contents'}[4];
! $result_trees{'macro_in_menu'}{'contents'}[5]{'parent'} = $result_trees{'macro_in_menu'};
  $result_trees{'macro_in_menu'}{'contents'}[6]{'parent'} = $result_trees{'macro_in_menu'};
  $result_trees{'macro_in_menu'}{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[7];
  $result_trees{'macro_in_menu'}{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[7];
  $result_trees{'macro_in_menu'}{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[7];
  $result_trees{'macro_in_menu'}{'contents'}[7]{'parent'} = $result_trees{'macro_in_menu'};
! $result_trees{'macro_in_menu'}{'contents'}[8]{'extra'}{'command'} = $result_trees{'macro_in_menu'}{'contents'}[7];
! $result_trees{'macro_in_menu'}{'contents'}[8]{'parent'} = $result_trees{'macro_in_menu'};
  $result_trees{'macro_in_menu'}{'contents'}[9]{'parent'} = $result_trees{'macro_in_menu'};
  $result_trees{'macro_in_menu'}{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[10];
  $result_trees{'macro_in_menu'}{'contents'}[10]{'contents'}[0]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[10];
  $result_trees{'macro_in_menu'}{'contents'}[10]{'contents'}[1]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[10];
  $result_trees{'macro_in_menu'}{'contents'}[10]{'parent'} = $result_trees{'macro_in_menu'};
! $result_trees{'macro_in_menu'}{'contents'}[11]{'extra'}{'command'} = $result_trees{'macro_in_menu'}{'contents'}[10];
! $result_trees{'macro_in_menu'}{'contents'}[11]{'parent'} = $result_trees{'macro_in_menu'};
  $result_trees{'macro_in_menu'}{'contents'}[12]{'parent'} = $result_trees{'macro_in_menu'};
  $result_trees{'macro_in_menu'}{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[13];
  $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[0]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[13];
  $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[1]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[13];
  $result_trees{'macro_in_menu'}{'contents'}[13]{'parent'} = $result_trees{'macro_in_menu'};
! $result_trees{'macro_in_menu'}{'contents'}[14]{'extra'}{'command'} = $result_trees{'macro_in_menu'}{'contents'}[13];
! $result_trees{'macro_in_menu'}{'contents'}[14]{'parent'} = $result_trees{'macro_in_menu'};
  $result_trees{'macro_in_menu'}{'contents'}[15]{'parent'} = $result_trees{'macro_in_menu'};
  $result_trees{'macro_in_menu'}{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[16];
  $result_trees{'macro_in_menu'}{'contents'}[16]{'contents'}[0]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[16];
  $result_trees{'macro_in_menu'}{'contents'}[16]{'contents'}[1]{'parent'} = $result_trees{'macro_in_menu'}{'contents'}[16];
  $result_trees{'macro_in_menu'}{'contents'}[16]{'parent'} = $result_trees{'macro_in_menu'};
! $result_trees{'macro_in_menu'}{'contents'}[17]{'extra'}{'command'} = $result_trees{'macro_in_menu'}{'contents'}[16];
! $result_trees{'macro_in_menu'}{'contents'}[17]{'parent'} = $result_trees{'macro_in_menu'};
  $result_trees{'macro_in_menu'}{'contents'}[18]{'parent'} = $result_trees{'macro_in_menu'};
  $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_menu'}{'contents'}[19];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/macro_in_misc_commands.pl texinfo-6.3/tp/t/results/macro/macro_in_misc_commands.pl
*** texinfo-6.1/tp/t/results/macro/macro_in_misc_commands.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/macro_in_misc_commands.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 34,49 ****
            'extra' => {
              'arg_line' => ' text 
! ',
!             'macrobody' => 'atext
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 34,38 ----
            'extra' => {
              'arg_line' => ' text 
! '
            },
            'line_nr' => {
***************
*** 54,58 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 43,55 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 85,100 ****
            'extra' => {
              'arg_line' => ' Top
! ',
!             'macrobody' => 'Top
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 82,86 ----
            'extra' => {
              'arg_line' => ' Top
! '
            },
            'line_nr' => {
***************
*** 105,109 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 91,103 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 318,333 ****
            'extra' => {
              'arg_line' => ' en 
! ',
!             'macrobody' => 'en
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 312,316 ----
            'extra' => {
              'arg_line' => ' en 
! '
            },
            'line_nr' => {
***************
*** 338,342 ****
            'parent' => {}
          },
!         {},
          {
            'args' => [
--- 321,333 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'args' => [
***************
*** 363,378 ****
            'extra' => {
              'arg_line' => ' documentlanguagecommand 
! ',
!             'macrobody' => '@documentlanguage
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 354,358 ----
            'extra' => {
              'arg_line' => ' documentlanguagecommand 
! '
            },
            'line_nr' => {
***************
*** 383,387 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 363,375 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 530,545 ****
            'extra' => {
              'arg_line' => ' pagesizesarg
! ',
!             'macrobody' => '200mm,150mm
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 518,522 ----
            'extra' => {
              'arg_line' => ' pagesizesarg
! '
            },
            'line_nr' => {
***************
*** 550,554 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 527,539 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 581,596 ****
            'extra' => {
              'arg_line' => ' afourpapermacro 
! ',
!             'macrobody' => '@afourpaper
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 566,570 ----
            'extra' => {
              'arg_line' => ' afourpapermacro 
! '
            },
            'line_nr' => {
***************
*** 601,605 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 575,587 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 775,790 ****
            'extra' => {
              'arg_line' => ' needarg
! ',
!             'macrobody' => '0.1
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 757,761 ----
            'extra' => {
              'arg_line' => ' needarg
! '
            },
            'line_nr' => {
***************
*** 795,799 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 766,778 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 873,888 ****
            'extra' => {
              'arg_line' => ' raisesectionsmacro 
! ',
!             'macrobody' => '@raisesections
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 852,856 ----
            'extra' => {
              'arg_line' => ' raisesectionsmacro 
! '
            },
            'line_nr' => {
***************
*** 893,897 ****
            'parent' => {}
          },
!         {},
          {
            'args' => [
--- 861,873 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'args' => [
***************
*** 930,945 ****
            'extra' => {
              'arg_line' => ' lowersectionsmacro 
! ',
!             'macrobody' => '@lowersections
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 906,910 ----
            'extra' => {
              'arg_line' => ' lowersectionsmacro 
! '
            },
            'line_nr' => {
***************
*** 950,954 ****
            'parent' => {}
          },
!         {},
          {
            'args' => [
--- 915,927 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'args' => [
***************
*** 1095,1110 ****
            'extra' => {
              'arg_line' => ' definfoenclosename 
! ',
!             'macrobody' => 'phi
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 1068,1072 ----
            'extra' => {
              'arg_line' => ' definfoenclosename 
! '
            },
            'line_nr' => {
***************
*** 1115,1119 ****
            'parent' => {}
          },
!         {},
          {
            'args' => [
--- 1077,1089 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'args' => [
***************
*** 1228,1243 ****
            'extra' => {
              'arg_line' => ' strongmacro 
! ',
!             'macrobody' => '@strong
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 1198,1202 ----
            'extra' => {
              'arg_line' => ' strongmacro 
! '
            },
            'line_nr' => {
***************
*** 1248,1252 ****
            'parent' => {}
          },
!         {},
          {
            'args' => [
--- 1207,1219 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'args' => [
***************
*** 1273,1288 ****
            'extra' => {
              'arg_line' => ' strongname 
! ',
!             'macrobody' => 'strong
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 1240,1244 ----
            'extra' => {
              'arg_line' => ' strongname 
! '
            },
            'line_nr' => {
***************
*** 1293,1297 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 1249,1261 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 1320,1324 ****
                  'file_name' => '',
                  'line_nr' => 76,
!                 'macro' => ''
                },
                'parent' => {}
--- 1284,1288 ----
                  'file_name' => '',
                  'line_nr' => 76,
!                 'macro' => 'strongmacro'
                },
                'parent' => {}
***************
*** 1412,1416 ****
                  'file_name' => '',
                  'line_nr' => 80,
!                 'macro' => ''
                },
                'parent' => {},
--- 1376,1380 ----
                  'file_name' => '',
                  'line_nr' => 80,
!                 'macro' => 'strongmacro'
                },
                'parent' => {},
***************
*** 1495,1510 ****
            'extra' => {
              'arg_line' => ' kbdinputstylearg 
! ',
!             'macrobody' => 'code
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 1459,1463 ----
            'extra' => {
              'arg_line' => ' kbdinputstylearg 
! '
            },
            'line_nr' => {
***************
*** 1515,1519 ****
            'parent' => {}
          },
!         {},
          {
            'args' => [
--- 1468,1480 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'args' => [
***************
*** 1736,1751 ****
            'extra' => {
              'arg_line' => ' asisarg 
! ',
!             'macrobody' => 'asis
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 1697,1701 ----
            'extra' => {
              'arg_line' => ' asisarg 
! '
            },
            'line_nr' => {
***************
*** 1756,1760 ****
            'parent' => {}
          },
!         {},
          {
            'args' => [
--- 1706,1718 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'args' => [
***************
*** 1781,1796 ****
            'extra' => {
              'arg_line' => ' zero 
! ',
!             'macrobody' => '0
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 1739,1743 ----
            'extra' => {
              'arg_line' => ' zero 
! '
            },
            'line_nr' => {
***************
*** 1801,1805 ****
            'parent' => {}
          },
!         {},
          {
            'args' => [
--- 1748,1760 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'args' => [
***************
*** 1826,1841 ****
            'extra' => {
              'arg_line' => ' nonearg 
! ',
!             'macrobody' => 'none
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 1781,1785 ----
            'extra' => {
              'arg_line' => ' nonearg 
! '
            },
            'line_nr' => {
***************
*** 1846,1850 ****
            'parent' => {}
          },
!         {},
          {
            'args' => [
--- 1790,1802 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'args' => [
***************
*** 1871,1886 ****
            'extra' => {
              'arg_line' => ' four 
! ',
!             'macrobody' => '4
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 1823,1827 ----
            'extra' => {
              'arg_line' => ' four 
! '
            },
            'line_nr' => {
***************
*** 1891,1895 ****
            'parent' => {}
          },
!         {},
          {
            'args' => [
--- 1832,1844 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'args' => [
***************
*** 1916,1931 ****
            'extra' => {
              'arg_line' => ' six 
! ',
!             'macrobody' => '6
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 1865,1869 ----
            'extra' => {
              'arg_line' => ' six 
! '
            },
            'line_nr' => {
***************
*** 1936,1940 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 1874,1886 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 2219,2234 ****
            'extra' => {
              'arg_line' => ' endarg 
! ',
!             'macrobody' => 'end
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 2165,2169 ----
            'extra' => {
              'arg_line' => ' endarg 
! '
            },
            'line_nr' => {
***************
*** 2239,2243 ****
            'parent' => {}
          },
!         {},
          {
            'args' => [
--- 2174,2186 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'args' => [
***************
*** 2264,2279 ****
            'extra' => {
              'arg_line' => ' separatearg 
! ',
!             'macrobody' => 'separate 
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 2207,2211 ----
            'extra' => {
              'arg_line' => ' separatearg 
! '
            },
            'line_nr' => {
***************
*** 2284,2288 ****
            'parent' => {}
          },
!         {},
          {
            'args' => [
--- 2216,2228 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'args' => [
***************
*** 2397,2412 ****
            'extra' => {
              'arg_line' => ' onarg 
! ',
!             'macrobody' => 'on
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 2337,2341 ----
            'extra' => {
              'arg_line' => ' onarg 
! '
            },
            'line_nr' => {
***************
*** 2417,2421 ****
            'parent' => {}
          },
!         {},
          {
            'args' => [
--- 2346,2358 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'args' => [
***************
*** 2442,2457 ****
            'extra' => {
              'arg_line' => ' offarg 
! ',
!             'macrobody' => 'off
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 2379,2383 ----
            'extra' => {
              'arg_line' => ' offarg 
! '
            },
            'line_nr' => {
***************
*** 2462,2466 ****
            'parent' => {}
          },
!         {},
          {
            'args' => [
--- 2388,2400 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'args' => [
***************
*** 2583,2608 ****
                'text' => '10',
                'type' => 'raw'
!             },
!             {
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'last_raw_newline'
!             }
!           ],
!           'extra' => {
!             'arg_line' => ' ten 
! ',
!             'macrobody' => '10
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
                'parent' => {},
                'text' => '
  ',
!               'type' => 'empty_line_after_command'
              }
            },
            'line_nr' => {
--- 2517,2531 ----
                'text' => '10',
                'type' => 'raw'
!             },
!             {
                'parent' => {},
                'text' => '
  ',
!               'type' => 'last_raw_newline'
              }
+           ],
+           'extra' => {
+             'arg_line' => ' ten 
+ '
            },
            'line_nr' => {
***************
*** 2613,2617 ****
            'parent' => {}
          },
!         {},
          {
            'args' => [
--- 2536,2548 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'args' => [
***************
*** 2697,2712 ****
            'extra' => {
              'arg_line' => ' falsearg 
! ',
!             'macrobody' => 'false
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 2628,2632 ----
            'extra' => {
              'arg_line' => ' falsearg 
! '
            },
            'line_nr' => {
***************
*** 2717,2721 ****
            'parent' => {}
          },
!         {},
          {
            'args' => [
--- 2637,2649 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'args' => [
***************
*** 2742,2757 ****
            'extra' => {
              'arg_line' => ' truearg
! ',
!             'macrobody' => 'true
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 2670,2674 ----
            'extra' => {
              'arg_line' => ' truearg
! '
            },
            'line_nr' => {
***************
*** 2762,2766 ****
            'parent' => {}
          },
!         {},
          {
            'args' => [
--- 2679,2691 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'args' => [
***************
*** 2881,2896 ****
            'extra' => {
              'arg_line' => ' pagemacro 
! ',
!             'macrobody' => '@page
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 2806,2810 ----
            'extra' => {
              'arg_line' => ' pagemacro 
! '
            },
            'line_nr' => {
***************
*** 2901,2905 ****
            'parent' => {}
          },
!         {},
          {
            'args' => [
--- 2815,2827 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'args' => [
***************
*** 2926,2941 ****
            'extra' => {
              'arg_line' => ' noindentmacro 
! ',
!             'macrobody' => '@noindent
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 2848,2852 ----
            'extra' => {
              'arg_line' => ' noindentmacro 
! '
            },
            'line_nr' => {
***************
*** 2946,2950 ****
            'parent' => {}
          },
!         {},
          {
            'args' => [
--- 2857,2869 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'args' => [
***************
*** 2971,2986 ****
            'extra' => {
              'arg_line' => ' refillmacro 
! ',
!             'macrobody' => '@refill
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 2890,2894 ----
            'extra' => {
              'arg_line' => ' refillmacro 
! '
            },
            'line_nr' => {
***************
*** 2991,2995 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 2899,2911 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 3322,3337 ****
            'extra' => {
              'arg_line' => ' contentsmacro 
! ',
!             'macrobody' => '@contents
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 3238,3242 ----
            'extra' => {
              'arg_line' => ' contentsmacro 
! '
            },
            'line_nr' => {
***************
*** 3342,3346 ****
            'parent' => {}
          },
!         {},
          {
            'args' => [
--- 3247,3259 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'args' => [
***************
*** 3414,3429 ****
            'extra' => {
              'arg_line' => ' cropmarksmacro
! ',
!             'macrobody' => '@cropmarks
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 3327,3331 ----
            'extra' => {
              'arg_line' => ' cropmarksmacro
! '
            },
            'line_nr' => {
***************
*** 3434,3438 ****
            'parent' => {}
          },
!         {},
          {
            'args' => [
--- 3336,3348 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'args' => [
***************
*** 3477,3492 ****
            'extra' => {
              'arg_line' => ' exdentmacro 
! ',
!             'macrobody' => '@exdent
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 3387,3391 ----
            'extra' => {
              'arg_line' => ' exdentmacro 
! '
            },
            'line_nr' => {
***************
*** 3497,3501 ****
            'parent' => {}
          },
!         {},
          {
            'args' => [
--- 3396,3408 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'args' => [
***************
*** 3569,3584 ****
            'extra' => {
              'arg_line' => ' two 
! ',
!             'macrobody' => '2
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 3476,3480 ----
            'extra' => {
              'arg_line' => ' two 
! '
            },
            'line_nr' => {
***************
*** 3589,3593 ****
            'parent' => {}
          },
!         {},
          {
            'args' => [
--- 3485,3497 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'args' => [
***************
*** 3661,3676 ****
            'extra' => {
              'arg_line' => ' resultmacro 
! ',
!             'macrobody' => '@result
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 3565,3569 ----
            'extra' => {
              'arg_line' => ' resultmacro 
! '
            },
            'line_nr' => {
***************
*** 3681,3685 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 3574,3586 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 3991,4006 ****
            'extra' => {
              'arg_line' => ' shortcontentsmacro 
! ',
!             'macrobody' => '@shortcontents
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 3892,3896 ----
            'extra' => {
              'arg_line' => ' shortcontentsmacro 
! '
            },
            'line_nr' => {
***************
*** 4011,4015 ****
            'parent' => {}
          },
!         {},
          {
            'args' => [
--- 3901,3913 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'args' => [
***************
*** 4059,4074 ****
            'extra' => {
              'arg_line' => ' byemacro
! ',
!             'macrobody' => '@bye
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 3957,3961 ----
            'extra' => {
              'arg_line' => ' byemacro
! '
            },
            'line_nr' => {
***************
*** 4079,4083 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 3966,3978 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 4120,4135 ****
  $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0];
  $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0];
- $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0];
- $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[0];
  $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[0];
! $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[1] = $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[0];
  $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3];
  $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3];
  $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3];
- $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3];
- $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[0];
  $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[0];
! $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[4] = $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[0];
  $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'};
--- 4015,4028 ----
  $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0];
  $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0];
  $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[0];
! $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[1]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[0];
! $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[0];
  $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[0];
  $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3];
  $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3];
  $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3];
  $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[0];
! $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[4]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[3];
! $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[0];
  $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[0];
  $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'};
***************
*** 4167,4181 ****
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[5] = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[7] = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[8]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[9];
--- 4060,4072 ----
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[4];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[5]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[6];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[7]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[8]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[9];
***************
*** 4203,4218 ****
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[14] = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[15]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[17] = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[18]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[19];
--- 4094,4107 ----
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[14]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[13];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[14]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[15]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[17]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[16];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[17]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[18]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[19];
***************
*** 4241,4248 ****
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[26] = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[27]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[28];
--- 4130,4136 ----
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[26]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[25];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[26]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[27]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[28];
***************
*** 4257,4264 ****
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[31] = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[32];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[32]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
--- 4145,4151 ----
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[31]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[30];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[31]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[32];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[32]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
***************
*** 4266,4273 ****
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[34] = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[35];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[35]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
--- 4153,4159 ----
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[34]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[33];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[34]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[35];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[35]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
***************
*** 4293,4300 ****
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[42] = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[43];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[43]{'args'}[0];
--- 4179,4185 ----
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[42]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[41];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[42]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[43];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[43]{'args'}[0];
***************
*** 4314,4328 ****
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[48] = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[50] = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[51]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[52]{'contents'}[0]{'args'}[0];
--- 4199,4211 ----
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[47];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[50]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[49];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[50]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[51]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[52]{'contents'}[0]{'args'}[0];
***************
*** 4355,4362 ****
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[61] = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[62]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[62];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[62]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[62]{'args'}[0];
--- 4238,4244 ----
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[61]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[60];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[61]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[62]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[62];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[62]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[62]{'args'}[0];
***************
*** 4395,4430 ****
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[69] = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[71] = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[73] = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[75] = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[77] = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[78]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[79]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[79];
--- 4277,4307 ----
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[69]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[69]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[71]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[70];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[71]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[73]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[72];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[73]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[75]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[74];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[75]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[77]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[76];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[77]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[78]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[79]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[79];
***************
*** 4474,4488 ****
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[87] = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[89] = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90]{'args'}[0];
--- 4351,4363 ----
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[87]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[86];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[87]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[89]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[88];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[89]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[90]{'args'}[0];
***************
*** 4503,4517 ****
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[94] = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[96] = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[97]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[97];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[97]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[97]{'args'}[0];
--- 4378,4390 ----
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[94]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[93];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[94]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[96]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[95];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[96]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[97]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[97];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[97]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[97]{'args'}[0];
***************
*** 4534,4541 ****
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[102] = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[103]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[103];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[103]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[103]{'args'}[0];
--- 4407,4413 ----
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[102]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[101];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[102]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[103]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[103];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[103]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[103]{'args'}[0];
***************
*** 4550,4564 ****
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[106] = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[108] = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[109]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[109];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[109]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[109]{'args'}[0];
--- 4422,4434 ----
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[106]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[105];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[106]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[108]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[107];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[108]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[109]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[109];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[109]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[109]{'args'}[0];
***************
*** 4580,4601 ****
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[114] = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[116] = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[118] = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[119]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[120]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[120];
--- 4450,4468 ----
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[114]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[113];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[114]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[116]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[115];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[116]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[118]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[117];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[118]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[119]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[120]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[120];
***************
*** 4661,4668 ****
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[136] = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[137]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[137];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[137]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
--- 4528,4534 ----
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[136]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[135];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[136]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[137]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[137];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[137]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
***************
*** 4674,4681 ****
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[142] = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[143]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[143];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[143]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
--- 4540,4546 ----
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[142]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[141];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[142]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[143]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[143];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[143]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
***************
*** 4684,4691 ****
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[146] = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[147]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[147];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[147]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[147]{'args'}[0];
--- 4549,4555 ----
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[146]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[145];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[146]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[147]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[147];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[147]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[147]{'args'}[0];
***************
*** 4700,4707 ****
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[150] = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[151]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[151];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[151]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[151]{'args'}[0];
--- 4564,4570 ----
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[150]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[149];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[150]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[151]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[151];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[151]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[151]{'args'}[0];
***************
*** 4715,4722 ****
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153];
- $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[154] = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[155]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[156]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[156];
--- 4578,4584 ----
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[154]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153];
! $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[154]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[155]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
  $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[156]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[156];
***************
*** 4771,4778 ****
  $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3];
  $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3];
- $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3];
- $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[4];
  $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[4];
! $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[4] = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[5];
  $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[5]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[4];
--- 4633,4639 ----
  $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3];
  $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3];
  $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[4];
! $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[4]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[3];
! $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[4]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[4];
  $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[5];
  $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[5]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[4];
***************
*** 4781,4788 ****
  $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7];
  $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7];
- $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7];
- $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[4];
  $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[4];
! $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[8] = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[9]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[4];
  $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'extra'}{'misc_content'}[0] = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'args'}[0]{'contents'}[1];
--- 4642,4648 ----
  $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7];
  $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7];
  $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[4];
! $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[8]{'extra'}{'command'} = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[7];
! $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[8]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[4];
  $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'contents'}[9]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[4];
  $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'extra'}{'misc_content'}[0] = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'args'}[0]{'contents'}[1];
***************
*** 5210,5219 ****
  $result_errors{'macro_in_misc_commands'} = [
    {
!     'error_line' => ':23: warning: @documentlanguage should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 23,
      'macro' => '',
!     'text' => '@documentlanguage should only appear at a line beginning',
      'type' => 'warning'
    },
--- 5070,5079 ----
  $result_errors{'macro_in_misc_commands'} = [
    {
!     'error_line' => ':23: warning: @documentlanguage should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 23,
      'macro' => '',
!     'text' => '@documentlanguage should only appear at the beginning of a line',
      'type' => 'warning'
    },
***************
*** 5228,5237 ****
    },
    {
!     'error_line' => ':58: warning: @definfoenclose should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 58,
      'macro' => '',
!     'text' => '@definfoenclose should only appear at a line beginning',
      'type' => 'warning'
    },
--- 5088,5097 ----
    },
    {
!     'error_line' => ':58: warning: @definfoenclose should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 58,
      'macro' => '',
!     'text' => '@definfoenclose should only appear at the beginning of a line',
      'type' => 'warning'
    },
***************
*** 5246,5264 ****
    },
    {
!     'error_line' => ':162: warning: @page should only appear at a line beginning (possibly involving @pagemacro)
  ',
      'file_name' => '',
      'line_nr' => 162,
      'macro' => 'pagemacro',
!     'text' => '@page should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':173: warning: @page should only appear at a line beginning (possibly involving @pagemacro)
  ',
      'file_name' => '',
      'line_nr' => 173,
      'macro' => 'pagemacro',
!     'text' => '@page should only appear at a line beginning',
      'type' => 'warning'
    }
--- 5106,5124 ----
    },
    {
!     'error_line' => ':162: warning: @page should only appear at the beginning of a line (possibly involving @pagemacro)
  ',
      'file_name' => '',
      'line_nr' => 162,
      'macro' => 'pagemacro',
!     'text' => '@page should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':173: warning: @page should only appear at the beginning of a line (possibly involving @pagemacro)
  ',
      'file_name' => '',
      'line_nr' => 173,
      'macro' => 'pagemacro',
!     'text' => '@page should only appear at the beginning of a line',
      'type' => 'warning'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/macro/macro_name_with_digit.pl texinfo-6.3/tp/t/results/macro/macro_name_with_digit.pl
*** texinfo-6.1/tp/t/results/macro/macro_name_with_digit.pl	2016-01-22 07:50:09.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/macro_name_with_digit.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 32,47 ****
        'extra' => {
          'arg_line' => ' macro1
! ',
!         'macrobody' => 'macro1
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 32,36 ----
        'extra' => {
          'arg_line' => ' macro1
! '
        },
        'line_nr' => {
***************
*** 52,56 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 41,53 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 88,106 ****
        'extra' => {
          'arg_line' => ' macro11 {arg}
! ',
!         'args_index' => {
!           'arg' => 0
!         },
!         'macrobody' => 'expand \\arg\\
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 85,89 ----
        'extra' => {
          'arg_line' => ' macro11 {arg}
! '
        },
        'line_nr' => {
***************
*** 111,115 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 94,106 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 135,142 ****
  $result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_name_with_digit'}{'contents'}[0];
  $result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_name_with_digit'}{'contents'}[0];
- $result_trees{'macro_name_with_digit'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_name_with_digit'}{'contents'}[0];
- $result_trees{'macro_name_with_digit'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_name_with_digit'};
  $result_trees{'macro_name_with_digit'}{'contents'}[0]{'parent'} = $result_trees{'macro_name_with_digit'};
! $result_trees{'macro_name_with_digit'}{'contents'}[1] = $result_trees{'macro_name_with_digit'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_name_with_digit'}{'contents'}[2]{'parent'} = $result_trees{'macro_name_with_digit'};
  $result_trees{'macro_name_with_digit'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'macro_name_with_digit'}{'contents'}[3];
--- 126,132 ----
  $result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_name_with_digit'}{'contents'}[0];
  $result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_name_with_digit'}{'contents'}[0];
  $result_trees{'macro_name_with_digit'}{'contents'}[0]{'parent'} = $result_trees{'macro_name_with_digit'};
! $result_trees{'macro_name_with_digit'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'macro_name_with_digit'}{'contents'}[0];
! $result_trees{'macro_name_with_digit'}{'contents'}[1]{'parent'} = $result_trees{'macro_name_with_digit'};
  $result_trees{'macro_name_with_digit'}{'contents'}[2]{'parent'} = $result_trees{'macro_name_with_digit'};
  $result_trees{'macro_name_with_digit'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'macro_name_with_digit'}{'contents'}[3];
***************
*** 144,151 ****
  $result_trees{'macro_name_with_digit'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'macro_name_with_digit'}{'contents'}[3];
  $result_trees{'macro_name_with_digit'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'macro_name_with_digit'}{'contents'}[3];
- $result_trees{'macro_name_with_digit'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_name_with_digit'}{'contents'}[3];
- $result_trees{'macro_name_with_digit'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_name_with_digit'};
  $result_trees{'macro_name_with_digit'}{'contents'}[3]{'parent'} = $result_trees{'macro_name_with_digit'};
! $result_trees{'macro_name_with_digit'}{'contents'}[4] = $result_trees{'macro_name_with_digit'}{'contents'}[3]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_name_with_digit'}{'contents'}[5]{'parent'} = $result_trees{'macro_name_with_digit'};
  $result_trees{'macro_name_with_digit'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'macro_name_with_digit'}{'contents'}[6];
--- 134,140 ----
  $result_trees{'macro_name_with_digit'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'macro_name_with_digit'}{'contents'}[3];
  $result_trees{'macro_name_with_digit'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'macro_name_with_digit'}{'contents'}[3];
  $result_trees{'macro_name_with_digit'}{'contents'}[3]{'parent'} = $result_trees{'macro_name_with_digit'};
! $result_trees{'macro_name_with_digit'}{'contents'}[4]{'extra'}{'command'} = $result_trees{'macro_name_with_digit'}{'contents'}[3];
! $result_trees{'macro_name_with_digit'}{'contents'}[4]{'parent'} = $result_trees{'macro_name_with_digit'};
  $result_trees{'macro_name_with_digit'}{'contents'}[5]{'parent'} = $result_trees{'macro_name_with_digit'};
  $result_trees{'macro_name_with_digit'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'macro_name_with_digit'}{'contents'}[6];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/macro_name_with_hyphen.pl texinfo-6.3/tp/t/results/macro/macro_name_with_hyphen.pl
*** texinfo-6.1/tp/t/results/macro/macro_name_with_hyphen.pl	2016-01-22 07:50:09.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/macro_name_with_hyphen.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 42,61 ****
        'extra' => {
          'arg_line' => ' macro-one {arg-one, arg2}
! ',
!         'args_index' => {
!           'arg-one' => 0,
!           'arg2' => 1
!         },
!         'macrobody' => 'This \\arg-one\\ and that \\arg2\\.
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 42,46 ----
        'extra' => {
          'arg_line' => ' macro-one {arg-one, arg2}
! '
        },
        'line_nr' => {
***************
*** 66,70 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 51,63 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 118,125 ****
  $result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_name_with_hyphen'}{'contents'}[0];
  $result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_name_with_hyphen'}{'contents'}[0];
- $result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_name_with_hyphen'}{'contents'}[0];
- $result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_name_with_hyphen'};
  $result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'parent'} = $result_trees{'macro_name_with_hyphen'};
! $result_trees{'macro_name_with_hyphen'}{'contents'}[1] = $result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_name_with_hyphen'}{'contents'}[2]{'parent'} = $result_trees{'macro_name_with_hyphen'};
  $result_trees{'macro_name_with_hyphen'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'macro_name_with_hyphen'}{'contents'}[3];
--- 111,117 ----
  $result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_name_with_hyphen'}{'contents'}[0];
  $result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_name_with_hyphen'}{'contents'}[0];
  $result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'parent'} = $result_trees{'macro_name_with_hyphen'};
! $result_trees{'macro_name_with_hyphen'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'macro_name_with_hyphen'}{'contents'}[0];
! $result_trees{'macro_name_with_hyphen'}{'contents'}[1]{'parent'} = $result_trees{'macro_name_with_hyphen'};
  $result_trees{'macro_name_with_hyphen'}{'contents'}[2]{'parent'} = $result_trees{'macro_name_with_hyphen'};
  $result_trees{'macro_name_with_hyphen'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'macro_name_with_hyphen'}{'contents'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/macro_no_arg_bad_expansion.pl texinfo-6.3/tp/t/results/macro/macro_no_arg_bad_expansion.pl
*** texinfo-6.1/tp/t/results/macro/macro_no_arg_bad_expansion.pl	2016-01-22 07:50:09.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/macro_no_arg_bad_expansion.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 32,47 ****
        'extra' => {
          'arg_line' => ' testone
! ',
!         'macrobody' => 'res1
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 32,36 ----
        'extra' => {
          'arg_line' => ' testone
! '
        },
        'line_nr' => {
***************
*** 52,56 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 41,53 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 76,83 ****
  $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0];
  $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0];
- $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0];
- $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_no_arg_bad_expansion'};
  $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'parent'} = $result_trees{'macro_no_arg_bad_expansion'};
! $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[1] = $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[2]{'parent'} = $result_trees{'macro_no_arg_bad_expansion'};
  $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[3];
--- 73,79 ----
  $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0];
  $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0];
  $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0]{'parent'} = $result_trees{'macro_no_arg_bad_expansion'};
! $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[0];
! $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[1]{'parent'} = $result_trees{'macro_no_arg_bad_expansion'};
  $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[2]{'parent'} = $result_trees{'macro_no_arg_bad_expansion'};
  $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/macro_no_arg_expansion.pl texinfo-6.3/tp/t/results/macro/macro_no_arg_expansion.pl
*** texinfo-6.1/tp/t/results/macro/macro_no_arg_expansion.pl	2016-01-22 07:50:09.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/macro_no_arg_expansion.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 32,47 ****
        'extra' => {
          'arg_line' => ' testone
! ',
!         'macrobody' => 'res1
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 32,36 ----
        'extra' => {
          'arg_line' => ' testone
! '
        },
        'line_nr' => {
***************
*** 52,56 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 41,53 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 76,83 ****
  $result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_no_arg_expansion'}{'contents'}[0];
  $result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_no_arg_expansion'}{'contents'}[0];
- $result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_no_arg_expansion'}{'contents'}[0];
- $result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_no_arg_expansion'};
  $result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'parent'} = $result_trees{'macro_no_arg_expansion'};
! $result_trees{'macro_no_arg_expansion'}{'contents'}[1] = $result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_no_arg_expansion'}{'contents'}[2]{'parent'} = $result_trees{'macro_no_arg_expansion'};
  $result_trees{'macro_no_arg_expansion'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'macro_no_arg_expansion'}{'contents'}[3];
--- 73,79 ----
  $result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_no_arg_expansion'}{'contents'}[0];
  $result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_no_arg_expansion'}{'contents'}[0];
  $result_trees{'macro_no_arg_expansion'}{'contents'}[0]{'parent'} = $result_trees{'macro_no_arg_expansion'};
! $result_trees{'macro_no_arg_expansion'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'macro_no_arg_expansion'}{'contents'}[0];
! $result_trees{'macro_no_arg_expansion'}{'contents'}[1]{'parent'} = $result_trees{'macro_no_arg_expansion'};
  $result_trees{'macro_no_arg_expansion'}{'contents'}[2]{'parent'} = $result_trees{'macro_no_arg_expansion'};
  $result_trees{'macro_no_arg_expansion'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'macro_no_arg_expansion'}{'contents'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/macro_one_arg_end_of_file.pl texinfo-6.3/tp/t/results/macro/macro_one_arg_end_of_file.pl
*** texinfo-6.1/tp/t/results/macro/macro_one_arg_end_of_file.pl	2016-01-22 07:50:09.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/macro_one_arg_end_of_file.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 37,55 ****
        'extra' => {
          'arg_line' => ' onearg{arg}
! ',
!         'args_index' => {
!           'arg' => 0
!         },
!         'macrobody' => 'Arg \\arg\\.
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 37,41 ----
        'extra' => {
          'arg_line' => ' onearg{arg}
! '
        },
        'line_nr' => {
***************
*** 60,64 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 46,58 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 84,91 ****
  $result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_one_arg_end_of_file'}{'contents'}[0];
  $result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_one_arg_end_of_file'}{'contents'}[0];
- $result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_one_arg_end_of_file'}{'contents'}[0];
- $result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_one_arg_end_of_file'};
  $result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'parent'} = $result_trees{'macro_one_arg_end_of_file'};
! $result_trees{'macro_one_arg_end_of_file'}{'contents'}[1] = $result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_one_arg_end_of_file'}{'contents'}[2]{'parent'} = $result_trees{'macro_one_arg_end_of_file'};
  $result_trees{'macro_one_arg_end_of_file'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'macro_one_arg_end_of_file'}{'contents'}[3];
--- 78,84 ----
  $result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_one_arg_end_of_file'}{'contents'}[0];
  $result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_one_arg_end_of_file'}{'contents'}[0];
  $result_trees{'macro_one_arg_end_of_file'}{'contents'}[0]{'parent'} = $result_trees{'macro_one_arg_end_of_file'};
! $result_trees{'macro_one_arg_end_of_file'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'macro_one_arg_end_of_file'}{'contents'}[0];
! $result_trees{'macro_one_arg_end_of_file'}{'contents'}[1]{'parent'} = $result_trees{'macro_one_arg_end_of_file'};
  $result_trees{'macro_one_arg_end_of_file'}{'contents'}[2]{'parent'} = $result_trees{'macro_one_arg_end_of_file'};
  $result_trees{'macro_one_arg_end_of_file'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'macro_one_arg_end_of_file'}{'contents'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl texinfo-6.3/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
*** texinfo-6.1/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 37,55 ****
        'extra' => {
          'arg_line' => ' witherror{string}
! ',
!         'args_index' => {
!           'string' => 0
!         },
!         'macrobody' => '@center
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 37,41 ----
        'extra' => {
          'arg_line' => ' witherror{string}
! '
        },
        'line_nr' => {
***************
*** 60,64 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 46,58 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 104,111 ****
  $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0];
  $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0];
- $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0];
- $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_with_error_at_end_line_after_macro'};
  $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'parent'} = $result_trees{'macro_with_error_at_end_line_after_macro'};
! $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[1] = $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[2]{'parent'} = $result_trees{'macro_with_error_at_end_line_after_macro'};
  $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[3];
--- 98,104 ----
  $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0];
  $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0];
  $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0]{'parent'} = $result_trees{'macro_with_error_at_end_line_after_macro'};
! $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[0];
! $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[1]{'parent'} = $result_trees{'macro_with_error_at_end_line_after_macro'};
  $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[2]{'parent'} = $result_trees{'macro_with_error_at_end_line_after_macro'};
  $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'macro_with_error_at_end_line_after_macro'}{'contents'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/macro_zero.pl texinfo-6.3/tp/t/results/macro/macro_zero.pl
*** texinfo-6.1/tp/t/results/macro/macro_zero.pl	2016-01-22 07:50:09.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/macro_zero.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 32,47 ****
        'extra' => {
          'arg_line' => ' zero
! ',
!         'macrobody' => '0
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 32,36 ----
        'extra' => {
          'arg_line' => ' zero
! '
        },
        'line_nr' => {
***************
*** 52,56 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 41,53 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 81,88 ****
  $result_trees{'macro_zero'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_zero'}{'contents'}[0];
  $result_trees{'macro_zero'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_zero'}{'contents'}[0];
- $result_trees{'macro_zero'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_zero'}{'contents'}[0];
- $result_trees{'macro_zero'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_zero'};
  $result_trees{'macro_zero'}{'contents'}[0]{'parent'} = $result_trees{'macro_zero'};
! $result_trees{'macro_zero'}{'contents'}[1] = $result_trees{'macro_zero'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_zero'}{'contents'}[2]{'parent'} = $result_trees{'macro_zero'};
  $result_trees{'macro_zero'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'macro_zero'}{'contents'}[3];
--- 78,84 ----
  $result_trees{'macro_zero'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_zero'}{'contents'}[0];
  $result_trees{'macro_zero'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_zero'}{'contents'}[0];
  $result_trees{'macro_zero'}{'contents'}[0]{'parent'} = $result_trees{'macro_zero'};
! $result_trees{'macro_zero'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'macro_zero'}{'contents'}[0];
! $result_trees{'macro_zero'}{'contents'}[1]{'parent'} = $result_trees{'macro_zero'};
  $result_trees{'macro_zero'}{'contents'}[2]{'parent'} = $result_trees{'macro_zero'};
  $result_trees{'macro_zero'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'macro_zero'}{'contents'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/nested_macro_call.pl texinfo-6.3/tp/t/results/macro/nested_macro_call.pl
*** texinfo-6.1/tp/t/results/macro/nested_macro_call.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/nested_macro_call.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 32,47 ****
        'extra' => {
          'arg_line' => ' machin{}
! ',
!         'macrobody' => '(machin)
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 32,36 ----
        'extra' => {
          'arg_line' => ' machin{}
! '
        },
        'line_nr' => {
***************
*** 52,56 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 41,53 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 89,105 ****
        'extra' => {
          'arg_line' => ' truc{}
! ',
!         'macrobody' => '@machin{}
! 
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 86,90 ----
        'extra' => {
          'arg_line' => ' truc{}
! '
        },
        'line_nr' => {
***************
*** 110,114 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 95,107 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 139,146 ****
  $result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_macro_call'}{'contents'}[0];
  $result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_macro_call'}{'contents'}[0];
- $result_trees{'nested_macro_call'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'nested_macro_call'}{'contents'}[0];
- $result_trees{'nested_macro_call'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'nested_macro_call'};
  $result_trees{'nested_macro_call'}{'contents'}[0]{'parent'} = $result_trees{'nested_macro_call'};
! $result_trees{'nested_macro_call'}{'contents'}[1] = $result_trees{'nested_macro_call'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'nested_macro_call'}{'contents'}[2]{'parent'} = $result_trees{'nested_macro_call'};
  $result_trees{'nested_macro_call'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'nested_macro_call'}{'contents'}[3];
--- 132,138 ----
  $result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_macro_call'}{'contents'}[0];
  $result_trees{'nested_macro_call'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_macro_call'}{'contents'}[0];
  $result_trees{'nested_macro_call'}{'contents'}[0]{'parent'} = $result_trees{'nested_macro_call'};
! $result_trees{'nested_macro_call'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'nested_macro_call'}{'contents'}[0];
! $result_trees{'nested_macro_call'}{'contents'}[1]{'parent'} = $result_trees{'nested_macro_call'};
  $result_trees{'nested_macro_call'}{'contents'}[2]{'parent'} = $result_trees{'nested_macro_call'};
  $result_trees{'nested_macro_call'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'nested_macro_call'}{'contents'}[3];
***************
*** 148,155 ****
  $result_trees{'nested_macro_call'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'nested_macro_call'}{'contents'}[3];
  $result_trees{'nested_macro_call'}{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'nested_macro_call'}{'contents'}[3];
- $result_trees{'nested_macro_call'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'nested_macro_call'}{'contents'}[3];
- $result_trees{'nested_macro_call'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'nested_macro_call'};
  $result_trees{'nested_macro_call'}{'contents'}[3]{'parent'} = $result_trees{'nested_macro_call'};
! $result_trees{'nested_macro_call'}{'contents'}[4] = $result_trees{'nested_macro_call'}{'contents'}[3]{'extra'}{'spaces_after_command'};
  $result_trees{'nested_macro_call'}{'contents'}[5]{'parent'} = $result_trees{'nested_macro_call'};
  $result_trees{'nested_macro_call'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'nested_macro_call'}{'contents'}[6];
--- 140,146 ----
  $result_trees{'nested_macro_call'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'nested_macro_call'}{'contents'}[3];
  $result_trees{'nested_macro_call'}{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'nested_macro_call'}{'contents'}[3];
  $result_trees{'nested_macro_call'}{'contents'}[3]{'parent'} = $result_trees{'nested_macro_call'};
! $result_trees{'nested_macro_call'}{'contents'}[4]{'extra'}{'command'} = $result_trees{'nested_macro_call'}{'contents'}[3];
! $result_trees{'nested_macro_call'}{'contents'}[4]{'parent'} = $result_trees{'nested_macro_call'};
  $result_trees{'nested_macro_call'}{'contents'}[5]{'parent'} = $result_trees{'nested_macro_call'};
  $result_trees{'nested_macro_call'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'nested_macro_call'}{'contents'}[6];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/no_macrobody.pl texinfo-6.3/tp/t/results/macro/no_macrobody.pl
*** texinfo-6.1/tp/t/results/macro/no_macrobody.pl	2016-01-22 07:50:09.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/no_macrobody.pl	2016-08-02 18:44:47.000000000 +0100
***************
*** 25,42 ****
        'extra' => {
          'arg_line' => ' nomacrobody {arg}
! ',
!         'args_index' => {
!           'arg' => 0
!         },
!         'macrobody' => '',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 25,29 ----
        'extra' => {
          'arg_line' => ' nomacrobody {arg}
! '
        },
        'line_nr' => {
***************
*** 47,51 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 34,46 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 82,89 ****
  $result_trees{'no_macrobody'}{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'no_macrobody'}{'contents'}[0];
  $result_trees{'no_macrobody'}{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'no_macrobody'}{'contents'}[0];
- $result_trees{'no_macrobody'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'no_macrobody'}{'contents'}[0];
- $result_trees{'no_macrobody'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'no_macrobody'};
  $result_trees{'no_macrobody'}{'contents'}[0]{'parent'} = $result_trees{'no_macrobody'};
! $result_trees{'no_macrobody'}{'contents'}[1] = $result_trees{'no_macrobody'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'no_macrobody'}{'contents'}[2]{'parent'} = $result_trees{'no_macrobody'};
  $result_trees{'no_macrobody'}{'contents'}[3]{'parent'} = $result_trees{'no_macrobody'};
--- 77,83 ----
  $result_trees{'no_macrobody'}{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'no_macrobody'}{'contents'}[0];
  $result_trees{'no_macrobody'}{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'no_macrobody'}{'contents'}[0];
  $result_trees{'no_macrobody'}{'contents'}[0]{'parent'} = $result_trees{'no_macrobody'};
! $result_trees{'no_macrobody'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'no_macrobody'}{'contents'}[0];
! $result_trees{'no_macrobody'}{'contents'}[1]{'parent'} = $result_trees{'no_macrobody'};
  $result_trees{'no_macrobody'}{'contents'}[2]{'parent'} = $result_trees{'no_macrobody'};
  $result_trees{'no_macrobody'}{'contents'}[3]{'parent'} = $result_trees{'no_macrobody'};
diff -Nrc2 texinfo-6.1/tp/t/results/macro/paragraph_and_macro.pl texinfo-6.3/tp/t/results/macro/paragraph_and_macro.pl
*** texinfo-6.1/tp/t/results/macro/paragraph_and_macro.pl	2016-01-22 07:50:09.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/paragraph_and_macro.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 20,34 ****
        'extra' => {
          'arg_line' => ' aempty
! ',
!         'macrobody' => '',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 20,24 ----
        'extra' => {
          'arg_line' => ' aempty
! '
        },
        'line_nr' => {
***************
*** 39,43 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 29,41 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 70,85 ****
        'extra' => {
          'arg_line' => ' aspace
! ',
!         'macrobody' => '   
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 68,72 ----
        'extra' => {
          'arg_line' => ' aspace
! '
        },
        'line_nr' => {
***************
*** 90,94 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 77,89 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 121,136 ****
        'extra' => {
          'arg_line' => ' word
! ',
!         'macrobody' => 'a word
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 116,120 ----
        'extra' => {
          'arg_line' => ' word
! '
        },
        'line_nr' => {
***************
*** 141,145 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 125,137 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 238,261 ****
  };
  $result_trees{'paragraph_and_macro'}{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'paragraph_and_macro'}{'contents'}[0];
- $result_trees{'paragraph_and_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'paragraph_and_macro'}{'contents'}[0];
- $result_trees{'paragraph_and_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'paragraph_and_macro'};
  $result_trees{'paragraph_and_macro'}{'contents'}[0]{'parent'} = $result_trees{'paragraph_and_macro'};
! $result_trees{'paragraph_and_macro'}{'contents'}[1] = $result_trees{'paragraph_and_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'paragraph_and_macro'}{'contents'}[2]{'parent'} = $result_trees{'paragraph_and_macro'};
  $result_trees{'paragraph_and_macro'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'paragraph_and_macro'}{'contents'}[3];
  $result_trees{'paragraph_and_macro'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'paragraph_and_macro'}{'contents'}[3];
  $result_trees{'paragraph_and_macro'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'paragraph_and_macro'}{'contents'}[3];
- $result_trees{'paragraph_and_macro'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'paragraph_and_macro'}{'contents'}[3];
- $result_trees{'paragraph_and_macro'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'paragraph_and_macro'};
  $result_trees{'paragraph_and_macro'}{'contents'}[3]{'parent'} = $result_trees{'paragraph_and_macro'};
! $result_trees{'paragraph_and_macro'}{'contents'}[4] = $result_trees{'paragraph_and_macro'}{'contents'}[3]{'extra'}{'spaces_after_command'};
  $result_trees{'paragraph_and_macro'}{'contents'}[5]{'parent'} = $result_trees{'paragraph_and_macro'};
  $result_trees{'paragraph_and_macro'}{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'paragraph_and_macro'}{'contents'}[6];
  $result_trees{'paragraph_and_macro'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'paragraph_and_macro'}{'contents'}[6];
  $result_trees{'paragraph_and_macro'}{'contents'}[6]{'contents'}[1]{'parent'} = $result_trees{'paragraph_and_macro'}{'contents'}[6];
- $result_trees{'paragraph_and_macro'}{'contents'}[6]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'paragraph_and_macro'}{'contents'}[6];
- $result_trees{'paragraph_and_macro'}{'contents'}[6]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'paragraph_and_macro'};
  $result_trees{'paragraph_and_macro'}{'contents'}[6]{'parent'} = $result_trees{'paragraph_and_macro'};
! $result_trees{'paragraph_and_macro'}{'contents'}[7] = $result_trees{'paragraph_and_macro'}{'contents'}[6]{'extra'}{'spaces_after_command'};
  $result_trees{'paragraph_and_macro'}{'contents'}[8]{'parent'} = $result_trees{'paragraph_and_macro'};
  $result_trees{'paragraph_and_macro'}{'contents'}[9]{'parent'} = $result_trees{'paragraph_and_macro'};
--- 230,250 ----
  };
  $result_trees{'paragraph_and_macro'}{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'paragraph_and_macro'}{'contents'}[0];
  $result_trees{'paragraph_and_macro'}{'contents'}[0]{'parent'} = $result_trees{'paragraph_and_macro'};
! $result_trees{'paragraph_and_macro'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'paragraph_and_macro'}{'contents'}[0];
! $result_trees{'paragraph_and_macro'}{'contents'}[1]{'parent'} = $result_trees{'paragraph_and_macro'};
  $result_trees{'paragraph_and_macro'}{'contents'}[2]{'parent'} = $result_trees{'paragraph_and_macro'};
  $result_trees{'paragraph_and_macro'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'paragraph_and_macro'}{'contents'}[3];
  $result_trees{'paragraph_and_macro'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'paragraph_and_macro'}{'contents'}[3];
  $result_trees{'paragraph_and_macro'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'paragraph_and_macro'}{'contents'}[3];
  $result_trees{'paragraph_and_macro'}{'contents'}[3]{'parent'} = $result_trees{'paragraph_and_macro'};
! $result_trees{'paragraph_and_macro'}{'contents'}[4]{'extra'}{'command'} = $result_trees{'paragraph_and_macro'}{'contents'}[3];
! $result_trees{'paragraph_and_macro'}{'contents'}[4]{'parent'} = $result_trees{'paragraph_and_macro'};
  $result_trees{'paragraph_and_macro'}{'contents'}[5]{'parent'} = $result_trees{'paragraph_and_macro'};
  $result_trees{'paragraph_and_macro'}{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'paragraph_and_macro'}{'contents'}[6];
  $result_trees{'paragraph_and_macro'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'paragraph_and_macro'}{'contents'}[6];
  $result_trees{'paragraph_and_macro'}{'contents'}[6]{'contents'}[1]{'parent'} = $result_trees{'paragraph_and_macro'}{'contents'}[6];
  $result_trees{'paragraph_and_macro'}{'contents'}[6]{'parent'} = $result_trees{'paragraph_and_macro'};
! $result_trees{'paragraph_and_macro'}{'contents'}[7]{'extra'}{'command'} = $result_trees{'paragraph_and_macro'}{'contents'}[6];
! $result_trees{'paragraph_and_macro'}{'contents'}[7]{'parent'} = $result_trees{'paragraph_and_macro'};
  $result_trees{'paragraph_and_macro'}{'contents'}[8]{'parent'} = $result_trees{'paragraph_and_macro'};
  $result_trees{'paragraph_and_macro'}{'contents'}[9]{'parent'} = $result_trees{'paragraph_and_macro'};
diff -Nrc2 texinfo-6.1/tp/t/results/macro/protect_comma_macro_line.pl texinfo-6.3/tp/t/results/macro/protect_comma_macro_line.pl
*** texinfo-6.1/tp/t/results/macro/protect_comma_macro_line.pl	2016-01-22 07:50:09.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/protect_comma_macro_line.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 55,76 ****
        'extra' => {
          'arg_line' => ' macrotwo { arg }
! ',
!         'args_index' => {
!           'arg' => 0
!         },
!         'macrobody' => 'we get \\arg\\ and another \\arg\\
! and another one on another line \\arg\\
! 
! and a last in another paragraph
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 55,59 ----
        'extra' => {
          'arg_line' => ' macrotwo { arg }
! '
        },
        'line_nr' => {
***************
*** 81,85 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 64,76 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 131,138 ****
  $result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'protect_comma_macro_line'}{'contents'}[0];
  $result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'protect_comma_macro_line'}{'contents'}[0];
- $result_trees{'protect_comma_macro_line'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'protect_comma_macro_line'}{'contents'}[0];
- $result_trees{'protect_comma_macro_line'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'protect_comma_macro_line'};
  $result_trees{'protect_comma_macro_line'}{'contents'}[0]{'parent'} = $result_trees{'protect_comma_macro_line'};
! $result_trees{'protect_comma_macro_line'}{'contents'}[1] = $result_trees{'protect_comma_macro_line'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'protect_comma_macro_line'}{'contents'}[2]{'parent'} = $result_trees{'protect_comma_macro_line'};
  $result_trees{'protect_comma_macro_line'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'protect_comma_macro_line'}{'contents'}[3];
--- 122,128 ----
  $result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'protect_comma_macro_line'}{'contents'}[0];
  $result_trees{'protect_comma_macro_line'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'protect_comma_macro_line'}{'contents'}[0];
  $result_trees{'protect_comma_macro_line'}{'contents'}[0]{'parent'} = $result_trees{'protect_comma_macro_line'};
! $result_trees{'protect_comma_macro_line'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'protect_comma_macro_line'}{'contents'}[0];
! $result_trees{'protect_comma_macro_line'}{'contents'}[1]{'parent'} = $result_trees{'protect_comma_macro_line'};
  $result_trees{'protect_comma_macro_line'}{'contents'}[2]{'parent'} = $result_trees{'protect_comma_macro_line'};
  $result_trees{'protect_comma_macro_line'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'protect_comma_macro_line'}{'contents'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/protect_in_body.pl texinfo-6.3/tp/t/results/macro/protect_in_body.pl
*** texinfo-6.1/tp/t/results/macro/protect_in_body.pl	2016-01-22 07:50:09.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/protect_in_body.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 42,61 ****
        'extra' => {
          'arg_line' => ' macroone { arg1 , arg2 }
! ',
!         'args_index' => {
!           'arg1' => 0,
!           'arg2' => 1
!         },
!         'macrobody' => 'result: @emph{\\arg1\\} protected \\\\ -> \\\\arg1\\\\ @emph{\\arg2\\}
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 42,46 ----
        'extra' => {
          'arg_line' => ' macroone { arg1 , arg2 }
! '
        },
        'line_nr' => {
***************
*** 66,70 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 51,63 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 154,161 ****
  $result_trees{'protect_in_body'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'protect_in_body'}{'contents'}[0];
  $result_trees{'protect_in_body'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'protect_in_body'}{'contents'}[0];
- $result_trees{'protect_in_body'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'protect_in_body'}{'contents'}[0];
- $result_trees{'protect_in_body'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'protect_in_body'};
  $result_trees{'protect_in_body'}{'contents'}[0]{'parent'} = $result_trees{'protect_in_body'};
! $result_trees{'protect_in_body'}{'contents'}[1] = $result_trees{'protect_in_body'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'protect_in_body'}{'contents'}[2]{'parent'} = $result_trees{'protect_in_body'};
  $result_trees{'protect_in_body'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'protect_in_body'}{'contents'}[3];
--- 147,153 ----
  $result_trees{'protect_in_body'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'protect_in_body'}{'contents'}[0];
  $result_trees{'protect_in_body'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'protect_in_body'}{'contents'}[0];
  $result_trees{'protect_in_body'}{'contents'}[0]{'parent'} = $result_trees{'protect_in_body'};
! $result_trees{'protect_in_body'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'protect_in_body'}{'contents'}[0];
! $result_trees{'protect_in_body'}{'contents'}[1]{'parent'} = $result_trees{'protect_in_body'};
  $result_trees{'protect_in_body'}{'contents'}[2]{'parent'} = $result_trees{'protect_in_body'};
  $result_trees{'protect_in_body'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'protect_in_body'}{'contents'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/protect_in_body_line_arg.pl texinfo-6.3/tp/t/results/macro/protect_in_body_line_arg.pl
*** texinfo-6.1/tp/t/results/macro/protect_in_body_line_arg.pl	2016-01-22 07:50:09.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/protect_in_body_line_arg.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 42,61 ****
        'extra' => {
          'arg_line' => ' macroone { arg1 , arg2 }
! ',
!         'args_index' => {
!           'arg1' => 0,
!           'arg2' => 1
!         },
!         'macrobody' => 'result: @emph{\\arg1\\} protected \\\\ -> \\\\arg1\\\\ @emph{\\arg2\\}
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 42,46 ----
        'extra' => {
          'arg_line' => ' macroone { arg1 , arg2 }
! '
        },
        'line_nr' => {
***************
*** 66,70 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 51,63 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 156,163 ****
  $result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'protect_in_body_line_arg'}{'contents'}[0];
  $result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'protect_in_body_line_arg'}{'contents'}[0];
- $result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'protect_in_body_line_arg'}{'contents'}[0];
- $result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'protect_in_body_line_arg'};
  $result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'parent'} = $result_trees{'protect_in_body_line_arg'};
! $result_trees{'protect_in_body_line_arg'}{'contents'}[1] = $result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'protect_in_body_line_arg'}{'contents'}[2]{'parent'} = $result_trees{'protect_in_body_line_arg'};
  $result_trees{'protect_in_body_line_arg'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'protect_in_body_line_arg'}{'contents'}[3];
--- 149,155 ----
  $result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'protect_in_body_line_arg'}{'contents'}[0];
  $result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'protect_in_body_line_arg'}{'contents'}[0];
  $result_trees{'protect_in_body_line_arg'}{'contents'}[0]{'parent'} = $result_trees{'protect_in_body_line_arg'};
! $result_trees{'protect_in_body_line_arg'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'protect_in_body_line_arg'}{'contents'}[0];
! $result_trees{'protect_in_body_line_arg'}{'contents'}[1]{'parent'} = $result_trees{'protect_in_body_line_arg'};
  $result_trees{'protect_in_body_line_arg'}{'contents'}[2]{'parent'} = $result_trees{'protect_in_body_line_arg'};
  $result_trees{'protect_in_body_line_arg'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'protect_in_body_line_arg'}{'contents'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/protect_in_body_one_arg.pl texinfo-6.3/tp/t/results/macro/protect_in_body_one_arg.pl
*** texinfo-6.1/tp/t/results/macro/protect_in_body_one_arg.pl	2016-01-22 07:50:09.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/protect_in_body_one_arg.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 42,61 ****
        'extra' => {
          'arg_line' => ' macroone { arg1 , arg2 }
! ',
!         'args_index' => {
!           'arg1' => 0,
!           'arg2' => 1
!         },
!         'macrobody' => 'result: @emph{\\arg1\\} protected \\\\ -> \\\\arg1\\\\ @emph{\\arg2\\}
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 42,46 ----
        'extra' => {
          'arg_line' => ' macroone { arg1 , arg2 }
! '
        },
        'line_nr' => {
***************
*** 66,70 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 51,63 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 149,156 ****
  $result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'protect_in_body_one_arg'}{'contents'}[0];
  $result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'protect_in_body_one_arg'}{'contents'}[0];
- $result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'protect_in_body_one_arg'}{'contents'}[0];
- $result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'protect_in_body_one_arg'};
  $result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'parent'} = $result_trees{'protect_in_body_one_arg'};
! $result_trees{'protect_in_body_one_arg'}{'contents'}[1] = $result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'protect_in_body_one_arg'}{'contents'}[2]{'parent'} = $result_trees{'protect_in_body_one_arg'};
  $result_trees{'protect_in_body_one_arg'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'protect_in_body_one_arg'}{'contents'}[3];
--- 142,148 ----
  $result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'protect_in_body_one_arg'}{'contents'}[0];
  $result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'protect_in_body_one_arg'}{'contents'}[0];
  $result_trees{'protect_in_body_one_arg'}{'contents'}[0]{'parent'} = $result_trees{'protect_in_body_one_arg'};
! $result_trees{'protect_in_body_one_arg'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'protect_in_body_one_arg'}{'contents'}[0];
! $result_trees{'protect_in_body_one_arg'}{'contents'}[1]{'parent'} = $result_trees{'protect_in_body_one_arg'};
  $result_trees{'protect_in_body_one_arg'}{'contents'}[2]{'parent'} = $result_trees{'protect_in_body_one_arg'};
  $result_trees{'protect_in_body_one_arg'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'protect_in_body_one_arg'}{'contents'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/recursive_call_in_argument.pl texinfo-6.3/tp/t/results/macro/recursive_call_in_argument.pl
*** texinfo-6.1/tp/t/results/macro/recursive_call_in_argument.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/recursive_call_in_argument.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 37,55 ****
        'extra' => {
          'arg_line' => ' anorecurse{arg}
! ',
!         'args_index' => {
!           'arg' => 0
!         },
!         'macrobody' => 'a
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 37,41 ----
        'extra' => {
          'arg_line' => ' anorecurse{arg}
! '
        },
        'line_nr' => {
***************
*** 60,64 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 46,58 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 85,92 ****
  $result_trees{'recursive_call_in_argument'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'recursive_call_in_argument'}{'contents'}[0];
  $result_trees{'recursive_call_in_argument'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'recursive_call_in_argument'}{'contents'}[0];
- $result_trees{'recursive_call_in_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'recursive_call_in_argument'}{'contents'}[0];
- $result_trees{'recursive_call_in_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'recursive_call_in_argument'};
  $result_trees{'recursive_call_in_argument'}{'contents'}[0]{'parent'} = $result_trees{'recursive_call_in_argument'};
! $result_trees{'recursive_call_in_argument'}{'contents'}[1] = $result_trees{'recursive_call_in_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'recursive_call_in_argument'}{'contents'}[2]{'parent'} = $result_trees{'recursive_call_in_argument'};
  $result_trees{'recursive_call_in_argument'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'recursive_call_in_argument'}{'contents'}[3];
--- 79,85 ----
  $result_trees{'recursive_call_in_argument'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'recursive_call_in_argument'}{'contents'}[0];
  $result_trees{'recursive_call_in_argument'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'recursive_call_in_argument'}{'contents'}[0];
  $result_trees{'recursive_call_in_argument'}{'contents'}[0]{'parent'} = $result_trees{'recursive_call_in_argument'};
! $result_trees{'recursive_call_in_argument'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'recursive_call_in_argument'}{'contents'}[0];
! $result_trees{'recursive_call_in_argument'}{'contents'}[1]{'parent'} = $result_trees{'recursive_call_in_argument'};
  $result_trees{'recursive_call_in_argument'}{'contents'}[2]{'parent'} = $result_trees{'recursive_call_in_argument'};
  $result_trees{'recursive_call_in_argument'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'recursive_call_in_argument'}{'contents'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/recursive_call_in_macro.pl texinfo-6.3/tp/t/results/macro/recursive_call_in_macro.pl
*** texinfo-6.1/tp/t/results/macro/recursive_call_in_macro.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/recursive_call_in_macro.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 37,55 ****
        'extra' => {
          'arg_line' => ' anorecurse{arg}
! ',
!         'args_index' => {
!           'arg' => 0
!         },
!         'macrobody' => '@anorecurse{arg}
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 37,41 ----
        'extra' => {
          'arg_line' => ' anorecurse{arg}
! '
        },
        'line_nr' => {
***************
*** 60,64 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 46,58 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 80,87 ****
  $result_trees{'recursive_call_in_macro'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'recursive_call_in_macro'}{'contents'}[0];
  $result_trees{'recursive_call_in_macro'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'recursive_call_in_macro'}{'contents'}[0];
- $result_trees{'recursive_call_in_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'recursive_call_in_macro'}{'contents'}[0];
- $result_trees{'recursive_call_in_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'recursive_call_in_macro'};
  $result_trees{'recursive_call_in_macro'}{'contents'}[0]{'parent'} = $result_trees{'recursive_call_in_macro'};
! $result_trees{'recursive_call_in_macro'}{'contents'}[1] = $result_trees{'recursive_call_in_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'recursive_call_in_macro'}{'contents'}[2]{'parent'} = $result_trees{'recursive_call_in_macro'};
  $result_trees{'recursive_call_in_macro'}{'contents'}[3]{'parent'} = $result_trees{'recursive_call_in_macro'};
--- 74,80 ----
  $result_trees{'recursive_call_in_macro'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'recursive_call_in_macro'}{'contents'}[0];
  $result_trees{'recursive_call_in_macro'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'recursive_call_in_macro'}{'contents'}[0];
  $result_trees{'recursive_call_in_macro'}{'contents'}[0]{'parent'} = $result_trees{'recursive_call_in_macro'};
! $result_trees{'recursive_call_in_macro'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'recursive_call_in_macro'}{'contents'}[0];
! $result_trees{'recursive_call_in_macro'}{'contents'}[1]{'parent'} = $result_trees{'recursive_call_in_macro'};
  $result_trees{'recursive_call_in_macro'}{'contents'}[2]{'parent'} = $result_trees{'recursive_call_in_macro'};
  $result_trees{'recursive_call_in_macro'}{'contents'}[3]{'parent'} = $result_trees{'recursive_call_in_macro'};
diff -Nrc2 texinfo-6.1/tp/t/results/macro/redefine_texinfo_macro.pl texinfo-6.3/tp/t/results/macro/redefine_texinfo_macro.pl
*** texinfo-6.1/tp/t/results/macro/redefine_texinfo_macro.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/redefine_texinfo_macro.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 37,55 ****
        'extra' => {
          'arg_line' => ' code{arg}
! ',
!         'args_index' => {
!           'arg' => 0
!         },
!         'macrobody' => '@emph{\\arg\\}
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 37,41 ----
        'extra' => {
          'arg_line' => ' code{arg}
! '
        },
        'line_nr' => {
***************
*** 60,64 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 46,58 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 107,114 ****
  $result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'redefine_texinfo_macro'}{'contents'}[0];
  $result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'redefine_texinfo_macro'}{'contents'}[0];
- $result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'redefine_texinfo_macro'}{'contents'}[0];
- $result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'redefine_texinfo_macro'};
  $result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'parent'} = $result_trees{'redefine_texinfo_macro'};
! $result_trees{'redefine_texinfo_macro'}{'contents'}[1] = $result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'redefine_texinfo_macro'}{'contents'}[2]{'parent'} = $result_trees{'redefine_texinfo_macro'};
  $result_trees{'redefine_texinfo_macro'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'redefine_texinfo_macro'}{'contents'}[3]{'contents'}[0]{'args'}[0];
--- 101,107 ----
  $result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'redefine_texinfo_macro'}{'contents'}[0];
  $result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'redefine_texinfo_macro'}{'contents'}[0];
  $result_trees{'redefine_texinfo_macro'}{'contents'}[0]{'parent'} = $result_trees{'redefine_texinfo_macro'};
! $result_trees{'redefine_texinfo_macro'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'redefine_texinfo_macro'}{'contents'}[0];
! $result_trees{'redefine_texinfo_macro'}{'contents'}[1]{'parent'} = $result_trees{'redefine_texinfo_macro'};
  $result_trees{'redefine_texinfo_macro'}{'contents'}[2]{'parent'} = $result_trees{'redefine_texinfo_macro'};
  $result_trees{'redefine_texinfo_macro'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'redefine_texinfo_macro'}{'contents'}[3]{'contents'}[0]{'args'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/simple_imbricated_macro.pl texinfo-6.3/tp/t/results/macro/simple_imbricated_macro.pl
*** texinfo-6.1/tp/t/results/macro/simple_imbricated_macro.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/simple_imbricated_macro.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 41,68 ****
            'extra' => {
              'arg_line' => ' bidule {}
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'parent' => {}
          },
!         {}
!       ],
!       'extra' => {
!         'arg_line' => ' truc {}
! ',
!         'macrobody' => 'truc.
! @macro bidule {}
! bidule.
! @end macro
! ',
!         'spaces_after_command' => {
            'extra' => {
              'command' => {}
--- 41,49 ----
            'extra' => {
              'arg_line' => ' bidule {}
! '
            },
            'parent' => {}
          },
!         {
            'extra' => {
              'command' => {}
***************
*** 73,76 ****
--- 54,61 ----
            'type' => 'empty_line_after_command'
          }
+       ],
+       'extra' => {
+         'arg_line' => ' truc {}
+ '
        },
        'line_nr' => {
***************
*** 81,85 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 66,78 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 119,134 ****
            'extra' => {
              'arg_line' => ' bidule {}
! ',
!             'macrobody' => 'bidule.
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 112,116 ----
            'extra' => {
              'arg_line' => ' bidule {}
! '
            },
            'line_nr' => {
***************
*** 139,143 ****
            'parent' => {}
          },
!         {}
        ],
        'parent' => {},
--- 121,133 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        ],
        'parent' => {},
***************
*** 168,179 ****
  $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1];
  $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1];
- $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1];
- $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'simple_imbricated_macro'}{'contents'}[0];
  $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'simple_imbricated_macro'}{'contents'}[0];
! $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[2] = $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'};
! $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'simple_imbricated_macro'}{'contents'}[0];
! $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'simple_imbricated_macro'};
  $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'parent'} = $result_trees{'simple_imbricated_macro'};
! $result_trees{'simple_imbricated_macro'}{'contents'}[1] = $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'simple_imbricated_macro'}{'contents'}[2]{'parent'} = $result_trees{'simple_imbricated_macro'};
  $result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'simple_imbricated_macro'}{'contents'}[3];
--- 158,167 ----
  $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1];
  $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1];
  $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'simple_imbricated_macro'}{'contents'}[0];
! $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[2]{'extra'}{'command'} = $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[1];
! $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'simple_imbricated_macro'}{'contents'}[0];
  $result_trees{'simple_imbricated_macro'}{'contents'}[0]{'parent'} = $result_trees{'simple_imbricated_macro'};
! $result_trees{'simple_imbricated_macro'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'simple_imbricated_macro'}{'contents'}[0];
! $result_trees{'simple_imbricated_macro'}{'contents'}[1]{'parent'} = $result_trees{'simple_imbricated_macro'};
  $result_trees{'simple_imbricated_macro'}{'contents'}[2]{'parent'} = $result_trees{'simple_imbricated_macro'};
  $result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'simple_imbricated_macro'}{'contents'}[3];
***************
*** 181,188 ****
  $result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1];
  $result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1];
- $result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1];
- $result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'simple_imbricated_macro'}{'contents'}[3];
  $result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'simple_imbricated_macro'}{'contents'}[3];
! $result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[2] = $result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1]{'extra'}{'spaces_after_command'};
  $result_trees{'simple_imbricated_macro'}{'contents'}[3]{'parent'} = $result_trees{'simple_imbricated_macro'};
  $result_trees{'simple_imbricated_macro'}{'contents'}[4]{'parent'} = $result_trees{'simple_imbricated_macro'};
--- 169,175 ----
  $result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1];
  $result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1];
  $result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'simple_imbricated_macro'}{'contents'}[3];
! $result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[2]{'extra'}{'command'} = $result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[1];
! $result_trees{'simple_imbricated_macro'}{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'simple_imbricated_macro'}{'contents'}[3];
  $result_trees{'simple_imbricated_macro'}{'contents'}[3]{'parent'} = $result_trees{'simple_imbricated_macro'};
  $result_trees{'simple_imbricated_macro'}{'contents'}[4]{'parent'} = $result_trees{'simple_imbricated_macro'};
diff -Nrc2 texinfo-6.1/tp/t/results/macro/space_macro_after_end.pl texinfo-6.3/tp/t/results/macro/space_macro_after_end.pl
*** texinfo-6.1/tp/t/results/macro/space_macro_after_end.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/space_macro_after_end.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 32,47 ****
        'extra' => {
          'arg_line' => ' spaces
! ',
!         'macrobody' => '  
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 32,36 ----
        'extra' => {
          'arg_line' => ' spaces
! '
        },
        'line_nr' => {
***************
*** 52,56 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 41,53 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 140,147 ****
  $result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'space_macro_after_end'}{'contents'}[0];
  $result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'space_macro_after_end'}{'contents'}[0];
- $result_trees{'space_macro_after_end'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'space_macro_after_end'}{'contents'}[0];
- $result_trees{'space_macro_after_end'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'space_macro_after_end'};
  $result_trees{'space_macro_after_end'}{'contents'}[0]{'parent'} = $result_trees{'space_macro_after_end'};
! $result_trees{'space_macro_after_end'}{'contents'}[1] = $result_trees{'space_macro_after_end'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'space_macro_after_end'}{'contents'}[2]{'parent'} = $result_trees{'space_macro_after_end'};
  $result_trees{'space_macro_after_end'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'} = $result_trees{'space_macro_after_end'}{'contents'}[3];
--- 137,143 ----
  $result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'space_macro_after_end'}{'contents'}[0];
  $result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'space_macro_after_end'}{'contents'}[0];
  $result_trees{'space_macro_after_end'}{'contents'}[0]{'parent'} = $result_trees{'space_macro_after_end'};
! $result_trees{'space_macro_after_end'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'space_macro_after_end'}{'contents'}[0];
! $result_trees{'space_macro_after_end'}{'contents'}[1]{'parent'} = $result_trees{'space_macro_after_end'};
  $result_trees{'space_macro_after_end'}{'contents'}[2]{'parent'} = $result_trees{'space_macro_after_end'};
  $result_trees{'space_macro_after_end'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'} = $result_trees{'space_macro_after_end'}{'contents'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/space_macro_after_end_verbatim.pl texinfo-6.3/tp/t/results/macro/space_macro_after_end_verbatim.pl
*** texinfo-6.1/tp/t/results/macro/space_macro_after_end_verbatim.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/space_macro_after_end_verbatim.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 32,47 ****
        'extra' => {
          'arg_line' => ' spaces
! ',
!         'macrobody' => '
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 32,36 ----
        'extra' => {
          'arg_line' => ' spaces
! '
        },
        'line_nr' => {
***************
*** 52,56 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 41,53 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 79,90 ****
        ],
        'extra' => {
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => ' ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 76,80 ----
        ],
        'extra' => {
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 95,99 ****
        'parent' => {}
      },
!     {}
    ],
    'type' => 'text_root'
--- 85,96 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => ' ',
!       'type' => 'empty_line_after_command'
!     }
    ],
    'type' => 'text_root'
***************
*** 102,117 ****
  $result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'space_macro_after_end_verbatim'}{'contents'}[0];
  $result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'space_macro_after_end_verbatim'}{'contents'}[0];
- $result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'space_macro_after_end_verbatim'}{'contents'}[0];
- $result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'space_macro_after_end_verbatim'};
  $result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'parent'} = $result_trees{'space_macro_after_end_verbatim'};
! $result_trees{'space_macro_after_end_verbatim'}{'contents'}[1] = $result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'space_macro_after_end_verbatim'}{'contents'}[2]{'parent'} = $result_trees{'space_macro_after_end_verbatim'};
  $result_trees{'space_macro_after_end_verbatim'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'} = $result_trees{'space_macro_after_end_verbatim'}{'contents'}[3];
  $result_trees{'space_macro_after_end_verbatim'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'space_macro_after_end_verbatim'}{'contents'}[3];
  $result_trees{'space_macro_after_end_verbatim'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'space_macro_after_end_verbatim'}{'contents'}[3];
! $result_trees{'space_macro_after_end_verbatim'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'space_macro_after_end_verbatim'}{'contents'}[3];
! $result_trees{'space_macro_after_end_verbatim'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'space_macro_after_end_verbatim'};
  $result_trees{'space_macro_after_end_verbatim'}{'contents'}[3]{'parent'} = $result_trees{'space_macro_after_end_verbatim'};
! $result_trees{'space_macro_after_end_verbatim'}{'contents'}[4] = $result_trees{'space_macro_after_end_verbatim'}{'contents'}[3]{'extra'}{'spaces_after_command'};
  
  $result_texis{'space_macro_after_end_verbatim'} = '@macro spaces
--- 99,113 ----
  $result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'space_macro_after_end_verbatim'}{'contents'}[0];
  $result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'space_macro_after_end_verbatim'}{'contents'}[0];
  $result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'parent'} = $result_trees{'space_macro_after_end_verbatim'};
! $result_trees{'space_macro_after_end_verbatim'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'space_macro_after_end_verbatim'}{'contents'}[0];
! $result_trees{'space_macro_after_end_verbatim'}{'contents'}[1]{'parent'} = $result_trees{'space_macro_after_end_verbatim'};
  $result_trees{'space_macro_after_end_verbatim'}{'contents'}[2]{'parent'} = $result_trees{'space_macro_after_end_verbatim'};
  $result_trees{'space_macro_after_end_verbatim'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'} = $result_trees{'space_macro_after_end_verbatim'}{'contents'}[3];
  $result_trees{'space_macro_after_end_verbatim'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'space_macro_after_end_verbatim'}{'contents'}[3];
  $result_trees{'space_macro_after_end_verbatim'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'space_macro_after_end_verbatim'}{'contents'}[3];
! $result_trees{'space_macro_after_end_verbatim'}{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'space_macro_after_end_verbatim'}{'contents'}[3]{'contents'}[0];
  $result_trees{'space_macro_after_end_verbatim'}{'contents'}[3]{'parent'} = $result_trees{'space_macro_after_end_verbatim'};
! $result_trees{'space_macro_after_end_verbatim'}{'contents'}[4]{'extra'}{'command'} = $result_trees{'space_macro_after_end_verbatim'}{'contents'}[3];
! $result_trees{'space_macro_after_end_verbatim'}{'contents'}[4]{'parent'} = $result_trees{'space_macro_after_end_verbatim'};
  
  $result_texis{'space_macro_after_end_verbatim'} = '@macro spaces
diff -Nrc2 texinfo-6.1/tp/t/results/macro/text_before_after.pl texinfo-6.3/tp/t/results/macro/text_before_after.pl
*** texinfo-6.1/tp/t/results/macro/text_before_after.pl	2016-01-22 07:50:09.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/text_before_after.pl	2016-08-02 18:44:47.000000000 +0100
***************
*** 38,52 ****
            'extra' => {
              'arg_line' => ' mymacro
! ',
!             'macrobody' => 'in macro
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => ' ',
!               'type' => 'empty_spaces_after_command'
!             }
            },
            'line_nr' => {
--- 38,42 ----
            'extra' => {
              'arg_line' => ' mymacro
! '
            },
            'line_nr' => {
***************
*** 57,61 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 47,58 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => ' ',
!           'type' => 'empty_spaces_after_command'
!         },
          {
            'parent' => {},
***************
*** 74,81 ****
  $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1];
  $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1];
- $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1];
- $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'text_before_after'}{'contents'}[0];
  $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'text_before_after'}{'contents'}[0];
! $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[2] = $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'};
  $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'text_before_after'}{'contents'}[0];
  $result_trees{'text_before_after'}{'contents'}[0]{'parent'} = $result_trees{'text_before_after'};
--- 71,77 ----
  $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1];
  $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1];
  $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'text_before_after'}{'contents'}[0];
! $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[2]{'extra'}{'command'} = $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[1];
! $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'text_before_after'}{'contents'}[0];
  $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'text_before_after'}{'contents'}[0];
  $result_trees{'text_before_after'}{'contents'}[0]{'parent'} = $result_trees{'text_before_after'};
***************
*** 92,101 ****
  $result_errors{'text_before_after'} = [
    {
!     'error_line' => ':1: warning: @macro should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@macro should only appear at a line beginning',
      'type' => 'warning'
    },
--- 88,97 ----
  $result_errors{'text_before_after'} = [
    {
!     'error_line' => ':1: warning: @macro should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@macro should only appear at the beginning of a line',
      'type' => 'warning'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/macro/too_much_args.pl texinfo-6.3/tp/t/results/macro/too_much_args.pl
*** texinfo-6.1/tp/t/results/macro/too_much_args.pl	2016-01-22 07:50:09.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/too_much_args.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 48,68 ****
        'extra' => {
          'arg_line' => ' twoargs {first, second}
! ',
!         'args_index' => {
!           'first' => 0,
!           'second' => 1
!         },
!         'macrobody' => 'first arg: \\first\\
! second arg: \\second\\
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 48,52 ----
        'extra' => {
          'arg_line' => ' twoargs {first, second}
! '
        },
        'line_nr' => {
***************
*** 73,77 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 57,69 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 105,112 ****
  $result_trees{'too_much_args'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'too_much_args'}{'contents'}[0];
  $result_trees{'too_much_args'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'too_much_args'}{'contents'}[0];
- $result_trees{'too_much_args'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'too_much_args'}{'contents'}[0];
- $result_trees{'too_much_args'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'too_much_args'};
  $result_trees{'too_much_args'}{'contents'}[0]{'parent'} = $result_trees{'too_much_args'};
! $result_trees{'too_much_args'}{'contents'}[1] = $result_trees{'too_much_args'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'too_much_args'}{'contents'}[2]{'parent'} = $result_trees{'too_much_args'};
  $result_trees{'too_much_args'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'too_much_args'}{'contents'}[3];
--- 97,103 ----
  $result_trees{'too_much_args'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'too_much_args'}{'contents'}[0];
  $result_trees{'too_much_args'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'too_much_args'}{'contents'}[0];
  $result_trees{'too_much_args'}{'contents'}[0]{'parent'} = $result_trees{'too_much_args'};
! $result_trees{'too_much_args'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'too_much_args'}{'contents'}[0];
! $result_trees{'too_much_args'}{'contents'}[1]{'parent'} = $result_trees{'too_much_args'};
  $result_trees{'too_much_args'}{'contents'}[2]{'parent'} = $result_trees{'too_much_args'};
  $result_trees{'too_much_args'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'too_much_args'}{'contents'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/macro/two_macros_on_a_line.pl texinfo-6.3/tp/t/results/macro/two_macros_on_a_line.pl
*** texinfo-6.1/tp/t/results/macro/two_macros_on_a_line.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/two_macros_on_a_line.pl	2016-08-02 18:44:48.000000000 +0100
***************
*** 32,47 ****
        'extra' => {
          'arg_line' => ' mymacro
! ',
!         'macrobody' => 'in mymacro
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 32,36 ----
        'extra' => {
          'arg_line' => ' mymacro
! '
        },
        'line_nr' => {
***************
*** 52,56 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 41,53 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 100,120 ****
        'extra' => {
          'arg_line' => ' mymacrowithargs{arg}
! ',
!         'args_index' => {
!           'arg' => 0
!         },
!         'macrobody' => 'in with args
! now the arg \\arg\\
! after
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 97,101 ----
        'extra' => {
          'arg_line' => ' mymacrowithargs{arg}
! '
        },
        'line_nr' => {
***************
*** 125,129 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 106,118 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 342,349 ****
  $result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'two_macros_on_a_line'}{'contents'}[0];
  $result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'two_macros_on_a_line'}{'contents'}[0];
- $result_trees{'two_macros_on_a_line'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'two_macros_on_a_line'}{'contents'}[0];
- $result_trees{'two_macros_on_a_line'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'two_macros_on_a_line'};
  $result_trees{'two_macros_on_a_line'}{'contents'}[0]{'parent'} = $result_trees{'two_macros_on_a_line'};
! $result_trees{'two_macros_on_a_line'}{'contents'}[1] = $result_trees{'two_macros_on_a_line'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'two_macros_on_a_line'}{'contents'}[2]{'parent'} = $result_trees{'two_macros_on_a_line'};
  $result_trees{'two_macros_on_a_line'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'two_macros_on_a_line'}{'contents'}[3];
--- 331,337 ----
  $result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'two_macros_on_a_line'}{'contents'}[0];
  $result_trees{'two_macros_on_a_line'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'two_macros_on_a_line'}{'contents'}[0];
  $result_trees{'two_macros_on_a_line'}{'contents'}[0]{'parent'} = $result_trees{'two_macros_on_a_line'};
! $result_trees{'two_macros_on_a_line'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'two_macros_on_a_line'}{'contents'}[0];
! $result_trees{'two_macros_on_a_line'}{'contents'}[1]{'parent'} = $result_trees{'two_macros_on_a_line'};
  $result_trees{'two_macros_on_a_line'}{'contents'}[2]{'parent'} = $result_trees{'two_macros_on_a_line'};
  $result_trees{'two_macros_on_a_line'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'two_macros_on_a_line'}{'contents'}[3];
***************
*** 353,360 ****
  $result_trees{'two_macros_on_a_line'}{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'two_macros_on_a_line'}{'contents'}[3];
  $result_trees{'two_macros_on_a_line'}{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'two_macros_on_a_line'}{'contents'}[3];
- $result_trees{'two_macros_on_a_line'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'two_macros_on_a_line'}{'contents'}[3];
- $result_trees{'two_macros_on_a_line'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'two_macros_on_a_line'};
  $result_trees{'two_macros_on_a_line'}{'contents'}[3]{'parent'} = $result_trees{'two_macros_on_a_line'};
! $result_trees{'two_macros_on_a_line'}{'contents'}[4] = $result_trees{'two_macros_on_a_line'}{'contents'}[3]{'extra'}{'spaces_after_command'};
  $result_trees{'two_macros_on_a_line'}{'contents'}[5]{'parent'} = $result_trees{'two_macros_on_a_line'};
  $result_trees{'two_macros_on_a_line'}{'contents'}[6]{'parent'} = $result_trees{'two_macros_on_a_line'};
--- 341,347 ----
  $result_trees{'two_macros_on_a_line'}{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'two_macros_on_a_line'}{'contents'}[3];
  $result_trees{'two_macros_on_a_line'}{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'two_macros_on_a_line'}{'contents'}[3];
  $result_trees{'two_macros_on_a_line'}{'contents'}[3]{'parent'} = $result_trees{'two_macros_on_a_line'};
! $result_trees{'two_macros_on_a_line'}{'contents'}[4]{'extra'}{'command'} = $result_trees{'two_macros_on_a_line'}{'contents'}[3];
! $result_trees{'two_macros_on_a_line'}{'contents'}[4]{'parent'} = $result_trees{'two_macros_on_a_line'};
  $result_trees{'two_macros_on_a_line'}{'contents'}[5]{'parent'} = $result_trees{'two_macros_on_a_line'};
  $result_trees{'two_macros_on_a_line'}{'contents'}[6]{'parent'} = $result_trees{'two_macros_on_a_line'};
diff -Nrc2 texinfo-6.1/tp/t/results/macro/zero_argument.pl texinfo-6.3/tp/t/results/macro/zero_argument.pl
*** texinfo-6.1/tp/t/results/macro/zero_argument.pl	2016-01-22 07:50:09.000000000 +0000
--- texinfo-6.3/tp/t/results/macro/zero_argument.pl	2016-08-02 18:44:47.000000000 +0100
***************
*** 32,47 ****
        'extra' => {
          'arg_line' => ' foo {}
! ',
!         'macrobody' => 'in foo
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 32,36 ----
        'extra' => {
          'arg_line' => ' foo {}
! '
        },
        'line_nr' => {
***************
*** 52,56 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 41,53 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 83,97 ****
        'extra' => {
          'arg_line' => ' abar
! ',
!         'macrobody' => 'in bar
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 80,84 ----
        'extra' => {
          'arg_line' => ' abar
! '
        },
        'line_nr' => {
***************
*** 102,106 ****
        'parent' => {}
      },
!     {}
    ],
    'type' => 'text_root'
--- 89,100 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '',
!       'type' => 'empty_line_after_command'
!     }
    ],
    'type' => 'text_root'
***************
*** 109,124 ****
  $result_trees{'zero_argument'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'zero_argument'}{'contents'}[0];
  $result_trees{'zero_argument'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'zero_argument'}{'contents'}[0];
- $result_trees{'zero_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'zero_argument'}{'contents'}[0];
- $result_trees{'zero_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'zero_argument'};
  $result_trees{'zero_argument'}{'contents'}[0]{'parent'} = $result_trees{'zero_argument'};
! $result_trees{'zero_argument'}{'contents'}[1] = $result_trees{'zero_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'zero_argument'}{'contents'}[2]{'parent'} = $result_trees{'zero_argument'};
  $result_trees{'zero_argument'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'zero_argument'}{'contents'}[3];
  $result_trees{'zero_argument'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'zero_argument'}{'contents'}[3];
  $result_trees{'zero_argument'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'zero_argument'}{'contents'}[3];
- $result_trees{'zero_argument'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'zero_argument'}{'contents'}[3];
- $result_trees{'zero_argument'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'zero_argument'};
  $result_trees{'zero_argument'}{'contents'}[3]{'parent'} = $result_trees{'zero_argument'};
! $result_trees{'zero_argument'}{'contents'}[4] = $result_trees{'zero_argument'}{'contents'}[3]{'extra'}{'spaces_after_command'};
  
  $result_texis{'zero_argument'} = '@macro foo {}
--- 103,116 ----
  $result_trees{'zero_argument'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'zero_argument'}{'contents'}[0];
  $result_trees{'zero_argument'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'zero_argument'}{'contents'}[0];
  $result_trees{'zero_argument'}{'contents'}[0]{'parent'} = $result_trees{'zero_argument'};
! $result_trees{'zero_argument'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'zero_argument'}{'contents'}[0];
! $result_trees{'zero_argument'}{'contents'}[1]{'parent'} = $result_trees{'zero_argument'};
  $result_trees{'zero_argument'}{'contents'}[2]{'parent'} = $result_trees{'zero_argument'};
  $result_trees{'zero_argument'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'zero_argument'}{'contents'}[3];
  $result_trees{'zero_argument'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'zero_argument'}{'contents'}[3];
  $result_trees{'zero_argument'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'zero_argument'}{'contents'}[3];
  $result_trees{'zero_argument'}{'contents'}[3]{'parent'} = $result_trees{'zero_argument'};
! $result_trees{'zero_argument'}{'contents'}[4]{'extra'}{'command'} = $result_trees{'zero_argument'}{'contents'}[3];
! $result_trees{'zero_argument'}{'contents'}[4]{'parent'} = $result_trees{'zero_argument'};
  
  $result_texis{'zero_argument'} = '@macro foo {}
diff -Nrc2 texinfo-6.1/tp/t/results/menu/block_commands_in_menu_description.pl texinfo-6.3/tp/t/results/menu/block_commands_in_menu_description.pl
*** texinfo-6.1/tp/t/results/menu/block_commands_in_menu_description.pl	2016-01-22 07:49:43.000000000 +0000
--- texinfo-6.3/tp/t/results/menu/block_commands_in_menu_description.pl	2016-08-02 18:44:24.000000000 +0100
***************
*** 261,264 ****
--- 261,265 ----
                              {
                                'cmdname' => 'bullet',
+                               'contents' => [],
                                'parent' => {},
                                'type' => 'command_as_argument'
***************
*** 291,294 ****
--- 292,301 ----
                              {
                                'cmdname' => 'asis',
+                               'contents' => [],
+                               'line_nr' => {
+                                 'file_name' => '',
+                                 'line_nr' => 11,
+                                 'macro' => ''
+                               },
                                'parent' => {},
                                'type' => 'command_as_argument'
***************
*** 459,467 ****
                          'spaces_after_command' => {}
                        },
!                       'line_nr' => {
!                         'file_name' => '',
!                         'line_nr' => 11,
!                         'macro' => ''
!                       },
                        'parent' => {}
                      },
--- 466,470 ----
                          'spaces_after_command' => {}
                        },
!                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 580,592 ****
                        ],
                        'extra' => {
!                         'spaces_after_command' => {
!                           'extra' => {
!                             'command' => {}
!                           },
!                           'parent' => {},
!                           'text' => '
! ',
!                           'type' => 'empty_line_after_command'
!                         }
                        },
                        'line_nr' => {
--- 583,587 ----
                        ],
                        'extra' => {
!                         'spaces_after_command' => {}
                        },
                        'line_nr' => {
***************
*** 597,601 ****
                        'parent' => {}
                      },
!                     {}
                    ],
                    'parent' => {},
--- 592,604 ----
                        'parent' => {}
                      },
!                     {
!                       'extra' => {
!                         'command' => {}
!                       },
!                       'parent' => {},
!                       'text' => '
! ',
!                       'type' => 'empty_line_after_command'
!                     }
                    ],
                    'parent' => {},
***************
*** 777,780 ****
--- 780,784 ----
  $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[2]{'contents'}[2];
  $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
+ $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[2]{'line_nr'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3];
  $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[3]{'contents'}[0];
***************
*** 799,806 ****
  $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4];
  $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4];
! $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4];
! $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3];
  $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4]{'parent'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3];
! $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[5] = $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4]{'extra'}{'spaces_after_command'};
  $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
  $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3];
--- 803,810 ----
  $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4];
  $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4];
! $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4]{'extra'}{'spaces_after_command'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4]{'contents'}[0];
  $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4]{'parent'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3];
! $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[5]{'extra'}{'command'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[4];
! $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[5]{'parent'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3];
  $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
  $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/menu/formats_in_menu.pl texinfo-6.3/tp/t/results/menu/formats_in_menu.pl
*** texinfo-6.1/tp/t/results/menu/formats_in_menu.pl	2016-01-22 07:49:43.000000000 +0000
--- texinfo-6.3/tp/t/results/menu/formats_in_menu.pl	2016-08-02 18:44:24.000000000 +0100
***************
*** 109,112 ****
--- 109,118 ----
                              {
                                'cmdname' => 'asis',
+                               'contents' => [],
+                               'line_nr' => {
+                                 'file_name' => '',
+                                 'line_nr' => 5,
+                                 'macro' => ''
+                               },
                                'parent' => {},
                                'type' => 'command_as_argument'
***************
*** 247,255 ****
                          'spaces_after_command' => {}
                        },
!                       'line_nr' => {
!                         'file_name' => '',
!                         'line_nr' => 5,
!                         'macro' => ''
!                       },
                        'parent' => {}
                      }
--- 253,257 ----
                          'spaces_after_command' => {}
                        },
!                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 357,369 ****
                        ],
                        'extra' => {
!                         'spaces_after_command' => {
!                           'extra' => {
!                             'command' => {}
!                           },
!                           'parent' => {},
!                           'text' => '
! ',
!                           'type' => 'empty_line_after_command'
!                         }
                        },
                        'line_nr' => {
--- 359,363 ----
                        ],
                        'extra' => {
!                         'spaces_after_command' => {}
                        },
                        'line_nr' => {
***************
*** 374,378 ****
                        'parent' => {}
                      },
!                     {},
                      {
                        'contents' => [],
--- 368,380 ----
                        'parent' => {}
                      },
!                     {
!                       'extra' => {
!                         'command' => {}
!                       },
!                       'parent' => {},
!                       'text' => '
! ',
!                       'type' => 'empty_line_after_command'
!                     },
                      {
                        'contents' => [],
***************
*** 603,611 ****
                                ]
                              ],
!                             'normalized' => 'description-_002a-acronym_003a_003a',
!                             'spaces_before_argument' => {
!                               'text' => '',
!                               'type' => 'empty_spaces_before_argument'
!                             }
                            },
                            'line_nr' => {
--- 605,609 ----
                                ]
                              ],
!                             'explanation_contents' => []
                            },
                            'line_nr' => {
***************
*** 878,881 ****
--- 876,880 ----
  $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[1];
  $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
+ $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'line_nr'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
  $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
***************
*** 896,903 ****
  $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1];
  $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1];
! $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1];
! $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3];
  $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3];
! $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[2] = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1]{'extra'}{'spaces_after_command'};
  $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[3]{'parent'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3];
  $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'parent'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
--- 895,902 ----
  $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1];
  $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1];
! $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1]{'contents'}[0];
  $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3];
! $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[2]{'extra'}{'command'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1];
! $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3];
  $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[3]{'parent'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3];
  $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'parent'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/menu/inlineraw_in_menu_description.pl texinfo-6.3/tp/t/results/menu/inlineraw_in_menu_description.pl
*** texinfo-6.1/tp/t/results/menu/inlineraw_in_menu_description.pl	2016-01-22 07:49:43.000000000 +0000
--- texinfo-6.3/tp/t/results/menu/inlineraw_in_menu_description.pl	2016-08-02 18:44:24.000000000 +0100
***************
*** 155,158 ****
--- 155,159 ----
                                'contents' => [
                                  {
+                                   'parent' => {},
                                    'text' => ' ',
                                    'type' => 'empty_spaces_before_argument'
***************
*** 191,199 ****
                                ]
                              ],
!                             'format' => 'html',
!                             'spaces_before_argument' => {
!                               'text' => '',
!                               'type' => 'empty_spaces_before_argument'
!                             }
                            },
                            'line_nr' => {
--- 192,197 ----
                                ]
                              ],
!                             'expand_index' => 1,
!                             'format' => 'html'
                            },
                            'line_nr' => {
***************
*** 351,354 ****
--- 349,353 ----
  $result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'contents'}[1];
+ $result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'contents'}[1]{'args'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/menu/menu_in_deffn.pl texinfo-6.3/tp/t/results/menu/menu_in_deffn.pl
*** texinfo-6.1/tp/t/results/menu/menu_in_deffn.pl	2016-01-22 07:49:43.000000000 +0000
--- texinfo-6.3/tp/t/results/menu/menu_in_deffn.pl	2016-08-02 18:44:24.000000000 +0100
***************
*** 131,135 ****
                    'index_at_command' => 'deffn',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deffn',
                    'key' => 'b',
--- 131,134 ----
diff -Nrc2 texinfo-6.1/tp/t/results/menu/menu_pointing_to_anchor.pl texinfo-6.3/tp/t/results/menu/menu_pointing_to_anchor.pl
*** texinfo-6.1/tp/t/results/menu/menu_pointing_to_anchor.pl	2016-01-22 07:49:43.000000000 +0000
--- texinfo-6.3/tp/t/results/menu/menu_pointing_to_anchor.pl	2016-08-02 18:44:24.000000000 +0100
***************
*** 138,146 ****
                {}
              ],
!             'normalized' => 'An-anchor',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 138,142 ----
                {}
              ],
!             'normalized' => 'An-anchor'
            },
            'line_nr' => {
***************
*** 152,155 ****
--- 148,152 ----
          },
          {
+           'parent' => {},
            'text' => '
  ',
***************
*** 326,329 ****
--- 323,327 ----
  $result_trees{'menu_pointing_to_anchor'}{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'menu_pointing_to_anchor'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
  $result_trees{'menu_pointing_to_anchor'}{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'menu_pointing_to_anchor'}{'contents'}[2];
+ $result_trees{'menu_pointing_to_anchor'}{'contents'}[2]{'contents'}[4]{'parent'} = $result_trees{'menu_pointing_to_anchor'}{'contents'}[2];
  $result_trees{'menu_pointing_to_anchor'}{'contents'}[2]{'contents'}[5]{'parent'} = $result_trees{'menu_pointing_to_anchor'}{'contents'}[2];
  $result_trees{'menu_pointing_to_anchor'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'extra'}{'command'} = $result_trees{'menu_pointing_to_anchor'}{'contents'}[2]{'contents'}[6];
***************
*** 416,424 ****
          ]
        ],
!       'normalized' => 'An-anchor',
!       'spaces_before_argument' => {
!         'text' => '',
!         'type' => 'empty_spaces_before_argument'
!       }
      },
      'node_prev' => {}
--- 414,418 ----
          ]
        ],
!       'normalized' => 'An-anchor'
      },
      'node_prev' => {}
***************
*** 472,480 ****
          ]
        ],
!       'normalized' => 'An-anchor',
!       'spaces_before_argument' => {
!         'text' => '',
!         'type' => 'empty_spaces_before_argument'
!       }
      },
      'menu_up' => {},
--- 466,470 ----
          ]
        ],
!       'normalized' => 'An-anchor'
      },
      'menu_up' => {},
diff -Nrc2 texinfo-6.1/tp/t/results/misc_commands/also_not_line.pl texinfo-6.3/tp/t/results/misc_commands/also_not_line.pl
*** texinfo-6.1/tp/t/results/misc_commands/also_not_line.pl	2016-01-22 07:49:36.000000000 +0000
--- texinfo-6.3/tp/t/results/misc_commands/also_not_line.pl	2016-08-02 18:44:17.000000000 +0100
***************
*** 604,649 ****
  $result_errors{'also_not_line'} = [
    {
!     'error_line' => ':3: warning: @page should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 3,
      'macro' => '',
!     'text' => '@page should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':14: warning: @page should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 14,
      'macro' => '',
!     'text' => '@page should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':16: warning: @novalidate should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 16,
      'macro' => '',
!     'text' => '@novalidate should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':22: warning: @cropmarks should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 22,
      'macro' => '',
!     'text' => '@cropmarks should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':24: warning: @exdent should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 24,
      'macro' => '',
!     'text' => '@exdent should only appear at a line beginning',
      'type' => 'warning'
    }
--- 604,649 ----
  $result_errors{'also_not_line'} = [
    {
!     'error_line' => ':3: warning: @page should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 3,
      'macro' => '',
!     'text' => '@page should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':14: warning: @page should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 14,
      'macro' => '',
!     'text' => '@page should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':16: warning: @novalidate should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 16,
      'macro' => '',
!     'text' => '@novalidate should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':22: warning: @cropmarks should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 22,
      'macro' => '',
!     'text' => '@cropmarks should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':24: warning: @exdent should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 24,
      'macro' => '',
!     'text' => '@exdent should only appear at the beginning of a line',
      'type' => 'warning'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/misc_commands/bad_documentlanguage.pl texinfo-6.3/tp/t/results/misc_commands/bad_documentlanguage.pl
*** texinfo-6.1/tp/t/results/misc_commands/bad_documentlanguage.pl	2016-01-22 07:49:36.000000000 +0000
--- texinfo-6.3/tp/t/results/misc_commands/bad_documentlanguage.pl	2016-08-02 18:44:18.000000000 +0100
***************
*** 138,142 ****
        'extra' => {
          'spaces_after_command' => {},
!         'text_arg' => 'en'
        },
        'line_nr' => {},
--- 138,142 ----
        'extra' => {
          'spaces_after_command' => {},
!         'text_arg' => 'en '
        },
        'line_nr' => {},
***************
*** 242,260 ****
  $result_errors{'bad_documentlanguage'} = [
    {
!     'error_line' => ':2: warning: @documentlanguage should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 2,
      'macro' => '',
!     'text' => '@documentlanguage should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':4: warning: @documentlanguage should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 4,
      'macro' => '',
!     'text' => '@documentlanguage should only appear at a line beginning',
      'type' => 'warning'
    },
--- 242,260 ----
  $result_errors{'bad_documentlanguage'} = [
    {
!     'error_line' => ':2: warning: @documentlanguage should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 2,
      'macro' => '',
!     'text' => '@documentlanguage should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':4: warning: @documentlanguage should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 4,
      'macro' => '',
!     'text' => '@documentlanguage should only appear at the beginning of a line',
      'type' => 'warning'
    },
***************
*** 269,272 ****
--- 269,281 ----
    },
    {
+     'error_line' => ':4: bad argument to @documentlanguage: en @documentlanguage  en
+ ',
+     'file_name' => '',
+     'line_nr' => 4,
+     'macro' => '',
+     'text' => 'bad argument to @documentlanguage: en @documentlanguage  en',
+     'type' => 'error'
+   },
+   {
      'error_line' => ':6: warning: en  after documentlanguage is not a valid language code
  ',
diff -Nrc2 texinfo-6.1/tp/t/results/misc_commands/clickstyle.pl texinfo-6.3/tp/t/results/misc_commands/clickstyle.pl
*** texinfo-6.1/tp/t/results/misc_commands/clickstyle.pl	2016-01-22 07:49:36.000000000 +0000
--- texinfo-6.3/tp/t/results/misc_commands/clickstyle.pl	2016-08-02 18:44:18.000000000 +0100
***************
*** 56,59 ****
--- 56,64 ----
              'clickstyle' => 'result'
            },
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 3,
+             'macro' => ''
+           },
            'parent' => {}
          },
diff -Nrc2 texinfo-6.1/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl texinfo-6.3/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
*** texinfo-6.1/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl	2016-01-22 07:49:37.000000000 +0000
--- texinfo-6.3/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl	2016-08-02 18:44:19.000000000 +0100
***************
*** 64,84 ****
            'extra' => {
              'arg_line' => ' quotes
! ',
!             'macrobody' => '``simple-double--three---four----\'\' `simple\' quotedblleft: @quotedblleft{} @*
! code: @code{``simple-double--three---four----\'\' `simple\' quotedblleft: @quotedblleft{}} @*
! asis: @asis{``simple-double--three---four----\'\' `simple\' quotedblleft: @quotedblleft{}} @*
! strong: @strong{``simple-double--three---four----\'\' `simple\' quotedblleft: @quotedblleft{}} @*
! kbd: @kbd{``simple-double--three---four----\'\' `simple\' quotedblleft: @quotedblleft{}} @*
! samp: @samp{``simple-double--three---four----\'\' `simple\' quotedblleft: @quotedblleft{}} @*
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 64,68 ----
            'extra' => {
              'arg_line' => ' quotes
! '
            },
            'line_nr' => {
***************
*** 89,93 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 73,85 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 216,247 ****
            'extra' => {
              'arg_line' => ' allquotes
! ',
!             'macrobody' => '@quotes{}
! 
! @example
! @@codequoteundirected on
! @@codequotebacktick on
! @end example
! @codequoteundirected
! @codequotebacktick
! @quotes{}
! 
! @example
! @@codequoteundirected off
! @@codequotebacktick off
! @end example
! @codequoteundirected off
! @codequotebacktick off
! @quotes{}
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 208,212 ----
            'extra' => {
              'arg_line' => ' allquotes
! '
            },
            'line_nr' => {
***************
*** 252,256 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 217,229 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 287,290 ****
--- 260,268 ----
                    'cmdname' => 'quotedblleft',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 31,
+                     'macro' => 'quotes'
+                   },
                    'parent' => {}
                  },
***************
*** 324,327 ****
--- 302,310 ----
                            'cmdname' => 'quotedblleft',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 31,
+                             'macro' => 'quotes'
+                           },
                            'parent' => {}
                          }
***************
*** 333,341 ****
                    'cmdname' => 'code',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 31,
!                     'macro' => 'quotes'
!                   },
                    'parent' => {}
                  },
--- 316,320 ----
                    'cmdname' => 'code',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 375,378 ****
--- 354,362 ----
                            'cmdname' => 'quotedblleft',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 31,
+                             'macro' => 'quotes'
+                           },
                            'parent' => {}
                          }
***************
*** 384,392 ****
                    'cmdname' => 'asis',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 31,
!                     'macro' => 'quotes'
!                   },
                    'parent' => {}
                  },
--- 368,372 ----
                    'cmdname' => 'asis',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 426,429 ****
--- 406,414 ----
                            'cmdname' => 'quotedblleft',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 31,
+                             'macro' => 'quotes'
+                           },
                            'parent' => {}
                          }
***************
*** 435,443 ****
                    'cmdname' => 'strong',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 31,
!                     'macro' => 'quotes'
!                   },
                    'parent' => {}
                  },
--- 420,424 ----
                    'cmdname' => 'strong',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 477,480 ****
--- 458,466 ----
                            'cmdname' => 'quotedblleft',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 31,
+                             'macro' => 'quotes'
+                           },
                            'parent' => {}
                          }
***************
*** 486,494 ****
                    'cmdname' => 'kbd',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 31,
!                     'macro' => 'quotes'
!                   },
                    'parent' => {}
                  },
--- 472,476 ----
                    'cmdname' => 'kbd',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 528,531 ****
--- 510,518 ----
                            'cmdname' => 'quotedblleft',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 31,
+                             'macro' => 'quotes'
+                           },
                            'parent' => {}
                          }
***************
*** 537,545 ****
                    'cmdname' => 'samp',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 31,
!                     'macro' => 'quotes'
!                   },
                    'parent' => {}
                  },
--- 524,528 ----
                    'cmdname' => 'samp',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 732,735 ****
--- 715,723 ----
                    'cmdname' => 'quotedblleft',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 31,
+                     'macro' => 'quotes'
+                   },
                    'parent' => {}
                  },
***************
*** 769,772 ****
--- 757,765 ----
                            'cmdname' => 'quotedblleft',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 31,
+                             'macro' => 'quotes'
+                           },
                            'parent' => {}
                          }
***************
*** 778,786 ****
                    'cmdname' => 'code',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 31,
!                     'macro' => 'quotes'
!                   },
                    'parent' => {}
                  },
--- 771,775 ----
                    'cmdname' => 'code',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 820,823 ****
--- 809,817 ----
                            'cmdname' => 'quotedblleft',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 31,
+                             'macro' => 'quotes'
+                           },
                            'parent' => {}
                          }
***************
*** 829,837 ****
                    'cmdname' => 'asis',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 31,
!                     'macro' => 'quotes'
!                   },
                    'parent' => {}
                  },
--- 823,827 ----
                    'cmdname' => 'asis',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 871,874 ****
--- 861,869 ----
                            'cmdname' => 'quotedblleft',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 31,
+                             'macro' => 'quotes'
+                           },
                            'parent' => {}
                          }
***************
*** 880,888 ****
                    'cmdname' => 'strong',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 31,
!                     'macro' => 'quotes'
!                   },
                    'parent' => {}
                  },
--- 875,879 ----
                    'cmdname' => 'strong',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 922,925 ****
--- 913,921 ----
                            'cmdname' => 'quotedblleft',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 31,
+                             'macro' => 'quotes'
+                           },
                            'parent' => {}
                          }
***************
*** 931,939 ****
                    'cmdname' => 'kbd',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 31,
!                     'macro' => 'quotes'
!                   },
                    'parent' => {}
                  },
--- 927,931 ----
                    'cmdname' => 'kbd',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 973,976 ****
--- 965,973 ----
                            'cmdname' => 'quotedblleft',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 31,
+                             'macro' => 'quotes'
+                           },
                            'parent' => {}
                          }
***************
*** 982,990 ****
                    'cmdname' => 'samp',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 31,
!                     'macro' => 'quotes'
!                   },
                    'parent' => {}
                  },
--- 979,983 ----
                    'cmdname' => 'samp',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 1199,1202 ****
--- 1192,1200 ----
                    'cmdname' => 'quotedblleft',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 31,
+                     'macro' => 'quotes'
+                   },
                    'parent' => {}
                  },
***************
*** 1236,1239 ****
--- 1234,1242 ----
                            'cmdname' => 'quotedblleft',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 31,
+                             'macro' => 'quotes'
+                           },
                            'parent' => {}
                          }
***************
*** 1245,1253 ****
                    'cmdname' => 'code',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 31,
!                     'macro' => 'quotes'
!                   },
                    'parent' => {}
                  },
--- 1248,1252 ----
                    'cmdname' => 'code',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 1287,1290 ****
--- 1286,1294 ----
                            'cmdname' => 'quotedblleft',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 31,
+                             'macro' => 'quotes'
+                           },
                            'parent' => {}
                          }
***************
*** 1296,1304 ****
                    'cmdname' => 'asis',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 31,
!                     'macro' => 'quotes'
!                   },
                    'parent' => {}
                  },
--- 1300,1304 ----
                    'cmdname' => 'asis',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 1338,1341 ****
--- 1338,1346 ----
                            'cmdname' => 'quotedblleft',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 31,
+                             'macro' => 'quotes'
+                           },
                            'parent' => {}
                          }
***************
*** 1347,1355 ****
                    'cmdname' => 'strong',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 31,
!                     'macro' => 'quotes'
!                   },
                    'parent' => {}
                  },
--- 1352,1356 ----
                    'cmdname' => 'strong',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 1389,1392 ****
--- 1390,1398 ----
                            'cmdname' => 'quotedblleft',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 31,
+                             'macro' => 'quotes'
+                           },
                            'parent' => {}
                          }
***************
*** 1398,1406 ****
                    'cmdname' => 'kbd',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 31,
!                     'macro' => 'quotes'
!                   },
                    'parent' => {}
                  },
--- 1404,1408 ----
                    'cmdname' => 'kbd',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 1440,1443 ****
--- 1442,1450 ----
                            'cmdname' => 'quotedblleft',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 31,
+                             'macro' => 'quotes'
+                           },
                            'parent' => {}
                          }
***************
*** 1449,1457 ****
                    'cmdname' => 'samp',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 31,
!                     'macro' => 'quotes'
!                   },
                    'parent' => {}
                  },
--- 1456,1460 ----
                    'cmdname' => 'samp',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 1732,1735 ****
--- 1735,1743 ----
                'cmdname' => 'quotedblleft',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 42,
+                 'macro' => 'quotes'
+               },
                'parent' => {}
              },
***************
*** 1769,1772 ****
--- 1777,1785 ----
                        'cmdname' => 'quotedblleft',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 42,
+                         'macro' => 'quotes'
+                       },
                        'parent' => {}
                      }
***************
*** 1778,1786 ****
                'cmdname' => 'code',
                'contents' => [],
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 42,
!                 'macro' => 'quotes'
!               },
                'parent' => {}
              },
--- 1791,1795 ----
                'cmdname' => 'code',
                'contents' => [],
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1820,1823 ****
--- 1829,1837 ----
                        'cmdname' => 'quotedblleft',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 42,
+                         'macro' => 'quotes'
+                       },
                        'parent' => {}
                      }
***************
*** 1829,1837 ****
                'cmdname' => 'asis',
                'contents' => [],
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 42,
!                 'macro' => 'quotes'
!               },
                'parent' => {}
              },
--- 1843,1847 ----
                'cmdname' => 'asis',
                'contents' => [],
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1871,1874 ****
--- 1881,1889 ----
                        'cmdname' => 'quotedblleft',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 42,
+                         'macro' => 'quotes'
+                       },
                        'parent' => {}
                      }
***************
*** 1880,1888 ****
                'cmdname' => 'strong',
                'contents' => [],
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 42,
!                 'macro' => 'quotes'
!               },
                'parent' => {}
              },
--- 1895,1899 ----
                'cmdname' => 'strong',
                'contents' => [],
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1922,1925 ****
--- 1933,1941 ----
                        'cmdname' => 'quotedblleft',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 42,
+                         'macro' => 'quotes'
+                       },
                        'parent' => {}
                      }
***************
*** 1931,1939 ****
                'cmdname' => 'kbd',
                'contents' => [],
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 42,
!                 'macro' => 'quotes'
!               },
                'parent' => {}
              },
--- 1947,1951 ----
                'cmdname' => 'kbd',
                'contents' => [],
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 1973,1976 ****
--- 1985,1993 ----
                        'cmdname' => 'quotedblleft',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 42,
+                         'macro' => 'quotes'
+                       },
                        'parent' => {}
                      }
***************
*** 1982,1990 ****
                'cmdname' => 'samp',
                'contents' => [],
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 42,
!                 'macro' => 'quotes'
!               },
                'parent' => {}
              },
--- 1999,2003 ----
                'cmdname' => 'samp',
                'contents' => [],
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 2177,2180 ****
--- 2190,2198 ----
                'cmdname' => 'quotedblleft',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 42,
+                 'macro' => 'quotes'
+               },
                'parent' => {}
              },
***************
*** 2214,2217 ****
--- 2232,2240 ----
                        'cmdname' => 'quotedblleft',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 42,
+                         'macro' => 'quotes'
+                       },
                        'parent' => {}
                      }
***************
*** 2223,2231 ****
                'cmdname' => 'code',
                'contents' => [],
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 42,
!                 'macro' => 'quotes'
!               },
                'parent' => {}
              },
--- 2246,2250 ----
                'cmdname' => 'code',
                'contents' => [],
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 2265,2268 ****
--- 2284,2292 ----
                        'cmdname' => 'quotedblleft',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 42,
+                         'macro' => 'quotes'
+                       },
                        'parent' => {}
                      }
***************
*** 2274,2282 ****
                'cmdname' => 'asis',
                'contents' => [],
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 42,
!                 'macro' => 'quotes'
!               },
                'parent' => {}
              },
--- 2298,2302 ----
                'cmdname' => 'asis',
                'contents' => [],
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 2316,2319 ****
--- 2336,2344 ----
                        'cmdname' => 'quotedblleft',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 42,
+                         'macro' => 'quotes'
+                       },
                        'parent' => {}
                      }
***************
*** 2325,2333 ****
                'cmdname' => 'strong',
                'contents' => [],
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 42,
!                 'macro' => 'quotes'
!               },
                'parent' => {}
              },
--- 2350,2354 ----
                'cmdname' => 'strong',
                'contents' => [],
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 2367,2370 ****
--- 2388,2396 ----
                        'cmdname' => 'quotedblleft',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 42,
+                         'macro' => 'quotes'
+                       },
                        'parent' => {}
                      }
***************
*** 2376,2384 ****
                'cmdname' => 'kbd',
                'contents' => [],
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 42,
!                 'macro' => 'quotes'
!               },
                'parent' => {}
              },
--- 2402,2406 ----
                'cmdname' => 'kbd',
                'contents' => [],
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 2418,2421 ****
--- 2440,2448 ----
                        'cmdname' => 'quotedblleft',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 42,
+                         'macro' => 'quotes'
+                       },
                        'parent' => {}
                      }
***************
*** 2427,2435 ****
                'cmdname' => 'samp',
                'contents' => [],
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 42,
!                 'macro' => 'quotes'
!               },
                'parent' => {}
              },
--- 2454,2458 ----
                'cmdname' => 'samp',
                'contents' => [],
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 2644,2647 ****
--- 2667,2675 ----
                'cmdname' => 'quotedblleft',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 42,
+                 'macro' => 'quotes'
+               },
                'parent' => {}
              },
***************
*** 2681,2684 ****
--- 2709,2717 ----
                        'cmdname' => 'quotedblleft',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 42,
+                         'macro' => 'quotes'
+                       },
                        'parent' => {}
                      }
***************
*** 2690,2698 ****
                'cmdname' => 'code',
                'contents' => [],
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 42,
!                 'macro' => 'quotes'
!               },
                'parent' => {}
              },
--- 2723,2727 ----
                'cmdname' => 'code',
                'contents' => [],
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 2732,2735 ****
--- 2761,2769 ----
                        'cmdname' => 'quotedblleft',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 42,
+                         'macro' => 'quotes'
+                       },
                        'parent' => {}
                      }
***************
*** 2741,2749 ****
                'cmdname' => 'asis',
                'contents' => [],
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 42,
!                 'macro' => 'quotes'
!               },
                'parent' => {}
              },
--- 2775,2779 ----
                'cmdname' => 'asis',
                'contents' => [],
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 2783,2786 ****
--- 2813,2821 ----
                        'cmdname' => 'quotedblleft',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 42,
+                         'macro' => 'quotes'
+                       },
                        'parent' => {}
                      }
***************
*** 2792,2800 ****
                'cmdname' => 'strong',
                'contents' => [],
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 42,
!                 'macro' => 'quotes'
!               },
                'parent' => {}
              },
--- 2827,2831 ----
                'cmdname' => 'strong',
                'contents' => [],
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 2834,2837 ****
--- 2865,2873 ----
                        'cmdname' => 'quotedblleft',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 42,
+                         'macro' => 'quotes'
+                       },
                        'parent' => {}
                      }
***************
*** 2843,2851 ****
                'cmdname' => 'kbd',
                'contents' => [],
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 42,
!                 'macro' => 'quotes'
!               },
                'parent' => {}
              },
--- 2879,2883 ----
                'cmdname' => 'kbd',
                'contents' => [],
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 2885,2888 ****
--- 2917,2925 ----
                        'cmdname' => 'quotedblleft',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 42,
+                         'macro' => 'quotes'
+                       },
                        'parent' => {}
                      }
***************
*** 2894,2902 ****
                'cmdname' => 'samp',
                'contents' => [],
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 42,
!                 'macro' => 'quotes'
!               },
                'parent' => {}
              },
--- 2931,2935 ----
                'cmdname' => 'samp',
                'contents' => [],
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 2952,2955 ****
--- 2985,2993 ----
                    'cmdname' => 'quotedblleft',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 45,
+                     'macro' => 'quotes'
+                   },
                    'parent' => {}
                  },
***************
*** 2989,2992 ****
--- 3027,3035 ----
                            'cmdname' => 'quotedblleft',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 45,
+                             'macro' => 'quotes'
+                           },
                            'parent' => {}
                          }
***************
*** 2998,3006 ****
                    'cmdname' => 'code',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 45,
!                     'macro' => 'quotes'
!                   },
                    'parent' => {}
                  },
--- 3041,3045 ----
                    'cmdname' => 'code',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 3040,3043 ****
--- 3079,3087 ----
                            'cmdname' => 'quotedblleft',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 45,
+                             'macro' => 'quotes'
+                           },
                            'parent' => {}
                          }
***************
*** 3049,3057 ****
                    'cmdname' => 'asis',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 45,
!                     'macro' => 'quotes'
!                   },
                    'parent' => {}
                  },
--- 3093,3097 ----
                    'cmdname' => 'asis',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 3091,3094 ****
--- 3131,3139 ----
                            'cmdname' => 'quotedblleft',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 45,
+                             'macro' => 'quotes'
+                           },
                            'parent' => {}
                          }
***************
*** 3100,3108 ****
                    'cmdname' => 'strong',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 45,
!                     'macro' => 'quotes'
!                   },
                    'parent' => {}
                  },
--- 3145,3149 ----
                    'cmdname' => 'strong',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 3142,3145 ****
--- 3183,3191 ----
                            'cmdname' => 'quotedblleft',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 45,
+                             'macro' => 'quotes'
+                           },
                            'parent' => {}
                          }
***************
*** 3151,3159 ****
                    'cmdname' => 'kbd',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 45,
!                     'macro' => 'quotes'
!                   },
                    'parent' => {}
                  },
--- 3197,3201 ----
                    'cmdname' => 'kbd',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 3193,3196 ****
--- 3235,3243 ----
                            'cmdname' => 'quotedblleft',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 45,
+                             'macro' => 'quotes'
+                           },
                            'parent' => {}
                          }
***************
*** 3202,3210 ****
                    'cmdname' => 'samp',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 45,
!                     'macro' => 'quotes'
!                   },
                    'parent' => {}
                  },
--- 3249,3253 ----
                    'cmdname' => 'samp',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 3397,3400 ****
--- 3440,3448 ----
                    'cmdname' => 'quotedblleft',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 45,
+                     'macro' => 'quotes'
+                   },
                    'parent' => {}
                  },
***************
*** 3434,3437 ****
--- 3482,3490 ----
                            'cmdname' => 'quotedblleft',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 45,
+                             'macro' => 'quotes'
+                           },
                            'parent' => {}
                          }
***************
*** 3443,3451 ****
                    'cmdname' => 'code',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 45,
!                     'macro' => 'quotes'
!                   },
                    'parent' => {}
                  },
--- 3496,3500 ----
                    'cmdname' => 'code',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 3485,3488 ****
--- 3534,3542 ----
                            'cmdname' => 'quotedblleft',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 45,
+                             'macro' => 'quotes'
+                           },
                            'parent' => {}
                          }
***************
*** 3494,3502 ****
                    'cmdname' => 'asis',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 45,
!                     'macro' => 'quotes'
!                   },
                    'parent' => {}
                  },
--- 3548,3552 ----
                    'cmdname' => 'asis',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 3536,3539 ****
--- 3586,3594 ----
                            'cmdname' => 'quotedblleft',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 45,
+                             'macro' => 'quotes'
+                           },
                            'parent' => {}
                          }
***************
*** 3545,3553 ****
                    'cmdname' => 'strong',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 45,
!                     'macro' => 'quotes'
!                   },
                    'parent' => {}
                  },
--- 3600,3604 ----
                    'cmdname' => 'strong',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 3587,3590 ****
--- 3638,3646 ----
                            'cmdname' => 'quotedblleft',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 45,
+                             'macro' => 'quotes'
+                           },
                            'parent' => {}
                          }
***************
*** 3596,3604 ****
                    'cmdname' => 'kbd',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 45,
!                     'macro' => 'quotes'
!                   },
                    'parent' => {}
                  },
--- 3652,3656 ----
                    'cmdname' => 'kbd',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 3638,3641 ****
--- 3690,3698 ----
                            'cmdname' => 'quotedblleft',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 45,
+                             'macro' => 'quotes'
+                           },
                            'parent' => {}
                          }
***************
*** 3647,3655 ****
                    'cmdname' => 'samp',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 45,
!                     'macro' => 'quotes'
!                   },
                    'parent' => {}
                  },
--- 3704,3708 ----
                    'cmdname' => 'samp',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 3864,3867 ****
--- 3917,3925 ----
                    'cmdname' => 'quotedblleft',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 45,
+                     'macro' => 'quotes'
+                   },
                    'parent' => {}
                  },
***************
*** 3901,3904 ****
--- 3959,3967 ----
                            'cmdname' => 'quotedblleft',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 45,
+                             'macro' => 'quotes'
+                           },
                            'parent' => {}
                          }
***************
*** 3910,3918 ****
                    'cmdname' => 'code',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 45,
!                     'macro' => 'quotes'
!                   },
                    'parent' => {}
                  },
--- 3973,3977 ----
                    'cmdname' => 'code',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 3952,3955 ****
--- 4011,4019 ----
                            'cmdname' => 'quotedblleft',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 45,
+                             'macro' => 'quotes'
+                           },
                            'parent' => {}
                          }
***************
*** 3961,3969 ****
                    'cmdname' => 'asis',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 45,
!                     'macro' => 'quotes'
!                   },
                    'parent' => {}
                  },
--- 4025,4029 ----
                    'cmdname' => 'asis',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 4003,4006 ****
--- 4063,4071 ----
                            'cmdname' => 'quotedblleft',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 45,
+                             'macro' => 'quotes'
+                           },
                            'parent' => {}
                          }
***************
*** 4012,4020 ****
                    'cmdname' => 'strong',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 45,
!                     'macro' => 'quotes'
!                   },
                    'parent' => {}
                  },
--- 4077,4081 ----
                    'cmdname' => 'strong',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 4054,4057 ****
--- 4115,4123 ----
                            'cmdname' => 'quotedblleft',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 45,
+                             'macro' => 'quotes'
+                           },
                            'parent' => {}
                          }
***************
*** 4063,4071 ****
                    'cmdname' => 'kbd',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 45,
!                     'macro' => 'quotes'
!                   },
                    'parent' => {}
                  },
--- 4129,4133 ----
                    'cmdname' => 'kbd',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 4105,4108 ****
--- 4167,4175 ----
                            'cmdname' => 'quotedblleft',
                            'contents' => [],
+                           'line_nr' => {
+                             'file_name' => '',
+                             'line_nr' => 45,
+                             'macro' => 'quotes'
+                           },
                            'parent' => {}
                          }
***************
*** 4114,4122 ****
                    'cmdname' => 'samp',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 45,
!                     'macro' => 'quotes'
!                   },
                    'parent' => {}
                  },
--- 4181,4185 ----
                    'cmdname' => 'samp',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 4223,4230 ****
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0];
- $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0];
- $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0];
! $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[1] = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3];
--- 4286,4292 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0];
! $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[1]{'extra'}{'command'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0];
! $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3];
***************
*** 4247,4254 ****
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3]{'contents'}[16]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3]{'contents'}[17]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3];
- $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3];
- $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0];
! $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[4] = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3]{'extra'}{'spaces_after_command'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'command'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6];
--- 4309,4315 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3]{'contents'}[16]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3]{'contents'}[17]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0];
! $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[4]{'extra'}{'command'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[3];
! $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'command'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6];
***************
*** 4265,4268 ****
--- 4326,4330 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[6]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[6];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[7]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
***************
*** 4274,4277 ****
--- 4336,4340 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[11]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[11]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[11];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[11]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[11]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[11]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[12]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
***************
*** 4283,4286 ****
--- 4346,4350 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[16]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[16];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[16]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[16]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[17]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
***************
*** 4292,4295 ****
--- 4356,4360 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[21]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[21]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[21]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[21];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[21]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[21]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[21]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[22]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
***************
*** 4301,4304 ****
--- 4366,4370 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[26]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[26]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[26]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[26];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[26]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[26]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[26]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[27]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
***************
*** 4346,4349 ****
--- 4412,4416 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[6]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[6];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[6]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[6]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[6]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[7]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6];
***************
*** 4355,4358 ****
--- 4422,4426 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[11]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[11]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[11];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[11]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[11]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[11]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[12]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6];
***************
*** 4364,4367 ****
--- 4432,4436 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[16]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[16]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[16];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[16]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[16]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[17]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6];
***************
*** 4373,4376 ****
--- 4442,4446 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[21]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[21]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[21]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[21];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[21]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[21]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[21]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[22]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6];
***************
*** 4382,4385 ****
--- 4452,4456 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[26]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[26]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[26]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[26];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[26]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[26]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[26]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6]{'contents'}[27]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[6];
***************
*** 4431,4434 ****
--- 4502,4506 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[6]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[6];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[6]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[6]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[6]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[7]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11];
***************
*** 4440,4443 ****
--- 4512,4516 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[11]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[11]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[11];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[11]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[11]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[11]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[12]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11];
***************
*** 4449,4452 ****
--- 4522,4526 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[16]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[16]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[16];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[16]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[16]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[17]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11];
***************
*** 4458,4461 ****
--- 4532,4536 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[21]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[21]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[21]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[21];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[21]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[21]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[21]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[22]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11];
***************
*** 4467,4470 ****
--- 4542,4546 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[26]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[26]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[26]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[26];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[26]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[26]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[26]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11]{'contents'}[27]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[6]{'contents'}[11];
***************
*** 4529,4532 ****
--- 4605,4609 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[6];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1];
***************
*** 4538,4541 ****
--- 4615,4619 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[11];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1];
***************
*** 4547,4550 ****
--- 4625,4629 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[16];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1];
***************
*** 4556,4559 ****
--- 4635,4639 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[21];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1];
***************
*** 4565,4568 ****
--- 4645,4649 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[26];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[1];
***************
*** 4610,4613 ****
--- 4691,4695 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[6]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[6];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[6]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[6]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[6]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[7]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6];
***************
*** 4619,4622 ****
--- 4701,4705 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[11]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[11]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[11];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[11]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[11]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[11]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[12]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6];
***************
*** 4628,4631 ****
--- 4711,4715 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[16]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[16]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[16];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[16]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[16]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[17]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6];
***************
*** 4637,4640 ****
--- 4721,4725 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[21]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[21]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[21]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[21];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[21]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[21]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[21]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[22]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6];
***************
*** 4646,4649 ****
--- 4731,4735 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[26]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[26]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[26]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[26];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[26]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[26]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[26]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6]{'contents'}[27]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[6];
***************
*** 4695,4698 ****
--- 4781,4785 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[6]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[6];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[6]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[6]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[6]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[7]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11];
***************
*** 4704,4707 ****
--- 4791,4795 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[11]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[11]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[11];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[11]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[11]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[11]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[12]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11];
***************
*** 4713,4716 ****
--- 4801,4805 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[16]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[16]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[16];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[16]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[16]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[17]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11];
***************
*** 4722,4725 ****
--- 4811,4815 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[21]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[21]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[21]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[21];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[21]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[21]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[21]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[22]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11];
***************
*** 4731,4734 ****
--- 4821,4825 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[26]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[26]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[26]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[26];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[26]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[26]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[26]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11]{'contents'}[27]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[11];
***************
*** 4750,4753 ****
--- 4841,4845 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[6]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[6];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[7]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1];
***************
*** 4759,4762 ****
--- 4851,4855 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[11]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[11]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[11];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[11]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[11]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[11]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[12]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1];
***************
*** 4768,4771 ****
--- 4861,4865 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[16]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[16];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[16]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[16]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[17]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1];
***************
*** 4777,4780 ****
--- 4871,4875 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[21]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[21]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[21]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[21];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[21]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[21]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[21]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[22]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1];
***************
*** 4786,4789 ****
--- 4881,4885 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[26]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[26]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[26]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[26];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[26]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[26]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[26]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[27]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[1];
***************
*** 4831,4834 ****
--- 4927,4931 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[8]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[8];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[8]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[8]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[9]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3];
***************
*** 4840,4843 ****
--- 4937,4941 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[13]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[13]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[13];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[13]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[13]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[13]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[14]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3];
***************
*** 4849,4852 ****
--- 4947,4951 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[18]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[18]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[18]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[18];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[18]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[18]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[18]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[19]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3];
***************
*** 4858,4861 ****
--- 4957,4961 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[23]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[23]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[23]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[23];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[23]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[23]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[23]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[24]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3];
***************
*** 4867,4870 ****
--- 4967,4971 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[28]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[28]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[28]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[28];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[28]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[28]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[28]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'contents'}[29]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[3];
***************
*** 4916,4919 ****
--- 5017,5021 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[8]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[8];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[8]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[8]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[9]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5];
***************
*** 4925,4928 ****
--- 5027,5031 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[13]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[13]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[13];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[13]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[13]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[13]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[14]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5];
***************
*** 4934,4937 ****
--- 5037,5041 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[18]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[18]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[18]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[18];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[18]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[18]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[18]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[19]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5];
***************
*** 4943,4946 ****
--- 5047,5051 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[23]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[23]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[23]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[23];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[23]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[23]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[23]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[24]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5];
***************
*** 4952,4955 ****
--- 5057,5061 ----
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[28]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[28]{'args'}[0];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[28]{'args'}[0]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[28];
+ $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[28]{'line_nr'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[28]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[28]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5];
  $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[29]{'parent'} = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[2]{'contents'}[13]{'contents'}[5];
diff -Nrc2 texinfo-6.1/tp/t/results/misc_commands/command_not_closed_in_documentencoding.pl texinfo-6.3/tp/t/results/misc_commands/command_not_closed_in_documentencoding.pl
*** texinfo-6.1/tp/t/results/misc_commands/command_not_closed_in_documentencoding.pl	2016-01-22 07:49:36.000000000 +0000
--- texinfo-6.3/tp/t/results/misc_commands/command_not_closed_in_documentencoding.pl	2016-08-02 18:44:18.000000000 +0100
***************
*** 69,88 ****
  $result_errors{'command_not_closed_in_documentencoding'} = [
    {
!     'error_line' => ':1: @strong missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@strong missing close brace',
      'type' => 'error'
    },
    {
!     'error_line' => ':1: warning: @documentencoding missing argument
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@documentencoding missing argument',
!     'type' => 'warning'
    }
  ];
--- 69,88 ----
  $result_errors{'command_not_closed_in_documentencoding'} = [
    {
!     'error_line' => ':1: @strong missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@strong missing closing brace',
      'type' => 'error'
    },
    {
!     'error_line' => ':1: bad argument to @documentencoding: @strong{}
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => 'bad argument to @documentencoding: @strong{}',
!     'type' => 'error'
    }
  ];
diff -Nrc2 texinfo-6.1/tp/t/results/misc_commands/comment_space_command_on_line.pl texinfo-6.3/tp/t/results/misc_commands/comment_space_command_on_line.pl
*** texinfo-6.1/tp/t/results/misc_commands/comment_space_command_on_line.pl	2016-01-22 07:49:37.000000000 +0000
--- texinfo-6.3/tp/t/results/misc_commands/comment_space_command_on_line.pl	2016-08-02 18:44:19.000000000 +0100
***************
*** 324,328 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'index entry  ',
--- 324,327 ----
***************
*** 504,507 ****
--- 503,507 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 604,607 ****
--- 604,608 ----
              ],
              'end_command' => {},
+             'float_section' => {},
              'node_content' => [
                {}
***************
*** 616,620 ****
              }
            },
-           'float_section' => {},
            'line_nr' => {
              'file_name' => '',
--- 617,620 ----
***************
*** 816,819 ****
--- 816,820 ----
  $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'args'}[0];
  $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9];
+ $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'args'}[1];
  $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'args'}[1];
  $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'args'}[1];
***************
*** 834,841 ****
  $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'extra'}{'block_command_line_contents'}[1][0] = $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'args'}[1]{'contents'}[1];
  $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'extra'}{'end_command'} = $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1];
  $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'extra'}{'node_content'}[0] = $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'args'}[1]{'contents'}[1];
  $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'extra'}{'spaces_after_command'} = $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'}[0];
  $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'extra'}{'type'}{'content'}[0] = $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'}[1];
- $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'float_section'} = $result_trees{'comment_space_command_on_line'}{'contents'}[2];
  $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'parent'} = $result_trees{'comment_space_command_on_line'}{'contents'}[2];
  $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[10]{'parent'} = $result_trees{'comment_space_command_on_line'}{'contents'}[2];
--- 835,842 ----
  $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'extra'}{'block_command_line_contents'}[1][0] = $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'args'}[1]{'contents'}[1];
  $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'extra'}{'end_command'} = $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1];
+ $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'extra'}{'float_section'} = $result_trees{'comment_space_command_on_line'}{'contents'}[2];
  $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'extra'}{'node_content'}[0] = $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'args'}[1]{'contents'}[1];
  $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'extra'}{'spaces_after_command'} = $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'}[0];
  $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'extra'}{'type'}{'content'}[0] = $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'}[1];
  $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'parent'} = $result_trees{'comment_space_command_on_line'}{'contents'}[2];
  $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[10]{'parent'} = $result_trees{'comment_space_command_on_line'}{'contents'}[2];
***************
*** 965,968 ****
--- 966,974 ----
            }
          },
+         'float_section' => {
+           'cmdname' => 'top',
+           'extra' => {},
+           'level' => 0
+         },
          'normalized' => 'label',
          'type' => {
***************
*** 975,983 ****
          }
        },
-       'float_section' => {
-         'cmdname' => 'top',
-         'extra' => {},
-         'level' => 0
-       },
        'number' => 1
      }
--- 981,984 ----
diff -Nrc2 texinfo-6.1/tp/t/results/misc_commands/contents.pl texinfo-6.3/tp/t/results/misc_commands/contents.pl
*** texinfo-6.1/tp/t/results/misc_commands/contents.pl	2016-01-22 07:49:36.000000000 +0000
--- texinfo-6.3/tp/t/results/misc_commands/contents.pl	2016-08-02 18:44:18.000000000 +0100
***************
*** 251,296 ****
  $result_errors{'contents'} = [
    {
!     'error_line' => ':2: warning: @contents should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 2,
      'macro' => '',
!     'text' => '@contents should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':3: warning: @contents should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 3,
      'macro' => '',
!     'text' => '@contents should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':7: warning: @shortcontents should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 7,
      'macro' => '',
!     'text' => '@shortcontents should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':8: warning: @shortcontents should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 8,
      'macro' => '',
!     'text' => '@shortcontents should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':9: warning: @summarycontents should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 9,
      'macro' => '',
!     'text' => '@summarycontents should only appear at a line beginning',
      'type' => 'warning'
    }
--- 251,296 ----
  $result_errors{'contents'} = [
    {
!     'error_line' => ':2: warning: @contents should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 2,
      'macro' => '',
!     'text' => '@contents should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':3: warning: @contents should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 3,
      'macro' => '',
!     'text' => '@contents should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':7: warning: @shortcontents should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 7,
      'macro' => '',
!     'text' => '@shortcontents should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':8: warning: @shortcontents should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 8,
      'macro' => '',
!     'text' => '@shortcontents should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':9: warning: @summarycontents should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 9,
      'macro' => '',
!     'text' => '@summarycontents should only appear at the beginning of a line',
      'type' => 'warning'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/misc_commands/definfoenclose.pl texinfo-6.3/tp/t/results/misc_commands/definfoenclose.pl
*** texinfo-6.1/tp/t/results/misc_commands/definfoenclose.pl	2016-01-22 07:49:36.000000000 +0000
--- texinfo-6.3/tp/t/results/misc_commands/definfoenclose.pl	2016-08-02 18:44:18.000000000 +0100
***************
*** 424,442 ****
  $result_errors{'definfoenclose'} = [
    {
!     'error_line' => ':2: warning: @definfoenclose should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 2,
      'macro' => '',
!     'text' => '@definfoenclose should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':6: warning: @definfoenclose should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 6,
      'macro' => '',
!     'text' => '@definfoenclose should only appear at a line beginning',
      'type' => 'warning'
    }
--- 424,442 ----
  $result_errors{'definfoenclose'} = [
    {
!     'error_line' => ':2: warning: @definfoenclose should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 2,
      'macro' => '',
!     'text' => '@definfoenclose should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':6: warning: @definfoenclose should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 6,
      'macro' => '',
!     'text' => '@definfoenclose should only appear at the beginning of a line',
      'type' => 'warning'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/misc_commands/footnote_in_center.pl texinfo-6.3/tp/t/results/misc_commands/footnote_in_center.pl
*** texinfo-6.1/tp/t/results/misc_commands/footnote_in_center.pl	2016-01-22 07:49:37.000000000 +0000
--- texinfo-6.3/tp/t/results/misc_commands/footnote_in_center.pl	2016-08-02 18:44:18.000000000 +0100
***************
*** 76,79 ****
--- 76,85 ----
                                  {
                                    'cmdname' => 'asis',
+                                   'contents' => [],
+                                   'line_nr' => {
+                                     'file_name' => '',
+                                     'line_nr' => 5,
+                                     'macro' => ''
+                                   },
                                    'parent' => {},
                                    'type' => 'command_as_argument'
***************
*** 214,222 ****
                              'spaces_after_command' => {}
                            },
!                           'line_nr' => {
!                             'file_name' => '',
!                             'line_nr' => 5,
!                             'macro' => ''
!                           },
                            'parent' => {}
                          },
--- 220,224 ----
                              'spaces_after_command' => {}
                            },
!                           'line_nr' => {},
                            'parent' => {}
                          },
***************
*** 281,291 ****
                'cmdname' => 'footnote',
                'contents' => [],
-               'extra' => {
-                 'spaces_before_argument' => {
-                   'parent' => {},
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
-                 }
-               },
                'line_nr' => {
                  'file_name' => '',
--- 283,286 ----
***************
*** 364,367 ****
--- 359,363 ----
  $result_trees{'footnote_in_center'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'footnote_in_center'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
  $result_trees{'footnote_in_center'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'footnote_in_center'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
+ $result_trees{'footnote_in_center'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'}[1]{'line_nr'} = $result_trees{'footnote_in_center'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'footnote_in_center'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'footnote_in_center'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
  $result_trees{'footnote_in_center'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'footnote_in_center'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'}[2];
***************
*** 377,381 ****
  $result_trees{'footnote_in_center'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'footnote_in_center'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'footnote_in_center'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'footnote_in_center'}{'contents'}[0]{'args'}[0]{'contents'}[2];
- $result_trees{'footnote_in_center'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'footnote_in_center'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'footnote_in_center'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'footnote_in_center'}{'contents'}[0]{'args'}[0];
  $result_trees{'footnote_in_center'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'footnote_in_center'}{'contents'}[0]{'args'}[0];
--- 373,376 ----
diff -Nrc2 texinfo-6.1/tp/t/results/misc_commands/index_entries.pl texinfo-6.3/tp/t/results/misc_commands/index_entries.pl
*** texinfo-6.1/tp/t/results/misc_commands/index_entries.pl	2016-01-22 07:49:36.000000000 +0000
--- texinfo-6.3/tp/t/results/misc_commands/index_entries.pl	2016-08-02 18:44:18.000000000 +0100
***************
*** 46,50 ****
            'index_at_command' => 'cindex',
            'index_name' => 'cp',
-           'index_prefix' => 'c',
            'index_type_command' => 'cindex',
            'key' => 'cindex entry',
--- 46,49 ----
***************
*** 153,157 ****
            'index_at_command' => 'trucindex',
            'index_name' => 'truc',
-           'index_prefix' => 'truc',
            'index_type_command' => 'trucindex',
            'key' => 'index truc',
--- 152,155 ----
***************
*** 245,253 ****
        },
        'in_code' => 0,
!       'name' => 'cp',
!       'prefix' => [
!         'c',
!         'cp'
!       ]
      },
      'fn' => {
--- 243,247 ----
        },
        'in_code' => 0,
!       'name' => 'cp'
      },
      'fn' => {
***************
*** 256,264 ****
        },
        'in_code' => 1,
!       'name' => 'fn',
!       'prefix' => [
!         'f',
!         'fn'
!       ]
      },
      'ky' => {
--- 250,254 ----
        },
        'in_code' => 1,
!       'name' => 'fn'
      },
      'ky' => {
***************
*** 267,275 ****
        },
        'in_code' => 1,
!       'name' => 'ky',
!       'prefix' => [
!         'k',
!         'ky'
!       ]
      },
      'pg' => {
--- 257,261 ----
        },
        'in_code' => 1,
!       'name' => 'ky'
      },
      'pg' => {
***************
*** 278,286 ****
        },
        'in_code' => 1,
!       'name' => 'pg',
!       'prefix' => [
!         'p',
!         'pg'
!       ]
      },
      'tp' => {
--- 264,268 ----
        },
        'in_code' => 1,
!       'name' => 'pg'
      },
      'tp' => {
***************
*** 289,297 ****
        },
        'in_code' => 1,
!       'name' => 'tp',
!       'prefix' => [
!         't',
!         'tp'
!       ]
      },
      'truc' => {
--- 271,275 ----
        },
        'in_code' => 1,
!       'name' => 'tp'
      },
      'truc' => {
***************
*** 300,307 ****
        },
        'in_code' => 0,
!       'name' => 'truc',
!       'prefix' => [
!         'truc'
!       ]
      },
      'vr' => {
--- 278,282 ----
        },
        'in_code' => 0,
!       'name' => 'truc'
      },
      'vr' => {
***************
*** 310,318 ****
        },
        'in_code' => 1,
!       'name' => 'vr',
!       'prefix' => [
!         'v',
!         'vr'
!       ]
      }
    }
--- 285,289 ----
        },
        'in_code' => 1,
!       'name' => 'vr'
      }
    }
diff -Nrc2 texinfo-6.1/tp/t/results/misc_commands/invalid_clickstyle.pl texinfo-6.3/tp/t/results/misc_commands/invalid_clickstyle.pl
*** texinfo-6.1/tp/t/results/misc_commands/invalid_clickstyle.pl	2016-01-22 07:49:36.000000000 +0000
--- texinfo-6.3/tp/t/results/misc_commands/invalid_clickstyle.pl	2016-08-02 18:44:18.000000000 +0100
***************
*** 62,65 ****
--- 62,70 ----
              'clickstyle' => 'result'
            },
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 4,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 127,130 ****
--- 132,140 ----
              'clickstyle' => 'nocmd'
            },
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 8,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 182,185 ****
--- 192,200 ----
              'clickstyle' => 'nocmd'
            },
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 12,
+             'macro' => ''
+           },
            'parent' => {}
          },
diff -Nrc2 texinfo-6.1/tp/t/results/misc_commands/invalid_documentencoding.pl texinfo-6.3/tp/t/results/misc_commands/invalid_documentencoding.pl
*** texinfo-6.1/tp/t/results/misc_commands/invalid_documentencoding.pl	2016-01-22 07:49:36.000000000 +0000
--- texinfo-6.3/tp/t/results/misc_commands/invalid_documentencoding.pl	2016-08-02 18:44:18.000000000 +0100
***************
*** 72,77 ****
        'cmdname' => 'documentencoding',
        'extra' => {
-         'input_encoding_name' => 'us-ascii',
-         'input_perl_encoding' => 'ascii',
          'spaces_after_command' => {},
          'text_arg' => 'us-ascii'
--- 72,75 ----
***************
*** 138,142 ****
        'extra' => {
          'spaces_after_command' => {},
!         'text_arg' => 'latin1a'
        },
        'line_nr' => {},
--- 136,140 ----
        'extra' => {
          'spaces_after_command' => {},
!         'text_arg' => 'latin1'
        },
        'line_nr' => {},
***************
*** 374,377 ****
--- 372,380 ----
                    'cmdname' => 'TeX',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 10,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 390,400 ****
            'extra' => {
              'spaces_after_command' => {},
!             'text_arg' => 'AAATeX'
!           },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 10,
!             'macro' => ''
            },
            'parent' => {}
          },
--- 393,399 ----
            'extra' => {
              'spaces_after_command' => {},
!             'text_arg' => 'AAA'
            },
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 429,432 ****
--- 428,437 ----
                    ],
                    'cmdname' => '\'',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 11,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 445,455 ****
            'extra' => {
              'spaces_after_command' => {},
!             'text_arg' => 'BBBe\''
!           },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 11,
!             'macro' => ''
            },
            'parent' => {}
          }
--- 450,456 ----
            'extra' => {
              'spaces_after_command' => {},
!             'text_arg' => 'BBB'
            },
+           'line_nr' => {},
            'parent' => {}
          }
***************
*** 530,533 ****
--- 531,535 ----
  $result_trees{'invalid_documentencoding'}{'contents'}[5]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'invalid_documentencoding'}{'contents'}[5]{'contents'}[6];
  $result_trees{'invalid_documentencoding'}{'contents'}[5]{'contents'}[6]{'extra'}{'spaces_after_command'} = $result_trees{'invalid_documentencoding'}{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[0];
+ $result_trees{'invalid_documentencoding'}{'contents'}[5]{'contents'}[6]{'line_nr'} = $result_trees{'invalid_documentencoding'}{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'invalid_documentencoding'}{'contents'}[5]{'contents'}[6]{'parent'} = $result_trees{'invalid_documentencoding'}{'contents'}[5];
  $result_trees{'invalid_documentencoding'}{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'invalid_documentencoding'}{'contents'}[5]{'contents'}[7];
***************
*** 540,543 ****
--- 542,546 ----
  $result_trees{'invalid_documentencoding'}{'contents'}[5]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'invalid_documentencoding'}{'contents'}[5]{'contents'}[7];
  $result_trees{'invalid_documentencoding'}{'contents'}[5]{'contents'}[7]{'extra'}{'spaces_after_command'} = $result_trees{'invalid_documentencoding'}{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[0];
+ $result_trees{'invalid_documentencoding'}{'contents'}[5]{'contents'}[7]{'line_nr'} = $result_trees{'invalid_documentencoding'}{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'invalid_documentencoding'}{'contents'}[5]{'contents'}[7]{'parent'} = $result_trees{'invalid_documentencoding'}{'contents'}[5];
  $result_trees{'invalid_documentencoding'}{'contents'}[5]{'parent'} = $result_trees{'invalid_documentencoding'};
***************
*** 562,581 ****
  $result_errors{'invalid_documentencoding'} = [
    {
!     'error_line' => ':4: warning: encoding `latin1a\' is not a canonical texinfo encoding
  ',
      'file_name' => '',
!     'line_nr' => 4,
      'macro' => '',
!     'text' => 'encoding `latin1a\' is not a canonical texinfo encoding',
!     'type' => 'warning'
    },
    {
!     'error_line' => ':4: warning: unrecognized encoding name `latin1a\'
  ',
      'file_name' => '',
      'line_nr' => 4,
      'macro' => '',
!     'text' => 'unrecognized encoding name `latin1a\'',
!     'type' => 'warning'
    },
    {
--- 565,584 ----
  $result_errors{'invalid_documentencoding'} = [
    {
!     'error_line' => ':2: bad argument to @documentencoding: us-ascii@asis{}
  ',
      'file_name' => '',
!     'line_nr' => 2,
      'macro' => '',
!     'text' => 'bad argument to @documentencoding: us-ascii@asis{}',
!     'type' => 'error'
    },
    {
!     'error_line' => ':4: bad argument to @documentencoding: latin1@asis{a}
  ',
      'file_name' => '',
      'line_nr' => 4,
      'macro' => '',
!     'text' => 'bad argument to @documentencoding: latin1@asis{a}',
!     'type' => 'error'
    },
    {
***************
*** 598,607 ****
    },
    {
!     'error_line' => ':6: warning: @documentencoding should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 6,
      'macro' => '',
!     'text' => '@documentencoding should only appear at a line beginning',
      'type' => 'warning'
    },
--- 601,610 ----
    },
    {
!     'error_line' => ':6: warning: @documentencoding should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 6,
      'macro' => '',
!     'text' => '@documentencoding should only appear at the beginning of a line',
      'type' => 'warning'
    },
***************
*** 679,716 ****
    },
    {
!     'error_line' => ':10: warning: encoding `AAATeX\' is not a canonical texinfo encoding
! ',
!     'file_name' => '',
!     'line_nr' => 10,
!     'macro' => '',
!     'text' => 'encoding `AAATeX\' is not a canonical texinfo encoding',
!     'type' => 'warning'
!   },
!   {
!     'error_line' => ':10: warning: unrecognized encoding name `AAATeX\'
  ',
      'file_name' => '',
      'line_nr' => 10,
      'macro' => '',
!     'text' => 'unrecognized encoding name `AAATeX\'',
!     'type' => 'warning'
    },
    {
!     'error_line' => ':11: warning: encoding `BBBe\'\' is not a canonical texinfo encoding
  ',
      'file_name' => '',
      'line_nr' => 11,
      'macro' => '',
!     'text' => 'encoding `BBBe\'\' is not a canonical texinfo encoding',
!     'type' => 'warning'
!   },
!   {
!     'error_line' => ':11: warning: unrecognized encoding name `BBBe\'\'
! ',
!     'file_name' => '',
!     'line_nr' => 11,
!     'macro' => '',
!     'text' => 'unrecognized encoding name `BBBe\'\'',
!     'type' => 'warning'
    }
  ];
--- 682,701 ----
    },
    {
!     'error_line' => ':10: bad argument to @documentencoding: AAA@TeX{}
  ',
      'file_name' => '',
      'line_nr' => 10,
      'macro' => '',
!     'text' => 'bad argument to @documentencoding: AAA@TeX{}',
!     'type' => 'error'
    },
    {
!     'error_line' => ':11: bad argument to @documentencoding: BBB@\'e
  ',
      'file_name' => '',
      'line_nr' => 11,
      'macro' => '',
!     'text' => 'bad argument to @documentencoding: BBB@\'e',
!     'type' => 'error'
    }
  ];
diff -Nrc2 texinfo-6.1/tp/t/results/misc_commands/invalid_kbdinputstyle.pl texinfo-6.3/tp/t/results/misc_commands/invalid_kbdinputstyle.pl
*** texinfo-6.1/tp/t/results/misc_commands/invalid_kbdinputstyle.pl	2016-01-22 07:49:36.000000000 +0000
--- texinfo-6.3/tp/t/results/misc_commands/invalid_kbdinputstyle.pl	2016-08-02 18:44:18.000000000 +0100
***************
*** 77,86 ****
  $result_errors{'invalid_kbdinputstyle'} = [
    {
!     'error_line' => ':1: warning: @kbdinputstyle should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@kbdinputstyle should only appear at a line beginning',
      'type' => 'warning'
    },
--- 77,86 ----
  $result_errors{'invalid_kbdinputstyle'} = [
    {
!     'error_line' => ':1: warning: @kbdinputstyle should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@kbdinputstyle should only appear at the beginning of a line',
      'type' => 'warning'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/misc_commands/kbdinputstyle.pl texinfo-6.3/tp/t/results/misc_commands/kbdinputstyle.pl
*** texinfo-6.1/tp/t/results/misc_commands/kbdinputstyle.pl	2016-01-22 07:49:36.000000000 +0000
--- texinfo-6.3/tp/t/results/misc_commands/kbdinputstyle.pl	2016-08-02 18:44:18.000000000 +0100
***************
*** 86,110 ****
        'extra' => {
          'arg_line' => ' codekbdmacro
! ',
!         'macrobody' => '@code{in code out of example @code{in nested code}}.
! @kbd{kbd out of example}.
! @code{kbd @kbd{in code}}.
! 
! in example
! @example
! @code{in code in example @code{in nested code}}.
! @kbd{kbd in example}.
! @code{kbd @kbd{in code} in example}.
! @end example
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 86,90 ----
        'extra' => {
          'arg_line' => ' codekbdmacro
! '
        },
        'line_nr' => {
***************
*** 115,119 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 95,107 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 1370,1377 ****
  $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[9]{'parent'} = $result_trees{'kbdinputstyle'}{'contents'}[0];
  $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[10]{'parent'} = $result_trees{'kbdinputstyle'}{'contents'}[0];
- $result_trees{'kbdinputstyle'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'kbdinputstyle'}{'contents'}[0];
- $result_trees{'kbdinputstyle'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'kbdinputstyle'};
  $result_trees{'kbdinputstyle'}{'contents'}[0]{'parent'} = $result_trees{'kbdinputstyle'};
! $result_trees{'kbdinputstyle'}{'contents'}[1] = $result_trees{'kbdinputstyle'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'kbdinputstyle'}{'contents'}[2]{'parent'} = $result_trees{'kbdinputstyle'};
  $result_trees{'kbdinputstyle'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'kbdinputstyle'}{'contents'}[3];
--- 1358,1364 ----
  $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[9]{'parent'} = $result_trees{'kbdinputstyle'}{'contents'}[0];
  $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[10]{'parent'} = $result_trees{'kbdinputstyle'}{'contents'}[0];
  $result_trees{'kbdinputstyle'}{'contents'}[0]{'parent'} = $result_trees{'kbdinputstyle'};
! $result_trees{'kbdinputstyle'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'kbdinputstyle'}{'contents'}[0];
! $result_trees{'kbdinputstyle'}{'contents'}[1]{'parent'} = $result_trees{'kbdinputstyle'};
  $result_trees{'kbdinputstyle'}{'contents'}[2]{'parent'} = $result_trees{'kbdinputstyle'};
  $result_trees{'kbdinputstyle'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'kbdinputstyle'}{'contents'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/misc_commands/many_lines.pl texinfo-6.3/tp/t/results/misc_commands/many_lines.pl
*** texinfo-6.1/tp/t/results/misc_commands/many_lines.pl	2016-01-22 07:49:36.000000000 +0000
--- texinfo-6.3/tp/t/results/misc_commands/many_lines.pl	2016-08-02 18:44:17.000000000 +0100
***************
*** 810,816 ****
            'cmdname' => 'exampleindent',
            'extra' => {
-             'misc_args' => [
-               '6'
-             ],
              'spaces_after_command' => {}
            },
--- 810,813 ----
***************
*** 1703,1739 ****
  $result_errors{'many_lines'} = [
    {
!     'error_line' => ':1: warning: @pagesizes should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@pagesizes should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':2: warning: @afourpaper should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 2,
      'macro' => '',
!     'text' => '@afourpaper should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':3: warning: @smallbook should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 3,
      'macro' => '',
!     'text' => '@smallbook should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':4: warning: @headings should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 4,
      'macro' => '',
!     'text' => '@headings should only appear at a line beginning',
      'type' => 'warning'
    },
--- 1700,1736 ----
  $result_errors{'many_lines'} = [
    {
!     'error_line' => ':1: warning: @pagesizes should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@pagesizes should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':2: warning: @afourpaper should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 2,
      'macro' => '',
!     'text' => '@afourpaper should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':3: warning: @smallbook should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 3,
      'macro' => '',
!     'text' => '@smallbook should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':4: warning: @headings should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 4,
      'macro' => '',
!     'text' => '@headings should only appear at the beginning of a line',
      'type' => 'warning'
    },
***************
*** 1748,1811 ****
    },
    {
!     'error_line' => ':5: warning: @oddfooting should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 5,
      'macro' => '',
!     'text' => '@oddfooting should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':6: warning: @everyheading should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 6,
      'macro' => '',
!     'text' => '@everyheading should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':7: warning: @everyfooting should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 7,
      'macro' => '',
!     'text' => '@everyfooting should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':8: warning: @evenheading should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 8,
      'macro' => '',
!     'text' => '@evenheading should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':9: warning: @evenfooting should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 9,
      'macro' => '',
!     'text' => '@evenfooting should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':10: warning: @oddheading should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 10,
      'macro' => '',
!     'text' => '@oddheading should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':11: warning: @need should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 11,
      'macro' => '',
!     'text' => '@need should only appear at a line beginning',
      'type' => 'warning'
    },
--- 1745,1808 ----
    },
    {
!     'error_line' => ':5: warning: @oddfooting should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 5,
      'macro' => '',
!     'text' => '@oddfooting should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':6: warning: @everyheading should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 6,
      'macro' => '',
!     'text' => '@everyheading should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':7: warning: @everyfooting should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 7,
      'macro' => '',
!     'text' => '@everyfooting should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':8: warning: @evenheading should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 8,
      'macro' => '',
!     'text' => '@evenheading should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':9: warning: @evenfooting should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 9,
      'macro' => '',
!     'text' => '@evenfooting should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':10: warning: @oddheading should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 10,
      'macro' => '',
!     'text' => '@oddheading should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':11: warning: @need should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 11,
      'macro' => '',
!     'text' => '@need should only appear at the beginning of a line',
      'type' => 'warning'
    },
***************
*** 1820,1838 ****
    },
    {
!     'error_line' => ':12: warning: @need should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 12,
      'macro' => '',
!     'text' => '@need should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':13: warning: @setchapternewpage should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 13,
      'macro' => '',
!     'text' => '@setchapternewpage should only appear at a line beginning',
      'type' => 'warning'
    },
--- 1817,1835 ----
    },
    {
!     'error_line' => ':12: warning: @need should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 12,
      'macro' => '',
!     'text' => '@need should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':13: warning: @setchapternewpage should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 13,
      'macro' => '',
!     'text' => '@setchapternewpage should only appear at the beginning of a line',
      'type' => 'warning'
    },
***************
*** 1847,1874 ****
    },
    {
!     'error_line' => ':14: warning: @raisesections should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 14,
      'macro' => '',
!     'text' => '@raisesections should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':15: warning: @lowersections should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 15,
      'macro' => '',
!     'text' => '@lowersections should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':16: warning: @kbdinputstyle should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 16,
      'macro' => '',
!     'text' => '@kbdinputstyle should only appear at a line beginning',
      'type' => 'warning'
    },
--- 1844,1871 ----
    },
    {
!     'error_line' => ':14: warning: @raisesections should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 14,
      'macro' => '',
!     'text' => '@raisesections should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':15: warning: @lowersections should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 15,
      'macro' => '',
!     'text' => '@lowersections should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':16: warning: @kbdinputstyle should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 16,
      'macro' => '',
!     'text' => '@kbdinputstyle should only appear at the beginning of a line',
      'type' => 'warning'
    },
***************
*** 1883,1991 ****
    },
    {
!     'error_line' => ':17: warning: @afourpaper should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 17,
      'macro' => '',
!     'text' => '@afourpaper should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':18: warning: @afourlatex should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 18,
      'macro' => '',
!     'text' => '@afourlatex should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':19: warning: @afourwide should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 19,
      'macro' => '',
!     'text' => '@afourwide should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':20: warning: @paragraphindent should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 20,
      'macro' => '',
!     'text' => '@paragraphindent should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':21: warning: @paragraphindent should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 21,
      'macro' => '',
!     'text' => '@paragraphindent should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':22: warning: @paragraphindent should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 22,
      'macro' => '',
!     'text' => '@paragraphindent should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':23: warning: @paragraphindent should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 23,
      'macro' => '',
!     'text' => '@paragraphindent should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':24: warning: @firstparagraphindent should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 24,
      'macro' => '',
!     'text' => '@firstparagraphindent should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':25: warning: @exampleindent should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 25,
      'macro' => '',
!     'text' => '@exampleindent should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':26: warning: @exampleindent should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 26,
      'macro' => '',
!     'text' => '@exampleindent should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':27: warning: @footnotestyle should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 27,
      'macro' => '',
!     'text' => '@footnotestyle should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':28: warning: @footnotestyle should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 28,
      'macro' => '',
!     'text' => '@footnotestyle should only appear at a line beginning',
      'type' => 'warning'
    },
--- 1880,1997 ----
    },
    {
!     'error_line' => ':17: warning: @afourpaper should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 17,
      'macro' => '',
!     'text' => '@afourpaper should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':18: warning: @afourlatex should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 18,
      'macro' => '',
!     'text' => '@afourlatex should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':19: warning: @afourwide should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 19,
      'macro' => '',
!     'text' => '@afourwide should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':20: warning: @paragraphindent should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 20,
      'macro' => '',
!     'text' => '@paragraphindent should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':21: warning: @paragraphindent should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 21,
      'macro' => '',
!     'text' => '@paragraphindent should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':22: warning: @paragraphindent should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 22,
      'macro' => '',
!     'text' => '@paragraphindent should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':23: warning: @paragraphindent should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 23,
      'macro' => '',
!     'text' => '@paragraphindent should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':24: warning: @firstparagraphindent should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 24,
      'macro' => '',
!     'text' => '@firstparagraphindent should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':25: warning: @exampleindent should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 25,
      'macro' => '',
!     'text' => '@exampleindent should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':25: @exampleindent arg must be numeric/`asis\', not `6 on line following exampleindent\'
! ',
!     'file_name' => '',
!     'line_nr' => 25,
!     'macro' => '',
!     'text' => '@exampleindent arg must be numeric/`asis\', not `6 on line following exampleindent\'',
!     'type' => 'error'
!   },
!   {
!     'error_line' => ':26: warning: @exampleindent should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 26,
      'macro' => '',
!     'text' => '@exampleindent should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':27: warning: @footnotestyle should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 27,
      'macro' => '',
!     'text' => '@footnotestyle should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':28: warning: @footnotestyle should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 28,
      'macro' => '',
!     'text' => '@footnotestyle should only appear at the beginning of a line',
      'type' => 'warning'
    },
***************
*** 2000,2009 ****
    },
    {
!     'error_line' => ':29: warning: @documentencoding should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 29,
      'macro' => '',
!     'text' => '@documentencoding should only appear at a line beginning',
      'type' => 'warning'
    },
--- 2006,2015 ----
    },
    {
!     'error_line' => ':29: warning: @documentencoding should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 29,
      'macro' => '',
!     'text' => '@documentencoding should only appear at the beginning of a line',
      'type' => 'warning'
    },
***************
*** 2027,2063 ****
    },
    {
!     'error_line' => ':31: warning: @frenchspacing should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 31,
      'macro' => '',
!     'text' => '@frenchspacing should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':32: warning: @frenchspacing should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 32,
      'macro' => '',
!     'text' => '@frenchspacing should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':33: warning: @fonttextsize should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 33,
      'macro' => '',
!     'text' => '@fonttextsize should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':34: warning: @everyheadingmarks should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 34,
      'macro' => '',
!     'text' => '@everyheadingmarks should only appear at a line beginning',
      'type' => 'warning'
    },
--- 2033,2069 ----
    },
    {
!     'error_line' => ':31: warning: @frenchspacing should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 31,
      'macro' => '',
!     'text' => '@frenchspacing should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':32: warning: @frenchspacing should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 32,
      'macro' => '',
!     'text' => '@frenchspacing should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':33: warning: @fonttextsize should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 33,
      'macro' => '',
!     'text' => '@fonttextsize should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':34: warning: @everyheadingmarks should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 34,
      'macro' => '',
!     'text' => '@everyheadingmarks should only appear at the beginning of a line',
      'type' => 'warning'
    },
***************
*** 2072,2090 ****
    },
    {
!     'error_line' => ':38: warning: @finalout should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 38,
      'macro' => '',
!     'text' => '@finalout should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':40: warning: @finalout should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 40,
      'macro' => '',
!     'text' => '@finalout should only appear at a line beginning',
      'type' => 'warning'
    }
--- 2078,2096 ----
    },
    {
!     'error_line' => ':38: warning: @finalout should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 38,
      'macro' => '',
!     'text' => '@finalout should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':40: warning: @finalout should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 40,
      'macro' => '',
!     'text' => '@finalout should only appear at the beginning of a line',
      'type' => 'warning'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/misc_commands/ref_in_center.pl texinfo-6.3/tp/t/results/misc_commands/ref_in_center.pl
*** texinfo-6.1/tp/t/results/misc_commands/ref_in_center.pl	2016-01-22 07:49:37.000000000 +0000
--- texinfo-6.3/tp/t/results/misc_commands/ref_in_center.pl	2016-08-02 18:44:18.000000000 +0100
***************
*** 87,94 ****
                        ],
                        'normalized' => 'Top'
-                     },
-                     'spaces_before_argument' => {
-                       'text' => '',
-                       'type' => 'empty_spaces_before_argument'
                      }
                    },
--- 87,90 ----
***************
*** 154,157 ****
--- 150,154 ----
                        'contents' => [
                          {
+                           'parent' => {},
                            'text' => ' ',
                            'type' => 'empty_spaces_before_argument'
***************
*** 181,189 ****
                        ],
                        undef
!                     ],
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {
--- 178,182 ----
                        ],
                        undef
!                     ]
                    },
                    'line_nr' => {
***************
*** 192,197 ****
                      'macro' => ''
                    },
!                   'parent' => {},
!                   'remaining_args' => 2
                  }
                ],
--- 185,189 ----
                      'macro' => ''
                    },
!                   'parent' => {}
                  }
                ],
***************
*** 271,274 ****
--- 263,267 ----
  $result_trees{'ref_in_center'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'ref_in_center'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'ref_in_center'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'ref_in_center'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1];
+ $result_trees{'ref_in_center'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'ref_in_center'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'ref_in_center'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'ref_in_center'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1];
  $result_trees{'ref_in_center'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'ref_in_center'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'args'}[2];
***************
*** 334,343 ****
  $result_errors{'ref_in_center'} = [
    {
!     'error_line' => ':5: @ref missing close brace
  ',
      'file_name' => '',
      'line_nr' => 5,
      'macro' => '',
!     'text' => '@ref missing close brace',
      'type' => 'error'
    },
--- 327,336 ----
  $result_errors{'ref_in_center'} = [
    {
!     'error_line' => ':5: @ref missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 5,
      'macro' => '',
!     'text' => '@ref missing closing brace',
      'type' => 'error'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/misc_commands/setfilename.pl texinfo-6.3/tp/t/results/misc_commands/setfilename.pl
*** texinfo-6.1/tp/t/results/misc_commands/setfilename.pl	2016-01-22 07:49:36.000000000 +0000
--- texinfo-6.3/tp/t/results/misc_commands/setfilename.pl	2016-08-02 18:44:18.000000000 +0100
***************
*** 214,219 ****
        'cmdname' => 'setfilename',
        'extra' => {
!         'spaces_after_command' => {},
!         'text_arg' => '  name  '
        },
        'line_nr' => {},
--- 214,219 ----
        'cmdname' => 'setfilename',
        'extra' => {
!         'missing_argument' => 1,
!         'spaces_after_command' => {}
        },
        'line_nr' => {},
***************
*** 314,317 ****
--- 314,326 ----
      'text' => '@verb should not appear in @setfilename',
      'type' => 'warning'
+   },
+   {
+     'error_line' => ':4: bad argument to @setfilename: @ @verb{: name :}@
+ ',
+     'file_name' => '',
+     'line_nr' => 4,
+     'macro' => '',
+     'text' => 'bad argument to @setfilename: @ @verb{: name :}@',
+     'type' => 'error'
    }
  ];
***************
*** 353,357 ****
  <setfilename file="file_and_spaces" spaces=" ">file_and_spaces   </setfilename>
  <setfilename file="file_space_comment" spaces=" ">file_space_comment </setfilename><!-- c comment -->
! <setfilename file="  name  " spaces=" "><spacecmd type="spc"/><verb delimiter=":"> name </verb><spacecmd type="spc"/></setfilename>
  
  ';
--- 362,366 ----
  <setfilename file="file_and_spaces" spaces=" ">file_and_spaces   </setfilename>
  <setfilename file="file_space_comment" spaces=" ">file_space_comment </setfilename><!-- c comment -->
! <setfilename spaces=" "><spacecmd type="spc"/><verb delimiter=":"> name </verb><spacecmd type="spc"/></setfilename>
  
  ';
diff -Nrc2 texinfo-6.1/tp/t/results/misc_commands/simple.pl texinfo-6.3/tp/t/results/misc_commands/simple.pl
*** texinfo-6.1/tp/t/results/misc_commands/simple.pl	2016-01-22 07:49:36.000000000 +0000
--- texinfo-6.3/tp/t/results/misc_commands/simple.pl	2016-08-02 18:44:17.000000000 +0100
***************
*** 68,76 ****
        },
        'in_code' => 0,
!       'name' => 'cp',
!       'prefix' => [
!         'c',
!         'cp'
!       ]
      },
      'fn' => {
--- 68,72 ----
        },
        'in_code' => 0,
!       'name' => 'cp'
      },
      'fn' => {
***************
*** 79,87 ****
        },
        'in_code' => 1,
!       'name' => 'fn',
!       'prefix' => [
!         'f',
!         'fn'
!       ]
      },
      'idx' => {
--- 75,79 ----
        },
        'in_code' => 1,
!       'name' => 'fn'
      },
      'idx' => {
***************
*** 90,97 ****
        },
        'in_code' => 0,
!       'name' => 'idx',
!       'prefix' => [
!         'idx'
!       ]
      },
      'ky' => {
--- 82,86 ----
        },
        'in_code' => 0,
!       'name' => 'idx'
      },
      'ky' => {
***************
*** 100,108 ****
        },
        'in_code' => 1,
!       'name' => 'ky',
!       'prefix' => [
!         'k',
!         'ky'
!       ]
      },
      'pg' => {
--- 89,93 ----
        },
        'in_code' => 1,
!       'name' => 'ky'
      },
      'pg' => {
***************
*** 111,119 ****
        },
        'in_code' => 1,
!       'name' => 'pg',
!       'prefix' => [
!         'p',
!         'pg'
!       ]
      },
      'tp' => {
--- 96,100 ----
        },
        'in_code' => 1,
!       'name' => 'pg'
      },
      'tp' => {
***************
*** 122,130 ****
        },
        'in_code' => 1,
!       'name' => 'tp',
!       'prefix' => [
!         't',
!         'tp'
!       ]
      },
      'vr' => {
--- 103,107 ----
        },
        'in_code' => 1,
!       'name' => 'tp'
      },
      'vr' => {
***************
*** 133,141 ****
        },
        'in_code' => 1,
!       'name' => 'vr',
!       'prefix' => [
!         'v',
!         'vr'
!       ]
      }
    }
--- 110,114 ----
        },
        'in_code' => 1,
!       'name' => 'vr'
      }
    }
diff -Nrc2 texinfo-6.1/tp/t/results/misc_commands/test_allowcodebreaks.pl texinfo-6.3/tp/t/results/misc_commands/test_allowcodebreaks.pl
*** texinfo-6.1/tp/t/results/misc_commands/test_allowcodebreaks.pl	2016-01-22 07:49:37.000000000 +0000
--- texinfo-6.3/tp/t/results/misc_commands/test_allowcodebreaks.pl	2016-08-02 18:44:18.000000000 +0100
***************
*** 107,130 ****
            'extra' => {
              'arg_line' => ' testallowcodebreakspara {nr}
! ',
!             'args_index' => {
!               'nr' => 0
!             },
!             'macrobody' => 'Out of code --- out-of-code.
! @code{1aaa} @code{2aaa-} @code{-3bbb} @code{4aaa-bbb} 
! @code{ 5aaa-bb} @code{6aaa-bb } @code{ccc 7aaa-bbb} @code{ccc 8aaa-bbb ddd}
! @code{9aaa-bbb rrr_vv}
! @samp{fff-- --- minus@minus{}b aa-tt@\'eff_gg aa@r{r-oman} 
! anc-hor@anchor{A node\\nr\\}}
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 107,111 ----
            'extra' => {
              'arg_line' => ' testallowcodebreakspara {nr}
! '
            },
            'line_nr' => {
***************
*** 135,139 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 116,128 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 184,202 ****
            'extra' => {
              'arg_line' => ' testallowcodebreaksexample{}
! ',
!             'macrobody' => '
! @example
! @code{in-example}
! @end example
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 173,177 ----
            'extra' => {
              'arg_line' => ' testallowcodebreaksexample{}
! '
            },
            'line_nr' => {
***************
*** 207,211 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 182,194 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 457,460 ****
--- 440,448 ----
                        'cmdname' => 'minus',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 20,
+                         'macro' => 'testallowcodebreakspara'
+                       },
                        'parent' => {}
                      },
***************
*** 477,480 ****
--- 465,470 ----
                        ],
                        'cmdname' => '\'',
+                       'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 498,506 ****
                        'cmdname' => 'r',
                        'contents' => [],
!                       'line_nr' => {
!                         'file_name' => '',
!                         'line_nr' => 20,
!                         'macro' => 'testallowcodebreakspara'
!                       },
                        'parent' => {}
                      },
--- 488,492 ----
                        'cmdname' => 'r',
                        'contents' => [],
!                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 538,546 ****
                            {}
                          ],
!                         'normalized' => 'A-node0',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 524,528 ----
                            {}
                          ],
!                         'normalized' => 'A-node0'
                        },
                        'line_nr' => {
***************
*** 964,967 ****
--- 946,954 ----
                        'cmdname' => 'minus',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 25,
+                         'macro' => 'testallowcodebreakspara'
+                       },
                        'parent' => {}
                      },
***************
*** 984,987 ****
--- 971,976 ----
                        ],
                        'cmdname' => '\'',
+                       'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1005,1013 ****
                        'cmdname' => 'r',
                        'contents' => [],
!                       'line_nr' => {
!                         'file_name' => '',
!                         'line_nr' => 25,
!                         'macro' => 'testallowcodebreakspara'
!                       },
                        'parent' => {}
                      },
--- 994,998 ----
                        'cmdname' => 'r',
                        'contents' => [],
!                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 1045,1053 ****
                            {}
                          ],
!                         'normalized' => 'A-node1',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 1030,1034 ----
                            {}
                          ],
!                         'normalized' => 'A-node1'
                        },
                        'line_nr' => {
***************
*** 1434,1437 ****
--- 1415,1423 ----
                                'cmdname' => 'minus',
                                'contents' => [],
+                               'line_nr' => {
+                                 'file_name' => '',
+                                 'line_nr' => 29,
+                                 'macro' => 'testallowcodebreakspara'
+                               },
                                'parent' => {}
                              },
***************
*** 1454,1457 ****
--- 1440,1445 ----
                                ],
                                'cmdname' => '\'',
+                               'contents' => [],
+                               'line_nr' => {},
                                'parent' => {}
                              },
***************
*** 1475,1483 ****
                                'cmdname' => 'r',
                                'contents' => [],
!                               'line_nr' => {
!                                 'file_name' => '',
!                                 'line_nr' => 29,
!                                 'macro' => 'testallowcodebreakspara'
!                               },
                                'parent' => {}
                              },
--- 1463,1467 ----
                                'cmdname' => 'r',
                                'contents' => [],
!                               'line_nr' => {},
                                'parent' => {}
                              },
***************
*** 1515,1523 ****
                                    {}
                                  ],
!                                 'normalized' => 'A-nodew',
!                                 'spaces_before_argument' => {
!                                   'text' => '',
!                                   'type' => 'empty_spaces_before_argument'
!                                 }
                                },
                                'line_nr' => {
--- 1499,1503 ----
                                    {}
                                  ],
!                                 'normalized' => 'A-nodew'
                                },
                                'line_nr' => {
***************
*** 1974,1977 ****
--- 1954,1962 ----
                        'cmdname' => 'minus',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 38,
+                         'macro' => 'testallowcodebreakspara'
+                       },
                        'parent' => {}
                      },
***************
*** 1994,1997 ****
--- 1979,1984 ----
                        ],
                        'cmdname' => '\'',
+                       'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 2015,2023 ****
                        'cmdname' => 'r',
                        'contents' => [],
!                       'line_nr' => {
!                         'file_name' => '',
!                         'line_nr' => 38,
!                         'macro' => 'testallowcodebreakspara'
!                       },
                        'parent' => {}
                      },
--- 2002,2006 ----
                        'cmdname' => 'r',
                        'contents' => [],
!                       'line_nr' => {},
                        'parent' => {}
                      },
***************
*** 2055,2063 ****
                            {}
                          ],
!                         'normalized' => 'A-node2',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 2038,2042 ----
                            {}
                          ],
!                         'normalized' => 'A-node2'
                        },
                        'line_nr' => {
***************
*** 2231,2238 ****
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1];
- $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1];
- $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1];
! $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[2] = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'};
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4];
--- 2210,2216 ----
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1];
! $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[2]{'extra'}{'command'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[1];
! $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4];
***************
*** 2242,2249 ****
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4]{'contents'}[3]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4]{'contents'}[4]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4];
- $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4];
- $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1];
! $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[5] = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4]{'extra'}{'spaces_after_command'};
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7];
--- 2220,2226 ----
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4]{'contents'}[3]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4]{'contents'}[4]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1];
! $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[5]{'extra'}{'command'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[4];
! $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7];
***************
*** 2297,2304 ****
--- 2274,2283 ----
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[3];
+ $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[5]{'args'}[0];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[5];
+ $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0];
***************
*** 2310,2314 ****
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20];
! $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'line_nr'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[5]{'line_nr'};
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[21]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7];
--- 2289,2293 ----
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20];
! $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'line_nr'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[21]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7];
***************
*** 2391,2398 ****
--- 2370,2379 ----
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[3];
+ $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[5]{'args'}[0];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[5];
+ $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0];
***************
*** 2404,2408 ****
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20];
! $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'line_nr'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[5]{'line_nr'};
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[21]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12];
--- 2385,2389 ----
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20];
! $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'line_nr'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[21]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12];
***************
*** 2478,2485 ****
--- 2459,2468 ----
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[3];
+ $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[5]{'args'}[0];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[5];
+ $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0];
***************
*** 2491,2495 ****
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19];
! $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'line_nr'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[5]{'line_nr'};
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[20]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0];
--- 2474,2478 ----
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19];
! $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'line_nr'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[20]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0];
***************
*** 2578,2585 ****
--- 2561,2570 ----
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[3];
+ $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[5]{'args'}[0];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[5];
+ $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0];
***************
*** 2591,2595 ****
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20];
! $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'line_nr'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[5]{'line_nr'};
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[21]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21];
--- 2576,2580 ----
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20];
! $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'line_nr'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21];
  $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[21]{'parent'} = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21];
diff -Nrc2 texinfo-6.1/tp/t/results/misc_commands/text_before_and_after_bye.pl texinfo-6.3/tp/t/results/misc_commands/text_before_and_after_bye.pl
*** texinfo-6.1/tp/t/results/misc_commands/text_before_and_after_bye.pl	2016-01-22 07:49:36.000000000 +0000
--- texinfo-6.3/tp/t/results/misc_commands/text_before_and_after_bye.pl	2016-08-02 18:44:18.000000000 +0100
***************
*** 46,55 ****
  $result_errors{'text_before_and_after_bye'} = [
    {
!     'error_line' => ':1: warning: @bye should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@bye should only appear at a line beginning',
      'type' => 'warning'
    }
--- 46,55 ----
  $result_errors{'text_before_and_after_bye'} = [
    {
!     'error_line' => ':1: warning: @bye should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@bye should only appear at the beginning of a line',
      'type' => 'warning'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/misc_commands/text_before_line_command.pl texinfo-6.3/tp/t/results/misc_commands/text_before_line_command.pl
*** texinfo-6.1/tp/t/results/misc_commands/text_before_line_command.pl	2016-01-22 07:49:36.000000000 +0000
--- texinfo-6.3/tp/t/results/misc_commands/text_before_line_command.pl	2016-08-02 18:44:18.000000000 +0100
***************
*** 484,529 ****
  $result_errors{'text_before_line_command'} = [
    {
!     'error_line' => ':1: warning: @title should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@title should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':3: warning: @node should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 3,
      'macro' => '',
!     'text' => '@node should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':4: warning: @chapter should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 4,
      'macro' => '',
!     'text' => '@chapter should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':6: warning: @contents should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 6,
      'macro' => '',
!     'text' => '@contents should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':9: warning: @author should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 9,
      'macro' => '',
!     'text' => '@author should only appear at a line beginning',
      'type' => 'warning'
    }
--- 484,529 ----
  $result_errors{'text_before_line_command'} = [
    {
!     'error_line' => ':1: warning: @title should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@title should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':3: warning: @node should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 3,
      'macro' => '',
!     'text' => '@node should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':4: warning: @chapter should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 4,
      'macro' => '',
!     'text' => '@chapter should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':6: warning: @contents should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 6,
      'macro' => '',
!     'text' => '@contents should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':9: warning: @author should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 9,
      'macro' => '',
!     'text' => '@author should only appear at the beginning of a line',
      'type' => 'warning'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/multitable/empty_multitable_with_cells.pl texinfo-6.3/tp/t/results/multitable/empty_multitable_with_cells.pl
*** texinfo-6.1/tp/t/results/multitable/empty_multitable_with_cells.pl	2016-01-22 07:49:53.000000000 +0000
--- texinfo-6.3/tp/t/results/multitable/empty_multitable_with_cells.pl	2016-08-02 18:44:32.000000000 +0100
***************
*** 134,144 ****
          'max_columns' => 0,
          'prototypes' => [],
-         'prototypes_line' => [
-           {
-             'text' => '
- ',
-             'type' => 'prototype_space'
-           }
-         ],
          'spaces_after_command' => {}
        },
--- 134,137 ----
diff -Nrc2 texinfo-6.1/tp/t/results/multitable/inter_item_commands_in_multitable.pl texinfo-6.3/tp/t/results/multitable/inter_item_commands_in_multitable.pl
*** texinfo-6.1/tp/t/results/multitable/inter_item_commands_in_multitable.pl	2016-01-22 07:49:52.000000000 +0000
--- texinfo-6.3/tp/t/results/multitable/inter_item_commands_in_multitable.pl	2016-08-02 18:44:32.000000000 +0100
***************
*** 142,146 ****
                            'index_at_command' => 'cindex',
                            'index_name' => 'cp',
-                           'index_prefix' => 'c',
                            'index_type_command' => 'cindex',
                            'key' => 'index entry between empty lines',
--- 142,145 ----
***************
*** 296,300 ****
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            }
--- 295,298 ----
***************
*** 649,653 ****
                                'index_at_command' => 'cindex',
                                'index_name' => 'cp',
-                               'index_prefix' => 'c',
                                'index_type_command' => 'cindex',
                                'key' => 'index entry within multitable',
--- 647,650 ----
***************
*** 869,873 ****
                        'index_at_command' => 'cindex',
                        'index_name' => 'cp',
-                       'index_prefix' => 'c',
                        'index_type_command' => 'cindex',
                        'key' => 'cindex',
--- 866,869 ----
***************
*** 990,994 ****
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            }
--- 986,989 ----
***************
*** 1074,1078 ****
  $result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2];
  $result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'args'}[0];
  $result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'extra'}{'prototypes_line'}[1] = $result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'args'}[0]{'contents'}[1];
  $result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'args'}[0]{'contents'}[0];
--- 1069,1072 ----
***************
*** 1205,1209 ****
  $result_trees{'inter_item_commands_in_multitable'}{'contents'}[4]{'extra'}{'end_command'} = $result_trees{'inter_item_commands_in_multitable'}{'contents'}[4]{'contents'}[2];
  $result_trees{'inter_item_commands_in_multitable'}{'contents'}[4]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'inter_item_commands_in_multitable'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'inter_item_commands_in_multitable'}{'contents'}[4]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'inter_item_commands_in_multitable'}{'contents'}[4]{'args'}[0];
  $result_trees{'inter_item_commands_in_multitable'}{'contents'}[4]{'extra'}{'prototypes_line'}[1] = $result_trees{'inter_item_commands_in_multitable'}{'contents'}[4]{'args'}[0]{'contents'}[1];
  $result_trees{'inter_item_commands_in_multitable'}{'contents'}[4]{'extra'}{'spaces_after_command'} = $result_trees{'inter_item_commands_in_multitable'}{'contents'}[4]{'args'}[0]{'contents'}[0];
--- 1199,1202 ----
diff -Nrc2 texinfo-6.1/tp/t/results/multitable/multitable_begin_with_tab.pl texinfo-6.3/tp/t/results/multitable/multitable_begin_with_tab.pl
*** texinfo-6.1/tp/t/results/multitable/multitable_begin_with_tab.pl	2016-01-22 07:49:53.000000000 +0000
--- texinfo-6.3/tp/t/results/multitable/multitable_begin_with_tab.pl	2016-08-02 18:44:32.000000000 +0100
***************
*** 126,155 ****
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            },
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            }
          ],
-         'prototypes_line' => [
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => '
- ',
-             'type' => 'prototype_space'
-           }
-         ],
          'spaces_after_command' => {}
        },
--- 126,136 ----
***************
*** 334,363 ****
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            },
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            }
          ],
-         'prototypes_line' => [
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => '
- ',
-             'type' => 'prototype_space'
-           }
-         ],
          'spaces_after_command' => {}
        },
--- 315,325 ----
***************
*** 395,403 ****
  $result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'contents'}[1];
  $result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'args'}[0];
  $result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'parent'} = $result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'args'}[0];
- $result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'extra'}{'prototypes_line'}[1] = $result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'args'}[0]{'contents'}[1];
- $result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'extra'}{'prototypes_line'}[3] = $result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'args'}[0]{'contents'}[0];
  $result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'parent'} = $result_trees{'multitable_begin_with_tab'};
--- 357,361 ----
***************
*** 434,442 ****
  $result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'contents'}[2];
  $result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'args'}[0];
  $result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'extra'}{'prototypes'}[1]{'parent'} = $result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'args'}[0];
- $result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'extra'}{'prototypes_line'}[1] = $result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'args'}[0]{'contents'}[1];
- $result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'extra'}{'prototypes_line'}[3] = $result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'args'}[0]{'contents'}[3];
  $result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'args'}[0]{'contents'}[0];
  $result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'parent'} = $result_trees{'multitable_begin_with_tab'};
--- 392,396 ----
diff -Nrc2 texinfo-6.1/tp/t/results/multitable/multitable_in_example.pl texinfo-6.3/tp/t/results/multitable/multitable_in_example.pl
*** texinfo-6.1/tp/t/results/multitable/multitable_in_example.pl	2016-01-22 07:49:52.000000000 +0000
--- texinfo-6.3/tp/t/results/multitable/multitable_in_example.pl	2016-08-02 18:44:32.000000000 +0100
***************
*** 299,308 ****
                {
                  'contents' => [],
-                 'parent' => {},
                  'type' => 'bracketed_multitable_prototype'
                },
                {
                  'contents' => [],
-                 'parent' => {},
                  'type' => 'bracketed_multitable_prototype'
                }
--- 299,306 ----
***************
*** 438,444 ****
  $result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
  $result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[1]{'parent'} = $result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes_line'}[1] = $result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1];
  $result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes_line'}[3] = $result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3];
--- 436,440 ----
diff -Nrc2 texinfo-6.1/tp/t/results/multitable/multitable_not_closed.pl texinfo-6.3/tp/t/results/multitable/multitable_not_closed.pl
*** texinfo-6.1/tp/t/results/multitable/multitable_not_closed.pl	2016-01-22 07:49:53.000000000 +0000
--- texinfo-6.3/tp/t/results/multitable/multitable_not_closed.pl	2016-08-02 18:44:32.000000000 +0100
***************
*** 61,90 ****
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            },
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            }
          ],
-         'prototypes_line' => [
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => '
- ',
-             'type' => 'prototype_space'
-           }
-         ],
          'spaces_after_command' => {}
        },
--- 61,71 ----
***************
*** 109,117 ****
  $result_trees{'multitable_not_closed'}{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'multitable_not_closed'}{'contents'}[0];
  $result_trees{'multitable_not_closed'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'multitable_not_closed'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'multitable_not_closed'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'multitable_not_closed'}{'contents'}[0]{'args'}[0];
  $result_trees{'multitable_not_closed'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'multitable_not_closed'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'multitable_not_closed'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'parent'} = $result_trees{'multitable_not_closed'}{'contents'}[0]{'args'}[0];
- $result_trees{'multitable_not_closed'}{'contents'}[0]{'extra'}{'prototypes_line'}[1] = $result_trees{'multitable_not_closed'}{'contents'}[0]{'args'}[0]{'contents'}[1];
- $result_trees{'multitable_not_closed'}{'contents'}[0]{'extra'}{'prototypes_line'}[3] = $result_trees{'multitable_not_closed'}{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'multitable_not_closed'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'multitable_not_closed'}{'contents'}[0]{'args'}[0]{'contents'}[0];
  $result_trees{'multitable_not_closed'}{'contents'}[0]{'parent'} = $result_trees{'multitable_not_closed'};
--- 90,94 ----
diff -Nrc2 texinfo-6.1/tp/t/results/multitable/multitable_not_closed_item.pl texinfo-6.3/tp/t/results/multitable/multitable_not_closed_item.pl
*** texinfo-6.1/tp/t/results/multitable/multitable_not_closed_item.pl	2016-01-22 07:49:53.000000000 +0000
--- texinfo-6.3/tp/t/results/multitable/multitable_not_closed_item.pl	2016-08-02 18:44:32.000000000 +0100
***************
*** 111,140 ****
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            },
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            }
          ],
-         'prototypes_line' => [
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => '
- ',
-             'type' => 'prototype_space'
-           }
-         ],
          'spaces_after_command' => {}
        },
--- 111,121 ----
***************
*** 167,175 ****
  $result_trees{'multitable_not_closed_item'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable_not_closed_item'}{'contents'}[0];
  $result_trees{'multitable_not_closed_item'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'multitable_not_closed_item'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'multitable_not_closed_item'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'multitable_not_closed_item'}{'contents'}[0]{'args'}[0];
  $result_trees{'multitable_not_closed_item'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'multitable_not_closed_item'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'multitable_not_closed_item'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'parent'} = $result_trees{'multitable_not_closed_item'}{'contents'}[0]{'args'}[0];
- $result_trees{'multitable_not_closed_item'}{'contents'}[0]{'extra'}{'prototypes_line'}[1] = $result_trees{'multitable_not_closed_item'}{'contents'}[0]{'args'}[0]{'contents'}[1];
- $result_trees{'multitable_not_closed_item'}{'contents'}[0]{'extra'}{'prototypes_line'}[3] = $result_trees{'multitable_not_closed_item'}{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'multitable_not_closed_item'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'multitable_not_closed_item'}{'contents'}[0]{'args'}[0]{'contents'}[0];
  $result_trees{'multitable_not_closed_item'}{'contents'}[0]{'parent'} = $result_trees{'multitable_not_closed_item'};
--- 148,152 ----
diff -Nrc2 texinfo-6.1/tp/t/results/multitable/multitable_not_closed_item_tab.pl texinfo-6.3/tp/t/results/multitable/multitable_not_closed_item_tab.pl
*** texinfo-6.1/tp/t/results/multitable/multitable_not_closed_item_tab.pl	2016-01-22 07:49:53.000000000 +0000
--- texinfo-6.3/tp/t/results/multitable/multitable_not_closed_item_tab.pl	2016-08-02 18:44:32.000000000 +0100
***************
*** 140,169 ****
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            },
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            }
          ],
-         'prototypes_line' => [
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => '
- ',
-             'type' => 'prototype_space'
-           }
-         ],
          'spaces_after_command' => {}
        },
--- 140,150 ----
***************
*** 203,211 ****
  $result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable_not_closed_item_tab'}{'contents'}[0];
  $result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'args'}[0];
  $result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'parent'} = $result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'args'}[0];
- $result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'extra'}{'prototypes_line'}[1] = $result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'args'}[0]{'contents'}[1];
- $result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'extra'}{'prototypes_line'}[3] = $result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'args'}[0]{'contents'}[0];
  $result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'parent'} = $result_trees{'multitable_not_closed_item_tab'};
--- 184,188 ----
diff -Nrc2 texinfo-6.1/tp/t/results/multitable/multitable_one_column_too_much_cells.pl texinfo-6.3/tp/t/results/multitable/multitable_one_column_too_much_cells.pl
*** texinfo-6.1/tp/t/results/multitable/multitable_one_column_too_much_cells.pl	2016-01-22 07:49:53.000000000 +0000
--- texinfo-6.3/tp/t/results/multitable/multitable_one_column_too_much_cells.pl	2016-08-02 18:44:32.000000000 +0100
***************
*** 373,392 ****
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            }
          ],
-         'prototypes_line' => [
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => '
- ',
-             'type' => 'prototype_space'
-           }
-         ],
          'spaces_after_command' => {}
        },
--- 373,379 ----
***************
*** 467,472 ****
  $result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'contents'}[1];
  $result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'args'}[0];
- $result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'extra'}{'prototypes_line'}[1] = $result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'args'}[0]{'contents'}[1];
  $result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'args'}[0]{'contents'}[0];
  $result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'parent'} = $result_trees{'multitable_one_column_too_much_cells'};
--- 454,457 ----
diff -Nrc2 texinfo-6.1/tp/t/results/multitable/multitable_with_empty_item_tab.pl texinfo-6.3/tp/t/results/multitable/multitable_with_empty_item_tab.pl
*** texinfo-6.1/tp/t/results/multitable/multitable_with_empty_item_tab.pl	2016-01-22 07:49:53.000000000 +0000
--- texinfo-6.3/tp/t/results/multitable/multitable_with_empty_item_tab.pl	2016-08-02 18:44:32.000000000 +0100
***************
*** 148,160 ****
                    'contents' => [],
                    'extra' => {
!                     'cell_number' => 1,
!                     'spaces_after_command' => {
!                       'extra' => {
!                         'command' => {}
!                       },
!                       'parent' => {},
!                       'text' => '',
!                       'type' => 'empty_line_after_command'
!                     }
                    },
                    'line_nr' => {},
--- 148,152 ----
                    'contents' => [],
                    'extra' => {
!                     'cell_number' => 1
                    },
                    'line_nr' => {},
***************
*** 165,177 ****
                    'contents' => [],
                    'extra' => {
!                     'cell_number' => 2,
!                     'spaces_after_command' => {
!                       'extra' => {
!                         'command' => {}
!                       },
!                       'parent' => {},
!                       'text' => '',
!                       'type' => 'empty_line_after_command'
!                     }
                    },
                    'line_nr' => {},
--- 157,161 ----
                    'contents' => [],
                    'extra' => {
!                     'cell_number' => 2
                    },
                    'line_nr' => {},
***************
*** 335,344 ****
  $result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
  $result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0];
- $result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
- $result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
  $result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'line_nr'} = $result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
- $result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
- $result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
  $result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
--- 319,324 ----
diff -Nrc2 texinfo-6.1/tp/t/results/multitable/paragraph_in_cells.pl texinfo-6.3/tp/t/results/multitable/paragraph_in_cells.pl
*** texinfo-6.1/tp/t/results/multitable/paragraph_in_cells.pl	2016-01-22 07:49:52.000000000 +0000
--- texinfo-6.3/tp/t/results/multitable/paragraph_in_cells.pl	2016-08-02 18:44:32.000000000 +0100
***************
*** 293,302 ****
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            },
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            }
--- 293,300 ----
***************
*** 384,390 ****
  $result_trees{'paragraph_in_cells'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'paragraph_in_cells'}{'contents'}[0]{'contents'}[1];
  $result_trees{'paragraph_in_cells'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'paragraph_in_cells'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'paragraph_in_cells'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'paragraph_in_cells'}{'contents'}[0]{'args'}[0];
  $result_trees{'paragraph_in_cells'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'paragraph_in_cells'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'paragraph_in_cells'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'parent'} = $result_trees{'paragraph_in_cells'}{'contents'}[0]{'args'}[0];
  $result_trees{'paragraph_in_cells'}{'contents'}[0]{'extra'}{'prototypes_line'}[1] = $result_trees{'paragraph_in_cells'}{'contents'}[0]{'args'}[0]{'contents'}[1];
  $result_trees{'paragraph_in_cells'}{'contents'}[0]{'extra'}{'prototypes_line'}[3] = $result_trees{'paragraph_in_cells'}{'contents'}[0]{'args'}[0]{'contents'}[3];
--- 382,386 ----
diff -Nrc2 texinfo-6.1/tp/t/results/multitable/prototype_brace_no_brace.pl texinfo-6.3/tp/t/results/multitable/prototype_brace_no_brace.pl
*** texinfo-6.1/tp/t/results/multitable/prototype_brace_no_brace.pl	2016-01-22 07:49:52.000000000 +0000
--- texinfo-6.3/tp/t/results/multitable/prototype_brace_no_brace.pl	2016-08-02 18:44:32.000000000 +0100
***************
*** 90,94 ****
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            },
--- 90,93 ----
***************
*** 146,150 ****
  $result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'contents'}[0];
  $result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'args'}[0];
  $result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'extra'}{'prototypes_line'}[1] = $result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'args'}[0]{'contents'}[1];
  $result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'args'}[0]{'contents'}[0];
--- 145,148 ----
diff -Nrc2 texinfo-6.1/tp/t/results/multitable/prototype_brace_no_brace_comment.pl texinfo-6.3/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
*** texinfo-6.1/tp/t/results/multitable/prototype_brace_no_brace_comment.pl	2016-01-22 07:49:52.000000000 +0000
--- texinfo-6.3/tp/t/results/multitable/prototype_brace_no_brace_comment.pl	2016-08-02 18:44:32.000000000 +0100
***************
*** 107,111 ****
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            },
--- 107,110 ----
***************
*** 160,164 ****
  $result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0];
  $result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'args'}[0];
  $result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'extra'}{'prototypes_line'}[1] = $result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'args'}[0]{'contents'}[1];
  $result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0];
--- 159,162 ----
diff -Nrc2 texinfo-6.1/tp/t/results/multitable/ref_in_multitable.pl texinfo-6.3/tp/t/results/multitable/ref_in_multitable.pl
*** texinfo-6.1/tp/t/results/multitable/ref_in_multitable.pl	2016-01-22 07:49:53.000000000 +0000
--- texinfo-6.3/tp/t/results/multitable/ref_in_multitable.pl	2016-08-02 18:44:32.000000000 +0100
***************
*** 60,64 ****
                ]
              ],
-             'label' => undef,
              'node_argument' => {
                'node_content' => [
--- 60,63 ----
***************
*** 67,74 ****
                ],
                'normalized' => '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'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 66,69 ----
***************
*** 232,236 ****
                                ]
                              ],
-                             'label' => undef,
                              'node_argument' => {
                                'node_content' => [
--- 227,230 ----
***************
*** 238,245 ****
                                ],
                                'normalized' => 'RRR-RRR-RRR-RRR-RRR-RRR-RRR-RRR-RRR-RRRR'
-                             },
-                             'spaces_before_argument' => {
-                               'text' => '',
-                               'type' => 'empty_spaces_before_argument'
                              }
                            },
--- 232,235 ----
***************
*** 349,353 ****
                                ]
                              ],
-                             'label' => undef,
                              'node_argument' => {
                                'node_content' => [
--- 339,342 ----
***************
*** 355,362 ****
                                ],
                                'normalized' => 'SSS-SSS-SSS-SSS-SSS-SSS-SSS-SSS-SSS-SSS-SSS-SSS-SSSSS'
-                             },
-                             'spaces_before_argument' => {
-                               'text' => '',
-                               'type' => 'empty_spaces_before_argument'
                              }
                            },
--- 344,347 ----
***************
*** 444,448 ****
                                            ]
                                          ],
-                                         'label' => undef,
                                          'node_argument' => {
                                            'node_content' => [
--- 429,432 ----
***************
*** 451,458 ****
                                            ],
                                            'normalized' => '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'
-                                         },
-                                         'spaces_before_argument' => {
-                                           'text' => '',
-                                           'type' => 'empty_spaces_before_argument'
                                          }
                                        },
--- 435,438 ----
***************
*** 475,485 ****
                            'cmdname' => 'footnote',
                            'contents' => [],
-                           'extra' => {
-                             'spaces_before_argument' => {
-                               'parent' => {},
-                               'text' => '',
-                               'type' => 'empty_spaces_before_argument'
-                             }
-                           },
                            'line_nr' => {},
                            'parent' => {}
--- 455,458 ----
***************
*** 633,637 ****
                ]
              ],
-             'label' => undef,
              'node_argument' => {
                'node_content' => [
--- 606,609 ----
***************
*** 640,647 ****
                ],
                'normalized' => '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'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 612,615 ----
***************
*** 742,746 ****
  $result_trees{'ref_in_multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'ref_in_multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'ref_in_multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'ref_in_multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1];
- $result_trees{'ref_in_multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'ref_in_multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'ref_in_multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'ref_in_multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'ref_in_multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'ref_in_multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1];
--- 710,713 ----
diff -Nrc2 texinfo-6.1/tp/t/results/multitable/w_in_multitable.pl texinfo-6.3/tp/t/results/multitable/w_in_multitable.pl
*** texinfo-6.1/tp/t/results/multitable/w_in_multitable.pl	2016-01-22 07:49:52.000000000 +0000
--- texinfo-6.3/tp/t/results/multitable/w_in_multitable.pl	2016-08-02 18:44:32.000000000 +0100
***************
*** 210,219 ****
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            },
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            }
--- 210,217 ----
***************
*** 286,292 ****
  $result_trees{'w_in_multitable'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'w_in_multitable'}{'contents'}[0]{'contents'}[1];
  $result_trees{'w_in_multitable'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'w_in_multitable'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'w_in_multitable'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'w_in_multitable'}{'contents'}[0]{'args'}[0];
  $result_trees{'w_in_multitable'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'w_in_multitable'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'w_in_multitable'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'parent'} = $result_trees{'w_in_multitable'}{'contents'}[0]{'args'}[0];
  $result_trees{'w_in_multitable'}{'contents'}[0]{'extra'}{'prototypes_line'}[1] = $result_trees{'w_in_multitable'}{'contents'}[0]{'args'}[0]{'contents'}[1];
  $result_trees{'w_in_multitable'}{'contents'}[0]{'extra'}{'prototypes_line'}[3] = $result_trees{'w_in_multitable'}{'contents'}[0]{'args'}[0]{'contents'}[3];
--- 284,288 ----
diff -Nrc2 texinfo-6.1/tp/t/results/paragraph/close_paragraph_command.pl texinfo-6.3/tp/t/results/paragraph/close_paragraph_command.pl
*** texinfo-6.1/tp/t/results/paragraph/close_paragraph_command.pl	2016-01-22 07:49:34.000000000 +0000
--- texinfo-6.3/tp/t/results/paragraph/close_paragraph_command.pl	2016-08-02 18:44:16.000000000 +0100
***************
*** 38,46 ****
              {}
            ]
!         ],
!         'spaces_before_argument' => {
!           'text' => '',
!           'type' => 'empty_spaces_before_argument'
!         }
        },
        'line_nr' => {
--- 38,42 ----
              {}
            ]
!         ]
        },
        'line_nr' => {
diff -Nrc2 texinfo-6.1/tp/t/results/paragraph/commands_in_flushright.pl texinfo-6.3/tp/t/results/paragraph/commands_in_flushright.pl
*** texinfo-6.1/tp/t/results/paragraph/commands_in_flushright.pl	2016-01-22 07:49:35.000000000 +0000
--- texinfo-6.3/tp/t/results/paragraph/commands_in_flushright.pl	2016-08-02 18:44:16.000000000 +0100
***************
*** 372,375 ****
--- 372,381 ----
                  {
                    'cmdname' => 'emph',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 17,
+                     'macro' => ''
+                   },
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 568,576 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 17,
!             'macro' => ''
!           },
            'parent' => {}
          },
--- 574,578 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {}
          },
***************
*** 901,904 ****
--- 903,907 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 966,975 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 969,973 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 1578,1581 ****
--- 1576,1580 ----
  $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[8]{'extra'}{'end_command'} = $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
  $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[8]{'extra'}{'spaces_after_command'} = $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
+ $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[8]{'parent'} = $result_trees{'commands_in_flushright'}{'contents'}[0];
  $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[9]{'parent'} = $result_trees{'commands_in_flushright'}{'contents'}[0];
***************
*** 1640,1643 ****
--- 1639,1643 ----
  $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[12]{'args'}[0];
  $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[12];
+ $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[12]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[12]{'args'}[1];
  $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[12]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[12]{'args'}[1];
  $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[12]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[12]{'args'}[1];
***************
*** 1651,1655 ****
  $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[12]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[12]{'contents'}[3];
  $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[12]{'contents'}[3]{'extra'}{'float'} = $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[12];
- $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[12]{'contents'}[3]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[12]{'contents'}[3]{'args'}[0];
  $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[12]{'contents'}[3]{'parent'} = $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[12];
  $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[12]{'contents'}[4]{'parent'} = $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[12];
--- 1651,1654 ----
***************
*** 1866,1874 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 1865,1869 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
diff -Nrc2 texinfo-6.1/tp/t/results/paragraph/double_style_paragraph.pl texinfo-6.3/tp/t/results/paragraph/double_style_paragraph.pl
*** texinfo-6.1/tp/t/results/paragraph/double_style_paragraph.pl	2016-01-22 07:49:35.000000000 +0000
--- texinfo-6.3/tp/t/results/paragraph/double_style_paragraph.pl	2016-08-02 18:44:16.000000000 +0100
***************
*** 119,137 ****
  $result_errors{'double_style_paragraph'} = [
    {
!     'error_line' => ':1: @strong missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@strong missing close brace',
      'type' => 'error'
    },
    {
!     'error_line' => ':1: @emph missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@emph missing close brace',
      'type' => 'error'
    },
--- 119,137 ----
  $result_errors{'double_style_paragraph'} = [
    {
!     'error_line' => ':1: @strong missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@strong missing closing brace',
      'type' => 'error'
    },
    {
!     'error_line' => ':1: @emph missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@emph missing closing brace',
      'type' => 'error'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/paragraph/image_in_paragraph.pl texinfo-6.3/tp/t/results/paragraph/image_in_paragraph.pl
*** texinfo-6.1/tp/t/results/paragraph/image_in_paragraph.pl	2016-01-22 07:49:34.000000000 +0000
--- texinfo-6.3/tp/t/results/paragraph/image_in_paragraph.pl	2016-08-02 18:44:16.000000000 +0100
***************
*** 86,94 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 86,90 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
diff -Nrc2 texinfo-6.1/tp/t/results/paragraph/no_paragraph_commands.pl texinfo-6.3/tp/t/results/paragraph/no_paragraph_commands.pl
*** texinfo-6.1/tp/t/results/paragraph/no_paragraph_commands.pl	2016-01-22 07:49:34.000000000 +0000
--- texinfo-6.3/tp/t/results/paragraph/no_paragraph_commands.pl	2016-08-02 18:44:16.000000000 +0100
***************
*** 37,45 ****
              {}
            ]
!         ],
!         'spaces_before_argument' => {
!           'text' => '',
!           'type' => 'empty_spaces_before_argument'
!         }
        },
        'line_nr' => {
--- 37,41 ----
              {}
            ]
!         ]
        },
        'line_nr' => {
***************
*** 127,135 ****
              {}
            ]
!         ],
!         'spaces_before_argument' => {
!           'text' => '',
!           'type' => 'empty_spaces_before_argument'
!         }
        },
        'line_nr' => {
--- 123,127 ----
              {}
            ]
!         ]
        },
        'line_nr' => {
diff -Nrc2 texinfo-6.1/tp/t/results/paragraph/paragraph_command.pl texinfo-6.3/tp/t/results/paragraph/paragraph_command.pl
*** texinfo-6.1/tp/t/results/paragraph/paragraph_command.pl	2016-01-22 07:49:34.000000000 +0000
--- texinfo-6.3/tp/t/results/paragraph/paragraph_command.pl	2016-08-02 18:44:16.000000000 +0100
***************
*** 129,137 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 129,133 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 179,187 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 175,179 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 316,326 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {
              'file_name' => '',
--- 308,311 ----
***************
*** 395,399 ****
  $result_trees{'paragraph_command'}{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'paragraph_command'}{'contents'}[13]{'contents'}[0]{'args'}[0];
  $result_trees{'paragraph_command'}{'contents'}[13]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'paragraph_command'}{'contents'}[13]{'contents'}[0];
- $result_trees{'paragraph_command'}{'contents'}[13]{'contents'}[0]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'paragraph_command'}{'contents'}[13]{'contents'}[0]{'args'}[0];
  $result_trees{'paragraph_command'}{'contents'}[13]{'contents'}[0]{'parent'} = $result_trees{'paragraph_command'}{'contents'}[13];
  $result_trees{'paragraph_command'}{'contents'}[13]{'contents'}[1]{'parent'} = $result_trees{'paragraph_command'}{'contents'}[13];
--- 380,383 ----
diff -Nrc2 texinfo-6.1/tp/t/results/paragraph/paragraph_in_style_command.pl texinfo-6.3/tp/t/results/paragraph/paragraph_in_style_command.pl
*** texinfo-6.1/tp/t/results/paragraph/paragraph_in_style_command.pl	2016-01-22 07:49:35.000000000 +0000
--- texinfo-6.3/tp/t/results/paragraph/paragraph_in_style_command.pl	2016-08-02 18:44:16.000000000 +0100
***************
*** 180,189 ****
  $result_errors{'paragraph_in_style_command'} = [
    {
!     'error_line' => ':1: @samp missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@samp missing close brace',
      'type' => 'error'
    },
--- 180,189 ----
  $result_errors{'paragraph_in_style_command'} = [
    {
!     'error_line' => ':1: @samp missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@samp missing closing brace',
      'type' => 'error'
    },
***************
*** 198,207 ****
    },
    {
!     'error_line' => ':5: @samp missing close brace
  ',
      'file_name' => '',
      'line_nr' => 5,
      'macro' => '',
!     'text' => '@samp missing close brace',
      'type' => 'error'
    },
--- 198,207 ----
    },
    {
!     'error_line' => ':5: @samp missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 5,
      'macro' => '',
!     'text' => '@samp missing closing brace',
      'type' => 'error'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/U_with_utf8_enable_encoding.pl texinfo-6.3/tp/t/results/plaintext_tests/U_with_utf8_enable_encoding.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/U_with_utf8_enable_encoding.pl	2016-01-22 07:50:30.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/U_with_utf8_enable_encoding.pl	2016-08-02 18:45:08.000000000 +0100
***************
*** 71,79 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 71,75 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/accents_in_var_enable_encoding.pl texinfo-6.3/tp/t/results/plaintext_tests/accents_in_var_enable_encoding.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/accents_in_var_enable_encoding.pl	2016-01-22 07:50:30.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/accents_in_var_enable_encoding.pl	2016-08-02 18:45:08.000000000 +0100
***************
*** 79,82 ****
--- 79,88 ----
                    ],
                    'cmdname' => ',',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 3,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 100,108 ****
                    'cmdname' => 'u',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 3,
!                     'macro' => ''
!                   },
                    'parent' => {}
                  },
--- 106,110 ----
                    'cmdname' => 'u',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 125,128 ****
--- 127,132 ----
                    ],
                    'cmdname' => '`',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 164,174 ****
  $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0];
  $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0];
  $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0];
  $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5];
  $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0];
  $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0];
! $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'line_nr'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[3]{'line_nr'};
  $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2];
  $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2];
--- 168,180 ----
  $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[3];
+ $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0];
  $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0];
  $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0];
  $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5];
+ $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0];
  $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0];
! $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'line_nr'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2];
  $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2];
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/anchor_and_empty_lines.pl texinfo-6.3/tp/t/results/plaintext_tests/anchor_and_empty_lines.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/anchor_and_empty_lines.pl	2016-01-22 07:50:30.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/anchor_and_empty_lines.pl	2016-08-02 18:45:08.000000000 +0100
***************
*** 49,57 ****
            {}
          ],
!         'normalized' => 'in-anchor',
!         'spaces_before_argument' => {
!           'text' => '',
!           'type' => 'empty_spaces_before_argument'
!         }
        },
        'line_nr' => {
--- 49,53 ----
            {}
          ],
!         'normalized' => 'in-anchor'
        },
        'line_nr' => {
***************
*** 63,66 ****
--- 59,63 ----
      },
      {
+       'parent' => {},
        'text' => '
  ',
***************
*** 95,98 ****
--- 92,96 ----
  $result_trees{'anchor_and_empty_lines'}{'contents'}[2]{'extra'}{'node_content'}[0] = $result_trees{'anchor_and_empty_lines'}{'contents'}[2]{'args'}[0]{'contents'}[0];
  $result_trees{'anchor_and_empty_lines'}{'contents'}[2]{'parent'} = $result_trees{'anchor_and_empty_lines'};
+ $result_trees{'anchor_and_empty_lines'}{'contents'}[3]{'parent'} = $result_trees{'anchor_and_empty_lines'};
  $result_trees{'anchor_and_empty_lines'}{'contents'}[4]{'parent'} = $result_trees{'anchor_and_empty_lines'};
  $result_trees{'anchor_and_empty_lines'}{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'anchor_and_empty_lines'}{'contents'}[5];
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl texinfo-6.3/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl	2016-01-22 07:50:31.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl	2016-08-02 18:45:09.000000000 +0100
***************
*** 49,52 ****
--- 49,57 ----
                'cmdname' => 'TeX',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 3,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 106,109 ****
--- 111,115 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 128,137 ****
                      {}
                    ]
!                 ],
!                 'normalized' => 'ABC',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 134,138 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 171,181 ****
                      {}
                    ]
!                 ],
!                 'explanation_contents' => [],
!                 'normalized' => 'ABC',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 172,176 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 210,213 ****
--- 205,209 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 232,240 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 228,232 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 280,287 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 272,275 ----
***************
*** 323,333 ****
                'cmdname' => 'footnote',
                'contents' => [],
-               'extra' => {
-                 'spaces_before_argument' => {
-                   'parent' => {},
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
-                 }
-               },
                'line_nr' => {
                  'file_name' => '',
--- 311,314 ----
***************
*** 502,510 ****
                    {}
                  ],
!                 'normalized' => 'anchor',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 483,487 ----
                    {}
                  ],
!                 'normalized' => 'anchor'
                },
                'line_nr' => {
***************
*** 562,566 ****
                    'index_at_command' => 'cindex',
                    'index_name' => 'cp',
-                   'index_prefix' => 'c',
                    'index_type_command' => 'cindex',
                    'key' => 'index',
--- 539,542 ----
***************
*** 655,658 ****
--- 631,635 ----
  $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[10];
+ $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[10]{'args'}[1];
  $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[10]{'args'}[1];
  $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[10]{'args'}[1]{'parent'} = $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[10];
***************
*** 665,669 ****
  $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[13];
  $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[13]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[13]{'args'}[0]{'contents'}[0];
- $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[13]{'extra'}{'explanation_contents'} = $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[10]{'extra'}{'brace_command_contents'}[1];
  $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[13]{'parent'} = $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1];
  $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[14]{'parent'} = $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1];
--- 642,645 ----
***************
*** 671,674 ****
--- 647,651 ----
  $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[16];
+ $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[16]{'args'}[1];
  $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[16]{'args'}[1];
  $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[16]{'args'}[1]{'parent'} = $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[16];
***************
*** 688,692 ****
  $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[22]{'args'}[0];
  $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[22]{'args'}[0]{'parent'} = $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[22];
- $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[22]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[22]{'args'}[0];
  $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[22]{'parent'} = $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1];
  $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[23]{'parent'} = $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1];
--- 665,668 ----
***************
*** 788,797 ****
  $result_errors{'at_commands_glued_in_example'} = [
    {
!     'error_line' => ':15: warning: @cindex should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 15,
      'macro' => '',
!     'text' => '@cindex should only appear at a line beginning',
      'type' => 'warning'
    },
--- 764,773 ----
  $result_errors{'at_commands_glued_in_example'} = [
    {
!     'error_line' => ':15: warning: @cindex should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 15,
      'macro' => '',
!     'text' => '@cindex should only appear at the beginning of a line',
      'type' => 'warning'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl texinfo-6.3/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl	2016-01-22 07:50:31.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl	2016-08-02 18:45:09.000000000 +0100
***************
*** 37,40 ****
--- 37,45 ----
            'cmdname' => 'TeX',
            'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 2,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 94,97 ****
--- 99,103 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 116,125 ****
                  {}
                ]
!             ],
!             'normalized' => 'ABC',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 122,126 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 159,169 ****
                  {}
                ]
!             ],
!             'explanation_contents' => [],
!             'normalized' => 'ABC',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 160,164 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 198,201 ****
--- 193,197 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 220,228 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 216,220 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 268,275 ****
                ],
                'normalized' => 'Top'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 260,263 ----
***************
*** 311,321 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {
              'file_name' => '',
--- 299,302 ----
***************
*** 496,504 ****
                {}
              ],
!             'normalized' => 'anchor',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 477,481 ----
                {}
              ],
!             'normalized' => 'anchor'
            },
            'line_nr' => {
***************
*** 556,560 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'index',
--- 533,536 ----
***************
*** 594,597 ****
--- 570,574 ----
  $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[10]{'args'}[0];
  $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[10];
+ $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[10]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[10]{'args'}[1];
  $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[10]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[10]{'args'}[1];
  $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[10]{'args'}[1]{'parent'} = $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[10];
***************
*** 604,608 ****
  $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[13];
  $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[13]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0];
- $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[13]{'extra'}{'explanation_contents'} = $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[10]{'extra'}{'brace_command_contents'}[1];
  $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0];
  $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0];
--- 581,584 ----
***************
*** 610,613 ****
--- 586,590 ----
  $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[16]{'args'}[0];
  $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[16];
+ $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[16]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[16]{'args'}[1];
  $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[16]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[16]{'args'}[1];
  $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[16]{'args'}[1]{'parent'} = $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[16];
***************
*** 627,631 ****
  $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[22]{'args'}[0];
  $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[22]{'args'}[0]{'parent'} = $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[22];
- $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[22]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[22]{'args'}[0];
  $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[22]{'parent'} = $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0];
  $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[23]{'parent'} = $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0];
--- 604,607 ----
***************
*** 715,724 ****
  $result_errors{'at_commands_glued_in_paragraph'} = [
    {
!     'error_line' => ':14: warning: @cindex should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 14,
      'macro' => '',
!     'text' => '@cindex should only appear at a line beginning',
      'type' => 'warning'
    },
--- 691,700 ----
  $result_errors{'at_commands_glued_in_paragraph'} = [
    {
!     'error_line' => ':14: warning: @cindex should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 14,
      'macro' => '',
!     'text' => '@cindex should only appear at the beginning of a line',
      'type' => 'warning'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/before_accent_punctuation.pl texinfo-6.3/tp/t/results/plaintext_tests/before_accent_punctuation.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/before_accent_punctuation.pl	2016-01-22 07:50:30.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/before_accent_punctuation.pl	2016-08-02 18:45:08.000000000 +0100
***************
*** 28,31 ****
--- 28,37 ----
            ],
            'cmdname' => '^',
+           'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 1,
+             'macro' => ''
+           },
            'parent' => {}
          }
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl texinfo-6.3/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl	2016-01-22 07:50:30.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl	2016-08-02 18:45:08.000000000 +0100
***************
*** 198,201 ****
--- 198,207 ----
                    ],
                    'cmdname' => ',',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 6,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 219,227 ****
                    'cmdname' => 'u',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 6,
!                     'macro' => ''
!                   },
                    'parent' => {}
                  },
--- 225,229 ----
                    'cmdname' => 'u',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 244,247 ****
--- 246,251 ----
                    ],
                    'cmdname' => '`',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 260,263 ****
--- 264,268 ----
                    'cmdname' => 'aa',
                    'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 355,365 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {
              'file_name' => '',
--- 360,363 ----
***************
*** 418,431 ****
  $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0];
  $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0];
  $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0];
  $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[5];
  $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0];
  $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0];
  $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[7];
  $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0];
  $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0];
! $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'line_nr'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[3]{'line_nr'};
  $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4];
  $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4];
--- 416,432 ----
  $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[3];
+ $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0];
  $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0];
  $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0];
  $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[5];
+ $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0];
  $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0];
  $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[7];
+ $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0];
  $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0];
! $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'line_nr'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4];
  $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4];
***************
*** 443,447 ****
  $result_trees{'characters_and_commands_in_var'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[6]{'contents'}[1]{'args'}[0];
  $result_trees{'characters_and_commands_in_var'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[6]{'contents'}[1];
- $result_trees{'characters_and_commands_in_var'}{'contents'}[6]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[6]{'contents'}[1]{'args'}[0];
  $result_trees{'characters_and_commands_in_var'}{'contents'}[6]{'contents'}[1]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[6];
  $result_trees{'characters_and_commands_in_var'}{'contents'}[6]{'contents'}[2]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[6];
--- 444,447 ----
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl texinfo-6.3/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl	2016-01-22 07:50:31.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl	2016-08-02 18:45:09.000000000 +0100
***************
*** 15,18 ****
--- 15,19 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => '\\input texinfo
  ',
***************
*** 416,419 ****
--- 417,421 ----
    'type' => 'document_root'
  };
+ $result_trees{'chinese_mixed_with_en'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'chinese_mixed_with_en'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
  $result_trees{'chinese_mixed_with_en'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'chinese_mixed_with_en'}{'contents'}[0]{'contents'}[0];
  $result_trees{'chinese_mixed_with_en'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'chinese_mixed_with_en'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/command_brace_no_arg_punctuation.pl texinfo-6.3/tp/t/results/plaintext_tests/command_brace_no_arg_punctuation.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/command_brace_no_arg_punctuation.pl	2016-01-22 07:50:30.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/command_brace_no_arg_punctuation.pl	2016-08-02 18:45:08.000000000 +0100
***************
*** 20,23 ****
--- 20,28 ----
            'cmdname' => 'TeX',
            'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 1,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 36,39 ****
--- 41,45 ----
            'cmdname' => 'LaTeX',
            'contents' => [],
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 52,55 ****
--- 58,62 ----
            'cmdname' => 'copyright',
            'contents' => [],
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 68,71 ****
--- 75,79 ----
            'cmdname' => 'registeredsymbol',
            'contents' => [],
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 86,95 ****
--- 94,106 ----
  $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0];
  $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[2];
+ $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0];
  $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0];
  $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[4];
+ $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0];
  $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0];
  $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[6];
+ $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[6]{'parent'} = $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0];
  $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/commands_and_punctuation.pl texinfo-6.3/tp/t/results/plaintext_tests/commands_and_punctuation.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/commands_and_punctuation.pl	2016-01-22 07:50:30.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/commands_and_punctuation.pl	2016-08-02 18:45:08.000000000 +0100
***************
*** 40,43 ****
--- 40,48 ----
            'cmdname' => 'dots',
            'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 1,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 56,59 ****
--- 61,65 ----
            'cmdname' => 'enddots',
            'contents' => [],
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 78,81 ****
--- 84,88 ----
  $result_trees{'commands_and_punctuation'}{'contents'}[0]{'contents'}[6]{'parent'} = $result_trees{'commands_and_punctuation'}{'contents'}[0];
  $result_trees{'commands_and_punctuation'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'commands_and_punctuation'}{'contents'}[0]{'contents'}[7];
+ $result_trees{'commands_and_punctuation'}{'contents'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'commands_and_punctuation'}{'contents'}[0]{'contents'}[5]{'line_nr'};
  $result_trees{'commands_and_punctuation'}{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'commands_and_punctuation'}{'contents'}[0];
  $result_trees{'commands_and_punctuation'}{'contents'}[0]{'contents'}[8]{'parent'} = $result_trees{'commands_and_punctuation'}{'contents'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl texinfo-6.3/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl	2016-01-22 07:50:30.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl	2016-08-02 18:45:08.000000000 +0100
***************
*** 123,133 ****
                  'max_columns' => 0,
                  'prototypes' => [],
-                 'prototypes_line' => [
-                   {
-                     'text' => '
- ',
-                     'type' => 'prototype_space'
-                   }
-                 ],
                  'spaces_after_command' => {}
                },
--- 123,126 ----
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/invalid_accent_punctuation.pl texinfo-6.3/tp/t/results/plaintext_tests/invalid_accent_punctuation.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/invalid_accent_punctuation.pl	2016-01-22 07:50:30.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/invalid_accent_punctuation.pl	2016-08-02 18:45:08.000000000 +0100
***************
*** 17,20 ****
--- 17,25 ----
            'cmdname' => '^',
            'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 1,
+             'macro' => ''
+           },
            'parent' => {}
          },
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl texinfo-6.3/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl	2016-01-22 07:50:30.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl	2016-08-02 18:45:08.000000000 +0100
***************
*** 101,104 ****
--- 101,105 ----
                  {
                    'cmdname' => 'bullet',
+                   'contents' => [],
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 238,241 ****
--- 239,243 ----
                  {
                    'cmdname' => 'bullet',
+                   'contents' => [],
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 381,384 ****
--- 383,387 ----
                  {
                    'cmdname' => 'bullet',
+                   'contents' => [],
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 552,555 ****
--- 555,559 ----
                  {
                    'cmdname' => 'bullet',
+                   'contents' => [],
                    'parent' => {},
                    'type' => 'command_as_argument'
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/japanese_utf8.pl texinfo-6.3/tp/t/results/plaintext_tests/japanese_utf8.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/japanese_utf8.pl	2016-01-22 07:50:31.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/japanese_utf8.pl	2016-08-02 18:45:09.000000000 +0100
***************
*** 15,18 ****
--- 15,19 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => '\\input texinfo @c -*- coding: utf-8; mode: texinfo; -*-
  ',
***************
*** 315,318 ****
--- 316,324 ----
                    'cmdname' => 'copyright',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => 'japanese_utf8.texi',
+                     'line_nr' => 12,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 956,959 ****
--- 962,966 ----
    'type' => 'document_root'
  };
+ $result_trees{'japanese_utf8'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'japanese_utf8'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
  $result_trees{'japanese_utf8'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'japanese_utf8'}{'contents'}[0]{'contents'}[0];
  $result_trees{'japanese_utf8'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'japanese_utf8'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/lone_braces_in_inlineraw.pl texinfo-6.3/tp/t/results/plaintext_tests/lone_braces_in_inlineraw.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/lone_braces_in_inlineraw.pl	2016-01-22 07:50:30.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/lone_braces_in_inlineraw.pl	2016-08-02 18:45:08.000000000 +0100
***************
*** 25,28 ****
--- 25,29 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 59,67 ****
                ]
              ],
!             'format' => 'plaintext',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 60,65 ----
                ]
              ],
!             'expand_index' => 1,
!             'format' => 'plaintext'
            },
            'line_nr' => {},
***************
*** 82,85 ****
--- 80,84 ----
  $result_trees{'lone_braces_in_inlineraw'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'lone_braces_in_inlineraw'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'lone_braces_in_inlineraw'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'lone_braces_in_inlineraw'}{'contents'}[0]{'contents'}[0];
+ $result_trees{'lone_braces_in_inlineraw'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'lone_braces_in_inlineraw'}{'contents'}[0]{'contents'}[0]{'args'}[1];
  $result_trees{'lone_braces_in_inlineraw'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'lone_braces_in_inlineraw'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1];
  $result_trees{'lone_braces_in_inlineraw'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'lone_braces_in_inlineraw'}{'contents'}[0]{'contents'}[0]{'args'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/long_uref_after_item.pl texinfo-6.3/tp/t/results/plaintext_tests/long_uref_after_item.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/long_uref_after_item.pl	2016-01-22 07:50:30.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/long_uref_after_item.pl	2016-08-02 18:45:08.000000000 +0100
***************
*** 54,62 ****
                          {}
                        ]
!                     ],
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {
--- 54,58 ----
                          {}
                        ]
!                     ]
                    },
                    'line_nr' => {
***************
*** 135,138 ****
--- 131,135 ----
              {
                'cmdname' => 'bullet',
+               'contents' => [],
                'parent' => {},
                'type' => 'command_as_argument'
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/multiline_image_and_align.pl texinfo-6.3/tp/t/results/plaintext_tests/multiline_image_and_align.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/multiline_image_and_align.pl	2016-01-22 07:50:30.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/multiline_image_and_align.pl	2016-08-02 18:45:08.000000000 +0100
***************
*** 40,48 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 40,44 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 116,124 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 112,116 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 193,201 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 185,189 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 270,278 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 258,262 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 355,363 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 339,343 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 409,417 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 389,393 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 446,454 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 422,426 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 497,505 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 469,473 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/multitable.pl texinfo-6.3/tp/t/results/plaintext_tests/multitable.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/multitable.pl	2016-01-22 07:50:30.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/multitable.pl	2016-08-02 18:45:08.000000000 +0100
***************
*** 254,283 ****
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            },
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            }
          ],
-         'prototypes_line' => [
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => '    ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => '
- ',
-             'type' => 'prototype_space'
-           }
-         ],
          'spaces_after_command' => {}
        },
--- 254,264 ----
***************
*** 1411,1440 ****
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            },
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            }
          ],
-         'prototypes_line' => [
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => '    ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => '
- ',
-             'type' => 'prototype_space'
-           }
-         ],
          'spaces_after_command' => {}
        },
--- 1392,1402 ----
***************
*** 1770,1799 ****
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            },
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            }
          ],
-         'prototypes_line' => [
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => '
- ',
-             'type' => 'prototype_space'
-           }
-         ],
          'spaces_after_command' => {}
        },
--- 1732,1742 ----
***************
*** 1990,2009 ****
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            }
          ],
-         'prototypes_line' => [
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => '
- ',
-             'type' => 'prototype_space'
-           }
-         ],
          'spaces_after_command' => {}
        },
--- 1933,1939 ----
***************
*** 2287,2316 ****
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            },
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            }
          ],
-         'prototypes_line' => [
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => '
- ',
-             'type' => 'prototype_space'
-           }
-         ],
          'spaces_after_command' => {}
        },
--- 2217,2227 ----
***************
*** 2373,2381 ****
  $result_trees{'multitable'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'multitable'}{'contents'}[0]{'contents'}[1];
  $result_trees{'multitable'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'multitable'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'multitable'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[0]{'args'}[0];
  $result_trees{'multitable'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'multitable'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'multitable'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[0]{'args'}[0];
- $result_trees{'multitable'}{'contents'}[0]{'extra'}{'prototypes_line'}[1] = $result_trees{'multitable'}{'contents'}[0]{'args'}[0]{'contents'}[1];
- $result_trees{'multitable'}{'contents'}[0]{'extra'}{'prototypes_line'}[3] = $result_trees{'multitable'}{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'multitable'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'multitable'}{'contents'}[0]{'args'}[0]{'contents'}[0];
  $result_trees{'multitable'}{'contents'}[0]{'parent'} = $result_trees{'multitable'};
--- 2284,2288 ----
***************
*** 2598,2606 ****
  $result_trees{'multitable'}{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[2];
  $result_trees{'multitable'}{'contents'}[2]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'multitable'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'multitable'}{'contents'}[2]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'args'}[0];
  $result_trees{'multitable'}{'contents'}[2]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'multitable'}{'contents'}[2]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'multitable'}{'contents'}[2]{'extra'}{'prototypes'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'args'}[0];
- $result_trees{'multitable'}{'contents'}[2]{'extra'}{'prototypes_line'}[1] = $result_trees{'multitable'}{'contents'}[2]{'args'}[0]{'contents'}[1];
- $result_trees{'multitable'}{'contents'}[2]{'extra'}{'prototypes_line'}[3] = $result_trees{'multitable'}{'contents'}[2]{'args'}[0]{'contents'}[3];
  $result_trees{'multitable'}{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'multitable'}{'contents'}[2]{'args'}[0]{'contents'}[0];
  $result_trees{'multitable'}{'contents'}[2]{'parent'} = $result_trees{'multitable'};
--- 2505,2509 ----
***************
*** 2668,2676 ****
  $result_trees{'multitable'}{'contents'}[4]{'extra'}{'end_command'} = $result_trees{'multitable'}{'contents'}[4]{'contents'}[1];
  $result_trees{'multitable'}{'contents'}[4]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'multitable'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'multitable'}{'contents'}[4]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[4]{'args'}[0];
  $result_trees{'multitable'}{'contents'}[4]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'multitable'}{'contents'}[4]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'multitable'}{'contents'}[4]{'extra'}{'prototypes'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[4]{'args'}[0];
- $result_trees{'multitable'}{'contents'}[4]{'extra'}{'prototypes_line'}[1] = $result_trees{'multitable'}{'contents'}[4]{'args'}[0]{'contents'}[1];
- $result_trees{'multitable'}{'contents'}[4]{'extra'}{'prototypes_line'}[3] = $result_trees{'multitable'}{'contents'}[4]{'args'}[0]{'contents'}[3];
  $result_trees{'multitable'}{'contents'}[4]{'extra'}{'spaces_after_command'} = $result_trees{'multitable'}{'contents'}[4]{'args'}[0]{'contents'}[0];
  $result_trees{'multitable'}{'contents'}[4]{'parent'} = $result_trees{'multitable'};
--- 2571,2575 ----
***************
*** 2708,2713 ****
  $result_trees{'multitable'}{'contents'}[6]{'extra'}{'end_command'} = $result_trees{'multitable'}{'contents'}[6]{'contents'}[1];
  $result_trees{'multitable'}{'contents'}[6]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'multitable'}{'contents'}[6]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'multitable'}{'contents'}[6]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[6]{'args'}[0];
- $result_trees{'multitable'}{'contents'}[6]{'extra'}{'prototypes_line'}[1] = $result_trees{'multitable'}{'contents'}[6]{'args'}[0]{'contents'}[1];
  $result_trees{'multitable'}{'contents'}[6]{'extra'}{'spaces_after_command'} = $result_trees{'multitable'}{'contents'}[6]{'args'}[0]{'contents'}[0];
  $result_trees{'multitable'}{'contents'}[6]{'parent'} = $result_trees{'multitable'};
--- 2607,2610 ----
***************
*** 2761,2769 ****
  $result_trees{'multitable'}{'contents'}[8]{'extra'}{'end_command'} = $result_trees{'multitable'}{'contents'}[8]{'contents'}[1];
  $result_trees{'multitable'}{'contents'}[8]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'multitable'}{'contents'}[8]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'multitable'}{'contents'}[8]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[8]{'args'}[0];
  $result_trees{'multitable'}{'contents'}[8]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'multitable'}{'contents'}[8]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'multitable'}{'contents'}[8]{'extra'}{'prototypes'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[8]{'args'}[0];
- $result_trees{'multitable'}{'contents'}[8]{'extra'}{'prototypes_line'}[1] = $result_trees{'multitable'}{'contents'}[8]{'args'}[0]{'contents'}[1];
- $result_trees{'multitable'}{'contents'}[8]{'extra'}{'prototypes_line'}[3] = $result_trees{'multitable'}{'contents'}[8]{'args'}[0]{'contents'}[3];
  $result_trees{'multitable'}{'contents'}[8]{'extra'}{'spaces_after_command'} = $result_trees{'multitable'}{'contents'}[8]{'args'}[0]{'contents'}[0];
  $result_trees{'multitable'}{'contents'}[8]{'parent'} = $result_trees{'multitable'};
--- 2658,2662 ----
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl texinfo-6.3/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl	2016-01-22 07:50:30.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl	2016-08-02 18:45:08.000000000 +0100
***************
*** 207,225 ****
                }
              ],
-             'prototypes_line' => [
-               {
-                 'text' => ' ',
-                 'type' => 'prototype_space'
-               },
-               {
-                 'text' => 'a',
-                 'type' => 'row_prototype'
-               },
-               {
-                 'text' => '
- ',
-                 'type' => 'prototype_space'
-               }
-             ],
              'spaces_after_command' => {}
            },
--- 207,210 ----
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/nested_multitable.pl texinfo-6.3/tp/t/results/plaintext_tests/nested_multitable.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/nested_multitable.pl	2016-01-22 07:50:30.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/nested_multitable.pl	2016-08-02 18:45:08.000000000 +0100
***************
*** 260,289 ****
                            {
                              'contents' => [],
-                             'parent' => {},
                              'type' => 'bracketed_multitable_prototype'
                            },
                            {
                              'contents' => [],
-                             'parent' => {},
                              'type' => 'bracketed_multitable_prototype'
                            }
                          ],
-                         'prototypes_line' => [
-                           {
-                             'text' => ' ',
-                             'type' => 'prototype_space'
-                           },
-                           {},
-                           {
-                             'text' => ' ',
-                             'type' => 'prototype_space'
-                           },
-                           {},
-                           {
-                             'text' => '
- ',
-                             'type' => 'prototype_space'
-                           }
-                         ],
                          'spaces_after_command' => {}
                        },
--- 260,270 ----
***************
*** 477,506 ****
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            },
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            }
          ],
-         'prototypes_line' => [
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => '    ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => '
- ',
-             'type' => 'prototype_space'
-           }
-         ],
          'spaces_after_command' => {}
        },
--- 458,468 ----
***************
*** 563,571 ****
  $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
  $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[1]{'parent'} = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
- $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes_line'}[1] = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1];
- $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes_line'}[3] = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3];
  $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
  $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
--- 525,529 ----
***************
*** 605,613 ****
  $result_trees{'nested_multitable'}{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[1];
  $result_trees{'nested_multitable'}{'contents'}[1]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'nested_multitable'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'nested_multitable'}{'contents'}[1]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'nested_multitable'}{'contents'}[1]{'args'}[0];
  $result_trees{'nested_multitable'}{'contents'}[1]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'nested_multitable'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'nested_multitable'}{'contents'}[1]{'extra'}{'prototypes'}[1]{'parent'} = $result_trees{'nested_multitable'}{'contents'}[1]{'args'}[0];
- $result_trees{'nested_multitable'}{'contents'}[1]{'extra'}{'prototypes_line'}[1] = $result_trees{'nested_multitable'}{'contents'}[1]{'args'}[0]{'contents'}[1];
- $result_trees{'nested_multitable'}{'contents'}[1]{'extra'}{'prototypes_line'}[3] = $result_trees{'nested_multitable'}{'contents'}[1]{'args'}[0]{'contents'}[3];
  $result_trees{'nested_multitable'}{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'nested_multitable'}{'contents'}[1]{'args'}[0]{'contents'}[0];
  $result_trees{'nested_multitable'}{'contents'}[1]{'parent'} = $result_trees{'nested_multitable'};
--- 563,567 ----
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/no_empty_line_after_section.pl texinfo-6.3/tp/t/results/plaintext_tests/no_empty_line_after_section.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/no_empty_line_after_section.pl	2016-01-22 07:50:30.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/no_empty_line_after_section.pl	2016-08-02 18:45:08.000000000 +0100
***************
*** 235,243 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 235,239 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/punctuation_abbr_acronym.pl texinfo-6.3/tp/t/results/plaintext_tests/punctuation_abbr_acronym.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/punctuation_abbr_acronym.pl	2016-01-22 07:50:30.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/punctuation_abbr_acronym.pl	2016-08-02 18:45:08.000000000 +0100
***************
*** 30,39 ****
                  {}
                ]
!             ],
!             'normalized' => 'AAA',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 30,34 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 68,77 ****
                  {}
                ]
!             ],
!             'normalized' => 'BBB',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 63,67 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 102,111 ****
                  {}
                ]
!             ],
!             'normalized' => 'aaa',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 92,96 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 136,145 ****
                  {}
                ]
!             ],
!             'normalized' => 'bbb',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 121,125 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 166,169 ****
--- 146,150 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 188,197 ****
                  {}
                ]
!             ],
!             'normalized' => 'AAA',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 169,173 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 221,224 ****
--- 197,201 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 243,252 ****
                  {}
                ]
!             ],
!             'normalized' => 'BBB',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 220,224 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 272,275 ****
--- 244,248 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 294,303 ****
                  {}
                ]
!             ],
!             'normalized' => 'aaa',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 267,271 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 324,327 ****
--- 292,296 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 346,355 ****
                  {}
                ]
!             ],
!             'normalized' => 'bbb',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 315,319 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 397,400 ****
--- 361,365 ----
  $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0];
  $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[8];
+ $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[1];
  $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[1];
  $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[1]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[8];
***************
*** 405,408 ****
--- 370,374 ----
  $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[10]{'args'}[0];
  $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[10];
+ $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[10]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[10]{'args'}[1];
  $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[10]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[10]{'args'}[1];
  $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[10]{'args'}[1]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[10];
***************
*** 414,417 ****
--- 380,384 ----
  $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[12]{'args'}[0];
  $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[12];
+ $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[12]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[12]{'args'}[1];
  $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[12]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[12]{'args'}[1];
  $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[12]{'args'}[1]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[12];
***************
*** 423,426 ****
--- 390,394 ----
  $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[14]{'args'}[0];
  $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[14];
+ $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[14]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[14]{'args'}[1];
  $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[14]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[14]{'args'}[1];
  $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[14]{'args'}[1]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[14];
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/punctuation_and_code_style_commands.pl texinfo-6.3/tp/t/results/plaintext_tests/punctuation_and_code_style_commands.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/punctuation_and_code_style_commands.pl	2016-01-22 07:50:30.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/punctuation_and_code_style_commands.pl	2016-08-02 18:45:08.000000000 +0100
***************
*** 54,57 ****
--- 54,59 ----
                    ],
                    'cmdname' => '~',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 84,87 ****
--- 86,90 ----
                    'cmdname' => 'aa',
                    'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 145,148 ****
--- 148,153 ----
                    ],
                    'cmdname' => '~',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 175,178 ****
--- 180,184 ----
                    'cmdname' => 'AA',
                    'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 240,243 ****
--- 246,251 ----
                    ],
                    'cmdname' => '~',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 274,277 ****
--- 282,286 ----
                    'cmdname' => 'AA',
                    'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 304,307 ****
--- 313,317 ----
  $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+ $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[2];
***************
*** 310,313 ****
--- 320,324 ----
  $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0];
  $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
+ $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0];
  $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[4];
***************
*** 321,324 ****
--- 332,336 ----
  $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
+ $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[6]{'line_nr'};
  $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0];
  $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[8];
***************
*** 327,330 ****
--- 339,343 ----
  $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[9]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0];
  $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0];
+ $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[6]{'line_nr'};
  $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[10]{'args'}[0];
  $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[10];
***************
*** 339,342 ****
--- 352,356 ----
  $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[1];
+ $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[12]{'line_nr'};
  $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0];
  $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14];
***************
*** 346,349 ****
--- 360,364 ----
  $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[16]{'args'}[0];
  $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[16]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[16]{'args'}[0]{'contents'}[1];
+ $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[12]{'line_nr'};
  $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[16]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[16]{'args'}[0];
  $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[16];
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/punctuation_and_code_style_commands_utf8.pl texinfo-6.3/tp/t/results/plaintext_tests/punctuation_and_code_style_commands_utf8.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/punctuation_and_code_style_commands_utf8.pl	2016-01-22 07:50:30.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/punctuation_and_code_style_commands_utf8.pl	2016-08-02 18:45:08.000000000 +0100
***************
*** 95,98 ****
--- 95,100 ----
                    ],
                    'cmdname' => '~',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 125,128 ****
--- 127,131 ----
                    'cmdname' => 'aa',
                    'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 186,189 ****
--- 189,194 ----
                    ],
                    'cmdname' => '~',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 216,219 ****
--- 221,225 ----
                    'cmdname' => 'AA',
                    'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 281,284 ****
--- 287,292 ----
                    ],
                    'cmdname' => '~',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 315,318 ****
--- 323,327 ----
                    'cmdname' => 'AA',
                    'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 352,355 ****
--- 361,365 ----
  $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
+ $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[2];
***************
*** 358,361 ****
--- 368,372 ----
  $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1];
  $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
+ $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[4]{'args'}[0];
  $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[4];
***************
*** 369,372 ****
--- 380,384 ----
  $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0];
+ $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[6]{'line_nr'};
  $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0];
  $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[8];
***************
*** 375,378 ****
--- 387,391 ----
  $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[9]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1];
  $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0];
+ $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[6]{'line_nr'};
  $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[10]{'args'}[0];
  $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[10];
***************
*** 387,390 ****
--- 400,404 ----
  $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1];
+ $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[12]{'line_nr'};
  $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0];
  $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14];
***************
*** 394,397 ****
--- 408,412 ----
  $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0];
  $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1];
+ $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[12]{'line_nr'};
  $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0];
  $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[16];
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/punctuation_and_footnotes.pl texinfo-6.3/tp/t/results/plaintext_tests/punctuation_and_footnotes.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/punctuation_and_footnotes.pl	2016-01-22 07:50:31.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/punctuation_and_footnotes.pl	2016-08-02 18:45:09.000000000 +0100
***************
*** 41,51 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {
              'file_name' => '',
--- 41,44 ----
***************
*** 85,95 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {
              'file_name' => '',
--- 78,81 ----
***************
*** 124,134 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {},
            'parent' => {}
--- 110,113 ----
***************
*** 176,186 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {
              'file_name' => '',
--- 155,158 ----
***************
*** 215,225 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {},
            'parent' => {}
--- 187,190 ----
***************
*** 255,265 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {
              'file_name' => '',
--- 220,223 ----
***************
*** 315,325 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {
              'file_name' => '',
--- 273,276 ----
***************
*** 363,373 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {
              'file_name' => '',
--- 314,317 ----
***************
*** 411,421 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {
              'file_name' => '',
--- 355,358 ----
***************
*** 471,481 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {
              'file_name' => '',
--- 408,411 ----
***************
*** 519,529 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {
              'file_name' => '',
--- 449,452 ----
***************
*** 567,577 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {
              'file_name' => '',
--- 490,493 ----
***************
*** 598,602 ****
  $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[1];
- $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[1];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[1];
--- 514,517 ----
***************
*** 605,609 ****
  $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[4]{'args'}[0];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[4];
- $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[4]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[4]{'args'}[0];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[1];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[1];
--- 520,523 ----
***************
*** 611,615 ****
  $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[6]{'args'}[0];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[6];
- $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[6]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[6]{'args'}[0];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[4]{'line_nr'};
  $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[1];
--- 525,528 ----
***************
*** 621,625 ****
  $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[1];
- $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[3];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[3];
--- 534,537 ----
***************
*** 627,631 ****
  $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[3]{'args'}[0];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[3];
- $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[3]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[3]{'args'}[0];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[3]{'line_nr'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[1]{'line_nr'};
  $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[3];
--- 539,542 ----
***************
*** 635,639 ****
  $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[6]{'args'}[0];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[6];
- $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[6]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[6]{'args'}[0];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[6]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[3];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[7]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[3];
--- 546,549 ----
***************
*** 645,649 ****
  $result_trees{'punctuation_and_footnotes'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[5]{'contents'}[2]{'args'}[0];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[5]{'contents'}[2];
- $result_trees{'punctuation_and_footnotes'}{'contents'}[5]{'contents'}[2]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[5]{'contents'}[2]{'args'}[0];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[5]{'contents'}[2]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[5];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[5]{'contents'}[3]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[5];
--- 555,558 ----
***************
*** 653,657 ****
  $result_trees{'punctuation_and_footnotes'}{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[5]{'contents'}[6]{'args'}[0];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[5]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[5]{'contents'}[6];
- $result_trees{'punctuation_and_footnotes'}{'contents'}[5]{'contents'}[6]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[5]{'contents'}[6]{'args'}[0];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[5]{'contents'}[6]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[5];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[5]{'contents'}[7]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[5];
--- 562,565 ----
***************
*** 661,665 ****
  $result_trees{'punctuation_and_footnotes'}{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[5]{'contents'}[10]{'args'}[0];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[5]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[5]{'contents'}[10];
- $result_trees{'punctuation_and_footnotes'}{'contents'}[5]{'contents'}[10]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[5]{'contents'}[10]{'args'}[0];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[5]{'contents'}[10]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[5];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[5]{'contents'}[11]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[5];
--- 569,572 ----
***************
*** 671,675 ****
  $result_trees{'punctuation_and_footnotes'}{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[7]{'contents'}[2]{'args'}[0];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[7]{'contents'}[2];
- $result_trees{'punctuation_and_footnotes'}{'contents'}[7]{'contents'}[2]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[7]{'contents'}[2]{'args'}[0];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[7]{'contents'}[2]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[7];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[7]{'contents'}[3]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[7];
--- 578,581 ----
***************
*** 679,683 ****
  $result_trees{'punctuation_and_footnotes'}{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[7]{'contents'}[6]{'args'}[0];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[7]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[7]{'contents'}[6];
- $result_trees{'punctuation_and_footnotes'}{'contents'}[7]{'contents'}[6]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[7]{'contents'}[6]{'args'}[0];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[7]{'contents'}[6]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[7];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[7]{'contents'}[7]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[7];
--- 585,588 ----
***************
*** 687,691 ****
  $result_trees{'punctuation_and_footnotes'}{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[7]{'contents'}[10]{'args'}[0];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[7]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[7]{'contents'}[10];
- $result_trees{'punctuation_and_footnotes'}{'contents'}[7]{'contents'}[10]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[7]{'contents'}[10]{'args'}[0];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[7]{'contents'}[10]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[7];
  $result_trees{'punctuation_and_footnotes'}{'contents'}[7]{'contents'}[11]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[7];
--- 592,595 ----
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/punctuation_and_footnotes_frenchspacing.pl texinfo-6.3/tp/t/results/plaintext_tests/punctuation_and_footnotes_frenchspacing.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/punctuation_and_footnotes_frenchspacing.pl	2016-01-22 07:50:31.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/punctuation_and_footnotes_frenchspacing.pl	2016-08-02 18:45:09.000000000 +0100
***************
*** 82,92 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {
              'file_name' => '',
--- 82,85 ----
***************
*** 126,136 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {
              'file_name' => '',
--- 119,122 ----
***************
*** 165,175 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {},
            'parent' => {}
--- 151,154 ----
***************
*** 217,227 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {
              'file_name' => '',
--- 196,199 ----
***************
*** 256,266 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {},
            'parent' => {}
--- 228,231 ----
***************
*** 296,306 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {
              'file_name' => '',
--- 261,264 ----
***************
*** 356,366 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {
              'file_name' => '',
--- 314,317 ----
***************
*** 404,414 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {
              'file_name' => '',
--- 355,358 ----
***************
*** 452,462 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {
              'file_name' => '',
--- 396,399 ----
***************
*** 512,522 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {
              'file_name' => '',
--- 449,452 ----
***************
*** 560,570 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {
              'file_name' => '',
--- 490,493 ----
***************
*** 608,618 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {
              'file_name' => '',
--- 531,534 ----
***************
*** 646,650 ****
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[1]{'args'}[0];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[1];
- $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[1]{'args'}[0];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2];
--- 562,565 ----
***************
*** 653,657 ****
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[4]{'args'}[0];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[4];
- $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[4]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[4]{'args'}[0];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[4]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[5]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2];
--- 568,571 ----
***************
*** 659,663 ****
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[6]{'args'}[0];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[6];
- $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[6]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[6]{'args'}[0];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[6]{'line_nr'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[4]{'line_nr'};
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[6]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2];
--- 573,576 ----
***************
*** 669,673 ****
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[1]{'args'}[0];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[1];
- $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[1]{'args'}[0];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[2]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4];
--- 582,585 ----
***************
*** 675,679 ****
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[3]{'args'}[0];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[3];
- $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[3]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[3]{'args'}[0];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[3]{'line_nr'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[1]{'line_nr'};
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[3]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4];
--- 587,590 ----
***************
*** 683,687 ****
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[6]{'args'}[0];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[6];
- $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[6]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[6]{'args'}[0];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[6]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[7]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4];
--- 594,597 ----
***************
*** 693,697 ****
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[6]{'contents'}[2]{'args'}[0];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[6]{'contents'}[2];
- $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[6]{'contents'}[2]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[6]{'contents'}[2]{'args'}[0];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[6]{'contents'}[2]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[6];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[6]{'contents'}[3]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[6];
--- 603,606 ----
***************
*** 701,705 ****
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[6]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[6]{'contents'}[6]{'args'}[0];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[6]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[6]{'contents'}[6];
- $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[6]{'contents'}[6]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[6]{'contents'}[6]{'args'}[0];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[6]{'contents'}[6]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[6];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[6]{'contents'}[7]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[6];
--- 610,613 ----
***************
*** 709,713 ****
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[6]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[6]{'contents'}[10]{'args'}[0];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[6]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[6]{'contents'}[10];
- $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[6]{'contents'}[10]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[6]{'contents'}[10]{'args'}[0];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[6]{'contents'}[10]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[6];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[6]{'contents'}[11]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[6];
--- 617,620 ----
***************
*** 719,723 ****
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[8]{'contents'}[2]{'args'}[0];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[8]{'contents'}[2];
- $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[8]{'contents'}[2]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[8]{'contents'}[2]{'args'}[0];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[8]{'contents'}[2]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[8];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[8]{'contents'}[3]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[8];
--- 626,629 ----
***************
*** 727,731 ****
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[8]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[8]{'contents'}[6]{'args'}[0];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[8]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[8]{'contents'}[6];
- $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[8]{'contents'}[6]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[8]{'contents'}[6]{'args'}[0];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[8]{'contents'}[6]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[8];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[8]{'contents'}[7]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[8];
--- 633,636 ----
***************
*** 735,739 ****
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[8]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[8]{'contents'}[10]{'args'}[0];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[8]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[8]{'contents'}[10];
- $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[8]{'contents'}[10]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[8]{'contents'}[10]{'args'}[0];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[8]{'contents'}[10]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[8];
  $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[8]{'contents'}[11]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[8];
--- 640,643 ----
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands.pl texinfo-6.3/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands.pl	2016-01-22 07:50:30.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands.pl	2016-08-02 18:45:08.000000000 +0100
***************
*** 60,63 ****
--- 60,65 ----
                    ],
                    'cmdname' => '~',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 90,93 ****
--- 92,96 ----
                    'cmdname' => 'aa',
                    'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 151,154 ****
--- 154,159 ----
                    ],
                    'cmdname' => '~',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 181,184 ****
--- 186,190 ----
                    'cmdname' => 'AA',
                    'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 246,249 ****
--- 252,257 ----
                    ],
                    'cmdname' => '~',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 280,283 ****
--- 288,292 ----
                    'cmdname' => 'AA',
                    'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 353,356 ****
--- 362,367 ----
                    ],
                    'cmdname' => '~',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 383,386 ****
--- 394,398 ----
                    'cmdname' => 'aa',
                    'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 444,447 ****
--- 456,461 ----
                    ],
                    'cmdname' => '~',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 474,477 ****
--- 488,492 ----
                    'cmdname' => 'AA',
                    'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 539,542 ****
--- 554,559 ----
                    ],
                    'cmdname' => '~',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 573,576 ****
--- 590,594 ----
                    'cmdname' => 'AA',
                    'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 604,607 ****
--- 622,626 ----
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
+ $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[2];
***************
*** 610,613 ****
--- 629,633 ----
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1];
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
+ $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[4]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[4];
***************
*** 621,624 ****
--- 641,645 ----
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0];
+ $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[6]{'line_nr'};
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[8]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[8];
***************
*** 627,630 ****
--- 648,652 ----
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[9]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1];
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0];
+ $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[6]{'line_nr'};
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[10]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[10];
***************
*** 639,642 ****
--- 661,665 ----
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1];
+ $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[12]{'line_nr'};
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14];
***************
*** 646,649 ****
--- 669,673 ----
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[16]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1];
+ $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[12]{'line_nr'};
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[16]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[16];
***************
*** 659,662 ****
--- 683,687 ----
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
+ $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[0]{'line_nr'};
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[2];
***************
*** 665,668 ****
--- 690,694 ----
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3];
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0];
+ $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[0]{'line_nr'};
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[4]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[4];
***************
*** 676,679 ****
--- 702,706 ----
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0];
+ $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[6]{'line_nr'};
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[8]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[8];
***************
*** 682,685 ****
--- 709,713 ----
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[9]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3];
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[10]{'args'}[0]{'contents'}[0];
+ $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[6]{'line_nr'};
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[10]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[10];
***************
*** 694,697 ****
--- 722,726 ----
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1];
+ $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[12]{'line_nr'};
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14];
***************
*** 701,704 ****
--- 730,734 ----
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[16]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[16]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[16]{'args'}[0]{'contents'}[1];
+ $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[12]{'line_nr'};
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[16]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[16]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[16];
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands_utf8.pl texinfo-6.3/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands_utf8.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands_utf8.pl	2016-01-22 07:50:30.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands_utf8.pl	2016-08-02 18:45:08.000000000 +0100
***************
*** 95,98 ****
--- 95,100 ----
                    ],
                    'cmdname' => '~',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 125,128 ****
--- 127,131 ----
                    'cmdname' => 'aa',
                    'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 186,189 ****
--- 189,194 ----
                    ],
                    'cmdname' => '~',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 216,219 ****
--- 221,225 ----
                    'cmdname' => 'AA',
                    'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 281,284 ****
--- 287,292 ----
                    ],
                    'cmdname' => '~',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 315,318 ****
--- 323,327 ----
                    'cmdname' => 'AA',
                    'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 388,391 ****
--- 397,402 ----
                    ],
                    'cmdname' => '~',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 418,421 ****
--- 429,433 ----
                    'cmdname' => 'aa',
                    'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 479,482 ****
--- 491,496 ----
                    ],
                    'cmdname' => '~',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 509,512 ****
--- 523,527 ----
                    'cmdname' => 'AA',
                    'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 574,577 ****
--- 589,594 ----
                    ],
                    'cmdname' => '~',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 608,611 ****
--- 625,629 ----
                    'cmdname' => 'AA',
                    'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 645,648 ****
--- 663,667 ----
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
+ $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[2];
***************
*** 651,654 ****
--- 670,674 ----
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1];
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
+ $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[4]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[4];
***************
*** 662,665 ****
--- 682,686 ----
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0];
+ $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[6]{'line_nr'};
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[8];
***************
*** 668,671 ****
--- 689,693 ----
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[9]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1];
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0];
+ $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[6]{'line_nr'};
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[10]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[10];
***************
*** 680,683 ****
--- 702,706 ----
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1];
+ $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[12]{'line_nr'};
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14];
***************
*** 687,690 ****
--- 710,714 ----
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1];
+ $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[12]{'line_nr'};
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[16];
***************
*** 700,703 ****
--- 724,728 ----
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
+ $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[0]{'line_nr'};
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[2]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[2];
***************
*** 706,709 ****
--- 731,735 ----
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3];
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0];
+ $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[0]{'line_nr'};
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[4]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[4];
***************
*** 717,720 ****
--- 743,747 ----
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0];
+ $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[6]{'line_nr'};
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[8]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[8];
***************
*** 723,726 ****
--- 750,754 ----
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[9]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3];
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[10]{'args'}[0]{'contents'}[0];
+ $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[6]{'line_nr'};
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[10]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[10];
***************
*** 735,738 ****
--- 763,767 ----
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1];
+ $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[12]{'line_nr'};
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14];
***************
*** 742,745 ****
--- 771,775 ----
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[16]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[16]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[16]{'args'}[0]{'contents'}[1];
+ $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[12]{'line_nr'};
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[16]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[16]{'args'}[0];
  $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[16];
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/punctuation_at_end_command.pl texinfo-6.3/tp/t/results/plaintext_tests/punctuation_at_end_command.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/punctuation_at_end_command.pl	2016-01-22 07:50:30.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/punctuation_at_end_command.pl	2016-08-02 18:45:08.000000000 +0100
***************
*** 53,61 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 53,57 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 90,98 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 86,90 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 123,131 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 115,119 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 182,192 ****
            'cmdname' => 'math',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {},
            'parent' => {}
--- 170,173 ----
***************
*** 344,348 ****
  $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[10]{'args'}[0];
  $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[10];
- $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[10]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[10]{'args'}[0];
  $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[10]{'line_nr'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[8]{'line_nr'};
  $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[10]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1];
--- 325,328 ----
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/punctuation_commands.pl texinfo-6.3/tp/t/results/plaintext_tests/punctuation_commands.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/punctuation_commands.pl	2016-01-22 07:50:31.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/punctuation_commands.pl	2016-08-02 18:45:09.000000000 +0100
***************
*** 95,98 ****
--- 95,103 ----
            'cmdname' => 'enddots',
            'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 4,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 111,114 ****
--- 116,120 ----
            'cmdname' => 'enddots',
            'contents' => [],
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 183,186 ****
--- 189,197 ----
            'cmdname' => 'enddots',
            'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 9,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 265,268 ****
--- 276,284 ----
            'cmdname' => 'enddots',
            'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 16,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 440,443 ****
--- 456,460 ----
  $result_trees{'punctuation_commands'}{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'punctuation_commands'}{'contents'}[3];
  $result_trees{'punctuation_commands'}{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'punctuation_commands'}{'contents'}[3]{'contents'}[3];
+ $result_trees{'punctuation_commands'}{'contents'}[3]{'contents'}[3]{'line_nr'} = $result_trees{'punctuation_commands'}{'contents'}[3]{'contents'}[1]{'line_nr'};
  $result_trees{'punctuation_commands'}{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'punctuation_commands'}{'contents'}[3];
  $result_trees{'punctuation_commands'}{'contents'}[3]{'contents'}[4]{'parent'} = $result_trees{'punctuation_commands'}{'contents'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/punctuation_commands_frenchspacing.pl texinfo-6.3/tp/t/results/plaintext_tests/punctuation_commands_frenchspacing.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/punctuation_commands_frenchspacing.pl	2016-01-22 07:50:31.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/punctuation_commands_frenchspacing.pl	2016-08-02 18:45:09.000000000 +0100
***************
*** 136,139 ****
--- 136,144 ----
            'cmdname' => 'enddots',
            'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 5,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 152,155 ****
--- 157,161 ----
            'cmdname' => 'enddots',
            'contents' => [],
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 224,227 ****
--- 230,238 ----
            'cmdname' => 'enddots',
            'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 10,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 306,309 ****
--- 317,325 ----
            'cmdname' => 'enddots',
            'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 17,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 488,491 ****
--- 504,508 ----
  $result_trees{'punctuation_commands_frenchspacing'}{'contents'}[4]{'contents'}[2]{'parent'} = $result_trees{'punctuation_commands_frenchspacing'}{'contents'}[4];
  $result_trees{'punctuation_commands_frenchspacing'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'punctuation_commands_frenchspacing'}{'contents'}[4]{'contents'}[3];
+ $result_trees{'punctuation_commands_frenchspacing'}{'contents'}[4]{'contents'}[3]{'line_nr'} = $result_trees{'punctuation_commands_frenchspacing'}{'contents'}[4]{'contents'}[1]{'line_nr'};
  $result_trees{'punctuation_commands_frenchspacing'}{'contents'}[4]{'contents'}[3]{'parent'} = $result_trees{'punctuation_commands_frenchspacing'}{'contents'}[4];
  $result_trees{'punctuation_commands_frenchspacing'}{'contents'}[4]{'contents'}[4]{'parent'} = $result_trees{'punctuation_commands_frenchspacing'}{'contents'}[4];
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/punctuation_in_command.pl texinfo-6.3/tp/t/results/plaintext_tests/punctuation_in_command.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/punctuation_in_command.pl	2016-01-22 07:50:30.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/punctuation_in_command.pl	2016-08-02 18:45:08.000000000 +0100
***************
*** 53,61 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 53,57 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 90,98 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 86,90 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 123,131 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 115,119 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {},
***************
*** 173,183 ****
            'cmdname' => 'math',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {},
            'parent' => {}
--- 161,164 ----
***************
*** 313,317 ****
  $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[9]{'args'}[0];
  $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[9];
- $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[9]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[9]{'args'}[0];
  $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[9]{'line_nr'} = $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[1]{'line_nr'};
  $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[9]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1];
--- 294,297 ----
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/punctuation_in_command_end_line.pl texinfo-6.3/tp/t/results/plaintext_tests/punctuation_in_command_end_line.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/punctuation_in_command_end_line.pl	2016-01-22 07:50:30.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/punctuation_in_command_end_line.pl	2016-08-02 18:45:08.000000000 +0100
***************
*** 47,55 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 47,51 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 89,97 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 85,89 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 131,139 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 123,127 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 199,209 ****
            'cmdname' => 'math',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {
              'file_name' => '',
--- 187,190 ----
***************
*** 397,401 ****
  $result_trees{'punctuation_in_command_end_line'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_command_end_line'}{'contents'}[0]{'contents'}[13]{'args'}[0];
  $result_trees{'punctuation_in_command_end_line'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_command_end_line'}{'contents'}[0]{'contents'}[13];
- $result_trees{'punctuation_in_command_end_line'}{'contents'}[0]{'contents'}[13]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'punctuation_in_command_end_line'}{'contents'}[0]{'contents'}[13]{'args'}[0];
  $result_trees{'punctuation_in_command_end_line'}{'contents'}[0]{'contents'}[13]{'parent'} = $result_trees{'punctuation_in_command_end_line'}{'contents'}[0];
  $result_trees{'punctuation_in_command_end_line'}{'contents'}[0]{'contents'}[14]{'parent'} = $result_trees{'punctuation_in_command_end_line'}{'contents'}[0];
--- 378,381 ----
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/quote_node_names.pl texinfo-6.3/tp/t/results/plaintext_tests/quote_node_names.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/quote_node_names.pl	2016-01-22 07:50:31.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/quote_node_names.pl	2016-08-02 18:45:09.000000000 +0100
***************
*** 105,108 ****
--- 105,109 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 182,189 ****
                    ],
                    'normalized' => 'normal-node'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 183,186 ----
***************
*** 215,218 ****
--- 212,216 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 244,251 ****
                    ],
                    'normalized' => 'normal-node'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 242,245 ----
***************
*** 289,292 ****
--- 283,287 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 366,373 ****
                    ],
                    'normalized' => 'blah_003ablah'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 361,364 ----
***************
*** 399,402 ****
--- 390,394 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 428,435 ****
                    ],
                    'normalized' => 'blah_003ablah'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 420,423 ----
***************
*** 473,476 ****
--- 461,465 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 550,557 ****
                    ],
                    'normalized' => 'blumpty_002efump'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 539,542 ----
***************
*** 583,586 ****
--- 568,572 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 612,619 ****
                    ],
                    'normalized' => 'blumpty_002efump'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 598,601 ----
***************
*** 669,676 ****
                    ],
                    'normalized' => 'blah_003ablah'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 651,654 ----
***************
*** 806,813 ****
                    ],
                    'normalized' => 'secret_002cnode'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 784,787 ----
***************
*** 863,870 ****
                    ],
                    'normalized' => 'blah_003ablah'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 837,840 ----
***************
*** 1662,1665 ****
--- 1632,1636 ----
  $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
+ $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
***************
*** 1680,1683 ****
--- 1651,1655 ----
  $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
+ $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1];
  $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1];
  $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
***************
*** 1692,1695 ****
--- 1664,1668 ----
  $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0];
  $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0];
+ $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[1];
  $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[1];
  $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0];
***************
*** 1710,1713 ****
--- 1683,1687 ----
  $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0];
  $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[2];
+ $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[1];
  $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[1];
  $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[2];
***************
*** 1722,1725 ****
--- 1696,1700 ----
  $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0];
  $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0];
+ $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[1];
  $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[1];
  $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0];
***************
*** 1740,1743 ****
--- 1715,1719 ----
  $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0];
  $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[2];
+ $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[1];
  $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[1];
  $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[2];
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/star_at_command_formatting.pl texinfo-6.3/tp/t/results/plaintext_tests/star_at_command_formatting.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/star_at_command_formatting.pl	2016-01-22 07:50:30.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/star_at_command_formatting.pl	2016-08-02 18:45:08.000000000 +0100
***************
*** 98,124 ****
        'extra' => {
          'arg_line' => ' mymacro
! ',
!         'macrobody' => 'Some text @*
! more text. @
! Even more text. @* not at eol.
! 
! Now followed by @@ : followed@*@ 
! And now followed by a space and @@ : follow @* @ 
! And now followed by a space and @@ and text: follow @* @ text
! Followed by empty asis and a space @asis{} 
! Followed by asis with space and a space @asis{ } 
! And now with * empty @@asis: @*@asis{} 
! And now with * asis with space @@asis: @* @asis{ }
! And end para.
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 98,102 ----
        'extra' => {
          'arg_line' => ' mymacro
! '
        },
        'line_nr' => {
***************
*** 129,133 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 107,119 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 1154,1161 ****
  $result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[11]{'parent'} = $result_trees{'star_at_command_formatting'}{'contents'}[0];
  $result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[12]{'parent'} = $result_trees{'star_at_command_formatting'}{'contents'}[0];
- $result_trees{'star_at_command_formatting'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'star_at_command_formatting'}{'contents'}[0];
- $result_trees{'star_at_command_formatting'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'star_at_command_formatting'};
  $result_trees{'star_at_command_formatting'}{'contents'}[0]{'parent'} = $result_trees{'star_at_command_formatting'};
! $result_trees{'star_at_command_formatting'}{'contents'}[1] = $result_trees{'star_at_command_formatting'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'star_at_command_formatting'}{'contents'}[2]{'parent'} = $result_trees{'star_at_command_formatting'};
  $result_trees{'star_at_command_formatting'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'star_at_command_formatting'}{'contents'}[3];
--- 1140,1146 ----
  $result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[11]{'parent'} = $result_trees{'star_at_command_formatting'}{'contents'}[0];
  $result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[12]{'parent'} = $result_trees{'star_at_command_formatting'}{'contents'}[0];
  $result_trees{'star_at_command_formatting'}{'contents'}[0]{'parent'} = $result_trees{'star_at_command_formatting'};
! $result_trees{'star_at_command_formatting'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'star_at_command_formatting'}{'contents'}[0];
! $result_trees{'star_at_command_formatting'}{'contents'}[1]{'parent'} = $result_trees{'star_at_command_formatting'};
  $result_trees{'star_at_command_formatting'}{'contents'}[2]{'parent'} = $result_trees{'star_at_command_formatting'};
  $result_trees{'star_at_command_formatting'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'star_at_command_formatting'}{'contents'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/tab_in_table_in_example.pl texinfo-6.3/tp/t/results/plaintext_tests/tab_in_table_in_example.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/tab_in_table_in_example.pl	2016-01-22 07:50:30.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/tab_in_table_in_example.pl	2016-08-02 18:45:08.000000000 +0100
***************
*** 34,37 ****
--- 34,43 ----
                  {
                    'cmdname' => 'code',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 2,
+                     'macro' => ''
+                   },
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 210,218 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 2,
!             'macro' => ''
!           },
            'parent' => {}
          },
--- 216,220 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {}
          },
***************
*** 312,315 ****
--- 314,318 ----
  $result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
  $result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
+ $result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'tab_in_table_in_example'}{'contents'}[0];
  $result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[2];
diff -Nrc2 texinfo-6.1/tp/t/results/plaintext_tests/transparent_text.pl texinfo-6.3/tp/t/results/plaintext_tests/transparent_text.pl
*** texinfo-6.1/tp/t/results/plaintext_tests/transparent_text.pl	2016-01-22 07:50:30.000000000 +0000
--- texinfo-6.3/tp/t/results/plaintext_tests/transparent_text.pl	2016-08-02 18:45:08.000000000 +0100
***************
*** 35,45 ****
            'cmdname' => 'footnote',
            'contents' => [],
-           'extra' => {
-             'spaces_before_argument' => {
-               'parent' => {},
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
-             }
-           },
            'line_nr' => {
              'file_name' => '',
--- 35,38 ----
***************
*** 87,91 ****
  $result_trees{'transparent_text'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'transparent_text'}{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'transparent_text'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'transparent_text'}{'contents'}[0]{'contents'}[1];
- $result_trees{'transparent_text'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'transparent_text'}{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'transparent_text'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'transparent_text'}{'contents'}[0];
  $result_trees{'transparent_text'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'transparent_text'}{'contents'}[0];
--- 80,83 ----
diff -Nrc2 texinfo-6.1/tp/t/results/preformatted/caption_in_example.pl texinfo-6.3/tp/t/results/preformatted/caption_in_example.pl
*** texinfo-6.1/tp/t/results/preformatted/caption_in_example.pl	2016-01-22 07:49:51.000000000 +0000
--- texinfo-6.3/tp/t/results/preformatted/caption_in_example.pl	2016-08-02 18:44:31.000000000 +0100
***************
*** 94,103 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 94,98 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 266,270 ****
  $result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
  $result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'float'} = $result_trees{'caption_in_example'}{'contents'}[0];
- $result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[1];
  $result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[3];
--- 261,264 ----
***************
*** 341,349 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 335,339 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
diff -Nrc2 texinfo-6.1/tp/t/results/preformatted/def_in_example.pl texinfo-6.3/tp/t/results/preformatted/def_in_example.pl
*** texinfo-6.1/tp/t/results/preformatted/def_in_example.pl	2016-01-22 07:49:51.000000000 +0000
--- texinfo-6.3/tp/t/results/preformatted/def_in_example.pl	2016-08-02 18:44:31.000000000 +0100
***************
*** 96,100 ****
                    'index_at_command' => 'defun',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'defun',
                    'key' => 'name',
--- 96,99 ----
diff -Nrc2 texinfo-6.1/tp/t/results/preformatted/titlefont_in_example.pl texinfo-6.3/tp/t/results/preformatted/titlefont_in_example.pl
*** texinfo-6.1/tp/t/results/preformatted/titlefont_in_example.pl	2016-01-22 07:49:51.000000000 +0000
--- texinfo-6.3/tp/t/results/preformatted/titlefont_in_example.pl	2016-08-02 18:44:31.000000000 +0100
***************
*** 40,48 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 40,44 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
diff -Nrc2 texinfo-6.1/tp/t/results/quotation/quotation_beginning_and_end_on_line.pl texinfo-6.3/tp/t/results/quotation/quotation_beginning_and_end_on_line.pl
*** texinfo-6.1/tp/t/results/quotation/quotation_beginning_and_end_on_line.pl	2016-01-22 07:49:46.000000000 +0000
--- texinfo-6.3/tp/t/results/quotation/quotation_beginning_and_end_on_line.pl	2016-08-02 18:44:26.000000000 +0100
***************
*** 109,118 ****
  $result_errors{'quotation_beginning_and_end_on_line'} = [
    {
!     'error_line' => ':1: warning: @end should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@end should only appear at a line beginning',
      'type' => 'warning'
    }
--- 109,118 ----
  $result_errors{'quotation_beginning_and_end_on_line'} = [
    {
!     'error_line' => ':1: warning: @end should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@end should only appear at the beginning of a line',
      'type' => 'warning'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/raw/beginning_and_end_on_line.pl texinfo-6.3/tp/t/results/raw/beginning_and_end_on_line.pl
*** texinfo-6.1/tp/t/results/raw/beginning_and_end_on_line.pl	2016-01-22 07:49:45.000000000 +0000
--- texinfo-6.3/tp/t/results/raw/beginning_and_end_on_line.pl	2016-08-02 18:44:25.000000000 +0100
***************
*** 117,126 ****
  $result_errors{'beginning_and_end_on_line'} = [
    {
!     'error_line' => ':2: warning: @end should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 2,
      'macro' => '',
!     'text' => '@end should only appear at a line beginning',
      'type' => 'warning'
    }
--- 117,126 ----
  $result_errors{'beginning_and_end_on_line'} = [
    {
!     'error_line' => ':2: warning: @end should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 2,
      'macro' => '',
!     'text' => '@end should only appear at the beginning of a line',
      'type' => 'warning'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/raw/braces_in_tex.pl texinfo-6.3/tp/t/results/raw/braces_in_tex.pl
*** texinfo-6.1/tp/t/results/raw/braces_in_tex.pl	2016-01-22 07:49:44.000000000 +0000
--- texinfo-6.3/tp/t/results/raw/braces_in_tex.pl	2016-08-02 18:44:25.000000000 +0100
***************
*** 38,44 ****
--- 38,46 ----
              },
              {
+               'parent' => {},
                'text' => '{i=1'
              },
              {
+               'parent' => {},
                'text' => '}^N
  '
***************
*** 166,172 ****
--- 168,176 ----
                      },
                      {
+                       'parent' => {},
                        'text' => '{i=1'
                      },
                      {
+                       'parent' => {},
                        'text' => '}^N
  '
***************
*** 315,318 ****
--- 319,324 ----
  $result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[1];
  $result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[1];
+ $result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[1];
+ $result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[1];
  $result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[1];
  $result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[1];
***************
*** 338,341 ****
--- 344,349 ----
  $result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1];
  $result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1];
+ $result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1];
+ $result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1];
  $result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1];
  $result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/raw/inline_in_example.pl texinfo-6.3/tp/t/results/raw/inline_in_example.pl
*** texinfo-6.1/tp/t/results/raw/inline_in_example.pl	2016-01-22 07:49:44.000000000 +0000
--- texinfo-6.3/tp/t/results/raw/inline_in_example.pl	2016-08-02 18:44:25.000000000 +0100
***************
*** 41,44 ****
--- 41,45 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 69,72 ****
--- 70,78 ----
                        'cmdname' => 'lbracechar',
                        'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 4,
+                         'macro' => ''
+                       },
                        'parent' => {}
                      },
***************
*** 95,103 ****
                    ]
                  ],
!                 'format' => 'plaintext',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 101,106 ----
                    ]
                  ],
!                 'expand_index' => 1,
!                 'format' => 'plaintext'
                },
                'line_nr' => {
***************
*** 128,131 ****
--- 131,135 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 151,159 ****
                    ]
                  ],
!                 'format' => 'plaintext',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 155,160 ----
                    ]
                  ],
!                 'expand_index' => 1,
!                 'format' => 'plaintext'
                },
                'line_nr' => {
***************
*** 195,198 ****
--- 196,200 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' 
  ',
***************
*** 229,238 ****
                              {}
                            ]
!                         ],
!                         'normalized' => 'HTML',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 231,235 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 266,274 ****
                    ]
                  ],
!                 'format' => 'html',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 263,268 ----
                    ]
                  ],
!                 'expand_index' => 1,
!                 'format' => 'html'
                },
                'line_nr' => {
***************
*** 349,352 ****
--- 343,347 ----
  $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
+ $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[1];
***************
*** 366,369 ****
--- 361,365 ----
  $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0];
  $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[3];
+ $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[1];
  $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[1]{'parent'} = $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[3];
***************
*** 376,379 ****
--- 372,376 ----
  $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[7]{'args'}[0];
  $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[7];
+ $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[7]{'args'}[1];
  $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[7]{'args'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/raw/inline_missing_first_arg.pl texinfo-6.3/tp/t/results/raw/inline_missing_first_arg.pl
*** texinfo-6.1/tp/t/results/raw/inline_missing_first_arg.pl	2016-01-22 07:49:45.000000000 +0000
--- texinfo-6.3/tp/t/results/raw/inline_missing_first_arg.pl	2016-08-02 18:44:25.000000000 +0100
***************
*** 15,18 ****
--- 15,19 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 23,38 ****
              },
              {
!               'contents' => [
!                 {
!                   'text' => ' ',
!                   'type' => 'empty_spaces_before_argument'
!                 },
!                 {
!                   'parent' => {},
!                   'text' => 'aaa'
!                 }
!               ],
                'parent' => {},
!               'type' => 'brace_command_arg'
              }
            ],
--- 24,30 ----
              },
              {
!               'contents' => [],
                'parent' => {},
!               'type' => 'elided'
              }
            ],
***************
*** 42,50 ****
              'brace_command_contents' => [
                undef,
!               [
!                 {}
!               ]
              ],
!             'format' => '',
              'spaces_before_argument' => {}
            },
--- 34,40 ----
              'brace_command_contents' => [
                undef,
!               undef
              ],
!             'format' => undef,
              'spaces_before_argument' => {}
            },
***************
*** 68,83 ****
              },
              {
!               'contents' => [
!                 {
!                   'text' => ' ',
!                   'type' => 'empty_spaces_before_argument'
!                 },
!                 {
!                   'parent' => {},
!                   'text' => 'bbb'
!                 }
!               ],
                'parent' => {},
!               'type' => 'brace_command_arg'
              }
            ],
--- 58,64 ----
              },
              {
!               'contents' => [],
                'parent' => {},
!               'type' => 'elided'
              }
            ],
***************
*** 87,99 ****
              'brace_command_contents' => [
                undef,
!               [
!                 {}
!               ]
              ],
!             'format' => '',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 68,74 ----
              'brace_command_contents' => [
                undef,
!               undef
              ],
!             'format' => undef
            },
            'line_nr' => {},
***************
*** 112,126 ****
    'type' => 'text_root'
  };
  $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0];
- $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'args'}[1];
  $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0];
- $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0] = $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1];
  $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_before_argument'} = $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
  $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline_missing_first_arg'}{'contents'}[0];
  $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'inline_missing_first_arg'}{'contents'}[0];
  $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2];
- $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2]{'args'}[1];
  $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2];
- $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2]{'extra'}{'brace_command_contents'}[1][0] = $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'contents'}[1];
  $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'inline_missing_first_arg'}{'contents'}[0];
--- 87,98 ----
    'type' => 'text_root'
  };
+ $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0];
  $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0];
  $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_before_argument'} = $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
  $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'inline_missing_first_arg'}{'contents'}[0];
  $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'inline_missing_first_arg'}{'contents'}[0];
  $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2];
  $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2];
  $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'inline_missing_first_arg'}{'contents'}[0];
***************
*** 128,132 ****
  $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'parent'} = $result_trees{'inline_missing_first_arg'};
  
! $result_texis{'inline_missing_first_arg'} = '@inlinefmt{ , aaa}. @inlineraw{, bbb}.
  ';
  
--- 100,104 ----
  $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'parent'} = $result_trees{'inline_missing_first_arg'};
  
! $result_texis{'inline_missing_first_arg'} = '@inlinefmt{ ,}. @inlineraw{,}.
  ';
  
diff -Nrc2 texinfo-6.1/tp/t/results/raw/inlinefmt.pl texinfo-6.3/tp/t/results/raw/inlinefmt.pl
*** texinfo-6.1/tp/t/results/raw/inlinefmt.pl	2016-01-22 07:49:44.000000000 +0000
--- texinfo-6.3/tp/t/results/raw/inlinefmt.pl	2016-08-02 18:44:25.000000000 +0100
***************
*** 29,32 ****
--- 29,33 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 46,49 ****
--- 47,55 ----
                    'cmdname' => 'lbracechar',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 1,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 70,84 ****
                ]
              ],
!             'format' => 'plaintext',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
!           },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 1,
!             'macro' => ''
            },
            'parent' => {}
          },
--- 76,83 ----
                ]
              ],
!             'expand_index' => 1,
!             'format' => 'plaintext'
            },
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 103,106 ****
--- 102,106 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 130,139 ****
                          {}
                        ]
!                     ],
!                     'normalized' => 'HTML',
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {
--- 130,134 ----
                          {}
                        ]
!                     ]
                    },
                    'line_nr' => {
***************
*** 166,174 ****
                ]
              ],
!             'format' => 'html',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 161,166 ----
                ]
              ],
!             'expand_index' => 1,
!             'format' => 'html'
            },
            'line_nr' => {},
***************
*** 190,193 ****
--- 182,186 ----
  $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1];
+ $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[2];
***************
*** 199,206 ****
--- 192,201 ----
  $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[1][1] = $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[2];
  $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[1][2] = $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[3];
+ $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[2]{'line_nr'};
  $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'inlinefmt'}{'contents'}[0];
  $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'inlinefmt'}{'contents'}[0];
  $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3];
+ $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'args'}[1];
  $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'args'}[1];
  $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[2]{'args'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/raw/inlinefmt_with_empty_line.pl texinfo-6.3/tp/t/results/raw/inlinefmt_with_empty_line.pl
*** texinfo-6.1/tp/t/results/raw/inlinefmt_with_empty_line.pl	2016-01-22 07:49:45.000000000 +0000
--- texinfo-6.3/tp/t/results/raw/inlinefmt_with_empty_line.pl	2016-08-02 18:44:25.000000000 +0100
***************
*** 29,32 ****
--- 29,33 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 56,64 ****
                ]
              ],
!             'format' => 'plaintext',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 57,62 ----
                ]
              ],
!             'expand_index' => 1,
!             'format' => 'plaintext'
            },
            'line_nr' => {
***************
*** 67,72 ****
              'macro' => ''
            },
!           'parent' => {},
!           'remaining_args' => 0
          }
        ],
--- 65,69 ----
              'macro' => ''
            },
!           'parent' => {}
          }
        ],
***************
*** 86,89 ****
--- 83,91 ----
            'cmdname' => 'lbracechar',
            'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 3,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 108,111 ****
--- 110,114 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 135,143 ****
                ]
              ],
!             'format' => 'html',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 138,143 ----
                ]
              ],
!             'expand_index' => 1,
!             'format' => 'html'
            },
            'line_nr' => {
***************
*** 146,151 ****
              'macro' => ''
            },
!           'parent' => {},
!           'remaining_args' => 0
          }
        ],
--- 146,150 ----
              'macro' => ''
            },
!           'parent' => {}
          }
        ],
***************
*** 179,188 ****
                  {}
                ]
!             ],
!             'normalized' => 'HTML',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 178,182 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 208,211 ****
--- 202,206 ----
  $result_trees{'inlinefmt_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inlinefmt_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'inlinefmt_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'inlinefmt_with_empty_line'}{'contents'}[0]{'contents'}[1];
+ $result_trees{'inlinefmt_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'inlinefmt_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'inlinefmt_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inlinefmt_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'inlinefmt_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'inlinefmt_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[1];
***************
*** 219,222 ****
--- 214,218 ----
  $result_trees{'inlinefmt_with_empty_line'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inlinefmt_with_empty_line'}{'contents'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'inlinefmt_with_empty_line'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'inlinefmt_with_empty_line'}{'contents'}[1]{'contents'}[2];
+ $result_trees{'inlinefmt_with_empty_line'}{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'inlinefmt_with_empty_line'}{'contents'}[1]{'contents'}[2]{'args'}[1];
  $result_trees{'inlinefmt_with_empty_line'}{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inlinefmt_with_empty_line'}{'contents'}[1]{'contents'}[2]{'args'}[1];
  $result_trees{'inlinefmt_with_empty_line'}{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'inlinefmt_with_empty_line'}{'contents'}[1]{'contents'}[2]{'args'}[1];
***************
*** 248,257 ****
  $result_errors{'inlinefmt_with_empty_line'} = [
    {
!     'error_line' => ':1: @inlinefmt missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@inlinefmt missing close brace',
      'type' => 'error'
    },
--- 244,253 ----
  $result_errors{'inlinefmt_with_empty_line'} = [
    {
!     'error_line' => ':1: @inlinefmt missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@inlinefmt missing closing brace',
      'type' => 'error'
    },
***************
*** 266,275 ****
    },
    {
!     'error_line' => ':4: @inlinefmt missing close brace
  ',
      'file_name' => '',
      'line_nr' => 4,
      'macro' => '',
!     'text' => '@inlinefmt missing close brace',
      'type' => 'error'
    },
--- 262,271 ----
    },
    {
!     'error_line' => ':4: @inlinefmt missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 4,
      'macro' => '',
!     'text' => '@inlinefmt missing closing brace',
      'type' => 'error'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/raw/inlineraw.pl texinfo-6.3/tp/t/results/raw/inlineraw.pl
*** texinfo-6.1/tp/t/results/raw/inlineraw.pl	2016-01-22 07:49:44.000000000 +0000
--- texinfo-6.3/tp/t/results/raw/inlineraw.pl	2016-08-02 18:44:25.000000000 +0100
***************
*** 29,32 ****
--- 29,33 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 46,49 ****
--- 47,55 ----
                    'cmdname' => 'lbracechar',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 1,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 70,84 ****
                ]
              ],
!             'format' => 'plaintext',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
!           },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 1,
!             'macro' => ''
            },
            'parent' => {}
          },
--- 76,83 ----
                ]
              ],
!             'expand_index' => 1,
!             'format' => 'plaintext'
            },
+           'line_nr' => {},
            'parent' => {}
          },
***************
*** 103,106 ****
--- 102,106 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 130,139 ****
                          {}
                        ]
!                     ],
!                     'normalized' => 'HTML',
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {
--- 130,134 ----
                          {}
                        ]
!                     ]
                    },
                    'line_nr' => {
***************
*** 166,174 ****
                ]
              ],
!             'format' => 'html',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 161,166 ----
                ]
              ],
!             'expand_index' => 1,
!             'format' => 'html'
            },
            'line_nr' => {},
***************
*** 190,193 ****
--- 182,186 ----
  $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1];
+ $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[2];
***************
*** 199,206 ****
--- 192,201 ----
  $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[1][1] = $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[2];
  $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[1][2] = $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[3];
+ $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[2]{'line_nr'};
  $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'inlineraw'}{'contents'}[0];
  $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'inlineraw'}{'contents'}[0];
  $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3];
+ $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'args'}[1];
  $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'args'}[1];
  $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[2]{'args'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/raw/inlineraw_with_empty_line.pl texinfo-6.3/tp/t/results/raw/inlineraw_with_empty_line.pl
*** texinfo-6.1/tp/t/results/raw/inlineraw_with_empty_line.pl	2016-01-22 07:49:45.000000000 +0000
--- texinfo-6.3/tp/t/results/raw/inlineraw_with_empty_line.pl	2016-08-02 18:44:25.000000000 +0100
***************
*** 29,32 ****
--- 29,33 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 53,56 ****
--- 54,62 ----
                    'cmdname' => 'lbracechar',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 3,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
***************
*** 78,86 ****
                ]
              ],
!             'format' => 'plaintext',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 84,89 ----
                ]
              ],
!             'expand_index' => 1,
!             'format' => 'plaintext'
            },
            'line_nr' => {
***************
*** 111,114 ****
--- 114,118 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 149,158 ****
                          {}
                        ]
!                     ],
!                     'normalized' => 'HTML',
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {
--- 153,157 ----
                          {}
                        ]
!                     ]
                    },
                    'line_nr' => {
***************
*** 187,195 ****
                ]
              ],
!             'format' => 'html',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 186,191 ----
                ]
              ],
!             'expand_index' => 1,
!             'format' => 'html'
            },
            'line_nr' => {
***************
*** 215,218 ****
--- 211,215 ----
  $result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[1];
+ $result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[1];
***************
*** 230,233 ****
--- 227,231 ----
  $result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[3];
+ $result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[3]{'args'}[1];
  $result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[3]{'args'}[1];
  $result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[3]{'args'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/raw/lone_braces_in_html.pl texinfo-6.3/tp/t/results/raw/lone_braces_in_html.pl
*** texinfo-6.1/tp/t/results/raw/lone_braces_in_html.pl	2016-01-22 07:49:44.000000000 +0000
--- texinfo-6.3/tp/t/results/raw/lone_braces_in_html.pl	2016-08-02 18:44:25.000000000 +0100
***************
*** 23,26 ****
--- 23,27 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => '}
  '
***************
*** 104,107 ****
--- 105,109 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => '{
  '
***************
*** 169,172 ****
--- 171,175 ----
  $result_trees{'lone_braces_in_html'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'lone_braces_in_html'}{'contents'}[0];
  $result_trees{'lone_braces_in_html'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'lone_braces_in_html'}{'contents'}[0];
+ $result_trees{'lone_braces_in_html'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'lone_braces_in_html'}{'contents'}[0]{'contents'}[1];
  $result_trees{'lone_braces_in_html'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'lone_braces_in_html'}{'contents'}[0];
  $result_trees{'lone_braces_in_html'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'lone_braces_in_html'}{'contents'}[0]{'contents'}[2];
***************
*** 184,187 ****
--- 187,191 ----
  $result_trees{'lone_braces_in_html'}{'contents'}[2]{'contents'}[0]{'extra'}{'command'} = $result_trees{'lone_braces_in_html'}{'contents'}[2];
  $result_trees{'lone_braces_in_html'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'lone_braces_in_html'}{'contents'}[2];
+ $result_trees{'lone_braces_in_html'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'lone_braces_in_html'}{'contents'}[2]{'contents'}[1];
  $result_trees{'lone_braces_in_html'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'lone_braces_in_html'}{'contents'}[2];
  $result_trees{'lone_braces_in_html'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'lone_braces_in_html'}{'contents'}[2]{'contents'}[2];
diff -Nrc2 texinfo-6.1/tp/t/results/raw/misc_raw.pl texinfo-6.3/tp/t/results/raw/misc_raw.pl
*** texinfo-6.1/tp/t/results/raw/misc_raw.pl	2016-01-22 07:49:44.000000000 +0000
--- texinfo-6.3/tp/t/results/raw/misc_raw.pl	2016-08-02 18:44:25.000000000 +0100
***************
*** 214,226 ****
        ],
        'extra' => {
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 214,218 ----
        ],
        'extra' => {
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 231,235 ****
        'parent' => {}
      },
!     {}
    ],
    'type' => 'text_root'
--- 223,235 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     }
    ],
    'type' => 'text_root'
***************
*** 274,281 ****
  $result_trees{'misc_raw'}{'contents'}[5]{'contents'}[1]{'parent'} = $result_trees{'misc_raw'}{'contents'}[5];
  $result_trees{'misc_raw'}{'contents'}[5]{'contents'}[2]{'parent'} = $result_trees{'misc_raw'}{'contents'}[5];
! $result_trees{'misc_raw'}{'contents'}[5]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'misc_raw'}{'contents'}[5];
! $result_trees{'misc_raw'}{'contents'}[5]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'misc_raw'};
  $result_trees{'misc_raw'}{'contents'}[5]{'parent'} = $result_trees{'misc_raw'};
! $result_trees{'misc_raw'}{'contents'}[6] = $result_trees{'misc_raw'}{'contents'}[5]{'extra'}{'spaces_after_command'};
  
  $result_texis{'misc_raw'} = '
--- 274,281 ----
  $result_trees{'misc_raw'}{'contents'}[5]{'contents'}[1]{'parent'} = $result_trees{'misc_raw'}{'contents'}[5];
  $result_trees{'misc_raw'}{'contents'}[5]{'contents'}[2]{'parent'} = $result_trees{'misc_raw'}{'contents'}[5];
! $result_trees{'misc_raw'}{'contents'}[5]{'extra'}{'spaces_after_command'} = $result_trees{'misc_raw'}{'contents'}[5]{'contents'}[0];
  $result_trees{'misc_raw'}{'contents'}[5]{'parent'} = $result_trees{'misc_raw'};
! $result_trees{'misc_raw'}{'contents'}[6]{'extra'}{'command'} = $result_trees{'misc_raw'}{'contents'}[5];
! $result_trees{'misc_raw'}{'contents'}[6]{'parent'} = $result_trees{'misc_raw'};
  
  $result_texis{'misc_raw'} = '
***************
*** 302,311 ****
  $result_errors{'misc_raw'} = [
    {
!     'error_line' => ':3: warning: @end should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 3,
      'macro' => '',
!     'text' => '@end should only appear at a line beginning',
      'type' => 'warning'
    }
--- 302,311 ----
  $result_errors{'misc_raw'} = [
    {
!     'error_line' => ':3: warning: @end should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 3,
      'macro' => '',
!     'text' => '@end should only appear at the beginning of a line',
      'type' => 'warning'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/raw/misc_raw_comments.pl texinfo-6.3/tp/t/results/raw/misc_raw_comments.pl
*** texinfo-6.1/tp/t/results/raw/misc_raw_comments.pl	2016-01-22 07:49:44.000000000 +0000
--- texinfo-6.3/tp/t/results/raw/misc_raw_comments.pl	2016-08-02 18:44:25.000000000 +0100
***************
*** 268,280 ****
        ],
        'extra' => {
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 268,272 ----
        ],
        'extra' => {
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 285,289 ****
        'parent' => {}
      },
!     {}
    ],
    'type' => 'text_root'
--- 277,289 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     }
    ],
    'type' => 'text_root'
***************
*** 334,341 ****
  $result_trees{'misc_raw_comments'}{'contents'}[5]{'contents'}[1]{'parent'} = $result_trees{'misc_raw_comments'}{'contents'}[5];
  $result_trees{'misc_raw_comments'}{'contents'}[5]{'contents'}[2]{'parent'} = $result_trees{'misc_raw_comments'}{'contents'}[5];
! $result_trees{'misc_raw_comments'}{'contents'}[5]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'misc_raw_comments'}{'contents'}[5];
! $result_trees{'misc_raw_comments'}{'contents'}[5]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'misc_raw_comments'};
  $result_trees{'misc_raw_comments'}{'contents'}[5]{'parent'} = $result_trees{'misc_raw_comments'};
! $result_trees{'misc_raw_comments'}{'contents'}[6] = $result_trees{'misc_raw_comments'}{'contents'}[5]{'extra'}{'spaces_after_command'};
  
  $result_texis{'misc_raw_comments'} = '
--- 334,341 ----
  $result_trees{'misc_raw_comments'}{'contents'}[5]{'contents'}[1]{'parent'} = $result_trees{'misc_raw_comments'}{'contents'}[5];
  $result_trees{'misc_raw_comments'}{'contents'}[5]{'contents'}[2]{'parent'} = $result_trees{'misc_raw_comments'}{'contents'}[5];
! $result_trees{'misc_raw_comments'}{'contents'}[5]{'extra'}{'spaces_after_command'} = $result_trees{'misc_raw_comments'}{'contents'}[5]{'contents'}[0];
  $result_trees{'misc_raw_comments'}{'contents'}[5]{'parent'} = $result_trees{'misc_raw_comments'};
! $result_trees{'misc_raw_comments'}{'contents'}[6]{'extra'}{'command'} = $result_trees{'misc_raw_comments'}{'contents'}[5];
! $result_trees{'misc_raw_comments'}{'contents'}[6]{'parent'} = $result_trees{'misc_raw_comments'};
  
  $result_texis{'misc_raw_comments'} = '
***************
*** 362,371 ****
  $result_errors{'misc_raw_comments'} = [
    {
!     'error_line' => ':3: warning: @end should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 3,
      'macro' => '',
!     'text' => '@end should only appear at a line beginning',
      'type' => 'warning'
    }
--- 362,371 ----
  $result_errors{'misc_raw_comments'} = [
    {
!     'error_line' => ':3: warning: @end should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 3,
      'macro' => '',
!     'text' => '@end should only appear at the beginning of a line',
      'type' => 'warning'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/raw/nested_macros.pl texinfo-6.3/tp/t/results/raw/nested_macros.pl
*** texinfo-6.1/tp/t/results/raw/nested_macros.pl	2016-01-22 07:49:44.000000000 +0000
--- texinfo-6.3/tp/t/results/raw/nested_macros.pl	2016-08-02 18:44:25.000000000 +0100
***************
*** 51,68 ****
            'extra' => {
              'arg_line' => ' othermacro 
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'parent' => {}
          },
!         {},
          {
            'cmdname' => 'macro',
--- 51,67 ----
            'extra' => {
              'arg_line' => ' othermacro 
! '
            },
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'cmdname' => 'macro',
***************
*** 70,103 ****
            'extra' => {
              'arg_line' => '
! ',
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'parent' => {}
          },
!         {}
!       ],
!       'extra' => {
!         'arg_line' => ' truc   { arg,  ex}
! ',
!         'args_index' => {
!           'arg' => 0,
!           'ex' => 1
!         },
!         'macrobody' => 'in macro \\arg\\
! @macro othermacro 
! other macro
! @end macro
! @macro
! @end macro
! ',
!         'spaces_after_command' => {
            'extra' => {
              'command' => {}
--- 69,77 ----
            'extra' => {
              'arg_line' => '
! '
            },
            'parent' => {}
          },
!         {
            'extra' => {
              'command' => {}
***************
*** 108,111 ****
--- 82,89 ----
            'type' => 'empty_line_after_command'
          }
+       ],
+       'extra' => {
+         'arg_line' => ' truc   { arg,  ex}
+ '
        },
        'line_nr' => {
***************
*** 116,120 ****
        'parent' => {}
      },
!     {}
    ],
    'type' => 'text_root'
--- 94,106 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     }
    ],
    'type' => 'text_root'
***************
*** 126,141 ****
  $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[1];
  $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[1];
- $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[1];
- $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'nested_macros'}{'contents'}[0];
  $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_macros'}{'contents'}[0];
! $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[2] = $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'};
! $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[3];
! $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'nested_macros'}{'contents'}[0];
  $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'nested_macros'}{'contents'}[0];
! $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[4] = $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[3]{'extra'}{'spaces_after_command'};
! $result_trees{'nested_macros'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'nested_macros'}{'contents'}[0];
! $result_trees{'nested_macros'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'nested_macros'};
  $result_trees{'nested_macros'}{'contents'}[0]{'parent'} = $result_trees{'nested_macros'};
! $result_trees{'nested_macros'}{'contents'}[1] = $result_trees{'nested_macros'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  
  $result_texis{'nested_macros'} = '@macro truc   { arg,  ex}
--- 112,124 ----
  $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[1];
  $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[1];
  $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_macros'}{'contents'}[0];
! $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[2]{'extra'}{'command'} = $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[1];
! $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'nested_macros'}{'contents'}[0];
  $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'nested_macros'}{'contents'}[0];
! $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[4]{'extra'}{'command'} = $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[3];
! $result_trees{'nested_macros'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'nested_macros'}{'contents'}[0];
  $result_trees{'nested_macros'}{'contents'}[0]{'parent'} = $result_trees{'nested_macros'};
! $result_trees{'nested_macros'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'nested_macros'}{'contents'}[0];
! $result_trees{'nested_macros'}{'contents'}[1]{'parent'} = $result_trees{'nested_macros'};
  
  $result_texis{'nested_macros'} = '@macro truc   { arg,  ex}
diff -Nrc2 texinfo-6.1/tp/t/results/raw/raw_commands_and_end_of_lines.pl texinfo-6.3/tp/t/results/raw/raw_commands_and_end_of_lines.pl
*** texinfo-6.1/tp/t/results/raw/raw_commands_and_end_of_lines.pl	2016-01-22 07:49:44.000000000 +0000
--- texinfo-6.3/tp/t/results/raw/raw_commands_and_end_of_lines.pl	2016-08-02 18:44:25.000000000 +0100
***************
*** 1155,1167 ****
        ],
        'extra' => {
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 1155,1159 ----
        ],
        'extra' => {
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 1172,1176 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 1164,1176 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 1210,1222 ****
        ],
        'extra' => {
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 1210,1214 ----
        ],
        'extra' => {
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 1227,1231 ****
        'parent' => {}
      },
!     {},
      {
        'contents' => [
--- 1219,1231 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'contents' => [
***************
*** 1275,1287 ****
        ],
        'extra' => {
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 1275,1279 ----
        ],
        'extra' => {
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 1292,1296 ****
        'parent' => {}
      },
!     {},
      {
        'contents' => [
--- 1284,1296 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'contents' => [
***************
*** 1340,1351 ****
        ],
        'extra' => {
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => ' ',
!           'type' => 'empty_spaces_after_command'
!         }
        },
        'line_nr' => {
--- 1340,1344 ----
        ],
        'extra' => {
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 1356,1360 ****
        'parent' => {}
      },
!     {},
      {
        'contents' => [
--- 1349,1360 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => ' ',
!       'type' => 'empty_spaces_after_command'
!     },
      {
        'contents' => [
***************
*** 1404,1416 ****
        ],
        'extra' => {
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 1404,1408 ----
        ],
        'extra' => {
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 1421,1425 ****
        'parent' => {}
      },
!     {},
      {
        'contents' => [
--- 1413,1425 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'contents' => [
***************
*** 1469,1480 ****
        ],
        'extra' => {
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 1469,1473 ----
        ],
        'extra' => {
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 1722,1729 ****
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'contents'}[0]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25];
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'contents'}[1]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25];
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25];
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[26] = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'extra'}{'spaces_after_command'};
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[27]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[28]{'contents'}[0]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[28];
--- 1715,1722 ----
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'contents'}[0]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25];
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'contents'}[1]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25];
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'extra'}{'spaces_after_command'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'contents'}[0];
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[26]{'extra'}{'command'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25];
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[26]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[27]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[28]{'contents'}[0]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[28];
***************
*** 1732,1739 ****
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29]{'contents'}[0]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29];
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29]{'contents'}[1]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29];
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29];
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[30] = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29]{'extra'}{'spaces_after_command'};
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[31]{'contents'}[0]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[31];
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[31]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
--- 1725,1732 ----
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29]{'contents'}[0]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29];
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29]{'contents'}[1]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29];
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29]{'extra'}{'spaces_after_command'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29]{'contents'}[0];
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[30]{'extra'}{'command'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29];
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[30]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[31]{'contents'}[0]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[31];
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[31]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
***************
*** 1744,1751 ****
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34]{'contents'}[0]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34];
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34]{'contents'}[1]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34];
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34];
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[35] = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34]{'extra'}{'spaces_after_command'};
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[36]{'contents'}[0]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[36];
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[36]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
--- 1737,1744 ----
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34]{'contents'}[0]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34];
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34]{'contents'}[1]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34];
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34]{'extra'}{'spaces_after_command'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34]{'contents'}[0];
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[35]{'extra'}{'command'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34];
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[35]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[36]{'contents'}[0]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[36];
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[36]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
***************
*** 1756,1763 ****
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39]{'contents'}[0]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39];
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39]{'contents'}[1]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39];
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39];
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[40] = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39]{'extra'}{'spaces_after_command'};
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[41]{'contents'}[0]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[41];
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[41]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
--- 1749,1756 ----
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39]{'contents'}[0]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39];
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39]{'contents'}[1]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39];
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39]{'extra'}{'spaces_after_command'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39]{'contents'}[0];
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[40]{'extra'}{'command'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39];
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[40]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[41]{'contents'}[0]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[41];
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[41]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
***************
*** 1768,1775 ****
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44]{'contents'}[0]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44];
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44]{'contents'}[1]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44];
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44];
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[45] = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44]{'extra'}{'spaces_after_command'};
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[46]{'contents'}[0]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[46];
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[46]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
--- 1761,1768 ----
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44]{'contents'}[0]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44];
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44]{'contents'}[1]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44];
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44]{'extra'}{'spaces_after_command'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44]{'contents'}[0];
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[45]{'extra'}{'command'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44];
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[45]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[46]{'contents'}[0]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[46];
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[46]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
***************
*** 1780,1785 ****
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49]{'contents'}[0]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49];
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49]{'contents'}[1]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49];
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49];
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[50]{'contents'}[0]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[50];
--- 1773,1777 ----
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49]{'contents'}[0]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49];
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49]{'contents'}[1]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49];
! $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49]{'extra'}{'spaces_after_command'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49]{'contents'}[0];
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'};
  $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[50]{'contents'}[0]{'parent'} = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[50];
***************
*** 1916,1934 ****
  $result_errors{'raw_commands_and_end_of_lines'} = [
    {
!     'error_line' => ':13: warning: @html should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 13,
      'macro' => '',
!     'text' => '@html should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':18: warning: @html should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 18,
      'macro' => '',
!     'text' => '@html should only appear at a line beginning',
      'type' => 'warning'
    },
--- 1908,1926 ----
  $result_errors{'raw_commands_and_end_of_lines'} = [
    {
!     'error_line' => ':13: warning: @html should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 13,
      'macro' => '',
!     'text' => '@html should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':18: warning: @html should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 18,
      'macro' => '',
!     'text' => '@html should only appear at the beginning of a line',
      'type' => 'warning'
    },
***************
*** 1943,1961 ****
    },
    {
!     'error_line' => ':22: warning: @html should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 22,
      'macro' => '',
!     'text' => '@html should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':27: warning: @html should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 27,
      'macro' => '',
!     'text' => '@html should only appear at a line beginning',
      'type' => 'warning'
    },
--- 1935,1953 ----
    },
    {
!     'error_line' => ':22: warning: @html should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 22,
      'macro' => '',
!     'text' => '@html should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':27: warning: @html should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 27,
      'macro' => '',
!     'text' => '@html should only appear at the beginning of a line',
      'type' => 'warning'
    },
***************
*** 1970,1988 ****
    },
    {
!     'error_line' => ':41: warning: @tex should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 41,
      'macro' => '',
!     'text' => '@tex should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':46: warning: @tex should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 46,
      'macro' => '',
!     'text' => '@tex should only appear at a line beginning',
      'type' => 'warning'
    },
--- 1962,1980 ----
    },
    {
!     'error_line' => ':41: warning: @tex should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 41,
      'macro' => '',
!     'text' => '@tex should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':46: warning: @tex should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 46,
      'macro' => '',
!     'text' => '@tex should only appear at the beginning of a line',
      'type' => 'warning'
    },
***************
*** 1997,2015 ****
    },
    {
!     'error_line' => ':50: warning: @tex should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 50,
      'macro' => '',
!     'text' => '@tex should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':55: warning: @tex should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 55,
      'macro' => '',
!     'text' => '@tex should only appear at a line beginning',
      'type' => 'warning'
    },
--- 1989,2007 ----
    },
    {
!     'error_line' => ':50: warning: @tex should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 50,
      'macro' => '',
!     'text' => '@tex should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':55: warning: @tex should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 55,
      'macro' => '',
!     'text' => '@tex should only appear at the beginning of a line',
      'type' => 'warning'
    },
***************
*** 2024,2042 ****
    },
    {
!     'error_line' => ':69: warning: @verbatim should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 69,
      'macro' => '',
!     'text' => '@verbatim should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':74: warning: @verbatim should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 74,
      'macro' => '',
!     'text' => '@verbatim should only appear at a line beginning',
      'type' => 'warning'
    },
--- 2016,2034 ----
    },
    {
!     'error_line' => ':69: warning: @verbatim should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 69,
      'macro' => '',
!     'text' => '@verbatim should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':74: warning: @verbatim should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 74,
      'macro' => '',
!     'text' => '@verbatim should only appear at the beginning of a line',
      'type' => 'warning'
    },
***************
*** 2051,2069 ****
    },
    {
!     'error_line' => ':78: warning: @verbatim should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 78,
      'macro' => '',
!     'text' => '@verbatim should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':83: warning: @verbatim should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 83,
      'macro' => '',
!     'text' => '@verbatim should only appear at a line beginning',
      'type' => 'warning'
    },
--- 2043,2061 ----
    },
    {
!     'error_line' => ':78: warning: @verbatim should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 78,
      'macro' => '',
!     'text' => '@verbatim should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':83: warning: @verbatim should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 83,
      'macro' => '',
!     'text' => '@verbatim should only appear at the beginning of a line',
      'type' => 'warning'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/raw/raw_in_example.pl texinfo-6.3/tp/t/results/raw/raw_in_example.pl
*** texinfo-6.1/tp/t/results/raw/raw_in_example.pl	2016-01-22 07:49:44.000000000 +0000
--- texinfo-6.3/tp/t/results/raw/raw_in_example.pl	2016-08-02 18:44:25.000000000 +0100
***************
*** 305,311 ****
--- 305,313 ----
                      },
                      {
+                       'parent' => {},
                        'text' => '{i=1'
                      },
                      {
+                       'parent' => {},
                        'text' => '}^N
  '
***************
*** 517,520 ****
--- 519,524 ----
  $result_trees{'raw_in_example'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'raw_in_example'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1];
  $result_trees{'raw_in_example'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'raw_in_example'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1];
+ $result_trees{'raw_in_example'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'raw_in_example'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1];
+ $result_trees{'raw_in_example'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'raw_in_example'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1];
  $result_trees{'raw_in_example'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'raw_in_example'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1];
  $result_trees{'raw_in_example'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'raw_in_example'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/raw/raw_in_para.pl texinfo-6.3/tp/t/results/raw/raw_in_para.pl
*** texinfo-6.1/tp/t/results/raw/raw_in_para.pl	2016-01-22 07:49:44.000000000 +0000
--- texinfo-6.3/tp/t/results/raw/raw_in_para.pl	2016-08-02 18:44:25.000000000 +0100
***************
*** 39,51 ****
        ],
        'extra' => {
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 39,43 ----
        ],
        'extra' => {
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 56,60 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 48,60 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 284,291 ****
  $result_trees{'raw_in_para'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'raw_in_para'}{'contents'}[1];
  $result_trees{'raw_in_para'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'raw_in_para'}{'contents'}[1];
! $result_trees{'raw_in_para'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'raw_in_para'}{'contents'}[1];
! $result_trees{'raw_in_para'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'raw_in_para'};
  $result_trees{'raw_in_para'}{'contents'}[1]{'parent'} = $result_trees{'raw_in_para'};
! $result_trees{'raw_in_para'}{'contents'}[2] = $result_trees{'raw_in_para'}{'contents'}[1]{'extra'}{'spaces_after_command'};
  $result_trees{'raw_in_para'}{'contents'}[3]{'parent'} = $result_trees{'raw_in_para'};
  $result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'raw_in_para'}{'contents'}[4];
--- 284,291 ----
  $result_trees{'raw_in_para'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'raw_in_para'}{'contents'}[1];
  $result_trees{'raw_in_para'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'raw_in_para'}{'contents'}[1];
! $result_trees{'raw_in_para'}{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'raw_in_para'}{'contents'}[1]{'contents'}[0];
  $result_trees{'raw_in_para'}{'contents'}[1]{'parent'} = $result_trees{'raw_in_para'};
! $result_trees{'raw_in_para'}{'contents'}[2]{'extra'}{'command'} = $result_trees{'raw_in_para'}{'contents'}[1];
! $result_trees{'raw_in_para'}{'contents'}[2]{'parent'} = $result_trees{'raw_in_para'};
  $result_trees{'raw_in_para'}{'contents'}[3]{'parent'} = $result_trees{'raw_in_para'};
  $result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'raw_in_para'}{'contents'}[4];
diff -Nrc2 texinfo-6.1/tp/t/results/raw/tex_not_closed.pl texinfo-6.3/tp/t/results/raw/tex_not_closed.pl
*** texinfo-6.1/tp/t/results/raw/tex_not_closed.pl	2016-01-22 07:49:44.000000000 +0000
--- texinfo-6.3/tp/t/results/raw/tex_not_closed.pl	2016-08-02 18:44:25.000000000 +0100
***************
*** 33,39 ****
--- 33,41 ----
              },
              {
+               'parent' => {},
                'text' => '{'
              },
              {
+               'parent' => {},
                'text' => '}
  '
***************
*** 61,64 ****
--- 63,68 ----
  $result_trees{'tex_not_closed'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'tex_not_closed'}{'contents'}[0]{'contents'}[1];
  $result_trees{'tex_not_closed'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'tex_not_closed'}{'contents'}[0]{'contents'}[1];
+ $result_trees{'tex_not_closed'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'tex_not_closed'}{'contents'}[0]{'contents'}[1];
+ $result_trees{'tex_not_closed'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'tex_not_closed'}{'contents'}[0]{'contents'}[1];
  $result_trees{'tex_not_closed'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'tex_not_closed'}{'contents'}[0];
  $result_trees{'tex_not_closed'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'tex_not_closed'}{'contents'}[0]{'contents'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/raw/verbatim_and_verbatiminclude.pl texinfo-6.3/tp/t/results/raw/verbatim_and_verbatiminclude.pl
*** texinfo-6.1/tp/t/results/raw/verbatim_and_verbatiminclude.pl	2016-01-22 07:49:44.000000000 +0000
--- texinfo-6.3/tp/t/results/raw/verbatim_and_verbatiminclude.pl	2016-08-02 18:44:25.000000000 +0100
***************
*** 28,40 ****
        ],
        'extra' => {
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 28,32 ----
        ],
        'extra' => {
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 45,49 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 37,49 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 83,95 ****
        ],
        'extra' => {
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 83,87 ----
        ],
        'extra' => {
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 100,104 ****
        'parent' => {}
      },
!     {},
      {
        'contents' => [
--- 92,104 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'contents' => [
***************
*** 167,179 ****
            ],
            'extra' => {
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 167,171 ----
            ],
            'extra' => {
!             'spaces_after_command' => {}
            },
            'line_nr' => {
***************
*** 184,188 ****
            'parent' => {}
          },
!         {},
          {
            'args' => [
--- 176,188 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'args' => [
***************
*** 275,287 ****
        ],
        'extra' => {
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 275,279 ----
        ],
        'extra' => {
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 292,296 ****
        'parent' => {}
      },
!     {},
      {
        'contents' => [
--- 284,296 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'contents' => [
***************
*** 598,610 ****
            ],
            'extra' => {
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 598,602 ----
            ],
            'extra' => {
!             'spaces_after_command' => {}
            },
            'line_nr' => {
***************
*** 615,619 ****
            'parent' => {}
          },
!         {},
          {
            'contents' => [
--- 607,619 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'contents' => [
***************
*** 742,754 ****
            ],
            'extra' => {
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 742,746 ----
            ],
            'extra' => {
!             'spaces_after_command' => {}
            },
            'line_nr' => {
***************
*** 759,763 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 751,763 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 874,886 ****
            ],
            'extra' => {
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => '
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 874,878 ----
            ],
            'extra' => {
!             'spaces_after_command' => {}
            },
            'line_nr' => {
***************
*** 891,895 ****
            'parent' => {}
          },
!         {},
          {
            'contents' => [
--- 883,895 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'contents' => [
***************
*** 962,969 ****
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'verbatim_and_verbatiminclude'};
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'};
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[1] = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[2]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'};
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[3];
--- 962,969 ----
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[0];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'};
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[1]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'};
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[2]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'};
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[3];
***************
*** 972,979 ****
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'verbatim_and_verbatiminclude'};
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'};
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[5] = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4]{'extra'}{'spaces_after_command'};
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[6];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[6]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'};
--- 972,979 ----
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4]{'extra'}{'spaces_after_command'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4]{'contents'}[0];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'};
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[5]{'extra'}{'command'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[4];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[5]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'};
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[6];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[6]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'};
***************
*** 987,994 ****
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[3] = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2]{'extra'}{'spaces_after_command'};
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[4];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[4]{'args'}[0];
--- 987,994 ----
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2]{'contents'}[0];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[3]{'extra'}{'command'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[2];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[3]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[4];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[8]{'contents'}[4]{'args'}[0];
***************
*** 1008,1015 ****
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11]{'contents'}[0]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11]{'contents'}[1]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'verbatim_and_verbatiminclude'};
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'};
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[12] = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11]{'extra'}{'spaces_after_command'};
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[13]{'contents'}[0]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[13];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[13]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'};
--- 1008,1015 ----
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11]{'contents'}[0]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11]{'contents'}[1]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11]{'extra'}{'spaces_after_command'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11]{'contents'}[0];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'};
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[12]{'extra'}{'command'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[11];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[12]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'};
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[13]{'contents'}[0]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[13];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[13]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'};
***************
*** 1067,1074 ****
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[3] = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2]{'extra'}{'spaces_after_command'};
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[4];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[4]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23];
--- 1067,1074 ----
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2]{'contents'}[0];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[3]{'extra'}{'command'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[2];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[3]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[4];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23]{'contents'}[4]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[23];
***************
*** 1094,1101 ****
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[4] = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3]{'extra'}{'spaces_after_command'};
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[5]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[6]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[6];
--- 1094,1101 ----
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3]{'contents'}[0];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[4]{'extra'}{'command'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[3];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[4]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[5]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[6]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[25]{'contents'}[6];
***************
*** 1119,1126 ****
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[4] = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3]{'extra'}{'spaces_after_command'};
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[5];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[5]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27];
--- 1119,1126 ----
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3]{'contents'}[0];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[4]{'extra'}{'command'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[3];
! $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[4]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[5];
  $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27]{'contents'}[5]{'parent'} = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[27];
diff -Nrc2 texinfo-6.1/tp/t/results/raw/verbatim_in_brace_command.pl texinfo-6.3/tp/t/results/raw/verbatim_in_brace_command.pl
*** texinfo-6.1/tp/t/results/raw/verbatim_in_brace_command.pl	2016-01-22 07:49:44.000000000 +0000
--- texinfo-6.3/tp/t/results/raw/verbatim_in_brace_command.pl	2016-08-02 18:44:25.000000000 +0100
***************
*** 58,70 ****
        'extra' => {
          'invalid_nesting' => 1,
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 58,62 ----
        'extra' => {
          'invalid_nesting' => 1,
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 75,79 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 67,79 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 91,98 ****
  $result_trees{'verbatim_in_brace_command'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'verbatim_in_brace_command'}{'contents'}[1];
  $result_trees{'verbatim_in_brace_command'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'verbatim_in_brace_command'}{'contents'}[1];
! $result_trees{'verbatim_in_brace_command'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'verbatim_in_brace_command'}{'contents'}[1];
! $result_trees{'verbatim_in_brace_command'}{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'verbatim_in_brace_command'};
  $result_trees{'verbatim_in_brace_command'}{'contents'}[1]{'parent'} = $result_trees{'verbatim_in_brace_command'};
! $result_trees{'verbatim_in_brace_command'}{'contents'}[2] = $result_trees{'verbatim_in_brace_command'}{'contents'}[1]{'extra'}{'spaces_after_command'};
  $result_trees{'verbatim_in_brace_command'}{'contents'}[3]{'parent'} = $result_trees{'verbatim_in_brace_command'};
  
--- 91,98 ----
  $result_trees{'verbatim_in_brace_command'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'verbatim_in_brace_command'}{'contents'}[1];
  $result_trees{'verbatim_in_brace_command'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'verbatim_in_brace_command'}{'contents'}[1];
! $result_trees{'verbatim_in_brace_command'}{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'verbatim_in_brace_command'}{'contents'}[1]{'contents'}[0];
  $result_trees{'verbatim_in_brace_command'}{'contents'}[1]{'parent'} = $result_trees{'verbatim_in_brace_command'};
! $result_trees{'verbatim_in_brace_command'}{'contents'}[2]{'extra'}{'command'} = $result_trees{'verbatim_in_brace_command'}{'contents'}[1];
! $result_trees{'verbatim_in_brace_command'}{'contents'}[2]{'parent'} = $result_trees{'verbatim_in_brace_command'};
  $result_trees{'verbatim_in_brace_command'}{'contents'}[3]{'parent'} = $result_trees{'verbatim_in_brace_command'};
  
***************
*** 112,121 ****
  $result_errors{'verbatim_in_brace_command'} = [
    {
!     'error_line' => ':1: @samp missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@samp missing close brace',
      'type' => 'error'
    },
--- 112,121 ----
  $result_errors{'verbatim_in_brace_command'} = [
    {
!     'error_line' => ':1: @samp missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@samp missing closing brace',
      'type' => 'error'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/regions/anchor_in_copying.pl texinfo-6.3/tp/t/results/regions/anchor_in_copying.pl
*** texinfo-6.1/tp/t/results/regions/anchor_in_copying.pl	2016-01-22 07:49:55.000000000 +0000
--- texinfo-6.3/tp/t/results/regions/anchor_in_copying.pl	2016-08-02 18:44:34.000000000 +0100
***************
*** 68,76 ****
                        {}
                      ],
!                     'normalized' => 'Copying-information',
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {
--- 68,72 ----
                        {}
                      ],
!                     'normalized' => 'Copying-information'
                    },
                    'line_nr' => {
***************
*** 82,85 ****
--- 78,82 ----
                  },
                  {
+                   'parent' => {},
                    'text' => '
  ',
***************
*** 263,270 ****
                    ],
                    'normalized' => 'Copying-information'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 260,263 ----
***************
*** 326,329 ****
--- 319,323 ----
  $result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
  $result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
+ $result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
  $result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[1];
  $result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/regions/anchor_in_copying_in_footnote.pl texinfo-6.3/tp/t/results/regions/anchor_in_copying_in_footnote.pl
*** texinfo-6.1/tp/t/results/regions/anchor_in_copying_in_footnote.pl	2016-01-22 07:49:55.000000000 +0000
--- texinfo-6.3/tp/t/results/regions/anchor_in_copying_in_footnote.pl	2016-08-02 18:44:34.000000000 +0100
***************
*** 78,86 ****
                                    {}
                                  ],
!                                 'normalized' => 'Copying-footnote',
!                                 'spaces_before_argument' => {
!                                   'text' => '',
!                                   'type' => 'empty_spaces_before_argument'
!                                 }
                                },
                                'line_nr' => {
--- 78,82 ----
                                    {}
                                  ],
!                                 'normalized' => 'Copying-footnote'
                                },
                                'line_nr' => {
***************
*** 92,95 ****
--- 88,92 ----
                              },
                              {
+                               'parent' => {},
                                'text' => '
  ',
***************
*** 299,306 ****
                    ],
                    'normalized' => 'Copying-footnote'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 296,299 ----
***************
*** 363,366 ****
--- 356,360 ----
  $result_trees{'anchor_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'anchor_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
  $result_trees{'anchor_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'anchor_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1];
+ $result_trees{'anchor_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'anchor_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1];
  $result_trees{'anchor_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'anchor_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
  $result_trees{'anchor_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'anchor_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/regions/anchor_in_titlepage.pl texinfo-6.3/tp/t/results/regions/anchor_in_titlepage.pl
*** texinfo-6.1/tp/t/results/regions/anchor_in_titlepage.pl	2016-01-22 07:49:55.000000000 +0000
--- texinfo-6.3/tp/t/results/regions/anchor_in_titlepage.pl	2016-08-02 18:44:35.000000000 +0100
***************
*** 55,63 ****
                    {}
                  ],
!                 'normalized' => 'in-titlepage',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 55,59 ----
                    {}
                  ],
!                 'normalized' => 'in-titlepage'
                },
                'line_nr' => {
***************
*** 69,72 ****
--- 65,69 ----
              },
              {
+               'parent' => {},
                'text' => '
  ',
***************
*** 243,250 ****
                    ],
                    'normalized' => 'in-titlepage'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 240,243 ----
***************
*** 298,301 ****
--- 291,295 ----
  $result_trees{'anchor_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}[0] = $result_trees{'anchor_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
  $result_trees{'anchor_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'anchor_in_titlepage'}{'contents'}[0]{'contents'}[0];
+ $result_trees{'anchor_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'anchor_in_titlepage'}{'contents'}[0]{'contents'}[0];
  $result_trees{'anchor_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'anchor_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
  $result_trees{'anchor_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'anchor_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/regions/anchor_in_titlepage_titlepage.pl texinfo-6.3/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
*** texinfo-6.1/tp/t/results/regions/anchor_in_titlepage_titlepage.pl	2016-01-22 07:49:55.000000000 +0000
--- texinfo-6.3/tp/t/results/regions/anchor_in_titlepage_titlepage.pl	2016-08-02 18:44:35.000000000 +0100
***************
*** 55,63 ****
                    {}
                  ],
!                 'normalized' => 'in-titlepage',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 55,59 ----
                    {}
                  ],
!                 'normalized' => 'in-titlepage'
                },
                'line_nr' => {
***************
*** 69,72 ****
--- 65,69 ----
              },
              {
+               'parent' => {},
                'text' => '
  ',
***************
*** 243,250 ****
                    ],
                    'normalized' => 'in-titlepage'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 240,243 ----
***************
*** 298,301 ****
--- 291,295 ----
  $result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}[0] = $result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
  $result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0];
+ $result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0];
  $result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
  $result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/regions/ref_in_copying.pl texinfo-6.3/tp/t/results/regions/ref_in_copying.pl
*** texinfo-6.1/tp/t/results/regions/ref_in_copying.pl	2016-01-22 07:49:55.000000000 +0000
--- texinfo-6.3/tp/t/results/regions/ref_in_copying.pl	2016-08-02 18:44:35.000000000 +0100
***************
*** 99,106 ****
                        ],
                        'normalized' => 'GFDL'
-                     },
-                     'spaces_before_argument' => {
-                       'text' => '',
-                       'type' => 'empty_spaces_before_argument'
                      }
                    },
--- 99,102 ----
diff -Nrc2 texinfo-6.1/tp/t/results/regions/today_in_copying.pl texinfo-6.3/tp/t/results/regions/today_in_copying.pl
*** texinfo-6.1/tp/t/results/regions/today_in_copying.pl	2016-01-22 07:49:55.000000000 +0000
--- texinfo-6.3/tp/t/results/regions/today_in_copying.pl	2016-08-02 18:44:35.000000000 +0100
***************
*** 34,37 ****
--- 34,42 ----
                    'cmdname' => 'today',
                    'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 2,
+                     'macro' => ''
+                   },
                    'parent' => {}
                  },
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/a_comma_after_node.pl texinfo-6.3/tp/t/results/sectioning/a_comma_after_node.pl
*** texinfo-6.1/tp/t/results/sectioning/a_comma_after_node.pl	2016-01-22 07:49:59.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/a_comma_after_node.pl	2016-08-02 18:44:38.000000000 +0100
***************
*** 36,39 ****
--- 36,40 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 50,53 ****
--- 51,55 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 128,133 ****
--- 130,137 ----
  $result_trees{'a_comma_after_node'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'a_comma_after_node'}{'contents'}[1]{'args'}[0];
  $result_trees{'a_comma_after_node'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'a_comma_after_node'}{'contents'}[1];
+ $result_trees{'a_comma_after_node'}{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'a_comma_after_node'}{'contents'}[1]{'args'}[1];
  $result_trees{'a_comma_after_node'}{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'a_comma_after_node'}{'contents'}[1]{'args'}[1];
  $result_trees{'a_comma_after_node'}{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'a_comma_after_node'}{'contents'}[1];
+ $result_trees{'a_comma_after_node'}{'contents'}[1]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'a_comma_after_node'}{'contents'}[1]{'args'}[2];
  $result_trees{'a_comma_after_node'}{'contents'}[1]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'a_comma_after_node'}{'contents'}[1]{'args'}[2];
  $result_trees{'a_comma_after_node'}{'contents'}[1]{'args'}[2]{'contents'}[2]{'parent'} = $result_trees{'a_comma_after_node'}{'contents'}[1]{'args'}[2];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/anchor_in_footnote.pl texinfo-6.3/tp/t/results/sectioning/anchor_in_footnote.pl
*** texinfo-6.1/tp/t/results/sectioning/anchor_in_footnote.pl	2016-01-22 07:50:02.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/anchor_in_footnote.pl	2016-08-02 18:44:41.000000000 +0100
***************
*** 138,146 ****
                                {}
                              ],
!                             'normalized' => 'Anchor-in-footnote',
!                             'spaces_before_argument' => {
!                               'text' => '',
!                               'type' => 'empty_spaces_before_argument'
!                             }
                            },
                            'line_nr' => {
--- 138,142 ----
                                {}
                              ],
!                             'normalized' => 'Anchor-in-footnote'
                            },
                            'line_nr' => {
***************
*** 167,177 ****
                'cmdname' => 'footnote',
                'contents' => [],
-               'extra' => {
-                 'spaces_before_argument' => {
-                   'parent' => {},
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
-                 }
-               },
                'line_nr' => {
                  'file_name' => '',
--- 163,166 ----
***************
*** 452,459 ****
                    ],
                    'normalized' => 'Anchor-in-footnote'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 441,444 ----
***************
*** 519,523 ****
  $result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
- $result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[1];
  $result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[1];
--- 504,507 ----
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/anchor_in_footnote_separate.pl texinfo-6.3/tp/t/results/sectioning/anchor_in_footnote_separate.pl
*** texinfo-6.1/tp/t/results/sectioning/anchor_in_footnote_separate.pl	2016-01-22 07:50:02.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/anchor_in_footnote_separate.pl	2016-08-02 18:44:41.000000000 +0100
***************
*** 180,188 ****
                                {}
                              ],
!                             'normalized' => 'Anchor-in-footnote',
!                             'spaces_before_argument' => {
!                               'text' => '',
!                               'type' => 'empty_spaces_before_argument'
!                             }
                            },
                            'line_nr' => {
--- 180,184 ----
                                {}
                              ],
!                             'normalized' => 'Anchor-in-footnote'
                            },
                            'line_nr' => {
***************
*** 209,219 ****
                'cmdname' => 'footnote',
                'contents' => [],
-               'extra' => {
-                 'spaces_before_argument' => {
-                   'parent' => {},
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
-                 }
-               },
                'line_nr' => {
                  'file_name' => '',
--- 205,208 ----
***************
*** 494,501 ****
                    ],
                    'normalized' => 'Anchor-in-footnote'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 483,486 ----
***************
*** 568,572 ****
  $result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
- $result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[1];
  $result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[1];
--- 553,556 ----
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/anchor_zero.pl texinfo-6.3/tp/t/results/sectioning/anchor_zero.pl
*** texinfo-6.1/tp/t/results/sectioning/anchor_zero.pl	2016-01-22 07:50:01.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/anchor_zero.pl	2016-08-02 18:44:40.000000000 +0100
***************
*** 72,80 ****
                {}
              ],
!             'normalized' => '0',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 72,76 ----
                {}
              ],
!             'normalized' => '0'
            },
            'line_nr' => {
***************
*** 131,138 ****
                    ],
                    'normalized' => '0'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 127,130 ----
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/at_commands_in_node.pl texinfo-6.3/tp/t/results/sectioning/at_commands_in_node.pl
*** texinfo-6.1/tp/t/results/sectioning/at_commands_in_node.pl	2016-01-22 07:49:59.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/at_commands_in_node.pl	2016-08-02 18:44:38.000000000 +0100
***************
*** 69,72 ****
--- 69,74 ----
                ],
                'cmdname' => '"',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 129,132 ****
--- 131,136 ----
                        ],
                        'cmdname' => '=',
+                       'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 155,158 ****
--- 159,163 ----
                'cmdname' => 'l',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 179,182 ****
--- 184,189 ----
                        ],
                        'cmdname' => '\'',
+                       'contents' => [],
+                       'line_nr' => {},
                        'parent' => {}
                      }
***************
*** 205,208 ****
--- 212,216 ----
                'cmdname' => 'exclamdown',
                'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              }
***************
*** 256,259 ****
--- 264,268 ----
  $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[4]{'args'}[0];
  $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[4];
+ $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0];
  $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0];
***************
*** 268,271 ****
--- 277,281 ----
  $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[8]{'args'}[0];
  $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[8];
***************
*** 274,281 ****
--- 284,293 ----
  $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0];
  $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[10];
+ $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0];
  $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0];
  $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0];
+ $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[12]{'args'}[0];
  $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[12];
***************
*** 284,287 ****
--- 296,300 ----
  $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0];
  $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[14];
+ $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[14]{'line_nr'} = $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0];
  $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_node'}{'contents'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/character_and_spaces_in_node.pl texinfo-6.3/tp/t/results/sectioning/character_and_spaces_in_node.pl
*** texinfo-6.1/tp/t/results/sectioning/character_and_spaces_in_node.pl	2016-01-22 07:50:01.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/character_and_spaces_in_node.pl	2016-08-02 18:44:41.000000000 +0100
***************
*** 92,95 ****
--- 92,96 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 106,109 ****
--- 107,111 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 120,123 ****
--- 122,126 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 201,204 ****
--- 204,208 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 215,218 ****
--- 219,223 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 229,232 ****
--- 234,238 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 330,333 ****
--- 336,340 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 493,500 ****
--- 500,510 ----
  $result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'args'}[0];
  $result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'character_and_spaces_in_node'}{'contents'}[2];
+ $result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'args'}[1];
  $result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'args'}[1];
  $result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'character_and_spaces_in_node'}{'contents'}[2];
+ $result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'args'}[2];
  $result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'args'}[2];
  $result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'args'}[2]{'parent'} = $result_trees{'character_and_spaces_in_node'}{'contents'}[2];
+ $result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'args'}[3];
  $result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'args'}[3];
  $result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'args'}[3];
***************
*** 511,518 ****
--- 521,531 ----
  $result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'args'}[0];
  $result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'character_and_spaces_in_node'}{'contents'}[3];
+ $result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'args'}[1];
  $result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'args'}[1];
  $result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'args'}[1]{'parent'} = $result_trees{'character_and_spaces_in_node'}{'contents'}[3];
+ $result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'args'}[2];
  $result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'args'}[2];
  $result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'args'}[2]{'parent'} = $result_trees{'character_and_spaces_in_node'}{'contents'}[3];
+ $result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'args'}[3];
  $result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'args'}[3];
  $result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'args'}[3];
***************
*** 533,536 ****
--- 546,550 ----
  $result_trees{'character_and_spaces_in_node'}{'contents'}[4]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_node'}{'contents'}[4]{'args'}[2];
  $result_trees{'character_and_spaces_in_node'}{'contents'}[4]{'args'}[2]{'parent'} = $result_trees{'character_and_spaces_in_node'}{'contents'}[4];
+ $result_trees{'character_and_spaces_in_node'}{'contents'}[4]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_node'}{'contents'}[4]{'args'}[3];
  $result_trees{'character_and_spaces_in_node'}{'contents'}[4]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_node'}{'contents'}[4]{'args'}[3];
  $result_trees{'character_and_spaces_in_node'}{'contents'}[4]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'character_and_spaces_in_node'}{'contents'}[4]{'args'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/character_and_spaces_in_refs.pl texinfo-6.3/tp/t/results/sectioning/character_and_spaces_in_refs.pl
*** texinfo-6.1/tp/t/results/sectioning/character_and_spaces_in_refs.pl	2016-01-22 07:50:01.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/character_and_spaces_in_refs.pl	2016-08-02 18:44:40.000000000 +0100
***************
*** 280,283 ****
--- 280,284 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 309,312 ****
--- 310,314 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 405,412 ****
                    ],
                    'normalized' => '_003a'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 407,410 ----
***************
*** 428,431 ****
--- 426,430 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 457,460 ****
--- 456,460 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 537,544 ****
                    ],
                    'normalized' => 'Cross-References'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 537,540 ----
***************
*** 580,583 ****
--- 576,580 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 610,617 ****
                    ],
                    'normalized' => 'node'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 607,610 ----
***************
*** 732,735 ****
--- 725,729 ----
                        'contents' => [
                          {
+                           'parent' => {},
                            'text' => ' ',
                            'type' => 'empty_spaces_before_argument'
***************
*** 746,749 ****
--- 740,744 ----
                        'contents' => [
                          {
+                           'parent' => {},
                            'text' => ' ',
                            'type' => 'empty_spaces_before_argument'
***************
*** 760,763 ****
--- 755,759 ----
                        'contents' => [
                          {
+                           'parent' => {},
                            'text' => ' ',
                            'type' => 'empty_spaces_before_argument'
***************
*** 830,837 ****
                    ],
                    'normalized' => '_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 826,829 ----
***************
*** 912,915 ****
--- 904,908 ----
                        'contents' => [
                          {
+                           'parent' => {},
                            'text' => ' ',
                            'type' => 'empty_spaces_before_argument'
***************
*** 982,989 ****
                    ],
                    'normalized' => '_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 975,978 ----
***************
*** 1005,1008 ****
--- 994,998 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1051,1054 ****
--- 1041,1045 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => '  ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1233,1236 ****
--- 1224,1228 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 1247,1250 ****
--- 1239,1243 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 1261,1264 ****
--- 1254,1258 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 1679,1682 ****
--- 1673,1677 ----
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[4]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2];
+ $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0];
***************
*** 1684,1687 ****
--- 1679,1683 ----
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[0];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[2]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[0];
+ $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[3];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[3];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[3]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[0];
***************
*** 1703,1706 ****
--- 1699,1703 ----
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5];
+ $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[0];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[0];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[0];
***************
*** 1708,1711 ****
--- 1705,1709 ----
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[4];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[2]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[4];
+ $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[3];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[3];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[3]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[4];
***************
*** 1727,1730 ****
--- 1725,1729 ----
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[8]{'args'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[8];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[8]{'args'}[2]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[8];
+ $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[8]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[8]{'args'}[3];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[8]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[8]{'args'}[3];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[8]{'args'}[3]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[8];
***************
*** 1752,1759 ****
--- 1751,1761 ----
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[0];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'};
+ $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[1];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[1];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'};
+ $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[2];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[2];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[2]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'};
+ $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[3];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[3];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[3];
***************
*** 1781,1784 ****
--- 1783,1787 ----
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'args'}[2];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'args'}[2]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'};
+ $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'args'}[3];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'args'}[3];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'args'}[3];
***************
*** 1795,1798 ****
--- 1798,1802 ----
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9];
+ $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[4]{'args'}[0];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[4]{'args'}[0];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[4];
***************
*** 1803,1806 ****
--- 1807,1811 ----
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[4]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[5]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9];
+ $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[6]{'args'}[0];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[6]{'args'}[0];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[9]{'contents'}[6];
***************
*** 1836,1843 ****
--- 1841,1851 ----
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[3]{'args'}[0];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[3];
+ $result_trees{'character_and_spaces_in_refs'}{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[3]{'args'}[1];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[3]{'args'}[1];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[3]{'args'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[3];
+ $result_trees{'character_and_spaces_in_refs'}{'contents'}[3]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[3]{'args'}[2];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[3]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[3]{'args'}[2];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[3]{'args'}[2]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[3];
+ $result_trees{'character_and_spaces_in_refs'}{'contents'}[3]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[3]{'args'}[3];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[3]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[3]{'args'}[3];
  $result_trees{'character_and_spaces_in_refs'}{'contents'}[3]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'character_and_spaces_in_refs'}{'contents'}[3]{'args'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl texinfo-6.3/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl
*** texinfo-6.1/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl	2016-01-22 07:50:01.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl	2016-08-02 18:44:40.000000000 +0100
***************
*** 281,284 ****
--- 281,285 ----
                      'contents' => [
                        {
+                         'parent' => {},
                          'text' => ' ',
                          'type' => 'empty_spaces_before_argument'
***************
*** 310,313 ****
--- 311,315 ----
                      'contents' => [
                        {
+                         'parent' => {},
                          'text' => ' ',
                          'type' => 'empty_spaces_before_argument'
***************
*** 406,413 ****
                      ],
                      'normalized' => '_003a'
-                   },
-                   'spaces_before_argument' => {
-                     'text' => '',
-                     'type' => 'empty_spaces_before_argument'
                    }
                  },
--- 408,411 ----
***************
*** 429,432 ****
--- 427,431 ----
                      'contents' => [
                        {
+                         'parent' => {},
                          'text' => ' ',
                          'type' => 'empty_spaces_before_argument'
***************
*** 458,461 ****
--- 457,461 ----
                      'contents' => [
                        {
+                         'parent' => {},
                          'text' => ' ',
                          'type' => 'empty_spaces_before_argument'
***************
*** 538,545 ****
                      ],
                      'normalized' => 'Cross-References'
-                   },
-                   'spaces_before_argument' => {
-                     'text' => '',
-                     'type' => 'empty_spaces_before_argument'
                    }
                  },
--- 538,541 ----
***************
*** 581,584 ****
--- 577,581 ----
                      'contents' => [
                        {
+                         'parent' => {},
                          'text' => ' ',
                          'type' => 'empty_spaces_before_argument'
***************
*** 611,618 ****
                      ],
                      'normalized' => 'node'
-                   },
-                   'spaces_before_argument' => {
-                     'text' => '',
-                     'type' => 'empty_spaces_before_argument'
                    }
                  },
--- 608,611 ----
***************
*** 733,736 ****
--- 726,730 ----
                          'contents' => [
                            {
+                             'parent' => {},
                              'text' => ' ',
                              'type' => 'empty_spaces_before_argument'
***************
*** 747,750 ****
--- 741,745 ----
                          'contents' => [
                            {
+                             'parent' => {},
                              'text' => ' ',
                              'type' => 'empty_spaces_before_argument'
***************
*** 761,764 ****
--- 756,760 ----
                          'contents' => [
                            {
+                             'parent' => {},
                              'text' => ' ',
                              'type' => 'empty_spaces_before_argument'
***************
*** 853,856 ****
--- 849,853 ----
                                  'contents' => [
                                    {
+                                     'parent' => {},
                                      'text' => ' ',
                                      'type' => 'empty_spaces_before_argument'
***************
*** 867,870 ****
--- 864,868 ----
                                  'contents' => [
                                    {
+                                     'parent' => {},
                                      'text' => ' ',
                                      'type' => 'empty_spaces_before_argument'
***************
*** 881,884 ****
--- 879,883 ----
                                  'contents' => [
                                    {
+                                     'parent' => {},
                                      'text' => ' ',
                                      'type' => 'empty_spaces_before_argument'
***************
*** 1253,1260 ****
                      ],
                      'normalized' => '_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
-                   },
-                   'spaces_before_argument' => {
-                     'text' => '',
-                     'type' => 'empty_spaces_before_argument'
                    }
                  },
--- 1252,1255 ----
***************
*** 1335,1338 ****
--- 1330,1334 ----
                          'contents' => [
                            {
+                             'parent' => {},
                              'text' => ' ',
                              'type' => 'empty_spaces_before_argument'
***************
*** 1415,1422 ****
                      ],
                      'normalized' => '_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
-                   },
-                   'spaces_before_argument' => {
-                     'text' => '',
-                     'type' => 'empty_spaces_before_argument'
                    }
                  },
--- 1411,1414 ----
***************
*** 1438,1441 ****
--- 1430,1434 ----
                      'contents' => [
                        {
+                         'parent' => {},
                          'text' => ' ',
                          'type' => 'empty_spaces_before_argument'
***************
*** 1484,1487 ****
--- 1477,1481 ----
                      'contents' => [
                        {
+                         'parent' => {},
                          'text' => '  ',
                          'type' => 'empty_spaces_before_argument'
***************
*** 1727,1730 ****
--- 1721,1725 ----
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[4]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2];
+ $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0];
***************
*** 1732,1735 ****
--- 1727,1731 ----
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[0];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[2]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[0];
+ $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[3];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[3];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[3]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[0];
***************
*** 1751,1754 ****
--- 1747,1751 ----
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[3]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5];
+ $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[0];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[0];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[0];
***************
*** 1756,1759 ****
--- 1753,1757 ----
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[4];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[2]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[4];
+ $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[3];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[3];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[3]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[4];
***************
*** 1775,1778 ****
--- 1773,1777 ----
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[8]{'args'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[8];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[8]{'args'}[2]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[8];
+ $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[8]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[8]{'args'}[3];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[8]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[8]{'args'}[3];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[8]{'args'}[3]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[8];
***************
*** 1800,1807 ****
--- 1799,1809 ----
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[0];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'};
+ $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[1];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[1];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'};
+ $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[2];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[2];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[2]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'};
+ $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[3];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[3];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[3];
***************
*** 1819,1826 ****
--- 1821,1831 ----
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[0];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0];
+ $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[1];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[1];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0];
+ $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[2];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[2];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[2]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0];
+ $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[3];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[3];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[3];
***************
*** 1906,1909 ****
--- 1911,1915 ----
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'args'}[2];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'args'}[2]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'};
+ $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'args'}[3];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'args'}[3];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'args'}[3];
***************
*** 1923,1926 ****
--- 1929,1933 ----
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[3]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9];
+ $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[4]{'args'}[0];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[4]{'args'}[0];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[4];
***************
*** 1931,1934 ****
--- 1938,1942 ----
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[4]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[5]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9];
+ $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'args'}[0];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'args'}[0];
  $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/complex.pl texinfo-6.3/tp/t/results/sectioning/complex.pl
*** texinfo-6.1/tp/t/results/sectioning/complex.pl	2016-01-22 07:49:59.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/complex.pl	2016-08-02 18:44:38.000000000 +0100
***************
*** 2728,2731 ****
--- 2728,2732 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => '  ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 2742,2745 ****
--- 2743,2747 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 2756,2759 ****
--- 2758,2762 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 3533,3540 ****
--- 3536,3546 ----
  $result_trees{'complex'}[12]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'complex'}[12]{'contents'}[0]{'args'}[0];
  $result_trees{'complex'}[12]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'complex'}[12]{'contents'}[0];
+ $result_trees{'complex'}[12]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'complex'}[12]{'contents'}[0]{'args'}[1];
  $result_trees{'complex'}[12]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'complex'}[12]{'contents'}[0]{'args'}[1];
  $result_trees{'complex'}[12]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'complex'}[12]{'contents'}[0];
+ $result_trees{'complex'}[12]{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'complex'}[12]{'contents'}[0]{'args'}[2];
  $result_trees{'complex'}[12]{'contents'}[0]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'complex'}[12]{'contents'}[0]{'args'}[2];
  $result_trees{'complex'}[12]{'contents'}[0]{'args'}[2]{'parent'} = $result_trees{'complex'}[12]{'contents'}[0];
+ $result_trees{'complex'}[12]{'contents'}[0]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'complex'}[12]{'contents'}[0]{'args'}[3];
  $result_trees{'complex'}[12]{'contents'}[0]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'complex'}[12]{'contents'}[0]{'args'}[3];
  $result_trees{'complex'}[12]{'contents'}[0]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'complex'}[12]{'contents'}[0]{'args'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/complex_split_at_node.pl texinfo-6.3/tp/t/results/sectioning/complex_split_at_node.pl
*** texinfo-6.1/tp/t/results/sectioning/complex_split_at_node.pl	2016-01-22 07:49:59.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/complex_split_at_node.pl	2016-08-02 18:44:38.000000000 +0100
***************
*** 2738,2741 ****
--- 2738,2742 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => '  ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 2752,2755 ****
--- 2753,2757 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 2766,2769 ****
--- 2768,2772 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 3556,3563 ****
--- 3559,3569 ----
  $result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[0];
  $result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'complex_split_at_node'}[13]{'contents'}[0];
+ $result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[1];
  $result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[1];
  $result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'complex_split_at_node'}[13]{'contents'}[0];
+ $result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[2];
  $result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[2];
  $result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[2]{'parent'} = $result_trees{'complex_split_at_node'}[13]{'contents'}[0];
+ $result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[3];
  $result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[3];
  $result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/contents_at_document_begin.pl texinfo-6.3/tp/t/results/sectioning/contents_at_document_begin.pl
*** texinfo-6.1/tp/t/results/sectioning/contents_at_document_begin.pl	2016-01-22 07:49:59.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/contents_at_document_begin.pl	2016-08-02 18:44:39.000000000 +0100
***************
*** 15,18 ****
--- 15,19 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => '\\input texinfo @c -*-texinfo-*-
  ',
***************
*** 20,23 ****
--- 21,25 ----
                  },
                  {
+                   'parent' => {},
                    'text' => '
  ',
***************
*** 269,272 ****
--- 271,276 ----
    'type' => 'document_root'
  };
+ $result_trees{'contents_at_document_begin'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'contents_at_document_begin'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+ $result_trees{'contents_at_document_begin'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'contents_at_document_begin'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
  $result_trees{'contents_at_document_begin'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'contents_at_document_begin'}{'contents'}[0]{'contents'}[0];
  $result_trees{'contents_at_document_begin'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'contents_at_document_begin'}{'contents'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/contents_at_end_document.pl texinfo-6.3/tp/t/results/sectioning/contents_at_end_document.pl
*** texinfo-6.1/tp/t/results/sectioning/contents_at_end_document.pl	2016-01-22 07:49:59.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/contents_at_end_document.pl	2016-08-02 18:44:39.000000000 +0100
***************
*** 15,18 ****
--- 15,19 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => '\\input texinfo @c -*-texinfo-*-
  ',
***************
*** 20,23 ****
--- 21,25 ----
                  },
                  {
+                   'parent' => {},
                    'text' => '
  ',
***************
*** 269,272 ****
--- 271,276 ----
    'type' => 'document_root'
  };
+ $result_trees{'contents_at_end_document'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'contents_at_end_document'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+ $result_trees{'contents_at_end_document'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'contents_at_end_document'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
  $result_trees{'contents_at_end_document'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'contents_at_end_document'}{'contents'}[0]{'contents'}[0];
  $result_trees{'contents_at_end_document'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'contents_at_end_document'}{'contents'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/contents_at_end_document_after_node.pl texinfo-6.3/tp/t/results/sectioning/contents_at_end_document_after_node.pl
*** texinfo-6.1/tp/t/results/sectioning/contents_at_end_document_after_node.pl	2016-01-22 07:49:59.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/contents_at_end_document_after_node.pl	2016-08-02 18:44:39.000000000 +0100
***************
*** 15,18 ****
--- 15,19 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => '\\input texinfo @c -*-texinfo-*-
  ',
***************
*** 20,23 ****
--- 21,25 ----
                  },
                  {
+                   'parent' => {},
                    'text' => '
  ',
***************
*** 481,484 ****
--- 483,488 ----
    'type' => 'document_root'
  };
+ $result_trees{'contents_at_end_document_after_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'contents_at_end_document_after_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+ $result_trees{'contents_at_end_document_after_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'contents_at_end_document_after_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
  $result_trees{'contents_at_end_document_after_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'contents_at_end_document_after_node'}{'contents'}[0]{'contents'}[0];
  $result_trees{'contents_at_end_document_after_node'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'contents_at_end_document_after_node'}{'contents'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/contents_in_document.pl texinfo-6.3/tp/t/results/sectioning/contents_in_document.pl
*** texinfo-6.1/tp/t/results/sectioning/contents_in_document.pl	2016-01-22 07:49:59.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/contents_in_document.pl	2016-08-02 18:44:39.000000000 +0100
***************
*** 15,18 ****
--- 15,19 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => '\\input texinfo @c -*-texinfo-*-
  ',
***************
*** 20,23 ****
--- 21,25 ----
                  },
                  {
+                   'parent' => {},
                    'text' => '
  ',
***************
*** 269,272 ****
--- 271,276 ----
    'type' => 'document_root'
  };
+ $result_trees{'contents_in_document'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'contents_in_document'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+ $result_trees{'contents_in_document'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'contents_in_document'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
  $result_trees{'contents_in_document'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'contents_in_document'}{'contents'}[0]{'contents'}[0];
  $result_trees{'contents_in_document'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'contents_in_document'}{'contents'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/contents_no_section.pl texinfo-6.3/tp/t/results/sectioning/contents_no_section.pl
*** texinfo-6.1/tp/t/results/sectioning/contents_no_section.pl	2016-01-22 07:49:59.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/contents_no_section.pl	2016-08-02 18:44:39.000000000 +0100
***************
*** 15,18 ****
--- 15,19 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => '\\input texinfo @c -*-texinfo-*-
  ',
***************
*** 20,23 ****
--- 21,25 ----
                  },
                  {
+                   'parent' => {},
                    'text' => '
  ',
***************
*** 175,178 ****
--- 177,182 ----
    'type' => 'document_root'
  };
+ $result_trees{'contents_no_section'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'contents_no_section'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+ $result_trees{'contents_no_section'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'contents_no_section'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
  $result_trees{'contents_no_section'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'contents_no_section'}{'contents'}[0]{'contents'}[0];
  $result_trees{'contents_no_section'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'contents_no_section'}{'contents'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/double_node_anchor_float.pl texinfo-6.3/tp/t/results/sectioning/double_node_anchor_float.pl
*** texinfo-6.1/tp/t/results/sectioning/double_node_anchor_float.pl	2016-01-22 07:50:02.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/double_node_anchor_float.pl	2016-08-02 18:44:41.000000000 +0100
***************
*** 124,132 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 124,128 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 138,141 ****
--- 134,138 ----
          },
          {
+           'parent' => {},
            'text' => '
  ',
***************
*** 172,180 ****
                {}
              ],
!             'normalized' => 'anchor1',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 169,173 ----
                {}
              ],
!             'normalized' => 'anchor1'
            },
            'line_nr' => {
***************
*** 186,189 ****
--- 179,183 ----
          },
          {
+           'parent' => {},
            'text' => '
  ',
***************
*** 273,276 ****
--- 267,271 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 389,392 ****
--- 384,388 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 505,508 ****
--- 501,505 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 693,696 ****
--- 690,694 ----
  $result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
  $result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'double_node_anchor_float'}{'contents'}[2];
+ $result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'double_node_anchor_float'}{'contents'}[2];
  $result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'double_node_anchor_float'}{'contents'}[2];
  $result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[4]{'args'}[0];
***************
*** 699,702 ****
--- 697,701 ----
  $result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[4]{'extra'}{'node_content'}[0] = $result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0];
  $result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[4]{'parent'} = $result_trees{'double_node_anchor_float'}{'contents'}[2];
+ $result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[5]{'parent'} = $result_trees{'double_node_anchor_float'}{'contents'}[2];
  $result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[6]{'parent'} = $result_trees{'double_node_anchor_float'}{'contents'}[2];
  $result_trees{'double_node_anchor_float'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'double_node_anchor_float'}{'contents'}[2]{'args'}[0]{'contents'}[1];
***************
*** 713,716 ****
--- 712,716 ----
  $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1];
+ $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'args'}[1];
  $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'args'}[1];
  $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'args'}[1];
***************
*** 735,738 ****
--- 735,739 ----
  $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[3]{'args'}[0];
  $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[3];
+ $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[3]{'args'}[1];
  $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[3]{'args'}[1];
  $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[3]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[3]{'args'}[1];
***************
*** 757,760 ****
--- 758,762 ----
  $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[5]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[5]{'args'}[0];
  $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[5];
+ $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[5]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[5]{'args'}[1];
  $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[5]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[5]{'args'}[1];
  $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[5]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[5]{'args'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/double_top.pl texinfo-6.3/tp/t/results/sectioning/double_top.pl
*** texinfo-6.1/tp/t/results/sectioning/double_top.pl	2016-01-22 07:50:02.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/double_top.pl	2016-08-02 18:44:41.000000000 +0100
***************
*** 36,39 ****
--- 36,40 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 169,177 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 170,174 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 233,236 ****
--- 230,234 ----
  $result_trees{'double_top'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'double_top'}{'contents'}[1]{'args'}[0];
  $result_trees{'double_top'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'double_top'}{'contents'}[1];
+ $result_trees{'double_top'}{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'double_top'}{'contents'}[1]{'args'}[1];
  $result_trees{'double_top'}{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'double_top'}{'contents'}[1]{'args'}[1];
  $result_trees{'double_top'}{'contents'}[1]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'double_top'}{'contents'}[1]{'args'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/double_top_in_menu.pl texinfo-6.3/tp/t/results/sectioning/double_top_in_menu.pl
*** texinfo-6.1/tp/t/results/sectioning/double_top_in_menu.pl	2016-01-22 07:49:59.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/double_top_in_menu.pl	2016-08-02 18:44:38.000000000 +0100
***************
*** 36,39 ****
--- 36,40 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 390,393 ****
--- 391,395 ----
  $result_trees{'double_top_in_menu'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'double_top_in_menu'}{'contents'}[1]{'args'}[0];
  $result_trees{'double_top_in_menu'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'double_top_in_menu'}{'contents'}[1];
+ $result_trees{'double_top_in_menu'}{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'double_top_in_menu'}{'contents'}[1]{'args'}[1];
  $result_trees{'double_top_in_menu'}{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'double_top_in_menu'}{'contents'}[1]{'args'}[1];
  $result_trees{'double_top_in_menu'}{'contents'}[1]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'double_top_in_menu'}{'contents'}[1]{'args'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/email_in_node.pl texinfo-6.3/tp/t/results/sectioning/email_in_node.pl
*** texinfo-6.1/tp/t/results/sectioning/email_in_node.pl	2016-01-22 07:49:59.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/email_in_node.pl	2016-08-02 18:44:38.000000000 +0100
***************
*** 30,33 ****
--- 30,34 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 88,91 ****
--- 89,93 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 110,118 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 112,116 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {},
***************
*** 128,131 ****
--- 126,130 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 138,141 ****
--- 137,141 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 203,206 ****
--- 203,207 ----
  $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'email_in_node'}{'contents'}[1];
  $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0];
+ $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0];
***************
*** 213,216 ****
--- 214,218 ----
  $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0];
  $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3];
+ $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[1];
  $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[1];
  $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[1]{'parent'} = $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3];
***************
*** 220,224 ****
--- 222,228 ----
  $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0];
  $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0];
+ $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[5]{'args'}[0];
  $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[5];
+ $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[5]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[5]{'args'}[1];
  $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[5]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[5]{'args'}[1];
  $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[5]{'args'}[1]{'parent'} = $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[5];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/empty_anchor.pl texinfo-6.3/tp/t/results/sectioning/empty_anchor.pl
*** texinfo-6.1/tp/t/results/sectioning/empty_anchor.pl	2016-01-22 07:49:59.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/empty_anchor.pl	2016-08-02 18:44:38.000000000 +0100
***************
*** 21,29 ****
          'brace_command_contents' => [
            undef
!         ],
!         'spaces_before_argument' => {
!           'text' => '',
!           'type' => 'empty_spaces_before_argument'
!         }
        },
        'line_nr' => {
--- 21,25 ----
          'brace_command_contents' => [
            undef
!         ]
        },
        'line_nr' => {
***************
*** 46,49 ****
--- 42,46 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => '   ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 84,87 ****
--- 81,85 ----
  $result_trees{'empty_anchor'}{'contents'}[0]{'parent'} = $result_trees{'empty_anchor'};
  $result_trees{'empty_anchor'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'empty_anchor'}{'contents'}[1];
+ $result_trees{'empty_anchor'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'empty_anchor'}{'contents'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'empty_anchor'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'empty_anchor'}{'contents'}[1]{'contents'}[1];
  $result_trees{'empty_anchor'}{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_before_argument'} = $result_trees{'empty_anchor'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/empty_node.pl texinfo-6.3/tp/t/results/sectioning/empty_node.pl
*** texinfo-6.1/tp/t/results/sectioning/empty_node.pl	2016-01-22 07:49:59.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/empty_node.pl	2016-08-02 18:44:38.000000000 +0100
***************
*** 72,75 ****
--- 72,76 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 86,89 ****
--- 87,91 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 100,103 ****
--- 102,106 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 164,171 ****
--- 167,177 ----
  $result_trees{'empty_node'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'empty_node'}{'contents'}[2]{'args'}[0];
  $result_trees{'empty_node'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'empty_node'}{'contents'}[2];
+ $result_trees{'empty_node'}{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'empty_node'}{'contents'}[2]{'args'}[1];
  $result_trees{'empty_node'}{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'empty_node'}{'contents'}[2]{'args'}[1];
  $result_trees{'empty_node'}{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'empty_node'}{'contents'}[2];
+ $result_trees{'empty_node'}{'contents'}[2]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'empty_node'}{'contents'}[2]{'args'}[2];
  $result_trees{'empty_node'}{'contents'}[2]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'empty_node'}{'contents'}[2]{'args'}[2];
  $result_trees{'empty_node'}{'contents'}[2]{'args'}[2]{'parent'} = $result_trees{'empty_node'}{'contents'}[2];
+ $result_trees{'empty_node'}{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'empty_node'}{'contents'}[2]{'args'}[3];
  $result_trees{'empty_node'}{'contents'}[2]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'empty_node'}{'contents'}[2]{'args'}[3];
  $result_trees{'empty_node'}{'contents'}[2]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'empty_node'}{'contents'}[2]{'args'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/empty_ref_arg.pl texinfo-6.3/tp/t/results/sectioning/empty_ref_arg.pl
*** texinfo-6.1/tp/t/results/sectioning/empty_ref_arg.pl	2016-01-22 07:49:59.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/empty_ref_arg.pl	2016-08-02 18:44:39.000000000 +0100
***************
*** 65,68 ****
--- 65,69 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 94,101 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 95,98 ----
***************
*** 127,130 ****
--- 124,128 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 137,140 ****
--- 135,139 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 167,174 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 166,169 ----
***************
*** 200,203 ****
--- 195,199 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 214,217 ****
--- 210,214 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 246,253 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 243,246 ----
***************
*** 279,282 ****
--- 272,276 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 339,342 ****
--- 333,337 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 403,410 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 398,401 ----
***************
*** 458,461 ****
--- 449,453 ----
  $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
+ $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
***************
*** 468,472 ****
--- 460,466 ----
  $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
+ $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[1];
  $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
+ $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[2];
  $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[2];
  $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[2]{'parent'} = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
***************
*** 479,484 ****
--- 473,480 ----
  $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0];
  $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[4];
+ $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1]{'parent'} = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[4];
+ $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[2];
  $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[2];
  $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[2]{'parent'} = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[4];
***************
*** 492,495 ****
--- 488,492 ----
  $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[0];
  $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6];
+ $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[1];
  $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[1];
  $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[1];
***************
*** 500,503 ****
--- 497,501 ----
  $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[5]{'parent'} = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[1];
  $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[1]{'parent'} = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6];
+ $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[2];
  $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[2]{'contents'}[1];
  $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[2];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/empty_refs.pl texinfo-6.3/tp/t/results/sectioning/empty_refs.pl
*** texinfo-6.1/tp/t/results/sectioning/empty_refs.pl	2016-01-22 07:49:59.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/empty_refs.pl	2016-08-02 18:44:38.000000000 +0100
***************
*** 36,43 ****
                ],
                'normalized' => ''
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 36,39 ----
***************
*** 98,105 ****
                ],
                'normalized' => '-'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 94,97 ----
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/equivalent_labels.pl texinfo-6.3/tp/t/results/sectioning/equivalent_labels.pl
*** texinfo-6.1/tp/t/results/sectioning/equivalent_labels.pl	2016-01-22 07:50:02.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/equivalent_labels.pl	2016-08-02 18:44:41.000000000 +0100
***************
*** 90,98 ****
                {}
              ],
!             'normalized' => 'anch',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 90,94 ----
                {}
              ],
!             'normalized' => 'anch'
            },
            'line_nr' => {},
***************
*** 139,142 ****
--- 135,139 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 487,490 ****
--- 484,488 ----
  $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'args'}[0];
  $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4];
+ $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'args'}[1];
  $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'args'}[1];
***************
*** 591,599 ****
          ]
        ],
!       'normalized' => 'anch',
!       'spaces_before_argument' => {
!         'text' => '',
!         'type' => 'empty_spaces_before_argument'
!       }
      },
      'node_prev' => {}
--- 589,593 ----
          ]
        ],
!       'normalized' => 'anch'
      },
      'node_prev' => {}
***************
*** 647,655 ****
          ]
        ],
!       'normalized' => 'anch',
!       'spaces_before_argument' => {
!         'text' => '',
!         'type' => 'empty_spaces_before_argument'
!       }
      },
      'menu_next' => {
--- 641,645 ----
          ]
        ],
!       'normalized' => 'anch'
      },
      'menu_next' => {
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/equivalent_nodes.pl texinfo-6.3/tp/t/results/sectioning/equivalent_nodes.pl
*** texinfo-6.1/tp/t/results/sectioning/equivalent_nodes.pl	2016-01-22 07:50:02.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/equivalent_nodes.pl	2016-08-02 18:44:41.000000000 +0100
***************
*** 36,39 ****
--- 36,40 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 327,334 ****
                    ],
                    'normalized' => 'node'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 328,331 ----
***************
*** 374,377 ****
--- 371,375 ----
  $result_trees{'equivalent_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'equivalent_nodes'}{'contents'}[1]{'args'}[0];
  $result_trees{'equivalent_nodes'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'equivalent_nodes'}{'contents'}[1];
+ $result_trees{'equivalent_nodes'}{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'equivalent_nodes'}{'contents'}[1]{'args'}[1];
  $result_trees{'equivalent_nodes'}{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'equivalent_nodes'}{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'equivalent_nodes'}{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'equivalent_nodes'}{'contents'}[1]{'args'}[1]{'contents'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/explicit_node_directions.pl texinfo-6.3/tp/t/results/sectioning/explicit_node_directions.pl
*** texinfo-6.1/tp/t/results/sectioning/explicit_node_directions.pl	2016-01-22 07:50:02.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/explicit_node_directions.pl	2016-08-02 18:44:41.000000000 +0100
***************
*** 292,295 ****
--- 292,296 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 552,555 ****
--- 553,557 ----
  $result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'explicit_node_directions'}[1]{'contents'}[0];
+ $result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'explicit_node_directions'}[1]{'contents'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/more_sections_than_nodes.pl texinfo-6.3/tp/t/results/sectioning/more_sections_than_nodes.pl
*** texinfo-6.1/tp/t/results/sectioning/more_sections_than_nodes.pl	2016-01-22 07:49:59.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/more_sections_than_nodes.pl	2016-08-02 18:44:39.000000000 +0100
***************
*** 579,582 ****
--- 579,583 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 593,596 ****
--- 594,598 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 607,610 ****
--- 609,613 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 1487,1494 ****
--- 1490,1500 ----
  $result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[0];
  $result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'more_sections_than_nodes'}{'contents'}[7];
+ $result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[1];
  $result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[1];
  $result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[1]{'parent'} = $result_trees{'more_sections_than_nodes'}{'contents'}[7];
+ $result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[2];
  $result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[2];
  $result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[2]{'parent'} = $result_trees{'more_sections_than_nodes'}{'contents'}[7];
+ $result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[3];
  $result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[3];
  $result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/next_no_prev_to_node.pl texinfo-6.3/tp/t/results/sectioning/next_no_prev_to_node.pl
*** texinfo-6.1/tp/t/results/sectioning/next_no_prev_to_node.pl	2016-01-22 07:49:59.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/next_no_prev_to_node.pl	2016-08-02 18:44:38.000000000 +0100
***************
*** 277,280 ****
--- 277,281 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 296,299 ****
--- 297,301 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 389,392 ****
--- 391,395 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 489,495 ****
--- 492,500 ----
  $result_trees{'next_no_prev_to_node'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'next_no_prev_to_node'}{'contents'}[2]{'args'}[0];
  $result_trees{'next_no_prev_to_node'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'next_no_prev_to_node'}{'contents'}[2];
+ $result_trees{'next_no_prev_to_node'}{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'next_no_prev_to_node'}{'contents'}[2]{'args'}[1];
  $result_trees{'next_no_prev_to_node'}{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'next_no_prev_to_node'}{'contents'}[2]{'args'}[1];
  $result_trees{'next_no_prev_to_node'}{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'next_no_prev_to_node'}{'contents'}[2];
  $result_trees{'next_no_prev_to_node'}{'contents'}[2]{'args'}[2]{'parent'} = $result_trees{'next_no_prev_to_node'}{'contents'}[2];
+ $result_trees{'next_no_prev_to_node'}{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'next_no_prev_to_node'}{'contents'}[2]{'args'}[3];
  $result_trees{'next_no_prev_to_node'}{'contents'}[2]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'next_no_prev_to_node'}{'contents'}[2]{'args'}[3];
  $result_trees{'next_no_prev_to_node'}{'contents'}[2]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'next_no_prev_to_node'}{'contents'}[2]{'args'}[3];
***************
*** 508,511 ****
--- 513,517 ----
  $result_trees{'next_no_prev_to_node'}{'contents'}[3]{'args'}[1]{'parent'} = $result_trees{'next_no_prev_to_node'}{'contents'}[3];
  $result_trees{'next_no_prev_to_node'}{'contents'}[3]{'args'}[2]{'parent'} = $result_trees{'next_no_prev_to_node'}{'contents'}[3];
+ $result_trees{'next_no_prev_to_node'}{'contents'}[3]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'next_no_prev_to_node'}{'contents'}[3]{'args'}[3];
  $result_trees{'next_no_prev_to_node'}{'contents'}[3]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'next_no_prev_to_node'}{'contents'}[3]{'args'}[3];
  $result_trees{'next_no_prev_to_node'}{'contents'}[3]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'next_no_prev_to_node'}{'contents'}[3]{'args'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/no_element.pl texinfo-6.3/tp/t/results/sectioning/no_element.pl
*** texinfo-6.1/tp/t/results/sectioning/no_element.pl	2016-01-22 07:50:02.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/no_element.pl	2016-08-02 18:44:41.000000000 +0100
***************
*** 126,134 ****
            {}
          ],
!         'normalized' => 'An-anchor',
!         'spaces_before_argument' => {
!           'text' => '',
!           'type' => 'empty_spaces_before_argument'
!         }
        },
        'line_nr' => {
--- 126,130 ----
            {}
          ],
!         'normalized' => 'An-anchor'
        },
        'line_nr' => {
***************
*** 140,143 ****
--- 136,140 ----
      },
      {
+       'parent' => {},
        'text' => '
  ',
***************
*** 184,191 ****
                ],
                'normalized' => 'An-anchor'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 181,184 ----
***************
*** 264,272 ****
                    {}
                  ],
!                 'normalized' => 'Anchor-in-footnote',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 257,261 ----
                    {}
                  ],
!                 'normalized' => 'Anchor-in-footnote'
                },
                'line_nr' => {
***************
*** 296,299 ****
--- 285,289 ----
                    {},
                    {
+                     'parent' => {},
                      'text' => '
  ',
***************
*** 340,347 ****
                              ],
                              'normalized' => 'An-anchor'
-                           },
-                           'spaces_before_argument' => {
-                             'text' => '',
-                             'type' => 'empty_spaces_before_argument'
                            }
                          },
--- 330,333 ----
***************
*** 369,379 ****
                    'cmdname' => 'footnote',
                    'contents' => [],
-                   'extra' => {
-                     'spaces_before_argument' => {
-                       'parent' => {},
-                       'text' => '',
-                       'type' => 'empty_spaces_before_argument'
-                     }
-                   },
                    'line_nr' => {
                      'file_name' => '',
--- 355,358 ----
***************
*** 402,409 ****
                ],
                'normalized' => 'Anchor-in-footnote'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 381,384 ----
***************
*** 456,459 ****
--- 431,435 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 594,601 ****
                ],
                'normalized' => 'float-anchor'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 570,573 ----
***************
*** 788,792 ****
            'index_at_command' => 'cindex',
            'index_name' => 'cp',
-           'index_prefix' => 'c',
            'index_type_command' => 'cindex',
            'key' => 'index entry',
--- 760,763 ----
***************
*** 829,832 ****
--- 800,804 ----
  $result_trees{'no_element'}{'contents'}[4]{'extra'}{'node_content'}[0] = $result_trees{'no_element'}{'contents'}[4]{'args'}[0]{'contents'}[0];
  $result_trees{'no_element'}{'contents'}[4]{'parent'} = $result_trees{'no_element'};
+ $result_trees{'no_element'}{'contents'}[5]{'parent'} = $result_trees{'no_element'};
  $result_trees{'no_element'}{'contents'}[6]{'parent'} = $result_trees{'no_element'};
  $result_trees{'no_element'}{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'no_element'}{'contents'}[7];
***************
*** 852,855 ****
--- 824,828 ----
  $result_trees{'no_element'}{'contents'}[9]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[1]{'parent'} = $result_trees{'no_element'}{'contents'}[9]{'contents'}[1]{'extra'}{'label'}{'parent'};
  $result_trees{'no_element'}{'contents'}[9]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[2] = $result_trees{'no_element'}{'contents'}[9]{'contents'}[1]{'extra'}{'label'};
+ $result_trees{'no_element'}{'contents'}[9]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[3]{'parent'} = $result_trees{'no_element'}{'contents'}[9]{'contents'}[1]{'extra'}{'label'}{'parent'};
  $result_trees{'no_element'}{'contents'}[9]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[4]{'parent'} = $result_trees{'no_element'}{'contents'}[9]{'contents'}[1]{'extra'}{'label'}{'parent'};
  $result_trees{'no_element'}{'contents'}[9]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'no_element'}{'contents'}[9]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[5];
***************
*** 863,867 ****
  $result_trees{'no_element'}{'contents'}[9]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[5]{'parent'} = $result_trees{'no_element'}{'contents'}[9]{'contents'}[1]{'extra'}{'label'}{'parent'};
  $result_trees{'no_element'}{'contents'}[9]{'contents'}[1]{'extra'}{'label'}{'parent'}{'parent'}{'args'}[0] = $result_trees{'no_element'}{'contents'}[9]{'contents'}[1]{'extra'}{'label'}{'parent'};
- $result_trees{'no_element'}{'contents'}[9]{'contents'}[1]{'extra'}{'label'}{'parent'}{'parent'}{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'no_element'}{'contents'}[9]{'contents'}[1]{'extra'}{'label'}{'parent'};
  $result_trees{'no_element'}{'contents'}[9]{'contents'}[1]{'extra'}{'label'}{'parent'}{'parent'}{'parent'}{'contents'}[0] = $result_trees{'no_element'}{'contents'}[9]{'contents'}[1]{'extra'}{'label'}{'parent'}{'parent'};
  $result_trees{'no_element'}{'contents'}[9]{'contents'}[1]{'extra'}{'label'}{'parent'}{'parent'}{'parent'}{'contents'}[1]{'parent'} = $result_trees{'no_element'}{'contents'}[9]{'contents'}[1]{'extra'}{'label'}{'parent'}{'parent'}{'parent'};
--- 836,839 ----
***************
*** 877,880 ****
--- 849,853 ----
  $result_trees{'no_element'}{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'no_element'}{'contents'}[13]{'args'}[0];
  $result_trees{'no_element'}{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'no_element'}{'contents'}[13];
+ $result_trees{'no_element'}{'contents'}[13]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'no_element'}{'contents'}[13]{'args'}[1];
  $result_trees{'no_element'}{'contents'}[13]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'no_element'}{'contents'}[13]{'args'}[1];
  $result_trees{'no_element'}{'contents'}[13]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'no_element'}{'contents'}[13]{'args'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/node.pl texinfo-6.3/tp/t/results/sectioning/node.pl
*** texinfo-6.1/tp/t/results/sectioning/node.pl	2016-01-22 07:49:58.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/node.pl	2016-08-02 18:44:38.000000000 +0100
***************
*** 92,95 ****
--- 92,96 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 161,164 ****
--- 162,166 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 175,178 ****
--- 177,181 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 250,253 ****
--- 253,257 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 264,267 ****
--- 268,272 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 278,281 ****
--- 283,287 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 359,362 ****
--- 365,369 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 373,376 ****
--- 380,384 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 387,390 ****
--- 395,399 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 551,554 ****
--- 560,568 ----
                'cmdname' => 'comma',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 10,
+                 'macro' => ''
+               },
                'parent' => {}
              },
***************
*** 564,567 ****
--- 578,582 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 581,584 ****
--- 596,601 ----
                ],
                'cmdname' => ',',
+               'contents' => [],
+               'line_nr' => {},
                'parent' => {}
              },
***************
*** 594,597 ****
--- 611,615 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 612,620 ****
                'cmdname' => 'strong',
                'contents' => [],
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 10,
!                 'macro' => ''
!               },
                'parent' => {}
              },
--- 630,634 ----
                'cmdname' => 'strong',
                'contents' => [],
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 698,701 ****
--- 712,716 ----
  $result_trees{'node'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'node'}{'contents'}[2]{'args'}[0];
  $result_trees{'node'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'node'}{'contents'}[2];
+ $result_trees{'node'}{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'node'}{'contents'}[2]{'args'}[1];
  $result_trees{'node'}{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'node'}{'contents'}[2]{'args'}[1];
  $result_trees{'node'}{'contents'}[2]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'node'}{'contents'}[2]{'args'}[1];
***************
*** 710,715 ****
--- 725,732 ----
  $result_trees{'node'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'node'}{'contents'}[3]{'args'}[0];
  $result_trees{'node'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'node'}{'contents'}[3];
+ $result_trees{'node'}{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'node'}{'contents'}[3]{'args'}[1];
  $result_trees{'node'}{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'node'}{'contents'}[3]{'args'}[1];
  $result_trees{'node'}{'contents'}[3]{'args'}[1]{'parent'} = $result_trees{'node'}{'contents'}[3];
+ $result_trees{'node'}{'contents'}[3]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'node'}{'contents'}[3]{'args'}[2];
  $result_trees{'node'}{'contents'}[3]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'node'}{'contents'}[3]{'args'}[2];
  $result_trees{'node'}{'contents'}[3]{'args'}[2]{'contents'}[2]{'parent'} = $result_trees{'node'}{'contents'}[3]{'args'}[2];
***************
*** 725,732 ****
--- 742,752 ----
  $result_trees{'node'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'node'}{'contents'}[4]{'args'}[0];
  $result_trees{'node'}{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'node'}{'contents'}[4];
+ $result_trees{'node'}{'contents'}[4]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'node'}{'contents'}[4]{'args'}[1];
  $result_trees{'node'}{'contents'}[4]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'node'}{'contents'}[4]{'args'}[1];
  $result_trees{'node'}{'contents'}[4]{'args'}[1]{'parent'} = $result_trees{'node'}{'contents'}[4];
+ $result_trees{'node'}{'contents'}[4]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'node'}{'contents'}[4]{'args'}[2];
  $result_trees{'node'}{'contents'}[4]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'node'}{'contents'}[4]{'args'}[2];
  $result_trees{'node'}{'contents'}[4]{'args'}[2]{'parent'} = $result_trees{'node'}{'contents'}[4];
+ $result_trees{'node'}{'contents'}[4]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'node'}{'contents'}[4]{'args'}[3];
  $result_trees{'node'}{'contents'}[4]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'node'}{'contents'}[4]{'args'}[3];
  $result_trees{'node'}{'contents'}[4]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'node'}{'contents'}[4]{'args'}[3];
***************
*** 743,750 ****
--- 763,773 ----
  $result_trees{'node'}{'contents'}[5]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'node'}{'contents'}[5]{'args'}[0];
  $result_trees{'node'}{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'node'}{'contents'}[5];
+ $result_trees{'node'}{'contents'}[5]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'node'}{'contents'}[5]{'args'}[1];
  $result_trees{'node'}{'contents'}[5]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'node'}{'contents'}[5]{'args'}[1];
  $result_trees{'node'}{'contents'}[5]{'args'}[1]{'parent'} = $result_trees{'node'}{'contents'}[5];
+ $result_trees{'node'}{'contents'}[5]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'node'}{'contents'}[5]{'args'}[2];
  $result_trees{'node'}{'contents'}[5]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'node'}{'contents'}[5]{'args'}[2];
  $result_trees{'node'}{'contents'}[5]{'args'}[2]{'parent'} = $result_trees{'node'}{'contents'}[5];
+ $result_trees{'node'}{'contents'}[5]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'node'}{'contents'}[5]{'args'}[3];
  $result_trees{'node'}{'contents'}[5]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'node'}{'contents'}[5]{'args'}[3];
  $result_trees{'node'}{'contents'}[5]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'node'}{'contents'}[5]{'args'}[3];
***************
*** 777,787 ****
--- 800,814 ----
  $result_trees{'node'}{'contents'}[7]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'node'}{'contents'}[7]{'args'}[0];
  $result_trees{'node'}{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'node'}{'contents'}[7];
+ $result_trees{'node'}{'contents'}[7]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'node'}{'contents'}[7]{'args'}[1];
  $result_trees{'node'}{'contents'}[7]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'node'}{'contents'}[7]{'args'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'node'}{'contents'}[7]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'node'}{'contents'}[7]{'args'}[1]{'contents'}[1];
+ $result_trees{'node'}{'contents'}[7]{'args'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'node'}{'contents'}[7]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'node'}{'contents'}[7]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'node'}{'contents'}[7]{'args'}[1];
  $result_trees{'node'}{'contents'}[7]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'node'}{'contents'}[7]{'args'}[1];
  $result_trees{'node'}{'contents'}[7]{'args'}[1]{'parent'} = $result_trees{'node'}{'contents'}[7];
+ $result_trees{'node'}{'contents'}[7]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'node'}{'contents'}[7]{'args'}[2];
  $result_trees{'node'}{'contents'}[7]{'args'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'node'}{'contents'}[7]{'args'}[2]{'contents'}[1]{'args'}[0];
  $result_trees{'node'}{'contents'}[7]{'args'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'node'}{'contents'}[7]{'args'}[2]{'contents'}[1];
+ $result_trees{'node'}{'contents'}[7]{'args'}[2]{'contents'}[1]{'line_nr'} = $result_trees{'node'}{'contents'}[7]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'node'}{'contents'}[7]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'node'}{'contents'}[7]{'args'}[2];
  $result_trees{'node'}{'contents'}[7]{'args'}[2]{'contents'}[2]{'parent'} = $result_trees{'node'}{'contents'}[7]{'args'}[2];
***************
*** 797,801 ****
  $result_trees{'node'}{'contents'}[7]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0] = $result_trees{'node'}{'contents'}[7]{'args'}[2]{'contents'}[1];
  $result_trees{'node'}{'contents'}[7]{'extra'}{'spaces_after_command'} = $result_trees{'node'}{'contents'}[7]{'args'}[0]{'contents'}[0];
! $result_trees{'node'}{'contents'}[7]{'line_nr'} = $result_trees{'node'}{'contents'}[7]{'args'}[2]{'contents'}[1]{'line_nr'};
  $result_trees{'node'}{'contents'}[7]{'parent'} = $result_trees{'node'};
  
--- 824,828 ----
  $result_trees{'node'}{'contents'}[7]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0] = $result_trees{'node'}{'contents'}[7]{'args'}[2]{'contents'}[1];
  $result_trees{'node'}{'contents'}[7]{'extra'}{'spaces_after_command'} = $result_trees{'node'}{'contents'}[7]{'args'}[0]{'contents'}[0];
! $result_trees{'node'}{'contents'}[7]{'line_nr'} = $result_trees{'node'}{'contents'}[7]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'node'}{'contents'}[7]{'parent'} = $result_trees{'node'};
  
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/node_empty_direction.pl texinfo-6.3/tp/t/results/sectioning/node_empty_direction.pl
*** texinfo-6.1/tp/t/results/sectioning/node_empty_direction.pl	2016-01-22 07:49:59.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/node_empty_direction.pl	2016-08-02 18:44:38.000000000 +0100
***************
*** 36,39 ****
--- 36,40 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 75,78 ****
--- 76,80 ----
  $result_trees{'node_empty_direction'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'node_empty_direction'}{'contents'}[1]{'args'}[0];
  $result_trees{'node_empty_direction'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'node_empty_direction'}{'contents'}[1];
+ $result_trees{'node_empty_direction'}{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'node_empty_direction'}{'contents'}[1]{'args'}[1];
  $result_trees{'node_empty_direction'}{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'node_empty_direction'}{'contents'}[1];
  $result_trees{'node_empty_direction'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'node_empty_direction'}{'contents'}[1]{'args'}[0]{'contents'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/node_too_much_args.pl texinfo-6.3/tp/t/results/sectioning/node_too_much_args.pl
*** texinfo-6.1/tp/t/results/sectioning/node_too_much_args.pl	2016-01-22 07:49:58.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/node_too_much_args.pl	2016-08-02 18:44:38.000000000 +0100
***************
*** 36,39 ****
--- 36,40 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 46,49 ****
--- 47,51 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 56,59 ****
--- 58,62 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => '  ',
                'type' => 'empty_spaces_before_argument'
***************
*** 109,114 ****
--- 112,120 ----
  $result_trees{'node_too_much_args'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'node_too_much_args'}{'contents'}[1]{'args'}[0];
  $result_trees{'node_too_much_args'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'node_too_much_args'}{'contents'}[1];
+ $result_trees{'node_too_much_args'}{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'node_too_much_args'}{'contents'}[1]{'args'}[1];
  $result_trees{'node_too_much_args'}{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'node_too_much_args'}{'contents'}[1];
+ $result_trees{'node_too_much_args'}{'contents'}[1]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'node_too_much_args'}{'contents'}[1]{'args'}[2];
  $result_trees{'node_too_much_args'}{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'node_too_much_args'}{'contents'}[1];
+ $result_trees{'node_too_much_args'}{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'node_too_much_args'}{'contents'}[1]{'args'}[3];
  $result_trees{'node_too_much_args'}{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'node_too_much_args'}{'contents'}[1]{'args'}[3];
  $result_trees{'node_too_much_args'}{'contents'}[1]{'args'}[3]{'parent'} = $result_trees{'node_too_much_args'}{'contents'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/node_up_external_node.pl texinfo-6.3/tp/t/results/sectioning/node_up_external_node.pl
*** texinfo-6.1/tp/t/results/sectioning/node_up_external_node.pl	2016-01-22 07:50:01.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/node_up_external_node.pl	2016-08-02 18:44:40.000000000 +0100
***************
*** 230,233 ****
--- 230,234 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 244,247 ****
--- 245,249 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 263,266 ****
--- 265,269 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 377,385 ****
--- 380,391 ----
  $result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'node_up_external_node'}[1]{'contents'}[0];
+ $result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'node_up_external_node'}[1]{'contents'}[0];
+ $result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[2];
  $result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[2];
  $result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[2]{'contents'}[2]{'parent'} = $result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[2];
  $result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[2]{'parent'} = $result_trees{'node_up_external_node'}[1]{'contents'}[0];
+ $result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[3];
  $result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[3];
  $result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/nodename_parentheses.pl texinfo-6.3/tp/t/results/sectioning/nodename_parentheses.pl
*** texinfo-6.1/tp/t/results/sectioning/nodename_parentheses.pl	2016-01-22 07:49:59.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/nodename_parentheses.pl	2016-08-02 18:44:38.000000000 +0100
***************
*** 597,604 ****
                    ],
                    'normalized' => 'Node-_0028with-parentheses_0029'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 597,600 ----
***************
*** 666,673 ****
                    ],
                    'normalized' => 'node'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 662,665 ----
***************
*** 847,855 ****
                }
              ],
!             'normalized' => 'anchor',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 839,843 ----
                }
              ],
!             'normalized' => 'anchor'
            },
            'line_nr' => {
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl texinfo-6.3/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
*** texinfo-6.1/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl	2016-01-22 07:50:02.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl	2016-08-02 18:44:41.000000000 +0100
***************
*** 292,295 ****
--- 292,296 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 597,600 ****
--- 598,602 ----
  $result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0];
+ $result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl texinfo-6.3/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl
*** texinfo-6.1/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl	2016-01-22 07:50:03.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl	2016-08-02 18:44:41.000000000 +0100
***************
*** 283,286 ****
--- 283,287 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 575,578 ****
--- 576,580 ----
  $result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[2];
+ $result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[2]{'args'}[1];
  $result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[2]{'args'}[1];
  $result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[2];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl texinfo-6.3/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl
*** texinfo-6.1/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl	2016-01-22 07:50:03.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl	2016-08-02 18:44:41.000000000 +0100
***************
*** 292,295 ****
--- 292,296 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 597,600 ****
--- 598,602 ----
  $result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0];
+ $result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl texinfo-6.3/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl
*** texinfo-6.1/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl	2016-01-22 07:50:03.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl	2016-08-02 18:44:41.000000000 +0100
***************
*** 283,286 ****
--- 283,287 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 575,578 ****
--- 576,580 ----
  $result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[2]{'args'}[0];
  $result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[2];
+ $result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[2]{'args'}[1];
  $result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[2]{'args'}[1];
  $result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[2];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/nodes_before_top.pl texinfo-6.3/tp/t/results/sectioning/nodes_before_top.pl
*** texinfo-6.1/tp/t/results/sectioning/nodes_before_top.pl	2016-01-22 07:49:59.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/nodes_before_top.pl	2016-08-02 18:44:38.000000000 +0100
***************
*** 36,39 ****
--- 36,40 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 50,53 ****
--- 51,55 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 680,685 ****
--- 682,689 ----
  $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[0];
  $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nodes_before_top'}{'contents'}[1];
+ $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[1];
  $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[1];
  $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'nodes_before_top'}{'contents'}[1];
+ $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[2];
  $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'nodes_before_top'}{'contents'}[1];
  $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl texinfo-6.3/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl
*** texinfo-6.1/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl	2016-01-22 07:50:05.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl	2016-08-02 18:44:44.000000000 +0100
***************
*** 37,40 ****
--- 37,41 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 51,54 ****
--- 52,56 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 69,72 ****
--- 71,75 ----
                      'contents' => [
                        {
+                         'parent' => {},
                          'text' => ' ',
                          'type' => 'empty_spaces_before_argument'
***************
*** 93,101 ****
                              ]
                            ],
!                           'normalized' => 'GNU',
!                           'spaces_before_argument' => {
!                             'text' => '',
!                             'type' => 'empty_spaces_before_argument'
!                           }
                          },
                          'line_nr' => {
--- 96,100 ----
                              ]
                            ],
!                           'explanation_contents' => []
                          },
                          'line_nr' => {
***************
*** 126,135 ****
                        {}
                      ]
!                   ],
!                   'normalized' => 'GNU',
!                   'spaces_before_argument' => {
!                     'text' => '',
!                     'type' => 'empty_spaces_before_argument'
!                   }
                  },
                  'line_nr' => {},
--- 125,129 ----
                        {}
                      ]
!                   ]
                  },
                  'line_nr' => {},
***************
*** 147,150 ****
--- 141,145 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 165,168 ****
--- 160,164 ----
                      'contents' => [
                        {
+                         'parent' => {},
                          'text' => ' ',
                          'type' => 'empty_spaces_before_argument'
***************
*** 189,198 ****
                              ]
                            ],
!                           'explanation_contents' => [],
!                           'normalized' => 'GNU',
!                           'spaces_before_argument' => {
!                             'text' => '',
!                             'type' => 'empty_spaces_before_argument'
!                           }
                          },
                          'line_nr' => {},
--- 185,189 ----
                              ]
                            ],
!                           'explanation_contents' => []
                          },
                          'line_nr' => {},
***************
*** 219,228 ****
                        {}
                      ]
!                   ],
!                   'normalized' => 'GNU',
!                   'spaces_before_argument' => {
!                     'text' => '',
!                     'type' => 'empty_spaces_before_argument'
!                   }
                  },
                  'line_nr' => {},
--- 210,214 ----
                        {}
                      ]
!                   ]
                  },
                  'line_nr' => {},
***************
*** 494,497 ****
--- 480,484 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 504,507 ****
--- 491,495 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 518,521 ****
--- 506,510 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 536,539 ****
--- 525,529 ----
                      'contents' => [
                        {
+                         'parent' => {},
                          'text' => ' ',
                          'type' => 'empty_spaces_before_argument'
***************
*** 560,569 ****
                              ]
                            ],
!                           'explanation_contents' => [],
!                           'normalized' => 'GNU',
!                           'spaces_before_argument' => {
!                             'text' => '',
!                             'type' => 'empty_spaces_before_argument'
!                           }
                          },
                          'line_nr' => {
--- 550,554 ----
                              ]
                            ],
!                           'explanation_contents' => []
                          },
                          'line_nr' => {
***************
*** 594,603 ****
                        {}
                      ]
!                   ],
!                   'normalized' => 'GNU',
!                   'spaces_before_argument' => {
!                     'text' => '',
!                     'type' => 'empty_spaces_before_argument'
!                   }
                  },
                  'line_nr' => {},
--- 579,583 ----
                        {}
                      ]
!                   ]
                  },
                  'line_nr' => {},
***************
*** 665,672 ****
--- 645,655 ----
  $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1];
+ $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1];
+ $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[2];
  $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1]{'args'}[0];
  $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $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]{'args'}[2]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1]{'args'}[1];
  $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1]{'args'}[1]{'contents'}[1];
***************
*** 682,687 ****
--- 665,672 ----
  $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[2]{'contents'}[2]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[2];
  $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1];
+ $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[3];
  $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $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]{'args'}[3]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[1];
  $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[1]{'contents'}[1];
***************
*** 751,759 ****
--- 736,748 ----
  $result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0];
+ $result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0];
+ $result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[2];
  $result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[2];
  $result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[2]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0];
+ $result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[3];
  $result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1];
+ $result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'args'}[1];
  $result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'args'}[1]{'contents'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl texinfo-6.3/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl
*** texinfo-6.1/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl	2016-01-22 07:50:05.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl	2016-08-02 18:44:44.000000000 +0100
***************
*** 37,40 ****
--- 37,41 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 51,54 ****
--- 52,56 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 69,72 ****
--- 71,75 ----
                      'contents' => [
                        {
+                         'parent' => {},
                          'text' => ' ',
                          'type' => 'empty_spaces_before_argument'
***************
*** 93,101 ****
                              ]
                            ],
!                           'normalized' => 'GNU',
!                           'spaces_before_argument' => {
!                             'text' => '',
!                             'type' => 'empty_spaces_before_argument'
!                           }
                          },
                          'line_nr' => {
--- 96,100 ----
                              ]
                            ],
!                           'explanation_contents' => []
                          },
                          'line_nr' => {
***************
*** 126,135 ****
                        {}
                      ]
!                   ],
!                   'normalized' => 'GNU',
!                   'spaces_before_argument' => {
!                     'text' => '',
!                     'type' => 'empty_spaces_before_argument'
!                   }
                  },
                  'line_nr' => {},
--- 125,129 ----
                        {}
                      ]
!                   ]
                  },
                  'line_nr' => {},
***************
*** 147,150 ****
--- 141,145 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 165,168 ****
--- 160,164 ----
                      'contents' => [
                        {
+                         'parent' => {},
                          'text' => ' ',
                          'type' => 'empty_spaces_before_argument'
***************
*** 189,198 ****
                              ]
                            ],
!                           'explanation_contents' => [],
!                           'normalized' => 'GNU',
!                           'spaces_before_argument' => {
!                             'text' => '',
!                             'type' => 'empty_spaces_before_argument'
!                           }
                          },
                          'line_nr' => {},
--- 185,189 ----
                              ]
                            ],
!                           'explanation_contents' => []
                          },
                          'line_nr' => {},
***************
*** 219,228 ****
                        {}
                      ]
!                   ],
!                   'normalized' => 'GNU',
!                   'spaces_before_argument' => {
!                     'text' => '',
!                     'type' => 'empty_spaces_before_argument'
!                   }
                  },
                  'line_nr' => {},
--- 210,214 ----
                        {}
                      ]
!                   ]
                  },
                  'line_nr' => {},
***************
*** 494,497 ****
--- 480,484 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 504,507 ****
--- 491,495 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 518,521 ****
--- 506,510 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 536,539 ****
--- 525,529 ----
                      'contents' => [
                        {
+                         'parent' => {},
                          'text' => ' ',
                          'type' => 'empty_spaces_before_argument'
***************
*** 560,569 ****
                              ]
                            ],
!                           'explanation_contents' => [],
!                           'normalized' => 'GNU',
!                           'spaces_before_argument' => {
!                             'text' => '',
!                             'type' => 'empty_spaces_before_argument'
!                           }
                          },
                          'line_nr' => {
--- 550,554 ----
                              ]
                            ],
!                           'explanation_contents' => []
                          },
                          'line_nr' => {
***************
*** 594,603 ****
                        {}
                      ]
!                   ],
!                   'normalized' => 'GNU',
!                   'spaces_before_argument' => {
!                     'text' => '',
!                     'type' => 'empty_spaces_before_argument'
!                   }
                  },
                  'line_nr' => {},
--- 579,583 ----
                        {}
                      ]
!                   ]
                  },
                  'line_nr' => {},
***************
*** 665,672 ****
--- 645,655 ----
  $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1];
+ $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1];
+ $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[2];
  $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1]{'args'}[0];
  $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $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]{'args'}[2]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1]{'args'}[1];
  $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1]{'args'}[1]{'contents'}[1];
***************
*** 682,687 ****
--- 665,672 ----
  $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[2]{'contents'}[2]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[2];
  $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1];
+ $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[3];
  $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $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]{'args'}[3]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[1];
  $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[1]{'contents'}[1];
***************
*** 751,759 ****
--- 736,748 ----
  $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0];
+ $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0];
+ $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[2];
  $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[2];
  $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[2]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0];
+ $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[3];
  $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'args'}[0];
  $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1];
+ $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'args'}[1];
  $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'args'}[1]{'contents'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/non_automatic_top_node_up_url.pl texinfo-6.3/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
*** texinfo-6.1/tp/t/results/sectioning/non_automatic_top_node_up_url.pl	2016-01-22 07:50:05.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/non_automatic_top_node_up_url.pl	2016-08-02 18:44:44.000000000 +0100
***************
*** 37,40 ****
--- 37,41 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 51,54 ****
--- 52,56 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 65,68 ****
--- 67,71 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 339,342 ****
--- 342,346 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 349,352 ****
--- 353,357 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 363,366 ****
--- 368,372 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 432,439 ****
--- 438,448 ----
  $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1];
+ $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1];
+ $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'args'}[2];
  $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'args'}[2];
  $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1];
+ $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'args'}[3];
  $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'args'}[3];
  $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'args'}[3];
***************
*** 487,493 ****
--- 496,505 ----
  $result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0];
+ $result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0];
+ $result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'args'}[2];
  $result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'args'}[2];
  $result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'args'}[2]{'parent'} = $result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0];
+ $result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'args'}[3];
  $result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'args'}[3];
  $result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'args'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/novalidate.pl texinfo-6.3/tp/t/results/sectioning/novalidate.pl
*** texinfo-6.1/tp/t/results/sectioning/novalidate.pl	2016-01-22 07:49:59.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/novalidate.pl	2016-08-02 18:44:38.000000000 +0100
***************
*** 66,69 ****
--- 66,70 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 243,247 ****
                    ]
                  ],
-                 'label' => undef,
                  'node_argument' => {
                    'node_content' => [
--- 244,247 ----
***************
*** 249,256 ****
                    ],
                    'normalized' => 'unknown-ref'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 249,252 ----
***************
*** 310,313 ****
--- 306,310 ----
  $result_trees{'novalidate'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'novalidate'}{'contents'}[1]{'args'}[0];
  $result_trees{'novalidate'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'novalidate'}{'contents'}[1];
+ $result_trees{'novalidate'}{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'novalidate'}{'contents'}[1]{'args'}[1];
  $result_trees{'novalidate'}{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'novalidate'}{'contents'}[1]{'args'}[1];
  $result_trees{'novalidate'}{'contents'}[1]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'novalidate'}{'contents'}[1]{'args'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl texinfo-6.3/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
*** texinfo-6.1/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl	2016-01-22 07:50:03.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl	2016-08-02 18:44:42.000000000 +0100
***************
*** 109,117 ****
                    {}
                  ],
!                 'normalized' => 'ref',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 109,113 ----
                    {}
                  ],
!                 'normalized' => 'ref'
                },
                'line_nr' => {
***************
*** 170,177 ****
                    ],
                    'normalized' => 'ref'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 166,169 ----
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/part_node_before_top.pl texinfo-6.3/tp/t/results/sectioning/part_node_before_top.pl
*** texinfo-6.1/tp/t/results/sectioning/part_node_before_top.pl	2016-01-22 07:50:03.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/part_node_before_top.pl	2016-08-02 18:44:42.000000000 +0100
***************
*** 37,40 ****
--- 37,41 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 391,394 ****
--- 392,396 ----
  $result_trees{'part_node_before_top'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'part_node_before_top'}[0]{'contents'}[1]{'args'}[0];
  $result_trees{'part_node_before_top'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'part_node_before_top'}[0]{'contents'}[1];
+ $result_trees{'part_node_before_top'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'part_node_before_top'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'part_node_before_top'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'part_node_before_top'}[0]{'contents'}[1]{'args'}[1];
  $result_trees{'part_node_before_top'}[0]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'part_node_before_top'}[0]{'contents'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/part_node_chapter_after_top.pl texinfo-6.3/tp/t/results/sectioning/part_node_chapter_after_top.pl
*** texinfo-6.1/tp/t/results/sectioning/part_node_chapter_after_top.pl	2016-01-22 07:50:03.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/part_node_chapter_after_top.pl	2016-08-02 18:44:42.000000000 +0100
***************
*** 381,384 ****
--- 381,385 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 395,398 ****
--- 396,400 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 409,412 ****
--- 411,415 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 508,511 ****
--- 511,515 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 527,530 ****
--- 531,535 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 704,711 ****
--- 709,719 ----
  $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[0];
  $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1];
+ $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[1];
  $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1];
+ $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[2];
  $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[2];
  $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1];
+ $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[3];
  $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[3];
  $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[3];
***************
*** 725,731 ****
--- 733,741 ----
  $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'args'}[0];
  $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2];
+ $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'args'}[1];
  $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'args'}[1];
  $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2];
  $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'args'}[2]{'parent'} = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2];
+ $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'args'}[3];
  $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'args'}[3];
  $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'args'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/placed_things_before_element.pl texinfo-6.3/tp/t/results/sectioning/placed_things_before_element.pl
*** texinfo-6.1/tp/t/results/sectioning/placed_things_before_element.pl	2016-01-22 07:50:02.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/placed_things_before_element.pl	2016-08-02 18:44:41.000000000 +0100
***************
*** 34,42 ****
                {}
              ],
!             'normalized' => 'An-anchor',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 34,38 ----
                {}
              ],
!             'normalized' => 'An-anchor'
            },
            'line_nr' => {
***************
*** 48,51 ****
--- 44,48 ----
          },
          {
+           'parent' => {},
            'text' => '
  ',
***************
*** 92,99 ****
                    ],
                    'normalized' => 'An-anchor'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 89,92 ----
***************
*** 172,180 ****
                        {}
                      ],
!                     'normalized' => 'Anchor-in-footnote',
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {
--- 165,169 ----
                        {}
                      ],
!                     'normalized' => 'Anchor-in-footnote'
                    },
                    'line_nr' => {
***************
*** 204,207 ****
--- 193,197 ----
                        {},
                        {
+                         'parent' => {},
                          'text' => '
  ',
***************
*** 248,255 ****
                                  ],
                                  'normalized' => 'An-anchor'
-                               },
-                               'spaces_before_argument' => {
-                                 'text' => '',
-                                 'type' => 'empty_spaces_before_argument'
                                }
                              },
--- 238,241 ----
***************
*** 277,287 ****
                        'cmdname' => 'footnote',
                        'contents' => [],
-                       'extra' => {
-                         'spaces_before_argument' => {
-                           'parent' => {},
-                           'text' => '',
-                           'type' => 'empty_spaces_before_argument'
-                         }
-                       },
                        'line_nr' => {
                          'file_name' => '',
--- 263,266 ----
***************
*** 310,317 ****
                    ],
                    'normalized' => 'Anchor-in-footnote'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 289,292 ----
***************
*** 364,367 ****
--- 339,343 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 502,509 ****
                    ],
                    'normalized' => 'float-anchor'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 478,481 ----
***************
*** 696,700 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'index entry',
--- 668,671 ----
***************
*** 791,798 ****
                    ],
                    'normalized' => 'An-anchor'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 762,765 ----
***************
*** 853,860 ****
                    ],
                    'normalized' => 'Anchor-in-footnote'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 820,823 ----
***************
*** 899,902 ****
--- 862,866 ----
  $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}[0] = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
  $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'placed_things_before_element'}{'contents'}[0];
+ $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'placed_things_before_element'}{'contents'}[0];
  $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'placed_things_before_element'}{'contents'}[0];
  $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[3];
***************
*** 922,925 ****
--- 886,890 ----
  $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[1]{'parent'} = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'};
  $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[2] = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'};
+ $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[3]{'parent'} = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'};
  $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[4]{'parent'} = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'};
  $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[5];
***************
*** 933,937 ****
  $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[5]{'parent'} = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'};
  $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'}{'parent'}{'args'}[0] = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'};
- $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'}{'parent'}{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'};
  $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'}{'parent'}{'parent'}{'contents'}[0] = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'}{'parent'};
  $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'}{'parent'}{'parent'}{'contents'}[1]{'parent'} = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'}{'parent'}{'parent'};
--- 898,901 ----
***************
*** 947,950 ****
--- 911,915 ----
  $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[9]{'args'}[0];
  $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[9];
+ $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[9]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[9]{'args'}[1];
  $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[9]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[9]{'args'}[1];
  $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[9]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[9]{'args'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/placed_things_before_node.pl texinfo-6.3/tp/t/results/sectioning/placed_things_before_node.pl
*** texinfo-6.1/tp/t/results/sectioning/placed_things_before_node.pl	2016-01-22 07:50:02.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/placed_things_before_node.pl	2016-08-02 18:44:41.000000000 +0100
***************
*** 34,42 ****
                {}
              ],
!             'normalized' => 'An-anchor',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 34,38 ----
                {}
              ],
!             'normalized' => 'An-anchor'
            },
            'line_nr' => {
***************
*** 48,51 ****
--- 44,48 ----
          },
          {
+           'parent' => {},
            'text' => '
  ',
***************
*** 92,99 ****
                    ],
                    'normalized' => 'An-anchor'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 89,92 ----
***************
*** 172,180 ****
                        {}
                      ],
!                     'normalized' => 'Anchor-in-footnote',
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {
--- 165,169 ----
                        {}
                      ],
!                     'normalized' => 'Anchor-in-footnote'
                    },
                    'line_nr' => {
***************
*** 204,207 ****
--- 193,197 ----
                        {},
                        {
+                         'parent' => {},
                          'text' => '
  ',
***************
*** 248,255 ****
                                  ],
                                  'normalized' => 'An-anchor'
-                               },
-                               'spaces_before_argument' => {
-                                 'text' => '',
-                                 'type' => 'empty_spaces_before_argument'
                                }
                              },
--- 238,241 ----
***************
*** 277,287 ****
                        'cmdname' => 'footnote',
                        'contents' => [],
-                       'extra' => {
-                         'spaces_before_argument' => {
-                           'parent' => {},
-                           'text' => '',
-                           'type' => 'empty_spaces_before_argument'
-                         }
-                       },
                        'line_nr' => {
                          'file_name' => '',
--- 263,266 ----
***************
*** 310,317 ****
                    ],
                    'normalized' => 'Anchor-in-footnote'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 289,292 ----
***************
*** 364,367 ****
--- 339,343 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 502,509 ****
                    ],
                    'normalized' => 'float-anchor'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 478,481 ----
***************
*** 696,700 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'index entry',
--- 668,671 ----
***************
*** 840,847 ****
                    ],
                    'normalized' => 'An-anchor'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 811,814 ----
***************
*** 902,909 ****
                    ],
                    'normalized' => 'Anchor-in-footnote'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 869,872 ----
***************
*** 947,950 ****
--- 910,914 ----
  $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}[0] = $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
  $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'placed_things_before_node'}{'contents'}[0];
+ $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'placed_things_before_node'}{'contents'}[0];
  $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'placed_things_before_node'}{'contents'}[0];
  $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[3];
***************
*** 970,973 ****
--- 934,938 ----
  $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[1]{'parent'} = $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'};
  $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[2] = $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'};
+ $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[3]{'parent'} = $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'};
  $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[4]{'parent'} = $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'};
  $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[5];
***************
*** 981,985 ****
  $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'}{'contents'}[5]{'parent'} = $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'};
  $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'}{'parent'}{'args'}[0] = $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'};
- $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'}{'parent'}{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'};
  $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'}{'parent'}{'parent'}{'contents'}[0] = $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'}{'parent'};
  $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'}{'parent'}{'parent'}{'contents'}[1]{'parent'} = $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'parent'}{'parent'}{'parent'};
--- 946,949 ----
***************
*** 995,998 ****
--- 959,963 ----
  $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[9]{'args'}[0];
  $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[9];
+ $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[9]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[9]{'args'}[1];
  $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[9]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[9]{'args'}[1];
  $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[9]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[9]{'args'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/protected_node_parentheses.pl texinfo-6.3/tp/t/results/sectioning/protected_node_parentheses.pl
*** texinfo-6.1/tp/t/results/sectioning/protected_node_parentheses.pl	2016-01-22 07:50:05.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/protected_node_parentheses.pl	2016-08-02 18:44:44.000000000 +0100
***************
*** 371,379 ****
                {}
              ],
!             'normalized' => '_0028manual2_0029-name2',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {},
--- 371,375 ----
                {}
              ],
!             'normalized' => '_0028manual2_0029-name2'
            },
            'line_nr' => {},
***************
*** 381,384 ****
--- 377,381 ----
          },
          {
+           'parent' => {},
            'text' => '
  ',
***************
*** 444,451 ****
                    ],
                    'normalized' => '_0028manual2_0029-name2'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 441,444 ----
***************
*** 552,555 ****
--- 545,549 ----
  $result_trees{'protected_node_parentheses'}{'contents'}[3]{'contents'}[1]{'line_nr'} = $result_trees{'protected_node_parentheses'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'protected_node_parentheses'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'protected_node_parentheses'}{'contents'}[3];
+ $result_trees{'protected_node_parentheses'}{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'protected_node_parentheses'}{'contents'}[3];
  $result_trees{'protected_node_parentheses'}{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'protected_node_parentheses'}{'contents'}[3];
  $result_trees{'protected_node_parentheses'}{'contents'}[3]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'protected_node_parentheses'}{'contents'}[3]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/ref_to_top.pl texinfo-6.3/tp/t/results/sectioning/ref_to_top.pl
*** texinfo-6.1/tp/t/results/sectioning/ref_to_top.pl	2016-01-22 07:50:02.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/ref_to_top.pl	2016-08-02 18:44:41.000000000 +0100
***************
*** 133,140 ****
                    ],
                    'normalized' => 'Top'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 133,136 ----
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/ref_to_unknown_node.pl texinfo-6.3/tp/t/results/sectioning/ref_to_unknown_node.pl
*** texinfo-6.1/tp/t/results/sectioning/ref_to_unknown_node.pl	2016-01-22 07:49:59.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/ref_to_unknown_node.pl	2016-08-02 18:44:38.000000000 +0100
***************
*** 36,43 ****
                ],
                'normalized' => 'unknown-node'
-             },
-             'spaces_before_argument' => {
-               'text' => '',
-               'type' => 'empty_spaces_before_argument'
              }
            },
--- 36,39 ----
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/section_in_unnumbered_info.pl texinfo-6.3/tp/t/results/sectioning/section_in_unnumbered_info.pl
*** texinfo-6.1/tp/t/results/sectioning/section_in_unnumbered_info.pl	2016-01-22 07:50:04.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/section_in_unnumbered_info.pl	2016-08-02 18:44:43.000000000 +0100
***************
*** 15,41 ****
  ',
            'type' => 'empty_line'
-         },
-         {
-           'args' => [
-             {
-               'parent' => {},
-               'text' => '
- ',
-               'type' => 'misc_arg'
-             }
-           ],
-           'cmdname' => 'setcontentsaftertitlepage',
-           'line_nr' => {
-             'file_name' => '',
-             'line_nr' => 2,
-             'macro' => ''
-           },
-           'parent' => {}
-         },
-         {
-           'parent' => {},
-           'text' => '
- ',
-           'type' => 'empty_line'
          }
        ],
--- 15,18 ----
***************
*** 87,91 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 4,
          'macro' => ''
        },
--- 64,68 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 2,
          'macro' => ''
        },
***************
*** 139,143 ****
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 7,
              'macro' => ''
            },
--- 116,120 ----
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 5,
              'macro' => ''
            },
***************
*** 230,234 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 12,
                  'macro' => ''
                },
--- 207,211 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 10,
                  'macro' => ''
                },
***************
*** 287,291 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 13,
                  'macro' => ''
                },
--- 264,268 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 11,
                  'macro' => ''
                },
***************
*** 344,348 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 14,
                  'macro' => ''
                },
--- 321,325 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 12,
                  'macro' => ''
                },
***************
*** 401,405 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 15,
                  'macro' => ''
                },
--- 378,382 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 13,
                  'macro' => ''
                },
***************
*** 458,462 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 16,
                  'macro' => ''
                },
--- 435,439 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 14,
                  'macro' => ''
                },
***************
*** 500,504 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 17,
                  'macro' => ''
                },
--- 477,481 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 15,
                  'macro' => ''
                },
***************
*** 512,516 ****
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 11,
              'macro' => ''
            },
--- 489,493 ----
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 9,
              'macro' => ''
            },
***************
*** 533,537 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 5,
          'macro' => ''
        },
--- 510,514 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 3,
          'macro' => ''
        },
***************
*** 582,586 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 19,
          'macro' => ''
        },
--- 559,563 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 17,
          'macro' => ''
        },
***************
*** 685,689 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 23,
                  'macro' => ''
                },
--- 662,666 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 21,
                  'macro' => ''
                },
***************
*** 727,731 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 24,
                  'macro' => ''
                },
--- 704,708 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 22,
                  'macro' => ''
                },
***************
*** 739,743 ****
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 22,
              'macro' => ''
            },
--- 716,720 ----
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 20,
              'macro' => ''
            },
***************
*** 760,764 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 20,
          'macro' => ''
        },
--- 737,741 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 18,
          'macro' => ''
        },
***************
*** 810,814 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 26,
          'macro' => ''
        },
--- 787,791 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 24,
          'macro' => ''
        },
***************
*** 860,864 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 27,
          'macro' => ''
        },
--- 837,841 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 25,
          'macro' => ''
        },
***************
*** 910,914 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 29,
          'macro' => ''
        },
--- 887,891 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 27,
          'macro' => ''
        },
***************
*** 1013,1017 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 33,
                  'macro' => ''
                },
--- 990,994 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 31,
                  'macro' => ''
                },
***************
*** 1055,1059 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 34,
                  'macro' => ''
                },
--- 1032,1036 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 32,
                  'macro' => ''
                },
***************
*** 1067,1071 ****
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 32,
              'macro' => ''
            },
--- 1044,1048 ----
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 30,
              'macro' => ''
            },
***************
*** 1088,1092 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 30,
          'macro' => ''
        },
--- 1065,1069 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 28,
          'macro' => ''
        },
***************
*** 1137,1141 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 36,
          'macro' => ''
        },
--- 1114,1118 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 34,
          'macro' => ''
        },
***************
*** 1187,1191 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 37,
          'macro' => ''
        },
--- 1164,1168 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 35,
          'macro' => ''
        },
***************
*** 1236,1240 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 39,
          'macro' => ''
        },
--- 1213,1217 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 37,
          'macro' => ''
        },
***************
*** 1339,1343 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 43,
                  'macro' => ''
                },
--- 1316,1320 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 41,
                  'macro' => ''
                },
***************
*** 1396,1400 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 44,
                  'macro' => ''
                },
--- 1373,1377 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 42,
                  'macro' => ''
                },
***************
*** 1438,1442 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 45,
                  'macro' => ''
                },
--- 1415,1419 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 43,
                  'macro' => ''
                },
***************
*** 1450,1454 ****
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 42,
              'macro' => ''
            },
--- 1427,1431 ----
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 40,
              'macro' => ''
            },
***************
*** 1471,1475 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 40,
          'macro' => ''
        },
--- 1448,1452 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 38,
          'macro' => ''
        },
***************
*** 1521,1525 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 47,
          'macro' => ''
        },
--- 1498,1502 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 45,
          'macro' => ''
        },
***************
*** 1624,1628 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 51,
                  'macro' => ''
                },
--- 1601,1605 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 49,
                  'macro' => ''
                },
***************
*** 1681,1685 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 52,
                  'macro' => ''
                },
--- 1658,1662 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 50,
                  'macro' => ''
                },
***************
*** 1738,1742 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 53,
                  'macro' => ''
                },
--- 1715,1719 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 51,
                  'macro' => ''
                },
***************
*** 1795,1799 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 54,
                  'macro' => ''
                },
--- 1772,1776 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 52,
                  'macro' => ''
                },
***************
*** 1837,1841 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 55,
                  'macro' => ''
                },
--- 1814,1818 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 53,
                  'macro' => ''
                },
***************
*** 1849,1853 ****
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 50,
              'macro' => ''
            },
--- 1826,1830 ----
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 48,
              'macro' => ''
            },
***************
*** 1870,1874 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 48,
          'macro' => ''
        },
--- 1847,1851 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 46,
          'macro' => ''
        },
***************
*** 1919,1923 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 57,
          'macro' => ''
        },
--- 1896,1900 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 55,
          'macro' => ''
        },
***************
*** 1969,1973 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 58,
          'macro' => ''
        },
--- 1946,1950 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 56,
          'macro' => ''
        },
***************
*** 2018,2022 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 60,
          'macro' => ''
        },
--- 1995,1999 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 58,
          'macro' => ''
        },
***************
*** 2068,2072 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 61,
          'macro' => ''
        },
--- 2045,2049 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 59,
          'macro' => ''
        },
***************
*** 2117,2121 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 63,
          'macro' => ''
        },
--- 2094,2098 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 61,
          'macro' => ''
        },
***************
*** 2167,2171 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 64,
          'macro' => ''
        },
--- 2144,2148 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 62,
          'macro' => ''
        },
***************
*** 2216,2220 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 66,
          'macro' => ''
        },
--- 2193,2197 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 64,
          'macro' => ''
        },
***************
*** 2266,2270 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 67,
          'macro' => ''
        },
--- 2243,2247 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 65,
          'macro' => ''
        },
***************
*** 2315,2319 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 69,
          'macro' => ''
        },
--- 2292,2296 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 67,
          'macro' => ''
        },
***************
*** 2418,2422 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 73,
                  'macro' => ''
                },
--- 2395,2399 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 71,
                  'macro' => ''
                },
***************
*** 2460,2464 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 74,
                  'macro' => ''
                },
--- 2437,2441 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 72,
                  'macro' => ''
                },
***************
*** 2472,2476 ****
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 72,
              'macro' => ''
            },
--- 2449,2453 ----
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 70,
              'macro' => ''
            },
***************
*** 2493,2497 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 70,
          'macro' => ''
        },
--- 2470,2474 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 68,
          'macro' => ''
        },
***************
*** 2542,2546 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 76,
          'macro' => ''
        },
--- 2519,2523 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 74,
          'macro' => ''
        },
***************
*** 2598,2602 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 77,
          'macro' => ''
        },
--- 2575,2579 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 75,
          'macro' => ''
        },
***************
*** 2647,2651 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 80,
          'macro' => ''
        },
--- 2624,2628 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 78,
          'macro' => ''
        },
***************
*** 2750,2754 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 84,
                  'macro' => ''
                },
--- 2727,2731 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 82,
                  'macro' => ''
                },
***************
*** 2807,2811 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 85,
                  'macro' => ''
                },
--- 2784,2788 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 83,
                  'macro' => ''
                },
***************
*** 2864,2868 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 86,
                  'macro' => ''
                },
--- 2841,2845 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 84,
                  'macro' => ''
                },
***************
*** 2921,2925 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 87,
                  'macro' => ''
                },
--- 2898,2902 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 85,
                  'macro' => ''
                },
***************
*** 2978,2982 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 88,
                  'macro' => ''
                },
--- 2955,2959 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 86,
                  'macro' => ''
                },
***************
*** 3020,3024 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 89,
                  'macro' => ''
                },
--- 2997,3001 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 87,
                  'macro' => ''
                },
***************
*** 3032,3036 ****
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 83,
              'macro' => ''
            },
--- 3009,3013 ----
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 81,
              'macro' => ''
            },
***************
*** 3053,3057 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 81,
          'macro' => ''
        },
--- 3030,3034 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 79,
          'macro' => ''
        },
***************
*** 3103,3107 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 91,
          'macro' => ''
        },
--- 3080,3084 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 89,
          'macro' => ''
        },
***************
*** 3206,3210 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 95,
                  'macro' => ''
                },
--- 3183,3187 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 93,
                  'macro' => ''
                },
***************
*** 3263,3267 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 96,
                  'macro' => ''
                },
--- 3240,3244 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 94,
                  'macro' => ''
                },
***************
*** 3320,3324 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 97,
                  'macro' => ''
                },
--- 3297,3301 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 95,
                  'macro' => ''
                },
***************
*** 3377,3381 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 98,
                  'macro' => ''
                },
--- 3354,3358 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 96,
                  'macro' => ''
                },
***************
*** 3419,3423 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 99,
                  'macro' => ''
                },
--- 3396,3400 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 97,
                  'macro' => ''
                },
***************
*** 3431,3435 ****
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 94,
              'macro' => ''
            },
--- 3408,3412 ----
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 92,
              'macro' => ''
            },
***************
*** 3452,3456 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 92,
          'macro' => ''
        },
--- 3429,3433 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 90,
          'macro' => ''
        },
***************
*** 3501,3505 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 101,
          'macro' => ''
        },
--- 3478,3482 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 99,
          'macro' => ''
        },
***************
*** 3551,3555 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 102,
          'macro' => ''
        },
--- 3528,3532 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 100,
          'macro' => ''
        },
***************
*** 3600,3604 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 104,
          'macro' => ''
        },
--- 3577,3581 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 102,
          'macro' => ''
        },
***************
*** 3650,3654 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 105,
          'macro' => ''
        },
--- 3627,3631 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 103,
          'macro' => ''
        },
***************
*** 3699,3703 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 107,
          'macro' => ''
        },
--- 3676,3680 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 105,
          'macro' => ''
        },
***************
*** 3749,3753 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 108,
          'macro' => ''
        },
--- 3726,3730 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 106,
          'macro' => ''
        },
***************
*** 3798,3802 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 110,
          'macro' => ''
        },
--- 3775,3779 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 108,
          'macro' => ''
        },
***************
*** 3848,3852 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 111,
          'macro' => ''
        },
--- 3825,3829 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 109,
          'macro' => ''
        },
***************
*** 3897,3901 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 113,
          'macro' => ''
        },
--- 3874,3878 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 111,
          'macro' => ''
        },
***************
*** 3947,3951 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 114,
          'macro' => ''
        },
--- 3924,3928 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 112,
          'macro' => ''
        },
***************
*** 3997,4001 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 116,
          'macro' => ''
        },
--- 3974,3978 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 114,
          'macro' => ''
        },
***************
*** 4100,4104 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 120,
                  'macro' => ''
                },
--- 4077,4081 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 118,
                  'macro' => ''
                },
***************
*** 4142,4146 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 121,
                  'macro' => ''
                },
--- 4119,4123 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 119,
                  'macro' => ''
                },
***************
*** 4154,4158 ****
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 119,
              'macro' => ''
            },
--- 4131,4135 ----
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 117,
              'macro' => ''
            },
***************
*** 4175,4179 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 117,
          'macro' => ''
        },
--- 4152,4156 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 115,
          'macro' => ''
        },
***************
*** 4224,4228 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 123,
          'macro' => ''
        },
--- 4201,4205 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 121,
          'macro' => ''
        },
***************
*** 4274,4278 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 124,
          'macro' => ''
        },
--- 4251,4255 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 122,
          'macro' => ''
        },
***************
*** 4323,4327 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 126,
          'macro' => ''
        },
--- 4300,4304 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 124,
          'macro' => ''
        },
***************
*** 4426,4430 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 130,
                  'macro' => ''
                },
--- 4403,4407 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 128,
                  'macro' => ''
                },
***************
*** 4468,4472 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 131,
                  'macro' => ''
                },
--- 4445,4449 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 129,
                  'macro' => ''
                },
***************
*** 4480,4484 ****
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 129,
              'macro' => ''
            },
--- 4457,4461 ----
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 127,
              'macro' => ''
            },
***************
*** 4501,4505 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 127,
          'macro' => ''
        },
--- 4478,4482 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 125,
          'macro' => ''
        },
***************
*** 4551,4555 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 133,
          'macro' => ''
        },
--- 4528,4532 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 131,
          'macro' => ''
        },
***************
*** 4601,4605 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 134,
          'macro' => ''
        },
--- 4578,4582 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 132,
          'macro' => ''
        },
***************
*** 4651,4655 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 136,
          'macro' => ''
        },
--- 4628,4632 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 134,
          'macro' => ''
        },
***************
*** 4754,4758 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 140,
                  'macro' => ''
                },
--- 4731,4735 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 138,
                  'macro' => ''
                },
***************
*** 4796,4800 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 141,
                  'macro' => ''
                },
--- 4773,4777 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 139,
                  'macro' => ''
                },
***************
*** 4808,4812 ****
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 139,
              'macro' => ''
            },
--- 4785,4789 ----
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 137,
              'macro' => ''
            },
***************
*** 4829,4833 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 137,
          'macro' => ''
        },
--- 4806,4810 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 135,
          'macro' => ''
        },
***************
*** 4878,4882 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 143,
          'macro' => ''
        },
--- 4855,4859 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 141,
          'macro' => ''
        },
***************
*** 4928,4932 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 144,
          'macro' => ''
        },
--- 4905,4909 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 142,
          'macro' => ''
        },
***************
*** 4977,4981 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 146,
          'macro' => ''
        },
--- 4954,4958 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 144,
          'macro' => ''
        },
***************
*** 5080,5084 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 150,
                  'macro' => ''
                },
--- 5057,5061 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 148,
                  'macro' => ''
                },
***************
*** 5122,5126 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 151,
                  'macro' => ''
                },
--- 5099,5103 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 149,
                  'macro' => ''
                },
***************
*** 5134,5138 ****
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 149,
              'macro' => ''
            },
--- 5111,5115 ----
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 147,
              'macro' => ''
            },
***************
*** 5155,5159 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 147,
          'macro' => ''
        },
--- 5132,5136 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 145,
          'macro' => ''
        },
***************
*** 5204,5208 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 153,
          'macro' => ''
        },
--- 5181,5185 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 151,
          'macro' => ''
        },
***************
*** 5307,5311 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 157,
                  'macro' => ''
                },
--- 5284,5288 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 155,
                  'macro' => ''
                },
***************
*** 5364,5368 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 158,
                  'macro' => ''
                },
--- 5341,5345 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 156,
                  'macro' => ''
                },
***************
*** 5421,5425 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 159,
                  'macro' => ''
                },
--- 5398,5402 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 157,
                  'macro' => ''
                },
***************
*** 5478,5482 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 160,
                  'macro' => ''
                },
--- 5455,5459 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 158,
                  'macro' => ''
                },
***************
*** 5520,5524 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 161,
                  'macro' => ''
                },
--- 5497,5501 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 159,
                  'macro' => ''
                },
***************
*** 5532,5536 ****
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 156,
              'macro' => ''
            },
--- 5509,5513 ----
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 154,
              'macro' => ''
            },
***************
*** 5553,5557 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 154,
          'macro' => ''
        },
--- 5530,5534 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 152,
          'macro' => ''
        },
***************
*** 5602,5606 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 163,
          'macro' => ''
        },
--- 5579,5583 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 161,
          'macro' => ''
        },
***************
*** 5652,5656 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 164,
          'macro' => ''
        },
--- 5629,5633 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 162,
          'macro' => ''
        },
***************
*** 5701,5705 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 166,
          'macro' => ''
        },
--- 5678,5682 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 164,
          'macro' => ''
        },
***************
*** 5751,5755 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 167,
          'macro' => ''
        },
--- 5728,5732 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 165,
          'macro' => ''
        },
***************
*** 5800,5804 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 169,
          'macro' => ''
        },
--- 5777,5781 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 167,
          'macro' => ''
        },
***************
*** 5850,5854 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 170,
          'macro' => ''
        },
--- 5827,5831 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 168,
          'macro' => ''
        },
***************
*** 5899,5903 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 172,
          'macro' => ''
        },
--- 5876,5880 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 170,
          'macro' => ''
        },
***************
*** 5942,5946 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 173,
          'macro' => ''
        },
--- 5919,5923 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 171,
          'macro' => ''
        },
***************
*** 5951,5957 ****
  };
  $result_trees{'section_in_unnumbered_info'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'section_in_unnumbered_info'}{'contents'}[0];
- $result_trees{'section_in_unnumbered_info'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'section_in_unnumbered_info'}{'contents'}[0]{'contents'}[1];
- $result_trees{'section_in_unnumbered_info'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'section_in_unnumbered_info'}{'contents'}[0];
- $result_trees{'section_in_unnumbered_info'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'section_in_unnumbered_info'}{'contents'}[0];
  $result_trees{'section_in_unnumbered_info'}{'contents'}[0]{'parent'} = $result_trees{'section_in_unnumbered_info'};
  $result_trees{'section_in_unnumbered_info'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'section_in_unnumbered_info'}{'contents'}[1];
--- 5928,5931 ----
***************
*** 7031,7036 ****
  
  $result_texis{'section_in_unnumbered_info'} = '
- @setcontentsaftertitlepage
- 
  @node Top
  @top Test section in unnumbered
--- 7005,7008 ----
***************
*** 7207,7211 ****
  
  $result_texts{'section_in_unnumbered_info'} = '
- 
  Test section in unnumbered
  **************************
--- 7179,7182 ----
***************
*** 9317,9320 ****
--- 9288,9300 ----
  
  <body lang="en">
+ 
+ <a name="Top"></a>
+ <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>
+ </div>
+ <a name="Test-section-in-unnumbered"></a>
+ <h1 class="top">Test section in unnumbered</h1>
+ 
  <a name="SEC_Contents"></a>
  <h2 class="contents-heading">Table of Contents</h2>
***************
*** 9381,9395 ****
  </div>
  
- <hr>
- 
- 
- <a name="Top"></a>
- <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>
- </div>
- <a name="Test-section-in-unnumbered"></a>
- <h1 class="top">Test section in unnumbered</h1>
- 
  
  <p>Menu:
--- 9361,9364 ----
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl texinfo-6.3/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
*** texinfo-6.1/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl	2016-01-22 07:50:00.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl	2016-08-02 18:44:40.000000000 +0100
***************
*** 15,41 ****
  ',
            'type' => 'empty_line'
-         },
-         {
-           'args' => [
-             {
-               'parent' => {},
-               'text' => '
- ',
-               'type' => 'misc_arg'
-             }
-           ],
-           'cmdname' => 'setcontentsaftertitlepage',
-           'line_nr' => {
-             'file_name' => '',
-             'line_nr' => 2,
-             'macro' => ''
-           },
-           'parent' => {}
-         },
-         {
-           'parent' => {},
-           'text' => '
- ',
-           'type' => 'empty_line'
          }
        ],
--- 15,18 ----
***************
*** 87,91 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 4,
          'macro' => ''
        },
--- 64,68 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 2,
          'macro' => ''
        },
***************
*** 139,143 ****
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 7,
              'macro' => ''
            },
--- 116,120 ----
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 5,
              'macro' => ''
            },
***************
*** 230,234 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 12,
                  'macro' => ''
                },
--- 207,211 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 10,
                  'macro' => ''
                },
***************
*** 287,291 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 13,
                  'macro' => ''
                },
--- 264,268 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 11,
                  'macro' => ''
                },
***************
*** 344,348 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 14,
                  'macro' => ''
                },
--- 321,325 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 12,
                  'macro' => ''
                },
***************
*** 401,405 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 15,
                  'macro' => ''
                },
--- 378,382 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 13,
                  'macro' => ''
                },
***************
*** 458,462 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 16,
                  'macro' => ''
                },
--- 435,439 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 14,
                  'macro' => ''
                },
***************
*** 500,504 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 17,
                  'macro' => ''
                },
--- 477,481 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 15,
                  'macro' => ''
                },
***************
*** 512,516 ****
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 11,
              'macro' => ''
            },
--- 489,493 ----
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 9,
              'macro' => ''
            },
***************
*** 533,537 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 5,
          'macro' => ''
        },
--- 510,514 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 3,
          'macro' => ''
        },
***************
*** 582,586 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 19,
          'macro' => ''
        },
--- 559,563 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 17,
          'macro' => ''
        },
***************
*** 685,689 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 23,
                  'macro' => ''
                },
--- 662,666 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 21,
                  'macro' => ''
                },
***************
*** 727,731 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 24,
                  'macro' => ''
                },
--- 704,708 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 22,
                  'macro' => ''
                },
***************
*** 739,743 ****
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 22,
              'macro' => ''
            },
--- 716,720 ----
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 20,
              'macro' => ''
            },
***************
*** 760,764 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 20,
          'macro' => ''
        },
--- 737,741 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 18,
          'macro' => ''
        },
***************
*** 810,814 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 26,
          'macro' => ''
        },
--- 787,791 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 24,
          'macro' => ''
        },
***************
*** 860,864 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 27,
          'macro' => ''
        },
--- 837,841 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 25,
          'macro' => ''
        },
***************
*** 910,914 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 29,
          'macro' => ''
        },
--- 887,891 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 27,
          'macro' => ''
        },
***************
*** 1013,1017 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 33,
                  'macro' => ''
                },
--- 990,994 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 31,
                  'macro' => ''
                },
***************
*** 1055,1059 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 34,
                  'macro' => ''
                },
--- 1032,1036 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 32,
                  'macro' => ''
                },
***************
*** 1067,1071 ****
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 32,
              'macro' => ''
            },
--- 1044,1048 ----
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 30,
              'macro' => ''
            },
***************
*** 1088,1092 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 30,
          'macro' => ''
        },
--- 1065,1069 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 28,
          'macro' => ''
        },
***************
*** 1137,1141 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 36,
          'macro' => ''
        },
--- 1114,1118 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 34,
          'macro' => ''
        },
***************
*** 1187,1191 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 37,
          'macro' => ''
        },
--- 1164,1168 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 35,
          'macro' => ''
        },
***************
*** 1236,1240 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 39,
          'macro' => ''
        },
--- 1213,1217 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 37,
          'macro' => ''
        },
***************
*** 1339,1343 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 43,
                  'macro' => ''
                },
--- 1316,1320 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 41,
                  'macro' => ''
                },
***************
*** 1396,1400 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 44,
                  'macro' => ''
                },
--- 1373,1377 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 42,
                  'macro' => ''
                },
***************
*** 1438,1442 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 45,
                  'macro' => ''
                },
--- 1415,1419 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 43,
                  'macro' => ''
                },
***************
*** 1450,1454 ****
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 42,
              'macro' => ''
            },
--- 1427,1431 ----
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 40,
              'macro' => ''
            },
***************
*** 1471,1475 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 40,
          'macro' => ''
        },
--- 1448,1452 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 38,
          'macro' => ''
        },
***************
*** 1521,1525 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 47,
          'macro' => ''
        },
--- 1498,1502 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 45,
          'macro' => ''
        },
***************
*** 1624,1628 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 51,
                  'macro' => ''
                },
--- 1601,1605 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 49,
                  'macro' => ''
                },
***************
*** 1681,1685 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 52,
                  'macro' => ''
                },
--- 1658,1662 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 50,
                  'macro' => ''
                },
***************
*** 1738,1742 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 53,
                  'macro' => ''
                },
--- 1715,1719 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 51,
                  'macro' => ''
                },
***************
*** 1795,1799 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 54,
                  'macro' => ''
                },
--- 1772,1776 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 52,
                  'macro' => ''
                },
***************
*** 1837,1841 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 55,
                  'macro' => ''
                },
--- 1814,1818 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 53,
                  'macro' => ''
                },
***************
*** 1849,1853 ****
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 50,
              'macro' => ''
            },
--- 1826,1830 ----
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 48,
              'macro' => ''
            },
***************
*** 1870,1874 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 48,
          'macro' => ''
        },
--- 1847,1851 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 46,
          'macro' => ''
        },
***************
*** 1919,1923 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 57,
          'macro' => ''
        },
--- 1896,1900 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 55,
          'macro' => ''
        },
***************
*** 1969,1973 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 58,
          'macro' => ''
        },
--- 1946,1950 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 56,
          'macro' => ''
        },
***************
*** 2018,2022 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 60,
          'macro' => ''
        },
--- 1995,1999 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 58,
          'macro' => ''
        },
***************
*** 2068,2072 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 61,
          'macro' => ''
        },
--- 2045,2049 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 59,
          'macro' => ''
        },
***************
*** 2117,2121 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 63,
          'macro' => ''
        },
--- 2094,2098 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 61,
          'macro' => ''
        },
***************
*** 2167,2171 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 64,
          'macro' => ''
        },
--- 2144,2148 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 62,
          'macro' => ''
        },
***************
*** 2216,2220 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 66,
          'macro' => ''
        },
--- 2193,2197 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 64,
          'macro' => ''
        },
***************
*** 2266,2270 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 67,
          'macro' => ''
        },
--- 2243,2247 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 65,
          'macro' => ''
        },
***************
*** 2315,2319 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 69,
          'macro' => ''
        },
--- 2292,2296 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 67,
          'macro' => ''
        },
***************
*** 2418,2422 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 73,
                  'macro' => ''
                },
--- 2395,2399 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 71,
                  'macro' => ''
                },
***************
*** 2460,2464 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 74,
                  'macro' => ''
                },
--- 2437,2441 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 72,
                  'macro' => ''
                },
***************
*** 2472,2476 ****
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 72,
              'macro' => ''
            },
--- 2449,2453 ----
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 70,
              'macro' => ''
            },
***************
*** 2493,2497 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 70,
          'macro' => ''
        },
--- 2470,2474 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 68,
          'macro' => ''
        },
***************
*** 2542,2546 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 76,
          'macro' => ''
        },
--- 2519,2523 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 74,
          'macro' => ''
        },
***************
*** 2598,2602 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 77,
          'macro' => ''
        },
--- 2575,2579 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 75,
          'macro' => ''
        },
***************
*** 2647,2651 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 80,
          'macro' => ''
        },
--- 2624,2628 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 78,
          'macro' => ''
        },
***************
*** 2750,2754 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 84,
                  'macro' => ''
                },
--- 2727,2731 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 82,
                  'macro' => ''
                },
***************
*** 2807,2811 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 85,
                  'macro' => ''
                },
--- 2784,2788 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 83,
                  'macro' => ''
                },
***************
*** 2864,2868 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 86,
                  'macro' => ''
                },
--- 2841,2845 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 84,
                  'macro' => ''
                },
***************
*** 2921,2925 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 87,
                  'macro' => ''
                },
--- 2898,2902 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 85,
                  'macro' => ''
                },
***************
*** 2978,2982 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 88,
                  'macro' => ''
                },
--- 2955,2959 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 86,
                  'macro' => ''
                },
***************
*** 3020,3024 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 89,
                  'macro' => ''
                },
--- 2997,3001 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 87,
                  'macro' => ''
                },
***************
*** 3032,3036 ****
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 83,
              'macro' => ''
            },
--- 3009,3013 ----
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 81,
              'macro' => ''
            },
***************
*** 3053,3057 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 81,
          'macro' => ''
        },
--- 3030,3034 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 79,
          'macro' => ''
        },
***************
*** 3103,3107 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 91,
          'macro' => ''
        },
--- 3080,3084 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 89,
          'macro' => ''
        },
***************
*** 3206,3210 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 95,
                  'macro' => ''
                },
--- 3183,3187 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 93,
                  'macro' => ''
                },
***************
*** 3263,3267 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 96,
                  'macro' => ''
                },
--- 3240,3244 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 94,
                  'macro' => ''
                },
***************
*** 3320,3324 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 97,
                  'macro' => ''
                },
--- 3297,3301 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 95,
                  'macro' => ''
                },
***************
*** 3377,3381 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 98,
                  'macro' => ''
                },
--- 3354,3358 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 96,
                  'macro' => ''
                },
***************
*** 3419,3423 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 99,
                  'macro' => ''
                },
--- 3396,3400 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 97,
                  'macro' => ''
                },
***************
*** 3431,3435 ****
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 94,
              'macro' => ''
            },
--- 3408,3412 ----
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 92,
              'macro' => ''
            },
***************
*** 3452,3456 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 92,
          'macro' => ''
        },
--- 3429,3433 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 90,
          'macro' => ''
        },
***************
*** 3501,3505 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 101,
          'macro' => ''
        },
--- 3478,3482 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 99,
          'macro' => ''
        },
***************
*** 3551,3555 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 102,
          'macro' => ''
        },
--- 3528,3532 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 100,
          'macro' => ''
        },
***************
*** 3600,3604 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 104,
          'macro' => ''
        },
--- 3577,3581 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 102,
          'macro' => ''
        },
***************
*** 3650,3654 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 105,
          'macro' => ''
        },
--- 3627,3631 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 103,
          'macro' => ''
        },
***************
*** 3699,3703 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 107,
          'macro' => ''
        },
--- 3676,3680 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 105,
          'macro' => ''
        },
***************
*** 3749,3753 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 108,
          'macro' => ''
        },
--- 3726,3730 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 106,
          'macro' => ''
        },
***************
*** 3798,3802 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 110,
          'macro' => ''
        },
--- 3775,3779 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 108,
          'macro' => ''
        },
***************
*** 3848,3852 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 111,
          'macro' => ''
        },
--- 3825,3829 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 109,
          'macro' => ''
        },
***************
*** 3897,3901 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 113,
          'macro' => ''
        },
--- 3874,3878 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 111,
          'macro' => ''
        },
***************
*** 3947,3951 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 114,
          'macro' => ''
        },
--- 3924,3928 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 112,
          'macro' => ''
        },
***************
*** 3997,4001 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 116,
          'macro' => ''
        },
--- 3974,3978 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 114,
          'macro' => ''
        },
***************
*** 4100,4104 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 120,
                  'macro' => ''
                },
--- 4077,4081 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 118,
                  'macro' => ''
                },
***************
*** 4142,4146 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 121,
                  'macro' => ''
                },
--- 4119,4123 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 119,
                  'macro' => ''
                },
***************
*** 4154,4158 ****
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 119,
              'macro' => ''
            },
--- 4131,4135 ----
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 117,
              'macro' => ''
            },
***************
*** 4175,4179 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 117,
          'macro' => ''
        },
--- 4152,4156 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 115,
          'macro' => ''
        },
***************
*** 4224,4228 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 123,
          'macro' => ''
        },
--- 4201,4205 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 121,
          'macro' => ''
        },
***************
*** 4274,4278 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 124,
          'macro' => ''
        },
--- 4251,4255 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 122,
          'macro' => ''
        },
***************
*** 4323,4327 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 126,
          'macro' => ''
        },
--- 4300,4304 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 124,
          'macro' => ''
        },
***************
*** 4426,4430 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 130,
                  'macro' => ''
                },
--- 4403,4407 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 128,
                  'macro' => ''
                },
***************
*** 4468,4472 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 131,
                  'macro' => ''
                },
--- 4445,4449 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 129,
                  'macro' => ''
                },
***************
*** 4480,4484 ****
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 129,
              'macro' => ''
            },
--- 4457,4461 ----
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 127,
              'macro' => ''
            },
***************
*** 4501,4505 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 127,
          'macro' => ''
        },
--- 4478,4482 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 125,
          'macro' => ''
        },
***************
*** 4551,4555 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 133,
          'macro' => ''
        },
--- 4528,4532 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 131,
          'macro' => ''
        },
***************
*** 4601,4605 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 134,
          'macro' => ''
        },
--- 4578,4582 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 132,
          'macro' => ''
        },
***************
*** 4651,4655 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 136,
          'macro' => ''
        },
--- 4628,4632 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 134,
          'macro' => ''
        },
***************
*** 4754,4758 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 140,
                  'macro' => ''
                },
--- 4731,4735 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 138,
                  'macro' => ''
                },
***************
*** 4796,4800 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 141,
                  'macro' => ''
                },
--- 4773,4777 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 139,
                  'macro' => ''
                },
***************
*** 4808,4812 ****
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 139,
              'macro' => ''
            },
--- 4785,4789 ----
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 137,
              'macro' => ''
            },
***************
*** 4829,4833 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 137,
          'macro' => ''
        },
--- 4806,4810 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 135,
          'macro' => ''
        },
***************
*** 4878,4882 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 143,
          'macro' => ''
        },
--- 4855,4859 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 141,
          'macro' => ''
        },
***************
*** 4928,4932 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 144,
          'macro' => ''
        },
--- 4905,4909 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 142,
          'macro' => ''
        },
***************
*** 4977,4981 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 146,
          'macro' => ''
        },
--- 4954,4958 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 144,
          'macro' => ''
        },
***************
*** 5080,5084 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 150,
                  'macro' => ''
                },
--- 5057,5061 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 148,
                  'macro' => ''
                },
***************
*** 5122,5126 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 151,
                  'macro' => ''
                },
--- 5099,5103 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 149,
                  'macro' => ''
                },
***************
*** 5134,5138 ****
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 149,
              'macro' => ''
            },
--- 5111,5115 ----
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 147,
              'macro' => ''
            },
***************
*** 5155,5159 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 147,
          'macro' => ''
        },
--- 5132,5136 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 145,
          'macro' => ''
        },
***************
*** 5204,5208 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 153,
          'macro' => ''
        },
--- 5181,5185 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 151,
          'macro' => ''
        },
***************
*** 5307,5311 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 157,
                  'macro' => ''
                },
--- 5284,5288 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 155,
                  'macro' => ''
                },
***************
*** 5364,5368 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 158,
                  'macro' => ''
                },
--- 5341,5345 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 156,
                  'macro' => ''
                },
***************
*** 5421,5425 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 159,
                  'macro' => ''
                },
--- 5398,5402 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 157,
                  'macro' => ''
                },
***************
*** 5478,5482 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 160,
                  'macro' => ''
                },
--- 5455,5459 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 158,
                  'macro' => ''
                },
***************
*** 5520,5524 ****
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 161,
                  'macro' => ''
                },
--- 5497,5501 ----
                'line_nr' => {
                  'file_name' => '',
!                 'line_nr' => 159,
                  'macro' => ''
                },
***************
*** 5532,5536 ****
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 156,
              'macro' => ''
            },
--- 5509,5513 ----
            'line_nr' => {
              'file_name' => '',
!             'line_nr' => 154,
              'macro' => ''
            },
***************
*** 5553,5557 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 154,
          'macro' => ''
        },
--- 5530,5534 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 152,
          'macro' => ''
        },
***************
*** 5602,5606 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 163,
          'macro' => ''
        },
--- 5579,5583 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 161,
          'macro' => ''
        },
***************
*** 5652,5656 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 164,
          'macro' => ''
        },
--- 5629,5633 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 162,
          'macro' => ''
        },
***************
*** 5701,5705 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 166,
          'macro' => ''
        },
--- 5678,5682 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 164,
          'macro' => ''
        },
***************
*** 5751,5755 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 167,
          'macro' => ''
        },
--- 5728,5732 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 165,
          'macro' => ''
        },
***************
*** 5800,5804 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 169,
          'macro' => ''
        },
--- 5777,5781 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 167,
          'macro' => ''
        },
***************
*** 5850,5854 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 170,
          'macro' => ''
        },
--- 5827,5831 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 168,
          'macro' => ''
        },
***************
*** 5899,5903 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 172,
          'macro' => ''
        },
--- 5876,5880 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 170,
          'macro' => ''
        },
***************
*** 5942,5946 ****
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 173,
          'macro' => ''
        },
--- 5919,5923 ----
        'line_nr' => {
          'file_name' => '',
!         'line_nr' => 171,
          'macro' => ''
        },
***************
*** 5951,5957 ****
  };
  $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[0];
- $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[0]{'contents'}[1];
- $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[0];
- $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[0];
  $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[0]{'parent'} = $result_trees{'section_in_unnumbered_plaintext'};
  $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[1];
--- 5928,5931 ----
***************
*** 7031,7036 ****
  
  $result_texis{'section_in_unnumbered_plaintext'} = '
- @setcontentsaftertitlepage
- 
  @node Top
  @top Test section in unnumbered
--- 7005,7008 ----
***************
*** 7207,7211 ****
  
  $result_texts{'section_in_unnumbered_plaintext'} = '
- 
  Test section in unnumbered
  **************************
--- 7179,7182 ----
***************
*** 8967,8970 ****
--- 8938,8944 ----
  
  $result_converted{'plaintext'}->{'section_in_unnumbered_plaintext'} = 'Test section in unnumbered
+ **************************
+ 
+ Test section in unnumbered
  1 chapter
    1.1 section in chapter
***************
*** 8998,9005 ****
      unnumbered subsection2 4
      numbered subsection2 4
- 
- Test section in unnumbered
- **************************
- 
  Menu:
  
--- 8972,8975 ----
***************
*** 9145,9148 ****
--- 9115,9127 ----
  
  <body lang="en">
+ 
+ <a name="Top"></a>
+ <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>
+ </div>
+ <a name="Test-section-in-unnumbered"></a>
+ <h1 class="top">Test section in unnumbered</h1>
+ 
  <a name="SEC_Contents"></a>
  <h2 class="contents-heading">Table of Contents</h2>
***************
*** 9209,9223 ****
  </div>
  
- <hr>
- 
- 
- <a name="Top"></a>
- <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>
- </div>
- <a name="Test-section-in-unnumbered"></a>
- <h1 class="top">Test section in unnumbered</h1>
- 
  
  <p>Menu:
--- 9188,9191 ----
***************
*** 9613,9618 ****
  
  $result_converted{'xml'}->{'section_in_unnumbered_plaintext'} = '
- <setcontentsaftertitlepage></setcontentsaftertitlepage>
- 
  <node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter</nodenext><nodeup automatic="on">(dir)</nodeup></node>
  <top spaces=" "><sectiontitle>Test section in unnumbered</sectiontitle>
--- 9581,9584 ----
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/semi_auto.pl texinfo-6.3/tp/t/results/sectioning/semi_auto.pl
*** texinfo-6.1/tp/t/results/sectioning/semi_auto.pl	2016-01-22 07:49:59.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/semi_auto.pl	2016-08-02 18:44:38.000000000 +0100
***************
*** 653,656 ****
--- 653,657 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 667,670 ****
--- 668,672 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 885,890 ****
--- 887,894 ----
  $result_trees{'semi_auto'}{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'semi_auto'}{'contents'}[7];
  $result_trees{'semi_auto'}{'contents'}[7]{'args'}[1]{'parent'} = $result_trees{'semi_auto'}{'contents'}[7];
+ $result_trees{'semi_auto'}{'contents'}[7]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'semi_auto'}{'contents'}[7]{'args'}[2];
  $result_trees{'semi_auto'}{'contents'}[7]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'semi_auto'}{'contents'}[7]{'args'}[2];
  $result_trees{'semi_auto'}{'contents'}[7]{'args'}[2]{'parent'} = $result_trees{'semi_auto'}{'contents'}[7];
+ $result_trees{'semi_auto'}{'contents'}[7]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'semi_auto'}{'contents'}[7]{'args'}[3];
  $result_trees{'semi_auto'}{'contents'}[7]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'semi_auto'}{'contents'}[7]{'args'}[3];
  $result_trees{'semi_auto'}{'contents'}[7]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'semi_auto'}{'contents'}[7]{'args'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/setcontentsaftertitlepage.pl texinfo-6.3/tp/t/results/sectioning/setcontentsaftertitlepage.pl
*** texinfo-6.1/tp/t/results/sectioning/setcontentsaftertitlepage.pl	2016-01-22 07:49:59.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/setcontentsaftertitlepage.pl	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,1085 ****
- 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{'setcontentsaftertitlepage'} = {
-   'contents' => [
-     {
-       'contents' => [
-         {
-           'args' => [
-             {
-               'parent' => {},
-               'text' => '
- ',
-               'type' => 'misc_arg'
-             }
-           ],
-           'cmdname' => 'setcontentsaftertitlepage',
-           'line_nr' => {
-             'file_name' => '',
-             'line_nr' => 1,
-             'macro' => ''
-           },
-           'parent' => {}
-         }
-       ],
-       'parent' => {},
-       'type' => 'text_root'
-     },
-     {
-       'args' => [
-         {
-           'contents' => [
-             {
-               'extra' => {
-                 'command' => {}
-               },
-               'parent' => {},
-               'text' => ' ',
-               'type' => 'empty_spaces_after_command'
-             },
-             {
-               'parent' => {},
-               'text' => 'top'
-             },
-             {
-               'parent' => {},
-               'text' => '
- ',
-               'type' => 'spaces_at_end'
-             }
-           ],
-           'parent' => {},
-           'type' => 'misc_line_arg'
-         }
-       ],
-       'cmdname' => 'top',
-       'contents' => [
-         {
-           'parent' => {},
-           'text' => '
- ',
-           'type' => 'empty_line'
-         }
-       ],
-       'extra' => {
-         'misc_content' => [
-           {}
-         ],
-         'spaces_after_command' => {}
-       },
-       'level' => 0,
-       'line_nr' => {
-         'file_name' => '',
-         'line_nr' => 2,
-         'macro' => ''
-       },
-       'parent' => {}
-     },
-     {
-       'args' => [
-         {
-           'contents' => [
-             {
-               'extra' => {
-                 'command' => {}
-               },
-               'parent' => {},
-               'text' => ' ',
-               'type' => 'empty_spaces_after_command'
-             },
-             {
-               'parent' => {},
-               'text' => 'chapter'
-             },
-             {
-               'parent' => {},
-               'text' => '
- ',
-               'type' => 'spaces_at_end'
-             }
-           ],
-           'parent' => {},
-           'type' => 'misc_line_arg'
-         }
-       ],
-       'cmdname' => 'chapter',
-       'contents' => [
-         {
-           'parent' => {},
-           'text' => '
- ',
-           'type' => 'empty_line'
-         }
-       ],
-       'extra' => {
-         'misc_content' => [
-           {}
-         ],
-         'spaces_after_command' => {}
-       },
-       'level' => 1,
-       'line_nr' => {
-         'file_name' => '',
-         'line_nr' => 4,
-         'macro' => ''
-       },
-       'number' => 1,
-       'parent' => {}
-     },
-     {
-       'args' => [
-         {
-           'contents' => [
-             {
-               'extra' => {
-                 'command' => {}
-               },
-               'parent' => {},
-               'text' => ' ',
-               'type' => 'empty_spaces_after_command'
-             },
-             {
-               'parent' => {},
-               'text' => 'section'
-             },
-             {
-               'parent' => {},
-               'text' => '
- ',
-               'type' => 'spaces_at_end'
-             }
-           ],
-           'parent' => {},
-           'type' => 'misc_line_arg'
-         }
-       ],
-       'cmdname' => 'section',
-       'contents' => [
-         {
-           'parent' => {},
-           'text' => '
- ',
-           'type' => 'empty_line'
-         }
-       ],
-       'extra' => {
-         'misc_content' => [
-           {}
-         ],
-         'spaces_after_command' => {}
-       },
-       'level' => 2,
-       'line_nr' => {
-         'file_name' => '',
-         'line_nr' => 6,
-         'macro' => ''
-       },
-       'number' => '1.1',
-       'parent' => {}
-     },
-     {
-       'args' => [
-         {
-           'contents' => [
-             {
-               'extra' => {
-                 'command' => {}
-               },
-               'parent' => {},
-               'text' => ' ',
-               'type' => 'empty_spaces_after_command'
-             },
-             {
-               'parent' => {},
-               'text' => 'subsection'
-             },
-             {
-               'parent' => {},
-               'text' => '
- ',
-               'type' => 'spaces_at_end'
-             }
-           ],
-           'parent' => {},
-           'type' => 'misc_line_arg'
-         }
-       ],
-       'cmdname' => 'subsection',
-       'contents' => [
-         {
-           'parent' => {},
-           'text' => '
- ',
-           'type' => 'empty_line'
-         }
-       ],
-       'extra' => {
-         'misc_content' => [
-           {}
-         ],
-         'spaces_after_command' => {}
-       },
-       'level' => 3,
-       'line_nr' => {
-         'file_name' => '',
-         'line_nr' => 8,
-         'macro' => ''
-       },
-       'number' => '1.1.1',
-       'parent' => {}
-     },
-     {
-       'args' => [
-         {
-           'contents' => [
-             {
-               'extra' => {
-                 'command' => {}
-               },
-               'parent' => {},
-               'text' => ' ',
-               'type' => 'empty_spaces_after_command'
-             },
-             {
-               'parent' => {},
-               'text' => 'subsubsection'
-             },
-             {
-               'parent' => {},
-               'text' => '
- ',
-               'type' => 'spaces_at_end'
-             }
-           ],
-           'parent' => {},
-           'type' => 'misc_line_arg'
-         }
-       ],
-       'cmdname' => 'subsubsection',
-       'contents' => [
-         {
-           'parent' => {},
-           'text' => '
- ',
-           'type' => 'empty_line'
-         }
-       ],
-       'extra' => {
-         'misc_content' => [
-           {}
-         ],
-         'spaces_after_command' => {}
-       },
-       'level' => 4,
-       'line_nr' => {
-         'file_name' => '',
-         'line_nr' => 10,
-         'macro' => ''
-       },
-       'number' => '1.1.1.1',
-       'parent' => {}
-     },
-     {
-       'args' => [
-         {
-           'contents' => [
-             {
-               'extra' => {
-                 'command' => {}
-               },
-               'parent' => {},
-               'text' => ' ',
-               'type' => 'empty_spaces_after_command'
-             },
-             {
-               'parent' => {},
-               'text' => 'part'
-             },
-             {
-               'parent' => {},
-               'text' => '
- ',
-               'type' => 'spaces_at_end'
-             }
-           ],
-           'parent' => {},
-           'type' => 'misc_line_arg'
-         }
-       ],
-       'cmdname' => 'part',
-       'contents' => [
-         {
-           'parent' => {},
-           'text' => '
- ',
-           'type' => 'empty_line'
-         }
-       ],
-       'extra' => {
-         'misc_content' => [
-           {}
-         ],
-         'spaces_after_command' => {}
-       },
-       'level' => 0,
-       'line_nr' => {
-         'file_name' => '',
-         'line_nr' => 12,
-         'macro' => ''
-       },
-       'parent' => {}
-     },
-     {
-       'args' => [
-         {
-           'contents' => [
-             {
-               'extra' => {
-                 'command' => {}
-               },
-               'parent' => {},
-               'text' => ' ',
-               'type' => 'empty_spaces_after_command'
-             },
-             {
-               'parent' => {},
-               'text' => 'chapter in part'
-             },
-             {
-               'parent' => {},
-               'text' => '
- ',
-               'type' => 'spaces_at_end'
-             }
-           ],
-           'parent' => {},
-           'type' => 'misc_line_arg'
-         }
-       ],
-       'cmdname' => 'chapter',
-       'contents' => [
-         {
-           'parent' => {},
-           'text' => '
- ',
-           'type' => 'empty_line'
-         }
-       ],
-       'extra' => {
-         'associated_part' => {},
-         'misc_content' => [
-           {}
-         ],
-         'spaces_after_command' => {}
-       },
-       'level' => 1,
-       'line_nr' => {
-         'file_name' => '',
-         'line_nr' => 14,
-         'macro' => ''
-       },
-       'number' => 2,
-       'parent' => {}
-     },
-     {
-       'args' => [
-         {
-           'contents' => [
-             {
-               'extra' => {
-                 'command' => {}
-               },
-               'parent' => {},
-               'text' => ' ',
-               'type' => 'empty_spaces_after_command'
-             },
-             {
-               'parent' => {},
-               'text' => 'second chapter in part'
-             },
-             {
-               'parent' => {},
-               'text' => '
- ',
-               'type' => 'spaces_at_end'
-             }
-           ],
-           'parent' => {},
-           'type' => 'misc_line_arg'
-         }
-       ],
-       'cmdname' => 'chapter',
-       'contents' => [
-         {
-           'parent' => {},
-           'text' => '
- ',
-           'type' => 'empty_line'
-         }
-       ],
-       'extra' => {
-         'misc_content' => [
-           {}
-         ],
-         'spaces_after_command' => {}
-       },
-       'level' => 1,
-       'line_nr' => {
-         'file_name' => '',
-         'line_nr' => 16,
-         'macro' => ''
-       },
-       'number' => 3,
-       'parent' => {}
-     },
-     {
-       'args' => [
-         {
-           'contents' => [
-             {
-               'extra' => {
-                 'command' => {}
-               },
-               'parent' => {},
-               'text' => ' ',
-               'type' => 'empty_spaces_after_command'
-             },
-             {
-               'parent' => {},
-               'text' => 'unnumbered'
-             },
-             {
-               'parent' => {},
-               'text' => '
- ',
-               'type' => 'spaces_at_end'
-             }
-           ],
-           'parent' => {},
-           'type' => 'misc_line_arg'
-         }
-       ],
-       'cmdname' => 'unnumbered',
-       'contents' => [
-         {
-           'parent' => {},
-           'text' => '
- ',
-           'type' => 'empty_line'
-         }
-       ],
-       'extra' => {
-         'misc_content' => [
-           {}
-         ],
-         'spaces_after_command' => {}
-       },
-       'level' => 1,
-       'line_nr' => {
-         'file_name' => '',
-         'line_nr' => 18,
-         'macro' => ''
-       },
-       'parent' => {}
-     },
-     {
-       'args' => [
-         {
-           'contents' => [
-             {
-               'extra' => {
-                 'command' => {}
-               },
-               'parent' => {},
-               'text' => ' ',
-               'type' => 'empty_spaces_after_command'
-             },
-             {
-               'parent' => {},
-               'text' => 'appendix'
-             },
-             {
-               'parent' => {},
-               'text' => '
- ',
-               'type' => 'spaces_at_end'
-             }
-           ],
-           'parent' => {},
-           'type' => 'misc_line_arg'
-         }
-       ],
-       'cmdname' => 'appendix',
-       'contents' => [
-         {
-           'parent' => {},
-           'text' => '
- ',
-           'type' => 'empty_line'
-         }
-       ],
-       'extra' => {
-         'misc_content' => [
-           {}
-         ],
-         'spaces_after_command' => {}
-       },
-       'level' => 1,
-       'line_nr' => {
-         'file_name' => '',
-         'line_nr' => 20,
-         'macro' => ''
-       },
-       'number' => 'A',
-       'parent' => {}
-     },
-     {
-       'args' => [
-         {
-           'contents' => [
-             {
-               'extra' => {
-                 'command' => {}
-               },
-               'parent' => {},
-               'text' => ' ',
-               'type' => 'empty_spaces_after_command'
-             },
-             {
-               'parent' => {},
-               'text' => 'appendixsec'
-             },
-             {
-               'parent' => {},
-               'text' => '
- ',
-               'type' => 'spaces_at_end'
-             }
-           ],
-           'parent' => {},
-           'type' => 'misc_line_arg'
-         }
-       ],
-       'cmdname' => 'appendixsec',
-       'contents' => [
-         {
-           'parent' => {},
-           'text' => '
- ',
-           'type' => 'empty_line'
-         },
-         {
-           'args' => [
-             {
-               'parent' => {},
-               'text' => '
- ',
-               'type' => 'misc_arg'
-             }
-           ],
-           'cmdname' => 'contents',
-           'line_nr' => {
-             'file_name' => '',
-             'line_nr' => 24,
-             'macro' => ''
-           },
-           'parent' => {}
-         }
-       ],
-       'extra' => {
-         'misc_content' => [
-           {}
-         ],
-         'spaces_after_command' => {}
-       },
-       'level' => 2,
-       'line_nr' => {
-         'file_name' => '',
-         'line_nr' => 22,
-         'macro' => ''
-       },
-       'number' => 'A.1',
-       'parent' => {}
-     }
-   ],
-   'type' => 'document_root'
- };
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[0]{'contents'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'};
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[1];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[1]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[1]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[1]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[1];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[1];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[1]{'extra'}{'misc_content'}[0] = $result_trees{'setcontentsaftertitlepage'}{'contents'}[1]{'args'}[0]{'contents'}[1];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[1]{'args'}[0]{'contents'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[1]{'parent'} = $result_trees{'setcontentsaftertitlepage'};
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[2];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[2]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[2]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[2]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[2];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[2];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[2]{'extra'}{'misc_content'}[0] = $result_trees{'setcontentsaftertitlepage'}{'contents'}[2]{'args'}[0]{'contents'}[1];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[2]{'args'}[0]{'contents'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[2]{'parent'} = $result_trees{'setcontentsaftertitlepage'};
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[3];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[3]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[3]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[3]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[3];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[3];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[3]{'extra'}{'misc_content'}[0] = $result_trees{'setcontentsaftertitlepage'}{'contents'}[3]{'args'}[0]{'contents'}[1];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[3]{'args'}[0]{'contents'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[3]{'parent'} = $result_trees{'setcontentsaftertitlepage'};
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[4];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[4]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[4]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[4]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[4];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[4];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[4]{'extra'}{'misc_content'}[0] = $result_trees{'setcontentsaftertitlepage'}{'contents'}[4]{'args'}[0]{'contents'}[1];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[4]{'extra'}{'spaces_after_command'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[4]{'args'}[0]{'contents'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[4]{'parent'} = $result_trees{'setcontentsaftertitlepage'};
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[5]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[5];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[5]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[5]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[5]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[5]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[5]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[5];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[5];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[5]{'extra'}{'misc_content'}[0] = $result_trees{'setcontentsaftertitlepage'}{'contents'}[5]{'args'}[0]{'contents'}[1];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[5]{'extra'}{'spaces_after_command'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[5]{'args'}[0]{'contents'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[5]{'parent'} = $result_trees{'setcontentsaftertitlepage'};
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[6];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[6]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[6]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[6]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[6];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[6];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[6]{'extra'}{'misc_content'}[0] = $result_trees{'setcontentsaftertitlepage'}{'contents'}[6]{'args'}[0]{'contents'}[1];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[6]{'extra'}{'spaces_after_command'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[6]{'args'}[0]{'contents'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[6]{'parent'} = $result_trees{'setcontentsaftertitlepage'};
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[7]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[7];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[7]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[7]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[7]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[7]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[7];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[7];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[7]{'extra'}{'associated_part'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[6];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[7]{'extra'}{'misc_content'}[0] = $result_trees{'setcontentsaftertitlepage'}{'contents'}[7]{'args'}[0]{'contents'}[1];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[7]{'extra'}{'spaces_after_command'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[7]{'args'}[0]{'contents'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[7]{'parent'} = $result_trees{'setcontentsaftertitlepage'};
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[8];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[8]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[8]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[8]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[8]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[8]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[8];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[8]{'contents'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[8];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[8]{'extra'}{'misc_content'}[0] = $result_trees{'setcontentsaftertitlepage'}{'contents'}[8]{'args'}[0]{'contents'}[1];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[8]{'extra'}{'spaces_after_command'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[8]{'args'}[0]{'contents'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[8]{'parent'} = $result_trees{'setcontentsaftertitlepage'};
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[9]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[9];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[9]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[9]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[9]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[9]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[9];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[9]{'contents'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[9];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[9]{'extra'}{'misc_content'}[0] = $result_trees{'setcontentsaftertitlepage'}{'contents'}[9]{'args'}[0]{'contents'}[1];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[9]{'extra'}{'spaces_after_command'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[9]{'args'}[0]{'contents'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[9]{'parent'} = $result_trees{'setcontentsaftertitlepage'};
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[10]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[10];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[10]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[10]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[10]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[10]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[10];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[10]{'contents'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[10];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[10]{'extra'}{'misc_content'}[0] = $result_trees{'setcontentsaftertitlepage'}{'contents'}[10]{'args'}[0]{'contents'}[1];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[10]{'extra'}{'spaces_after_command'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[10]{'args'}[0]{'contents'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[10]{'parent'} = $result_trees{'setcontentsaftertitlepage'};
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[11]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[11];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[11]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[11]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[11]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[11]{'args'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[11];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[11]{'contents'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[11];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[11]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[11]{'contents'}[1];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[11]{'contents'}[1]{'parent'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[11];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[11]{'extra'}{'misc_content'}[0] = $result_trees{'setcontentsaftertitlepage'}{'contents'}[11]{'args'}[0]{'contents'}[1];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[11]{'extra'}{'spaces_after_command'} = $result_trees{'setcontentsaftertitlepage'}{'contents'}[11]{'args'}[0]{'contents'}[0];
- $result_trees{'setcontentsaftertitlepage'}{'contents'}[11]{'parent'} = $result_trees{'setcontentsaftertitlepage'};
- 
- $result_texis{'setcontentsaftertitlepage'} = '@setcontentsaftertitlepage
- @top top
- 
- @chapter chapter
- 
- @section section
- 
- @subsection subsection
- 
- @subsubsection subsubsection
- 
- @part part
- 
- @chapter chapter in part
- 
- @chapter second chapter in part
- 
- @unnumbered unnumbered
- 
- @appendix appendix
- 
- @appendixsec appendixsec
- 
- @contents
- ';
- 
- 
- $result_texts{'setcontentsaftertitlepage'} = 'top
- ***
- 
- 1 chapter
- *********
- 
- 1.1 section
- ===========
- 
- 1.1.1 subsection
- ----------------
- 
- 1.1.1.1 subsubsection
- .....................
- 
- part
- ****
- 
- 2 chapter in part
- *****************
- 
- 3 second chapter in part
- ************************
- 
- unnumbered
- **********
- 
- Appendix A appendix
- *******************
- 
- A.1 appendixsec
- ===============
- 
- ';
- 
- $result_sectioning{'setcontentsaftertitlepage'} = {
-   'level' => -1,
-   'section_childs' => [
-     {
-       'cmdname' => 'top',
-       'extra' => {},
-       'level' => 0,
-       'section_childs' => [
-         {
-           'cmdname' => 'chapter',
-           'extra' => {},
-           'level' => 1,
-           'number' => 1,
-           'section_childs' => [
-             {
-               'cmdname' => 'section',
-               'extra' => {},
-               'level' => 2,
-               'number' => '1.1',
-               'section_childs' => [
-                 {
-                   'cmdname' => 'subsection',
-                   'extra' => {},
-                   'level' => 3,
-                   'number' => '1.1.1',
-                   'section_childs' => [
-                     {
-                       'cmdname' => 'subsubsection',
-                       'extra' => {},
-                       'level' => 4,
-                       'number' => '1.1.1.1',
-                       'section_up' => {}
-                     }
-                   ],
-                   'section_up' => {}
-                 }
-               ],
-               'section_up' => {}
-             }
-           ],
-           'section_up' => {},
-           'toplevel_prev' => {},
-           'toplevel_up' => {}
-         }
-       ],
-       'section_up' => {}
-     },
-     {
-       'cmdname' => 'part',
-       'extra' => {
-         'part_associated_section' => {
-           'cmdname' => 'chapter',
-           'extra' => {
-             'associated_part' => {}
-           },
-           'level' => 1,
-           'number' => 2,
-           'section_up' => {},
-           'toplevel_prev' => {},
-           'toplevel_up' => {}
-         }
-       },
-       'level' => 0,
-       'section_childs' => [
-         {},
-         {
-           'cmdname' => 'chapter',
-           'extra' => {},
-           'level' => 1,
-           'number' => 3,
-           'section_prev' => {},
-           'section_up' => {},
-           'toplevel_prev' => {},
-           'toplevel_up' => {}
-         },
-         {
-           'cmdname' => 'unnumbered',
-           'extra' => {},
-           'level' => 1,
-           'section_prev' => {},
-           'section_up' => {},
-           'toplevel_prev' => {},
-           'toplevel_up' => {}
-         }
-       ],
-       'section_prev' => {},
-       'section_up' => {}
-     },
-     {
-       'cmdname' => 'appendix',
-       'extra' => {},
-       'level' => 1,
-       'number' => 'A',
-       'section_childs' => [
-         {
-           'cmdname' => 'appendixsec',
-           'extra' => {},
-           'level' => 2,
-           'number' => 'A.1',
-           'section_up' => {}
-         }
-       ],
-       'section_prev' => {},
-       'section_up' => {},
-       'toplevel_prev' => {},
-       'toplevel_up' => {}
-     }
-   ]
- };
- $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[0]{'section_childs'}[0]{'section_childs'}[0]{'section_childs'}[0]{'section_childs'}[0]{'section_up'} = $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[0]{'section_childs'}[0]{'section_childs'}[0]{'section_childs'}[0];
- $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[0]{'section_childs'}[0]{'section_childs'}[0]{'section_childs'}[0]{'section_up'} = $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[0]{'section_childs'}[0]{'section_childs'}[0];
- $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[0]{'section_childs'}[0]{'section_childs'}[0]{'section_up'} = $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[0]{'section_childs'}[0];
- $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[0]{'section_childs'}[0]{'section_up'} = $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[0];
- $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[0]{'section_childs'}[0]{'toplevel_prev'} = $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[0];
- $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[0]{'section_childs'}[0]{'toplevel_up'} = $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[0];
- $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[0]{'section_up'} = $result_sectioning{'setcontentsaftertitlepage'};
- $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[1]{'extra'}{'part_associated_section'}{'extra'}{'associated_part'} = $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[1];
- $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[1]{'extra'}{'part_associated_section'}{'section_up'} = $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[1];
- $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[1]{'extra'}{'part_associated_section'}{'toplevel_prev'} = $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[0]{'section_childs'}[0];
- $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[1]{'extra'}{'part_associated_section'}{'toplevel_up'} = $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[0];
- $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[1]{'section_childs'}[0] = $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[1]{'extra'}{'part_associated_section'};
- $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[1]{'section_childs'}[1]{'section_prev'} = $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[1]{'extra'}{'part_associated_section'};
- $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[1]{'section_childs'}[1]{'section_up'} = $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[1];
- $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[1]{'section_childs'}[1]{'toplevel_prev'} = $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[1]{'extra'}{'part_associated_section'};
- $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[1]{'section_childs'}[1]{'toplevel_up'} = $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[0];
- $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[1]{'section_childs'}[2]{'section_prev'} = $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[1]{'section_childs'}[1];
- $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[1]{'section_childs'}[2]{'section_up'} = $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[1];
- $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[1]{'section_childs'}[2]{'toplevel_prev'} = $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[1]{'section_childs'}[1];
- $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[1]{'section_childs'}[2]{'toplevel_up'} = $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[0];
- $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[1]{'section_prev'} = $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[0];
- $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[1]{'section_up'} = $result_sectioning{'setcontentsaftertitlepage'};
- $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[2]{'section_childs'}[0]{'section_up'} = $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[2];
- $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[2]{'section_prev'} = $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[1];
- $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[2]{'section_up'} = $result_sectioning{'setcontentsaftertitlepage'};
- $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[2]{'toplevel_prev'} = $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[1]{'section_childs'}[2];
- $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[2]{'toplevel_up'} = $result_sectioning{'setcontentsaftertitlepage'}{'section_childs'}[0];
- 
- $result_errors{'setcontentsaftertitlepage'} = [];
- 
- 
- 
- $result_converted{'plaintext'}->{'setcontentsaftertitlepage'} = 'top
- 1 chapter
-   1.1 section
-     1.1.1 subsection
-       1.1.1.1 subsubsection
- part
- 2 chapter in part
- 3 second chapter in part
- unnumbered
- Appendix A appendix
-   A.1 appendixsec
- 
- top
- ***
- 
- 1 chapter
- *********
- 
- 1.1 section
- ===========
- 
- 1.1.1 subsection
- ----------------
- 
- 1.1.1.1 subsubsection
- .....................
- 
- 2 chapter in part
- *****************
- 
- 3 second chapter in part
- ************************
- 
- unnumbered
- **********
- 
- Appendix A appendix
- *******************
- 
- A.1 appendixsec
- ===============
- 
- ';
- 
- 
- $result_converted{'html'}->{'setcontentsaftertitlepage'} = '<!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>
- <title>top</title>
- 
- <meta name="description" content="top">
- <meta name="keywords" content="top">
- <meta name="resource-type" content="document">
- <meta name="distribution" content="global">
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <link href="#SEC_Contents" rel="contents" title="Table of Contents">
- <style type="text/css">
- <!--
- a.summary-letter {text-decoration: none}
- blockquote.indentedblock {margin-right: 0em}
- blockquote.smallindentedblock {margin-right: 0em; font-size: smaller}
- blockquote.smallquotation {font-size: smaller}
- div.display {margin-left: 3.2em}
- div.example {margin-left: 3.2em}
- div.lisp {margin-left: 3.2em}
- div.smalldisplay {margin-left: 3.2em}
- div.smallexample {margin-left: 3.2em}
- div.smalllisp {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}
- 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.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">
- <a name="SEC_Contents"></a>
- <h2 class="contents-heading">Table of Contents</h2>
- 
- <div class="contents">
- <ul class="no-bullet">
- <li>
- <ul class="no-bullet">
-   <li><a name="toc-chapter" href="#chapter">1 chapter</a>
-   <ul class="no-bullet">
-     <li><a name="toc-section" href="#section">1.1 section</a>
-     <ul class="no-bullet">
-       <li><a name="toc-subsection" href="#subsection">1.1.1 subsection</a>
-       <ul class="no-bullet">
-         <li><a name="toc-subsubsection" href="#subsubsection">1.1.1.1 subsubsection</a></li>
-       </ul></li>
-     </ul></li>
-   </ul></li>
- </ul></li>
- <li><a name="toc-part" href="#part">part</a>
- <ul class="no-bullet">
-   <li><a name="toc-chapter-in-part" href="#chapter-in-part">2 chapter in part</a></li>
-   <li><a name="toc-second-chapter-in-part" href="#second-chapter-in-part">3 second chapter in part</a></li>
-   <li><a name="toc-unnumbered" href="#unnumbered">unnumbered</a></li>
- </ul></li>
-   <li><a name="toc-appendix" href="#appendix">Appendix A appendix</a>
-   <ul class="no-bullet">
-     <li><a name="toc-appendixsec" href="#appendixsec">A.1 appendixsec</a></li>
-   </ul></li>
- 
- </ul>
- </div>
- 
- <hr>
- <a name="top"></a>
- <h1 class="top">top</h1>
- 
- <a name="chapter"></a>
- <h2 class="chapter">1 chapter</h2>
- 
- <a name="section"></a>
- <h3 class="section">1.1 section</h3>
- 
- <a name="subsection"></a>
- <h4 class="subsection">1.1.1 subsection</h4>
- 
- <a name="subsubsection"></a>
- <h4 class="subsubsection">1.1.1.1 subsubsection</h4>
- 
- <a name="part"></a>
- <h1 class="part">part</h1>
- <hr>
- 
- <a name="chapter-in-part"></a>
- <h2 class="chapter">2 chapter in part</h2>
- 
- <a name="second-chapter-in-part"></a>
- <h2 class="chapter">3 second chapter in part</h2>
- 
- <a name="unnumbered"></a>
- <h2 class="unnumbered">unnumbered</h2>
- 
- <a name="appendix"></a>
- <h2 class="appendix">Appendix A appendix</h2>
- 
- <a name="appendixsec"></a>
- <h3 class="appendixsec">A.1 appendixsec</h3>
- 
- <hr>
- 
- 
- 
- </body>
- </html>
- ';
- 
- 1;
--- 0 ----
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl texinfo-6.3/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl
*** texinfo-6.1/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl	2016-01-22 07:50:00.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl	2016-08-02 18:44:39.000000000 +0100
***************
*** 293,302 ****
  $result_errors{'setfilename_on_top_and_after_node'} = [
    {
!     'error_line' => ':2: warning: @setfilename should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 2,
      'macro' => '',
!     'text' => '@setfilename should only appear at a line beginning',
      'type' => 'warning'
    },
--- 293,302 ----
  $result_errors{'setfilename_on_top_and_after_node'} = [
    {
!     'error_line' => ':2: warning: @setfilename should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 2,
      'macro' => '',
!     'text' => '@setfilename should only appear at the beginning of a line',
      'type' => 'warning'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/setshortcontentsaftertitlepage.pl texinfo-6.3/tp/t/results/sectioning/setshortcontentsaftertitlepage.pl
*** texinfo-6.1/tp/t/results/sectioning/setshortcontentsaftertitlepage.pl	2016-01-22 07:49:59.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/setshortcontentsaftertitlepage.pl	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,1066 ****
- 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{'setshortcontentsaftertitlepage'} = {
-   'contents' => [
-     {
-       'contents' => [
-         {
-           'args' => [
-             {
-               'parent' => {},
-               'text' => '
- ',
-               'type' => 'misc_arg'
-             }
-           ],
-           'cmdname' => 'setshortcontentsaftertitlepage',
-           'line_nr' => {
-             'file_name' => '',
-             'line_nr' => 1,
-             'macro' => ''
-           },
-           'parent' => {}
-         }
-       ],
-       'parent' => {},
-       'type' => 'text_root'
-     },
-     {
-       'args' => [
-         {
-           'contents' => [
-             {
-               'extra' => {
-                 'command' => {}
-               },
-               'parent' => {},
-               'text' => ' ',
-               'type' => 'empty_spaces_after_command'
-             },
-             {
-               'parent' => {},
-               'text' => 'top'
-             },
-             {
-               'parent' => {},
-               'text' => '
- ',
-               'type' => 'spaces_at_end'
-             }
-           ],
-           'parent' => {},
-           'type' => 'misc_line_arg'
-         }
-       ],
-       'cmdname' => 'top',
-       'contents' => [
-         {
-           'parent' => {},
-           'text' => '
- ',
-           'type' => 'empty_line'
-         }
-       ],
-       'extra' => {
-         'misc_content' => [
-           {}
-         ],
-         'spaces_after_command' => {}
-       },
-       'level' => 0,
-       'line_nr' => {
-         'file_name' => '',
-         'line_nr' => 2,
-         'macro' => ''
-       },
-       'parent' => {}
-     },
-     {
-       'args' => [
-         {
-           'contents' => [
-             {
-               'extra' => {
-                 'command' => {}
-               },
-               'parent' => {},
-               'text' => ' ',
-               'type' => 'empty_spaces_after_command'
-             },
-             {
-               'parent' => {},
-               'text' => 'chapter'
-             },
-             {
-               'parent' => {},
-               'text' => '
- ',
-               'type' => 'spaces_at_end'
-             }
-           ],
-           'parent' => {},
-           'type' => 'misc_line_arg'
-         }
-       ],
-       'cmdname' => 'chapter',
-       'contents' => [
-         {
-           'parent' => {},
-           'text' => '
- ',
-           'type' => 'empty_line'
-         }
-       ],
-       'extra' => {
-         'misc_content' => [
-           {}
-         ],
-         'spaces_after_command' => {}
-       },
-       'level' => 1,
-       'line_nr' => {
-         'file_name' => '',
-         'line_nr' => 4,
-         'macro' => ''
-       },
-       'number' => 1,
-       'parent' => {}
-     },
-     {
-       'args' => [
-         {
-           'contents' => [
-             {
-               'extra' => {
-                 'command' => {}
-               },
-               'parent' => {},
-               'text' => ' ',
-               'type' => 'empty_spaces_after_command'
-             },
-             {
-               'parent' => {},
-               'text' => 'section'
-             },
-             {
-               'parent' => {},
-               'text' => '
- ',
-               'type' => 'spaces_at_end'
-             }
-           ],
-           'parent' => {},
-           'type' => 'misc_line_arg'
-         }
-       ],
-       'cmdname' => 'section',
-       'contents' => [
-         {
-           'parent' => {},
-           'text' => '
- ',
-           'type' => 'empty_line'
-         }
-       ],
-       'extra' => {
-         'misc_content' => [
-           {}
-         ],
-         'spaces_after_command' => {}
-       },
-       'level' => 2,
-       'line_nr' => {
-         'file_name' => '',
-         'line_nr' => 6,
-         'macro' => ''
-       },
-       'number' => '1.1',
-       'parent' => {}
-     },
-     {
-       'args' => [
-         {
-           'contents' => [
-             {
-               'extra' => {
-                 'command' => {}
-               },
-               'parent' => {},
-               'text' => ' ',
-               'type' => 'empty_spaces_after_command'
-             },
-             {
-               'parent' => {},
-               'text' => 'subsection'
-             },
-             {
-               'parent' => {},
-               'text' => '
- ',
-               'type' => 'spaces_at_end'
-             }
-           ],
-           'parent' => {},
-           'type' => 'misc_line_arg'
-         }
-       ],
-       'cmdname' => 'subsection',
-       'contents' => [
-         {
-           'parent' => {},
-           'text' => '
- ',
-           'type' => 'empty_line'
-         }
-       ],
-       'extra' => {
-         'misc_content' => [
-           {}
-         ],
-         'spaces_after_command' => {}
-       },
-       'level' => 3,
-       'line_nr' => {
-         'file_name' => '',
-         'line_nr' => 8,
-         'macro' => ''
-       },
-       'number' => '1.1.1',
-       'parent' => {}
-     },
-     {
-       'args' => [
-         {
-           'contents' => [
-             {
-               'extra' => {
-                 'command' => {}
-               },
-               'parent' => {},
-               'text' => ' ',
-               'type' => 'empty_spaces_after_command'
-             },
-             {
-               'parent' => {},
-               'text' => 'subsubsection'
-             },
-             {
-               'parent' => {},
-               'text' => '
- ',
-               'type' => 'spaces_at_end'
-             }
-           ],
-           'parent' => {},
-           'type' => 'misc_line_arg'
-         }
-       ],
-       'cmdname' => 'subsubsection',
-       'contents' => [
-         {
-           'parent' => {},
-           'text' => '
- ',
-           'type' => 'empty_line'
-         }
-       ],
-       'extra' => {
-         'misc_content' => [
-           {}
-         ],
-         'spaces_after_command' => {}
-       },
-       'level' => 4,
-       'line_nr' => {
-         'file_name' => '',
-         'line_nr' => 10,
-         'macro' => ''
-       },
-       'number' => '1.1.1.1',
-       'parent' => {}
-     },
-     {
-       'args' => [
-         {
-           'contents' => [
-             {
-               'extra' => {
-                 'command' => {}
-               },
-               'parent' => {},
-               'text' => ' ',
-               'type' => 'empty_spaces_after_command'
-             },
-             {
-               'parent' => {},
-               'text' => 'part'
-             },
-             {
-               'parent' => {},
-               'text' => '
- ',
-               'type' => 'spaces_at_end'
-             }
-           ],
-           'parent' => {},
-           'type' => 'misc_line_arg'
-         }
-       ],
-       'cmdname' => 'part',
-       'contents' => [
-         {
-           'parent' => {},
-           'text' => '
- ',
-           'type' => 'empty_line'
-         }
-       ],
-       'extra' => {
-         'misc_content' => [
-           {}
-         ],
-         'spaces_after_command' => {}
-       },
-       'level' => 0,
-       'line_nr' => {
-         'file_name' => '',
-         'line_nr' => 12,
-         'macro' => ''
-       },
-       'parent' => {}
-     },
-     {
-       'args' => [
-         {
-           'contents' => [
-             {
-               'extra' => {
-                 'command' => {}
-               },
-               'parent' => {},
-               'text' => ' ',
-               'type' => 'empty_spaces_after_command'
-             },
-             {
-               'parent' => {},
-               'text' => 'chapter in part'
-             },
-             {
-               'parent' => {},
-               'text' => '
- ',
-               'type' => 'spaces_at_end'
-             }
-           ],
-           'parent' => {},
-           'type' => 'misc_line_arg'
-         }
-       ],
-       'cmdname' => 'chapter',
-       'contents' => [
-         {
-           'parent' => {},
-           'text' => '
- ',
-           'type' => 'empty_line'
-         }
-       ],
-       'extra' => {
-         'associated_part' => {},
-         'misc_content' => [
-           {}
-         ],
-         'spaces_after_command' => {}
-       },
-       'level' => 1,
-       'line_nr' => {
-         'file_name' => '',
-         'line_nr' => 14,
-         'macro' => ''
-       },
-       'number' => 2,
-       'parent' => {}
-     },
-     {
-       'args' => [
-         {
-           'contents' => [
-             {
-               'extra' => {
-                 'command' => {}
-               },
-               'parent' => {},
-               'text' => ' ',
-               'type' => 'empty_spaces_after_command'
-             },
-             {
-               'parent' => {},
-               'text' => 'second chapter in part'
-             },
-             {
-               'parent' => {},
-               'text' => '
- ',
-               'type' => 'spaces_at_end'
-             }
-           ],
-           'parent' => {},
-           'type' => 'misc_line_arg'
-         }
-       ],
-       'cmdname' => 'chapter',
-       'contents' => [
-         {
-           'parent' => {},
-           'text' => '
- ',
-           'type' => 'empty_line'
-         }
-       ],
-       'extra' => {
-         'misc_content' => [
-           {}
-         ],
-         'spaces_after_command' => {}
-       },
-       'level' => 1,
-       'line_nr' => {
-         'file_name' => '',
-         'line_nr' => 16,
-         'macro' => ''
-       },
-       'number' => 3,
-       'parent' => {}
-     },
-     {
-       'args' => [
-         {
-           'contents' => [
-             {
-               'extra' => {
-                 'command' => {}
-               },
-               'parent' => {},
-               'text' => ' ',
-               'type' => 'empty_spaces_after_command'
-             },
-             {
-               'parent' => {},
-               'text' => 'unnumbered'
-             },
-             {
-               'parent' => {},
-               'text' => '
- ',
-               'type' => 'spaces_at_end'
-             }
-           ],
-           'parent' => {},
-           'type' => 'misc_line_arg'
-         }
-       ],
-       'cmdname' => 'unnumbered',
-       'contents' => [
-         {
-           'parent' => {},
-           'text' => '
- ',
-           'type' => 'empty_line'
-         }
-       ],
-       'extra' => {
-         'misc_content' => [
-           {}
-         ],
-         'spaces_after_command' => {}
-       },
-       'level' => 1,
-       'line_nr' => {
-         'file_name' => '',
-         'line_nr' => 18,
-         'macro' => ''
-       },
-       'parent' => {}
-     },
-     {
-       'args' => [
-         {
-           'contents' => [
-             {
-               'extra' => {
-                 'command' => {}
-               },
-               'parent' => {},
-               'text' => ' ',
-               'type' => 'empty_spaces_after_command'
-             },
-             {
-               'parent' => {},
-               'text' => 'appendix'
-             },
-             {
-               'parent' => {},
-               'text' => '
- ',
-               'type' => 'spaces_at_end'
-             }
-           ],
-           'parent' => {},
-           'type' => 'misc_line_arg'
-         }
-       ],
-       'cmdname' => 'appendix',
-       'contents' => [
-         {
-           'parent' => {},
-           'text' => '
- ',
-           'type' => 'empty_line'
-         }
-       ],
-       'extra' => {
-         'misc_content' => [
-           {}
-         ],
-         'spaces_after_command' => {}
-       },
-       'level' => 1,
-       'line_nr' => {
-         'file_name' => '',
-         'line_nr' => 20,
-         'macro' => ''
-       },
-       'number' => 'A',
-       'parent' => {}
-     },
-     {
-       'args' => [
-         {
-           'contents' => [
-             {
-               'extra' => {
-                 'command' => {}
-               },
-               'parent' => {},
-               'text' => ' ',
-               'type' => 'empty_spaces_after_command'
-             },
-             {
-               'parent' => {},
-               'text' => 'appendixsec'
-             },
-             {
-               'parent' => {},
-               'text' => '
- ',
-               'type' => 'spaces_at_end'
-             }
-           ],
-           'parent' => {},
-           'type' => 'misc_line_arg'
-         }
-       ],
-       'cmdname' => 'appendixsec',
-       'contents' => [
-         {
-           'parent' => {},
-           'text' => '
- ',
-           'type' => 'empty_line'
-         },
-         {
-           'args' => [
-             {
-               'parent' => {},
-               'text' => '
- ',
-               'type' => 'misc_arg'
-             }
-           ],
-           'cmdname' => 'shortcontents',
-           'line_nr' => {
-             'file_name' => '',
-             'line_nr' => 24,
-             'macro' => ''
-           },
-           'parent' => {}
-         }
-       ],
-       'extra' => {
-         'misc_content' => [
-           {}
-         ],
-         'spaces_after_command' => {}
-       },
-       'level' => 2,
-       'line_nr' => {
-         'file_name' => '',
-         'line_nr' => 22,
-         'macro' => ''
-       },
-       'number' => 'A.1',
-       'parent' => {}
-     }
-   ],
-   'type' => 'document_root'
- };
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[0]{'contents'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'};
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[1];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[1]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[1]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[1]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[1];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[1];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[1]{'extra'}{'misc_content'}[0] = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[1]{'args'}[0]{'contents'}[1];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[1]{'args'}[0]{'contents'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[1]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'};
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[2];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[2]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[2]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[2]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[2];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[2];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[2]{'extra'}{'misc_content'}[0] = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[2]{'args'}[0]{'contents'}[1];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[2]{'args'}[0]{'contents'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[2]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'};
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[3];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[3]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[3]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[3]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[3];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[3];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[3]{'extra'}{'misc_content'}[0] = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[3]{'args'}[0]{'contents'}[1];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[3]{'args'}[0]{'contents'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[3]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'};
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[4];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[4]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[4]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[4]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[4];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[4];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[4]{'extra'}{'misc_content'}[0] = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[4]{'args'}[0]{'contents'}[1];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[4]{'extra'}{'spaces_after_command'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[4]{'args'}[0]{'contents'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[4]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'};
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[5]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[5];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[5]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[5]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[5]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[5]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[5]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[5];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[5];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[5]{'extra'}{'misc_content'}[0] = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[5]{'args'}[0]{'contents'}[1];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[5]{'extra'}{'spaces_after_command'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[5]{'args'}[0]{'contents'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[5]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'};
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[6];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[6]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[6]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[6]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[6];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[6];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[6]{'extra'}{'misc_content'}[0] = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[6]{'args'}[0]{'contents'}[1];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[6]{'extra'}{'spaces_after_command'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[6]{'args'}[0]{'contents'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[6]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'};
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[7]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[7];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[7]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[7]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[7]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[7]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[7];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[7];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[7]{'extra'}{'associated_part'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[6];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[7]{'extra'}{'misc_content'}[0] = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[7]{'args'}[0]{'contents'}[1];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[7]{'extra'}{'spaces_after_command'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[7]{'args'}[0]{'contents'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[7]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'};
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[8];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[8]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[8]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[8]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[8]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[8]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[8];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[8]{'contents'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[8];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[8]{'extra'}{'misc_content'}[0] = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[8]{'args'}[0]{'contents'}[1];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[8]{'extra'}{'spaces_after_command'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[8]{'args'}[0]{'contents'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[8]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'};
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[9]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[9];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[9]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[9]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[9]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[9]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[9];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[9]{'contents'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[9];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[9]{'extra'}{'misc_content'}[0] = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[9]{'args'}[0]{'contents'}[1];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[9]{'extra'}{'spaces_after_command'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[9]{'args'}[0]{'contents'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[9]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'};
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[10]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[10];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[10]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[10]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[10]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[10]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[10];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[10]{'contents'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[10];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[10]{'extra'}{'misc_content'}[0] = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[10]{'args'}[0]{'contents'}[1];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[10]{'extra'}{'spaces_after_command'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[10]{'args'}[0]{'contents'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[10]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'};
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[11]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[11];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[11]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[11]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[11]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[11]{'args'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[11];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[11]{'contents'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[11];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[11]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[11]{'contents'}[1];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[11]{'contents'}[1]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[11];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[11]{'extra'}{'misc_content'}[0] = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[11]{'args'}[0]{'contents'}[1];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[11]{'extra'}{'spaces_after_command'} = $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[11]{'args'}[0]{'contents'}[0];
- $result_trees{'setshortcontentsaftertitlepage'}{'contents'}[11]{'parent'} = $result_trees{'setshortcontentsaftertitlepage'};
- 
- $result_texis{'setshortcontentsaftertitlepage'} = '@setshortcontentsaftertitlepage
- @top top
- 
- @chapter chapter
- 
- @section section
- 
- @subsection subsection
- 
- @subsubsection subsubsection
- 
- @part part
- 
- @chapter chapter in part
- 
- @chapter second chapter in part
- 
- @unnumbered unnumbered
- 
- @appendix appendix
- 
- @appendixsec appendixsec
- 
- @shortcontents
- ';
- 
- 
- $result_texts{'setshortcontentsaftertitlepage'} = 'top
- ***
- 
- 1 chapter
- *********
- 
- 1.1 section
- ===========
- 
- 1.1.1 subsection
- ----------------
- 
- 1.1.1.1 subsubsection
- .....................
- 
- part
- ****
- 
- 2 chapter in part
- *****************
- 
- 3 second chapter in part
- ************************
- 
- unnumbered
- **********
- 
- Appendix A appendix
- *******************
- 
- A.1 appendixsec
- ===============
- 
- ';
- 
- $result_sectioning{'setshortcontentsaftertitlepage'} = {
-   'level' => -1,
-   'section_childs' => [
-     {
-       'cmdname' => 'top',
-       'extra' => {},
-       'level' => 0,
-       'section_childs' => [
-         {
-           'cmdname' => 'chapter',
-           'extra' => {},
-           'level' => 1,
-           'number' => 1,
-           'section_childs' => [
-             {
-               'cmdname' => 'section',
-               'extra' => {},
-               'level' => 2,
-               'number' => '1.1',
-               'section_childs' => [
-                 {
-                   'cmdname' => 'subsection',
-                   'extra' => {},
-                   'level' => 3,
-                   'number' => '1.1.1',
-                   'section_childs' => [
-                     {
-                       'cmdname' => 'subsubsection',
-                       'extra' => {},
-                       'level' => 4,
-                       'number' => '1.1.1.1',
-                       'section_up' => {}
-                     }
-                   ],
-                   'section_up' => {}
-                 }
-               ],
-               'section_up' => {}
-             }
-           ],
-           'section_up' => {},
-           'toplevel_prev' => {},
-           'toplevel_up' => {}
-         }
-       ],
-       'section_up' => {}
-     },
-     {
-       'cmdname' => 'part',
-       'extra' => {
-         'part_associated_section' => {
-           'cmdname' => 'chapter',
-           'extra' => {
-             'associated_part' => {}
-           },
-           'level' => 1,
-           'number' => 2,
-           'section_up' => {},
-           'toplevel_prev' => {},
-           'toplevel_up' => {}
-         }
-       },
-       'level' => 0,
-       'section_childs' => [
-         {},
-         {
-           'cmdname' => 'chapter',
-           'extra' => {},
-           'level' => 1,
-           'number' => 3,
-           'section_prev' => {},
-           'section_up' => {},
-           'toplevel_prev' => {},
-           'toplevel_up' => {}
-         },
-         {
-           'cmdname' => 'unnumbered',
-           'extra' => {},
-           'level' => 1,
-           'section_prev' => {},
-           'section_up' => {},
-           'toplevel_prev' => {},
-           'toplevel_up' => {}
-         }
-       ],
-       'section_prev' => {},
-       'section_up' => {}
-     },
-     {
-       'cmdname' => 'appendix',
-       'extra' => {},
-       'level' => 1,
-       'number' => 'A',
-       'section_childs' => [
-         {
-           'cmdname' => 'appendixsec',
-           'extra' => {},
-           'level' => 2,
-           'number' => 'A.1',
-           'section_up' => {}
-         }
-       ],
-       'section_prev' => {},
-       'section_up' => {},
-       'toplevel_prev' => {},
-       'toplevel_up' => {}
-     }
-   ]
- };
- $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[0]{'section_childs'}[0]{'section_childs'}[0]{'section_childs'}[0]{'section_childs'}[0]{'section_up'} = $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[0]{'section_childs'}[0]{'section_childs'}[0]{'section_childs'}[0];
- $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[0]{'section_childs'}[0]{'section_childs'}[0]{'section_childs'}[0]{'section_up'} = $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[0]{'section_childs'}[0]{'section_childs'}[0];
- $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[0]{'section_childs'}[0]{'section_childs'}[0]{'section_up'} = $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[0]{'section_childs'}[0];
- $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[0]{'section_childs'}[0]{'section_up'} = $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[0];
- $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[0]{'section_childs'}[0]{'toplevel_prev'} = $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[0];
- $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[0]{'section_childs'}[0]{'toplevel_up'} = $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[0];
- $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[0]{'section_up'} = $result_sectioning{'setshortcontentsaftertitlepage'};
- $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[1]{'extra'}{'part_associated_section'}{'extra'}{'associated_part'} = $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[1];
- $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[1]{'extra'}{'part_associated_section'}{'section_up'} = $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[1];
- $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[1]{'extra'}{'part_associated_section'}{'toplevel_prev'} = $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[0]{'section_childs'}[0];
- $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[1]{'extra'}{'part_associated_section'}{'toplevel_up'} = $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[0];
- $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[1]{'section_childs'}[0] = $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[1]{'extra'}{'part_associated_section'};
- $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[1]{'section_childs'}[1]{'section_prev'} = $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[1]{'extra'}{'part_associated_section'};
- $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[1]{'section_childs'}[1]{'section_up'} = $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[1];
- $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[1]{'section_childs'}[1]{'toplevel_prev'} = $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[1]{'extra'}{'part_associated_section'};
- $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[1]{'section_childs'}[1]{'toplevel_up'} = $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[0];
- $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[1]{'section_childs'}[2]{'section_prev'} = $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[1]{'section_childs'}[1];
- $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[1]{'section_childs'}[2]{'section_up'} = $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[1];
- $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[1]{'section_childs'}[2]{'toplevel_prev'} = $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[1]{'section_childs'}[1];
- $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[1]{'section_childs'}[2]{'toplevel_up'} = $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[0];
- $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[1]{'section_prev'} = $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[0];
- $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[1]{'section_up'} = $result_sectioning{'setshortcontentsaftertitlepage'};
- $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[2]{'section_childs'}[0]{'section_up'} = $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[2];
- $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[2]{'section_prev'} = $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[1];
- $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[2]{'section_up'} = $result_sectioning{'setshortcontentsaftertitlepage'};
- $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[2]{'toplevel_prev'} = $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[1]{'section_childs'}[2];
- $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[2]{'toplevel_up'} = $result_sectioning{'setshortcontentsaftertitlepage'}{'section_childs'}[0];
- 
- $result_errors{'setshortcontentsaftertitlepage'} = [];
- 
- 
- 
- $result_converted{'plaintext'}->{'setshortcontentsaftertitlepage'} = 'top
- 1 chapter
- part
- 2 chapter in part
- 3 second chapter in part
- unnumbered
- Appendix A appendix
- 
- top
- ***
- 
- 1 chapter
- *********
- 
- 1.1 section
- ===========
- 
- 1.1.1 subsection
- ----------------
- 
- 1.1.1.1 subsubsection
- .....................
- 
- 2 chapter in part
- *****************
- 
- 3 second chapter in part
- ************************
- 
- unnumbered
- **********
- 
- Appendix A appendix
- *******************
- 
- A.1 appendixsec
- ===============
- 
- ';
- 
- 
- $result_converted{'html'}->{'setshortcontentsaftertitlepage'} = '<!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>
- <title>top</title>
- 
- <meta name="description" content="top">
- <meta name="keywords" content="top">
- <meta name="resource-type" content="document">
- <meta name="distribution" content="global">
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <style type="text/css">
- <!--
- a.summary-letter {text-decoration: none}
- blockquote.indentedblock {margin-right: 0em}
- blockquote.smallindentedblock {margin-right: 0em; font-size: smaller}
- blockquote.smallquotation {font-size: smaller}
- div.display {margin-left: 3.2em}
- div.example {margin-left: 3.2em}
- div.lisp {margin-left: 3.2em}
- div.smalldisplay {margin-left: 3.2em}
- div.smallexample {margin-left: 3.2em}
- div.smalllisp {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}
- 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.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">
- <a name="SEC_Overview"></a>
- <h2 class="shortcontents-heading">Short Table of Contents</h2>
- 
- <div class="shortcontents">
- <ul class="no-bullet">
- <li><ul class="no-bullet">
- <li><a name="stoc-chapter" href="#toc-chapter">1 chapter</a></li>
- </ul></li>
- <li><a name="stoc-part" href="#toc-part">part</a><ul class="no-bullet">
- <li><a name="stoc-chapter-in-part" href="#toc-chapter-in-part">2 chapter in part</a></li>
- <li><a name="stoc-second-chapter-in-part" href="#toc-second-chapter-in-part">3 second chapter in part</a></li>
- <li><a name="stoc-unnumbered" href="#toc-unnumbered">unnumbered</a></li>
- </ul></li>
- <li><a name="stoc-appendix" href="#toc-appendix">Appendix A appendix</a></li>
- 
- </ul>
- </div>
- 
- <hr>
- <a name="top"></a>
- <h1 class="top">top</h1>
- 
- <a name="chapter"></a>
- <h2 class="chapter">1 chapter</h2>
- 
- <a name="section"></a>
- <h3 class="section">1.1 section</h3>
- 
- <a name="subsection"></a>
- <h4 class="subsection">1.1.1 subsection</h4>
- 
- <a name="subsubsection"></a>
- <h4 class="subsubsection">1.1.1.1 subsubsection</h4>
- 
- <a name="part"></a>
- <h1 class="part">part</h1>
- <hr>
- 
- <a name="chapter-in-part"></a>
- <h2 class="chapter">2 chapter in part</h2>
- 
- <a name="second-chapter-in-part"></a>
- <h2 class="chapter">3 second chapter in part</h2>
- 
- <a name="unnumbered"></a>
- <h2 class="unnumbered">unnumbered</h2>
- 
- <a name="appendix"></a>
- <h2 class="appendix">Appendix A appendix</h2>
- 
- <a name="appendixsec"></a>
- <h3 class="appendixsec">A.1 appendixsec</h3>
- 
- <hr>
- 
- 
- 
- </body>
- </html>
- ';
- 
- 1;
--- 0 ----
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl texinfo-6.3/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
*** texinfo-6.1/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl	2016-01-22 07:50:01.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl	2016-08-02 18:44:40.000000000 +0100
***************
*** 84,87 ****
--- 84,93 ----
                          ],
                          'cmdname' => '~',
+                         'contents' => [],
+                         'line_nr' => {
+                           'file_name' => '',
+                           'line_nr' => 4,
+                           'macro' => ''
+                         },
                          'parent' => {}
                        }
***************
*** 122,130 ****
                    }
                  },
!                 'line_nr' => {
!                   'file_name' => '',
!                   'line_nr' => 4,
!                   'macro' => ''
!                 },
                  'parent' => {},
                  'type' => 'menu_entry'
--- 128,132 ----
                    }
                  },
!                 'line_nr' => {},
                  'parent' => {},
                  'type' => 'menu_entry'
***************
*** 210,213 ****
--- 212,221 ----
                          ],
                          'cmdname' => '^',
+                         'contents' => [],
+                         'line_nr' => {
+                           'file_name' => '',
+                           'line_nr' => 6,
+                           'macro' => ''
+                         },
                          'parent' => {}
                        }
***************
*** 248,256 ****
                    }
                  },
!                 'line_nr' => {
!                   'file_name' => '',
!                   'line_nr' => 6,
!                   'macro' => ''
!                 },
                  'parent' => {},
                  'type' => 'menu_entry'
--- 256,260 ----
                    }
                  },
!                 'line_nr' => {},
                  'parent' => {},
                  'type' => 'menu_entry'
***************
*** 371,374 ****
--- 375,384 ----
                  ],
                  'cmdname' => '~',
+                 'contents' => [],
+                 'line_nr' => {
+                   'file_name' => '',
+                   'line_nr' => 9,
+                   'macro' => ''
+                 },
                  'parent' => {}
                },
***************
*** 406,414 ****
            'spaces_after_command' => {}
          },
!         'line_nr' => {
!           'file_name' => '',
!           'line_nr' => 9,
!           'macro' => ''
!         },
          'parent' => {}
        }
--- 416,420 ----
            'spaces_after_command' => {}
          },
!         'line_nr' => {},
          'parent' => {}
        }
***************
*** 515,518 ****
--- 521,530 ----
                  ],
                  'cmdname' => '^',
+                 'contents' => [],
+                 'line_nr' => {
+                   'file_name' => '',
+                   'line_nr' => 13,
+                   'macro' => ''
+                 },
                  'parent' => {}
                },
***************
*** 543,551 ****
            'spaces_after_command' => {}
          },
!         'line_nr' => {
!           'file_name' => '',
!           'line_nr' => 13,
!           'macro' => ''
!         },
          'parent' => {}
        }
--- 555,559 ----
            'spaces_after_command' => {}
          },
!         'line_nr' => {},
          'parent' => {}
        }
***************
*** 579,582 ****
--- 587,591 ----
  $result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'} = $result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
  $result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
+ $result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1];
  $result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2];
***************
*** 601,604 ****
--- 610,614 ----
  $result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_description'} = $result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3];
  $result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0];
+ $result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'line_nr'} = $result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1];
  $result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[4];
***************
*** 631,634 ****
--- 641,645 ----
  $result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'extra'}{'node_content'};
  $result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'line_nr'} = $result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'parent'} = $result_trees{'transliterated_split_equivalent_nodes'}[1];
  $result_trees{'transliterated_split_equivalent_nodes'}[1]{'element_prev'} = $result_trees{'transliterated_split_equivalent_nodes'}[0];
***************
*** 658,661 ****
--- 669,673 ----
  $result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'extra'}{'node_content'};
  $result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'line_nr'} = $result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'parent'} = $result_trees{'transliterated_split_equivalent_nodes'}[3];
  $result_trees{'transliterated_split_equivalent_nodes'}[3]{'element_prev'} = $result_trees{'transliterated_split_equivalent_nodes'}[2];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/two_nodes_at_the_end.pl texinfo-6.3/tp/t/results/sectioning/two_nodes_at_the_end.pl
*** texinfo-6.1/tp/t/results/sectioning/two_nodes_at_the_end.pl	2016-01-22 07:50:01.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/two_nodes_at_the_end.pl	2016-08-02 18:44:40.000000000 +0100
***************
*** 388,391 ****
--- 388,392 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 402,405 ****
--- 403,407 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 416,419 ****
--- 418,422 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 710,717 ****
--- 713,723 ----
  $result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0];
+ $result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0];
+ $result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[2];
  $result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[2];
  $result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[2]{'parent'} = $result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0];
+ $result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[3];
  $result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[3];
  $result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/two_nodes_between_chapters.pl texinfo-6.3/tp/t/results/sectioning/two_nodes_between_chapters.pl
*** texinfo-6.1/tp/t/results/sectioning/two_nodes_between_chapters.pl	2016-01-22 07:50:01.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/two_nodes_between_chapters.pl	2016-08-02 18:44:40.000000000 +0100
***************
*** 388,391 ****
--- 388,392 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 402,405 ****
--- 403,407 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 416,419 ****
--- 418,422 ----
              'contents' => [
                {
+                 'parent' => {},
                  'text' => ' ',
                  'type' => 'empty_spaces_before_argument'
***************
*** 765,772 ****
--- 768,778 ----
  $result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[0];
  $result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0];
+ $result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[1];
  $result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0];
+ $result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[2];
  $result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[2];
  $result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[2]{'parent'} = $result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0];
+ $result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[3];
  $result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[3];
  $result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/sectioning/unnumbered_before_top_node.pl texinfo-6.3/tp/t/results/sectioning/unnumbered_before_top_node.pl
*** texinfo-6.1/tp/t/results/sectioning/unnumbered_before_top_node.pl	2016-01-22 07:50:04.000000000 +0000
--- texinfo-6.3/tp/t/results/sectioning/unnumbered_before_top_node.pl	2016-08-02 18:44:42.000000000 +0100
***************
*** 130,138 ****
                    {}
                  ]
!               ],
!               'spaces_before_argument' => {
!                 'text' => '',
!                 'type' => 'empty_spaces_before_argument'
!               }
              },
              'line_nr' => {
--- 130,134 ----
                    {}
                  ]
!               ]
              },
              'line_nr' => {
diff -Nrc2 texinfo-6.1/tp/t/results/test_count/commands.pl texinfo-6.3/tp/t/results/test_count/commands.pl
*** texinfo-6.1/tp/t/results/test_count/commands.pl	2016-01-22 07:50:33.000000000 +0000
--- texinfo-6.3/tp/t/results/test_count/commands.pl	2016-08-02 18:45:10.000000000 +0100
***************
*** 20,23 ****
--- 20,28 ----
            'cmdname' => 'TeX',
            'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 1,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 53,56 ****
--- 58,67 ----
            ],
            'cmdname' => '~',
+           'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 2,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 78,86 ****
                    'cmdname' => 'dotless',
                    'contents' => [],
!                   'line_nr' => {
!                     'file_name' => '',
!                     'line_nr' => 2,
!                     'macro' => ''
!                   },
                    'parent' => {}
                  }
--- 89,93 ----
                    'cmdname' => 'dotless',
                    'contents' => [],
!                   'line_nr' => {},
                    'parent' => {}
                  }
***************
*** 310,313 ****
--- 317,326 ----
              {
                'cmdname' => 'samp',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 12,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 368,372 ****
                        'index_at_command' => 'item',
                        'index_name' => 'vr',
-                       'index_prefix' => 'v',
                        'index_type_command' => 'vtable',
                        'key' => 'vitem table',
--- 381,384 ----
***************
*** 460,468 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 12,
!         'macro' => ''
!       },
        'parent' => {}
      }
--- 472,476 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      }
***************
*** 482,488 ****
  $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[7];
! $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'commands'}{'contents'}[0];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[8]{'parent'} = $result_trees{'commands'}{'contents'}[0];
--- 490,497 ----
  $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
+ $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[5]{'line_nr'};
  $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[7];
! $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'commands'}{'contents'}[0]{'contents'}[5]{'line_nr'};
  $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'commands'}{'contents'}[0];
  $result_trees{'commands'}{'contents'}[0]{'contents'}[8]{'parent'} = $result_trees{'commands'}{'contents'}[0];
***************
*** 556,559 ****
--- 565,569 ----
  $result_trees{'commands'}{'contents'}[9]{'extra'}{'end_command'} = $result_trees{'commands'}{'contents'}[9]{'contents'}[1];
  $result_trees{'commands'}{'contents'}[9]{'extra'}{'spaces_after_command'} = $result_trees{'commands'}{'contents'}[9]{'args'}[0]{'contents'}[0];
+ $result_trees{'commands'}{'contents'}[9]{'line_nr'} = $result_trees{'commands'}{'contents'}[9]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'commands'}{'contents'}[9]{'parent'} = $result_trees{'commands'};
  
diff -Nrc2 texinfo-6.1/tp/t/results/test_count/expanded_tex.pl texinfo-6.3/tp/t/results/test_count/expanded_tex.pl
*** texinfo-6.1/tp/t/results/test_count/expanded_tex.pl	2016-01-22 07:50:33.000000000 +0000
--- texinfo-6.3/tp/t/results/test_count/expanded_tex.pl	2016-08-02 18:45:10.000000000 +0100
***************
*** 293,302 ****
  $result_errors{'expanded_tex'} = [
    {
!     'error_line' => ':10: warning: @end should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 10,
      'macro' => '',
!     'text' => '@end should only appear at a line beginning',
      'type' => 'warning'
    }
--- 293,302 ----
  $result_errors{'expanded_tex'} = [
    {
!     'error_line' => ':10: warning: @end should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 10,
      'macro' => '',
!     'text' => '@end should only appear at the beginning of a line',
      'type' => 'warning'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/test_count/flushright.pl texinfo-6.3/tp/t/results/test_count/flushright.pl
*** texinfo-6.1/tp/t/results/test_count/flushright.pl	2016-01-22 07:50:33.000000000 +0000
--- texinfo-6.3/tp/t/results/test_count/flushright.pl	2016-08-02 18:45:10.000000000 +0100
***************
*** 61,69 ****
                    {}
                  ],
!                 'normalized' => 'rrr',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 61,65 ----
                    {}
                  ],
!                 'normalized' => 'rrr'
                },
                'line_nr' => {
***************
*** 75,78 ****
--- 71,75 ----
              },
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_after_close_brace'
***************
*** 111,119 ****
                    {}
                  ],
!                 'normalized' => 'a1',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 108,112 ----
                    {}
                  ],
!                 'normalized' => 'a1'
                },
                'line_nr' => {
***************
*** 125,128 ****
--- 118,122 ----
              },
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_after_close_brace'
***************
*** 156,164 ****
                    {}
                  ],
!                 'normalized' => 'a2',
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 150,154 ----
                    {}
                  ],
!                 'normalized' => 'a2'
                },
                'line_nr' => {},
***************
*** 166,169 ****
--- 156,160 ----
              },
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_after_close_brace'
***************
*** 230,238 ****
                {}
              ],
!             'normalized' => 'alone',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 221,225 ----
                {}
              ],
!             'normalized' => 'alone'
            },
            'line_nr' => {
***************
*** 244,247 ****
--- 231,235 ----
          },
          {
+           'parent' => {},
            'text' => '
  ',
***************
*** 337,340 ****
--- 325,329 ----
  $result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
  $result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'flushright'}{'contents'}[1]{'contents'}[2];
+ $result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'flushright'}{'contents'}[1]{'contents'}[2];
  $result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'flushright'}{'contents'}[1]{'contents'}[2];
  $result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'parent'} = $result_trees{'flushright'}{'contents'}[1]{'contents'}[2];
***************
*** 344,347 ****
--- 333,337 ----
  $result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[5]{'extra'}{'node_content'}[0] = $result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0];
  $result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[5]{'parent'} = $result_trees{'flushright'}{'contents'}[1]{'contents'}[2];
+ $result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[6]{'parent'} = $result_trees{'flushright'}{'contents'}[1]{'contents'}[2];
  $result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[7]{'parent'} = $result_trees{'flushright'}{'contents'}[1]{'contents'}[2];
  $result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[8]{'args'}[0];
***************
*** 351,354 ****
--- 341,345 ----
  $result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[8]{'line_nr'} = $result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[5]{'line_nr'};
  $result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[8]{'parent'} = $result_trees{'flushright'}{'contents'}[1]{'contents'}[2];
+ $result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[9]{'parent'} = $result_trees{'flushright'}{'contents'}[1]{'contents'}[2];
  $result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[10]{'parent'} = $result_trees{'flushright'}{'contents'}[1]{'contents'}[2];
  $result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'flushright'}{'contents'}[1];
***************
*** 363,366 ****
--- 354,358 ----
  $result_trees{'flushright'}{'contents'}[1]{'contents'}[6]{'extra'}{'node_content'}[0] = $result_trees{'flushright'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0];
  $result_trees{'flushright'}{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'flushright'}{'contents'}[1];
+ $result_trees{'flushright'}{'contents'}[1]{'contents'}[7]{'parent'} = $result_trees{'flushright'}{'contents'}[1];
  $result_trees{'flushright'}{'contents'}[1]{'contents'}[8]{'parent'} = $result_trees{'flushright'}{'contents'}[1];
  $result_trees{'flushright'}{'contents'}[1]{'contents'}[9]{'contents'}[0]{'parent'} = $result_trees{'flushright'}{'contents'}[1]{'contents'}[9];
diff -Nrc2 texinfo-6.1/tp/t/results/test_count/flushright_in_example.pl texinfo-6.3/tp/t/results/test_count/flushright_in_example.pl
*** texinfo-6.1/tp/t/results/test_count/flushright_in_example.pl	2016-01-22 07:50:33.000000000 +0000
--- texinfo-6.3/tp/t/results/test_count/flushright_in_example.pl	2016-08-02 18:45:10.000000000 +0100
***************
*** 68,76 ****
                        {}
                      ],
!                     'normalized' => 'rrr',
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {
--- 68,72 ----
                        {}
                      ],
!                     'normalized' => 'rrr'
                    },
                    'line_nr' => {
***************
*** 82,85 ****
--- 78,82 ----
                  },
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_after_close_brace'
***************
*** 118,126 ****
                        {}
                      ],
!                     'normalized' => 'a1',
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {
--- 115,119 ----
                        {}
                      ],
!                     'normalized' => 'a1'
                    },
                    'line_nr' => {
***************
*** 132,135 ****
--- 125,129 ----
                  },
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_after_close_brace'
***************
*** 163,171 ****
                        {}
                      ],
!                     'normalized' => 'a2',
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {},
--- 157,161 ----
                        {}
                      ],
!                     'normalized' => 'a2'
                    },
                    'line_nr' => {},
***************
*** 173,176 ****
--- 163,167 ----
                  },
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_after_close_brace'
***************
*** 209,217 ****
                        {}
                      ],
!                     'normalized' => 'a3',
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {
--- 200,204 ----
                        {}
                      ],
!                     'normalized' => 'a3'
                    },
                    'line_nr' => {
***************
*** 223,226 ****
--- 210,214 ----
                  },
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_after_close_brace'
***************
*** 254,262 ****
                        {}
                      ],
!                     'normalized' => 'a4',
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {},
--- 242,246 ----
                        {}
                      ],
!                     'normalized' => 'a4'
                    },
                    'line_nr' => {},
***************
*** 264,267 ****
--- 248,252 ----
                  },
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_after_close_brace'
***************
*** 318,326 ****
                        {}
                      ],
!                     'normalized' => 'alone',
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {
--- 303,307 ----
                        {}
                      ],
!                     'normalized' => 'alone'
                    },
                    'line_nr' => {
***************
*** 332,335 ****
--- 313,317 ----
                  },
                  {
+                   'parent' => {},
                    'text' => '
  ',
***************
*** 477,480 ****
--- 459,463 ----
  $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
  $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
+ $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
  $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
  $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
***************
*** 484,487 ****
--- 467,471 ----
  $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'extra'}{'node_content'}[0] = $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0];
  $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
+ $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
  $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[7]{'parent'} = $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
  $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[8]{'args'}[0];
***************
*** 491,494 ****
--- 475,479 ----
  $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'line_nr'};
  $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[8]{'parent'} = $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
+ $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[9]{'parent'} = $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
  $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[10]{'parent'} = $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
  $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[11]{'parent'} = $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
***************
*** 498,501 ****
--- 483,487 ----
  $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[12]{'extra'}{'node_content'}[0] = $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[12]{'args'}[0]{'contents'}[0];
  $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[12]{'parent'} = $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
+ $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[13]{'parent'} = $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
  $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[14]{'parent'} = $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
  $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[15]{'args'}[0];
***************
*** 505,508 ****
--- 491,495 ----
  $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[15]{'line_nr'} = $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[12]{'line_nr'};
  $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[15]{'parent'} = $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
+ $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[16]{'parent'} = $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
  $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[17]{'parent'} = $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
  $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[18]{'parent'} = $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
***************
*** 515,518 ****
--- 502,506 ----
  $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[22]{'extra'}{'node_content'}[0] = $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[22]{'args'}[0]{'contents'}[0];
  $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[22]{'parent'} = $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
+ $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[23]{'parent'} = $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
  $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[24]{'parent'} = $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
  $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[25]{'parent'} = $result_trees{'flushright_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
diff -Nrc2 texinfo-6.1/tp/t/results/test_count/multitable.pl texinfo-6.3/tp/t/results/test_count/multitable.pl
*** texinfo-6.1/tp/t/results/test_count/multitable.pl	2016-01-22 07:50:33.000000000 +0000
--- texinfo-6.3/tp/t/results/test_count/multitable.pl	2016-08-02 18:45:10.000000000 +0100
***************
*** 154,162 ****
                                {}
                              ],
!                             'normalized' => 'anch-1',
!                             'spaces_before_argument' => {
!                               'text' => '',
!                               'type' => 'empty_spaces_before_argument'
!                             }
                            },
                            'line_nr' => {},
--- 154,158 ----
                                {}
                              ],
!                             'normalized' => 'anch-1'
                            },
                            'line_nr' => {},
***************
*** 164,167 ****
--- 160,164 ----
                          },
                          {
+                           'parent' => {},
                            'text' => '
  ',
***************
*** 281,289 ****
                            {}
                          ],
!                         'normalized' => 'anch2',
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 278,282 ----
                            {}
                          ],
!                         'normalized' => 'anch2'
                        },
                        'line_nr' => {},
***************
*** 291,294 ****
--- 284,288 ----
                      },
                      {
+                       'parent' => {},
                        'text' => '
  ',
***************
*** 362,401 ****
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            },
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            },
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            }
          ],
-         'prototypes_line' => [
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => ' ',
-             'type' => 'prototype_space'
-           },
-           {},
-           {
-             'text' => '
- ',
-             'type' => 'prototype_space'
-           }
-         ],
          'spaces_after_command' => {}
        },
--- 356,370 ----
***************
*** 438,441 ****
--- 407,411 ----
  $result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+ $result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
  $result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
  $result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
***************
*** 461,464 ****
--- 431,435 ----
  $result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'line_nr'};
  $result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+ $result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
  $result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
  $result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'line_nr'};
***************
*** 476,487 ****
  $result_trees{'multitable'}{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'multitable'}{'contents'}[1]{'contents'}[1];
  $result_trees{'multitable'}{'contents'}[1]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'multitable'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'multitable'}{'contents'}[1]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'args'}[0];
  $result_trees{'multitable'}{'contents'}[1]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'multitable'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'multitable'}{'contents'}[1]{'extra'}{'prototypes'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'args'}[0];
  $result_trees{'multitable'}{'contents'}[1]{'extra'}{'prototypes'}[2]{'contents'} = $result_trees{'multitable'}{'contents'}[1]{'args'}[0]{'contents'}[5]{'contents'};
- $result_trees{'multitable'}{'contents'}[1]{'extra'}{'prototypes'}[2]{'parent'} = $result_trees{'multitable'}{'contents'}[1]{'args'}[0];
- $result_trees{'multitable'}{'contents'}[1]{'extra'}{'prototypes_line'}[1] = $result_trees{'multitable'}{'contents'}[1]{'args'}[0]{'contents'}[1];
- $result_trees{'multitable'}{'contents'}[1]{'extra'}{'prototypes_line'}[3] = $result_trees{'multitable'}{'contents'}[1]{'args'}[0]{'contents'}[3];
- $result_trees{'multitable'}{'contents'}[1]{'extra'}{'prototypes_line'}[5] = $result_trees{'multitable'}{'contents'}[1]{'args'}[0]{'contents'}[5];
  $result_trees{'multitable'}{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'multitable'}{'contents'}[1]{'args'}[0]{'contents'}[0];
  $result_trees{'multitable'}{'contents'}[1]{'parent'} = $result_trees{'multitable'};
--- 447,452 ----
diff -Nrc2 texinfo-6.1/tp/t/results/test_count/printindex.pl texinfo-6.3/tp/t/results/test_count/printindex.pl
*** texinfo-6.1/tp/t/results/test_count/printindex.pl	2016-01-22 07:50:33.000000000 +0000
--- texinfo-6.3/tp/t/results/test_count/printindex.pl	2016-08-02 18:45:10.000000000 +0100
***************
*** 86,90 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'index entry',
--- 86,89 ----
***************
*** 141,145 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'index entry',
--- 140,143 ----
***************
*** 196,200 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'looooooooooooooooooooooooooooooooooooooooooooooooooooooooooong index entry',
--- 194,197 ----
***************
*** 304,308 ****
                'index_at_command' => 'cindex',
                'index_name' => 'cp',
-               'index_prefix' => 'c',
                'index_type_command' => 'cindex',
                'key' => 'after index',
--- 301,304 ----
***************
*** 398,406 ****
                {}
              ],
!             'normalized' => 'a-counting-anchor',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 394,398 ----
                {}
              ],
!             'normalized' => 'a-counting-anchor'
            },
            'line_nr' => {
***************
*** 412,415 ****
--- 404,408 ----
          },
          {
+           'parent' => {},
            'text' => '
  ',
***************
*** 518,521 ****
--- 511,515 ----
  $result_trees{'printindex'}{'contents'}[1]{'contents'}[11]{'extra'}{'node_content'}[0] = $result_trees{'printindex'}{'contents'}[1]{'contents'}[11]{'args'}[0]{'contents'}[0];
  $result_trees{'printindex'}{'contents'}[1]{'contents'}[11]{'parent'} = $result_trees{'printindex'}{'contents'}[1];
+ $result_trees{'printindex'}{'contents'}[1]{'contents'}[12]{'parent'} = $result_trees{'printindex'}{'contents'}[1];
  $result_trees{'printindex'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'printindex'}{'contents'}[1]{'args'}[0]{'contents'}[1];
  $result_trees{'printindex'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'printindex'}{'contents'}[1]{'extra'}{'node_content'};
diff -Nrc2 texinfo-6.1/tp/t/results/value/bad_syntax.pl texinfo-6.3/tp/t/results/value/bad_syntax.pl
*** texinfo-6.1/tp/t/results/value/bad_syntax.pl	2016-01-22 07:50:06.000000000 +0000
--- texinfo-6.3/tp/t/results/value/bad_syntax.pl	2016-08-02 18:44:44.000000000 +0100
***************
*** 116,124 ****
      },
      {
-       'parent' => {},
-       'text' => '',
-       'type' => 'empty_line'
-     },
-     {
        'cmdname' => 'value',
        'type' => 'unknown'
--- 116,119 ----
***************
*** 147,152 ****
  $result_trees{'bad_syntax'}{'contents'}[12]{'parent'} = $result_trees{'bad_syntax'};
  $result_trees{'bad_syntax'}{'contents'}[13]{'parent'} = $result_trees{'bad_syntax'};
! $result_trees{'bad_syntax'}{'contents'}[14]{'parent'} = $result_trees{'bad_syntax'};
! $result_trees{'bad_syntax'}{'contents'}[16]{'parent'} = $result_trees{'bad_syntax'};
  
  $result_texis{'bad_syntax'} = '
--- 142,146 ----
  $result_trees{'bad_syntax'}{'contents'}[12]{'parent'} = $result_trees{'bad_syntax'};
  $result_trees{'bad_syntax'}{'contents'}[13]{'parent'} = $result_trees{'bad_syntax'};
! $result_trees{'bad_syntax'}{'contents'}[15]{'parent'} = $result_trees{'bad_syntax'};
  
  $result_texis{'bad_syntax'} = '
diff -Nrc2 texinfo-6.1/tp/t/results/value/ignored_value_definition.pl texinfo-6.3/tp/t/results/value/ignored_value_definition.pl
*** texinfo-6.1/tp/t/results/value/ignored_value_definition.pl	2016-01-22 07:50:06.000000000 +0000
--- texinfo-6.3/tp/t/results/value/ignored_value_definition.pl	2016-08-02 18:44:44.000000000 +0100
***************
*** 53,89 ****
              },
              {
!               'contents' => [
!                 {
!                   'text' => '
! ',
!                   'type' => 'empty_spaces_before_argument'
!                 },
!                 {
!                   'args' => [
!                     {
!                       'parent' => {},
!                       'text' => 'aa',
!                       'type' => 'misc_arg'
!                     },
!                     {
!                       'parent' => {},
!                       'text' => 'in inlinefmt tex',
!                       'type' => 'misc_arg'
!                     }
!                   ],
!                   'cmdname' => 'set',
!                   'extra' => {
!                     'arg_line' => ' aa in inlinefmt tex
! ',
!                     'misc_args' => [
!                       'aa',
!                       'in inlinefmt tex'
!                     ]
!                   },
!                   'parent' => {}
!                 }
!               ],
                'parent' => {},
!               'type' => 'brace_command_arg'
              }
            ],
--- 53,59 ----
              },
              {
!               'contents' => [],
                'parent' => {},
!               'type' => 'elided'
              }
            ],
***************
*** 95,107 ****
                  {}
                ],
!               [
!                 {}
!               ]
              ],
!             'format' => 'tex',
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 65,71 ----
                  {}
                ],
!               undef
              ],
!             'format' => 'tex'
            },
            'line_nr' => {
***************
*** 147,156 ****
  $result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[0];
  $result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0];
- $result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'contents'}[1];
- $result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'contents'}[1];
- $result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[1];
  $result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0];
  $result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0] = $result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
- $result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0] = $result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'contents'}[1];
  $result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'ignored_value_definition'}{'contents'}[2];
  $result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'ignored_value_definition'}{'contents'}[2];
--- 111,116 ----
***************
*** 162,168 ****
  $result_texis{'ignored_value_definition'} = '@set aa outside
  
! @inlinefmt{tex,
! @set aa in inlinefmt tex
! }
  
  outside.
--- 122,126 ----
  $result_texis{'ignored_value_definition'} = '@set aa outside
  
! @inlinefmt{tex,}
  
  outside.
diff -Nrc2 texinfo-6.1/tp/t/results/value/set_in_item_missing_line.pl texinfo-6.3/tp/t/results/value/set_in_item_missing_line.pl
*** texinfo-6.1/tp/t/results/value/set_in_item_missing_line.pl	2016-01-22 07:50:06.000000000 +0000
--- texinfo-6.3/tp/t/results/value/set_in_item_missing_line.pl	2016-08-02 18:44:44.000000000 +0100
***************
*** 22,25 ****
--- 22,31 ----
              {
                'cmdname' => 'code',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 1,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 221,229 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 1,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 227,231 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 248,251 ****
--- 250,259 ----
              {
                'cmdname' => 'code',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 6,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 405,413 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 6,
!         'macro' => ''
!       },
        'parent' => {}
      }
--- 413,417 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      }
***************
*** 457,460 ****
--- 461,465 ----
  $result_trees{'set_in_item_missing_line'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2];
  $result_trees{'set_in_item_missing_line'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'set_in_item_missing_line'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'set_in_item_missing_line'}{'contents'}[0]{'line_nr'} = $result_trees{'set_in_item_missing_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'set_in_item_missing_line'}{'contents'}[0]{'parent'} = $result_trees{'set_in_item_missing_line'};
  $result_trees{'set_in_item_missing_line'}{'contents'}[1]{'parent'} = $result_trees{'set_in_item_missing_line'};
***************
*** 494,497 ****
--- 499,503 ----
  $result_trees{'set_in_item_missing_line'}{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'set_in_item_missing_line'}{'contents'}[2]{'contents'}[1];
  $result_trees{'set_in_item_missing_line'}{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'set_in_item_missing_line'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+ $result_trees{'set_in_item_missing_line'}{'contents'}[2]{'line_nr'} = $result_trees{'set_in_item_missing_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'set_in_item_missing_line'}{'contents'}[2]{'parent'} = $result_trees{'set_in_item_missing_line'};
  
diff -Nrc2 texinfo-6.1/tp/t/results/value/set_on_item_line.pl texinfo-6.3/tp/t/results/value/set_on_item_line.pl
*** texinfo-6.1/tp/t/results/value/set_on_item_line.pl	2016-01-22 07:50:06.000000000 +0000
--- texinfo-6.3/tp/t/results/value/set_on_item_line.pl	2016-08-02 18:44:44.000000000 +0100
***************
*** 22,25 ****
--- 22,31 ----
              {
                'cmdname' => 'code',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 1,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 336,344 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 1,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 342,346 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 363,366 ****
--- 365,374 ----
              {
                'cmdname' => 'code',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 10,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 693,701 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 10,
!         'macro' => ''
!       },
        'parent' => {}
      }
--- 701,705 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      }
***************
*** 764,767 ****
--- 768,772 ----
  $result_trees{'set_on_item_line'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[3];
  $result_trees{'set_on_item_line'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'set_on_item_line'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'set_on_item_line'}{'contents'}[0]{'line_nr'} = $result_trees{'set_on_item_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'set_on_item_line'}{'contents'}[0]{'parent'} = $result_trees{'set_on_item_line'};
  $result_trees{'set_on_item_line'}{'contents'}[1]{'parent'} = $result_trees{'set_on_item_line'};
***************
*** 831,834 ****
--- 836,840 ----
  $result_trees{'set_on_item_line'}{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[3];
  $result_trees{'set_on_item_line'}{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'set_on_item_line'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+ $result_trees{'set_on_item_line'}{'contents'}[2]{'line_nr'} = $result_trees{'set_on_item_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'set_on_item_line'}{'contents'}[2]{'parent'} = $result_trees{'set_on_item_line'};
  
diff -Nrc2 texinfo-6.1/tp/t/results/value/value_after_accent.pl texinfo-6.3/tp/t/results/value/value_after_accent.pl
*** texinfo-6.1/tp/t/results/value/value_after_accent.pl	2016-01-22 07:50:06.000000000 +0000
--- texinfo-6.3/tp/t/results/value/value_after_accent.pl	2016-08-02 18:44:44.000000000 +0100
***************
*** 40,43 ****
--- 40,48 ----
              'spaces' => ' '
            },
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 2,
+             'macro' => ''
+           },
            'parent' => {}
          },
***************
*** 50,53 ****
--- 55,63 ----
            'cmdname' => '~',
            'contents' => [],
+           'line_nr' => {
+             'file_name' => '',
+             'line_nr' => 3,
+             'macro' => ''
+           },
            'parent' => {}
          },
diff -Nrc2 texinfo-6.1/tp/t/results/value/value_in_index_commands.pl texinfo-6.3/tp/t/results/value/value_in_index_commands.pl
*** texinfo-6.1/tp/t/results/value/value_in_index_commands.pl	2016-01-22 07:50:06.000000000 +0000
--- texinfo-6.3/tp/t/results/value/value_in_index_commands.pl	2016-08-02 18:44:44.000000000 +0100
***************
*** 485,489 ****
                'index_at_command' => 'trucindex',
                'index_name' => 'truc',
-               'index_prefix' => 'truc',
                'index_type_command' => 'trucindex',
                'key' => 'index truc',
--- 485,488 ----
***************
*** 564,567 ****
--- 563,568 ----
                    ],
                    'cmdname' => '\'',
+                   'contents' => [],
+                   'line_nr' => {},
                    'parent' => {}
                  },
***************
*** 629,633 ****
                'index_at_command' => 'codeidxindex',
                'index_name' => 'codeidx',
-               'index_prefix' => 'codeidx',
                'index_type_command' => 'codeidxindex',
                'key' => 'a index entry te\' i^',
--- 630,633 ----
***************
*** 686,690 ****
                'index_at_command' => 'kindex',
                'index_name' => 'ky',
-               'index_prefix' => 'k',
                'index_type_command' => 'kindex',
                'key' => 'truc kindex',
--- 686,689 ----
***************
*** 741,745 ****
                'index_at_command' => 'pindex',
                'index_name' => 'pg',
-               'index_prefix' => 'p',
                'index_type_command' => 'pindex',
                'key' => 'pindex codeidx',
--- 740,743 ----
***************
*** 987,990 ****
--- 985,989 ----
  $result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0];
  $result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4];
+ $result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2]{'line_nr'};
  $result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0];
  $result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0];
***************
*** 1166,1173 ****
        },
        'in_code' => 1,
!       'name' => 'codeidx',
!       'prefix' => [
!         'codeidx'
!       ]
      },
      'cp' => {
--- 1165,1169 ----
        },
        'in_code' => 1,
!       'name' => 'codeidx'
      },
      'cp' => {
***************
*** 1177,1185 ****
        'in_code' => 1,
        'merged_in' => 'fn',
!       'name' => 'cp',
!       'prefix' => [
!         'c',
!         'cp'
!       ]
      },
      'fn' => {
--- 1173,1177 ----
        'in_code' => 1,
        'merged_in' => 'fn',
!       'name' => 'cp'
      },
      'fn' => {
***************
*** 1189,1197 ****
        },
        'in_code' => 1,
!       'name' => 'fn',
!       'prefix' => [
!         'f',
!         'fn'
!       ]
      },
      'ky' => {
--- 1181,1185 ----
        },
        'in_code' => 1,
!       'name' => 'fn'
      },
      'ky' => {
***************
*** 1200,1208 ****
        },
        'in_code' => 1,
!       'name' => 'ky',
!       'prefix' => [
!         'k',
!         'ky'
!       ]
      },
      'pg' => {
--- 1188,1192 ----
        },
        'in_code' => 1,
!       'name' => 'ky'
      },
      'pg' => {
***************
*** 1211,1219 ****
        },
        'in_code' => 1,
!       'name' => 'pg',
!       'prefix' => [
!         'p',
!         'pg'
!       ]
      },
      'tp' => {
--- 1195,1199 ----
        },
        'in_code' => 1,
!       'name' => 'pg'
      },
      'tp' => {
***************
*** 1222,1230 ****
        },
        'in_code' => 1,
!       'name' => 'tp',
!       'prefix' => [
!         't',
!         'tp'
!       ]
      },
      'truc' => {
--- 1202,1206 ----
        },
        'in_code' => 1,
!       'name' => 'tp'
      },
      'truc' => {
***************
*** 1233,1240 ****
        },
        'in_code' => 0,
!       'name' => 'truc',
!       'prefix' => [
!         'truc'
!       ]
      },
      'vr' => {
--- 1209,1213 ----
        },
        'in_code' => 0,
!       'name' => 'truc'
      },
      'vr' => {
***************
*** 1243,1251 ****
        },
        'in_code' => 1,
!       'name' => 'vr',
!       'prefix' => [
!         'v',
!         'vr'
!       ]
      }
    },
--- 1216,1220 ----
        },
        'in_code' => 1,
!       'name' => 'vr'
      }
    },
diff -Nrc2 texinfo-6.1/tp/t/results/value/value_in_misc_commands.pl texinfo-6.3/tp/t/results/value/value_in_misc_commands.pl
*** texinfo-6.1/tp/t/results/value/value_in_misc_commands.pl	2016-01-22 07:50:06.000000000 +0000
--- texinfo-6.3/tp/t/results/value/value_in_misc_commands.pl	2016-08-02 18:44:44.000000000 +0100
***************
*** 3882,3891 ****
    },
    {
!     'error_line' => ':34: warning: @definfoenclose should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 34,
      'macro' => '',
!     'text' => '@definfoenclose should only appear at a line beginning',
      'type' => 'warning'
    },
--- 3882,3891 ----
    },
    {
!     'error_line' => ':34: warning: @definfoenclose should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 34,
      'macro' => '',
!     'text' => '@definfoenclose should only appear at the beginning of a line',
      'type' => 'warning'
    },
***************
*** 3900,3927 ****
    },
    {
!     'error_line' => ':88: warning: @documentlanguage should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 88,
      'macro' => '',
!     'text' => '@documentlanguage should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':115: warning: @page should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 115,
      'macro' => '',
!     'text' => '@page should only appear at a line beginning',
      'type' => 'warning'
    },
    {
!     'error_line' => ':125: warning: @page should only appear at a line beginning
  ',
      'file_name' => '',
      'line_nr' => 125,
      'macro' => '',
!     'text' => '@page should only appear at a line beginning',
      'type' => 'warning'
    },
--- 3900,3927 ----
    },
    {
!     'error_line' => ':88: warning: @documentlanguage should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 88,
      'macro' => '',
!     'text' => '@documentlanguage should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':115: warning: @page should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 115,
      'macro' => '',
!     'text' => '@page should only appear at the beginning of a line',
      'type' => 'warning'
    },
    {
!     'error_line' => ':125: warning: @page should only appear at the beginning of a line
  ',
      'file_name' => '',
      'line_nr' => 125,
      'macro' => '',
!     'text' => '@page should only appear at the beginning of a line',
      'type' => 'warning'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/value/value_in_node.pl texinfo-6.3/tp/t/results/value/value_in_node.pl
*** texinfo-6.1/tp/t/results/value/value_in_node.pl	2016-01-22 07:50:06.000000000 +0000
--- texinfo-6.3/tp/t/results/value/value_in_node.pl	2016-08-02 18:44:44.000000000 +0100
***************
*** 67,70 ****
--- 67,71 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 81,84 ****
--- 82,86 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 95,98 ****
--- 97,101 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 372,375 ****
--- 375,379 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 386,389 ****
--- 390,394 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 671,674 ****
--- 676,680 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 681,684 ****
--- 687,691 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 695,698 ****
--- 702,706 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 750,757 ****
                    ],
                    'normalized' => 'Node-1'
-                 },
-                 'spaces_before_argument' => {
-                   'text' => '',
-                   'type' => 'empty_spaces_before_argument'
                  }
                },
--- 758,761 ----
***************
*** 818,825 ****
--- 822,832 ----
  $result_trees{'value_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'value_in_node'}{'contents'}[1]{'args'}[0];
  $result_trees{'value_in_node'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'value_in_node'}{'contents'}[1];
+ $result_trees{'value_in_node'}{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'value_in_node'}{'contents'}[1]{'args'}[1];
  $result_trees{'value_in_node'}{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'value_in_node'}{'contents'}[1]{'args'}[1];
  $result_trees{'value_in_node'}{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'value_in_node'}{'contents'}[1];
+ $result_trees{'value_in_node'}{'contents'}[1]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'value_in_node'}{'contents'}[1]{'args'}[2];
  $result_trees{'value_in_node'}{'contents'}[1]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'value_in_node'}{'contents'}[1]{'args'}[2];
  $result_trees{'value_in_node'}{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'value_in_node'}{'contents'}[1];
+ $result_trees{'value_in_node'}{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'value_in_node'}{'contents'}[1]{'args'}[3];
  $result_trees{'value_in_node'}{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'value_in_node'}{'contents'}[1]{'args'}[3];
  $result_trees{'value_in_node'}{'contents'}[1]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'value_in_node'}{'contents'}[1]{'args'}[3];
***************
*** 873,878 ****
--- 880,887 ----
  $result_trees{'value_in_node'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'value_in_node'}{'contents'}[3];
  $result_trees{'value_in_node'}{'contents'}[3]{'args'}[1]{'parent'} = $result_trees{'value_in_node'}{'contents'}[3];
+ $result_trees{'value_in_node'}{'contents'}[3]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'value_in_node'}{'contents'}[3]{'args'}[2];
  $result_trees{'value_in_node'}{'contents'}[3]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'value_in_node'}{'contents'}[3]{'args'}[2];
  $result_trees{'value_in_node'}{'contents'}[3]{'args'}[2]{'parent'} = $result_trees{'value_in_node'}{'contents'}[3];
+ $result_trees{'value_in_node'}{'contents'}[3]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'value_in_node'}{'contents'}[3]{'args'}[3];
  $result_trees{'value_in_node'}{'contents'}[3]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'value_in_node'}{'contents'}[3]{'args'}[3];
  $result_trees{'value_in_node'}{'contents'}[3]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'value_in_node'}{'contents'}[3]{'args'}[3];
***************
*** 925,931 ****
--- 934,943 ----
  $result_trees{'value_in_node'}{'contents'}[5]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'value_in_node'}{'contents'}[5]{'args'}[0];
  $result_trees{'value_in_node'}{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'value_in_node'}{'contents'}[5];
+ $result_trees{'value_in_node'}{'contents'}[5]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'value_in_node'}{'contents'}[5]{'args'}[1];
  $result_trees{'value_in_node'}{'contents'}[5]{'args'}[1]{'parent'} = $result_trees{'value_in_node'}{'contents'}[5];
+ $result_trees{'value_in_node'}{'contents'}[5]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'value_in_node'}{'contents'}[5]{'args'}[2];
  $result_trees{'value_in_node'}{'contents'}[5]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'value_in_node'}{'contents'}[5]{'args'}[2];
  $result_trees{'value_in_node'}{'contents'}[5]{'args'}[2]{'parent'} = $result_trees{'value_in_node'}{'contents'}[5];
+ $result_trees{'value_in_node'}{'contents'}[5]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'value_in_node'}{'contents'}[5]{'args'}[3];
  $result_trees{'value_in_node'}{'contents'}[5]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'value_in_node'}{'contents'}[5]{'args'}[3];
  $result_trees{'value_in_node'}{'contents'}[5]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'value_in_node'}{'contents'}[5]{'args'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/value/value_node_directions.pl texinfo-6.3/tp/t/results/value/value_node_directions.pl
*** texinfo-6.1/tp/t/results/value/value_node_directions.pl	2016-01-22 07:50:06.000000000 +0000
--- texinfo-6.3/tp/t/results/value/value_node_directions.pl	2016-08-02 18:44:44.000000000 +0100
***************
*** 67,70 ****
--- 67,71 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 81,84 ****
--- 82,86 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 95,98 ****
--- 97,101 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 242,245 ****
--- 245,249 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 256,259 ****
--- 260,264 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 270,273 ****
--- 275,279 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 404,407 ****
--- 410,414 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 414,417 ****
--- 421,425 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 428,431 ****
--- 436,440 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 539,546 ****
--- 548,558 ----
  $result_trees{'value_node_directions'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[1]{'args'}[0];
  $result_trees{'value_node_directions'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[1];
+ $result_trees{'value_node_directions'}{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[1]{'args'}[1];
  $result_trees{'value_node_directions'}{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[1]{'args'}[1];
  $result_trees{'value_node_directions'}{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[1];
+ $result_trees{'value_node_directions'}{'contents'}[1]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[1]{'args'}[2];
  $result_trees{'value_node_directions'}{'contents'}[1]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[1]{'args'}[2];
  $result_trees{'value_node_directions'}{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[1];
+ $result_trees{'value_node_directions'}{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[1]{'args'}[3];
  $result_trees{'value_node_directions'}{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[1]{'args'}[3];
  $result_trees{'value_node_directions'}{'contents'}[1]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[1]{'args'}[3];
***************
*** 569,576 ****
--- 581,591 ----
  $result_trees{'value_node_directions'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[3]{'args'}[0];
  $result_trees{'value_node_directions'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[3];
+ $result_trees{'value_node_directions'}{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[3]{'args'}[1];
  $result_trees{'value_node_directions'}{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[3]{'args'}[1];
  $result_trees{'value_node_directions'}{'contents'}[3]{'args'}[1]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[3];
+ $result_trees{'value_node_directions'}{'contents'}[3]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[3]{'args'}[2];
  $result_trees{'value_node_directions'}{'contents'}[3]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[3]{'args'}[2];
  $result_trees{'value_node_directions'}{'contents'}[3]{'args'}[2]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[3];
+ $result_trees{'value_node_directions'}{'contents'}[3]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[3]{'args'}[3];
  $result_trees{'value_node_directions'}{'contents'}[3]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[3]{'args'}[3];
  $result_trees{'value_node_directions'}{'contents'}[3]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[3]{'args'}[3];
***************
*** 596,602 ****
--- 611,620 ----
  $result_trees{'value_node_directions'}{'contents'}[5]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[5]{'args'}[0];
  $result_trees{'value_node_directions'}{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[5];
+ $result_trees{'value_node_directions'}{'contents'}[5]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[5]{'args'}[1];
  $result_trees{'value_node_directions'}{'contents'}[5]{'args'}[1]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[5];
+ $result_trees{'value_node_directions'}{'contents'}[5]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[5]{'args'}[2];
  $result_trees{'value_node_directions'}{'contents'}[5]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[5]{'args'}[2];
  $result_trees{'value_node_directions'}{'contents'}[5]{'args'}[2]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[5];
+ $result_trees{'value_node_directions'}{'contents'}[5]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[5]{'args'}[3];
  $result_trees{'value_node_directions'}{'contents'}[5]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[5]{'args'}[3];
  $result_trees{'value_node_directions'}{'contents'}[5]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[5]{'args'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl texinfo-6.3/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
*** texinfo-6.1/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl	2016-08-02 18:44:49.000000000 +0100
***************
*** 72,91 ****
        'extra' => {
          'arg_line' => ' macro1 { arg1 , arg2 }
! ',
!         'args_index' => {
!           'arg1' => 0,
!           'arg2' => 1
!         },
!         'macrobody' => 'result: @emph{\\arg1\\} protected \\\\ -> \\\\arg1\\\\ @emph{\\arg2\\}
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 72,76 ----
        'extra' => {
          'arg_line' => ' macro1 { arg1 , arg2 }
! '
        },
        'line_nr' => {
***************
*** 96,100 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 81,93 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 169,176 ****
  $result_trees{'comma_value_in_macro_arg'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'comma_value_in_macro_arg'}{'contents'}[2];
  $result_trees{'comma_value_in_macro_arg'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'comma_value_in_macro_arg'}{'contents'}[2];
- $result_trees{'comma_value_in_macro_arg'}{'contents'}[2]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'comma_value_in_macro_arg'}{'contents'}[2];
- $result_trees{'comma_value_in_macro_arg'}{'contents'}[2]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'comma_value_in_macro_arg'};
  $result_trees{'comma_value_in_macro_arg'}{'contents'}[2]{'parent'} = $result_trees{'comma_value_in_macro_arg'};
! $result_trees{'comma_value_in_macro_arg'}{'contents'}[3] = $result_trees{'comma_value_in_macro_arg'}{'contents'}[2]{'extra'}{'spaces_after_command'};
  $result_trees{'comma_value_in_macro_arg'}{'contents'}[4]{'parent'} = $result_trees{'comma_value_in_macro_arg'};
  $result_trees{'comma_value_in_macro_arg'}{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'comma_value_in_macro_arg'}{'contents'}[5];
--- 162,168 ----
  $result_trees{'comma_value_in_macro_arg'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'comma_value_in_macro_arg'}{'contents'}[2];
  $result_trees{'comma_value_in_macro_arg'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'comma_value_in_macro_arg'}{'contents'}[2];
  $result_trees{'comma_value_in_macro_arg'}{'contents'}[2]{'parent'} = $result_trees{'comma_value_in_macro_arg'};
! $result_trees{'comma_value_in_macro_arg'}{'contents'}[3]{'extra'}{'command'} = $result_trees{'comma_value_in_macro_arg'}{'contents'}[2];
! $result_trees{'comma_value_in_macro_arg'}{'contents'}[3]{'parent'} = $result_trees{'comma_value_in_macro_arg'};
  $result_trees{'comma_value_in_macro_arg'}{'contents'}[4]{'parent'} = $result_trees{'comma_value_in_macro_arg'};
  $result_trees{'comma_value_in_macro_arg'}{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'comma_value_in_macro_arg'}{'contents'}[5];
diff -Nrc2 texinfo-6.1/tp/t/results/value_and_macro/macro_in_value.pl texinfo-6.3/tp/t/results/value_and_macro/macro_in_value.pl
*** texinfo-6.1/tp/t/results/value_and_macro/macro_in_value.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/value_and_macro/macro_in_value.pl	2016-08-02 18:44:49.000000000 +0100
***************
*** 44,61 ****
        'extra' => {
          'arg_line' => ' ab
! ',
!         'macrobody' => 'a
! 
! b
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 44,48 ----
        'extra' => {
          'arg_line' => ' ab
! '
        },
        'line_nr' => {
***************
*** 66,70 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 53,65 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 139,146 ****
  $result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'macro_in_value'}{'contents'}[0];
  $result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'macro_in_value'}{'contents'}[0];
- $result_trees{'macro_in_value'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_in_value'}{'contents'}[0];
- $result_trees{'macro_in_value'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_in_value'};
  $result_trees{'macro_in_value'}{'contents'}[0]{'parent'} = $result_trees{'macro_in_value'};
! $result_trees{'macro_in_value'}{'contents'}[1] = $result_trees{'macro_in_value'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_in_value'}{'contents'}[2]{'parent'} = $result_trees{'macro_in_value'};
  $result_trees{'macro_in_value'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'macro_in_value'}{'contents'}[3];
--- 134,140 ----
  $result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'macro_in_value'}{'contents'}[0];
  $result_trees{'macro_in_value'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'macro_in_value'}{'contents'}[0];
  $result_trees{'macro_in_value'}{'contents'}[0]{'parent'} = $result_trees{'macro_in_value'};
! $result_trees{'macro_in_value'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'macro_in_value'}{'contents'}[0];
! $result_trees{'macro_in_value'}{'contents'}[1]{'parent'} = $result_trees{'macro_in_value'};
  $result_trees{'macro_in_value'}{'contents'}[2]{'parent'} = $result_trees{'macro_in_value'};
  $result_trees{'macro_in_value'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'macro_in_value'}{'contents'}[3];
diff -Nrc2 texinfo-6.1/tp/t/results/value_and_macro/value_in_macro_body.pl texinfo-6.3/tp/t/results/value_and_macro/value_in_macro_body.pl
*** texinfo-6.1/tp/t/results/value_and_macro/value_in_macro_body.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/value_and_macro/value_in_macro_body.pl	2016-08-02 18:44:49.000000000 +0100
***************
*** 67,85 ****
        'extra' => {
          'arg_line' => ' testvaluebody { arg }
! ',
!         'args_index' => {
!           'arg' => 0
!         },
!         'macrobody' => 'result: @emph{\\@value{bodyarg}\\  }
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 67,71 ----
        'extra' => {
          'arg_line' => ' testvaluebody { arg }
! '
        },
        'line_nr' => {
***************
*** 90,94 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 76,88 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 145,152 ****
  $result_trees{'value_in_macro_body'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'value_in_macro_body'}{'contents'}[2];
  $result_trees{'value_in_macro_body'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'value_in_macro_body'}{'contents'}[2];
- $result_trees{'value_in_macro_body'}{'contents'}[2]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'value_in_macro_body'}{'contents'}[2];
- $result_trees{'value_in_macro_body'}{'contents'}[2]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'value_in_macro_body'};
  $result_trees{'value_in_macro_body'}{'contents'}[2]{'parent'} = $result_trees{'value_in_macro_body'};
! $result_trees{'value_in_macro_body'}{'contents'}[3] = $result_trees{'value_in_macro_body'}{'contents'}[2]{'extra'}{'spaces_after_command'};
  $result_trees{'value_in_macro_body'}{'contents'}[4]{'parent'} = $result_trees{'value_in_macro_body'};
  $result_trees{'value_in_macro_body'}{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'value_in_macro_body'}{'contents'}[5];
--- 139,145 ----
  $result_trees{'value_in_macro_body'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'value_in_macro_body'}{'contents'}[2];
  $result_trees{'value_in_macro_body'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'value_in_macro_body'}{'contents'}[2];
  $result_trees{'value_in_macro_body'}{'contents'}[2]{'parent'} = $result_trees{'value_in_macro_body'};
! $result_trees{'value_in_macro_body'}{'contents'}[3]{'extra'}{'command'} = $result_trees{'value_in_macro_body'}{'contents'}[2];
! $result_trees{'value_in_macro_body'}{'contents'}[3]{'parent'} = $result_trees{'value_in_macro_body'};
  $result_trees{'value_in_macro_body'}{'contents'}[4]{'parent'} = $result_trees{'value_in_macro_body'};
  $result_trees{'value_in_macro_body'}{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'value_in_macro_body'}{'contents'}[5];
diff -Nrc2 texinfo-6.1/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl texinfo-6.3/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
*** texinfo-6.1/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl	2016-01-22 07:50:10.000000000 +0000
--- texinfo-6.3/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl	2016-08-02 18:44:49.000000000 +0100
***************
*** 73,92 ****
          'arg_line' => ' testvalue { arg , the@value{argument} }
  ',
!         'args_index' => {
!           'arg' => 0,
!           'the@value{argument' => 1
!         },
!         'invalid_syntax' => 1,
!         'macrobody' => 'result: @emph{\\arg\\} the \\the\\ thearg \\thearg\\ with value \\the@value{argument}\\
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 73,77 ----
          'arg_line' => ' testvalue { arg , the@value{argument} }
  ',
!         'invalid_syntax' => 1
        },
        'line_nr' => {
***************
*** 97,101 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 82,94 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 127,134 ****
  $result_trees{'value_in_macro_formal_arg'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'value_in_macro_formal_arg'}{'contents'}[2];
  $result_trees{'value_in_macro_formal_arg'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'value_in_macro_formal_arg'}{'contents'}[2];
- $result_trees{'value_in_macro_formal_arg'}{'contents'}[2]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'value_in_macro_formal_arg'}{'contents'}[2];
- $result_trees{'value_in_macro_formal_arg'}{'contents'}[2]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'value_in_macro_formal_arg'};
  $result_trees{'value_in_macro_formal_arg'}{'contents'}[2]{'parent'} = $result_trees{'value_in_macro_formal_arg'};
! $result_trees{'value_in_macro_formal_arg'}{'contents'}[3] = $result_trees{'value_in_macro_formal_arg'}{'contents'}[2]{'extra'}{'spaces_after_command'};
  $result_trees{'value_in_macro_formal_arg'}{'contents'}[4]{'parent'} = $result_trees{'value_in_macro_formal_arg'};
  $result_trees{'value_in_macro_formal_arg'}{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'value_in_macro_formal_arg'}{'contents'}[5];
--- 120,126 ----
  $result_trees{'value_in_macro_formal_arg'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'value_in_macro_formal_arg'}{'contents'}[2];
  $result_trees{'value_in_macro_formal_arg'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'value_in_macro_formal_arg'}{'contents'}[2];
  $result_trees{'value_in_macro_formal_arg'}{'contents'}[2]{'parent'} = $result_trees{'value_in_macro_formal_arg'};
! $result_trees{'value_in_macro_formal_arg'}{'contents'}[3]{'extra'}{'command'} = $result_trees{'value_in_macro_formal_arg'}{'contents'}[2];
! $result_trees{'value_in_macro_formal_arg'}{'contents'}[3]{'parent'} = $result_trees{'value_in_macro_formal_arg'};
  $result_trees{'value_in_macro_formal_arg'}{'contents'}[4]{'parent'} = $result_trees{'value_in_macro_formal_arg'};
  $result_trees{'value_in_macro_formal_arg'}{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'value_in_macro_formal_arg'}{'contents'}[5];
***************
*** 152,170 ****
  $result_errors{'value_in_macro_formal_arg'} = [
    {
!     'error_line' => ':3: bad syntax for @macro argument: }
  ',
      'file_name' => '',
      'line_nr' => 3,
      'macro' => '',
!     'text' => 'bad syntax for @macro argument: }',
      'type' => 'error'
    },
    {
!     'error_line' => ':3: bad or empty @macro formal argument: the@value{argument
  ',
      'file_name' => '',
      'line_nr' => 3,
      'macro' => '',
!     'text' => 'bad or empty @macro formal argument: the@value{argument',
      'type' => 'error'
    },
--- 144,162 ----
  $result_errors{'value_in_macro_formal_arg'} = [
    {
!     'error_line' => ':3: bad or empty @macro formal argument: the@value{argument
  ',
      'file_name' => '',
      'line_nr' => 3,
      'macro' => '',
!     'text' => 'bad or empty @macro formal argument: the@value{argument',
      'type' => 'error'
    },
    {
!     'error_line' => ':3: bad syntax for @macro argument: }
  ',
      'file_name' => '',
      'line_nr' => 3,
      'macro' => '',
!     'text' => 'bad syntax for @macro argument: }',
      'type' => 'error'
    },
diff -Nrc2 texinfo-6.1/tp/t/results/verb/verb_at_end_of_line_not_closed.pl texinfo-6.3/tp/t/results/verb/verb_at_end_of_line_not_closed.pl
*** texinfo-6.1/tp/t/results/verb/verb_at_end_of_line_not_closed.pl	2016-01-22 07:49:33.000000000 +0000
--- texinfo-6.3/tp/t/results/verb/verb_at_end_of_line_not_closed.pl	2016-08-02 18:44:15.000000000 +0100
***************
*** 79,88 ****
    },
    {
!     'error_line' => ':1: @verb missing close brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@verb missing close brace',
      'type' => 'error'
    }
--- 79,88 ----
    },
    {
!     'error_line' => ':1: @verb missing closing brace
  ',
      'file_name' => '',
      'line_nr' => 1,
      'macro' => '',
!     'text' => '@verb missing closing brace',
      'type' => 'error'
    }
diff -Nrc2 texinfo-6.1/tp/t/results/xml_tests/brace_commands_spaces_end_of_lines.pl texinfo-6.3/tp/t/results/xml_tests/brace_commands_spaces_end_of_lines.pl
*** texinfo-6.1/tp/t/results/xml_tests/brace_commands_spaces_end_of_lines.pl	2016-01-22 07:50:35.000000000 +0000
--- texinfo-6.3/tp/t/results/xml_tests/brace_commands_spaces_end_of_lines.pl	2016-08-02 18:45:13.000000000 +0100
***************
*** 13,16 ****
--- 13,17 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => '
  ',
***************
*** 59,62 ****
--- 60,64 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' 
  ',
***************
*** 115,118 ****
--- 117,121 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => '
  ',
***************
*** 138,146 ****
              {}
            ]
!         ],
!         'spaces_before_argument' => {
!           'text' => '',
!           'type' => 'empty_spaces_before_argument'
!         }
        },
        'line_nr' => {
--- 141,145 ----
              {}
            ]
!         ]
        },
        'line_nr' => {
***************
*** 177,180 ****
--- 176,180 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' 
  ',
***************
*** 200,208 ****
              {}
            ]
!         ],
!         'spaces_before_argument' => {
!           'text' => '',
!           'type' => 'empty_spaces_before_argument'
!         }
        },
        'line_nr' => {
--- 200,204 ----
              {}
            ]
!         ]
        },
        'line_nr' => {
***************
*** 239,242 ****
--- 235,239 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => '
  ',
***************
*** 262,270 ****
              {}
            ]
!         ],
!         'spaces_before_argument' => {
!           'text' => '',
!           'type' => 'empty_spaces_before_argument'
!         }
        },
        'line_nr' => {
--- 259,263 ----
              {}
            ]
!         ]
        },
        'line_nr' => {
***************
*** 301,304 ****
--- 294,298 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' 
  ',
***************
*** 324,332 ****
              {}
            ]
!         ],
!         'spaces_before_argument' => {
!           'text' => '',
!           'type' => 'empty_spaces_before_argument'
!         }
        },
        'line_nr' => {
--- 318,322 ----
              {}
            ]
!         ]
        },
        'line_nr' => {
***************
*** 345,348 ****
--- 335,339 ----
    'type' => 'text_root'
  };
+ $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[0]{'args'}[0];
  $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[0]{'args'}[0];
  $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[0];
***************
*** 352,355 ****
--- 343,347 ----
  $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[1]{'parent'} = $result_trees{'brace_commands_spaces_end_of_lines'};
  $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[2]{'parent'} = $result_trees{'brace_commands_spaces_end_of_lines'};
+ $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[3]{'args'}[0];
  $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[3]{'args'}[0];
  $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[3];
***************
*** 361,364 ****
--- 353,357 ----
  $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[6]{'args'}[0];
  $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[6];
+ $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[6]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[6]{'args'}[1];
  $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[6]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[6]{'args'}[1];
  $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[6]{'args'}[1]{'parent'} = $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[6];
***************
*** 370,373 ****
--- 363,367 ----
  $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[9]{'args'}[0];
  $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[9];
+ $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[9]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[9]{'args'}[1];
  $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[9]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[9]{'args'}[1];
  $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[9]{'args'}[1]{'parent'} = $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[9];
***************
*** 379,382 ****
--- 373,377 ----
  $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[12]{'args'}[0];
  $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[12];
+ $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[12]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[12]{'args'}[1];
  $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[12]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[12]{'args'}[1];
  $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[12]{'args'}[1]{'parent'} = $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[12];
***************
*** 388,391 ****
--- 383,387 ----
  $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[15]{'args'}[0];
  $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[15]{'args'}[0]{'parent'} = $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[15];
+ $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[15]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[15]{'args'}[1];
  $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[15]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[15]{'args'}[1];
  $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[15]{'args'}[1]{'parent'} = $result_trees{'brace_commands_spaces_end_of_lines'}{'contents'}[15];
diff -Nrc2 texinfo-6.1/tp/t/results/xml_tests/commands_and_spaces.pl texinfo-6.3/tp/t/results/xml_tests/commands_and_spaces.pl
*** texinfo-6.1/tp/t/results/xml_tests/commands_and_spaces.pl	2016-01-22 07:50:35.000000000 +0000
--- texinfo-6.3/tp/t/results/xml_tests/commands_and_spaces.pl	2016-08-02 18:45:13.000000000 +0100
***************
*** 213,216 ****
--- 213,217 ----
            'contents' => [
              {
+               'parent' => {},
                'text' => ' ',
                'type' => 'empty_spaces_before_argument'
***************
*** 413,416 ****
--- 414,418 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 457,460 ****
--- 459,463 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 529,532 ****
--- 532,536 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 579,582 ****
--- 583,587 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 778,781 ****
--- 783,787 ----
                'contents' => [
                  {
+                   'parent' => {},
                    'text' => ' ',
                    'type' => 'empty_spaces_before_argument'
***************
*** 879,888 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 885,889 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {
***************
*** 1131,1134 ****
--- 1132,1136 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1231,1240 ****
                {
                  'contents' => [],
-                 'parent' => {},
                  'type' => 'bracketed_multitable_prototype'
                },
                {
                  'contents' => [],
-                 'parent' => {},
                  'type' => 'bracketed_multitable_prototype'
                },
--- 1233,1240 ----
***************
*** 1326,1338 ****
            ],
            'extra' => {
!             'spaces_after_command' => {
!               'extra' => {
!                 'command' => {}
!               },
!               'parent' => {},
!               'text' => ' 
! ',
!               'type' => 'empty_line_after_command'
!             }
            },
            'line_nr' => {
--- 1326,1330 ----
            ],
            'extra' => {
!             'spaces_after_command' => {}
            },
            'line_nr' => {
***************
*** 1343,1347 ****
            'parent' => {}
          },
!         {},
          {
            'parent' => {},
--- 1335,1347 ----
            'parent' => {}
          },
!         {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => ' 
! ',
!           'type' => 'empty_line_after_command'
!         },
          {
            'parent' => {},
***************
*** 1528,1531 ****
--- 1528,1537 ----
                  {
                    'cmdname' => 'strong',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 56,
+                     'macro' => ''
+                   },
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 1649,1657 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 56,
!             'macro' => ''
!           },
            'parent' => {}
          },
--- 1655,1659 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {}
          },
***************
*** 1792,1795 ****
--- 1794,1798 ----
                    'contents' => [
                      {
+                       'parent' => {},
                        'text' => ' ',
                        'type' => 'empty_spaces_before_argument'
***************
*** 1859,1862 ****
--- 1862,1866 ----
                        'contents' => [
                          {
+                           'parent' => {},
                            'text' => ' ',
                            'type' => 'empty_spaces_before_argument'
***************
*** 1890,1893 ****
--- 1894,1898 ----
                        'contents' => [
                          {
+                           'parent' => {},
                            'text' => ' ',
                            'type' => 'empty_spaces_before_argument'
***************
*** 1917,1920 ****
--- 1922,1926 ----
                        'contents' => [
                          {
+                           'parent' => {},
                            'text' => ' ',
                            'type' => 'empty_spaces_before_argument'
***************
*** 1944,1947 ****
--- 1950,1954 ----
                        'contents' => [
                          {
+                           'parent' => {},
                            'text' => '  ',
                            'type' => 'empty_spaces_before_argument'
***************
*** 1971,1974 ****
--- 1978,1982 ----
                        'contents' => [
                          {
+                           'parent' => {},
                            'text' => '  ',
                            'type' => 'empty_spaces_before_argument'
***************
*** 2010,2014 ****
                          'spaces_before_argument' => {}
                        },
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 2018,2021 ----
***************
*** 2028,2032 ****
                          'spaces_before_argument' => {}
                        },
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 2035,2038 ----
***************
*** 2046,2050 ****
                          'spaces_before_argument' => {}
                        },
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 2052,2055 ----
***************
*** 2064,2068 ****
                          'spaces_before_argument' => {}
                        },
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 2069,2072 ----
***************
*** 2082,2086 ****
                          'spaces_before_argument' => {}
                        },
-                       'parent' => {},
                        'type' => 'bracketed_def_content'
                      }
--- 2086,2089 ----
***************
*** 2103,2107 ****
                    'index_at_command' => 'deffn',
                    'index_name' => 'fn',
-                   'index_prefix' => 'f',
                    'index_type_command' => 'deffn',
                    'key' => 'machin',
--- 2106,2109 ----
***************
*** 2267,2270 ****
--- 2269,2273 ----
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[2];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1];
+ $result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[3];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[3];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[3];
***************
*** 2301,2304 ****
--- 2304,2308 ----
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[13]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[14]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1];
+ $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[0];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[0];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[0];
***************
*** 2309,2312 ****
--- 2313,2317 ----
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[2];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[2]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15];
+ $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[3];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[3];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[3]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15];
***************
*** 2323,2326 ****
--- 2328,2332 ----
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[16]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[17]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1];
+ $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[0];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[0];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[0];
***************
*** 2332,2335 ****
--- 2338,2342 ----
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[2];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[2]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18];
+ $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[3];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[3];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[3]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18];
***************
*** 2371,2374 ****
--- 2378,2382 ----
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'args'}[0];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'args'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23];
+ $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'args'}[1];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'args'}[1];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'args'}[1];
***************
*** 2389,2393 ****
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'contents'}[3];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'contents'}[3]{'extra'}{'float'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23];
- $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'contents'}[3]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'contents'}[3]{'args'}[0];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'contents'}[3]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'contents'}[4];
--- 2397,2400 ----
***************
*** 2440,2443 ****
--- 2447,2451 ----
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0];
+ $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[3];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[3];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[3]{'extra'}{'spaces_before_argument'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[3]{'contents'}[0];
***************
*** 2459,2465 ****
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'end_command'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'contents'}[0];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes'}[1]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes'}[2] = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[5];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes_line'}[1] = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[1];
--- 2467,2471 ----
***************
*** 2473,2480 ****
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'contents'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'contents'}[1]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29];
! $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29];
! $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1];
! $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[30] = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'extra'}{'spaces_after_command'};
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[31]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'command'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[32];
--- 2479,2486 ----
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'contents'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'contents'}[1]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29];
! $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'extra'}{'spaces_after_command'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'contents'}[0];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1];
! $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[30]{'extra'}{'command'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29];
! $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[30]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[31]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'command'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[32];
***************
*** 2537,2540 ****
--- 2543,2547 ----
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'extra'}{'end_command'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[1];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'extra'}{'spaces_after_command'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'args'}[0]{'contents'}[0];
+ $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'line_nr'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[37]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1];
***************
*** 2562,2565 ****
--- 2569,2573 ----
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[41]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1];
+ $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0];
***************
*** 2573,2576 ****
--- 2581,2585 ----
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0];
+ $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[1];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[1];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[1];
***************
*** 2578,2581 ****
--- 2587,2591 ----
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0];
+ $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[3];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[3];
***************
*** 2584,2587 ****
--- 2594,2598 ----
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0];
+ $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[5];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[5];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[2]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[5];
***************
*** 2590,2593 ****
--- 2601,2605 ----
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0];
+ $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[7];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[7];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[7]{'contents'}[2]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[7];
***************
*** 2596,2599 ****
--- 2608,2612 ----
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0];
+ $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[9]{'contents'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[9];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[9]{'contents'}[1]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[9];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[9]{'contents'}[2]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[9];
***************
*** 2605,2621 ****
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'extra'}{'spaces_before_argument'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0];
- $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'extra'}{'spaces_before_argument'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'}[0];
- $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'contents'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'};
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'extra'}{'spaces_before_argument'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[0];
- $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'contents'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[7]{'contents'};
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'extra'}{'spaces_before_argument'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[7]{'contents'}[0];
- $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[8][1]{'contents'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[9]{'contents'};
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[8][1]{'extra'}{'spaces_before_argument'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[9]{'contents'}[0];
- $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[8][1]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[0][1];
  $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_args'}[2][1];
--- 2618,2629 ----
***************
*** 2841,2849 ****
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 2849,2853 ----
            'cmdname' => 'shortcaption',
            'extra' => {
!             'float' => {}
            }
          },
diff -Nrc2 texinfo-6.1/tp/t/results/xml_tests/comments_end_lines.pl texinfo-6.3/tp/t/results/xml_tests/comments_end_lines.pl
*** texinfo-6.1/tp/t/results/xml_tests/comments_end_lines.pl	2016-01-22 07:50:35.000000000 +0000
--- texinfo-6.3/tp/t/results/xml_tests/comments_end_lines.pl	2016-08-02 18:45:13.000000000 +0100
***************
*** 118,121 ****
--- 118,122 ----
              {
                'cmdname' => 'bullet',
+               'contents' => [],
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 243,246 ****
--- 244,253 ----
              {
                'cmdname' => 'asis',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 8,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 381,389 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 8,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 388,392 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 1313,1316 ****
--- 1316,1320 ----
  $result_trees{'comments_end_lines'}{'contents'}[4]{'extra'}{'end_command'} = $result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1];
  $result_trees{'comments_end_lines'}{'contents'}[4]{'extra'}{'spaces_after_command'} = $result_trees{'comments_end_lines'}{'contents'}[4]{'args'}[0]{'contents'}[0];
+ $result_trees{'comments_end_lines'}{'contents'}[4]{'line_nr'} = $result_trees{'comments_end_lines'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'comments_end_lines'}{'contents'}[4]{'parent'} = $result_trees{'comments_end_lines'};
  $result_trees{'comments_end_lines'}{'contents'}[5]{'parent'} = $result_trees{'comments_end_lines'};
diff -Nrc2 texinfo-6.1/tp/t/results/xml_tests/comments_on_block_command_lines.pl texinfo-6.3/tp/t/results/xml_tests/comments_on_block_command_lines.pl
*** texinfo-6.1/tp/t/results/xml_tests/comments_on_block_command_lines.pl	2016-01-22 07:50:35.000000000 +0000
--- texinfo-6.3/tp/t/results/xml_tests/comments_on_block_command_lines.pl	2016-08-02 18:45:13.000000000 +0100
***************
*** 126,129 ****
--- 126,130 ----
              {
                'cmdname' => 'bullet',
+               'contents' => [],
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 306,309 ****
--- 307,316 ----
              {
                'cmdname' => 'bullet',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 9,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 425,433 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 9,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 432,436 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 460,463 ****
--- 463,471 ----
                'cmdname' => 'bullet',
                'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 13,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 579,587 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 13,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 587,591 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 882,885 ****
--- 886,895 ----
              {
                'cmdname' => 'asis',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 25,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 1020,1028 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 25,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 1030,1034 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 1879,1888 ****
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            },
            {
              'contents' => [],
-             'parent' => {},
              'type' => 'bracketed_multitable_prototype'
            }
--- 1885,1892 ----
***************
*** 2357,2360 ****
--- 2361,2365 ----
  $result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'extra'}{'end_command'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'contents'}[1];
  $result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'extra'}{'spaces_after_command'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'args'}[0]{'contents'}[0];
+ $result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'line_nr'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'parent'} = $result_trees{'comments_on_block_command_lines'};
  $result_trees{'comments_on_block_command_lines'}{'contents'}[5]{'parent'} = $result_trees{'comments_on_block_command_lines'};
***************
*** 2385,2388 ****
--- 2390,2394 ----
  $result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'extra'}{'end_command'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'contents'}[1];
  $result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'extra'}{'spaces_after_command'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'args'}[0]{'contents'}[0];
+ $result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'line_nr'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'parent'} = $result_trees{'comments_on_block_command_lines'};
  $result_trees{'comments_on_block_command_lines'}{'contents'}[7]{'parent'} = $result_trees{'comments_on_block_command_lines'};
***************
*** 2465,2468 ****
--- 2471,2475 ----
  $result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'extra'}{'end_command'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'contents'}[1];
  $result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'extra'}{'spaces_after_command'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'args'}[0]{'contents'}[0];
+ $result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'line_nr'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'parent'} = $result_trees{'comments_on_block_command_lines'};
  $result_trees{'comments_on_block_command_lines'}{'contents'}[13]{'parent'} = $result_trees{'comments_on_block_command_lines'};
***************
*** 2623,2629 ****
  $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'extra'}{'end_command'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[1];
  $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'contents'}[1]{'contents'};
- $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'extra'}{'prototypes'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0];
  $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'contents'}[3]{'contents'};
- $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'extra'}{'prototypes'}[1]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0];
  $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'extra'}{'prototypes_line'}[1] = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'contents'}[1];
  $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'extra'}{'prototypes_line'}[3] = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'contents'}[3];
--- 2630,2634 ----
diff -Nrc2 texinfo-6.1/tp/t/results/xml_tests/image_inline_or_not.pl texinfo-6.3/tp/t/results/xml_tests/image_inline_or_not.pl
*** texinfo-6.1/tp/t/results/xml_tests/image_inline_or_not.pl	2016-01-22 07:50:35.000000000 +0000
--- texinfo-6.3/tp/t/results/xml_tests/image_inline_or_not.pl	2016-08-02 18:45:13.000000000 +0100
***************
*** 30,38 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 30,34 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 80,88 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 76,80 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 216,224 ****
                  {}
                ]
!             ],
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            },
            'line_nr' => {
--- 208,212 ----
                  {}
                ]
!             ]
            },
            'line_nr' => {
***************
*** 266,274 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 254,258 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 334,342 ****
                          {}
                        ]
!                     ],
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {
--- 318,322 ----
                          {}
                        ]
!                     ]
                    },
                    'line_nr' => {
***************
*** 383,391 ****
                          {}
                        ]
!                     ],
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {
--- 363,367 ----
                          {}
                        ]
!                     ]
                    },
                    'line_nr' => {
***************
*** 496,504 ****
                          {}
                        ]
!                     ],
!                     'spaces_before_argument' => {
!                       'text' => '',
!                       'type' => 'empty_spaces_before_argument'
!                     }
                    },
                    'line_nr' => {
--- 472,476 ----
                          {}
                        ]
!                     ]
                    },
                    'line_nr' => {
***************
*** 542,550 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 514,518 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 634,637 ****
--- 602,611 ----
                  {
                    'cmdname' => 'asis',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 24,
+                     'macro' => ''
+                   },
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 686,694 ****
                                      {}
                                    ]
!                                 ],
!                                 'spaces_before_argument' => {
!                                   'text' => '',
!                                   'type' => 'empty_spaces_before_argument'
!                                 }
                                },
                                'line_nr' => {
--- 660,664 ----
                                      {}
                                    ]
!                                 ]
                                },
                                'line_nr' => {
***************
*** 752,760 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 722,726 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 802,810 ****
                                  {}
                                ]
!                             ],
!                             'spaces_before_argument' => {
!                               'text' => '',
!                               'type' => 'empty_spaces_before_argument'
!                             }
                            },
                            'line_nr' => {
--- 768,772 ----
                                  {}
                                ]
!                             ]
                            },
                            'line_nr' => {
***************
*** 850,858 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 812,816 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 928,936 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 24,
!             'macro' => ''
!           },
            'parent' => {}
          },
--- 886,890 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {}
          },
***************
*** 982,990 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 936,940 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 1028,1036 ****
                                  {}
                                ]
!                             ],
!                             'spaces_before_argument' => {
!                               'text' => '',
!                               'type' => 'empty_spaces_before_argument'
!                             }
                            },
                            'line_nr' => {},
--- 978,982 ----
                                  {}
                                ]
!                             ]
                            },
                            'line_nr' => {},
***************
*** 1093,1101 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 1039,1043 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 1141,1149 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {},
--- 1083,1087 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {},
***************
*** 1227,1235 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 1165,1169 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 1359,1367 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 1293,1297 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 1433,1441 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 1363,1367 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 1507,1515 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 1433,1437 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 1622,1630 ****
                      {}
                    ]
!                 ],
!                 'spaces_before_argument' => {
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {
--- 1544,1548 ----
                      {}
                    ]
!                 ]
                },
                'line_nr' => {
***************
*** 1670,1678 ****
                              {}
                            ]
!                         ],
!                         'spaces_before_argument' => {
!                           'text' => '',
!                           'type' => 'empty_spaces_before_argument'
!                         }
                        },
                        'line_nr' => {
--- 1588,1592 ----
                              {}
                            ]
!                         ]
                        },
                        'line_nr' => {
***************
*** 1709,1717 ****
                                  {}
                                ]
!                             ],
!                             'spaces_before_argument' => {
!                               'text' => '',
!                               'type' => 'empty_spaces_before_argument'
!                             }
                            },
                            'line_nr' => {},
--- 1623,1627 ----
                                  {}
                                ]
!                             ]
                            },
                            'line_nr' => {},
***************
*** 1730,1739 ****
                'contents' => [],
                'extra' => {
!                 'float' => {},
!                 'spaces_before_argument' => {
!                   'parent' => {},
!                   'text' => '',
!                   'type' => 'empty_spaces_before_argument'
!                 }
                },
                'line_nr' => {},
--- 1640,1644 ----
                'contents' => [],
                'extra' => {
!                 'float' => {}
                },
                'line_nr' => {},
***************
*** 1798,1801 ****
--- 1703,1707 ----
              'caption' => {},
              'end_command' => {},
+             'float_section' => {},
              'node_content' => [
                {}
***************
*** 1810,1814 ****
              }
            },
-           'float_section' => {},
            'line_nr' => {
              'file_name' => '',
--- 1716,1719 ----
***************
*** 1985,1988 ****
--- 1890,1894 ----
  $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'extra'}{'end_command'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'contents'}[1];
  $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'extra'}{'spaces_after_command'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'}[0];
+ $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'line_nr'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2];
  $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[11]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2];
***************
*** 2118,2122 ****
  $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[4];
  $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'extra'}{'float'} = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4];
- $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'extra'}{'spaces_before_argument'}{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'args'}[0];
  $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'line_nr'} = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
  $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4];
--- 2024,2027 ----
***************
*** 2134,2141 ****
  $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'extra'}{'caption'} = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[4];
  $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'extra'}{'end_command'} = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[6];
  $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'extra'}{'node_content'}[0] = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'args'}[1]{'contents'}[0];
  $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'extra'}{'spaces_after_command'} = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0];
  $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'extra'}{'type'}{'content'}[0] = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[1];
- $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'float_section'} = $result_trees{'image_inline_or_not'}{'contents'}[4];
  $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[4];
  $result_trees{'image_inline_or_not'}{'contents'}[4]{'extra'}{'misc_content'}[0] = $result_trees{'image_inline_or_not'}{'contents'}[4]{'args'}[0]{'contents'}[1];
--- 2039,2046 ----
  $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'extra'}{'caption'} = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[4];
  $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'extra'}{'end_command'} = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[6];
+ $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'extra'}{'float_section'} = $result_trees{'image_inline_or_not'}{'contents'}[4];
  $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'extra'}{'node_content'}[0] = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'args'}[1]{'contents'}[0];
  $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'extra'}{'spaces_after_command'} = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0];
  $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'extra'}{'type'}{'content'}[0] = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[1];
  $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[4];
  $result_trees{'image_inline_or_not'}{'contents'}[4]{'extra'}{'misc_content'}[0] = $result_trees{'image_inline_or_not'}{'contents'}[4]{'args'}[0]{'contents'}[1];
***************
*** 2385,2393 ****
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {},
!             'spaces_before_argument' => {
!               'text' => '',
!               'type' => 'empty_spaces_before_argument'
!             }
            }
          },
--- 2290,2294 ----
            'cmdname' => 'caption',
            'extra' => {
!             'float' => {}
            }
          },
***************
*** 2400,2403 ****
--- 2301,2310 ----
            }
          },
+         'float_section' => {
+           'cmdname' => 'chapter',
+           'extra' => {},
+           'level' => 1,
+           'number' => 1
+         },
          'normalized' => 'g',
          'type' => {
***************
*** 2410,2419 ****
          }
        },
-       'float_section' => {
-         'cmdname' => 'chapter',
-         'extra' => {},
-         'level' => 1,
-         'number' => 1
-       },
        'number' => '1.1'
      }
--- 2317,2320 ----
diff -Nrc2 texinfo-6.1/tp/t/results/xml_tests/macro_and_args.pl texinfo-6.3/tp/t/results/xml_tests/macro_and_args.pl
*** texinfo-6.1/tp/t/results/xml_tests/macro_and_args.pl	2016-01-22 07:50:35.000000000 +0000
--- texinfo-6.3/tp/t/results/xml_tests/macro_and_args.pl	2016-08-02 18:45:13.000000000 +0100
***************
*** 30,48 ****
        'extra' => {
          'arg_line' => ' good { aaa, 2b-bb}
! ',
!         'args_index' => {
!           '2b-bb' => 1,
!           'aaa' => 0
!         },
!         'macrobody' => '',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 30,34 ----
        'extra' => {
          'arg_line' => ' good { aaa, 2b-bb}
! '
        },
        'line_nr' => {
***************
*** 53,57 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 39,51 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 88,107 ****
          'arg_line' => ' bad { ggg"@@^_ ff, nnn_b, ccc v}
  ',
!         'args_index' => {
!           'ccc v' => 2,
!           'ggg"@@^_ ff' => 0,
!           'nnn_b' => 1
!         },
!         'invalid_syntax' => 1,
!         'macrobody' => '',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 82,86 ----
          'arg_line' => ' bad { ggg"@@^_ ff, nnn_b, ccc v}
  ',
!         'invalid_syntax' => 1
        },
        'line_nr' => {
***************
*** 112,116 ****
        'parent' => {}
      },
!     {}
    ],
    'type' => 'text_root'
--- 91,103 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     }
    ],
    'type' => 'text_root'
***************
*** 119,126 ****
  $result_trees{'macro_and_args'}{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'macro_and_args'}{'contents'}[0];
  $result_trees{'macro_and_args'}{'contents'}[0]{'args'}[2]{'parent'} = $result_trees{'macro_and_args'}{'contents'}[0];
- $result_trees{'macro_and_args'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_and_args'}{'contents'}[0];
- $result_trees{'macro_and_args'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_and_args'};
  $result_trees{'macro_and_args'}{'contents'}[0]{'parent'} = $result_trees{'macro_and_args'};
! $result_trees{'macro_and_args'}{'contents'}[1] = $result_trees{'macro_and_args'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'macro_and_args'}{'contents'}[2]{'parent'} = $result_trees{'macro_and_args'};
  $result_trees{'macro_and_args'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'macro_and_args'}{'contents'}[3];
--- 106,112 ----
  $result_trees{'macro_and_args'}{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'macro_and_args'}{'contents'}[0];
  $result_trees{'macro_and_args'}{'contents'}[0]{'args'}[2]{'parent'} = $result_trees{'macro_and_args'}{'contents'}[0];
  $result_trees{'macro_and_args'}{'contents'}[0]{'parent'} = $result_trees{'macro_and_args'};
! $result_trees{'macro_and_args'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'macro_and_args'}{'contents'}[0];
! $result_trees{'macro_and_args'}{'contents'}[1]{'parent'} = $result_trees{'macro_and_args'};
  $result_trees{'macro_and_args'}{'contents'}[2]{'parent'} = $result_trees{'macro_and_args'};
  $result_trees{'macro_and_args'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'macro_and_args'}{'contents'}[3];
***************
*** 128,135 ****
  $result_trees{'macro_and_args'}{'contents'}[3]{'args'}[2]{'parent'} = $result_trees{'macro_and_args'}{'contents'}[3];
  $result_trees{'macro_and_args'}{'contents'}[3]{'args'}[3]{'parent'} = $result_trees{'macro_and_args'}{'contents'}[3];
- $result_trees{'macro_and_args'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'macro_and_args'}{'contents'}[3];
- $result_trees{'macro_and_args'}{'contents'}[3]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'macro_and_args'};
  $result_trees{'macro_and_args'}{'contents'}[3]{'parent'} = $result_trees{'macro_and_args'};
! $result_trees{'macro_and_args'}{'contents'}[4] = $result_trees{'macro_and_args'}{'contents'}[3]{'extra'}{'spaces_after_command'};
  
  $result_texis{'macro_and_args'} = '@macro good { aaa, 2b-bb}
--- 114,120 ----
  $result_trees{'macro_and_args'}{'contents'}[3]{'args'}[2]{'parent'} = $result_trees{'macro_and_args'}{'contents'}[3];
  $result_trees{'macro_and_args'}{'contents'}[3]{'args'}[3]{'parent'} = $result_trees{'macro_and_args'}{'contents'}[3];
  $result_trees{'macro_and_args'}{'contents'}[3]{'parent'} = $result_trees{'macro_and_args'};
! $result_trees{'macro_and_args'}{'contents'}[4]{'extra'}{'command'} = $result_trees{'macro_and_args'}{'contents'}[3];
! $result_trees{'macro_and_args'}{'contents'}[4]{'parent'} = $result_trees{'macro_and_args'};
  
  $result_texis{'macro_and_args'} = '@macro good { aaa, 2b-bb}
diff -Nrc2 texinfo-6.1/tp/t/results/xml_tests/spaces_info_lost.pl texinfo-6.3/tp/t/results/xml_tests/spaces_info_lost.pl
*** texinfo-6.1/tp/t/results/xml_tests/spaces_info_lost.pl	2016-01-22 07:50:35.000000000 +0000
--- texinfo-6.3/tp/t/results/xml_tests/spaces_info_lost.pl	2016-08-02 18:45:13.000000000 +0100
***************
*** 132,144 ****
        ],
        'extra' => {
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => ' 
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 132,136 ----
        ],
        'extra' => {
!         'spaces_after_command' => {}
        },
        'line_nr' => {
***************
*** 149,153 ****
        'parent' => {}
      },
!     {}
    ],
    'type' => 'text_root'
--- 141,153 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => ' 
! ',
!       'type' => 'empty_line_after_command'
!     }
    ],
    'type' => 'text_root'
***************
*** 176,183 ****
  $result_trees{'spaces_info_lost'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'spaces_info_lost'}{'contents'}[2];
  $result_trees{'spaces_info_lost'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'spaces_info_lost'}{'contents'}[2];
! $result_trees{'spaces_info_lost'}{'contents'}[2]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'spaces_info_lost'}{'contents'}[2];
! $result_trees{'spaces_info_lost'}{'contents'}[2]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'spaces_info_lost'};
  $result_trees{'spaces_info_lost'}{'contents'}[2]{'parent'} = $result_trees{'spaces_info_lost'};
! $result_trees{'spaces_info_lost'}{'contents'}[3] = $result_trees{'spaces_info_lost'}{'contents'}[2]{'extra'}{'spaces_after_command'};
  
  $result_texis{'spaces_info_lost'} = '@example  text on example line 
--- 176,183 ----
  $result_trees{'spaces_info_lost'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'spaces_info_lost'}{'contents'}[2];
  $result_trees{'spaces_info_lost'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'spaces_info_lost'}{'contents'}[2];
! $result_trees{'spaces_info_lost'}{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'spaces_info_lost'}{'contents'}[2]{'contents'}[0];
  $result_trees{'spaces_info_lost'}{'contents'}[2]{'parent'} = $result_trees{'spaces_info_lost'};
! $result_trees{'spaces_info_lost'}{'contents'}[3]{'extra'}{'command'} = $result_trees{'spaces_info_lost'}{'contents'}[2];
! $result_trees{'spaces_info_lost'}{'contents'}[3]{'parent'} = $result_trees{'spaces_info_lost'};
  
  $result_texis{'spaces_info_lost'} = '@example  text on example line 
diff -Nrc2 texinfo-6.1/tp/t/results/xtable/accent_on_table_line.pl texinfo-6.3/tp/t/results/xtable/accent_on_table_line.pl
*** texinfo-6.1/tp/t/results/xtable/accent_on_table_line.pl	2016-01-22 07:49:54.000000000 +0000
--- texinfo-6.3/tp/t/results/xtable/accent_on_table_line.pl	2016-08-02 18:44:33.000000000 +0100
***************
*** 22,25 ****
--- 22,31 ----
              {
                'cmdname' => '~',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 1,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 210,213 ****
--- 216,220 ----
              {
                'cmdname' => 'asis',
+               'contents' => [],
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 219,227 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 1,
!         'macro' => ''
!       },
        'parent' => {}
      }
--- 226,230 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      }
***************
*** 271,274 ****
--- 274,278 ----
  $result_trees{'accent_on_table_line'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[2];
  $result_trees{'accent_on_table_line'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'accent_on_table_line'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'accent_on_table_line'}{'contents'}[0]{'line_nr'} = $result_trees{'accent_on_table_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'accent_on_table_line'}{'contents'}[0]{'parent'} = $result_trees{'accent_on_table_line'};
  
diff -Nrc2 texinfo-6.1/tp/t/results/xtable/block_commands_in_table.pl texinfo-6.3/tp/t/results/xtable/block_commands_in_table.pl
*** texinfo-6.1/tp/t/results/xtable/block_commands_in_table.pl	2016-01-22 07:49:54.000000000 +0000
--- texinfo-6.3/tp/t/results/xtable/block_commands_in_table.pl	2016-08-02 18:44:33.000000000 +0100
***************
*** 111,114 ****
--- 111,120 ----
                  {
                    'cmdname' => 'emph',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 4,
+                     'macro' => ''
+                   },
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 806,814 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 4,
!             'macro' => ''
!           },
            'parent' => {}
          },
--- 812,816 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {}
          },
***************
*** 833,836 ****
--- 835,844 ----
                  {
                    'cmdname' => 'strong',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 31,
+                     'macro' => ''
+                   },
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 891,895 ****
                            'index_at_command' => 'item',
                            'index_name' => 'vr',
-                           'index_prefix' => 'v',
                            'index_type_command' => 'vtable',
                            'key' => 'item before ignored lines',
--- 899,902 ----
***************
*** 965,969 ****
                                'index_at_command' => 'vindex',
                                'index_name' => 'vr',
-                               'index_prefix' => 'v',
                                'index_type_command' => 'vindex',
                                'key' => 'vindex',
--- 972,975 ----
***************
*** 1024,1028 ****
                            'index_at_command' => 'itemx',
                            'index_name' => 'vr',
-                           'index_prefix' => 'v',
                            'index_type_command' => 'vtable',
                            'key' => 'itemx now',
--- 1030,1033 ----
***************
*** 1123,1131 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 31,
!             'macro' => ''
!           },
            'parent' => {}
          },
--- 1128,1132 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {}
          },
***************
*** 1144,1147 ****
--- 1145,1154 ----
                  {
                    'cmdname' => 'r',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 39,
+                     'macro' => ''
+                   },
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 1202,1206 ****
                            'index_at_command' => 'item',
                            'index_name' => 'vr',
-                           'index_prefix' => 'v',
                            'index_type_command' => 'vtable',
                            'key' => 'item',
--- 1209,1212 ----
***************
*** 1268,1272 ****
                            'index_at_command' => 'itemx',
                            'index_name' => 'vr',
-                           'index_prefix' => 'v',
                            'index_type_command' => 'vtable',
                            'key' => 'itemx after an empty line',
--- 1274,1277 ----
***************
*** 1373,1381 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 39,
!             'macro' => ''
!           },
            'parent' => {}
          },
--- 1378,1382 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {}
          },
***************
*** 1411,1414 ****
--- 1412,1421 ----
                  {
                    'cmdname' => 'emph',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 49,
+                     'macro' => ''
+                   },
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 1619,1627 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 49,
!             'macro' => ''
!           },
            'parent' => {}
          },
--- 1626,1630 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {}
          },
***************
*** 1807,1810 ****
--- 1810,1814 ----
  $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
  $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
+ $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'line_nr'} = $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'block_commands_in_table'}{'contents'}[2];
  $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'block_commands_in_table'}{'contents'}[2];
***************
*** 1871,1874 ****
--- 1875,1879 ----
  $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
  $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
+ $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'line_nr'} = $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'block_commands_in_table'}{'contents'}[2];
  $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4];
***************
*** 1922,1925 ****
--- 1927,1931 ----
  $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'extra'}{'end_command'} = $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[1];
  $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'extra'}{'spaces_after_command'} = $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0];
+ $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'line_nr'} = $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'parent'} = $result_trees{'block_commands_in_table'}{'contents'}[2];
  $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[5]{'parent'} = $result_trees{'block_commands_in_table'}{'contents'}[2];
***************
*** 1969,1972 ****
--- 1975,1979 ----
  $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[7]{'extra'}{'end_command'} = $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[7]{'contents'}[2];
  $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[7]{'extra'}{'spaces_after_command'} = $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0];
+ $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[7]{'line_nr'} = $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[7]{'parent'} = $result_trees{'block_commands_in_table'}{'contents'}[2];
  $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'parent'} = $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[8];
diff -Nrc2 texinfo-6.1/tp/t/results/xtable/comment_and_itemx_before_item.pl texinfo-6.3/tp/t/results/xtable/comment_and_itemx_before_item.pl
*** texinfo-6.1/tp/t/results/xtable/comment_and_itemx_before_item.pl	2016-01-22 07:49:54.000000000 +0000
--- texinfo-6.3/tp/t/results/xtable/comment_and_itemx_before_item.pl	2016-08-02 18:44:34.000000000 +0100
***************
*** 22,25 ****
--- 22,31 ----
              {
                'cmdname' => 'code',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 1,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 167,175 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 1,
!         'macro' => ''
!       },
        'parent' => {}
      }
--- 173,177 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      }
***************
*** 207,210 ****
--- 209,213 ----
  $result_trees{'comment_and_itemx_before_item'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'comment_and_itemx_before_item'}{'contents'}[0]{'contents'}[2];
  $result_trees{'comment_and_itemx_before_item'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'comment_and_itemx_before_item'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'comment_and_itemx_before_item'}{'contents'}[0]{'line_nr'} = $result_trees{'comment_and_itemx_before_item'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'comment_and_itemx_before_item'}{'contents'}[0]{'parent'} = $result_trees{'comment_and_itemx_before_item'};
  
diff -Nrc2 texinfo-6.1/tp/t/results/xtable/definfoenclose_on_table_line.pl texinfo-6.3/tp/t/results/xtable/definfoenclose_on_table_line.pl
*** texinfo-6.1/tp/t/results/xtable/definfoenclose_on_table_line.pl	2016-01-22 07:49:54.000000000 +0000
--- texinfo-6.3/tp/t/results/xtable/definfoenclose_on_table_line.pl	2016-08-02 18:44:33.000000000 +0100
***************
*** 71,77 ****
              {
                'cmdname' => 'phi',
                'extra' => {
                  'begin' => ':',
!                 'end' => ':'
                },
                'parent' => {},
--- 71,79 ----
              {
                'cmdname' => 'phi',
+               'contents' => [],
                'extra' => {
                  'begin' => ':',
!                 'end' => ':',
!                 'invalid_nesting' => 1
                },
                'parent' => {},
diff -Nrc2 texinfo-6.1/tp/t/results/xtable/empty_item_itemx.pl texinfo-6.3/tp/t/results/xtable/empty_item_itemx.pl
*** texinfo-6.1/tp/t/results/xtable/empty_item_itemx.pl	2016-01-22 07:49:54.000000000 +0000
--- texinfo-6.3/tp/t/results/xtable/empty_item_itemx.pl	2016-08-02 18:44:33.000000000 +0100
***************
*** 22,25 ****
--- 22,31 ----
              {
                'cmdname' => 'asis',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 1,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 109,113 ****
                        'index_at_command' => 'item',
                        'index_name' => 'vr',
-                       'index_prefix' => 'v',
                        'index_type_command' => 'vtable',
                        'key' => 'first item',
--- 115,118 ----
***************
*** 192,196 ****
                        'index_at_command' => 'itemx',
                        'index_name' => 'vr',
-                       'index_prefix' => 'v',
                        'index_type_command' => 'vtable',
                        'key' => 'after an empty itemx, before an empty item',
--- 197,200 ----
***************
*** 299,303 ****
                        'index_at_command' => 'item',
                        'index_name' => 'vr',
-                       'index_prefix' => 'v',
                        'index_type_command' => 'vtable',
                        'key' => 'in item before end table',
--- 303,306 ----
***************
*** 374,382 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 1,
!         'macro' => ''
!       },
        'parent' => {}
      }
--- 377,381 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      }
***************
*** 455,458 ****
--- 454,458 ----
  $result_trees{'empty_item_itemx'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[4];
  $result_trees{'empty_item_itemx'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'empty_item_itemx'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'empty_item_itemx'}{'contents'}[0]{'line_nr'} = $result_trees{'empty_item_itemx'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'empty_item_itemx'}{'contents'}[0]{'parent'} = $result_trees{'empty_item_itemx'};
  
diff -Nrc2 texinfo-6.1/tp/t/results/xtable/headitem_in_table.pl texinfo-6.3/tp/t/results/xtable/headitem_in_table.pl
*** texinfo-6.1/tp/t/results/xtable/headitem_in_table.pl	2016-01-22 07:49:54.000000000 +0000
--- texinfo-6.3/tp/t/results/xtable/headitem_in_table.pl	2016-08-02 18:44:34.000000000 +0100
***************
*** 22,25 ****
--- 22,31 ----
              {
                'cmdname' => 'strong',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 1,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 188,196 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 1,
!         'macro' => ''
!       },
        'parent' => {}
      }
--- 194,198 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      }
***************
*** 233,236 ****
--- 235,239 ----
  $result_trees{'headitem_in_table'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'headitem_in_table'}{'contents'}[0]{'contents'}[2];
  $result_trees{'headitem_in_table'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'headitem_in_table'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'headitem_in_table'}{'contents'}[0]{'line_nr'} = $result_trees{'headitem_in_table'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'headitem_in_table'}{'contents'}[0]{'parent'} = $result_trees{'headitem_in_table'};
  
diff -Nrc2 texinfo-6.1/tp/t/results/xtable/inter_item_commands_in_table.pl texinfo-6.3/tp/t/results/xtable/inter_item_commands_in_table.pl
*** texinfo-6.1/tp/t/results/xtable/inter_item_commands_in_table.pl	2016-01-22 07:49:54.000000000 +0000
--- texinfo-6.3/tp/t/results/xtable/inter_item_commands_in_table.pl	2016-08-02 18:44:33.000000000 +0100
***************
*** 22,25 ****
--- 22,31 ----
              {
                'cmdname' => 'code',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 1,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 104,108 ****
                        'index_at_command' => 'item',
                        'index_name' => 'vr',
-                       'index_prefix' => 'v',
                        'index_type_command' => 'vtable',
                        'key' => 'a',
--- 110,113 ----
***************
*** 196,204 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 1,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 201,205 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 223,226 ****
--- 224,233 ----
              {
                'cmdname' => 'asis',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 7,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 281,285 ****
                        'index_at_command' => 'item',
                        'index_name' => 'vr',
-                       'index_prefix' => 'v',
                        'index_type_command' => 'vtable',
                        'key' => 'a',
--- 288,291 ----
***************
*** 358,362 ****
                        'index_at_command' => 'itemx',
                        'index_name' => 'vr',
-                       'index_prefix' => 'v',
                        'index_type_command' => 'vtable',
                        'key' => 'b',
--- 364,367 ----
***************
*** 450,458 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 7,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 455,459 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 477,480 ****
--- 478,487 ----
              {
                'cmdname' => 'var',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 14,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 535,539 ****
                        'index_at_command' => 'item',
                        'index_name' => 'fn',
-                       'index_prefix' => 'f',
                        'index_type_command' => 'ftable',
                        'key' => 'a',
--- 542,545 ----
***************
*** 590,594 ****
                            'index_at_command' => 'cindex',
                            'index_name' => 'cp',
-                           'index_prefix' => 'c',
                            'index_type_command' => 'cindex',
                            'key' => 'index entry between item and itemx',
--- 596,599 ----
***************
*** 684,688 ****
                        'index_at_command' => 'itemx',
                        'index_name' => 'fn',
-                       'index_prefix' => 'f',
                        'index_type_command' => 'ftable',
                        'key' => 'b',
--- 689,692 ----
***************
*** 766,770 ****
                        'index_at_command' => 'item',
                        'index_name' => 'fn',
-                       'index_prefix' => 'f',
                        'index_type_command' => 'ftable',
                        'key' => 'c',
--- 770,773 ----
***************
*** 855,859 ****
                        'index_at_command' => 'itemx',
                        'index_name' => 'fn',
-                       'index_prefix' => 'f',
                        'index_type_command' => 'ftable',
                        'key' => 'd',
--- 858,861 ----
***************
*** 960,968 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 14,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 962,966 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 987,990 ****
--- 985,994 ----
              {
                'cmdname' => 'code',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 30,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 1043,1047 ****
                    'index_at_command' => 'cindex',
                    'index_name' => 'cp',
-                   'index_prefix' => 'c',
                    'index_type_command' => 'cindex',
                    'key' => 'cindex in table',
--- 1047,1050 ----
***************
*** 1203,1211 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 30,
!         'macro' => ''
!       },
        'parent' => {}
      },
--- 1206,1210 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      },
***************
*** 1230,1233 ****
--- 1229,1238 ----
              {
                'cmdname' => 'code',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 37,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 1286,1290 ****
                    'index_at_command' => 'cindex',
                    'index_name' => 'cp',
-                   'index_prefix' => 'c',
                    'index_type_command' => 'cindex',
                    'key' => 'cindex in table',
--- 1291,1294 ----
***************
*** 1422,1430 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 37,
!         'macro' => ''
!       },
        'parent' => {}
      }
--- 1426,1430 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      }
***************
*** 1468,1471 ****
--- 1468,1472 ----
  $result_trees{'inter_item_commands_in_table'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'inter_item_commands_in_table'}{'contents'}[0]{'contents'}[2];
  $result_trees{'inter_item_commands_in_table'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'inter_item_commands_in_table'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'inter_item_commands_in_table'}{'contents'}[0]{'line_nr'} = $result_trees{'inter_item_commands_in_table'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'inter_item_commands_in_table'}{'contents'}[0]{'parent'} = $result_trees{'inter_item_commands_in_table'};
  $result_trees{'inter_item_commands_in_table'}{'contents'}[1]{'parent'} = $result_trees{'inter_item_commands_in_table'};
***************
*** 1517,1520 ****
--- 1518,1522 ----
  $result_trees{'inter_item_commands_in_table'}{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'inter_item_commands_in_table'}{'contents'}[2]{'contents'}[1];
  $result_trees{'inter_item_commands_in_table'}{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'inter_item_commands_in_table'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+ $result_trees{'inter_item_commands_in_table'}{'contents'}[2]{'line_nr'} = $result_trees{'inter_item_commands_in_table'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'inter_item_commands_in_table'}{'contents'}[2]{'parent'} = $result_trees{'inter_item_commands_in_table'};
  $result_trees{'inter_item_commands_in_table'}{'contents'}[3]{'parent'} = $result_trees{'inter_item_commands_in_table'};
***************
*** 1612,1615 ****
--- 1614,1618 ----
  $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'extra'}{'end_command'} = $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[2];
  $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'extra'}{'spaces_after_command'} = $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'args'}[0]{'contents'}[0];
+ $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'line_nr'} = $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'parent'} = $result_trees{'inter_item_commands_in_table'};
  $result_trees{'inter_item_commands_in_table'}{'contents'}[5]{'parent'} = $result_trees{'inter_item_commands_in_table'};
***************
*** 1658,1661 ****
--- 1661,1665 ----
  $result_trees{'inter_item_commands_in_table'}{'contents'}[6]{'extra'}{'end_command'} = $result_trees{'inter_item_commands_in_table'}{'contents'}[6]{'contents'}[2];
  $result_trees{'inter_item_commands_in_table'}{'contents'}[6]{'extra'}{'spaces_after_command'} = $result_trees{'inter_item_commands_in_table'}{'contents'}[6]{'args'}[0]{'contents'}[0];
+ $result_trees{'inter_item_commands_in_table'}{'contents'}[6]{'line_nr'} = $result_trees{'inter_item_commands_in_table'}{'contents'}[6]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'inter_item_commands_in_table'}{'contents'}[6]{'parent'} = $result_trees{'inter_item_commands_in_table'};
  $result_trees{'inter_item_commands_in_table'}{'contents'}[7]{'parent'} = $result_trees{'inter_item_commands_in_table'};
***************
*** 1701,1704 ****
--- 1705,1709 ----
  $result_trees{'inter_item_commands_in_table'}{'contents'}[8]{'extra'}{'end_command'} = $result_trees{'inter_item_commands_in_table'}{'contents'}[8]{'contents'}[2];
  $result_trees{'inter_item_commands_in_table'}{'contents'}[8]{'extra'}{'spaces_after_command'} = $result_trees{'inter_item_commands_in_table'}{'contents'}[8]{'args'}[0]{'contents'}[0];
+ $result_trees{'inter_item_commands_in_table'}{'contents'}[8]{'line_nr'} = $result_trees{'inter_item_commands_in_table'}{'contents'}[8]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'inter_item_commands_in_table'}{'contents'}[8]{'parent'} = $result_trees{'inter_item_commands_in_table'};
  
diff -Nrc2 texinfo-6.1/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl texinfo-6.3/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
*** texinfo-6.1/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl	2016-01-22 07:49:54.000000000 +0000
--- texinfo-6.3/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl	2016-08-02 18:44:33.000000000 +0100
***************
*** 34,37 ****
--- 34,43 ----
                  {
                    'cmdname' => 'var',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 2,
+                     'macro' => ''
+                   },
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 137,141 ****
                                    'index_at_command' => 'cindex',
                                    'index_name' => 'cp',
-                                   'index_prefix' => 'c',
                                    'index_type_command' => 'cindex',
                                    'key' => 'index entry between item and itemx',
--- 143,146 ----
***************
*** 427,435 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 2,
!             'macro' => ''
!           },
            'parent' => {}
          },
--- 432,436 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {}
          },
***************
*** 568,571 ****
--- 569,573 ----
  $result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
  $result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
+ $result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0];
  $result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[2];
diff -Nrc2 texinfo-6.1/tp/t/results/xtable/invalid_command_and_brace_in_table.pl texinfo-6.3/tp/t/results/xtable/invalid_command_and_brace_in_table.pl
*** texinfo-6.1/tp/t/results/xtable/invalid_command_and_brace_in_table.pl	2016-01-22 07:49:54.000000000 +0000
--- texinfo-6.3/tp/t/results/xtable/invalid_command_and_brace_in_table.pl	2016-08-02 18:44:34.000000000 +0100
***************
*** 22,25 ****
--- 22,31 ----
              {
                'cmdname' => 'asis',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 1,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 121,129 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 1,
!         'macro' => ''
!       },
        'parent' => {}
      }
--- 127,131 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      }
***************
*** 154,157 ****
--- 156,160 ----
  $result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[1];
  $result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'line_nr'} = $result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'parent'} = $result_trees{'invalid_command_and_brace_in_table'};
  
diff -Nrc2 texinfo-6.1/tp/t/results/xtable/itemx_before_item.pl texinfo-6.3/tp/t/results/xtable/itemx_before_item.pl
*** texinfo-6.1/tp/t/results/xtable/itemx_before_item.pl	2016-01-22 07:49:54.000000000 +0000
--- texinfo-6.3/tp/t/results/xtable/itemx_before_item.pl	2016-08-02 18:44:34.000000000 +0100
***************
*** 22,25 ****
--- 22,31 ----
              {
                'cmdname' => 'emph',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 1,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 143,151 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 1,
!         'macro' => ''
!       },
        'parent' => {}
      }
--- 149,153 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      }
***************
*** 180,183 ****
--- 182,186 ----
  $result_trees{'itemx_before_item'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'itemx_before_item'}{'contents'}[0]{'contents'}[1];
  $result_trees{'itemx_before_item'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'itemx_before_item'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'itemx_before_item'}{'contents'}[0]{'line_nr'} = $result_trees{'itemx_before_item'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'itemx_before_item'}{'contents'}[0]{'parent'} = $result_trees{'itemx_before_item'};
  
diff -Nrc2 texinfo-6.1/tp/t/results/xtable/long_item.pl texinfo-6.3/tp/t/results/xtable/long_item.pl
*** texinfo-6.1/tp/t/results/xtable/long_item.pl	2016-01-22 07:49:54.000000000 +0000
--- texinfo-6.3/tp/t/results/xtable/long_item.pl	2016-08-02 18:44:33.000000000 +0100
***************
*** 22,25 ****
--- 22,31 ----
              {
                'cmdname' => 'emph',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 1,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 207,215 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 1,
!         'macro' => ''
!       },
        'parent' => {}
      }
--- 213,217 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      }
***************
*** 256,259 ****
--- 258,262 ----
  $result_trees{'long_item'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'long_item'}{'contents'}[0]{'contents'}[1];
  $result_trees{'long_item'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'long_item'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'long_item'}{'contents'}[0]{'line_nr'} = $result_trees{'long_item'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'long_item'}{'contents'}[0]{'parent'} = $result_trees{'long_item'};
  
diff -Nrc2 texinfo-6.1/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl texinfo-6.3/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl
*** texinfo-6.1/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl	2016-01-22 07:49:54.000000000 +0000
--- texinfo-6.3/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl	2016-08-02 18:44:34.000000000 +0100
***************
*** 22,25 ****
--- 22,31 ----
              {
                'cmdname' => 'bullet',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 1,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 138,141 ****
--- 144,148 ----
              {
                'cmdname' => 'asis',
+               'contents' => [],
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 147,155 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 1,
!         'macro' => ''
!       },
        'parent' => {}
      }
--- 154,158 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      }
***************
*** 184,187 ****
--- 187,191 ----
  $result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[1];
  $result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'line_nr'} = $result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'parent'} = $result_trees{'no_arg_brace_command_on_table_line'};
  
diff -Nrc2 texinfo-6.1/tp/t/results/xtable/no_argument_for_table.pl texinfo-6.3/tp/t/results/xtable/no_argument_for_table.pl
*** texinfo-6.1/tp/t/results/xtable/no_argument_for_table.pl	2016-01-22 07:49:54.000000000 +0000
--- texinfo-6.3/tp/t/results/xtable/no_argument_for_table.pl	2016-08-02 18:44:34.000000000 +0100
***************
*** 137,140 ****
--- 137,141 ----
              {
                'cmdname' => 'asis',
+               'contents' => [],
                'parent' => {},
                'type' => 'command_as_argument'
diff -Nrc2 texinfo-6.1/tp/t/results/xtable/table_nested.pl texinfo-6.3/tp/t/results/xtable/table_nested.pl
*** texinfo-6.1/tp/t/results/xtable/table_nested.pl	2016-01-22 07:49:54.000000000 +0000
--- texinfo-6.3/tp/t/results/xtable/table_nested.pl	2016-08-02 18:44:34.000000000 +0100
***************
*** 152,187 ****
        'extra' => {
          'arg_line' => ' myvtable
! ',
!         'macrobody' => '@vtable @asis
! @item first item
! @itemx second itemx
! 
! Text.
! 
! @item second item
! 
! Text 2
! 
! @item last
! @end vtable
! 
! Something.
! @table @emph
! @item in item
! Text without blank line
! @item second item
! Text without blank line 2
! @end table
! After table.
! ',
!         'spaces_after_command' => {
!           'extra' => {
!             'command' => {}
!           },
!           'parent' => {},
!           'text' => '
! ',
!           'type' => 'empty_line_after_command'
!         }
        },
        'line_nr' => {
--- 152,156 ----
        'extra' => {
          'arg_line' => ' myvtable
! '
        },
        'line_nr' => {
***************
*** 192,196 ****
        'parent' => {}
      },
!     {},
      {
        'parent' => {},
--- 161,173 ----
        'parent' => {}
      },
!     {
!       'extra' => {
!         'command' => {}
!       },
!       'parent' => {},
!       'text' => '
! ',
!       'type' => 'empty_line_after_command'
!     },
      {
        'parent' => {},
***************
*** 236,239 ****
--- 213,222 ----
                  {
                    'cmdname' => 'asis',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 27,
+                     'macro' => 'myvtable'
+                   },
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 294,298 ****
                            'index_at_command' => 'item',
                            'index_name' => 'vr',
-                           'index_prefix' => 'v',
                            'index_type_command' => 'vtable',
                            'key' => 'first item',
--- 277,280 ----
***************
*** 347,351 ****
                            'index_at_command' => 'itemx',
                            'index_name' => 'vr',
-                           'index_prefix' => 'v',
                            'index_type_command' => 'vtable',
                            'key' => 'second itemx',
--- 329,332 ----
***************
*** 441,445 ****
                            'index_at_command' => 'item',
                            'index_name' => 'vr',
-                           'index_prefix' => 'v',
                            'index_type_command' => 'vtable',
                            'key' => 'second item',
--- 422,425 ----
***************
*** 535,539 ****
                            'index_at_command' => 'item',
                            'index_name' => 'vr',
-                           'index_prefix' => 'v',
                            'index_type_command' => 'vtable',
                            'key' => 'last',
--- 515,518 ----
***************
*** 610,618 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 27,
!             'macro' => 'myvtable'
!           },
            'parent' => {}
          },
--- 589,593 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {}
          },
***************
*** 648,651 ****
--- 623,632 ----
                  {
                    'cmdname' => 'emph',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 27,
+                     'macro' => 'myvtable'
+                   },
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 856,864 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 27,
!             'macro' => 'myvtable'
!           },
            'parent' => {}
          },
--- 837,841 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {}
          },
***************
*** 970,973 ****
--- 947,956 ----
                  {
                    'cmdname' => 'asis',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 32,
+                     'macro' => 'myvtable'
+                   },
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 1028,1032 ****
                            'index_at_command' => 'item',
                            'index_name' => 'vr',
-                           'index_prefix' => 'v',
                            'index_type_command' => 'vtable',
                            'key' => 'first item',
--- 1011,1014 ----
***************
*** 1081,1085 ****
                            'index_at_command' => 'itemx',
                            'index_name' => 'vr',
-                           'index_prefix' => 'v',
                            'index_type_command' => 'vtable',
                            'key' => 'second itemx',
--- 1063,1066 ----
***************
*** 1175,1179 ****
                            'index_at_command' => 'item',
                            'index_name' => 'vr',
-                           'index_prefix' => 'v',
                            'index_type_command' => 'vtable',
                            'key' => 'second item',
--- 1156,1159 ----
***************
*** 1269,1273 ****
                            'index_at_command' => 'item',
                            'index_name' => 'vr',
-                           'index_prefix' => 'v',
                            'index_type_command' => 'vtable',
                            'key' => 'last',
--- 1249,1252 ----
***************
*** 1344,1352 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 32,
!             'macro' => 'myvtable'
!           },
            'parent' => {}
          },
--- 1323,1327 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {}
          },
***************
*** 1382,1385 ****
--- 1357,1366 ----
                  {
                    'cmdname' => 'emph',
+                   'contents' => [],
+                   'line_nr' => {
+                     'file_name' => '',
+                     'line_nr' => 32,
+                     'macro' => 'myvtable'
+                   },
                    'parent' => {},
                    'type' => 'command_as_argument'
***************
*** 1590,1598 ****
              'spaces_after_command' => {}
            },
!           'line_nr' => {
!             'file_name' => '',
!             'line_nr' => 32,
!             'macro' => 'myvtable'
!           },
            'parent' => {}
          },
--- 1571,1575 ----
              'spaces_after_command' => {}
            },
!           'line_nr' => {},
            'parent' => {}
          },
***************
*** 1716,1719 ****
--- 1693,1702 ----
                      {
                        'cmdname' => 'asis',
+                       'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 38,
+                         'macro' => 'myvtable'
+                       },
                        'parent' => {},
                        'type' => 'command_as_argument'
***************
*** 1774,1778 ****
                                'index_at_command' => 'item',
                                'index_name' => 'vr',
-                               'index_prefix' => 'v',
                                'index_type_command' => 'vtable',
                                'key' => 'first item',
--- 1757,1760 ----
***************
*** 1827,1831 ****
                                'index_at_command' => 'itemx',
                                'index_name' => 'vr',
-                               'index_prefix' => 'v',
                                'index_type_command' => 'vtable',
                                'key' => 'second itemx',
--- 1809,1812 ----
***************
*** 1921,1925 ****
                                'index_at_command' => 'item',
                                'index_name' => 'vr',
-                               'index_prefix' => 'v',
                                'index_type_command' => 'vtable',
                                'key' => 'second item',
--- 1902,1905 ----
***************
*** 2015,2019 ****
                                'index_at_command' => 'item',
                                'index_name' => 'vr',
-                               'index_prefix' => 'v',
                                'index_type_command' => 'vtable',
                                'key' => 'last',
--- 1995,1998 ----
***************
*** 2090,2098 ****
                  'spaces_after_command' => {}
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 38,
!                 'macro' => 'myvtable'
!               },
                'parent' => {}
              },
--- 2069,2073 ----
                  'spaces_after_command' => {}
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 2128,2131 ****
--- 2103,2112 ----
                      {
                        'cmdname' => 'emph',
+                       'contents' => [],
+                       'line_nr' => {
+                         'file_name' => '',
+                         'line_nr' => 38,
+                         'macro' => 'myvtable'
+                       },
                        'parent' => {},
                        'type' => 'command_as_argument'
***************
*** 2336,2344 ****
                  'spaces_after_command' => {}
                },
!               'line_nr' => {
!                 'file_name' => '',
!                 'line_nr' => 38,
!                 'macro' => 'myvtable'
!               },
                'parent' => {}
              },
--- 2317,2321 ----
                  'spaces_after_command' => {}
                },
!               'line_nr' => {},
                'parent' => {}
              },
***************
*** 2486,2493 ****
  $result_trees{'table_nested'}{'contents'}[0]{'contents'}[20]{'parent'} = $result_trees{'table_nested'}{'contents'}[0];
  $result_trees{'table_nested'}{'contents'}[0]{'contents'}[21]{'parent'} = $result_trees{'table_nested'}{'contents'}[0];
- $result_trees{'table_nested'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'} = $result_trees{'table_nested'}{'contents'}[0];
- $result_trees{'table_nested'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'} = $result_trees{'table_nested'};
  $result_trees{'table_nested'}{'contents'}[0]{'parent'} = $result_trees{'table_nested'};
! $result_trees{'table_nested'}{'contents'}[1] = $result_trees{'table_nested'}{'contents'}[0]{'extra'}{'spaces_after_command'};
  $result_trees{'table_nested'}{'contents'}[2]{'parent'} = $result_trees{'table_nested'};
  $result_trees{'table_nested'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'table_nested'}{'contents'}[3];
--- 2463,2469 ----
  $result_trees{'table_nested'}{'contents'}[0]{'contents'}[20]{'parent'} = $result_trees{'table_nested'}{'contents'}[0];
  $result_trees{'table_nested'}{'contents'}[0]{'contents'}[21]{'parent'} = $result_trees{'table_nested'}{'contents'}[0];
  $result_trees{'table_nested'}{'contents'}[0]{'parent'} = $result_trees{'table_nested'};
! $result_trees{'table_nested'}{'contents'}[1]{'extra'}{'command'} = $result_trees{'table_nested'}{'contents'}[0];
! $result_trees{'table_nested'}{'contents'}[1]{'parent'} = $result_trees{'table_nested'};
  $result_trees{'table_nested'}{'contents'}[2]{'parent'} = $result_trees{'table_nested'};
  $result_trees{'table_nested'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'table_nested'}{'contents'}[3];
***************
*** 2572,2575 ****
--- 2548,2552 ----
  $result_trees{'table_nested'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'table_nested'}{'contents'}[4]{'contents'}[1]{'contents'}[3];
  $result_trees{'table_nested'}{'contents'}[4]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'table_nested'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
+ $result_trees{'table_nested'}{'contents'}[4]{'contents'}[1]{'line_nr'} = $result_trees{'table_nested'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'table_nested'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'table_nested'}{'contents'}[4];
  $result_trees{'table_nested'}{'contents'}[4]{'contents'}[2]{'parent'} = $result_trees{'table_nested'}{'contents'}[4];
***************
*** 2619,2622 ****
--- 2596,2600 ----
  $result_trees{'table_nested'}{'contents'}[4]{'contents'}[4]{'extra'}{'end_command'} = $result_trees{'table_nested'}{'contents'}[4]{'contents'}[4]{'contents'}[2];
  $result_trees{'table_nested'}{'contents'}[4]{'contents'}[4]{'extra'}{'spaces_after_command'} = $result_trees{'table_nested'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0];
+ $result_trees{'table_nested'}{'contents'}[4]{'contents'}[4]{'line_nr'} = $result_trees{'table_nested'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'table_nested'}{'contents'}[4]{'contents'}[4]{'parent'} = $result_trees{'table_nested'}{'contents'}[4];
  $result_trees{'table_nested'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'table_nested'}{'contents'}[4]{'contents'}[5];
***************
*** 2715,2718 ****
--- 2693,2697 ----
  $result_trees{'table_nested'}{'contents'}[7]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'table_nested'}{'contents'}[7]{'contents'}[1]{'contents'}[3];
  $result_trees{'table_nested'}{'contents'}[7]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'table_nested'}{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0];
+ $result_trees{'table_nested'}{'contents'}[7]{'contents'}[1]{'line_nr'} = $result_trees{'table_nested'}{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'table_nested'}{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'table_nested'}{'contents'}[7];
  $result_trees{'table_nested'}{'contents'}[7]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'table_nested'}{'contents'}[7]{'contents'}[2];
***************
*** 2762,2765 ****
--- 2741,2745 ----
  $result_trees{'table_nested'}{'contents'}[7]{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'table_nested'}{'contents'}[7]{'contents'}[3]{'contents'}[2];
  $result_trees{'table_nested'}{'contents'}[7]{'contents'}[3]{'extra'}{'spaces_after_command'} = $result_trees{'table_nested'}{'contents'}[7]{'contents'}[3]{'args'}[0]{'contents'}[0];
+ $result_trees{'table_nested'}{'contents'}[7]{'contents'}[3]{'line_nr'} = $result_trees{'table_nested'}{'contents'}[7]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'table_nested'}{'contents'}[7]{'contents'}[3]{'parent'} = $result_trees{'table_nested'}{'contents'}[7];
  $result_trees{'table_nested'}{'contents'}[7]{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'table_nested'}{'contents'}[7]{'contents'}[4];
***************
*** 2860,2863 ****
--- 2840,2844 ----
  $result_trees{'table_nested'}{'contents'}[10]{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'table_nested'}{'contents'}[10]{'contents'}[1]{'contents'}[1]{'contents'}[3];
  $result_trees{'table_nested'}{'contents'}[10]{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'table_nested'}{'contents'}[10]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
+ $result_trees{'table_nested'}{'contents'}[10]{'contents'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'table_nested'}{'contents'}[10]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'table_nested'}{'contents'}[10]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'table_nested'}{'contents'}[10]{'contents'}[1];
  $result_trees{'table_nested'}{'contents'}[10]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'table_nested'}{'contents'}[10]{'contents'}[1];
***************
*** 2907,2910 ****
--- 2888,2892 ----
  $result_trees{'table_nested'}{'contents'}[10]{'contents'}[1]{'contents'}[4]{'extra'}{'end_command'} = $result_trees{'table_nested'}{'contents'}[10]{'contents'}[1]{'contents'}[4]{'contents'}[2];
  $result_trees{'table_nested'}{'contents'}[10]{'contents'}[1]{'contents'}[4]{'extra'}{'spaces_after_command'} = $result_trees{'table_nested'}{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
+ $result_trees{'table_nested'}{'contents'}[10]{'contents'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'table_nested'}{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'table_nested'}{'contents'}[10]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'table_nested'}{'contents'}[10]{'contents'}[1];
  $result_trees{'table_nested'}{'contents'}[10]{'contents'}[1]{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'table_nested'}{'contents'}[10]{'contents'}[1]{'contents'}[5];
diff -Nrc2 texinfo-6.1/tp/t/results/xtable/text_between_item_itemx.pl texinfo-6.3/tp/t/results/xtable/text_between_item_itemx.pl
*** texinfo-6.1/tp/t/results/xtable/text_between_item_itemx.pl	2016-01-22 07:49:54.000000000 +0000
--- texinfo-6.3/tp/t/results/xtable/text_between_item_itemx.pl	2016-08-02 18:44:34.000000000 +0100
***************
*** 22,25 ****
--- 22,31 ----
              {
                'cmdname' => 'strong',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 1,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 201,209 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 1,
!         'macro' => ''
!       },
        'parent' => {}
      }
--- 207,211 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      }
***************
*** 249,252 ****
--- 251,255 ----
  $result_trees{'text_between_item_itemx'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'text_between_item_itemx'}{'contents'}[0]{'contents'}[1];
  $result_trees{'text_between_item_itemx'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'text_between_item_itemx'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'text_between_item_itemx'}{'contents'}[0]{'line_nr'} = $result_trees{'text_between_item_itemx'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'text_between_item_itemx'}{'contents'}[0]{'parent'} = $result_trees{'text_between_item_itemx'};
  
diff -Nrc2 texinfo-6.1/tp/t/results/xtable/title_and_itemx_before_item.pl texinfo-6.3/tp/t/results/xtable/title_and_itemx_before_item.pl
*** texinfo-6.1/tp/t/results/xtable/title_and_itemx_before_item.pl	2016-01-22 07:49:54.000000000 +0000
--- texinfo-6.3/tp/t/results/xtable/title_and_itemx_before_item.pl	2016-08-02 18:44:34.000000000 +0100
***************
*** 22,25 ****
--- 22,31 ----
              {
                'cmdname' => 'emph',
+               'contents' => [],
+               'line_nr' => {
+                 'file_name' => '',
+                 'line_nr' => 1,
+                 'macro' => ''
+               },
                'parent' => {},
                'type' => 'command_as_argument'
***************
*** 160,168 ****
          'spaces_after_command' => {}
        },
!       'line_nr' => {
!         'file_name' => '',
!         'line_nr' => 1,
!         'macro' => ''
!       },
        'parent' => {}
      }
--- 166,170 ----
          'spaces_after_command' => {}
        },
!       'line_nr' => {},
        'parent' => {}
      }
***************
*** 200,203 ****
--- 202,206 ----
  $result_trees{'title_and_itemx_before_item'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'title_and_itemx_before_item'}{'contents'}[0]{'contents'}[2];
  $result_trees{'title_and_itemx_before_item'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'title_and_itemx_before_item'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+ $result_trees{'title_and_itemx_before_item'}{'contents'}[0]{'line_nr'} = $result_trees{'title_and_itemx_before_item'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
  $result_trees{'title_and_itemx_before_item'}{'contents'}[0]{'parent'} = $result_trees{'title_and_itemx_before_item'};
  
diff -Nrc2 texinfo-6.1/tp/t/test_brace_count.t texinfo-6.3/tp/t/test_brace_count.t
*** texinfo-6.1/tp/t/test_brace_count.t	2014-04-22 02:56:40.000000000 +0100
--- texinfo-6.3/tp/t/test_brace_count.t	2016-07-31 16:33:14.000000000 +0100
***************
*** 16,24 ****
  use lib 'maintain/lib/Text-Unidecode/lib/';
  use Texinfo::Parser qw(parse_texi_text);
  
  ok(1, "modules loading");
  
  my ($before, $after, $braces_count) 
!   = Texinfo::Parser::_find_end_brace(" aa (bbb ()ccc)(g))j (gg", 1);
  is ($before, " aa (bbb ()ccc)(g))", "before with brace closed");
  is ($after, "j (gg", "after with brace closed");
--- 16,25 ----
  use lib 'maintain/lib/Text-Unidecode/lib/';
  use Texinfo::Parser qw(parse_texi_text);
+ use Texinfo::Common;
  
  ok(1, "modules loading");
  
  my ($before, $after, $braces_count) 
!   = Texinfo::Common::_find_end_brace(" aa (bbb ()ccc)(g))j (gg", 1);
  is ($before, " aa (bbb ()ccc)(g))", "before with brace closed");
  is ($after, "j (gg", "after with brace closed");
***************
*** 26,40 ****
  my $string_no_close = " kjsdf ( k)lj(";
  ($before, $after, $braces_count) 
!   = Texinfo::Parser::_find_end_brace($string_no_close, 2);
  ok (($braces_count == 3 and $before eq $string_no_close and !defined($after)),
      "more braces opened");
  my $string_no_brace = " other ";
  ($before, $after, $braces_count)
!   = Texinfo::Parser::_find_end_brace($string_no_brace, 1);
  ok (($braces_count == 1 and $before eq $string_no_brace and !defined($after)),
    "no brace in text");
  my $string_open_brace_and_text = " (other ";
  ($before, $after, $braces_count)
!   = Texinfo::Parser::_find_end_brace($string_open_brace_and_text, 1);
  ok (($braces_count == 2 and $before eq $string_open_brace_and_text 
       and !defined($after)), "more braces opened and text");
--- 27,41 ----
  my $string_no_close = " kjsdf ( k)lj(";
  ($before, $after, $braces_count) 
!   = Texinfo::Common::_find_end_brace($string_no_close, 2);
  ok (($braces_count == 3 and $before eq $string_no_close and !defined($after)),
      "more braces opened");
  my $string_no_brace = " other ";
  ($before, $after, $braces_count)
!   = Texinfo::Common::_find_end_brace($string_no_brace, 1);
  ok (($braces_count == 1 and $before eq $string_no_brace and !defined($after)),
    "no brace in text");
  my $string_open_brace_and_text = " (other ";
  ($before, $after, $braces_count)
!   = Texinfo::Common::_find_end_brace($string_open_brace_and_text, 1);
  ok (($braces_count == 2 and $before eq $string_open_brace_and_text 
       and !defined($after)), "more braces opened and text");
***************
*** 51,55 ****
  
    my $braces_count 
!     = Texinfo::Parser::_count_opened_tree_braces($tree, $initial_brace_count);
    if (!defined($ref_braces_count)) {
      print STDERR " --> $name ($in): $braces_count\n";
--- 52,56 ----
  
    my $braces_count 
!     = Texinfo::Common::_count_opened_tree_braces($tree, $initial_brace_count);
    if (!defined($ref_braces_count)) {
      print STDERR " --> $name ($in): $braces_count\n";
diff -Nrc2 texinfo-6.1/tp/t/test_utils.pl texinfo-6.3/tp/t/test_utils.pl
*** texinfo-6.1/tp/t/test_utils.pl	2015-12-15 15:20:55.000000000 +0000
--- texinfo-6.3/tp/t/test_utils.pl	2016-07-31 16:35:11.000000000 +0100
***************
*** 1,3 ****
! # $Id: test_utils.pl 6791 2015-11-21 14:57:34Z gavin $
  # t/* test support for the Perl modules.
  #
--- 1,3 ----
! # $Id: test_utils.pl 7235 2016-06-25 20:20:46Z gavin $
  # t/* test support for the Perl modules.
  #
***************
*** 375,379 ****
    my $trimmed = remove_keys($compared, $deleted_keys);
  no warnings 'recursion';
!   cmp_deeply($trimmed, $reference, $test_name);
  }
  
--- 375,379 ----
    my $trimmed = remove_keys($compared, $deleted_keys);
  no warnings 'recursion';
!   Test::Deep::cmp_deeply($trimmed, $reference, $test_name);
  }
  
***************
*** 405,409 ****
  my %avoided_keys_tree;
  our @avoided_keys_tree = (@sections_keys, @menus_keys, @node_keys, 
!    'menu_child', 'element_next', 'directions', 'page_next');
  foreach my $avoided_key(@avoided_keys_tree) {
    $avoided_keys_tree{$avoided_key} = 1;
--- 405,409 ----
  my %avoided_keys_tree;
  our @avoided_keys_tree = (@sections_keys, @menus_keys, @node_keys, 
!    'menu_child', 'element_next', 'directions', 'page_next', 'remaining_args');
  foreach my $avoided_key(@avoided_keys_tree) {
    $avoided_keys_tree{$avoided_key} = 1;
***************
*** 463,468 ****
    my $format = shift;
    $converter_options = {} if (!defined($converter_options));
!   if (!defined($parser_options->{'expanded_formats'})
!       and !defined($converter_options->{'expanded_formats'})) {
      $converter_options->{'expanded_formats'} = [$format];
    }
--- 463,467 ----
    my $format = shift;
    $converter_options = {} if (!defined($converter_options));
!   if (!defined($converter_options->{'expanded_formats'})) {
      $converter_options->{'expanded_formats'} = [$format];
    }
***************
*** 686,689 ****
--- 685,697 ----
    $converter_options = shift @$test_case if (@$test_case);
  
+   if (!defined $parser_options->{'expanded_formats'}) {
+     $parser_options->{'expanded_formats'} = [
+       'docbook', 'html', 'xml', 'info', 'plaintext'];
+     #  'tex' is missed out here so that @ifnottex is expanded
+     # in the tests.  Put
+     #   {'expanded_formats' => ['tex']}
+     # where you need @tex expanded in the t/*.t files.
+   }
+ 
    my $test_file;
    if ($parser_options->{'test_file'}) {
***************
*** 810,815 ****
            mkdir ($base) 
              if (! -d $base);
!           mkdir ($base."$test_out_dir/") 
!             if (! -d $base."$test_out_dir/");
            $format_converter_options->{'SUBDIR'} 
               = $base."$test_out_dir/";
--- 818,827 ----
            mkdir ($base) 
              if (! -d $base);
!           if (! -d $base."$test_out_dir/") {
!             mkdir ($base."$test_out_dir/"); 
!           } else {
!             # remove any files from previous runs
!             unlink glob ($base."$test_out_dir/*"); 
!           }
            $format_converter_options->{'SUBDIR'} 
               = $base."$test_out_dir/";
diff -Nrc2 texinfo-6.1/tp/t/xml_tests.t texinfo-6.3/tp/t/xml_tests.t
*** texinfo-6.1/tp/t/xml_tests.t	2014-04-22 02:56:40.000000000 +0100
--- texinfo-6.3/tp/t/xml_tests.t	2016-07-31 16:35:11.000000000 +0100
***************
*** 190,194 ****
  <in />
  @end xml
! '],
  ['raw_and_comments',
  '@tex  @c comment
--- 190,196 ----
  <in />
  @end xml
! ',
! {'expanded_formats' => ['tex', 'xml']}
! ],
  ['raw_and_comments',
  '@tex  @c comment
***************
*** 200,204 ****
  <in />
  @end xml  @comment end xml comment
! '],
  ['node_no_section',
  '@node Top
--- 202,208 ----
  <in />
  @end xml  @comment end xml comment
! ',
! {'expanded_formats' => ['tex', 'xml']}
! ],
  ['node_no_section',
  '@node Top
***************
*** 281,285 ****
  @end deffn
  
! '],
  ['spaces_info_lost',
  '@example  text on example line 
--- 285,291 ----
  @end deffn
  
! ',
! {'expanded_formats' => ['tex'] }
! ],
  ['spaces_info_lost',
  '@example  text on example line 
diff -Nrc2 texinfo-6.1/tp/tests/Makefile.am texinfo-6.3/tp/tests/Makefile.am
*** texinfo-6.1/tp/tests/Makefile.am	2015-11-01 19:23:08.000000000 +0000
--- texinfo-6.3/tp/tests/Makefile.am	2016-07-31 16:20:07.000000000 +0100
***************
*** 1,5 ****
! # $Id: Makefile.am 6745 2015-11-01 19:18:52Z gavin $
  # Makefile.am for texinfo/tp/tests.
! # Copyright 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
  #
  # This file is free software; as a special exception the author gives
--- 1,5 ----
! # $Id: Makefile.am 7036 2016-02-27 17:17:09Z gavin $
  # Makefile.am for texinfo/tp/tests.
! # Copyright 2012, 2013, 2014, 2015, 2016 Free Software Foundation, Inc.
  #
  # This file is free software; as a special exception the author gives
***************
*** 23,38 ****
  	  -tex_html '$(tex_html_tests)'
  
! base_tests = formatting 
  long_tests = sectioning coverage indices nested_formats contents layout
  tex_html_tests = tex_html
  
! test_subdirs = htmlxref htmlxref-only_mono htmlxref-only_split
! 
! DIST_SUBDIRS = many_input_files $(test_subdirs) $(base_tests) $(long_tests) $(tex_html_tests)
! SUBDIRS = . many_input_files $(test_subdirs)
  
  copy-tests: copy-base copy-long
  	cd many_input_files && $(MAKE) copy-tests
- 	for dir in $(test_subdirs); do (cd $$dir && $(MAKE) copy-tests); done
  
  copy-base:
--- 23,35 ----
  	  -tex_html '$(tex_html_tests)'
  
! base_tests = formatting htmlxref htmlxref-only_mono htmlxref-only_split
  long_tests = sectioning coverage indices nested_formats contents layout
  tex_html_tests = tex_html
  
! DIST_SUBDIRS = many_input_files $(base_tests) $(long_tests) $(tex_html_tests)
! SUBDIRS = . many_input_files
  
  copy-tests: copy-base copy-long
  	cd many_input_files && $(MAKE) copy-tests
  
  copy-base:
***************
*** 108,114 ****
  	sed 's/$$/\r/' $(srcdir)/coverage_macro.texi > $@
  
- old_test_scripts = parser_base_tests long_tests.sh tex_html_tests.sh
  EXTRA_DIST = run_parser_all.sh parser_tests.sh \
!  $(old_test_scripts) $(one_test_files_generated_list) coverage_macro.texi \
   coverage_macro-cr.texi $(other_tests) reference
  
--- 105,110 ----
  	sed 's/$$/\r/' $(srcdir)/coverage_macro.texi > $@
  
  EXTRA_DIST = run_parser_all.sh parser_tests.sh \
!  $(one_test_files_generated_list) coverage_macro.texi \
   coverage_macro-cr.texi $(other_tests) reference
  
diff -Nrc2 texinfo-6.1/tp/tests/Makefile.in texinfo-6.3/tp/tests/Makefile.in
*** texinfo-6.1/tp/tests/Makefile.in	2016-02-06 12:24:07.000000000 +0000
--- texinfo-6.3/tp/tests/Makefile.in	2016-09-10 20:29:57.000000000 +0100
***************
*** 15,21 ****
  @SET_MAKE@
  
! # $Id: Makefile.am 6745 2015-11-01 19:18:52Z gavin $
  # Makefile.am for texinfo/tp/tests.
! # Copyright 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
  #
  # This file is free software; as a special exception the author gives
--- 15,21 ----
  @SET_MAKE@
  
! # $Id: Makefile.am 7036 2016-02-27 17:17:09Z gavin $
  # Makefile.am for texinfo/tp/tests.
! # Copyright 2012, 2013, 2014, 2015, 2016 Free Software Foundation, Inc.
  #
  # This file is free software; as a special exception the author gives
***************
*** 133,136 ****
--- 133,137 ----
  	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
  	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+ 	$(top_srcdir)/gnulib/m4/hard-locale.m4 \
  	$(top_srcdir)/gnulib/m4/iconv.m4 \
  	$(top_srcdir)/gnulib/m4/include_next.m4 \
***************
*** 1255,1259 ****
  
  # List of files that describe tests.  See tp/tests/README.
! test_driving_files_generated_list = sectioning/tests-parser.txt coverage/tests-parser.txt indices/tests-parser.txt nested_formats/tests-parser.txt contents/tests-parser.txt layout/tests-parser.txt formatting/tests-parser.txt tex_html/tests-parser.txt
  
  # List of test scripts that only run one test
--- 1256,1260 ----
  
  # List of files that describe tests.  See tp/tests/README.
! test_driving_files_generated_list = sectioning/tests-parser.txt coverage/tests-parser.txt indices/tests-parser.txt nested_formats/tests-parser.txt contents/tests-parser.txt layout/tests-parser.txt formatting/tests-parser.txt htmlxref/tests-parser.txt htmlxref-only_mono/tests-parser.txt htmlxref-only_split/tests-parser.txt tex_html/tests-parser.txt
  
  # List of test scripts that only run one test
***************
*** 1333,1337 ****
       test_scripts/contents_contents_in_middle_section.sh \
       test_scripts/contents_double_contents.sh \
-      test_scripts/contents_double_contents_setcontentsaftertitlepage.sh \
       test_scripts/contents_double_contents_chapter.sh \
       test_scripts/contents_double_contents_section.sh \
--- 1334,1337 ----
***************
*** 1346,1350 ****
       test_scripts/contents_contents_in_middle_section_inline.sh \
       test_scripts/contents_double_contents_inline.sh \
-      test_scripts/contents_double_contents_setcontentsaftertitlepage_inline.sh \
       test_scripts/contents_double_contents_inline_chapter.sh \
       test_scripts/contents_double_contents_inline_section.sh \
--- 1346,1349 ----
***************
*** 1355,1360 ****
       test_scripts/contents_no_content_setcatpage_do_contents_inline.sh \
       test_scripts/contents_double_contents_book.sh \
-      test_scripts/contents_double_contents_setcontentsaftertitlepage_book.sh \
-      test_scripts/contents_double_contents_setcontentsaftertitlepage_book_chapter.sh \
       test_scripts/contents_contents_and_parts.sh \
       test_scripts/contents_contents_at_begin_info.sh \
--- 1354,1357 ----
***************
*** 1363,1367 ****
       test_scripts/contents_contents_in_middle_section_info.sh \
       test_scripts/contents_double_contents_info.sh \
-      test_scripts/contents_double_contents_setcontentsaftertitlepage_info.sh \
       test_scripts/layout_no_monolithic.sh \
       test_scripts/layout_no_monolithic_only_toc_out.sh \
--- 1360,1363 ----
***************
*** 1428,1431 ****
--- 1424,1433 ----
       test_scripts/formatting_simple_with_menu_docbook_info.sh \
       test_scripts/formatting_split_for_format_not_split.sh \
+      test_scripts/htmlxref_htmlxref.sh \
+      test_scripts/htmlxref_htmlxref_nodes.sh \
+      test_scripts/htmlxref-only_mono_htmlxref.sh \
+      test_scripts/htmlxref-only_mono_htmlxref_nodes.sh \
+      test_scripts/htmlxref-only_split_htmlxref.sh \
+      test_scripts/htmlxref-only_split_htmlxref_nodes.sh \
       test_scripts/tex_html_block_EOL_tex.sh \
       test_scripts/tex_html_simplest_httex.sh \
***************
*** 1442,1451 ****
       test_scripts/tex_html_formatting_singular.sh
  
! base_tests = formatting 
  long_tests = sectioning coverage indices nested_formats contents layout
  tex_html_tests = tex_html
! test_subdirs = htmlxref htmlxref-only_mono htmlxref-only_split
! DIST_SUBDIRS = many_input_files $(test_subdirs) $(base_tests) $(long_tests) $(tex_html_tests)
! SUBDIRS = . many_input_files $(test_subdirs)
  other_tests = \
  	t/stdout.sh \
--- 1444,1452 ----
       test_scripts/tex_html_formatting_singular.sh
  
! base_tests = formatting htmlxref htmlxref-only_mono htmlxref-only_split
  long_tests = sectioning coverage indices nested_formats contents layout
  tex_html_tests = tex_html
! DIST_SUBDIRS = many_input_files $(base_tests) $(long_tests) $(tex_html_tests)
! SUBDIRS = . many_input_files
  other_tests = \
  	t/stdout.sh \
***************
*** 1454,1460 ****
  TESTS = $(one_test_files_generated_list) $(other_tests)
  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;
- old_test_scripts = parser_base_tests long_tests.sh tex_html_tests.sh
  EXTRA_DIST = run_parser_all.sh parser_tests.sh \
!  $(old_test_scripts) $(one_test_files_generated_list) coverage_macro.texi \
   coverage_macro-cr.texi $(other_tests) reference
  
--- 1455,1460 ----
  TESTS = $(one_test_files_generated_list) $(other_tests)
  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 \
   coverage_macro-cr.texi $(other_tests) reference
  
***************
*** 2255,2265 ****
  	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
  	"$$tst" $(AM_TESTS_FD_REDIRECT)
- test_scripts/contents_double_contents_setcontentsaftertitlepage.sh.log: test_scripts/contents_double_contents_setcontentsaftertitlepage.sh
- 	@p='test_scripts/contents_double_contents_setcontentsaftertitlepage.sh'; \
- 	b='test_scripts/contents_double_contents_setcontentsaftertitlepage.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/contents_double_contents_chapter.sh.log: test_scripts/contents_double_contents_chapter.sh
  	@p='test_scripts/contents_double_contents_chapter.sh'; \
--- 2255,2258 ----
***************
*** 2346,2356 ****
  	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
  	"$$tst" $(AM_TESTS_FD_REDIRECT)
- test_scripts/contents_double_contents_setcontentsaftertitlepage_inline.sh.log: test_scripts/contents_double_contents_setcontentsaftertitlepage_inline.sh
- 	@p='test_scripts/contents_double_contents_setcontentsaftertitlepage_inline.sh'; \
- 	b='test_scripts/contents_double_contents_setcontentsaftertitlepage_inline.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/contents_double_contents_inline_chapter.sh.log: test_scripts/contents_double_contents_inline_chapter.sh
  	@p='test_scripts/contents_double_contents_inline_chapter.sh'; \
--- 2339,2342 ----
***************
*** 2409,2426 ****
  	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
  	"$$tst" $(AM_TESTS_FD_REDIRECT)
- test_scripts/contents_double_contents_setcontentsaftertitlepage_book.sh.log: test_scripts/contents_double_contents_setcontentsaftertitlepage_book.sh
- 	@p='test_scripts/contents_double_contents_setcontentsaftertitlepage_book.sh'; \
- 	b='test_scripts/contents_double_contents_setcontentsaftertitlepage_book.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/contents_double_contents_setcontentsaftertitlepage_book_chapter.sh.log: test_scripts/contents_double_contents_setcontentsaftertitlepage_book_chapter.sh
- 	@p='test_scripts/contents_double_contents_setcontentsaftertitlepage_book_chapter.sh'; \
- 	b='test_scripts/contents_double_contents_setcontentsaftertitlepage_book_chapter.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/contents_contents_and_parts.sh.log: test_scripts/contents_contents_and_parts.sh
  	@p='test_scripts/contents_contents_and_parts.sh'; \
--- 2395,2398 ----
***************
*** 2465,2475 ****
  	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
  	"$$tst" $(AM_TESTS_FD_REDIRECT)
- test_scripts/contents_double_contents_setcontentsaftertitlepage_info.sh.log: test_scripts/contents_double_contents_setcontentsaftertitlepage_info.sh
- 	@p='test_scripts/contents_double_contents_setcontentsaftertitlepage_info.sh'; \
- 	b='test_scripts/contents_double_contents_setcontentsaftertitlepage_info.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/layout_no_monolithic.sh.log: test_scripts/layout_no_monolithic.sh
  	@p='test_scripts/layout_no_monolithic.sh'; \
--- 2437,2440 ----
***************
*** 2920,2923 ****
--- 2885,2930 ----
  	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
  	"$$tst" $(AM_TESTS_FD_REDIRECT)
+ test_scripts/htmlxref_htmlxref.sh.log: test_scripts/htmlxref_htmlxref.sh
+ 	@p='test_scripts/htmlxref_htmlxref.sh'; \
+ 	b='test_scripts/htmlxref_htmlxref.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/htmlxref_htmlxref_nodes.sh.log: test_scripts/htmlxref_htmlxref_nodes.sh
+ 	@p='test_scripts/htmlxref_htmlxref_nodes.sh'; \
+ 	b='test_scripts/htmlxref_htmlxref_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/htmlxref-only_mono_htmlxref.sh.log: test_scripts/htmlxref-only_mono_htmlxref.sh
+ 	@p='test_scripts/htmlxref-only_mono_htmlxref.sh'; \
+ 	b='test_scripts/htmlxref-only_mono_htmlxref.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/htmlxref-only_mono_htmlxref_nodes.sh.log: test_scripts/htmlxref-only_mono_htmlxref_nodes.sh
+ 	@p='test_scripts/htmlxref-only_mono_htmlxref_nodes.sh'; \
+ 	b='test_scripts/htmlxref-only_mono_htmlxref_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/htmlxref-only_split_htmlxref.sh.log: test_scripts/htmlxref-only_split_htmlxref.sh
+ 	@p='test_scripts/htmlxref-only_split_htmlxref.sh'; \
+ 	b='test_scripts/htmlxref-only_split_htmlxref.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/htmlxref-only_split_htmlxref_nodes.sh.log: test_scripts/htmlxref-only_split_htmlxref_nodes.sh
+ 	@p='test_scripts/htmlxref-only_split_htmlxref_nodes.sh'; \
+ 	b='test_scripts/htmlxref-only_split_htmlxref_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/tex_html_block_EOL_tex.sh.log: test_scripts/tex_html_block_EOL_tex.sh
  	@p='test_scripts/tex_html_block_EOL_tex.sh'; \
***************
*** 3235,3239 ****
  copy-tests: copy-base copy-long
  	cd many_input_files && $(MAKE) copy-tests
- 	for dir in $(test_subdirs); do (cd $$dir && $(MAKE) copy-tests); done
  
  copy-base:
--- 3242,3245 ----
diff -Nrc2 texinfo-6.1/tp/tests/Makefile.onetst texinfo-6.3/tp/tests/Makefile.onetst
*** texinfo-6.1/tp/tests/Makefile.onetst	2016-01-23 11:30:36.000000000 +0000
--- texinfo-6.3/tp/tests/Makefile.onetst	2016-09-03 19:07:58.000000000 +0100
***************
*** 12,16 ****
  
  # List of files that describe tests.  See tp/tests/README.
! test_driving_files_generated_list = sectioning/tests-parser.txt coverage/tests-parser.txt indices/tests-parser.txt nested_formats/tests-parser.txt contents/tests-parser.txt layout/tests-parser.txt formatting/tests-parser.txt tex_html/tests-parser.txt
  
  # List of test scripts that only run one test
--- 12,16 ----
  
  # List of files that describe tests.  See tp/tests/README.
! test_driving_files_generated_list = sectioning/tests-parser.txt coverage/tests-parser.txt indices/tests-parser.txt nested_formats/tests-parser.txt contents/tests-parser.txt layout/tests-parser.txt formatting/tests-parser.txt htmlxref/tests-parser.txt htmlxref-only_mono/tests-parser.txt htmlxref-only_split/tests-parser.txt tex_html/tests-parser.txt
  
  # List of test scripts that only run one test
***************
*** 90,94 ****
       test_scripts/contents_contents_in_middle_section.sh \
       test_scripts/contents_double_contents.sh \
-      test_scripts/contents_double_contents_setcontentsaftertitlepage.sh \
       test_scripts/contents_double_contents_chapter.sh \
       test_scripts/contents_double_contents_section.sh \
--- 90,93 ----
***************
*** 103,107 ****
       test_scripts/contents_contents_in_middle_section_inline.sh \
       test_scripts/contents_double_contents_inline.sh \
-      test_scripts/contents_double_contents_setcontentsaftertitlepage_inline.sh \
       test_scripts/contents_double_contents_inline_chapter.sh \
       test_scripts/contents_double_contents_inline_section.sh \
--- 102,105 ----
***************
*** 112,117 ****
       test_scripts/contents_no_content_setcatpage_do_contents_inline.sh \
       test_scripts/contents_double_contents_book.sh \
-      test_scripts/contents_double_contents_setcontentsaftertitlepage_book.sh \
-      test_scripts/contents_double_contents_setcontentsaftertitlepage_book_chapter.sh \
       test_scripts/contents_contents_and_parts.sh \
       test_scripts/contents_contents_at_begin_info.sh \
--- 110,113 ----
***************
*** 120,124 ****
       test_scripts/contents_contents_in_middle_section_info.sh \
       test_scripts/contents_double_contents_info.sh \
-      test_scripts/contents_double_contents_setcontentsaftertitlepage_info.sh \
       test_scripts/layout_no_monolithic.sh \
       test_scripts/layout_no_monolithic_only_toc_out.sh \
--- 116,119 ----
***************
*** 185,188 ****
--- 180,189 ----
       test_scripts/formatting_simple_with_menu_docbook_info.sh \
       test_scripts/formatting_split_for_format_not_split.sh \
+      test_scripts/htmlxref_htmlxref.sh \
+      test_scripts/htmlxref_htmlxref_nodes.sh \
+      test_scripts/htmlxref-only_mono_htmlxref.sh \
+      test_scripts/htmlxref-only_mono_htmlxref_nodes.sh \
+      test_scripts/htmlxref-only_split_htmlxref.sh \
+      test_scripts/htmlxref-only_split_htmlxref_nodes.sh \
       test_scripts/tex_html_block_EOL_tex.sh \
       test_scripts/tex_html_simplest_httex.sh \
diff -Nrc2 texinfo-6.1/tp/tests/README texinfo-6.3/tp/tests/README
*** texinfo-6.1/tp/tests/README	2016-01-15 18:26:48.000000000 +0000
--- texinfo-6.3/tp/tests/README	2016-09-10 16:58:29.000000000 +0100
***************
*** 1,3 ****
! $Id: README 6942 2016-01-15 18:21:28Z gavin $
  texinfo/tp/tests/README
  
--- 1,3 ----
! $Id: README 7356 2016-09-10 15:49:59Z gavin $
  texinfo/tp/tests/README
  
***************
*** 81,90 ****
  =========================
  
  Giving -copy as the first argument to ../run_parser_all.sh or
  parser_tests.sh (or long_tests.sh or tex_html_tests.sh, which need
  environment variables LONG_TESTS resp. TEX_HTML_TESTS, or ALL_TESTS, to
  be set to "yes", but otherwise operate similarly) will cause the 
! reference results to be regenerated.  For example, to update the 
! reference results for one particular test:
  
  $ ./parser_tests.sh -copy formatting
--- 81,93 ----
  =========================
  
+ 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 (or long_tests.sh or tex_html_tests.sh, which need
  environment variables LONG_TESTS resp. TEX_HTML_TESTS, or ALL_TESTS, to
  be set to "yes", but otherwise operate 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 -copy formatting
***************
*** 165,178 ****
  Init files are searched for in ../t/init/.
  
- Subdirectories
- --------------
- 
- There are three subdirectories containing tests, each of which is 
- organized like this one: htmlxref, htmlxref-only_mono and htmlxref-only_split.
- These groups of tests are in their own subdirectorie so they can use 
- their own htmlxref.cnf init file (which is copied to the build dir in 
- tests/Makefile.am).  In htmlxref-only_split, using a .texinfo directory 
- is tested.
- 
  
  Creating a new test
--- 168,171 ----
diff -Nrc2 texinfo-6.1/tp/tests/contents/Makefile.in texinfo-6.3/tp/tests/contents/Makefile.in
*** texinfo-6.1/tp/tests/contents/Makefile.in	2016-02-06 12:24:07.000000000 +0000
--- texinfo-6.3/tp/tests/contents/Makefile.in	2016-09-10 20:29:58.000000000 +0100
***************
*** 109,112 ****
--- 109,113 ----
  	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
  	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+ 	$(top_srcdir)/gnulib/m4/hard-locale.m4 \
  	$(top_srcdir)/gnulib/m4/iconv.m4 \
  	$(top_srcdir)/gnulib/m4/include_next.m4 \
diff -Nrc2 texinfo-6.1/tp/tests/contents/no_content_setcatpage.texi texinfo-6.3/tp/tests/contents/no_content_setcatpage.texi
*** texinfo-6.1/tp/tests/contents/no_content_setcatpage.texi	2014-04-22 02:56:38.000000000 +0100
--- texinfo-6.3/tp/tests/contents/no_content_setcatpage.texi	2016-07-31 16:20:07.000000000 +0100
***************
*** 3,8 ****
  @setfilename no_contents_setcatpage.info
  
- @setcontentsaftertitlepage
- 
  @node Top
  @top No ccontent
--- 3,6 ----
diff -Nrc2 texinfo-6.1/tp/tests/contents/res_parser/no_content_setcatpage/no_content_setcatpage.html texinfo-6.3/tp/tests/contents/res_parser/no_content_setcatpage/no_content_setcatpage.html
*** texinfo-6.1/tp/tests/contents/res_parser/no_content_setcatpage/no_content_setcatpage.html	2016-01-22 08:09:29.000000000 +0000
--- texinfo-6.3/tp/tests/contents/res_parser/no_content_setcatpage/no_content_setcatpage.html	2016-07-31 16:20:07.000000000 +0100
***************
*** 44,48 ****
  <body lang="en">
  
- 
  <a name="Top"></a>
  <table class="header" cellpadding="1" cellspacing="1" border="0">
--- 44,47 ----
diff -Nrc2 texinfo-6.1/tp/tests/contents/res_parser/no_content_setcatpage_do_contents/no_content_setcatpage.html texinfo-6.3/tp/tests/contents/res_parser/no_content_setcatpage_do_contents/no_content_setcatpage.html
*** texinfo-6.1/tp/tests/contents/res_parser/no_content_setcatpage_do_contents/no_content_setcatpage.html	2016-01-22 08:09:29.000000000 +0000
--- texinfo-6.3/tp/tests/contents/res_parser/no_content_setcatpage_do_contents/no_content_setcatpage.html	2016-07-31 16:20:07.000000000 +0100
***************
*** 43,58 ****
  
  <body lang="en">
- <a name="SEC_Contents"></a>
- <h1 class="contents-heading">Table of Contents</h1>
- 
- <div class="contents">
- 
- <ul class="no-bullet">
-   <li><a name="toc-Chapter-1" href="#chapter">1 Chapter 1</a></li>
- </ul>
- </div>
- 
- <hr>
- 
  
  <a name="Top"></a>
--- 43,46 ----
***************
*** 98,101 ****
--- 86,105 ----
  </p>
  <hr size="6">
+ <a name="SEC_Contents"></a>
+ <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">[<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="#SEC_About" title="About (help)"> ? </a>]</td>
+ </tr></table>
+ <h1 class="contents-heading">Table of Contents</h1>
+ 
+ <div class="contents">
+ 
+ <ul class="no-bullet">
+   <li><a name="toc-Chapter-1" href="#chapter">1 Chapter 1</a></li>
+ </ul>
+ </div>
+ <hr>
  <a name="SEC_About"></a>
  <table class="header" cellpadding="1" cellspacing="1" border="0">
diff -Nrc2 texinfo-6.1/tp/tests/contents/res_parser/no_content_setcatpage_do_contents_inline/no_content_setcatpage.html texinfo-6.3/tp/tests/contents/res_parser/no_content_setcatpage_do_contents_inline/no_content_setcatpage.html
*** texinfo-6.1/tp/tests/contents/res_parser/no_content_setcatpage_do_contents_inline/no_content_setcatpage.html	2016-01-22 08:09:29.000000000 +0000
--- texinfo-6.3/tp/tests/contents/res_parser/no_content_setcatpage_do_contents_inline/no_content_setcatpage.html	2016-07-31 16:20:07.000000000 +0100
***************
*** 43,58 ****
  
  <body lang="en">
- <a name="SEC_Contents"></a>
- <h1 class="contents-heading">Table of Contents</h1>
- 
- <div class="contents">
- 
- <ul class="no-bullet">
-   <li><a name="toc-Chapter-1" href="#chapter">1 Chapter 1</a></li>
- </ul>
- </div>
- 
- <hr>
- 
  
  <a name="Top"></a>
--- 43,46 ----
***************
*** 61,65 ****
  <td valign="middle" align="left">[<a href="#chapter" 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>
  <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
--- 49,53 ----
  <td valign="middle" align="left">[<a href="#chapter" 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>
  <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
***************
*** 88,92 ****
  <td valign="middle" align="left"> &nbsp; </td>
  <td valign="middle" align="left">[<a href="#Top" 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="#SEC_About" title="About (help)"> ? </a>]</td>
--- 76,80 ----
  <td valign="middle" align="left"> &nbsp; </td>
  <td valign="middle" align="left">[<a href="#Top" 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>
***************
*** 101,105 ****
  <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">[<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="#SEC_About" title="About (help)"> ? </a>]</td>
--- 89,93 ----
  <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>
  <td valign="middle" align="left">[Index]</td>
  <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
diff -Nrc2 texinfo-6.1/tp/tests/contents/res_parser/no_content_setcatpage_inline/no_content_setcatpage.html texinfo-6.3/tp/tests/contents/res_parser/no_content_setcatpage_inline/no_content_setcatpage.html
*** texinfo-6.1/tp/tests/contents/res_parser/no_content_setcatpage_inline/no_content_setcatpage.html	2016-01-22 08:09:29.000000000 +0000
--- texinfo-6.3/tp/tests/contents/res_parser/no_content_setcatpage_inline/no_content_setcatpage.html	2016-07-31 16:20:07.000000000 +0100
***************
*** 44,48 ****
  <body lang="en">
  
- 
  <a name="Top"></a>
  <table class="header" cellpadding="1" cellspacing="1" border="0">
--- 44,47 ----
diff -Nrc2 texinfo-6.1/tp/tests/contents/tests-parser.txt texinfo-6.3/tp/tests/contents/tests-parser.txt
*** texinfo-6.1/tp/tests/contents/tests-parser.txt	2014-04-22 02:56:38.000000000 +0100
--- texinfo-6.3/tp/tests/contents/tests-parser.txt	2016-07-31 16:20:07.000000000 +0100
***************
*** 4,8 ****
  contents_in_middle_section contents_in_middle_section.texi
  double_contents double_contents.texi
- double_contents_setcontentsaftertitlepage double_contents_setcontentsaftertitlepage.texi
  double_contents_chapter double_contents.texi --split chapter
  double_contents_section double_contents.texi --split section
--- 4,7 ----
***************
*** 17,21 ****
  contents_in_middle_section_inline contents_in_middle_section.texi --set-customization-variable 'INLINE_CONTENTS 1'
  double_contents_inline double_contents.texi --set-customization-variable 'INLINE_CONTENTS 1'
- double_contents_setcontentsaftertitlepage_inline double_contents_setcontentsaftertitlepage.texi --set-customization-variable 'INLINE_CONTENTS 1'
  double_contents_inline_chapter double_contents.texi --set-customization-variable 'INLINE_CONTENTS 1' --split chapter
  double_contents_inline_section double_contents.texi --set-customization-variable 'INLINE_CONTENTS 1' --split section
--- 16,19 ----
***************
*** 26,31 ****
  no_content_setcatpage_do_contents_inline no_content_setcatpage.texi --set-customization-variable 'INLINE_CONTENTS 1' --set-customization-variable 'contents 1'
  double_contents_book double_contents.texi --init book.pm
- double_contents_setcontentsaftertitlepage_book double_contents_setcontentsaftertitlepage.texi --init book.pm
- double_contents_setcontentsaftertitlepage_book_chapter double_contents_setcontentsaftertitlepage.texi --init book.pm --split chapter
  contents_and_parts contents_and_parts.texi
  
--- 24,27 ----
***************
*** 35,38 ****
  contents_in_middle_section_info contents_in_middle_section.texi --info
  double_contents_info double_contents.texi --info
- double_contents_setcontentsaftertitlepage_info double_contents_setcontentsaftertitlepage.texi --info
  
--- 31,33 ----
diff -Nrc2 texinfo-6.1/tp/tests/coverage/Makefile.in texinfo-6.3/tp/tests/coverage/Makefile.in
*** texinfo-6.1/tp/tests/coverage/Makefile.in	2016-02-06 12:24:07.000000000 +0000
--- texinfo-6.3/tp/tests/coverage/Makefile.in	2016-09-10 20:29:58.000000000 +0100
***************
*** 109,112 ****
--- 109,113 ----
  	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
  	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+ 	$(top_srcdir)/gnulib/m4/hard-locale.m4 \
  	$(top_srcdir)/gnulib/m4/iconv.m4 \
  	$(top_srcdir)/gnulib/m4/include_next.m4 \
diff -Nrc2 texinfo-6.1/tp/tests/coverage/res_parser/formatting/formatting.2 texinfo-6.3/tp/tests/coverage/res_parser/formatting/formatting.2
*** texinfo-6.1/tp/tests/coverage/res_parser/formatting/formatting.2	2016-01-22 08:09:30.000000000 +0000
--- texinfo-6.3/tp/tests/coverage/res_parser/formatting/formatting.2	2016-09-10 16:55:39.000000000 +0100
***************
*** 26,30 ****
  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 size of integer: 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)
--- 26,30 ----
  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)
***************
*** 72,76 ****
  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 size of integer: 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)
--- 72,76 ----
  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)
***************
*** 118,122 ****
  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 size of integer: 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)
--- 118,122 ----
  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)
***************
*** 164,168 ****
  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 size of integer: 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)
--- 164,168 ----
  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)
diff -Nrc2 texinfo-6.1/tp/tests/coverage/res_parser/formatting_cr/formatting-cr.2 texinfo-6.3/tp/tests/coverage/res_parser/formatting_cr/formatting-cr.2
*** texinfo-6.1/tp/tests/coverage/res_parser/formatting_cr/formatting-cr.2	2016-01-22 08:09:30.000000000 +0000
--- texinfo-6.3/tp/tests/coverage/res_parser/formatting_cr/formatting-cr.2	2016-09-10 16:55:40.000000000 +0100
***************
*** 27,31 ****
  formatting-cr.texi:25: non-hex digits in argument for @U: z (possibly involving @mymacro)
  formatting-cr.texi:25: warning: fewer than four hex digits in argument for @U: abc (possibly involving @mymacro)
! formatting-cr.texi:25: argument for @U exceeds size of integer: FFFFFFFFFFFFFF (possibly involving @mymacro)
  formatting-cr.texi:25: argument for @U exceeds Unicode maximum 0x10FFFF: 110000 (possibly involving @mymacro)
  formatting-cr.texi:25: @TeX expected braces (possibly involving @mymacro)
--- 27,31 ----
  formatting-cr.texi:25: non-hex digits in argument for @U: z (possibly involving @mymacro)
  formatting-cr.texi:25: warning: fewer than four hex digits in argument for @U: abc (possibly involving @mymacro)
! formatting-cr.texi:25: argument for @U exceeds Unicode maximum 0x10FFFF: FFFFFFFFFFFFFF (possibly involving @mymacro)
  formatting-cr.texi:25: argument for @U exceeds Unicode maximum 0x10FFFF: 110000 (possibly involving @mymacro)
  formatting-cr.texi:25: @TeX expected braces (possibly involving @mymacro)
***************
*** 74,78 ****
  formatting-cr.texi:35: non-hex digits in argument for @U: z (possibly involving @mymacro)
  formatting-cr.texi:35: warning: fewer than four hex digits in argument for @U: abc (possibly involving @mymacro)
! formatting-cr.texi:35: argument for @U exceeds size of integer: FFFFFFFFFFFFFF (possibly involving @mymacro)
  formatting-cr.texi:35: argument for @U exceeds Unicode maximum 0x10FFFF: 110000 (possibly involving @mymacro)
  formatting-cr.texi:35: @TeX expected braces (possibly involving @mymacro)
--- 74,78 ----
  formatting-cr.texi:35: non-hex digits in argument for @U: z (possibly involving @mymacro)
  formatting-cr.texi:35: warning: fewer than four hex digits in argument for @U: abc (possibly involving @mymacro)
! formatting-cr.texi:35: argument for @U exceeds Unicode maximum 0x10FFFF: FFFFFFFFFFFFFF (possibly involving @mymacro)
  formatting-cr.texi:35: argument for @U exceeds Unicode maximum 0x10FFFF: 110000 (possibly involving @mymacro)
  formatting-cr.texi:35: @TeX expected braces (possibly involving @mymacro)
***************
*** 121,125 ****
  formatting-cr.texi:45: non-hex digits in argument for @U: z (possibly involving @mymacro)
  formatting-cr.texi:45: warning: fewer than four hex digits in argument for @U: abc (possibly involving @mymacro)
! formatting-cr.texi:45: argument for @U exceeds size of integer: FFFFFFFFFFFFFF (possibly involving @mymacro)
  formatting-cr.texi:45: argument for @U exceeds Unicode maximum 0x10FFFF: 110000 (possibly involving @mymacro)
  formatting-cr.texi:45: @TeX expected braces (possibly involving @mymacro)
--- 121,125 ----
  formatting-cr.texi:45: non-hex digits in argument for @U: z (possibly involving @mymacro)
  formatting-cr.texi:45: warning: fewer than four hex digits in argument for @U: abc (possibly involving @mymacro)
! formatting-cr.texi:45: argument for @U exceeds Unicode maximum 0x10FFFF: FFFFFFFFFFFFFF (possibly involving @mymacro)
  formatting-cr.texi:45: argument for @U exceeds Unicode maximum 0x10FFFF: 110000 (possibly involving @mymacro)
  formatting-cr.texi:45: @TeX expected braces (possibly involving @mymacro)
***************
*** 168,172 ****
  formatting-cr.texi:49: non-hex digits in argument for @U: z (possibly involving @mymacro)
  formatting-cr.texi:49: warning: fewer than four hex digits in argument for @U: abc (possibly involving @mymacro)
! formatting-cr.texi:49: argument for @U exceeds size of integer: FFFFFFFFFFFFFF (possibly involving @mymacro)
  formatting-cr.texi:49: argument for @U exceeds Unicode maximum 0x10FFFF: 110000 (possibly involving @mymacro)
  formatting-cr.texi:49: @TeX expected braces (possibly involving @mymacro)
--- 168,172 ----
  formatting-cr.texi:49: non-hex digits in argument for @U: z (possibly involving @mymacro)
  formatting-cr.texi:49: warning: fewer than four hex digits in argument for @U: abc (possibly involving @mymacro)
! formatting-cr.texi:49: argument for @U exceeds Unicode maximum 0x10FFFF: FFFFFFFFFFFFFF (possibly involving @mymacro)
  formatting-cr.texi:49: argument for @U exceeds Unicode maximum 0x10FFFF: 110000 (possibly involving @mymacro)
  formatting-cr.texi:49: @TeX expected braces (possibly involving @mymacro)
diff -Nrc2 texinfo-6.1/tp/tests/coverage/res_parser/formatting_fr/formatting.2 texinfo-6.3/tp/tests/coverage/res_parser/formatting_fr/formatting.2
*** texinfo-6.1/tp/tests/coverage/res_parser/formatting_fr/formatting.2	2016-01-22 08:09:30.000000000 +0000
--- texinfo-6.3/tp/tests/coverage/res_parser/formatting_fr/formatting.2	2016-09-10 16:55:40.000000000 +0100
***************
*** 26,30 ****
  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 size of integer: 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)
--- 26,30 ----
  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)
***************
*** 72,76 ****
  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 size of integer: 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)
--- 72,76 ----
  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)
***************
*** 118,122 ****
  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 size of integer: 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)
--- 118,122 ----
  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)
***************
*** 164,168 ****
  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 size of integer: 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)
--- 164,168 ----
  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)
diff -Nrc2 texinfo-6.1/tp/tests/coverage/res_parser/formatting_fr/formatting.html texinfo-6.3/tp/tests/coverage/res_parser/formatting_fr/formatting.html
*** texinfo-6.1/tp/tests/coverage/res_parser/formatting_fr/formatting.html	2016-01-22 08:09:30.000000000 +0000
--- texinfo-6.3/tp/tests/coverage/res_parser/formatting_fr/formatting.html	2016-09-10 16:55:40.000000000 +0100
***************
*** 5402,5406 ****
  
  <p>
!   Ce document a &eacute;t&eacute; g&eacute;n&eacute;r&eacute; <em>a sunny day</em> en utilisant <a href="http://www.gnu.org/software/texinfo/"><em>texi2any</em></a>
  </p>
  <p>
--- 5402,5406 ----
  
  <p>
!   Ce document a &eacute;t&eacute; g&eacute;n&eacute;r&eacute; <em>a sunny day</em> en utilisant <a href="http://www.gnu.org/software/texinfo/"><em>texi2any</em></a>.
  </p>
  <p>
***************
*** 5503,5507 ****
  <hr>
  <p><font size="-1">
!   Ce document a &eacute;t&eacute; g&eacute;n&eacute;r&eacute; <em>a sunny day</em> en utilisant <a href="http://www.gnu.org/software/texinfo/"><em>texi2any</em></a>
  </font></p>
  
--- 5503,5507 ----
  <hr>
  <p><font size="-1">
!   Ce document a &eacute;t&eacute; g&eacute;n&eacute;r&eacute; <em>a sunny day</em> en utilisant <a href="http://www.gnu.org/software/texinfo/"><em>texi2any</em></a>.
  </font></p>
  
diff -Nrc2 texinfo-6.1/tp/tests/coverage/res_parser/texi_formatting/formatting.2 texinfo-6.3/tp/tests/coverage/res_parser/texi_formatting/formatting.2
*** texinfo-6.1/tp/tests/coverage/res_parser/texi_formatting/formatting.2	2016-01-22 08:09:30.000000000 +0000
--- texinfo-6.3/tp/tests/coverage/res_parser/texi_formatting/formatting.2	2016-09-10 16:55:39.000000000 +0100
***************
*** 26,30 ****
  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 size of integer: 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)
--- 26,30 ----
  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)
***************
*** 72,76 ****
  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 size of integer: 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)
--- 72,76 ----
  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)
***************
*** 118,122 ****
  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 size of integer: 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)
--- 118,122 ----
  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)
***************
*** 164,168 ****
  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 size of integer: 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)
--- 164,168 ----
  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)
diff -Nrc2 texinfo-6.1/tp/tests/coverage/res_parser/texi_formatting/formatting.texi texinfo-6.3/tp/tests/coverage/res_parser/texi_formatting/formatting.texi
*** texinfo-6.1/tp/tests/coverage/res_parser/texi_formatting/formatting.texi	2016-01-22 08:09:30.000000000 +0000
--- texinfo-6.3/tp/tests/coverage/res_parser/texi_formatting/formatting.texi	2016-09-10 16:55:39.000000000 +0100
***************
*** 1339,1343 ****
  
  @xml
- <para> xml para </para> ''
  @end xml
  
--- 1339,1342 ----
***************
*** 1347,1355 ****
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
  @end tex
  
  @docbook
- docbook ''
  @end docbook
  
--- 1346,1352 ----
***************
*** 2070,2074 ****
  
  @xml
- <para> xml para </para> ''
  @end xml
  
--- 2067,2070 ----
***************
*** 2078,2086 ****
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
  @end tex
  
  @docbook
- docbook ''
  @end docbook
  
--- 2074,2080 ----
***************
*** 2801,2805 ****
  
  @xml
- <para> xml para </para> ''
  @end xml
  
--- 2795,2798 ----
***************
*** 2809,2817 ****
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
  @end tex
  
  @docbook
- docbook ''
  @end docbook
  
--- 2802,2808 ----
***************
*** 3526,3530 ****
  
  @xml
- <para> xml para </para> ''
  @end xml
  
--- 3517,3520 ----
***************
*** 3534,3542 ****
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
  @end tex
  
  @docbook
- docbook ''
  @end docbook
  
--- 3524,3530 ----
diff -Nrc2 texinfo-6.1/tp/tests/coverage/res_parser_info/texi_formatting/formatting.texi texinfo-6.3/tp/tests/coverage/res_parser_info/texi_formatting/formatting.texi
*** texinfo-6.1/tp/tests/coverage/res_parser_info/texi_formatting/formatting.texi	2016-01-22 08:09:30.000000000 +0000
--- texinfo-6.3/tp/tests/coverage/res_parser_info/texi_formatting/formatting.texi	2016-09-10 16:55:39.000000000 +0100
***************
*** 1326,1342 ****
  
  @xml
- <para> xml para </para> ''
  @end xml
  
  @html
- html ''
  @end html
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
  @end tex
  
  @docbook
- docbook ''
  @end docbook
  
--- 1326,1338 ----
***************
*** 1933,1949 ****
  
  @xml
- <para> xml para </para> ''
  @end xml
  
  @html
- html ''
  @end html
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
  @end tex
  
  @docbook
- docbook ''
  @end docbook
  
--- 1929,1941 ----
***************
*** 2540,2556 ****
  
  @xml
- <para> xml para </para> ''
  @end xml
  
  @html
- html ''
  @end html
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
  @end tex
  
  @docbook
- docbook ''
  @end docbook
  
--- 2532,2544 ----
***************
*** 3141,3157 ****
  
  @xml
- <para> xml para </para> ''
  @end xml
  
  @html
- html ''
  @end html
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
  @end tex
  
  @docbook
- docbook ''
  @end docbook
  
--- 3129,3141 ----
diff -Nrc2 texinfo-6.1/tp/tests/formatting/Makefile.in texinfo-6.3/tp/tests/formatting/Makefile.in
*** texinfo-6.1/tp/tests/formatting/Makefile.in	2016-02-06 12:24:07.000000000 +0000
--- texinfo-6.3/tp/tests/formatting/Makefile.in	2016-09-10 20:29:58.000000000 +0100
***************
*** 109,112 ****
--- 109,113 ----
  	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
  	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+ 	$(top_srcdir)/gnulib/m4/hard-locale.m4 \
  	$(top_srcdir)/gnulib/m4/iconv.m4 \
  	$(top_srcdir)/gnulib/m4/include_next.m4 \
diff -Nrc2 texinfo-6.1/tp/tests/formatting/res_parser/cond_xml/cond.xml texinfo-6.3/tp/tests/formatting/res_parser/cond_xml/cond.xml
*** texinfo-6.1/tp/tests/formatting/res_parser/cond_xml/cond.xml	2016-01-22 07:55:05.000000000 +0000
--- texinfo-6.3/tp/tests/formatting/res_parser/cond_xml/cond.xml	2016-09-10 16:46:41.000000000 +0100
***************
*** 9,13 ****
  
  <html endspaces=" ">
- This is html text.
  </html>
  
--- 9,12 ----
***************
*** 21,25 ****
  
  <tex endspaces=" ">
- This is tex text.
  </tex>
  
--- 20,23 ----
diff -Nrc2 texinfo-6.1/tp/tests/formatting/res_parser/documentlanguage_set_option/documentlanguage_set.html texinfo-6.3/tp/tests/formatting/res_parser/documentlanguage_set_option/documentlanguage_set.html
*** texinfo-6.1/tp/tests/formatting/res_parser/documentlanguage_set_option/documentlanguage_set.html	2016-01-22 07:55:06.000000000 +0000
--- texinfo-6.3/tp/tests/formatting/res_parser/documentlanguage_set_option/documentlanguage_set.html	2016-09-10 16:46:42.000000000 +0100
***************
*** 54,58 ****
  <hr>
  <p><font size="-1">
!   Ce document a &eacute;t&eacute; g&eacute;n&eacute;r&eacute; <em>a sunny day</em> en utilisant <a href="http://www.gnu.org/software/texinfo/"><em>texi2any</em></a>
  </font></p>
  
--- 54,58 ----
  <hr>
  <p><font size="-1">
!   Ce document a &eacute;t&eacute; g&eacute;n&eacute;r&eacute; <em>a sunny day</em> en utilisant <a href="http://www.gnu.org/software/texinfo/"><em>texi2any</em></a>.
  </font></p>
  
diff -Nrc2 texinfo-6.1/tp/tests/formatting/res_parser/test_redefine_need/test_need.2 texinfo-6.3/tp/tests/formatting/res_parser/test_redefine_need/test_need.2
*** texinfo-6.1/tp/tests/formatting/res_parser/test_redefine_need/test_need.2	2016-01-22 07:55:05.000000000 +0000
--- texinfo-6.3/tp/tests/formatting/res_parser/test_redefine_need/test_need.2	2016-09-10 16:46:42.000000000 +0100
***************
*** 1,5 ****
! test_need.texi:8: warning: @need should only appear at a line beginning
  test_need.texi:8: bad argument to @need: 0.1 on line following
! test_need.texi:10: warning: @need should only appear at a line beginning
  test_need.texi:8: warning: Bad arg for need
  test_need.texi:10: warning: need has the right arg: 0.1
--- 1,5 ----
! test_need.texi:8: warning: @need should only appear at the beginning of a line
  test_need.texi:8: bad argument to @need: 0.1 on line following
! test_need.texi:10: warning: @need should only appear at the beginning of a line
  test_need.texi:8: warning: Bad arg for need
  test_need.texi:10: warning: need has the right arg: 0.1
diff -Nrc2 texinfo-6.1/tp/tests/formatting/res_parser/texi_bib-example/bib-example.2 texinfo-6.3/tp/tests/formatting/res_parser/texi_bib-example/bib-example.2
*** texinfo-6.1/tp/tests/formatting/res_parser/texi_bib-example/bib-example.2	2016-01-22 07:55:05.000000000 +0000
--- texinfo-6.3/tp/tests/formatting/res_parser/texi_bib-example/bib-example.2	2016-09-10 16:46:41.000000000 +0100
***************
*** 1 ****
! bib-example.texi:44: warning: @ifclear should only appear at a line beginning (possibly involving @mybibcite)
--- 1 ----
! bib-example.texi:44: warning: @ifclear should only appear at the beginning of a line (possibly involving @mybibcite)
diff -Nrc2 texinfo-6.1/tp/tests/formatting/res_parser/texi_cond/cond.texi texinfo-6.3/tp/tests/formatting/res_parser/texi_cond/cond.texi
*** texinfo-6.1/tp/tests/formatting/res_parser/texi_cond/cond.texi	2016-01-22 07:55:05.000000000 +0000
--- texinfo-6.3/tp/tests/formatting/res_parser/texi_cond/cond.texi	2016-09-10 16:46:41.000000000 +0100
***************
*** 17,21 ****
  
  @tex
- This is tex text.
  @end tex
  
--- 17,20 ----
diff -Nrc2 texinfo-6.1/tp/tests/formatting/res_parser/texi_glossary/glossary.2 texinfo-6.3/tp/tests/formatting/res_parser/texi_glossary/glossary.2
*** texinfo-6.1/tp/tests/formatting/res_parser/texi_glossary/glossary.2	2016-01-22 07:55:05.000000000 +0000
--- texinfo-6.3/tp/tests/formatting/res_parser/texi_glossary/glossary.2	2016-09-10 16:46:41.000000000 +0100
***************
*** 1,3 ****
! glossary.texi:42: warning: @ifhtml should only appear at a line beginning (possibly involving @gentry)
  glossary.texi:47: recursive call of macro glossarytext is not allowed; use @rmacro if needed (possibly involving @glossarytext)
  glossary.texi:47: @item outside of table or list (possibly involving @glossarytext)
--- 1,3 ----
! glossary.texi:42: warning: @ifhtml should only appear at the beginning of a line (possibly involving @gentry)
  glossary.texi:47: recursive call of macro glossarytext is not allowed; use @rmacro if needed (possibly involving @glossarytext)
  glossary.texi:47: @item outside of table or list (possibly involving @glossarytext)
diff -Nrc2 texinfo-6.1/tp/tests/htmlxref/Makefile.am texinfo-6.3/tp/tests/htmlxref/Makefile.am
*** texinfo-6.1/tp/tests/htmlxref/Makefile.am	2015-07-30 12:07:18.000000000 +0100
--- texinfo-6.3/tp/tests/htmlxref/Makefile.am	2016-07-31 16:20:07.000000000 +0100
***************
*** 1,19 ****
! # autogenerated test scripts list and tests-parser.txt list
! include $(srcdir)/Makefile.onetst
! 
! $(srcdir)/Makefile.onetst: \
!   ../../maintain/regenerate_cmd_tests.sh $(test_driving_files_generated_list) 
! 	cd $(srcdir) \
! 	&& $(SHELL) ../../maintain/regenerate_cmd_tests.sh "$@" htmlxref \
! 	  -base .
! 
! 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;
! 
! copy-tests:
! 	$(srcdir)/../run_parser_all.sh -copy
! 
! EXTRA_DIST = htmlxref.cnf-ref res_parser \
!  $(one_test_files_generated_list) $(test_driving_files_generated_list)
  
  DISTCLEANFILES = tests.log tests.out htmlxref.cnf
--- 1,3 ----
! EXTRA_DIST = htmlxref.cnf-ref res_parser tests-parser.txt
  
  DISTCLEANFILES = tests.log tests.out htmlxref.cnf
diff -Nrc2 texinfo-6.1/tp/tests/htmlxref/Makefile.in texinfo-6.3/tp/tests/htmlxref/Makefile.in
*** texinfo-6.1/tp/tests/htmlxref/Makefile.in	2016-02-06 12:24:08.000000000 +0000
--- texinfo-6.3/tp/tests/htmlxref/Makefile.in	2016-09-10 20:29:59.000000000 +0100
***************
*** 14,29 ****
  
  @SET_MAKE@
- 
- # Makefile.onetst generated by ../../maintain/regenerate_cmd_tests.sh.
- #
- # Copyright 2016 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.
  VPATH = @srcdir@
  am__is_gnu_make = { \
--- 14,17 ----
***************
*** 121,124 ****
--- 109,113 ----
  	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
  	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+ 	$(top_srcdir)/gnulib/m4/hard-locale.m4 \
  	$(top_srcdir)/gnulib/m4/iconv.m4 \
  	$(top_srcdir)/gnulib/m4/include_next.m4 \
***************
*** 227,436 ****
    esac
  am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
! am__tty_colors_dummy = \
!   mgn= red= grn= lgn= blu= brg= std=; \
!   am__color_tests=no
! am__tty_colors = { \
!   $(am__tty_colors_dummy); \
!   if test "X$(AM_COLOR_TESTS)" = Xno; then \
!     am__color_tests=no; \
!   elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
!     am__color_tests=yes; \
!   elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
!     am__color_tests=yes; \
!   fi; \
!   if test $$am__color_tests = yes; then \
!     red='[0;31m'; \
!     grn='[0;32m'; \
!     lgn='[1;32m'; \
!     blu='[1;34m'; \
!     mgn='[0;35m'; \
!     brg='[1m'; \
!     std='[m'; \
!   fi; \
! }
! am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
! am__vpath_adj = case $$p in \
!     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
!     *) f=$$p;; \
!   esac;
! am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
! am__install_max = 40
! am__nobase_strip_setup = \
!   srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
! am__nobase_strip = \
!   for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
! am__nobase_list = $(am__nobase_strip_setup); \
!   for p in $$list; do echo "$$p $$p"; done | \
!   sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
!   $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
!     if (++n[$$2] == $(am__install_max)) \
!       { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
!     END { for (dir in files) print dir, files[dir] }'
! am__base_list = \
!   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
!   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
! am__uninstall_files_from_dir = { \
!   test -z "$$files" \
!     || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
!     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
!          $(am__cd) "$$dir" && rm -f $$files; }; \
!   }
! am__recheck_rx = ^[ 	]*:recheck:[ 	]*
! am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
! am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
! # A command that, given a newline-separated list of test names on the
! # standard input, print the name of the tests that are to be re-run
! # upon "make recheck".
! am__list_recheck_tests = $(AWK) '{ \
!   recheck = 1; \
!   while ((rc = (getline line < ($$0 ".trs"))) != 0) \
!     { \
!       if (rc < 0) \
!         { \
!           if ((getline line2 < ($$0 ".log")) < 0) \
! 	    recheck = 0; \
!           break; \
!         } \
!       else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
!         { \
!           recheck = 0; \
!           break; \
!         } \
!       else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
!         { \
!           break; \
!         } \
!     }; \
!   if (recheck) \
!     print $$0; \
!   close ($$0 ".trs"); \
!   close ($$0 ".log"); \
! }'
! # A command that, given a newline-separated list of test names on the
! # standard input, create the global log from their .trs and .log files.
! am__create_global_log = $(AWK) ' \
! function fatal(msg) \
! { \
!   print "fatal: making $@: " msg | "cat >&2"; \
!   exit 1; \
! } \
! function rst_section(header) \
! { \
!   print header; \
!   len = length(header); \
!   for (i = 1; i <= len; i = i + 1) \
!     printf "="; \
!   printf "\n\n"; \
! } \
! { \
!   copy_in_global_log = 1; \
!   global_test_result = "RUN"; \
!   while ((rc = (getline line < ($$0 ".trs"))) != 0) \
!     { \
!       if (rc < 0) \
!          fatal("failed to read from " $$0 ".trs"); \
!       if (line ~ /$(am__global_test_result_rx)/) \
!         { \
!           sub("$(am__global_test_result_rx)", "", line); \
!           sub("[ 	]*$$", "", line); \
!           global_test_result = line; \
!         } \
!       else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
!         copy_in_global_log = 0; \
!     }; \
!   if (copy_in_global_log) \
!     { \
!       rst_section(global_test_result ": " $$0); \
!       while ((rc = (getline line < ($$0 ".log"))) != 0) \
!       { \
!         if (rc < 0) \
!           fatal("failed to read from " $$0 ".log"); \
!         print line; \
!       }; \
!       printf "\n"; \
!     }; \
!   close ($$0 ".trs"); \
!   close ($$0 ".log"); \
! }'
! # Restructured Text title.
! am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
! # Solaris 10 'make', and several other traditional 'make' implementations,
! # pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
! # by disabling -e (using the XSI extension "set +e") if it's set.
! am__sh_e_setup = case $$- in *e*) set +e;; esac
! # Default flags passed to test drivers.
! am__common_driver_flags = \
!   --color-tests "$$am__color_tests" \
!   --enable-hard-errors "$$am__enable_hard_errors" \
!   --expect-failure "$$am__expect_failure"
! # To be inserted before the command running the test.  Creates the
! # directory for the log if needed.  Stores in $dir the directory
! # containing $f, in $tst the test, in $log the log.  Executes the
! # developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
! # passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
! # will run the test scripts (or their associated LOG_COMPILER, if
! # thy have one).
! am__check_pre = \
! $(am__sh_e_setup);					\
! $(am__vpath_adj_setup) $(am__vpath_adj)			\
! $(am__tty_colors);					\
! srcdir=$(srcdir); export srcdir;			\
! case "$@" in						\
!   */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
!     *) am__odir=.;; 					\
! esac;							\
! test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
!   || $(MKDIR_P) "$$am__odir" || exit $$?;		\
! if test -f "./$$f"; then dir=./;			\
! elif test -f "$$f"; then dir=;				\
! else dir="$(srcdir)/"; fi;				\
! tst=$$dir$$f; log='$@'; 				\
! if test -n '$(DISABLE_HARD_ERRORS)'; then		\
!   am__enable_hard_errors=no; 				\
! else							\
!   am__enable_hard_errors=yes; 				\
! fi; 							\
! case " $(XFAIL_TESTS) " in				\
!   *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
!     am__expect_failure=yes;;				\
!   *)							\
!     am__expect_failure=no;;				\
! esac; 							\
! $(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
! # A shell command to get the names of the tests scripts with any registered
! # extension removed (i.e., equivalently, the names of the test logs, with
! # the '.log' extension removed).  The result is saved in the shell variable
! # '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
! # we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
! # since that might cause problem with VPATH rewrites for suffix-less tests.
! # See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
! am__set_TESTS_bases = \
!   bases='$(TEST_LOGS)'; \
!   bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
!   bases=`echo $$bases`
! RECHECK_LOGS = $(TEST_LOGS)
! AM_RECURSIVE_TARGETS = check recheck
! TEST_SUITE_LOG = test-suite.log
! TEST_EXTENSIONS = @EXEEXT@ .test
! LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
! LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
! am__set_b = \
!   case '$@' in \
!     */*) \
!       case '$*' in \
!         */*) b='$*';; \
!           *) b=`echo '$@' | sed 's/\.log$$//'`; \
!        esac;; \
!     *) \
!       b='$*';; \
!   esac
! am__test_logs1 = $(TESTS:=.log)
! am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
! TEST_LOGS = $(am__test_logs2:.test.log=.log)
! TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
! TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
! 	$(TEST_LOG_FLAGS)
! am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.onetst \
! 	$(top_srcdir)/build-aux/test-driver
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  pkglibexecdir = @pkglibexecdir@
--- 216,220 ----
    esac
  am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
! am__DIST_COMMON = $(srcdir)/Makefile.in
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  pkglibexecdir = @pkglibexecdir@
***************
*** 1183,1206 ****
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
! 
! # List of files that describe tests.  See tp/tests/README.
! test_driving_files_generated_list = ./tests-parser.txt
! 
! # List of test scripts that only run one test
! one_test_files_generated_list = \
!      test_scripts/htmlxref_htmlxref.sh \
!      test_scripts/htmlxref_htmlxref_nodes.sh
! 
! 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 = htmlxref.cnf-ref res_parser \
!  $(one_test_files_generated_list) $(test_driving_files_generated_list)
! 
  DISTCLEANFILES = tests.log tests.out htmlxref.cnf
  all: all-am
  
  .SUFFIXES:
! .SUFFIXES: .log .test .test$(EXEEXT) .trs
! $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/Makefile.onetst $(am__configure_deps)
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
--- 967,976 ----
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
! EXTRA_DIST = htmlxref.cnf-ref res_parser tests-parser.txt
  DISTCLEANFILES = tests.log tests.out htmlxref.cnf
  all: all-am
  
  .SUFFIXES:
! $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
***************
*** 1222,1226 ****
  	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
  	esac;
- $(srcdir)/Makefile.onetst $(am__empty):
  
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
--- 992,995 ----
***************
*** 1239,1412 ****
  
  
- # Recover from deleted '.trs' file; this should ensure that
- # "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
- # both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
- # to avoid problems with "make -n".
- .log.trs:
- 	rm -f $< $@
- 	$(MAKE) $(AM_MAKEFLAGS) $<
- 
- # Leading 'am--fnord' is there to ensure the list of targets does not
- # expand to empty, as could happen e.g. with make check TESTS=''.
- am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
- am--force-recheck:
- 	@:
- 
- $(TEST_SUITE_LOG): $(TEST_LOGS)
- 	@$(am__set_TESTS_bases); \
- 	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
- 	redo_bases=`for i in $$bases; do \
- 	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
- 	            done`; \
- 	if test -n "$$redo_bases"; then \
- 	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
- 	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
- 	  if $(am__make_dryrun); then :; else \
- 	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
- 	  fi; \
- 	fi; \
- 	if test -n "$$am__remaking_logs"; then \
- 	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
- 	       "recursion detected" >&2; \
- 	elif test -n "$$redo_logs"; then \
- 	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
- 	fi; \
- 	if $(am__make_dryrun); then :; else \
- 	  st=0;  \
- 	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
- 	  for i in $$redo_bases; do \
- 	    test -f $$i.trs && test -r $$i.trs \
- 	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
- 	    test -f $$i.log && test -r $$i.log \
- 	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
- 	  done; \
- 	  test $$st -eq 0 || exit 1; \
- 	fi
- 	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
- 	ws='[ 	]'; \
- 	results=`for b in $$bases; do echo $$b.trs; done`; \
- 	test -n "$$results" || results=/dev/null; \
- 	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
- 	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
- 	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
- 	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
- 	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
- 	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
- 	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
- 	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
- 	  success=true; \
- 	else \
- 	  success=false; \
- 	fi; \
- 	br='==================='; br=$$br$$br$$br$$br; \
- 	result_count () \
- 	{ \
- 	    if test x"$$1" = x"--maybe-color"; then \
- 	      maybe_colorize=yes; \
- 	    elif test x"$$1" = x"--no-color"; then \
- 	      maybe_colorize=no; \
- 	    else \
- 	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
- 	    fi; \
- 	    shift; \
- 	    desc=$$1 count=$$2; \
- 	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
- 	      color_start=$$3 color_end=$$std; \
- 	    else \
- 	      color_start= color_end=; \
- 	    fi; \
- 	    echo "$${color_start}# $$desc $$count$${color_end}"; \
- 	}; \
- 	create_testsuite_report () \
- 	{ \
- 	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
- 	  result_count $$1 "PASS: " $$pass  "$$grn"; \
- 	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
- 	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
- 	  result_count $$1 "FAIL: " $$fail  "$$red"; \
- 	  result_count $$1 "XPASS:" $$xpass "$$red"; \
- 	  result_count $$1 "ERROR:" $$error "$$mgn"; \
- 	}; \
- 	{								\
- 	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
- 	    $(am__rst_title);						\
- 	  create_testsuite_report --no-color;				\
- 	  echo;								\
- 	  echo ".. contents:: :depth: 2";				\
- 	  echo;								\
- 	  for b in $$bases; do echo $$b; done				\
- 	    | $(am__create_global_log);					\
- 	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
- 	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
- 	if $$success; then						\
- 	  col="$$grn";							\
- 	 else								\
- 	  col="$$red";							\
- 	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
- 	fi;								\
- 	echo "$${col}$$br$${std}"; 					\
- 	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
- 	echo "$${col}$$br$${std}"; 					\
- 	create_testsuite_report --maybe-color;				\
- 	echo "$$col$$br$$std";						\
- 	if $$success; then :; else					\
- 	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
- 	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
- 	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
- 	  fi;								\
- 	  echo "$$col$$br$$std";					\
- 	fi;								\
- 	$$success || exit 1
- 
- check-TESTS:
- 	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
- 	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
- 	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
- 	@set +e; $(am__set_TESTS_bases); \
- 	log_list=`for i in $$bases; do echo $$i.log; done`; \
- 	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
- 	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
- 	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
- 	exit $$?;
- recheck: all 
- 	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
- 	@set +e; $(am__set_TESTS_bases); \
- 	bases=`for i in $$bases; do echo $$i; done \
- 	         | $(am__list_recheck_tests)` || exit 1; \
- 	log_list=`for i in $$bases; do echo $$i.log; done`; \
- 	log_list=`echo $$log_list`; \
- 	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
- 	        am__force_recheck=am--force-recheck \
- 	        TEST_LOGS="$$log_list"; \
- 	exit $$?
- test_scripts/htmlxref_htmlxref.sh.log: test_scripts/htmlxref_htmlxref.sh
- 	@p='test_scripts/htmlxref_htmlxref.sh'; \
- 	b='test_scripts/htmlxref_htmlxref.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/htmlxref_htmlxref_nodes.sh.log: test_scripts/htmlxref_htmlxref_nodes.sh
- 	@p='test_scripts/htmlxref_htmlxref_nodes.sh'; \
- 	b='test_scripts/htmlxref_htmlxref_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.log:
- 	@p='$<'; \
- 	$(am__set_b); \
- 	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
- 	--log-file $$b.log --trs-file $$b.trs \
- 	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
- 	"$$tst" $(AM_TESTS_FD_REDIRECT)
- @am__EXEEXT_TRUE@.test$(EXEEXT).log:
- @am__EXEEXT_TRUE@	@p='$<'; \
- @am__EXEEXT_TRUE@	$(am__set_b); \
- @am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
- @am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
- @am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
- @am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
- 
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--- 1008,1011 ----
***************
*** 1443,1447 ****
  	  dist-hook
  check-am: all-am
- 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
  check: check-am
  all-am: Makefile
--- 1042,1045 ----
***************
*** 1467,1473 ****
  	fi
  mostlyclean-generic:
- 	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
- 	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
- 	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
  
  clean-generic:
--- 1065,1068 ----
***************
*** 1547,1556 ****
  uninstall-am:
  
! .MAKE: check-am install-am install-strip
  
! .PHONY: all all-am check check-TESTS check-am clean clean-generic \
! 	cscopelist-am ctags-am dist-hook distclean distclean-generic \
! 	distclean-local 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 \
--- 1142,1151 ----
  uninstall-am:
  
! .MAKE: install-am install-strip
  
! .PHONY: all all-am check check-am clean clean-generic cscopelist-am \
! 	ctags-am dist-hook distclean distclean-generic distclean-local \
! 	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 \
***************
*** 1558,1578 ****
  	install-strip installcheck installcheck-am installdirs \
  	maintainer-clean maintainer-clean-generic mostlyclean \
! 	mostlyclean-generic pdf pdf-am ps ps-am recheck tags-am \
! 	uninstall uninstall-am
  
  .PRECIOUS: Makefile
  
  
- # autogenerated test scripts list and tests-parser.txt list
- 
- $(srcdir)/Makefile.onetst: \
-   ../../maintain/regenerate_cmd_tests.sh $(test_driving_files_generated_list) 
- 	cd $(srcdir) \
- 	&& $(SHELL) ../../maintain/regenerate_cmd_tests.sh "$@" htmlxref \
- 	  -base .
- 
- copy-tests:
- 	$(srcdir)/../run_parser_all.sh -copy
- 
  distclean-local:
  	rm -rf out_parser diffs test_log
--- 1153,1162 ----
  	install-strip installcheck installcheck-am installdirs \
  	maintainer-clean maintainer-clean-generic mostlyclean \
! 	mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
! 	uninstall-am
  
  .PRECIOUS: Makefile
  
  
  distclean-local:
  	rm -rf out_parser diffs test_log
diff -Nrc2 texinfo-6.1/tp/tests/htmlxref/Makefile.onetst texinfo-6.3/tp/tests/htmlxref/Makefile.onetst
*** texinfo-6.1/tp/tests/htmlxref/Makefile.onetst	2016-01-23 11:30:37.000000000 +0000
--- texinfo-6.3/tp/tests/htmlxref/Makefile.onetst	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,20 ****
- # Makefile.onetst generated by ../../maintain/regenerate_cmd_tests.sh.
- #
- # Copyright 2016 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.
- 
- # List of files that describe tests.  See tp/tests/README.
- test_driving_files_generated_list = ./tests-parser.txt
- 
- # List of test scripts that only run one test
- one_test_files_generated_list =  \
-      test_scripts/htmlxref_htmlxref.sh \
-      test_scripts/htmlxref_htmlxref_nodes.sh
- 
--- 0 ----
diff -Nrc2 texinfo-6.1/tp/tests/htmlxref/res_parser/htmlxref/test_refs.2 texinfo-6.3/tp/tests/htmlxref/res_parser/htmlxref/test_refs.2
*** texinfo-6.1/tp/tests/htmlxref/res_parser/htmlxref/test_refs.2	2016-01-22 07:56:49.000000000 +0000
--- texinfo-6.3/tp/tests/htmlxref/res_parser/htmlxref/test_refs.2	2016-07-31 16:20:07.000000000 +0100
***************
*** 1,2 ****
! ./htmlxref.cnf:15: warning: unrecognized type: foo
! ./htmlxref.cnf:16: warning: missing type
--- 1,2 ----
! ./htmlxref/htmlxref.cnf:15: warning: unrecognized type: foo
! ./htmlxref/htmlxref.cnf:16: warning: missing type
diff -Nrc2 texinfo-6.1/tp/tests/htmlxref/res_parser/htmlxref_nodes/test_refs.2 texinfo-6.3/tp/tests/htmlxref/res_parser/htmlxref_nodes/test_refs.2
*** texinfo-6.1/tp/tests/htmlxref/res_parser/htmlxref_nodes/test_refs.2	2016-01-22 07:56:49.000000000 +0000
--- texinfo-6.3/tp/tests/htmlxref/res_parser/htmlxref_nodes/test_refs.2	2016-07-31 16:20:07.000000000 +0100
***************
*** 1,2 ****
! ./htmlxref.cnf:15: warning: unrecognized type: foo
! ./htmlxref.cnf:16: warning: missing type
--- 1,2 ----
! ./htmlxref/htmlxref.cnf:15: warning: unrecognized type: foo
! ./htmlxref/htmlxref.cnf:16: warning: missing type
diff -Nrc2 texinfo-6.1/tp/tests/htmlxref/test_scripts/htmlxref_htmlxref.sh texinfo-6.3/tp/tests/htmlxref/test_scripts/htmlxref_htmlxref.sh
*** texinfo-6.1/tp/tests/htmlxref/test_scripts/htmlxref_htmlxref.sh	2016-01-23 11:30:37.000000000 +0000
--- texinfo-6.3/tp/tests/htmlxref/test_scripts/htmlxref_htmlxref.sh	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,31 ****
- #! /bin/sh
- 
- if test z"$srcdir" = "z"; then
-   srcdir=.
- fi
- 
- command=run_parser_all.sh
- one_test_logs_dir=test_log
- diffs_dir=diffs
- 
- 
- 
- if test "z$LONG_TESTS" = z"yes"; then
-   echo "Skipping short tests because we are only doing long tests"
-   exit 77
- fi
- dir=.
- arg='htmlxref'
- name='htmlxref'
- [ -d "$dir" ] || mkdir $dir
- 
- srcdir_test=$dir; export srcdir_test;
- "$srcdir"/../"$command" -dir $dir $arg
- exit_status=$?
- cat $dir/$one_test_logs_dir/$name.log
- if test -f $dir/$diffs_dir/$name.diff; then
-   echo 
-   cat $dir/$diffs_dir/$name.diff
- fi
- exit $exit_status
- 
--- 0 ----
diff -Nrc2 texinfo-6.1/tp/tests/htmlxref/test_scripts/htmlxref_htmlxref_nodes.sh texinfo-6.3/tp/tests/htmlxref/test_scripts/htmlxref_htmlxref_nodes.sh
*** texinfo-6.1/tp/tests/htmlxref/test_scripts/htmlxref_htmlxref_nodes.sh	2016-01-23 11:30:37.000000000 +0000
--- texinfo-6.3/tp/tests/htmlxref/test_scripts/htmlxref_htmlxref_nodes.sh	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,31 ****
- #! /bin/sh
- 
- if test z"$srcdir" = "z"; then
-   srcdir=.
- fi
- 
- command=run_parser_all.sh
- one_test_logs_dir=test_log
- diffs_dir=diffs
- 
- 
- 
- if test "z$LONG_TESTS" = z"yes"; then
-   echo "Skipping short tests because we are only doing long tests"
-   exit 77
- fi
- dir=.
- arg='htmlxref_nodes'
- name='htmlxref_nodes'
- [ -d "$dir" ] || mkdir $dir
- 
- srcdir_test=$dir; export srcdir_test;
- "$srcdir"/../"$command" -dir $dir $arg
- exit_status=$?
- cat $dir/$one_test_logs_dir/$name.log
- if test -f $dir/$diffs_dir/$name.diff; then
-   echo 
-   cat $dir/$diffs_dir/$name.diff
- fi
- exit $exit_status
- 
--- 0 ----
diff -Nrc2 texinfo-6.1/tp/tests/htmlxref/tests-parser.txt texinfo-6.3/tp/tests/htmlxref/tests-parser.txt
*** texinfo-6.1/tp/tests/htmlxref/tests-parser.txt	2015-07-22 17:17:33.000000000 +0100
--- texinfo-6.3/tp/tests/htmlxref/tests-parser.txt	2016-07-31 16:20:07.000000000 +0100
***************
*** 1,2 ****
! htmlxref ../sectioning/test_refs.texi --set-customization-variable CHECK_HTMLXREF
! htmlxref_nodes ../sectioning/test_refs.texi --split node --set-customization-variable 'USE_NODES 1' --node-files
--- 1,3 ----
! htmlxref ../sectioning/test_refs.texi --set-customization-variable CHECK_HTMLXREF -c HTMLXREF=htmlxref.cnf-ref --set-customization-variable 'HTMLXREF=htmlxref/htmlxref.cnf'
! 
! htmlxref_nodes ../sectioning/test_refs.texi --split node --set-customization-variable 'USE_NODES 1' --node-files --set-customization-variable 'HTMLXREF=htmlxref/htmlxref.cnf'
diff -Nrc2 texinfo-6.1/tp/tests/htmlxref-only_mono/Makefile.am texinfo-6.3/tp/tests/htmlxref-only_mono/Makefile.am
*** texinfo-6.1/tp/tests/htmlxref-only_mono/Makefile.am	2015-07-30 12:13:42.000000000 +0100
--- texinfo-6.3/tp/tests/htmlxref-only_mono/Makefile.am	2016-07-31 16:20:07.000000000 +0100
***************
*** 1,19 ****
! # autogenerated test scripts list and tests-parser.txt list
! include $(srcdir)/Makefile.onetst
! 
! $(srcdir)/Makefile.onetst: \
!   ../../maintain/regenerate_cmd_tests.sh $(test_driving_files_generated_list) 
! 	cd $(srcdir) \
! 	&& $(SHELL) ../../maintain/regenerate_cmd_tests.sh "$@" htmlxref-only_mono \
! 	  -base .
! 
! 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;
! 
! copy-tests:
! 	$(srcdir)/../run_parser_all.sh -copy
! 
! EXTRA_DIST = htmlxref.cnf-ref res_parser \
!  $(one_test_files_generated_list) $(test_driving_files_generated_list)
  
  DISTCLEANFILES = tests.log tests.out htmlxref.cnf
--- 1,3 ----
! EXTRA_DIST = htmlxref.cnf-ref res_parser tests-parser.txt
  
  DISTCLEANFILES = tests.log tests.out htmlxref.cnf
diff -Nrc2 texinfo-6.1/tp/tests/htmlxref-only_mono/Makefile.in texinfo-6.3/tp/tests/htmlxref-only_mono/Makefile.in
*** texinfo-6.1/tp/tests/htmlxref-only_mono/Makefile.in	2016-02-06 12:24:07.000000000 +0000
--- texinfo-6.3/tp/tests/htmlxref-only_mono/Makefile.in	2016-09-10 20:29:58.000000000 +0100
***************
*** 14,29 ****
  
  @SET_MAKE@
- 
- # Makefile.onetst generated by ../../maintain/regenerate_cmd_tests.sh.
- #
- # Copyright 2016 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.
  VPATH = @srcdir@
  am__is_gnu_make = { \
--- 14,17 ----
***************
*** 121,124 ****
--- 109,113 ----
  	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
  	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+ 	$(top_srcdir)/gnulib/m4/hard-locale.m4 \
  	$(top_srcdir)/gnulib/m4/iconv.m4 \
  	$(top_srcdir)/gnulib/m4/include_next.m4 \
***************
*** 227,436 ****
    esac
  am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
! am__tty_colors_dummy = \
!   mgn= red= grn= lgn= blu= brg= std=; \
!   am__color_tests=no
! am__tty_colors = { \
!   $(am__tty_colors_dummy); \
!   if test "X$(AM_COLOR_TESTS)" = Xno; then \
!     am__color_tests=no; \
!   elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
!     am__color_tests=yes; \
!   elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
!     am__color_tests=yes; \
!   fi; \
!   if test $$am__color_tests = yes; then \
!     red='[0;31m'; \
!     grn='[0;32m'; \
!     lgn='[1;32m'; \
!     blu='[1;34m'; \
!     mgn='[0;35m'; \
!     brg='[1m'; \
!     std='[m'; \
!   fi; \
! }
! am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
! am__vpath_adj = case $$p in \
!     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
!     *) f=$$p;; \
!   esac;
! am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
! am__install_max = 40
! am__nobase_strip_setup = \
!   srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
! am__nobase_strip = \
!   for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
! am__nobase_list = $(am__nobase_strip_setup); \
!   for p in $$list; do echo "$$p $$p"; done | \
!   sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
!   $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
!     if (++n[$$2] == $(am__install_max)) \
!       { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
!     END { for (dir in files) print dir, files[dir] }'
! am__base_list = \
!   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
!   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
! am__uninstall_files_from_dir = { \
!   test -z "$$files" \
!     || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
!     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
!          $(am__cd) "$$dir" && rm -f $$files; }; \
!   }
! am__recheck_rx = ^[ 	]*:recheck:[ 	]*
! am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
! am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
! # A command that, given a newline-separated list of test names on the
! # standard input, print the name of the tests that are to be re-run
! # upon "make recheck".
! am__list_recheck_tests = $(AWK) '{ \
!   recheck = 1; \
!   while ((rc = (getline line < ($$0 ".trs"))) != 0) \
!     { \
!       if (rc < 0) \
!         { \
!           if ((getline line2 < ($$0 ".log")) < 0) \
! 	    recheck = 0; \
!           break; \
!         } \
!       else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
!         { \
!           recheck = 0; \
!           break; \
!         } \
!       else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
!         { \
!           break; \
!         } \
!     }; \
!   if (recheck) \
!     print $$0; \
!   close ($$0 ".trs"); \
!   close ($$0 ".log"); \
! }'
! # A command that, given a newline-separated list of test names on the
! # standard input, create the global log from their .trs and .log files.
! am__create_global_log = $(AWK) ' \
! function fatal(msg) \
! { \
!   print "fatal: making $@: " msg | "cat >&2"; \
!   exit 1; \
! } \
! function rst_section(header) \
! { \
!   print header; \
!   len = length(header); \
!   for (i = 1; i <= len; i = i + 1) \
!     printf "="; \
!   printf "\n\n"; \
! } \
! { \
!   copy_in_global_log = 1; \
!   global_test_result = "RUN"; \
!   while ((rc = (getline line < ($$0 ".trs"))) != 0) \
!     { \
!       if (rc < 0) \
!          fatal("failed to read from " $$0 ".trs"); \
!       if (line ~ /$(am__global_test_result_rx)/) \
!         { \
!           sub("$(am__global_test_result_rx)", "", line); \
!           sub("[ 	]*$$", "", line); \
!           global_test_result = line; \
!         } \
!       else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
!         copy_in_global_log = 0; \
!     }; \
!   if (copy_in_global_log) \
!     { \
!       rst_section(global_test_result ": " $$0); \
!       while ((rc = (getline line < ($$0 ".log"))) != 0) \
!       { \
!         if (rc < 0) \
!           fatal("failed to read from " $$0 ".log"); \
!         print line; \
!       }; \
!       printf "\n"; \
!     }; \
!   close ($$0 ".trs"); \
!   close ($$0 ".log"); \
! }'
! # Restructured Text title.
! am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
! # Solaris 10 'make', and several other traditional 'make' implementations,
! # pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
! # by disabling -e (using the XSI extension "set +e") if it's set.
! am__sh_e_setup = case $$- in *e*) set +e;; esac
! # Default flags passed to test drivers.
! am__common_driver_flags = \
!   --color-tests "$$am__color_tests" \
!   --enable-hard-errors "$$am__enable_hard_errors" \
!   --expect-failure "$$am__expect_failure"
! # To be inserted before the command running the test.  Creates the
! # directory for the log if needed.  Stores in $dir the directory
! # containing $f, in $tst the test, in $log the log.  Executes the
! # developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
! # passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
! # will run the test scripts (or their associated LOG_COMPILER, if
! # thy have one).
! am__check_pre = \
! $(am__sh_e_setup);					\
! $(am__vpath_adj_setup) $(am__vpath_adj)			\
! $(am__tty_colors);					\
! srcdir=$(srcdir); export srcdir;			\
! case "$@" in						\
!   */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
!     *) am__odir=.;; 					\
! esac;							\
! test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
!   || $(MKDIR_P) "$$am__odir" || exit $$?;		\
! if test -f "./$$f"; then dir=./;			\
! elif test -f "$$f"; then dir=;				\
! else dir="$(srcdir)/"; fi;				\
! tst=$$dir$$f; log='$@'; 				\
! if test -n '$(DISABLE_HARD_ERRORS)'; then		\
!   am__enable_hard_errors=no; 				\
! else							\
!   am__enable_hard_errors=yes; 				\
! fi; 							\
! case " $(XFAIL_TESTS) " in				\
!   *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
!     am__expect_failure=yes;;				\
!   *)							\
!     am__expect_failure=no;;				\
! esac; 							\
! $(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
! # A shell command to get the names of the tests scripts with any registered
! # extension removed (i.e., equivalently, the names of the test logs, with
! # the '.log' extension removed).  The result is saved in the shell variable
! # '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
! # we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
! # since that might cause problem with VPATH rewrites for suffix-less tests.
! # See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
! am__set_TESTS_bases = \
!   bases='$(TEST_LOGS)'; \
!   bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
!   bases=`echo $$bases`
! RECHECK_LOGS = $(TEST_LOGS)
! AM_RECURSIVE_TARGETS = check recheck
! TEST_SUITE_LOG = test-suite.log
! TEST_EXTENSIONS = @EXEEXT@ .test
! LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
! LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
! am__set_b = \
!   case '$@' in \
!     */*) \
!       case '$*' in \
!         */*) b='$*';; \
!           *) b=`echo '$@' | sed 's/\.log$$//'`; \
!        esac;; \
!     *) \
!       b='$*';; \
!   esac
! am__test_logs1 = $(TESTS:=.log)
! am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
! TEST_LOGS = $(am__test_logs2:.test.log=.log)
! TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
! TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
! 	$(TEST_LOG_FLAGS)
! am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.onetst \
! 	$(top_srcdir)/build-aux/test-driver
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  pkglibexecdir = @pkglibexecdir@
--- 216,220 ----
    esac
  am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
! am__DIST_COMMON = $(srcdir)/Makefile.in
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  pkglibexecdir = @pkglibexecdir@
***************
*** 1183,1206 ****
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
! 
! # List of files that describe tests.  See tp/tests/README.
! test_driving_files_generated_list = ./tests-parser.txt
! 
! # List of test scripts that only run one test
! one_test_files_generated_list = \
!      test_scripts/htmlxref-only_mono_htmlxref.sh \
!      test_scripts/htmlxref-only_mono_htmlxref_nodes.sh
! 
! 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 = htmlxref.cnf-ref res_parser \
!  $(one_test_files_generated_list) $(test_driving_files_generated_list)
! 
  DISTCLEANFILES = tests.log tests.out htmlxref.cnf
  all: all-am
  
  .SUFFIXES:
! .SUFFIXES: .log .test .test$(EXEEXT) .trs
! $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/Makefile.onetst $(am__configure_deps)
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
--- 967,976 ----
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
! EXTRA_DIST = htmlxref.cnf-ref res_parser tests-parser.txt
  DISTCLEANFILES = tests.log tests.out htmlxref.cnf
  all: all-am
  
  .SUFFIXES:
! $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
***************
*** 1222,1226 ****
  	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
  	esac;
- $(srcdir)/Makefile.onetst $(am__empty):
  
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
--- 992,995 ----
***************
*** 1239,1412 ****
  
  
- # Recover from deleted '.trs' file; this should ensure that
- # "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
- # both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
- # to avoid problems with "make -n".
- .log.trs:
- 	rm -f $< $@
- 	$(MAKE) $(AM_MAKEFLAGS) $<
- 
- # Leading 'am--fnord' is there to ensure the list of targets does not
- # expand to empty, as could happen e.g. with make check TESTS=''.
- am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
- am--force-recheck:
- 	@:
- 
- $(TEST_SUITE_LOG): $(TEST_LOGS)
- 	@$(am__set_TESTS_bases); \
- 	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
- 	redo_bases=`for i in $$bases; do \
- 	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
- 	            done`; \
- 	if test -n "$$redo_bases"; then \
- 	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
- 	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
- 	  if $(am__make_dryrun); then :; else \
- 	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
- 	  fi; \
- 	fi; \
- 	if test -n "$$am__remaking_logs"; then \
- 	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
- 	       "recursion detected" >&2; \
- 	elif test -n "$$redo_logs"; then \
- 	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
- 	fi; \
- 	if $(am__make_dryrun); then :; else \
- 	  st=0;  \
- 	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
- 	  for i in $$redo_bases; do \
- 	    test -f $$i.trs && test -r $$i.trs \
- 	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
- 	    test -f $$i.log && test -r $$i.log \
- 	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
- 	  done; \
- 	  test $$st -eq 0 || exit 1; \
- 	fi
- 	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
- 	ws='[ 	]'; \
- 	results=`for b in $$bases; do echo $$b.trs; done`; \
- 	test -n "$$results" || results=/dev/null; \
- 	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
- 	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
- 	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
- 	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
- 	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
- 	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
- 	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
- 	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
- 	  success=true; \
- 	else \
- 	  success=false; \
- 	fi; \
- 	br='==================='; br=$$br$$br$$br$$br; \
- 	result_count () \
- 	{ \
- 	    if test x"$$1" = x"--maybe-color"; then \
- 	      maybe_colorize=yes; \
- 	    elif test x"$$1" = x"--no-color"; then \
- 	      maybe_colorize=no; \
- 	    else \
- 	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
- 	    fi; \
- 	    shift; \
- 	    desc=$$1 count=$$2; \
- 	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
- 	      color_start=$$3 color_end=$$std; \
- 	    else \
- 	      color_start= color_end=; \
- 	    fi; \
- 	    echo "$${color_start}# $$desc $$count$${color_end}"; \
- 	}; \
- 	create_testsuite_report () \
- 	{ \
- 	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
- 	  result_count $$1 "PASS: " $$pass  "$$grn"; \
- 	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
- 	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
- 	  result_count $$1 "FAIL: " $$fail  "$$red"; \
- 	  result_count $$1 "XPASS:" $$xpass "$$red"; \
- 	  result_count $$1 "ERROR:" $$error "$$mgn"; \
- 	}; \
- 	{								\
- 	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
- 	    $(am__rst_title);						\
- 	  create_testsuite_report --no-color;				\
- 	  echo;								\
- 	  echo ".. contents:: :depth: 2";				\
- 	  echo;								\
- 	  for b in $$bases; do echo $$b; done				\
- 	    | $(am__create_global_log);					\
- 	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
- 	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
- 	if $$success; then						\
- 	  col="$$grn";							\
- 	 else								\
- 	  col="$$red";							\
- 	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
- 	fi;								\
- 	echo "$${col}$$br$${std}"; 					\
- 	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
- 	echo "$${col}$$br$${std}"; 					\
- 	create_testsuite_report --maybe-color;				\
- 	echo "$$col$$br$$std";						\
- 	if $$success; then :; else					\
- 	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
- 	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
- 	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
- 	  fi;								\
- 	  echo "$$col$$br$$std";					\
- 	fi;								\
- 	$$success || exit 1
- 
- check-TESTS:
- 	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
- 	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
- 	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
- 	@set +e; $(am__set_TESTS_bases); \
- 	log_list=`for i in $$bases; do echo $$i.log; done`; \
- 	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
- 	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
- 	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
- 	exit $$?;
- recheck: all 
- 	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
- 	@set +e; $(am__set_TESTS_bases); \
- 	bases=`for i in $$bases; do echo $$i; done \
- 	         | $(am__list_recheck_tests)` || exit 1; \
- 	log_list=`for i in $$bases; do echo $$i.log; done`; \
- 	log_list=`echo $$log_list`; \
- 	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
- 	        am__force_recheck=am--force-recheck \
- 	        TEST_LOGS="$$log_list"; \
- 	exit $$?
- test_scripts/htmlxref-only_mono_htmlxref.sh.log: test_scripts/htmlxref-only_mono_htmlxref.sh
- 	@p='test_scripts/htmlxref-only_mono_htmlxref.sh'; \
- 	b='test_scripts/htmlxref-only_mono_htmlxref.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/htmlxref-only_mono_htmlxref_nodes.sh.log: test_scripts/htmlxref-only_mono_htmlxref_nodes.sh
- 	@p='test_scripts/htmlxref-only_mono_htmlxref_nodes.sh'; \
- 	b='test_scripts/htmlxref-only_mono_htmlxref_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.log:
- 	@p='$<'; \
- 	$(am__set_b); \
- 	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
- 	--log-file $$b.log --trs-file $$b.trs \
- 	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
- 	"$$tst" $(AM_TESTS_FD_REDIRECT)
- @am__EXEEXT_TRUE@.test$(EXEEXT).log:
- @am__EXEEXT_TRUE@	@p='$<'; \
- @am__EXEEXT_TRUE@	$(am__set_b); \
- @am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
- @am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
- @am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
- @am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
- 
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--- 1008,1011 ----
***************
*** 1443,1447 ****
  	  dist-hook
  check-am: all-am
- 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
  check: check-am
  all-am: Makefile
--- 1042,1045 ----
***************
*** 1467,1473 ****
  	fi
  mostlyclean-generic:
- 	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
- 	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
- 	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
  
  clean-generic:
--- 1065,1068 ----
***************
*** 1547,1556 ****
  uninstall-am:
  
! .MAKE: check-am install-am install-strip
  
! .PHONY: all all-am check check-TESTS check-am clean clean-generic \
! 	cscopelist-am ctags-am dist-hook distclean distclean-generic \
! 	distclean-local 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 \
--- 1142,1151 ----
  uninstall-am:
  
! .MAKE: install-am install-strip
  
! .PHONY: all all-am check check-am clean clean-generic cscopelist-am \
! 	ctags-am dist-hook distclean distclean-generic distclean-local \
! 	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 \
***************
*** 1558,1578 ****
  	install-strip installcheck installcheck-am installdirs \
  	maintainer-clean maintainer-clean-generic mostlyclean \
! 	mostlyclean-generic pdf pdf-am ps ps-am recheck tags-am \
! 	uninstall uninstall-am
  
  .PRECIOUS: Makefile
  
  
- # autogenerated test scripts list and tests-parser.txt list
- 
- $(srcdir)/Makefile.onetst: \
-   ../../maintain/regenerate_cmd_tests.sh $(test_driving_files_generated_list) 
- 	cd $(srcdir) \
- 	&& $(SHELL) ../../maintain/regenerate_cmd_tests.sh "$@" htmlxref-only_mono \
- 	  -base .
- 
- copy-tests:
- 	$(srcdir)/../run_parser_all.sh -copy
- 
  distclean-local:
  	rm -rf out_parser diffs test_log
--- 1153,1162 ----
  	install-strip installcheck installcheck-am installdirs \
  	maintainer-clean maintainer-clean-generic mostlyclean \
! 	mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
! 	uninstall-am
  
  .PRECIOUS: Makefile
  
  
  distclean-local:
  	rm -rf out_parser diffs test_log
diff -Nrc2 texinfo-6.1/tp/tests/htmlxref-only_mono/Makefile.onetst texinfo-6.3/tp/tests/htmlxref-only_mono/Makefile.onetst
*** texinfo-6.1/tp/tests/htmlxref-only_mono/Makefile.onetst	2016-01-23 11:30:39.000000000 +0000
--- texinfo-6.3/tp/tests/htmlxref-only_mono/Makefile.onetst	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,20 ****
- # Makefile.onetst generated by ../../maintain/regenerate_cmd_tests.sh.
- #
- # Copyright 2016 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.
- 
- # List of files that describe tests.  See tp/tests/README.
- test_driving_files_generated_list = ./tests-parser.txt
- 
- # List of test scripts that only run one test
- one_test_files_generated_list =  \
-      test_scripts/htmlxref-only_mono_htmlxref.sh \
-      test_scripts/htmlxref-only_mono_htmlxref_nodes.sh
- 
--- 0 ----
diff -Nrc2 texinfo-6.1/tp/tests/htmlxref-only_mono/test_scripts/htmlxref-only_mono_htmlxref.sh texinfo-6.3/tp/tests/htmlxref-only_mono/test_scripts/htmlxref-only_mono_htmlxref.sh
*** texinfo-6.1/tp/tests/htmlxref-only_mono/test_scripts/htmlxref-only_mono_htmlxref.sh	2016-01-23 11:30:39.000000000 +0000
--- texinfo-6.3/tp/tests/htmlxref-only_mono/test_scripts/htmlxref-only_mono_htmlxref.sh	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,31 ****
- #! /bin/sh
- 
- if test z"$srcdir" = "z"; then
-   srcdir=.
- fi
- 
- command=run_parser_all.sh
- one_test_logs_dir=test_log
- diffs_dir=diffs
- 
- 
- 
- if test "z$LONG_TESTS" = z"yes"; then
-   echo "Skipping short tests because we are only doing long tests"
-   exit 77
- fi
- dir=.
- arg='htmlxref'
- name='htmlxref'
- [ -d "$dir" ] || mkdir $dir
- 
- srcdir_test=$dir; export srcdir_test;
- "$srcdir"/../"$command" -dir $dir $arg
- exit_status=$?
- cat $dir/$one_test_logs_dir/$name.log
- if test -f $dir/$diffs_dir/$name.diff; then
-   echo 
-   cat $dir/$diffs_dir/$name.diff
- fi
- exit $exit_status
- 
--- 0 ----
diff -Nrc2 texinfo-6.1/tp/tests/htmlxref-only_mono/test_scripts/htmlxref-only_mono_htmlxref_nodes.sh texinfo-6.3/tp/tests/htmlxref-only_mono/test_scripts/htmlxref-only_mono_htmlxref_nodes.sh
*** texinfo-6.1/tp/tests/htmlxref-only_mono/test_scripts/htmlxref-only_mono_htmlxref_nodes.sh	2016-01-23 11:30:39.000000000 +0000
--- texinfo-6.3/tp/tests/htmlxref-only_mono/test_scripts/htmlxref-only_mono_htmlxref_nodes.sh	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,31 ****
- #! /bin/sh
- 
- if test z"$srcdir" = "z"; then
-   srcdir=.
- fi
- 
- command=run_parser_all.sh
- one_test_logs_dir=test_log
- diffs_dir=diffs
- 
- 
- 
- if test "z$LONG_TESTS" = z"yes"; then
-   echo "Skipping short tests because we are only doing long tests"
-   exit 77
- fi
- dir=.
- arg='htmlxref_nodes'
- name='htmlxref_nodes'
- [ -d "$dir" ] || mkdir $dir
- 
- srcdir_test=$dir; export srcdir_test;
- "$srcdir"/../"$command" -dir $dir $arg
- exit_status=$?
- cat $dir/$one_test_logs_dir/$name.log
- if test -f $dir/$diffs_dir/$name.diff; then
-   echo 
-   cat $dir/$diffs_dir/$name.diff
- fi
- exit $exit_status
- 
--- 0 ----
diff -Nrc2 texinfo-6.1/tp/tests/htmlxref-only_mono/tests-parser.txt texinfo-6.3/tp/tests/htmlxref-only_mono/tests-parser.txt
*** texinfo-6.1/tp/tests/htmlxref-only_mono/tests-parser.txt	2015-07-22 17:17:35.000000000 +0100
--- texinfo-6.3/tp/tests/htmlxref-only_mono/tests-parser.txt	2016-07-31 16:20:07.000000000 +0100
***************
*** 1,2 ****
! htmlxref ../sectioning/test_refs.texi
! htmlxref_nodes ../sectioning/test_refs.texi --split node --set-customization-variable 'USE_NODES 1' --node-files
--- 1,2 ----
! htmlxref ../sectioning/test_refs.texi -c HTMLXREF=htmlxref-only_mono/htmlxref.cnf
! htmlxref_nodes ../sectioning/test_refs.texi --split node --set-customization-variable 'USE_NODES 1' --node-files -c HTMLXREF=htmlxref-only_mono/htmlxref.cnf
diff -Nrc2 texinfo-6.1/tp/tests/htmlxref-only_split/Makefile.am texinfo-6.3/tp/tests/htmlxref-only_split/Makefile.am
*** texinfo-6.1/tp/tests/htmlxref-only_split/Makefile.am	2015-07-30 12:14:22.000000000 +0100
--- texinfo-6.3/tp/tests/htmlxref-only_split/Makefile.am	2016-07-31 16:20:07.000000000 +0100
***************
*** 1,19 ****
! # autogenerated test scripts list and tests-parser.txt list
! include $(srcdir)/Makefile.onetst
! 
! $(srcdir)/Makefile.onetst: \
!   ../../maintain/regenerate_cmd_tests.sh $(test_driving_files_generated_list) 
! 	cd $(srcdir) \
! 	&& $(SHELL) ../../maintain/regenerate_cmd_tests.sh "$@" htmlxref-only_split \
! 	  -base .
! 
! 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;
! 
! copy-tests:
! 	$(srcdir)/../run_parser_all.sh -copy
! 
! EXTRA_DIST = htmlxref.cnf-ref htmlxref.cnf-texinfo res_parser \
!  $(one_test_files_generated_list) $(test_driving_files_generated_list)
  
  DISTCLEANFILES = tests.log tests.out htmlxref.cnf
--- 1,3 ----
! EXTRA_DIST = htmlxref.cnf-ref htmlxref.cnf-texinfo res_parser tests-parser.txt
  
  DISTCLEANFILES = tests.log tests.out htmlxref.cnf
diff -Nrc2 texinfo-6.1/tp/tests/htmlxref-only_split/Makefile.in texinfo-6.3/tp/tests/htmlxref-only_split/Makefile.in
*** texinfo-6.1/tp/tests/htmlxref-only_split/Makefile.in	2016-02-06 12:24:08.000000000 +0000
--- texinfo-6.3/tp/tests/htmlxref-only_split/Makefile.in	2016-09-10 20:29:58.000000000 +0100
***************
*** 14,29 ****
  
  @SET_MAKE@
- 
- # Makefile.onetst generated by ../../maintain/regenerate_cmd_tests.sh.
- #
- # Copyright 2016 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.
  VPATH = @srcdir@
  am__is_gnu_make = { \
--- 14,17 ----
***************
*** 121,124 ****
--- 109,113 ----
  	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
  	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+ 	$(top_srcdir)/gnulib/m4/hard-locale.m4 \
  	$(top_srcdir)/gnulib/m4/iconv.m4 \
  	$(top_srcdir)/gnulib/m4/include_next.m4 \
***************
*** 227,436 ****
    esac
  am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
! am__tty_colors_dummy = \
!   mgn= red= grn= lgn= blu= brg= std=; \
!   am__color_tests=no
! am__tty_colors = { \
!   $(am__tty_colors_dummy); \
!   if test "X$(AM_COLOR_TESTS)" = Xno; then \
!     am__color_tests=no; \
!   elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
!     am__color_tests=yes; \
!   elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
!     am__color_tests=yes; \
!   fi; \
!   if test $$am__color_tests = yes; then \
!     red='[0;31m'; \
!     grn='[0;32m'; \
!     lgn='[1;32m'; \
!     blu='[1;34m'; \
!     mgn='[0;35m'; \
!     brg='[1m'; \
!     std='[m'; \
!   fi; \
! }
! am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
! am__vpath_adj = case $$p in \
!     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
!     *) f=$$p;; \
!   esac;
! am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
! am__install_max = 40
! am__nobase_strip_setup = \
!   srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
! am__nobase_strip = \
!   for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
! am__nobase_list = $(am__nobase_strip_setup); \
!   for p in $$list; do echo "$$p $$p"; done | \
!   sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
!   $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
!     if (++n[$$2] == $(am__install_max)) \
!       { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
!     END { for (dir in files) print dir, files[dir] }'
! am__base_list = \
!   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
!   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
! am__uninstall_files_from_dir = { \
!   test -z "$$files" \
!     || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
!     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
!          $(am__cd) "$$dir" && rm -f $$files; }; \
!   }
! am__recheck_rx = ^[ 	]*:recheck:[ 	]*
! am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
! am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
! # A command that, given a newline-separated list of test names on the
! # standard input, print the name of the tests that are to be re-run
! # upon "make recheck".
! am__list_recheck_tests = $(AWK) '{ \
!   recheck = 1; \
!   while ((rc = (getline line < ($$0 ".trs"))) != 0) \
!     { \
!       if (rc < 0) \
!         { \
!           if ((getline line2 < ($$0 ".log")) < 0) \
! 	    recheck = 0; \
!           break; \
!         } \
!       else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
!         { \
!           recheck = 0; \
!           break; \
!         } \
!       else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
!         { \
!           break; \
!         } \
!     }; \
!   if (recheck) \
!     print $$0; \
!   close ($$0 ".trs"); \
!   close ($$0 ".log"); \
! }'
! # A command that, given a newline-separated list of test names on the
! # standard input, create the global log from their .trs and .log files.
! am__create_global_log = $(AWK) ' \
! function fatal(msg) \
! { \
!   print "fatal: making $@: " msg | "cat >&2"; \
!   exit 1; \
! } \
! function rst_section(header) \
! { \
!   print header; \
!   len = length(header); \
!   for (i = 1; i <= len; i = i + 1) \
!     printf "="; \
!   printf "\n\n"; \
! } \
! { \
!   copy_in_global_log = 1; \
!   global_test_result = "RUN"; \
!   while ((rc = (getline line < ($$0 ".trs"))) != 0) \
!     { \
!       if (rc < 0) \
!          fatal("failed to read from " $$0 ".trs"); \
!       if (line ~ /$(am__global_test_result_rx)/) \
!         { \
!           sub("$(am__global_test_result_rx)", "", line); \
!           sub("[ 	]*$$", "", line); \
!           global_test_result = line; \
!         } \
!       else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
!         copy_in_global_log = 0; \
!     }; \
!   if (copy_in_global_log) \
!     { \
!       rst_section(global_test_result ": " $$0); \
!       while ((rc = (getline line < ($$0 ".log"))) != 0) \
!       { \
!         if (rc < 0) \
!           fatal("failed to read from " $$0 ".log"); \
!         print line; \
!       }; \
!       printf "\n"; \
!     }; \
!   close ($$0 ".trs"); \
!   close ($$0 ".log"); \
! }'
! # Restructured Text title.
! am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
! # Solaris 10 'make', and several other traditional 'make' implementations,
! # pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
! # by disabling -e (using the XSI extension "set +e") if it's set.
! am__sh_e_setup = case $$- in *e*) set +e;; esac
! # Default flags passed to test drivers.
! am__common_driver_flags = \
!   --color-tests "$$am__color_tests" \
!   --enable-hard-errors "$$am__enable_hard_errors" \
!   --expect-failure "$$am__expect_failure"
! # To be inserted before the command running the test.  Creates the
! # directory for the log if needed.  Stores in $dir the directory
! # containing $f, in $tst the test, in $log the log.  Executes the
! # developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
! # passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
! # will run the test scripts (or their associated LOG_COMPILER, if
! # thy have one).
! am__check_pre = \
! $(am__sh_e_setup);					\
! $(am__vpath_adj_setup) $(am__vpath_adj)			\
! $(am__tty_colors);					\
! srcdir=$(srcdir); export srcdir;			\
! case "$@" in						\
!   */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
!     *) am__odir=.;; 					\
! esac;							\
! test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
!   || $(MKDIR_P) "$$am__odir" || exit $$?;		\
! if test -f "./$$f"; then dir=./;			\
! elif test -f "$$f"; then dir=;				\
! else dir="$(srcdir)/"; fi;				\
! tst=$$dir$$f; log='$@'; 				\
! if test -n '$(DISABLE_HARD_ERRORS)'; then		\
!   am__enable_hard_errors=no; 				\
! else							\
!   am__enable_hard_errors=yes; 				\
! fi; 							\
! case " $(XFAIL_TESTS) " in				\
!   *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
!     am__expect_failure=yes;;				\
!   *)							\
!     am__expect_failure=no;;				\
! esac; 							\
! $(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
! # A shell command to get the names of the tests scripts with any registered
! # extension removed (i.e., equivalently, the names of the test logs, with
! # the '.log' extension removed).  The result is saved in the shell variable
! # '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
! # we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
! # since that might cause problem with VPATH rewrites for suffix-less tests.
! # See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
! am__set_TESTS_bases = \
!   bases='$(TEST_LOGS)'; \
!   bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
!   bases=`echo $$bases`
! RECHECK_LOGS = $(TEST_LOGS)
! AM_RECURSIVE_TARGETS = check recheck
! TEST_SUITE_LOG = test-suite.log
! TEST_EXTENSIONS = @EXEEXT@ .test
! LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
! LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
! am__set_b = \
!   case '$@' in \
!     */*) \
!       case '$*' in \
!         */*) b='$*';; \
!           *) b=`echo '$@' | sed 's/\.log$$//'`; \
!        esac;; \
!     *) \
!       b='$*';; \
!   esac
! am__test_logs1 = $(TESTS:=.log)
! am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
! TEST_LOGS = $(am__test_logs2:.test.log=.log)
! TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
! TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
! 	$(TEST_LOG_FLAGS)
! am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.onetst \
! 	$(top_srcdir)/build-aux/test-driver
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  pkglibexecdir = @pkglibexecdir@
--- 216,220 ----
    esac
  am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
! am__DIST_COMMON = $(srcdir)/Makefile.in
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  pkglibexecdir = @pkglibexecdir@
***************
*** 1183,1206 ****
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
! 
! # List of files that describe tests.  See tp/tests/README.
! test_driving_files_generated_list = ./tests-parser.txt
! 
! # List of test scripts that only run one test
! one_test_files_generated_list = \
!      test_scripts/htmlxref-only_split_htmlxref.sh \
!      test_scripts/htmlxref-only_split_htmlxref_nodes.sh
! 
! 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 = htmlxref.cnf-ref htmlxref.cnf-texinfo res_parser \
!  $(one_test_files_generated_list) $(test_driving_files_generated_list)
! 
  DISTCLEANFILES = tests.log tests.out htmlxref.cnf
  all: all-am
  
  .SUFFIXES:
! .SUFFIXES: .log .test .test$(EXEEXT) .trs
! $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/Makefile.onetst $(am__configure_deps)
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
--- 967,976 ----
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
! EXTRA_DIST = htmlxref.cnf-ref htmlxref.cnf-texinfo res_parser tests-parser.txt
  DISTCLEANFILES = tests.log tests.out htmlxref.cnf
  all: all-am
  
  .SUFFIXES:
! $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
***************
*** 1222,1226 ****
  	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
  	esac;
- $(srcdir)/Makefile.onetst $(am__empty):
  
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
--- 992,995 ----
***************
*** 1239,1412 ****
  
  
- # Recover from deleted '.trs' file; this should ensure that
- # "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
- # both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
- # to avoid problems with "make -n".
- .log.trs:
- 	rm -f $< $@
- 	$(MAKE) $(AM_MAKEFLAGS) $<
- 
- # Leading 'am--fnord' is there to ensure the list of targets does not
- # expand to empty, as could happen e.g. with make check TESTS=''.
- am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
- am--force-recheck:
- 	@:
- 
- $(TEST_SUITE_LOG): $(TEST_LOGS)
- 	@$(am__set_TESTS_bases); \
- 	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
- 	redo_bases=`for i in $$bases; do \
- 	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
- 	            done`; \
- 	if test -n "$$redo_bases"; then \
- 	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
- 	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
- 	  if $(am__make_dryrun); then :; else \
- 	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
- 	  fi; \
- 	fi; \
- 	if test -n "$$am__remaking_logs"; then \
- 	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
- 	       "recursion detected" >&2; \
- 	elif test -n "$$redo_logs"; then \
- 	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
- 	fi; \
- 	if $(am__make_dryrun); then :; else \
- 	  st=0;  \
- 	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
- 	  for i in $$redo_bases; do \
- 	    test -f $$i.trs && test -r $$i.trs \
- 	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
- 	    test -f $$i.log && test -r $$i.log \
- 	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
- 	  done; \
- 	  test $$st -eq 0 || exit 1; \
- 	fi
- 	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
- 	ws='[ 	]'; \
- 	results=`for b in $$bases; do echo $$b.trs; done`; \
- 	test -n "$$results" || results=/dev/null; \
- 	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
- 	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
- 	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
- 	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
- 	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
- 	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
- 	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
- 	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
- 	  success=true; \
- 	else \
- 	  success=false; \
- 	fi; \
- 	br='==================='; br=$$br$$br$$br$$br; \
- 	result_count () \
- 	{ \
- 	    if test x"$$1" = x"--maybe-color"; then \
- 	      maybe_colorize=yes; \
- 	    elif test x"$$1" = x"--no-color"; then \
- 	      maybe_colorize=no; \
- 	    else \
- 	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
- 	    fi; \
- 	    shift; \
- 	    desc=$$1 count=$$2; \
- 	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
- 	      color_start=$$3 color_end=$$std; \
- 	    else \
- 	      color_start= color_end=; \
- 	    fi; \
- 	    echo "$${color_start}# $$desc $$count$${color_end}"; \
- 	}; \
- 	create_testsuite_report () \
- 	{ \
- 	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
- 	  result_count $$1 "PASS: " $$pass  "$$grn"; \
- 	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
- 	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
- 	  result_count $$1 "FAIL: " $$fail  "$$red"; \
- 	  result_count $$1 "XPASS:" $$xpass "$$red"; \
- 	  result_count $$1 "ERROR:" $$error "$$mgn"; \
- 	}; \
- 	{								\
- 	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
- 	    $(am__rst_title);						\
- 	  create_testsuite_report --no-color;				\
- 	  echo;								\
- 	  echo ".. contents:: :depth: 2";				\
- 	  echo;								\
- 	  for b in $$bases; do echo $$b; done				\
- 	    | $(am__create_global_log);					\
- 	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
- 	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
- 	if $$success; then						\
- 	  col="$$grn";							\
- 	 else								\
- 	  col="$$red";							\
- 	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
- 	fi;								\
- 	echo "$${col}$$br$${std}"; 					\
- 	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
- 	echo "$${col}$$br$${std}"; 					\
- 	create_testsuite_report --maybe-color;				\
- 	echo "$$col$$br$$std";						\
- 	if $$success; then :; else					\
- 	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
- 	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
- 	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
- 	  fi;								\
- 	  echo "$$col$$br$$std";					\
- 	fi;								\
- 	$$success || exit 1
- 
- check-TESTS:
- 	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
- 	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
- 	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
- 	@set +e; $(am__set_TESTS_bases); \
- 	log_list=`for i in $$bases; do echo $$i.log; done`; \
- 	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
- 	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
- 	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
- 	exit $$?;
- recheck: all 
- 	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
- 	@set +e; $(am__set_TESTS_bases); \
- 	bases=`for i in $$bases; do echo $$i; done \
- 	         | $(am__list_recheck_tests)` || exit 1; \
- 	log_list=`for i in $$bases; do echo $$i.log; done`; \
- 	log_list=`echo $$log_list`; \
- 	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
- 	        am__force_recheck=am--force-recheck \
- 	        TEST_LOGS="$$log_list"; \
- 	exit $$?
- test_scripts/htmlxref-only_split_htmlxref.sh.log: test_scripts/htmlxref-only_split_htmlxref.sh
- 	@p='test_scripts/htmlxref-only_split_htmlxref.sh'; \
- 	b='test_scripts/htmlxref-only_split_htmlxref.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/htmlxref-only_split_htmlxref_nodes.sh.log: test_scripts/htmlxref-only_split_htmlxref_nodes.sh
- 	@p='test_scripts/htmlxref-only_split_htmlxref_nodes.sh'; \
- 	b='test_scripts/htmlxref-only_split_htmlxref_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.log:
- 	@p='$<'; \
- 	$(am__set_b); \
- 	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
- 	--log-file $$b.log --trs-file $$b.trs \
- 	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
- 	"$$tst" $(AM_TESTS_FD_REDIRECT)
- @am__EXEEXT_TRUE@.test$(EXEEXT).log:
- @am__EXEEXT_TRUE@	@p='$<'; \
- @am__EXEEXT_TRUE@	$(am__set_b); \
- @am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
- @am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
- @am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
- @am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
- 
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--- 1008,1011 ----
***************
*** 1443,1447 ****
  	  dist-hook
  check-am: all-am
- 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
  check: check-am
  all-am: Makefile
--- 1042,1045 ----
***************
*** 1467,1473 ****
  	fi
  mostlyclean-generic:
- 	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
- 	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
- 	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
  
  clean-generic:
--- 1065,1068 ----
***************
*** 1547,1556 ****
  uninstall-am:
  
! .MAKE: check-am install-am install-strip
  
! .PHONY: all all-am check check-TESTS check-am clean clean-generic \
! 	cscopelist-am ctags-am dist-hook distclean distclean-generic \
! 	distclean-local 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 \
--- 1142,1151 ----
  uninstall-am:
  
! .MAKE: install-am install-strip
  
! .PHONY: all all-am check check-am clean clean-generic cscopelist-am \
! 	ctags-am dist-hook distclean distclean-generic distclean-local \
! 	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 \
***************
*** 1558,1578 ****
  	install-strip installcheck installcheck-am installdirs \
  	maintainer-clean maintainer-clean-generic mostlyclean \
! 	mostlyclean-generic pdf pdf-am ps ps-am recheck tags-am \
! 	uninstall uninstall-am
  
  .PRECIOUS: Makefile
  
  
- # autogenerated test scripts list and tests-parser.txt list
- 
- $(srcdir)/Makefile.onetst: \
-   ../../maintain/regenerate_cmd_tests.sh $(test_driving_files_generated_list) 
- 	cd $(srcdir) \
- 	&& $(SHELL) ../../maintain/regenerate_cmd_tests.sh "$@" htmlxref-only_split \
- 	  -base .
- 
- copy-tests:
- 	$(srcdir)/../run_parser_all.sh -copy
- 
  distclean-local:
  	rm -rf out_parser diffs test_log .texinfo
--- 1153,1162 ----
  	install-strip installcheck installcheck-am installdirs \
  	maintainer-clean maintainer-clean-generic mostlyclean \
! 	mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
! 	uninstall-am
  
  .PRECIOUS: Makefile
  
  
  distclean-local:
  	rm -rf out_parser diffs test_log .texinfo
diff -Nrc2 texinfo-6.1/tp/tests/htmlxref-only_split/Makefile.onetst texinfo-6.3/tp/tests/htmlxref-only_split/Makefile.onetst
*** texinfo-6.1/tp/tests/htmlxref-only_split/Makefile.onetst	2016-01-23 11:30:40.000000000 +0000
--- texinfo-6.3/tp/tests/htmlxref-only_split/Makefile.onetst	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,20 ****
- # Makefile.onetst generated by ../../maintain/regenerate_cmd_tests.sh.
- #
- # Copyright 2016 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.
- 
- # List of files that describe tests.  See tp/tests/README.
- test_driving_files_generated_list = ./tests-parser.txt
- 
- # List of test scripts that only run one test
- one_test_files_generated_list =  \
-      test_scripts/htmlxref-only_split_htmlxref.sh \
-      test_scripts/htmlxref-only_split_htmlxref_nodes.sh
- 
--- 0 ----
diff -Nrc2 texinfo-6.1/tp/tests/htmlxref-only_split/test_scripts/htmlxref-only_split_htmlxref.sh texinfo-6.3/tp/tests/htmlxref-only_split/test_scripts/htmlxref-only_split_htmlxref.sh
*** texinfo-6.1/tp/tests/htmlxref-only_split/test_scripts/htmlxref-only_split_htmlxref.sh	2016-01-23 11:30:40.000000000 +0000
--- texinfo-6.3/tp/tests/htmlxref-only_split/test_scripts/htmlxref-only_split_htmlxref.sh	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,31 ****
- #! /bin/sh
- 
- if test z"$srcdir" = "z"; then
-   srcdir=.
- fi
- 
- command=run_parser_all.sh
- one_test_logs_dir=test_log
- diffs_dir=diffs
- 
- 
- 
- if test "z$LONG_TESTS" = z"yes"; then
-   echo "Skipping short tests because we are only doing long tests"
-   exit 77
- fi
- dir=.
- arg='htmlxref'
- name='htmlxref'
- [ -d "$dir" ] || mkdir $dir
- 
- srcdir_test=$dir; export srcdir_test;
- "$srcdir"/../"$command" -dir $dir $arg
- exit_status=$?
- cat $dir/$one_test_logs_dir/$name.log
- if test -f $dir/$diffs_dir/$name.diff; then
-   echo 
-   cat $dir/$diffs_dir/$name.diff
- fi
- exit $exit_status
- 
--- 0 ----
diff -Nrc2 texinfo-6.1/tp/tests/htmlxref-only_split/test_scripts/htmlxref-only_split_htmlxref_nodes.sh texinfo-6.3/tp/tests/htmlxref-only_split/test_scripts/htmlxref-only_split_htmlxref_nodes.sh
*** texinfo-6.1/tp/tests/htmlxref-only_split/test_scripts/htmlxref-only_split_htmlxref_nodes.sh	2016-01-23 11:30:40.000000000 +0000
--- texinfo-6.3/tp/tests/htmlxref-only_split/test_scripts/htmlxref-only_split_htmlxref_nodes.sh	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,31 ****
- #! /bin/sh
- 
- if test z"$srcdir" = "z"; then
-   srcdir=.
- fi
- 
- command=run_parser_all.sh
- one_test_logs_dir=test_log
- diffs_dir=diffs
- 
- 
- 
- if test "z$LONG_TESTS" = z"yes"; then
-   echo "Skipping short tests because we are only doing long tests"
-   exit 77
- fi
- dir=.
- arg='htmlxref_nodes'
- name='htmlxref_nodes'
- [ -d "$dir" ] || mkdir $dir
- 
- srcdir_test=$dir; export srcdir_test;
- "$srcdir"/../"$command" -dir $dir $arg
- exit_status=$?
- cat $dir/$one_test_logs_dir/$name.log
- if test -f $dir/$diffs_dir/$name.diff; then
-   echo 
-   cat $dir/$diffs_dir/$name.diff
- fi
- exit $exit_status
- 
--- 0 ----
diff -Nrc2 texinfo-6.1/tp/tests/htmlxref-only_split/tests-parser.txt texinfo-6.3/tp/tests/htmlxref-only_split/tests-parser.txt
*** texinfo-6.1/tp/tests/htmlxref-only_split/tests-parser.txt	2015-07-22 17:17:36.000000000 +0100
--- texinfo-6.3/tp/tests/htmlxref-only_split/tests-parser.txt	2016-07-31 16:20:07.000000000 +0100
***************
*** 1,2 ****
! htmlxref ../sectioning/test_refs.texi
! htmlxref_nodes ../sectioning/test_refs.texi --split node --set-customization-variable 'USE_NODES 1' --node-files
--- 1,2 ----
! htmlxref ../sectioning/test_refs.texi -c HTMLXREF=htmlxref-only_split/htmlxref.cnf
! htmlxref_nodes ../sectioning/test_refs.texi --split node --set-customization-variable 'USE_NODES 1' --node-files -c HTMLXREF=htmlxref-only_split/htmlxref.cnf
diff -Nrc2 texinfo-6.1/tp/tests/indices/Makefile.in texinfo-6.3/tp/tests/indices/Makefile.in
*** texinfo-6.1/tp/tests/indices/Makefile.in	2016-02-06 12:24:08.000000000 +0000
--- texinfo-6.3/tp/tests/indices/Makefile.in	2016-09-10 20:29:59.000000000 +0100
***************
*** 109,112 ****
--- 109,113 ----
  	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
  	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+ 	$(top_srcdir)/gnulib/m4/hard-locale.m4 \
  	$(top_srcdir)/gnulib/m4/iconv.m4 \
  	$(top_srcdir)/gnulib/m4/include_next.m4 \
diff -Nrc2 texinfo-6.1/tp/tests/layout/Makefile.in texinfo-6.3/tp/tests/layout/Makefile.in
*** texinfo-6.1/tp/tests/layout/Makefile.in	2016-02-06 12:24:08.000000000 +0000
--- texinfo-6.3/tp/tests/layout/Makefile.in	2016-09-10 20:29:59.000000000 +0100
***************
*** 109,112 ****
--- 109,113 ----
  	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
  	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+ 	$(top_srcdir)/gnulib/m4/hard-locale.m4 \
  	$(top_srcdir)/gnulib/m4/iconv.m4 \
  	$(top_srcdir)/gnulib/m4/include_next.m4 \
diff -Nrc2 texinfo-6.1/tp/tests/layout/res_parser/formatting_chm/formatting.2 texinfo-6.3/tp/tests/layout/res_parser/formatting_chm/formatting.2
*** texinfo-6.1/tp/tests/layout/res_parser/formatting_chm/formatting.2	2016-01-22 08:09:28.000000000 +0000
--- texinfo-6.3/tp/tests/layout/res_parser/formatting_chm/formatting.2	2016-09-10 16:55:37.000000000 +0100
***************
*** 26,30 ****
  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 size of integer: 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)
--- 26,30 ----
  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)
***************
*** 72,76 ****
  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 size of integer: 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)
--- 72,76 ----
  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)
***************
*** 118,122 ****
  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 size of integer: 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)
--- 118,122 ----
  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)
***************
*** 164,168 ****
  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 size of integer: 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)
--- 164,168 ----
  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)
diff -Nrc2 texinfo-6.1/tp/tests/layout/res_parser/formatting_exotic/formatting.2 texinfo-6.3/tp/tests/layout/res_parser/formatting_exotic/formatting.2
*** texinfo-6.1/tp/tests/layout/res_parser/formatting_exotic/formatting.2	2016-01-22 08:09:28.000000000 +0000
--- texinfo-6.3/tp/tests/layout/res_parser/formatting_exotic/formatting.2	2016-09-10 16:55:37.000000000 +0100
***************
*** 26,30 ****
  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 size of integer: 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)
--- 26,30 ----
  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)
***************
*** 72,76 ****
  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 size of integer: 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)
--- 72,76 ----
  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)
***************
*** 118,122 ****
  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 size of integer: 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)
--- 118,122 ----
  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)
***************
*** 164,168 ****
  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 size of integer: 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)
--- 164,168 ----
  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)
diff -Nrc2 texinfo-6.1/tp/tests/layout/res_parser/formatting_fr_icons/formatting.2 texinfo-6.3/tp/tests/layout/res_parser/formatting_fr_icons/formatting.2
*** texinfo-6.1/tp/tests/layout/res_parser/formatting_fr_icons/formatting.2	2016-01-22 08:09:28.000000000 +0000
--- texinfo-6.3/tp/tests/layout/res_parser/formatting_fr_icons/formatting.2	2016-09-10 16:55:37.000000000 +0100
***************
*** 26,30 ****
  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 size of integer: 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)
--- 26,30 ----
  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)
***************
*** 72,76 ****
  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 size of integer: 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)
--- 72,76 ----
  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)
***************
*** 118,122 ****
  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 size of integer: 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)
--- 118,122 ----
  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)
***************
*** 164,168 ****
  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 size of integer: 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)
--- 164,168 ----
  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)
diff -Nrc2 texinfo-6.1/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html texinfo-6.3/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
*** texinfo-6.1/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html	2016-01-22 08:09:28.000000000 +0000
--- texinfo-6.3/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html	2016-09-10 16:55:37.000000000 +0100
***************
*** 5402,5406 ****
  
  <p>
!   Ce document a &eacute;t&eacute; g&eacute;n&eacute;r&eacute; <em>a sunny day</em> en utilisant <a href="http://www.gnu.org/software/texinfo/"><em>texi2any</em></a>
  </p>
  <p>
--- 5402,5406 ----
  
  <p>
!   Ce document a &eacute;t&eacute; g&eacute;n&eacute;r&eacute; <em>a sunny day</em> en utilisant <a href="http://www.gnu.org/software/texinfo/"><em>texi2any</em></a>.
  </p>
  <p>
***************
*** 5503,5507 ****
  <hr>
  <p><font size="-1">
!   Ce document a &eacute;t&eacute; g&eacute;n&eacute;r&eacute; <em>a sunny day</em> en utilisant <a href="http://www.gnu.org/software/texinfo/"><em>texi2any</em></a>
  </font></p>
  
--- 5503,5507 ----
  <hr>
  <p><font size="-1">
!   Ce document a &eacute;t&eacute; g&eacute;n&eacute;r&eacute; <em>a sunny day</em> en utilisant <a href="http://www.gnu.org/software/texinfo/"><em>texi2any</em></a>.
  </font></p>
  
diff -Nrc2 texinfo-6.1/tp/tests/layout/res_parser/formatting_html/formatting.2 texinfo-6.3/tp/tests/layout/res_parser/formatting_html/formatting.2
*** texinfo-6.1/tp/tests/layout/res_parser/formatting_html/formatting.2	2016-01-22 08:09:28.000000000 +0000
--- texinfo-6.3/tp/tests/layout/res_parser/formatting_html/formatting.2	2016-09-10 16:55:37.000000000 +0100
***************
*** 26,30 ****
  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 size of integer: 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)
--- 26,30 ----
  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)
***************
*** 72,76 ****
  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 size of integer: 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)
--- 72,76 ----
  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)
***************
*** 118,122 ****
  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 size of integer: 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)
--- 118,122 ----
  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)
***************
*** 164,168 ****
  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 size of integer: 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)
--- 164,168 ----
  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)
diff -Nrc2 texinfo-6.1/tp/tests/layout/res_parser/formatting_html32/formatting.2 texinfo-6.3/tp/tests/layout/res_parser/formatting_html32/formatting.2
*** texinfo-6.1/tp/tests/layout/res_parser/formatting_html32/formatting.2	2016-01-22 08:09:28.000000000 +0000
--- texinfo-6.3/tp/tests/layout/res_parser/formatting_html32/formatting.2	2016-09-10 16:55:37.000000000 +0100
***************
*** 26,30 ****
  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 size of integer: 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)
--- 26,30 ----
  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)
***************
*** 72,76 ****
  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 size of integer: 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)
--- 72,76 ----
  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)
***************
*** 118,122 ****
  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 size of integer: 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)
--- 118,122 ----
  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)
***************
*** 164,168 ****
  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 size of integer: 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)
--- 164,168 ----
  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)
diff -Nrc2 texinfo-6.1/tp/tests/layout/res_parser/formatting_html_nodes/formatting.2 texinfo-6.3/tp/tests/layout/res_parser/formatting_html_nodes/formatting.2
*** texinfo-6.1/tp/tests/layout/res_parser/formatting_html_nodes/formatting.2	2016-01-22 08:09:28.000000000 +0000
--- texinfo-6.3/tp/tests/layout/res_parser/formatting_html_nodes/formatting.2	2016-09-10 16:55:37.000000000 +0100
***************
*** 26,30 ****
  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 size of integer: 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)
--- 26,30 ----
  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)
***************
*** 72,76 ****
  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 size of integer: 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)
--- 72,76 ----
  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)
***************
*** 118,122 ****
  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 size of integer: 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)
--- 118,122 ----
  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)
***************
*** 164,168 ****
  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 size of integer: 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)
--- 164,168 ----
  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)
diff -Nrc2 texinfo-6.1/tp/tests/layout/res_parser/formatting_nodes/formatting.2 texinfo-6.3/tp/tests/layout/res_parser/formatting_nodes/formatting.2
*** texinfo-6.1/tp/tests/layout/res_parser/formatting_nodes/formatting.2	2016-01-22 08:09:28.000000000 +0000
--- texinfo-6.3/tp/tests/layout/res_parser/formatting_nodes/formatting.2	2016-09-10 16:55:37.000000000 +0100
***************
*** 26,30 ****
  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 size of integer: 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)
--- 26,30 ----
  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)
***************
*** 72,76 ****
  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 size of integer: 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)
--- 72,76 ----
  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)
***************
*** 118,122 ****
  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 size of integer: 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)
--- 118,122 ----
  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)
***************
*** 164,168 ****
  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 size of integer: 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)
--- 164,168 ----
  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)
diff -Nrc2 texinfo-6.1/tp/tests/layout/res_parser/formatting_regions/formatting_regions.2 texinfo-6.3/tp/tests/layout/res_parser/formatting_regions/formatting_regions.2
*** texinfo-6.1/tp/tests/layout/res_parser/formatting_regions/formatting_regions.2	2016-01-22 08:09:28.000000000 +0000
--- texinfo-6.3/tp/tests/layout/res_parser/formatting_regions/formatting_regions.2	2016-09-10 16:55:37.000000000 +0100
***************
*** 26,30 ****
  formatting_regions.texi:28: non-hex digits in argument for @U: z (possibly involving @mymacro)
  formatting_regions.texi:28: warning: fewer than four hex digits in argument for @U: abc (possibly involving @mymacro)
! formatting_regions.texi:28: argument for @U exceeds size of integer: FFFFFFFFFFFFFF (possibly involving @mymacro)
  formatting_regions.texi:28: argument for @U exceeds Unicode maximum 0x10FFFF: 110000 (possibly involving @mymacro)
  formatting_regions.texi:28: @TeX expected braces (possibly involving @mymacro)
--- 26,30 ----
  formatting_regions.texi:28: non-hex digits in argument for @U: z (possibly involving @mymacro)
  formatting_regions.texi:28: warning: fewer than four hex digits in argument for @U: abc (possibly involving @mymacro)
! formatting_regions.texi:28: argument for @U exceeds Unicode maximum 0x10FFFF: FFFFFFFFFFFFFF (possibly involving @mymacro)
  formatting_regions.texi:28: argument for @U exceeds Unicode maximum 0x10FFFF: 110000 (possibly involving @mymacro)
  formatting_regions.texi:28: @TeX expected braces (possibly involving @mymacro)
***************
*** 72,76 ****
  formatting_regions.texi:39: non-hex digits in argument for @U: z (possibly involving @mymacro)
  formatting_regions.texi:39: warning: fewer than four hex digits in argument for @U: abc (possibly involving @mymacro)
! formatting_regions.texi:39: argument for @U exceeds size of integer: FFFFFFFFFFFFFF (possibly involving @mymacro)
  formatting_regions.texi:39: argument for @U exceeds Unicode maximum 0x10FFFF: 110000 (possibly involving @mymacro)
  formatting_regions.texi:39: @TeX expected braces (possibly involving @mymacro)
--- 72,76 ----
  formatting_regions.texi:39: non-hex digits in argument for @U: z (possibly involving @mymacro)
  formatting_regions.texi:39: warning: fewer than four hex digits in argument for @U: abc (possibly involving @mymacro)
! formatting_regions.texi:39: argument for @U exceeds Unicode maximum 0x10FFFF: FFFFFFFFFFFFFF (possibly involving @mymacro)
  formatting_regions.texi:39: argument for @U exceeds Unicode maximum 0x10FFFF: 110000 (possibly involving @mymacro)
  formatting_regions.texi:39: @TeX expected braces (possibly involving @mymacro)
***************
*** 118,122 ****
  formatting_regions.texi:46: non-hex digits in argument for @U: z (possibly involving @mymacro)
  formatting_regions.texi:46: warning: fewer than four hex digits in argument for @U: abc (possibly involving @mymacro)
! formatting_regions.texi:46: argument for @U exceeds size of integer: FFFFFFFFFFFFFF (possibly involving @mymacro)
  formatting_regions.texi:46: argument for @U exceeds Unicode maximum 0x10FFFF: 110000 (possibly involving @mymacro)
  formatting_regions.texi:46: @TeX expected braces (possibly involving @mymacro)
--- 118,122 ----
  formatting_regions.texi:46: non-hex digits in argument for @U: z (possibly involving @mymacro)
  formatting_regions.texi:46: warning: fewer than four hex digits in argument for @U: abc (possibly involving @mymacro)
! formatting_regions.texi:46: argument for @U exceeds Unicode maximum 0x10FFFF: FFFFFFFFFFFFFF (possibly involving @mymacro)
  formatting_regions.texi:46: argument for @U exceeds Unicode maximum 0x10FFFF: 110000 (possibly involving @mymacro)
  formatting_regions.texi:46: @TeX expected braces (possibly involving @mymacro)
***************
*** 164,168 ****
  formatting_regions.texi:49: non-hex digits in argument for @U: z (possibly involving @mymacro)
  formatting_regions.texi:49: warning: fewer than four hex digits in argument for @U: abc (possibly involving @mymacro)
! formatting_regions.texi:49: argument for @U exceeds size of integer: FFFFFFFFFFFFFF (possibly involving @mymacro)
  formatting_regions.texi:49: argument for @U exceeds Unicode maximum 0x10FFFF: 110000 (possibly involving @mymacro)
  formatting_regions.texi:49: @TeX expected braces (possibly involving @mymacro)
--- 164,168 ----
  formatting_regions.texi:49: non-hex digits in argument for @U: z (possibly involving @mymacro)
  formatting_regions.texi:49: warning: fewer than four hex digits in argument for @U: abc (possibly involving @mymacro)
! formatting_regions.texi:49: argument for @U exceeds Unicode maximum 0x10FFFF: FFFFFFFFFFFFFF (possibly involving @mymacro)
  formatting_regions.texi:49: argument for @U exceeds Unicode maximum 0x10FFFF: 110000 (possibly involving @mymacro)
  formatting_regions.texi:49: @TeX expected braces (possibly involving @mymacro)
diff -Nrc2 texinfo-6.1/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.2 texinfo-6.3/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.2
*** texinfo-6.1/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.2	2016-01-22 08:09:28.000000000 +0000
--- texinfo-6.3/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.2	2016-09-10 16:55:37.000000000 +0100
***************
*** 26,30 ****
  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 size of integer: 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)
--- 26,30 ----
  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)
***************
*** 72,76 ****
  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 size of integer: 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)
--- 72,76 ----
  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)
***************
*** 118,122 ****
  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 size of integer: 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)
--- 118,122 ----
  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)
***************
*** 164,168 ****
  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 size of integer: 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)
--- 164,168 ----
  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)
diff -Nrc2 texinfo-6.1/tp/tests/layout/res_parser/formatting_xml/formatting.xml texinfo-6.3/tp/tests/layout/res_parser/formatting_xml/formatting.xml
*** texinfo-6.1/tp/tests/layout/res_parser/formatting_xml/formatting.xml	2016-01-22 08:09:28.000000000 +0000
--- texinfo-6.3/tp/tests/layout/res_parser/formatting_xml/formatting.xml	2016-09-10 16:55:37.000000000 +0100
***************
*** 1329,1341 ****
  
  <html endspaces=" ">
- html &textrdquo;
  </html>
  
  <tex endspaces=" ">
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ &textrdquo;
  </tex>
  
  <docbook endspaces=" ">
- docbook &textrdquo;
  </docbook>
  
--- 1329,1338 ----
***************
*** 1932,1944 ****
  
  <html endspaces=" ">
- html &textrdquo;
  </html>
  
  <tex endspaces=" ">
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ &textrdquo;
  </tex>
  
  <docbook endspaces=" ">
- docbook &textrdquo;
  </docbook>
  
--- 1929,1938 ----
***************
*** 2535,2547 ****
  
  <html endspaces=" ">
- html &textrdquo;
  </html>
  
  <tex endspaces=" ">
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ &textrdquo;
  </tex>
  
  <docbook endspaces=" ">
- docbook &textrdquo;
  </docbook>
  
--- 2529,2538 ----
***************
*** 3132,3144 ****
  
  <html endspaces=" ">
- html ''
  </html>
  
  <tex endspaces=" ">
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
  </tex>
  
  <docbook endspaces=" ">
- docbook ''
  </docbook>
  
--- 3123,3132 ----
diff -Nrc2 texinfo-6.1/tp/tests/long_tests.sh texinfo-6.3/tp/tests/long_tests.sh
*** texinfo-6.1/tp/tests/long_tests.sh	2015-02-08 13:22:57.000000000 +0000
--- texinfo-6.3/tp/tests/long_tests.sh	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,22 ****
- #! /bin/sh
- # $Id: long_tests.sh 6073 2015-01-29 00:08:18Z karl $
- # Copyright 2010, 2012, 2013, 2014, 2015 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.
- 
- test -z "$srcdir" && srcdir=.
- 
- if test "z$LONG_TESTS" != z'yes' && test "z$ALL_TESTS" != z'yes'; then
-   echo "Skipping long tests that take a lot of time to run"
-   exit 77
- fi
- 
- if test "z$TEX_HTML_TESTS" = z'yes'; then
-   echo "Skipping long tests, only doing HTML TeX tests"
-   exit 77
- fi
- 
- "$srcdir"/parser_tests.sh "$@" \
-  sectioning coverage indices nested_formats contents layout
--- 0 ----
diff -Nrc2 texinfo-6.1/tp/tests/many_input_files/Makefile.in texinfo-6.3/tp/tests/many_input_files/Makefile.in
*** texinfo-6.1/tp/tests/many_input_files/Makefile.in	2016-02-06 12:24:08.000000000 +0000
--- texinfo-6.3/tp/tests/many_input_files/Makefile.in	2016-09-10 20:29:59.000000000 +0100
***************
*** 121,124 ****
--- 121,125 ----
  	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
  	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+ 	$(top_srcdir)/gnulib/m4/hard-locale.m4 \
  	$(top_srcdir)/gnulib/m4/iconv.m4 \
  	$(top_srcdir)/gnulib/m4/include_next.m4 \
diff -Nrc2 texinfo-6.1/tp/tests/nested_formats/Makefile.in texinfo-6.3/tp/tests/nested_formats/Makefile.in
*** texinfo-6.1/tp/tests/nested_formats/Makefile.in	2016-02-06 12:24:09.000000000 +0000
--- texinfo-6.3/tp/tests/nested_formats/Makefile.in	2016-09-10 20:29:59.000000000 +0100
***************
*** 109,112 ****
--- 109,113 ----
  	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
  	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+ 	$(top_srcdir)/gnulib/m4/hard-locale.m4 \
  	$(top_srcdir)/gnulib/m4/iconv.m4 \
  	$(top_srcdir)/gnulib/m4/include_next.m4 \
diff -Nrc2 texinfo-6.1/tp/tests/nested_formats/res_parser/texi_nested_formats/nested_formats.texi texinfo-6.3/tp/tests/nested_formats/res_parser/texi_nested_formats/nested_formats.texi
*** texinfo-6.1/tp/tests/nested_formats/res_parser/texi_nested_formats/nested_formats.texi	2016-01-22 08:09:29.000000000 +0000
--- texinfo-6.3/tp/tests/nested_formats/res_parser/texi_nested_formats/nested_formats.texi	2016-07-31 16:35:10.000000000 +0100
***************
*** 233,237 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
--- 233,236 ----
***************
*** 241,245 ****
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 240,243 ----
***************
*** 394,398 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
--- 392,395 ----
***************
*** 402,406 ****
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 399,402 ----
***************
*** 556,560 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
--- 552,555 ----
***************
*** 564,568 ****
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 559,562 ----
***************
*** 716,720 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
--- 710,713 ----
***************
*** 724,728 ****
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 717,720 ----
***************
*** 877,881 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
--- 869,872 ----
***************
*** 885,889 ****
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 876,879 ----
***************
*** 1040,1044 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
--- 1030,1033 ----
***************
*** 1048,1052 ****
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 1037,1040 ----
***************
*** 1200,1204 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
--- 1188,1191 ----
***************
*** 1208,1212 ****
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 1195,1198 ----
***************
*** 1361,1365 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
--- 1347,1350 ----
***************
*** 1369,1373 ****
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 1354,1357 ----
***************
*** 1526,1530 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
--- 1510,1513 ----
***************
*** 1534,1538 ****
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 1517,1520 ----
***************
*** 1686,1690 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
--- 1668,1671 ----
***************
*** 1694,1698 ****
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 1675,1678 ----
***************
*** 1847,1851 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
--- 1827,1830 ----
***************
*** 1855,1859 ****
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 1834,1837 ----
***************
*** 2010,2014 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
--- 1988,1991 ----
***************
*** 2018,2022 ****
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 1995,1998 ----
***************
*** 2171,2175 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
--- 2147,2150 ----
***************
*** 2179,2183 ****
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 2154,2157 ----
***************
*** 2333,2337 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
--- 2307,2310 ----
***************
*** 2341,2345 ****
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 2314,2317 ----
***************
*** 2501,2505 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
--- 2473,2476 ----
***************
*** 2509,2513 ****
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 2480,2483 ----
***************
*** 2662,2666 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
--- 2632,2635 ----
***************
*** 2670,2674 ****
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 2639,2642 ----
***************
*** 2825,2829 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
--- 2793,2796 ----
***************
*** 2833,2837 ****
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 2800,2803 ----
***************
*** 2988,2992 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
--- 2954,2957 ----
***************
*** 2996,3000 ****
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 2961,2964 ----
***************
*** 3148,3152 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
--- 3112,3115 ----
***************
*** 3156,3160 ****
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 3119,3122 ----
***************
*** 3309,3313 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
--- 3271,3274 ----
***************
*** 3317,3321 ****
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 3278,3281 ----
***************
*** 3472,3476 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
--- 3432,3435 ----
***************
*** 3480,3484 ****
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 3439,3442 ----
***************
*** 3632,3636 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
--- 3590,3593 ----
***************
*** 3640,3644 ****
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 3597,3600 ----
***************
*** 3792,3796 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
--- 3748,3751 ----
***************
*** 3800,3804 ****
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 3755,3758 ----
***************
*** 3955,3959 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
--- 3909,3912 ----
***************
*** 3963,3967 ****
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 3916,3919 ----
***************
*** 4116,4120 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
--- 4068,4071 ----
***************
*** 4124,4128 ****
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 4075,4078 ----
***************
*** 4278,4282 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
--- 4228,4231 ----
***************
*** 4286,4290 ****
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 4235,4238 ----
***************
*** 4438,4442 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
--- 4386,4389 ----
***************
*** 4446,4450 ****
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 4393,4396 ----
diff -Nrc2 texinfo-6.1/tp/tests/nested_formats/res_parser_info/texi_nested_formats/nested_formats.texi texinfo-6.3/tp/tests/nested_formats/res_parser_info/texi_nested_formats/nested_formats.texi
*** texinfo-6.1/tp/tests/nested_formats/res_parser_info/texi_nested_formats/nested_formats.texi	2016-01-22 08:09:29.000000000 +0000
--- texinfo-6.3/tp/tests/nested_formats/res_parser_info/texi_nested_formats/nested_formats.texi	2016-07-31 16:35:10.000000000 +0100
***************
*** 233,245 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
  @html
- html
  @end html
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 233,242 ----
***************
*** 394,406 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
  @html
- html
  @end html
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 391,400 ----
***************
*** 556,568 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
  @html
- html
  @end html
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 550,559 ----
***************
*** 716,728 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
  @html
- html
  @end html
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 707,716 ----
***************
*** 877,889 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
  @html
- html
  @end html
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 865,874 ----
***************
*** 1040,1052 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
  @html
- html
  @end html
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 1025,1034 ----
***************
*** 1200,1212 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
  @html
- html
  @end html
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 1182,1191 ----
***************
*** 1361,1373 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
  @html
- html
  @end html
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 1340,1349 ----
***************
*** 1526,1538 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
  @html
- html
  @end html
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 1502,1511 ----
***************
*** 1686,1698 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
  @html
- html
  @end html
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 1659,1668 ----
***************
*** 1847,1859 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
  @html
- html
  @end html
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 1817,1826 ----
***************
*** 2010,2022 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
  @html
- html
  @end html
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 1977,1986 ----
***************
*** 2171,2183 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
  @html
- html
  @end html
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 2135,2144 ----
***************
*** 2333,2345 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
  @html
- html
  @end html
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 2294,2303 ----
***************
*** 2501,2513 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
  @html
- html
  @end html
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 2459,2468 ----
***************
*** 2662,2674 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
  @html
- html
  @end html
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 2617,2626 ----
***************
*** 2825,2837 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
  @html
- html
  @end html
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 2777,2786 ----
***************
*** 2988,3000 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
  @html
- html
  @end html
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 2937,2946 ----
***************
*** 3148,3160 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
  @html
- html
  @end html
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 3094,3103 ----
***************
*** 3309,3321 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
  @html
- html
  @end html
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 3252,3261 ----
***************
*** 3472,3484 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
  @html
- html
  @end html
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 3412,3421 ----
***************
*** 3632,3644 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
  @html
- html
  @end html
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 3569,3578 ----
***************
*** 3792,3804 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
  @html
- html
  @end html
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 3726,3735 ----
***************
*** 3955,3967 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
  @html
- html
  @end html
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 3886,3895 ----
***************
*** 4116,4128 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
  @html
- html
  @end html
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 4044,4053 ----
***************
*** 4278,4290 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
  @html
- html
  @end html
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 4203,4212 ----
***************
*** 4438,4450 ****
  
  @xml
- <para> xml para </xml>
  @end xml
  
  @html
- html
  @end html
  
  @tex
- $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
  @end tex
  
--- 4360,4369 ----
diff -Nrc2 texinfo-6.1/tp/tests/parser_base_tests texinfo-6.3/tp/tests/parser_base_tests
*** texinfo-6.1/tp/tests/parser_base_tests	2014-04-22 02:56:39.000000000 +0100
--- texinfo-6.3/tp/tests/parser_base_tests	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,20 ****
- #! /bin/sh
- # $Id: parser_base_tests 5191 2013-02-23 00:11:18Z karl $
- # Copyright 2010, 2012 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.
- 
- if test z"$srcdir" = 'z'; then
-   srcdir=.
- fi
- 
- if test "z$LONG_TESTS" = z'yes'; then
-   echo "Skipping short tests because we are only doing long tests"
-   exit 77
- fi
- 
- "$srcdir"/parser_tests.sh "$@" \
-  formatting \
-  htmlxref htmlxref-only_mono htmlxref-only_split
--- 0 ----
diff -Nrc2 texinfo-6.1/tp/tests/sectioning/Makefile.in texinfo-6.3/tp/tests/sectioning/Makefile.in
*** texinfo-6.1/tp/tests/sectioning/Makefile.in	2016-02-06 12:24:09.000000000 +0000
--- texinfo-6.3/tp/tests/sectioning/Makefile.in	2016-09-10 20:30:00.000000000 +0100
***************
*** 112,115 ****
--- 112,116 ----
  	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
  	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+ 	$(top_srcdir)/gnulib/m4/hard-locale.m4 \
  	$(top_srcdir)/gnulib/m4/iconv.m4 \
  	$(top_srcdir)/gnulib/m4/include_next.m4 \
diff -Nrc2 texinfo-6.1/tp/tests/test_scripts/contents_double_contents_setcontentsaftertitlepage.sh texinfo-6.3/tp/tests/test_scripts/contents_double_contents_setcontentsaftertitlepage.sh
*** texinfo-6.1/tp/tests/test_scripts/contents_double_contents_setcontentsaftertitlepage.sh	2016-01-23 11:30:33.000000000 +0000
--- texinfo-6.3/tp/tests/test_scripts/contents_double_contents_setcontentsaftertitlepage.sh	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,37 ****
- #! /bin/sh
- 
- if test z"$srcdir" = "z"; then
-   srcdir=.
- fi
- 
- command=run_parser_all.sh
- one_test_logs_dir=test_log
- diffs_dir=diffs
- 
- 
- 
- if test "z$LONG_TESTS" != z"yes" && test "z$ALL_TESTS" != z"yes"; then
-   echo "Skipping long tests that take a lot of time to run"
-   exit 77
- fi
- 
- if test "z$TEX_HTML_TESTS" = z"yes"; then
-   echo "Skipping long tests, only doing HTML TeX tests"
-   exit 77
- fi
- 
- dir=contents
- arg='double_contents_setcontentsaftertitlepage'
- name='double_contents_setcontentsaftertitlepage'
- [ -d "$dir" ] || mkdir $dir
- 
- srcdir_test=$dir; export srcdir_test;
- "$srcdir"/"$command" -dir $dir $arg
- exit_status=$?
- cat $dir/$one_test_logs_dir/$name.log
- if test -f $dir/$diffs_dir/$name.diff; then
-   echo 
-   cat $dir/$diffs_dir/$name.diff
- fi
- exit $exit_status
- 
--- 0 ----
diff -Nrc2 texinfo-6.1/tp/tests/test_scripts/contents_double_contents_setcontentsaftertitlepage_book.sh texinfo-6.3/tp/tests/test_scripts/contents_double_contents_setcontentsaftertitlepage_book.sh
*** texinfo-6.1/tp/tests/test_scripts/contents_double_contents_setcontentsaftertitlepage_book.sh	2016-01-23 11:30:33.000000000 +0000
--- texinfo-6.3/tp/tests/test_scripts/contents_double_contents_setcontentsaftertitlepage_book.sh	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,37 ****
- #! /bin/sh
- 
- if test z"$srcdir" = "z"; then
-   srcdir=.
- fi
- 
- command=run_parser_all.sh
- one_test_logs_dir=test_log
- diffs_dir=diffs
- 
- 
- 
- if test "z$LONG_TESTS" != z"yes" && test "z$ALL_TESTS" != z"yes"; then
-   echo "Skipping long tests that take a lot of time to run"
-   exit 77
- fi
- 
- if test "z$TEX_HTML_TESTS" = z"yes"; then
-   echo "Skipping long tests, only doing HTML TeX tests"
-   exit 77
- fi
- 
- dir=contents
- arg='double_contents_setcontentsaftertitlepage_book'
- name='double_contents_setcontentsaftertitlepage_book'
- [ -d "$dir" ] || mkdir $dir
- 
- srcdir_test=$dir; export srcdir_test;
- "$srcdir"/"$command" -dir $dir $arg
- exit_status=$?
- cat $dir/$one_test_logs_dir/$name.log
- if test -f $dir/$diffs_dir/$name.diff; then
-   echo 
-   cat $dir/$diffs_dir/$name.diff
- fi
- exit $exit_status
- 
--- 0 ----
diff -Nrc2 texinfo-6.1/tp/tests/test_scripts/contents_double_contents_setcontentsaftertitlepage_book_chapter.sh texinfo-6.3/tp/tests/test_scripts/contents_double_contents_setcontentsaftertitlepage_book_chapter.sh
*** texinfo-6.1/tp/tests/test_scripts/contents_double_contents_setcontentsaftertitlepage_book_chapter.sh	2016-01-23 11:30:33.000000000 +0000
--- texinfo-6.3/tp/tests/test_scripts/contents_double_contents_setcontentsaftertitlepage_book_chapter.sh	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,37 ****
- #! /bin/sh
- 
- if test z"$srcdir" = "z"; then
-   srcdir=.
- fi
- 
- command=run_parser_all.sh
- one_test_logs_dir=test_log
- diffs_dir=diffs
- 
- 
- 
- if test "z$LONG_TESTS" != z"yes" && test "z$ALL_TESTS" != z"yes"; then
-   echo "Skipping long tests that take a lot of time to run"
-   exit 77
- fi
- 
- if test "z$TEX_HTML_TESTS" = z"yes"; then
-   echo "Skipping long tests, only doing HTML TeX tests"
-   exit 77
- fi
- 
- dir=contents
- arg='double_contents_setcontentsaftertitlepage_book_chapter'
- name='double_contents_setcontentsaftertitlepage_book_chapter'
- [ -d "$dir" ] || mkdir $dir
- 
- srcdir_test=$dir; export srcdir_test;
- "$srcdir"/"$command" -dir $dir $arg
- exit_status=$?
- cat $dir/$one_test_logs_dir/$name.log
- if test -f $dir/$diffs_dir/$name.diff; then
-   echo 
-   cat $dir/$diffs_dir/$name.diff
- fi
- exit $exit_status
- 
--- 0 ----
diff -Nrc2 texinfo-6.1/tp/tests/test_scripts/contents_double_contents_setcontentsaftertitlepage_info.sh texinfo-6.3/tp/tests/test_scripts/contents_double_contents_setcontentsaftertitlepage_info.sh
*** texinfo-6.1/tp/tests/test_scripts/contents_double_contents_setcontentsaftertitlepage_info.sh	2016-01-23 11:30:34.000000000 +0000
--- texinfo-6.3/tp/tests/test_scripts/contents_double_contents_setcontentsaftertitlepage_info.sh	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,37 ****
- #! /bin/sh
- 
- if test z"$srcdir" = "z"; then
-   srcdir=.
- fi
- 
- command=run_parser_all.sh
- one_test_logs_dir=test_log
- diffs_dir=diffs
- 
- 
- 
- if test "z$LONG_TESTS" != z"yes" && test "z$ALL_TESTS" != z"yes"; then
-   echo "Skipping long tests that take a lot of time to run"
-   exit 77
- fi
- 
- if test "z$TEX_HTML_TESTS" = z"yes"; then
-   echo "Skipping long tests, only doing HTML TeX tests"
-   exit 77
- fi
- 
- dir=contents
- arg='double_contents_setcontentsaftertitlepage_info'
- name='double_contents_setcontentsaftertitlepage_info'
- [ -d "$dir" ] || mkdir $dir
- 
- srcdir_test=$dir; export srcdir_test;
- "$srcdir"/"$command" -dir $dir $arg
- exit_status=$?
- cat $dir/$one_test_logs_dir/$name.log
- if test -f $dir/$diffs_dir/$name.diff; then
-   echo 
-   cat $dir/$diffs_dir/$name.diff
- fi
- exit $exit_status
- 
--- 0 ----
diff -Nrc2 texinfo-6.1/tp/tests/test_scripts/contents_double_contents_setcontentsaftertitlepage_inline.sh texinfo-6.3/tp/tests/test_scripts/contents_double_contents_setcontentsaftertitlepage_inline.sh
*** texinfo-6.1/tp/tests/test_scripts/contents_double_contents_setcontentsaftertitlepage_inline.sh	2016-01-23 11:30:33.000000000 +0000
--- texinfo-6.3/tp/tests/test_scripts/contents_double_contents_setcontentsaftertitlepage_inline.sh	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,37 ****
- #! /bin/sh
- 
- if test z"$srcdir" = "z"; then
-   srcdir=.
- fi
- 
- command=run_parser_all.sh
- one_test_logs_dir=test_log
- diffs_dir=diffs
- 
- 
- 
- if test "z$LONG_TESTS" != z"yes" && test "z$ALL_TESTS" != z"yes"; then
-   echo "Skipping long tests that take a lot of time to run"
-   exit 77
- fi
- 
- if test "z$TEX_HTML_TESTS" = z"yes"; then
-   echo "Skipping long tests, only doing HTML TeX tests"
-   exit 77
- fi
- 
- dir=contents
- arg='double_contents_setcontentsaftertitlepage_inline'
- name='double_contents_setcontentsaftertitlepage_inline'
- [ -d "$dir" ] || mkdir $dir
- 
- srcdir_test=$dir; export srcdir_test;
- "$srcdir"/"$command" -dir $dir $arg
- exit_status=$?
- cat $dir/$one_test_logs_dir/$name.log
- if test -f $dir/$diffs_dir/$name.diff; then
-   echo 
-   cat $dir/$diffs_dir/$name.diff
- fi
- exit $exit_status
- 
--- 0 ----
diff -Nrc2 texinfo-6.1/tp/tests/test_scripts/htmlxref-only_mono_htmlxref.sh texinfo-6.3/tp/tests/test_scripts/htmlxref-only_mono_htmlxref.sh
*** texinfo-6.1/tp/tests/test_scripts/htmlxref-only_mono_htmlxref.sh	1970-01-01 01:00:00.000000000 +0100
--- texinfo-6.3/tp/tests/test_scripts/htmlxref-only_mono_htmlxref.sh	2016-09-03 19:07:58.000000000 +0100
***************
*** 0 ****
--- 1,31 ----
+ #! /bin/sh
+ 
+ if test z"$srcdir" = "z"; then
+   srcdir=.
+ fi
+ 
+ command=run_parser_all.sh
+ one_test_logs_dir=test_log
+ diffs_dir=diffs
+ 
+ 
+ 
+ if test "z$LONG_TESTS" = z"yes"; then
+   echo "Skipping short tests because we are only doing long tests"
+   exit 77
+ fi
+ dir=htmlxref-only_mono
+ arg='htmlxref'
+ name='htmlxref'
+ [ -d "$dir" ] || mkdir $dir
+ 
+ srcdir_test=$dir; export srcdir_test;
+ "$srcdir"/"$command" -dir $dir $arg
+ exit_status=$?
+ cat $dir/$one_test_logs_dir/$name.log
+ if test -f $dir/$diffs_dir/$name.diff; then
+   echo 
+   cat $dir/$diffs_dir/$name.diff
+ fi
+ exit $exit_status
+ 
diff -Nrc2 texinfo-6.1/tp/tests/test_scripts/htmlxref-only_mono_htmlxref_nodes.sh texinfo-6.3/tp/tests/test_scripts/htmlxref-only_mono_htmlxref_nodes.sh
*** texinfo-6.1/tp/tests/test_scripts/htmlxref-only_mono_htmlxref_nodes.sh	1970-01-01 01:00:00.000000000 +0100
--- texinfo-6.3/tp/tests/test_scripts/htmlxref-only_mono_htmlxref_nodes.sh	2016-09-03 19:07:58.000000000 +0100
***************
*** 0 ****
--- 1,31 ----
+ #! /bin/sh
+ 
+ if test z"$srcdir" = "z"; then
+   srcdir=.
+ fi
+ 
+ command=run_parser_all.sh
+ one_test_logs_dir=test_log
+ diffs_dir=diffs
+ 
+ 
+ 
+ if test "z$LONG_TESTS" = z"yes"; then
+   echo "Skipping short tests because we are only doing long tests"
+   exit 77
+ fi
+ dir=htmlxref-only_mono
+ arg='htmlxref_nodes'
+ name='htmlxref_nodes'
+ [ -d "$dir" ] || mkdir $dir
+ 
+ srcdir_test=$dir; export srcdir_test;
+ "$srcdir"/"$command" -dir $dir $arg
+ exit_status=$?
+ cat $dir/$one_test_logs_dir/$name.log
+ if test -f $dir/$diffs_dir/$name.diff; then
+   echo 
+   cat $dir/$diffs_dir/$name.diff
+ fi
+ exit $exit_status
+ 
diff -Nrc2 texinfo-6.1/tp/tests/test_scripts/htmlxref-only_split_htmlxref.sh texinfo-6.3/tp/tests/test_scripts/htmlxref-only_split_htmlxref.sh
*** texinfo-6.1/tp/tests/test_scripts/htmlxref-only_split_htmlxref.sh	1970-01-01 01:00:00.000000000 +0100
--- texinfo-6.3/tp/tests/test_scripts/htmlxref-only_split_htmlxref.sh	2016-09-03 19:07:58.000000000 +0100
***************
*** 0 ****
--- 1,31 ----
+ #! /bin/sh
+ 
+ if test z"$srcdir" = "z"; then
+   srcdir=.
+ fi
+ 
+ command=run_parser_all.sh
+ one_test_logs_dir=test_log
+ diffs_dir=diffs
+ 
+ 
+ 
+ if test "z$LONG_TESTS" = z"yes"; then
+   echo "Skipping short tests because we are only doing long tests"
+   exit 77
+ fi
+ dir=htmlxref-only_split
+ arg='htmlxref'
+ name='htmlxref'
+ [ -d "$dir" ] || mkdir $dir
+ 
+ srcdir_test=$dir; export srcdir_test;
+ "$srcdir"/"$command" -dir $dir $arg
+ exit_status=$?
+ cat $dir/$one_test_logs_dir/$name.log
+ if test -f $dir/$diffs_dir/$name.diff; then
+   echo 
+   cat $dir/$diffs_dir/$name.diff
+ fi
+ exit $exit_status
+ 
diff -Nrc2 texinfo-6.1/tp/tests/test_scripts/htmlxref-only_split_htmlxref_nodes.sh texinfo-6.3/tp/tests/test_scripts/htmlxref-only_split_htmlxref_nodes.sh
*** texinfo-6.1/tp/tests/test_scripts/htmlxref-only_split_htmlxref_nodes.sh	1970-01-01 01:00:00.000000000 +0100
--- texinfo-6.3/tp/tests/test_scripts/htmlxref-only_split_htmlxref_nodes.sh	2016-09-03 19:07:58.000000000 +0100
***************
*** 0 ****
--- 1,31 ----
+ #! /bin/sh
+ 
+ if test z"$srcdir" = "z"; then
+   srcdir=.
+ fi
+ 
+ command=run_parser_all.sh
+ one_test_logs_dir=test_log
+ diffs_dir=diffs
+ 
+ 
+ 
+ if test "z$LONG_TESTS" = z"yes"; then
+   echo "Skipping short tests because we are only doing long tests"
+   exit 77
+ fi
+ dir=htmlxref-only_split
+ arg='htmlxref_nodes'
+ name='htmlxref_nodes'
+ [ -d "$dir" ] || mkdir $dir
+ 
+ srcdir_test=$dir; export srcdir_test;
+ "$srcdir"/"$command" -dir $dir $arg
+ exit_status=$?
+ cat $dir/$one_test_logs_dir/$name.log
+ if test -f $dir/$diffs_dir/$name.diff; then
+   echo 
+   cat $dir/$diffs_dir/$name.diff
+ fi
+ exit $exit_status
+ 
diff -Nrc2 texinfo-6.1/tp/tests/test_scripts/htmlxref_htmlxref.sh texinfo-6.3/tp/tests/test_scripts/htmlxref_htmlxref.sh
*** texinfo-6.1/tp/tests/test_scripts/htmlxref_htmlxref.sh	1970-01-01 01:00:00.000000000 +0100
--- texinfo-6.3/tp/tests/test_scripts/htmlxref_htmlxref.sh	2016-09-03 19:07:58.000000000 +0100
***************
*** 0 ****
--- 1,31 ----
+ #! /bin/sh
+ 
+ if test z"$srcdir" = "z"; then
+   srcdir=.
+ fi
+ 
+ command=run_parser_all.sh
+ one_test_logs_dir=test_log
+ diffs_dir=diffs
+ 
+ 
+ 
+ if test "z$LONG_TESTS" = z"yes"; then
+   echo "Skipping short tests because we are only doing long tests"
+   exit 77
+ fi
+ dir=htmlxref
+ arg='htmlxref'
+ name='htmlxref'
+ [ -d "$dir" ] || mkdir $dir
+ 
+ srcdir_test=$dir; export srcdir_test;
+ "$srcdir"/"$command" -dir $dir $arg
+ exit_status=$?
+ cat $dir/$one_test_logs_dir/$name.log
+ if test -f $dir/$diffs_dir/$name.diff; then
+   echo 
+   cat $dir/$diffs_dir/$name.diff
+ fi
+ exit $exit_status
+ 
diff -Nrc2 texinfo-6.1/tp/tests/test_scripts/htmlxref_htmlxref_nodes.sh texinfo-6.3/tp/tests/test_scripts/htmlxref_htmlxref_nodes.sh
*** texinfo-6.1/tp/tests/test_scripts/htmlxref_htmlxref_nodes.sh	1970-01-01 01:00:00.000000000 +0100
--- texinfo-6.3/tp/tests/test_scripts/htmlxref_htmlxref_nodes.sh	2016-09-03 19:07:58.000000000 +0100
***************
*** 0 ****
--- 1,31 ----
+ #! /bin/sh
+ 
+ if test z"$srcdir" = "z"; then
+   srcdir=.
+ fi
+ 
+ command=run_parser_all.sh
+ one_test_logs_dir=test_log
+ diffs_dir=diffs
+ 
+ 
+ 
+ if test "z$LONG_TESTS" = z"yes"; then
+   echo "Skipping short tests because we are only doing long tests"
+   exit 77
+ fi
+ dir=htmlxref
+ arg='htmlxref_nodes'
+ name='htmlxref_nodes'
+ [ -d "$dir" ] || mkdir $dir
+ 
+ srcdir_test=$dir; export srcdir_test;
+ "$srcdir"/"$command" -dir $dir $arg
+ exit_status=$?
+ cat $dir/$one_test_logs_dir/$name.log
+ if test -f $dir/$diffs_dir/$name.diff; then
+   echo 
+   cat $dir/$diffs_dir/$name.diff
+ fi
+ exit $exit_status
+ 
diff -Nrc2 texinfo-6.1/tp/tests/tex_html/Makefile.in texinfo-6.3/tp/tests/tex_html/Makefile.in
*** texinfo-6.1/tp/tests/tex_html/Makefile.in	2016-02-06 12:24:09.000000000 +0000
--- texinfo-6.3/tp/tests/tex_html/Makefile.in	2016-09-10 20:30:00.000000000 +0100
***************
*** 109,112 ****
--- 109,113 ----
  	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
  	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+ 	$(top_srcdir)/gnulib/m4/hard-locale.m4 \
  	$(top_srcdir)/gnulib/m4/iconv.m4 \
  	$(top_srcdir)/gnulib/m4/include_next.m4 \
diff -Nrc2 texinfo-6.1/tp/tests/tex_html_tests.sh texinfo-6.3/tp/tests/tex_html_tests.sh
*** texinfo-6.1/tp/tests/tex_html_tests.sh	2014-04-22 02:56:36.000000000 +0100
--- texinfo-6.3/tp/tests/tex_html_tests.sh	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,19 ****
- #! /bin/sh
- # $Id: tex_html_tests.sh 5191 2013-02-23 00:11:18Z karl $
- # Copyright 2010, 2012 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.
- 
- if test z"$srcdir" = 'z'; then
-   srcdir=.
- fi
- 
- if test "z$TEX_HTML_TESTS" != z'yes'; then
-   echo "Skipping HTML TeX tests that are not easily reproducible"
-   exit 77
- fi
- 
- "$srcdir"/parser_tests.sh "$@" \
-  tex_html
--- 0 ----
diff -Nrc2 texinfo-6.1/tp/texi2any.pl texinfo-6.3/tp/texi2any.pl
*** texinfo-6.1/tp/texi2any.pl	2016-01-03 20:50:31.000000000 +0000
--- texinfo-6.3/tp/texi2any.pl	2016-09-03 13:52:06.000000000 +0100
***************
*** 924,928 ****
   'no-validate|no-pointer-validate' => sub {
        set_from_cmdline('novalidate',$_[1]);
!       $parser_default_options->{'novalidate'} = $_[1];
      },
   'no-warn' => sub { set_from_cmdline('NO_WARN', $_[1]); },
--- 924,928 ----
   'no-validate|no-pointer-validate' => sub {
        set_from_cmdline('novalidate',$_[1]);
!       $parser_default_options->{'info'}->{'novalidate'} = $_[1];
      },
   'no-warn' => sub { set_from_cmdline('NO_WARN', $_[1]); },
***************
*** 1192,1197 ****
    }
    unshift @htmlxref_dirs, '.';
!   my @texinfo_htmlxref_files 
        = locate_init_file ($texinfo_htmlxref, \@htmlxref_dirs, 1);
  
    my $parser_options = { %$parser_default_options };
--- 1192,1204 ----
    }
    unshift @htmlxref_dirs, '.';
! 
!   my @texinfo_htmlxref_files;
!   my $init_file_from_conf = get_conf('HTMLXREF');
!   if ($init_file_from_conf) {
!     @texinfo_htmlxref_files = ( $init_file_from_conf );
!   } else {
!     @texinfo_htmlxref_files 
        = locate_init_file ($texinfo_htmlxref, \@htmlxref_dirs, 1);
+   }
  
    my $parser_options = { %$parser_default_options };
diff -Nrc2 texinfo-6.1/util/Makefile.in texinfo-6.3/util/Makefile.in
*** texinfo-6.1/util/Makefile.in	2016-02-06 12:24:09.000000000 +0000
--- texinfo-6.3/util/Makefile.in	2016-09-10 20:30:00.000000000 +0100
***************
*** 127,130 ****
--- 127,131 ----
  	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
  	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
+ 	$(top_srcdir)/gnulib/m4/hard-locale.m4 \
  	$(top_srcdir)/gnulib/m4/iconv.m4 \
  	$(top_srcdir)/gnulib/m4/include_next.m4 \
diff -Nrc2 texinfo-6.1/util/dir-example texinfo-6.3/util/dir-example
*** texinfo-6.1/util/dir-example	2016-02-06 12:20:25.000000000 +0000
--- texinfo-6.3/util/dir-example	2016-05-07 16:55:40.000000000 +0100
***************
*** 10,14 ****
    please send them to karl@gnu.org.
  
! $Id: dir-example 6905 2016-01-01 18:33:25Z karl $
  
  File: dir,	Node: Top,	This is the top of the INFO tree.
--- 10,14 ----
    please send them to karl@gnu.org.
  
! $Id: dir-example 7140 2016-04-26 16:50:27Z karl $
  
  File: dir,	Node: Top,	This is the top of the INFO tree.
***************
*** 18,22 ****
  
    `q' quits;
!   `?' lists all Info commands;
    `h' starts the Info tutorial;
    `mTexinfo RET' visits the Texinfo manual, etc.
--- 18,22 ----
  
    `q' quits;
!   `H' lists all Info commands;
    `h' starts the Info tutorial;
    `mTexinfo RET' visits the Texinfo manual, etc.
***************
*** 307,316 ****
  * Kpathsea: (kpathsea).         File lookup along search paths.
  * LaTeX2e: (latex2e).           LaTeX2e unofficial reference manual.
! * LaTeX2e-es: (latex2e-es).     Spanish translation of LaTeX2e.
  * Mf2pt1: (mf2pt1).             Make PostScript Type 1 fonts from Metafont.
  * Naming TeX fonts: (fontname). Filenames for TeX fonts.
  * TDS: (tds).                   Standard TeX directory structure.
  * TeXDraw: (texdraw).           Drawing PostScript diagrams within TeX.
! * TL-build: (tlbuild).          TeX Live configuration and development.
  * Web2C: (web2c).               TeX, Metafont, and companion programs.
  
--- 307,317 ----
  * Kpathsea: (kpathsea).         File lookup along search paths.
  * LaTeX2e: (latex2e).           LaTeX2e unofficial reference manual.
! * LaTeX2e-es: (latex2e-es).     Spanish translation of latex2e.
! * LaTeX2e-fr: (latex2e-fr).     French translation of latex2e.
  * Mf2pt1: (mf2pt1).             Make PostScript Type 1 fonts from Metafont.
  * Naming TeX fonts: (fontname). Filenames for TeX fonts.
  * TDS: (tds).                   Standard TeX directory structure.
  * TeXDraw: (texdraw).           Drawing PostScript diagrams within TeX.
! * TLbuild: (tlbuild).           TeX Live configuration and development.
  * Web2C: (web2c).               TeX, Metafont, and companion programs.
  
***************
*** 350,353 ****
--- 351,355 ----
  * autoupdate: (autoconf)autoupdate Invocation.  Automatic configure.ac update.
  * awk: (gawk)Invoking gawk.                     Text scanning and processing.
+ * base32: (coreutils)base32 invocation.         Base32 encode/decode data.
  * base64: (coreutils)base64 invocation.         Base64 encode/decode data.
  * basename: (coreutils)basename invocation.     Strip directory and suffix.
diff -Nrc2 texinfo-6.1/util/htmlxref.cnf texinfo-6.3/util/htmlxref.cnf
*** texinfo-6.1/util/htmlxref.cnf	2015-08-18 18:36:02.000000000 +0100
--- texinfo-6.3/util/htmlxref.cnf	2016-07-11 21:56:21.000000000 +0100
***************
*** 1,7 ****
  # htmlxref.cnf - reference file for free Texinfo manuals on the web.
  
! htmlxrefversion=2015-07-24.22; # UTC
  
! # Copyright 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
  # 
  # Copying and distribution of this file, with or without modification,
--- 1,8 ----
  # htmlxref.cnf - reference file for free Texinfo manuals on the web.
  
! htmlxrefversion=2016-07-11.22; # UTC
  
! # Copyright 2010, 2011, 2012, 2013, 2014, 2015, 2016 Free Software
! # Foundation, Inc.
  # 
  # Copying and distribution of this file, with or without modification,
***************
*** 251,255 ****
   gfortran	node	${GCC}/gfortran/
   gnat_rm	node	${GCC}/gnat_rm/
!  gnat_ugn_unw	node	${GCC}/gnat_ugn_unw/
   libgomp	node	${GCC}/libgomp/
   libstdc++	node	${GCC}/libstdc++/
--- 252,256 ----
   gfortran	node	${GCC}/gfortran/
   gnat_rm	node	${GCC}/gnat_rm/
!  gnat_ugn	node	${GCC}/gnat_ugn/
   libgomp	node	${GCC}/libgomp/
   libstdc++	node	${GCC}/libstdc++/
diff -Nrc2 texinfo-6.1/util/pdftexi2dvi texinfo-6.3/util/pdftexi2dvi
*** texinfo-6.1/util/pdftexi2dvi	2016-02-06 12:21:52.000000000 +0000
--- texinfo-6.3/util/pdftexi2dvi	2016-09-10 20:36:48.000000000 +0100
***************
*** 1,4 ****
  #!/bin/sh
! # $Id: pdftexi2dvi 6991 2016-02-06 12:16:13Z gavin $
  # Written by Thomas Esser.  Public domain.
  # Execute texi2dvi --pdf.
--- 1,4 ----
  #!/bin/sh
! # $Id: texi2pdf 7353 2016-09-10 13:03:54Z gavin $
  # Written by Thomas Esser.  Public domain.
  # Execute texi2dvi --pdf.
***************
*** 17,21 ****
  test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
  
! rcs_revision='$Revision: 6991 $'
  rcs_version=`set - $rcs_revision; echo $2`
  
--- 17,21 ----
  test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
  
! rcs_revision='$Revision: 7353 $'
  rcs_version=`set - $rcs_revision; echo $2`
  
***************
*** 26,30 ****
  if test "x$1" = x--version; then
    cat <<EOF
! texi2pdf (GNU Texinfo 6.1) $rcs_version
  
  Copyright (C) 2016 Free Software Foundation, Inc.
--- 26,30 ----
  if test "x$1" = x--version; then
    cat <<EOF
! texi2pdf (GNU Texinfo 6.3) $rcs_version
  
  Copyright (C) 2016 Free Software Foundation, Inc.
diff -Nrc2 texinfo-6.1/util/texi2dvi texinfo-6.3/util/texi2dvi
*** texinfo-6.1/util/texi2dvi	2016-02-06 12:21:52.000000000 +0000
--- texinfo-6.3/util/texi2dvi	2016-09-10 20:25:16.000000000 +0100
***************
*** 1,5 ****
  #! /bin/sh
  # texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
! # $Id: texi2dvi 6991 2016-02-06 12:16:13Z gavin $
  #
  # Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
--- 1,5 ----
  #! /bin/sh
  # texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
! # $Id: texi2dvi 7353 2016-09-10 13:03:54Z gavin $
  #
  # Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
***************
*** 38,42 ****
  
  # This string is expanded automatically when this file is checked out.
! rcs_revision='$Revision: 6991 $'
  rcs_version=`set - $rcs_revision; echo $2`
  program=`echo $0 | $SED -e 's!.*/!!'`
--- 38,42 ----
  
  # This string is expanded automatically when this file is checked out.
! rcs_revision='$Revision: 7353 $'
  rcs_version=`set - $rcs_revision; echo $2`
  program=`echo $0 | $SED -e 's!.*/!!'`
***************
*** 52,56 ****
  action=compile
  batch=false     # interact normally
- catcode_special=maybe
  debug=false
  escape="\\"
--- 52,55 ----
***************
*** 135,145 ****
  (e)plain TeX files, set the environment variable LATEX=tex.
  
! In order to make texi2dvi a drop-in replacement of TeX/LaTeX in AUC-TeX,
! the FILE may also be composed of the following simple TeX commands.
!   \`\\input{FILE}'     the actual file to compile
!   \`\\nonstopmode'     same as --batch
! 
! When invoked as \`texi2pdf' or \`pdftexi2dvi', or given the option --pdf
! or --dvipdf, generate PDF output.  Otherwise, generate DVI.
  
  General options:
--- 134,139 ----
  (e)plain TeX files, set the environment variable LATEX=tex.
  
! When invoked as \`texi2pdf' or given the option --pdf generate PDF output.
! Otherwise, generate DVI.
  
  General options:
***************
*** 149,158 ****
    -o, --output=OFILE  leave output in OFILE; only one input FILE is allowed
    -q, --quiet         no output unless errors (implies --batch)
-   -s, --silent        same as --quiet
    -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]
!   --mostly-clean      remove the auxiliary files and directories,
!                          but not the output
  
  Output format:
--- 143,151 ----
    -o, --output=OFILE  leave output in OFILE; only one input FILE is allowed
    -q, --quiet         no output unless errors (implies --batch)
    -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]
!   --mostly-clean      remove auxiliary files or directories from
!                           previous runs (but not the output)
  
  Output format:
***************
*** 166,171 ****
  
  TeX tuning:
!   -@                         use @input instead of \input for preloaded Texinfo
!   -e, -E, --expand           force macro expansion using makeinfo
    -I DIR                     search DIR for Texinfo files
    -l, --language=LANG        specify LANG for FILE, either latex or texinfo
--- 159,163 ----
  
  TeX tuning:
!   -E, --expand               macro expansion using makeinfo
    -I DIR                     search DIR for Texinfo files
    -l, --language=LANG        specify LANG for FILE, either latex or texinfo
***************
*** 173,179 ****
        --shell-escape         pass --shell-escape to TeX
        --src-specials         pass --src-specials to TeX
-   -t, --command=CMD          insert CMD in copy of input file
-    or --texinfo=CMD          multiple values accumulate
        --translate-file=FILE  use given charset translation file for TeX
  
  Build modes:
--- 165,173 ----
        --shell-escape         pass --shell-escape to TeX
        --src-specials         pass --src-specials to TeX
        --translate-file=FILE  use given charset translation file for TeX
+   -t, --command=CMD          insert CMD in copy of input file
+ 
+ Any CMD strings are added after @setfilename for Texinfo input, or in
+ the first line for LaTeX input.  Multiple values accumulate.
  
  Build modes:
***************
*** 207,213 ****
  dvipdf dvi2pdf dvitopdf.
  
- Any CMD strings are added after @setfilename for Texinfo input, or in
- the first line for LaTeX input.
- 
  If Texinfo is installed on your site, then the command
  
--- 201,204 ----
***************
*** 229,233 ****
  {
    cat <<EOF
! texi2dvi (GNU Texinfo 6.1) $rcs_version
  
  Copyright (C) 2016 Free Software Foundation, Inc.
--- 220,224 ----
  {
    cat <<EOF
! texi2dvi (GNU Texinfo 6.3) $rcs_version
  
  Copyright (C) 2016 Free Software Foundation, Inc.
***************
*** 242,245 ****
--- 233,278 ----
  #  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'
+ 
+ # 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
+   [\\/]* | ?:[\\/]*)  # absolute path
+     for cdd_dir in $path_vars; do
+       eval "$cdd_dir=\`absolute \$$cdd_dir\`"
+     done
+     return ;;
+   esac
+ 
+   # 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
+ }
+ 
  # cd_orig - Return to the original directory.
  cd_orig ()
***************
*** 252,255 ****
--- 285,306 ----
    # - 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
  }
  
***************
*** 811,822 ****
    esac
  
-   # do the special catcode trick for ~ in filenames only for Texinfo,
-   # not LaTeX.
-   if test x"$in_lang" = xtexinfo && test $catcode_special = maybe; then
-     catcode_special=true
-   else
-     catcode_special=false
-   fi
- 
    # Beware of aux files in subdirectories that require the
    # subdirectory to exist.
--- 862,865 ----
***************
*** 874,932 ****
      tex_cmd="$tex_cmd </dev/null '${escape}nonstopmode'"
    fi
- 
-   # we'd like to handle arbitrary input file names, especially
-   # foo~bar/a~b.tex, since Debian likes ~ characters.
-   if $catcode_special; then
-     # The idea is to define \normaltilde as a catcode other ~ character,
-     # then make the active ~ be equivalent to that, instead of the plain
-     # TeX tie.  Then when the active ~ appears in the filename, it will
-     # be expanded to itself, as far as \input will see.  (This is the
-     # same thing that texinfo.tex does in general, BTW.)
-     normaltilde="${escape}catcode126=12 ${escape}def${escape}normaltilde{~}"
-     tex_cmd="$tex_cmd '$normaltilde${escape}catcode126=13 ${escape}let~\normaltilde '"
-   fi
-   # Other special (non-active) characters could be supported by
-   # resetting their catcodes to other on the command line and changing
-   # texinfo.tex to initialize everything to plain catcodes.  Maybe someday.
- 
-   # append the \input command.
-   tex_cmd="$tex_cmd '${escape}input'"
  }
  
  # run_tex - Run TeX as "$tex $in_input", taking care of errors and logs.
  run_tex ()
  {
    make_tex_cmd
-     
-   # TeX's \input does not (easily or reliably) support whitespace
-   # characters or other special characters in file names.  Our intensive
-   # use of absolute file names makes this worse: the enclosing directory
-   # names may include white spaces.  Improve the situation using a
-   # symbolic link to the filename in the current directory, in tidy mode
-   # only.  Do not alter in_input.
-   #
-   # The filename is almost always tokenized using plain TeX conventions
-   # (the exception would be if the user made a texinfo.fmt file).  Not
-   # all the plain TeX special characters cause trouble, but there's no
-   # harm in making the link.
-   #
-   case $tidy:`func_dirname "$in_input"` in
-     true:*["$space$tab$newline\"#\$%\\^_{}~"]*)
-       _run_tex_file_name=`basename "$in_input"`
-       if test ! -f "$_run_tex_file_name"; then
-         # It might not be a file, clear it.
-         run rm -f "$_run_tex_file_name"
-         run ln -s "$in_input"
-       fi
-       tex_cmd="$tex_cmd '$_run_tex_file_name'"
-       ;;
  
!     *)
!       tex_cmd="$tex_cmd '$in_input'"
!       ;;
!   esac
  
    verbose "$0: Running $tex_cmd ..."
!   if eval "$tex_cmd" >&5; then
      case $out_lang in
        dvi | pdf ) move_to_dest "$in_noext.$out_lang";;
--- 917,961 ----
      tex_cmd="$tex_cmd </dev/null '${escape}nonstopmode'"
    fi
  }
  
+ 
  # run_tex - Run TeX as "$tex $in_input", 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.
!   in_input_funnies=`echo "$in_input" \
!     | $SED -e 's![^}#$%&^_{~]!!g' -e 's!\(.\)!\1\''
! !g' | uniq`
! 
!   if test -n "$in_input_funnies" ; then
!     # Make > an end group character, as it's unlikely to appear in
!     # a filename.
!     tex_cmd="$tex_cmd '${escape}bgroup${escape}catcode62=2${escape}relax'"
! 
!     # If the filename has funny characters, change the TeX category codes of 
!     # some characters within a group, and use \expandafter to input the file
!     # outside of the group.
!     for w in $in_input_funnies ; do
!       tex_cmd="$tex_cmd '${escape}catcode\`${escape}$w=12${escape}relax'"
!     done
! 
!     # Set \toks0 to "\input FILENAME\relax"
!     tex_cmd="$tex_cmd '${escape}toks0${escape}bgroup${escape}input' '$in_input' '${escape}relax>"
! 
!     # Expand \toks0 after the end of the group
!     tex_cmd="$tex_cmd${escape}expandafter${escape}egroup"
!     tex_cmd="$tex_cmd${escape}the${escape}toks0${escape}relax'"
!   else
!     # In the case of a simple filename, just pass the filename
!     # with no funny tricks.
!     tex_cmd="$tex_cmd '${escape}input' '$in_input'"
!   fi
  
    verbose "$0: Running $tex_cmd ..."
!   if (eval "$tex_cmd" >&5); then
      case $out_lang in
        dvi | pdf ) move_to_dest "$in_noext.$out_lang";;
***************
*** 989,993 ****
  filter_files ()
  {
!   test -n "$xref_files_new" && echo "$xref_files_new" |
    # Filter existing files matching the criterion.
    #
--- 1018,1023 ----
  filter_files ()
  {
!   test -n "$xref_files_new" || return 0
!   echo "$xref_files_new" |
    # Filter existing files matching the criterion.
    #
***************
*** 1111,1115 ****
    if $tidy; then
      verbose "cd $work_build"
!     cd "$work_build" || exit 1
    fi
  
--- 1141,1145 ----
    if $tidy; then
      verbose "cd $work_build"
!     cd_dir "$work_build" || exit 1
    fi
  
***************
*** 1456,1460 ****
    insert_commands
  
!   # Run until a fix point is reached.
    run_tex_suite
  }
--- 1486,1490 ----
    insert_commands
  
!   # Run until a fixed point is reached.
    run_tex_suite
  }
***************
*** 1465,1470 ****
  make_openout_test ()
  {
!     ensure_dir $workdir/check_recorder
!     cd $workdir/check_recorder
      cat > openout.tex <<EOF
  \newwrite\ourwrite
--- 1495,1500 ----
  make_openout_test ()
  {
!     ensure_dir "$workdir"/check_recorder
!     cd_dir "$workdir"/check_recorder
      cat > openout.tex <<EOF
  \newwrite\ourwrite
***************
*** 1475,1487 ****
      # to exit with an input error.
      recorder_option_maybe="$1"
!     save_catcode_special=$catcode_special
!     catcode_special=false
      make_tex_cmd
!     catcode_special=$save_catcode_special
!     tex_cmd="$tex_cmd ./openout.tex"
      # ./ in case . isn't in path
      verbose "$0: running $tex_cmd ..."
      rm -fr "openout.$2"
!     eval "$tex_cmd" </dev/null >/dev/null 2>&1
  }
  
--- 1505,1517 ----
      # 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 ..."
      rm -fr "openout.$2"
!     (eval "$tex_cmd" >/dev/null 2>&1)
  }
  
***************
*** 1647,1654 ****
  cleanup ()
  {
!   case $build_mode in
!     local) cd_orig; remove "$t2ddir";;
!     clean) mostly_clean;;
!     tidy)  ;;
    esac
  }
--- 1677,1683 ----
  cleanup ()
  {
!   case $clean:$tidy in
!     true:true) mostly_clean ;;                # build mode is "clean"
!     false:false) cd_orig; remove "$t2ddir";;  # build mode is "local"
    esac
  }
***************
*** 1661,1667 ****
  #   The filename given on the commmand line, but cleaned of TeX commands.
  # - IN_DIR
! #   The directory containing the input file, possibly absolute if needed.
! # - IN_DIR_ABS
! #   The absolute directory of the input file.
  # - IN_BASE
  #   The input file base name (no directory part).
--- 1690,1694 ----
  #   The filename given on the commmand line, but cleaned of TeX commands.
  # - IN_DIR
! #   The directory containing the input file.
  # - IN_BASE
  #   The input file base name (no directory part).
***************
*** 1703,1711 ****
    # Get the name of the current directory.
    in_dir=`func_dirname "$command_line_filename"`
-   in_dir_abs=`absolute "$in_dir"`
-   # In a clean build, we `cd', so get an absolute file name.
-   if $tidy; then
-     in_dir=$in_dir_abs
-   fi
  
    # Strip directory part but leave extension.
--- 1730,1733 ----
***************
*** 1769,1773 ****
    case "$1" in
      -@ ) escape=@;;
!     -~ ) catcode_special=false;;
      # Silently and without documentation accept -b and --b[atch] as synonyms.
      -b | --batch) batch=true;;
--- 1791,1795 ----
    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;;
***************
*** 1943,1948 ****
    ensure_dir "$build_dir" "$t2ddir"
  
-   # We will change directory, better work with an absolute path...
-   t2ddir=`absolute "$t2ddir"`
    # Sometimes there are incompatibilities between auxiliary files for
    # DVI and PDF.  The contents can also change whether we work on PDF
--- 1965,1968 ----
diff -Nrc2 texinfo-6.1/util/texi2pdf texinfo-6.3/util/texi2pdf
*** texinfo-6.1/util/texi2pdf	2016-02-06 12:21:52.000000000 +0000
--- texinfo-6.3/util/texi2pdf	2016-09-10 20:25:23.000000000 +0100
***************
*** 1,4 ****
  #!/bin/sh
! # $Id: texi2pdf 6991 2016-02-06 12:16:13Z gavin $
  # Written by Thomas Esser.  Public domain.
  # Execute texi2dvi --pdf.
--- 1,4 ----
  #!/bin/sh
! # $Id: texi2pdf 7353 2016-09-10 13:03:54Z gavin $
  # Written by Thomas Esser.  Public domain.
  # Execute texi2dvi --pdf.
***************
*** 17,21 ****
  test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
  
! rcs_revision='$Revision: 6991 $'
  rcs_version=`set - $rcs_revision; echo $2`
  
--- 17,21 ----
  test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
  
! rcs_revision='$Revision: 7353 $'
  rcs_version=`set - $rcs_revision; echo $2`
  
***************
*** 26,30 ****
  if test "x$1" = x--version; then
    cat <<EOF
! texi2pdf (GNU Texinfo 6.1) $rcs_version
  
  Copyright (C) 2016 Free Software Foundation, Inc.
--- 26,30 ----
  if test "x$1" = x--version; then
    cat <<EOF
! texi2pdf (GNU Texinfo 6.3) $rcs_version
  
  Copyright (C) 2016 Free Software Foundation, Inc.
